From 675dd4af007e8daa3f6058874691b05babdd6670 Mon Sep 17 00:00:00 2001 From: Nagy Karoly Gabriel Date: Fri, 26 Sep 2014 20:21:05 +0200 Subject: [PATCH] quagga: Updated (0.99.6 -> 0.99.23) Also updated download location, removed old patches added new configure options and removed old ones and moved example configuration files to their place. --- network/quagga/link-readline-order.patch | 38 ------------------------ network/quagga/linux-2.6.18.patch | 28 ----------------- network/quagga/quagga.conf | 18 ++++++----- network/quagga/quagga.desc | 6 ++-- 4 files changed, 13 insertions(+), 77 deletions(-) delete mode 100644 network/quagga/link-readline-order.patch delete mode 100644 network/quagga/linux-2.6.18.patch diff --git a/network/quagga/link-readline-order.patch b/network/quagga/link-readline-order.patch deleted file mode 100644 index 48f1df209..000000000 --- a/network/quagga/link-readline-order.patch +++ /dev/null @@ -1,38 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../quagga/link-readline-order.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- quagga-0.99.3/configure.orig 2006-02-13 20:23:28.000000000 +0100 -+++ quagga-0.99.3/configure 2006-02-13 20:35:54.000000000 +0100 -@@ -11234,7 +11234,7 @@ - echo "$as_me:$LINENO: result: $ac_cv_lib_readline_main" >&5 - echo "${ECHO_T}$ac_cv_lib_readline_main" >&6 - if test $ac_cv_lib_readline_main = yes; then -- LIBREADLINE="$LIBREADLINE -lreadline" -+ LIBREADLINE="-lreadline $LIBREADLINE" - fi - - if test $ac_cv_lib_readline_main = no; then ---- quagga-0.99.3/configure.ac.orig 2006-02-13 20:40:40.000000000 +0100 -+++ quagga-0.99.3/configure.ac 2006-02-13 20:41:00.000000000 +0100 -@@ -431,7 +431,7 @@ - )] - )] - ) -- AC_CHECK_LIB(readline, main, LIBREADLINE="$LIBREADLINE -lreadline",, -+ AC_CHECK_LIB(readline, main, LIBREADLINE="-lreadline $LIBREADLINE",, - "$LIBREADLINE") - if test $ac_cv_lib_readline_main = no; then - AC_MSG_ERROR([vtysh needs libreadline but was not found and usable on your system.]) diff --git a/network/quagga/linux-2.6.18.patch b/network/quagga/linux-2.6.18.patch deleted file mode 100644 index 59c0fc295..000000000 --- a/network/quagga/linux-2.6.18.patch +++ /dev/null @@ -1,28 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../quagga/linux-2.6.18.patch -# Copyright (C) 2006 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./lib/zebra.h.orig 2006-10-11 01:31:42.000000000 +0200 -+++ ./lib/zebra.h 2006-10-11 01:46:47.000000000 +0200 -@@ -97,7 +97,9 @@ - #endif /* HAVE_LINUX_VERSION_H */ - - #ifdef HAVE_ASM_TYPES_H -+#undef __STRICT_ANSI__ - #include -+#define __STRICT_ANSI__ - #endif /* HAVE_ASM_TYPES_H */ - - /* misc include group */ diff --git a/network/quagga/quagga.conf b/network/quagga/quagga.conf index 12dc5a6d6..e3e7e6123 100644 --- a/network/quagga/quagga.conf +++ b/network/quagga/quagga.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../quagga/quagga.conf -# Copyright (C) 2006 - 2007 The OpenSDE Project +# Copyright (C) 2006 - 2014 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -16,18 +16,20 @@ autogen=1 -# disabling IPv6 support -var_append confopt ' ' '--disable-ipv6' -var_append confopt ' ' '--disable-ospfapi' - var_append confopt ' ' '--enable-multipath=64' var_append confopt ' ' '--enable-netlink' var_append confopt ' ' '--enable-vtysh' -var_append confopt ' ' '--enable-nssa' -var_append confopt ' ' '--enable-opaque-lsa' -var_append confopt ' ' '--enable-ospf-te' +var_append confopt ' ' '--enable-isisd' +var_append confopt ' ' '--enable-isis-topology' +var_append confopt ' ' '--enable-tcp-zebra' +var_append confopt ' ' '--enable-irdp' +var_append confopt ' ' '--enable-pcreposix' +var_append confopt ' ' '--enable-user=quagga' +var_append confopt ' ' '--enable-group=quagga' var_append confopt ' ' '--sysconfdir=$sysconfdir/quagga' +var_append confopt ' ' '--localstatedir=$localstatedir/quagga' +var_append confopt ' ' '--enable-exampledir=/usr/share/doc/quagga/examples' for y in $( cd $confdir/../zebra; ls -1 *.init 2> /dev/null ); do hook_add postinstall 6 "install_init '${y%.init}' '$confdir/../zebra/$y'" diff --git a/network/quagga/quagga.desc b/network/quagga/quagga.desc index 11bb06a08..1bb4c2e42 100644 --- a/network/quagga/quagga.desc +++ b/network/quagga/quagga.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../quagga/quagga.desc -[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2014 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] [COPY] More information can be found in the files COPYING and README. @@ -31,9 +31,9 @@ [L] GPL [S] Stable -[V] 0.99.6 +[V] 0.99.23 [P] X ---3-5---9 179.000 -[D] 4008319882 quagga-0.99.6.tar.gz http://www.quagga.net/download/ +[D] 3274377902 quagga-0.99.23.tar.gz http://download.savannah.gnu.org/releases/quagga/