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: 21-Mar-2006 11:34:01
Branch: HEAD Handle: 2006032110340100
Modified files:
openpkg-src/freeradius freeradius.patch freeradius.spec
Log:
upgrading package: freeradius 1.0.5 -> 1.1.1
Summary:
Revision Changes Path
1.8 +9 -22 openpkg-src/freeradius/freeradius.patch
1.18 +8 -5 openpkg-src/freeradius/freeradius.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/freeradius/freeradius.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 freeradius.patch
--- openpkg-src/freeradius/freeradius.patch 6 Oct 2005 12:05:05 -0000
1.7
+++ openpkg-src/freeradius/freeradius.patch 21 Mar 2006 10:34:01 -0000
1.8
@@ -1,6 +1,6 @@
Index: Make.inc.in
---- Make.inc.in.orig 2004-01-23 18:08:43 +0100
-+++ Make.inc.in 2005-10-05 23:17:12 +0200
+--- Make.inc.in.orig 2006-01-24 22:02:20 +0100
++++ Make.inc.in 2006-03-21 09:27:22 +0100
@@ -14,7 +14,7 @@
sbindir = @sbindir@
mandir = @mandir@
@@ -10,7 +10,7 @@
logdir = @logdir@
raddbdir = @raddbdir@
radacctdir = @radacctdir@
-@@ -45,7 +45,7 @@
+@@ -46,7 +46,7 @@
LOGDIR = ${logdir}
RADDBDIR = ${raddbdir}
@@ -20,8 +20,8 @@
RADIR = ${radacctdir}
Index: raddb/radiusd.conf.in
---- raddb/radiusd.conf.in.orig 2005-06-12 00:20:40 +0200
-+++ raddb/radiusd.conf.in 2005-10-05 23:17:12 +0200
+--- raddb/radiusd.conf.in.orig 2006-02-10 16:12:02 +0100
++++ raddb/radiusd.conf.in 2006-03-21 09:27:22 +0100
@@ -31,7 +31,7 @@
# Location of config and logfiles.
@@ -31,30 +31,17 @@
#
# 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-08-29 18:09:56 +0200
-+++ src/modules/rlm_ldap/rlm_ldap.c 2005-10-05 23:17:12 +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 2005-04-11 23:18:28
+0200
-+++ src/modules/rlm_sql/drivers/Makefile.in 2005-10-05 23:17:12 +0200
-@@ -18,10 +18,10 @@
+--- src/modules/rlm_sql/drivers/Makefile.in.orig 2006-02-10 20:47:19
+0100
++++ src/modules/rlm_sql/drivers/Makefile.in 2006-03-21 09:39:59 +0100
+@@ -13,8 +13,8 @@
- common:
+ 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 $?;\
+ [ -d $$mod ] || exit 0; (cd $$mod && $(MAKE) $(MFLAGS) $$what)
|| exit $?;\
done
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/freeradius/freeradius.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 freeradius.spec
--- openpkg-src/freeradius/freeradius.spec 1 Jan 2006 13:01:52 -0000
1.17
+++ openpkg-src/freeradius/freeradius.spec 21 Mar 2006 10:34:01 -0000
1.18
@@ -26,8 +26,8 @@
# FIXME: rse: still not run-time tested
# package version
-%define V_real 1.0.5
-%define V_here 1.0.5
+%define V_real 1.1.1
+%define V_here 1.1.1
# package information
Name: freeradius
@@ -40,7 +40,7 @@
Group: Network
License: GPL
Version: %{V_here}
-Release: 20060101
+Release: 20060321
# list of sources
Source0: ftp://ftp.freeradius.org/pub/radius/freeradius-%{V_real}.tar.gz
@@ -75,7 +75,7 @@
%setup -q -n freeradius-%{V_real}
%patch -p0
%{l_shtool} subst \
- -e 's;\(LIBS *=.* *-lldap\)";\1 -llber -lssl -lcrypto";' \
+ -e 's;\(LIBS *=.* *-lldap\);\1 -llber -lssl -lcrypto;' \
src/modules/rlm_ldap/configure
%build
@@ -84,7 +84,7 @@
CFLAGS="-I`pwd`/src/include %{l_cflags -O} %{l_cppflags}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
- LIBS="-llber" \
+ LIBS="-llber -lssl -lcrypto" \
./configure \
--prefix=%{l_prefix} \
--libdir=%{l_prefix}/lib/freeradius \
@@ -110,6 +110,9 @@
--without-rlm_sql \
--without-rlm_sql_postgresql \
--without-rlm_dbm \
+ --without-rlm_otp \
+ --without-rlm_pam \
+ --without-rlm_perl \
--enable-strict-dependencies \
--with-ltdl-lib=%{l_prefix}/lib \
--with-ltdl-include=%{l_prefix}/include \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
