Cleaning vulnerable version (security bug #176936).

Package-Manager: portage-2.1.2.7

5 files changed, 9 insertions, 144 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/Manifest b/net-dialup/pptpd/Manifest
index 91dab9583ad0..dec43ab3d956 100644
--- a/net-dialup/pptpd/Manifest
+++ b/net-dialup/pptpd/Manifest
@@ -1,10 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX pptpd-1.3.3-gentoo.patch 2142 RMD160 e2fccbad38354c5f863f3ffead6ce4f3a66361c1 SHA1 e1645423786b1513e74f6ad7e496988957f57e49 SHA256 df9fcc875a46882656812ad585481a6e5d94ba833f9564bc94270269addbdae7
-MD5 49006c3af81f022720c83abc19e2daab files/pptpd-1.3.3-gentoo.patch 2142
-RMD160 e2fccbad38354c5f863f3ffead6ce4f3a66361c1 files/pptpd-1.3.3-gentoo.patch 2142
-SHA256 df9fcc875a46882656812ad585481a6e5d94ba833f9564bc94270269addbdae7 files/pptpd-1.3.3-gentoo.patch 2142
 AUX pptpd-1.3.4-gentoo.patch 2139 RMD160 316f9335050084280431e00ae5b977653846beb7 SHA1 a8b067b0a7e7ab53eb64b00f4e24a7e305affc91 SHA256 e9f6a4c461538f6dc8580c7fec086b12945976cc55b6dfe9c6a3ef4a02333cb7
 MD5 0df06dc0588985217fc5fed766e90394 files/pptpd-1.3.4-gentoo.patch 2139
 RMD160 316f9335050084280431e00ae5b977653846beb7 files/pptpd-1.3.4-gentoo.patch 2139
@@ -21,34 +14,19 @@ AUX pptpd-init 386 RMD160 e496308edea338dfbd89016ae02aeb11db4fb0e0 SHA1 6b7c053a
 MD5 96fed26a1a72e947d12edda983f74d16 files/pptpd-init 386
 RMD160 e496308edea338dfbd89016ae02aeb11db4fb0e0 files/pptpd-init 386
 SHA256 17e78d810690dbbe0738d9f146b6b58e7b45f19ec545be630f1bf338869a86f4 files/pptpd-init 386
-DIST pptpd-1.3.3.tar.gz 240588 RMD160 c7e7c1ed5ef3aa3ca11137b2d4cf5bba7cf06b16 SHA1 816c796611fec55867da5808b58ef4df6cdb01e5 SHA256 8f2055d4b4927e3a8598d0e82743b92d08acf37055e80ee61b0f6b06cbe4b3c3
 DIST pptpd-1.3.4.tar.gz 240942 RMD160 1c6c748bf9e81d223087998ee0cca821814d19f9 SHA1 3d1faf99055e420bafa96c96e8871a888c50b4e8 SHA256 c23a9bdd219a0a36ae7ca20e7c9749f2efdcdbf108aabeeeb5066ba442ec88b6
-EBUILD pptpd-1.3.3.ebuild 1531 RMD160 8692566fcf7c6175edf0a9f555cce8db0c12b4e2 SHA1 1aad529011a5c742564cfdfd36e29c2d9e6b0eed SHA256 af154342e4c4558b99ed9314899a98897f2837b08e5900e38a1df24df15d5eb8
-MD5 bc269e3c5cfe157c31a21b9d73cd103b pptpd-1.3.3.ebuild 1531
-RMD160 8692566fcf7c6175edf0a9f555cce8db0c12b4e2 pptpd-1.3.3.ebuild 1531
-SHA256 af154342e4c4558b99ed9314899a98897f2837b08e5900e38a1df24df15d5eb8 pptpd-1.3.3.ebuild 1531
 EBUILD pptpd-1.3.4.ebuild 1585 RMD160 c728d78e6facc90b0fb7fa9087e1dea8ea5f7ee8 SHA1 8243006ab4a47456eec864c3ba389e80186456dc SHA256 5b09245a6ed28240bf01ecb155ee0d12c82ef8d683eb4b785c44af10983b6ffc
 MD5 d403e91893516f26f46d09c43e7ffc8e pptpd-1.3.4.ebuild 1585
 RMD160 c728d78e6facc90b0fb7fa9087e1dea8ea5f7ee8 pptpd-1.3.4.ebuild 1585
 SHA256 5b09245a6ed28240bf01ecb155ee0d12c82ef8d683eb4b785c44af10983b6ffc pptpd-1.3.4.ebuild 1585
-MISC ChangeLog 4469 RMD160 11bbe948af86903360ad117a59a503314487a30e SHA1 239ba3308e6e16ccf5390f517f1191886d0f69c8 SHA256 37581f13746ec176e3132240eb34d7b4a71f2a6c8a7631b90e226d7767a2e0fe
-MD5 693d6f1d97d63e597b8be683d914b2cb ChangeLog 4469
-RMD160 11bbe948af86903360ad117a59a503314487a30e ChangeLog 4469
-SHA256 37581f13746ec176e3132240eb34d7b4a71f2a6c8a7631b90e226d7767a2e0fe ChangeLog 4469
+MISC ChangeLog 4609 RMD160 5993ffcfa59dc2ac032fec5b7d3f837e65e8e29c SHA1 f16ea942a0d1abdb30eebda4241a6b1f993c4138 SHA256 58e0dcb9aef6563819402827b5d24239904a7a8b077cf908f7c934e5d1df0790
+MD5 47d2954f287cf6f78f0c490f8e73bbdb ChangeLog 4609
+RMD160 5993ffcfa59dc2ac032fec5b7d3f837e65e8e29c ChangeLog 4609
+SHA256 58e0dcb9aef6563819402827b5d24239904a7a8b077cf908f7c934e5d1df0790 ChangeLog 4609
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
 SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata.xml 163
-MD5 cab98d3075196090c65f32e8dd07ec1d files/digest-pptpd-1.3.3 235
-RMD160 081cbe2b283fec1b5d0489844d791c6ffd286c73 files/digest-pptpd-1.3.3 235
-SHA256 7639f0f51f01a4242bbabe7ad9e05bcf81c8cdeec4303c478ca4c087e9e3c4ab files/digest-pptpd-1.3.3 235
 MD5 e5ddeb1570473fa562efe63fd712e4cc files/digest-pptpd-1.3.4 235
 RMD160 d7e10bd24879d0f28b3cbfce99cb781b721719b0 files/digest-pptpd-1.3.4 235
 SHA256 399c7e4355eb78a8d2fff6feaeba1f33866a507c48b8137dfb02102832c754ce files/digest-pptpd-1.3.4 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD4DBQFGQh6f2ZWR0Jhg/EsRAprJAJ9CWuN0+u/KrGLhKBgOI1qDIOmh3QCY65c9
-x8kWPYiy58RY7QAVIUnz4Q==
-=n7KM
------END PGP SIGNATURE-----
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/*
-}