Version bump, drop old

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

5 files changed, 103 insertions, 18 deletions

diff --git a/net-dialup/pptpd/ChangeLog b/net-dialup/pptpd/ChangeLog
index a933f21b9247..4c017ede557e 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.54 2013/11/04 12:14:10 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.55 2013/11/06 18:26:56 pinkbyte Exp $
+
+*pptpd-1.4.0 (06 Nov 2013)
+
+  06 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> -pptpd-1.3.4-r3.ebuild,
+  +pptpd-1.4.0.ebuild, +files/pptpd-1.4.0-gentoo.patch,
+  +files/pptpd-1.4.0-sandbox-fix.patch:
+  Version bump, drop old
 
   04 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> pptpd-1.3.4-r4.ebuild:
   Stable on amd64 and x86, bug #489772
diff --git a/net-dialup/pptpd/Manifest b/net-dialup/pptpd/Manifest
index 0d28c9dcac66..53204238c20b 100644
--- a/net-dialup/pptpd/Manifest
+++ b/net-dialup/pptpd/Manifest
@@ -5,21 +5,24 @@ AUX pptpd-1.3.4-gcc-4.7.patch 416 SHA256 f114df99d77668c36a82036a37126774c4f00d6
 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-1.4.0-gentoo.patch 2360 SHA256 b84c7a17ff6ccb7560dd1fcfbe439dcde740724b52ef520f880fd4395f04b9d7 SHA512 ba89b3b9eacd19e7cf6173289e8cb5db2443b55b3ad86f053c58636ed4f65227c626678f052f2d0a3c4c22fe4e0487493d097cd9a5434101017b95605966fc5b WHIRLPOOL 058306023e0d1cd27126b638027fef00eddf99f5a0bdf177437f17bd45edb6556ed20dbcddb66f1ce4ccc5702cfbbda44269cfe4df59f987c7bc1d47c52bd022
+AUX pptpd-1.4.0-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-r3.ebuild 2052 SHA256 c3e849f2dc5d73beb95cf1800c26977e4bf2da79de1e4768f17818e4fc59b310 SHA512 6ad19eb7ecd859e93daa04b473de5dcefd73a025cf68682b960d16e06ebe331cd6bd8f5ea56587ffcef8e751431bb332eb8ef20110aa82debacea3cfd3b2fc4c WHIRLPOOL aca931ae0734c85b40f2002c3f082ac32d810e264b8aed98ba6a7767c847d5beb6be96b26e28fbdbeedcdc3684fe7389c69e02001a77ffb6727da0618de7e15c
+DIST pptpd-1.4.0.tar.gz 252167 SHA256 8fcd8b8a42de2af59e9fe8cbaa9f894045c977f4d038bbd6346a8522bb7f06c0 SHA512 cfb4caef3025c0721e7fabf8b7bf595739f2d3048555b30616cdadc37e70ba9e1c50561c25091dd617b5448da2816aeaf83aea0fc2ef6b0dd5e3fe35d9591484 WHIRLPOOL 8296818e05cb01339b83a68d149413fd5bd76b435cfa56c3e16a8136b531743468953279d44339fd0f8125fb25172a3ee9a10ec14bb9f801eb54133b665dab3b
 EBUILD pptpd-1.3.4-r4.ebuild 2093 SHA256 60dcadedc8e70f7e724b3c1d69933de46e2517b64a23918a6b450b971b257ec4 SHA512 bc78ff21663d000eee0e291efa065ebb69db5f7013743aab4359a4e7fe75d6e27eef5996ede51dabaa21c64df7be2591040f3088720915d2a00d486bc4ebd360 WHIRLPOOL a0f4d0976e3bab4daddeb85f233e09aca75ad78237da0c71d58bfbf3e942bc14103f7dfa6044556d4c79c4bef604b59f7228bc88bf61d8563743b7c4834df5c5
-MISC ChangeLog 8255 SHA256 2e8f633b08e06b681b8da3408662d5bbfea4c7f1f86adc9428dabb1089c71e7b SHA512 9ef9e720f9c39f4a207daa8293c3c41dfaedaa4a9275f0dbb759a4823ddcf1ab4f8ee6cbd1d926be79471a578392514597b01bf7ba85fa34978f9f205e5f805f WHIRLPOOL dd0899392f2ae4c83def887ab619f4a28a3cce604ad04ed9d38d0a57a983829723ef12523cd4a2bc5678a6107dcb26427cf066d62ff9741b59eeb22e48f3bcca
+EBUILD pptpd-1.4.0.ebuild 1904 SHA256 9fd8c344f2927286e57a853a84f4e6af7aa60bbd7d635835a5903c9e1a85efce SHA512 2cba09e1c7df1530941654ad82a68267c72ca0d109adb58870f72de8c27a534e42c0268e84042586a9110e712d815a79964ccb6f5b9fb2c68e0f3e3e5244323f WHIRLPOOL fea9c45e7005af0d9cdfd381083407fb2630eab1611731f0688c4b809d2cc4df0d500e0ec75f844cef20cf5296827b6e6e00c1399216d9c84980632e51352269
+MISC ChangeLog 8479 SHA256 b1b0385e2f8111f4e65a8011fe54eb560358463ce33cb411a43b89f615830f7d SHA512 63f9032ff598403d252fe00d12f796e5848b14c35799d2611ed3e733de174ec564d0e385a06ff08ef98273642f1b3ff276916ca6e8d454a21a92fe5a089c77b7 WHIRLPOOL eb63ebe57d2f8e709f3146835fb62cae4b5b3fd77d458844520f2bba6b6722180ce3893c57e69bafc2c4cd345d07a17a1e91aa6d05aacf4347fca0ef0f438c46
 MISC metadata.xml 306 SHA256 a0cf603b6e5ca038b8b5801dcd69aed9a0a6d0944b36d4cd7653f72a49ca0da2 SHA512 eb93d272f87fc4441a6babbad4d2b681e0dfbba141812000dc1423e6f119b418724bea18e4b5b2de32bbaf3757b19223524f259e113c9a239b55688577169da2 WHIRLPOOL a9680e44c29633c3e4f1c8e01fc3b0e09358d9b75d94c5f0876e60ecedda260c45b0c51b956a3ae7889c3e10ebe53e990aff86ea2ff7da28632404e3435de11f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSd4+TAAoJECo/aRed9267IDcIAIvjuNH4qbV5UfoyTyRjAXcT
-fuSG27ud9u09GG8wlHUo/+mN6V2M9PRvrxlvj6pZgIiKNm0/MzciRZwGNFzAHrvR
-0n6FSDvoQW5mAGdBlH7bW1f7K9wbQWBJmdJsF90ECdWPfPu18FQZUZfj6L+cWP6X
-WDCXnEJZgn8kQvO3oXiowT3P2wAtciHlrVZfL5qCWHTF5QazduBr2H8BI2h9t7+I
-FV4q1iKt+7tlCKqVDEn21laoq6rdYIiwJiNGubJ/gQl/8jozAIh4crugBm00tiS6
-KDRab2paTTaRDiyjasulzjJiZZX03fROrfxWaf9+YB/mVHviZpofnnHYzBLZFJg=
-=a9wB
+iQEcBAEBCAAGBQJSeon2AAoJECo/aRed9267Sf4H+gOIShLlthlkxxRc02lUHT44
+hEHLHw4HzqU3Ti5FvrIzPQJc6wLYWDqYXtdAfMMJo1b4DI9N1WdH4GKpPWSju5Vq
+iJL4JaHXsc+NXYp/ToQZ92HxVPnmo0H2vtqTlSW0QwH+GFYSQti04oSlLq2vMdwT
+b/QCJARY1BZ6YY9MneV1oW4mKVMfwSRsYHYjRBEidhD31mXaXJb3Uc/Ccwl6/wD4
+uSHTwaIXxPNNeKE1wfT08IwnLR50T+hk4O05bwrAqZ5d8qs9zA+biAbOgzwxT0/i
+yWUFku2jS1hBMEIg4E88uznRXVWv3Nwu7qz7XVCTzNWayDgv1ZC9JZBdu0k4UwY=
+=0rsu
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch b/net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch
new file mode 100644
index 000000000000..9e7db7ea3454
--- /dev/null
+++ b/net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch
@@ -0,0 +1,59 @@
+diff -Naur pptpd-1.3.4.orig/Makefile.am pptpd-1.3.4/Makefile.am
+--- pptpd-1.3.4.orig/Makefile.am	2007-04-16 04:53:53.000000000 +0400
++++ pptpd-1.3.4/Makefile.am	2007-05-01 21:29:15.000000000 +0400
+@@ -11,7 +11,7 @@
+ ##  warning with -Wmissing-prototypes).
+ ## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers
+ ##  aren't up to it).
+-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
++CFLAGS += -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
+ #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
+ #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
+ 
+diff -Naur pptpd-1.3.4.orig/plugins/Makefile pptpd-1.3.4/plugins/Makefile
+--- pptpd-1.3.4.orig/plugins/Makefile	2006-08-03 06:02:01.000000000 +0400
++++ pptpd-1.3.4/plugins/Makefile	2007-05-01 21:29:15.000000000 +0400
+@@ -1,6 +1,5 @@
+-CC	= gcc
++CC	?= gcc
+-COPTS	= -O2 -g
+-CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
++CFLAGS	+= -I.. -I../../include -fPIC
+-LDFLAGS	= -shared
++LDFLAGS	+= -shared
+ LDADD   = -lutil
+ INSTALL	= install -o root
+diff -Naur pptpd-1.3.4.orig/pptpgre.c pptpd-1.3.4/pptpgre.c
+--- pptpd-1.3.4.orig/pptpgre.c	2007-04-16 04:21:02.000000000 +0400
++++ pptpd-1.3.4/pptpgre.c	2007-05-01 21:29:50.000000000 +0400
+@@ -326,9 +326,11 @@
+                                        "GRE: timeout waiting for %d packets", 
+                                        head->seq - gre.seq_recv - 1);        
+                 }
++#ifdef LOG_DEBUG_GRE_ACCEPTING_PACKET
+                 if (pptpctrl_debug)
+                         syslog(LOG_DEBUG, "GRE: accepting #%d from queue", 
+                                head->seq);
++#endif
+                 gre.seq_recv = head->seq;
+                 status = callback(cl, head->packet, head->packlen);
+                 pqueue_del(head);
+diff -Naur pptpd-1.3.4.orig/pqueue.c pptpd-1.3.4/pqueue.c
+--- pptpd-1.3.4.orig/pqueue.c	2005-08-03 12:53:22.000000000 +0400
++++ pptpd-1.3.4/pqueue.c	2007-05-01 21:29:15.000000000 +0400
+@@ -7,13 +7,11 @@
+ #include "pqueue.h"
+ 
+ #ifdef DEBUG_PQUEUE
+-#define DEBUG_ON 1
++#	define DEBUG_CMD(_a) { _a }
+ #else
+-#define DEBUG_ON 0
++#	define DEBUG_CMD(_a)
+ #endif
+ 
+-#define DEBUG_CMD(_a) if (DEBUG_ON) { _a }
+-
+ #define MIN_CAPACITY 128 /* min allocated buffer for a packet */
+ 
+ static int pqueue_alloc (int seq, unsigned char *packet, int packlen, pqueue_t **new);
diff --git a/net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch b/net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch
new file mode 100644
index 000000000000..de91753f33f5
--- /dev/null
+++ b/net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch
@@ -0,0 +1,21 @@
+--- plugins/Makefile.orig	2013-05-15 14:36:33.994231829 +0400
++++ plugins/Makefile	2013-05-15 14:37:06.686234429 +0400
+@@ -17,14 +17,14 @@
+ %.so: %.c
+ 	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD)
+ 
+-LIBDIR	?= $(DESTDIR)$(prefix)/lib/pptpd
++LIBDIR	?= $(prefix)/lib/pptpd
+ 
+ install: $(PLUGINS)
+-	$(INSTALL) -d $(LIBDIR)
+-	$(INSTALL) $? $(LIBDIR)
++	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
++	$(INSTALL) $? $(DESTDIR)$(LIBDIR)
+ 
+ uninstall:
+-	rm -f $(LIBDIR)$(PLUGINS)
++	rm -f $(DESTDIR)$(LIBDIR)$(PLUGINS)
+ 
+ clean:
+ 	rm -f *.o *.so *.a
diff --git a/net-dialup/pptpd/pptpd-1.3.4-r3.ebuild b/net-dialup/pptpd/pptpd-1.4.0.ebuild
index 03efc04c0022..59dee417b753 100644
--- a/net-dialup/pptpd/pptpd-1.3.4-r3.ebuild
+++ b/net-dialup/pptpd/pptpd-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.4 2013/10/25 09:24:36 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.4.0.ebuild,v 1.1 2013/11/06 18:26:56 pinkbyte Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gre-extreme-debug tcpd"
 
 DEPEND="net-dialup/ppp:=
@@ -23,7 +23,6 @@ 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"
 
 	# Match pptpd-logwtmp.so's version with pppd's version (#89895)
@@ -32,9 +31,6 @@ src_prepare() {
 	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'
 
@@ -74,6 +70,5 @@ src_install () {
 	newconfd "${FILESDIR}/pptpd-confd" pptpd
 
 	dodoc README.*
-	docinto samples
-	dodoc samples/*
+	dodoc -r samples
 }