Revision bump: fix compatibility with gcc 4.7, wrt bug #462108. Drop old revision

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 57 insertions, 23 deletions

diff --git a/net-dialup/pptpd/ChangeLog b/net-dialup/pptpd/ChangeLog
index ce89b736b10c..cd18bb9b5b72 100644
--- a/net-dialup/pptpd/ChangeLog
+++ b/net-dialup/pptpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/pptpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.52 2013/10/25 09:24:36 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.53 2013/10/25 11:23:12 pinkbyte Exp $
+
+*pptpd-1.3.4-r4 (25 Oct 2013)
+
+  25 Oct 2013; Sergey Popov <pinkbyte@gentoo.org> -pptpd-1.3.4-r2.ebuild,
+  +pptpd-1.3.4-r4.ebuild, +files/pptpd-1.3.4-gcc-4.7.patch:
+  Revision bump: fix compatibility with gcc 4.7, wrt bug #462108. Drop old
+  revision
 
   25 Oct 2013; Sergey Popov <pinkbyte@gentoo.org> pptpd-1.3.4-r3.ebuild:
   Add ~arm keyword
diff --git a/net-dialup/pptpd/Manifest b/net-dialup/pptpd/Manifest
index bc0c7a8c79f3..4da15108629c 100644
--- a/net-dialup/pptpd/Manifest
+++ b/net-dialup/pptpd/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pptpd-1.3.4-gcc-4.7.patch 416 SHA256 f114df99d77668c36a82036a37126774c4f00d6f2b19a250359ffb3a83b5d35a SHA512 e30dc4158bb022e63533f848b0a2d69476cc9f8593f4c6545cca67114ab82e029a41863a9033e0adbc68478aab402dcdd365bf8e651e5fce65f820f98af5e9b7 WHIRLPOOL 2f1c7e0bf6a771c346bbc8bc837789f81c86f32131a310407901d26da8a4a2dd9ca9bf8b0fb341763261e25f616ba89ac999ec402b21a6ba1b90fccc9afb9d1c
 AUX pptpd-1.3.4-gentoo.patch 2150 SHA256 2e333037d30ee567cab87b60fa4cd1cf166ea26e0db0ee98933a76de88ffe6f7 SHA512 9821e8b3a1471d37accd756301c21bcc5acee9059556355ca5e2c2f481d427a898eec77b40299302d0ab1e471a5f3b162143d18b4f0351507cc9048fc874fb64 WHIRLPOOL fb81fe39c74f6bf0caeabdc1d3fe265804d9622fdf6869faff621f85a0bb07c2c25717b6c6573f760002bef70a911b05e015d8f9da207da010d69485a94765ff
 AUX pptpd-1.3.4-more-reodering-fixes.patch 2340 SHA256 4540048186b1c1805b02d7d4740b89c498ea5e71a313b6592e469087bb4f0e9f SHA512 28fdb770fd286a1b41f77d952dfe0119c2e53e5c4503687fab59141ecfc71609bd8bc31ae747c6ff3303229164bdf9ee88f85ce5d066f84c9913a747d253b407 WHIRLPOOL 027326151984144e19644211e96864b8e87f21dd014673ba82042c01e3806064fa00f29af02253f76e0775748e148c07815d8735b3b88291f03c86e21d50a3d6
 AUX pptpd-1.3.4-sandbox-fix.patch 529 SHA256 213f3e5199d29641a6ae5396386803f63132c71583b2c590df7445fe579a265a SHA512 ea1e2019a09da67cf9c7fd35de97d84b52eb31c3739fadeaef5ebbe37f68a98f37de014eb64e7c553586d85edc06d594d655a3893998a1a55fb4bec287499509 WHIRLPOOL b42f7654b39cb39b1f61004de0be4496abe0180981810cd8080b91f840278ea8ec917c66ecfa5a72a3fb2b3b4d41f57260afd687abe339c873c842fd4795c283
 AUX pptpd-confd 131 SHA256 4d69da546e36439dc1a7cb5abb949ad48046155752c047babb5472decdfa1958 SHA512 59f118715cf6c36442687a58f46a54519fb5125383e85c4fa352a4c97f8a4e19f46c9715330550755eb9691e8174b70cdfab48fbd14c2707364e8083d6baa488 WHIRLPOOL a386723e4e0f660563aca44807bf7b2553caf99904a115587072925a49fd2d5cb8c2742cc832afefa16cec4bc85c3c03afc37b149b81c6426474f1f7032bf60e
 AUX pptpd-init-r2 324 SHA256 10e19019799051cc4129c2cb85ac2576bb3db0fa389bf7da8b9f04a519d970d0 SHA512 a8245b027d4a7c2bc7753fd6693f86073cf6a4f7f7d7a0781fd0ac2f959e2d41f9970c9c4c11d61c4ba434b193a9f986fb8fc40eb1942af15f63741a45799d0d WHIRLPOOL e28c6a9a5f6ebfb87e5b95869a07fde143ab01c1083168e19bd1bc4d5d416aa55ed42944e5859c7a4b4cb41049ac40d8a8c3a0d53ceee11282997caf7e716b4b
 DIST pptpd-1.3.4.tar.gz 240942 SHA256 c23a9bdd219a0a36ae7ca20e7c9749f2efdcdbf108aabeeeb5066ba442ec88b6 SHA512 382cc7ce9db7f2b6ffe0a075a319267310f736ca1b93e9867e9d5abb3c56edf49d3cf2bba83d6ae778834e0e18a21fddf29444106c8143a3016ca704ac538b1e WHIRLPOOL ae0675c3dad54242ff8d1fd588540ce097eab2dc48af3381fc844db27b0f78059d2abb101cc894464c60fcdbec1ab77c119361a95e866b29a5ae1f15f53f3887
-EBUILD pptpd-1.3.4-r2.ebuild 1700 SHA256 47ebb75d81ffd38fc13263b1093d4e3998d4255702467b6d230afce22f2ca54c SHA512 7b3343a27de27ed451a15751349280fd3ccdccb1c9a938061840391082febf10871f8b3558be47134a9ecd41baa4e7efc98cb508394431e10386dbca06c4f8fe WHIRLPOOL 233f7b2a91d069c1bd6239fb47f036d925a97ae46df7c0a3a717c9a68004379065ef68a19a06a015b638f453dda46ae1df437160289477245df2a4be8780c1ac
 EBUILD pptpd-1.3.4-r3.ebuild 2052 SHA256 c3e849f2dc5d73beb95cf1800c26977e4bf2da79de1e4768f17818e4fc59b310 SHA512 6ad19eb7ecd859e93daa04b473de5dcefd73a025cf68682b960d16e06ebe331cd6bd8f5ea56587ffcef8e751431bb332eb8ef20110aa82debacea3cfd3b2fc4c WHIRLPOOL aca931ae0734c85b40f2002c3f082ac32d810e264b8aed98ba6a7767c847d5beb6be96b26e28fbdbeedcdc3684fe7389c69e02001a77ffb6727da0618de7e15c
-MISC ChangeLog 7890 SHA256 175dae424f320cc97fc2d6b74a5e73577d50479dcf84dabb363d9a24133a415c SHA512 224d2c92dfb5948ed0c6ea905e240ec073f2dbccf6807b9ee63d877440ee77ce8f0e8c977281127fc0ec3f6eca8135520408f1c767ef7bba7091cde40625b7a6 WHIRLPOOL 418b0dab8299da418d96ff6738b9c635fe2c1ffb4d6909a334af768f35d632fdc0496b6a94d121406cf3e629e272f49ef647d1c2a01dadafb0c88a9652f2d63d
+EBUILD pptpd-1.3.4-r4.ebuild 2095 SHA256 74bab274d4734e4c93dfea1bd952464dac265a7bfaad18ad4314ef148c828b99 SHA512 ae05121dffe6907d3a529bd88165c7af8457aa9876effce0d55c393c3b6c1e73f108f78eb5b3b8bcfb48fd7d6a786189c8063f8ca305ff707291b5b5060c4dcc WHIRLPOOL 40322c5afb54b4995ab5f33c1c7c5eecfef0ccf3d562b629663cfadf48dd8439a112db09dd992e369fbd611321e3fdd4b6ce568d204fdb77a9b67dbef7cf66f0
+MISC ChangeLog 8142 SHA256 589888dde155c0dde2e2e721fefac61c0c3c9904d756bf4d1fba275ed4671f6a SHA512 78a03c8262e17a7e68475eb6efebb5caa8f0c39d0bcc2744e91e7c82aa556c09036ebe0f3a17e3676369b9ffb68dfe448a5528d99c9c3189b6693b82080f362a WHIRLPOOL cca8c5239a6feafa0c1a5be3997eab65ec8c143d62a6fe8ef6e97c208e65fb2db37b3a6edf9e9d3e7b6a64382b3b0ab401a42c6284086bdd60a019ebc38740d3
 MISC metadata.xml 306 SHA256 a0cf603b6e5ca038b8b5801dcd69aed9a0a6d0944b36d4cd7653f72a49ca0da2 SHA512 eb93d272f87fc4441a6babbad4d2b681e0dfbba141812000dc1423e6f119b418724bea18e4b5b2de32bbaf3757b19223524f259e113c9a239b55688577169da2 WHIRLPOOL a9680e44c29633c3e4f1c8e01fc3b0e09358d9b75d94c5f0876e60ecedda260c45b0c51b956a3ae7889c3e10ebe53e990aff86ea2ff7da28632404e3435de11f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSajimAAoJECo/aRed9267fFYH/AnTYPZP/Vo7bfMFqkjw4I5R
-OU6RMuuz6sJxwNjFjRlsMDJoLBLDAGShYvLSqOJRaE7Xq3O6AsYTjre2ROX3m03H
-GEodZRc2EV1NbHnoZdoOQkiD0NG060snHPpVcaBKYpP/6em2xsa20/mVxgB6fN1Q
-WWNS0PVdlE7xFSSiBMjxWDlt8HEK1LyflGIuY7Umz3VAEcvcrp2rO73lbJeBjRhp
-AIqshdeANoWKZg0m4i87XMWL+6J4LpR26yqpAOlZU+Bd0dnjSPUEatqdYeUV8PF/
-GjgDA2bKnVxKrDXcBZOCxeBYT1INrOS46o++qMCbBSn408Ds9tiSbjfgdtv7RVM=
-=urNE
+iQEcBAEBCAAGBQJSalRzAAoJECo/aRed9267pO8H/2zcL/X8sKtAMJEnCqYxSFwJ
+ufEBW5Ht4FIsZT75S+K6YuTLeWN1cLaM7byR/RFtzQK2NRfqfrLTX0YqR/ds8f5x
+Ae1NVWY0eL5aoShVACGbxTxkbTTTUXjvI1opYiGefGgWjaTjRce5nmaTwofuIWkW
+H8H7slHD2VPSXEsDSqAfvOKYnDyTHBTaoIGcn4rBMr/XY12hi8xrhS9obVZx5Nmi
+yPCEvdSTV1H5CQ9PGvvu5wQRYGJNSkEJaV8iPb+gjeiVFs/8om1RVQETTvGpIgwx
+hws7gxSqpwOBNpGw0s/2RSMg7R69/hlxr9zWNuyj0vavQGjkWSJ6Z7el+At8KGg=
+=Gwrm
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/pptpd/files/pptpd-1.3.4-gcc-4.7.patch b/net-dialup/pptpd/files/pptpd-1.3.4-gcc-4.7.patch
new file mode 100644
index 000000000000..46bd3c6c4d8d
--- /dev/null
+++ b/net-dialup/pptpd/files/pptpd-1.3.4-gcc-4.7.patch
@@ -0,0 +1,12 @@
+--- pptpctrl.c.orig	2013-10-25 15:10:53.632625057 +0400
++++ pptpctrl.c	2013-10-25 15:11:12.175626673 +0400
+@@ -759,8 +759,8 @@
+ 			syslog(LOG_DEBUG, "CTRL (PPPD Launcher): remote address = %s", pppaddrs[1]);
+ 	}
+ 	
++	char pppInterfaceIPs[33];
+ 	if (*pppaddrs[0] || *pppaddrs[1]) {
+-		char pppInterfaceIPs[33];
+ 		sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);
+ 		pppd_argv[an++] = pppInterfaceIPs;
+ 	}
diff --git a/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild b/net-dialup/pptpd/pptpd-1.3.4-r4.ebuild
index c9053f4192fc..678c88419489 100644
--- a/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild
+++ b/net-dialup/pptpd/pptpd-1.3.4-r4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild,v 1.4 2013/03/25 13:23:11 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.4-r4.ebuild,v 1.1 2013/10/25 11:23:12 pinkbyte Exp $
 
 EAPI="5"
 
-inherit eutils autotools flag-o-matic
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Linux Point-to-Point Tunnelling Protocol Server"
 HOMEPAGE="http://poptop.sourceforge.net/"
@@ -12,36 +12,50 @@ SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="tcpd gre-extreme-debug"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gre-extreme-debug tcpd"
 
-DEPEND="net-dialup/ppp
+DEPEND="net-dialup/ppp:=
 	tcpd? ( sys-apps/tcp-wrappers )"
 RDEPEND="${DEPEND}"
 
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
 src_prepare() {
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 	epatch "${FILESDIR}/${P}-more-reodering-fixes.patch"
+	epatch "${FILESDIR}/${P}-sandbox-fix.patch"
+	epatch "${FILESDIR}/${P}-gcc-4.7.patch"
 
-	#Match pptpd-logwtmp.so's version with pppd's version (#89895)
+	# Match pptpd-logwtmp.so's version with pppd's version (#89895)
 	local PPPD_VER=`best_version net-dialup/ppp`
 	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
 	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
 	sed -i -e "s:\\(#define[ \\t]*VERSION[ \\t]*\\)\".*\":\\1\"${PPPD_VER}\":" plugins/patchlevel.h || die
+
+	# respect LDFLAGS
 	sed -i -e "/^LDFLAGS/{s:=:+=:}" plugins/Makefile || die
 
+	# Automake 1.13, compatibility, bug #469476
+	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.in || die 'sed on configure.ac failed'
+
+	# remove 'missing' script to prevent warnings
+	rm missing || die 'remove missing script failed'
+
 	# respect compiler, bug #461722
 	tc-export CC
 
+	# Apply user patches
+	epatch_user
+
 	eautoreconf
 }
 
 src_configure() {
-	use gre-extreme-debug && append-flags "-DLOG_DEBUG_GRE_ACCEPTING_PACKET"
-	local myconf
-	use tcpd && myconf="--with-libwrap"
-	econf --enable-bcrelay \
-		${myconf}
+	use gre-extreme-debug && append-cppflags "-DLOG_DEBUG_GRE_ACCEPTING_PACKET"
+	econf \
+		--enable-bcrelay \
+		$(use tcpd && echo "--with-libwrap")
 }
 
 src_compile() {
@@ -49,7 +63,7 @@ src_compile() {
 }
 
 src_install () {
-	einstall
+	default
 
 	insinto /etc
 	doins samples/pptpd.conf
@@ -60,7 +74,7 @@ src_install () {
 	newinitd "${FILESDIR}/pptpd-init-r2" pptpd
 	newconfd "${FILESDIR}/pptpd-confd" pptpd
 
-	dodoc AUTHORS ChangeLog NEWS README* TODO
+	dodoc README.*
 	docinto samples
 	dodoc samples/*
 }