From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- net-dialup/pptpd/Manifest | 1 + net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch | 59 +++++++++++++++++ .../pptpd/files/pptpd-1.4.0-sandbox-fix.patch | 21 ++++++ net-dialup/pptpd/files/pptpd-confd | 5 ++ net-dialup/pptpd/files/pptpd-init-r2 | 19 ++++++ net-dialup/pptpd/metadata.xml | 12 ++++ net-dialup/pptpd/pptpd-1.4.0.ebuild | 74 ++++++++++++++++++++++ 7 files changed, 191 insertions(+) create mode 100644 net-dialup/pptpd/Manifest create mode 100644 net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch create mode 100644 net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch create mode 100644 net-dialup/pptpd/files/pptpd-confd create mode 100644 net-dialup/pptpd/files/pptpd-init-r2 create mode 100644 net-dialup/pptpd/metadata.xml create mode 100644 net-dialup/pptpd/pptpd-1.4.0.ebuild (limited to 'net-dialup/pptpd') diff --git a/net-dialup/pptpd/Manifest b/net-dialup/pptpd/Manifest new file mode 100644 index 000000000000..5a62976fcde8 --- /dev/null +++ b/net-dialup/pptpd/Manifest @@ -0,0 +1 @@ +DIST pptpd-1.4.0.tar.gz 252167 SHA256 8fcd8b8a42de2af59e9fe8cbaa9f894045c977f4d038bbd6346a8522bb7f06c0 SHA512 cfb4caef3025c0721e7fabf8b7bf595739f2d3048555b30616cdadc37e70ba9e1c50561c25091dd617b5448da2816aeaf83aea0fc2ef6b0dd5e3fe35d9591484 WHIRLPOOL 8296818e05cb01339b83a68d149413fd5bd76b435cfa56c3e16a8136b531743468953279d44339fd0f8125fb25172a3ee9a10ec14bb9f801eb54133b665dab3b diff --git a/net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch b/net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch new file mode 100644 index 000000000000..9e7db7ea3454 --- /dev/null +++ b/net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch @@ -0,0 +1,59 @@ +diff -Naur pptpd-1.3.4.orig/Makefile.am pptpd-1.3.4/Makefile.am +--- pptpd-1.3.4.orig/Makefile.am 2007-04-16 04:53:53.000000000 +0400 ++++ pptpd-1.3.4/Makefile.am 2007-05-01 21:29:15.000000000 +0400 +@@ -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 -Naur pptpd-1.3.4.orig/plugins/Makefile pptpd-1.3.4/plugins/Makefile +--- pptpd-1.3.4.orig/plugins/Makefile 2006-08-03 06:02:01.000000000 +0400 ++++ pptpd-1.3.4/plugins/Makefile 2007-05-01 21:29:15.000000000 +0400 +@@ -1,6 +1,5 @@ +-CC = gcc ++CC ?= gcc +-COPTS = -O2 -g +-CFLAGS = $(COPTS) -I.. -I../../include -fPIC ++CFLAGS += -I.. -I../../include -fPIC +-LDFLAGS = -shared ++LDFLAGS += -shared + LDADD = -lutil + INSTALL = install -o root +diff -Naur pptpd-1.3.4.orig/pptpgre.c pptpd-1.3.4/pptpgre.c +--- pptpd-1.3.4.orig/pptpgre.c 2007-04-16 04:21:02.000000000 +0400 ++++ pptpd-1.3.4/pptpgre.c 2007-05-01 21:29:50.000000000 +0400 +@@ -326,9 +326,11 @@ + "GRE: timeout waiting for %d packets", + head->seq - gre.seq_recv - 1); + } ++#ifdef LOG_DEBUG_GRE_ACCEPTING_PACKET + if (pptpctrl_debug) + syslog(LOG_DEBUG, "GRE: accepting #%d from queue", + head->seq); ++#endif + gre.seq_recv = head->seq; + status = callback(cl, head->packet, head->packlen); + pqueue_del(head); +diff -Naur pptpd-1.3.4.orig/pqueue.c pptpd-1.3.4/pqueue.c +--- pptpd-1.3.4.orig/pqueue.c 2005-08-03 12:53:22.000000000 +0400 ++++ pptpd-1.3.4/pqueue.c 2007-05-01 21:29:15.000000000 +0400 +@@ -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/files/pptpd-1.4.0-sandbox-fix.patch b/net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch new file mode 100644 index 000000000000..de91753f33f5 --- /dev/null +++ b/net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch @@ -0,0 +1,21 @@ +--- plugins/Makefile.orig 2013-05-15 14:36:33.994231829 +0400 ++++ plugins/Makefile 2013-05-15 14:37:06.686234429 +0400 +@@ -17,14 +17,14 @@ + %.so: %.c + $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD) + +-LIBDIR ?= $(DESTDIR)$(prefix)/lib/pptpd ++LIBDIR ?= $(prefix)/lib/pptpd + + install: $(PLUGINS) +- $(INSTALL) -d $(LIBDIR) +- $(INSTALL) $? $(LIBDIR) ++ $(INSTALL) -d $(DESTDIR)$(LIBDIR) ++ $(INSTALL) $? $(DESTDIR)$(LIBDIR) + + uninstall: +- rm -f $(LIBDIR)$(PLUGINS) ++ rm -f $(DESTDIR)$(LIBDIR)$(PLUGINS) + + clean: + rm -f *.o *.so *.a diff --git a/net-dialup/pptpd/files/pptpd-confd b/net-dialup/pptpd/files/pptpd-confd new file mode 100644 index 000000000000..1169e57f1c7c --- /dev/null +++ b/net-dialup/pptpd/files/pptpd-confd @@ -0,0 +1,5 @@ +# Config file for /etc/init.d/pptpd + +# Any extra options you want to pass to pptpd +# on start-up should be put here. +PPTPD_OPTS="" diff --git a/net-dialup/pptpd/files/pptpd-init-r2 b/net-dialup/pptpd/files/pptpd-init-r2 new file mode 100644 index 000000000000..b1f8d293183e --- /dev/null +++ b/net-dialup/pptpd/files/pptpd-init-r2 @@ -0,0 +1,19 @@ +#!/sbin/runscript + +depend() { + need net +} + +start() { + ebegin "Starting pptpd" + start-stop-daemon --start --quiet --exec /usr/sbin/pptpd -- ${PPTPD_OPTS} + eend $? +} + +stop() { + ebegin "Stopping pptpd" + start-stop-daemon --stop --quiet --pidfile /run/pptpd.pid + result=$? + killall -SIGTERM pptpctrl &>/dev/null + eend $result +} diff --git a/net-dialup/pptpd/metadata.xml b/net-dialup/pptpd/metadata.xml new file mode 100644 index 000000000000..c068ca384f2c --- /dev/null +++ b/net-dialup/pptpd/metadata.xml @@ -0,0 +1,12 @@ + + + + net-dialup + + Log all GRE accepted packages when in debug + mode (required if you want upstream support) + + + poptop + + diff --git a/net-dialup/pptpd/pptpd-1.4.0.ebuild b/net-dialup/pptpd/pptpd-1.4.0.ebuild new file mode 100644 index 000000000000..86da5937c32c --- /dev/null +++ b/net-dialup/pptpd/pptpd-1.4.0.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit autotools eutils flag-o-matic + +DESCRIPTION="Linux Point-to-Point Tunnelling Protocol Server" +HOMEPAGE="http://poptop.sourceforge.net/" +SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +IUSE="gre-extreme-debug tcpd" + +DEPEND="net-dialup/ppp:= + tcpd? ( sys-apps/tcp-wrappers )" +RDEPEND="${DEPEND}" + +DOCS=( AUTHORS ChangeLog NEWS README TODO ) + +src_prepare() { + epatch "${FILESDIR}/${P}-gentoo.patch" + epatch "${FILESDIR}/${P}-sandbox-fix.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}\":" plugins/patchlevel.h || die + + # Automake 1.13, compatibility, bug #469476 + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.in || die 'sed on configure.ac failed' + + # remove 'missing' script to prevent warnings + rm missing || die 'remove missing script failed' + + # respect compiler, bug #461722 + tc-export CC + + # Apply user patches + epatch_user + + eautoreconf +} + +src_configure() { + use gre-extreme-debug && append-cppflags "-DLOG_DEBUG_GRE_ACCEPTING_PACKET" + econf \ + --enable-bcrelay \ + $(use tcpd && echo "--with-libwrap") +} + +src_compile() { + emake COPTS="${CFLAGS}" +} + +src_install () { + default + + insinto /etc + doins samples/pptpd.conf + + insinto /etc/ppp + doins samples/options.pptpd + + newinitd "${FILESDIR}/pptpd-init-r2" pptpd + newconfd "${FILESDIR}/pptpd-confd" pptpd + + dodoc README.* + dodoc -r samples +} -- cgit v1.2.3-65-gdbad