tlsdate various small fixes

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBBB51E42

3 files changed, 90 insertions, 16 deletions

diff --git a/net-misc/tlsdate/ChangeLog b/net-misc/tlsdate/ChangeLog
index 96e8e83c9399..b57ed19a1090 100644
--- a/net-misc/tlsdate/ChangeLog
+++ b/net-misc/tlsdate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tlsdate
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tlsdate/ChangeLog,v 1.11 2014/11/06 16:00:28 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tlsdate/ChangeLog,v 1.12 2015/01/03 00:29:06 hanno Exp $
+
+*tlsdate-0.0.12-r1 (03 Jan 2015)
+
+  03 Jan 2015; <hanno@gentoo.org> +tlsdate-0.0.12-r1.ebuild:
+  Fix default server/config, disable polarssl (broken upstream), install dbus
+  rules.
 
 *tlsdate-0.0.12 (06 Nov 2014)
 
diff --git a/net-misc/tlsdate/Manifest b/net-misc/tlsdate/Manifest
index 62b71cb7d993..17840632f607 100644
--- a/net-misc/tlsdate/Manifest
+++ b/net-misc/tlsdate/Manifest
@@ -15,28 +15,29 @@ DIST tlsdate-0.0.5.tar.gz 205288 SHA256 00d988d004e207b19e9a4fb7090f111ea491b8a7
 DIST tlsdate-0.0.6.tar.gz 211400 SHA256 c1f8518216f3fcfb8b19a2caafea555098f907ec60c76f142e839fdede910d18 SHA512 03608e65421fb709a2b0014918f911b5261e5fdba401908e45d2986c87f69e45f6dc3b9d71df18bedce321e573574221849bc6e9f277cbdfcf8b20a536d978f9 WHIRLPOOL 39b2b4d84631007f59b18ca293f920ffeb9520cdfeba71003dcb1d89e0113feab55f1edc14d9c7ccafdf50a989a6eab6cfe0931577c4167076a65370d541ae64
 EBUILD tlsdate-0.0.1.ebuild 672 SHA256 34c03235bf3527053e78936f236b43bdf7acd1e179aefd95f47ee137dc4574fc SHA512 1d949828704db7d0e5575e7ec86b6de7f9c69e7c39e3d0a9159e4fdac18cd734ddaa4920ac413811fd2629673e29d1cdb871cd18b5305a6a88b657e6676c4b26 WHIRLPOOL aa3a799108fea97c7f9ceeea7767386e2e1c01127b0708e4bf5d4ba88d4bed94383747232550473f83d01d1420bae7df9cd265c60dcb19d41f77d28d88983027
 EBUILD tlsdate-0.0.11.ebuild 1583 SHA256 7865ddb87447ed77640e23017637710b72f92c8191c63f6868d56baeb27c3c22 SHA512 abefb88c6cb6a8149b28946e7e6d158813ef4dfb5b50e2834a3fdb31a289f17af832e63aaad4eb9d08ff6fefa0a5c3a4101097a09a7453b07aeed295103a0046 WHIRLPOOL 8f8eabe2c51b3e7d76184d19f76af28b0d5e0ace3f9a4f64f2e99d9cb68386b631cc0280c04dcfbfe4f8413a62fa04ac9ee72b930f80390b16c48ae57b55b31a
+EBUILD tlsdate-0.0.12-r1.ebuild 1752 SHA256 a61fb6f09bfecd21ed0b3f323eccc9f8e4fde8d2242b077a1b85d832b1ff49fa SHA512 430313630eb39ee8416338271b57a35ddfc8a32059cf4f934eafc61f2031eae58fa1938a679ac3632e8540b58be7a1cd7b8bcba614429e2d090243aafff7894c WHIRLPOOL 293174350fd966008e57d6eb066b71ba61431c648e212aa502d912f41777f4f15a67234779b5c0b9d26e5d294635969598d98b2a6b573cb9fe43d6fc6facada7
 EBUILD tlsdate-0.0.12.ebuild 1583 SHA256 5b3c143889c7794d1ef66d8e7a3a8575ec004f439df9402199655a237f2bce7b SHA512 baf92c2e0599b3c6c0f9563936d88ad735deeb20f5bce89fb2cb0d3988667988fbd5af065fc74a3f82af5d4036bd5c4871924b32f21829c4f1c5d67553327e16 WHIRLPOOL 4c3f15334aad83c60ab2b1903476a61925cf6fee530517a87c0696ccbc439b1553f8cdfc4dea5edb49bf51e63c71c5149afaf43e8a19c979f86d1c2c44b66c43
 EBUILD tlsdate-0.0.4-r1.ebuild 1059 SHA256 ee24463926558fe702fa26a8019483cb853c6b76744059aaf153f183b6f1d93e SHA512 b11e70c3ca36847022112f55512be3da2f201214611128be16acec51509e30a987b9f32260f963eb86a652e2fd0f2d9708e671f4a3f76469b715e16f6d27a8c7 WHIRLPOOL 9606a8770e339d2965c333c983d6c811badc1f076ea630e3f19a780da359267ab613b5c76c7c08c3d621ea56f7305f0c5d49caaa9f88808a87c6bc8cd3fd7a9f
 EBUILD tlsdate-0.0.4-r2.ebuild 1226 SHA256 4177371173117e3181dc8bf3eaa7616fcc7a6d03792fb6383be2214e18503c94 SHA512 7e369776faae4c50b46347b792843cdc315df250b94e27ff17961142d71d20057fb7816ebdc7d39bb2d4f77d5277e4734cfb023030c18d28b1aaf20b7fde9121 WHIRLPOOL 24c4747bde363402e96624bb3e04c60e6511a85a089c3383d0b9c7c64ca84d84e46c83c64bb9ddc6a3c03cb6bd34e164da305a04c1196e0c3e9168c23358ae76
 EBUILD tlsdate-0.0.4.ebuild 840 SHA256 76e109579758587509b13e6fafbc6d5b6b0863ef532a2745744f709541d8912f SHA512 4c740292100ab60cabb7a7046a14d34126e4f0f0ed86984cdd13f5610b7240d050f9e274ba7b3b71cc14fbeb417f003e395d1a6c0b4be9ab8e3ed8ed4ab822b7 WHIRLPOOL 64e892478ff997f1c4c4758e64fc7256f9b9fca101487a1835c4c6d3f5e0f91c55c47eb8ca8a4385b4c69afc9f218b0e168be8565333444767f87adab464950c
 EBUILD tlsdate-0.0.5.ebuild 1174 SHA256 ca0e92e579f6597e047c5d153a0ddaf7af8162ea31851536c181cc5ec9d58830 SHA512 7f9ed89a30bfd3783ae0e28e09e664d583bfea7d4922a3176dc0fb7c0c624811435c50607b514ca8074b967451463faf44e9dd29f71b3205bf124008d3c3f3d8 WHIRLPOOL c3f0c18f929bf393d40cde8c783b1ea2faa05a01a015c21f9ee8f4d16fbf017a86665b2a264d6ed59ea609347c28c80eb73db7e4c2c9320499154b8d28bfb895
 EBUILD tlsdate-0.0.6.ebuild 1171 SHA256 b8e4f14ebfde58a0e545d8ca50312b697c737389759cac2bb90e7623ca395a82 SHA512 c164a7c08ae58bde44445c77b11a13ecbfde951968fce2e817caba2809649f98d91ddf2c1eab37c1fae274f83821824635d68b5625134a03918ea3c0a59bbcdf WHIRLPOOL c4a4e80d0b632d859c5fe47d69bc7adbfbfa79b1021ebe2cf8f59e370d039bfcab8eb2c15df2aedc6988303986933dfd04cfe9771bb561c00b82e566a820f4f5
-MISC ChangeLog 2079 SHA256 b4b87e1c39885bce54eaa97cd92ba64e4a92e8f19b76c7324ebe3e197432f991 SHA512 9b8d73f444fa6f2c0266e566544b01105198a0f137ae5e5a7c233c6ffeb8ac507cdf83f4ae31305c2c0761cf07f43373056f41bc38a05b42060680c9342d8973 WHIRLPOOL b0d822c7c3ace510e4c361f377b6b24d92f14bba07e545a4ab082e8e11721982a7236858653e6e9cf12d84c9848572b780621802a150a79eab7921d2c4c96e3b
+MISC ChangeLog 2261 SHA256 27069e4767c9d6130d84021297cea18e006a82b4faef2e6f7e5a1abf12771234 SHA512 b730eb45a82ce8fbffac768463612ced0e97e942398285256775c40aa5fee769af61a8746d07fbe57e04c65f608fc74094a63da50afe73ed763fbddff5a92cf7 WHIRLPOOL f0fdfefb5b151eaf2a456d2b9d89dc1234582281be16636769db877673a10cfa8550fbaabf8a58f6b17751def3abaa43687f97c0f21fdaa05202e1a89231c794
 MISC metadata.xml 342 SHA256 13ad16b63ce2edef3150c467c3d0693279330c953cb99dfc1ce20012c5aa3348 SHA512 20fc72050176217461dd946f73f102e7447d054c368c5a7b68c447d6d1daaeaa852e188ed26191fb1571f6d3663ad1c48ef64704d1c31370675b940dcdc5deb3 WHIRLPOOL 7ef3fa3b9ac88204457edf02e5aa6248f9dad2571ffe23845448cf2cba8711db29389aabf45c2fd5f52970b885893ab160bf2e7c897e73765ad43cb9acbbd52b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUW5sdAAoJEPGu1DbS6WIAZ3wP/28/HeZCxUIqF3YN7mBGumsO
-zqJIJV/iKiwctiHx2Y79CV1nC0pguUJbdkbBCtE0TYDGfttMfNa2a/B1CFbWWEbE
-B9soboWCUbQkSZvzZ6vhLP2u8CmXR68G4bSaQiNV3YJarmHR0qNhRGu34DFJTADp
-qkqK2CPPOMyKlT4AW8X3+ub4/7H+JNbUD7/KJTrBDLzw4PxgI75uOXO6JeHFOmY6
-Stz3n7nVaZSdyyeF3Np+g2DT53NOKJ5nfNq0jn/eW7M8XAO46rjUb1g3jbe5es5V
-MTV7O6VQIC+eMxSsu1KpWLss2fJaO/4RT7biFTg8K+WzBdWKMGnbn8ru7YpYavNC
-Zql1/fzmhy1PRZQkV6ppKKyx15z2cWdtnqDszNxpON8g931Mk0fApxcrqw4oDxD+
-8WZlQiLZ85H2IuT0NJ00/N22ZddbyMUbMEHLfeapLfClT3h/HbijQWEylhsSmVrF
-yfi/2EBG9uQGwRCgkhPzhUwd6+n7yymOo9n1+hyFtrHF3gzk8mh3kgyZXMhas58L
-8HnUJTJtrpDtGeCexYBN1EMCLVDTSfuZqlVbEnM42InCTm/b3Otp1unMqX0KRlgY
-uMl9pAGWBVuXu1Cdg/8E3NYsM21y1YW3FiGPk48VvfCmCepqxLdy8TFtvmYpkl6v
-dWv8qD1CAO/9TNZrpC9m
-=uLu+
+iQIcBAEBCAAGBQJUpzfSAAoJEKWIAHK7tR5CUBwP+wTYHdSpLWb+qzf6jo8KaBxO
+xb79Q/IOuZiigjAvRYZiCUw5qiKIzqL639CgjupIMyJN8PHmdMSD+AfLZIlI8W8I
+pFRwLzcPKAAAjet0aaY+KnqxOzKYZdmoy4iZJGt/sPtQkLSOWD/d+0G2VJH+2rwh
+ykKNYxSKM0i7gwdksGepGYDu04hM4gkrGM+rSriWYbYOOHwgnmrmBe7LHuYj6sOc
+iMQs3avHzPiiYnJZwRRGQmfdOCs3F5ANHYVZ2ewAZlGQTqcFI/BY+4VKihTe2QlX
+dct3/vGgtMp2JEUKlE6L14HtALyguvIZlbgR1ryMp5987DdNMOlfi5SAWo2ittTc
+sYdR7/GS5bJS/C0C97J9TNO6vbh9ifY3eN9WJN85Xqj4/LngTTB/K+bN1IAhjpnx
+tc2jLWdaFiyw3rLubS3rKW6JPHooJwaP3BOCe0CfzcPjHZHJWNNsBsoGUjrHF2x4
+0RRUpV3cJWxt96Hwj1xu8/38iy3IBUSMt4A1OM0XkbwjtGMz/TAgqkflXI/skpgx
+HkLWYrgB3oDcqUzGRJlbyPXM1NLUf+RKdXANBT5oe+E08jDI+/UDnEHJQc/RqWdq
+5DSsnwEka0UEGvHJrTfXu/LTC5G033AhcD49ILHfBOfLr00x+TSaGi2WtS0VXMIK
+1vhULA3pZ+TRpiR0G3mh
+=OcDw
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tlsdate/tlsdate-0.0.12-r1.ebuild b/net-misc/tlsdate/tlsdate-0.0.12-r1.ebuild
new file mode 100644
index 000000000000..6f8f1d2e47fa
--- /dev/null
+++ b/net-misc/tlsdate/tlsdate-0.0.12-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tlsdate/tlsdate-0.0.12-r1.ebuild,v 1.1 2015/01/03 00:29:06 hanno Exp $
+
+EAPI="4"
+
+inherit autotools 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 ~x86"
+IUSE="dbus +seccomp static-libs"
+
+DEPEND="dev-libs/openssl
+	dev-libs/libevent
+	dbus? ( sys-apps/dbus )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Use Google servers by default rather than a random German site.
+	# They provide round robin DNS and local servers automatically.
+	sed -i \
+		-e 's:www.ptb.de:www.google.com:' \
+		etc/tlsdated.conf \
+		src/tlsdate.h || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dbus) \
+		$(use_enable seccomp seccomp-filter) \
+		--disable-hardened-checks \
+		--without-polarssl \
+		--with-unpriv-user=tlsdate \
+		--with-unpriv-group=tlsdate
+}
+
+src_install() {
+	default
+
+	# only install cert required for www.google.com
+	rm "${ED}"/etc/tlsdate/ca-roots/tlsdate-ca-roots.conf || die #446426
+	dosym "${EPREFIX}"/etc/ssl/certs/Equifax_Secure_CA.pem \
+		/etc/tlsdate/ca-roots/tlsdate-ca-roots.conf
+
+	newinitd "${FILESDIR}"/tlsdated.rc tlsdated
+	newconfd "${FILESDIR}"/tlsdated.confd tlsdated
+	newinitd "${FILESDIR}"/tlsdate.rc tlsdate
+	newconfd "${FILESDIR}"/tlsdate.confd tlsdate
+
+	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
+}