pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2004Q3]: pkgsrc Pullup ticket 118 - requested by Adrian Portelli



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4472fedfc1c2
branches:  pkgsrc-2004Q3
changeset: 480715:4472fedfc1c2
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Oct 19 12:51:58 2004 +0000

description:
Pullup ticket 118 - requested by Adrian Portelli
build and security fixes for freeradius

Based on patches provided by Adrian.

diffstat:

 doc/CHANGES-pkgsrc-2004Q3       |    4 +-
 net/freeradius/HEADER           |   12 -
 net/freeradius/Makefile         |   90 ++++++++++--
 net/freeradius/PLIST            |  266 ++++++++++++++++++++++++++++++++++++---
 net/freeradius/PLIST.ldap       |    5 +
 net/freeradius/PLIST.mysql      |    5 +
 net/freeradius/PLIST.pgsql      |    5 +
 net/freeradius/distinfo         |   14 +-
 net/freeradius/files/radiusd.sh |    6 +-
 net/freeradius/options.mk       |   82 ++++++++++++
 net/freeradius/patches/patch-ab |   13 -
 net/freeradius/patches/patch-ae |   27 ++-
 net/freeradius/patches/patch-af |   13 -
 net/freeradius/patches/patch-ah |   18 ++
 net/freeradius/patches/patch-ai |   13 +
 net/freeradius/patches/patch-aj |   13 +
 net/freeradius/patches/patch-ak |   12 +
 17 files changed, 495 insertions(+), 103 deletions(-)

diffs (truncated from 821 to 300 lines):

diff -r 3a1bdab43661 -r 4472fedfc1c2 doc/CHANGES-pkgsrc-2004Q3
--- a/doc/CHANGES-pkgsrc-2004Q3 Mon Oct 18 17:03:48 2004 +0000
+++ b/doc/CHANGES-pkgsrc-2004Q3 Tue Oct 19 12:51:58 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q3,v 1.1.2.6 2004/10/18 17:03:48 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q3,v 1.1.2.7 2004/10/19 12:51:58 agc Exp $
 
 Changes to the packages collection and infrastructure on the
 pkgsrc-2004Q3 branch:
@@ -11,6 +11,8 @@
 fix bug in lftp
 Pullup ticket 116 - requested by Eric Gillespie
 security fix for subversion
+Pullup ticket 118 - requested by Adrian Portelli
+build and security fixes for freeradius
 Pullup ticket 121 - requested by Quentin Garnier
 security fix for sox
 Pullup ticket 122 - requested by Matthias Scheler
diff -r 3a1bdab43661 -r 4472fedfc1c2 net/freeradius/HEADER
--- a/net/freeradius/HEADER     Mon Oct 18 17:03:48 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-# $NetBSD: HEADER,v 1.1 2003/07/30 14:50:07 jmmv Exp $
-
-EGDIR="${PKG_PREFIX}/share/examples/freeradius"
-
-case ${STAGE} in
-POST-INSTALL|DEINSTALL)
-       for fp in ${EGDIR}/*; do
-               f="`${BASENAME} $fp`"
-               CONF_FILES="${CONF_FILES} ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f"
-       done
-       ;;
-esac
diff -r 3a1bdab43661 -r 4472fedfc1c2 net/freeradius/Makefile
--- a/net/freeradius/Makefile   Mon Oct 18 17:03:48 2004 +0000
+++ b/net/freeradius/Makefile   Tue Oct 19 12:51:58 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/09/17 16:08:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11.2.1 2004/10/19 12:51:58 agc Exp $
 
-DISTNAME=      freeradius-0.9.3
+DISTNAME=      freeradius-1.0.1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.freeradius.org/pub/radius/ \
                ftp://ftp.Awfulhak.org/pub/radius/
@@ -9,39 +10,90 @@
 HOMEPAGE=      http://www.freeradius.org/
 COMMENT=       Free RADIUS server implementation
 
-CONFLICTS+=    radiusd-cistron*
-USE_GNU_TOOLS+=        make
-GNU_CONFIGURE= yes
-USE_BUILDLINK3= YES
-USE_LIBTOOL=   YES
-USE_PKGINSTALL=        YES
-LTCONFIG_OVERRIDE=     ${WRKSRC}/ltconfig
-PTHREAD_OPTS+= native
+.include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS=                --quiet
-CONFIGURE_ARGS+=       --with-logdir=/var/log
+CONFLICTS+=            radiusd-cistron*
+USE_GNU_TOOLS+=                make
+GNU_CONFIGURE=         YES
+USE_BUILDLINK3=        YES
+USE_PKGINSTALL=                YES
+USE_PERL5=             YES
+PTHREAD_OPTS+=         native
+PLIST_SRC=             ${WRKDIR}/.PLIST_SRC
+
+# This package currently breaks using our libtool.  It does not appear to use
+# libtool properly/fully and as a result the daemon does not compile correctly.
+#
+#USE_LIBTOOL=          YES
+#LIBTOOL_OVERRIDE=     libtool
+
+CONFIGURE_ARGS+=       --with-logdir=${VARBASE}/log
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
+CONFIGURE_ARGS+=       --sysconfdir=${PREFIX}/etc
 CONFIGURE_ARGS+=       --disable-ltdl-install
 CONFIGURE_ARGS+=       --with-ltdl-lib=${PREFIX}/lib
 CONFIGURE_ARGS+=       --with-ltdl-include=${PREFIX}/include
-CONFIGURE_ARGS+=       --localstatedir=/var
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=        --without-rlm_ippool
 CONFIGURE_ARGS+=        --without-rlm_smb
+CONFIGURE_ARGS+=       --without-rlm_krb5
+CONFIGURE_ARGS+=       --without-rlm_ldap
+CONFIGURE_ARGS+=       --without-rlm_pam
+CONFIGURE_ARGS+=       --without-rlm_sql_iodbc
+CONFIGURE_ARGS+=       --without-rlm_sql_mysql
+CONFIGURE_ARGS+=       --without-rlm_sql_postgresql
+CONFIGURE_ARGS+=       --without-rlm_sql_oracle
+CONFIGURE_ARGS+=       --without-rlm_sql_unixodbc
+CONFIGURE_ARGS+=       --without-snmp
+
+.include "options.mk"
 
 RCD_SCRIPTS=           radiusd
 
-OWN_DIRS=              /var/run/radiusd
+OWN_DIRS=              ${VARBASE}/run/radiusd
 
 PKG_SYSCONFSUBDIR=     raddb
 EGDIR=                 ${PREFIX}/share/examples/freeradius
-CONF_FILES=            # Contents set in HEADER file
+
+EGFILES=       acct_users attrs certs/demoCA/index.txt.old \
+               certs/demoCA/cacert.pem certs/demoCA/index.txt \
+               certs/demoCA/serial.old certs/demoCA/serial \
+               certs/newcert.pem certs/README certs/dh \
+               certs/cert-clt.der certs/cert-clt.p12 certs/cert-clt.pem \
+               certs/cert-srv.der certs/cert-srv.p12 certs/cert-srv.pem \
+               certs/newreq.pem certs/random certs/root.der certs/root.p12 \
+               certs/root.pem clients clients.conf dictionary.in eap.conf \
+               experimental.conf hints huntgroups ldap.attrmap mssql.conf \
+               naslist naspasswd oraclesql.conf pgsql-voip.conf \
+               postgresql.conf preproxy_users proxy.conf radiusd.conf.in \
+               realms snmp.conf sql.conf users x99.conf x99passwd.sample \
+               radiusd.conf dictionary
+
+.for f in ${EGFILES}
+CONF_FILES+=   ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+.endfor
+.undef f
+
+pre-build:
+       cd ${WRKSRC} && ${LN} -s src/lib lib
+
+post-build:
+       @${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
 
 post-install:
        ${INSTALL_DATA_DIR} ${EGDIR}
-       cd ${WRKSRC}/raddb && for f in [a-z]*; do \
-               ${INSTALL_DATA} $$f ${EGDIR}/$$f; \
-       done
+       ${INSTALL_DATA_DIR} ${EGDIR}/certs
+       ${INSTALL_DATA_DIR} ${EGDIR}/certs/demoCA
 
+.      for f in ${EGFILES}
+               ${INSTALL_DATA} ${WRKSRC}/raddb/${f} ${EGDIR}/${f}
+.      endfor
+.      undef f
+
+       @${MKDIR} ${PKG_SYSCONFDIR}/certs
+       @${MKDIR} ${PKG_SYSCONFDIR}/certs/demoCA
+       cd ${WRKSRC} && ${FIND} . -name .libs | ${XARGS} ${RM} -rf
+
+.include "../../security/openssl/buildlink3.mk"
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/libtool/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r 3a1bdab43661 -r 4472fedfc1c2 net/freeradius/PLIST
--- a/net/freeradius/PLIST      Mon Oct 18 17:03:48 2004 +0000
+++ b/net/freeradius/PLIST      Tue Oct 19 12:51:58 2004 +0000
@@ -1,14 +1,19 @@
-@comment $NetBSD: PLIST,v 1.4 2004/04/23 22:07:56 reed Exp $
+@comment $NetBSD: PLIST,v 1.4.4.1 2004/10/19 12:51:58 agc Exp $
 bin/radclient
+bin/radeapclient
 bin/radlast
 bin/radrelay
 bin/radtest
-bin/raduse
 bin/radwho
 bin/radzap
 bin/rlm_dbm_cat
 bin/rlm_dbm_parser
 bin/smbencrypt
+lib/libeap-${PKGVERSION}.la
+lib/libeap-${PKGVERSION}.so
+lib/libeap.a
+lib/libeap.la
+lib/libeap.so
 lib/libradius-${PKGVERSION}.la
 lib/libradius-${PKGVERSION}.so
 lib/libradius.a
@@ -39,9 +44,16 @@
 lib/rlm_chap.a
 lib/rlm_chap.la
 lib/rlm_chap.so
+lib/rlm_checkval-${PKGVERSION}.la
+lib/rlm_checkval-${PKGVERSION}.so
+lib/rlm_checkval.a
+lib/rlm_checkval.la
+lib/rlm_checkval.so
 lib/rlm_counter-${PKGVERSION}.la
+lib/rlm_counter-${PKGVERSION}.so
 lib/rlm_counter.a
 lib/rlm_counter.la
+lib/rlm_counter.so
 lib/rlm_dbm-${PKGVERSION}.la
 lib/rlm_dbm-${PKGVERSION}.so
 lib/rlm_dbm.a
@@ -52,21 +64,66 @@
 lib/rlm_detail.a
 lib/rlm_detail.la
 lib/rlm_detail.so
+lib/rlm_digest-${PKGVERSION}.la
+lib/rlm_digest-${PKGVERSION}.so
+lib/rlm_digest.a
+lib/rlm_digest.la
+lib/rlm_digest.so
 lib/rlm_eap-${PKGVERSION}.la
 lib/rlm_eap-${PKGVERSION}.so
 lib/rlm_eap.a
 lib/rlm_eap.la
 lib/rlm_eap.so
+lib/rlm_eap_gtc-${PKGVERSION}.la
+lib/rlm_eap_gtc-${PKGVERSION}.so
+lib/rlm_eap_gtc.a
+lib/rlm_eap_gtc.la
+lib/rlm_eap_gtc.so
+lib/rlm_eap_leap-${PKGVERSION}.la
+lib/rlm_eap_leap-${PKGVERSION}.so
+lib/rlm_eap_leap.a
+lib/rlm_eap_leap.la
+lib/rlm_eap_leap.so
 lib/rlm_eap_md5-${PKGVERSION}.la
 lib/rlm_eap_md5-${PKGVERSION}.so
 lib/rlm_eap_md5.a
 lib/rlm_eap_md5.la
 lib/rlm_eap_md5.so
+lib/rlm_eap_mschapv2-${PKGVERSION}.la
+lib/rlm_eap_mschapv2-${PKGVERSION}.so
+lib/rlm_eap_mschapv2.a
+lib/rlm_eap_mschapv2.la
+lib/rlm_eap_mschapv2.so
+lib/rlm_eap_peap-${PKGVERSION}.la
+lib/rlm_eap_peap-${PKGVERSION}.so
+lib/rlm_eap_peap.a
+lib/rlm_eap_peap.la
+lib/rlm_eap_peap.so
+lib/rlm_eap_sim-${PKGVERSION}.la
+lib/rlm_eap_sim-${PKGVERSION}.so
+lib/rlm_eap_sim.a
+lib/rlm_eap_sim.la
+lib/rlm_eap_sim.so
 lib/rlm_eap_tls-${PKGVERSION}.la
 lib/rlm_eap_tls-${PKGVERSION}.so
 lib/rlm_eap_tls.a
 lib/rlm_eap_tls.la
 lib/rlm_eap_tls.so
+lib/rlm_eap_ttls-${PKGVERSION}.la
+lib/rlm_eap_ttls-${PKGVERSION}.so
+lib/rlm_eap_ttls.a
+lib/rlm_eap_ttls.la
+lib/rlm_eap_ttls.so
+lib/rlm_exec-${PKGVERSION}.la
+lib/rlm_exec-${PKGVERSION}.so
+lib/rlm_exec.a
+lib/rlm_exec.la
+lib/rlm_exec.so
+lib/rlm_expr-${PKGVERSION}.la
+lib/rlm_expr-${PKGVERSION}.so
+lib/rlm_expr.a
+lib/rlm_expr.la
+lib/rlm_expr.so
 lib/rlm_fastusers-${PKGVERSION}.la
 lib/rlm_fastusers-${PKGVERSION}.so
 lib/rlm_fastusers.a
@@ -92,6 +149,11 @@
 lib/rlm_pap.a
 lib/rlm_pap.la
 lib/rlm_pap.so
+lib/rlm_passwd-${PKGVERSION}.la
+lib/rlm_passwd-${PKGVERSION}.so
+lib/rlm_passwd.a
+lib/rlm_passwd.la
+lib/rlm_passwd.so
 lib/rlm_preprocess-${PKGVERSION}.la
 lib/rlm_preprocess-${PKGVERSION}.so
 lib/rlm_preprocess.a
@@ -123,9 +185,9 @@
 lib/rlm_x99_token.la
 lib/rlm_x99_token.so
 man/man1/radclient.1
+man/man1/radeapclient.1
 man/man1/radlast.1
 man/man1/radtest.1
-man/man1/raduse.1
 man/man1/radwho.1
 man/man1/radzap.1
 man/man5/acct_users.5
@@ -133,8 +195,22 @@
 man/man5/dictionary.5
 man/man5/naslist.5
 man/man5/radiusd.conf.5
+man/man5/rlm_acct_unique.5
+man/man5/rlm_always.5
+man/man5/rlm_attr_filter.5
+man/man5/rlm_attr_rewrite.5
+man/man5/rlm_chap.5
+man/man5/rlm_counter.5
+man/man5/rlm_detail.5
+man/man5/rlm_expr.5
+man/man5/rlm_files.5



Home | Main Index | Thread Index | Old Index