From ae46f325094c54c2610c3276723453bf69f61416 Mon Sep 17 00:00:00 2001 From: Alin Năstac Date: Thu, 19 May 2005 04:54:19 +0000 Subject: use upstream patch for #91736 Package-Manager: portage-2.0.51.19 --- net-dialup/freeradius/ChangeLog | 9 +- net-dialup/freeradius/Manifest | 14 +-- .../freeradius/files/digest-freeradius-1.0.2-r3 | 1 - .../freeradius/files/digest-freeradius-1.0.2-r4 | 1 + .../files/freeradius-1.0.2-sql-escape.patch | 59 ++++++---- net-dialup/freeradius/freeradius-1.0.2-r3.ebuild | 130 --------------------- net-dialup/freeradius/freeradius-1.0.2-r4.ebuild | 130 +++++++++++++++++++++ 7 files changed, 183 insertions(+), 161 deletions(-) delete mode 100644 net-dialup/freeradius/files/digest-freeradius-1.0.2-r3 create mode 100644 net-dialup/freeradius/files/digest-freeradius-1.0.2-r4 delete mode 100644 net-dialup/freeradius/freeradius-1.0.2-r3.ebuild create mode 100644 net-dialup/freeradius/freeradius-1.0.2-r4.ebuild (limited to 'net-dialup/freeradius') diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog index fc27dadb6aba..6087a6e8d6e0 100644 --- a/net-dialup/freeradius/ChangeLog +++ b/net-dialup/freeradius/ChangeLog @@ -1,6 +1,13 @@ # 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.32 2005/05/10 20:13:45 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.33 2005/05/19 04:54:19 mrness Exp $ + +*freeradius-1.0.2-r4 (19 May 2005) + + 19 May 2005; Alin Nastac + files/freeradius-1.0.2-sql-escape.patch, -freeradius-1.0.2-r3.ebuild, + +freeradius-1.0.2-r4.ebuild: + Use the upstream patch for bug #91736. 10 May 2005; Alin Nastac freeradius-1.0.2-r3.ebuild: Stable on x86 wrt bug #91736. diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest index 261a7cd4ac00..393c03ad9db5 100644 --- a/net-dialup/freeradius/Manifest +++ b/net-dialup/freeradius/Manifest @@ -1,23 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 3b8d03722330d025d4185bdc56382b23 freeradius-1.0.2-r3.ebuild 3327 MD5 d075f94b574fba2c813ded7d415ef0b3 freeradius-1.0.1.ebuild 2890 MD5 9b37bc88688cb942777da79117459988 freeradius-1.0.2-r2.ebuild 3106 -MD5 afa45db62de7f028d0937cef32a1b7e5 ChangeLog 4721 +MD5 ec265dfc71efb8a8c4da9a90a84845ea freeradius-1.0.2-r4.ebuild 3327 +MD5 53304f8018c3bf70eef42632755452d3 ChangeLog 4949 MD5 1542bf76e28581e9d6bcfdc75e46f33d metadata.xml 252 MD5 fc6693f3df5a0694610110287a28568a files/radius.conf 129 MD5 50b0d44ee0e5313901606e2749dfdd34 files/radius.init 1006 MD5 5a26f9881af51aed070957e5fc4ed808 files/digest-freeradius-1.0.2-r2 69 -MD5 5a26f9881af51aed070957e5fc4ed808 files/digest-freeradius-1.0.2-r3 69 +MD5 5a26f9881af51aed070957e5fc4ed808 files/digest-freeradius-1.0.2-r4 69 MD5 9f0188ba482e825cf2a89584f8caa813 files/digest-freeradius-1.0.1 69 MD5 3c2119ec1d8d807fe5ed14944747f0f8 files/freeradius-1.0.1-gcc34.patch 715 MD5 6b0efd384f551fab6b82794e91dbb4d5 files/freeradius-1.0.2-whole-archive-gentoo.patch 1728 -MD5 503ac5a922de5a21fde5487e339220f7 files/freeradius-1.0.2-sql-escape.patch 3157 +MD5 994b0489242b9c3bacf054bffb53ef0a files/freeradius-1.0.2-sql-escape.patch 3927 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCij9pjiC39V7gKu0RAr1VAJ4+WHEmUiUydLI576bnNefDhE5+cwCbBBpb -doljkSx9nksLjW6CGMAUbZM= -=8K6r +iD8DBQFCjBwMjiC39V7gKu0RAqzHAKCgYC0gtdZAyjoBrc3K5bpirzrHowCffwQ5 +ZcBt39vTBhOkEnCgvd7sqJc= +=7dpy -----END PGP SIGNATURE----- diff --git a/net-dialup/freeradius/files/digest-freeradius-1.0.2-r3 b/net-dialup/freeradius/files/digest-freeradius-1.0.2-r3 deleted file mode 100644 index 54745a2d6470..000000000000 --- a/net-dialup/freeradius/files/digest-freeradius-1.0.2-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 f5dfce4efbb03bbc47ceae08270a875e freeradius-1.0.2.tar.gz 2208884 diff --git a/net-dialup/freeradius/files/digest-freeradius-1.0.2-r4 b/net-dialup/freeradius/files/digest-freeradius-1.0.2-r4 new file mode 100644 index 000000000000..54745a2d6470 --- /dev/null +++ b/net-dialup/freeradius/files/digest-freeradius-1.0.2-r4 @@ -0,0 +1 @@ +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 index ae2b0211cf56..f2060a75eebf 100644 --- a/net-dialup/freeradius/files/freeradius-1.0.2-sql-escape.patch +++ b/net-dialup/freeradius/files/freeradius-1.0.2-sql-escape.patch @@ -1,7 +1,29 @@ -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-07 18:54:43.314085504 +0300 -@@ -158,6 +158,7 @@ +=================================================================== +RCS file: /web/pages/us.freeradius.org/cvs/radiusd/src/modules/rlm_sql/rlm_sql.c,v +retrieving revision 1.131.2.1 +retrieving revision 1.131.2.3 +diff -u -p -r1.131.2.1 -r1.131.2.3 +--- radiusd/src/modules/rlm_sql/rlm_sql.c 2004/09/30 14:54:22 1.131.2.1 ++++ radiusd/src/modules/rlm_sql/rlm_sql.c 2005/05/18 13:22:18 1.131.2.3 +@@ -2,7 +2,7 @@ + * rlm_sql.c SQL Module + * Main SQL module file. Most ICRADIUS code is located in sql.c + * +- * Version: $Id: freeradius-1.0.2-sql-escape.patch,v 1.2 2005/05/19 04:54:19 mrness Exp $ ++ * Version: $Id: freeradius-1.0.2-sql-escape.patch,v 1.2 2005/05/19 04:54:19 mrness Exp $ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -24,7 +24,7 @@ + */ + + static const char rcsid[] = +- "$Id: freeradius-1.0.2-sql-escape.patch,v 1.2 2005/05/19 04:54:19 mrness Exp $"; ++ "$Id: freeradius-1.0.2-sql-escape.patch,v 1.2 2005/05/19 04:54:19 mrness Exp $"; + + #include "autoconf.h" + +@@ -158,6 +158,7 @@ static int rlm_sql_init(void) { */ static int sql_set_user(SQL_INST *inst, REQUEST *request, char *sqlusername, const char *username); static int generate_sql_clients(SQL_INST *inst); @@ -9,7 +31,7 @@ diff -Nru freeradius-1.0.2.orig/src/modules/rlm_sql/rlm_sql.c freeradius-1.0.2/s /* * sql xlat function. Right now only SELECTs are supported. Only -@@ -184,7 +185,7 @@ +@@ -184,7 +185,7 @@ static int sql_xlat(void *instance, REQU /* * Do an xlat on the provided string (nice recursive operation). */ @@ -18,7 +40,7 @@ diff -Nru freeradius-1.0.2.orig/src/modules/rlm_sql/rlm_sql.c freeradius-1.0.2/s radlog(L_ERR, "rlm_sql (%s): xlat failed.", inst->config->xlat_name); return 0; -@@ -409,18 +410,18 @@ +@@ -409,18 +410,18 @@ static int sql_escape_func(char *out, in while (in[0]) { /* @@ -35,7 +57,7 @@ diff -Nru freeradius-1.0.2.orig/src/modules/rlm_sql/rlm_sql.c freeradius-1.0.2/s if ((in[0] < 32) || strchr(allowed_chars, *in) == NULL) { + /* -+ * Less than 3 bytes left. ++ * Only 3 or less bytes available. + */ + if (outlen <= 3) { + break; @@ -44,30 +66,23 @@ diff -Nru freeradius-1.0.2.orig/src/modules/rlm_sql/rlm_sql.c freeradius-1.0.2/s snprintf(out, outlen, "=%02X", (unsigned char) in[0]); in++; out += 3; -@@ -430,6 +431,13 @@ +@@ -430,7 +431,14 @@ static int sql_escape_func(char *out, in } /* -+ * Only one byte left. +- * Else it's a nice character. ++ * Only one byte left. + */ + if (outlen <= 1) { + break; + } + + /* - * Else it's a nice character. ++ * Allowed character. */ *out = *in; -@@ -459,7 +467,7 @@ - if (username != NULL) { - strNcpy(tmpuser, username, MAX_STRING_LEN); - } else if (strlen(inst->config->query_user)) { -- radius_xlat(tmpuser, sizeof(tmpuser), inst->config->query_user, request, NULL); -+ radius_xlat(tmpuser, sizeof(tmpuser), inst->config->query_user, request, sql_escape_func); - } else { - return 0; - } -@@ -517,7 +525,7 @@ + out++; +@@ -517,7 +525,7 @@ static int sql_groupcmp(void *instance, */ if (sql_set_user(inst, req, sqlusername, 0) < 0) return 1; @@ -76,7 +91,7 @@ diff -Nru freeradius-1.0.2.orig/src/modules/rlm_sql/rlm_sql.c freeradius-1.0.2/s radlog(L_ERR, "rlm_sql (%s): xlat failed.", inst->config->xlat_name); /* Remove the username we (maybe) added above */ -@@ -1149,7 +1157,7 @@ +@@ -1149,7 +1157,7 @@ static int rlm_sql_checksimul(void *inst if(sql_set_user(inst, request, sqlusername, 0) <0) return RLM_MODULE_FAIL; @@ -85,7 +100,7 @@ diff -Nru freeradius-1.0.2.orig/src/modules/rlm_sql/rlm_sql.c freeradius-1.0.2/s /* initialize the sql socket */ sqlsocket = sql_get_socket(inst); -@@ -1193,7 +1201,7 @@ +@@ -1193,7 +1201,7 @@ static int rlm_sql_checksimul(void *inst return RLM_MODULE_OK; } diff --git a/net-dialup/freeradius/freeradius-1.0.2-r3.ebuild b/net-dialup/freeradius/freeradius-1.0.2-r3.ebuild deleted file mode 100644 index a21d5fce03dd..000000000000 --- a/net-dialup/freeradius/freeradius-1.0.2-r3.ebuild +++ /dev/null @@ -1,130 +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-r3.ebuild,v 1.3 2005/05/17 19:00:34 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 /bin/false /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 frascent 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 /bin/false /var/log/radius radiusd -} diff --git a/net-dialup/freeradius/freeradius-1.0.2-r4.ebuild b/net-dialup/freeradius/freeradius-1.0.2-r4.ebuild new file mode 100644 index 000000000000..3800a9c149a0 --- /dev/null +++ b/net-dialup/freeradius/freeradius-1.0.2-r4.ebuild @@ -0,0 +1,130 @@ +# 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-r4.ebuild,v 1.1 2005/05/19 04:54:19 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 /bin/false /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 frascent 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 /bin/false /var/log/radius radiusd +} -- cgit v1.2.3-65-gdbad