On Mon, Nov 10, 2008 at 2:30 PM, Stuart Henderson <[EMAIL PROTECTED]> wrote:
> On 2008/11/10 14:13, Felipe Alfaro Solana wrote:
>> I fixed it already. I had the two listed patches for, but some reason,
>> the ports package failed to get rebuilt so I was installing 0.99.11
>> without the two patches.
>
> ah, ok - thanks..
>
> here is a diff to update the port, but it doesn't fix FLAVOR=snmp
> (which is currently broken).
Can you resend as an attachment? I think there are some tabs in the
patch that are expanded into blanks. Hence, if I try to apply this
patch it fails. For example, it fails for Makefile.
Thanks!
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/quagga/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- Makefile 23 May 2008 12:55:58 -0000 1.11
> +++ Makefile 10 Nov 2008 13:29:10 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT= multi-threaded routing daemon
>
> -DISTNAME= quagga-0.99.9
> -PKGNAME= ${DISTNAME}p0
> +DISTNAME= quagga-0.99.11
> SHARED_LIBS= ospf 0.0 \
> zebra 0.0
> CATEGORIES= net
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/net/quagga/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 12 Sep 2007 20:31:17 -0000 1.5
> +++ distinfo 10 Nov 2008 13:29:10 -0000
> @@ -1,5 +1,5 @@
> -MD5 (quagga-0.99.9.tar.gz) = Tb2vkb9mCYA4Gdl9X8zEyQ==
> -RMD160 (quagga-0.99.9.tar.gz) = x61o0Mco0TwZF+xyeqET4+xgco8=
> -SHA1 (quagga-0.99.9.tar.gz) = uyj/3lhaPHV9iD/XXcwdXzoa/nA=
> -SHA256 (quagga-0.99.9.tar.gz) = kqv0TFI5yKGHYs8nyv0DtG1YHxgLxBFwYxS4uNHpTbA=
> -SIZE (quagga-0.99.9.tar.gz) = 2341067
> +MD5 (quagga-0.99.11.tar.gz) = kD5Ax0RzCtTWK+6HLuuBOw==
> +RMD160 (quagga-0.99.11.tar.gz) = ZUEHN4lVwkxQcwxMnnVEoWO8M7g=
> +SHA1 (quagga-0.99.11.tar.gz) = ZUKqtrVYy4isCAbM4Qszvg8Ayic=
> +SHA256 (quagga-0.99.11.tar.gz) = qDo1fW3iPXBiNgypMTcdLWXA4aK6EcV8ejXG42tHpkY=
> +SIZE (quagga-0.99.11.tar.gz) = 2192249
> Index: patches/patch-bgpd_bgp_snmp_c
> ===================================================================
> RCS file: patches/patch-bgpd_bgp_snmp_c
> diff -N patches/patch-bgpd_bgp_snmp_c
> --- patches/patch-bgpd_bgp_snmp_c 12 Sep 2007 20:31:18 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-bgpd_bgp_snmp_c,v 1.3 2007/09/12 20:31:18 rui Exp $
> ---- bgpd/bgp_snmp.c.orig Fri May 4 19:50:58 2007
> -+++ bgpd/bgp_snmp.c Tue Sep 11 16:52:20 2007
> -@@ -21,12 +21,8 @@ Software Foundation, Inc., 59 Temple Place - Suite 330
> - #include <zebra.h>
> -
> - #ifdef HAVE_SNMP
> --#ifdef HAVE_NETSNMP
> - #include <net-snmp/net-snmp-config.h>
> --#endif
> --#include <asn1.h>
> --#include <snmp.h>
> --#include <snmp_impl.h>
> -+#include <net-snmp/net-snmp-includes.h>
> -
> - #include "if.h"
> - #include "log.h"
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/net/quagga/patches/patch-configure,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-configure
> --- patches/patch-configure 12 Sep 2007 20:31:18 -0000 1.4
> +++ patches/patch-configure 10 Nov 2008 13:29:10 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-configure,v 1.4 2007/09/12 20:31:18 rui Exp $
> ---- configure.orig Fri Sep 7 17:54:55 2007
> -+++ configure Tue Sep 11 16:52:20 2007
> -@@ -21131,6 +21131,15 @@ cat confdefs.h >>conftest.$ac_ext
> +--- configure.orig Thu Oct 2 09:31:36 2008
> ++++ configure Mon Nov 10 09:14:15 2008
> +@@ -21359,6 +21359,15 @@ cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h. */
> $ac_includes_default
> @@ -17,7 +17,7 @@ $OpenBSD: patch-configure,v 1.4 2007/09/
> #include <$ac_header>
> _ACEOF
> rm -f conftest.$ac_objext
> -@@ -24842,6 +24851,18 @@ cat confdefs.h >>conftest.$ac_ext
> +@@ -25070,6 +25079,18 @@ cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h. */
> $ac_includes_default
> @@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.4 2007/09/
> #include <$ac_header>
> _ACEOF
> rm -f conftest.$ac_objext
> -@@ -35776,10 +35797,3 @@ log file mask : ${enable_logfile_mask}
> +@@ -37195,10 +37216,3 @@ log file mask : ${enable_logfile_mask}
>
> The above user and group must have read/write access to the state file
> directory and to the config files in the config file directory."
> Index: patches/patch-doc_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/net/quagga/patches/patch-doc_Makefile_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-doc_Makefile_in
> --- patches/patch-doc_Makefile_in 12 Sep 2007 20:31:18 -0000 1.3
> +++ patches/patch-doc_Makefile_in 10 Nov 2008 13:29:10 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-doc_Makefile_in,v 1.3 2007/09/12 20:31:18 rui Exp $
> ---- doc/Makefile.in.orig Tue Sep 11 16:59:47 2007
> -+++ doc/Makefile.in Tue Sep 11 17:02:43 2007
> +--- doc/Makefile.in.orig Thu Oct 2 09:31:38 2008
> ++++ doc/Makefile.in Mon Nov 10 09:14:15 2008
> @@ -129,6 +129,7 @@ LIBS = @LIBS@
> LIBTOOL = @LIBTOOL@
> LIB_IPV6 = @LIB_IPV6@
> @@ -9,7 +9,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.3 20
> LN_S = @LN_S@
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
> -@@ -342,7 +343,7 @@ clean-libtool:
> +@@ -344,7 +345,7 @@ clean-libtool:
>
> .texi.dvi:
> TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
> @@ -18,7 +18,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.3 20
> $(TEXI2DVI) $<
>
> .texi.pdf:
> -@@ -698,7 +699,7 @@ install-info-am: $(INFO_DEPS)
> +@@ -700,7 +701,7 @@ install-info-am: $(INFO_DEPS)
> case $$file in \
> $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
> esac; \
> Index: patches/patch-lib_smux_c
> ===================================================================
> RCS file: patches/patch-lib_smux_c
> diff -N patches/patch-lib_smux_c
> --- patches/patch-lib_smux_c 12 Sep 2007 20:31:18 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-lib_smux_c,v 1.3 2007/09/12 20:31:18 rui Exp $
> ---- lib/smux.c.orig Wed May 9 21:59:34 2007
> -+++ lib/smux.c Tue Sep 11 16:52:21 2007
> -@@ -22,12 +22,8 @@
> - #include <zebra.h>
> -
> - #ifdef HAVE_SNMP
> --#ifdef HAVE_NETSNMP
> - #include <net-snmp/net-snmp-config.h>
> --#endif
> --#include <asn1.h>
> --#include <snmp.h>
> --#include <snmp_impl.h>
> -+#include <net-snmp/net-snmp-includes.h>
> -
> - #include "log.h"
> - #include "thread.h"
> Index: patches/patch-ospfclient_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/net/quagga/patches/patch-ospfclient_Makefile_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-ospfclient_Makefile_in
> --- patches/patch-ospfclient_Makefile_in 12 Sep 2007 20:31:18 -0000
> 1.3
> +++ patches/patch-ospfclient_Makefile_in 10 Nov 2008 13:29:10 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-ospfclient_Makefile_in,v 1.3 2007/09/12 20:31:18 rui Exp $
> ---- ospfclient/Makefile.in.orig Fri Sep 7 17:54:57 2007
> -+++ ospfclient/Makefile.in Tue Sep 11 16:52:21 2007
> -@@ -107,7 +107,8 @@ CXXCPP = @CXXCPP@
> +--- ospfclient/Makefile.in.orig Thu Oct 2 09:31:39 2008
> ++++ ospfclient/Makefile.in Mon Nov 10 09:14:15 2008
> +@@ -110,7 +110,8 @@ CXXCPP = @CXXCPP@
> CXXDEPMODE = @CXXDEPMODE@
> CXXFLAGS = @CXXFLAGS@
> CYGPATH_W = @CYGPATH_W@
> Index: patches/patch-ospfd_ospf_snmp_c
> ===================================================================
> RCS file: patches/patch-ospfd_ospf_snmp_c
> diff -N patches/patch-ospfd_ospf_snmp_c
> --- patches/patch-ospfd_ospf_snmp_c 12 Sep 2007 20:31:18 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-ospfd_ospf_snmp_c,v 1.3 2007/09/12 20:31:18 rui Exp $
> ---- ospfd/ospf_snmp.c.orig Thu Mar 15 19:14:12 2007
> -+++ ospfd/ospf_snmp.c Tue Sep 11 16:52:21 2007
> -@@ -25,12 +25,8 @@
> - #include <zebra.h>
> -
> - #ifdef HAVE_SNMP
> --#ifdef HAVE_NETSNMP
> - #include <net-snmp/net-snmp-config.h>
> --#endif
> --#include <asn1.h>
> --#include <snmp.h>
> --#include <snmp_impl.h>
> -+#include <net-snmp/net-snmp-includes.h>
> -
> - #include "if.h"
> - #include "log.h"
> Index: patches/patch-ripd_rip_snmp_c
> ===================================================================
> RCS file: patches/patch-ripd_rip_snmp_c
> diff -N patches/patch-ripd_rip_snmp_c
> --- patches/patch-ripd_rip_snmp_c 12 Sep 2007 20:31:18 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-ripd_rip_snmp_c,v 1.3 2007/09/12 20:31:18 rui Exp $
> ---- ripd/rip_snmp.c.orig Thu Sep 29 15:41:12 2005
> -+++ ripd/rip_snmp.c Tue Sep 11 16:52:21 2007
> -@@ -22,12 +22,8 @@
> - #include <zebra.h>
> -
> - #ifdef HAVE_SNMP
> --#ifdef HAVE_NETSNMP
> - #include <net-snmp/net-snmp-config.h>
> --#endif
> --#include <asn1.h>
> --#include <snmp.h>
> --#include <snmp_impl.h>
> -+#include <net-snmp/net-snmp-includes.h>
> -
> - #include "if.h"
> - #include "log.h"
> Index: patches/patch-zebra_kernel_socket_c
> ===================================================================
> RCS file: /cvs/ports/net/quagga/patches/patch-zebra_kernel_socket_c,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-zebra_kernel_socket_c
> --- patches/patch-zebra_kernel_socket_c 23 May 2008 12:55:58 -0000 1.4
> +++ patches/patch-zebra_kernel_socket_c 10 Nov 2008 13:29:10 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-zebra_kernel_socket_c,v 1.4 2008/05/23 12:55:58 claudio Exp $
> ---- zebra/kernel_socket.c.orig Wed Aug 22 18:22:57 2007
> -+++ zebra/kernel_socket.c Tue Oct 9 23:54:58 2007
> -@@ -136,7 +136,7 @@ struct message rtm_type_str[] =
> +--- zebra/kernel_socket.c.orig Fri Sep 5 15:27:26 2008
> ++++ zebra/kernel_socket.c Mon Nov 10 09:14:15 2008
> +@@ -136,7 +136,7 @@ const struct message rtm_type_str[] =
> {RTM_REDIRECT, "RTM_REDIRECT"},
> {RTM_MISS, "RTM_MISS"},
> {RTM_LOCK, "RTM_LOCK"},
> @@ -10,7 +10,7 @@ $OpenBSD: patch-zebra_kernel_socket_c,v
> {RTM_OLDADD, "RTM_OLDADD"},
> #endif /* RTM_OLDADD */
> #ifdef RTM_OLDDEL
> -@@ -705,9 +705,7 @@ rtm_read_mesg (struct rt_msghdr *rtm,
> +@@ -726,9 +726,7 @@ rtm_read_mesg (struct rt_msghdr *rtm,
>
> /* rt_msghdr version check. */
> if (rtm->rtm_version != RTM_VERSION)
> Index: patches/patch-zebra_zebra_snmp_c
> ===================================================================
> RCS file: patches/patch-zebra_zebra_snmp_c
> diff -N patches/patch-zebra_zebra_snmp_c
> --- patches/patch-zebra_zebra_snmp_c 12 Sep 2007 20:31:18 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-zebra_zebra_snmp_c,v 1.3 2007/09/12 20:31:18 rui Exp $
> ---- zebra/zebra_snmp.c.orig Wed Oct 13 19:45:08 2004
> -+++ zebra/zebra_snmp.c Tue Sep 11 16:52:21 2007
> -@@ -22,12 +22,8 @@
> - #include <zebra.h>
> -
> - #ifdef HAVE_SNMP
> --#ifdef HAVE_NETSNMP
> - #include <net-snmp/net-snmp-config.h>
> --#endif
> --#include <asn1.h>
> --#include <snmp.h>
> --#include <snmp_impl.h>
> -+#include <net-snmp/net-snmp-includes.h>
> -
> - #include "if.h"
> - #include "log.h"
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/net/quagga/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST 12 Sep 2007 20:31:18 -0000 1.8
> +++ pkg/PLIST 10 Nov 2008 13:29:10 -0000
> @@ -3,7 +3,7 @@
> @newgroup _quagga:525
> @newuser _quagga:525:_quagga:daemon:Quagga Account:/nonexistent:/sbin/nologin
> %%SHARED%%
> -bin/vtysh
> [EMAIL PROTECTED] bin/vtysh
> include/quagga/
> include/quagga/quagga/
> include/quagga/quagga/buffer.h
> @@ -66,13 +66,13 @@ lib/libzebra.la
> @man man/man8/ripd.8
> @man man/man8/ripngd.8
> @man man/man8/zebra.8
> -sbin/bgpd
> -sbin/ospf6d
> -sbin/ospfd
> -sbin/ripd
> -sbin/ripngd
> -sbin/watchquagga
> -sbin/zebra
> [EMAIL PROTECTED] sbin/bgpd
> [EMAIL PROTECTED] sbin/ospf6d
> [EMAIL PROTECTED] sbin/ospfd
> [EMAIL PROTECTED] sbin/ripd
> [EMAIL PROTECTED] sbin/ripngd
> [EMAIL PROTECTED] sbin/watchquagga
> [EMAIL PROTECTED] sbin/zebra
> share/doc/quagga/
> share/doc/quagga/README
> share/doc/quagga/SERVICES
>
--
http://www.felipe-alfaro.org/blog/disclaimer/
