Version bump. Fix segfault when -C option is specified on command line (#132898).

Package-Manager: portage-2203-svn

6 files changed, 144 insertions, 5 deletions

diff --git a/net-dialup/pptpd/ChangeLog b/net-dialup/pptpd/ChangeLog
index 861c871a52be..abd9cef6b9a3 100644
--- a/net-dialup/pptpd/ChangeLog
+++ b/net-dialup/pptpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/pptpd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.21 2006/03/26 09:13:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.22 2006/05/12 21:25:14 mrness Exp $
+
+*pptpd-1.3.2 (12 May 2006)
+
+  12 May 2006; Alin Nastac <mrness@gentoo.org>
+  +files/pptpd-1.3.2-connections-arg.patch, +files/pptpd-1.3.2-gentoo.patch,
+  +pptpd-1.3.2.ebuild:
+  Version bump. Fix segfault when -C option is specified on command line
+  (#132898).
 
 *pptpd-1.3.1 (26 Mar 2006)
 
diff --git a/net-dialup/pptpd/Manifest b/net-dialup/pptpd/Manifest
index 0550eb92f7cb..5fc868475fc9 100644
--- a/net-dialup/pptpd/Manifest
+++ b/net-dialup/pptpd/Manifest
@@ -1,22 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b12265bd867bd4a34bdb6a4d922775a2 ChangeLog 3172
+MD5 26f6c5f86e774fbb4ba44177e8a8aa39 ChangeLog 3434
 MD5 1fa197073ee270e0a198941524453ce3 files/digest-pptpd-1.2.3-r1 63
 MD5 4e3a14647e551188f195fa9a7372924c files/digest-pptpd-1.3.0 63
 MD5 6db8aa74503d1723d2124dc9e8685d54 files/digest-pptpd-1.3.1 63
+MD5 5a49a0eae3244d6f965f466a364fcef5 files/digest-pptpd-1.3.2 63
 MD5 4c6b3d63b289e8f024cdde4da1b16663 files/pptpd-1.3.0-gentoo.patch 1955
 MD5 62b01173931d0eee6a4cc6228d9154dd files/pptpd-1.3.1-gentoo.patch 1985
+MD5 eb35e1d83d8cf310cc0d36d2b91fe115 files/pptpd-1.3.2-connections-arg.patch 507
+MD5 99fb708ddfa84950cf09d91893a1fcff files/pptpd-1.3.2-gentoo.patch 2005
 MD5 bff575819b8997e7bbe743b95cb134cb files/pptpd-confd 131
 MD5 96fed26a1a72e947d12edda983f74d16 files/pptpd-init 386
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 b7dbbe4e000b11e6915287267bcb835d pptpd-1.2.3-r1.ebuild 1378
 MD5 0bc4bd031b43f2df2dbeafc584440b6e pptpd-1.3.0.ebuild 1466
 MD5 0ebba8a1b9b58370ffa8727ced8c2d99 pptpd-1.3.1.ebuild 1466
+MD5 3d9d4bc5ead7e9dfa3958764953961f2 pptpd-1.3.2.ebuild 1515
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEJls0jG8pv1lIUX4RApt6AJ4sP2NiXDxeVG7/s+UZ5GVxYN44sACffE1H
-6/4xRhe/lfrLD6Gi8jlMGFk=
-=LMJa
+iD4DBQFEZP1NjG8pv1lIUX4RAj3QAJ49HFAEu7KH6KOuuSv17SMnXnfwUACWLKkl
+ibh3CvsNzhHXvWqopeiQ8w==
+=E883
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/pptpd/files/digest-pptpd-1.3.2 b/net-dialup/pptpd/files/digest-pptpd-1.3.2
new file mode 100644
index 000000000000..6d47c06bd69d
--- /dev/null
+++ b/net-dialup/pptpd/files/digest-pptpd-1.3.2
@@ -0,0 +1 @@
+MD5 4e4eb2fd2d96cb86b88d18318b3108dc pptpd-1.3.2.tar.gz 235467
diff --git a/net-dialup/pptpd/files/pptpd-1.3.2-connections-arg.patch b/net-dialup/pptpd/files/pptpd-1.3.2-connections-arg.patch
new file mode 100644
index 000000000000..ab5920566a05
--- /dev/null
+++ b/net-dialup/pptpd/files/pptpd-1.3.2-connections-arg.patch
@@ -0,0 +1,15 @@
+diff -Nru pptpd-1.3.2.orig/pptpd.c pptpd-1.3.2/pptpd.c
+--- pptpd-1.3.2.orig/pptpd.c	2005-12-29 11:59:49.000000000 +0200
++++ pptpd-1.3.2/pptpd.c	2006-05-12 23:44:15.000000000 +0300
+@@ -149,9 +149,9 @@
+ 	while (1) {
+ 		int option_index = 0;
+ #ifdef BCRELAY
+-		char *optstring = "b:c:de:fhil:o:p:s:t:vwCD";
++		char *optstring = "b:c:de:fhil:o:p:s:t:vwC:D";
+ #else
+-		char *optstring = "c:de:fhil:o:p:s:t:vwCD";
++		char *optstring = "c:de:fhil:o:p:s:t:vwC:D";
+ #endif
+ 
+ 		static struct option long_options[] =
diff --git a/net-dialup/pptpd/files/pptpd-1.3.2-gentoo.patch b/net-dialup/pptpd/files/pptpd-1.3.2-gentoo.patch
new file mode 100644
index 000000000000..c2359d9bf15d
--- /dev/null
+++ b/net-dialup/pptpd/files/pptpd-1.3.2-gentoo.patch
@@ -0,0 +1,51 @@
+diff -Nru pptpd-1.3.2.orig/Makefile.am pptpd-1.3.2/Makefile.am
+--- pptpd-1.3.2.orig/Makefile.am	2006-04-18 06:22:17.000000000 +0300
++++ pptpd-1.3.2/Makefile.am	2006-05-13 00:01:40.666690750 +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.2.orig/plugins/Makefile pptpd-1.3.2/plugins/Makefile
+--- pptpd-1.3.2.orig/plugins/Makefile	2004-05-21 12:26:37.000000000 +0300
++++ pptpd-1.3.2/plugins/Makefile	2006-05-13 00:01:40.666690750 +0300
+@@ -1,6 +1,5 @@
+ CC	= gcc
+-COPTS	= -O2 -g
+-CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
++CFLAGS	+= -I.. -I../../include -fPIC
+ LDFLAGS	= -shared
+ INSTALL	= install -o root
+ prefix  = /usr/local
+diff -Nru pptpd-1.3.2.orig/pptpgre.c pptpd-1.3.2/pptpgre.c
+--- pptpd-1.3.2.orig/pptpgre.c	2006-03-28 00:39:05.000000000 +0300
++++ pptpd-1.3.2/pptpgre.c	2006-05-13 00:05:12.462064250 +0300
+@@ -405,9 +405,9 @@
+ 		}
+ 		/* check for out-of-order sequence number */
+ 		if (seq_greater(seq, gre.seq_recv)) {
+-			if (pptpctrl_debug)
++			/* if (pptpctrl_debug)
+ 				syslog(LOG_DEBUG, "GRE: accepting packet #%d", 
+-				       seq);
++				       seq); */
+ 			stats.rx_accepted++;
+ 			gre.seq_recv = seq;
+ 			return cb(cl, buffer + ip_len + headersize, payload_len);
+diff -Nru pptpd-1.3.2.orig/pqueue.c pptpd-1.3.2/pqueue.c
+--- pptpd-1.3.2.orig/pqueue.c	2005-08-03 11:53:22.000000000 +0300
++++ pptpd-1.3.2/pqueue.c	2006-05-13 00:01:40.666690750 +0300
+@@ -12,7 +12,8 @@
+ #define DEBUG_ON 0
+ #endif
+ 
+-#define DEBUG_CMD(_a) if (DEBUG_ON) { _a }
++/* #define DEBUG_CMD(_a) if (DEBUG_ON) { _a } */
++#define DEBUG_CMD(_a)
+ 
+ #define MIN_CAPACITY 128 /* min allocated buffer for a packet */
+ 
diff --git a/net-dialup/pptpd/pptpd-1.3.2.ebuild b/net-dialup/pptpd/pptpd-1.3.2.ebuild
new file mode 100644
index 000000000000..0f049669b4b9
--- /dev/null
+++ b/net-dialup/pptpd/pptpd-1.3.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.2.ebuild,v 1.1 2006/05/12 21:25:14 mrness Exp $
+
+inherit eutils autotools
+
+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"
+
+DEPEND="net-dialup/ppp
+	tcpd? ( sys-apps/tcp-wrappers )"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-connections-arg.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"
+}
+
+src_compile() {
+	eautomake
+
+	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
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/pptpd-init" pptpd
+
+	insinto /etc/conf.d
+	newins "${FILESDIR}/pptpd-confd" pptpd
+
+	dodoc AUTHORS ChangeLog NEWS README* TODO
+	docinto samples
+	dodoc samples/*
+}