cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.0.20160315, ok sthen@ (maintainer)

Browse Source 
Announce:

  https://lists.quagga.net/pipermail/quagga-users/2016-March/014293.html

ChangeLog:

  http://savannah.spinellicreations.com/quagga/quagga-1.0.20160315.changelog.txt
  http://savannah.spinellicreations.com/quagga/quagga-1.0.20160309.changelog.txt

Note that this update brings a fix for CVE-2016-2342.  This vulnerability
affects quagga MPLS VPN setups which probably aren't possible on OpenBSD.
This commit is contained in:
jca 2016-03-22 12:57:54 +00:00
parent 247f8deefc
commit 2886733742
8 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/quagga/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.49 2015/10/08 21:19:22 sthen Exp $
# $OpenBSD: Makefile,v 1.50 2016/03/22 12:57:54 jca Exp $
COMMENT= multi-threaded routing daemon
DISTNAME= quagga-0.99.24.1
REVISION= 4
DISTNAME= quagga-1.0.20160315
CATEGORIES= net
MASTER_SITES= http://download.savannah.gnu.org/releases/quagga/
EXTRACT_SUFX= .tar.xz

4
net/quagga/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (quagga-0.99.24.1.tar.xz) = b9a6rbE2qAHCnB3XLQ/mnanxmuSY6Hv/cFd3g2HkOxQ=
SIZE (quagga-0.99.24.1.tar.xz) = 1779120
SHA256 (quagga-1.0.20160315.tar.xz) = 0oSvXdh127qQq4ddQNtdaP3J7eF6dvKvUl+FNEvlZ2c=
SIZE (quagga-1.0.20160315.tar.xz) = 1819488

17
net/quagga/patches/patch-lib_sockopt_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-lib_sockopt_c,v 1.1 2013/01/04 00:24:10 sthen Exp $
$OpenBSD: patch-lib_sockopt_c,v 1.2 2016/03/22 12:57:54 jca Exp $
Revert 69bf3a39; does not work on at least (Open/Net)BSD.
This can be put back if we get RFC3678 support.
--- lib/sockopt.c.orig Thu Jan 3 00:29:56 2013
+++ lib/sockopt.c Thu Jan 3 00:29:45 2013
--- lib/sockopt.c.orig Wed Mar 16 00:17:17 2016
+++ lib/sockopt.c Mon Mar 21 01:42:18 2016
@@ -197,7 +197,7 @@ setsockopt_ipv6_tclass(int sock, int tclass)
/*
@ -14,7 +14,7 @@ This can be put back if we get RFC3678 support.
*
* Many operating systems have a limit on the number of groups that
* can be joined per socket (where each group and local address
@@ -217,133 +217,121 @@ setsockopt_ipv6_tclass(int sock, int tclass)
@@ -217,132 +217,121 @@ setsockopt_ipv6_tclass(int sock, int tclass)
* allow leaves, or implicitly leave all groups joined to down interfaces.
*/
int
@ -23,8 +23,8 @@ This can be put back if we get RFC3678 support.
int optname,
+ struct in_addr if_addr /* required */,
unsigned int mcast_addr,
- unsigned int ifindex)
+ unsigned int ifindex /* optional: if non-zero, may be
- ifindex_t ifindex)
+ ifindex_t ifindex /* optional: if non-zero, may be
+ used instead of if_addr */)
{
-#ifdef HAVE_RFC3678
@ -206,8 +206,7 @@ This can be put back if we get RFC3678 support.
- * Set IP_MULTICAST_IF socket option in an OS-dependent manner.
- */
-int
-setsockopt_ipv4_multicast_if(int sock,
- unsigned int ifindex)
-setsockopt_ipv4_multicast_if(int sock, ifindex_t ifindex)
-{
-
-#ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX
@ -233,5 +232,5 @@ This can be put back if we get RFC3678 support.
-}
-
static int
setsockopt_ipv4_ifindex (int sock, int val)
setsockopt_ipv4_ifindex (int sock, ifindex_t val)
{

22
net/quagga/patches/patch-lib_sockopt_h
View File

@ -1,23 +1,19 @@
$OpenBSD: patch-lib_sockopt_h,v 1.1 2013/01/04 00:24:10 sthen Exp $
$OpenBSD: patch-lib_sockopt_h,v 1.2 2016/03/22 12:57:54 jca Exp $
Revert 69bf3a39; does not work on at least (Open/Net)BSD.
This can be put back if we get RFC3678 support.
--- lib/sockopt.h.orig Tue Apr 17 14:56:26 2012
+++ lib/sockopt.h Thu Jan 3 00:24:26 2013
@@ -83,11 +83,13 @@ extern int setsockopt_ipv6_tclass (int, int);
(((af) == AF_INET) : SOPT_SIZE_CMSG_IFINDEX_IPV4() \
? SOPT_SIZE_CMSG_PKTINFO_IPV6())
--- lib/sockopt.h.orig Wed Mar 16 00:17:17 2016
+++ lib/sockopt.h Mon Mar 21 02:12:14 2016
@@ -85,8 +85,12 @@ extern int setsockopt_ipv6_tclass (int, int);
-extern int setsockopt_ipv4_multicast_if(int sock,
- unsigned int ifindex);
-extern int setsockopt_ipv4_multicast(int sock, int optname,
+extern int setsockopt_multicast_ipv4(int sock, int optname,
+ struct in_addr if_addr
extern int setsockopt_ipv4_multicast_if(int sock, ifindex_t ifindex);
extern int setsockopt_ipv4_multicast(int sock, int optname,
+ struct in_addr if_addr
+ /* required: interface to join on */,
unsigned int mcast_addr,
- unsigned int ifindex);
+ unsigned int ifindex
- ifindex_t ifindex);
+ ifindex_t ifindex
+ /* optional: if non-zero, may be used
+ instead of if_addr */);
extern int setsockopt_ipv4_tos(int sock, int tos);

12
net/quagga/patches/patch-ospfd_ospf_network_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-ospfd_ospf_network_c,v 1.1 2013/01/04 00:24:10 sthen Exp $
$OpenBSD: patch-ospfd_ospf_network_c,v 1.2 2016/03/22 12:57:54 jca Exp $
Revert 69bf3a39; does not work on at least (Open/Net)BSD.
This can be put back if we get RFC3678 support.
--- ospfd/ospf_network.c.orig Tue Apr 17 14:56:26 2012
+++ ospfd/ospf_network.c Thu Jan 3 00:24:26 2013
--- ospfd/ospf_network.c.orig Wed Mar 16 00:17:17 2016
+++ ospfd/ospf_network.c Mon Mar 21 01:24:12 2016
@@ -52,8 +52,8 @@ ospf_if_add_allspfrouters (struct ospf *top, struct pr
{
int ret;
@ -27,7 +27,7 @@ This can be put back if we get RFC3678 support.
ifindex);
if (ret < 0)
zlog_warn ("can't setsockopt IP_DROP_MEMBERSHIP (fd %d, addr %s, "
@@ -94,8 +94,8 @@ ospf_if_add_alldrouters (struct ospf *top, struct pref
@@ -93,8 +93,8 @@ ospf_if_add_alldrouters (struct ospf *top, struct pref
{
int ret;
@ -38,7 +38,7 @@ This can be put back if we get RFC3678 support.
ifindex);
if (ret < 0)
zlog_warn ("can't setsockopt IP_ADD_MEMBERSHIP (fd %d, addr %s, "
@@ -115,8 +115,8 @@ ospf_if_drop_alldrouters (struct ospf *top, struct pre
@@ -113,8 +113,8 @@ ospf_if_drop_alldrouters (struct ospf *top, struct pre
{
int ret;
@ -49,7 +49,7 @@ This can be put back if we get RFC3678 support.
ifindex);
if (ret < 0)
zlog_warn ("can't setsockopt IP_DROP_MEMBERSHIP (fd %d, addr %s, "
@@ -151,7 +151,8 @@ ospf_if_ipmulticast (struct ospf *top, struct prefix *
@@ -149,7 +149,8 @@ ospf_if_ipmulticast (struct ospf *top, struct prefix *
zlog_warn ("can't setsockopt IP_MULTICAST_TTL(1) for fd %d: %s",
top->fd, safe_strerror (errno));

16
net/quagga/patches/patch-zebra_kernel_socket_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-zebra_kernel_socket_c,v 1.11 2015/09/11 20:56:11 sthen Exp $
--- zebra/kernel_socket.c.orig Sat Mar 7 07:58:00 2015
+++ zebra/kernel_socket.c Fri Sep 11 22:55:36 2015
@@ -185,7 +185,7 @@ const struct message rtm_type_str[] =
$OpenBSD: patch-zebra_kernel_socket_c,v 1.12 2016/03/22 12:57:54 jca Exp $
--- zebra/kernel_socket.c.orig Wed Mar 16 00:17:17 2016
+++ zebra/kernel_socket.c Mon Mar 21 01:19:29 2016
@@ -202,7 +202,7 @@ const struct message rtm_type_str[] =
{RTM_REDIRECT, "RTM_REDIRECT"},
{RTM_MISS, "RTM_MISS"},
{RTM_LOCK, "RTM_LOCK"},
@ -10,17 +10,17 @@ $OpenBSD: patch-zebra_kernel_socket_c,v 1.11 2015/09/11 20:56:11 sthen Exp $
{RTM_OLDADD, "RTM_OLDADD"},
#endif /* RTM_OLDADD */
#ifdef RTM_OLDDEL
@@ -225,7 +225,9 @@ static const struct message rtm_flag_str[] =
@@ -242,7 +242,9 @@ static const struct message rtm_flag_str[] =
#ifdef RTF_CLONING
{RTF_CLONING, "CLONING"},
#endif /* RTF_CLONING */
+#ifdef RTF_XRESOLVE
{RTF_XRESOLVE, "XRESOLVE"},
+#endif /* RTF_XRESOLVE */
#ifdef RTF_LLINFO
{RTF_LLINFO, "LLINFO"},
{RTF_STATIC, "STATIC"},
{RTF_BLACKHOLE, "BLACKHOLE"},
@@ -799,9 +801,7 @@ rtm_read_mesg (struct rt_msghdr *rtm,
#endif /* RTF_LLINFO */
@@ -834,9 +836,7 @@ rtm_read_mesg (struct rt_msghdr *rtm,
/* rt_msghdr version check. */
if (rtm->rtm_version != RTM_VERSION)

19
net/quagga/pkg/PLIST
View File

@ -1,9 +1,11 @@
@comment $OpenBSD: PLIST,v 1.19 2015/01/19 15:44:12 sthen Exp $
@comment $OpenBSD: PLIST,v 1.20 2016/03/22 12:57:54 jca Exp $
@conflict zebra-*
@newgroup _quagga:525
@newuser _quagga:525:_quagga:daemon:Quagga Account:/nonexistent:/sbin/nologin
@extraunexec rm -rf ${LOCALSTATEDIR}/*
@extraunexec rm -rf /var/log/quagga/*
@comment @bin bin/bgp_btoa
@bin bin/test_igmpv3_join
@bin bin/vtysh
include/quagga/
include/quagga/quagga/
@ -11,6 +13,7 @@ include/quagga/quagga/buffer.h
include/quagga/quagga/checksum.h
include/quagga/quagga/command.h
include/quagga/quagga/distribute.h
include/quagga/quagga/fifo.h
include/quagga/quagga/filter.h
include/quagga/quagga/getopt.h
include/quagga/quagga/hash.h
@ -53,6 +56,7 @@ include/quagga/quagga/table.h
include/quagga/quagga/thread.h
include/quagga/quagga/vector.h
include/quagga/quagga/version.h
include/quagga/quagga/vrf.h
include/quagga/quagga/vty.h
include/quagga/quagga/workqueue.h
include/quagga/quagga/zassert.h
@ -74,16 +78,17 @@ lib/libzebra.la
@man man/man8/ospf6d.8
@man man/man8/ospfclient.8
@man man/man8/ospfd.8
@man man/man8/pimd.8
@man man/man8/ripd.8
@man man/man8/ripngd.8
@man man/man8/watchquagga.8
@man man/man8/zebra.8
@bin sbin/babeld
@bin sbin/bgpd
@bin sbin/isisd
@bin sbin/ospf6d
@bin sbin/ospfclient
@bin sbin/ospfd
@bin sbin/pimd
@bin sbin/ripd
@bin sbin/ripngd
@bin sbin/watchquagga
@ -92,13 +97,11 @@ share/doc/quagga/
share/doc/quagga/README
share/doc/quagga/SERVICES
share/examples/quagga/
share/examples/quagga/babeld.conf.sample
@mode 750
@owner _quagga
@group _quagga
@sample ${SYSCONFDIR}/
@mode
@sample ${SYSCONFDIR}/babeld.conf
@owner
@group
share/examples/quagga/bgpd.conf.sample
@ -126,6 +129,12 @@ share/examples/quagga/ospfd.conf.sample
@sample ${SYSCONFDIR}/ospfd.conf
@owner
@group
share/examples/quagga/pimd.conf.sample
@owner _quagga
@group _quagga
@sample ${SYSCONFDIR}/pimd.conf
@owner
@group
share/examples/quagga/ripd.conf.sample
@owner _quagga
@group _quagga
@ -152,11 +161,11 @@ share/examples/quagga/zebra.conf.sample
@sample /var/log/quagga/
@owner
@group
@rcscript ${RCDIR}/quagga_babeld
@rcscript ${RCDIR}/quagga_bgpd
@rcscript ${RCDIR}/quagga_isisd
@rcscript ${RCDIR}/quagga_ospf6d
@rcscript ${RCDIR}/quagga_ospfd
@rcscript ${RCDIR}/quagga_pimd
@rcscript ${RCDIR}/quagga_ripd
@rcscript ${RCDIR}/quagga_ripngd
@rcscript ${RCDIR}/quagga_zebra

9
net/quagga/pkg/quagga_pimd.rc Normal file
View File

@ -0,0 +1,9 @@
#!/bin/sh
#
# $OpenBSD: quagga_pimd.rc,v 1.1 2016/03/22 12:57:54 jca Exp $
daemon="${TRUEPREFIX}/sbin/pimd -d"
. /etc/rc.d/rc.subr
rc_cmd $1