[gentoo-commits] gentoo-x86 commit in net-misc/quagga/files: quagga-services.init zebra.init.2 quagga-0.99.14-fix-ipremove.patch quagga-0.99.17-libcap.patch

[Diego Petteno (flameeyes)]

flameeyes    10/09/05 17:09:37

  Added:                quagga-services.init zebra.init.2
                        quagga-0.99.14-fix-ipremove.patch
                        quagga-0.99.17-libcap.patch
  Log:
  Version bump (bug #311865), remove old non-stable ebuilds as they are vulnerable (bug #334303). Take co-maintainership of the package; change the libcap patch (sent upstream) and avoid using a tarball for the patches for now; the other two feature, optional patches are fetched from their respective websites if the flags are enabled; rewrite init scripts almost from scratch so that they recreate their state directory if missing, and make all the services, beside zebra, share the same init script file, drop --quiet, make sure that s-s-d knows about the pidfile as well; install sample files in the documentation directory and not /etc; only use libpcre if not using glibc (could actually be unneeded on other systems as well); don't add /usr/lib/quagga to the library path (the build system will take care of using rpath; if the libraries have to be linked against from third parties, open a bug as they should be in /usr/lib directly).
  
  (Portage version: 2.2_rc75/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-misc/quagga/files/quagga-services.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/files/quagga-services.init?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/files/quagga-services.init?rev=1.1&content-type=text/plain

Index: quagga-services.init
===================================================================
#!/sbin/runscript
# Copyright 1999-2010 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,v 1.1 2010/09/05 17:09:37 flameeyes Exp $

depend() {
    need zebra
}

start() {
    if [ ! -e /etc/quagga/${SVCNAME}.conf ] ; then
        eerror "Before starting ${SVCNAME} you have to configure it, by creating"
        eerror "a /etc/quagga/${SVCNAME}.conf file."
        eerror ""
        eerror "A sample file has been installed in `ls /usr/share/doc/quagga-*/samples/${SVCNAME}.conf.sample`"
        return 1
    fi

    if [ ! -d /var/run/quagga ] ; then
        mkdir -p /var/run/quagga
        chown quagga:quagga /var/run/quagga
        chmod 0750 /var/run/quagga
    fi

    ebegin "Starting ${SVCNAME}"
    start-stop-daemon \
        --start --exec /usr/sbin/${SVCNAME} \
        --pidfile /var/run/quagga/${SVCNAME}.pid \
	-- -d -f /etc/quagga/${SVCNAME}.conf ${EXTRA_OPTS} \
	--pid_file /var/run/quagga/${SVCNAME}.pid

    eend $?
}

stop() {
    ebegin "Stopping ${SVCNAME}"
    start-stop-daemon --stop \
        --pidfile /var/run/quagga/${SVCNAME}.pid
    eend $?
}



1.1                  net-misc/quagga/files/zebra.init.2

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/files/zebra.init.2?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/files/zebra.init.2?rev=1.1&content-type=text/plain

Index: zebra.init.2
===================================================================
#!/sbin/runscript
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/zebra.init.2,v 1.1 2010/09/05 17:09:37 flameeyes Exp $

depend() {
    need net
}

start() {
    if [ ! -e /etc/quagga/${SVCNAME}.conf ] ; then
        eerror "Before starting ${SVCNAME} you have to configure it, by creating"
        eerror "a /etc/quagga/${SVCNAME}.conf file."
        eerror ""
        eerror "A sample file has been installed in `ls /usr/share/doc/quagga-*/samples/${SVCNAME}.conf.sample`"
        return 1
    fi

    if [ ! -d /var/run/quagga ] ; then
        mkdir -p /var/run/quagga
        chown quagga:quagga /var/run/quagga
        chmod 0750 /var/run/quagga
    fi

    ebegin "Cleaning up stale zebra routes..."
    ip route flush proto zebra
    eend $?

    ebegin "Starting ${SVCNAME}"
    start-stop-daemon \
        --start --exec /usr/sbin/${SVCNAME} \
        --pidfile /var/run/quagga/${SVCNAME}.pid \
	-- -d -f /etc/quagga/${SVCNAME}.conf ${EXTRA_OPTS} \
	--pid_file /var/run/quagga/${SVCNAME}.pid

    eend $?
}

stop() {
    ebegin "Stopping ${SVCNAME}"
    start-stop-daemon --stop \
        --pidfile /var/run/quagga/${SVCNAME}.pid
    eend $?
}



1.1                  net-misc/quagga/files/quagga-0.99.14-fix-ipremove.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/files/quagga-0.99.14-fix-ipremove.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/files/quagga-0.99.14-fix-ipremove.patch?rev=1.1&content-type=text/plain

Index: quagga-0.99.14-fix-ipremove.patch
===================================================================
diff -ur quagga-0.99.14/zebra/interface.c quagga-0.99.14-fix-ipremove/zebra/interface.c
--- quagga-0.99.14/zebra/interface.c	2009-07-21 13:11:21.000000000 +0100
+++ quagga-0.99.14-fix-ipremove/zebra/interface.c	2009-08-12 17:04:14.000000000 +0100
@@ -1293,17 +1293,17 @@
       return CMD_WARNING;
     }
 
-#if 0
   /* Redistribute this information. */
   zebra_interface_address_delete_update (ifp, ifc);
 
   /* Remove connected route. */
   connected_down_ipv4 (ifp, ifc);
 
+  if_subnet_delete(ifp, ifc);
+
   /* Free address information. */
   listnode_delete (ifp->connected, ifc);
   connected_free (ifc);
-#endif
 
   return CMD_SUCCESS;
 }



1.1                  net-misc/quagga/files/quagga-0.99.17-libcap.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/files/quagga-0.99.17-libcap.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/quagga/files/quagga-0.99.17-libcap.patch?rev=1.1&content-type=text/plain

Index: quagga-0.99.17-libcap.patch
===================================================================
From 63e97633d01908da6d3776ac61e4033e6fa91e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@×××××.com>
Date: Sun, 5 Sep 2010 18:19:09 +0200
Subject: [PATCH] build: fix linking position for libcap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 * lib/Makefile.am: link libzebra to libcap, since it uses symbols
   from there.
 * zebra/Makefile.am: no need to link libcap here now, since it's not
   used directly (libtool with apply transitive dependencies for
   static linking).

Signed-off-by: Diego Elio Pettenò <flameeyes@×××××.com>
---
 lib/Makefile.am   |    2 +-
 zebra/Makefile.am |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 315e919..6e69993 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,7 +18,7 @@ BUILT_SOURCES = memtypes.h route_types.h
 
 libzebra_la_DEPENDENCIES = @LIB_REGEX@
 
-libzebra_la_LIBADD = @LIB_REGEX@
+libzebra_la_LIBADD = @LIB_REGEX@ $(LIBCAP)
 
 pkginclude_HEADERS = \
 	buffer.h checksum.h command.h filter.h getopt.h hash.h \
diff --git a/zebra/Makefile.am b/zebra/Makefile.am
index 542f36f..d09a209 100644
--- a/zebra/Makefile.am
+++ b/zebra/Makefile.am
@@ -5,7 +5,6 @@ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@
 INSTALL_SDATA=@INSTALL@ -m 600
 
 LIB_IPV6 = @LIB_IPV6@
-LIBCAP = @LIBCAP@
 
 ipforward = @IPFORWARD@
 if_method = @IF_METHOD@
@@ -39,9 +38,9 @@ noinst_HEADERS = \
 	connected.h ioctl.h rib.h rt.h zserv.h redistribute.h debug.h rtadv.h \
 	interface.h ipforward.h irdp.h router-id.h kernel_socket.h
 
-zebra_LDADD = $(otherobj) $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.la
+zebra_LDADD = $(otherobj) ../lib/libzebra.la $(LIB_IPV6)
 
-testzebra_LDADD = $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.la
+testzebra_LDADD = ../lib/libzebra.la $(LIB_IPV6)
 
 zebra_DEPENDENCIES = $(otherobj)
 
-- 
1.7.2.2