From 1b604af2aa9dde75ccd92d6b4ba53e6b288d2c3c Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Apr 24 2019 18:24:10 +0000
Subject: Add 9.4.2 sources


---

diff --git a/.gitignore b/.gitignore
index 5387612..f6e41b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ bacula-docs-5.0.3.tar.bz2
 /bacula-9.2.1.tar.gz
 /bacula-9.4.0.tar.gz
 /bacula-9.4.1.tar.gz
+/bacula-9.4.2.tar.gz
diff --git a/bacula-9.4.1-s3-configure.patch b/bacula-9.4.1-s3-configure.patch
deleted file mode 100644
index 0bbfef9..0000000
--- a/bacula-9.4.1-s3-configure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur bacula-9.4.2.old/autoconf/configure.in bacula-9.4.2/autoconf/configure.in
---- bacula-9.4.2.old/autoconf/configure.in	2019-04-18 11:50:32.221553081 +0200
-+++ bacula-9.4.2/autoconf/configure.in	2019-04-18 11:51:49.346938638 +0200
-@@ -1894,6 +1894,20 @@
- 
- AC_CHECK_FUNC(accept4, [AC_DEFINE(HAVE_ACCEPT4, 1, [Define to 1 if you have the 'accept4' function.])])
- 
-+dnl ---------------------------------------------------
-+dnl Check for S3 support/directory (default on)
-+dnl ---------------------------------------------------
-+dnl this allows you to turn it completely off
-+
-+AC_ARG_ENABLE(s3,
-+   AC_HELP_STRING([--disable-s3], [disable S3 support @<:@default=yes@:>@]),
-+   [
-+       if test x$enableval = xno; then
-+	  support_s3=no
-+       fi
-+   ]
-+)
-+
- S3_INC=
- S3_LIBS=
- S3_LDFLAGS=
-@@ -3631,6 +3645,7 @@
-    Encryption support:	     ${support_crypto}
-    ZLIB support:	     ${have_zlib}
-    LZO support: 	     ${have_lzo}
-+   S3 support:               ${have_libs3}
-    enable-smartalloc:	     ${support_smartalloc}
-    enable-lockmgr:	     ${support_lockmgr}
-    bat support: 	     ${support_bat}
diff --git a/bacula-9.4.2-s3-configure.patch b/bacula-9.4.2-s3-configure.patch
new file mode 100644
index 0000000..0bbfef9
--- /dev/null
+++ b/bacula-9.4.2-s3-configure.patch
@@ -0,0 +1,32 @@
+diff -Naur bacula-9.4.2.old/autoconf/configure.in bacula-9.4.2/autoconf/configure.in
+--- bacula-9.4.2.old/autoconf/configure.in	2019-04-18 11:50:32.221553081 +0200
++++ bacula-9.4.2/autoconf/configure.in	2019-04-18 11:51:49.346938638 +0200
+@@ -1894,6 +1894,20 @@
+ 
+ AC_CHECK_FUNC(accept4, [AC_DEFINE(HAVE_ACCEPT4, 1, [Define to 1 if you have the 'accept4' function.])])
+ 
++dnl ---------------------------------------------------
++dnl Check for S3 support/directory (default on)
++dnl ---------------------------------------------------
++dnl this allows you to turn it completely off
++
++AC_ARG_ENABLE(s3,
++   AC_HELP_STRING([--disable-s3], [disable S3 support @<:@default=yes@:>@]),
++   [
++       if test x$enableval = xno; then
++	  support_s3=no
++       fi
++   ]
++)
++
+ S3_INC=
+ S3_LIBS=
+ S3_LDFLAGS=
+@@ -3631,6 +3645,7 @@
+    Encryption support:	     ${support_crypto}
+    ZLIB support:	     ${have_zlib}
+    LZO support: 	     ${have_lzo}
++   S3 support:               ${have_libs3}
+    enable-smartalloc:	     ${support_smartalloc}
+    enable-lockmgr:	     ${support_lockmgr}
+    bat support: 	     ${support_bat}
diff --git a/bacula.spec b/bacula.spec
index 532b387..36c53e8 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -39,7 +39,7 @@ Patch7:             %{name}-9.4.0-non-free-code.patch
 Patch8:             %{name}-9.0.2-desktop.patch
 Patch9:             %{name}-9.4.2-g++-options.patch
 # https://sources.debian.org/patches/bacula/9.4.1-1/upstream/add-libs3-checks/
-Patch10:            %{name}-9.4.1-s3-configure.patch
+Patch10:            %{name}-9.4.2-s3-configure.patch
 
 # Original patch removed by mistake, upstream is not willing to add it again:
 # http://www.bacula.org/git/cgit.cgi/bacula/commit/?h=Branch-7.0&id=51b3b98fb77ab3c0decee455cc6c4d2eb3c5303a
diff --git a/sources b/sources
index 94f5dd7..2a78b93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bacula-9.4.1.tar.gz) = 5e05a939c5f457a121879a6108ce2ac6403dde556b415af4e5013e4f100cf4d878f3d468fd680fa1633a4c8d6ce3d7a6ed351a1600ef780166cd4be9b70191ee
+SHA512 (bacula-9.4.2.tar.gz) = f8c8f4c788ced1ab846e02656a0a1d9d1b65fe57ae0b888780167ac7e9272e8ca624ef5c41bd44a7454cf518c8e451c2201970b3e4862a99b4290a377da40b0d