From 7be003636d42c69c826834f8a687dedfca8bae43 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Mon, 22 Jan 2018 05:38:12 -0600 Subject: [PATCH] Fix: https://bugs.gentoo.org/643382 failed to compile if >=sys-kernel/linux-headers-4.11 emerged --- net-misc/quagga/Manifest | 16 ++++++++++++- .../quagga-0.99.22.4-ipctl-forwarding.patch | 22 ++++++++++++++++++ .../files/quagga-1.2.2-NETINET_IN_H.patch | 23 +++++++++++++++++++ net-misc/quagga/files/quagga-services.init.3 | 9 ++++---- net-misc/quagga/files/systemd/bgpd.service | 16 +++++++++++++ net-misc/quagga/files/systemd/isisd.service | 16 +++++++++++++ net-misc/quagga/files/systemd/nhrpd.service | 16 +++++++++++++ net-misc/quagga/files/systemd/ospf6d.service | 16 +++++++++++++ net-misc/quagga/files/systemd/ospfd.service | 16 +++++++++++++ net-misc/quagga/files/systemd/pimd.service | 17 ++++++++++++++ net-misc/quagga/files/systemd/quagga.conf | 1 + net-misc/quagga/files/systemd/ripd.service | 16 +++++++++++++ net-misc/quagga/files/systemd/ripngd.service | 16 +++++++++++++ net-misc/quagga/files/systemd/zebra.service | 16 +++++++++++++ ...-1.2.2.ebuild => quagga-1.2.2-r100.ebuild} | 4 +++- 15 files changed, 213 insertions(+), 7 deletions(-) create mode 100644 net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch create mode 100644 net-misc/quagga/files/quagga-1.2.2-NETINET_IN_H.patch create mode 100644 net-misc/quagga/files/systemd/bgpd.service create mode 100644 net-misc/quagga/files/systemd/isisd.service create mode 100644 net-misc/quagga/files/systemd/nhrpd.service create mode 100644 net-misc/quagga/files/systemd/ospf6d.service create mode 100644 net-misc/quagga/files/systemd/ospfd.service create mode 100644 net-misc/quagga/files/systemd/pimd.service create mode 100644 net-misc/quagga/files/systemd/quagga.conf create mode 100644 net-misc/quagga/files/systemd/ripd.service create mode 100644 net-misc/quagga/files/systemd/ripngd.service create mode 100644 net-misc/quagga/files/systemd/zebra.service rename net-misc/quagga/{quagga-1.2.2.ebuild => quagga-1.2.2-r100.ebuild} (97%) diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest index d8c6e44..3665390 100644 --- a/net-misc/quagga/Manifest +++ b/net-misc/quagga/Manifest @@ -1,14 +1,28 @@ AUX 437292-ipforward.patch 611 SHA256 e16c2c71a5a60ab9b3ed5c97be0c3763da70c790a121b45fe50300d3e81e869d SHA512 ea016978319f4fa4c559f9c5cef0568e616a5224243c2354e75c6602cd4ed7608c091ec8eafb5c5010f8620d5f49d6df3e9226445ff45c645cfbe58a9dad5fc1 WHIRLPOOL 21d55d483063fcd54115c68889f33ad05b776e3d98a11a91ea403fa918b6555ed2d2410af843eeb07c8be6e11c819341c7faa6af19dea31dcd8997ba2b7b0f11 AUX quagga-0.99.21-fix-no-ipv6.patch 3144 SHA256 905478424846456138fa194fee40ffd773d58ee0c68424fc0f5b986abfd0044e SHA512 8d05e60c980b207dd4a0e59f8bc95f687e16c521a41aeda542beb68ae23bc0e4f416c46521d902b188903fbde858479d8dbe6e02585508d9ab3326b29a277be4 WHIRLPOOL c1dd29bd9a7f3cd1c00f31a0d80d2728ae97cdf45040605064470070bf0b6989d7f18331b243b8c9784b78bdba292da2e48a02ccce8e5a3b9988b6d7f4331081 +AUX quagga-0.99.22.4-ipctl-forwarding.patch 731 SHA256 13944134f93a8b31ec0cad8444618afe9681f52de54b20be3be5ff4f7a647c83 SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447 WHIRLPOOL aacf456f7ccbf91ff9356606a475da00e486008bab35bd5c3f0bc3e742580079ab347f0be07d41816d7ecb438ea95cc4a128384898937b555b43c9b4531fdfe0 +AUX quagga-1.2.2-NETINET_IN_H.patch 671 SHA256 c0b76862f138fc470cd7d7d7b4893117612f9f90241fde23338427c15ba6a924 SHA512 3181cf334d6b79f56045d8451131d155ad3674110cc7f3c8784e59e9d8b522d8e3aa37b492cb9ea1876e75325f5c2f3355d20c6425c3a184d3498e8a34112297 WHIRLPOOL fd4df2f610170f4102a8ad28d547f61b13b3a59b9b26aea3c7d2083c4fb3c4711828adec920fc09b808e5a80045f4c4b74b98d394b6fdfdc9c7bed1b8396870f AUX quagga-link-libcap.patch 1027 SHA256 33bbab3490852b32f38437d50d64fcbb2a98e063503ccc46dd75cd350187853f SHA512 bc87b14432af75bc6e1bb27a7f90f0a05ddd98c6b554ef53535a2fc8e43f49c76762c8a0c240323817fdbb4e1ce29b868da7b768c597acce919febe8f040ec78 WHIRLPOOL 6be7d422ecdd4166c2bf22d8a2dbfdbdbcee9bb4d3af1d189457e3dda8d2746466533789c23f18ce9f726daf2c89b2b731675a8222d8957fb4410b550e24964f AUX quagga-services.init.2 1384 SHA256 51f604e45d82831fe2d34ec9a15ab65c6aaa21c7a3bc6856c97372cabbc06108 SHA512 e4d92a694f13ddeea9980b37de9322a19ca21f458fd4be621860c2d5835a78cb853a48bec91a858a48e8fead0dde7f993e2b7a4e119823bf74fa3e170102574e WHIRLPOOL 5ed2f7f801e1b0c859da04b2637c66eb6de94aa1e7ec553fd166e98d242d0081a5327a7a2cc79a715a93393cce71f0cfde15642e252ca8629ffdc23c5c9fc565 -AUX quagga-services.init.3 1195 SHA256 5941bdf35374a94a50e2b004993883fa69047e72de644008d15bb260a4eb7ada SHA512 de42ef010c833dc623517efd8b25212c5859b8819863e37b165cc6102b520d554f996dd710fd52e6ed35c0d43b3d52045bce52a2fa2973a390302ce943dc295f WHIRLPOOL 948c98c107416a530ee76e0259df5c11b943762659fa62c4228c664ee28e110b95add813eaf37270635ff42a7230cc68c535569f09fa3cc5505feddbc1b9b46e +AUX quagga-services.init.3 1072 SHA256 348b781bed87f50632391ea9efafca7e067f88c92ee7e21fe1c6b22869ba4a35 SHA512 03ce5cf77612ece73d3df85c6afa747dab479949299458b5c6f59dcf778b60314fd0a9c7987be289cc0b8363dcc6e337ab5309e0a86f716208ddfc5f12b8a4b3 WHIRLPOOL 8ef67c9a3b9a8fe32fa0df00e36733bf349cbd8818d12a009101775d94522bf83a9a2bc565702e1b144cc8ec1888d60bffc1edf42dc6a39ada6b1a3965d5ec61 AUX quagga.pam 975 SHA256 aa68ac97d7a951324bc3c4124a1c70f6fa88a45da860f636ac01cbcbfa36db70 SHA512 92dc6c68146d46046c6f5ff410629a2a7170e81e9657b7a2aebe1d94c8fa267acdcac9d8d8596fb54dbbacc0566502e82d900ea33f8824c07fba497b7e0f1efe WHIRLPOOL defc345fe4ccbff1cf3b68bee46f589467d68b11f7511d1333f9cdf4dbef8c55c32e4b0d9eb2f2aa57df7bdb47baa75bada593f97059494534192d34c808733b +AUX systemd/bgpd.service 347 SHA256 9912dc6178f332750bb373706745895664cea7a80c1715f444c3cbd3ba3e6e63 SHA512 dfefd7b758fd41ccaeb024c0ba4f08400086e05f44c1985cb387d0dfb0c0e19844879b49f84c350282e0d5d56dd1c65c8ac33f65e06543a20aacdfbba593606b WHIRLPOOL bdaf11a623d2f3d64da1402da70787eb4a17d03ad7f8e59d2b0266f8ae0a707e8dcb5412864f2d174210be1645287742c8398d527fd6414155e225efd831a4a4 +AUX systemd/isisd.service 352 SHA256 009ce3926808f7c2bb98c79ab46bdfcc6dfc5054d590db6a19326ee69c9a17d7 SHA512 28c054986c9171f960663056d3058c46c81270a0cb14c356d31deb1e77ef44e710535ec402773fc44191b449eae3367411ee6344386069fda9ac150c6c715713 WHIRLPOOL be36dc493f6aceb76ef61167b56f201f22447ade83158f36e9039ba7de8a0c22ffa4f680e37fab9cf3fe3e5356297a35661388f21a43de5662fbbf2d5065d971 +AUX systemd/nhrpd.service 344 SHA256 cbff1b0da3597479d3e4c444f8e4823989644c4f367e9fee6e8fbe99eebef069 SHA512 d289853f3dfca5f6de2a24935fbcd13018938e8d6614dd4eeb127b5085e6a772b0af2e8f15786c309d515b998fc7f49edd159d47e4fb7686029167775bca2635 WHIRLPOOL be9a1464a6a18c238604c1633d52aeebf84932b210c57099bb3dc2380cd00806d64942346ee7702866aa76c2eae309b285ad6d0a25b43af4c8f001178a20d677 +AUX systemd/ospf6d.service 364 SHA256 b4a4ff945d0340a729c937688ce7fe90587c2b3f1dc6170ad965c5ab9b0ba19f SHA512 379f72ec275329a715c0e4b044cbdeae8f51e06b3ed8eb1bf643163ab824a9539c6a1b0d6521cea6585eca58fbf8bd3fa153ef62936c14c06fad48395e7103ac WHIRLPOOL 7568da84e08ac39430a801d70ba3d068a760355bf844525e99f6aef4364c96a3e9bf14f37eb91406f95d743290e3922001f3479653c6748858fa471ce66f9629 +AUX systemd/ospfd.service 352 SHA256 98e7d99ca63b80143d53507e515b716c649ce497930916dd392d4ce478f35bfb SHA512 48fff984c5ac6e446fcf77307645258df881e194869aeff4d145233bb1306e422e7964f9043d244cd3bfcf9fe4cb2ebf117f562c564c847138ef32e070c50a85 WHIRLPOOL 5aec494c84bfa582f14b11c3bcd828a6d6759a556b74f915230804a400cbb1055a2fbb969ebf6f1db91850ab3da85f387b8697a22fb27e5fe068bcbb85b9e4f3 +AUX systemd/pimd.service 359 SHA256 c1a93da9b944258d77d14d92c8ad1ea52c9fb8fecc1bad4877bb92a28da2b32f SHA512 fc0d6dbf746c3fd95cf82be44415c456559596c03460c9975f957591b0d647cdf6968fe16091673114306f3dcdfce9fc401a053d8bf8f00b67b3957512b26640 WHIRLPOOL 2c39fe3517a84f275a2d4609840431263c4ca15665a0af19f5144b515072b05e7dbb78477a507701f0601bbfa24102b2523315582baaec769ee03ec3ddc92594 +AUX systemd/quagga.conf 33 SHA256 d1e6439001a6860419cecd97c36fa646fe4a9b81895cb2e2dd353cf024471953 SHA512 78effd7fe5ddd0187dc6e110ac2550001e24e803423ece7332e7dae0f83fde2d897aafe18665c64a15e2c1747b347d8eb9c99c8b95f16348deffca454a79ad8a WHIRLPOOL 94b97496109627f6f7d95ef605ba7e63bf6dc69b1e70559c252ec018563a66866e7b399c53cb7b1995e0a71fa5e446fd06b3015faf7092e446ace262cfe61fe6 +AUX systemd/ripd.service 347 SHA256 1bd58e78865a6ed7d68ef0e6545e220c44a6a66906d19bfe946b3f0365d60061 SHA512 4251609529c0fe7b8cee1191eae3d13ae1813d5d9544d2844df7e135f341f84cfd2192e6331bb2642da3637f7dd2ec29ffa93df918ecc1e071cfb45802ceabee WHIRLPOOL 0ff9a54ce7ba20faff30bcbfa7a11f4ef981a9fd557951286c6357a84a988e18e90ded89b9305216a9f1ca3c08b78ec04fafc18a25e06e58bf3d5e2add7a9b4d +AUX systemd/ripngd.service 364 SHA256 387f38a6dd747e4ad60abcfc3f4b4fca415973b963bd8bd6a26635265edc9f56 SHA512 ccfd048152896ee7ebdc434554a080b8ba36444d4de1cd11b5d2408cddfeb2ea1312962460b9a761d1a2db31dd5e72cadddf1807f9783ac1c2a51fd52c85ad54 WHIRLPOOL f83c6ac4430662f312791204ead3566d8c4465b4fe77bc5e279c54c9b0b730f52eff43881162d0fa43cce8770e330d61fb8eb62253524342dc6edff0571ef300 +AUX systemd/zebra.service 354 SHA256 495eb109bc513784eff1028dbd8759cd583f37c7d07b083e4c3bb8a627e93713 SHA512 d02a801a421c143cefb63abc3448b162505fb9063130523f939f1e6ad33c4b39f113d00e6d0c4ea7f53616fffa1aa2333bf33660b5ccb4d7fd9d4f048c5a979a WHIRLPOOL 2e277d14608dd1b59c549b0046075bad22cf7fc531e7e9838de59aeb8349cd6048bf720622a51086a24a3c8c00c3076fde2de0e02573809f611677513879160f AUX zebra.init.3 1433 SHA256 ce174d7b8a277f0e1c2ba2c6991b133c1cbd4f3f445406f741e1e4becc236918 SHA512 b7be568b03d5c20f3ac29669cc0cefd52fe06ab053fb3f82197d875d05835654efc64f5846d92816866e979602647a1f4d1d59806bc68e6a0e1900a4be840e34 WHIRLPOOL cff2c0cf8395ff77418653d72cfaa9e3e511aeb8ba47b17115ba5b41c2c8380b8c09d533e2ce022b849db15f56caf83c9e2661990866790504b7d8767d26191d DIST ht-20040304-classless-bgp.patch 1581 SHA256 39993890f9e31d662ed0564c732fb22392a901beb45b64261ffeadd9edf27887 SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8 WHIRLPOOL cef99d64d52ab8c28bd672fb93dfbd8d716a31c76a5403496a6d104a5ff39531d6085134124d41fe4ff7adf895fa001cbe77b6e42846d849d6c108c81583d04e DIST quagga-0.99.21.tar.xz 1572264 SHA256 87329c3d9d4e5c0a74812e725026560c477f610eec9771e67baf513da0357246 SHA512 0f35cabfd7aa82e08f3f728660f0fe4c35a38e1146fca8ea37100e176333363cdd3cb22987cffd644f77852bfbf8b98da87310abdc575b2200415901837765cd WHIRLPOOL f745f4840671da06c6e6504c446e86c02f255f7bf5b35651aa205cf6e4021048fd3640b8b4a66a45798191105799f19aa77ea2b05d26cc2111aba22659722197 DIST quagga-0.99.22.1.tar.xz 1608840 SHA256 fb49dce0d54b83bf4cb82cf998dc3adddd34a7579f3c7cba0572a252c010c6a6 SHA512 0ebe2fe2062a9f9db985fb3ac56df142bc35b45e5afe1b265a211cc3310920b39defab0baae805092cc20ce99e1af57ad1f03d7d65691f2150b4a23cdc70b5d4 WHIRLPOOL 783edc9b80488ce427f33728573f4056e2aa8aa4eec7f7ae509485d2dd8df9f152d549b38ec89c421a1263d9ac53583a9631116fa625a00ebd47fc796cced020 DIST quagga-0.99.22.4.tar.xz 1609248 SHA256 5e12056692e2dbc272a929f96d0e98d9873f4e7f7ffcca62434b58f6660a6386 SHA512 bcf429e71073e4fc71efc364a21a6c8b70871a17c66bd1328bc57b57962c2c15182436183b2e363c9c1c0e85d84c49d304d4049d40129272f52d6140db330b8a WHIRLPOOL bfd2d5405b6ba44d52e8dcbdb74b31be02ad384d186abb37ec0dfba52facbc9c6c7a5309a11ad844e73129a2da970b91d293271b7194fdf98c93930a2def8cfd +DIST quagga-1.2.2.tar.gz 2986142 SHA256 522e22f2beee64e3f0c2cde3d0155f3b8103f4f6fc8abef92cb40bc3a4cc2931 SHA512 861f6524bcdc01d1a895762bf1904744c12ae4dfc7c3583ecb7e55b3978c98187bde76df0ff85093c744139be9d5cf324fec75b5ba86cf1fdbce70d923710d14 WHIRLPOOL da3c361017e87da02880513e7814ac30194526910795fa4efc38ec8290d11648172929919769ef6f848b1f3d78650ec27f90da9341f3cc5681b3eeec546b6956 EBUILD quagga-0.99.21-r1.ebuild 3682 SHA256 b58e7842871f02615db4806918c343f3a8107e6485718ea9f9eba13df300b5a4 SHA512 e84248c92e4ba4d3cd11eeee6533825392f4bc82760bae33446350649e1aa6145e003cca6c7892e6bf79ea49a0eb64aa9f9e86cacf698057422c1886c281c56c WHIRLPOOL a82a71b531c2546e5ad1aaa945f41bb9f2482f1f0c2bf61cc167d357d403af1fd81ee4a83bf7f365b96ab50f24f8b54c8dc50e0efe12a39db52fb0b74f208f29 EBUILD quagga-0.99.22.1-r1.ebuild 3360 SHA256 53728f5ae2d8c690892c30e5ec33494f8a45a7db7b3ed3fde552978c845c454b SHA512 f7f17049efd6c827856077f70b5124bdfddba18031f015730a7ed54927ab4cea22c4fc6844bd960cb23f3fda8f719920a2888f17ddceb83018e4f49d21835393 WHIRLPOOL fee342121b6f762915d80a360e26b89d090d15ddf827231c8d99ded1994b4ab0a90d26c562b28ddb4faa4f05f36226529e1996b5c664193f94a778ca1a0bbb20 EBUILD quagga-0.99.22.4-r1.ebuild 3454 SHA256 ab85fbd9af51f8234253c259ef568e7f05d78aedeea55a1e41a1fce1b610906b SHA512 41460e229845fe542693b79b67bc8154b32d5b9129bf2bfdc06ba57a33b4ec91d7f38765607f923285019aa67f347e2b477dc62f49324f24315105a8fd61867e WHIRLPOOL 34ba63afee49196520220eed0ea3750c094759dc832105c52ed3bef9f3ffd78aca4be89a05241e34ab5435873d333b90ccf7ce4ede82d5f481230e1203005274 +EBUILD quagga-1.2.2-r100.ebuild 3728 SHA256 f20a0f149ac79fb09c2f4e810c9830b7e256f0faf2160a3f39f8048f94da7891 SHA512 524f5ae542cd649bb63e6788db03554dc69237f277604d829e2f7ab241dfed0ed2e8016b221cf657d426af727ff2eb9c4e7fe03311109a9d326c2c2fb3aabba4 WHIRLPOOL fbfdb82bcbcdf4271721a900709065c43c471ed2b3e4f5b1f33b8168c79bf4c7ec87a2084e5cbbf798e1e4eef4871224e49827e45891ff3ef4cbf7a5febd4266 diff --git a/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch b/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch new file mode 100644 index 0000000..f6b726b --- /dev/null +++ b/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch @@ -0,0 +1,22 @@ +Fix for missing definitions on some Hardened configurations +Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=437292 + +diff -Naur quagga-0.99.16.orig/zebra/ipforward_sysctl.c quagga-0.99.16/zebra/ipforward_sysctl.c +--- quagga-0.99.16.orig/zebra/ipforward_sysctl.c 2010-03-11 12:11:32.000000000 -0500 ++++ quagga-0.99.16/zebra/ipforward_sysctl.c 2010-03-11 12:11:39.000000000 -0500 +@@ -31,6 +31,15 @@ + + #define MIB_SIZ 4 + ++/* Fix for recent (2.6.14) kernel headers */ ++#ifndef IPCTL_FORWARDING ++ #define IPCTL_FORWARDING NET_IPV4_FORWARD ++#endif ++ ++#ifndef IP6CTL_FORWARDING ++ #define IP6CTL_FORWARDING NET_IPV6_FORWARDING ++#endif ++ + extern struct zebra_privs_t zserv_privs; + + /* IPv4 forwarding control MIB. */ diff --git a/net-misc/quagga/files/quagga-1.2.2-NETINET_IN_H.patch b/net-misc/quagga/files/quagga-1.2.2-NETINET_IN_H.patch new file mode 100644 index 0000000..56c359e --- /dev/null +++ b/net-misc/quagga/files/quagga-1.2.2-NETINET_IN_H.patch @@ -0,0 +1,23 @@ +diff -uriNp quagga-1.2.2.orig/lib/zebra.h quagga-1.2.2/lib/zebra.h +--- quagga-1.2.2.orig/lib/zebra.h 2017-10-03 09:57:10.000000000 -0500 ++++ quagga-1.2.2/lib/zebra.h 2018-01-22 05:13:55.000000000 -0600 +@@ -131,6 +131,9 @@ typedef int socklen_t; + #endif /* !C99 */ + + ++#ifdef HAVE_NETINET_IN_H ++#include ++#endif /* HAVE_NETINET_IN_H */ + #ifdef HAVE_LCAPS + #include + #include +@@ -152,9 +155,6 @@ typedef int socklen_t; + #define __APPLE_USE_RFC_3542 + #endif + +-#ifdef HAVE_NETINET_IN_H +-#include +-#endif /* HAVE_NETINET_IN_H */ + #include + #include + #include diff --git a/net-misc/quagga/files/quagga-services.init.3 b/net-misc/quagga/files/quagga-services.init.3 index a91c825..e613b26 100644 --- a/net-misc/quagga/files/quagga-services.init.3 +++ b/net-misc/quagga/files/quagga-services.init.3 @@ -1,11 +1,10 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation +#!/sbin/openrc-run +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/quagga-services.init.3,v 1.2 2012/12/05 22:48:59 jer Exp $ : ${CFGFILE:=/etc/quagga/${SVCNAME}.conf} -pidfile=/var/run/quagga/${SVCNAME}.pid +pidfile=/run/quagga/${SVCNAME}.pid command=/usr/sbin/${SVCNAME} command_args="-d -f ${CFGFILE} ${EXTRA_OPTS} --pid_file ${pidfile}" @@ -34,7 +33,7 @@ start_pre() { return 1 fi - checkpath -d -m 0750 -o quagga:quagga /var/run/quagga + checkpath -d -m 0750 -o quagga:quagga /run/quagga if [ ${SVCNAME} = "zebra" ]; then ebegin "Cleaning up stale zebra routes..." diff --git a/net-misc/quagga/files/systemd/bgpd.service b/net-misc/quagga/files/systemd/bgpd.service new file mode 100644 index 0000000..f5db0b2 --- /dev/null +++ b/net-misc/quagga/files/systemd/bgpd.service @@ -0,0 +1,16 @@ +[Unit] +Description=BGP routing daemon +Documentation=man:bgpd(8) man:zebra(8) +BindsTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/bgpd.conf + +[Service] +Type=forking +PIDFile=/run/quagga/bgpd.pid +ExecStart=/usr/sbin/bgpd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/isisd.service b/net-misc/quagga/files/systemd/isisd.service new file mode 100644 index 0000000..10eb0a8 --- /dev/null +++ b/net-misc/quagga/files/systemd/isisd.service @@ -0,0 +1,16 @@ +[Unit] +Description=IS-IS routing daemon +Documentation=man:isis(8) man:zebra(8) +BindsTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/isisd.conf + +[Service] +Type=forking +PIDFile=/run/quagga/isisd.pid +ExecStart=/usr/sbin/isisd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/nhrpd.service b/net-misc/quagga/files/systemd/nhrpd.service new file mode 100644 index 0000000..1a93bae --- /dev/null +++ b/net-misc/quagga/files/systemd/nhrpd.service @@ -0,0 +1,16 @@ +[Unit] +Description=NHRP daemon +Documentation=man:nhrpd(8) man:zebra(8) +BindsTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/nhrpd.conf + +[Service] +Type=forking +PIDFile=/run/quagga/nhrpd.pid +ExecStart=/usr/sbin/nhrpd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/ospf6d.service b/net-misc/quagga/files/systemd/ospf6d.service new file mode 100644 index 0000000..b6372d1 --- /dev/null +++ b/net-misc/quagga/files/systemd/ospf6d.service @@ -0,0 +1,16 @@ +[Unit] +Description=OSPF routing daemon for IPv6 +Documentation=man:ospfd(8) man:zebra(8) +BindsTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/ospf6d.conf + +[Service] +Type=forking +PIDFile=/run/quagga/ospf6d.pid +ExecStart=/usr/sbin/ospf6d -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/ospfd.service b/net-misc/quagga/files/systemd/ospfd.service new file mode 100644 index 0000000..310d219 --- /dev/null +++ b/net-misc/quagga/files/systemd/ospfd.service @@ -0,0 +1,16 @@ +[Unit] +Description=OSPF routing daemon +Documentation=man:ospfd(8) man:zebra(8) +BindsTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/ospfd.conf + +[Service] +Type=forking +PIDFile=/run/quagga/ospfd.pid +ExecStart=/usr/sbin/ospfd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/pimd.service b/net-misc/quagga/files/systemd/pimd.service new file mode 100644 index 0000000..d39f596 --- /dev/null +++ b/net-misc/quagga/files/systemd/pimd.service @@ -0,0 +1,17 @@ +[Unit] +Description=PIM-SSM routing daemon +Documentation=man:zebra(8) +BindsTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/pimd.conf + +[Service] +Type=forking +PIDFile=/run/quagga/pimd.pid +ExecStart=/usr/sbin/pimd -d +ExecReload=/bin/kill -HUP $MAINPID +SuccessExitStatus=1 +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/quagga.conf b/net-misc/quagga/files/systemd/quagga.conf new file mode 100644 index 0000000..2960837 --- /dev/null +++ b/net-misc/quagga/files/systemd/quagga.conf @@ -0,0 +1 @@ +d /run/quagga 0750 quagga quagga diff --git a/net-misc/quagga/files/systemd/ripd.service b/net-misc/quagga/files/systemd/ripd.service new file mode 100644 index 0000000..b2a74df --- /dev/null +++ b/net-misc/quagga/files/systemd/ripd.service @@ -0,0 +1,16 @@ +[Unit] +Description=RIP routing daemon +Documentation=man:ripd(8) man:zebra(8) +BindsTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/ripd.conf + +[Service] +Type=forking +PIDFile=/run/quagga/ripd.pid +ExecStart=/usr/sbin/ripd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/ripngd.service b/net-misc/quagga/files/systemd/ripngd.service new file mode 100644 index 0000000..75c60d8 --- /dev/null +++ b/net-misc/quagga/files/systemd/ripngd.service @@ -0,0 +1,16 @@ +[Unit] +Description=RIP routing daemon for IPv6 +Documentation=man:ripngd(8) man:zebra(8) +BindsTo=zebra.service +After=network.target zebra.service +ConditionPathExists=/etc/quagga/ripngd.conf + +[Service] +Type=forking +PIDFile=/run/quagga/ripngd.pid +ExecStart=/usr/sbin/ripngd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/zebra.service b/net-misc/quagga/files/systemd/zebra.service new file mode 100644 index 0000000..d237441 --- /dev/null +++ b/net-misc/quagga/files/systemd/zebra.service @@ -0,0 +1,16 @@ +[Unit] +Description=GNU Zebra routing manager +Documentation=man:zebra(8) +After=network.target +ConditionPathExists=/etc/quagga/zebra.conf + +[Service] +Type=forking +PIDFile=/run/quagga/zebra.pid +ExecStartPre=/bin/ip route flush proto zebra +ExecStart=/usr/sbin/zebra -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/quagga/quagga-1.2.2.ebuild b/net-misc/quagga/quagga-1.2.2-r100.ebuild similarity index 97% rename from net-misc/quagga/quagga-1.2.2.ebuild rename to net-misc/quagga/quagga-1.2.2-r100.ebuild index 9832536..fa802d6 100644 --- a/net-misc/quagga/quagga-1.2.2.ebuild +++ b/net-misc/quagga/quagga-1.2.2-r100.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ppc ~s390 ~sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86" IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test" @@ -37,8 +37,10 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch" + "${FILESDIR}/${PN}-1.2.2-NETINET_IN_H.patch" ) + DISABLE_AUTOFORMATTING=1 DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples You have to create config files in /etc/quagga before