# ChangeLog for net-dialup/pptpd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.56 2014/02/19 12:59:41 pinkbyte Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.57 2015/02/01 10:21:18 pinkbyte Exp $
+
+ 01 Feb 2015; Sergey Popov <pinkbyte@gentoo.org> -pptpd-1.3.4-r4.ebuild,
+ -files/pptpd-1.3.4-gcc-4.7.patch, -files/pptpd-1.3.4-gentoo.patch,
+ -files/pptpd-1.3.4-more-reodering-fixes.patch,
+ -files/pptpd-1.3.4-sandbox-fix.patch:
+ Drop old
19 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> pptpd-1.4.0.ebuild:
Stable on amd64 and x86, wrt bug #495834
-----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-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
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
EBUILD pptpd-1.4.0.ebuild 1902 SHA256 5a74e7b630853cdedcc94c3425f918e276674ecf88b07e437552e8d57269be8f SHA512 c2ed5167c1ba2e355a628cb03e53c02af75dc89255b44716c28086cd5a3caa1cd54d37020776df550e969eb3c47b9dc14fbf62274e27257e60329f823e7fbc0a WHIRLPOOL 397e48715705ab5dab1c52714a01c81f2db3fe0071822e8c1bf87193cc7ebad373e5bb71468eb8378054b83320ec6cad43a2b0550a0ed72df1b4f02bb4f1906e
-MISC ChangeLog 8593 SHA256 813f35789e00fc123378efe1629b93866b918f7e9e579fdfeafcf2a2e300c3e3 SHA512 298f5811c573ba9ee25eea02a924cdc7e4741fb0d972b762262572ab8292f58e98ec742fe16e99b4007fc1f1428a1b32e5fc8c7beefb71cf3726e8b74f71ae1e WHIRLPOOL 66163abb06e2c5cdd065c64a2dbee34d4eb29aeaa76fb9f06efbe3f8f54522590b0450cab88f7f540a26a72f2e1449e9234116182604c98f680db2b5fef7053a
+MISC ChangeLog 8837 SHA256 67daa01101539732f78424f330651186077d36b96c49ec7981b074a59e08914b SHA512 3bd12a775f73cab81a3d4374360341c31d2d7f3a7b3c0510880b1ff788e1175e07c255d475e0134f444f54fdd979300e97e770662d9d8fdce9655e0116227eab WHIRLPOOL f4f62995f7eb0716c617963ffbdd993695bb5d1dbc2bfd56ca0f506935bc878165e6d75dfd60ec7fb744d87f3f02ff924aa90fa8de69da3339f560b5402d6fff
MISC metadata.xml 306 SHA256 a0cf603b6e5ca038b8b5801dcd69aed9a0a6d0944b36d4cd7653f72a49ca0da2 SHA512 eb93d272f87fc4441a6babbad4d2b681e0dfbba141812000dc1423e6f119b418724bea18e4b5b2de32bbaf3757b19223524f259e113c9a239b55688577169da2 WHIRLPOOL a9680e44c29633c3e4f1c8e01fc3b0e09358d9b75d94c5f0876e60ecedda260c45b0c51b956a3ae7889c3e10ebe53e990aff86ea2ff7da28632404e3435de11f
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
-iQEcBAEBCAAGBQJTBKqzAAoJECo/aRed9267smoH+weE/Fh4eUnEWT+tG6jDDanB
-h+HJn979hZTI+jZV0iLD6l460cwAbOOF7x5B71xINo5HhWpt1kv5WzvWaVcUBBOa
-Ew+wn/YZAzNkiVI50dIz1JNyBe/vNbx664MqBXihuGQfkmyFtR9ia5/wGM4ZeJEk
-wO2BiTwr3eauFKFW/htHpnay63r8V20EFBaaoDGwfs4ocXTXcUqYh3LefJPFCsxB
-lDOYWJI78wOhWzOX7nMUwpTIX5F8i/C6tshHWvXIBs/8RGHBG5CxsThxMxYUs+xa
-VFJIdw+EXH/tHBuphLuI73vkTOiRASKWXbW6Rv68MygktkGm5r1i7FO5jtUXkVQ=
-=X8X2
+iQEcBAEBCAAGBQJUzf4gAAoJECo/aRed9267RGkH/AkSBeauImI18SE9K26r8YI2
+OmXw0WZAa5JRSa2IXsnaKwgBl+8SI3iz2h7AN4kTi20u9R8NMhTskgGssKw4gaGA
+i5/kdlmKf8gQxTmrmVeZPP6rZroU7gMcp1HOjDwllviN8HGM6qwbSRoZJr7/4rVq
+fraWj3BrDqK/gehhDmBr4CNGjePIr53aiIJ3TaKwOIhOGYbexFKt779xOdATM+XX
+kwYwML2uvVLVW+TjPs0U4+mMQog/QYspSp436Xr6qEIpQjHT+7oh3ZfX/9Jo5vIf
+jEjXOGApYNCzKcPI9BXBdBDouL1tqjcoOV8BA3pGvCRQxpG3ET7Nux631siJ4Ng=
+=w2/G
-----END PGP SIGNATURE-----
+++ /dev/null
---- 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;
- }
+++ /dev/null
-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
- 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
-@@ -405,9 +405,11 @@
- }
- /* check for out-of-order sequence number */
- if (seq == gre.seq_recv + 1) {
-+#ifdef LOG_DEBUG_GRE_ACCEPTING_PACKET
- if (pptpctrl_debug)
- syslog(LOG_DEBUG, "GRE: accepting packet #%d",
- seq);
-+#endif
- stats.rx_accepted++;
- gre.seq_recv = seq;
- return cb(cl, buffer + ip_len + headersize, payload_len);
-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);
+++ /dev/null
-diff -Naur pptpd-1.3.4.orig/ChangeLog pptpd-1.3.4/ChangeLog
---- pptpd-1.3.4.orig/ChangeLog 2007-04-16 04:32:45.000000000 +0400
-+++ pptpd-1.3.4/ChangeLog 2007-05-01 21:42:12.000000000 +0400
-@@ -1,3 +1,17 @@
-+Tue Apr 24 13:11:28 2007 Phil Oester <kernel@linuxace.com>
-+
-+ * pptpgre.c (decaps_gre): further testing has revealed a couple
-+ more problems with the packet reordering/buffering code:
-+
-+ 1) Some clients (notably the PPTP client) start their sequence
-+ numbers at 1 instead of 0 as the RFC mandates. My previous fix
-+ caused problems with these clients.
-+
-+ 2) Duplicate packets were causing corruption when they were placed
-+ on the queue but never used -or- when they were placed on the
-+ queue but already existed on the queue (i.e. they previously
-+ arrived out of order).
-+
- Mon Apr 16 10:32:40 2007 James Cameron <quozl@us.netrek.org>
-
- * pptpd-1.3.4.tar.gz: released.
-diff -Naur pptpd-1.3.4.orig/NEWS pptpd-1.3.4/NEWS
---- pptpd-1.3.4.orig/NEWS 2007-04-16 04:32:20.000000000 +0400
-+++ pptpd-1.3.4/NEWS 2007-05-01 21:42:15.000000000 +0400
-@@ -1,3 +1,5 @@
-+- fix reordering some more [Oester]
-+
- 1.3.4: released 2007-04-16
-
- - fix two release critical packet reordering bugs [Oester]
-diff -Naur pptpd-1.3.4.orig/pptpgre.c pptpd-1.3.4/pptpgre.c
---- pptpd-1.3.4.orig/pptpgre.c 2007-05-01 21:35:31.000000000 +0400
-+++ pptpd-1.3.4/pptpgre.c 2007-05-01 21:41:17.000000000 +0400
-@@ -403,8 +403,13 @@
- stats.rx_truncated++;
- return 0;
- }
-- /* check for out-of-order sequence number */
-- if (seq == gre.seq_recv + 1) {
-+ /* check for out-of-order sequence number
-+ * N.B.: some client implementations violate RFC 2637
-+ * and start their sequence numbers at 1 instead of 0,
-+ * so we have to introduce a kludge to deal with it.
-+ * on wrap we may allow an out of order packet to pass
-+ */
-+ if (seq == gre.seq_recv + 1 || seq == 1) {
- #ifdef LOG_DEBUG_GRE_ACCEPTING_PACKET
- if (pptpctrl_debug)
- syslog(LOG_DEBUG, "GRE: accepting packet #%d",
-@@ -413,7 +418,7 @@
- stats.rx_accepted++;
- gre.seq_recv = seq;
- return cb(cl, buffer + ip_len + headersize, payload_len);
-- } else if (seq == gre.seq_recv) {
-+ } else if (!seq_greater(seq, gre.seq_recv)) {
- if (pptpctrl_debug)
- syslog(LOG_DEBUG,
- "GRE: discarding duplicate or old packet #%d (expecting #%d)",
+++ /dev/null
---- 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
+++ /dev/null
-# 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-r4.ebuild,v 1.2 2013/11/04 12:14:10 pinkbyte Exp $
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Linux Point-to-Point Tunnelling Protocol Server"
-HOMEPAGE="http://poptop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="gre-extreme-debug tcpd"
-
-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)
- 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-cppflags "-DLOG_DEBUG_GRE_ACCEPTING_PACKET"
- econf \
- --enable-bcrelay \
- $(use tcpd && echo "--with-libwrap")
-}
-
-src_compile() {
- emake COPTS="${CFLAGS}"
-}
-
-src_install () {
- default
-
- insinto /etc
- doins samples/pptpd.conf
-
- insinto /etc/ppp
- doins samples/options.pptpd
-
- newinitd "${FILESDIR}/pptpd-init-r2" pptpd
- newconfd "${FILESDIR}/pptpd-confd" pptpd
-
- dodoc README.*
- docinto samples
- dodoc samples/*
-}
projects / gentoo.git / commitdiff