diff options
Diffstat (limited to 'app-backup/bacula/files/5.2.3')
6 files changed, 102 insertions, 0 deletions
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 new file mode 100644 index 0000000..3cdee15 --- /dev/null +++ b/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch @@ -0,0 +1,27 @@ +# 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-as-needed.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch new file mode 100644 index 0000000..4b52d21 --- /dev/null +++ b/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch @@ -0,0 +1,14 @@ +# 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/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 new file mode 100644 index 0000000..98c6e6c --- /dev/null +++ b/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch @@ -0,0 +1,13 @@ +# 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 new file mode 100644 index 0000000..94d8fb6 --- /dev/null +++ b/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch @@ -0,0 +1,11 @@ +# 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 new file mode 100644 index 0000000..c3bded4 --- /dev/null +++ b/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch @@ -0,0 +1,12 @@ +# 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) + diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch new file mode 100644 index 0000000..58d2631 --- /dev/null +++ b/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch @@ -0,0 +1,25 @@ +http://bugs.gentoo.org/328701 +http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-5.0.2-openssl.patch?revision=1.3&view=markup + +--- src/lib/crypto.c ++++ src/lib/crypto.c +@@ -51,7 +51,7 @@ + * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer + * exists. It was not an official API. + */ +-#ifdef HAVE_OPENSSLv1 ++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) + #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old + #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old + #endif +--- src/lib/tls.c ++++ src/lib/tls.c +@@ -315,7 +315,7 @@ bool tls_postconnect_verify_host(JCR *jc + extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext))); + + if (strcmp(extname, "subjectAltName") == 0) { +-#ifdef HAVE_OPENSSLv1 ++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) + const X509V3_EXT_METHOD *method; + #else + X509V3_EXT_METHOD *method; |