diff options
author | Alin Năstac <mrness@gentoo.org> | 2007-03-18 07:39:17 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2007-03-18 07:39:17 +0000 |
commit | d11353be5382dace602cb4ecc7835ed9b175e9c3 (patch) | |
tree | 7cf86b8fc116e530f9d5dc08ce1fd0afbe46ba07 /net-dialup/pptpclient | |
parent | Remove unused version. (diff) | |
download | gentoo-2-d11353be5382dace602cb4ecc7835ed9b175e9c3.tar.gz gentoo-2-d11353be5382dace602cb4ecc7835ed9b175e9c3.tar.bz2 gentoo-2-d11353be5382dace602cb4ecc7835ed9b175e9c3.zip |
Remove obsolete version. Don't rename pptp process to pptpgw (#171058). Restrict test - vector_test.c is useless and broken.
(Portage version: 2.1.2.2)
Diffstat (limited to 'net-dialup/pptpclient')
-rw-r--r-- | net-dialup/pptpclient/ChangeLog | 10 | ||||
-rw-r--r-- | net-dialup/pptpclient/files/digest-pptpclient-1.7.1-r1 (renamed from net-dialup/pptpclient/files/digest-pptpclient-1.7.0) | 6 | ||||
-rw-r--r-- | net-dialup/pptpclient/files/options.pptp | 32 | ||||
-rw-r--r-- | net-dialup/pptpclient/files/pptpclient-1.7.1-process-name.patch | 26 | ||||
-rw-r--r-- | net-dialup/pptpclient/pptpclient-1.7.1-r1.ebuild (renamed from net-dialup/pptpclient/pptpclient-1.7.0.ebuild) | 16 |
5 files changed, 51 insertions, 39 deletions
diff --git a/net-dialup/pptpclient/ChangeLog b/net-dialup/pptpclient/ChangeLog index 7ce78ee49c33..04e89c5dcbd7 100644 --- a/net-dialup/pptpclient/ChangeLog +++ b/net-dialup/pptpclient/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-dialup/pptpclient # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.46 2007/02/10 09:21:35 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.47 2007/03/18 07:39:17 mrness Exp $ + +*pptpclient-1.7.1-r1 (18 Mar 2007) + + 18 Mar 2007; Alin Năstac <mrness@gentoo.org> + +files/pptpclient-1.7.1-process-name.patch, -files/options.pptp, + -pptpclient-1.7.0.ebuild, +pptpclient-1.7.1-r1.ebuild: + Remove obsolete version. Don't rename pptp process to pptpgw (#171058). + Restrict test - vector_test.c is useless and broken. 10 Feb 2007; Alin Năstac <mrness@gentoo.org> pptpclient-1.7.1.ebuild: Stable on amd64. diff --git a/net-dialup/pptpclient/files/digest-pptpclient-1.7.0 b/net-dialup/pptpclient/files/digest-pptpclient-1.7.1-r1 index 77b6634397cd..962839b6d0cd 100644 --- a/net-dialup/pptpclient/files/digest-pptpclient-1.7.0 +++ b/net-dialup/pptpclient/files/digest-pptpclient-1.7.1-r1 @@ -1,6 +1,6 @@ -MD5 0bc7dbd1c265e4263008fa7883de58dd pptp-1.7.0.tar.gz 227699 -RMD160 62c947379c44102945a198ddc914d5aa634db13c pptp-1.7.0.tar.gz 227699 -SHA256 2d3c52a7becda2717d62705b09ca466890eb7381bf82c697c89b5300f4e0fa4e pptp-1.7.0.tar.gz 227699 +MD5 b47735ba5d6d37dfdbccb85afc044ede pptp-1.7.1.tar.gz 229024 +RMD160 f510262e8c06058d754d6d73d1b289fcdbc54dc7 pptp-1.7.1.tar.gz 229024 +SHA256 8e3fa9f17c22818eae68419f66966865423206d736eb74d212a3501f62423276 pptp-1.7.1.tar.gz 229024 MD5 a2fd08077b4c6ab1edd9e959901639cd pptp-command-20050401.gz 7662 RMD160 1c02ad63aa90419bbe2151476d1463d7a26d6215 pptp-command-20050401.gz 7662 SHA256 49cfb115491b476a364ddc03f8c1b27f7ba19b6a231eabc11e823e3f32c5987d pptp-command-20050401.gz 7662 diff --git a/net-dialup/pptpclient/files/options.pptp b/net-dialup/pptpclient/files/options.pptp deleted file mode 100644 index 24119ad5da61..000000000000 --- a/net-dialup/pptpclient/files/options.pptp +++ /dev/null @@ -1,32 +0,0 @@ -# -# Lock the port -# -lock - -# -# We don't need the tunnel server to authenticate itself -# -noauth - -# -# Turn off transmission protocols we know won't be used -# -nobsdcomp -nodeflate - -# -# We want MPPE -# -require-mppe - -# -# We want a sane mtu/mru -# -mtu 1000 -mru 1000 - -# -# Time this thing out of it goes poof -# -lcp-echo-failure 10 -lcp-echo-interval 10 diff --git a/net-dialup/pptpclient/files/pptpclient-1.7.1-process-name.patch b/net-dialup/pptpclient/files/pptpclient-1.7.1-process-name.patch new file mode 100644 index 000000000000..8add526a439c --- /dev/null +++ b/net-dialup/pptpclient/files/pptpclient-1.7.1-process-name.patch @@ -0,0 +1,26 @@ +diff -Nru pptp-1.7.1.orig/pptp.c pptp-1.7.1/pptp.c +--- pptp-1.7.1.orig/pptp.c 2006-02-13 05:07:42.000000000 +0200 ++++ pptp-1.7.1/pptp.c 2007-03-18 09:23:16.000000000 +0200 +@@ -43,11 +43,7 @@ + #include "pptp_callmgr.h" + #include "pptp_gre.h" + #include "version.h" +-#if defined(__linux__) +-#include <linux/prctl.h> +-#else + #include "inststr.h" +-#endif + #include "util.h" + #include "pptp_quirks.h" + #include "pqueue.h" +@@ -355,10 +351,6 @@ + + snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s", + ttyname(tty_fd)); +-#ifdef PR_SET_NAME +- rc = prctl(PR_SET_NAME, "pptpgw", 0, 0, 0); +- if (rc != 0) perror("prctl"); +-#endif + inststr(argc, argv, envp, buf); + if (sigsetjmp(env, 1)!= 0) goto shutdown; + diff --git a/net-dialup/pptpclient/pptpclient-1.7.0.ebuild b/net-dialup/pptpclient/pptpclient-1.7.1-r1.ebuild index 80c165b80f7a..bc5f0eb0a316 100644 --- a/net-dialup/pptpclient/pptpclient-1.7.0.ebuild +++ b/net-dialup/pptpclient/pptpclient-1.7.1-r1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.7.0.ebuild,v 1.8 2006/10/23 07:57:53 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.7.1-r1.ebuild,v 1.1 2007/03/18 07:39:17 mrness Exp $ + +inherit eutils MY_P=${P/client} MY_CMD=pptp-command-20050401 @@ -19,8 +21,16 @@ DEPEND=">=net-dialup/ppp-2.4.2 dev-lang/perl tk? ( dev-perl/perl-tk )" +RESTRICT="test" #make test is useless and vector_test.c is broken + S="${WORKDIR}/${MY_P}" +src_unpack() { + unpack ${A} + + epatch "${FILESDIR}"/${P}-process-name.patch +} + src_compile() { emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" || die "make failed" } @@ -35,7 +45,7 @@ src_install() { # The current version of pptp-linux doesn't include the # RH-specific portions, so include them ourselves. insinto /etc/ppp - doins "${FILESDIR}/options.pptp" + doins options.pptp newsbin "${WORKDIR}/${MY_CMD}" pptp-command dosbin "${FILESDIR}/pptp_fe.pl" use tk && dosbin "${FILESDIR}/xpptp_fe.pl" |