commit 693f93094a6ec3e061252f7e08b32f8faa61b399
Author: Jacek Konieczny <[email protected]>
Date: Tue Oct 9 15:49:31 2018 +0200
Up to 3.0.17, work in progress
aclocal.patch | 43 ++++++++++++++++++++
freeradius-server-config.patch | 26 ++++++------
freeradius-server-libdir.patch | 91 ++++++++----------------------------------
freeradius-server-rundir.patch | 24 +++++------
freeradius-server.spec | 45 +++++++++++----------
5 files changed, 108 insertions(+), 121 deletions(-)
---
diff --git a/freeradius-server.spec b/freeradius-server.spec
index d33b797..3ed54b2 100644
--- 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.10
-Release: 7
+Version: 3.0.17
+Release: 0.1
License: GPL v2
Group: Networking/Daemons/Radius
Source0: ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.bz2
-# Source0-md5: f1ce12d2b8258585cb3d525f5bdfeb17
+# Source0-md5: 1f4ad38f32101a7d50d818afa6f17339
Source1: %{name}.logrotate
Source2: %{name}.init
Source3: %{name}.pam
@@ -34,10 +34,11 @@ Patch4: %{name}-heimdal.patch
Patch5: %{name}-rubyhdrs.patch
# Patch taken from
http://download.ag-projects.com/CDRTool/contrib/freeradius-brandinger/
Patch6: failed_calls_accounting.patch
-Patch7: http://eduroam.pl/Dokumentacja/cui-fr-2.2.0.patch
+#Patch7: http://eduroam.pl/Dokumentacja/cui-fr-2.2.0.patch
Patch8: format-security.patch
Patch9: am.patch
Patch10: %{name}-oracle.patch
+Patch11: aclocal.patch
URL: http://www.freeradius.org/
%{?with_firebird:BuildRequires: Firebird-devel}
BuildRequires: autoconf >= 2.59
@@ -48,10 +49,11 @@ BuildRequires: gdbm-devel
BuildRequires: heimdal-devel
%endif
%{?with_redis:BuildRequires: hiredis-devel}
+BuildRequires: json-c-devel
%if %{with kerberos5} && %{with krb5}
BuildRequires: krb5-devel
%endif
-%{?with_eap_ikev2:BuildRequires: libeap-ikev2-devel}
+%{?with_eap_ikev2:BuildRequires: libeap-ikev2-devel >= 0.2.1-5}
BuildRequires: libltdl-devel
BuildRequires: libpcap-devel
BuildRequires: libtool
@@ -329,19 +331,19 @@ Baza danych MIB dla serwera FreeRADIUS.
%prep
%setup -q
+
%patch0 -p1
%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+#%patch4 -p1
+#%patch5 -p1
%{?with_failed_calls_acc:%patch6 -p0}
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-
-%{__rm} aclocal.m4 libtool.m4
+#%patch7 -p1
+#%patch8 -p1
+#%patch9 -p1
+#%patch10 -p1
+%patch11 -p1
%build
# Keep it for future when ac/am regeneration will be ok
@@ -349,7 +351,7 @@ TOPDIR="$(pwd)"
find -name 'configure.[ia][nc]' -type f | while read FILE; do
cd $(dirname "$FILE")
grep -q 'A[CM]_PROG_LIBTOOL' configure.[ia][nc] && %{__libtoolize}
- %{__aclocal} -I "$TOPDIR"
+ %{__aclocal} -I "$TOPDIR" -I "$TOPDIR/m4" $(if [ -d m4 ] ; then echo
"-I m4" ; fi)
%{__autoconf}
[ -f config.h.in ] && %{__autoheader}
cd -
@@ -384,7 +386,9 @@ done
--without-rlm_sql_db2 \
%{!?with_firebird:--without-rlm_sql_firebird} \
--without-rlm_sql_iodbc \
- %{!?with_oci:--without-rlm_sql_oracle}
+ %{!?with_oci:--without-rlm_sql_oracle} \
+ --without-rlm_couchbase \
+ --without-rlm_securid
%{__make} -j1
@@ -404,19 +408,18 @@ install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/radius
install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
# Install mibs:
-install mibs/FREERADIUS-*.txt $RPM_BUILD_ROOT%{mibdir}
+install mibs/FREERADIUS-*.mib $RPM_BUILD_ROOT%{mibdir}
# Cleanups:
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la \
$RPM_BUILD_ROOT%{_sbindir}/rc.*
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/freeradius \
- %{!?with_oci:$RPM_BUILD_ROOT%{_sysconfdir}/raddb/sql/oracle}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/freeradius
# prepare cleaned up docs for rpm
install -d docs-rpm
cp -a doc scripts docs-rpm
-%{__rm}
docs-rpm/doc/{.gitignore,CYGWIN.rst,DIFFS.rst,MACOSX,OS2,Makefile*,examples/Makefile,rfc/{Makefile,update.sh,*.pl}}
-%{__rm}
docs-rpm/scripts/{.gitignore,Makefile,*.in,radsqlrelay,radwatch,raddebug,cryptpasswd}
+%{__rm} docs-rpm/doc/{.gitignore,Makefile*,rfc/{Makefile,update.sh,*.pl}}
+%{__rm} docs-rpm/scripts/{.gitignore,*.in,raddebug,cryptpasswd}
%{__rm} -r docs-rpm/scripts/solaris
%clean
diff --git a/aclocal.patch b/aclocal.patch
new file mode 100644
index 0000000..fc8de34
--- /dev/null
+++ b/aclocal.patch
@@ -0,0 +1,43 @@
+diff -dur -x '*~'
freeradius-server-3.0.17.orig/src/modules/rlm_perl/configure.ac
freeradius-server-3.0.17/src/modules/rlm_perl/configure.ac
+--- freeradius-server-3.0.17.orig/src/modules/rlm_perl/configure.ac
2018-04-17 19:12:27.000000000 +0200
++++ freeradius-server-3.0.17/src/modules/rlm_perl/configure.ac 2018-10-09
15:03:14.000000000 +0200
+@@ -3,8 +3,6 @@
+ AC_REVISION($Revision$)
+ AC_DEFUN(modname,[rlm_perl])
+
+-m4_include([ax_with_prog.m4])
+-
+ if test x$with_[]modname != xno; then
+ AC_PROG_CC
+ AC_PROG_CPP
+diff -dur -x '*~'
freeradius-server-3.0.17.orig/src/modules/rlm_rest/configure.ac
freeradius-server-3.0.17/src/modules/rlm_rest/configure.ac
+--- freeradius-server-3.0.17.orig/src/modules/rlm_rest/configure.ac
2018-04-17 19:12:27.000000000 +0200
++++ freeradius-server-3.0.17/src/modules/rlm_rest/configure.ac 2018-10-09
15:03:36.000000000 +0200
+@@ -3,7 +3,6 @@
+ AC_REVISION($Revision$)
+ AC_DEFUN(modname,[rlm_rest])
+ AC_CONFIG_HEADER(config.h)
+-m4_include([m4/libcurl_check_config.m4])
+
+ if test x$with_[]modname != xno; then
+
+diff -dur -x '*~'
freeradius-server-3.0.17.orig/src/modules/rlm_ruby/configure.ac
freeradius-server-3.0.17/src/modules/rlm_ruby/configure.ac
+--- freeradius-server-3.0.17.orig/src/modules/rlm_ruby/configure.ac
2018-04-17 19:12:27.000000000 +0200
++++ freeradius-server-3.0.17/src/modules/rlm_ruby/configure.ac 2018-10-09
15:03:26.000000000 +0200
+@@ -3,16 +3,10 @@
+ AC_REVISION($Revision: 1.9 $)
+ AC_DEFUN(modname,[rlm_ruby])
+
+-m4_include([ax_with_prog.m4])
+-
+ AC_DEFUN([AX_WITH_RUBY],[
+ AX_WITH_PROG([RUBY],[ruby],[not-found],[${PATH}:/usr/bin:/usr/local/bin])
+ ])
+
+-m4_include([ax_compare_version.m4])
+-m4_include([ax_prog_ruby_version.m4])
+-m4_include([ax_ruby_devel.m4])
+-
+ targetname=modname
+ mod_cflags=
+ mod_ldflags=
diff --git a/freeradius-server-config.patch b/freeradius-server-config.patch
index 170a70f..43b6176 100644
--- a/freeradius-server-config.patch
+++ b/freeradius-server-config.patch
@@ -1,14 +1,14 @@
-diff -dur freeradius-1.0.1.orig/raddb/radiusd.conf.in
freeradius-1.0.1/raddb/radiusd.conf.in
---- freeradius-1.0.1.orig/raddb/radiusd.conf.in 2004-10-13
11:29:16.000000000 +0200
-+++ freeradius-1.0.1/raddb/radiusd.conf.in 2004-10-13 11:49:08.318567276
+0200
-@@ -106,8 +106,8 @@
- # that the debugging mode server is running as a user that can read the
- # shadow info, and the user listed below can not.
- #
--#user = radius
--#group = radius
-+user = radius
-+group = radius
+diff -dur -x '*~' -x '*.orig' -x '*.rej'
freeradius-server-3.0.17.orig/raddb/radiusd.conf.in
freeradius-server-3.0.17/raddb/radiusd.conf.in
+--- freeradius-server-3.0.17.orig/raddb/radiusd.conf.in 2018-04-17
19:12:27.000000000 +0200
++++ freeradius-server-3.0.17/raddb/radiusd.conf.in 2018-10-09
14:33:41.000000000 +0200
+@@ -398,8 +398,8 @@
+ # member. This can allow for some finer-grained access
+ # controls.
+ #
+-# user = radius
+-# group = radius
++ user = radius
++ group = radius
- # max_request_time: The maximum time (in seconds) to handle a request.
- #
+ # Core dumps are a bad thing. This should only be set to
+ # 'yes' if you're debugging a problem with the server.
diff --git a/freeradius-server-libdir.patch b/freeradius-server-libdir.patch
index c0da206..23b7eb6 100644
--- a/freeradius-server-libdir.patch
+++ b/freeradius-server-libdir.patch
@@ -1,7 +1,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 @@
+diff -dur -x '*~' -x '*.orig' -x '*.rej'
freeradius-server-3.0.17.orig/raddb/radiusd.conf.in
freeradius-server-3.0.17/raddb/radiusd.conf.in
+--- freeradius-server-3.0.17.orig/raddb/radiusd.conf.in 2018-10-09
14:36:25.000000000 +0200
++++ freeradius-server-3.0.17/raddb/radiusd.conf.in 2018-10-09
14:37:15.000000000 +0200
+@@ -105,7 +105,7 @@
# make
# make install
#
@@ -10,74 +10,15 @@ diff -ur freeradius-server-2.2.5.orig/raddb/radiusd.conf.in
freeradius-server-2.
# pidfile: Where to place the PID of the RADIUS server.
#
-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" },
-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 --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)
-
- #######################################################################
- #
-@@ -141,12 +141,12 @@
- # Do any module-specific installation.
- #
- # If there isn't a TARGET defined, then don't do anything.
--# Otherwise, install the libraries into $(libdir)
-+# Otherwise, install the libraries into $(libdir)/freeradius
- #
- install:
- if [ "x$(TARGET)" != "x" ]; then \
- $(LIBTOOL) --mode=install $(INSTALL) -c \
-- $(TARGET).la $(R)$(libdir)/$(TARGET).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_STRING).la; \
-+ ln -s $(TARGET).la
$(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \
- fi
-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)
-
- #######################################################################
- #
-@@ -163,13 +163,13 @@
- # Do any module-specific installation.
- #
- # If there isn't a TARGET defined, then don't do anything.
--# Otherwise, install the libraries into $(libdir)
-+# Otherwise, install the libraries into $(libdir)/freeradius
- #
- install:
- @[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
- if [ "x$(TARGET)" != "x" ]; then \
- $(LIBTOOL) --mode=install $(INSTALL) -c \
-- $(TARGET).la $(R)$(libdir)/$(TARGET).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_STRING).la; \
-+ ln -s $(TARGET).la
$(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \
- fi
+diff -dur -x '*~' -x '*.orig' -x '*.rej'
freeradius-server-3.0.17.orig/src/main/mainconfig.c
freeradius-server-3.0.17/src/main/mainconfig.c
+--- freeradius-server-3.0.17.orig/src/main/mainconfig.c 2018-04-17
19:12:27.000000000 +0200
++++ freeradius-server-3.0.17/src/main/mainconfig.c 2018-10-09
14:39:21.000000000 +0200
+@@ -183,7 +183,7 @@
+ { "sbindir", FR_CONF_POINTER(PW_TYPE_STRING, &sbindir),
"${prefix}/sbin"},
+ { "logdir", FR_CONF_POINTER(PW_TYPE_STRING, &radlog_dir),
"${localstatedir}/log"},
+ { "run_dir", FR_CONF_POINTER(PW_TYPE_STRING, &run_dir),
"${localstatedir}/run/${name}"},
+- { "libdir", FR_CONF_POINTER(PW_TYPE_STRING, &radlib_dir),
"${prefix}/lib"},
++ { "libdir", FR_CONF_POINTER(PW_TYPE_STRING, &radlib_dir),
"${prefix}/lib/freeradius"},
+ { "radacctdir", FR_CONF_POINTER(PW_TYPE_STRING, &radacct_dir),
"${logdir}/radacct" },
+ { "panic_action", FR_CONF_POINTER(PW_TYPE_STRING,
&main_config.panic_action), NULL},
+ { "hostname_lookups", FR_CONF_POINTER(PW_TYPE_BOOLEAN,
&fr_dns_lookups), "no" },
diff --git a/freeradius-server-rundir.patch b/freeradius-server-rundir.patch
index 87745ec..a29c3a2 100644
--- a/freeradius-server-rundir.patch
+++ b/freeradius-server-rundir.patch
@@ -1,7 +1,7 @@
-diff -dur -x '*~' -x '*.orig' freeradius-server-2.1.4.orig/Make.inc.in
freeradius-server-2.1.4/Make.inc.in
---- freeradius-server-2.1.4.orig/Make.inc.in 2009-03-11 03:26:50.000000000
+0100
-+++ freeradius-server-2.1.4/Make.inc.in 2009-03-18 09:52:34.000000000
+0100
-@@ -48,7 +48,7 @@
+diff -dur -x '*~' -x '*.orig' -x '*.rej'
freeradius-server-3.0.17.orig/Make.inc.in freeradius-server-3.0.17/Make.inc.in
+--- freeradius-server-3.0.17.orig/Make.inc.in 2018-04-17 19:12:27.000000000
+0200
++++ freeradius-server-3.0.17/Make.inc.in 2018-10-09 14:42:09.000000000
+0200
+@@ -95,7 +95,7 @@
LOGDIR = ${logdir}
RADDBDIR = ${raddbdir}
@@ -9,14 +9,14 @@ diff -dur -x '*~' -x '*.orig'
freeradius-server-2.1.4.orig/Make.inc.in freeradiu
+RUNDIR = ${localstatedir}/run/freeradius
SBINDIR = ${sbindir}
RADIR = ${radacctdir}
- LIBRADIUS = $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la
-diff -dur -x '*~' -x '*.orig'
freeradius-server-2.1.4.orig/raddb/radiusd.conf.in
freeradius-server-2.1.4/raddb/radiusd.conf.in
---- freeradius-server-2.1.4.orig/raddb/radiusd.conf.in 2009-03-18
09:52:24.000000000 +0100
-+++ freeradius-server-2.1.4/raddb/radiusd.conf.in 2009-03-18
09:53:13.000000000 +0100
-@@ -66,7 +66,7 @@
-
- # Location of config and logfiles.
- confdir = ${raddbdir}
+ LIBRADIUS = $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la
$(TALLOC_LIBS)
+diff -dur -x '*~' -x '*.orig' -x '*.rej'
freeradius-server-3.0.17.orig/raddb/radiusd.conf.in
freeradius-server-3.0.17/raddb/radiusd.conf.in
+--- freeradius-server-3.0.17.orig/raddb/radiusd.conf.in 2018-10-09
14:41:49.000000000 +0200
++++ freeradius-server-3.0.17/raddb/radiusd.conf.in 2018-10-09
14:42:44.000000000 +0200
+@@ -68,7 +68,7 @@
+ modconfdir = ${confdir}/mods-config
+ certdir = ${confdir}/certs
+ cadir = ${confdir}/certs
-run_dir = ${localstatedir}/run/${name}
+run_dir = ${localstatedir}/run/freeradius
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/freeradius-server.git/commitdiff/693f93094a6ec3e061252f7e08b32f8faa61b399
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
