From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- net-misc/lldpd/Manifest | 3 ++- net-misc/lldpd/files/lldpd-1.0.5-cpp.patch | 13 +++++++++++++ net-misc/lldpd/lldpd-1.0.5-r1.ebuild | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 net-misc/lldpd/files/lldpd-1.0.5-cpp.patch (limited to 'net-misc/lldpd') diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest index 115e4925fa08..38a28fdb6fbd 100644 --- a/net-misc/lldpd/Manifest +++ b/net-misc/lldpd/Manifest @@ -2,6 +2,7 @@ AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 BLAKE2B 47f508fd0894334cc4d0007 AUX lldpd-1.0.1-seccomp-add-brk.patch 900 BLAKE2B 0bfbdc01382c8b96e6b266797110f5988f94abc9e40c19e0e2b7f24eebe07d91182629c8c2f06632360096b9f2509dbc0aea3f87e2152ca1ea264535c9c25f55 SHA512 8b51bce336da2151323f9fd8a48efa59684bc72450a49c438a4fcac81f64602f0a2777bdc8880b21541ac22760c7922b455225af7c27e8c392d70a651f84e752 AUX lldpd-1.0.2-seccomp-add-misc.patch 789 BLAKE2B 49fb6cf10946154a7573778c558b5ac5754e1f2dfa87c7011c44b9515df5d4e06d6271e21e3a0104823603a6e5644cee944354621c937fe358eba79f5f03c8d8 SHA512 bcc473debe7f45c533057ca1ecd6ab717bbeb663aaee223045239152fcf7c92c1dcf5e77c5bd0d36f0dbc08739dc8fd90bfcc7c82c8019a3508f496cf7df2d34 AUX lldpd-1.0.3-fix-fdp-without-cdp.patch 775 BLAKE2B 900476f2bd2e6671ed9fd1eb99f727d5b153681db85e83d28baaa6fef99bbb1e408488475b6370df337742e735b6d56f53183f1cd2072c1dbc9da5fb194bd7af SHA512 bdc0f61a467c5a5d5fddc64b3e9822a94fedc7d61cce96ab3996fd2b12e418453da27f9de7879f13b0feccf1080b8559e848b113826ca0733e60b0d28cc5aacf +AUX lldpd-1.0.5-cpp.patch 617 BLAKE2B 71a520303bbde126425f6e1432407d5cc6b4f363c74a3019761433a58fdbe404e9d90836c7fce1d8caef428fa0eb874739fc1115458f8ec7a403e275311987bd SHA512 16b7669e7f0fc6403d79121db056cbd5fe2cf892aa8a23c64b5253266164fcea27cc559b8deca8a0af7e1e3b5b0baa289302e46f057fe781f3ba0f6c7042171b AUX lldpd-1.0.5-seccomp.patch 2282 BLAKE2B 6a3cd06b65576c4f2c54636778a628960104980d3bf0b05f4164b0062c7604fb694517457f0ad13a4b83086de5219b23ca7a795b7cfb16b2baf15680e5ad7036 SHA512 6818b88d17cab0b924a3f145ce82c24ee9e3ae6a450b82413f5979cd51fb1b58fe51a9fa98e5225e0f4229bf227a029abba5f02636319b74b01394e5723ddb95 AUX lldpd-confd-1 142 BLAKE2B 38b3709d5cfcfdcfdf91ad4bd47902db779d035f825a7c875cbbfa55b35f085c04cc387599526465a0f12a0686d6550e7d3750b077f04993b55893cba2bbe362 SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e127a861d259c00410c44223177a3b08cf87465a024120b089f5794957f287479c65542610205303 SHA512 ec0157dff35cb2c370b81bff827c22d2f6c5fb0e139c1a82fabe7c6f259da4f50525a90acb5e26b4e39e0d41495b050ff9c4cf38726d3a8c4c4cea19cdb925d9 @@ -13,5 +14,5 @@ DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04 DIST lldpd-1.0.5.tar.gz 1624872 BLAKE2B 0c85cd05bd9e24c06038675be0e9e03228981bb815d8eb93ba1565eb2001dfbf24c183c9d10a1a3d194f49990e252a53730ef69a8b0e9e3151de40bb2ae5a5b8 SHA512 ce6075b6e2f847c4854c117ffc81d6e9f852e857d2bf88151ea7b3d40fbebcf980f65d4a21f17332de7f27fc696ce3ada3c063b8fa7677d7b9eee3e4634e898e EBUILD lldpd-1.0.3.ebuild 2541 BLAKE2B 91a6ce4d2e1503f2bbff6f29c5819202e069a9fa06b033438ff4d98525fe389f8d11104ff4a058a83301e7ddea473599e277d6e2c8ba01db2bc0d0605761bcff SHA512 c828991bae9872304317d2436445df7d0db20f97a8902ba2a4effd12d6730bd66ec7b9130766baee6b7b31b076efed529afb811ca2f96b10298eadb4400a15ff EBUILD lldpd-1.0.4.ebuild 2515 BLAKE2B 4a9c52827401c9cd32d6e914fe8e963498b57bc7bffbb0f58336385499f442c2df114d9e085aeda257016779b25a207131089228294f8382e6be00efae42f1f1 SHA512 2b78ff27eda0ba7ce765f03f222ee790d62bcf7d1df780d4f09a32edca424d32a245eecd8e0575898603e8fe0292602f0e0c82fa6bcbca317d4edf5a0313a663 -EBUILD lldpd-1.0.5-r1.ebuild 2321 BLAKE2B 8f5aa4915393eab19f0e7dc7e58a6f1bebe708da47ad22bddaffb77bec21f37d6bf14b159d1bfc737bbedc2495a6d8cd35f606bd29f931ae1882b1125af2fee2 SHA512 ac9a808768aede243e3d7a14b9739b31a0097598428e6ed2b5c63506125b856f92d383f1be0e577f5bcbb8791427658a3917a592e54510aa985b4210a8ab4801 +EBUILD lldpd-1.0.5-r1.ebuild 2358 BLAKE2B 7c4ce6ad02ec5850536efce7e0b32b93766a3741a896dcf796871c823d1f0b44670ff0e537c5164d5e01144165b60a65e30bb3b160991b4c6bdbc1c82a580929 SHA512 ca685b258e2912fd2c01847f506305d9ed6f0357b46157a17c5fd76112396fecf74bd6f1409b8d234f859fb2e31bbbe6757e536c1991c4a013c53d59d0bae5af MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511 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 000000000000..0c3fc1964d40 --- /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 " | cpp -dM | grep '^#define __NR_' | \ ++ echo "#include " | $(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 bdb15ea083d9..8a440b4d037b 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() { -- cgit v1.2.3