summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2010-10-29 15:55:19 +0000
committeradam <adam@pkgsrc.org>2010-10-29 15:55:19 +0000
commit362f290922cd509cd1aa0dce4cbc350982bfc536 (patch)
tree2a03aea4de0e81997d84b2a8277f714efdeaf460
parenteb4ed493ab4c54a0212b726f7d53e2b4bb872e75 (diff)
downloadpkgsrc-362f290922cd509cd1aa0dce4cbc350982bfc536.tar.gz
Changes 1.1.8:
Bug fixes: Fix crash (memcpy with length -1) when invalid Tunnel-Password attributes are received.
-rw-r--r--net/freeradius/Makefile29
-rw-r--r--net/freeradius/PLIST16
-rw-r--r--net/freeradius/distinfo9
-rw-r--r--net/freeradius/patches/patch-ac12
4 files changed, 39 insertions, 27 deletions
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 395548cc94f..747192f5dfe 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2010/06/28 22:43:50 joerg Exp $
+# $NetBSD: Makefile,v 1.72 2010/10/29 15:55:19 adam Exp $
DISTNAME= freeradius-${RADVER}
-PKGREVISION= 4
CATEGORIES= net
MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/
@@ -22,15 +21,15 @@ GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_OLD_DES_API= YES
-BUILD_DEFS= VARBASE
+BUILD_DEFS+= VARBASE
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
-FILES_SUBST+= RADIUS_USER=${RADIUS_USER:Q}
-FILES_SUBST+= RADIUS_GROUP=${RADIUS_GROUP:Q}
+FILES_SUBST+= RADIUS_USER=${RADIUS_USER}
+FILES_SUBST+= RADIUS_GROUP=${RADIUS_GROUP}
PLIST_SUBST+= RADVER=${RADVER}
MESSAGE_SRC+= ${WRKDIR}/.MESSAGE_SRC
MESSAGE_SUBST+= CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} VARBASE=${VARBASE}
-MESSAGE_SUBST+= RADIUS_USER=${RADIUS_USER:Q} XARGS=${XARGS:Q}
-MESSAGE_SUBST+= RADIUS_GROUP=${RADIUS_GROUP:Q} FIND=${FIND:Q}
+MESSAGE_SUBST+= RADIUS_USER=${RADIUS_USER} XARGS=${XARGS:Q}
+MESSAGE_SUBST+= RADIUS_GROUP=${RADIUS_GROUP} FIND=${FIND:Q}
PKG_SYSCONFSUBDIR= raddb
RCD_SCRIPTS= radiusd
@@ -38,8 +37,8 @@ RADIUS_USER?= radius
RADIUS_GROUP?= radius
PKG_GROUPS= ${RADIUS_USER}
PKG_USERS= ${RADIUS_USER}:${RADIUS_GROUP}
-PKG_GROUPS_VARS+= RADIUS_GROUP
-PKG_USERS_VARS+= RADIUS_USER
+PKG_GROUPS_VARS= RADIUS_GROUP
+PKG_USERS_VARS= RADIUS_USER
OWN_DIRS_PERMS+= ${VARBASE}/run/radiusd \
${RADIUS_USER} ${RADIUS_GROUP} 0750
OWN_DIRS_PERMS+= ${VARBASE}/log/radiusd \
@@ -47,14 +46,14 @@ OWN_DIRS_PERMS+= ${VARBASE}/log/radiusd \
OWN_DIRS_PERMS+= ${VARBASE}/log/radiusd/radacct \
${RADIUS_USER} ${RADIUS_GROUP} 0750
-RADVER= 1.1.7
+RADVER= 1.1.8
EGDIR= ${PREFIX}/share/examples/freeradius
BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7
CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log/radiusd
-CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
+CONFIGURE_ARGS+= --localstatedir=${VARBASE}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
CONFIGURE_ARGS+= --disable-ltdl-install
CONFIGURE_ARGS+= --with-ltdl-lib=${PREFIX}/lib
CONFIGURE_ARGS+= --with-ltdl-include=${PREFIX}/include
@@ -71,7 +70,7 @@ CONFIGURE_ARGS+= --quiet
REPLACE_PERL= scripts/radsqlrelay
-SUBST_CLASSES= make
+SUBST_CLASSES+= make
SUBST_STAGE.make= post-patch
SUBST_FILES.make= src/modules/rlm_mschap/Makefile \
src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in
@@ -134,9 +133,9 @@ CFLAGS+= -fPIC
post-build:
${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
- ${CP} ${PKGDIR:Q}/MESSAGE ${WRKDIR:Q}/.MESSAGE_SRC
+ ${CP} ${PKGDIR}/MESSAGE ${WRKDIR}/.MESSAGE_SRC
.if !empty(PKG_OPTIONS:Mpam)
- ${CP} ${PKGDIR:Q}/MESSAGE.pam ${WRKDIR:Q}/.MESSAGE_SRC.pam
+ ${CP} ${PKGDIR}/MESSAGE.pam ${WRKDIR}/.MESSAGE_SRC.pam
.endif
INSTALLATION_DIRS+= ${EGDIR}/certs/demoCA
diff --git a/net/freeradius/PLIST b/net/freeradius/PLIST
index 1dbe6cab4d7..f808af02f08 100644
--- a/net/freeradius/PLIST
+++ b/net/freeradius/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2009/06/14 18:09:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.25 2010/10/29 15:55:19 adam Exp $
bin/radclient
bin/radeapclient
bin/radlast
@@ -119,20 +119,17 @@ sbin/radiusd
sbin/radwatch
sbin/rc.radiusd
share/doc/freeradius/Acct-Type
+share/doc/freeradius/Autz-Type
share/doc/freeradius/CYGWIN
share/doc/freeradius/ChangeLog
-share/doc/freeradius/Post-Auth-Type
-share/doc/freeradius/Session-Type
-share/doc/freeradius/ldap_howto.txt
-share/doc/freeradius/misc-nas
-share/doc/freeradius/release-method.txt
-share/doc/freeradius/Autz-Type
share/doc/freeradius/DIFFS
share/doc/freeradius/MACOSX
share/doc/freeradius/OS2
-share/doc/freeradius/RADIUS-SQL.schema
+share/doc/freeradius/Post-Auth-Type
share/doc/freeradius/RADIUS-LDAP-eDirectory
+share/doc/freeradius/RADIUS-SQL.schema
share/doc/freeradius/README
+share/doc/freeradius/Session-Type
share/doc/freeradius/Simultaneous-Use
share/doc/freeradius/aaa.txt
share/doc/freeradius/ascend
@@ -150,13 +147,16 @@ share/doc/freeradius/examples/openldap.schema
share/doc/freeradius/examples/oracle.sql
share/doc/freeradius/examples/postgresql.sql
share/doc/freeradius/examples/postgresql.sql.extra
+share/doc/freeradius/ldap_howto.txt
share/doc/freeradius/load-balance.txt
+share/doc/freeradius/misc-nas
share/doc/freeradius/module_interface
share/doc/freeradius/mssql
share/doc/freeradius/performance-testing
share/doc/freeradius/processing_users_file
share/doc/freeradius/proxy
share/doc/freeradius/radrelay
+share/doc/freeradius/release-method.txt
share/doc/freeradius/rfc/attributes.html
share/doc/freeradius/rfc/draft-kamath-pppext-eap-mschapv2-00.txt
share/doc/freeradius/rfc/draft-sterman-aaa-sip-00.txt
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index 8412dc305cc..ad8657318b2 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.28 2007/11/24 17:40:36 adrianp Exp $
+$NetBSD: distinfo,v 1.29 2010/10/29 15:55:19 adam Exp $
-SHA1 (freeradius-1.1.7.tar.gz) = 4e8515f82260478ef881ed7b87b7ca258e19ccba
-RMD160 (freeradius-1.1.7.tar.gz) = 9d33a4b01fc791557153b375a41e3d905fc8efe5
-Size (freeradius-1.1.7.tar.gz) = 3156228 bytes
+SHA1 (freeradius-1.1.8.tar.gz) = c6dcebd09af1c9e4df75e05c800d8b42bdd5f0af
+RMD160 (freeradius-1.1.8.tar.gz) = a21a50657fc3bc525d837e432a6d867c03276793
+Size (freeradius-1.1.8.tar.gz) = 3130766 bytes
SHA1 (patch-ab) = 7a23eb75a9818b073263fd36cbf17b692fa19a9f
+SHA1 (patch-ac) = 6cd06080398a67ad15fd34c8b9e567cfd90d940b
SHA1 (patch-ae) = 8fa500de8c24ec4a8e3bfa043ebb2fb574b0fe7e
SHA1 (patch-ai) = 8e74a07cde8134881cfd2e5fe661e42cfa3e9fbf
SHA1 (patch-aj) = 422c9dfbde08c26acf41a040c57508ab9725004e
diff --git a/net/freeradius/patches/patch-ac b/net/freeradius/patches/patch-ac
new file mode 100644
index 00000000000..c3e65023dae
--- /dev/null
+++ b/net/freeradius/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.3 2010/10/29 15:55:19 adam Exp $
+
+--- src/main/modules.c.orig 2009-09-09 12:20:06.000000000 +0000
++++ src/main/modules.c
+@@ -698,6 +698,7 @@ int setup_modules(void)
+ * No current list of modules: Go initialize libltdl.
+ */
+ if (!module_list) {
++#define lt_preloaded_symbols lt_libltdl_LTX_preloaded_symbols
+ /*
+ * Set the default list of preloaded symbols.
+ * This is used to initialize libltdl's list of