quagga: update to 1.1.0
PATCH 1/1 quagga: update to 1.1.0
* remove the following 3 patches which already fixed in upstream:
0001-ospf6d-check-ospf6-before-using-it-in-ospf6_clean.patch quagga-Avoid-duplicate-connected-address.patch ripd-fix-two-bugs-after-received-SIGHUP.patch
* inherit pkgconfig to fix configure errors:
| configure.ac:97: error: possibly undefined macro: AC_MSG_RESULT | If this token and others are legitimate, please use m4_pattern_allow. | See the Autoconf documentation.
* add user quagga to quaggavty supplementary group to fix startup error:
Starting Quagga daemons: zebra
privs_init: user(quagga) is not part of vty group specified(quaggavty)
* remove babeld related code from initscript becasue it had been removed from quagga
Signed-off-by Yi Zhao <[email protected]>
--- ...heck-ospf6-before-using-it-in-ospf6_clean.patch | 28 ----------- .../quagga-Avoid-duplicate-connected-address.patch | 54 ---------------------- .../recipes-protocols/quagga/files/quagga.default | 1 - .../recipes-protocols/quagga/files/quagga.init | 2 +- .../ripd-fix-two-bugs-after-received-SIGHUP.patch | 50 -------------------- .../recipes-protocols/quagga/quagga.inc | 6 +-- .../quagga/quagga_1.0.20160315.bb | 10 ---- .../recipes-protocols/quagga/quagga_1.1.0.bb | 6 +++ 8 files changed, 9 insertions(+), 148 deletions(-) delete mode 100644 meta-networking/recipes-protocols/quagga/files/0001-ospf6d-check-ospf6-before-using-it-in-ospf6_clean.patch delete mode 100644 meta-networking/recipes-protocols/quagga/files/quagga-Avoid-duplicate-connected-address.patch delete mode 100644 meta-networking/recipes-protocols/quagga/files/ripd-fix-two-bugs-after-received-SIGHUP.patch delete mode 100644 meta-networking/recipes-protocols/quagga/quagga_1.0.20160315.bb create mode 100644 meta-networking/recipes-protocols/quagga/quagga_1.1.0.bb
meta-networking/recipes-protocols/quagga/files/0001-ospf6d-check-ospf6-before-using-it-in-ospf6_clean.patch deleted +0 -28
@@ -1,28 +0,0 @@ -Upstream-Status: Pending - -Subject: ospf6d: check ospf6 before using it in ospf6_clean - -The ospf6 variable might be 'NULL' causing segment fault error. -Check it before referencing it. - -Signed-off-by: Chen Qi <[email protected]> ---- - ospf6d/ospf6d.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c -index 3cdd5c1..e3bf1af 100644 ---- a/ospf6d/ospf6d.c -+++ b/ospf6d/ospf6d.c -@@ -1892,6 +1892,8 @@ ospf6_init (void) - void - ospf6_clean (void) - { -+ if (ospf6 == NULL) -+ return; - if (ospf6->route_table) - ospf6_route_remove_all (ospf6->route_table); - if (ospf6->brouter_table) --- -1.9.1 -
meta-networking/recipes-protocols/quagga/files/quagga-Avoid-duplicate-connected-address.patch deleted +0 -54
54 lines not on this page · raw message
meta-networking/recipes-protocols/quagga/files/quagga.default +0 -1
@@ -4,7 +4,6 @@ vtysh_enable=yes # Bind all daemons to loopback only by default zebra_options=" --daemon -A 127.0.0.1" -babeld_options="--daemon -A 127.0.0.1" bgpd_options=" --daemon -A 127.0.0.1" ospfd_options=" --daemon -A 127.0.0.1" ospf6d_options="--daemon -A ::1"
meta-networking/recipes-protocols/quagga/files/quagga.init +1 -1
@@ -26,7 +26,7 @@ D_PATH=/usr/sbin C_PATH=/etc/quagga # Keep zebra first and do not list watchquagga! -DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld" +DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd" # Print the name of the pidfile. pidfile()
meta-networking/recipes-protocols/quagga/files/ripd-fix-two-bugs-after-received-SIGHUP.patch deleted +0 -50
50 lines not on this page · raw message
meta-networking/recipes-protocols/quagga/quagga.inc +2 -4
@@ -28,8 +28,6 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quagga${QUAGGASUBDIR}/quagga-${PV}.tar.gz; \ file://watchquagga.default \ file://volatiles.03_quagga \ file://quagga.pam \ - file://ripd-fix-two-bugs-after-received-SIGHUP.patch \ - file://quagga-Avoid-duplicate-connected-address.patch \ file://bgpd.service \ file://isisd.service \ file://ospf6d.service \
@@ -43,7 +41,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" -inherit autotools update-rc.d useradd systemd +inherit autotools update-rc.d useradd systemd pkgconfig SYSTEMD_PACKAGES = "${PN} ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" SYSTEMD_SERVICE_${PN}-bgpd = "bgpd.service"
@@ -202,7 +200,7 @@ INITSCRIPT_PARAMS_${PN}-watchquagga = "defaults 90 10" # Add quagga's user and group USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system quagga ; --system quaggavty" -USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/quagga/ -M -g quagga --shell /bin/false quagga" +USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/quagga/ -M -g quagga -G quaggavty --shell /bin/false quagga" pkg_postinst_${PN} () { if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
meta-networking/recipes-protocols/quagga/quagga_1.0.20160315.bb deleted +0 -10
@@ -1,10 +0,0 @@ -require quagga.inc - -SRC_URI += " \ - file://0001-ospf6d-check-ospf6-before-using-it-in-ospf6_clean.patch \ -" - -SRC_URI[md5sum] = "e73d6e527fb80240f180de420cfe8042" -SRC_URI[sha256sum] = "21ffb7bad0ef5f130f18dd299d219ea1cb4f5c03d473b6b32c83c340cd853263" - -QUAGGASUBDIR = ""
meta-networking/recipes-protocols/quagga/quagga_1.1.0.bb new file +6 -0
@@ -0,0 +1,6 @@ +require quagga.inc + +SRC_URI[md5sum] = "daa303871e07ea5856aae6fd79e89722" +SRC_URI[sha256sum] = "f7a43a9c59bfd3722002210530b2553c8d5cc05bfea5acd56d4f102b9f55dc63" + +QUAGGASUBDIR = ""
Signature · 1 line
2.7.4