OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Apr-2008 20:41:47
Branch: HEAD Handle: 2008040419414600
Modified files:
openpkg-src/freeradius freeradius.patch freeradius.spec
Log:
upgrading package: freeradius 1.1.7 -> 2.0.3
Summary:
Revision Changes Path
1.10 +28 -15 openpkg-src/freeradius/freeradius.patch
1.33 +8 -6 openpkg-src/freeradius/freeradius.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/freeradius/freeradius.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 freeradius.patch
--- openpkg-src/freeradius/freeradius.patch 29 May 2006 06:33:51 -0000
1.9
+++ openpkg-src/freeradius/freeradius.patch 4 Apr 2008 18:41:46 -0000
1.10
@@ -1,16 +1,16 @@
Index: Make.inc.in
---- Make.inc.in.orig 2006-01-24 22:02:20 +0100
-+++ Make.inc.in 2006-05-29 08:26:38 +0200
-@@ -14,7 +14,7 @@
- sbindir = @sbindir@
+--- Make.inc.in.orig 2007-11-24 09:28:43 +0100
++++ Make.inc.in 2008-04-04 18:45:54 +0200
+@@ -15,7 +15,7 @@
+ docdir = @docdir@
mandir = @mandir@
datadir = @datadir@
-dictdir = $(datadir)/freeradius
+dictdir = $(datadir)
logdir = @logdir@
+ includedir = @includedir@
raddbdir = @raddbdir@
- radacctdir = @radacctdir@
-@@ -46,7 +46,7 @@
+@@ -48,7 +48,7 @@
LOGDIR = ${logdir}
RADDBDIR = ${raddbdir}
@@ -18,23 +18,36 @@
+RUNDIR = ${localstatedir}
SBINDIR = ${sbindir}
RADIR = ${radacctdir}
-
+ LIBRADIUS = $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la
Index: raddb/radiusd.conf.in
---- raddb/radiusd.conf.in.orig 2006-04-20 20:40:29 +0200
-+++ raddb/radiusd.conf.in 2006-05-29 08:26:38 +0200
-@@ -31,7 +31,7 @@
+--- raddb/radiusd.conf.in.orig 2008-03-04 17:53:02 +0100
++++ raddb/radiusd.conf.in 2008-04-04 18:45:54 +0200
+@@ -62,7 +62,7 @@
# Location of config and logfiles.
confdir = ${raddbdir}
-run_dir = ${localstatedir}/run/radiusd
+run_dir = ${localstatedir}
- #
- # The logging messages for the server are appended to the
+ # Should likely be ${localstatedir}/lib/radiusd
+ db_dir = $(raddbdir)
+Index: src/main/event.c
+--- src/main/event.c.orig 2008-03-15 13:04:28 +0100
++++ src/main/event.c 2008-04-04 20:06:14 +0200
+@@ -2284,6 +2284,9 @@
+ rad_listen_t *listener = ctx;
+ RAD_REQUEST_FUNP fun;
+ REQUEST *request;
++#if !defined(HAVE_PTHREAD_H) && defined(WNOHANG)
++ int argval;
++#endif
+
+ rad_assert(xel == el);
+
Index: src/modules/rlm_sql/drivers/Makefile.in
---- src/modules/rlm_sql/drivers/Makefile.in.orig 2006-05-25 18:24:42
+0200
-+++ src/modules/rlm_sql/drivers/Makefile.in 2006-05-29 08:29:22 +0200
-@@ -13,7 +13,7 @@
+--- src/modules/rlm_sql/drivers/Makefile.in.orig 2006-07-06 18:54:27
+0200
++++ src/modules/rlm_sql/drivers/Makefile.in 2008-04-04 18:45:54 +0200
+@@ -16,7 +16,7 @@
common:
@[ -d lib/ ] || mkdir lib
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/freeradius/freeradius.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 freeradius.spec
--- openpkg-src/freeradius/freeradius.spec 1 Jan 2008 14:54:02 -0000
1.32
+++ openpkg-src/freeradius/freeradius.spec 4 Apr 2008 18:41:46 -0000
1.33
@@ -34,8 +34,8 @@
Class: EVAL
Group: RADIUS
License: GPL
-Version: 1.1.7
-Release: 20080101
+Version: 2.0.3
+Release: 20080404
# package options
%option with_mysql no
@@ -44,7 +44,7 @@
%option with_snmp no
# list of sources
-Source0:
ftp://ftp.freeradius.org/pub/radius/freeradius-%{version}.tar.gz
+Source0:
ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-%{version}.tar.gz
Source1: rc.freeradius
Patch0: freeradius.patch
@@ -84,12 +84,12 @@
%track
prog freeradius = {
version = %{version}
- url = ftp://ftp.freeradius.org/pub/radius/
- regex = freeradius-(\d+\.\d+(\.\d+)*)\.tar\.gz
+ url = ftp://ftp.freeradius.org/pub/freeradius/
+ regex = freeradius-server-(\d+\.\d+(\.\d+)*)\.tar\.gz
}
%prep
- %setup -q
+ %setup -q -n freeradius-server-%{version}
%patch -p0
%{l_shtool} subst \
-e 's;\(LIBS *=.* *-lldap\);\1 -llber -lssl -lcrypto;' \
@@ -151,6 +151,7 @@
%else
--without-snmp \
%endif
+ --without-rlm_eap_ikev2 \
--without-rlm_eap_sim \
--without-rlm_eap_tls \
--without-rlm_eap_peap \
@@ -160,6 +161,7 @@
--without-rlm_otp \
--without-rlm_pam \
--without-rlm_perl \
+ --without-rlm_python \
--enable-strict-dependencies \
--with-ltdl-lib=%{l_prefix}/lib \
--with-ltdl-include=%{l_prefix}/include \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
