Fix dependencies for USE=static and add pkg_postinst functionality to fix permissions on /etc/pdns (bug #458018), as discussed with swegener.

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x1E0CA85F!

3 files changed, 62 insertions, 28 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 481935f3509d..6c503ce184d8 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/pdns
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.87 2013/05/20 19:05:48 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.88 2013/05/23 12:14:11 dev-zero Exp $
+
+  23 May 2013; Tiziano Müller <dev-zero@gentoo.org> pdns-3.2.ebuild:
+  Fix dependencies for USE=static and add pkg_postinst functionality to fix
+  permissions on /etc/pdns (bug #458018), as discussed with swegener.
 
 *pdns-3.2 (20 May 2013)
 
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 80942918e38a..d74aeef70e3a 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -14,19 +14,19 @@ DIST pdns-3.1.tar.gz 1268532 SHA256 1400f7bd659207c0b1f4b8296092e559a7b7bf6a2434
 DIST pdns-3.2.tar.gz 1293593 SHA256 d1895aba065446dc68e5d7cc792d5303626c71759f61a455531ed65d59c06572 SHA512 ba129fda742f06983b429b245a86288cc5738beea7e8776f3d7980e6cda8e9a1efab90fcef84093f2e4857fb83d3b1c0a258d1d875ebf0bb7724226877898335 WHIRLPOOL ac105586c5860615ffa18923163c822b37cbd6ad902bf9aa60d952a82a1f7102da127eac330577d63e841195599ac5b67177b228c5120249f226c480cfa387f0
 EBUILD pdns-3.0.1.ebuild 3064 SHA256 1b67ba8ab60cc5be702d0c3552d6efac8235d8914ae5383c47d33f172df185ea SHA512 b40abb170207838c7b49d3814eda7767eee6cdf25508d5097f471f14612f2de56d4133ab12ea1481fb8130cf3d96b1650550af84461b3c549bdd7494501fefa3 WHIRLPOOL 60d93ce9ddec34b5c51c35fd14842e6ead3ec752afd9aec3c29a453c841219eb05bd384eb3b6969b208fb9d2166e5c292e86cd90fcf876905b5031b3efc5afeb
 EBUILD pdns-3.1.ebuild 2928 SHA256 5790060a9ee78d32f1e57959223d8e487399eb3ae6ed28a13c426eb513a9ade7 SHA512 e8249d9584f6e10429e60009b06176324c8141717ac590a7c464338b8ed80d823f5b43a01c25de0e30e968a88e72d53dd5a6e5c5b7d84888bf9fbf97f0721498 WHIRLPOOL d18869852f88a5f8582cc328d6f89b71c073bcce1bc5b30f05d8da77eec5f043cef8aca4d6098bb26378ffb7dffa0cc331920354e16546aadcb701e9d70935b4
-EBUILD pdns-3.2.ebuild 4075 SHA256 cc0aa013ae01738cd8f19846e7883370c19111d9d8c0640523fd7fe3df15d816 SHA512 6bb97efe92c4907b4502e9542b8bc05c48b86053aaaa773bfa404a8e1788a7d5de4ae683efa36e0a68887137ad8726b8e18f7c6271c2f561f08615298f7d172b WHIRLPOOL 71df3d6d66d50b7a5117eceb4cdc2b5b62e350581a71e1c41316e267c358101ae33d3b5282d7e86054366706cbcd546ceb5be315fcb736eb85b9db7b5577a90a
-MISC ChangeLog 13517 SHA256 8cc0bca6cdc0aa32259702ffe9f9723b05798f6610d8eca222e5745604885dc5 SHA512 edb45be76ec29d1d82be3b124a45f8ce23464eb556ff510366a61fc0d4d8fcbc8f9af02005813562900185b86ed514cc15c451db108f9b8f30297f3466293fcf WHIRLPOOL 631b08612ee9ff668b0310cb01ca26b7062b4f2ef85408933b8966d436b0b8c40df7f8a5973bc1ac91317990a2034be871ee05aa413ffb5b6d84bd7552ff0f83
+EBUILD pdns-3.2.ebuild 5157 SHA256 6fe3505ab232ca8ada8c8249a7e7b1b85cfa6a2d1c82a87d0ce541c565efe56b SHA512 2077dbe71978203318cd524de896d1658fc2247450ded287c139608a49638aa0cc8b177b3d2b949f2123284303bc6e21c5595675f8732b047e4cb6622082f454 WHIRLPOOL cd5fced49a6187454ceea19613f9c447e55418f092b0d35a42103f9bd49b6ed25de652563eb3c28fcbf5535a2166a726fd0a0b526dfca7e7a0c15cac08c7ff8b
+MISC ChangeLog 13734 SHA256 3f0ba31d6655b071f29ea60496c9c072b69addb29d96cb8d71b483b10bbc829f SHA512 5c6acfb6741145a08fe98c06e42e6bd6256756a1274eb7ba39178fb77621e9fcea657f1053d30666cd654b47e02cedf9e02979a88fd5355070a66b86d7cdfd9d WHIRLPOOL 97e89a9ebd1d55d1340828554f950fd5c0229d83c5e70f033cc5f070667a8d1b9f1b8b6b00e7317f780bb7905e9e80b5fd8a77a434598a4c6786bdcb0904fdbd
 MISC metadata.xml 1420 SHA256 71d1877c78a2ec451298ee16f2d482c37d93bd16687ed1ff5aeeb049d72772c4 SHA512 87faa2dda26ee19baa11380759e1680de0f4b5924306d0417ba126dd44defed5095fb03adb60dceb27e2151e359d0111b05103a590ef2991c69f31ba8012e128 WHIRLPOOL 9dd8c9b188802b6e0c6c77faa957b62794932ffed131cfc4b80d5ea84b2b6f5057ef3e663460e4c9baeff76c384e981c131227a92e80a4becdbf9de6e64c9e4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQF8BAEBCABmBQJRmnQNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF7BAEBCABmBQJRnggUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RjI0QTQ0MjI1OURBNzI4MEIyREExRkQx
-RTdDRkM3NzFFMENBODVGAAoJEB58/HceDKhfwdsH/1pYmkvluELwZpjU0yKGIFMW
-YwV8XtLRJBJ4gnPbLaG9wq/UDAKwghNCKjU5Vs1O/MIODw8MzLE6ktZjcMtT/DUX
-7xzBIf/4isM4iaP/RxgPlizcnhqZVSwTlYBe8ogh5+gZHWnvgh2/ofTB6gzqHERe
-RRpxY4j+sY2zsjG0a+DU+7zUV1FikQY5GtWqsIrSdN/4MXh+74ZPxo9sk0how3GY
-8e9Sig2mtOVoqKBFXpT+UhxTn+Ua4T/Faa7k2M3Dbd6wpF1DgtW4cZW3GMRPZs/6
-Vrx0bwSl+J3z5cmv/0YSfLD6+Eqk3fAu6rsMGBMuFTrKaZnfO+SAemsK0cWtbxM=
-=6t6s
+RTdDRkM3NzFFMENBODVGAAoJEB58/HceDKhfPvkH9RFojvuni36Ibv9QheIo/hPI
+OtYy6QGCjaeNAThRycdZrRDBFSm1l2UxVg5ThA4skZLSgWxXoy3xoNnjTZi3EYlH
+oOePP0rwmMgVMFE+7Jak5nhRBxrFI+ow3vAZgesSFkY1CsFNkqcObwyckYwkR3JV
+qdlBPE5VLf8L0e3+pqgYVeCPUepug5L5bAKMtulfSFKBscHIbQs7J9rG0RLCmhXI
+IAXJPFhYwAcbXwpmVoRJkcriM8bxZgP6cVwUahaAjStMQMIM8QoHIYreYW/uIm2b
+LNEZsCoBqqn3s4PSwnM7S1fw7M+y03LrwxGU2ll/f+gFEdvYm8Mdi2o6gXsJOQ==
+=esjZ
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns/pdns-3.2.ebuild b/net-dns/pdns/pdns-3.2.ebuild
index 4a6afb9afb2c..4e4c295c852f 100644
--- a/net-dns/pdns/pdns-3.2.ebuild
+++ b/net-dns/pdns/pdns-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.2.ebuild,v 1.1 2013/05/20 19:05:48 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.2.ebuild,v 1.2 2013/05/23 12:14:11 dev-zero Exp $
 
 EAPI=5
 
@@ -19,29 +19,41 @@ KEYWORDS=""
 # oracle: dito (need Oracle Client Libraries)
 # xdb: (almost) dead, surely not supported
 
-# TODO: sort out static deps
-
 IUSE="botan cryptopp debug doc ldap lua mydns mysql odbc opendbx postgres remote
 remote-http sqlite static tinydns"
 
 REQUIRED_USE="mydns? ( mysql )"
 
-RDEPEND="net-libs/polarssl
-	botan? ( =dev-libs/botan-1.10* )
-	cryptopp? ( dev-libs/crypto++ )
-	lua? ( dev-lang/lua )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base:= )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( dev-db/sqlite:3 )
-	odbc? ( dev-db/unixODBC )
-	opendbx? ( dev-db/opendbx )
-	remote-http? ( net-misc/curl )
-	tinydns? ( dev-db/cdb )
-	!static? ( >=dev-libs/boost-1.34:= )"
+RDEPEND="!static? (
+		net-libs/polarssl
+		>=dev-libs/boost-1.34:=
+		botan? ( =dev-libs/botan-1.10* )
+		cryptopp? ( dev-libs/crypto++ )
+		lua? ( dev-lang/lua )
+		mysql? ( virtual/mysql )
+		postgres? ( dev-db/postgresql-base:= )
+		ldap? ( >=net-nds/openldap-2.0.27-r4 )
+		sqlite? ( dev-db/sqlite:3 )
+		odbc? ( dev-db/unixODBC )
+		opendbx? ( dev-db/opendbx )
+		remote-http? ( net-misc/curl )
+		tinydns? ( dev-db/cdb ) )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	static? ( >=dev-libs/boost-1.34[static-libs] )
+	static? (
+		net-libs/polarssl[static-libs(+)]
+		>=dev-libs/boost-1.34[static-libs(+)]
+		botan? ( =dev-libs/botan-1.10*[static-libs(+)] )
+		cryptopp? ( dev-libs/crypto++[static-libs(+)] )
+		lua? ( dev-lang/lua[static-libs(+)] )
+		mysql? ( virtual/mysql[static-libs(+)] )
+		postgres? ( dev-db/postgresql-base[static-libs(+)] )
+		ldap? ( >=net-nds/openldap-2.0.27-r4[static-libs(+)] )
+		sqlite? ( dev-db/sqlite:3[static-libs(+)] )
+		odbc? ( dev-db/unixODBC[static-libs(+)] )
+		opendbx? ( dev-db/opendbx[static-libs(+)] )
+		remote-http? ( net-misc/curl[static-libs(+)] )
+		tinydns? ( dev-db/cdb ) )
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
@@ -151,4 +163,22 @@ pkg_postinst() {
 		ewarn "The official LDAP backend module is only compile-tested by upstream."
 		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
 	fi
+
+	local fix_perms=0
+
+	for rv in ${REPLACING_VERSIONS} ; do
+		version_compare ${rv} 3.2
+		[[ $? -eq 1 ]] && fix_perms=1
+	done
+
+	if [[ $fix_perms -eq 1 ]] ; then
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/pdns"
+		ewarn "  ${EPREFIX}/etc/pdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/pdns/{,pdns.conf}
+	fi
+
 }