From 05b8b0e0af1d72e51a3ee61522941bf7605cd01c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 Jul 2020 14:05:23 +0100 Subject: gentoo resync : 04.07.2020 --- net-dialup/Manifest.gz | Bin 6056 -> 6057 bytes net-dialup/freeradius-client/Manifest | 2 +- .../freeradius-client-1.1.7-r1.ebuild | 9 +- net-dialup/rp-pppoe/Manifest | 4 + net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild | 96 +++++++++++++++++++++ 5 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild (limited to 'net-dialup') diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz index fad47370f67b..b533fa1ef50d 100644 Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ diff --git a/net-dialup/freeradius-client/Manifest b/net-dialup/freeradius-client/Manifest index 4655e3d0fa24..8ca1f2d0e1d4 100644 --- a/net-dialup/freeradius-client/Manifest +++ b/net-dialup/freeradius-client/Manifest @@ -1,4 +1,4 @@ DIST freeradius-client-1.1.7.tar.gz 433141 BLAKE2B 3a1ba65eb8b66d28362fd66a905af0a4e12b67e664da2c64dab87616e3787cded58d0c3bf56705bdb879d41f1a9a984cf5256b06eeb382209caebf748f679e12 SHA512 20e79ec97da79f46b334e1c2880803a692885a4038196a4d016094d349f675e2d0521d921140c5ab06703008619417f7a20d3e90cdfc7b3578faccbd232be0ce -EBUILD freeradius-client-1.1.7-r1.ebuild 975 BLAKE2B 94b9ba767e1bdbecc90ac1de3245cf97aac3b2ea2e3a064002c2af1aa4b3f84fae2bc4d41afd456f233420fe5f6e1bc7a4096e7ef8036c3919d03d4ab9d39014 SHA512 69e680f941e69e8524bd26cdbcbeb4d3ba952ec01490a1e74094f0a716706ead3cee7e246273786efd293d2422e57b2dcaf441331eda4d586bc4ead4333fef00 +EBUILD freeradius-client-1.1.7-r1.ebuild 1163 BLAKE2B 246604b5aafb6d0f603cc410bd3cac7906e36f089f66edd6f0a290714bcac06e43987482069e444707c79044de64ffa15b795cfe2f0f4ce9e7c90f580ceba510 SHA512 3a3acb9be24723974f91351ee9461d2af7442d57688a714acd7d15a8e24fcaaa4749f341b168610b3e2292663cec4c69f4b9922ed216839bc5a9738a0b77eb8c EBUILD freeradius-client-1.1.7.ebuild 836 BLAKE2B 38271f1900af8aaf48a0fdfb5247ff33660c52086bb4c92065b9cb30669d54e3fc3d686f814c09a55271fcae3db4f6fc4572f2540bffb4c134b874f0574f88cd SHA512 718cba62d2996bdbd4c38bca123e35862ea99a34f08b66c61523498c1d3efcfde8eef41b9c71846b5e2973875c86f1c8404ea9ad14c91a073e4d3c6ba0ce6dff MISC metadata.xml 937 BLAKE2B dd3e76a7a6a71b1d0ad75eb4190154124c8c15c8026ee35947067fc403369a348117dbb72f3986b81234777896aeef6ebc32f6ad32e6d41ae24dc772e9f57a28 SHA512 49a0f971e1bac986e6f6dfb02370011afeda182eb733b1c11cc1307d43881fadf924af84c42d8ed44937a01faa9b5793a8ec112e87d6648ba0d1737ee4c5495d diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild index f9ac8661b098..0b182155d465 100644 --- a/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild +++ b/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools +inherit autotools toolchain-funcs DESCRIPTION="FreeRADIUS Client framework" HOMEPAGE="https://wiki.freeradius.org/project/Radiusclient" @@ -31,12 +31,19 @@ src_prepare() { } src_configure() { + tc-export AR + local myeconfargs=( $(use_enable scp) $(use_enable shadow) --with-secure-path ) econf "${myeconfargs[@]}" + + for MAKEFILE in $(find -name Makefile) libtool; do + sed -i "s|/usr/bin/ar|${AR}|" "${MAKEFILE}" || \ + die "Patching ${MAKEFILE} for ${AR} failed" + done } src_install() { diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest index b836c9cb78f7..6f905d1cb22a 100644 --- a/net-dialup/rp-pppoe/Manifest +++ b/net-dialup/rp-pppoe/Manifest @@ -13,8 +13,12 @@ AUX rp-pppoe-3.12-linux-headers.patch 681 BLAKE2B 79198d765c1c114cc8bb87de7254e3 AUX rp-pppoe-3.13-autotools.patch 3537 BLAKE2B dda2e4494e29248b2d829bacb272f60fd03a378d93f463c4eaac2cba659039857ca04f4daaf07399ab9992c10e6a94260d42117c6a9f1d38707f43dfe2858c83 SHA512 1068dae2a50923f35d9d81da6f359b48e96fc9dc321ddc9cd3fd6462f066feb1985a10f6cdbf8e75ad6cf00ab064f4695d3d4135a14e20f837b93f3e881c4029 AUX rp-pppoe-3.13-linux-headers.patch 608 BLAKE2B 22ea43655b50eb38e2ae0e9ceca19063e44bb3bd7277269cbacc39c109df30c8709bc4b27cf4de07d3d2005875b921ee8bac8ff5588c612fd5caba5df2ccb3d8 SHA512 7a7458004e255a20698ae4cfef4ca0c67f7acf556963019bc4a23f256a92d882c9e9de1d1d097bfab0fb05181050263e4d84b46450f63579565f5f8b79e75b6d DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2 +DIST ppp-2.4.8.tar.gz 697530 BLAKE2B 235114288699db45501bc7d9ce8f36c0b5684ab0dab09da93d7f2b4f7c3eca030ae26e34dfff25efa971374fbd7fde62f121ea6aa69872658f44c5ac8c7850a2 SHA512 a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478 DIST rp-pppoe-3.12.tar.gz 224125 BLAKE2B 27fe75e794624acaeb81806d67a6f4e5601a6b6a466100898ae3cccc8acb5f72ad9275fecd28735df1b01162ff0e60b74ad0373a24a60c7a5731b0744b86e019 SHA512 1b9e4c806fcbad1bc21f7b74a780ae98682b10a69d91fb08df6dbd1fff86f6271995ebded43f926f8249a17cdddb541edccbbb3ee28e1a2dc89173ad61cd3de1 DIST rp-pppoe-3.13.tar.gz 224204 BLAKE2B 8ac3cd59c809f7f2e10fea580dfbda20fc99ae443851513cdc6d0ba8e8df848d7bd6f10d2b0ac6592bc4b48ee1945c299d3cbd73eb9dd6ddc23d0c1c39cd1b77 SHA512 e29ddc39252a0e71d509096e275f6f195f86a5871052dd558e8fb174d13086b1c601e6652f45619279a1eb2fbda96ba0ec85dea9edb27459af56ded4a52b5f36 +DIST rp-pppoe-3.14-patches-01.tar.xz 4708 BLAKE2B d0c294490f5c4c8f3f81fccb8234d5eec2257350a41206bf05882aa7e2aa0e2cb0944a962d77e23451f604376168298d5ef99c70b134989c35261bae6046b882 SHA512 0ae0f91e8b9cfcd7d1a1af6cb55f7972e9bc029cd4b10469d5be696ae750d6aabb5f59426e9bf6f700d5a56decd3ddf85a097bb98ae1d06f0b167967b5b8b8ea +DIST rp-pppoe-3.14.tar.gz 224688 BLAKE2B bfac215d206ce53ead2a10d5440f8243cce4763f7ef15d52f7bd609e8eebdebf5bc52204350988cb1d1b69d1df9092aca77173333e753e8bb9752ead8618569c SHA512 0fa26e9478d387d4752ab85837dab9d1464f27c1ca832bad265deb01b5c3565aa341e3c75278b43a56aed466f02861af11b3bc64bae932a13cb103c4f0b91a29 EBUILD rp-pppoe-3.12-r1.ebuild 2634 BLAKE2B 911848e6fae959fa2f5c48c66aa96a7d48a392026956c176457867477859d20351eb531937d74e9602388b5671dd080332a3895dd1ad10264b38f651cd59175f SHA512 fc6889b4bc7823c723e9ff4c194fcb71515a73b2f2061408e916ea6afa76f8de8e81c0fd12b8c4ec32f8d13d47e6733b59e9bd1264fcde5d92846c75c8ae7599 EBUILD rp-pppoe-3.13.ebuild 2901 BLAKE2B 1dfcb9aed579522e18c5c776e6679e902958e387772122517f9a80d852956b6c06efd5fa821555110901de69e4d72073e9ddcaaee7d6502a2fe74ece0cf52b8e SHA512 0679726862627bccb3027c6182de44948946d876c0ce1be9ce765f53ee23f52920b9e5dffe4bbeb1584047ad30a8f3c6691966a1d31707b392faa1a8e65fcd85 +EBUILD rp-pppoe-3.14.ebuild 2319 BLAKE2B 86abf4dc3464a88e97bdb13ac8090a62180b4207c4448af5df213b90a55bb1f381645ea722786b5fd9657219177e37b601fe8ee0df7746d8b23b8fb132402fcc SHA512 a7f6f0d5ad247db53aa92aeb0a5ef0d7237f200ccb140516243bd79f750e3b4cd46196f0f46c1863ee45af3a98671df8aea3a302d81361f54b1c9c06145d6b70 MISC metadata.xml 370 BLAKE2B 00e0195d903d9fe379c0c8662f4019dd55a53f7027ade12f314f8007f9edbb6b4a5e5bccef2897d97ee3d2164a169efcad607548dbf53d363b72a360b57444b3 SHA512 ebfae7addd585ee6f01b45921b1ba6a1c824c6e34f8f6a3c6d2fd917d7b17aceffca5f6a4ca1c7b135a34c679394417b73a23e067daed8a2c4b71fa63536c849 diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild new file mode 100644 index 000000000000..eaaeb1d3a7c8 --- /dev/null +++ b/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs + +PPP_P="ppp-2.4.8" +PATCHES="${P}-patches-01" + +DESCRIPTION="A user-mode PPPoE client and server suite for Linux" +HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/" +SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz + https://github.com/paulusmack/ppp/archive/${PPP_P}.tar.gz + https://dev.gentoo.org/~polynomial-c/dist/${PATCHES}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="tk" + +RDEPEND=" + net-dialup/ppp:= + tk? ( dev-lang/tk:= ) +" +DEPEND=">=sys-kernel/linux-headers-2.6.25 + ${RDEPEND}" + +DOC_CONTENTS="Use pppoe-setup to configure your dialup connection" + +pkg_setup() { + # This is needed in multiple phases + PPPD_VER=$(best_version net-dialup/ppp) + PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV} +} + +src_prepare() { + if ! use elibc_musl ; then + rm "${WORKDIR}/patches/${PN}-3.14-musl.patch" || die + fi + + eapply "${WORKDIR}/patches" + eapply_user + + cd "${S}"/src || die + eautoreconf +} + +src_configure() { + addpredict /dev/ppp + + cd src || die + # Not a mistake! This comes from the GitHub tarball doing funky naming + econf --enable-plugin=../../ppp-ppp-${PPPD_VER} +} + +src_compile() { + cd src || die + emake AR="$(tc-getAR)" + + if use tk; then + emake -C "${S}/gui" + fi +} + +src_install() { + cd src || die + emake DESTDIR="${D}" install + + #Don't use compiled rp-pppoe plugin - see pkg_preinst below + local pppoe_plugin="${ED}/etc/ppp/plugins/rp-pppoe.so" + if [[ -f "${pppoe_plugin}" ]] ; then + rm "${pppoe_plugin}" || die + fi + + if use tk ; then + emake -C "${S}/gui" \ + DESTDIR="${D}" \ + datadir=/usr/share/doc/${PF}/ \ + install + dosym doc/${PF}/tkpppoe /usr/share/tkpppoe + fi + + newinitd "${FILESDIR}"/pppoe-server.initd pppoe-server + newconfd "${FILESDIR}"/pppoe-server.confd pppoe-server + + readme.gentoo_create_doc +} + +pkg_preinst() { + # Use the rp-pppoe plugin that comes with net-dialup/pppd + if [[ -n "${PPPD_VER}" ]] && [[ -f "${EROOT}/usr/$(get_libdir)/pppd/${PPPD_VER}/rp-pppoe.so" ]] ; then + dosym ../../../usr/$(get_libdir)/pppd/${PPPD_VER}/rp-pppoe.so /etc/ppp/plugins/rp-pppoe.so + fi +} -- cgit v1.2.3