From 52f895faaaf01579a8d9528cafec20bf2c873f5c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 17 Jan 2020 22:43:15 +0000 Subject: gentoo resync : 17.01.2010 --- .../files/5.2.10/bacula-5.2.10-fix-static.patch | 56 ---------------------- .../bacula/files/5.2.12/bacula-5.2.12-depend.patch | 12 ----- .../bacula/files/5.2.3/bacula-5.2.3-Makefile.patch | 27 ----------- .../bacula/files/5.2.3/bacula-5.2.3-doc.patch | 13 ----- .../bacula/files/5.2.3/bacula-5.2.3-ldflags.patch | 11 ----- .../files/5.2.3/bacula-5.2.3-lib-search-path.patch | 12 ----- 6 files changed, 131 deletions(-) delete mode 100644 app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch delete mode 100644 app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch delete mode 100644 app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch delete mode 100644 app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch delete mode 100644 app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch delete mode 100644 app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch (limited to 'app-backup/bacula/files') diff --git a/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch b/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch deleted file mode 100644 index 458c188733a4..000000000000 --- a/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- src/console/Makefile.in.orig 2011-10-30 14:10:41.100802721 -0400 -+++ src/console/Makefile.in 2011-10-30 14:14:42.330488174 -0400 -@@ -29,10 +29,11 @@ - GETTEXT_LIBS = @LIBINTL@ - - CONS_INC=@CONS_INC@ - CONS_LIBS=@CONS_LIBS@ - CONS_LDFLAGS=@CONS_LDFLAGS@ -+ZLIBS=@ZLIBS@ - - .SUFFIXES: .c .o - .PHONY: - .DONTCARE: - -@@ -46,17 +47,17 @@ - @echo " " - - - bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ -- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS) -+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ -+ $(OPENSSL_LIBS) $(LIBS) - - static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ -- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS) -+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ -+ $(OPENSSL_LIBS) $(LIBS) $(ZLIBS) - strip $@ - - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status - cd $(topdir) \ ---- src/filed/Makefile.in.orig 2012-06-28 16:52:03.000000000 +0200 -+++ src/filed/Makefile.in 2012-08-16 11:08:09.000000000 +0200 -@@ -96,13 +96,13 @@ - bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ -- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) -+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \ -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) - - static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ -- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) -+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \ -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) - strip $@ - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status diff --git a/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch b/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch deleted file mode 100644 index 8c419a3bdfac..000000000000 --- a/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch +++ /dev/null @@ -1,12 +0,0 @@ -# fix file not found error during make depend ---- src/tools/Makefile.in.orig 2012-09-20 20:42:54.000000000 +0200 -+++ src/tools/Makefile.in 2012-09-20 20:35:46.000000000 +0200 -@@ -194,7 +194,7 @@ - @$(MV) Makefile Makefile.bak - @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile - @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile -- @$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile -+ @$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored *.c >> Makefile - @if test -f Makefile ; then \ - $(RMF) Makefile.bak; \ - else \ diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch deleted file mode 100644 index 3cdee15d4db7..000000000000 --- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ -# stop build if there are errors in subdirs ---- Makefile.in.orig 2010-07-20 16:53:44.000000000 +0000 -+++ Makefile.in 2010-07-20 16:55:50.000000000 +0000 -@@ -44,9 +44,8 @@ - - all: Makefile - @for I in ${all_subdirs}; \ -- do (cd $$I; echo "==>Entering directory `pwd`"; \ -- $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \ -- echo ""; echo ""; exit 1;)); \ -+ do \ -+ $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \ - done - - depend: -@@ -55,9 +54,8 @@ - - bacula-fd: Makefile - @for I in ${fd_subdirs}; \ -- do (cd $$I; echo "==>Entering directory `pwd`"; \ -- $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \ -- echo ""; echo ""; exit 1;)); \ -+ do \ -+ $(MAKE) DESTDIR=$(DESTDIR) -C $$I all || exit 1; \ - done - - #------------------------------------------------------------------------- diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch deleted file mode 100644 index 98c6e6ce34be..000000000000 --- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch +++ /dev/null @@ -1,13 +0,0 @@ -# drop automatic installation of doc files ---- Makefile.in.orig 2011-02-26 09:05:21.000000000 +0000 -+++ Makefile.in 2011-02-26 09:06:01.000000000 +0000 -@@ -34,8 +34,7 @@ - autoconf/config.h.in autoconf/acconfig.h autoconf/Make.common.in \ - autoconf/install-sh autoconf/mkinstalldirs - --doc_files = VERIFYING technotes ChangeLog README ReleaseNotes LICENSE \ -- INSTALL -+doc_files = - - MKDIR = $(srcdir)/autoconf/mkinstalldirs - LIBTOOL_DEPS = @LIBTOOL_DEPS@ diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch deleted file mode 100644 index 94d8fb60120e..000000000000 --- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ -# bat needs to respect LDFLAGS ---- src/qt-console/bat.pro.in.orig 2010-07-20 18:28:50.000000000 +0000 -+++ src/qt-console/bat.pro.in 2010-07-20 18:29:25.000000000 +0000 -@@ -26,6 +26,7 @@ - QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) - QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p - QMAKE_CLEAN += .libs/* bat -+QMAKE_LFLAGS += @LDFLAGS@ - - qwt { - INCLUDEPATH += @QWT_INC@ diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch deleted file mode 100644 index c3bded40ad03..000000000000 --- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -# If upgrading the old libraries gets linked first. So fix order of lib search path. ---- src/console/Makefile.in.orig 2010-03-29 11:35:00.000000000 +0000 -+++ src/console/Makefile.in 2010-03-29 11:45:14.000000000 +0000 -@@ -47,7 +47,7 @@ - - - bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) -- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ -+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ - $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ - $(OPENSSL_LIBS) - -- cgit v1.2.3