- updated to 2.2.5

diff --git a/format-security.patch b/format-security.patch
index 4c79668c74402afbb5ed384f10cd678023ad9de7..981c135ef73ee314e4bf9a6b8abfbb89a570d48c 100644 (file)
--- a/format-security.patch
+++ b/format-security.patch
@@ -9,3 +9,14 @@
      return Qnil;
  }
  
+--- freeradius-server-2.2.5.orig/src/main/radclient.c  2014-04-28 19:13:08.000000000 +0000
++++ freeradius-server-2.2.5/src/main/radclient.c       2014-06-11 16:34:16.990041774 +0000
+@@ -934,7 +934,7 @@
+                       timeout = atof(optarg);
+                       break;
+               case 'v':
+-                      printf(radclient_version);
++                      printf("%s", radclient_version);
+                       exit(0);
+                       break;
+               case 'x':

diff --git a/freeradius-server-libdir.patch b/freeradius-server-libdir.patch
index 53159a96131beb43a045cc0642c75760d0a7dee9..c0da2068bad027c567465722dd378b9d12f36761 100644 (file)
--- a/freeradius-server-libdir.patch
+++ b/freeradius-server-libdir.patch
@@ -1,7 +1,7 @@
-diff -urN freeradius-server-2.0.3.orig/raddb/radiusd.conf.in freeradius-server-2.0.3/raddb/radiusd.conf.in
---- freeradius-server-2.0.3.orig/raddb/radiusd.conf.in 2008-03-04 17:53:02.000000000 +0100
-+++ freeradius-server-2.0.3/raddb/radiusd.conf.in      2008-04-09 17:00:51.000000000 +0200
-@@ -99,7 +99,7 @@
+diff -ur freeradius-server-2.2.5.orig/raddb/radiusd.conf.in freeradius-server-2.2.5/raddb/radiusd.conf.in
+--- freeradius-server-2.2.5.orig/raddb/radiusd.conf.in 2014-04-28 19:13:08.000000000 +0000
++++ freeradius-server-2.2.5/raddb/radiusd.conf.in      2014-06-11 16:01:09.900016369 +0000
+@@ -103,7 +103,7 @@
  #     make
  #     make install
  #
@@ -10,31 +10,31 @@ diff -urN freeradius-server-2.0.3.orig/raddb/radiusd.conf.in freeradius-server-2
  
  #  pidfile: Where to place the PID of the RADIUS server.
  #
-diff -urN freeradius-server-2.0.3.orig/src/main/mainconfig.c freeradius-server-2.0.3/src/main/mainconfig.c
---- freeradius-server-2.0.3.orig/src/main/mainconfig.c 2008-03-06 11:28:36.000000000 +0100
-+++ freeradius-server-2.0.3/src/main/mainconfig.c      2008-04-09 17:00:51.000000000 +0200
-@@ -219,7 +219,7 @@
+diff -ur freeradius-server-2.2.5.orig/src/main/mainconfig.c freeradius-server-2.2.5/src/main/mainconfig.c
+--- freeradius-server-2.2.5.orig/src/main/mainconfig.c 2014-04-28 19:13:08.000000000 +0000
++++ freeradius-server-2.2.5/src/main/mainconfig.c      2014-06-11 16:01:09.901016378 +0000
+@@ -235,7 +235,7 @@
        { "sbindir",            PW_TYPE_STRING_PTR, 0, &sbindir,            "${prefix}/sbin"},
        { "logdir",             PW_TYPE_STRING_PTR, 0, &radlog_dir,        "${localstatedir}/log"},
        { "run_dir",            PW_TYPE_STRING_PTR, 0, &run_dir,           "${localstatedir}/run/${name}"},
 -      { "libdir",             PW_TYPE_STRING_PTR, 0, &radlib_dir,        "${prefix}/lib"},
 +      { "libdir",             PW_TYPE_STRING_PTR, 0, &radlib_dir,        "${prefix}/lib/freeradius"},
        { "radacctdir",         PW_TYPE_STRING_PTR, 0, &radacct_dir,       "${logdir}/radacct" },
+       { "panic_action",       PW_TYPE_STRING_PTR, 0, &mainconfig.panic_action, NULL},
        { "hostname_lookups",   PW_TYPE_BOOLEAN,    0, &fr_dns_lookups,      "no" },
-       { "max_request_time", PW_TYPE_INTEGER, 0, &mainconfig.max_request_time, Stringify(MAX_REQUEST_TIME) },
-diff -urN freeradius-server-2.0.3.orig/src/modules/rlm_sql/drivers/rules.mak freeradius-server-2.0.3/src/modules/rlm_sql/drivers/rules.mak
---- freeradius-server-2.0.3.orig/src/modules/rlm_sql/drivers/rules.mak 2007-06-28 07:11:36.000000000 +0200
-+++ freeradius-server-2.0.3/src/modules/rlm_sql/drivers/rules.mak      2008-04-09 17:02:24.000000000 +0200
-@@ -101,7 +101,7 @@
+diff -ur freeradius-server-2.2.5.orig/src/modules/rlm_sql/drivers/rules.mak freeradius-server-2.2.5/src/modules/rlm_sql/drivers/rules.mak
+--- freeradius-server-2.2.5.orig/src/modules/rlm_sql/drivers/rules.mak 2014-04-28 19:13:08.000000000 +0000
++++ freeradius-server-2.2.5/src/modules/rlm_sql/drivers/rules.mak      2014-06-11 16:07:19.716021082 +0000
+@@ -103,7 +103,7 @@
  $(TARGET).la: $(LT_OBJS)
-       $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
+       $(LIBTOOL) --mode=link --tag=CC $(CC) -release $(RADIUSD_VERSION_STRING) \
        -module $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \
 -      -rpath $(libdir) $^ $(RLM_SQL_LIBS)
 +      -rpath $(libdir)/freeradius $^ $(RLM_SQL_LIBS)
  
  #######################################################################
  #
-@@ -139,12 +139,12 @@
+@@ -141,12 +141,12 @@
  #  Do any module-specific installation.
  #
  #  If there isn't a TARGET defined, then don't do anything.
@@ -45,25 +45,25 @@ diff -urN freeradius-server-2.0.3.orig/src/modules/rlm_sql/drivers/rules.mak fre
        if [ "x$(TARGET)" != "x" ]; then \
            $(LIBTOOL) --mode=install $(INSTALL) -c \
 -              $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
--          rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
--          ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
+-          rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \
+-          ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \
 +              $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la || exit $$?; \
-+          rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la; \
-+          ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
++          rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \
++          ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \
        fi
-diff -urN freeradius-server-2.0.3.orig/src/modules/rules.mak freeradius-server-2.0.3/src/modules/rules.mak
---- freeradius-server-2.0.3.orig/src/modules/rules.mak 2008-01-10 11:12:01.000000000 +0100
-+++ freeradius-server-2.0.3/src/modules/rules.mak      2008-04-09 17:01:23.000000000 +0200
-@@ -115,7 +115,7 @@
- $(TARGET).la: $(LT_OBJS)
-       $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
+diff -ur freeradius-server-2.2.5.orig/src/modules/rules.mak freeradius-server-2.2.5/src/modules/rules.mak
+--- freeradius-server-2.2.5.orig/src/modules/rules.mak 2014-04-28 19:13:08.000000000 +0000
++++ freeradius-server-2.2.5/src/modules/rules.mak      2014-06-11 16:06:32.670020429 +0000
+@@ -122,7 +122,7 @@
+ $(TARGET).la: $(RLM_SUBDIRS) $(LT_OBJS)
+       $(LIBTOOL) --mode=link --tag=CC $(CC) -release $(RADIUSD_VERSION_STRING) \
        -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
 -      -rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
 +      -rpath $(libdir)/freeradius $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
  
  #######################################################################
  #
-@@ -156,13 +156,13 @@
+@@ -163,13 +163,13 @@
  #  Do any module-specific installation.
  #
  #  If there isn't a TARGET defined, then don't do anything.
@@ -75,9 +75,9 @@ diff -urN freeradius-server-2.0.3.orig/src/modules/rules.mak freeradius-server-2
        if [ "x$(TARGET)" != "x" ]; then \
            $(LIBTOOL) --mode=install $(INSTALL) -c \
 -              $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
--          rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
--          ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
+-          rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \
+-          ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \
 +              $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la || exit $$?; \
-+          rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la; \
-+          ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
++          rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \
++          ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \
        fi

diff --git a/freeradius-server-rubyhdrs.patch b/freeradius-server-rubyhdrs.patch
index 1b913c9c09dd080c2210aa517f6b91a123949d44..de3341f1283d521e76dbc75adbaae460a3612b25 100644 (file)
--- a/freeradius-server-rubyhdrs.patch
+++ b/freeradius-server-rubyhdrs.patch
@@ -1,19 +1,25 @@
 --- freeradius-server-2.1.7/src/modules/rlm_ruby/configure.in~ 2009-09-14 16:43:29.000000000 +0200
 +++ freeradius-server-2.1.7/src/modules/rlm_ruby/configure.in  2010-03-01 13:53:59.571124248 +0100
-@@ -57,12 +57,13 @@
- #             RB_LIB_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('libdir')"`
- #             RB_EXTRA_LIBS=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('LIBS')"`
-               RB_LIBS=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('LIBRUBYARG_SHARED')"`
--              RB_INC_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('includedir')"`
-+              RB_INC_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('rubyhdrdir')"`
-               RB_CFLAGS=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('CFLAGS')"`
-               RB_ARCH_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('archdir')"`
-+              RB_ARCH_INC_DIR=`${RUBYBIN} -r rbconfig -e 'puts RbConfig.expand("$(rubyhdrdir)/$(arch)")'`
+@@ -48,7 +48,7 @@
+               RB_LIBS=`${RUBYBIN} -e "require 'rbconfig'; puts RbConfig::CONFIG.fetch('LIBRUBYARG_SHARED')"`
+               AC_MSG_NOTICE([libs: $RB_LIBS])
+ 
+-              RB_INC_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts RbConfig::CONFIG.fetch('includedir')"`
++              RB_INC_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts RbConfig::CONFIG.fetch('rubyhdrdir')"`
+               AC_MSG_NOTICE([include: $RB_INC_DIR])
  
+               RB_CFLAGS=`${RUBYBIN} -e "require 'rbconfig'; puts RbConfig::CONFIG.fetch('CFLAGS')"`
+@@ -57,8 +57,11 @@
+               RB_ARCH_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts RbConfig::CONFIG.fetch('archdir')"`
+               AC_MSG_NOTICE([arch: $RB_ARCH_DIR])
+ 
++              RB_ARCH_INC_DIR=`${RUBYBIN} -r rbconfig -e 'puts RbConfig.expand("$(rubyhdrdir)/$(arch)")'`
++              AC_MSG_NOTICE([arch: $RB_ARCH_DIR])
++
                old_CFLAGS=$CFLAGS
--              CFLAGS="$CFLAGS $RB_CFLAGS -I${RB_ARCH_DIR} -I${RB_INC_DIR}"
-+              CFLAGS="$CFLAGS $RB_CFLAGS -I${RB_ARCH_INC_DIR} -I${RB_INC_DIR}"
- #             smart_try_dir=$RB_INC_DIR
+-              CFLAGS="$CFLAGS $RB_CFLAGS -I${RB_ARCH_DIR} -I${RB_INC_DIR} -I${RB_INC_DIR}/ruby-${RB_VERSION}"
++              CFLAGS="$CFLAGS $RB_CFLAGS -I${RB_ARCH_INC_DIR} -I${RB_INC_DIR} -I${RB_INC_DIR}/ruby-${RB_VERSION}"
+               AC_MSG_NOTICE("$CFLAGS");
                FR_SMART_CHECK_INCLUDE(ruby.h)
                if test "x$ac_cv_header_ruby_h" != "xyes"; then
 --- freeradius-server-2.1.7/src/modules/rlm_ruby/rlm_ruby.c~   2009-09-14 16:43:29.000000000 +0200

diff --git a/freeradius-server.spec b/freeradius-server.spec
index f7d58a39fc1a01a25cb98e4d37307020f0213dc4..59ba0fe6aac05edc6c3e1a8b1b3da89a86194c44 100644 (file)
--- a/freeradius-server.spec
+++ b/freeradius-server.spec
@@ -16,12 +16,12 @@
 Summary:       High-performance and highly configurable RADIUS server
 Summary(pl.UTF-8):     Szybki i wysoce konfigurowalny serwer RADIUS
 Name:          freeradius-server
-Version:       2.2.0
-Release:       5
+Version:       2.2.5
+Release:       1
 License:       GPL
 Group:         Networking/Daemons/Radius
 Source0:       ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.bz2
-# Source0-md5: 0fb333fe6a64eb2b1dd6ef67f7bca119
+# Source0-md5: 40535bace507d7a3134c3d858f3cbc5a
 Source1:       %{name}.logrotate
 Source2:       %{name}.init
 Source3:       %{name}.pam
@@ -632,7 +632,7 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfreeradius-eap-?.?.?.so
-%attr(755,root,root) %{_libdir}/libfreeradius-radius-?.?.?.so
+%attr(755,root,root) %{_libdir}/libfreeradius-radius-??????.so
 %dir %{_libdir}/freeradius
 
 %files devel