1 |
chainsaw 11/03/31 09:48:53 |
2 |
|
3 |
Added: 1.3.0-v4-v6-build.patch initd-v6-bird-1.3.0 |
4 |
initd-v4-bird-1.3.0 |
5 |
Log: |
6 |
New upstream release, adds iBGP, multipath support, layer 2 link state detection, IPv6 RAs and many bugfixes. OSPF now supports point-to-multipoint interfaces. Azamat H. Hackimov has provided completely new initscripts and important socket path fixes, closes bugs #338118 and #338188. |
7 |
|
8 |
(Portage version: 2.1.9.45/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 net-misc/bird/files/1.3.0-v4-v6-build.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/bird/files/1.3.0-v4-v6-build.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/bird/files/1.3.0-v4-v6-build.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: 1.3.0-v4-v6-build.patch |
17 |
=================================================================== |
18 |
diff -uNr bird-1.3.0.ORIG//tools/Makefile-top.in bird-1.3.0/tools/Makefile-top.in |
19 |
--- bird-1.3.0.ORIG//tools/Makefile-top.in 2011-03-31 10:42:08.264002882 +0100 |
20 |
+++ bird-1.3.0/tools/Makefile-top.in 2011-03-31 10:42:32.083002944 +0100 |
21 |
@@ -3,16 +3,19 @@ |
22 |
|
23 |
objdir=@objdir@ |
24 |
|
25 |
-all depend tags install install-docs: |
26 |
+all depend tags install install-docs install-bin install-bin6: |
27 |
$(MAKE) -C $(objdir) $@ |
28 |
|
29 |
docs userdocs progdocs: |
30 |
$(MAKE) -C doc $@ |
31 |
|
32 |
-clean: |
33 |
- $(MAKE) -C $(objdir) clean |
34 |
+almost-clean: |
35 |
+ $(MAKE) -C $(objdir) almost-clean |
36 |
find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f |
37 |
|
38 |
+clean: almost-clean |
39 |
+ $(MAKE) -C $(objdir) clean |
40 |
+ |
41 |
distclean: clean |
42 |
$(MAKE) -C doc distclean |
43 |
rm -rf $(objdir) autom4te.cache |
44 |
diff -uNr bird-1.3.0.ORIG//tools/Makefile.in bird-1.3.0/tools/Makefile.in |
45 |
--- bird-1.3.0.ORIG//tools/Makefile.in 2011-03-31 10:42:08.265002882 +0100 |
46 |
+++ bird-1.3.0/tools/Makefile.in 2011-03-31 10:42:32.083002944 +0100 |
47 |
@@ -3,13 +3,13 @@ |
48 |
|
49 |
include Rules |
50 |
|
51 |
-.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs |
52 |
+.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs almost-clean |
53 |
|
54 |
all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@ |
55 |
|
56 |
-daemon: $(exedir)/bird |
57 |
+daemon: $(exedir)/bird@SUFFIX6@ |
58 |
|
59 |
-client: $(exedir)/birdc |
60 |
+client: $(exedir)/birdc@SUFFIX6@ |
61 |
|
62 |
bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a |
63 |
|
64 |
@@ -27,10 +27,10 @@ |
65 |
set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done |
66 |
set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done |
67 |
|
68 |
-$(exedir)/bird: $(bird-dep) |
69 |
+$(exedir)/bird@SUFFIX6@: $(bird-dep) |
70 |
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) |
71 |
|
72 |
-$(exedir)/birdc: $(birdc-dep) |
73 |
+$(exedir)/birdc@SUFFIX6@: $(birdc-dep) |
74 |
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS) |
75 |
|
76 |
.dir-stamp: sysdep/paths.h |
77 |
@@ -54,25 +54,42 @@ |
78 |
tags: |
79 |
cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]` |
80 |
|
81 |
-install: all |
82 |
+install-gen: |
83 |
$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run |
84 |
- $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@ |
85 |
+ |
86 |
+install-bin: install-gen |
87 |
+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/ |
88 |
+ if test -n "@CLIENT@" ; then \ |
89 |
+ $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/ ; \ |
90 |
+ fi |
91 |
+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird.conf ; then \ |
92 |
+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird.conf ; \ |
93 |
+ else \ |
94 |
+ echo "Not overwriting old bird.conf" ; \ |
95 |
+ fi |
96 |
+ |
97 |
+install-bin6: install-gen |
98 |
+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/ |
99 |
if test -n "@CLIENT@" ; then \ |
100 |
- $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ; \ |
101 |
+ $(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ; \ |
102 |
fi |
103 |
- if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then \ |
104 |
- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; \ |
105 |
+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird6.conf ; then \ |
106 |
+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird6.conf ; \ |
107 |
else \ |
108 |
- echo "Not overwriting old bird@SUFFIX@.conf" ; \ |
109 |
+ echo "Not overwriting old bird6.conf" ; \ |
110 |
fi |
111 |
|
112 |
+install: all install-bin@SUFFIX6@ |
113 |
+ |
114 |
install-docs: |
115 |
$(INSTALL) -d $(DESTDIR)/$(docdir) |
116 |
$(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/ |
117 |
|
118 |
-clean: |
119 |
+almost-clean: |
120 |
find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f |
121 |
rm -f conf/cf-lex.c conf/cf-parse.* conf/commands.h conf/keywords.h |
122 |
+ |
123 |
+clean: almost-clean |
124 |
rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp |
125 |
|
126 |
distclean: clean |
127 |
|
128 |
|
129 |
|
130 |
1.1 net-misc/bird/files/initd-v6-bird-1.3.0 |
131 |
|
132 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/bird/files/initd-v6-bird-1.3.0?rev=1.1&view=markup |
133 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/bird/files/initd-v6-bird-1.3.0?rev=1.1&content-type=text/plain |
134 |
|
135 |
Index: initd-v6-bird-1.3.0 |
136 |
=================================================================== |
137 |
#!/sbin/runscript |
138 |
# Copyright 1999-2011 Gentoo Foundation |
139 |
# Distributed under the terms of the GNU General Public License v2 |
140 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v6-bird-1.3.0,v 1.1 2011/03/31 09:48:53 chainsaw Exp $ |
141 |
|
142 |
opts="reload" |
143 |
|
144 |
EXE=bird6 |
145 |
SOCK="/var/run/${EXE}.ctl" |
146 |
|
147 |
depend() { |
148 |
need net |
149 |
use logger |
150 |
} |
151 |
|
152 |
checkconfig() { |
153 |
if [ ! -f "/etc/${EXE}.conf" ]; then |
154 |
eerror "Please create /etc/${EXE}.conf" |
155 |
return 1 |
156 |
fi |
157 |
return 0 |
158 |
} |
159 |
|
160 |
start() { |
161 |
checkconfig || return $? |
162 |
ebegin "Starting BIRD" |
163 |
start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}" |
164 |
eend $? "Failed to start BIRD" |
165 |
} |
166 |
|
167 |
stop() { |
168 |
ebegin "Stopping BIRD" |
169 |
start-stop-daemon --stop --exec /usr/sbin/${EXE} |
170 |
eend $? "Failed to stop BIRD" |
171 |
} |
172 |
|
173 |
reload() { |
174 |
service_started "${SVCNAME}" || return |
175 |
ebegin "Reloading BIRD" |
176 |
start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE} |
177 |
eend $? "Failed to reload BIRD" |
178 |
} |
179 |
|
180 |
|
181 |
|
182 |
1.1 net-misc/bird/files/initd-v4-bird-1.3.0 |
183 |
|
184 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/bird/files/initd-v4-bird-1.3.0?rev=1.1&view=markup |
185 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/bird/files/initd-v4-bird-1.3.0?rev=1.1&content-type=text/plain |
186 |
|
187 |
Index: initd-v4-bird-1.3.0 |
188 |
=================================================================== |
189 |
#!/sbin/runscript |
190 |
# Copyright 1999-2011 Gentoo Foundation |
191 |
# Distributed under the terms of the GNU General Public License v2 |
192 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v4-bird-1.3.0,v 1.1 2011/03/31 09:48:53 chainsaw Exp $ |
193 |
|
194 |
opts="reload" |
195 |
|
196 |
EXE=bird |
197 |
SOCK="/var/run/${EXE}.ctl" |
198 |
|
199 |
depend() { |
200 |
need net |
201 |
use logger |
202 |
} |
203 |
|
204 |
checkconfig() { |
205 |
if [ ! -f "/etc/${EXE}.conf" ]; then |
206 |
eerror "Please create /etc/${EXE}.conf" |
207 |
return 1 |
208 |
fi |
209 |
return 0 |
210 |
} |
211 |
|
212 |
start() { |
213 |
checkconfig || return $? |
214 |
ebegin "Starting BIRD" |
215 |
start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}" |
216 |
eend $? "Failed to start BIRD" |
217 |
} |
218 |
|
219 |
stop() { |
220 |
ebegin "Stopping BIRD" |
221 |
start-stop-daemon --stop --exec /usr/sbin/${EXE} |
222 |
eend $? "Failed to stop BIRD" |
223 |
} |
224 |
|
225 |
reload() { |
226 |
service_started "${SVCNAME}" || return |
227 |
ebegin "Reloading BIRD" |
228 |
start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE} |
229 |
eend $? "Failed to reload BIRD" |
230 |
} |