commit: 73eb78b120e29dba2f8272bbdd4ae6dc17644eb1 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Dec 4 16:52:27 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Dec 4 16:53:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73eb78b1
net-misc/tlsdate: Remove last-rited pkg Closes: https://bugs.gentoo.org/637286 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-misc/tlsdate/Manifest | 1 - .../files/tlsdate-0.0.13-tlsdated-service.patch | 22 ------- net-misc/tlsdate/files/tlsdate.confd | 8 --- net-misc/tlsdate/files/tlsdate.rc | 16 ----- net-misc/tlsdate/files/tlsdated.confd | 15 ----- net-misc/tlsdate/files/tlsdated.default | 4 -- net-misc/tlsdate/files/tlsdated.rc | 18 ----- net-misc/tlsdate/files/tlsdated.tmpfiles.conf | 1 - net-misc/tlsdate/metadata.xml | 8 --- net-misc/tlsdate/tlsdate-0.0.13.ebuild | 76 ---------------------- profiles/arch/arm64/package.use.mask | 4 -- profiles/arch/mips/package.use.mask | 4 -- profiles/package.mask | 6 -- 13 files changed, 183 deletions(-) diff --git a/net-misc/tlsdate/Manifest b/net-misc/tlsdate/Manifest deleted file mode 100644 index a78d72fe6f9..00000000000 --- a/net-misc/tlsdate/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST tlsdate-0.0.13.tar.gz 264228 BLAKE2B 74d915ee070ddc62ec25696557d1dda3ce677c6a46e38b0a8462821cf7f99f0f75ed08e318bfd0145bfc08ed5773d77148edecec1ac90f143912bb0219849005 SHA512 9c4fd51439976a8541fdf1bb70afa5333b43b2e43b801a65b3b1ac3e4a437fd3021ef2aaeeb13fc1ba63ccd119f6eff4c10e3a5a28cf0cfd96bbc7a174dbb789 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 deleted file mode 100644 index df03833f7cd..00000000000 --- a/net-misc/tlsdate/files/tlsdate-0.0.13-tlsdated-service.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Dominik Kriegner <dominik.krieg...@gmail.com> -Date: Tue, 26 Jan 2016 12:12:26 +0000 -Subject: [PATCH] Fix systemd unit file - -Project-Bug-URL: https://github.com/ioerror/tlsdate/pull/162 -Gentoo-Bug-URL: https://bugs.gentoo.org/533380 - ---- a/systemd/tlsdated.service -+++ b/systemd/tlsdated.service -@@ -5,6 +5,9 @@ After=network.target - [Service] - Type=simple - EnvironmentFile=/etc/default/tlsdated --ExecStart=/usr/sbin/tlsdated ${DAEMON_OPTS} --ExecReload=/bin/kill -HUP ${MAINPID} --ExecStop=/bin/kill -INT ${MAINPID} -+ExecStart=/usr/sbin/tlsdated $DAEMON_OPTS -+ExecReload=/bin/kill -HUP $MAINPID -+ExecStop=/bin/kill -INT $MAINPID -+ -+[Install] -+WantedBy=multi-user.target diff --git a/net-misc/tlsdate/files/tlsdate.confd b/net-misc/tlsdate/files/tlsdate.confd deleted file mode 100644 index 2d7ed030de3..00000000000 --- a/net-misc/tlsdate/files/tlsdate.confd +++ /dev/null @@ -1,8 +0,0 @@ -# config file for /etc/init.d/tlsdate - -# Command to execute to set the time. -# This are some common tlsdate options: -# -l: leap (set time regardless of difference) -# -H: hostname to sync with -# -x: proxy URL -TLSDATE_OPTS="-l -H www.google.com" diff --git a/net-misc/tlsdate/files/tlsdate.rc b/net-misc/tlsdate/files/tlsdate.rc deleted file mode 100644 index 3c5163ac92b..00000000000 --- a/net-misc/tlsdate/files/tlsdate.rc +++ /dev/null @@ -1,16 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="set time once when started" - -depend() { - use net -} - -start() { - : ${TLSDATE_CMD:=tlsdate} - ebegin "Setting clock via tlsdate '${TLSDATE_CMD}'" - "${TLSDATE_CMD}" ${TLSDATE_OPTS} - eend $? "Failed to set clock" -} diff --git a/net-misc/tlsdate/files/tlsdated.confd b/net-misc/tlsdate/files/tlsdated.confd deleted file mode 100644 index d257289cc58..00000000000 --- a/net-misc/tlsdate/files/tlsdated.confd +++ /dev/null @@ -1,15 +0,0 @@ -# config file for /etc/init.d/tlsdated - -# Command to execute to set the time. -# This are some common tlsdate options: -# -l: leap (set time regardless of difference) -# -H: hostname to sync with -# -x: proxy URL -TLSDATED_CMD="/usr/bin/tlsdate -l -H www.google.com" - -# Additional options; see `man tlsdated` for reference. -TLSDATED_OPTS="" - -# Cache dir. Probably don't need to change this. -# It matches the compiled-in default. -TLSDATED_CACHE_DIR="/var/cache/tlsdated" diff --git a/net-misc/tlsdate/files/tlsdated.default b/net-misc/tlsdate/files/tlsdated.default deleted file mode 100644 index 08186f75ef3..00000000000 --- a/net-misc/tlsdate/files/tlsdated.default +++ /dev/null @@ -1,4 +0,0 @@ -# defaults file for /etc/default/tlsdated - -# Additional options; see `man tlsdated` for reference. -DEAMON_OPTS="" diff --git a/net-misc/tlsdate/files/tlsdated.rc b/net-misc/tlsdate/files/tlsdated.rc deleted file mode 100644 index d0814c874b4..00000000000 --- a/net-misc/tlsdate/files/tlsdated.rc +++ /dev/null @@ -1,18 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="start a daemon to continuously set time via a helper" - -command="tlsdated" -command_args="${TLSDATED_OPTS} -- ${TLSDATED_CMD}" -command_background="true" -pidfile="/var/run/${SVCNAME}.pid" - -depend() { - use net -} - -start_pre() { - checkpath -d -m 0700 -o tlsdate:tlsdate "${TLSDATED_CACHE_DIR}" -} diff --git a/net-misc/tlsdate/files/tlsdated.tmpfiles.conf b/net-misc/tlsdate/files/tlsdated.tmpfiles.conf deleted file mode 100644 index 07a7966cc87..00000000000 --- a/net-misc/tlsdate/files/tlsdated.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/cache/tlsdated 0700 tlsdate tlsdate - diff --git a/net-misc/tlsdate/metadata.xml b/net-misc/tlsdate/metadata.xml deleted file mode 100644 index a4383548462..00000000000 --- a/net-misc/tlsdate/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">ioerror/tlsdate</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/tlsdate/tlsdate-0.0.13.ebuild b/net-misc/tlsdate/tlsdate-0.0.13.ebuild deleted file mode 100644 index 135c195e304..00000000000 --- a/net-misc/tlsdate/tlsdate-0.0.13.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils systemd vcs-snapshot user - -DESCRIPTION="Update local time over HTTPS" -HOMEPAGE="https://github.com/ioerror/tlsdate"; -SRC_URI="https://github.com/ioerror/tlsdate/tarball/${P} -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ia64 m68k ~mips s390 sh sparc x86" -IUSE="dbus +seccomp static-libs" - -DEPEND="dev-libs/openssl:0= - dev-libs/libevent:= - dbus? ( sys-apps/dbus )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-tlsdated-service.patch -) - -src_prepare() { - # Use the system cert store rather than a custom one specific - # to the tlsdate package. #534394 - sed -i \ - -e 's:/tlsdate/ca-roots/tlsdate-ca-roots.conf:/ssl/certs/ca-certificates.crt:' \ - Makefile.am || die - - default - - eautoreconf -} - -src_configure() { - econf \ - --disable-silent-rules \ - $(use_enable dbus) \ - $(use_enable seccomp seccomp-filter) \ - --disable-hardened-checks \ - --without-polarssl \ - --with-unpriv-user=tlsdate \ - --with-unpriv-group=tlsdate -} - -src_install() { - default - - # Use the system cert store; see src_prepare. #446426 #534394 - rm "${ED}"/etc/tlsdate/ca-roots/tlsdate-ca-roots.conf || die - rmdir "${ED}"/etc/tlsdate/ca-roots || die - - newinitd "${FILESDIR}"/tlsdated.rc tlsdated - newconfd "${FILESDIR}"/tlsdated.confd tlsdated - newinitd "${FILESDIR}"/tlsdate.rc tlsdate - newconfd "${FILESDIR}"/tlsdate.confd tlsdate - - systemd_newunit "${S}"/systemd/tlsdated.service tlsdated.service - systemd_newtmpfilesd "${FILESDIR}"/tlsdated.tmpfiles.conf tlsdated.conf - insinto /etc/default - newins "${FILESDIR}"/tlsdated.default tlsdated - - insinto /etc/dbus-1/system.d/ - doins dbus/org.torproject.tlsdate.conf - - use static-libs || \ - find "${ED}"/usr '(' -name '*.la' -o -name '*.a' ')' -delete -} - -pkg_preinst() { - enewgroup tlsdate 124 - enewuser tlsdate 124 -1 /dev/null tlsdate -} diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask index 879b7bae959..7b14c4a3c27 100644 --- a/profiles/arch/arm64/package.use.mask +++ b/profiles/arch/arm64/package.use.mask @@ -373,10 +373,6 @@ dev-libs/libcdio cddb # Chromium uses an internal tcmalloc that doesn't support this arch yet. www-client/chromium tcmalloc -# Mike Frysinger <vap...@gentoo.org> (17 Dec 2015) -# The tlsdate seccomp logic is open-coded and doesn't support this arch yet. -net-misc/tlsdate seccomp - # Mike Frysinger <vap...@gentoo.org> (20 Jul 2015) # Mart Raudsepp <l...@gentoo.org> (04 Feb 2017) # Needs deps tested. diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask index 583a2734c70..a6722e9627a 100644 --- a/profiles/arch/mips/package.use.mask +++ b/profiles/arch/mips/package.use.mask @@ -71,10 +71,6 @@ net-dns/dnsmasq conntrack # net-libs/openpgm is not keyworded on mips net-libs/zeromq pgm -# Mike Frysinger <vap...@gentoo.org> (17 Dec 2015) -# The tlsdate seccomp logic is open-coded and doesn't support this arch yet. -net-misc/tlsdate seccomp - # Davide Pesavento <p...@gentoo.org> (26 Oct 2015) # Tests require non-keyworded qt5 dev-qt/qtchooser test diff --git a/profiles/package.mask b/profiles/package.mask index ef5b906132d..d8fddf1fb36 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -374,12 +374,6 @@ dev-libs/libsolv # bump. Removal in a month. dev-lua/lua-openssl -# Pacho Ramos <pa...@gentoo.org> (04 Nov 2018) -# Upstream dead for ages, crashes (#637286), build issues (#592580). -# Migration to Google fork or other alternative will be needed. Removal in a -# month. -net-misc/tlsdate - # Andreas Sturmlechner <ast...@gentoo.org> (03 Nov 2018) # Breaks revdeps (GDir and GDirEntry split from gfile.h into new gdir.h) # See tracker: https://bugs.gentoo.org/670222
