Cleaning vulnerable version (security bug #176936).

(Portage version: 2.1.2.7)

4 files changed, 5 insertions, 118 deletions

diff --git a/net-dialup/pptpd/ChangeLog b/net-dialup/pptpd/ChangeLog
index ac64ba92e639..7b839aa8aa59 100644
--- a/net-dialup/pptpd/ChangeLog
+++ b/net-dialup/pptpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/pptpd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.28 2007/05/09 19:18:44 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.29 2007/05/20 08:13:32 pva Exp $
+
+  20 May 2007; <pva@gentoo.org> -files/pptpd-1.3.3-gentoo.patch,
+  -pptpd-1.3.3.ebuild:
+  Cleaning vulnerable version (security bug #176936).
 
   09 May 2007; Joshua Jackson <tsunam@gentoo.org> pptpd-1.3.4.ebuild:
   Stable for security bug #176936
diff --git a/net-dialup/pptpd/files/digest-pptpd-1.3.3 b/net-dialup/pptpd/files/digest-pptpd-1.3.3
deleted file mode 100644
index dc6237564dbf..000000000000
--- a/net-dialup/pptpd/files/digest-pptpd-1.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 281cbe4b18f0524a283fdb9618cc73ec pptpd-1.3.3.tar.gz 240588
-RMD160 c7e7c1ed5ef3aa3ca11137b2d4cf5bba7cf06b16 pptpd-1.3.3.tar.gz 240588
-SHA256 8f2055d4b4927e3a8598d0e82743b92d08acf37055e80ee61b0f6b06cbe4b3c3 pptpd-1.3.3.tar.gz 240588
diff --git a/net-dialup/pptpd/files/pptpd-1.3.3-gentoo.patch b/net-dialup/pptpd/files/pptpd-1.3.3-gentoo.patch
deleted file mode 100644
index 0e718d312b20..000000000000
--- a/net-dialup/pptpd/files/pptpd-1.3.3-gentoo.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nru pptpd-1.3.3.orig/Makefile.am pptpd-1.3.3/Makefile.am
---- pptpd-1.3.3.orig/Makefile.am	2006-08-03 05:00:50.000000000 +0300
-+++ pptpd-1.3.3/Makefile.am	2006-09-07 13:08:44.000000000 +0300
-@@ -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 -Nru pptpd-1.3.3.orig/plugins/Makefile pptpd-1.3.3/plugins/Makefile
---- pptpd-1.3.3.orig/plugins/Makefile	2006-08-03 05:02:01.000000000 +0300
-+++ pptpd-1.3.3/plugins/Makefile	2006-09-07 13:08:44.000000000 +0300
-@@ -1,6 +1,5 @@
- 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 -Nru pptpd-1.3.3.orig/pptpgre.c pptpd-1.3.3/pptpgre.c
---- pptpd-1.3.3.orig/pptpgre.c	2006-03-28 00:39:05.000000000 +0300
-+++ pptpd-1.3.3/pptpgre.c	2006-09-07 13:08:02.000000000 +0300
-@@ -405,9 +405,11 @@
- 		}
- 		/* check for out-of-order sequence number */
- 		if (seq_greater(seq, gre.seq_recv)) {
-+#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 -Nru pptpd-1.3.3.orig/pqueue.c pptpd-1.3.3/pqueue.c
---- pptpd-1.3.3.orig/pqueue.c	2005-08-03 11:53:22.000000000 +0300
-+++ pptpd-1.3.3/pqueue.c	2006-09-07 13:28:02.000000000 +0300
-@@ -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/pptpd-1.3.3.ebuild b/net-dialup/pptpd/pptpd-1.3.3.ebuild
deleted file mode 100644
index 4b49966046cb..000000000000
--- a/net-dialup/pptpd/pptpd-1.3.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.3.ebuild,v 1.3 2007/04/22 00:13:15 mrness Exp $
-
-inherit eutils autotools flag-o-matic
-
-DESCRIPTION="Linux Point-to-Point Tunnelling Protocol Server"
-SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz"
-HOMEPAGE="http://www.poptop.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE="tcpd gre-extreme-debug"
-
-DEPEND="net-dialup/ppp
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-gentoo.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}\":" "${S}/plugins/patchlevel.h"
-
-	eautomake
-}
-
-src_compile() {
-	use gre-extreme-debug && append-flags "-DLOG_DEBUG_GRE_ACCEPTING_PACKET"
-	local myconf
-	use tcpd && myconf="--with-libwrap"
-	econf --enable-bcrelay \
-		${myconf} || die "configure failed"
-	emake COPTS="${CFLAGS}" || die "make failed"
-}
-
-src_install () {
-	einstall || die "make install failed"
-
-	insinto /etc
-	doins samples/pptpd.conf
-
-	insinto /etc/ppp
-	doins samples/options.pptpd
-
-	newinitd "${FILESDIR}/pptpd-init" pptpd
-	newconfd "${FILESDIR}/pptpd-confd" pptpd
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-	docinto samples
-	dodoc samples/*
-}