Version bump (#125464). Fix compile warnings and CFLAGS.

Package-Manager: portage-2.0.53

5 files changed, 133 insertions, 9 deletions

diff --git a/net-dialup/pptpd/ChangeLog b/net-dialup/pptpd/ChangeLog
index 09085b616d03..c61097da0018 100644
--- a/net-dialup/pptpd/ChangeLog
+++ b/net-dialup/pptpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/pptpd
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.19 2005/10/06 05:17:24 mrness Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.20 2006/03/10 13:47:53 mrness Exp $
+
+*pptpd-1.3.0 (10 Mar 2006)
+
+  10 Mar 2006; Alin Nastac <mrness@gentoo.org>
+  +files/pptpd-1.3.0-gentoo.patch, +pptpd-1.3.0.ebuild:
+  Version bump (#125464). Fix compile warnings and CFLAGS.
 
   06 Oct 2005; Alin Nastac <mrness@gentoo.org> pptpd-1.2.3-r1.ebuild:
   Remove COPYING and INSTALL from docs.
diff --git a/net-dialup/pptpd/Manifest b/net-dialup/pptpd/Manifest
index 7dc9ed882f79..35be028db179 100644
--- a/net-dialup/pptpd/Manifest
+++ b/net-dialup/pptpd/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b7dbbe4e000b11e6915287267bcb835d pptpd-1.2.3-r1.ebuild 1378
-MD5 10cce1436cfa61e5e71127e1457602c8 ChangeLog 2760
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 977a120a1c8dec0a87bfec80b05a0ab8 ChangeLog 2951
 MD5 1fa197073ee270e0a198941524453ce3 files/digest-pptpd-1.2.3-r1 63
-MD5 96fed26a1a72e947d12edda983f74d16 files/pptpd-init 386
+MD5 4e3a14647e551188f195fa9a7372924c files/digest-pptpd-1.3.0 63
+MD5 4c6b3d63b289e8f024cdde4da1b16663 files/pptpd-1.3.0-gentoo.patch 1955
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDRLN/NSP4Vda7IdsRAq00AJ9IMjzH+0VttbS8VvoMx8+KS+yuOgCfZaAO
-dYxQB6G9CPAzJ1YDizAlCng=
-=LbxF
+iD8DBQFEEYOdjG8pv1lIUX4RAgnfAKDRqMTKPyZBC8VTU18oCirKrJ4TsQCbBgEr
+qZQNqBM0VZcp50N30q6/1Zw=
+=U+Hv
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/pptpd/files/digest-pptpd-1.3.0 b/net-dialup/pptpd/files/digest-pptpd-1.3.0
new file mode 100644
index 000000000000..a791ab115e68
--- /dev/null
+++ b/net-dialup/pptpd/files/digest-pptpd-1.3.0
@@ -0,0 +1 @@
+MD5 75d494e881f7027f4e60b114163f6b67 pptpd-1.3.0.tar.gz 204099
diff --git a/net-dialup/pptpd/files/pptpd-1.3.0-gentoo.patch b/net-dialup/pptpd/files/pptpd-1.3.0-gentoo.patch
new file mode 100644
index 000000000000..e84af0bf4a82
--- /dev/null
+++ b/net-dialup/pptpd/files/pptpd-1.3.0-gentoo.patch
@@ -0,0 +1,55 @@
+diff -Nur pptpd-1.3.0.orig/Makefile.am pptpd-1.3.0/Makefile.am
+--- pptpd-1.3.0.orig/Makefile.am	2005-08-02 12:01:34.000000000 +0300
++++ pptpd-1.3.0/Makefile.am	2006-03-10 15:20:03.000000000 +0200
+@@ -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 -Nur pptpd-1.3.0.orig/plugins/Makefile pptpd-1.3.0/plugins/Makefile
+--- pptpd-1.3.0.orig/plugins/Makefile	2004-05-21 12:26:37.000000000 +0300
++++ pptpd-1.3.0/plugins/Makefile	2006-03-10 15:20:34.000000000 +0200
+@@ -1,6 +1,5 @@
+ CC	= gcc
+-COPTS	= -O2 -g
+-CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
++CFLAGS	+= -g -I.. -I../../include -fPIC
+ LDFLAGS	= -shared
+ INSTALL	= install -o root
+ prefix  = /usr/local
+diff -Nru pptpd-1.3.0.orig/plugins/pptpd-logwtmp.c pptpd-1.3.0/plugins/pptpd-logwtmp.c
+--- pptpd-1.3.0.orig/plugins/pptpd-logwtmp.c	2005-08-02 12:51:18.000000000 +0300
++++ pptpd-1.3.0/plugins/pptpd-logwtmp.c	2006-03-10 15:38:52.000000000 +0200
+@@ -11,6 +11,7 @@
+  */
+ #include <unistd.h>
+ #include <utmp.h>
++#include <string.h>
+ #include "pppd.h"
+ 
+ char pppd_version[] = VERSION;
+diff -Nru pptpd-1.3.0.orig/pqueue.c pptpd-1.3.0/pqueue.c
+--- pptpd-1.3.0.orig/pqueue.c	2005-03-31 07:55:53.000000000 +0300
++++ pptpd-1.3.0/pqueue.c	2006-03-10 15:39:27.000000000 +0200
+@@ -2,6 +2,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <assert.h>
++#include <err.h>
+ 
+ #include "pqueue.h"
+ 
+@@ -11,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.0.ebuild b/net-dialup/pptpd/pptpd-1.3.0.ebuild
new file mode 100644
index 000000000000..fa7e2ad5bbd7
--- /dev/null
+++ b/net-dialup/pptpd/pptpd-1.3.0.ebuild
@@ -0,0 +1,59 @@
+# 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.0.ebuild,v 1.1 2006/03/10 13:47:53 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"
+
+	#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() {
+	eautoreconf
+
+	local myconf
+	use tcpd && myconf="--with-libwrap"
+	econf --with-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/*
+}