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@[email protected] ; then \ -- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@[email protected] ; \ -+ 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@[email protected]" ; \ -+ 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@[email protected] ; then \ -- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@[email protected] ; \ -+ 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@[email protected]" ; \ -+ 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@[email protected] ; then \ -- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@[email protected] ; \ -+ 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@[email protected]" ; \ -+ 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@[email protected] ; then \ -- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@[email protected] ; \ -+ 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@[email protected]" ; \ -+ 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@[email protected] ; then \ -- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@[email protected] ; \ -+ 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@[email protected]" ; \ -+ 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" -}
