summaryrefslogtreecommitdiff
path: root/net-dialup/ppp
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-06-23 07:00:28 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-06-23 07:00:28 +0100
commite23cdda4dbb0c83b9e682ab5e916085a35203da5 (patch)
tree5a4ac448a3b288b731c24d947e0ce52df3cab07b /net-dialup/ppp
parent8187a741807f3e9a9e26304973cf18087dcf2560 (diff)
gentoo resync : 23.06.2018
Diffstat (limited to 'net-dialup/ppp')
-rw-r--r--net-dialup/ppp/Manifest2
-rw-r--r--net-dialup/ppp/ppp-2.4.7-r6.ebuild12
2 files changed, 11 insertions, 3 deletions
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