diff --git a/freeradius/freeradius.patch b/freeradius/freeradius.patch index d36e7cd693..15809c649b 100644 --- a/freeradius/freeradius.patch +++ b/freeradius/freeradius.patch @@ -1,56 +1,6 @@ -Index: src/modules/rlm_x99_token/x99_rlm.c ---- src/modules/rlm_x99_token/x99_rlm.c.orig 2004-02-26 20:04:37 +0100 -+++ src/modules/rlm_x99_token/x99_rlm.c 2004-07-22 21:47:04 +0200 -@@ -517,8 +517,8 @@ - } - - /* Fast path if we didn't protect the state. */ -- if (!(user_info.card_id & X99_CF_AM)) -- goto good_state; -+ if ((user_info.card_id & X99_CF_AM)) -+ { /* defeat gcc "label at end of compound statement" error */ - - /* Verify the state. */ - (void) memset(challenge, 0, sizeof(challenge)); -@@ -544,7 +544,7 @@ - "auth: bad state for [%s]: expired", username); - return RLM_MODULE_REJECT; - } --good_state: -+ } - /* State is good! */ - - } else { -Index: src/modules/rlm_ldap/rlm_ldap.c ---- src/modules/rlm_ldap/rlm_ldap.c.orig 2004-04-30 09:54:56 +0200 -+++ src/modules/rlm_ldap/rlm_ldap.c 2004-07-22 23:12:09 +0200 -@@ -193,6 +193,7 @@ - * every use of the pthread functions. - */ - #define pthread_mutex_lock(a) -+#define pthread_mutex_trylock(a) 0 - #define pthread_mutex_unlock(a) - #define pthread_mutex_init(a,b) - #define pthread_mutex_destroy(a) -Index: src/modules/rlm_sql/drivers/Makefile.in ---- src/modules/rlm_sql/drivers/Makefile.in.orig 2003-10-09 06:00:26.000000000 +0200 -+++ src/modules/rlm_sql/drivers/Makefile.in 2004-07-23 00:20:38.766269000 +0200 -@@ -18,10 +18,10 @@ - - common: - @[ -d lib/ ] || mkdir lib -- @for mod in $(SQL_MODULES); do \ -+ @for mod in $(SQL_MODULES) NOOP; do \ - what=$(WHAT_TO_MAKE); \ - [ "$$what" = "all" ] && what="$(TARGET_LIBS)"; \ - echo "Making $$what in $$mod..."; \ -- (cd $$mod && $(MAKE) $(MFLAGS) $$what) || exit 1;\ -+ [ -d $$mod ] || exit 0; (cd $$mod && $(MAKE) $(MFLAGS) $$what) || exit 1;\ - done - Index: Make.inc.in --- Make.inc.in.orig 2004-01-23 18:08:43 +0100 -+++ Make.inc.in 2004-07-23 22:29:36 +0200 ++++ Make.inc.in 2005-02-17 19:08:46 +0100 @@ -14,7 +14,7 @@ sbindir = @sbindir@ mandir = @mandir@ @@ -70,8 +20,8 @@ Index: Make.inc.in RADIR = ${radacctdir} Index: raddb/radiusd.conf.in ---- raddb/radiusd.conf.in.orig 2004-05-13 22:10:19 +0200 -+++ raddb/radiusd.conf.in 2004-07-23 22:35:48 +0200 +--- raddb/radiusd.conf.in.orig 2005-02-07 20:52:05 +0100 ++++ raddb/radiusd.conf.in 2005-02-17 19:08:46 +0100 @@ -31,7 +31,7 @@ # Location of config and logfiles. @@ -81,3 +31,30 @@ Index: raddb/radiusd.conf.in # # The logging messages for the server are appended to the +Index: src/modules/rlm_ldap/rlm_ldap.c +--- src/modules/rlm_ldap/rlm_ldap.c.orig 2005-02-07 20:51:28 +0100 ++++ src/modules/rlm_ldap/rlm_ldap.c 2005-02-17 19:08:46 +0100 +@@ -193,6 +193,7 @@ + * every use of the pthread functions. + */ + #define pthread_mutex_lock(a) ++#define pthread_mutex_trylock(a) 0 + #define pthread_mutex_unlock(a) + #define pthread_mutex_init(a,b) + #define pthread_mutex_destroy(a) +Index: src/modules/rlm_sql/drivers/Makefile.in +--- src/modules/rlm_sql/drivers/Makefile.in.orig 2003-10-09 06:00:26 +0200 ++++ src/modules/rlm_sql/drivers/Makefile.in 2005-02-17 19:08:46 +0100 +@@ -18,10 +18,10 @@ + + common: + @[ -d lib/ ] || mkdir lib +- @for mod in $(SQL_MODULES); do \ ++ @for mod in $(SQL_MODULES) NOOP; do \ + what=$(WHAT_TO_MAKE); \ + [ "$$what" = "all" ] && what="$(TARGET_LIBS)"; \ + echo "Making $$what in $$mod..."; \ +- (cd $$mod && $(MAKE) $(MFLAGS) $$what) || exit 1;\ ++ [ -d $$mod ] || exit 0; (cd $$mod && $(MAKE) $(MFLAGS) $$what) || exit 1;\ + done + diff --git a/freeradius/freeradius.spec b/freeradius/freeradius.spec index 6525879ac7..d0e69fe1d8 100644 --- a/freeradius/freeradius.spec +++ b/freeradius/freeradius.spec @@ -27,8 +27,8 @@ # FIXME: rse: still not run-time tested # package version -%define V_real 1.0.1 -%define V_here 1.0.1 +%define V_real 1.0.2 +%define V_here 1.0.2 # package information Name: freeradius @@ -41,7 +41,7 @@ Class: EVAL Group: Network License: GPL Version: %{V_here} -Release: 20041207 +Release: 20050217 # list of sources Source0: ftp://ftp.freeradius.org/pub/radius/freeradius-%{V_real}.tar.gz