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

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

3 files changed, 47 insertions, 14 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/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/*
 }