summaryrefslogtreecommitdiff
path: root/app-backup/bacula/files
diff options
context:
space:
mode:
Diffstat (limited to 'app-backup/bacula/files')
-rw-r--r--app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl26.patch62
-rw-r--r--app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch11
-rw-r--r--app-backup/bacula/files/9.4.1/bacula-9.4.1_sql.patch11
-rw-r--r--app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch63
-rw-r--r--app-backup/bacula/files/bacula-dir.initd24
-rw-r--r--app-backup/bacula/files/bacula-fd.initd21
-rw-r--r--app-backup/bacula/files/bacula-sd.initd21
7 files changed, 63 insertions, 150 deletions
diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl26.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl26.patch
deleted file mode 100644
index 3df4285c2e2e..000000000000
--- a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl26.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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 @@
- IMPLEMENT_ASN1_FUNCTIONS(SignatureData)
- IMPLEMENT_ASN1_FUNCTIONS(CryptoData)
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) )
- DEFINE_STACK_OF(SignerInfo);
- DEFINE_STACK_OF(RecipientInfo);
- #else
---- src/lib/openssl-compat.h.orig 2018-02-02 15:26:04.182557000 -0600
-+++ src/lib/openssl-compat.h 2018-02-02 15:27:50.229100000 -0600
-@@ -1,7 +1,7 @@
- #ifndef __OPENSSL_COPMAT__H__
- #define __OPENSSL_COPMAT__H__
-
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
- static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey)
- {
- CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
---- src/lib/openssl.c.orig 2018-02-16 08:36:24.092583000 -0600
-+++ src/lib/openssl.c 2018-02-16 08:37:23.795454000 -0600
-@@ -69,7 +69,7 @@
- }
- }
-
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
- /* Array of mutexes for use with OpenSSL static locking */
- static pthread_mutex_t *mutexes;
-
-@@ -263,7 +263,7 @@
- {
- int stat = 0;
-
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
- if ((stat = openssl_init_threads()) != 0) {
- berrno be;
- Jmsg1(NULL, M_ABORT, 0,
-@@ -310,7 +310,7 @@
- Jmsg0(NULL, M_ERROR, 0, _("Failed to save OpenSSL PRNG\n"));
- }
-
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
- openssl_cleanup_threads();
-
- /* Free libssl and libcrypto error strings */
---- src/lib/tls.c.orig 2017-11-21 18:37:16.000000000 +0100
-+++ src/lib/tls.c 2018-04-16 20:00:54.082000000 +0200
-@@ -116,7 +116,7 @@
- ctx = (TLS_CONTEXT *)malloc(sizeof(TLS_CONTEXT));
-
- /* Allocate our OpenSSL TLS Context */
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
- /* Allows SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols */
- ctx->openssl = SSL_CTX_new(TLS_method());
-
diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch
deleted file mode 100644
index b87f4b13f9f8..000000000000
--- a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 @@
- IMPLEMENT_ASN1_FUNCTIONS(SignatureData)
- IMPLEMENT_ASN1_FUNCTIONS(CryptoData)
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) )
- DEFINE_STACK_OF(SignerInfo);
- DEFINE_STACK_OF(RecipientInfo);
- #else
diff --git a/app-backup/bacula/files/9.4.1/bacula-9.4.1_sql.patch b/app-backup/bacula/files/9.4.1/bacula-9.4.1_sql.patch
deleted file mode 100644
index b2b7c4863d2a..000000000000
--- a/app-backup/bacula/files/9.4.1/bacula-9.4.1_sql.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bacula-9.4.1.orig/src/cats/sql_update.c 2018-12-16 05:30:25.000000000 -0500
-+++ bacula-9.4.1/src/cats/sql_update.c 2018-12-31 12:58:09.107874630 -0500
-@@ -375,7 +375,7 @@
- "LabelType=%d,StorageId=%s,PoolId=%s,VolRetention=%s,VolUseDuration=%s,"
- "MaxVolJobs=%d,MaxVolFiles=%d,Enabled=%d,LocationId=%s,"
- "ScratchPoolId=%s,RecyclePoolId=%s,RecycleCount=%d,Recycle=%d,"
-- "ActionOnPurge=%d,CacheRetention=%s,EndBlock=%d"
-+ "ActionOnPurge=%d,CacheRetention=%s,EndBlock=%u"
- " WHERE VolumeName='%s'",
- mr->VolJobs, mr->VolFiles, mr->VolBlocks,
- edit_uint64(mr->VolBytes, ed1),
diff --git a/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch b/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch
new file mode 100644
index 000000000000..1f32cd224f01
--- /dev/null
+++ b/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch
@@ -0,0 +1,63 @@
+--- src/console/Makefile.in.orig 2017-07-25 19:03:05.664760298 +0200
++++ src/console/Makefile.in 2017-07-25 19:05:43.576706091 +0200
+@@ -24,6 +24,7 @@
+ CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
+ CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
+ JSONOBJS = bbconsjson.o console_conf.o
++ZLIBS=@ZLIBS@
+
+ # these are the objects that are changed by the .configure process
+ EXTRAOBJS = @OBJLIST@
+@@ -50,18 +51,18 @@
+
+ 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)
+
+ bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
+- $(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 -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)
+ strip $@
+
+
+--- src/filed/Makefile.in.orig 2017-07-25 19:09:19.655852979 +0200
++++ src/filed/Makefile.in 2017-07-25 19:11:39.519558592 +0200
+@@ -69,19 +69,19 @@
+ bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(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 -lbaccfg -lbac -lm $(LIBS) \
+- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS)
++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS)
+
+ bfdjson: Makefile $(JSONOBJS) ../findlib/libbacfind$(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 $@ $(JSONOBJS) \
+- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+
+ static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../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 -lbaccfg -lbac -lm $(LIBS) \
+- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ strip $@
+
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/app-backup/bacula/files/bacula-dir.initd b/app-backup/bacula/files/bacula-dir.initd
deleted file mode 100644
index 0601ca56e2c4..000000000000
--- a/app-backup/bacula/files/bacula-dir.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
- if [ "${LOCAL_DB}" -eq 1 ]; then
- need "%database%"
- fi
- use dns bacula-fd bacula-sd
-}
-
-start() {
- ebegin "Starting bacula director"
- start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
- -- ${DIR_OPTIONS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping bacula director"
- start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
- eend $?
-}
diff --git a/app-backup/bacula/files/bacula-fd.initd b/app-backup/bacula/files/bacula-fd.initd
deleted file mode 100644
index 1cc636edbf9c..000000000000
--- a/app-backup/bacula/files/bacula-fd.initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
- use dns
-}
-
-start() {
- ebegin "Starting bacula file daemon"
- start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
- -- ${FD_OPTIONS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping bacula file daemon"
- start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
- eend $?
-}
diff --git a/app-backup/bacula/files/bacula-sd.initd b/app-backup/bacula/files/bacula-sd.initd
deleted file mode 100644
index a18840242efa..000000000000
--- a/app-backup/bacula/files/bacula-sd.initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
- use dns
-}
-
-start() {
- ebegin "Starting bacula storage daemon"
- start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
- -- ${SD_OPTIONS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping bacula storage daemon"
- start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid
- eend $?
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 08:28:44 +0000