From e23cdda4dbb0c83b9e682ab5e916085a35203da5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Jun 2018 07:00:28 +0100 Subject: gentoo resync : 23.06.2018 --- net-dialup/Manifest.gz | Bin 6560 -> 6555 bytes net-dialup/freeradius/Manifest | 6 +- net-dialup/freeradius/freeradius-3.0.16.ebuild | 227 ------------------------- net-dialup/freeradius/freeradius-3.0.17.ebuild | 13 +- net-dialup/freeradius/metadata.xml | 15 +- net-dialup/ppp/Manifest | 2 +- net-dialup/ppp/ppp-2.4.7-r6.ebuild | 12 +- 7 files changed, 37 insertions(+), 238 deletions(-) delete mode 100644 net-dialup/freeradius/freeradius-3.0.16.ebuild (limited to 'net-dialup') diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz index 45696feba187..a22b696d9c02 100644 Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest index ea8de1af7096..235c05800bbd 100644 --- a/net-dialup/freeradius/Manifest +++ b/net-dialup/freeradius/Manifest @@ -3,9 +3,7 @@ AUX freeradius.tmpfiles 36 BLAKE2B 612c6ca79a678a3a82114ec142d33aa831b5b19c3e677 AUX radius.conf-r4 465 BLAKE2B 1c17f57c088be0612b3db23e8a909d7e1f6fc114d3ff31ee1c82f199e3962db57f3042498cf135b3a29c8a730695ed99612e490e0b3253f0644462d28f61215d SHA512 4142869fb61b2938232002c9cb5b843590785560da7db4f2b2a9c9d55c76d0e2d4a6cb946a5347dfa505cd82f5e86c7315cf71f3443a86632090cf4bd025748a AUX radius.init-r3 734 BLAKE2B ba6918cf5da5ad29ca8062045c3318c2bb30e0a803bc6e6bb9104fe6e8bc2f662bddb4749e6fa57fda55d57ad41b2cb4014d5efcac557a2213f190a5dcc2f7b6 SHA512 826fd3fd576b09e7e590095b1ac63dfaec587a3b46ae1ccdec68134264fb689827aea4a446522bc2a253b9885469b6788a3dddc466ad47483dd62ef67262de49 DIST freeradius-server-3.0.15.tar.gz 4818244 BLAKE2B 24cded2c4f0c6fc6a6135058c40bb2c9d100a55161f2edfc388efba991ff85ecd0f546bc2008cc0c50f2753cf93ece8e67dc3fc0fe13a8b935193ff1f68514b9 SHA512 9b92045b445032bde9d421499fdc0f6a08d602c501730c31a8d3974b21cc5c12c78abb024ed62a176c7aa7fe260fe1d19386aaf558e0fecfcd3a0ba7aa47499c -DIST freeradius-server-3.0.16.tar.gz 4833927 BLAKE2B 48a991da9fec7594f1bd5bd9c713138755b746473b30d54bbbe2be06759375c1b1ba3925234ebf683a9686e5535a37122a38a708a058909c8cde22bd36641aeb SHA512 ec2fa1d28fb722d84327eed8670931f5a9220e724e0c12965f0a217ae63b0bc089ea1cfb4878420c1f2a7cf9e2abbb8d3be645c4e21170732c915f1f2953d84b DIST freeradius-server-3.0.17.tar.gz 4843020 BLAKE2B 9e1f54a9f5ad8ede471881ffe4ec987c3ac655a3c39fcd920094760c006102be02f3b7f25b14379a0bac876ac0944e8698c2781bbd804cd22d8b915b6c13a693 SHA512 381222e452288c56a1bf68953be57379a5568f0c92de022abc3004cc6a15078d46535b867b31801de3eb096ba7af92e745e79decfa7cc8151a1ffb371b1aea79 EBUILD freeradius-3.0.15.ebuild 5995 BLAKE2B 2685b85c868d06961a1d552ff88371b485d090f08806d960a97e302361dad61238ffdacf7fa292403a3f652efe9ceff510ee1c53932bd68869a222dcc354555b SHA512 1dc84e269e26768da54a05a46e7e539b6ba06c5d5fd7ca3fd255457aca3d9e64cc4adc7a7a3d45cbe956c25a698b51bc6f5c20bd6b899e044363887cac1994b4 -EBUILD freeradius-3.0.16.ebuild 5980 BLAKE2B e3b8add5223ec7e5eadcb74e03447ba6bfb5a5aa3f7b84259bb622bf1e9df2e9cd726a63ea823c6b1c04818163c705fbaf2511713f904c16b08b92cf9a1571c0 SHA512 dc58857f774a8bce1f76a5a37641c54356cf41e3595a571c441e36299f7675e298030542ddf6a6a2987e58790b6de62b365921d764ed4390237aeb0c6b32e53e -EBUILD freeradius-3.0.17.ebuild 5980 BLAKE2B e3b8add5223ec7e5eadcb74e03447ba6bfb5a5aa3f7b84259bb622bf1e9df2e9cd726a63ea823c6b1c04818163c705fbaf2511713f904c16b08b92cf9a1571c0 SHA512 dc58857f774a8bce1f76a5a37641c54356cf41e3595a571c441e36299f7675e298030542ddf6a6a2987e58790b6de62b365921d764ed4390237aeb0c6b32e53e -MISC metadata.xml 295 BLAKE2B 6b974fb9bc56043133ad2b9df88f5499018638e806eec1520b676ee15e181243735c2474f53fe312c05615c713734debb9ce18470c6533c77d1f450f3d7829d3 SHA512 4f6cbe1b6931f4d672943e6cbb8e82dc66af63245027d4c1b791697bc492f8a9cc1dfe937fc59fc19f03713293458b27fc721d9b9a6bf43d2938d09a91ca4fbc +EBUILD freeradius-3.0.17.ebuild 6384 BLAKE2B 65d5245912bfc975dd3bc259fe3e3e4ac130e47ce53dfc5f3ba9fe5782e9006e24334471a1997bdf80a603604717b9d318b93dd96b0aa737ae7ded299a32927d SHA512 5257fb0463b00582676a9af1325e8ed977341317bf513615c026799d101816cfb6e6288223f4ba789faa4104fd9a77e50bd0188a57b8c74432423c75107af38a +MISC metadata.xml 719 BLAKE2B ae0beb2d6330f89d5c202cdb2cc01427f8c96728567921b985b3ec41f88218088da9a5efd522fff0870f1954281efd6c0893ffdd24603d73575431d1ad94d620 SHA512 b571e889f1133154da1994513b0f7643f2a0c853f75ea357154ec8e22957256b6ff2e2ef375d16c791ab8e1cafb4f46e46db72e1d9c22c94f8d4c4a37cf87477 diff --git a/net-dialup/freeradius/freeradius-3.0.16.ebuild b/net-dialup/freeradius/freeradius-3.0.16.ebuild deleted file mode 100644 index 2920c24ee947..000000000000 --- a/net-dialup/freeradius/freeradius-3.0.16.ebuild +++ /dev/null @@ -1,227 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -inherit autotools pam python-single-r1 systemd user - -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="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -LICENSE="GPL-2" -SLOT="0" - -IUSE=" - debug firebird iodbc kerberos ldap libressl 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:= - sys-libs/talloc - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - pcap? ( net-libs/libpcap ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql:= ) - firebird? ( dev-db/firebird ) - pam? ( virtual/pam ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - 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}" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup radius - enewuser radius -1 -1 /var/log/radius radius - - python-single-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} || die ; } - use ldap || { rm -r src/modules/rlm_ldap || die ; } - use kerberos || { rm -r src/modules/rlm_krb5 || die ; } - use pam || { rm -r src/modules/rlm_pam || die ; } - use python || { rm -r src/modules/rlm_python || die ; } - # Do not install ruby rlm module, bug #483108 - rm -r src/modules/rlm_ruby || die - - # 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 || die # requires TNCS library - rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2 - rm -r src/modules/rlm_opendirectory || die # requires some membership.h - rm -r src/modules/rlm_redis{,who} || die # requires redis - rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die - - # 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:^#\tuser = :\tuser = :g' \ - -e 's:^#\tgroup = :\tgroup = :g' \ - -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 - - default - - eautoreconf -} - -src_configure() { - # 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. - local myeconfargs=( - --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) - ) - # fix bug #77613 - if has_version app-crypt/heimdal; then - myeconfargs+=( --enable-heimdal-krb5 ) - fi - - use readline || export ac_cv_lib_readline=no - use pcap || export ac_cv_lib_pcap_pcap_open_live=no - - econf "${myeconfargs[@]}" -} - -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 - # Parallel install fails (#509498) - 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" || die - - newinitd "${FILESDIR}/radius.init-r3" radiusd - newconfd "${FILESDIR}/radius.conf-r4" radiusd - - systemd_newtmpfilesd "${FILESDIR}"/freeradius.tmpfiles freeradius.conf - systemd_dounit "${FILESDIR}"/freeradius.service - - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die -} - -pkg_config() { - if use ssl; then - cd "${ROOT}"/etc/raddb/certs - ./bootstrap - - chown -R root:radius "${ROOT}"/etc/raddb/certs - 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.17.ebuild b/net-dialup/freeradius/freeradius-3.0.17.ebuild index 2920c24ee947..59c9dfd3515e 100644 --- a/net-dialup/freeradius/freeradius-3.0.17.ebuild +++ b/net-dialup/freeradius/freeradius-3.0.17.ebuild @@ -20,8 +20,8 @@ LICENSE="GPL-2" SLOT="0" IUSE=" - debug firebird iodbc kerberos ldap libressl mysql odbc oracle pam pcap - postgres python readline sqlite ssl + debug firebird iodbc kerberos ldap libressl memcached mysql odbc oracle pam + pcap postgres python readline rest samba sqlite ssl " RESTRICT="test firebird? ( bindist )" @@ -34,12 +34,15 @@ RDEPEND="!net-dialup/cistronradius python? ( ${PYTHON_DEPS} ) readline? ( sys-libs/readline:0= ) pcap? ( net-libs/libpcap ) + memcached? ( dev-libs/libmemcached ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) firebird? ( dev-db/firebird ) pam? ( virtual/pam ) + rest? ( dev-libs/json-c:= ) + samba? ( net-fs/samba ) ssl? ( - !libressl? ( dev-libs/openssl:0= ) + !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) ) ldap? ( net-nds/openldap ) @@ -73,8 +76,12 @@ src_prepare() { use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; } use ldap || { rm -r src/modules/rlm_ldap || die ; } use kerberos || { rm -r src/modules/rlm_krb5 || die ; } + use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; } use pam || { rm -r src/modules/rlm_pam || die ; } use python || { rm -r src/modules/rlm_python || die ; } + use rest || { rm -r src/modules/rlm_rest || die ; } + # can't just nuke rlm_mschap because many modules rely on smbdes.h + use samba || { rm -r src/modules/rlm_mschap/{configure,*.mk} || die ; } # Do not install ruby rlm module, bug #483108 rm -r src/modules/rlm_ruby || die diff --git a/net-dialup/freeradius/metadata.xml b/net-dialup/freeradius/metadata.xml index fa9540c73dc9..ff1258ca8492 100644 --- a/net-dialup/freeradius/metadata.xml +++ b/net-dialup/freeradius/metadata.xml @@ -1,10 +1,23 @@ - + + herb@hlmjr.com + Herb Miller Jr. (herbmillerjr) + + + proxy-maint@gentoo.org + Proxy Maintainers + + + Include dev-libs/libmemcached in caching drivers + Build the RADIUS sniffer which requires net-libs/libpcap. + + Include support for sending and receiving HTTP requests + diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest index 5360a5394f6e..dfb810d69d26 100644 --- a/net-dialup/ppp/Manifest +++ b/net-dialup/ppp/Manifest @@ -7,5 +7,5 @@ DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 EBUILD ppp-2.4.7-r3.ebuild 6802 BLAKE2B 499a46c7792023bcc00bf4c1fa8a750092765de7738d4875eb350eaed6e9d2ef5c409eb323e60af7603a27dafb089a2f97e9339709caa47d3ce6001cf116283b SHA512 371aac305e679b5297d99971c48ad8c4384a8368b760896d23f3016f4219001cfc618c11a0f9cb876e577ceb1d36488efa06a51d75685982030c26701c066647 EBUILD ppp-2.4.7-r5.ebuild 6843 BLAKE2B a774f4c699de7661e5b344f3647be23ca16f18e26d95e4d9663b68da978351cfd885251fa47374a0d7ea31e0d799da1fc6ea4e66e8c9274f4c4383e5d0e4971f SHA512 13803f3071272f6b0385e95740fe0b25045cfa88a09efab75634ff9e324b0dcbf7962dd291b6cf7d714769c19bfbc351b1fbd65f7faceaa6a659594657bc2efc -EBUILD ppp-2.4.7-r6.ebuild 6825 BLAKE2B 85a6d01423faef378c5974745e69807bdf42edf58d95eeab30ff28f14881a33ac8f286ab537740fc355d1bff693a6a01a784c587ea080f6cda79de6c1eaeb2bd SHA512 034fe0c5e71732b50dc7b68390e136b4f35fa601001deca16be702290689ee799cc1fc66fed80aa1700d09223e5e89d3b979cade385de55bef78a650b11a50d2 +EBUILD ppp-2.4.7-r6.ebuild 7089 BLAKE2B 1e0af84e2cd4bf680e603e193626ba2aba0f52f9aa6ce53924bb5e9c1d5812e34666e064e3016c68e4470ce18c62fb6159ce56426482a0021eb0356bf1119257 SHA512 648a5b7e1e2cd4d27982380e32e29beb5caa34254bb972c0bea6f7d71d439d698bcb2e0f66936c2d82b085d7e0bdefe55980c042a70659e923dfc9d3fa49815d MISC metadata.xml 1470 BLAKE2B 8e70c742a13d352ff2b16946c6d063cda061e4710e340227d907ca599938b0466f86258d67836eeed6ed189e546ec463703dc0b1e44c1c9a9409c0ef1b74b5ed SHA512 2b00f6c0b4f3079eb885327188e12d151ec3d9682df9a71232b331524d9d3430af5fe342ca4198d926c012059786ec6a7e91fffeec899069a990e032b94b94c4 diff --git a/net-dialup/ppp/ppp-2.4.7-r6.ebuild b/net-dialup/ppp/ppp-2.4.7-r6.ebuild index 5e0743255bf3..b60a527f75cb 100644 --- a/net-dialup/ppp/ppp-2.4.7-r6.ebuild +++ b/net-dialup/ppp/ppp-2.4.7-r6.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz LICENSE="BSD GPL-2" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius" DEPEND="activefilter? ( net-libs/libpcap ) @@ -86,11 +86,19 @@ src_prepare() { sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die fi + # Respect our pkg-config settings. + sed -i \ + -e 's:pkg-config:$(PKG_CONFIG):' \ + contrib/pppgetpass/Makefile.linux || die + sed -i \ + -e '/^LIBS/{s:-L/usr/local/ssl/lib::;s:-lcrypto:`$(PKG_CONFIG) --libs libcrypto`:}' \ + pppd/Makefile.linux || die + eapply_user #549588 } src_compile() { - tc-export AR CC + tc-export AR CC PKG_CONFIG emake COPTS="${CFLAGS} -D_GNU_SOURCE" # build pppgetpass -- cgit v1.2.3