Date: Sat, 29 May 2010 10:09:56 -0400 From: Ryan Steinmetz <rpsfa@rit.edu> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/147188: [maintainer update] Update net/freeradis2 to 2.1.9 Message-ID: <20100529140956.GA14516@fast.rit.edu> In-Reply-To: <201005291400.o4TE0Cmr026643@freefall.freebsd.org> References: <201005291355.o4TDtOc3017639@www.freebsd.org> <201005291400.o4TE0Cmr026643@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--X1bOJ3K7DJ5YkBrT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Updated diff. Original diff in PR incorrectly contains Makefile~ --X1bOJ3K7DJ5YkBrT Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="fr2.1.9-new.diff" diff -urN /usr/ports/net/freeradius2/Makefile freeradius2/Makefile --- /usr/ports/net/freeradius2/Makefile 2010-03-27 15:33:51.000000000 -0400 +++ freeradius2/Makefile 2010-05-29 09:50:18.000000000 -0400 @@ -8,8 +8,7 @@ # PORTNAME= freeradius -DISTVERSION= 2.1.8 -PORTREVISION= 1 +DISTVERSION= 2.1.9 CATEGORIES= net MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \ ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \ @@ -22,9 +21,10 @@ MAINTAINER= rpsfa@rit.edu COMMENT= A free RADIUS server implementation -RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm +USE_GMAKE= yes + USE_BZIP2= yes LOGDIR?= /var/log @@ -68,6 +68,13 @@ SUB_LIST+= RUN_AS_USER="no" .endif +# User and group to use if USER option is chosen +RADIUS_USER= freeradius +RADIUS_GROUP= freeradius + +USERS= ${RADIUS_USER} +GROUPS= ${RADIUS_GROUP} + .if defined(WITH_HEIMDAL) && !defined(WITH_KERBEROS) WITH_KERBEROS= yes .endif @@ -207,7 +214,7 @@ # Oracle support is experimental under FreeBSD .ifdef(WITH_OCI8) -EXTRA_PATCHES+= files/extra-patch-exec.c +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-exec.c CONFIGURE_ENV= ORACLE_HOME="${ORACLE_HOME}" ORACLE_HOME?= ${LOCALBASE}/oracle8-client BUILD_DEPENDS+= ${ORACLE_HOME}/lib/libclntst8.a:${PORTSDIR}/databases/oracle8-client @@ -237,10 +244,6 @@ BROKEN= Does not build on sparc64-6 .endif -# User and group to use if USER option is chosen -USER= freeradius -GROUP= freeradius - FREERADIUS_LIBDIR= lib/freeradius-${PORTVERSION} PLIST_SUB+= LIBDIR="${FREERADIUS_LIBDIR}" USE_LDCONFIG= ${PREFIX}/${FREERADIUS_LIBDIR} @@ -280,31 +283,8 @@ CONFIGURE_ARGS+= --with-pic .endif -# Credentials for WITH_USER are RADIUS_USER, RADIUS_UID, RADIUS_GECOS, -# RADIUS_HOME, RADIUS_SHELL, RADIUS_GROUP and RADIUS_GID. - -# Parse ${PORTSDIR}/UIDs and GIDs for the defaults -USERCREDS!= ${GREP} -E '^${USER}:' ${PORTSDIR}/UIDs | \ - ${SED} -Ee 's/^([^:]*):([^:]*):([^:]*):([^:]*)::0:0:([^:]*):([^:]*):([^:]*)$$/USER="\1" UID="\3" GECOS="\5" HOME="\6" SHELL="\7"/' -GROUPCREDS!= ${GREP} -E '^${GROUP}:' ${PORTSDIR}/GIDs | \ - ${SED} -Ee 's/^([^:]*):([^:]*):([^:]*):$$/GROUP="\1" GID="\3"/' - -# Apply the defaults where necessary -RADIUS_USER?= ${USERCREDS:MUSER*:C/^[^=]*=\"([^\"]*)\"$/\1/} -RADIUS_UID?= ${USERCREDS:MUID*:C/^[^=]*=\"([^\"]*)\"$/\1/} -RADIUS_GECOS?= ${USERCREDS:MGECOS*:C/^[^=]*=\"([^\"]*)\"$/\1/} -RADIUS_HOME?= ${USERCREDS:MHOME*:C/^[^=]*=\"([^\"]*)\"$/\1/} -RADIUS_SHELL?= ${USERCREDS:MSHELL*:C/^[^=]*=\"([^\"]*)\"$/\1/} -RADIUS_GROUP?= ${GROUPCREDS:MGROUP*:C/^[^=]*=\"([^\"]*)\"$/\1/} -RADIUS_GID?= ${GROUPCREDS:MGID*:C/^[^=]*=\"([^\"]*)\"$/\1/} - -SUB_LIST+= USER="${RADIUS_USER}" \ - UID="${RADIUS_UID}" \ - GECOS="${RADIUS_GECOS}" \ - HOME="${RADIUS_HOME}" \ - SHELL="${RADIUS_SHELL}" \ - GROUP="${RADIUS_GROUP}" \ - GID="${RADIUS_GID}" \ +SUB_LIST+= RADIUS_USER="${RADIUS_USER}" \ + RADIUS_GROUP="${RADIUS_GROUP}" \ RADDB_WORK="${WRKSRC}/raddb" \ RADDB="${PREFIX}/etc/raddb" \ LOGDIR="${LOGDIR}" \ diff -urN /usr/ports/net/freeradius2/distinfo freeradius2/distinfo --- /usr/ports/net/freeradius2/distinfo 2010-02-02 09:40:27.000000000 -0500 +++ freeradius2/distinfo 2010-05-24 21:48:00.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (freeradius-server-2.1.8.tar.bz2) = d326525490bfba273471d77560471fcb -SHA256 (freeradius-server-2.1.8.tar.bz2) = 9329607d8082f8d7197b7ebad23a83c5239fb129c68b9cab43a3752300708d22 -SIZE (freeradius-server-2.1.8.tar.bz2) = 2544696 +MD5 (freeradius-server-2.1.9.tar.bz2) = 5e16a0869acdf448b191c7e30f6507d8 +SHA256 (freeradius-server-2.1.9.tar.bz2) = b0b7c5fe334e826e2f643569485ce203520ecb1d058d42b8df2a94a73acb05b1 +SIZE (freeradius-server-2.1.9.tar.bz2) = 2524497 diff -urN /usr/ports/net/freeradius2/files/pkg-deinstall.in freeradius2/files/pkg-deinstall.in --- /usr/ports/net/freeradius2/files/pkg-deinstall.in 2008-04-02 09:07:01.000000000 -0400 +++ freeradius2/files/pkg-deinstall.in 2010-05-27 17:54:37.000000000 -0400 @@ -9,15 +9,15 @@ If you are not upgrading and don't intend to use FreeRADIUS any more then you may wish to delete -the %%GROUP%% group, which can be done with the +the %%RADIUS_GROUP%% group, which can be done with the following command: - # pw groupdel %%GROUP%% + # pw groupdel %%RADIUS_GROUP%% -You may also wish to delete the %%USER%% user, +You may also wish to delete the %%RADIUS_USER%% user, which can be done with the following command: - # pw userdel %%USER%% + # pw userdel %%RADIUS_USER%% EOMSG ;; esac diff -urN /usr/ports/net/freeradius2/files/pkg-install.in freeradius2/files/pkg-install.in --- /usr/ports/net/freeradius2/files/pkg-install.in 2009-09-18 07:18:09.000000000 -0400 +++ freeradius2/files/pkg-install.in 2010-05-27 17:54:49.000000000 -0400 @@ -3,14 +3,8 @@ PATH=/usr/sbin:/usr/bin:/bin ; export PATH -radius_user="%%USER%%" -radius_uid="%%UID%%" -radius_gecos="%%GECOS%%" -radius_home="%%HOME%%" -radius_shell="%%SHELL%%" - -radius_group="%%GROUP%%" -radius_gid="%%GID%%" +radius_user="%%RADIUS_USER%%" +radius_group="%%RADIUS_GROUP%%" radius_raddb_work="%%RADDB_WORK%%" radius_raddb="%%RADDB%%" @@ -20,87 +14,10 @@ radius_run_as_user="%%RUN_AS_USER%%" -create_group() { - local user uid group gid gecos home shell - - user=$1 - uid=$2 - group=$3 - gid=$4 - gecos=$5 - home=$6 - shell=$7 - - - if pw group show -n $group >/dev/null 2>&1 ; then - echo "===> Using existing group $group" - else - if pw groupadd -n $group -g $gid ; then - echo "===> Created group $group" - else - cat <<-EOERRORMSG -*** Failed to create group $group. - -Please add user $user and group $group -manually with the following commands: - - pw groupadd -n $group -g $gid - pw useradd -n $user -u $uid -g $group -c "$gecos" \\ - -d $home -s $shell -h - - -and retry installing this package. -EOERRORMSG - exit 1 - fi - fi - -} - - -create_user() { - local user uid group gid gecos home shell - - user=$1 - uid=$2 - group=$3 - gid=$4 - gecos=$5 - home=$6 - shell=$7 - - if pw user show -n $user >/dev/null 2>&1 ; then - echo "===> Using existing user $user" - else - if pw useradd -n $user -u $uid -g $group -c "$gecos" \ - -d $home -s $shell -h - ; then - echo "===> Created user $user" - else - cat <<-EOERRORMSG -*** Failed to create user $user. - -Please add user $user manually with the following command: - - pw useradd -n $user -u $uid -g $group -c "$gecos" \\ - -d $home -s $shell -h - - -and retry installing this package. -EOERRORMSG - exit 1 - fi - fi -} - - if [ ${radius_run_as_user} != "yes" ]; then exit 0; fi case $2 in PRE-INSTALL) - # Create the radius user and group if they do not already exist - create_group $radius_user $radius_uid $radius_group $radius_gid \ - "$radius_gecos" $radius_home $radius_shell - create_user $radius_user $radius_uid $radius_group $radius_gid \ - "$radius_gecos" $radius_home $radius_shell - # Fix the user and group in raddb/radiusd.conf echo "===> Setting user and group in radiusd.conf" for file in ${radius_raddb_work}/radiusd.conf ${radius_raddb}/radiusd.conf; do diff -urN /usr/ports/net/freeradius2/pkg-plist freeradius2/pkg-plist --- /usr/ports/net/freeradius2/pkg-plist 2010-02-02 09:40:27.000000000 -0500 +++ freeradius2/pkg-plist 2010-05-24 22:08:22.000000000 -0400 @@ -85,6 +85,7 @@ %%EXAMPLESDIR%%/raddb/radiusd.conf %%EXAMPLESDIR%%/raddb/sites-available/README %%EXAMPLESDIR%%/raddb/sites-available/buffered-sql +%%EXAMPLESDIR%%/raddb/sites-available/coa %%EXAMPLESDIR%%/raddb/sites-available/control-socket %%EXAMPLESDIR%%/raddb/sites-available/copy-acct-to-home-server %%EXAMPLESDIR%%/raddb/sites-available/decoupled-accounting @@ -749,6 +750,7 @@ %%DATADIR%%/dictionary.vqp %%DATADIR%%/dictionary.walabi %%DATADIR%%/dictionary.waverider +%%DATADIR%%/dictionary.wichorus %%DATADIR%%/dictionary.wimax %%DATADIR%%/dictionary.wispr %%DATADIR%%/dictionary.xedia --X1bOJ3K7DJ5YkBrT--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100529140956.GA14516>