commit: d91d363618661d81101eade626c0c3db456c1d45 Author: layman <layman <AT> localhost> AuthorDate: Sun Dec 20 22:00:28 2015 +0000 Commit: Mike Auty <ikelos <AT> gentoo <DOT> org> CommitDate: Sun Dec 20 22:00:28 2015 +0000 URL: https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=d91d3636
Fix up the dependencies and ditch the old versions. net-dialup/freeradius/Manifest | 6 +- net-dialup/freeradius/freeradius-3.0.10.ebuild | 1 + net-dialup/freeradius/freeradius-3.0.4.ebuild | 215 ------------------------- net-dialup/freeradius/freeradius-3.0.8.ebuild | 215 ------------------------- 4 files changed, 2 insertions(+), 435 deletions(-) diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest index c51f175..73a9522 100644 --- a/net-dialup/freeradius/Manifest +++ b/net-dialup/freeradius/Manifest @@ -2,11 +2,7 @@ AUX freeradius-2.2.5-gentoo.patch 3459 SHA256 73dc67b4a59f93b70750c6dff3c92ffca6 AUX radius.conf-r3 467 SHA256 f76dd3c55117611d636f7fb645e98c58ae733f33cd9ba54a54075368625ddaae SHA512 b28bf4c22e72a3074aba79f7edeb48b69cc0e7671f7023e8888846dec6db4a428c6d1a0803b714fd9b9b3f45bbc1bad93cfa7911d716a856505da043c1f9c6d5 WHIRLPOOL d6e6847fa3aa45e8cb9ba370eaa8f1df33e3b29e121392369e251a71543c21413940fae2bca5d75553d0d91bc06541f00df301171ad9b3a6dc20f481d87e9e99 AUX radius.init-r3 733 SHA256 fd4435217237f828a89315d5a184ee0f4b0b19b4166a42097ccffc62a48baf6b SHA512 11c4faa8875b9a8a9e6c41f3c11aa8b5bb1e7b26ea5bc2d126eeb5e341a4fe7ba859244267ae3ae2cfc15d98c925141e2cb7d61f526a3d67ebe318918f73d173 WHIRLPOOL eafce68bb11522d294ae13cb90896dc061e17988f8043c91d230fad9348933f3d27ea03f3f2d05a9a079c4d33671276274f6692c46850e9807e3a05c231e6bb0 DIST freeradius-server-3.0.10.tar.gz 4789660 SHA256 e8825518bde1d9787f7f9ea1e9fec7ae5282af9c3362d2fa360f60c4db6f77ec SHA512 7546d54ca9ae1189f17fa97a8c6f6e15486d61dda8819b15f883ba48fbd6629f4728ba41490b51cb08eb1399090c16eca1b559c22ee19f3a770f1ce7ce23a8d5 WHIRLPOOL 6edcb31094f91a2f7c4eed9e6d8b295f59f3f9190f1e4384bc818d3d8e3e7f73315fd0c66967ecd08657e292c43c4bd238a0247709522afd1e44b0d9e44e4478 -DIST freeradius-server-3.0.4.tar.gz 4376773 SHA256 56919b25d5b2ff301cb37278494498f35d8c58986c33d693d6c0cd757a4a1fe9 SHA512 556b9f8b1fb8850a943e40a66ae0491794297ac77ec958f7c863f68fb6365b0390fb369ce77875d90f5151a61e29c3443d0159f3c32111c6fc112af7e5b9e116 WHIRLPOOL 0bb1b35d1d479ecb8301ce3908e462610547763b987ebfe69116ba46284cf76281b389fd91b81d9882708631e263b6eac238002586239b4e23f4c2466f2d955c -DIST freeradius-server-3.0.8.tar.gz 4656262 SHA256 c27252d7a86ba252904612d9b1f90e846f3ef1f4afee6a748f5287b730e87e3a SHA512 89aabc474e95226eeb5003feef40fbe240f28aa65c40e0566a9bec08991d95fab83826f3b14f416cf4d7d832a814912521cb3c83097c1a2ce5d3e3537ee3a732 WHIRLPOOL 62e799a7f62e6bae027d33bbfec30e4aa70e1613e83edd8e5ff1b28c9f00560655a3c6d8a3e00e5f078e07de70cfa750428cd55d0760a2a9f81eab2689e312cf -EBUILD freeradius-3.0.10.ebuild 5384 SHA256 dfdf2da2b054f7108e40b9cc04b5e44e39dcfb2020276637d11fcbd1c819c492 SHA512 fb2de61b919894795b099d3f1ba9184f48bb13d2d6e0ba28e689c99502a5617bba627b25d44110b7342b35dc6dd439f3a4cbe411337be833fff4c3765d63e1f7 WHIRLPOOL bd2edbecd107c1dabeaffa022e61d42b249f005160456f7830d24fd8c3921f4cc5f9a5d1f4e6d9e96a6b9c1170af41f72c6563fd79a45194697ad1cd17793141 -EBUILD freeradius-3.0.4.ebuild 5384 SHA256 dfdf2da2b054f7108e40b9cc04b5e44e39dcfb2020276637d11fcbd1c819c492 SHA512 fb2de61b919894795b099d3f1ba9184f48bb13d2d6e0ba28e689c99502a5617bba627b25d44110b7342b35dc6dd439f3a4cbe411337be833fff4c3765d63e1f7 WHIRLPOOL bd2edbecd107c1dabeaffa022e61d42b249f005160456f7830d24fd8c3921f4cc5f9a5d1f4e6d9e96a6b9c1170af41f72c6563fd79a45194697ad1cd17793141 -EBUILD freeradius-3.0.8.ebuild 5384 SHA256 dfdf2da2b054f7108e40b9cc04b5e44e39dcfb2020276637d11fcbd1c819c492 SHA512 fb2de61b919894795b099d3f1ba9184f48bb13d2d6e0ba28e689c99502a5617bba627b25d44110b7342b35dc6dd439f3a4cbe411337be833fff4c3765d63e1f7 WHIRLPOOL bd2edbecd107c1dabeaffa022e61d42b249f005160456f7830d24fd8c3921f4cc5f9a5d1f4e6d9e96a6b9c1170af41f72c6563fd79a45194697ad1cd17793141 +EBUILD freeradius-3.0.10.ebuild 5401 SHA256 1ba5bd8f9480a7ee0983912cf5b12b3e5f60d3b803bd0d66076aa577f7b178bf SHA512 a66ba065c0a1e59b4f47ba0ef4219582f6242ca10f96030fbb7a3f6de4f0dc528458fc1b3fbbcca7ea0b916b5ca1cf32fe67ff4c904f185fc91f150eea1d9a4e WHIRLPOOL b6d89602b485b994f0081ef09f8a4ebcdfe0b8c13e982f37cbd99ab999bb56be13b07d6a7e7a06d8c5ba6256a72a9083f7a49ea5c406a83b765882fa574330a8 MISC ChangeLog 2234 SHA256 359c8792abaa333784c6afe0123831f0c8b6ede474e238929a7901ad76193406 SHA512 dc950552602660fd02624f843b1a4aec90bc357cc41e7c26b97c7ab266cd25a6c88bb2b501ab3ef22d7648533d01763be2abcd5eda08d102df2d4d4d8e91a6ed WHIRLPOOL 37dab7fe68ed736bd6e5293b8636c57156c6aa87b9ffed29bd9e76b036b92023dae656432436396f3d8f76d096dec27f3e2c2ba25dc59f9e8c69f5712bba4ebf MISC ChangeLog-2015 28265 SHA256 bebaacc4b68b52c055ba6d19030606cac47a0aae7328b83acc574fa1250e7223 SHA512 4303e8aa36161e358c4fc4f6c6e4d4e44c33a1ede0810928591319e570f4b95d0190f7c36122f4e28a124bc40802c9c4d88ce03913bba6b4572de0e47ba32812 WHIRLPOOL 6ffa9d991348ca09a98ff5b429e90a6591682624cd74e357965d1bed030290a90725b13ee91e0ac0a7ddab512294eb39462a7ee4edeaac0e7b7609427042ef42 MISC metadata.xml 292 SHA256 2dd425124762370883ff4bda38aea3916b488da4757278911e891c20db752a00 SHA512 e94382e544441b4ed022138fd2d37d7ad7b79c8a3d4c8cf1422f4c8e66d7504346db60d3719fd93059dcf4604e16eb9b9c376d210317ddd45ed2375949a3dc30 WHIRLPOOL 998d68c8a161f31811850f25080bd05ca1ca934e43ce2fc9291ded75f0031521ddaeef7fd81d5a444399bfb935165d9c7853cd590d5fdfd38df23f2f071255ad diff --git a/net-dialup/freeradius/freeradius-3.0.10.ebuild b/net-dialup/freeradius/freeradius-3.0.10.ebuild index 15ecb9d..d1c57da 100644 --- a/net-dialup/freeradius/freeradius-3.0.10.ebuild +++ b/net-dialup/freeradius/freeradius-3.0.10.ebuild @@ -33,6 +33,7 @@ RDEPEND="!net-dialup/cistronradius sys-devel/libtool dev-lang/perl sys-libs/gdbm + sys-libs/talloc python? ( ${PYTHON_DEPS} ) readline? ( sys-libs/readline ) pcap? ( net-libs/libpcap ) diff --git a/net-dialup/freeradius/freeradius-3.0.4.ebuild b/net-dialup/freeradius/freeradius-3.0.4.ebuild deleted file mode 100644 index 15ecb9d..0000000 --- a/net-dialup/freeradius/freeradius-3.0.4.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit autotools eutils pam python-any-r1 user - -PATCHSET=4 - -MY_P="${PN}-server-${PV}" - -DESCRIPTION="Highly configurable free RADIUS server" -SRC_URI=" - ftp://ftp.freeradius.org/pub/radius/${MY_P}.tar.gz - ftp://ftp.freeradius.org/pub/radius/old/${MY_P}.tar.gz -" -HOMEPAGE="http://www.freeradius.org/" - -KEYWORDS="~x86 ~amd64" -LICENSE="GPL-2" -SLOT="0" - -IUSE=" - debug firebird iodbc kerberos ldap mysql odbc oracle pam pcap - postgres python readline sqlite ssl -" -RESTRICT="test firebird? ( bindist )" - -RDEPEND="!net-dialup/cistronradius - !net-dialup/gnuradius - sys-devel/libtool - dev-lang/perl - sys-libs/gdbm - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline ) - pcap? ( net-libs/libpcap ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql ) - firebird? ( dev-db/firebird ) - pam? ( virtual/pam ) - ssl? ( dev-libs/openssl ) - ldap? ( net-nds/openldap ) - kerberos? ( virtual/krb5 ) - sqlite? ( dev-db/sqlite:3 ) - odbc? ( dev-db/unixODBC ) - iodbc? ( dev-db/libiodbc ) - oracle? ( dev-db/oracle-instantclient-basic )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup radius - enewuser radius -1 -1 /var/log/radius radius - - python-any-r1_pkg_setup - export PYTHONBIN="${EPYTHON}" -} - -src_prepare() { - # most of the configuration options do not appear as ./configure - # switches. Instead it identifies the directories that are available - # and run through them. These might check for the presence of - # various libraries, in which case they are not built. To avoid - # automagic dependencies, we just remove all the modules that we're - # not interested in using. - - use ssl || rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} - use ldap || rm -r src/modules/rlm_ldap - use kerberos || rm -r src/modules/rlm_krb5 - use pam || rm -r src/modules/rlm_pam - use python || rm -r src/modules/rlm_python - # Do not install ruby rlm module, bug #483108 - rm -r src/modules/rlm_ruby - - # these are all things we don't have in portage/I don't want to deal - # with myself - rm -r src/modules/rlm_eap/types/rlm_eap_tnc # requires TNCS library - rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 # requires libeap-ikev2 - rm -r src/modules/rlm_opendirectory # requires some membership.h - rm -r src/modules/rlm_redis{,who} # requires redis - rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} - - # sql drivers that are not part of experimental are loaded from a - # file, so we have to remove them from the file itself when we - # remove them. - usesqldriver() { - local flag=$1 - local driver=rlm_sql_${2:-${flag}} - - if ! use ${flag}; then - rm -r src/modules/rlm_sql/drivers/${driver} || die - sed -i -e /${driver}/d src/modules/rlm_sql/stable || die - fi - } - - sed -i \ - -e 's:/var/run/radiusd:/run/radiusd:g' \ - -e '/^run_dir/s:${localstatedir}::g' \ - raddb/radiusd.conf.in || die - - # verbosity - # build shared libraries using jlibtool --shared - sed -i \ - -e '/$(LIBTOOL)/s|--quiet ||g' \ - -e 's:--mode=\(compile\|link\):& --shared:g' \ - Make.inc.in || die - - sed -i \ - -e 's|--silent ||g' \ - -e 's:--mode=\(compile\|link\):& --shared:g' \ - scripts/libtool.mk || die - - # crude measure to stop jlibtool from running ranlib and ar - sed -i \ - -e '/LIBRARIAN/s|".*"|"true"|g' \ - -e '/RANLIB/s|".*"|"true"|g' \ - scripts/jlibtool.c || die - - usesqldriver mysql - usesqldriver postgres postgresql - usesqldriver firebird - usesqldriver iodbc - usesqldriver odbc unixodbc - usesqldriver oracle - usesqldriver sqlite - - epatch_user - - eautoreconf -} - -src_configure() { - # fix bug #77613 - if has_version app-crypt/heimdal; then - myconf="${myconf} --enable-heimdal-krb5" - fi - - use readline || export ac_cv_lib_readline=no - use pcap || export ac_cv_lib_pcap_pcap_open_live=no - - # do not try to enable static with static-libs; upstream is a - # massacre of libtool best practices so you also have to make sure - # to --enable-shared explicitly. - econf \ - --enable-shared \ - --disable-static \ - --disable-ltdl-install \ - --with-system-libtool \ - --with-system-libltdl \ - --with-ascend-binary \ - --with-udpfromto \ - --with-dhcp \ - --with-iodbc-include-dir=/usr/include/iodbc \ - --with-experimental-modules \ - --with-docdir=/usr/share/doc/${PF} \ - --with-logdir=/var/log/radius \ - $(use_enable debug developer) \ - $(use_with ldap edir) \ - $(use_with ssl openssl) \ - ${myconf} -} - -src_compile() { - # verbose, do not generate certificates - emake \ - Q='' ECHO=true \ - LOCAL_CERT_PRODUCTS='' -} - -src_install() { - dodir /etc - diropts -m0750 -o root -g radius - dodir /etc/raddb - diropts -m0750 -o radius -g radius - dodir /var/log/radius - keepdir /var/log/radius/radacct - diropts - - # verbose, do not install certificates - emake -j1 \ - Q='' ECHO=true \ - LOCAL_CERT_PRODUCTS='' \ - R="${D}" \ - install - - fowners -R root:radius /etc/raddb - - pamd_mimic_system radiusd auth account password session - - dodoc CREDITS - - rm "${D}/usr/sbin/rc.radiusd" - - newinitd "${FILESDIR}/radius.init-r3" radiusd - newconfd "${FILESDIR}/radius.conf-r3" radiusd - - prune_libtool_files -} - -pkg_config() { - if use ssl; then - cd "${ROOT}"/etc/raddb/certs - ./bootstrap - fi -} - -pkg_preinst() { - if ! has_version ${CATEGORY}/${PN} && use ssl; then - elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able" - elog "to start the radiusd service." - fi -} diff --git a/net-dialup/freeradius/freeradius-3.0.8.ebuild b/net-dialup/freeradius/freeradius-3.0.8.ebuild deleted file mode 100644 index 15ecb9d..0000000 --- a/net-dialup/freeradius/freeradius-3.0.8.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit autotools eutils pam python-any-r1 user - -PATCHSET=4 - -MY_P="${PN}-server-${PV}" - -DESCRIPTION="Highly configurable free RADIUS server" -SRC_URI=" - ftp://ftp.freeradius.org/pub/radius/${MY_P}.tar.gz - ftp://ftp.freeradius.org/pub/radius/old/${MY_P}.tar.gz -" -HOMEPAGE="http://www.freeradius.org/" - -KEYWORDS="~x86 ~amd64" -LICENSE="GPL-2" -SLOT="0" - -IUSE=" - debug firebird iodbc kerberos ldap mysql odbc oracle pam pcap - postgres python readline sqlite ssl -" -RESTRICT="test firebird? ( bindist )" - -RDEPEND="!net-dialup/cistronradius - !net-dialup/gnuradius - sys-devel/libtool - dev-lang/perl - sys-libs/gdbm - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline ) - pcap? ( net-libs/libpcap ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql ) - firebird? ( dev-db/firebird ) - pam? ( virtual/pam ) - ssl? ( dev-libs/openssl ) - ldap? ( net-nds/openldap ) - kerberos? ( virtual/krb5 ) - sqlite? ( dev-db/sqlite:3 ) - odbc? ( dev-db/unixODBC ) - iodbc? ( dev-db/libiodbc ) - oracle? ( dev-db/oracle-instantclient-basic )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup radius - enewuser radius -1 -1 /var/log/radius radius - - python-any-r1_pkg_setup - export PYTHONBIN="${EPYTHON}" -} - -src_prepare() { - # most of the configuration options do not appear as ./configure - # switches. Instead it identifies the directories that are available - # and run through them. These might check for the presence of - # various libraries, in which case they are not built. To avoid - # automagic dependencies, we just remove all the modules that we're - # not interested in using. - - use ssl || rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} - use ldap || rm -r src/modules/rlm_ldap - use kerberos || rm -r src/modules/rlm_krb5 - use pam || rm -r src/modules/rlm_pam - use python || rm -r src/modules/rlm_python - # Do not install ruby rlm module, bug #483108 - rm -r src/modules/rlm_ruby - - # these are all things we don't have in portage/I don't want to deal - # with myself - rm -r src/modules/rlm_eap/types/rlm_eap_tnc # requires TNCS library - rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 # requires libeap-ikev2 - rm -r src/modules/rlm_opendirectory # requires some membership.h - rm -r src/modules/rlm_redis{,who} # requires redis - rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} - - # sql drivers that are not part of experimental are loaded from a - # file, so we have to remove them from the file itself when we - # remove them. - usesqldriver() { - local flag=$1 - local driver=rlm_sql_${2:-${flag}} - - if ! use ${flag}; then - rm -r src/modules/rlm_sql/drivers/${driver} || die - sed -i -e /${driver}/d src/modules/rlm_sql/stable || die - fi - } - - sed -i \ - -e 's:/var/run/radiusd:/run/radiusd:g' \ - -e '/^run_dir/s:${localstatedir}::g' \ - raddb/radiusd.conf.in || die - - # verbosity - # build shared libraries using jlibtool --shared - sed -i \ - -e '/$(LIBTOOL)/s|--quiet ||g' \ - -e 's:--mode=\(compile\|link\):& --shared:g' \ - Make.inc.in || die - - sed -i \ - -e 's|--silent ||g' \ - -e 's:--mode=\(compile\|link\):& --shared:g' \ - scripts/libtool.mk || die - - # crude measure to stop jlibtool from running ranlib and ar - sed -i \ - -e '/LIBRARIAN/s|".*"|"true"|g' \ - -e '/RANLIB/s|".*"|"true"|g' \ - scripts/jlibtool.c || die - - usesqldriver mysql - usesqldriver postgres postgresql - usesqldriver firebird - usesqldriver iodbc - usesqldriver odbc unixodbc - usesqldriver oracle - usesqldriver sqlite - - epatch_user - - eautoreconf -} - -src_configure() { - # fix bug #77613 - if has_version app-crypt/heimdal; then - myconf="${myconf} --enable-heimdal-krb5" - fi - - use readline || export ac_cv_lib_readline=no - use pcap || export ac_cv_lib_pcap_pcap_open_live=no - - # do not try to enable static with static-libs; upstream is a - # massacre of libtool best practices so you also have to make sure - # to --enable-shared explicitly. - econf \ - --enable-shared \ - --disable-static \ - --disable-ltdl-install \ - --with-system-libtool \ - --with-system-libltdl \ - --with-ascend-binary \ - --with-udpfromto \ - --with-dhcp \ - --with-iodbc-include-dir=/usr/include/iodbc \ - --with-experimental-modules \ - --with-docdir=/usr/share/doc/${PF} \ - --with-logdir=/var/log/radius \ - $(use_enable debug developer) \ - $(use_with ldap edir) \ - $(use_with ssl openssl) \ - ${myconf} -} - -src_compile() { - # verbose, do not generate certificates - emake \ - Q='' ECHO=true \ - LOCAL_CERT_PRODUCTS='' -} - -src_install() { - dodir /etc - diropts -m0750 -o root -g radius - dodir /etc/raddb - diropts -m0750 -o radius -g radius - dodir /var/log/radius - keepdir /var/log/radius/radacct - diropts - - # verbose, do not install certificates - emake -j1 \ - Q='' ECHO=true \ - LOCAL_CERT_PRODUCTS='' \ - R="${D}" \ - install - - fowners -R root:radius /etc/raddb - - pamd_mimic_system radiusd auth account password session - - dodoc CREDITS - - rm "${D}/usr/sbin/rc.radiusd" - - newinitd "${FILESDIR}/radius.init-r3" radiusd - newconfd "${FILESDIR}/radius.conf-r3" radiusd - - prune_libtool_files -} - -pkg_config() { - if use ssl; then - cd "${ROOT}"/etc/raddb/certs - ./bootstrap - fi -} - -pkg_preinst() { - if ! has_version ${CATEGORY}/${PN} && use ssl; then - elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able" - elog "to start the radiusd service." - fi -}