Attachment 190706 Details for Bug 225962 – full patch to upgrade bird-devel to bird2

[patch] full patch to upgrade bird-devel to bird2

bird2.txt (text/plain), 8.39 KB, created by Leo Vandewoestijne on 2018-02-16 21:42:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Vandewoestijne

Created: 2018-02-16 21:42:42 UTC

Size: 8.39 KB

patch

obsolete

>diff -ruN /usr/ports.orig/net/bird-devel/distinfo /usr/ports/net/bird-devel/distinfo
>--- /usr/ports.orig/net/bird-devel/distinfo	2018-02-16 20:21:06.227930000 +0000
>+++ /usr/ports/net/bird-devel/distinfo	1970-01-01 00:00:00.000000000 +0000
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1512568931
>-SHA256 (bird-2.0.0-pre1.tar.gz) = f1d75703dd22e5d203e8bafc2d8266c4fdc823ea517c57ec36055dd32a62f369
>-SIZE (bird-2.0.0-pre1.tar.gz) = 1101988
>diff -ruN /usr/ports.orig/net/bird-devel/files/bird.in /usr/ports/net/bird-devel/files/bird.in
>--- /usr/ports.orig/net/bird-devel/files/bird.in	2018-02-16 20:21:06.230281000 +0000
>+++ /usr/ports/net/bird-devel/files/bird.in	1970-01-01 00:00:00.000000000 +0000
>@@ -1,32 +0,0 @@
>-#!/bin/sh
>-
>-# $FreeBSD: head/net/bird-devel/files/bird.in 340872 2014-01-24 00:14:07Z mat $
>-#
>-# PROVIDE: bird
>-# REQUIRE: LOGIN
>-# KEYWORD: shutdown
>-#
>-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
>-# to enable this service:
>-#
>-# bird_enable (bool):   Set to NO by default.
>-#               Set it to YES to enable bird.
>-# bird_config (path):   Set to %%PREFIX%%/etc/bird.conf
>-#               by default.
>-#
>-
>-. /etc/rc.subr
>-
>-name="bird"
>-rcvar=bird_enable
>-
>-command=%%PREFIX%%/sbin/${name}
>-
>-load_rc_config $name
>-
>-: ${bird_enable="NO"}
>-: ${bird_config="%%PREFIX%%/etc/bird.conf"}
>-
>-command_args="-c $bird_config"
>-
>-run_rc_command "$1"
>diff -ruN /usr/ports.orig/net/bird-devel/files/patch-Makefile.in /usr/ports/net/bird-devel/files/patch-Makefile.in
>--- /usr/ports.orig/net/bird-devel/files/patch-Makefile.in	2018-02-16 20:21:06.229871000 +0000
>+++ /usr/ports/net/bird-devel/files/patch-Makefile.in	1970-01-01 00:00:00.000000000 +0000
>@@ -1,15 +0,0 @@
>---- Makefile.in.orig	2017-04-29 22:26:04 UTC
>-+++ Makefile.in
>-@@ -163,11 +163,7 @@ install: all
>- 	if test -n "@CLIENT@" ; then								\
>- 		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;		\
>- 	fi
>--	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
>--		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ;	\
>--	else											\
>--		echo "Not overwriting old bird.conf" ;						\
>--	fi
>-+	$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@.example
>- 
>- install-docs:
>- 	$(INSTALL) -d $(DESTDIR)/$(docdir)
>diff -ruN /usr/ports.orig/net/bird-devel/Makefile /usr/ports/net/bird-devel/Makefile
>--- /usr/ports.orig/net/bird-devel/Makefile	2018-02-16 20:21:06.228705000 +0000
>+++ /usr/ports/net/bird-devel/Makefile	1970-01-01 00:00:00.000000000 +0000
>@@ -1,25 +0,0 @@
>-# Created by: Alexander V. Chernikov <melifaro@FreeBSD.org>
>-# $FreeBSD: head/net/bird-devel/Makefile 456793 2017-12-20 13:28:21Z mat $
>-
>-PORTNAME=	bird
>-DISTVERSION=	2.0.0-pre1
>-CATEGORIES=	net
>-MASTER_SITES=	ftp://bird.network.cz/pub/bird/ \
>-		http://bird.mpls.in/distfiles/bird/
>-PKGNAMESUFFIX=	-devel
>-
>-MAINTAINER=	melifaro@ipfw.ru
>-COMMENT=	Dynamic IP routing daemon (devel version)
>-
>-CONFLICTS=	bird-[0-9]*
>-
>-USES=		bison gmake readline
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--localstatedir=/var
>-USE_CSTD=	gnu89
>-
>-MAKE_JOBS_UNSAFE=	yes
>-
>-USE_RC_SUBR=	bird
>-
>-.include <bsd.port.mk>
>diff -ruN /usr/ports.orig/net/bird-devel/pkg-descr /usr/ports/net/bird-devel/pkg-descr
>--- /usr/ports.orig/net/bird-devel/pkg-descr	2018-02-16 20:21:06.228357000 +0000
>+++ /usr/ports/net/bird-devel/pkg-descr	1970-01-01 00:00:00.000000000 +0000
>@@ -1,16 +0,0 @@
>-The BIRD project aims to develop a fully functional dynamic IP routing daemon.
>-
>-- Both IPv4 and IPv6
>-- Multiple routing tables
>-- BGP
>-- RIP
>-- OSPF
>-- LDP
>-- L3VPN
>-- Static routes
>-- Inter-table protocol
>-- Command-line interface
>-- Soft reconfiguration
>-- Powerful language for route filtering
>-
>-WWW: http://bird.mpls.in/
>diff -ruN /usr/ports.orig/net/bird-devel/pkg-plist /usr/ports/net/bird-devel/pkg-plist
>--- /usr/ports.orig/net/bird-devel/pkg-plist	2018-02-16 20:21:06.229171000 +0000
>+++ /usr/ports/net/bird-devel/pkg-plist	1970-01-01 00:00:00.000000000 +0000
>@@ -1,4 +0,0 @@
>-@sample etc/bird.conf.example etc/bird.conf
>-sbin/bird
>-sbin/birdc
>-sbin/birdcl
>diff -ruN /usr/ports.orig/net/bird2/distinfo /usr/ports/net/bird2/distinfo
>--- /usr/ports.orig/net/bird2/distinfo	1970-01-01 00:00:00.000000000 +0000
>+++ /usr/ports/net/bird2/distinfo	2018-02-16 20:23:59.112635000 +0000
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1518802884
>+SHA256 (bird-2.0.1.tar.gz) = 5614b60d31a0e224a7e484126641dee7a5386a939f59373a48dfc1233b13d063
>+SIZE (bird-2.0.1.tar.gz) = 1006261
>diff -ruN /usr/ports.orig/net/bird2/files/bird.in /usr/ports/net/bird2/files/bird.in
>--- /usr/ports.orig/net/bird2/files/bird.in	1970-01-01 00:00:00.000000000 +0000
>+++ /usr/ports/net/bird2/files/bird.in	2018-02-16 20:23:59.111045000 +0000
>@@ -0,0 +1,32 @@
>+#!/bin/sh
>+
>+# $FreeBSD: head/net/bird-devel/files/bird.in 340872 2014-01-24 00:14:07Z mat $
>+#
>+# PROVIDE: bird
>+# REQUIRE: LOGIN
>+# KEYWORD: shutdown
>+#
>+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
>+# to enable this service:
>+#
>+# bird_enable (bool):   Set to NO by default.
>+#               Set it to YES to enable bird.
>+# bird_config (path):   Set to %%PREFIX%%/etc/bird.conf
>+#               by default.
>+#
>+
>+. /etc/rc.subr
>+
>+name="bird"
>+rcvar=bird_enable
>+
>+command=%%PREFIX%%/sbin/${name}
>+
>+load_rc_config $name
>+
>+: ${bird_enable="NO"}
>+: ${bird_config="%%PREFIX%%/etc/bird.conf"}
>+
>+command_args="-c $bird_config"
>+
>+run_rc_command "$1"
>diff -ruN /usr/ports.orig/net/bird2/files/patch-Makefile.in /usr/ports/net/bird2/files/patch-Makefile.in
>--- /usr/ports.orig/net/bird2/files/patch-Makefile.in	1970-01-01 00:00:00.000000000 +0000
>+++ /usr/ports/net/bird2/files/patch-Makefile.in	2018-02-16 20:23:59.111850000 +0000
>@@ -0,0 +1,15 @@
>+--- Makefile.in.orig	2017-04-29 22:26:04 UTC
>++++ Makefile.in
>+@@ -163,11 +163,7 @@ install: all
>+ 	if test -n "@CLIENT@" ; then								\
>+ 		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;		\
>+ 	fi
>+-	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
>+-		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ;	\
>+-	else											\
>+-		echo "Not overwriting old bird.conf" ;						\
>+-	fi
>++	$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@.example
>+ 
>+ install-docs:
>+ 	$(INSTALL) -d $(DESTDIR)/$(docdir)
>diff -ruN /usr/ports.orig/net/bird2/Makefile /usr/ports/net/bird2/Makefile
>--- /usr/ports.orig/net/bird2/Makefile	1970-01-01 00:00:00.000000000 +0000
>+++ /usr/ports/net/bird2/Makefile	2018-02-16 20:23:59.109623000 +0000
>@@ -0,0 +1,50 @@
>+# Created by: Alexander V. Chernikov <melifaro@FreeBSD.org>
>+# $FreeBSD: head/net/bird-devel/Makefile 456793 2017-12-20 13:28:21Z mat $
>+
>+PORTNAME=	bird
>+DISTVERSION=	2.0.1
>+CATEGORIES=	net
>+MASTER_SITES=	ftp://bird.network.cz/pub/bird/
>+
>+MAINTAINER=	melifaro@ipfw.ru
>+COMMENT=	Dynamic IP routing daemon (devel version)
>+
>+LICENSE=	GPLv2
>+
>+CONFLICTS=	bird-[0-9]*
>+
>+USES=		bison gmake readline
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--localstatedir=/var
>+USE_CSTD=	gnu89
>+
>+OPTIONS_MULTI=	RP
>+RP_DESC=	Routing Protocols
>+OPTIONS_MULTI_RP=	BFD BABEL BGP OSPF PIPE RADV RIP STATIC
>+OPTIONS_DEFAULT:=	${OPTIONS_MULTI_RP}
>+
>+BFD_DESC=	Bidirectional Forwarding Detection
>+BABEL_DESC=	Babel routing protocol
>+BGP_DESC=	Border Gateway Protocol
>+OSPF_DESC=	Open Short Path First
>+PIPE_DESC=	PIPE routing
>+RADV_DESC=	Router Advertisement
>+RIP_DESC=	Routing Information Protocol
>+STATIC_DESC=	Static routing
>+
>+BFD_VARS=	rt_prot+=bfd
>+BABEL_VARS=	rt_prot+=babel
>+BGP_VARS=	rt_prot+=bgp
>+OSPF_VARS=	rt_prot+=ospf
>+PIPE_VARS=	rt_prot+=pipe
>+RADV_VARS=	rt_prot+=radv
>+RIP_VARS=	rt_prot+=rip
>+STATIC_VARS=	rt_prot+=static
>+
>+CONFIGURE_ARGS+=--with-protocols="${RT_PROT}"
>+
>+MAKE_JOBS_UNSAFE=	yes
>+
>+USE_RC_SUBR=	bird
>+
>+.include <bsd.port.mk>
>diff -ruN /usr/ports.orig/net/bird2/pkg-descr /usr/ports/net/bird2/pkg-descr
>--- /usr/ports.orig/net/bird2/pkg-descr	1970-01-01 00:00:00.000000000 +0000
>+++ /usr/ports/net/bird2/pkg-descr	2018-02-16 20:23:59.108655000 +0000
>@@ -0,0 +1,16 @@
>+The BIRD project aims to develop a fully functional dynamic IP routing daemon.
>+
>+- Both IPv4 and IPv6
>+- Multiple routing tables
>+- BGP
>+- RIP
>+- OSPF
>+- LDP
>+- L3VPN
>+- Static routes
>+- Inter-table protocol
>+- Command-line interface
>+- Soft reconfiguration
>+- Powerful language for route filtering
>+
>+WWW: http://bird.network.cz/
>diff -ruN /usr/ports.orig/net/bird2/pkg-plist /usr/ports/net/bird2/pkg-plist
>--- /usr/ports.orig/net/bird2/pkg-plist	1970-01-01 00:00:00.000000000 +0000
>+++ /usr/ports/net/bird2/pkg-plist	2018-02-16 20:23:59.107827000 +0000
>@@ -0,0 +1,4 @@
>+@sample etc/bird.conf.example etc/bird.conf
>+sbin/bird
>+sbin/birdc
>+sbin/birdcl

Actions: View | Diff

Attachments on bug 225962: 190705 | 190706 | 191018 | 191224