summaryrefslogtreecommitdiff
path: root/net-dialup
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-01-26 15:48:02 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-01-26 15:48:02 +0000
commit38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch)
tree6fce284d5bfddaf597a490ac66069d16c6a485db /net-dialup
parent0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff)
gentoo resync : 25.01.2018
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/Manifest.gzbin6715 -> 6719 bytes
-rw-r--r--net-dialup/freeradius/Manifest2
-rw-r--r--net-dialup/freeradius/freeradius-3.0.16.ebuild224
-rw-r--r--net-dialup/ppp/Manifest2
-rw-r--r--net-dialup/ppp/ppp-2.4.7-r5.ebuild (renamed from net-dialup/ppp/ppp-2.4.7-r4.ebuild)24
5 files changed, 240 insertions, 12 deletions
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index a1651a9e5b56..45c739b6bfb9 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
Binary files differ
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 15f3225f8fdb..94edd603bac8 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -3,5 +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
EBUILD freeradius-3.0.15.ebuild 5931 BLAKE2B 31a7e822e7b08c263e8c859343cc858875af7e0a8a9a89cc14f9f7b75c9257caccf125d36e1103f00126522198f00a49ef66feef25322454b770e98beb671a09 SHA512 58f8e2b97d09f327d1f857326e86701d580b11369517fafdb8af3525c228a30701ccf2e547e0d513cd09a58feb2d679437cc2113f89c92ca9dede91e5f1ece58
+EBUILD freeradius-3.0.16.ebuild 5916 BLAKE2B 8f1133c8039e55fbae8a0c0a00857c281aabb1301cce31d01d02d00f5a3885e4e8a4535d278d8d5cebbe333de44fa0426ccc6d1fbdb3b11c6036eaf2f5380156 SHA512 7c058fd69a1d21121a8d316f74978e18af08bc4051e15b00ab8d996a2694f8d3bb16431c9947c06bf9d1e37f275ef5b60c6915532a354c87ae258acec1482506
MISC metadata.xml 295 BLAKE2B 6b974fb9bc56043133ad2b9df88f5499018638e806eec1520b676ee15e181243735c2474f53fe312c05615c713734debb9ce18470c6533c77d1f450f3d7829d3 SHA512 4f6cbe1b6931f4d672943e6cbb8e82dc66af63245027d4c1b791697bc492f8a9cc1dfe937fc59fc19f03713293458b27fc721d9b9a6bf43d2938d09a91ca4fbc
diff --git a/net-dialup/freeradius/freeradius-3.0.16.ebuild b/net-dialup/freeradius/freeradius-3.0.16.ebuild
new file mode 100644
index 000000000000..abbb1380d9eb
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.0.16.ebuild
@@ -0,0 +1,224 @@
+# 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 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? ( dev-libs/openssl: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/ppp/Manifest b/net-dialup/ppp/Manifest
index a3521f15637d..9c8f2e6fcf39 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -5,5 +5,5 @@ DIST ppp-2.4.7-patches-5.tar.xz 38680 BLAKE2B 56e4d3a5bc2486144791adf6ffb8a6cf07
DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2
DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
EBUILD ppp-2.4.7-r3.ebuild 6801 BLAKE2B dbd9ede10dbfd48f8cadd08a49fbad552711438c936940fe55257181d718162822345fa397cfcf808dca2251b15ebe95aa8776bb94ba0d0a4cc4b2a278630188 SHA512 5b688e6be27e555e27021dd971aaaca3278fe5f301eadc8ac1dcee0d006b8afe587911ec913c8b51efaecb05d895e9f9a5225add0710def0692214f895bb7e48
-EBUILD ppp-2.4.7-r4.ebuild 6811 BLAKE2B 9775a52a7df42939294f82e9e490e822e35d5cea2be3d4bef9993a61558970a03620572ad1cb5efcedfff2a62a53537cf71dd7b633950561e5ea15a3c2411c49 SHA512 c49aa2614d0de78a4b9c90a7bc1ea1d279a09b090d9d53b1d0dfedc33de5faf31dbe22260a25d9e40de200821ed6f846a94a30eab76dba8bd2f4e79f49acfc69
+EBUILD ppp-2.4.7-r5.ebuild 6842 BLAKE2B f26e980aa3a1ca698058990c53864d78650a6804178f3e905a72dc1f7b366248f8ed65346c0720b5e5bf643cd7ccadb01d11fe998a12c74f18a5a25d8a7d2c8d SHA512 d91756f0ae964e1b82406f9234669dabae266b7e916841d71cd658f7413b6cf4ca978013a3b4bb7b45e46c1d31a43aaeba198e939dd0f7220a50c270ef2b1ca4
MISC metadata.xml 1470 BLAKE2B 8e70c742a13d352ff2b16946c6d063cda061e4710e340227d907ca599938b0466f86258d67836eeed6ed189e546ec463703dc0b1e44c1c9a9409c0ef1b74b5ed SHA512 2b00f6c0b4f3079eb885327188e12d151ec3d9682df9a71232b331524d9d3430af5fe342ca4198d926c012059786ec6a7e91fffeec899069a990e032b94b94c4
diff --git a/net-dialup/ppp/ppp-2.4.7-r4.ebuild b/net-dialup/ppp/ppp-2.4.7-r5.ebuild
index 06151c548336..d4a55aff1e0d 100644
--- a/net-dialup/ppp/ppp-2.4.7-r4.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit eutils linux-info multilib pam toolchain-funcs
+inherit linux-info multilib pam toolchain-funcs
PATCH_VER="5"
DESCRIPTION="Point-to-Point Protocol (PPP)"
@@ -32,9 +32,10 @@ PDEPEND="net-dialup/ppp-scripts"
src_prepare() {
mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
- use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*"
- EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}"/patch
+ if ! use eap-tls ; then
+ rm "${WORKDIR}"/patch/8?_all_eaptls-* || die
+ fi
+ eapply "${WORKDIR}"/patch
if use atm ; then
einfo "Enabling PPPoATM support"
@@ -55,6 +56,7 @@ src_prepare() {
if use ipv6 ; then
einfo "Enabling IPv6"
sed -i '/#HAVE_INET6/s:#::' pppd/Makefile.linux || die
+ echo "+ipv6" >> etc.ppp/options || die
fi
einfo "Enabling CBCP"
@@ -62,9 +64,9 @@ src_prepare() {
if use dhcp ; then
einfo "Adding ppp-dhcp plugin files"
- sed -i \
+ sed \
-e '/^SUBDIRS :=/s:$: dhcp:' \
- pppd/plugins/Makefile.linux || die
+ -i pppd/plugins/Makefile.linux || die
fi
# Set correct libdir
@@ -73,9 +75,9 @@ src_prepare() {
if use radius ; then
#set the right paths in radiusclient.conf
- sed -i -e "s:/usr/local/etc:/etc:" \
+ sed -e "s:/usr/local/etc:/etc:" \
-e "s:/usr/local/sbin:/usr/sbin:" \
- pppd/plugins/radius/etc/radiusclient.conf || die
+ -i pppd/plugins/radius/etc/radiusclient.conf || die
#set config dir to /etc/ppp/radius
sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
pppd/plugins/radius/{*.8,*.c,*.h} \
@@ -85,7 +87,7 @@ src_prepare() {
sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
fi
- epatch_user # 549588
+ eapply_user #549588
}
src_compile() {