diff options
author | 2005-10-04 18:37:57 +0000 | |
---|---|---|
committer | 2005-10-04 18:37:57 +0000 | |
commit | 74b53c98741f3c40f68c2f5eefd4a04fdf367aa1 (patch) | |
tree | ac4f1c03044a09852420595161146b39fe93c199 /net-dialup/freeradius | |
parent | Marked ~ppc (diff) | |
download | gentoo-2-74b53c98741f3c40f68c2f5eefd4a04fdf367aa1.tar.gz gentoo-2-74b53c98741f3c40f68c2f5eefd4a04fdf367aa1.tar.bz2 gentoo-2-74b53c98741f3c40f68c2f5eefd4a04fdf367aa1.zip |
remove obsolete version; remove COPYRIGHT, CREDITS, INSTALL and LICENSE files from docs
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'net-dialup/freeradius')
7 files changed, 11 insertions, 279 deletions
diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog index c1e0677842fb..5413d4927042 100644 --- a/net-dialup/freeradius/ChangeLog +++ b/net-dialup/freeradius/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-dialup/freeradius # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.37 2005/09/24 17:58:25 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.38 2005/10/04 18:37:57 mrness Exp $ + + 04 Oct 2005; Alin Nastac <mrness@gentoo.org> + -files/freeradius-1.0.2-sql-escape.patch, + -files/freeradius-1.0.2-whole-archive-gentoo.patch, + -freeradius-1.0.2-r5.ebuild, freeradius-1.0.4.ebuild, + freeradius-1.0.5.ebuild: + Remove obsolete version. Remove COPYRIGHT, CREDITS, INSTALL and LICENSE + files from docs. *freeradius-1.0.5 (24 Sep 2005) diff --git a/net-dialup/freeradius/files/digest-freeradius-1.0.2-r5 b/net-dialup/freeradius/files/digest-freeradius-1.0.2-r5 deleted file mode 100644 index 54745a2d6470..000000000000 --- a/net-dialup/freeradius/files/digest-freeradius-1.0.2-r5 +++ /dev/null @@ -1 +0,0 @@ -MD5 f5dfce4efbb03bbc47ceae08270a875e freeradius-1.0.2.tar.gz 2208884 diff --git a/net-dialup/freeradius/files/freeradius-1.0.2-sql-escape.patch b/net-dialup/freeradius/files/freeradius-1.0.2-sql-escape.patch deleted file mode 100644 index 3658a83884bc..000000000000 --- a/net-dialup/freeradius/files/freeradius-1.0.2-sql-escape.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -Nru freeradius-1.0.2.orig/src/modules/rlm_sql/rlm_sql.c freeradius-1.0.2/src/modules/rlm_sql/rlm_sql.c ---- freeradius-1.0.2.orig/src/modules/rlm_sql/rlm_sql.c 2004-09-30 17:54:22.000000000 +0300 -+++ freeradius-1.0.2/src/modules/rlm_sql/rlm_sql.c 2005-05-19 08:32:00.830722112 +0300 -@@ -158,6 +158,7 @@ - */ - static int sql_set_user(SQL_INST *inst, REQUEST *request, char *sqlusername, const char *username); - static int generate_sql_clients(SQL_INST *inst); -+static int sql_escape_func(char *out, int outlen, const char *in); - - /* - * sql xlat function. Right now only SELECTs are supported. Only -@@ -184,7 +185,7 @@ - /* - * Do an xlat on the provided string (nice recursive operation). - */ -- if (!radius_xlat(querystr, sizeof(querystr), fmt, request, func)) { -+ if (!radius_xlat(querystr, sizeof(querystr), fmt, request, sql_escape_func)) { - radlog(L_ERR, "rlm_sql (%s): xlat failed.", - inst->config->xlat_name); - return 0; -@@ -409,18 +410,18 @@ - - while (in[0]) { - /* -- * Only one byte left. -- */ -- if (outlen <= 1) { -- break; -- } -- -- /* - * Non-printable characters get replaced with their - * mime-encoded equivalents. - */ - if ((in[0] < 32) || - strchr(allowed_chars, *in) == NULL) { -+ /* -+ * Only 3 or less bytes available. -+ */ -+ if (outlen <= 3) { -+ break; -+ } -+ - snprintf(out, outlen, "=%02X", (unsigned char) in[0]); - in++; - out += 3; -@@ -430,7 +431,14 @@ - } - - /* -- * Else it's a nice character. -+ * Only one byte left. -+ */ -+ if (outlen <= 1) { -+ break; -+ } -+ -+ /* -+ * Allowed character. - */ - *out = *in; - out++; -@@ -517,7 +525,7 @@ - */ - if (sql_set_user(inst, req, sqlusername, 0) < 0) - return 1; -- if (!radius_xlat(querystr, sizeof(querystr), inst->config->groupmemb_query, req, NULL)){ -+ if (!radius_xlat(querystr, sizeof(querystr), inst->config->groupmemb_query, req, sql_escape_func)){ - radlog(L_ERR, "rlm_sql (%s): xlat failed.", - inst->config->xlat_name); - /* Remove the username we (maybe) added above */ -@@ -1149,7 +1157,7 @@ - if(sql_set_user(inst, request, sqlusername, 0) <0) - return RLM_MODULE_FAIL; - -- radius_xlat(querystr, sizeof(querystr), inst->config->simul_count_query, request, NULL); -+ radius_xlat(querystr, sizeof(querystr), inst->config->simul_count_query, request, sql_escape_func); - - /* initialize the sql socket */ - sqlsocket = sql_get_socket(inst); -@@ -1193,7 +1201,7 @@ - return RLM_MODULE_OK; - } - -- radius_xlat(querystr, sizeof(querystr), inst->config->simul_verify_query, request, NULL); -+ radius_xlat(querystr, sizeof(querystr), inst->config->simul_verify_query, request, sql_escape_func); - if(rlm_sql_select_query(sqlsocket, inst, querystr)) { - radlog(L_ERR, "rlm_sql (%s): sql_checksimul: Database query error", inst->config->xlat_name); - sql_release_socket(inst, sqlsocket); diff --git a/net-dialup/freeradius/files/freeradius-1.0.2-whole-archive-gentoo.patch b/net-dialup/freeradius/files/freeradius-1.0.2-whole-archive-gentoo.patch deleted file mode 100644 index a91911b67b57..000000000000 --- a/net-dialup/freeradius/files/freeradius-1.0.2-whole-archive-gentoo.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nru freeradius-1.0.2.orig/aclocal.m4 freeradius-1.0.2/aclocal.m4 ---- freeradius-1.0.2.orig/aclocal.m4 2005-02-13 03:03:20.000000000 +0200 -+++ freeradius-1.0.2/aclocal.m4 2005-03-02 08:37:42.301666608 +0200 -@@ -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.2.orig/configure freeradius-1.0.2/configure ---- freeradius-1.0.2.orig/configure 2005-03-02 08:32:15.000000000 +0200 -+++ freeradius-1.0.2/configure 2005-03-02 08:37:58.710172136 +0200 -@@ -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.2.orig/ltconfig freeradius-1.0.2/ltconfig ---- freeradius-1.0.2.orig/ltconfig 2003-06-24 14:03:39.000000000 +0300 -+++ freeradius-1.0.2/ltconfig 2005-03-02 08:38:21.478710792 +0200 -@@ -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.2-r5.ebuild b/net-dialup/freeradius/freeradius-1.0.2-r5.ebuild deleted file mode 100644 index 38dfbdddee61..000000000000 --- a/net-dialup/freeradius/freeradius-1.0.2-r5.ebuild +++ /dev/null @@ -1,148 +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.2-r5.ebuild,v 1.3 2005/07/20 05:49:00 mrness Exp $ - -inherit eutils - -DESCRIPTION="highly configurable free RADIUS server" -SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar.gz" -HOMEPAGE="http://www.freeradius.org/" - -KEYWORDS="x86 ~amd64 ~ppc ~sparc" -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 - fi - enewgroup radiusd - enewuser radiusd -1 -1 /var/log/radius radiusd -} - -src_unpack() { - unpack ${P}.tar.gz - cd ${S} - - epatch ${FILESDIR}/${P}-whole-archive-gentoo.patch - epatch ${FILESDIR}/${P}-sql-escape.patch - - export WANT_AUTOCONF=2.1 - autoconf -} - -src_compile() { - 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 - dodir /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 - - [ -z "${PR}" ] || mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF} - gzip -f -9 ${D}/usr/share/doc/${PF}/{rfc/*.txt,*} - dodoc COPYRIGHT CREDITS INSTALL LICENSE - #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 -} diff --git a/net-dialup/freeradius/freeradius-1.0.4.ebuild b/net-dialup/freeradius/freeradius-1.0.4.ebuild index 024c847d7f76..e0b4bbca039f 100644 --- a/net-dialup/freeradius/freeradius-1.0.4.ebuild +++ b/net-dialup/freeradius/freeradius-1.0.4.ebuild @@ -1,6 +1,6 @@ # 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.4.ebuild,v 1.2 2005/07/20 05:49:00 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.4.ebuild,v 1.3 2005/10/04 18:37:57 mrness Exp $ inherit eutils @@ -110,7 +110,6 @@ src_install() { [ -z "${PR}" ] || mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF} gzip -f -9 ${D}/usr/share/doc/${PF}/{rfc/*.txt,*} - dodoc COPYRIGHT CREDITS INSTALL LICENSE #Copy SQL schemas to doc dir docinto sql.schemas dodoc src/modules/rlm_sql/drivers/rlm_sql_*/*.sql diff --git a/net-dialup/freeradius/freeradius-1.0.5.ebuild b/net-dialup/freeradius/freeradius-1.0.5.ebuild index 088e6acf57a4..70905f88b344 100644 --- a/net-dialup/freeradius/freeradius-1.0.5.ebuild +++ b/net-dialup/freeradius/freeradius-1.0.5.ebuild @@ -1,6 +1,6 @@ # 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.ebuild,v 1.1 2005/09/24 17:58:25 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.5.ebuild,v 1.2 2005/10/04 18:37:57 mrness Exp $ inherit eutils @@ -109,7 +109,6 @@ src_install() { [ -z "${PR}" ] || mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF} gzip -f -9 ${D}/usr/share/doc/${PF}/{rfc/*.txt,*} - dodoc COPYRIGHT CREDITS INSTALL LICENSE #Copy SQL schemas to doc dir docinto sql.schemas dodoc src/modules/rlm_sql/drivers/rlm_sql_*/*.sql |