From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 31 00:20:35 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 492C416A412 for ; Tue, 31 Oct 2006 00:20:35 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF3F843D72 for ; Tue, 31 Oct 2006 00:20:28 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k9V0KSBp062456 for ; Tue, 31 Oct 2006 00:20:28 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k9V0KSqa062428; Tue, 31 Oct 2006 00:20:28 GMT (envelope-from gnats) Resent-Date: Tue, 31 Oct 2006 00:20:28 GMT Resent-Message-Id: <200610310020.k9V0KSqa062428@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, David Wood Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A71516A40F for ; Tue, 31 Oct 2006 00:15:32 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E02B43D58 for ; Tue, 31 Oct 2006 00:15:32 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k9V0FVFt016600 for ; Tue, 31 Oct 2006 00:15:31 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k9V0FVqY016598; Tue, 31 Oct 2006 00:15:31 GMT (envelope-from nobody) Message-Id: <200610310015.k9V0FVqY016598@www.freebsd.org> Date: Tue, 31 Oct 2006 00:15:31 GMT From: David Wood To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: ports/104949: [patch] update net/freeradius to 1.1.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Oct 2006 00:20:35 -0000 >Number: 104949 >Category: ports >Synopsis: [patch] update net/freeradius to 1.1.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Oct 31 00:20:23 GMT 2006 >Closed-Date: >Last-Modified: >Originator: David Wood >Release: FreeBSD 6.1-RELEASE-p10 i386 >Organization: >Environment: FreeBSD titanium.wood2.org.uk 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Fri Oct 6 10:56:46 BST 2006 david@titanium.wood2.org.uk:/usr/obj/usr/src/sys/TITANIUM i386 >Description: Here is FreeRADIUS 1.1.3 for FreeBSD. >From the FreeRADIUS team: This version has been released to fix build issues in 1.1.2. The build tools (autoconf, libtool, libltld) have been upgraded to a recent version, and the server now builds "out of the box" on more platforms. Other fixes include: * More dictionary updates * Oracle support for radsqlrelay * Security and portability fixes to rlm_otp * Experimental module to store IP's in an SQL table. * Miscellaneous bug fixes Because of the new build tools, the port has required some reworking to compensate. As it stands here, the build is very slightly kludged, as I can't get AC_LIBLTDL_INSTALLABLE to behave properly with libltdl being installed on /usr/local/lib on FreeBSD. I did try getting the port's Makefile to add a parameter to AC_LIBLTDL_INSTALLABLE in configure.in, then rebuild configure using autoconf in the hope that that would solve the problem. Though I've verified that that version of my Makefile is doing what I expected it to, the problem remains. Maybe I've got the parameter to AC_LIBLTDL_INSTALLABLE wrong - I tried AC_LIBLTDL_INSTALLABLE(/usr/local/lib) and AC_LIBLTDL_INSTALLABLE(/usr/local/lib/) and neither worked. I will try to work further on this - any ideas are welcome. Even so, with one spurious error, the port works. The new build system has obsoleted the old --with-ltdl-include and --with-ltdl-lib parameters. With the failure to get AC_LIBLTDL_INSTALLABLE to work correctly, I've added "-I${LOCALBASE}/include" to CFLAGS (so that ltdl.h can be found when compiling), kept libltdl:15 in the USE_AUTOTOOLS= line to ensure a shared libltdl is installed and passed --disable-ltdl-install to configure prevent FreeRADIUS from building a libltdl. This works, though configure emits a spurious warning "WARNING: libltdl not installed, but installation disabled". I've added a couple of extra MASTER_SITES - they're the only sites on the (somewhat moribund?) FreeRADIUS mirrors web page that worked for me. Maybe I should take the maintainership, as nobody else seems interested in doing so. This is tested and working in my EAP-TLS wireless LAN environment. >How-To-Repeat: >Fix: NOTE - file removed: files/patch-4.11-fix (none of the code it patches survives into 1.1.3 as rlm_otp has been rewritten) Patch attached with submission follows: diff -ruN /usr/ports/net/freeradius/Makefile /usr/ports_updated/net/freeradius/Makefile --- /usr/ports/net/freeradius/Makefile Thu Oct 5 17:20:13 2006 +++ /usr/ports_updated/net/freeradius/Makefile Mon Oct 30 21:56:14 2006 @@ -6,10 +6,11 @@ # PORTNAME= freeradius -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 CATEGORIES= net MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \ + ftp://ftp.ntua.gr/pub/net/radius/freeradius/ \ + ftp://ftp.uk.freeradius.org/pub/radius/ \ http://freeradius.portal-to-web.de/ MAINTAINER= ports@FreeBSD.org @@ -27,6 +28,7 @@ USE_PERL5= yes USE_OPENSSL= yes MAKE_ARGS+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CFLAGS+= "-I${LOCALBASE}/include" PLIST_SUB= PORTVERSION=${PORTVERSION} @@ -42,9 +44,9 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \ --localstatedir=/var \ + --with-system-libtool \ --disable-ltdl-install \ - --with-ltdl-include=${LOCALBASE}/include \ - --with-ltdl-lib=${LOCALBASE}/lib \ + --with-docdir=${DOCSDIR} \ --with-large-files --without-rlm_sql_unixodbc \ --without-rlm_sql_oracle --without-rlm_sql_iodbc \ --without-rlm_sql_db2 \ @@ -144,12 +146,13 @@ rlm_attr_filter.5 rlm_attr_rewrite.5 rlm_chap.5 rlm_counter.5 \ rlm_detail.5 rlm_expr.5 rlm_files.5 rlm_mschap.5 rlm_pap.5 \ rlm_passwd.5 rlm_realm.5 rlm_sql.5 rlm_sql_log.5 rlm_unix.5 users.5 -MAN8= radiusd.8 radrelay.8 radsqlrelay.8 radwatch.8 rlm_ippool_tool.8 +MAN8= radiusd.8 radrelay.8 radsqlrelay.8 radwatch.8 DICTS= dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \ dictionary.airespace dictionary.alcatel dictionary.alteon \ - dictionary.altiga dictionary.aptis dictionary.aruba dictionary.ascend \ - dictionary.avaya dictionary.bay dictionary.bintec dictionary.bristol \ + dictionary.alvarion dictionary.altiga dictionary.aptis \ + dictionary.aruba dictionary.ascend dictionary.avaya \ + dictionary.bay dictionary.bintec dictionary.bristol \ dictionary.cablelabs dictionary.cabletron dictionary.cisco \ dictionary.cisco.bbsm dictionary.cisco.vpn3000 dictionary.cisco.vpn5000 \ dictionary.colubris dictionary.columbia_university dictionary.compat \ @@ -164,15 +167,16 @@ dictionary.motorola dictionary.navini dictionary.netscreen \ dictionary.nokia dictionary.nomadix dictionary.nortel dictionary.ntua \ dictionary.packeteer dictionary.propel dictionary.quintum \ - dictionary.redback dictionary.redcreek dictionary.rfc2865 \ - dictionary.rfc2866 dictionary.rfc2867 dictionary.rfc2868 \ - dictionary.rfc2869 dictionary.rfc3162 dictionary.rfc3576 \ - dictionary.rfc3580 dictionary.roaringpenguin dictionary.shasta \ - dictionary.shiva dictionary.sonicwall dictionary.springtide \ - dictionary.starent dictionary.t_systems_nova dictionary.telebit \ - dictionary.trapeze dictionary.unix dictionary.usr dictionary.valemount \ - dictionary.versanet dictionary.waverider dictionary.wispr \ - dictionary.xedia dictionary.xylan dictionary.zyxel + dictionary.redback dictionary.redcreek dictionary.riverstone \ + dictionary.rfc2865 dictionary.rfc2866 dictionary.rfc2867 \ + dictionary.rfc2868 dictionary.rfc2869 dictionary.rfc3162 \ + dictionary.rfc3576 dictionary.rfc3580 dictionary.roaringpenguin \ + dictionary.shasta dictionary.shiva dictionary.sonicwall \ + dictionary.springtide dictionary.starent dictionary.t_systems_nova \ + dictionary.telebit dictionary.trapeze dictionary.tropos \ + dictionary.unix dictionary.usr dictionary.valemount \ + dictionary.versanet dictionary.walabi dictionary.waverider \ + dictionary.wispr dictionary.xedia dictionary.xylan dictionary.zyxel post-patch: @${RM} ${WRKSRC}/doc/Makefile.orig diff -ruN /usr/ports/net/freeradius/distinfo /usr/ports_updated/net/freeradius/distinfo --- /usr/ports/net/freeradius/distinfo Mon May 29 21:42:04 2006 +++ /usr/ports_updated/net/freeradius/distinfo Fri Oct 27 10:23:50 2006 @@ -1,3 +1,3 @@ -SHA256 (freeradius-1.1.2.tar.gz) = 5bc1b7fcb2d37fcce402e7baf9e8508b6fb62b94afead3b6da4718cd9a5762bf -MD5 (freeradius-1.1.2.tar.gz) = 6649ac5f9666b4a8cd55a837068ca61e -SIZE (freeradius-1.1.2.tar.gz) = 2389227 +MD5 (freeradius-1.1.3.tar.gz) = d8724cdc15bc23c330a7d3a2080829bd +SHA256 (freeradius-1.1.3.tar.gz) = f615f67fb807494892015e671593801fe3ac30c04740cd1dc8d2f18fc218da35 +SIZE (freeradius-1.1.3.tar.gz) = 3068204 diff -ruN /usr/ports/net/freeradius/files/patch-4.11-fix /usr/ports_updated/net/freeradius/files/patch-4.11-fix --- /usr/ports/net/freeradius/files/patch-4.11-fix Sat Feb 4 19:52:39 2006 +++ /usr/ports_updated/net/freeradius/files/patch-4.11-fix Thu Jan 1 01:00:00 1970 @@ -1,48 +0,0 @@ ---- src/modules/rlm_otp/cardops/cryptocard.c.ORIG Thu Dec 8 02:30:54 2005 -+++ src/modules/rlm_otp/cardops/cryptocard.c Sat Feb 4 18:30:55 2006 -@@ -20,6 +20,10 @@ - */ - - #include -+#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) -+#define PRIx32 "x" /* uint32_t */ -+#define SCNx32 "x" /* uint32_t */ -+#endif - #include - #include - ---- src/modules/rlm_otp/otp_state.c.ORIG Sat Feb 4 18:22:14 2006 -+++ src/modules/rlm_otp/otp_state.c Sat Feb 4 18:33:48 2006 -@@ -28,6 +28,10 @@ - - #include - #include -+#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) -+#define PRIx32 "x" /* uint32_t */ -+#define SCNx32 "x" /* uint32_t */ -+#endif - #include - #include - #include ---- src/modules/rlm_otp/otp_cardops.c.ORIG Thu Dec 8 02:30:50 2005 -+++ src/modules/rlm_otp/otp_cardops.c Sat Feb 4 18:37:22 2006 -@@ -30,6 +30,9 @@ - #endif - #include - #include -+#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) -+#define INT32_MAX 0x7fffffff -+#endif - #include - #include - #include ---- src/modules/rlm_otp/Makefile.in.ORIG Thu Dec 8 02:30:48 2005 -+++ src/modules/rlm_otp/Makefile.in Sat Feb 4 18:44:06 2006 -@@ -34,7 +34,7 @@ - include ../rules.mak - - # Not part of RLM_CFLAGS to avoid propagation to subdirs --CFLAGS += -Wno-unused-label -Wno-cast-qual -+CFLAGS += -Wno-cast-qual - - $(STATIC_OBJS): $(HEADERS) $(CARDOPS_LTLIBS) diff -ruN /usr/ports/net/freeradius/files/patch-doc::Makefile /usr/ports_updated/net/freeradius/files/patch-doc::Makefile --- /usr/ports/net/freeradius/files/patch-doc::Makefile Tue Mar 28 21:30:51 2006 +++ /usr/ports_updated/net/freeradius/files/patch-doc::Makefile Fri Oct 27 12:30:12 2006 @@ -1,18 +1,18 @@ ---- doc/Makefile.orig Mon Mar 27 15:12:40 2006 -+++ doc/Makefile Mon Mar 27 15:13:06 2006 +--- doc/Makefile.orig Sat Jul 15 18:16:51 2006 ++++ doc/Makefile Fri Oct 27 11:22:45 2006 @@ -17,6 +17,7 @@ @rm -f *~ install: -+ifndef NOPORTDOCS - $(INSTALL) -d -m 755 $(R)$(datadir)/doc - $(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius ++#ifndef NOPORTDOCS + $(INSTALL) -d -m 755 $(R)$(docdir) for file in *[!~]; do \ -@@ -25,6 +26,7 @@ + if [ -f $$file -a $$file != Makefile ]; then \ +@@ -24,6 +25,7 @@ fi; \ done @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common -+endif ++#endif common: $(SUBDIRS) diff -ruN /usr/ports/net/freeradius/files/patch-src-main-Makefile.in /usr/ports_updated/net/freeradius/files/patch-src-main-Makefile.in --- /usr/ports/net/freeradius/files/patch-src-main-Makefile.in Tue Mar 28 21:30:51 2006 +++ /usr/ports_updated/net/freeradius/files/patch-src-main-Makefile.in Mon Oct 30 23:37:06 2006 @@ -1,5 +1,5 @@ ---- src/main/Makefile.in.orig Mon Mar 27 15:22:33 2006 -+++ src/main/Makefile.in Mon Mar 27 15:27:58 2006 +--- src/main/Makefile.in.orig Mon Aug 21 13:47:46 2006 ++++ src/main/Makefile.in Fri Oct 27 12:18:50 2006 @@ -19,6 +19,7 @@ CFLAGS += -DHOSTINFO=\"${HOSTINFO}\" CFLAGS += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\" @@ -30,9 +30,9 @@ radrelay.lo: radrelay.c $(INCLUDES) $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radrelay.c - radrelay: radrelay.lo mainconfig.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo ../lib/libradius.la -- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radrelay radrelay.lo mainconfig.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo $(LIBS) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS_MAIN) $(LINK_MODE) -o radrelay radrelay.lo mainconfig.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo $(LIBS) + radrelay: radrelay.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo ../lib/libradius.la +- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radrelay radrelay.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo $(LIBS) ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS_MAIN) $(LINK_MODE) -o radrelay radrelay.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo $(LIBS) radwho.lo: radwho.c $(INCLUDES) $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radwho.c diff -ruN /usr/ports/net/freeradius/pkg-plist /usr/ports_updated/net/freeradius/pkg-plist --- /usr/ports/net/freeradius/pkg-plist Mon Jun 12 15:47:16 2006 +++ /usr/ports_updated/net/freeradius/pkg-plist Mon Oct 30 20:40:34 2006 @@ -387,13 +387,13 @@ %%PORTDOCS%%%%DOCSDIR%%/rlm_fastusers %%PORTDOCS%%%%DOCSDIR%%/rlm_krb5 %%PORTDOCS%%%%DOCSDIR%%/rlm_ldap -%%PORTDOCS%%%%DOCSDIR%%/rlm_otp %%PORTDOCS%%%%DOCSDIR%%/rlm_pam %%PORTDOCS%%%%DOCSDIR%%/rlm_passwd %%PORTDOCS%%%%DOCSDIR%%/rlm_python %%PORTDOCS%%%%DOCSDIR%%/rlm_sim_triplets %%PORTDOCS%%%%DOCSDIR%%/rlm_sql %%PORTDOCS%%%%DOCSDIR%%/rlm_sqlcounter +%%PORTDOCS%%%%DOCSDIR%%/rlm_sqlippool %%PORTDOCS%%%%DOCSDIR%%/supervise-radiusd.txt %%PORTDOCS%%%%DOCSDIR%%/tuning_guide %%PORTDOCS%%%%DOCSDIR%%/variables.txt @@ -406,6 +406,7 @@ %%DATADIR%%/dictionary.alcatel %%DATADIR%%/dictionary.alteon %%DATADIR%%/dictionary.altiga +%%DATADIR%%/dictionary.alvarion %%DATADIR%%/dictionary.aptis %%DATADIR%%/dictionary.aruba %%DATADIR%%/dictionary.ascend @@ -468,6 +469,7 @@ %%DATADIR%%/dictionary.rfc3162 %%DATADIR%%/dictionary.rfc3576 %%DATADIR%%/dictionary.rfc3580 +%%DATADIR%%/dictionary.riverstone %%DATADIR%%/dictionary.roaringpenguin %%DATADIR%%/dictionary.shasta %%DATADIR%%/dictionary.shiva @@ -477,10 +479,12 @@ %%DATADIR%%/dictionary.t_systems_nova %%DATADIR%%/dictionary.telebit %%DATADIR%%/dictionary.trapeze +%%DATADIR%%/dictionary.tropos %%DATADIR%%/dictionary.unix %%DATADIR%%/dictionary.usr %%DATADIR%%/dictionary.valemount %%DATADIR%%/dictionary.versanet +%%DATADIR%%/dictionary.walabi %%DATADIR%%/dictionary.waverider %%DATADIR%%/dictionary.wispr %%DATADIR%%/dictionary.xedia >Release-Note: >Audit-Trail: >Unformatted: