diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/quagga/Makefile | 16 | ||||
| -rw-r--r-- | package/quagga/patches/patch-lib_queue_h | 11 | ||||
| -rw-r--r-- | package/quagga/patches/patch-lib_zebra_h | 10 |
3 files changed, 2 insertions, 35 deletions
diff --git a/package/quagga/Makefile b/package/quagga/Makefile index 3f66b032b..0abd8bb58 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= quagga -PKG_VERSION:= 0.99.22.4 +PKG_VERSION:= 0.99.24.1 PKG_RELEASE:= 1 -PKG_HASH:= 5e12056692e2dbc272a929f96d0e98d9873f4e7f7ffcca62434b58f6660a6386 +PKG_HASH:= 6fd6baadb136a801c29c1dd72d0fe69da9f19ae498e87bff7057778361e43b14 PKG_DESCR:= routing software package PKG_SECTION:= net/route PKG_BUILDDEP:= readline ncurses @@ -28,9 +28,6 @@ PKGSN_QUAGGA_RIPD:= quagga PKGSD_QUAGGA_VTYSH:= vtysh utility PKGSN_QUAGGA_VTYSH:= quagga -PKG_FLAVOURS_QUAGGA:= WITH_IPV6 -PKGFD_WITH_IPV6:= enable IPv6 support - include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,QUAGGA,quagga,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -50,15 +47,8 @@ CONFIGURE_ARGS+= --localstatedir=/var/run/quagga \ --disable-pie \ --disable-babeld \ --disable-doc \ - --disable-tests \ --enable-multipath=8 -ifneq (${ADK_PACKAGE_QUAGGA_WITH_IPV6},) -CONFIGURE_ARGS+= --enable-ipv6 -else -CONFIGURE_ARGS+= --disable-ipv6 -endif - quagga-install: ${INSTALL_DIR} ${IDIR_QUAGGA}/usr/{lib,sbin} ${CP} ${WRKINST}/usr/lib/libzebra.so.* ${IDIR_QUAGGA}/usr/lib/ @@ -78,10 +68,8 @@ quagga-ospfd-install: ${CP} ${WRKINST}/usr/sbin/ospfd ${IDIR_QUAGGA_OSPFD}/usr/sbin/ quagga-ospf6d-install: -ifneq (${ADK_PACKAGE_QUAGGA_WITH_IPV6},) ${INSTALL_DIR} ${IDIR_QUAGGA_OSPF6D}/usr/sbin ${CP} ${WRKINST}/usr/sbin/ospf6d ${IDIR_QUAGGA_OSPF6D}/usr/sbin/ -endif quagga-ripngd-install: ${INSTALL_DIR} ${IDIR_QUAGGA_RIPNGD}/usr/sbin diff --git a/package/quagga/patches/patch-lib_queue_h b/package/quagga/patches/patch-lib_queue_h deleted file mode 100644 index 2a2ce12ac..000000000 --- a/package/quagga/patches/patch-lib_queue_h +++ /dev/null @@ -1,11 +0,0 @@ ---- quagga-0.99.22.4.orig/lib/queue.h 2013-08-04 15:01:38.000000000 +0200 -+++ quagga-0.99.22.4/lib/queue.h 2013-12-30 19:57:25.000000000 +0100 -@@ -33,8 +33,6 @@ - #ifndef _SYS_QUEUE_H_ - #define _SYS_QUEUE_H_ - --#include <sys/cdefs.h> -- - /* - * This file defines four types of data structures: singly-linked lists, - * singly-linked tail queues, lists and tail queues. diff --git a/package/quagga/patches/patch-lib_zebra_h b/package/quagga/patches/patch-lib_zebra_h deleted file mode 100644 index 160b4cc20..000000000 --- a/package/quagga/patches/patch-lib_zebra_h +++ /dev/null @@ -1,10 +0,0 @@ ---- quagga-0.99.22.4.orig/lib/zebra.h 2013-09-02 14:53:04.000000000 +0200 -+++ quagga-0.99.22.4/lib/zebra.h 2013-12-30 19:58:14.000000000 +0100 -@@ -51,7 +51,6 @@ typedef int socklen_t; - #ifdef HAVE_STROPTS_H - #include <stropts.h> - #endif /* HAVE_STROPTS_H */ --#include <sys/fcntl.h> - #ifdef HAVE_SYS_SELECT_H - #include <sys/select.h> - #endif /* HAVE_SYS_SELECT_H */ |