Version bump (bug #501994), add seccomp USE flag.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)

4 files changed, 122 insertions, 2 deletions

diff --git a/net-misc/lldpd/ChangeLog b/net-misc/lldpd/ChangeLog
index 879bfa2c1011..5a1746663bfe 100644
--- a/net-misc/lldpd/ChangeLog
+++ b/net-misc/lldpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/lldpd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/ChangeLog,v 1.10 2013/08/05 21:15:11 chutzpah Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/ChangeLog,v 1.11 2014/02/21 18:47:02 chutzpah Exp $
+
+*lldpd-0.7.7 (21 Feb 2014)
+
+  21 Feb 2014; Patrick McLean <chutzpah@gentoo.org> +lldpd-0.7.7.ebuild,
+  +files/lldpd-0.7.7-fix-readline-wrapper.patch, metadata.xml:
+  Version bump (bug #501994), add seccomp USE flag.
 
 *lldpd-0.7.6 (05 Aug 2013)
 
diff --git a/net-misc/lldpd/files/lldpd-0.7.7-fix-readline-wrapper.patch b/net-misc/lldpd/files/lldpd-0.7.7-fix-readline-wrapper.patch
new file mode 100644
index 000000000000..79f024cc3778
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-0.7.7-fix-readline-wrapper.patch
@@ -0,0 +1,26 @@
+commit 02987888adc8575cd8efa103fe901de69224f4b4
+Author: Vincent Bernat <bernat@luffy.cx>
+Date:   Thu Feb 20 21:57:29 2014 +0100
+
+    lldpcli: fix readline() wrapper to take prompt as argument
+    
+    `readline()` is expecting the prompt as argument. We fix the wrapper to
+    have the same requirement.
+
+diff --git a/src/client/lldpcli.c b/src/client/lldpcli.c
+index 4223c90..35c1b94 100644
+--- a/src/client/lldpcli.c
++++ b/src/client/lldpcli.c
+@@ -239,10 +239,10 @@ cmd_help(int count, int ch)
+ }
+ #else
+ static char*
+-readline()
++readline(const char *p)
+ {
+ 	static char line[2048];
+-	fprintf(stderr, "%s", prompt());
++	fprintf(stderr, "%s", p);
+ 	fflush(stderr);
+ 	if (fgets(line, sizeof(line) - 2, stdin) == NULL)
+ 		return NULL;
diff --git a/net-misc/lldpd/lldpd-0.7.7.ebuild b/net-misc/lldpd/lldpd-0.7.7.ebuild
new file mode 100644
index 000000000000..0158454109bf
--- /dev/null
+++ b/net-misc/lldpd/lldpd-0.7.7.ebuild
@@ -0,0 +1,87 @@
+# 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.7.ebuild,v 1.1 2014/02/21 18:47:03 chutzpah Exp $
+
+EAPI=5
+
+inherit eutils user
+
+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 "${FILESDIR}"/${P}-fix-readline-wrapper.patch
+
+	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}
+}
diff --git a/net-misc/lldpd/metadata.xml b/net-misc/lldpd/metadata.xml
index da8113d4651f..b6d7fc9d49e2 100644
--- a/net-misc/lldpd/metadata.xml
+++ b/net-misc/lldpd/metadata.xml
@@ -27,6 +27,7 @@ lldpd also implements CDP (Cisco Discovery Protocol), FDP (Foundry Discovery Pro
 		<flag name='fdp'>Enable Foundry Discovery Protocol</flag>
 		<flag name='json'>Enable JSON output via Jansson</flag>
 		<flag name='lldpmed'>Enable LLDP-MED extension</flag>
+		<flag name='seccomp'>Enable use of libseccomp for system call filtering</flag>
 		<flag name='sonmp'>Enable SynOptics Network Management</flag>
 		<flag name='snmp'>Enable the use of SNMP</flag>
 	</use>