Gentoo Archives: gentoo-commits

From: Sergey Popov <pinkbyte@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/pptpclient/, net-dialup/pptpclient/files/
Date: Tue, 25 Sep 2018 15:38:05
Message-Id: 1537889874.00df9f849daeafd95855720c81c534eee1d8e395.pinkbyte@gentoo
1 commit: 00df9f849daeafd95855720c81c534eee1d8e395
2 Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 25 15:36:15 2018 +0000
4 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 25 15:37:54 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00df9f84
7
8 net-dialup/pptpclient: drop old
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 net-dialup/pptpclient/Manifest | 1 -
13 .../files/pptpclient-1.7.2-process-name.patch | 42 -----------------
14 net-dialup/pptpclient/pptpclient-1.7.2-r3.ebuild | 52 ----------------------
15 3 files changed, 95 deletions(-)
16
17 diff --git a/net-dialup/pptpclient/Manifest b/net-dialup/pptpclient/Manifest
18 index b55d0d18505..d1186bad491 100644
19 --- a/net-dialup/pptpclient/Manifest
20 +++ b/net-dialup/pptpclient/Manifest
21 @@ -1,4 +1,3 @@
22 DIST pptp-1.10.0.tar.gz 87007 BLAKE2B aeb8bff0025c5144678db2ee79ecd80ec3c7261640ed94596a3599c163763cbf17b50c37591fd8b39d0687db5dff9b4c14d1aa303d95b9fcaf4eb53602cf321b SHA512 d2b925fb9cb5dbc4da576dce0cfae62f466576ae5b5ed7d6edeaec9be16ab6e0d17c307df43ebdc06138f1269ef61ba8910462a4629b6262c452e8287cabe41c
23 -DIST pptp-1.7.2.tar.gz 81113 BLAKE2B 86ba6905d8442c09b52af452b6dd865b9f522e502d0da86fe8fd12c9feba62935575f02f5bcbad50240913e0e3d8050a97614d8c36ef36306d37c57a6f06a440 SHA512 8c070bd0e2fac68e54eefcc21a31b567f74080764130cf94bf1e29138c3a43b8f56721836d826343528062fc6afcffee03ad93631678cc9b946bc6a8f4ce3dec
24 DIST pptp-1.8.0.tar.gz 86778 BLAKE2B 30cf3aadc3be97be83ac298ee366b5f44d7de669b083708194bd1d26c3b3f0d51e3d8b2484b6378f7c383c271732bc5be42c1674f3f71f19b979d4441e5b64a7 SHA512 cabcc2ef29d20859af923c6d96c524e83a80549839d1ad6fccaf9ec0ed5e7a5de7120e0694e6160b374952ea3ecb7b69d9809641000d6bf2585eeedb2d29c073
25 DIST pptp-command-20130515.bz2 7269 BLAKE2B dda3f517cf747e025dee1967841d40e58461384415161ef01bcc96c6568c5ccfb1af5254f26276164c43c41b668bf2646e5138985531d54f13ab2fedd410fab2 SHA512 3b0ad28c5f7bf4f674ba8742e8a3be50cb62521f767142a1a1e74263707bc860126b7238a4aea307366a71100a193d18f3ec7599f4c0c52cd259f8b1d6b429bf
26
27 diff --git a/net-dialup/pptpclient/files/pptpclient-1.7.2-process-name.patch b/net-dialup/pptpclient/files/pptpclient-1.7.2-process-name.patch
28 deleted file mode 100644
29 index b0051f81bde..00000000000
30 --- a/net-dialup/pptpclient/files/pptpclient-1.7.2-process-name.patch
31 +++ /dev/null
32 @@ -1,42 +0,0 @@
33 -diff -Nru pptp-1.7.2.orig/pptp.c pptp-1.7.2/pptp.c
34 ---- pptp-1.7.2.orig/pptp.c 2008-05-14 08:33:55.000000000 +0200
35 -+++ pptp-1.7.2/pptp.c 2009-06-20 10:53:07.000000000 +0200
36 -@@ -59,11 +59,7 @@
37 - #include "pptp_callmgr.h"
38 - #include "pptp_gre.h"
39 - #include "version.h"
40 --#if defined(__linux__)
41 --#include <sys/prctl.h>
42 --#else
43 - #include "inststr.h"
44 --#endif
45 - #include "util.h"
46 - #include "pptp_quirks.h"
47 - #include "pqueue.h"
48 -@@ -394,12 +390,7 @@
49 - char *tty_name = ttyname(tty_fd);
50 - snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s",
51 - tty_name ? tty_name : "(null)");
52 --#ifdef PR_SET_NAME
53 -- rc = prctl(PR_SET_NAME, "pptpgw", 0, 0, 0);
54 -- if (rc != 0) perror("prctl");
55 --#else
56 - inststr(argc, argv, envp, buf);
57 --#endif
58 - if (sigsetjmp(env, 1)!= 0) goto shutdown;
59 -
60 - signal(SIGINT, sighandler);
61 -@@ -495,13 +486,7 @@
62 - char *my_argv[3] = { argv[0], inet_ntoa(inetaddr), phonenr };
63 - char buf[128];
64 - snprintf(buf, sizeof(buf), "pptp: call manager for %s", my_argv[1]);
65 --#ifdef PR_SET_NAME
66 -- int rc;
67 -- rc = prctl(PR_SET_NAME, "pptpcm", 0, 0, 0);
68 -- if (rc != 0) perror("prctl");
69 --#else
70 - inststr(argc, argv, envp, buf);
71 --#endif
72 - exit(callmgr_main(3, my_argv, envp));
73 - }
74 -
75
76 diff --git a/net-dialup/pptpclient/pptpclient-1.7.2-r3.ebuild b/net-dialup/pptpclient/pptpclient-1.7.2-r3.ebuild
77 deleted file mode 100644
78 index 56577c7da2b..00000000000
79 --- a/net-dialup/pptpclient/pptpclient-1.7.2-r3.ebuild
80 +++ /dev/null
81 @@ -1,52 +0,0 @@
82 -# Copyright 1999-2016 Gentoo Foundation
83 -# Distributed under the terms of the GNU General Public License v2
84 -
85 -EAPI="5"
86 -
87 -inherit eutils toolchain-funcs
88 -
89 -MY_P="${P/client}"
90 -MY_CMD="pptp-command-20130515"
91 -
92 -DESCRIPTION="Linux client for PPTP"
93 -HOMEPAGE="http://pptpclient.sourceforge.net/"
94 -SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz
95 - https://dev.gentoo.org/~pinkbyte/distfiles/pptpclient/${MY_CMD}.bz2"
96 -
97 -SLOT="0"
98 -LICENSE="GPL-2"
99 -KEYWORDS="alpha amd64 ~arm ppc ppc64 x86"
100 -IUSE="tk"
101 -
102 -DEPEND="net-dialup/ppp
103 - dev-lang/perl
104 - tk? ( dev-perl/Tk )"
105 -RDEPEND="${DEPEND}
106 - sys-apps/iproute2"
107 -
108 -RESTRICT="test" #make test is useless and vector_test.c is broken
109 -
110 -S="${WORKDIR}/${MY_P}"
111 -
112 -DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
113 -
114 -src_prepare() {
115 - epatch "${FILESDIR}"/${P}-process-name.patch
116 - epatch_user
117 -}
118 -
119 -src_compile() {
120 - emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
121 -}
122 -
123 -src_install() {
124 - default
125 - dodoc Documentation/*
126 - dodir /etc/pptp.d
127 -
128 - # The current version of pptp-linux doesn't include the
129 - # RH-specific portions, so include them ourselves.
130 - newsbin "${WORKDIR}/${MY_CMD}" pptp-command
131 - dosbin "${FILESDIR}/pptp_fe.pl"
132 - use tk && dosbin "${FILESDIR}/xpptp_fe.pl"
133 -}