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