bacula: dropped unneded patches, patch headers as requested by exherbo devs

10 files changed, 22 insertions, 105 deletions

diff --git a/packages/app-backup/bacula/bacula.exlib b/packages/app-backup/bacula/bacula.exlib
index cfac30c..e6d9075 100644
--- a/packages/app-backup/bacula/bacula.exlib
+++ b/packages/app-backup/bacula/bacula.exlib
@@ -84,12 +84,12 @@ DEPENDENCIES="
 WORK="${WORK}"/bacula
 
 DEFAULT_SRC_PREPARE_PATCHES=(
-    -p0 "${FILES}"/7.2.0/${PN}-7.2.0-doc.patch
-    -p1 "${FILES}"/5.2.3/${PN}-5.2.3-as-needed.patch
-    -p0 "${FILES}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-    "${FILES}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-    "${FILES}/bacula-fix-sonames.patch"
-    "${FILES}"/7.0.2/${PN}-7.0.2-depend.patch
+#    -p0 "${FILES}"/7.2.0/${PN}-7.2.0-doc.patch
+#    -p1 "${FILES}"/5.2.3/${PN}-5.2.3-as-needed.patch
+#    -p0 "${FILES}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+    -p0 "${FILES}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+#    "${FILES}/bacula-fix-sonames.patch"
+#    "${FILES}"/7.0.2/${PN}-7.0.2-depend.patch
     -p0 "${FILES}"/9.0.6/${PN}-9.0.6-libressl.patch
     -p1 "${FILES}"/bacula-libressl-2.7.patch
     "${FILES}"/bacula-fix-configure-bat.patch
diff --git a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch
deleted file mode 100644
index 4b52d21..0000000
--- a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# see bug #310087 
-diff -urN bacula-5.2.1.orig/src/findlib/Makefile.in bacula-5.2.1/src/findlib/Makefile.in
---- bacula-5.2.1.orig/src/findlib/Makefile.in	2010-02-24 16:33:48.000000000 +0100
-+++ bacula-5.2.1/src/findlib/Makefile.in	2010-03-22 17:37:43.772805754 +0100
-@@ -59,7 +59,7 @@
- 
- libbacfind.la: Makefile $(LIBBACFIND_LOBJS) 
- 	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE) -L../lib -lbac $(LIBS) $(OPENSSL_LIBS)
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
-
diff --git a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch
index 58d2631..b2811be 100644
--- a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch
+++ b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch
@@ -1,3 +1,7 @@
+Source: Gentoo distribution
+Reason: fix build with openssl >= 1.1
+Upstream: http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-5.0.2-openssl.patch?revision=1.3&view=markup
+
 http://bugs.gentoo.org/328701
 http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-5.0.2-openssl.patch?revision=1.3&view=markup
 
diff --git a/packages/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch b/packages/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch
deleted file mode 100644
index e076cd6..0000000
--- a/packages/app-backup/bacula/files/7.0.2/bacula-7.0.2-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) -I$(srcdir) -I$(basedir) *.c >> Makefile
-+	@$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored *.c >> Makefile
- 	@if test -f Makefile ; then \
- 	    $(RMF) Makefile.bak; \
- 	else \
diff --git a/packages/app-backup/bacula/files/7.2.0/bacula-7.2.0-doc.patch b/packages/app-backup/bacula/files/7.2.0/bacula-7.2.0-doc.patch
deleted file mode 100644
index 155746a..0000000
--- a/packages/app-backup/bacula/files/7.2.0/bacula-7.2.0-doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in.orig	2015-09-03 20:03:22.000000000 +0200
-+++ Makefile.in	2015-09-03 20:03:50.000000000 +0200
-@@ -35,8 +35,7 @@
- 	autoconf/config.h.in  autoconf/acconfig.h  autoconf/Make.common.in \
- 	autoconf/install-sh autoconf/mkinstalldirs
- 
--doc_files = VERIFYING ChangeLog README ReleaseNotes LICENSE \
--	    LICENSE-FAQ LICENSE-FOSS INSTALL
-+doc_files =
- 
- MKDIR = $(srcdir)/autoconf/mkinstalldirs
- LIBTOOL_DEPS = @LIBTOOL_DEPS@
diff --git a/packages/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch b/packages/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch
deleted file mode 100644
index 33cf83d..0000000
--- a/packages/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# If upgrading the old libraries gets linked first. So fix order of 
-# lib search path.
---- src/console/Makefile.in.orig	2017-07-26 15:03:07.000000000 +0200
-+++ src/console/Makefile.in	2017-07-23 18:31:57.000000000 +0200
-@@ -49,17 +49,17 @@
- 
- 
- 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)
- 
- bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(JSONOBJS) \
-+	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
- 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- 	      $(OPENSSL_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) \
-+	$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
- 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- 	      $(OPENSSL_LIBS)
- 	strip $@
diff --git a/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch b/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch
index 3df4285..6dc5fbf 100644
--- a/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch
+++ b/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch
@@ -1,3 +1,7 @@
+Source: Gentoo distribution
+Reason: Fix build with libressl
+Upstream: Unknwon status
+
 --- src/lib/crypto.c.orig       2018-02-02 15:34:39.420489000 -0600
 +++ src/lib/crypto.c    2018-02-02 15:35:44.000524000 -0600
 @@ -195,7 +195,7 @@
diff --git a/packages/app-backup/bacula/files/bacula-fix-configure-bat.patch b/packages/app-backup/bacula/files/bacula-fix-configure-bat.patch
index 722123b..e37cda5 100644
--- a/packages/app-backup/bacula/files/bacula-fix-configure-bat.patch
+++ b/packages/app-backup/bacula/files/bacula-fix-configure-bat.patch
@@ -1,3 +1,7 @@
+Source: written by Gluzskiy Alexandr <sss@sss.chaoslab.ru>
+Reason: Use proper pkg_config variable in configure script
+Upstream: not reported
+
 diff --git a/configure b/configure
 index 99bb43c8e..cefcbca9f 100755
 --- a/configure
diff --git a/packages/app-backup/bacula/files/bacula-fix-sonames.patch b/packages/app-backup/bacula/files/bacula-fix-sonames.patch
deleted file mode 100644
index d05b2b9..0000000
--- a/packages/app-backup/bacula/files/bacula-fix-sonames.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-=== modified file 'autoconf/ltmain.sh'
---- autoconf/ltmain.sh	2011-11-06 20:34:58 +0000
-+++ autoconf/ltmain.sh	2012-02-09 17:27:13 +0000
-@@ -2428,6 +2428,7 @@
-   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-   -shared           only do dynamic linking of libtool libraries
-   -shrext SUFFIX    override the standard shared library file extension
-+  -soname SONAME    override the standard shared object name
-   -static           do not do any dynamic linking of uninstalled libtool libraries
-   -static-libtool-libs
-                     do not do any dynamic linking of libtool libraries
-@@ -5422,6 +5423,11 @@
- 	  prev=
- 	  continue
- 	  ;;
-+        soname)
-+	  soname_spec="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	weak)
- 	  func_append weak_libs " $arg"
- 	  prev=
-@@ -5741,6 +5747,11 @@
- 	continue
- 	;;
- 
-+      -soname)
-+	prev=soname
-+	continue
-+	;;
-+
-       -static | -static-libtool-libs)
- 	# The effects of -static are defined in a previous loop.
- 	# We used to do the same as -all-static on platforms that
-
diff --git a/packages/app-backup/bacula/files/bacula-libressl-2.7.patch b/packages/app-backup/bacula/files/bacula-libressl-2.7.patch
index c7986d7..ee042cc 100644
--- a/packages/app-backup/bacula/files/bacula-libressl-2.7.patch
+++ b/packages/app-backup/bacula/files/bacula-libressl-2.7.patch
@@ -1,3 +1,7 @@
+Source: written by Gluzskiy Alexandr <sss@sss.chaoslab.ru>
+Reason: fix build with libressl >= 2.7
+Upstream: not reported
+
 diff --git a/src/lib/openssl-compat.h b/src/lib/openssl-compat.h
 index e811a4b97..e547bd9a2 100644
 --- a/src/lib/openssl-compat.h