Browse Source

upgrading package: quagga 0.96.5 -> 0.97.0

Ralf S. Engelschall 21 years ago
parent
commit
487da89cc8
2 changed files with 26 additions and 2 deletions
  1. 21 0
      quagga/quagga.patch
  2. 5 2
      quagga/quagga.spec

+ 21 - 0
quagga/quagga.patch

@@ -0,0 +1,21 @@
+Index: lib/sockopt.h
+--- lib/sockopt.h.orig	2004-10-07 02:40:25 +0200
++++ lib/sockopt.h	2004-10-08 09:33:11 +0200
+@@ -62,9 +62,16 @@
+ 
+ #if defined (SUNOS_5)
+ #define SOPT_SIZE_CMSG_IFINDEX_IPV4()  (sizeof (uint_t))
+-#else
++#elif defined (CMSG_ALIGN)
++#define SOPT_SIZE_CMSG_IFINDEX_IPV4()	\
++	CMSG_ALIGN((sizeof (struct sockaddr_dl)))
++#elif defined (__CMSG_ALIGN)
+ #define SOPT_SIZE_CMSG_IFINDEX_IPV4()	\
+ 	__CMSG_ALIGN((sizeof (struct sockaddr_dl)))
++#elif defined (_ALIGN)
++#define SOPT_SIZE_CMSG_IFINDEX_IPV4()	\
++	_ALIGN((sizeof (struct sockaddr_dl)))
++#else
+ #endif /* SUNOS_5 */
+ 
+ #endif

+ 5 - 2
quagga/quagga.spec

@@ -33,8 +33,8 @@ Distribution: OpenPKG
 Class:        PLUS
 Group:        Network
 License:      GPL
-Version:      0.96.5
-Release:      20040920
+Version:      0.97.0
+Release:      20041008
 
 #   list of sources
 Source0:      http://www.quagga.net/download/quagga-%{version}.tar.gz
@@ -44,6 +44,7 @@ Source3:      ospfd.conf
 Source4:      ripd.conf
 Source5:      zebra.conf
 Source6:      vtysh.conf
+Patch0:       quagga.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -75,6 +76,7 @@ Conflicts:    zebra
 
 %prep
     %setup -q
+    %patch -p0
     %{l_shtool} subst \
         -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
         vtysh/extract.pl
@@ -108,6 +110,7 @@ Conflicts:    zebra
         --disable-ripngd \
         --disable-ipv6 \
         --without-libpam \
+        --disable-shared \
         $ISISD
 
     #   build package