From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 29 13:30:33 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 48F9316A619 for ; Sun, 29 Oct 2006 13:30:33 +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 0480143D73 for ; Sun, 29 Oct 2006 13:30:29 +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 k9TDUT1p068188 for ; Sun, 29 Oct 2006 13:30:29 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k9TDUTV2068186; Sun, 29 Oct 2006 13:30:29 GMT (envelope-from gnats) Resent-Date: Sun, 29 Oct 2006 13:30:29 GMT Resent-Message-Id: <200610291330.k9TDUTV2068186@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, "Babak Farrokhi" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C3FA16A403 for ; Sun, 29 Oct 2006 13:20:17 +0000 (UTC) (envelope-from babak@farrokhi.net) Received: from plesk.datak-telecom.net (plesk.datak-telecom.net [81.91.129.96]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4816943D5A for ; Sun, 29 Oct 2006 13:20:08 +0000 (GMT) (envelope-from babak@farrokhi.net) Received: (qmail 47717 invoked from network); 29 Oct 2006 16:50:02 +0330 Received: from unknown (HELO starfish.farrokhi.net) (81.91.130.217) by 81.91.129.125 with (DHE-RSA-AES256-SHA encrypted) SMTP; 29 Oct 2006 16:50:02 +0330 Message-Id: <1162128006.52459@starfish.farrokhi.net> Date: Sun, 29 Oct 2006 16:50:06 +0330 From: "Babak Farrokhi" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/104905: [update port] port net/openradius - update to 0.9.12b 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: Sun, 29 Oct 2006 13:30:33 -0000 >Number: 104905 >Category: ports >Synopsis: [update port] port net/openradius - update to 0.9.12b >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Oct 29 13:30:28 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Babak Farrokhi >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: >Environment: System: FreeBSD 6.2-PRERELEASE #0: Fri Sep 22 14:10:00 IRST 2006 root@starfish.datak.net:/usr/obj/usr/src/sys/STARFISH >Description: - update to 0.9.12b - adopt >How-To-Repeat: >Fix: --- openradius.patch begins here --- diff -ruN openradius.orig/Makefile openradius/Makefile --- openradius.orig/Makefile Sun Oct 29 15:43:52 2006 +++ openradius/Makefile Sun Oct 29 16:46:55 2006 @@ -6,13 +6,12 @@ # PORTNAME= openradius -PORTVERSION= 0.9.10 -PORTREVISION= 2 +PORTVERSION= 0.9.12b CATEGORIES= net MASTER_SITES= http://www.xs4all.nl/~evbergen/openradius/download/ \ http://www.mirrors.wiretapped.net/security/authentication/radius/openradius/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= babak@farrokhi.net COMMENT= A RADIUS server with some actual documentation LOGFILE?= /var/log/openradius.log @@ -46,6 +45,7 @@ ${INSTALL_MAN} ${WRKSRC}/doc/async-iface-notes ${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/language.html ${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/module-interface.html ${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/note-behaviourfile ${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/note-struct-ownership ${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/using-openradius.html ${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-ldap ${EXAMPLESDIR} @@ -54,14 +54,12 @@ ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-postgres ${EXAMPLESDIR} ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-unixpass ${EXAMPLESDIR} ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-usersfile ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/examples/behaviour.sample-usersfile-longpass ${EXAMPLESDIR} ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-ldap ${EXAMPLESDIR} ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-ldap-authbind ${EXAMPLESDIR} ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-mysql ${EXAMPLESDIR} ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-postgres ${EXAMPLESDIR} ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-unixpass ${EXAMPLESDIR} ${INSTALL_MAN} ${WRKSRC}/examples/configuration.sample-usersfile ${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/examples/redhat-sysv-init-script ${EXAMPLESDIR} ${INSTALL_MAN} ${WRKSRC}/examples/accounts/README ${EXAMPLESDIR}/accounts ${INSTALL_MAN} ${WRKSRC}/examples/accounts/accounts.mysql ${EXAMPLESDIR}/accounts ${INSTALL_MAN} ${WRKSRC}/examples/accounts/behaviour ${EXAMPLESDIR}/accounts @@ -69,7 +67,7 @@ .endif # Configuration, copy over to sample files ${MKDIR} ${PREFIX}/etc/${PORTNAME} -.for FILE in dictionary behaviour configuration +.for FILE in dictionary ${INSTALL_DATA} ${WRKSRC}/etc/${FILE} \ ${PREFIX}/etc/${PORTNAME}/${FILE}.sample .endfor @@ -79,6 +77,19 @@ ${INSTALL} -m 0600 ${WRKSRC}/etc/legacy/${FILE} \ ${PREFIX}/etc/${PORTNAME}/legacy/${FILE}.sample .endfor + + ${MKDIR} ${PREFIX}/etc/${PORTNAME}/modules +.for FILE in radldap.attrmap + ${INSTALL} -m 0600 ${WRKSRC}/etc/modules/${FILE} \ + ${PREFIX}/etc/${PORTNAME}/modules/${FILE}.sample +.endfor + + ${MKDIR} ${PREFIX}/etc/${PORTNAME}/subdicts +.for FILE in dict.* + ${INSTALL} -m 0600 ${WRKSRC}/etc/subdicts/${FILE} \ + ${PREFIX}/etc/${PORTNAME}/subdicts/ +.endfor + @${ECHO_CMD} @${CAT} ${PKGMESSAGE} @${ECHO_CMD} diff -ruN openradius.orig/distinfo openradius/distinfo --- openradius.orig/distinfo Sun Oct 29 15:43:52 2006 +++ openradius/distinfo Sun Oct 29 15:44:23 2006 @@ -1,3 +1,3 @@ -MD5 (openradius-0.9.10.tar.gz) = 73ef55461c7fff738045c4d964a8c669 -SHA256 (openradius-0.9.10.tar.gz) = 6fe0c984bddfeebc5b23a0ce3d80e1950c1bbddfee5cd3b08064642b93a25596 -SIZE (openradius-0.9.10.tar.gz) = 231504 +MD5 (openradius-0.9.12b.tar.gz) = 9cbe284df0615d6c59861b902829f1c0 +SHA256 (openradius-0.9.12b.tar.gz) = 89d13ca11ec7ecbc7f13a213e7b0c1472c5708b5c292e5f34829308a60ccd3f4 +SIZE (openradius-0.9.12b.tar.gz) = 253801 diff -ruN openradius.orig/files/patch-ETCRules.mk openradius/files/patch-ETCRules.mk --- openradius.orig/files/patch-ETCRules.mk Sun Oct 29 15:43:52 2006 +++ openradius/files/patch-ETCRules.mk Sun Oct 29 15:46:53 2006 @@ -1,13 +1,10 @@ ---- etc/Rules.mk.orig Thu Mar 31 10:50:37 2005 -+++ etc/Rules.mk Thu Mar 31 10:50:29 2005 -@@ -11,9 +11,7 @@ - +--- etc/Rules.mk.orig Fri Mar 17 13:39:14 2006 ++++ etc/Rules.mk Sun Oct 29 15:46:17 2006 +@@ -13,7 +13,6 @@ CMD_INSTETC := $(CMD_INSTETC) \ - $(INST) $(d)/subdicts/* -m 644 -d $(DIR_ETC)/subdicts \ -- $(d)/modules/* -m 644 -d $(DIR_ETC)/modules \ -- $(d)/legacy/* -m 640 -d $(DIR_ETC)/legacy ; -- -+ $(d)/modules/* -m 644 -d $(DIR_ETC)/modules ; - - # Standard things - + $(INST) $(d)/dictionary -m 644 -d $(INST_PREFIX)$(DIR_ETC) \ + $(d)/subdicts/* -m 644 -d $(INST_PREFIX)$(DIR_ETC)/subdicts \ +- $(d)/legacy/* -m 640 -d $(INST_PREFIX)$(DIR_ETC)/legacy \ + $(d)/modules/radldap.attrmap \ + -m 644 -d $(INST_PREFIX)$(DIR_ETC)/modules ; \ + cp examples/configuration.sample-usersfile $(INST_PREFIX)$(DIR_ETC)/configuration ; \ diff -ruN openradius.orig/files/patch-Rules.mk openradius/files/patch-Rules.mk --- openradius.orig/files/patch-Rules.mk Sun Oct 29 15:43:52 2006 +++ openradius/files/patch-Rules.mk Sun Oct 29 15:49:57 2006 @@ -1,15 +1,22 @@ ---- Rules.mk.orig Thu Mar 31 10:55:15 2005 -+++ Rules.mk Thu Mar 31 10:55:43 2005 -@@ -69,12 +69,7 @@ - $(CMD_INSTBIN) - $(INST) $(TGT_SBIN) -m 750 -d $(DIR_SBIN) +--- Rules.mk.orig Thu Mar 23 17:19:04 2006 ++++ Rules.mk Sun Oct 29 15:49:17 2006 +@@ -74,19 +74,6 @@ $(CMD_INSTSBIN) --ifeq ($(wildcard $(DIR_ETC)/*),) -- $(INST) $(TGT_ETC) -m 644 -d $(DIR_ETC) - $(CMD_INSTETC) + $(INST) $(TGT_LIB) -m 755 -d $(INST_PREFIX)$(DIR_LIB) + $(CMD_INSTLIB) +-ifeq ($(wildcard $(INST_PREFIX)$(DIR_ETC)/*),) +- $(INST) $(TGT_ETC) -m 644 -d $(INST_PREFIX)$(DIR_ETC) +- $(CMD_INSTETC) -else -- @echo Configuration directory $(DIR_ETC) already present -- skipping +- @echo +- @echo Configuration directory $(DIR_ETC) already present -- skipping. +- @echo +- @echo When upgrading, is recommended to rename your existing configuration +- @echo directory $(DIR_ETC) to eg. $(DIR_ETC).orig, +- @echo to redo the installation, and to copy only the configuration- and behaviour +- @echo files and the files in the legacy and modules subdirectories that have +- @echo local changes back from the .orig directory. -endif - $(INST) $(TGT_LIB) -m 750 -d $(DIR_LIB) - $(CMD_INSTLIB) + @echo + @echo If no error messages appeared, OpenRADIUS has been installed successfully. @echo diff -ruN openradius.orig/files/patch-aa openradius/files/patch-aa --- openradius.orig/files/patch-aa Sun Oct 29 15:43:52 2006 +++ openradius/files/patch-aa Thu Jan 1 03:30:00 1970 @@ -1,22 +0,0 @@ ---- language/Rules.mk.orig Thu Jan 9 11:18:53 2003 -+++ language/Rules.mk Thu Apr 7 14:06:31 2005 -@@ -31,7 +31,7 @@ - $(COMP) - - $(d)/language.a: $(LIBOBJS_$(d)) -- $(ARCH) -+ $(AR) - - $(d)/langtest: $(TSTOBJS_$(d)) common/common.a - $(LINK) ---- common/Rules.mk.orig Sun Feb 23 14:32:14 2003 -+++ common/Rules.mk Thu Apr 7 14:05:54 2005 -@@ -29,7 +29,7 @@ - $(OBJS_$(d)): $(d)/platform.h - - $(d)/common.a: $(OBJS_$(d)) -- $(ARCH) -+ $(AR) - - $(d)/platform.h: $(d)/Rules.mk - $(DEFHDR) $@ $(S_CF_U_INT32_T) $(S_CF_VSNPRINTF) $(S_CF_SYSLOG) diff -ruN openradius.orig/files/patch-common-Rules.mk openradius/files/patch-common-Rules.mk --- openradius.orig/files/patch-common-Rules.mk Thu Jan 1 03:30:00 1970 +++ openradius/files/patch-common-Rules.mk Sun Oct 29 15:54:50 2006 @@ -0,0 +1,11 @@ +--- common/Rules.mk.orig Sun Oct 29 15:53:42 2006 ++++ common/Rules.mk Sun Oct 29 15:53:45 2006 +@@ -29,7 +29,7 @@ + $(OBJS_$(d)): $(d)/platform.h + + $(d)/common.a: $(OBJS_$(d)) +- $(ARCHIVE) ++ $(AR) + + $(d)/platform.h: $(d)/Rules.mk + $(DEFHDR) $@ $(S_CF_U_INT32_T) $(S_CF_VSNPRINTF) \ diff -ruN openradius.orig/files/patch-language-Rules.mk openradius/files/patch-language-Rules.mk --- openradius.orig/files/patch-language-Rules.mk Thu Jan 1 03:30:00 1970 +++ openradius/files/patch-language-Rules.mk Sun Oct 29 15:55:31 2006 @@ -0,0 +1,11 @@ +--- language/Rules.mk.orig Sun Oct 29 15:55:04 2006 ++++ language/Rules.mk Sun Oct 29 15:55:08 2006 +@@ -31,7 +31,7 @@ + $(COMP) + + $(d)/language.a: $(LIBOBJS_$(d)) +- $(ARCHIVE) ++ $(AR) + + $(d)/langtest: LL_TGT := $(S_LL_CRYPT) + $(d)/langtest: $(TSTOBJS_$(d)) common/common.a diff -ruN openradius.orig/files/patch-ringbuf openradius/files/patch-ringbuf --- openradius.orig/files/patch-ringbuf Sun Oct 29 15:43:52 2006 +++ openradius/files/patch-ringbuf Thu Jan 1 03:30:00 1970 @@ -1,62 +0,0 @@ ---- common/ringbuf.c.orig Mon Feb 14 16:10:51 2005 -+++ common/ringbuf.c Tue Aug 30 13:55:42 2005 -@@ -355,7 +355,7 @@ - ssize_t ring_count(RING *r, RINGCNTFUNC func, ...) - { - va_list ap; -- ssize_t len, ret; -+ ssize_t len, ret = 0; - - len = ring_maxget(r); - -@@ -363,37 +363,41 @@ - - /* There is data available */ - -- va_start(ap, func); -- - if (r->r + len <= r->size) { - - /* Message ends before end of buffer */ - - /* peek at single part, return whatever the - closure returns. */ -- return func(r->buf + r->r, len, 0, ap); -+ va_start(ap, func); -+ ret = func(r->buf + r->r, len, 0, ap); -+ va_end(ap); - } - else { - - /* Message doesn't end before end of buffer */ - - /* peek at first part, till end of buffer */ -+ va_start(ap, func); - ret = func(r->buf + r->r, r->size - r->r, 0, ap); -+ va_end(ap); - - if (ret < r->size - r->r) { - /* Satisfied by first part; return whatever - the closure gave us. */ -- return ret; - } -- -- /* peek at rest, from start of buffer */ -- return ret + func(r->buf, len - (r->size - r->r), -- ret, ap); -+ else { -+ /* peek at rest, from start of buffer */ -+ va_start(ap, func); -+ ret += func(r->buf, len - (r->size - r->r), -+ ret, ap); -+ va_end(ap); -+ } - } - } - - /* No data available, return 0. */ -- return 0; -+ return ret; - } - - diff -ruN openradius.orig/pkg-plist openradius/pkg-plist --- openradius.orig/pkg-plist Sun Oct 29 15:43:52 2006 +++ openradius/pkg-plist Sun Oct 29 16:33:19 2006 @@ -1,24 +1,24 @@ -etc/openradius/behaviour.sample -etc/openradius/configuration.sample +bin/ascenddatafilter +bin/genmd5hexpasswd +bin/radaccttest +bin/radclient +bin/radtest etc/openradius/dictionary.sample - etc/openradius/legacy/clients.sample etc/openradius/legacy/nases.sample -etc/openradius/legacy/users.sample etc/openradius/legacy/realms.sample -@dirrm etc/openradius/legacy - -etc/openradius/modules/radldap.attrmap -@dirrm etc/openradius/modules - +etc/openradius/legacy/users.sample +etc/openradius/modules/radldap.attrmap.sample etc/openradius/subdicts/dict.ascend etc/openradius/subdicts/dict.cisco etc/openradius/subdicts/dict.erx etc/openradius/subdicts/dict.garderos etc/openradius/subdicts/dict.internal +etc/openradius/subdicts/dict.memory etc/openradius/subdicts/dict.microsoft etc/openradius/subdicts/dict.nomadix etc/openradius/subdicts/dict.rfc2869 +etc/openradius/subdicts/dict.rfc3580 etc/openradius/subdicts/dict.stdacct etc/openradius/subdicts/dict.stdauth etc/openradius/subdicts/dict.str-ldap @@ -27,52 +27,40 @@ etc/openradius/subdicts/dict.usr etc/openradius/subdicts/dict.vendors etc/openradius/subdicts/dict.wispr -@dirrm etc/openradius/subdicts - -@dirrm etc/openradius - lib/openradius/ascfile lib/openradius/delay lib/openradius/radclient -%%LDAP%%lib/openradius/radldap lib/openradius/radlogger lib/openradius/radsql lib/openradius/unixpasswd -@dirrm lib/openradius - -bin/ascenddatafilter -bin/genmd5hexpasswd -bin/radaccttest -bin/radclient -bin/radtest - sbin/radiusd - %%PORTDOCS%%%%DOCSDIR%%/async-iface-notes %%PORTDOCS%%%%DOCSDIR%%/language.html %%PORTDOCS%%%%DOCSDIR%%/module-interface.html +%%PORTDOCS%%%%DOCSDIR%%/note-behaviourfile %%PORTDOCS%%%%DOCSDIR%%/note-struct-ownership %%PORTDOCS%%%%DOCSDIR%%/using-openradius.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% - %%PORTDOCS%%%%EXAMPLESDIR%%/accounts/README %%PORTDOCS%%%%EXAMPLESDIR%%/accounts/accounts.mysql %%PORTDOCS%%%%EXAMPLESDIR%%/accounts/behaviour %%PORTDOCS%%%%EXAMPLESDIR%%/accounts/configuration -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/accounts - %%PORTDOCS%%%%EXAMPLESDIR%%/behaviour.sample-ldap %%PORTDOCS%%%%EXAMPLESDIR%%/behaviour.sample-ldap-authbind %%PORTDOCS%%%%EXAMPLESDIR%%/behaviour.sample-mysql %%PORTDOCS%%%%EXAMPLESDIR%%/behaviour.sample-postgres %%PORTDOCS%%%%EXAMPLESDIR%%/behaviour.sample-unixpass %%PORTDOCS%%%%EXAMPLESDIR%%/behaviour.sample-usersfile -%%PORTDOCS%%%%EXAMPLESDIR%%/behaviour.sample-usersfile-longpass %%PORTDOCS%%%%EXAMPLESDIR%%/configuration.sample-ldap %%PORTDOCS%%%%EXAMPLESDIR%%/configuration.sample-ldap-authbind %%PORTDOCS%%%%EXAMPLESDIR%%/configuration.sample-mysql %%PORTDOCS%%%%EXAMPLESDIR%%/configuration.sample-postgres %%PORTDOCS%%%%EXAMPLESDIR%%/configuration.sample-unixpass %%PORTDOCS%%%%EXAMPLESDIR%%/configuration.sample-usersfile -%%PORTDOCS%%%%EXAMPLESDIR%%/redhat-sysv-init-script +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/accounts %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm lib/openradius +@dirrmtry etc/openradius/subdicts +@dirrmtry etc/openradius/modules +@dirrmtry etc/openradius/legacy +@dirrmtry etc/openradius --- openradius.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: