Drop old

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

6 files changed, 8 insertions, 231 deletions

diff --git a/net-dialup/pptpd/ChangeLog b/net-dialup/pptpd/ChangeLog
index 40a25dac0bdc..6d636be3fc83 100644
--- a/net-dialup/pptpd/ChangeLog
+++ b/net-dialup/pptpd/ChangeLog
@@ -1,6 +1,12 @@
 # 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
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
deleted file mode 100644
index 46bd3c6c4d8d..000000000000
--- a/net-dialup/pptpd/files/pptpd-1.3.4-gcc-4.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/files/pptpd-1.3.4-gentoo.patch b/net-dialup/pptpd/files/pptpd-1.3.4-gentoo.patch
deleted file mode 100644
index 9d5e245b7295..000000000000
--- a/net-dialup/pptpd/files/pptpd-1.3.4-gentoo.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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);
diff --git a/net-dialup/pptpd/files/pptpd-1.3.4-more-reodering-fixes.patch b/net-dialup/pptpd/files/pptpd-1.3.4-more-reodering-fixes.patch
deleted file mode 100644
index 67da66e7a785..000000000000
--- a/net-dialup/pptpd/files/pptpd-1.3.4-more-reodering-fixes.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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)", 
diff --git a/net-dialup/pptpd/files/pptpd-1.3.4-sandbox-fix.patch b/net-dialup/pptpd/files/pptpd-1.3.4-sandbox-fix.patch
deleted file mode 100644
index de91753f33f5..000000000000
--- a/net-dialup/pptpd/files/pptpd-1.3.4-sandbox-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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-r4.ebuild b/net-dialup/pptpd/pptpd-1.3.4-r4.ebuild
deleted file mode 100644
index 7ab2c47626d9..000000000000
--- a/net-dialup/pptpd/pptpd-1.3.4-r4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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/*
-}