1 |
commit: 73eb78b120e29dba2f8272bbdd4ae6dc17644eb1 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 4 16:52:27 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 4 16:53:40 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73eb78b1 |
7 |
|
8 |
net-misc/tlsdate: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/637286 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
net-misc/tlsdate/Manifest | 1 - |
14 |
.../files/tlsdate-0.0.13-tlsdated-service.patch | 22 ------- |
15 |
net-misc/tlsdate/files/tlsdate.confd | 8 --- |
16 |
net-misc/tlsdate/files/tlsdate.rc | 16 ----- |
17 |
net-misc/tlsdate/files/tlsdated.confd | 15 ----- |
18 |
net-misc/tlsdate/files/tlsdated.default | 4 -- |
19 |
net-misc/tlsdate/files/tlsdated.rc | 18 ----- |
20 |
net-misc/tlsdate/files/tlsdated.tmpfiles.conf | 1 - |
21 |
net-misc/tlsdate/metadata.xml | 8 --- |
22 |
net-misc/tlsdate/tlsdate-0.0.13.ebuild | 76 ---------------------- |
23 |
profiles/arch/arm64/package.use.mask | 4 -- |
24 |
profiles/arch/mips/package.use.mask | 4 -- |
25 |
profiles/package.mask | 6 -- |
26 |
13 files changed, 183 deletions(-) |
27 |
|
28 |
diff --git a/net-misc/tlsdate/Manifest b/net-misc/tlsdate/Manifest |
29 |
deleted file mode 100644 |
30 |
index a78d72fe6f9..00000000000 |
31 |
--- a/net-misc/tlsdate/Manifest |
32 |
+++ /dev/null |
33 |
@@ -1 +0,0 @@ |
34 |
-DIST tlsdate-0.0.13.tar.gz 264228 BLAKE2B 74d915ee070ddc62ec25696557d1dda3ce677c6a46e38b0a8462821cf7f99f0f75ed08e318bfd0145bfc08ed5773d77148edecec1ac90f143912bb0219849005 SHA512 9c4fd51439976a8541fdf1bb70afa5333b43b2e43b801a65b3b1ac3e4a437fd3021ef2aaeeb13fc1ba63ccd119f6eff4c10e3a5a28cf0cfd96bbc7a174dbb789 |
35 |
|
36 |
diff --git a/net-misc/tlsdate/files/tlsdate-0.0.13-tlsdated-service.patch b/net-misc/tlsdate/files/tlsdate-0.0.13-tlsdated-service.patch |
37 |
deleted file mode 100644 |
38 |
index df03833f7cd..00000000000 |
39 |
--- a/net-misc/tlsdate/files/tlsdate-0.0.13-tlsdated-service.patch |
40 |
+++ /dev/null |
41 |
@@ -1,22 +0,0 @@ |
42 |
-From: Dominik Kriegner <dominik.kriegner@×××××.com> |
43 |
-Date: Tue, 26 Jan 2016 12:12:26 +0000 |
44 |
-Subject: [PATCH] Fix systemd unit file |
45 |
- |
46 |
-Project-Bug-URL: https://github.com/ioerror/tlsdate/pull/162 |
47 |
-Gentoo-Bug-URL: https://bugs.gentoo.org/533380 |
48 |
- |
49 |
---- a/systemd/tlsdated.service |
50 |
-+++ b/systemd/tlsdated.service |
51 |
-@@ -5,6 +5,9 @@ After=network.target |
52 |
- [Service] |
53 |
- Type=simple |
54 |
- EnvironmentFile=/etc/default/tlsdated |
55 |
--ExecStart=/usr/sbin/tlsdated ${DAEMON_OPTS} |
56 |
--ExecReload=/bin/kill -HUP ${MAINPID} |
57 |
--ExecStop=/bin/kill -INT ${MAINPID} |
58 |
-+ExecStart=/usr/sbin/tlsdated $DAEMON_OPTS |
59 |
-+ExecReload=/bin/kill -HUP $MAINPID |
60 |
-+ExecStop=/bin/kill -INT $MAINPID |
61 |
-+ |
62 |
-+[Install] |
63 |
-+WantedBy=multi-user.target |
64 |
|
65 |
diff --git a/net-misc/tlsdate/files/tlsdate.confd b/net-misc/tlsdate/files/tlsdate.confd |
66 |
deleted file mode 100644 |
67 |
index 2d7ed030de3..00000000000 |
68 |
--- a/net-misc/tlsdate/files/tlsdate.confd |
69 |
+++ /dev/null |
70 |
@@ -1,8 +0,0 @@ |
71 |
-# config file for /etc/init.d/tlsdate |
72 |
- |
73 |
-# Command to execute to set the time. |
74 |
-# This are some common tlsdate options: |
75 |
-# -l: leap (set time regardless of difference) |
76 |
-# -H: hostname to sync with |
77 |
-# -x: proxy URL |
78 |
-TLSDATE_OPTS="-l -H www.google.com" |
79 |
|
80 |
diff --git a/net-misc/tlsdate/files/tlsdate.rc b/net-misc/tlsdate/files/tlsdate.rc |
81 |
deleted file mode 100644 |
82 |
index 3c5163ac92b..00000000000 |
83 |
--- a/net-misc/tlsdate/files/tlsdate.rc |
84 |
+++ /dev/null |
85 |
@@ -1,16 +0,0 @@ |
86 |
-#!/sbin/openrc-run |
87 |
-# Copyright 1999-2012 Gentoo Foundation |
88 |
-# Distributed under the terms of the GNU General Public License v2 |
89 |
- |
90 |
-description="set time once when started" |
91 |
- |
92 |
-depend() { |
93 |
- use net |
94 |
-} |
95 |
- |
96 |
-start() { |
97 |
- : ${TLSDATE_CMD:=tlsdate} |
98 |
- ebegin "Setting clock via tlsdate '${TLSDATE_CMD}'" |
99 |
- "${TLSDATE_CMD}" ${TLSDATE_OPTS} |
100 |
- eend $? "Failed to set clock" |
101 |
-} |
102 |
|
103 |
diff --git a/net-misc/tlsdate/files/tlsdated.confd b/net-misc/tlsdate/files/tlsdated.confd |
104 |
deleted file mode 100644 |
105 |
index d257289cc58..00000000000 |
106 |
--- a/net-misc/tlsdate/files/tlsdated.confd |
107 |
+++ /dev/null |
108 |
@@ -1,15 +0,0 @@ |
109 |
-# config file for /etc/init.d/tlsdated |
110 |
- |
111 |
-# Command to execute to set the time. |
112 |
-# This are some common tlsdate options: |
113 |
-# -l: leap (set time regardless of difference) |
114 |
-# -H: hostname to sync with |
115 |
-# -x: proxy URL |
116 |
-TLSDATED_CMD="/usr/bin/tlsdate -l -H www.google.com" |
117 |
- |
118 |
-# Additional options; see `man tlsdated` for reference. |
119 |
-TLSDATED_OPTS="" |
120 |
- |
121 |
-# Cache dir. Probably don't need to change this. |
122 |
-# It matches the compiled-in default. |
123 |
-TLSDATED_CACHE_DIR="/var/cache/tlsdated" |
124 |
|
125 |
diff --git a/net-misc/tlsdate/files/tlsdated.default b/net-misc/tlsdate/files/tlsdated.default |
126 |
deleted file mode 100644 |
127 |
index 08186f75ef3..00000000000 |
128 |
--- a/net-misc/tlsdate/files/tlsdated.default |
129 |
+++ /dev/null |
130 |
@@ -1,4 +0,0 @@ |
131 |
-# defaults file for /etc/default/tlsdated |
132 |
- |
133 |
-# Additional options; see `man tlsdated` for reference. |
134 |
-DEAMON_OPTS="" |
135 |
|
136 |
diff --git a/net-misc/tlsdate/files/tlsdated.rc b/net-misc/tlsdate/files/tlsdated.rc |
137 |
deleted file mode 100644 |
138 |
index d0814c874b4..00000000000 |
139 |
--- a/net-misc/tlsdate/files/tlsdated.rc |
140 |
+++ /dev/null |
141 |
@@ -1,18 +0,0 @@ |
142 |
-#!/sbin/openrc-run |
143 |
-# Copyright 1999-2014 Gentoo Foundation |
144 |
-# Distributed under the terms of the GNU General Public License v2 |
145 |
- |
146 |
-description="start a daemon to continuously set time via a helper" |
147 |
- |
148 |
-command="tlsdated" |
149 |
-command_args="${TLSDATED_OPTS} -- ${TLSDATED_CMD}" |
150 |
-command_background="true" |
151 |
-pidfile="/var/run/${SVCNAME}.pid" |
152 |
- |
153 |
-depend() { |
154 |
- use net |
155 |
-} |
156 |
- |
157 |
-start_pre() { |
158 |
- checkpath -d -m 0700 -o tlsdate:tlsdate "${TLSDATED_CACHE_DIR}" |
159 |
-} |
160 |
|
161 |
diff --git a/net-misc/tlsdate/files/tlsdated.tmpfiles.conf b/net-misc/tlsdate/files/tlsdated.tmpfiles.conf |
162 |
deleted file mode 100644 |
163 |
index 07a7966cc87..00000000000 |
164 |
--- a/net-misc/tlsdate/files/tlsdated.tmpfiles.conf |
165 |
+++ /dev/null |
166 |
@@ -1 +0,0 @@ |
167 |
-d /var/cache/tlsdated 0700 tlsdate tlsdate - |
168 |
|
169 |
diff --git a/net-misc/tlsdate/metadata.xml b/net-misc/tlsdate/metadata.xml |
170 |
deleted file mode 100644 |
171 |
index a4383548462..00000000000 |
172 |
--- a/net-misc/tlsdate/metadata.xml |
173 |
+++ /dev/null |
174 |
@@ -1,8 +0,0 @@ |
175 |
-<?xml version="1.0" encoding="UTF-8"?> |
176 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
177 |
-<pkgmetadata> |
178 |
- <!-- maintainer-needed --> |
179 |
- <upstream> |
180 |
- <remote-id type="github">ioerror/tlsdate</remote-id> |
181 |
- </upstream> |
182 |
-</pkgmetadata> |
183 |
|
184 |
diff --git a/net-misc/tlsdate/tlsdate-0.0.13.ebuild b/net-misc/tlsdate/tlsdate-0.0.13.ebuild |
185 |
deleted file mode 100644 |
186 |
index 135c195e304..00000000000 |
187 |
--- a/net-misc/tlsdate/tlsdate-0.0.13.ebuild |
188 |
+++ /dev/null |
189 |
@@ -1,76 +0,0 @@ |
190 |
-# Copyright 1999-2017 Gentoo Foundation |
191 |
-# Distributed under the terms of the GNU General Public License v2 |
192 |
- |
193 |
-EAPI=6 |
194 |
- |
195 |
-inherit autotools eutils systemd vcs-snapshot user |
196 |
- |
197 |
-DESCRIPTION="Update local time over HTTPS" |
198 |
-HOMEPAGE="https://github.com/ioerror/tlsdate" |
199 |
-SRC_URI="https://github.com/ioerror/tlsdate/tarball/${P} -> ${P}.tar.gz" |
200 |
- |
201 |
-LICENSE="BSD" |
202 |
-SLOT="0" |
203 |
-KEYWORDS="amd64 arm arm64 hppa ia64 m68k ~mips s390 sh sparc x86" |
204 |
-IUSE="dbus +seccomp static-libs" |
205 |
- |
206 |
-DEPEND="dev-libs/openssl:0= |
207 |
- dev-libs/libevent:= |
208 |
- dbus? ( sys-apps/dbus )" |
209 |
-RDEPEND="${DEPEND}" |
210 |
- |
211 |
-PATCHES=( |
212 |
- "${FILESDIR}"/${P}-tlsdated-service.patch |
213 |
-) |
214 |
- |
215 |
-src_prepare() { |
216 |
- # Use the system cert store rather than a custom one specific |
217 |
- # to the tlsdate package. #534394 |
218 |
- sed -i \ |
219 |
- -e 's:/tlsdate/ca-roots/tlsdate-ca-roots.conf:/ssl/certs/ca-certificates.crt:' \ |
220 |
- Makefile.am || die |
221 |
- |
222 |
- default |
223 |
- |
224 |
- eautoreconf |
225 |
-} |
226 |
- |
227 |
-src_configure() { |
228 |
- econf \ |
229 |
- --disable-silent-rules \ |
230 |
- $(use_enable dbus) \ |
231 |
- $(use_enable seccomp seccomp-filter) \ |
232 |
- --disable-hardened-checks \ |
233 |
- --without-polarssl \ |
234 |
- --with-unpriv-user=tlsdate \ |
235 |
- --with-unpriv-group=tlsdate |
236 |
-} |
237 |
- |
238 |
-src_install() { |
239 |
- default |
240 |
- |
241 |
- # Use the system cert store; see src_prepare. #446426 #534394 |
242 |
- rm "${ED}"/etc/tlsdate/ca-roots/tlsdate-ca-roots.conf || die |
243 |
- rmdir "${ED}"/etc/tlsdate/ca-roots || die |
244 |
- |
245 |
- newinitd "${FILESDIR}"/tlsdated.rc tlsdated |
246 |
- newconfd "${FILESDIR}"/tlsdated.confd tlsdated |
247 |
- newinitd "${FILESDIR}"/tlsdate.rc tlsdate |
248 |
- newconfd "${FILESDIR}"/tlsdate.confd tlsdate |
249 |
- |
250 |
- systemd_newunit "${S}"/systemd/tlsdated.service tlsdated.service |
251 |
- systemd_newtmpfilesd "${FILESDIR}"/tlsdated.tmpfiles.conf tlsdated.conf |
252 |
- insinto /etc/default |
253 |
- newins "${FILESDIR}"/tlsdated.default tlsdated |
254 |
- |
255 |
- insinto /etc/dbus-1/system.d/ |
256 |
- doins dbus/org.torproject.tlsdate.conf |
257 |
- |
258 |
- use static-libs || \ |
259 |
- find "${ED}"/usr '(' -name '*.la' -o -name '*.a' ')' -delete |
260 |
-} |
261 |
- |
262 |
-pkg_preinst() { |
263 |
- enewgroup tlsdate 124 |
264 |
- enewuser tlsdate 124 -1 /dev/null tlsdate |
265 |
-} |
266 |
|
267 |
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask |
268 |
index 879b7bae959..7b14c4a3c27 100644 |
269 |
--- a/profiles/arch/arm64/package.use.mask |
270 |
+++ b/profiles/arch/arm64/package.use.mask |
271 |
@@ -373,10 +373,6 @@ dev-libs/libcdio cddb |
272 |
# Chromium uses an internal tcmalloc that doesn't support this arch yet. |
273 |
www-client/chromium tcmalloc |
274 |
|
275 |
-# Mike Frysinger <vapier@g.o> (17 Dec 2015) |
276 |
-# The tlsdate seccomp logic is open-coded and doesn't support this arch yet. |
277 |
-net-misc/tlsdate seccomp |
278 |
- |
279 |
# Mike Frysinger <vapier@g.o> (20 Jul 2015) |
280 |
# Mart Raudsepp <leio@g.o> (04 Feb 2017) |
281 |
# Needs deps tested. |
282 |
|
283 |
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask |
284 |
index 583a2734c70..a6722e9627a 100644 |
285 |
--- a/profiles/arch/mips/package.use.mask |
286 |
+++ b/profiles/arch/mips/package.use.mask |
287 |
@@ -71,10 +71,6 @@ net-dns/dnsmasq conntrack |
288 |
# net-libs/openpgm is not keyworded on mips |
289 |
net-libs/zeromq pgm |
290 |
|
291 |
-# Mike Frysinger <vapier@g.o> (17 Dec 2015) |
292 |
-# The tlsdate seccomp logic is open-coded and doesn't support this arch yet. |
293 |
-net-misc/tlsdate seccomp |
294 |
- |
295 |
# Davide Pesavento <pesa@g.o> (26 Oct 2015) |
296 |
# Tests require non-keyworded qt5 |
297 |
dev-qt/qtchooser test |
298 |
|
299 |
diff --git a/profiles/package.mask b/profiles/package.mask |
300 |
index ef5b906132d..d8fddf1fb36 100644 |
301 |
--- a/profiles/package.mask |
302 |
+++ b/profiles/package.mask |
303 |
@@ -374,12 +374,6 @@ dev-libs/libsolv |
304 |
# bump. Removal in a month. |
305 |
dev-lua/lua-openssl |
306 |
|
307 |
-# Pacho Ramos <pacho@g.o> (04 Nov 2018) |
308 |
-# Upstream dead for ages, crashes (#637286), build issues (#592580). |
309 |
-# Migration to Google fork or other alternative will be needed. Removal in a |
310 |
-# month. |
311 |
-net-misc/tlsdate |
312 |
- |
313 |
# Andreas Sturmlechner <asturm@g.o> (03 Nov 2018) |
314 |
# Breaks revdeps (GDir and GDirEntry split from gfile.h into new gdir.h) |
315 |
# See tracker: https://bugs.gentoo.org/670222 |