From: Alin Năstac Date: Sun, 18 Mar 2007 07:39:17 +0000 (+0000) Subject: Remove obsolete version. Don't rename pptp process to pptpgw (#171058). Restrict... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b955523bdf22738ed7d9f7801552203e70540791;p=gentoo.git Remove obsolete version. Don't rename pptp process to pptpgw (#171058). Restrict test - vector_test.c is useless and broken. Package-Manager: portage-2.1.2.2 --- 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 + +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 pptpclient-1.7.1.ebuild: Stable on amd64. diff --git a/net-dialup/pptpclient/Manifest b/net-dialup/pptpclient/Manifest index ad054bb5d3a1..c23ace389596 100644 --- a/net-dialup/pptpclient/Manifest +++ b/net-dialup/pptpclient/Manifest @@ -1,47 +1,46 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX options.pptp 340 RMD160 adc667e771edab67316f855c8458978e386c51c3 SHA1 c4a729264a3ddd9534725ef43c2a8204b7120f1f SHA256 cd50ad834140f6d5088d52190c5acee3eaea690cdb6550f90ba6d8837633b68e -MD5 eeee374ec64214d7f9c26a21ce8f4a36 files/options.pptp 340 -RMD160 adc667e771edab67316f855c8458978e386c51c3 files/options.pptp 340 -SHA256 cd50ad834140f6d5088d52190c5acee3eaea690cdb6550f90ba6d8837633b68e files/options.pptp 340 AUX pptp_fe.pl 8100 RMD160 4b8c4591645a5f79daf2ba27e3e657db24323ffe SHA1 ec6102be37a7a2107f796bee974feadb7a3bd7a1 SHA256 f980fd3ff529bd4476852be39e05579bbeb9dc5c299795050a8d146ed6c4c648 MD5 34862b5af00d851d068eb3e384093c3b files/pptp_fe.pl 8100 RMD160 4b8c4591645a5f79daf2ba27e3e657db24323ffe files/pptp_fe.pl 8100 SHA256 f980fd3ff529bd4476852be39e05579bbeb9dc5c299795050a8d146ed6c4c648 files/pptp_fe.pl 8100 +AUX pptpclient-1.7.1-process-name.patch 735 RMD160 df4e5d1fcbe18fdf823b403d8f190fd3e7d922c3 SHA1 49a918fcd5f8d03f1063067ae81c0cadfd73221e SHA256 db4386f18e959bf5fc60a0318f8f2722be9d6b3cdce39c2e115efb550b00c2a5 +MD5 33f0e70185111d64596261f79add3346 files/pptpclient-1.7.1-process-name.patch 735 +RMD160 df4e5d1fcbe18fdf823b403d8f190fd3e7d922c3 files/pptpclient-1.7.1-process-name.patch 735 +SHA256 db4386f18e959bf5fc60a0318f8f2722be9d6b3cdce39c2e115efb550b00c2a5 files/pptpclient-1.7.1-process-name.patch 735 AUX xpptp_fe.pl 5620 RMD160 876401b301857b17e0ced6e191316f1ff89afe19 SHA1 003c9b054c521972adfd1b48c244ad7470ddb12b SHA256 18c6098a66721a4f5c5b387c2ea312c21224c11ad6b2ddaec83f63049b1ab053 MD5 bd60480b6ba90362342540fb9cbe7ebe files/xpptp_fe.pl 5620 RMD160 876401b301857b17e0ced6e191316f1ff89afe19 files/xpptp_fe.pl 5620 SHA256 18c6098a66721a4f5c5b387c2ea312c21224c11ad6b2ddaec83f63049b1ab053 files/xpptp_fe.pl 5620 -DIST pptp-1.7.0.tar.gz 227699 RMD160 62c947379c44102945a198ddc914d5aa634db13c SHA1 fc96e8a765bf17eb02ce1584d8e9d024b68ab5a7 SHA256 2d3c52a7becda2717d62705b09ca466890eb7381bf82c697c89b5300f4e0fa4e DIST pptp-1.7.1.tar.gz 229024 RMD160 f510262e8c06058d754d6d73d1b289fcdbc54dc7 SHA1 cc2e4f40c5e3316bede41ec0a092a32025682851 SHA256 8e3fa9f17c22818eae68419f66966865423206d736eb74d212a3501f62423276 DIST pptp-command-20050401.gz 7662 RMD160 1c02ad63aa90419bbe2151476d1463d7a26d6215 SHA1 546c437896ba00fe2b66b924671de884986de5d8 SHA256 49cfb115491b476a364ddc03f8c1b27f7ba19b6a231eabc11e823e3f32c5987d -EBUILD pptpclient-1.7.0.ebuild 1134 RMD160 c85e2dc4e10d0fdd0e1ffeb69c1bde0eb83b8f04 SHA1 77de0add62e45b6bf350752a7cfa9b7b5768c84e SHA256 33590d5f54601ec4a71b3f4be62f13414742c4d53134f9026b2b9f6ea63e75ef -MD5 56cb486d4b933f41e5905098db236d1f pptpclient-1.7.0.ebuild 1134 -RMD160 c85e2dc4e10d0fdd0e1ffeb69c1bde0eb83b8f04 pptpclient-1.7.0.ebuild 1134 -SHA256 33590d5f54601ec4a71b3f4be62f13414742c4d53134f9026b2b9f6ea63e75ef pptpclient-1.7.0.ebuild 1134 +EBUILD pptpclient-1.7.1-r1.ebuild 1284 RMD160 006e1c5f30af48342b6831c7b9967c23e350de7e SHA1 29115bcbdbee75c07979c1e3332ad0017bab7232 SHA256 26e15729bc05a898855ad3fb841883d93e0ec1815cc31df2e75761e7d43b0005 +MD5 ee45906ac8741f4a27643c3e1fa17a9b pptpclient-1.7.1-r1.ebuild 1284 +RMD160 006e1c5f30af48342b6831c7b9967c23e350de7e pptpclient-1.7.1-r1.ebuild 1284 +SHA256 26e15729bc05a898855ad3fb841883d93e0ec1815cc31df2e75761e7d43b0005 pptpclient-1.7.1-r1.ebuild 1284 EBUILD pptpclient-1.7.1.ebuild 1120 RMD160 62d0038539ee6ee6772d5425d5bdbd42e3472996 SHA1 b1e5c7d8909d9ad8ab955f98d2f3cf10d69485a6 SHA256 71e0118401eed9503839072b6b3781696d915e807c2dd7e80be5cf0153375dc3 MD5 811209fcfbdabab093e0ad716056e224 pptpclient-1.7.1.ebuild 1120 RMD160 62d0038539ee6ee6772d5425d5bdbd42e3472996 pptpclient-1.7.1.ebuild 1120 SHA256 71e0118401eed9503839072b6b3781696d915e807c2dd7e80be5cf0153375dc3 pptpclient-1.7.1.ebuild 1120 -MISC ChangeLog 6578 RMD160 955b96f49d6c8bc900bbfa4a2893b3d8dbb945d1 SHA1 9cd89e69e5af920d4d1d3e675cd91ddfbdde076e SHA256 6d228626ffa9c3323b69394844ea388cc72529019068f73fb84561a63e311cdd -MD5 1c20022727bb52040e436101abbccad1 ChangeLog 6578 -RMD160 955b96f49d6c8bc900bbfa4a2893b3d8dbb945d1 ChangeLog 6578 -SHA256 6d228626ffa9c3323b69394844ea388cc72529019068f73fb84561a63e311cdd ChangeLog 6578 +MISC ChangeLog 6916 RMD160 6ccec097e5c79b5192930596223d58ba59d1214e SHA1 e08deadc0aaeca65839e006e66374e068e666c6a SHA256 89ad912d2cb97415eb41904d2e9df26e40ae09ee6d67bcbfc6d038358551a0fe +MD5 b8cc1f6d17172dc9afb2045826b29d11 ChangeLog 6916 +RMD160 6ccec097e5c79b5192930596223d58ba59d1214e ChangeLog 6916 +SHA256 89ad912d2cb97415eb41904d2e9df26e40ae09ee6d67bcbfc6d038358551a0fe ChangeLog 6916 MISC metadata.xml 295 RMD160 db055ffb19549883c4f07256f391e498f0ed504d SHA1 c1601c40929a9fd88e233a2773f0efa7b672114e SHA256 86aeda200c41eff29b264a66ce96f3a68f1e1e5a142ffdccf2bb1cd46ac5f5be MD5 ee37a5b63158f3efa67cb4fc241cf868 metadata.xml 295 RMD160 db055ffb19549883c4f07256f391e498f0ed504d metadata.xml 295 SHA256 86aeda200c41eff29b264a66ce96f3a68f1e1e5a142ffdccf2bb1cd46ac5f5be metadata.xml 295 -MD5 8e150a3838ee20a0e8e8e7ca5ec50bdd files/digest-pptpclient-1.7.0 479 -RMD160 359ef18adfba1ccf0b46c3febe9410170a365c0b files/digest-pptpclient-1.7.0 479 -SHA256 99f48c18bb4b270ec49ca20221e21f6d53f04d300f87684f687a4562aa06225a files/digest-pptpclient-1.7.0 479 MD5 a89d747eee9204028d222649dc0f7fd9 files/digest-pptpclient-1.7.1 479 RMD160 29a2cfe46abb7753e63e5b29e109a15329533fd4 files/digest-pptpclient-1.7.1 479 SHA256 31c3ae17fad3170e68f044bb529632112c02297ac915bb190b012993d82fc771 files/digest-pptpclient-1.7.1 479 +MD5 a89d747eee9204028d222649dc0f7fd9 files/digest-pptpclient-1.7.1-r1 479 +RMD160 29a2cfe46abb7753e63e5b29e109a15329533fd4 files/digest-pptpclient-1.7.1-r1 479 +SHA256 31c3ae17fad3170e68f044bb529632112c02297ac915bb190b012993d82fc771 files/digest-pptpclient-1.7.1-r1 479 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFzY6lJnxX6mF440QRAh3rAJ0bJQP6Dx8Hc1+55o8sVz9pDjkSvgCglwPh -c73VKBMPK+YB0FvMLRbyFVI= -=/4Hv +iD8DBQFF/OywJnxX6mF440QRAoh6AJ9iIO3Pj6onFrBEUtziT0jCWfYLBwCcD3iP +J/p6NlFH0KAJNZWzVeBytjU= +=gstr -----END PGP SIGNATURE----- diff --git a/net-dialup/pptpclient/files/digest-pptpclient-1.7.0 b/net-dialup/pptpclient/files/digest-pptpclient-1.7.1-r1 similarity index 51% rename from net-dialup/pptpclient/files/digest-pptpclient-1.7.0 rename to 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 +-#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 similarity index 78% rename from net-dialup/pptpclient/pptpclient-1.7.0.ebuild rename to 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"