From: Patrick McLean Date: Sat, 31 Jan 2015 08:06:12 +0000 (+0000) Subject: Version bump, clean out old version. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5022d3bc0fa303b67334f2b901ff14990a4ab49e;p=gentoo.git Version bump, clean out old version. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF --- diff --git a/net-misc/lldpd/ChangeLog b/net-misc/lldpd/ChangeLog index 45e29b803208..d778cbb77826 100644 --- a/net-misc/lldpd/ChangeLog +++ b/net-misc/lldpd/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-misc/lldpd # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/ChangeLog,v 1.26 2015/01/26 09:42:29 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/ChangeLog,v 1.27 2015/01/31 08:05:54 chutzpah Exp $ + +*lldpd-0.7.13 (31 Jan 2015) + + 31 Jan 2015; Patrick McLean +lldpd-0.7.13.ebuild, + -files/lldpd-0.7.9-dont-fork-after-making-pidfile.patch, + -files/lldpd-0.7.9-seccomp-add-syscalls.patch, -files/lldpd-initd-3, + -lldpd-0.7.9-r3.ebuild, metadata.xml: + Version bump, clean out old version. 26 Jan 2015; Agostino Sarubbo lldpd-0.7.11-r3.ebuild: Stable for x86, wrt bug #535606 diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest index 4a10b30e4035..3ffda0292503 100644 --- a/net-misc/lldpd/Manifest +++ b/net-misc/lldpd/Manifest @@ -3,32 +3,29 @@ Hash: SHA256 AUX lldpd-0.7.11-bash-completion-dir.patch 374 SHA256 5e502278a5f304c7324283bcc2f5103892b935873fa5e46cd8be1e799175064f SHA512 31267d07e0bfa126181105bcc5092d061adc489057fadbc2afa817bf232d31c92c0e65c39cfe8b21e558d68d02029645dbc63cf01d99cff32a415640b4530d38 WHIRLPOOL 991a53bb007ed3a926ac57b43db7c8068b56bf6f61800177fd604f21dea70a43ce1aa91afb3fa7617b56859507cbe31c44558f356bff2e84f458a6a6496c819c AUX lldpd-0.7.11-zsh-completion-dir.patch 318 SHA256 a6b1cab53649d58d3332ae847bb0827c07f8c550e57812802ae88e9a009b6083 SHA512 cd4c069f9d637d6c9f0a687a7a415a6382bf5217390a94a269de19f5a35c1edd47d5c3455bc63d75aa7bc74a72d7f2c9de9210c0795a95bd0c78a10c1709fcb1 WHIRLPOOL 058512d0caf9ee539c91fbf2722cc1cb17322fceed62fa498c63773e10be2e461cf510650b0e680fe781954b05031ede70acd4912a270f853d2db61a03950538 -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-3 438 SHA256 51da90a95b0fe264500d26b2ccefbd23c6f64577c1acd999c361dee75f911920 SHA512 85516cedb8461fffb5561f696aa641e5bb140b3f126c07ce7926ea86e2e06b6795758e1d598acf23b8adf9338b0d7efb04755e937399be0cbf4fc3fe479a500a WHIRLPOOL b78a1df6f2c8af8f439d5cb6841de42c688aac8bff0a2398a7b3abaac218dc15cf4ed280987881c301989d04b3879c8a522d2256913f0a3cfd3c9eca094b35c0 AUX lldpd-initd-4 467 SHA256 8094ec4b1c33c9d61562d0e2a3ed7e867a0facf5186c97df2f3055aecdda16c3 SHA512 0dd88c937f093c643f90267067fbd611ad2be3fe2ce2a3e2cfe68ad9d95d94bb665eac335e6ba7cd3cd23e0fc388ee7f2edd1a6cfeef5cc655ea2d5fa8fd0331 WHIRLPOOL f074a9f6a2df5e6cd19990303a1cbc85dd04cee4a96532c59bc1bc6cd8aae03c6987233c9616cfcedcb05e9bd4b7bb25572faef482d2f5db287bad3e1bb74a06 AUX lldpd.service 205 SHA256 a8434a8092ae95de991c4af83a96bbeacb0daae816cde127a3fbde6715605ef9 SHA512 5b5aead569c842c2850fb0180b67beb87b4f0301e9e591d957089f5c659a30ef464fadd44a01f9b5476ff999368c3494c7dc7013db473d518721e5fab41cd054 WHIRLPOOL 20ffed164e88e7a84428df12bfd3a1475d41d121e0b1a129995327521f0ba908e417484d1acffb2819a0a55724181ea72264fdc31fb8f915dae1e59eb615b99a DIST lldpd-0.7.11.tar.gz 1509215 SHA256 5257169e0de6037e81efb1bcb26f6dd5755e3efa0a025144d6763bdfaf982e6b SHA512 7f5454ef4255a4fae0e323703d607bd93254b8a511984e434539d0305de1298f8bcf481beb2f121876bedc9890e6f1338cc30f5b08d7b5cf261cf87d5bb69bff WHIRLPOOL 710826936318099a562c7503653ce002c60256055e5f34d7328e7bc5397805c5790670efcc746a11f5abb5a2ff1b6590c888a3ccf02048f260f83a6ea855f28a -DIST lldpd-0.7.9.tar.gz 1496740 SHA256 7ac9abb7de51203cd3a88f8f032baef272474523bfb9c3fcc5c585e5c0c8dac1 SHA512 f8808dc6f0c57c48b62221b25c71e6b92f84500d850f8db75e53ba36a79e6937dcb49c9403fcd0363aa99af84bd3d6e1725f38890173d58b2866da0aaa5f2aa6 WHIRLPOOL ea1a7d8d1bc379b7a8751e2ccd50efc1bd9cd79c3285ecae803184e9f8009b6d871a9dba2912351d9a387bce018d6d7bd1544f39346b91c3d657b7a94f0f3e4a +DIST lldpd-0.7.13.tar.gz 1523864 SHA256 bbba3ef922f6b6cc6d2c0f008066dc882750557661c54dd1b97ae7936678d92d SHA512 3fa476a3e06e2d5c15a29a3b46bfd2e147bdd55884fef4748f1197454cde45f82d33e4cc66eb70e559a1e3ad150577781d308b2f39c08f86d75412368099d4a5 WHIRLPOOL c641e0f9f21ce9510a7e30f14ccc0ab34c54251ccbec5317a30504f5b4bca4b64e88391d7a252340490a919bb1d13764627404d1f2c2b9d19057f5b4ca561a97 EBUILD lldpd-0.7.11-r3.ebuild 2448 SHA256 5e01a11c0bac31ad9ff15ee90ae13605b7b7e80e5586960b05ce2505c6e2f0fa SHA512 2b570b6389443bc562cbc9061005a30094fbd1125e35a9018ea67457e7486998ea66c9be10218f2ecb5275503a51dfca4a9f31b4614c96de2d49958155405fd2 WHIRLPOOL 1179dbd1c7c01e8d5b7fac8d46d5198d761cb763a1f11d6fa4d9826c02e93edf212a65d372f408956f4c052fa325ed6a56b4fc78258e5d930b8655001fdbe184 -EBUILD lldpd-0.7.9-r3.ebuild 2132 SHA256 6409b59690e240bca19ca76d0450b174ec07ed037f972f3dbbfed0a137869064 SHA512 3cb144c6c164fea560525655c1af6d7ff4eccbfa76d81294e6c13704e451f6c35c1f9b54439dd8f18962734db11930e2b771e82e6600f03b5deb7795bad8a032 WHIRLPOOL 74536f94e158f2d5bb68e0e8d2e4b7cbd51654d9c469ca6a719beec3aa69da95c9f56167491ba6c73854974b940a1103ea0765fcd35e52a5ca35282e99f9e5d3 -MISC ChangeLog 5705 SHA256 93ca6793edfaf56244ed78e71daf5a662eb4da02c577d4d21fe52de11c146b3f SHA512 0dfc5e582d7d5a944f052ce7dd654c18825ebe90f98bda910027b677e9815b250f44a271f77611d46f4cac5244b26c3a461b89ed007264515651babf16a94496 WHIRLPOOL 51f282c88cb225245d272c3ae0b7d661f8dcbbaee33f86f5defd16f6dada396f15cd0231b8a60d39865cea43baac45bf199097c5a2ef56bac7265ca4cc91ee7f -MISC metadata.xml 2838 SHA256 9f121c4d95fe02236d939cdd7e3e13eb02cdecda8a401e637994c685f25d6688 SHA512 d5548a36c7cac67752035b06f1952875d8f2844f2b3e7cb3fed33a2f58ca65fe0ae449d4561a7415ccf6ed4d513cce5f109d82cc29f5d158f8f23f7830292861 WHIRLPOOL 3547d0d61e49f498c1df52402221efe9a1c4a9fdf440148242c8c71ea36261c74f049d39ea534f2d29af98e0d265db794abd33b7d5556133dd28b7161e80cd74 +EBUILD lldpd-0.7.13.ebuild 2481 SHA256 649b7dc31616dd6e2da7470596302e8f34f3b99cb8845d919ef5fb29c9296f62 SHA512 d8a41314e7a3ce7d41d434d900f66072d03f78563aa4909f5e78256d25f91d781b20fb52bcea599ed0e349dd6972311bf7a0036402f5d41528cf15630126236d WHIRLPOOL ea7cff9b2ce7a17992015b255b4870ddb43384c2e138448045017bb744e4fd5c224e40e3b9985b164be621c91e678bb884228f4c6d95a1b94ea22f61b740b6d9 +MISC ChangeLog 6023 SHA256 5972bfa3d875e5feded9456d73da068829db99dc7f2a6185abb93767c3e61365 SHA512 68a1ddd7b1d6abd282405be0b5efed83eb59fb0575b2a57925f9ac7bf5788d15eb39ba6564666f4c05ff63eb30766ce2d240ee5678daa1392d669ac769de029e WHIRLPOOL 1943659de525ca8a9d43cc9236985a795cbe7be2013a53c835121c162bdcbcc8f71f4329b4c893c69c0918eda673d715d183dc15ffb64628ede24ce297026d07 +MISC metadata.xml 2780 SHA256 e43463951a00a3ab8c4c4b612ca223e48fd0aeaa685fd5a70e561fc554faba46 SHA512 376a637218eb3bbe54db99bfbf764e57d064bad8a6c166789181ddf724b4ccd93f84b39a23ccbc282324e88b0326f99aa4ce977da7cee1cfc42b06c64adfadf5 WHIRLPOOL e54b5f3c9e95816165653242fe81336c0604004618f2a0dbdad662d82724bc10a459256b3d155d3bf740b198cad4a0e176f4b749b9000ffe42766f9919a503e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUxgwGAAoJELp701BxlEWflG0P/3X+1iS84tGEo4BIG652Z8tp -uzqVegETb5WRNJZxxKsJDJcrqQi71nlvuiQR1CZ9AfTJTYUJ1CsYWi6m+cGjnUak -T1esaY6R8EdurWx/FX0kzrxWPwUiX7hmUPKwRg/CX3coeit6y0fUVbL3k5XEwGZg -vklrtNQEUBneQVVRkUyEnTaCRyDKqT2KY2+WBPnNQm6H79Qj7eBK4AbwJYYLG0Ax -+va8+xMw93oD61/NPhuM6MhPULAgF8PkqANBE+UfuIpF0ujjBDMpqoFOWBejmYef -zerjDXuwqbe8C8+dJrssKi0/GIbuJQBovo/KAuIIWfxamQvmSLNkWn9MKy7q8O5L -Ls4EDYJOGGpcS+INJCM3MAtIimgQ9AgoUWGy4nnQsrdMs+VneRmmVOTgNYa2/TEy -UO1CmzLZ2yic5/3kBEP+1jVnG6ckKWviFPHtbMf3ohYay6NDYIsgXN0nV+fLXoJR -k7hsPlAW35OHhhvPyDgsc/DwF8kojBW6KEVK4ayqE2pnzNg3Qyvv//F/GE3bHhHh -iBVZVAHd3HKpGtDFxJULTh+VUwfCaqXh97lkhjN+hlNu3VhwfBZpP0OP+8xBBJ0N -7p416xzRWua3mYr+KIhKW0sGpgT1SwDkkbRuFoVZq6clmCe9871M7eZJV/FiyOq8 -4ZWbGos9co/+UiJS2aoJ -=L7+k +iQIcBAEBCAAGBQJUzIzvAAoJEHy/RO9cNQiDdRAQAMs4/DFZg8/LggOdDFWKUPtn +GQVfIFK/UXrwuxt4mWuvyuOmMEbbMGCEHLcJnNb8Vg+tzN3UFHyr6M7zZIo1dIdR +K9lYzjlZKe1DNb5+7YQJ8J2z/v6NQivw2QUUMVeVCmpaslrZ42cZA0fm8K9K5gFS +/wW+FCGu0jxBIOpQ233NCZD7IOOg12AIcqYLnwVmGDAd/q7jNzWN4tW+E+ZFFyK7 +PRNC12FwcMdOA0NTwxZ5qbkg3hjufNZMT7qyKB9yUIgRzo0yhRYRezr5CLfp71iF +sIlL4lVVyVAXnFjrA/3HWEyursXUdYP2UpNzkDr8/tvSw1cke1zRHuxx+IYYX+Zv +p6ScMcZ9QlF4XeQfBLeBiSHa7Js077wuEaXjMdXaEcDkgLDcCKExOrCBE9/6ozk6 +HejWERgqvVFBDUlgJHf44ReX9KfhDDozOU1JHI6whWDz0U4b6K0eyix3pAwAqytF +2PWeAyPH1Nhu2d5kedt8WsfNhk/sv8//f87vybBtUXJIPiWQkH90FAfzOaETv5ZB +owDulPiQ53lFGp9XU+XJqqYmPTOZSd/uAVvYk3QznYTgwJytpxozIVFXgP/M45BW +CCn00O7+k4xrEzgDgxHJWce/5Zk0KO7WDaXBK71KL52kNJXLSW6eaQORcFbHS3Oz +hyNqzoN4gfge1jzplpX+ +=gSQY -----END PGP SIGNATURE----- diff --git a/net-misc/lldpd/files/lldpd-0.7.9-dont-fork-after-making-pidfile.patch b/net-misc/lldpd/files/lldpd-0.7.9-dont-fork-after-making-pidfile.patch deleted file mode 100644 index 54785fd46f1d..000000000000 --- a/net-misc/lldpd/files/lldpd-0.7.9-dont-fork-after-making-pidfile.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff --git a/src/daemon/lldpd.c b/src/daemon/lldpd.c -index 4c32f27..09bee41 100644 ---- a/src/daemon/lldpd.c -+++ b/src/daemon/lldpd.c -@@ -1264,7 +1264,7 @@ lldpd_main(int argc, char *argv[], char *envp[]) - { - struct lldpd *cfg; - struct lldpd_chassis *lchassis; -- int ch, debug = 0; -+ int ch, debug = 0, create_pid = 0; - #ifdef USE_SNMP - int snmp = 0; - char *agentx = NULL; /* AgentX socket */ -@@ -1464,34 +1464,24 @@ lldpd_main(int argc, char *argv[], char *envp[]) - /* Disable SIGPIPE */ - signal(SIGPIPE, SIG_IGN); - -- /* Configuration with lldpcli */ -- if (lldpcli) { -- log_debug("main", "invoking lldpcli for configuration"); -- if (lldpd_configure(debug, lldpcli, ctlname) == -1) -- fatal("main", "unable to spawn lldpcli"); -- } -- - /* Daemonization, unless started by upstart, systemd or launchd or debug */ - #ifndef HOST_OS_OSX - if (!lldpd_started_by_upstart() && !lldpd_started_by_systemd() && - !debug) { -- int pid; -- char *spid; - log_debug("main", "daemonize"); - if (daemon(0, 0) != 0) - fatal("main", "failed to detach daemon"); -- if ((pid = open(LLDPD_PID_FILE, -- O_TRUNC | O_CREAT | O_WRONLY, 0666)) == -1) -- fatal("main", "unable to open pid file " LLDPD_PID_FILE); -- if (asprintf(&spid, "%d\n", getpid()) == -1) -- fatal("main", "unable to create pid file " LLDPD_PID_FILE); -- if (write(pid, spid, strlen(spid)) == -1) -- fatal("main", "unable to write pid file " LLDPD_PID_FILE); -- free(spid); -- close(pid); -+ create_pid++; - } - #endif - -+ /* Configuration with lldpcli */ -+ if (lldpcli) { -+ log_debug("main", "invoking lldpcli for configuration"); -+ if (lldpd_configure(debug, lldpcli, ctlname) == -1) -+ fatal("main", "unable to spawn lldpcli"); -+ } -+ - /* Try to read system information from /etc/os-release if possible. - Fall back to lsb_release for compatibility. */ - log_debug("main", "get OS/LSB release information"); -@@ -1501,7 +1491,7 @@ lldpd_main(int argc, char *argv[], char *envp[]) - } - - log_debug("main", "initialize privilege separation"); -- priv_init(PRIVSEP_CHROOT, ctl, uid, gid); -+ priv_init(PRIVSEP_CHROOT, ctl, uid, gid, create_pid); - - /* Initialization of global configuration */ - if ((cfg = (struct lldpd *) -diff --git a/src/daemon/lldpd.h b/src/daemon/lldpd.h -index 797623c..887ca9a 100644 ---- a/src/daemon/lldpd.h -+++ b/src/daemon/lldpd.h -@@ -220,7 +220,7 @@ client_handle_client(struct lldpd *cfg, - int*); - - /* priv.c */ --void priv_init(const char*, int, uid_t, gid_t); -+void priv_init(const char*, int, uid_t, gid_t, int); - void priv_wait(void); - void priv_ctl_cleanup(const char *ctlname); - char *priv_gethostbyname(void); -diff --git a/src/daemon/priv.c b/src/daemon/priv.c -index b6341e4..9903bce 100644 ---- a/src/daemon/priv.c -+++ b/src/daemon/priv.c -@@ -71,6 +71,24 @@ int res_init (void); - static int monitored = -1; /* Child */ - #endif - -+/* make pidfile on Linux systems */ -+void write_pidfile() -+{ -+#ifndef HOST_OS_OSX -+ int pid; -+ char *spid; -+ -+ if ((pid = open(LLDPD_PID_FILE, O_TRUNC | O_CREAT | O_WRONLY, 0666)) == -1) -+ fatal("main", "unable to open pid file " LLDPD_PID_FILE); -+ if (asprintf(&spid, "%d\n", getpid()) == -1) -+ fatal("main", "unable to create pid file " LLDPD_PID_FILE); -+ if (write(pid, spid, strlen(spid)) == -1) -+ fatal("main", "unable to write pid file " LLDPD_PID_FILE); -+ free(spid); -+ close(pid); -+#endif -+} -+ - /* Proxies */ - static void - priv_ping() -@@ -569,7 +587,7 @@ priv_setup_chroot(const char *chrootdir) - #endif - - void --priv_init(const char *chrootdir, int ctl, uid_t uid, gid_t gid) -+priv_init(const char *chrootdir, int ctl, uid_t uid, gid_t gid, int create_pid) - { - - int pair[2]; -@@ -587,6 +605,8 @@ priv_init(const char *chrootdir, int ctl, uid_t uid, gid_t gid) - /* Spawn off monitor */ - if ((monitored = fork()) < 0) - fatal("privsep", "unable to fork monitor"); -+ if (create_pid != 0) -+ write_pidfile(); - switch (monitored) { - case 0: - /* We are in the children, drop privileges */ -@@ -649,6 +669,8 @@ priv_init(const char *chrootdir, int ctl, uid_t uid, gid_t gid) - exit(0); - } - #else -+ if (create_pid != 0) -+ write_pidfile(); - log_warnx("priv", "no privilege separation available"); - priv_ping(); - #endif 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 deleted file mode 100644 index d58cc2223e9c..000000000000 --- a/net-misc/lldpd/files/lldpd-0.7.9-seccomp-add-syscalls.patch +++ /dev/null @@ -1,15 +0,0 @@ -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/files/lldpd-initd-3 b/net-misc/lldpd/files/lldpd-initd-3 deleted file mode 100644 index a84df6971c35..000000000000 --- a/net-misc/lldpd/files/lldpd-initd-3 +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/files/lldpd-initd-3,v 1.1 2014/07/08 23:17:39 chutzpah Exp $ - -name=lldpd -pidfile=/run/lldpd.pid -command=/usr/sbin/lldpd -retry="TERM/10/KILL/5" - -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.9-r3.ebuild b/net-misc/lldpd/lldpd-0.7.13.ebuild similarity index 65% rename from net-misc/lldpd/lldpd-0.7.9-r3.ebuild rename to net-misc/lldpd/lldpd-0.7.13.ebuild index 5ba49a6d1bb5..ef80d0ebcdca 100644 --- a/net-misc/lldpd/lldpd-0.7.9-r3.ebuild +++ b/net-misc/lldpd/lldpd-0.7.13.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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-r3.ebuild,v 1.3 2014/10/10 11:02:10 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.13.ebuild,v 1.1 2015/01/31 08:05:54 chutzpah Exp $ EAPI=5 -inherit eutils user systemd +inherit eutils user systemd bash-completion-r1 autotools DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" HOMEPAGE="http://vincentbernat.github.com/lldpd/" @@ -12,14 +12,17 @@ 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" +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 ) - json? ( dev-libs/jansson ) - seccomp? ( sys-libs/libseccomp )" + jansson? ( dev-libs/jansson ) + json-c? ( dev-libs/json-c ) + seccomp? ( sys-libs/libseccomp ) + zsh-completion? ( app-shells/zsh )" DEPEND="${RDEPEND} virtual/pkgconfig doc? ( @@ -27,7 +30,12 @@ DEPEND="${RDEPEND} !graph? ( app-doc/doxygen ) )" -REQUIRED_USE="graph? ( doc )" +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" @@ -37,8 +45,10 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${P}-seccomp-add-syscalls.patch + epatch "${PATCHES[@]}" epatch_user + eautoreconf + elibtoolize } src_configure() { @@ -62,7 +72,8 @@ src_configure() { $(use_enable lldpmed) \ $(use_enable sonmp) \ $(use_enable static-libs static) \ - $(use_with json) \ + $(use_with json-c) \ + $(use_with jansson) \ $(use_with readline) \ $(use_with seccomp) \ $(use_with snmp) \ @@ -78,8 +89,9 @@ src_install() { emake DESTDIR="${D}" install prune_libtool_files - newinitd "${FILESDIR}"/${PN}-initd-3 ${PN} + 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/* diff --git a/net-misc/lldpd/metadata.xml b/net-misc/lldpd/metadata.xml index 6953550edc2a..8cd85f09923a 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 Enable Extreme Discovery Protocol Enable Foundry Discovery Protocol Enable JSON output via Jansson - Enable JSON output via Jansson Enable JSON output via json-c Enable LLDP-MED extension Enable use of libseccomp for system call filtering