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