Remove obsolete version. Quote strings containing env vars.
authorAlin Năstac <mrness@gentoo.org>
Sun, 12 Mar 2006 11:51:43 +0000 (11:51 +0000)
committerAlin Năstac <mrness@gentoo.org>
Sun, 12 Mar 2006 11:51:43 +0000 (11:51 +0000)
Package-Manager: portage-2.0.54

net-dialup/freeradius/ChangeLog
net-dialup/freeradius/Manifest
net-dialup/freeradius/files/digest-freeradius-1.0.5-r3 [deleted file]
net-dialup/freeradius/files/freeradius-1.0.5-user-password-ha1.patch [deleted file]
net-dialup/freeradius/files/freeradius-1.0.5-whole-archive-gentoo.patch [deleted file]
net-dialup/freeradius/freeradius-1.0.5-r3.ebuild [deleted file]
net-dialup/freeradius/freeradius-1.1.0-r1.ebuild

index 2853afad4f342070d9097767eea3a58475208c5d..61a8b9bf5ee109b8a35faca9ab1c96701abe7b2f 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.48 2006/02/28 10:41:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.49 2006/03/12 11:51:43 mrness Exp $
+
+  12 Mar 2006; Alin Nastac <mrness@gentoo.org>
+  -files/freeradius-1.0.5-user-password-ha1.patch,
+  -files/freeradius-1.0.5-whole-archive-gentoo.patch,
+  -freeradius-1.0.5-r3.ebuild, freeradius-1.1.0-r1.ebuild:
+  Remove obsolete version. Quote strings containing env vars.
 
   28 Feb 2006; Alin Nastac <mrness@gentoo.org> freeradius-1.1.0-r1.ebuild:
   Add debug USE flag (#124367). Mark as stable on amd64 and x86.
index 521fdfeb3be9fb8249d8d2a461087db27c879afc..61845bb7bf876b6a5614699a9093d930f0b826af 100644 (file)
@@ -1,23 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 77c2bfa0651a3c3718bcd293678dbbb8 ChangeLog 8038
-MD5 2d8c394126e7b211f44d26a4ff420f7d files/digest-freeradius-1.0.5-r3 69
+MD5 7ffe798262e664be249be4252e2bfd40 ChangeLog 8312
 MD5 7dc694a1ee1c374e37a40f81bcaf28a3 files/digest-freeradius-1.1.0-r1 69
-MD5 c1ccec77b79020a074dcd62ee622c9c4 files/freeradius-1.0.5-user-password-ha1.patch 2269
-MD5 6509371cc5a50915f90a413dc54b2c10 files/freeradius-1.0.5-whole-archive-gentoo.patch 1728
 MD5 7dc1f8c829f2d44978b414662997041a files/freeradius-1.1.0-dict-attr-sizeof.patch 478
 MD5 66405667b57e288296ed7fae92e0a583 files/freeradius-1.1.0-libeap-fPIC.patch 458
 MD5 ce75b2dd4a38950b23b4a529b6d6b5ae files/freeradius-1.1.0-whole-archive-gentoo.patch 1728
 MD5 fc6693f3df5a0694610110287a28568a files/radius.conf 129
 MD5 adc7e9af3a2ab37f1ab021de3e279d41 files/radius.init 1675
-MD5 9556d5bbc383fa3d1ac386208702824c freeradius-1.0.5-r3.ebuild 4118
-MD5 af9f017dbe0a9a9569dab3a9d629f1ff freeradius-1.1.0-r1.ebuild 3932
+MD5 e7a9476cc2e95753463494b2950c8786 freeradius-1.1.0-r1.ebuild 3999
 MD5 1542bf76e28581e9d6bcfdc75e46f33d metadata.xml 252
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFEBCjujG8pv1lIUX4RAsl2AKChpjXS/zi0457zPMOWzJ2e0c9rQgCgtFb9
-NRdqP/t1JT98fGySWogGjYw=
-=2ZMS
+iD8DBQFEFAtkjG8pv1lIUX4RAqhcAJ0YEY4fJ4wwau97dfiIhlccP+Ss1wCg15V7
+B500nqSo4XzALgTQRBZQFo4=
+=i4ee
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.0.5-r3 b/net-dialup/freeradius/files/digest-freeradius-1.0.5-r3
deleted file mode 100644 (file)
index 00bf51d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 00d06fc31e3b8279f6456d25401c81cb freeradius-1.0.5.tar.gz 2294225
diff --git a/net-dialup/freeradius/files/freeradius-1.0.5-user-password-ha1.patch b/net-dialup/freeradius/files/freeradius-1.0.5-user-password-ha1.patch
deleted file mode 100644 (file)
index c3ef885..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -aurN freeradius-1.0.5/src/modules/rlm_digest/rlm_digest.c freeradius-1.0.5-new/src/modules/rlm_digest/rlm_digest.c
---- freeradius-1.0.5/src/modules/rlm_digest/rlm_digest.c       2004-05-15 16:57:41.000000000 +0200
-+++ freeradius-1.0.5-new/src/modules/rlm_digest/rlm_digest.c   2005-10-09 02:06:06.000000000 +0200
-@@ -35,6 +35,42 @@
- static const char rcsid[] = "$Id: freeradius-1.0.5-user-password-ha1.patch,v 1.1 2005/10/16 08:47:36 mrness Exp $";
-+typedef struct {
-+      int           enc_mode;
-+} digest_instance;
-+
-+static CONF_PARSER module_config[] = {
-+  {"enc_mode", PW_TYPE_BOOLEAN, offsetof(digest_instance,enc_mode), NULL, "no"},
-+  {NULL, -1, 0, NULL, NULL}
-+};
-+
-+static int
-+digest_instantiate(CONF_SECTION * conf, void **instance)
-+{
-+      digest_instance  *inst;
-+
-+      inst = rad_malloc(sizeof *inst);
-+      if (!inst) {
-+              return -1;
-+      }
-+      memset(inst, 0, sizeof(*inst));
-+
-+      if (cf_section_parse(conf, inst, module_config) < 0) {
-+              free(inst);
-+              return -1;
-+      }
-+#ifndef NDEBUG
-+      if (inst->enc_mode) {
-+        DEBUG("Encrypting mode set. User-Password field must contain H(A1)");
-+      }
-+#endif
-+      *instance = inst;
-+
-+
-+      return 0;
-+
-+}
-+
- static int digest_authorize(void *instance, REQUEST *request)
- {
-       VALUE_PAIR *vp;
-@@ -188,6 +224,7 @@
-       uint8_t hash[16];       /* MD5 output */
-       VALUE_PAIR *vp;
-       VALUE_PAIR *qop, *nonce;
-+      digest_instance *inst = instance;
-       /*
-        *      We require access to the plain-text password.
-@@ -347,6 +384,21 @@
-        */
-       librad_md5_calc(&hash[0], &a1[0], a1_len);
-+      /*
-+       *     If enc_mode is on, User-Password must contain
-+       *     H(A1) itself. Overwrite hash then.
-+       */
-+      if (inst->enc_mode) {
-+        DEBUG("User-Password must contain H(A1) , e.g H(username:realm:password)");
-+        vp = pairfind(request->config_items, PW_PASSWORD);
-+        if (!vp) {
-+          DEBUG("ERROR: No User-Password: Cannot perform Digest authentication");
-+          return RLM_MODULE_INVALID;
-+        }
-+        
-+        hex2bin(&hash[0], &vp->strvalue[0]);
-+      }
-+
-       for (i = 0; i < 16; i++) {
-               sprintf(&kd[i * 2], "%02x", hash[i]);
-       }
-@@ -491,7 +543,7 @@
-       "DIGEST",
-       0,                              /* type */
-       NULL,                           /* initialization */
--      NULL,                           /* instantiation */
-+      digest_instantiate,                             /* instantiation */
-       {
-               digest_authenticate,    /* authentication */
-               digest_authorize,       /* authorization */
diff --git a/net-dialup/freeradius/files/freeradius-1.0.5-whole-archive-gentoo.patch b/net-dialup/freeradius/files/freeradius-1.0.5-whole-archive-gentoo.patch
deleted file mode 100644 (file)
index b8e0829..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nru freeradius-1.0.5.orig/aclocal.m4 freeradius-1.0.5/aclocal.m4
---- freeradius-1.0.5.orig/aclocal.m4   2005-08-19 20:29:04.000000000 +0300
-+++ freeradius-1.0.5/aclocal.m4        2005-09-24 20:20:47.733693672 +0300
-@@ -1421,7 +1421,7 @@
-     *)
-       # ancient GNU ld didn't support --whole-archive et. al.
-       if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
--      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      whole_archive_flag_spec="$wlarc"'--no-whole-archive'
-       else
-       whole_archive_flag_spec=
-       fi
-diff -Nru freeradius-1.0.5.orig/configure freeradius-1.0.5/configure
---- freeradius-1.0.5.orig/configure    2005-09-24 20:20:08.000000000 +0300
-+++ freeradius-1.0.5/configure 2005-09-24 20:20:47.737693064 +0300
-@@ -3511,7 +3511,7 @@
-     *)
-       # ancient GNU ld didn't support --whole-archive et. al.
-       if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
--      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      whole_archive_flag_spec="$wlarc"'--no-whole-archive'
-       else
-       whole_archive_flag_spec=
-       fi
-diff -Nru freeradius-1.0.5.orig/ltconfig freeradius-1.0.5/ltconfig
---- freeradius-1.0.5.orig/ltconfig     2003-06-24 14:03:39.000000000 +0300
-+++ freeradius-1.0.5/ltconfig  2005-09-24 20:20:47.739692760 +0300
-@@ -1246,7 +1246,7 @@
-     *)
-       # ancient GNU ld didn't support --whole-archive et. al.
-       if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
--        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+        whole_archive_flag_spec="$wlarc"'--no-whole-archive'
-       else
-         whole_archive_flag_spec=
-       fi
diff --git a/net-dialup/freeradius/freeradius-1.0.5-r3.ebuild b/net-dialup/freeradius/freeradius-1.0.5-r3.ebuild
deleted file mode 100644 (file)
index 56a74b4..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.5-r3.ebuild,v 1.2 2005/12/20 20:13:25 mrness Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="highly configurable free RADIUS server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar.gz"
-HOMEPAGE="http://www.freeradius.org/"
-
-KEYWORDS="amd64 ~ppc ~sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="edirectory frascend frnothreads frxp kerberos ldap mysql pam postgres snmp ssl udpfromto"
-
-DEPEND="!net-dialup/cistronradius
-       !net-dialup/gnuradius
-       virtual/libc
-       >=sys-libs/db-3.2
-       sys-libs/gdbm
-       snmp? ( net-analyzer/net-snmp )
-       mysql? ( dev-db/mysql )
-       postgres? ( dev-db/postgresql )
-       pam? ( sys-libs/pam )
-       ssl? ( dev-libs/openssl )
-       ldap? ( net-nds/openldap )
-       kerberos? ( virtual/krb5 )
-       frxp? ( dev-lang/python
-               dev-lang/perl )"
-
-pkg_setup() {
-       if use edirectory && ! use ldap ; then
-               eerror "Cannot add integration with Novell's eDirectory without having LDAP support!"
-               eerror "Either you select ldap USE flag or remove edirectory"
-               die "edirectory needs ldap"
-       fi
-       enewgroup radiusd
-       enewuser radiusd -1 -1 /var/log/radius radiusd
-}
-
-src_unpack() {
-       unpack ${A}
-
-       epatch ${FILESDIR}/${P}-whole-archive-gentoo.patch
-       if use frxp; then
-               #(bug #109003) This patch allows you to store the hash value of the 
-               #username:realm:password string instead of the clear text password.
-               #It can be found here :
-               #       http://bugs.freeradius.org/show_bug.cgi?id=287
-               epatch ${FILESDIR}/${P}-user-password-ha1.patch
-       fi
-}
-
-src_compile() {
-       append-flags -fPIC #needed to solve bug #111909
-
-#      export WANT_AUTOCONF=2.1
-       autoconf
-
-       local myconf=" \
-               `use_with snmp` \
-               `use_with frascend ascend-binary` \
-               `use_with frxp experimental-modules` \
-               `use_with udpfromto` \
-               `use_with edirectory edir` "
-
-       if useq frnothreads; then
-               myconf="${myconf} --without-threads"
-       fi
-       #fix bug #77613
-       if has_version app-crypt/heimdal; then
-               myconf="${myconf} --enable-heimdal-krb5"
-       fi
-
-       # kill modules we don't use
-       if ! use ssl; then
-               einfo "removing rlm_eap_tls and rlm_x99_token (no use ssl)"
-               rm -rf src/modules/rlm_eap/types/rlm_eap_tls src/modules/rlm_x99_token
-       fi
-       if ! use ldap; then
-               einfo "removing rlm_ldap (no use ldap)"
-               rm -rf src/modules/rlm_ldap
-       fi
-       if ! use kerberos; then
-               einfo "removing rlm_krb5 (no use kerberos)"
-               rm -rf src/modules/rlm_krb5
-       fi
-       if ! use pam; then
-               einfo "removing rlm_pam (no use pam)"
-               rm -rf src/modules/rlm_pam
-       fi
-
-       ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-               --mandir=/usr/share/man \
-               --with-large-files --disable-ltdl-install --disable-static \
-               ${myconf} || die
-
-       make || die
-}
-
-src_install() {
-       dodir /etc
-       dodir /var/log
-       dodir /var/run
-       pkg_preinst
-       diropts -m0750 -o root -g radiusd
-       dodir /etc/raddb
-       diropts -m0750 -o radiusd -g radiusd
-       dodir /var/log/radius
-       keepdir /var/log/radius/radacct
-       dodir /var/run/radiusd
-       diropts
-
-       make R=${D} install || die
-       dosed 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
-           /etc/raddb/radiusd.conf
-       chown -R root:radiusd ${D}/etc/raddb/*
-
-       [ -z "${PR}" ] || mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF}
-       gzip -f -9 ${D}/usr/share/doc/${PF}/{rfc/*.txt,*}
-       dodoc CREDITS
-       #Copy SQL schemas to doc dir
-       docinto sql.schemas
-       dodoc src/modules/rlm_sql/drivers/rlm_sql_*/*.sql
-
-       rm ${D}/usr/sbin/rc.radiusd
-
-       exeinto /etc/init.d
-       newexe ${FILESDIR}/radius.init radiusd
-
-       insinto /etc/conf.d
-       newins ${FILESDIR}/radius.conf radiusd
-}
-
-pkg_preinst() {
-       enewgroup radiusd
-       enewuser radiusd -1 -1 /var/log/radius radiusd
-}
-
-pkg_prerm() {
-       if [ -n "`${ROOT}/etc/init.d/radiusd status | grep start`" ]; then
-               ${ROOT}/etc/init.d/radiusd stop
-       fi
-}
-
-pkg_postrm() {
-       if has_version ">${CATEGORY}/${PF}" || has_version "<${CATEGORY}/${PF}" ; then
-               ewarn "If radiusd service was running, it had been stopped!"
-               echo
-               ewarn "You should update the configuration files using etc-update"
-               ewarn "and start the radiusd service again by running:"
-               einfo "    /etc/init.d/radiusd start"
-
-               ebeep
-       fi
-}
index 7e3471d95d12c39529fcb3bf9f88cdc5c20375b9..d93a0d4112aa16020f371427c9bb22ed3d03400f 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.0-r1.ebuild,v 1.2 2006/02/28 10:41:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.0-r1.ebuild,v 1.3 2006/03/12 11:51:43 mrness Exp $
 
 inherit eutils flag-o-matic
 
@@ -41,13 +41,13 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
 
-       epatch ${FILESDIR}/${P}-whole-archive-gentoo.patch
-       epatch ${FILESDIR}/${P}-dict-attr-sizeof.patch
-       epatch ${FILESDIR}/${P}-libeap-fPIC.patch #needed for rlm_eap installation on amd64
+       epatch "${FILESDIR}/${P}-whole-archive-gentoo.patch"
+       epatch "${FILESDIR}/${P}-dict-attr-sizeof.patch"
+       epatch "${FILESDIR}/${P}-libeap-fPIC.patch" #needed for rlm_eap installation on amd64
 }
 
 src_compile() {
-       autoconf
+       autoconf || die "autoconf failed"
 
        local myconf=" \
                `use_enable debug developer` \
@@ -86,9 +86,9 @@ src_compile() {
        ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
                --mandir=/usr/share/man \
                --with-large-files --disable-ltdl-install --disable-static --with-pic \
-               ${myconf} || die
+               ${myconf} || die "configure failed"
 
-       make || die
+       make || die "make failed"
 }
 
 src_install() {
@@ -104,25 +104,22 @@ src_install() {
        dodir /var/run/radiusd
        diropts
 
-       make R=${D} install || die
+       make R="${D}" install || die "make install failed"
        dosed 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
            /etc/raddb/radiusd.conf
-       chown -R root:radiusd ${D}/etc/raddb/*
+       chown -R root:radiusd "${D}"/etc/raddb/*
 
-       [ -z "${PR}" ] || mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF}
-       gzip -f -9 ${D}/usr/share/doc/${PF}/{rfc/*.txt,*}
+       [ -z "${PR}" ] || mv "${D}/usr/share/doc/${P}" "${D}/usr/share/doc/${PF}"
+       gzip -f -9 "${D}/usr/share/doc/${PF}"/{rfc/*.txt,*}
        dodoc CREDITS
        #Copy SQL schemas to doc dir
        docinto sql.schemas
        dodoc src/modules/rlm_sql/drivers/rlm_sql_*/*.sql
 
-       rm ${D}/usr/sbin/rc.radiusd
+       rm "${D}/usr/sbin/rc.radiusd"
 
-       exeinto /etc/init.d
-       newexe ${FILESDIR}/radius.init radiusd
-
-       insinto /etc/conf.d
-       newins ${FILESDIR}/radius.conf radiusd
+       newinitd "${FILESDIR}/radius.init" radiusd
+       newconfd "${FILESDIR}/radius.conf" radiusd
 }
 
 pkg_preinst() {
@@ -131,8 +128,8 @@ pkg_preinst() {
 }
 
 pkg_prerm() {
-       if [ -n "`${ROOT}/etc/init.d/radiusd status | grep start`" ]; then
-               ${ROOT}/etc/init.d/radiusd stop
+       if [ -n "`'${ROOT}/etc/init.d/radiusd' status | grep start`" ]; then
+               "${ROOT}/etc/init.d/radiusd" stop
        fi
 }