diff options
Diffstat (limited to 'net-dialup/pptpd')
| -rw-r--r-- | net-dialup/pptpd/ChangeLog | 9 | ||||
| -rw-r--r-- | net-dialup/pptpd/files/digest-pptpd-1.2.3-r1 | 2 | ||||
| -rw-r--r-- | net-dialup/pptpd/files/digest-pptpd-1.3.0 | 2 | ||||
| -rw-r--r-- | net-dialup/pptpd/files/digest-pptpd-1.3.1 | 2 | ||||
| -rw-r--r-- | net-dialup/pptpd/files/digest-pptpd-1.3.2 | 2 | ||||
| -rw-r--r-- | net-dialup/pptpd/files/digest-pptpd-1.3.3 | 3 | ||||
| -rw-r--r-- | net-dialup/pptpd/files/pptpd-1.3.3-gentoo.patch | 57 | ||||
| -rw-r--r-- | net-dialup/pptpd/pptpd-1.3.3.ebuild | 60 |
8 files changed, 136 insertions, 1 deletions
diff --git a/net-dialup/pptpd/ChangeLog b/net-dialup/pptpd/ChangeLog index abd9cef6b9a3..7eca5fb95b8d 100644 --- a/net-dialup/pptpd/ChangeLog +++ b/net-dialup/pptpd/ChangeLog @@ -1,6 +1,13 @@ # 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.22 2006/05/12 21:25:14 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.23 2006/09/08 06:35:05 mrness Exp $ + +*pptpd-1.3.3 (08 Sep 2006) + + 08 Sep 2006; Alin Nastac <mrness@gentoo.org> + +files/pptpd-1.3.3-gentoo.patch, +pptpd-1.3.3.ebuild: + Version bump. Add gre-extreme-debug USE flag which enables logging of every + accepted GRE package (#127388). *pptpd-1.3.2 (12 May 2006) diff --git a/net-dialup/pptpd/files/digest-pptpd-1.2.3-r1 b/net-dialup/pptpd/files/digest-pptpd-1.2.3-r1 index ccdf21edaae4..f1373462d8b6 100644 --- a/net-dialup/pptpd/files/digest-pptpd-1.2.3-r1 +++ b/net-dialup/pptpd/files/digest-pptpd-1.2.3-r1 @@ -1 +1,3 @@ MD5 a521e40ca304b0c125cc25f9b9d03324 pptpd-1.2.3.tar.gz 185721 +RMD160 76cf6a08701d1755b427a0c01cc2861887fb8850 pptpd-1.2.3.tar.gz 185721 +SHA256 f888e226e2872e075bd904d1d86f0d7d7a1d8ea68d860f9e5db8130978b5f210 pptpd-1.2.3.tar.gz 185721 diff --git a/net-dialup/pptpd/files/digest-pptpd-1.3.0 b/net-dialup/pptpd/files/digest-pptpd-1.3.0 index a791ab115e68..2d335a16a64f 100644 --- a/net-dialup/pptpd/files/digest-pptpd-1.3.0 +++ b/net-dialup/pptpd/files/digest-pptpd-1.3.0 @@ -1 +1,3 @@ MD5 75d494e881f7027f4e60b114163f6b67 pptpd-1.3.0.tar.gz 204099 +RMD160 01bb976b56589d7fd264653c394abe3c883e055b pptpd-1.3.0.tar.gz 204099 +SHA256 4f6fe4eb08ca7a69c83658ab13b23a77aa153ec1a2663596ddcbbf35768b0cee pptpd-1.3.0.tar.gz 204099 diff --git a/net-dialup/pptpd/files/digest-pptpd-1.3.1 b/net-dialup/pptpd/files/digest-pptpd-1.3.1 index 7cb46db83e48..6f18e4069356 100644 --- a/net-dialup/pptpd/files/digest-pptpd-1.3.1 +++ b/net-dialup/pptpd/files/digest-pptpd-1.3.1 @@ -1 +1,3 @@ MD5 1ad4bf5e99670cab37b90252cc1d691a pptpd-1.3.1.tar.gz 232609 +RMD160 e676b017d4bd63adecd4a06c4afc8d29ba8e67b4 pptpd-1.3.1.tar.gz 232609 +SHA256 3e2f7abec062b16061228adaa171894fb3ff88213e5f01607d43ee3f62168883 pptpd-1.3.1.tar.gz 232609 diff --git a/net-dialup/pptpd/files/digest-pptpd-1.3.2 b/net-dialup/pptpd/files/digest-pptpd-1.3.2 index 6d47c06bd69d..c897d9996dce 100644 --- a/net-dialup/pptpd/files/digest-pptpd-1.3.2 +++ b/net-dialup/pptpd/files/digest-pptpd-1.3.2 @@ -1 +1,3 @@ MD5 4e4eb2fd2d96cb86b88d18318b3108dc pptpd-1.3.2.tar.gz 235467 +RMD160 ed561b8c3363bcce068657c6f2797e1d439ce053 pptpd-1.3.2.tar.gz 235467 +SHA256 29ed4c09202dadf07c85cd98d86d6b81cb48e3c949a0284b213612d54b4ff1c2 pptpd-1.3.2.tar.gz 235467 diff --git a/net-dialup/pptpd/files/digest-pptpd-1.3.3 b/net-dialup/pptpd/files/digest-pptpd-1.3.3 new file mode 100644 index 000000000000..dc6237564dbf --- /dev/null +++ b/net-dialup/pptpd/files/digest-pptpd-1.3.3 @@ -0,0 +1,3 @@ +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 new file mode 100644 index 000000000000..0e718d312b20 --- /dev/null +++ b/net-dialup/pptpd/files/pptpd-1.3.3-gentoo.patch @@ -0,0 +1,57 @@ +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 new file mode 100644 index 000000000000..35fb4eaa8a0b --- /dev/null +++ b/net-dialup/pptpd/pptpd-1.3.3.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.3.ebuild,v 1.1 2006/09/08 06:35:05 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 + + 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/* +} |