* [gentoo-commits] repo/gentoo:master commit in: net-misc/lldpd/files/, net-misc/lldpd/
@ 2016-12-02 22:49 Patrick McLean
0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2016-12-02 22:49 UTC (permalink / raw
To: gentoo-commits
commit: a86853ded7192ddc43ad9bc4380aa2c160c6a332
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 2 22:48:52 2016 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Dec 2 22:48:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86853de
net-misc/lldpd: Remove old
Package-Manager: portage-2.3.2
net-misc/lldpd/Manifest | 3 -
.../files/lldpd-0.7.11-bash-completion-dir.patch | 9 --
net-misc/lldpd/files/lldpd-initd-4 | 20 ----
net-misc/lldpd/lldpd-0.7.11-r3.ebuild | 100 --------------------
net-misc/lldpd/lldpd-0.7.13.ebuild | 101 ---------------------
net-misc/lldpd/lldpd-0.9.1.ebuild | 101 ---------------------
net-misc/lldpd/metadata.xml | 1 -
7 files changed, 335 deletions(-)
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 003cb86..80c7267 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,6 +1,3 @@
-DIST lldpd-0.7.11.tar.gz 1509215 SHA256 5257169e0de6037e81efb1bcb26f6dd5755e3efa0a025144d6763bdfaf982e6b SHA512 7f5454ef4255a4fae0e323703d607bd93254b8a511984e434539d0305de1298f8bcf481beb2f121876bedc9890e6f1338cc30f5b08d7b5cf261cf87d5bb69bff WHIRLPOOL 710826936318099a562c7503653ce002c60256055e5f34d7328e7bc5397805c5790670efcc746a11f5abb5a2ff1b6590c888a3ccf02048f260f83a6ea855f28a
-DIST lldpd-0.7.13.tar.gz 1523864 SHA256 bbba3ef922f6b6cc6d2c0f008066dc882750557661c54dd1b97ae7936678d92d SHA512 3fa476a3e06e2d5c15a29a3b46bfd2e147bdd55884fef4748f1197454cde45f82d33e4cc66eb70e559a1e3ad150577781d308b2f39c08f86d75412368099d4a5 WHIRLPOOL c641e0f9f21ce9510a7e30f14ccc0ab34c54251ccbec5317a30504f5b4bca4b64e88391d7a252340490a919bb1d13764627404d1f2c2b9d19057f5b4ca561a97
-DIST lldpd-0.9.1.tar.gz 1600504 SHA256 16ad6d513a6a0c6c201ce4941693c0e9d6fce83bbfa3733620354d1ac9a60908 SHA512 3a6ea3051ceac689a65045c06dac4f788071291f6ab826286de54175cad48143daadb13f44a2d7ff8a97269ec7c1bf9dc337d929b8cbf256fe135d33f965b3ad WHIRLPOOL b71310da3e7626893fb00b8fc5553c80bb4dbabdabe9cabe028cb72767cfe2f0a46a6c3d09c15fc7cb1b7379b73a8eb9a9e6683ace25492f76a032834db13ce0
DIST lldpd-0.9.3.tar.gz 1601102 SHA256 cfa8a3245dd71efc1f5de064a72576a7c1afaaf0ccb5833238398b6dc612b127 SHA512 0d40d77bfde78f9ceece56968981f3a36bd7e683b12de05e84e5da0409b8e0d06062e5d665942637a66164af0254a6ac3d1a327aab3bcb48ec91ecfdd2693283 WHIRLPOOL c7be527cf48bd5623ad9b7b3ae684a5e223114d7ff57a71a33623e3e445f6bbb612a6db5353844644c6340f039bdf7caf435b7ae19cf231ae54acf1dad72b62a
DIST lldpd-0.9.4.tar.gz 1604103 SHA256 eb1f5beff2ff5c13c5e0342b5b9da815ed4a63866262445e1168a79ee65c9079 SHA512 c9313d94044da1bd760f63a60c8215f69742d5e91ef3d43427571870e04254e9c251e40f69861f9bc27828f6905919582d965b6c796c4febbf4b1b2f87e91b9c WHIRLPOOL 8306400224a4a9726f08d79004fe1f82675ceddbafb53f4e40fc538e2eed0d63028a9e0fd5ca00918ce008f131b2a8cf3f50a396eafd820dbc8e05ac43d0422d
DIST lldpd-0.9.5.tar.gz 1614052 SHA256 e9585c52f14808f03f6b6c3a9163c95b542a47b18abe002992b155d143a1a247 SHA512 ca1a0d07bab50e3d697bfe4e6d00a150b17255de5a4a4a9ec8b7d45b2b03ce70a2bfb3452562ffdc3e7542a854cb30e6412d5a3eb919ad9e8b1064fde1b344df WHIRLPOOL 6a8e31a180488f0f2c6bf9272ecdaa7acf4e7b325ef5aad63d52685a239dd60295ddce33941af778891c3112721ee5e45cc5bcb9b98caee14ffee04ea847eef6
diff --git a/net-misc/lldpd/files/lldpd-0.7.11-bash-completion-dir.patch b/net-misc/lldpd/files/lldpd-0.7.11-bash-completion-dir.patch
deleted file mode 100644
index 9e2735d..00000000
--- a/net-misc/lldpd/files/lldpd-0.7.11-bash-completion-dir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/src/client/Makefile.am b/src/client/Makefile.am
-index 454bdeb..f1580a0 100644
---- a/src/client/Makefile.am
-+++ b/src/client/Makefile.am
-@@ -44,2 +44,2 @@ endif
--bashcompletiondir = $(sysconfdir)/bash_completion.d
--dist_bashcompletion_DATA = lldpcli.bash-completion
-+bashcompletiondir = $(datadir)/bash-completion/completions
-+dist_bashcompletion_DATA = lldpcli
diff --git a/net-misc/lldpd/files/lldpd-initd-4 b/net-misc/lldpd/files/lldpd-initd-4
deleted file mode 100644
index 2cd3fe1..00000000
--- a/net-misc/lldpd/files/lldpd-initd-4
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-name=lldpd
-pidfile=/run/lldpd.pid
-command=/usr/sbin/lldpd
-retry="TERM/10/KILL/5"
-command_args="${LLDPD_OPTS}"
-
-depend() {
- use net
-}
-
-start_pre() {
- checkpath --directory /run/lldpd
-}
-
-# vim:ft=gentoo-init-d:noet:ts=4:sts=4:sw=4:
diff --git a/net-misc/lldpd/lldpd-0.7.11-r3.ebuild b/net-misc/lldpd/lldpd-0.7.11-r3.ebuild
deleted file mode 100644
index e6ccb75..00000000
--- a/net-misc/lldpd/lldpd-0.7.11-r3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user systemd bash-completion-r1 autotools
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://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 jansson json-c +lldpmed seccomp sonmp
- snmp static-libs readline xml zsh-completion"
-
-RDEPEND=">=dev-libs/libevent-2.0.5
- snmp? ( net-analyzer/net-snmp[extensible(+)] )
- xml? ( dev-libs/libxml2 )
- jansson? ( dev-libs/jansson )
- json-c? ( dev-libs/json-c )
- seccomp? ( sys-libs/libseccomp )
- zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- graph? ( app-doc/doxygen[dot] )
- !graph? ( app-doc/doxygen )
- )"
-
-REQUIRED_USE="graph? ( doc ) json-c? ( !jansson )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-zsh-completion-dir.patch
- "${FILESDIR}"/${P}-bash-completion-dir.patch
-)
-
-pkg_setup() {
- ebegin "Creating lldpd user and group"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
- eend $?
-}
-
-src_prepare() {
- epatch "${PATCHES[@]}"
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- econf \
- --without-embedded-libevent \
- --with-privsep-user=${PN} \
- --with-privsep-group=${PN} \
- --with-privsep-chroot=/run/${PN} \
- --with-lldpd-ctl-socket=/run/${PN}.socket \
- --with-lldpd-pid-file=/run/${PN}.pid \
- --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-c) \
- $(use_with jansson) \
- $(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-4 ${PN}
- newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
- newbashcomp src/client/lldpcli.bash-completion lldpcli
-
- use doc && dohtml -r doxygen/html/*
-
- keepdir /etc/${PN}.d
-
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/net-misc/lldpd/lldpd-0.7.13.ebuild b/net-misc/lldpd/lldpd-0.7.13.ebuild
deleted file mode 100644
index 0ffa4dd..00000000
--- a/net-misc/lldpd/lldpd-0.7.13.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user systemd bash-completion-r1 autotools
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://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 jansson json-c +lldpmed seccomp sonmp
- snmp static-libs readline xml zsh-completion"
-
-RDEPEND=">=dev-libs/libevent-2.0.5
- snmp? ( net-analyzer/net-snmp[extensible(+)] )
- xml? ( dev-libs/libxml2 )
- jansson? ( dev-libs/jansson )
- json-c? ( dev-libs/json-c )
- seccomp? ( sys-libs/libseccomp )
- zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- graph? ( app-doc/doxygen[dot] )
- !graph? ( app-doc/doxygen )
- )"
-
-REQUIRED_USE="graph? ( doc ) json-c? ( !jansson )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.7.11-zsh-completion-dir.patch
- "${FILESDIR}"/${PN}-0.7.11-bash-completion-dir.patch
-)
-
-pkg_setup() {
- ebegin "Creating lldpd user and group"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
- eend $?
-}
-
-src_prepare() {
- epatch "${PATCHES[@]}"
- epatch_user
- eautoreconf
- elibtoolize
-}
-
-src_configure() {
- econf \
- --without-embedded-libevent \
- --with-privsep-user=${PN} \
- --with-privsep-group=${PN} \
- --with-privsep-chroot=/run/${PN} \
- --with-lldpd-ctl-socket=/run/${PN}.socket \
- --with-lldpd-pid-file=/run/${PN}.pid \
- --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-c) \
- $(use_with jansson) \
- $(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-4 ${PN}
- newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
- newbashcomp src/client/lldpcli.bash-completion lldpcli
-
- use doc && dohtml -r doxygen/html/*
-
- keepdir /etc/${PN}.d
-
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/net-misc/lldpd/lldpd-0.9.1.ebuild b/net-misc/lldpd/lldpd-0.9.1.ebuild
deleted file mode 100644
index 059d48b..00000000
--- a/net-misc/lldpd/lldpd-0.9.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user systemd bash-completion-r1 autotools
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://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 jansson +lldpmed old-kernel
- seccomp sonmp snmp static-libs readline xml zsh-completion"
-
-RDEPEND=">=dev-libs/libevent-2.0.5
- dev-libs/libbsd
- snmp? ( net-analyzer/net-snmp[extensible(+)] )
- xml? ( dev-libs/libxml2 )
- jansson? ( dev-libs/jansson )
- seccomp? ( sys-libs/libseccomp )
- zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- graph? ( app-doc/doxygen[dot] )
- !graph? ( app-doc/doxygen )
- )"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.7.11-zsh-completion-dir.patch
-)
-
-pkg_setup() {
- ebegin "Creating lldpd user and group"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
- eend $?
-}
-
-src_prepare() {
- epatch "${PATCHES[@]}"
- epatch_user
- eautoreconf
- elibtoolize
-}
-
-src_configure() {
- econf \
- --without-embedded-libevent \
- --with-privsep-user=${PN} \
- --with-privsep-group=${PN} \
- --with-privsep-chroot=/run/${PN} \
- --with-lldpd-ctl-socket=/run/${PN}.socket \
- --with-lldpd-pid-file=/run/${PN}.pid \
- --docdir=/usr/share/doc/${PF} \
- $(use_enable cdp) \
- $(use_enable doc doxygen-man) \
- $(use_enable doc doxygen-pdf) \
- $(use_enable doc doxygen-html) \
- $(use_enable dot1) \
- $(use_enable dot3) \
- $(use_enable edp) \
- $(use_enable fdp) \
- $(use_enable graph doxygen-dot) \
- $(use_with jansson json) \
- $(use_enable lldpmed) \
- $(use_enable old-kernel oldies) \
- $(use_enable sonmp) \
- $(use_enable static-libs static) \
- $(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-5 ${PN}
- newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
- newbashcomp src/client/completion/lldpcli lldpcli
-
- use doc && dohtml -r doxygen/html/*
-
- keepdir /etc/${PN}.d
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
diff --git a/net-misc/lldpd/metadata.xml b/net-misc/lldpd/metadata.xml
index 4ca20a4..83adab8 100644
--- a/net-misc/lldpd/metadata.xml
+++ b/net-misc/lldpd/metadata.xml
@@ -26,7 +26,6 @@ lldpd also implements CDP (Cisco Discovery Protocol), FDP (Foundry Discovery Pro
<flag name="edp">Enable Extreme Discovery Protocol</flag>
<flag name="fdp">Enable Foundry Discovery Protocol</flag>
<flag name="jansson">Enable JSON output via Jansson</flag>
- <flag name="json-c">Enable JSON output via json-c</flag>
<flag name="lldpmed">Enable LLDP-MED extension</flag>
<flag name="old-kernel">Enable compatibility with Linux kernel older than 2.6.39</flag>
<flag name="sanitizers">Enable code instrumentation with selected sanitizers</flag>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/lldpd/files/, net-misc/lldpd/
@ 2016-12-06 0:35 Patrick McLean
0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2016-12-06 0:35 UTC (permalink / raw
To: gentoo-commits
commit: bb12143c16378a705ce8592ac5f304901f8665de
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 00:34:56 2016 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 00:35:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb12143c
net-misc/lldpd: Revision bump, add sendmmsg and recvfrom to seccomp filter
Package-Manager: portage-2.3.2
.../lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch | 13 +++++++++++++
.../lldpd/{lldpd-0.9.5.ebuild => lldpd-0.9.5-r1.ebuild} | 5 +++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch b/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch
new file mode 100644
index 00000000..987ef9a
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch
@@ -0,0 +1,13 @@
+diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
+index 97f4233..36184cd 100644
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -167,6 +167,8 @@ priv_seccomp_init(int remote, int child)
+ (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 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), 0)) < 0 ||
++ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
++ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 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.9.5.ebuild b/net-misc/lldpd/lldpd-0.9.5-r1.ebuild
similarity index 96%
rename from net-misc/lldpd/lldpd-0.9.5.ebuild
rename to net-misc/lldpd/lldpd-0.9.5-r1.ebuild
index 27c5d99..fbba6a5 100644
--- a/net-misc/lldpd/lldpd-0.9.5.ebuild
+++ b/net-misc/lldpd/lldpd-0.9.5-r1.ebuild
@@ -35,12 +35,13 @@ REQUIRED_USE="graph? ( doc )"
PATCHES=(
"${FILESDIR}/${PN}-0.7.11-zsh-completion-dir.patch"
"${FILESDIR}/${P}-seccomp-add-mprotect.patch"
+ "${FILESDIR}/${P}-seccomp-add-socket-ops.patch"
)
pkg_setup() {
ebegin "Creating lldpd user and group"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
+ #enewgroup ${PN}
+ #enewuser ${PN} -1 -1 -1 ${PN}
eend $?
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/lldpd/files/, net-misc/lldpd/
@ 2018-12-05 19:00 Patrick McLean
0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2018-12-05 19:00 UTC (permalink / raw
To: gentoo-commits
commit: abb033282e05e40401ec49677a1b8c7ecc64ad9e
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Wed Dec 5 18:59:47 2018 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Dec 5 19:00:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abb03328
net-misc/lldpd: Version bump to 1.0.2
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
net-misc/lldpd/Manifest | 1 +
.../lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch | 12 +++
net-misc/lldpd/lldpd-1.0.2.ebuild | 104 +++++++++++++++++++++
3 files changed, 117 insertions(+)
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 5b629f66af8..8e9d18d6737 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,2 +1,3 @@
DIST lldpd-0.9.3.tar.gz 1601102 BLAKE2B 0ba31d20dad9770c93fa4930a7c439273c36e5cebdb0b4a1674f0a375008f642e33d71b9668c91313ec4bb3311e1b4bd22d0996ed6347d2cacfd7cce24536a58 SHA512 0d40d77bfde78f9ceece56968981f3a36bd7e683b12de05e84e5da0409b8e0d06062e5d665942637a66164af0254a6ac3d1a327aab3bcb48ec91ecfdd2693283
DIST lldpd-1.0.1.tar.gz 1590903 BLAKE2B 37ff1c042537ac31f394986f1bbd3faf13105d07f340ed045a4bbc196912c0c017a5d60b2c6a89b0da9faa5a7ff8e9c4ef0d4d01a39504a31c23288a89eb92a3 SHA512 61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd
+DIST lldpd-1.0.2.tar.gz 1605391 BLAKE2B 8050b7461d4cb00c8db3c5eaa9c1fdabc9715e2b673efd9c76024448aa46363836f66b9ded9e0aa27414a742c7b1bce789394045a304839ba376e50d3d3851e4 SHA512 910a0f0211eb39deaa3291c37ec0eaaa5f762565ae2198d568b6c9ddaaa62f1f2283bc92013db54852e22a68aea4e0ba09ea25f9fb368702755e69c4de919e0b
diff --git a/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch b/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch
new file mode 100644
index 00000000000..c5e6d2edb78
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch
@@ -0,0 +1,12 @@
+diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
+index fe48ad3..791b76b 100644
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -148,6 +148,7 @@ priv_seccomp_init(int remote, int child)
+ if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(read), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(write), 0)) < 0 || /* write needed for */
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), 0)) < 0 ||
++ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(lseek), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fcntl), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(kill), 0)) < 0 ||
diff --git a/net-misc/lldpd/lldpd-1.0.2.ebuild b/net-misc/lldpd/lldpd-1.0.2.ebuild
new file mode 100644
index 00000000000..09b8552f81f
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user systemd bash-completion-r1 autotools
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://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 +lldpmed old-kernel sanitizers
+ seccomp sonmp snmp static-libs test readline xml zsh-completion"
+
+RDEPEND="dev-libs/libbsd
+ >=dev-libs/libevent-2.0.5:=
+ snmp? ( net-analyzer/net-snmp[extensible(+)] )
+ xml? ( dev-libs/libxml2 )
+ seccomp? ( sys-libs/libseccomp )
+ zsh-completion? ( app-shells/zsh )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? (
+ graph? ( app-doc/doxygen[dot] )
+ !graph? ( app-doc/doxygen )
+ )
+ test? ( dev-libs/check )"
+
+REQUIRED_USE="graph? ( doc )"
+
+PATCHES=(
+ "${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
+ "${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
+ "${FILESDIR}/lldpd-1.0.2-seccomp-add-misc.patch"
+)
+
+pkg_setup() {
+ ebegin "Creating lldpd user and group"
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+ eend $?
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ --without-embedded-libevent \
+ --with-privsep-user=${PN} \
+ --with-privsep-group=${PN} \
+ --with-privsep-chroot=/run/${PN} \
+ --with-lldpd-ctl-socket=/run/${PN}.socket \
+ --with-lldpd-pid-file=/run/${PN}.pid \
+ --docdir=/usr/share/doc/${PF} \
+ $(use_enable cdp) \
+ $(use_enable doc doxygen-man) \
+ $(use_enable doc doxygen-pdf) \
+ $(use_enable doc doxygen-html) \
+ $(use_enable dot1) \
+ $(use_enable dot3) \
+ $(use_enable edp) \
+ $(use_enable fdp) \
+ $(use_enable graph doxygen-dot) \
+ $(use_enable lldpmed) \
+ $(use_enable old-kernel oldies) \
+ $(use_enable sonmp) \
+ $(use_enable static-libs static) \
+ $(use_with readline) \
+ $(use_enable sanitizers) \
+ $(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-5 ${PN}
+ newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+ newbashcomp src/client/completion/lldpcli lldpcli
+
+ use doc && dodoc -r doxygen/html
+
+ insinto /etc
+ doins "${FILESDIR}/lldpd.conf"
+ keepdir /etc/${PN}.d
+
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/lldpd/files/, net-misc/lldpd/
@ 2020-05-29 20:39 Patrick McLean
0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2020-05-29 20:39 UTC (permalink / raw
To: gentoo-commits
commit: 0df1c6235ae79a341e59ae99fa58d8aa1ce44c24
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri May 29 20:39:07 2020 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri May 29 20:39:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df1c623
net-misc/lldpd-1.0.5-r1: Add patch to not call cpp in header test
Closes: https://bugs.gentoo.org/725234
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
net-misc/lldpd/files/lldpd-1.0.5-cpp.patch | 13 +++++++++++++
net-misc/lldpd/lldpd-1.0.5-r1.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch b/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch
new file mode 100644
index 00000000000..0c3fc1964d4
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch
@@ -0,0 +1,13 @@
+diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
+index 0d5f2f3..cc41a8a 100644
+--- a/src/daemon/Makefile.am
++++ b/src/daemon/Makefile.am
+@@ -108,7 +108,7 @@ CLEANFILES += syscall-names.h
+ syscall-names.h:
+ $(AM_V_GEN)
+ $(AM_V_at)echo "static const char *syscall_names[] = {" > $@ ;\
+- echo "#include <sys/syscall.h>" | cpp -dM | grep '^#define __NR_' | \
++ echo "#include <sys/syscall.h>" | $(CPP) -dM | grep '^#define __NR_' | \
+ LC_ALL=C sed -r -n -e 's/^\#define[ \t]+__NR_([a-z0-9_]+)[ \t]+([0-9]+)(.*)/ [\2] = "\1",/p' >> $@ ;\
+ echo "};" >> $@
+ nodist_liblldpd_la_SOURCES += syscall-names.h
diff --git a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild b/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
index bdb15ea083d..8a440b4d037 100644
--- a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
@@ -41,6 +41,7 @@ REQUIRED_USE="graph? ( doc )"
PATCHES=(
"${FILESDIR}/lldpd-1.0.5-seccomp.patch"
+ "${FILESDIR}/lldpd-1.0.5-cpp.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/lldpd/files/, net-misc/lldpd/
@ 2021-04-02 17:24 Patrick McLean
0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2021-04-02 17:24 UTC (permalink / raw
To: gentoo-commits
commit: ebd80baec2cd21a691c4d7b75857eb849f40f77f
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Apr 2 17:16:14 2021 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Apr 2 17:16:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd80bae
net-misc/lldpd: Remove old
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
net-misc/lldpd/Manifest | 4 -
.../files/lldpd-0.9.5-seccomp-add-socket-ops.patch | 13 ---
.../lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch | 11 ---
.../lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch | 12 ---
.../files/lldpd-1.0.3-fix-fdp-without-cdp.patch | 30 ------
net-misc/lldpd/files/lldpd-1.0.5-cpp.patch | 13 ---
net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch | 31 ------
net-misc/lldpd/files/lldpd-1.0.6-seccomp.patch | 12 ---
net-misc/lldpd/lldpd-1.0.3.ebuild | 106 ---------------------
net-misc/lldpd/lldpd-1.0.4.ebuild | 105 --------------------
net-misc/lldpd/lldpd-1.0.5-r1.ebuild | 103 --------------------
net-misc/lldpd/lldpd-1.0.6.ebuild | 102 --------------------
12 files changed, 542 deletions(-)
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index bbeb62f6ee7..80d7b80e317 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,5 +1 @@
-DIST lldpd-1.0.3.tar.gz 1605563 BLAKE2B 968d1c2e046049fd9ba9e9af7b8cb4f531fbd99f41a9157679f3694f800b0da1a4dd3b21feac583fa5cde3f57b022e2d6ee543ea349e1136037ba10419e3c855 SHA512 bae121a707d06726830dbb6b45210c1ed23aa2a99349a68d088b3ae3109504a6b462c7b0abf8543297083294519be2878779edf1a41bb73fe002bb6c9f966ef1
-DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04c228eeb12a2f60ea6643f63a7de3831ee3f0a060cd4de3849e75b58fdb6a868dc1aa0f8dc4b516fdd4f4ead0 SHA512 a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9
-DIST lldpd-1.0.5.tar.gz 1624872 BLAKE2B 0c85cd05bd9e24c06038675be0e9e03228981bb815d8eb93ba1565eb2001dfbf24c183c9d10a1a3d194f49990e252a53730ef69a8b0e9e3151de40bb2ae5a5b8 SHA512 ce6075b6e2f847c4854c117ffc81d6e9f852e857d2bf88151ea7b3d40fbebcf980f65d4a21f17332de7f27fc696ce3ada3c063b8fa7677d7b9eee3e4634e898e
-DIST lldpd-1.0.6.tar.gz 1814839 BLAKE2B d4bf30a7ae5a5de93f67ef6b06662e287a4c2eff76f157dc9b0a551b4473e0b0896e7af1cd39866f2ee0013ebdf572e762d8543a00bda0d0a1136cfedc7f2ba9 SHA512 b0930cf3202eba6bcbb7d5f941bda16ebbdde15f1839c6664c2896f92a7c2842cbe87baa32c7ce85f1d1fe012a8ceb9975a06244644a4bc3759241a4a1d058d1
DIST lldpd-1.0.7.tar.gz 1815150 BLAKE2B 53bd73ce4cadf9c49f93a7ec5459adba0076d40156ba25c9ea6985b10a2cfec74a741318e74fa59bf560ce129eed2faf2964c093019b27e922c3dd10ed7daa13 SHA512 32fc153d0376db797163e4654c75cc8d10c35b85d7bb611996920bf67dfd2f30e154328a6e81837d9f77e8b4b7dd9ba76c81c5dd5847faa083654b8405d0bd69
diff --git a/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch b/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch
deleted file mode 100644
index 987ef9a515c..00000000000
--- a/net-misc/lldpd/files/lldpd-0.9.5-seccomp-add-socket-ops.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
-index 97f4233..36184cd 100644
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -167,6 +167,8 @@ priv_seccomp_init(int remote, int child)
- (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 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 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/files/lldpd-1.0.1-seccomp-add-brk.patch b/net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch
deleted file mode 100644
index 40cc428ec8f..00000000000
--- a/net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -purN lldpd-1.0.1.orig/src/daemon/priv-seccomp.c lldpd-1.0.1/src/daemon/priv-seccomp.c
---- lldpd-1.0.1.orig/src/daemon/priv-seccomp.c 2018-06-12 07:48:04.282557213 +0200
-+++ lldpd-1.0.1/src/daemon/priv-seccomp.c 2018-06-12 07:52:26.214348537 +0200
-@@ -162,6 +162,7 @@ priv_seccomp_init(int remote, int child)
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(wait4), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(brk), 0)) < 0 || /* brk needed for newer libc */
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getpid), 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 ||
diff --git a/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch b/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch
deleted file mode 100644
index c5e6d2edb78..00000000000
--- a/net-misc/lldpd/files/lldpd-1.0.2-seccomp-add-misc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
-index fe48ad3..791b76b 100644
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -148,6 +148,7 @@ priv_seccomp_init(int remote, int child)
- if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(read), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(write), 0)) < 0 || /* write needed for */
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(lseek), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fcntl), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(kill), 0)) < 0 ||
diff --git a/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch b/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch
deleted file mode 100644
index 17099a2f819..00000000000
--- a/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 4e7ec8233cd185941eaa9e41785cfc53f92799b4
-Author: Vincent Bernat <vincent@bernat.ch>
-Date: Tue Jan 8 17:19:15 2019 -0500
-
- build: fix compilation with `--enable-fdp --disable-cdp`
-
- Fix #315
-
-diff --git a/src/lldpd-structs.h b/src/lldpd-structs.h
-index c3ffa10..f6b03d7 100644
---- a/src/lldpd-structs.h
-+++ b/src/lldpd-structs.h
-@@ -129,7 +129,7 @@ struct lldpd_dot3_power {
- MARSHAL(lldpd_dot3_power);
- #endif
-
--#ifdef ENABLE_CDP
-+#if defined (ENABLE_CDP) || defined (ENABLE_FDP)
- struct cdpv2_power {
- u_int16_t request_id;
- u_int16_t management_id;
-@@ -273,7 +273,7 @@ struct lldpd_port {
- struct lldpd_med_power p_med_power;
- #endif
-
--#ifdef ENABLE_CDP
-+#if defined (ENABLE_CDP) || defined (ENABLE_FDP)
- struct cdpv2_power p_cdp_power;
- #endif
-
diff --git a/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch b/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch
deleted file mode 100644
index 0c3fc1964d4..00000000000
--- a/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
-index 0d5f2f3..cc41a8a 100644
---- a/src/daemon/Makefile.am
-+++ b/src/daemon/Makefile.am
-@@ -108,7 +108,7 @@ CLEANFILES += syscall-names.h
- syscall-names.h:
- $(AM_V_GEN)
- $(AM_V_at)echo "static const char *syscall_names[] = {" > $@ ;\
-- echo "#include <sys/syscall.h>" | cpp -dM | grep '^#define __NR_' | \
-+ echo "#include <sys/syscall.h>" | $(CPP) -dM | grep '^#define __NR_' | \
- LC_ALL=C sed -r -n -e 's/^\#define[ \t]+__NR_([a-z0-9_]+)[ \t]+([0-9]+)(.*)/ [\2] = "\1",/p' >> $@ ;\
- echo "};" >> $@
- nodist_liblldpd_la_SOURCES += syscall-names.h
diff --git a/net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch b/net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch
deleted file mode 100644
index 4ac67afeec5..00000000000
--- a/net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
-index 5a6e2ae..5cef36f 100644
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -148,6 +148,7 @@ priv_seccomp_init(int remote, int child)
- if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(read), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(write), 0)) < 0 || /* write needed for */
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(lseek), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(lseek), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fcntl), 0)) < 0 ||
-@@ -163,6 +164,7 @@ priv_seccomp_init(int remote, int child)
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(wait4), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(brk), 0)) < 0 || /* brk needed for newer libc */
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getpid), 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 ||
-@@ -172,6 +174,10 @@ priv_seccomp_init(int remote, int child)
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(readv), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(clock_gettime), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(gettimeofday), 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/files/lldpd-1.0.6-seccomp.patch b/net-misc/lldpd/files/lldpd-1.0.6-seccomp.patch
deleted file mode 100644
index f0d38bd25a5..00000000000
--- a/net-misc/lldpd/files/lldpd-1.0.6-seccomp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
-index 6d2736a..5bab871 100644
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -170,6 +170,7 @@ priv_seccomp_init(int remote, int child)
- (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(sendmmsg), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(readv), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), 0)) < 0 ||
diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild
deleted file mode 100644
index 7a948e636cc..00000000000
--- a/net-misc/lldpd/lldpd-1.0.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user systemd bash-completion-r1 autotools ltprune tmpfiles
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://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 +lldpmed old-kernel sanitizers
- seccomp sonmp snmp static-libs test readline xml zsh-completion"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/libbsd
- >=dev-libs/libevent-2.0.5:=
- sys-libs/readline:0=
- snmp? ( net-analyzer/net-snmp[extensible(+)] )
- xml? ( dev-libs/libxml2 )
- seccomp? ( sys-libs/libseccomp )
- zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- graph? ( app-doc/doxygen[dot] )
- !graph? ( app-doc/doxygen )
- )
- test? ( dev-libs/check )"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
- "${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
- "${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
- "${FILESDIR}/lldpd-1.0.2-seccomp-add-misc.patch"
- "${FILESDIR}/lldpd-1.0.3-fix-fdp-without-cdp.patch"
-)
-
-pkg_setup() {
- ebegin "Creating lldpd user and group"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
- eend $?
-}
-
-src_prepare() {
- default
-
- eautoreconf
- elibtoolize
-}
-
-src_configure() {
- econf \
- --without-embedded-libevent \
- --with-privsep-user=${PN} \
- --with-privsep-group=${PN} \
- --with-privsep-chroot=/run/${PN} \
- --with-lldpd-ctl-socket=/run/${PN}.socket \
- --with-lldpd-pid-file=/run/${PN}.pid \
- $(use_enable cdp) \
- $(use_enable doc doxygen-man) \
- $(use_enable doc doxygen-pdf) \
- $(use_enable doc doxygen-html) \
- $(use_enable dot1) \
- $(use_enable dot3) \
- $(use_enable edp) \
- $(use_enable fdp) \
- $(use_enable graph doxygen-dot) \
- $(use_enable lldpmed) \
- $(use_enable old-kernel oldies) \
- $(use_enable sonmp) \
- $(use_enable static-libs static) \
- $(use_with readline) \
- $(use_enable sanitizers) \
- $(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-5 ${PN}
- newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
- newbashcomp src/client/completion/lldpcli lldpcli
-
- use doc && dodoc -r doxygen/html
-
- insinto /etc
- doins "${FILESDIR}/lldpd.conf"
- keepdir /etc/${PN}.d
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
diff --git a/net-misc/lldpd/lldpd-1.0.4.ebuild b/net-misc/lldpd/lldpd-1.0.4.ebuild
deleted file mode 100644
index 1619bcba506..00000000000
--- a/net-misc/lldpd/lldpd-1.0.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils user systemd bash-completion-r1 autotools tmpfiles
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://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 +lldpmed old-kernel sanitizers
- seccomp sonmp snmp static-libs test readline xml zsh-completion"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/libbsd
- >=dev-libs/libevent-2.0.5:=
- sys-libs/readline:0=
- snmp? ( net-analyzer/net-snmp[extensible(+)] )
- xml? ( dev-libs/libxml2:= )
- seccomp? ( sys-libs/libseccomp:= )
- zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
- test? ( dev-libs/check )"
-BDEPEND="virtual/pkgconfig
- doc? (
- graph? ( app-doc/doxygen[dot] )
- !graph? ( app-doc/doxygen )
- )"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
- "${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
- "${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
- "${FILESDIR}/lldpd-1.0.2-seccomp-add-misc.patch"
-)
-
-pkg_setup() {
- ebegin "Creating lldpd user and group"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
- eend $?
-}
-
-src_prepare() {
- default
-
- eautoreconf
- elibtoolize
-}
-
-src_configure() {
- econf \
- --without-embedded-libevent \
- --with-privsep-user=${PN} \
- --with-privsep-group=${PN} \
- --with-privsep-chroot=/run/${PN} \
- --with-lldpd-ctl-socket=/run/${PN}.socket \
- --with-lldpd-pid-file=/run/${PN}.pid \
- $(use_enable cdp) \
- $(use_enable doc doxygen-man) \
- $(use_enable doc doxygen-pdf) \
- $(use_enable doc doxygen-html) \
- $(use_enable dot1) \
- $(use_enable dot3) \
- $(use_enable edp) \
- $(use_enable fdp) \
- $(use_enable graph doxygen-dot) \
- $(use_enable lldpmed) \
- $(use_enable old-kernel oldies) \
- $(use_enable sonmp) \
- $(use_enable static-libs static) \
- $(use_with readline) \
- $(use_enable sanitizers) \
- $(use_with seccomp) \
- $(use_with snmp) \
- $(use_with xml)
-}
-
-src_compile() {
- emake
- use doc && emake doxygen-doc
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- find "${D}" -name '*.la' -delete || die
-
- newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
- newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
- newbashcomp src/client/completion/lldpcli lldpcli
-
- use doc && dodoc -r doxygen/html
-
- insinto /etc
- doins "${FILESDIR}/lldpd.conf"
- keepdir /etc/${PN}.d
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
diff --git a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild b/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
deleted file mode 100644
index 1151f58a48b..00000000000
--- a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd bash-completion-r1 autotools tmpfiles
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
-SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/4.8.0"
-KEYWORDS="amd64 x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
- seccomp sonmp snmp static-libs test readline xml zsh-completion"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/lldpd
- acct-user/lldpd
- dev-libs/libbsd
- >=dev-libs/libevent-2.0.5:=
- sys-libs/readline:0=
- seccomp? ( sys-libs/libseccomp:= )
- snmp? ( net-analyzer/net-snmp[extensible(+)] )
- xml? ( dev-libs/libxml2:= )
- zsh-completion? ( app-shells/zsh )
-"
-DEPEND="${RDEPEND}
- test? ( dev-libs/check )
-"
-BDEPEND="virtual/pkgconfig
- doc? (
- graph? ( app-doc/doxygen[dot] )
- !graph? ( app-doc/doxygen )
- )
-"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
- "${FILESDIR}/lldpd-1.0.5-seccomp.patch"
- "${FILESDIR}/lldpd-1.0.5-cpp.patch"
-)
-
-src_prepare() {
- default
-
- eautoreconf
- elibtoolize
-}
-
-src_configure() {
- econf \
- --without-embedded-libevent \
- --with-privsep-user=${PN} \
- --with-privsep-group=${PN} \
- --with-privsep-chroot=/run/${PN} \
- --with-lldpd-ctl-socket=/run/${PN}.socket \
- --with-lldpd-pid-file=/run/${PN}.pid \
- $(use_enable cdp) \
- $(use_enable doc doxygen-man) \
- $(use_enable doc doxygen-pdf) \
- $(use_enable doc doxygen-html) \
- $(use_enable dot1) \
- $(use_enable dot3) \
- $(use_enable edp) \
- $(use_enable fdp) \
- $(use_enable graph doxygen-dot) \
- $(use_enable lldpmed) \
- $(use_enable old-kernel oldies) \
- $(use_enable sonmp) \
- $(use_enable static-libs static) \
- $(use_with readline) \
- $(use_enable sanitizers) \
- $(use_with seccomp) \
- $(use_with snmp) \
- $(use_with xml)
-}
-
-src_compile() {
- emake
- use doc && emake doxygen-doc
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- find "${D}" -name '*.la' -delete || die
-
- newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
- newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
- newbashcomp src/client/completion/lldpcli lldpcli
-
- use doc && dodoc -r doxygen/html
-
- insinto /etc
- doins "${FILESDIR}/lldpd.conf"
- keepdir /etc/${PN}.d
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
diff --git a/net-misc/lldpd/lldpd-1.0.6.ebuild b/net-misc/lldpd/lldpd-1.0.6.ebuild
deleted file mode 100644
index b202dbd60a5..00000000000
--- a/net-misc/lldpd/lldpd-1.0.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd bash-completion-r1 autotools tmpfiles
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
-SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/4.9.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
- seccomp sonmp snmp static-libs test readline xml zsh-completion"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/lldpd
- acct-user/lldpd
- dev-libs/libbsd
- >=dev-libs/libevent-2.1.11:=
- sys-libs/readline:0=
- seccomp? ( sys-libs/libseccomp:= )
- snmp? ( net-analyzer/net-snmp[extensible(+)] )
- xml? ( dev-libs/libxml2:= )
- zsh-completion? ( app-shells/zsh )
-"
-DEPEND="${RDEPEND}
- test? ( dev-libs/check )
-"
-BDEPEND="virtual/pkgconfig
- doc? (
- graph? ( app-doc/doxygen[dot] )
- !graph? ( app-doc/doxygen )
- )
-"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
- "${FILESDIR}/lldpd-1.0.6-seccomp.patch"
-)
-
-src_prepare() {
- default
-
- eautoreconf
- elibtoolize
-}
-
-src_configure() {
- econf \
- --without-embedded-libevent \
- --with-privsep-user=${PN} \
- --with-privsep-group=${PN} \
- --with-privsep-chroot=/run/${PN} \
- --with-lldpd-ctl-socket=/run/${PN}.socket \
- --with-lldpd-pid-file=/run/${PN}.pid \
- $(use_enable cdp) \
- $(use_enable doc doxygen-man) \
- $(use_enable doc doxygen-pdf) \
- $(use_enable doc doxygen-html) \
- $(use_enable dot1) \
- $(use_enable dot3) \
- $(use_enable edp) \
- $(use_enable fdp) \
- $(use_enable graph doxygen-dot) \
- $(use_enable lldpmed) \
- $(use_enable old-kernel oldies) \
- $(use_enable sonmp) \
- $(use_enable static-libs static) \
- $(use_with readline) \
- $(use_enable sanitizers) \
- $(use_with seccomp) \
- $(use_with snmp) \
- $(use_with xml)
-}
-
-src_compile() {
- emake
- use doc && emake doxygen-doc
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- find "${D}" -name '*.la' -delete || die
-
- newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
- newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
- newbashcomp src/client/completion/lldpcli lldpcli
-
- use doc && dodoc -r doxygen/html
-
- insinto /etc
- doins "${FILESDIR}/lldpd.conf"
- keepdir /etc/${PN}.d
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/lldpd/files/, net-misc/lldpd/
@ 2021-04-12 21:24 Patrick McLean
0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2021-04-12 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 19a39474f57a9098fe4a38b019e827e9e8ed8ca3
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Mon Apr 12 21:24:02 2021 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Apr 12 21:24:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19a39474
net-misc/lldpd-1.0.10: Version bump
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
net-misc/lldpd/Manifest | 1 +
net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch | 12 +++
net-misc/lldpd/lldpd-1.0.10.ebuild | 102 +++++++++++++++++++++
3 files changed, 115 insertions(+)
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index a1b8ecd3b79..b3b7aed6a27 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,2 +1,3 @@
+DIST lldpd-1.0.10.tar.gz 1961631 BLAKE2B 06d3b7d659dae0df4b10f3568a6ffa96c8e848863eb5ecb11b046806b4c23afdae084ffcab8b07b93e6a111dea2c24bd2cfc81a7f1c2559a39b3b2ed8f80814f SHA512 6835bfe36cbaffb0e7f0dbc958d234b7a16787bd51d0c5423c7b775d71dc89635ab28c005e2df550c40f4ee76ab461c0c7cb2a09b011878cadaca18153485d8f
DIST lldpd-1.0.7.tar.gz 1815150 BLAKE2B 53bd73ce4cadf9c49f93a7ec5459adba0076d40156ba25c9ea6985b10a2cfec74a741318e74fa59bf560ce129eed2faf2964c093019b27e922c3dd10ed7daa13 SHA512 32fc153d0376db797163e4654c75cc8d10c35b85d7bb611996920bf67dfd2f30e154328a6e81837d9f77e8b4b7dd9ba76c81c5dd5847faa083654b8405d0bd69
DIST lldpd-1.0.9.tar.gz 1961522 BLAKE2B 83a853bb3bde7abd15b4aa167d213d97677db817aba773b152f032b0d0bf299d5cc891c56871182b2f11fc3bfb2d6c88153f32973fdec5844df5c6fc6bc97b8b SHA512 5f5d5abed7fc73efc59932a1f2ee07eedbdca6f82d002221886b4ddf704955aef432acb92084adc72a965fef3e660f3c95b2a1b8892cf05d9616921501e6aae0
diff --git a/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch b/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch
new file mode 100644
index 00000000000..876a9ce31cd
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch
@@ -0,0 +1,12 @@
+diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
+index 6d2736a..533f6fe 100644
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -180,6 +180,7 @@ priv_seccomp_init(int remote, int child)
+ (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 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fstat), 0)) < 0 ||
++ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(newfstatat), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(connect), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(futex), 0)) < 0 ||
+
diff --git a/net-misc/lldpd/lldpd-1.0.10.ebuild b/net-misc/lldpd/lldpd-1.0.10.ebuild
new file mode 100644
index 00000000000..416283761d4
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.10.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd bash-completion-r1 autotools tmpfiles
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://vincentbernat.github.com/lldpd/"
+SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/4.9.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+ seccomp sonmp snmp static-libs test readline xml zsh-completion"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/lldpd
+ acct-user/lldpd
+ dev-libs/libbsd
+ >=dev-libs/libevent-2.1.11:=
+ sys-libs/readline:0=
+ seccomp? ( sys-libs/libseccomp:= )
+ snmp? ( net-analyzer/net-snmp[extensible(+)] )
+ xml? ( dev-libs/libxml2:= )
+ zsh-completion? ( app-shells/zsh )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/check )
+"
+BDEPEND="virtual/pkgconfig
+ doc? (
+ graph? ( app-doc/doxygen[dot] )
+ !graph? ( app-doc/doxygen )
+ )
+"
+
+REQUIRED_USE="graph? ( doc )"
+
+PATCHES=(
+ "${FILESDIR}/lldpd-1.0.10-glibc-2.33.patch"
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ --without-embedded-libevent \
+ --with-privsep-user=${PN} \
+ --with-privsep-group=${PN} \
+ --with-privsep-chroot=/run/${PN} \
+ --with-lldpd-ctl-socket=/run/${PN}.socket \
+ --with-lldpd-pid-file=/run/${PN}.pid \
+ $(use_enable cdp) \
+ $(use_enable doc doxygen-man) \
+ $(use_enable doc doxygen-pdf) \
+ $(use_enable doc doxygen-html) \
+ $(use_enable dot1) \
+ $(use_enable dot3) \
+ $(use_enable edp) \
+ $(use_enable fdp) \
+ $(use_enable graph doxygen-dot) \
+ $(use_enable lldpmed) \
+ $(use_enable old-kernel oldies) \
+ $(use_enable sonmp) \
+ $(use_enable static-libs static) \
+ $(use_with readline) \
+ $(use_enable sanitizers) \
+ $(use_with seccomp) \
+ $(use_with snmp) \
+ $(use_with xml)
+}
+
+src_compile() {
+ emake
+ use doc && emake doxygen-doc
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ find "${D}" -name '*.la' -delete || die
+
+ newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+ newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+ newbashcomp src/client/completion/lldpcli lldpcli
+
+ use doc && dodoc -r doxygen/html
+
+ insinto /etc
+ doins "${FILESDIR}/lldpd.conf"
+ keepdir /etc/${PN}.d
+
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/lldpd/files/, net-misc/lldpd/
@ 2024-07-17 18:05 Patrick McLean
0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2024-07-17 18:05 UTC (permalink / raw
To: gentoo-commits
commit: 84cd129314ac47a9631049caae75f8f45c550366
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 18:04:52 2024 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 18:04:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84cd1293
net-misc/lldpd: drop 1.0.16-r2, 1.0.17
Bug: https://bugs.gentoo.org/918552
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
net-misc/lldpd/Manifest | 2 -
.../files/lldpd-1.0.16-configure-clang16.patch | 23 -----
net-misc/lldpd/lldpd-1.0.16-r2.ebuild | 114 ---------------------
net-misc/lldpd/lldpd-1.0.17.ebuild | 111 --------------------
4 files changed, 250 deletions(-)
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index cc668e569932..96161893a88d 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,3 +1 @@
-DIST lldpd-1.0.16.tar.gz 1967182 BLAKE2B 3a359ec6539087ab1ffa5e1f83b90cc375b047b6e404df21067621bac9c9e5bab4b04209e9111d72fc2486046fb1d4b6744c093342c908f9a6475cd0b5a33328 SHA512 4abd25d1d7325f0a963518d916139f39b9250c37dfd918819019cabaafcdbedbfa03c78da80d36a09a0f4b1d79d4ee5e8aee1d10596bcd5710cd0c1181ba27c1
-DIST lldpd-1.0.17.tar.gz 1983689 BLAKE2B e74a1cdd965b26e9bad509fefb66bddfd74028a7d5122e561aed51eeb1b42c26497ce07169218133e4b99f12f4e0951065280c4ea8e47d54ecb6a8e697104106 SHA512 8f6d6ea6a32cc0f238158a2d1f08224224bca250cf61f80e4d8b633c0471e4ff9a17a7a7d7f313f10d557a256c7419f54cbb3b78903b7bba3619f9c5b6c114c8
DIST lldpd-1.0.18.tar.gz 1988691 BLAKE2B 37ee156013ab9ceaee06d10025fe0b76e26ebafef7a8254866347db8e6b316805a49d0f9f2ba330bb5f863336e95983214c9c9fb453e2290e9be0c47808504c7 SHA512 c8734221767cd879c98ea3ee6fa80e1dce2f8470a97b0f757cfe7ef8fe2adaf878fdedcda896cf65e1af980634f2ab312588658fb85f89c6d5b6cc9d2da52045
diff --git a/net-misc/lldpd/files/lldpd-1.0.16-configure-clang16.patch b/net-misc/lldpd/files/lldpd-1.0.16-configure-clang16.patch
deleted file mode 100644
index bd03399e1b36..000000000000
--- a/net-misc/lldpd/files/lldpd-1.0.16-configure-clang16.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/900286
-https://github.com/lldpd/lldpd/commit/01aee0f3601c60e570aeb9040c036c83d053cc5a
-
-From 01aee0f3601c60e570aeb9040c036c83d053cc5a Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Thu, 8 Dec 2022 13:01:07 +0100
-Subject: [PATCH] m4/progname.m4: Include <stdio.h> for printf in
- lldp_CHECK___PROGNAME
-
-Otherwise the checks always fails with a compiler that does not
-support implict function declarations.
---- a/m4/progname.m4
-+++ b/m4/progname.m4
-@@ -4,7 +4,7 @@
- AC_DEFUN([lldp_CHECK___PROGNAME],[
- AC_CACHE_CHECK([whether libc defines __progname], lldp_cv_check___progname, [
- AC_LINK_IFELSE([AC_LANG_PROGRAM(
-- [[]],
-+ [[#include<stdio.h>]],
- [[ extern char *__progname; printf("%s", __progname); ]])],
- [ lldp_cv_check___progname="yes" ],
- [ lldp_cv_check___progname="no" ])
-
diff --git a/net-misc/lldpd/lldpd-1.0.16-r2.ebuild b/net-misc/lldpd/lldpd-1.0.16-r2.ebuild
deleted file mode 100644
index 996694fae22a..000000000000
--- a/net-misc/lldpd/lldpd-1.0.16-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd bash-completion-r1 autotools tmpfiles
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://lldpd.github.io/"
-SRC_URI="https://github.com/lldpd/lldpd/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/4.9.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
- seccomp sonmp snmp static-libs test readline valgrind xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/lldpd
- acct-user/lldpd
- dev-libs/libbsd
- >=dev-libs/libevent-2.1.11:=
- sys-libs/readline:0=
- seccomp? ( sys-libs/libseccomp:= )
- snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
- xml? ( dev-libs/libxml2:= )
-"
-DEPEND="${RDEPEND}
- test? ( dev-libs/check )
- valgrind? ( dev-debug/valgrind )
-"
-BDEPEND="virtual/pkgconfig
- doc? (
- graph? ( app-text/doxygen[dot,doc] )
- !graph? ( app-text/doxygen )
- )
-"
-
-REQUIRED_USE="
- graph? ( doc )
- test? ( snmp sanitizers )
-"
-
-# tests need root
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.0.16-configure-clang16.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
-
- econf \
- --without-embedded-libevent \
- --with-privsep-user=${PN} \
- --with-privsep-group=${PN} \
- --with-privsep-chroot=/run/${PN} \
- --with-lldpd-ctl-socket=/run/${PN}.socket \
- --with-lldpd-pid-file=/run/${PN}.pid \
- $(use_enable cdp) \
- $(use_enable doc doxygen-doc) \
- $(use_enable doc doxygen-man) \
- $(use_enable doc doxygen-pdf) \
- $(use_enable doc doxygen-html) \
- $(use_enable dot1) \
- $(use_enable dot3) \
- $(use_enable edp) \
- $(use_enable fdp) \
- $(use_enable graph doxygen-dot) \
- $(use_enable lldpmed) \
- $(use_enable old-kernel oldies) \
- $(use_enable sonmp) \
- $(use_enable static-libs static) \
- $(use_with readline) \
- $(use_enable sanitizers) \
- $(use_with seccomp) \
- $(use_with snmp) \
- $(use_with xml)
-}
-
-src_compile() {
- emake
- use doc && emake doxygen-doc
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- find "${D}" -name '*.la' -delete || die
-
- newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
- newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
- newbashcomp src/client/completion/lldpcli lldpcli
-
- use doc && dodoc -r doxygen/html
-
- insinto /etc
- doins "${FILESDIR}/lldpd.conf"
- keepdir /etc/${PN}.d
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}.conf
-}
diff --git a/net-misc/lldpd/lldpd-1.0.17.ebuild b/net-misc/lldpd/lldpd-1.0.17.ebuild
deleted file mode 100644
index 92848bf22b45..000000000000
--- a/net-misc/lldpd/lldpd-1.0.17.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd bash-completion-r1 autotools tmpfiles
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://lldpd.github.io/"
-SRC_URI="https://github.com/lldpd/lldpd/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/4.9.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
- seccomp sonmp snmp static-libs test readline valgrind xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/lldpd
- acct-user/lldpd
- dev-libs/libbsd
- >=dev-libs/libevent-2.1.11:=
- sys-libs/readline:0=
- seccomp? ( sys-libs/libseccomp:= )
- snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
- xml? ( dev-libs/libxml2:= )
-"
-DEPEND="${RDEPEND}
- test? ( dev-libs/check )
- valgrind? ( dev-debug/valgrind )
-"
-BDEPEND="virtual/pkgconfig
- doc? (
- graph? ( app-text/doxygen[dot,doc] )
- !graph? ( app-text/doxygen )
- )
-"
-
-REQUIRED_USE="
- graph? ( doc )
- test? ( snmp sanitizers )
-"
-
-# tests need root
-RESTRICT+=" test"
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
-
- econf \
- --cache-file="${S}"/config.cache \
- --without-embedded-libevent \
- --with-privsep-user=${PN} \
- --with-privsep-group=${PN} \
- --with-privsep-chroot=/run/${PN} \
- --with-lldpd-ctl-socket=/run/${PN}.socket \
- --with-lldpd-pid-file=/run/${PN}.pid \
- $(use_enable cdp) \
- $(use_enable doc doxygen-doc) \
- $(use_enable doc doxygen-man) \
- $(use_enable doc doxygen-pdf) \
- $(use_enable doc doxygen-html) \
- $(use_enable dot1) \
- $(use_enable dot3) \
- $(use_enable edp) \
- $(use_enable fdp) \
- $(use_enable graph doxygen-dot) \
- $(use_enable lldpmed) \
- $(use_enable old-kernel oldies) \
- $(use_enable sonmp) \
- $(use_enable static-libs static) \
- $(use_with readline) \
- $(use_enable sanitizers) \
- $(use_with seccomp) \
- $(use_with snmp) \
- $(use_with xml)
-}
-
-src_compile() {
- emake
- use doc && emake doxygen-doc
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- find "${D}" -name '*.la' -delete || die
-
- newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
- newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
- newbashcomp src/client/completion/lldpcli lldpcli
-
- use doc && dodoc -r doxygen/html
-
- insinto /etc
- doins "${FILESDIR}/lldpd.conf"
- keepdir /etc/${PN}.d
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}.conf
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-07-17 18:05 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-02 22:49 [gentoo-commits] repo/gentoo:master commit in: net-misc/lldpd/files/, net-misc/lldpd/ Patrick McLean
-- strict thread matches above, loose matches on Subject: below --
2016-12-06 0:35 Patrick McLean
2018-12-05 19:00 Patrick McLean
2020-05-29 20:39 Patrick McLean
2021-04-02 17:24 Patrick McLean
2021-04-12 21:24 Patrick McLean
2024-07-17 18:05 Patrick McLean
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox