* [gentoo-commits] repo/gentoo:master commit in: net-misc/bird/files/
@ 2017-01-26 22:37 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2017-01-26 22:37 UTC (permalink / raw
To: gentoo-commits
commit: 180db639b2bb75dbbd172b62c53c8aedc5c91b75
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jan 24 16:41:39 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 22:36:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=180db639
net-misc/bird: remove unused patches/files
Closes: https://github.com/gentoo/gentoo/pull/3628
net-misc/bird/files/1.2.3-v4-v6-build.patch | 109 ----------------------------
net-misc/bird/files/1.2.4-v4-v6-build.patch | 109 ----------------------------
net-misc/bird/files/1.3.0-v4-v6-build.patch | 109 ----------------------------
net-misc/bird/files/1.3.1-v4-v6-build.patch | 109 ----------------------------
net-misc/bird/files/1.3.2-v4-v6-build.patch | 109 ----------------------------
net-misc/bird/files/initd-v4-bird-1.2.3 | 39 ----------
net-misc/bird/files/initd-v4-bird-1.2.4 | 39 ----------
net-misc/bird/files/initd-v4-bird-1.3.0 | 42 -----------
net-misc/bird/files/initd-v4-bird-1.3.1 | 42 -----------
net-misc/bird/files/initd-v4-bird-1.3.2 | 42 -----------
net-misc/bird/files/initd-v6-bird-1.2.3 | 39 ----------
net-misc/bird/files/initd-v6-bird-1.2.4 | 39 ----------
net-misc/bird/files/initd-v6-bird-1.3.0 | 42 -----------
net-misc/bird/files/initd-v6-bird-1.3.1 | 42 -----------
net-misc/bird/files/initd-v6-bird-1.3.2 | 42 -----------
15 files changed, 953 deletions(-)
diff --git a/net-misc/bird/files/1.2.3-v4-v6-build.patch b/net-misc/bird/files/1.2.3-v4-v6-build.patch
deleted file mode 100644
index 12f9e21..00000000
--- a/net-misc/bird/files/1.2.3-v4-v6-build.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -uNr bird-1.2.3.ORIG//tools/Makefile.in bird-1.2.3/tools/Makefile.in
---- bird-1.2.3.ORIG//tools/Makefile.in 2010-06-07 14:15:41.000000000 +0100
-+++ bird-1.2.3/tools/Makefile.in 2010-06-07 14:15:58.000000000 +0100
-@@ -3,13 +3,13 @@
-
- include Rules
-
--.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs
-+.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs almost-clean
-
- all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@
-
--daemon: $(exedir)/bird
-+daemon: $(exedir)/bird@SUFFIX6@
-
--client: $(exedir)/birdc
-+client: $(exedir)/birdc@SUFFIX6@
-
- bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
-
-@@ -27,10 +27,10 @@
- set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
- set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
-
--$(exedir)/bird: $(bird-dep)
-+$(exedir)/bird@SUFFIX6@: $(bird-dep)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
--$(exedir)/birdc: $(birdc-dep)
-+$(exedir)/birdc@SUFFIX6@: $(birdc-dep)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
-
- .dir-stamp: sysdep/paths.h
-@@ -54,25 +54,42 @@
- tags:
- cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
-
--install: all
-+install-gen:
- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run
-- $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
-+
-+install-bin: install-gen
-+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
-+ if test -n "@CLIENT@" ; then \
-+ $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/ ; \
-+ fi
-+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird.conf ; then \
-+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird.conf ; \
-+ else \
-+ echo "Not overwriting old bird.conf" ; \
-+ fi
-+
-+install-bin6: install-gen
-+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
- if test -n "@CLIENT@" ; then \
-- $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ; \
-+ $(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ; \
- fi
-- if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then \
-- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; \
-+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird6.conf ; then \
-+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird6.conf ; \
- else \
-- echo "Not overwriting old bird@SUFFIX@.conf" ; \
-+ echo "Not overwriting old bird6.conf" ; \
- fi
-
-+install: all install-bin@SUFFIX6@
-+
- install-docs:
- $(INSTALL) -d $(DESTDIR)/$(docdir)
- $(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/
-
--clean:
-+almost-clean:
- find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
- rm -f conf/cf-lex.c conf/cf-parse.* conf/commands.h conf/keywords.h
-+
-+clean: almost-clean
- rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
-
- distclean: clean
-diff -uNr bird-1.2.3.ORIG//tools/Makefile-top.in bird-1.2.3/tools/Makefile-top.in
---- bird-1.2.3.ORIG//tools/Makefile-top.in 2010-06-07 14:15:41.000000000 +0100
-+++ bird-1.2.3/tools/Makefile-top.in 2010-06-07 14:15:58.000000000 +0100
-@@ -3,16 +3,19 @@
-
- objdir=@objdir@
-
--all depend tags install install-docs:
-+all depend tags install install-docs install-bin install-bin6:
- $(MAKE) -C $(objdir) $@
-
- docs userdocs progdocs:
- $(MAKE) -C doc $@
-
--clean:
-- $(MAKE) -C $(objdir) clean
-+almost-clean:
-+ $(MAKE) -C $(objdir) almost-clean
- find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
-
-+clean: almost-clean
-+ $(MAKE) -C $(objdir) clean
-+
- distclean: clean
- $(MAKE) -C doc distclean
- rm -rf $(objdir) autom4te.cache
diff --git a/net-misc/bird/files/1.2.4-v4-v6-build.patch b/net-misc/bird/files/1.2.4-v4-v6-build.patch
deleted file mode 100644
index 83a2710..00000000
--- a/net-misc/bird/files/1.2.4-v4-v6-build.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -uNr bird-1.2.4.ORIG//tools/Makefile.in bird-1.2.4/tools/Makefile.in
---- bird-1.2.4.ORIG//tools/Makefile.in 2010-09-06 15:38:39.000000000 +0100
-+++ bird-1.2.4/tools/Makefile.in 2010-09-06 15:38:56.000000000 +0100
-@@ -3,13 +3,13 @@
-
- include Rules
-
--.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs
-+.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs almost-clean
-
- all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@
-
--daemon: $(exedir)/bird
-+daemon: $(exedir)/bird@SUFFIX6@
-
--client: $(exedir)/birdc
-+client: $(exedir)/birdc@SUFFIX6@
-
- bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
-
-@@ -27,10 +27,10 @@
- set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
- set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
-
--$(exedir)/bird: $(bird-dep)
-+$(exedir)/bird@SUFFIX6@: $(bird-dep)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
--$(exedir)/birdc: $(birdc-dep)
-+$(exedir)/birdc@SUFFIX6@: $(birdc-dep)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
-
- .dir-stamp: sysdep/paths.h
-@@ -54,25 +54,42 @@
- tags:
- cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
-
--install: all
-+install-gen:
- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run
-- $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
-+
-+install-bin: install-gen
-+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
-+ if test -n "@CLIENT@" ; then \
-+ $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/ ; \
-+ fi
-+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird.conf ; then \
-+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird.conf ; \
-+ else \
-+ echo "Not overwriting old bird.conf" ; \
-+ fi
-+
-+install-bin6: install-gen
-+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
- if test -n "@CLIENT@" ; then \
-- $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ; \
-+ $(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ; \
- fi
-- if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then \
-- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; \
-+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird6.conf ; then \
-+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird6.conf ; \
- else \
-- echo "Not overwriting old bird@SUFFIX@.conf" ; \
-+ echo "Not overwriting old bird6.conf" ; \
- fi
-
-+install: all install-bin@SUFFIX6@
-+
- install-docs:
- $(INSTALL) -d $(DESTDIR)/$(docdir)
- $(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/
-
--clean:
-+almost-clean:
- find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
- rm -f conf/cf-lex.c conf/cf-parse.* conf/commands.h conf/keywords.h
-+
-+clean: almost-clean
- rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
-
- distclean: clean
-diff -uNr bird-1.2.4.ORIG//tools/Makefile-top.in bird-1.2.4/tools/Makefile-top.in
---- bird-1.2.4.ORIG//tools/Makefile-top.in 2010-09-06 15:38:39.000000000 +0100
-+++ bird-1.2.4/tools/Makefile-top.in 2010-09-06 15:38:56.000000000 +0100
-@@ -3,16 +3,19 @@
-
- objdir=@objdir@
-
--all depend tags install install-docs:
-+all depend tags install install-docs install-bin install-bin6:
- $(MAKE) -C $(objdir) $@
-
- docs userdocs progdocs:
- $(MAKE) -C doc $@
-
--clean:
-- $(MAKE) -C $(objdir) clean
-+almost-clean:
-+ $(MAKE) -C $(objdir) almost-clean
- find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
-
-+clean: almost-clean
-+ $(MAKE) -C $(objdir) clean
-+
- distclean: clean
- $(MAKE) -C doc distclean
- rm -rf $(objdir) autom4te.cache
diff --git a/net-misc/bird/files/1.3.0-v4-v6-build.patch b/net-misc/bird/files/1.3.0-v4-v6-build.patch
deleted file mode 100644
index 9e32183..00000000
--- a/net-misc/bird/files/1.3.0-v4-v6-build.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -uNr bird-1.3.0.ORIG//tools/Makefile-top.in bird-1.3.0/tools/Makefile-top.in
---- bird-1.3.0.ORIG//tools/Makefile-top.in 2011-03-31 10:42:08.264002882 +0100
-+++ bird-1.3.0/tools/Makefile-top.in 2011-03-31 10:42:32.083002944 +0100
-@@ -3,16 +3,19 @@
-
- objdir=@objdir@
-
--all depend tags install install-docs:
-+all depend tags install install-docs install-bin install-bin6:
- $(MAKE) -C $(objdir) $@
-
- docs userdocs progdocs:
- $(MAKE) -C doc $@
-
--clean:
-- $(MAKE) -C $(objdir) clean
-+almost-clean:
-+ $(MAKE) -C $(objdir) almost-clean
- find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
-
-+clean: almost-clean
-+ $(MAKE) -C $(objdir) clean
-+
- distclean: clean
- $(MAKE) -C doc distclean
- rm -rf $(objdir) autom4te.cache
-diff -uNr bird-1.3.0.ORIG//tools/Makefile.in bird-1.3.0/tools/Makefile.in
---- bird-1.3.0.ORIG//tools/Makefile.in 2011-03-31 10:42:08.265002882 +0100
-+++ bird-1.3.0/tools/Makefile.in 2011-03-31 10:42:32.083002944 +0100
-@@ -3,13 +3,13 @@
-
- include Rules
-
--.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs
-+.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs almost-clean
-
- all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@
-
--daemon: $(exedir)/bird
-+daemon: $(exedir)/bird@SUFFIX6@
-
--client: $(exedir)/birdc
-+client: $(exedir)/birdc@SUFFIX6@
-
- bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
-
-@@ -27,10 +27,10 @@
- set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
- set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
-
--$(exedir)/bird: $(bird-dep)
-+$(exedir)/bird@SUFFIX6@: $(bird-dep)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
--$(exedir)/birdc: $(birdc-dep)
-+$(exedir)/birdc@SUFFIX6@: $(birdc-dep)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
-
- .dir-stamp: sysdep/paths.h
-@@ -54,25 +54,42 @@
- tags:
- cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
-
--install: all
-+install-gen:
- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run
-- $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
-+
-+install-bin: install-gen
-+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
-+ if test -n "@CLIENT@" ; then \
-+ $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/ ; \
-+ fi
-+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird.conf ; then \
-+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird.conf ; \
-+ else \
-+ echo "Not overwriting old bird.conf" ; \
-+ fi
-+
-+install-bin6: install-gen
-+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
- if test -n "@CLIENT@" ; then \
-- $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ; \
-+ $(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ; \
- fi
-- if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then \
-- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; \
-+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird6.conf ; then \
-+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird6.conf ; \
- else \
-- echo "Not overwriting old bird@SUFFIX@.conf" ; \
-+ echo "Not overwriting old bird6.conf" ; \
- fi
-
-+install: all install-bin@SUFFIX6@
-+
- install-docs:
- $(INSTALL) -d $(DESTDIR)/$(docdir)
- $(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/
-
--clean:
-+almost-clean:
- find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
- rm -f conf/cf-lex.c conf/cf-parse.* conf/commands.h conf/keywords.h
-+
-+clean: almost-clean
- rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
-
- distclean: clean
diff --git a/net-misc/bird/files/1.3.1-v4-v6-build.patch b/net-misc/bird/files/1.3.1-v4-v6-build.patch
deleted file mode 100644
index 3d6d0e2..00000000
--- a/net-misc/bird/files/1.3.1-v4-v6-build.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -uNr bird-1.3.1.ORIG//tools/Makefile-top.in bird-1.3.1/tools/Makefile-top.in
---- bird-1.3.1.ORIG//tools/Makefile-top.in 2011-05-02 12:57:26.799971384 +0100
-+++ bird-1.3.1/tools/Makefile-top.in 2011-05-02 12:57:42.587971260 +0100
-@@ -3,16 +3,19 @@
-
- objdir=@objdir@
-
--all depend tags install install-docs:
-+all depend tags install install-docs install-bin install-bin6:
- $(MAKE) -C $(objdir) $@
-
- docs userdocs progdocs:
- $(MAKE) -C doc $@
-
--clean:
-- $(MAKE) -C $(objdir) clean
-+almost-clean:
-+ $(MAKE) -C $(objdir) almost-clean
- find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
-
-+clean: almost-clean
-+ $(MAKE) -C $(objdir) clean
-+
- distclean: clean
- $(MAKE) -C doc distclean
- rm -rf $(objdir) autom4te.cache
-diff -uNr bird-1.3.1.ORIG//tools/Makefile.in bird-1.3.1/tools/Makefile.in
---- bird-1.3.1.ORIG//tools/Makefile.in 2011-05-02 12:57:26.799971384 +0100
-+++ bird-1.3.1/tools/Makefile.in 2011-05-02 12:57:42.588971277 +0100
-@@ -3,13 +3,13 @@
-
- include Rules
-
--.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs
-+.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs almost-clean
-
- all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@
-
--daemon: $(exedir)/bird
-+daemon: $(exedir)/bird@SUFFIX6@
-
--client: $(exedir)/birdc
-+client: $(exedir)/birdc@SUFFIX6@
-
- bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
-
-@@ -27,10 +27,10 @@
- set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
- set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
-
--$(exedir)/bird: $(bird-dep)
-+$(exedir)/bird@SUFFIX6@: $(bird-dep)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
--$(exedir)/birdc: $(birdc-dep)
-+$(exedir)/birdc@SUFFIX6@: $(birdc-dep)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
-
- .dir-stamp: sysdep/paths.h
-@@ -55,25 +55,42 @@
- tags:
- cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
-
--install: all
-+install-gen:
- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run
-- $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
-+
-+install-bin: install-gen
-+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
-+ if test -n "@CLIENT@" ; then \
-+ $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/ ; \
-+ fi
-+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird.conf ; then \
-+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird.conf ; \
-+ else \
-+ echo "Not overwriting old bird.conf" ; \
-+ fi
-+
-+install-bin6: install-gen
-+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
- if test -n "@CLIENT@" ; then \
-- $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ; \
-+ $(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ; \
- fi
-- if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then \
-- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; \
-+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird6.conf ; then \
-+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird6.conf ; \
- else \
-- echo "Not overwriting old bird@SUFFIX@.conf" ; \
-+ echo "Not overwriting old bird6.conf" ; \
- fi
-
-+install: all install-bin@SUFFIX6@
-+
- install-docs:
- $(INSTALL) -d $(DESTDIR)/$(docdir)
- $(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/
-
--clean:
-+almost-clean:
- find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
- rm -f conf/cf-lex.c conf/cf-parse.* conf/commands.h conf/keywords.h
-+
-+clean: almost-clean
- rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
-
- distclean: clean
diff --git a/net-misc/bird/files/1.3.2-v4-v6-build.patch b/net-misc/bird/files/1.3.2-v4-v6-build.patch
deleted file mode 100644
index 134c31f..00000000
--- a/net-misc/bird/files/1.3.2-v4-v6-build.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -uNr bird-1.3.2.ORIG/tools/Makefile.in bird-1.3.2/tools/Makefile.in
---- bird-1.3.2.ORIG/tools/Makefile.in 2011-11-07 10:53:52.881139861 +0000
-+++ bird-1.3.2/tools/Makefile.in 2011-11-07 10:54:08.606140225 +0000
-@@ -3,13 +3,13 @@
-
- include Rules
-
--.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs
-+.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs almost-clean
-
- all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@
-
--daemon: $(exedir)/bird
-+daemon: $(exedir)/bird@SUFFIX6@
-
--client: $(exedir)/birdc
-+client: $(exedir)/birdc@SUFFIX6@
-
- bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
-
-@@ -27,10 +27,10 @@
- set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
- set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
-
--$(exedir)/bird: $(bird-dep)
-+$(exedir)/bird@SUFFIX6@: $(bird-dep)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
--$(exedir)/birdc: $(birdc-dep)
-+$(exedir)/birdc@SUFFIX6@: $(birdc-dep)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
-
- .dir-stamp: sysdep/paths.h
-@@ -55,25 +55,42 @@
- tags:
- cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
-
--install: all
-+install-gen:
- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run
-- $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
-+
-+install-bin: install-gen
-+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
-+ if test -n "@CLIENT@" ; then \
-+ $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/ ; \
-+ fi
-+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird.conf ; then \
-+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird.conf ; \
-+ else \
-+ echo "Not overwriting old bird.conf" ; \
-+ fi
-+
-+install-bin6: install-gen
-+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
- if test -n "@CLIENT@" ; then \
-- $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ; \
-+ $(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ; \
- fi
-- if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then \
-- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; \
-+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird6.conf ; then \
-+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird6.conf ; \
- else \
-- echo "Not overwriting old bird@SUFFIX@.conf" ; \
-+ echo "Not overwriting old bird6.conf" ; \
- fi
-
-+install: all install-bin@SUFFIX6@
-+
- install-docs:
- $(INSTALL) -d $(DESTDIR)/$(docdir)
- $(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/
-
--clean:
-+almost-clean:
- find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
- rm -f conf/cf-lex.c conf/cf-parse.* conf/commands.h conf/keywords.h
-+
-+clean: almost-clean
- rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
-
- distclean: clean
-diff -uNr bird-1.3.2.ORIG/tools/Makefile-top.in bird-1.3.2/tools/Makefile-top.in
---- bird-1.3.2.ORIG/tools/Makefile-top.in 2011-11-07 10:53:52.881139861 +0000
-+++ bird-1.3.2/tools/Makefile-top.in 2011-11-07 10:54:08.603140225 +0000
-@@ -3,16 +3,19 @@
-
- objdir=@objdir@
-
--all depend tags install install-docs:
-+all depend tags install install-docs install-bin install-bin6:
- $(MAKE) -C $(objdir) $@
-
- docs userdocs progdocs:
- $(MAKE) -C doc $@
-
--clean:
-- $(MAKE) -C $(objdir) clean
-+almost-clean:
-+ $(MAKE) -C $(objdir) almost-clean
- find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
-
-+clean: almost-clean
-+ $(MAKE) -C $(objdir) clean
-+
- distclean: clean
- $(MAKE) -C doc distclean
- rm -rf $(objdir) autom4te.cache
diff --git a/net-misc/bird/files/initd-v4-bird-1.2.3 b/net-misc/bird/files/initd-v4-bird-1.2.3
deleted file mode 100644
index 485eda2..00000000
--- a/net-misc/bird/files/initd-v4-bird-1.2.3
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EXE=bird
-CLI=birdc
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
- need net
- use logger
-}
-
-checkconfig() {
- if [ ! -f "/etc/${EXE}.conf" ]; then
- eerror "Please create /etc/${EXE}.conf"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return $?
-
- ebegin "Starting BIRD"
- "/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
- eend $? "Failed to start BIRD"
-}
-
-stop() {
- ebegin "Stopping BIRD"
- if [ -f "${SOCK}" ]; then
- echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
- eend $? "Failed to stop BIRD"
- else
- eend 0
- fi
-}
diff --git a/net-misc/bird/files/initd-v4-bird-1.2.4 b/net-misc/bird/files/initd-v4-bird-1.2.4
deleted file mode 100644
index 7f5b6ca..00000000
--- a/net-misc/bird/files/initd-v4-bird-1.2.4
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EXE=bird
-CLI=birdc
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
- need net
- use logger
-}
-
-checkconfig() {
- if [ ! -f "/etc/${EXE}.conf" ]; then
- eerror "Please create /etc/${EXE}.conf"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return $?
-
- ebegin "Starting BIRD"
- "/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
- eend $? "Failed to start BIRD"
-}
-
-stop() {
- ebegin "Stopping BIRD"
- if [ -f "${SOCK}" ]; then
- echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
- eend $? "Failed to stop BIRD"
- else
- eend 0
- fi
-}
diff --git a/net-misc/bird/files/initd-v4-bird-1.3.0 b/net-misc/bird/files/initd-v4-bird-1.3.0
deleted file mode 100644
index 0a6dfd0..00000000
--- a/net-misc/bird/files/initd-v4-bird-1.3.0
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-opts="reload"
-
-EXE=bird
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
- need net
- use logger
-}
-
-checkconfig() {
- if [ ! -f "/etc/${EXE}.conf" ]; then
- eerror "Please create /etc/${EXE}.conf"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return $?
- ebegin "Starting BIRD"
- start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
- eend $? "Failed to start BIRD"
-}
-
-stop() {
- ebegin "Stopping BIRD"
- start-stop-daemon --stop --exec /usr/sbin/${EXE}
- eend $? "Failed to stop BIRD"
-}
-
-reload() {
- service_started "${SVCNAME}" || return
- ebegin "Reloading BIRD"
- start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
- eend $? "Failed to reload BIRD"
-}
diff --git a/net-misc/bird/files/initd-v4-bird-1.3.1 b/net-misc/bird/files/initd-v4-bird-1.3.1
deleted file mode 100644
index 0a6dfd0..00000000
--- a/net-misc/bird/files/initd-v4-bird-1.3.1
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-opts="reload"
-
-EXE=bird
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
- need net
- use logger
-}
-
-checkconfig() {
- if [ ! -f "/etc/${EXE}.conf" ]; then
- eerror "Please create /etc/${EXE}.conf"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return $?
- ebegin "Starting BIRD"
- start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
- eend $? "Failed to start BIRD"
-}
-
-stop() {
- ebegin "Stopping BIRD"
- start-stop-daemon --stop --exec /usr/sbin/${EXE}
- eend $? "Failed to stop BIRD"
-}
-
-reload() {
- service_started "${SVCNAME}" || return
- ebegin "Reloading BIRD"
- start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
- eend $? "Failed to reload BIRD"
-}
diff --git a/net-misc/bird/files/initd-v4-bird-1.3.2 b/net-misc/bird/files/initd-v4-bird-1.3.2
deleted file mode 100644
index 0a6dfd0..00000000
--- a/net-misc/bird/files/initd-v4-bird-1.3.2
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-opts="reload"
-
-EXE=bird
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
- need net
- use logger
-}
-
-checkconfig() {
- if [ ! -f "/etc/${EXE}.conf" ]; then
- eerror "Please create /etc/${EXE}.conf"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return $?
- ebegin "Starting BIRD"
- start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
- eend $? "Failed to start BIRD"
-}
-
-stop() {
- ebegin "Stopping BIRD"
- start-stop-daemon --stop --exec /usr/sbin/${EXE}
- eend $? "Failed to stop BIRD"
-}
-
-reload() {
- service_started "${SVCNAME}" || return
- ebegin "Reloading BIRD"
- start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
- eend $? "Failed to reload BIRD"
-}
diff --git a/net-misc/bird/files/initd-v6-bird-1.2.3 b/net-misc/bird/files/initd-v6-bird-1.2.3
deleted file mode 100644
index 26d4709..00000000
--- a/net-misc/bird/files/initd-v6-bird-1.2.3
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EXE=bird6
-CLI=birdc6
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
- need net
- use logger
-}
-
-checkconfig() {
- if [ ! -f "/etc/${EXE}.conf" ]; then
- eerror "Please create /etc/${EXE}.conf"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return $?
-
- ebegin "Starting BIRD"
- "/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
- eend $? "Failed to start BIRD"
-}
-
-stop() {
- ebegin "Stopping BIRD"
- if [ -f "${SOCK}" ]; then
- echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
- eend $? "Failed to stop BIRD"
- else
- eend 0
- fi
-}
diff --git a/net-misc/bird/files/initd-v6-bird-1.2.4 b/net-misc/bird/files/initd-v6-bird-1.2.4
deleted file mode 100644
index 26d4709..00000000
--- a/net-misc/bird/files/initd-v6-bird-1.2.4
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EXE=bird6
-CLI=birdc6
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
- need net
- use logger
-}
-
-checkconfig() {
- if [ ! -f "/etc/${EXE}.conf" ]; then
- eerror "Please create /etc/${EXE}.conf"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return $?
-
- ebegin "Starting BIRD"
- "/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
- eend $? "Failed to start BIRD"
-}
-
-stop() {
- ebegin "Stopping BIRD"
- if [ -f "${SOCK}" ]; then
- echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
- eend $? "Failed to stop BIRD"
- else
- eend 0
- fi
-}
diff --git a/net-misc/bird/files/initd-v6-bird-1.3.0 b/net-misc/bird/files/initd-v6-bird-1.3.0
deleted file mode 100644
index 7b55d21..00000000
--- a/net-misc/bird/files/initd-v6-bird-1.3.0
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-opts="reload"
-
-EXE=bird6
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
- need net
- use logger
-}
-
-checkconfig() {
- if [ ! -f "/etc/${EXE}.conf" ]; then
- eerror "Please create /etc/${EXE}.conf"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return $?
- ebegin "Starting BIRD"
- start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
- eend $? "Failed to start BIRD"
-}
-
-stop() {
- ebegin "Stopping BIRD"
- start-stop-daemon --stop --exec /usr/sbin/${EXE}
- eend $? "Failed to stop BIRD"
-}
-
-reload() {
- service_started "${SVCNAME}" || return
- ebegin "Reloading BIRD"
- start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
- eend $? "Failed to reload BIRD"
-}
diff --git a/net-misc/bird/files/initd-v6-bird-1.3.1 b/net-misc/bird/files/initd-v6-bird-1.3.1
deleted file mode 100644
index 7b55d21..00000000
--- a/net-misc/bird/files/initd-v6-bird-1.3.1
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-opts="reload"
-
-EXE=bird6
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
- need net
- use logger
-}
-
-checkconfig() {
- if [ ! -f "/etc/${EXE}.conf" ]; then
- eerror "Please create /etc/${EXE}.conf"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return $?
- ebegin "Starting BIRD"
- start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
- eend $? "Failed to start BIRD"
-}
-
-stop() {
- ebegin "Stopping BIRD"
- start-stop-daemon --stop --exec /usr/sbin/${EXE}
- eend $? "Failed to stop BIRD"
-}
-
-reload() {
- service_started "${SVCNAME}" || return
- ebegin "Reloading BIRD"
- start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
- eend $? "Failed to reload BIRD"
-}
diff --git a/net-misc/bird/files/initd-v6-bird-1.3.2 b/net-misc/bird/files/initd-v6-bird-1.3.2
deleted file mode 100644
index 7b55d21..00000000
--- a/net-misc/bird/files/initd-v6-bird-1.3.2
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-opts="reload"
-
-EXE=bird6
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
- need net
- use logger
-}
-
-checkconfig() {
- if [ ! -f "/etc/${EXE}.conf" ]; then
- eerror "Please create /etc/${EXE}.conf"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return $?
- ebegin "Starting BIRD"
- start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
- eend $? "Failed to start BIRD"
-}
-
-stop() {
- ebegin "Stopping BIRD"
- start-stop-daemon --stop --exec /usr/sbin/${EXE}
- eend $? "Failed to stop BIRD"
-}
-
-reload() {
- service_started "${SVCNAME}" || return
- ebegin "Reloading BIRD"
- start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
- eend $? "Failed to reload BIRD"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/bird/files/
@ 2020-06-25 7:30 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2020-06-25 7:30 UTC (permalink / raw
To: gentoo-commits
commit: f16e25677d8f3c0a90a5927f837d3520bae25d39
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jun 22 18:11:19 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:30:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f16e2567
net-misc/bird: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/16375
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
net-misc/bird/files/initd-v4-bird-1.3.8 | 40 ---------------------------------
net-misc/bird/files/initd-v6-bird-1.3.8 | 40 ---------------------------------
2 files changed, 80 deletions(-)
diff --git a/net-misc/bird/files/initd-v4-bird-1.3.8 b/net-misc/bird/files/initd-v4-bird-1.3.8
deleted file mode 100644
index c7c6a0b63af..00000000000
--- a/net-misc/bird/files/initd-v4-bird-1.3.8
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-EXE=bird
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
- need net
- use logger
-}
-
-checkconfig() {
- if [ ! -f "/etc/${EXE}.conf" ]; then
- eerror "Please create /etc/${EXE}.conf"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return $?
- ebegin "Starting BIRD"
- start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
- eend $? "Failed to start BIRD"
-}
-
-stop() {
- ebegin "Stopping BIRD"
- start-stop-daemon --stop --exec /usr/sbin/${EXE}
- eend $? "Failed to stop BIRD"
-}
-
-reload() {
- ebegin "Reloading BIRD"
- start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
- eend $? "Failed to reload BIRD"
-}
diff --git a/net-misc/bird/files/initd-v6-bird-1.3.8 b/net-misc/bird/files/initd-v6-bird-1.3.8
deleted file mode 100644
index 94ba4426e5d..00000000000
--- a/net-misc/bird/files/initd-v6-bird-1.3.8
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-EXE=bird6
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
- need net
- use logger
-}
-
-checkconfig() {
- if [ ! -f "/etc/${EXE}.conf" ]; then
- eerror "Please create /etc/${EXE}.conf"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return $?
- ebegin "Starting BIRD"
- start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
- eend $? "Failed to start BIRD"
-}
-
-stop() {
- ebegin "Stopping BIRD"
- start-stop-daemon --stop --exec /usr/sbin/${EXE}
- eend $? "Failed to stop BIRD"
-}
-
-reload() {
- ebegin "Reloading BIRD"
- start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
- eend $? "Failed to reload BIRD"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/bird/files/
@ 2021-04-09 22:02 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-04-09 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 63cb2ebe3a5725da13e43d5b3c367d53755dccae
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 9 22:02:25 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 9 22:02:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63cb2ebe
net-misc/bird: fix ExecutableFile
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/bird/files/initd-bird-2 | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-misc/bird/files/initd-bird-2 b/net-misc/bird/files/initd-bird-2
old mode 100755
new mode 100644
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/bird/files/
@ 2023-03-07 13:33 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-03-07 13:33 UTC (permalink / raw
To: gentoo-commits
commit: 7377c09d61dd996d0bed4f5c293eec02144eecf3
Author: Alarig Le Lay <alarig <AT> swordarmor <DOT> fr>
AuthorDate: Tue Mar 7 12:50:52 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 13:32:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7377c09d
net-misc/bird: Fixing musl patch for < 2.0.12
Closes: https://bugs.gentoo.org/900104
Signed-off-by: Alarig Le Lay <alarig <AT> swordarmor.fr>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...sl-tests.patch => bird-2.0.12-musl-tests.patch} | 0
net-misc/bird/files/bird-2.0.9-musl-tests.patch | 39 ++++++++--------------
2 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/net-misc/bird/files/bird-2.0.9-musl-tests.patch b/net-misc/bird/files/bird-2.0.12-musl-tests.patch
similarity index 100%
copy from net-misc/bird/files/bird-2.0.9-musl-tests.patch
copy to net-misc/bird/files/bird-2.0.12-musl-tests.patch
diff --git a/net-misc/bird/files/bird-2.0.9-musl-tests.patch b/net-misc/bird/files/bird-2.0.9-musl-tests.patch
index df6e00e04dfe..4da5788fa4d4 100644
--- a/net-misc/bird/files/bird-2.0.9-musl-tests.patch
+++ b/net-misc/bird/files/bird-2.0.9-musl-tests.patch
@@ -1,43 +1,30 @@
https://bird.network.cz/pipermail/bird-users/2023-March/016743.html
-https://gitlab.nic.cz/labs/bird/-/commit/0f679438f36d8c2a31dfe490007e983b085caef6
-
-From 0f679438f36d8c2a31dfe490007e983b085caef6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
-Date: Mon, 6 Mar 2023 11:19:30 +0100
-Subject: [PATCH] Printf test suite fails on systems with musl libc because
- tests for "%m" and "%M" formats expect "Input/output error" message but musl
- returns "I/O error". Proposed change compares the printf output with string
- returned from strerror function for EIO constant.
-
See-also: https://bugs.gentoo.org/836713
-
-Minor change from committer.
+Signed-off-by: Petr Vaněk <arkamar at atlas.cz>
---
- lib/printf_test.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
+ lib/printf_test.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/printf_test.c b/lib/printf_test.c
-index 47ea905d..88ecf05e 100644
+index 47ea905d..ca278975 100644
--- a/lib/printf_test.c
+++ b/lib/printf_test.c
@@ -32,11 +32,14 @@ t_simple(void)
BSPRINTF(1, "@", buf, "@", 64);
BSPRINTF(1, "\xff", buf, "%c", 0xff);
-
-- errno = 5;
-- BSPRINTF(18, "Input/output error", buf, "%m");
-+ const char *io_error_str = lp_strdup(tmp_linpool, strerror(EIO));
+
++ const char * io_error_str = strerror(EIO);
+ const int io_error_len = strlen(io_error_str);
+
-+ errno = EIO;
+ errno = 5;
+- BSPRINTF(18, "Input/output error", buf, "%m");
+ BSPRINTF(io_error_len, io_error_str, buf, "%m");
errno = 0;
-
+
- BSPRINTF(18, "Input/output error", buf, "%M", 5);
-+ BSPRINTF(io_error_len, io_error_str, buf, "%M", EIO);
-
++ BSPRINTF(io_error_len, io_error_str, buf, "%M", 5);
+
BSPRINTF(11, "TeSt%StRiNg", buf, "%s", "TeSt%StRiNg");
-
---
-GitLab
+--
+2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-07 13:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-07 13:33 [gentoo-commits] repo/gentoo:master commit in: net-misc/bird/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-04-09 22:02 Sam James
2020-06-25 7:30 Conrad Kostecki
2017-01-26 22:37 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox