Revision bump, add a patch to whitelist some more syscalls in seccomp and remove the pidfile patch.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

5 files changed, 44 insertions, 111 deletions

diff --git a/net-misc/lldpd/ChangeLog b/net-misc/lldpd/ChangeLog
index 3d86e2e35076..20cd5c427fc2 100644
--- a/net-misc/lldpd/ChangeLog
+++ b/net-misc/lldpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/lldpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/ChangeLog,v 1.15 2014/07/07 22:08:35 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/ChangeLog,v 1.16 2014/07/08 18:34:25 chutzpah Exp $
+
+*lldpd-0.7.9-r2 (08 Jul 2014)
+
+  08 Jul 2014; Patrick McLean <chutzpah@gentoo.org> -lldpd-0.7.9.ebuild,
+  -lldpd-0.7.9-r1.ebuild, +lldpd-0.7.9-r2.ebuild,
+  +files/lldpd-0.7.9-seccomp-add-syscalls.patch:
+  Revision bump, add a patch to whitelist some more syscalls in seccomp and
+  remove the pidfile patch.
 
 *lldpd-0.7.9-r1 (07 Jul 2014)
 
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index a058a0701271..36bc19bf4ffc 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX lldpd-0.7.6-include-unistd.patch 283 SHA256 695fd16d350b75ed0a1b5b630ac13bb0365bc8b0738148b2b45ceed27e2e7f6e SHA512 f7345796fe30d21f819fcd3ec1ed580156bf3fe2d4cd7e1287ef43ba81d84c1a21372eb6550e2384d67372d9d0a7bbf7c66572426406ba6043a8c0ec48061f04 WHIRLPOOL 4331b0ba7dfac85bd0eea35c1c4c296efe245d38fd20e38fcf51b2219276416eb481d8bc12acbae4cb15b3d425f6b762b1b446eda06eb29be61c3e0ce767442f
 AUX lldpd-0.7.7-fix-readline-wrapper.patch 735 SHA256 aeb73ba9fa70b9351a998b4368ca812cc309c0b5c183161b6f9567a819e362b1 SHA512 3ff88a539ae80a4c75e00342bb2989f759791cd3372d06ca7cad6f1644f6bfc59e00bf264c54e73b6ffb0dec6b66ac714a8b38e747b5ff173b9cd32a5ae83ce0 WHIRLPOOL 3ad03197ccf7109724b955cd2b280468312da8d57a3385ca4b169406d077bfa8244d9f1993665ad36e17a5b5723cfdb3ce2e847e0c057f50d3baab75e3a37e3a
 AUX lldpd-0.7.9-dont-fork-after-making-pidfile.patch 4184 SHA256 caf7666effc2337ae7d1c68641a190edc0659f653fe9339d32d1749fd50e80c0 SHA512 9c92c8ebc3cb3e615c37e1bda353ceb22bba5a265d7da51371c8ac713aaea6a2633e813ec5c2bc556508b705784307c7ddf35da66b6f19debbb69a0b837b9b19 WHIRLPOOL b7d18617072e0143a2413916d5b5869ec7d48169f3939d4901b583e17eab11c427a83a53ad200f13aac411817ea3ceaa95377ceca672c4aedbd792d2369508bf
+AUX lldpd-0.7.9-seccomp-add-syscalls.patch 987 SHA256 bf934224ff3326cff15ea808517586a46f5e43fb5ce6b94230c50c3d092befe0 SHA512 d8aaec8d9d2d9cc0589d8d4102fc218bb1510badd53e9a7bae6e3b727cb1e0065b94eb59b991e0a077d9dee35f2e4ca500ef2ecad3aa5051c75d6e59f6d3d893 WHIRLPOOL 1910bcb8eee72b04b4187272965f20ef6e172a1d779f059797ff2fb597bf1af037bccb802a5510f584bdfb17dfb245ddfd8f2649057788020e9c6551e58532ff
 AUX lldpd-confd-1 142 SHA256 b1680fcf0395fc681bfb3283df7c86ac873aa105a9c92be37c41475b9ba9ee4c SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c WHIRLPOOL 0312f12cb5328dd9a3af675fbc142c726cb872b588e624c53b5e162cce191bf79d80ce039a61683d6c5c59c3263621ebd7e91deca1be40f6161865ccc257ad45
 AUX lldpd-initd-1 546 SHA256 41e90798d0bf488e05abdb7bbea2c24b422c88550ef5030a6e3b4b354a4dc2fa SHA512 0484d6105646b7e4f2f6bebf31e7add838207101a341b35d3475ea260868ed993b969dccb28419dfec7a90173d5525ad11a30abc1f91e6b61c252c9f97c09d95 WHIRLPOOL 48f0cf607d84a411a4048d1242fedbce76cf0378eab7e306693056be867093d39966fef230b3ee84a9416257afd797859eb63ca935444d3f004dc9d9df1ffcbe
 AUX lldpd-initd-2 511 SHA256 a2d8f51e0d85a196e3beabc2279f8deba1a0a9742428e133e116e7a77763c1f8 SHA512 45926194ad827636c54c4096ccba3e949f61fb59f76f355043703d6ac50c65559f0b8063dc825d85e1da800f720fb7e98bb9631a5dc7c1f7558d03e9b05815d0 WHIRLPOOL b316ca82182d541699cd01a37fab2e47dcc8d43dc96c87a9da63720c26930fe9562bace3f88293147a0a69871a6d47bd18dfb314036d0c94a9c565d0b036780e
@@ -15,24 +16,23 @@ DIST lldpd-0.7.9.tar.gz 1496740 SHA256 7ac9abb7de51203cd3a88f8f032baef272474523b
 EBUILD lldpd-0.7.1.ebuild 1826 SHA256 1b80c38edb8fdd8f38bdb9998623e493c43df93bfb918717ea40958d8e003d93 SHA512 dfe883cc05a0fb4d61bbadec79dbae2930a4c67f9914a5524b17f8d29bc4cca246d3e11c1dfcb7a56d8015c75cc8a79a088ac35338ba0c72774f37f57ac89caf WHIRLPOOL 87a22552fbef8111ae7c997aa2075b94cf680efc4cf393172c62ddfe1b2dfa922d4ab613f3042b29ff02d63e2d33e40d1350b92c862bd25b04eacbadb160e3b7
 EBUILD lldpd-0.7.6.ebuild 1941 SHA256 f91d579fe9678a6fc958fa9439ccc3b3178557873115dfb8b1a6b957a075dc90 SHA512 c17e2cec3080f76be28c83637c38c1ac2c2ff87aa0c75edf01992125178c7a9e5c58fcd56146576803b4aea8c97a8ff76ca75e37e2c487eb1fa7c1b2330fece1 WHIRLPOOL a096e39cf57f57611d4e083319f9c041143873d39cea708bbfb8db944d013ff290c3e59b43913c29bccefb1f51b8e00fcbe91d5d7ee30e4274b4567939fabfa3
 EBUILD lldpd-0.7.7.ebuild 2019 SHA256 dfbb98f55489302d85facc09aec37c04514c491bcc0db493bde6abe20aaaee43 SHA512 e8cbf5f8adfdaae0ead238c9cd194724699b54187a5b2fe9f9e3a236c5c626792c240f6b168f2df5d8838cda08bd179003b5855c98f7cbd34193c4e143cc9695 WHIRLPOOL 9cbdea3b2a07addc8e7a9a1e93d927a0318e08e15a7279162f4693df6106f76174931db991bc90a69cb354176ea5a47af9a79db4cc9327974871900098cd311c
-EBUILD lldpd-0.7.9-r1.ebuild 2168 SHA256 07237c5d5c13bddaceb1e0aeed6424b642d57ede186e403801b198e4872372b2 SHA512 a00ec26e39c7505ceda031094aecce3d7a9a80662e60644f6ac82107fcc6027181cb4be2c798913df78847452f0e3c1aac31013f8c2957996a29d49562f4af5e WHIRLPOOL 9938341b6ed4fb83a6710e1781f654ca19cd64bee98994cdc344864249e6a299191a9b0b1a19c9cb719caf61f1f3b1d6e449b27222ceb4a0f1bbb35e20801b3e
-EBUILD lldpd-0.7.9.ebuild 2018 SHA256 d10a30fe57b4f3c5291d35852d674841b0ef76efcc1358d8128d02285887785c SHA512 8930775472c420af7153c0df91f198a1696e5235a208fe50fb3dc8ad9df73fb0a58a623b2fc1edfbd04e2f3b269451e06c8338478a78da0e49c72ee1e7af30ad WHIRLPOOL 2ccfd03fb9d8179eaad95df548485a99bccf443d3fd9f8e6e2be886f7e0039cfee340d0b3f9247e1f1418bbe0eac4d55ad6cf07a3f1d663f337c7adc042b3c96
-MISC ChangeLog 2856 SHA256 6d346737e9b4c8263524a4f4c0ff011066f6902ea91f8d45b5efd37c6949782a SHA512 a976c5669e3c52633d8ab58095206ae8fca1f2b199eb818d7d61cb0fc63e8dbc545710bfaac727c51b329ba58ea63a71eb09abd0dc1740b945803d2ae0c0aeb1 WHIRLPOOL 37838ec9b7effbab70599539b53c1525b0c8531359403a5f0990bffa9ce49b741c50ed65b84d8dac7c39b2c095838f9cefec862dc1622180ca3e5029dba235b7
+EBUILD lldpd-0.7.9-r2.ebuild 2139 SHA256 02c44f31f6b491083c88767f89a7de00169d2c58d603add9c3372f80aa5747c1 SHA512 16b4a521ff66712807d8aa0150264cee54e9ce2bcaa843812a2db3ef35ce7503dfd0f3cc40fa8d2e620ac6df39015905ac9d1b5d8010a6f1921f92914ac2778b WHIRLPOOL 655547089d11a43c4741ca5d20b387b8c58745ddd15c06aa2e6d7b2b7677583a12d347b070908bad926d0c68229af5de6be950119a9bd584e82f831ae7d6a791
+MISC ChangeLog 3164 SHA256 00c39055034e18c57442db4b1e272600d81dd9cc9522755300e1baf31f250a1d SHA512 7f394516c6adbcbd7a71ede504cf5b13c8cabdd95ad84bbf1bf04d9627153204c84a744ff047a250b4211127ae77fa48124be6651dacdc0c603368fa060b16b4 WHIRLPOOL 288404d3128c392c5d1fd38bde72e64d3821ca762e4d8fc0920a33607d01120933559901bafe38b4ba06c84c6d94c32fc5a1d2a7ae8939f5532c97acdda897d9
 MISC metadata.xml 2718 SHA256 47dba0b887082461fac8017091a249014731a9228139a31028ddb65e443f7710 SHA512 15a78cdd37bca3dfae31f4551ed11e2fd329d2cf5ef54f2561fc92e421ec62ff8364e945454568b5f7ab61b65787cde1a094c7c0a2ead4ca77bcec43a2018764 WHIRLPOOL 33049e9119917389637f07210589d5a0c425ae11d5402f5658a74a7816559c11aafde1930d5d55efcc1a14c9c24e6244a86a2a8a6d1932abba28d776133275e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTuxplAAoJEHy/RO9cNQiDatAP/3IwlJNoetEw9/IB4MynXp7e
-1pwEmomeeVK3u3d4bMjrZm+R1QJjaCRwQywPDiRG8Qz/yZfjbLrOIecM4Ygh4kLm
-5FeLYzzROX+eTEx99cZQOLfhLTQUkj9hYupvFVwMf7eykbthZoF4A+GODCNmv3i3
-mAhM0Iss1QX/mvXhaaAByOP93jvXHaNswfgNagwhQAhrQmwtpexaeZNY8BKp6efx
-AyIt/2bP24KwSooXRMeWC1GYcQjgYqc/eNmau7AybyvOqZpofVecFMQAe8L8iSTH
-f+wruHAKjHQoBRUCQPMLVfw7LRKdB8XrjSLWAYIORQz4dItlngdp4nzEz6wzCoxA
-auJ4CiK27KuvN2rMi0NQg+MsMS5KbP88d3ybNOvJL7gmxHcjRMA6jkofygmtYPv0
-YCkPx1msY9dKtUY7twtKHQhDDu2zaOcvO6ZakkSYGhfF6z92ms+z4Qd8Wb8F7b30
-Fn8Ap9liEfvYPp+27aWyG9v6iykEyKedydUCQuNPRiQ6v/uKKsrFhxvzorCxRxv8
-0X0ys5aTdYuVgJ/vURGIoDnMFp1YPZsLmy02/07SN3MditYc7be9AoR4TC/g8YX/
-21Bx/Y0E4OoPuHLILVy/qZhTG2BMfRDO4OkBWoVAEZi544mBRENTXgcyBq37gtB1
-46xyGPIiL9p3HptEFnVw
-=TFsg
+iQIcBAEBCAAGBQJTvDmyAAoJEHy/RO9cNQiDNNMQAJZUdAVgENWGh7SABqjVgtca
+rW+opfX0J/plkC/RQ71B9QBgQoKgIrrA0VVMLgW/wUBzeT7e9cmllg9uu528+DaZ
+RYywGN3W9Gj2qLTXCueJgIxZskeimiABxYBaNDE4r9YLXRdLrPxe6DoiWpMWj2F6
+PQUufBI3/id09BZJL+30i4AYstM9D0clpm5Txk2ZSOzxqr/YgoGMc8oDuqcWqiLJ
+t+v3uOMfAD6tg9TH8vNFr/d4k/H0rhiNcpfVvWXhljsfXfNi13eCNuuKx5zb2lZM
+un2uSrVlRXZ2R9sxgz2THavlX43mF6yv/vD9PIWN76pGS9NhIFq0UFm21DU73TMG
+SJ0ygBQHI5gZIUkG51EH5N/iSAdSMv6Dl+ZZJwoONKH5NbDgf5BmRt9NDL0Ry7gt
+kcUggMqlnyIUwx4J2u1BNqb5ORwIF4qRElH/vQoVcSd5rZ0gjZ534UWm/ahtnUmf
+80JzPR1CzG/C2Ryk54hwc/p/KZQ/GWRvW7eTiK9nniAUt9v3EeDATHwbC4baTgFk
+ICSNF+9sG0c6M9bHx2GlX8I2LVTph3bTwIzr8yuvEK/qOMEmk4rhKHgbiUykg4QG
+Wc/TtpFzL0XD6TmBdc0CNlMrUCH9TtAYAYrTtD4wuHcF+Ewhe/BnL4X4aBRrjFqW
+lKMl40GCfa6lcTCPFq+w
+=sZ5d
 -----END PGP SIGNATURE-----
diff --git a/net-misc/lldpd/files/lldpd-0.7.9-seccomp-add-syscalls.patch b/net-misc/lldpd/files/lldpd-0.7.9-seccomp-add-syscalls.patch
new file mode 100644
index 000000000000..d58cc2223e9c
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-0.7.9-seccomp-add-syscalls.patch
@@ -0,0 +1,15 @@
+diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
+index 7eb49d6..c69d82a 100644
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -160,6 +160,10 @@ priv_seccomp_init(int remote, int child)
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigreturn), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(close), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendto), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(poll), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvmsg), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(readv), 0)) < 0 ||
+ 	    /* The following are for resolving addresses */
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 ||
diff --git a/net-misc/lldpd/lldpd-0.7.9-r1.ebuild b/net-misc/lldpd/lldpd-0.7.9-r2.ebuild
index 76c214063701..ee6ffa084cba 100644
--- a/net-misc/lldpd/lldpd-0.7.9-r1.ebuild
+++ b/net-misc/lldpd/lldpd-0.7.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.9-r1.ebuild,v 1.1 2014/07/07 22:08:36 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.9-r2.ebuild,v 1.1 2014/07/08 18:34:25 chutzpah Exp $
 
 EAPI=5
 
@@ -37,15 +37,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# remove the bundled libevent
-	rm -rf libevent
-
-	epatch "${FILESDIR}"/${P}-dont-fork-after-making-pidfile.patch
+	epatch "${FILESDIR}"/${P}-seccomp-add-syscalls.patch
 	epatch_user
 }
 
 src_configure() {
 	econf \
+		--without-embedded-libevent \
 		--with-privsep-user=${PN} \
 		--with-privsep-group=${PN} \
 		--with-privsep-chroot=/run/${PN} \
@@ -85,7 +83,7 @@ src_install() {
 
 	use doc && dohtml -r doxygen/html/*
 
-	keepdir /var/lib/${PN}
+	keepdir /etc/${PN}.d
 
 	systemd_dounit "${FILESDIR}"/${PN}.service
 }
diff --git a/net-misc/lldpd/lldpd-0.7.9.ebuild b/net-misc/lldpd/lldpd-0.7.9.ebuild
deleted file mode 100644
index 81b3121d3cc9..000000000000
--- a/net-misc/lldpd/lldpd-0.7.9.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.9.ebuild,v 1.1 2014/07/01 18:01:53 chutzpah Exp $
-
-EAPI=5
-
-inherit eutils user systemd
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="http://vincentbernat.github.com/lldpd/"
-SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph json +lldpmed seccomp sonmp snmp static-libs readline xml"
-
-RDEPEND=">=dev-libs/libevent-2.0.5
-		snmp? ( net-analyzer/net-snmp[extensible(+)] )
-		xml? ( dev-libs/libxml2 )
-		json? ( dev-libs/jansson )
-		seccomp? ( sys-libs/libseccomp )"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig
-		doc? (
-			graph? ( app-doc/doxygen[dot] )
-			!graph? ( app-doc/doxygen )
-		)"
-
-REQUIRED_USE="graph? ( doc )"
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	# remove the bundled libevent
-	rm -rf libevent
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/var/lib/${PN} \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable graph doxygen-dot) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable cdp) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable lldpmed) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with json) \
-		$(use_with readline) \
-		$(use_with seccomp) \
-		$(use_with snmp) \
-		$(use_with xml)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/${PN}-initd-1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-
-	use doc && dohtml -r doxygen/html/*
-
-	keepdir /var/lib/${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}