From 5cdcf6a91ad9f88171bacd4305c535a69a7919a0 Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Mon, 2 Dec 2013 11:43:54 +0000 Subject: Version bump, drop old (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42) --- net-dialup/pptpclient/ChangeLog | 8 +++- .../files/pptpclient-1.8.0-process-name.patch | 39 ++++++++++++++++ net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild | 52 --------------------- net-dialup/pptpclient/pptpclient-1.8.0.ebuild | 53 ++++++++++++++++++++++ 4 files changed, 99 insertions(+), 53 deletions(-) create mode 100644 net-dialup/pptpclient/files/pptpclient-1.8.0-process-name.patch delete mode 100644 net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild create mode 100644 net-dialup/pptpclient/pptpclient-1.8.0.ebuild (limited to 'net-dialup/pptpclient') diff --git a/net-dialup/pptpclient/ChangeLog b/net-dialup/pptpclient/ChangeLog index 00297963bdf5..5d7df6f0ce56 100644 --- a/net-dialup/pptpclient/ChangeLog +++ b/net-dialup/pptpclient/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-dialup/pptpclient # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.65 2013/10/25 09:27:10 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.66 2013/12/02 11:43:54 pinkbyte Exp $ + +*pptpclient-1.8.0 (02 Dec 2013) + + 02 Dec 2013; Sergey Popov -pptpclient-1.7.2-r2.ebuild, + +pptpclient-1.8.0.ebuild, +files/pptpclient-1.8.0-process-name.patch: + Version bump, drop old 25 Oct 2013; Sergey Popov pptpclient-1.7.2-r3.ebuild: Add ~arm keyword wrt bug #488572, thanks to Michael Kurinnoy +-#endif + #include "inststr.h" + #include "util.h" + #include "pptp_quirks.h" +@@ -413,12 +410,7 @@ + tty_name = ttyname(tty_fd); + snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s", + tty_name ? tty_name : "(null)"); +-#ifdef PR_SET_NAME +- rc = prctl(PR_SET_NAME, "pptpgw", 0, 0, 0); +- if (rc != 0) perror("prctl"); +-#else + inststr(argc, argv, envp, buf); +-#endif + if (sigsetjmp(env, 1)!= 0) goto shutdown; + + signal(SIGINT, sighandler); +@@ -517,13 +509,7 @@ + char *my_argv[3] = { argv[0], inet_ntoa(inetaddr), phonenr }; + char buf[128]; + snprintf(buf, sizeof(buf), "pptp: call manager for %s", my_argv[1]); +-#ifdef PR_SET_NAME +- int rc; +- rc = prctl(PR_SET_NAME, "pptpcm", 0, 0, 0); +- if (rc != 0) perror("prctl"); +-#else + inststr(argc, argv, envp, buf); +-#endif + exit(callmgr_main(3, my_argv, envp)); + } + diff --git a/net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild b/net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild deleted file mode 100644 index b5486e21e402..000000000000 --- a/net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.7.2-r2.ebuild,v 1.3 2010/04/29 19:46:17 truedfx Exp $ - -EAPI="2" - -inherit eutils toolchain-funcs - -MY_P=${P/client} -MY_CMD=pptp-command-20050401 - -DESCRIPTION="Linux client for PPTP" -HOMEPAGE="http://pptpclient.sourceforge.net/" -SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz - mirror://gentoo/${MY_CMD}.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="alpha amd64 ppc ppc64 x86" -IUSE="tk" - -DEPEND="net-dialup/ppp - dev-lang/perl - tk? ( dev-perl/perl-tk )" -RDEPEND="${DEPEND} - sys-apps/iproute2" - -RESTRICT="test" #make test is useless and vector_test.c is broken - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-process-name.patch - epatch "${FILESDIR}"/${P}-ip-path.patch -} - -src_compile() { - emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING - dodoc Documentation/* - dodir /etc/pptp.d - - # The current version of pptp-linux doesn't include the - # RH-specific portions, so include them ourselves. - newsbin "${WORKDIR}/${MY_CMD}" pptp-command - dosbin "${FILESDIR}/pptp_fe.pl" - use tk && dosbin "${FILESDIR}/xpptp_fe.pl" -} diff --git a/net-dialup/pptpclient/pptpclient-1.8.0.ebuild b/net-dialup/pptpclient/pptpclient-1.8.0.ebuild new file mode 100644 index 000000000000..cd281263caaf --- /dev/null +++ b/net-dialup/pptpclient/pptpclient-1.8.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.8.0.ebuild,v 1.1 2013/12/02 11:43:54 pinkbyte Exp $ + +EAPI="5" + +inherit eutils toolchain-funcs + +MY_P="${P/client}" +MY_CMD="pptp-command-20130515" + +DESCRIPTION="Linux client for PPTP" +HOMEPAGE="http://pptpclient.sourceforge.net/" +SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz + http://dev.gentoo.org/~pinkbyte/distfiles/pptpclient/${MY_CMD}.bz2" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="tk" + +DEPEND="net-dialup/ppp + dev-lang/perl + tk? ( dev-perl/perl-tk )" +RDEPEND="${DEPEND} + sys-apps/iproute2" + +RESTRICT="test" #make test is useless and vector_test.c is broken + +S="${WORKDIR}/${MY_P}" + +DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING ) + +src_prepare() { + epatch "${FILESDIR}"/${P}-process-name.patch + epatch_user +} + +src_compile() { + emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" +} + +src_install() { + default + dodoc Documentation/* + dodir /etc/pptp.d + + # The current version of pptp-linux doesn't include the + # RH-specific portions, so include them ourselves. + newsbin "${WORKDIR}/${MY_CMD}" pptp-command + dosbin "${FILESDIR}/pptp_fe.pl" + use tk && dosbin "${FILESDIR}/xpptp_fe.pl" +} -- cgit v1.2.3-65-gdbad