commit: 08b40cf9de14d259571e389b502d68476946fc05
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Mon Sep 4 09:18:14 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 13:39:29 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=08b40cf9
net-dialup/ppp: revbump
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-dialup/ppp/Manifest | 4 ++--
.../{ppp-2.4.7-r99.ebuild => ppp-2.4.7-r3.ebuild} | 28 ++++++++++------------
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 1876ffb..08e18b5 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -2,8 +2,8 @@ AUX README.mpls 530 SHA256
5ef99aba902533fe9d17b7dfaf91e72b638cc70b9f811d1e51882
AUX modules.ppp 299 SHA256
8947dd48d3d0c128166edc9bb0917b9af88502296fad791d6d90bf165ca50db3 SHA512
58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041
WHIRLPOOL
dfc2d6fb1a36b74b0dd998739bb1c5977234c2d88100f686fb6faae2826795b0ca217937a7775660421f5ebc356e5e1378849ac6e56fef018eceab6f90bb26e3
AUX ppp-2.4.7-dhcp-musl.patch 1943 SHA256
2c76bf44407ebb917c0c7db7b1d7c7253e6d67efa16edfbd6906b7cd18e5951b SHA512
26cbbe527a8bf950d983f124b78b6b65fcd5f37ff9af20ec8ffcd7b4cb42d507ec80270361c7993a4cd96f78b170da5b5818f10146f76f193f9cd958f0014eec
WHIRLPOOL
d2578dbdf9a9b1215584bf77c0a725e7c0785880ad09a8b27cacb6f79655338d1e3609d984a8a523dc41392edc658ba0d161a5ea5639569b7be247ef9b4d1276
AUX ppp-2.4.7-musl.patch 5350 SHA256
91e67a03538b1146584b784bfd41f33eb4d0587af66e6df442a3a2ffa259c8af SHA512
ce6381280c5299933ee55cc1039874e9d33900e28198939263ca4b78e1c1b8e88939e198c4e313e7f05ba6d85ff33e8d5ccd5c5ba12c7acfff6d96e767738179
WHIRLPOOL
bf6d148ba578ffcdd169c966d13daa541d478a2d400e1a1aad53b52d0e11b55d14b23d0f78f3f9dbb8b3cfd56ea4641d2a15224fcc47fc996c4779429d4e397a
-DIST ppp-2.4.7-patches-1.tar.xz 38852 SHA256
442e619ab33afe4c8d9999295a221699917604dbc55171cdef6fb2094bf0aaf6 SHA512
105c68cbabcc860498bdb583598fc5838de5f523875ef3e7c35ce3c367d89072b0a52d97c2d500cd225407e2b6d806b45054c19ff1203dd1fad10515980d56da
WHIRLPOOL
d57aef8666b5189d4d9a69de3097eda41233dfdc07d87ac7a91d5e03bb070f372665d7c39912fc7196504ca079220efd5103cfecc3e5f97136d089e7c4f4e44d
+DIST ppp-2.4.7-patches-4.tar.xz 37308 SHA256
afd96003fb50b462852d81f10af344ff23dcf26f626e65301b45dbaaa89f03c4 SHA512
f217f7272a791605101e0f1885350db8ff8b580a647e670461b81fe0026ee9050ce68b9b9635edee89ec1ada7adf000c7e6b3aa5a5dafec875ce715a9dfb84d2
WHIRLPOOL
ec8ef47938eac296e1573c8281afbfc0914e4cd2461a082f670a2367f4a77359f09b4986c10c498bf39b6a1441bbf9700529991a82a01854d8e2289a14636e9d
DIST ppp-2.4.7.tar.gz 688117 SHA256
02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30 SHA512
e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2
WHIRLPOOL
48f3251e6b955ecfdaf9260b9ea5220d9e355fff836e2f5217ee0b15bf2c93e43f8207005f58bf1f97fb8ff0c76c56df8ecd8536f63c4d84d5940458ba0ba5c3
DIST ppp-dhcpc.tgz 33497 SHA256
977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644 SHA512
aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
WHIRLPOOL
74e5e0d7f9bc52d1b9cfeff83fe74c2b38cc10c60636cd9c0f5d67d61dc7da56dbf2bcc84afa29444546792876cb36afbc853a6515ce9b3d83d6de98eacedd1e
-EBUILD ppp-2.4.7-r99.ebuild 7097 SHA256
659de46c4264c96eba9c068a1f560951685019f3d1f4942df1baf7b8d7555a36 SHA512
0543855eef0943d0282d6c107cb6903b8b3991d85815df68e031ba3de387d1596ee9404aec105a8cc0b8c80bb8b387f227d3d670986af465750a51c3828cc6ba
WHIRLPOOL
e79916122e46207bbaebe91b9783a53f5b3fbf2098546e53d49ad498ea0d52bee2cb9f9b3cf8043f7d7b1ec19c4251e4237ea9a694d460aaee6151a0f37aff0c
+EBUILD ppp-2.4.7-r3.ebuild 7037 SHA256
ef67311a6d13ccb51ad010acd1bdf0e163b8f28b5b6be9659a3a6648a1538c90 SHA512
1d5f4a885ed6db124b57260100313ea0e2c14c1ef69d356bf90cbea5162d0b7a61a39779e9e109074d27b31eab8f00abb4f0986f4c7bc75d5e3282000f804db7
WHIRLPOOL
bc235d572d2efd39c733920819e019a4b8c13f95e5b7f0cf485ac89edab14d68953916837469dc19ac95ab3275bbb5a747a629f9af0b40a3cc7550111082afbe
MISC metadata.xml 1470 SHA256
f202e01dec4fa5519f5720c1b1eea86e9cc67ea119f2e8c0b35953c879d6dd2e SHA512
2b00f6c0b4f3079eb885327188e12d151ec3d9682df9a71232b331524d9d3430af5fe342ca4198d926c012059786ec6a7e91fffeec899069a990e032b94b94c4
WHIRLPOOL
ffa072ae03216d551c6335cd49633ceb96dbc7e4200a46ced255c1fe8d33dfde5ea5426cac50156d6934b228f35191b6a061c2f95431adc6daef111ad65837a9
diff --git a/net-dialup/ppp/ppp-2.4.7-r99.ebuild
b/net-dialup/ppp/ppp-2.4.7-r3.ebuild
similarity index 93%
rename from net-dialup/ppp/ppp-2.4.7-r99.ebuild
rename to net-dialup/ppp/ppp-2.4.7-r3.ebuild
index b2cd4f7..8db487d 100644
--- a/net-dialup/ppp/ppp-2.4.7-r99.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils linux-info multilib pam toolchain-funcs
-PATCH_VER="1"
+PATCH_VER="4"
DESCRIPTION="Point-to-Point Protocol (PPP)"
HOMEPAGE="http://www.samba.org/ppp";
SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
@@ -14,16 +14,20 @@ SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
LICENSE="BSD GPL-2"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
+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="!net-dialup/ppp-scripts
- activefilter? ( net-libs/libpcap )
+DEPEND="activefilter? ( net-libs/libpcap )
atm? ( net-dialup/linux-atm )
pam? ( virtual/pam )
gtk? ( x11-libs/gtk+:2 )
- eap-tls? ( net-misc/curl dev-libs/openssl:0 )"
+ eap-tls? (
+ net-misc/curl
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
RDEPEND="${DEPEND}"
+PDEPEND="net-dialup/ppp-scripts"
src_prepare() {
mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
@@ -90,6 +94,8 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-dhcp-musl.patch
fi
fi
+
+ epatch_user # 549588
}
src_compile() {
@@ -127,14 +133,6 @@ src_install() {
insopts -m0644
doins etc.ppp/options
- exeinto /etc/ppp
- for i in ip-up ip-down ; do
- doexe "${WORKDIR}/scripts/${i}"
- insinto /etc/ppp/${i}.d
- use ipv6 && dosym ${i} /etc/ppp/${i/ip/ipv6}
- doins "${WORKDIR}/scripts/${i}.d"/*
- done
-
pamd_mimic_system ppp auth account session
local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
