| 1 |
tomjbe 12/01/02 13:17:47 |
| 2 |
|
| 3 |
Added: bacula-5.2.3-fix-static.patch |
| 4 |
bacula-5.2.3-doc.patch |
| 5 |
bacula-5.2.3-lib-search-path.patch |
| 6 |
bacula-5.2.3-Makefile.patch |
| 7 |
bacula-5.2.3-ldflags.patch |
| 8 |
bacula-5.2.3-openssl-1.patch |
| 9 |
bacula-5.2.3-as-needed.patch |
| 10 |
Log: |
| 11 |
Version bump |
| 12 |
|
| 13 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 14 |
|
| 15 |
Revision Changes Path |
| 16 |
1.1 app-backup/bacula/files/5.2.3/bacula-5.2.3-fix-static.patch |
| 17 |
|
| 18 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.2.3/bacula-5.2.3-fix-static.patch?rev=1.1&view=markup |
| 19 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.2.3/bacula-5.2.3-fix-static.patch?rev=1.1&content-type=text/plain |
| 20 |
|
| 21 |
Index: bacula-5.2.3-fix-static.patch |
| 22 |
=================================================================== |
| 23 |
--- src/console/Makefile.in.orig 2011-10-30 14:10:41.100802721 -0400 |
| 24 |
+++ src/console/Makefile.in 2011-10-30 14:14:42.330488174 -0400 |
| 25 |
@@ -29,10 +29,11 @@ |
| 26 |
GETTEXT_LIBS = @LIBINTL@ |
| 27 |
|
| 28 |
CONS_INC=@CONS_INC@ |
| 29 |
CONS_LIBS=@CONS_LIBS@ |
| 30 |
CONS_LDFLAGS=@CONS_LDFLAGS@ |
| 31 |
+ZLIBS=@ZLIBS@ |
| 32 |
|
| 33 |
.SUFFIXES: .c .o |
| 34 |
.PHONY: |
| 35 |
.DONTCARE: |
| 36 |
|
| 37 |
@@ -46,17 +47,17 @@ |
| 38 |
@echo " " |
| 39 |
|
| 40 |
|
| 41 |
bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) |
| 42 |
$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ |
| 43 |
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ |
| 44 |
- $(OPENSSL_LIBS) |
| 45 |
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ |
| 46 |
+ $(OPENSSL_LIBS) $(LIBS) |
| 47 |
|
| 48 |
static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) |
| 49 |
$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ |
| 50 |
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ |
| 51 |
- $(OPENSSL_LIBS) |
| 52 |
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ |
| 53 |
+ $(OPENSSL_LIBS) $(LIBS) |
| 54 |
strip $@ |
| 55 |
|
| 56 |
|
| 57 |
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status |
| 58 |
cd $(topdir) \ |
| 59 |
--- src/filed/Makefile.in.orig 2011-10-30 08:03:42.000000000 -0400 |
| 60 |
+++ src/filed/Makefile.in 2011-10-30 14:15:28.018102837 -0400 |
| 61 |
@@ -92,17 +92,17 @@ |
| 62 |
@rm -f bacula-fd.exe |
| 63 |
|
| 64 |
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@ |
| 65 |
@echo "Linking $@ ..." |
| 66 |
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ |
| 67 |
- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) $(LZOLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ |
| 68 |
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) |
| 69 |
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) $(LZOLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \ |
| 70 |
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) |
| 71 |
|
| 72 |
static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ |
| 73 |
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ |
| 74 |
- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) $(LZOLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ |
| 75 |
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) |
| 76 |
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) $(LZOLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \ |
| 77 |
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) |
| 78 |
strip $@ |
| 79 |
|
| 80 |
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status |
| 81 |
cd $(topdir) \ |
| 82 |
&& CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status |
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
1.1 app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch |
| 87 |
|
| 88 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch?rev=1.1&view=markup |
| 89 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch?rev=1.1&content-type=text/plain |
| 90 |
|
| 91 |
Index: bacula-5.2.3-doc.patch |
| 92 |
=================================================================== |
| 93 |
# drop automatic installation of doc files |
| 94 |
--- Makefile.in.orig 2011-02-26 09:05:21.000000000 +0000 |
| 95 |
+++ Makefile.in 2011-02-26 09:06:01.000000000 +0000 |
| 96 |
@@ -34,8 +34,7 @@ |
| 97 |
autoconf/config.h.in autoconf/acconfig.h autoconf/Make.common.in \ |
| 98 |
autoconf/install-sh autoconf/mkinstalldirs |
| 99 |
|
| 100 |
-doc_files = VERIFYING technotes ChangeLog README ReleaseNotes LICENSE \ |
| 101 |
- INSTALL |
| 102 |
+doc_files = |
| 103 |
|
| 104 |
MKDIR = $(srcdir)/autoconf/mkinstalldirs |
| 105 |
LIBTOOL_DEPS = @LIBTOOL_DEPS@ |
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
1.1 app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch |
| 110 |
|
| 111 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch?rev=1.1&view=markup |
| 112 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch?rev=1.1&content-type=text/plain |
| 113 |
|
| 114 |
Index: bacula-5.2.3-lib-search-path.patch |
| 115 |
=================================================================== |
| 116 |
# If upgrading the old libraries gets linked first. So fix order of lib search path. |
| 117 |
--- src/console/Makefile.in.orig 2010-03-29 11:35:00.000000000 +0000 |
| 118 |
+++ src/console/Makefile.in 2010-03-29 11:45:14.000000000 +0000 |
| 119 |
@@ -47,7 +47,7 @@ |
| 120 |
|
| 121 |
|
| 122 |
bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) |
| 123 |
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ |
| 124 |
+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ |
| 125 |
$(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ |
| 126 |
$(OPENSSL_LIBS) |
| 127 |
|
| 128 |
|
| 129 |
|
| 130 |
|
| 131 |
1.1 app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch |
| 132 |
|
| 133 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch?rev=1.1&view=markup |
| 134 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch?rev=1.1&content-type=text/plain |
| 135 |
|
| 136 |
Index: bacula-5.2.3-Makefile.patch |
| 137 |
=================================================================== |
| 138 |
# stop build if there are errors in subdirs |
| 139 |
--- Makefile.in.orig 2010-07-20 16:53:44.000000000 +0000 |
| 140 |
+++ Makefile.in 2010-07-20 16:55:50.000000000 +0000 |
| 141 |
@@ -44,9 +44,8 @@ |
| 142 |
|
| 143 |
all: Makefile |
| 144 |
@for I in ${all_subdirs}; \ |
| 145 |
- do (cd $$I; echo "==>Entering directory `pwd`"; \ |
| 146 |
- $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \ |
| 147 |
- echo ""; echo ""; exit 1;)); \ |
| 148 |
+ do \ |
| 149 |
+ $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \ |
| 150 |
done |
| 151 |
|
| 152 |
depend: |
| 153 |
@@ -55,9 +54,8 @@ |
| 154 |
|
| 155 |
bacula-fd: Makefile |
| 156 |
@for I in ${fd_subdirs}; \ |
| 157 |
- do (cd $$I; echo "==>Entering directory `pwd`"; \ |
| 158 |
- $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \ |
| 159 |
- echo ""; echo ""; exit 1;)); \ |
| 160 |
+ do \ |
| 161 |
+ $(MAKE) DESTDIR=$(DESTDIR) -C $$I all || exit 1; \ |
| 162 |
done |
| 163 |
|
| 164 |
#------------------------------------------------------------------------- |
| 165 |
|
| 166 |
|
| 167 |
|
| 168 |
1.1 app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch |
| 169 |
|
| 170 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch?rev=1.1&view=markup |
| 171 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch?rev=1.1&content-type=text/plain |
| 172 |
|
| 173 |
Index: bacula-5.2.3-ldflags.patch |
| 174 |
=================================================================== |
| 175 |
# bat needs to respect LDFLAGS |
| 176 |
--- src/qt-console/bat.pro.in.orig 2010-07-20 18:28:50.000000000 +0000 |
| 177 |
+++ src/qt-console/bat.pro.in 2010-07-20 18:29:25.000000000 +0000 |
| 178 |
@@ -26,6 +26,7 @@ |
| 179 |
QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) |
| 180 |
QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p |
| 181 |
QMAKE_CLEAN += .libs/* bat |
| 182 |
+QMAKE_LFLAGS += @LDFLAGS@ |
| 183 |
|
| 184 |
qwt { |
| 185 |
INCLUDEPATH += @QWT_INC@ |
| 186 |
|
| 187 |
|
| 188 |
|
| 189 |
1.1 app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch |
| 190 |
|
| 191 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch?rev=1.1&view=markup |
| 192 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch?rev=1.1&content-type=text/plain |
| 193 |
|
| 194 |
Index: bacula-5.2.3-openssl-1.patch |
| 195 |
=================================================================== |
| 196 |
http://bugs.gentoo.org/328701 |
| 197 |
http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-5.0.2-openssl.patch?revision=1.3&view=markup |
| 198 |
|
| 199 |
--- src/lib/crypto.c |
| 200 |
+++ src/lib/crypto.c |
| 201 |
@@ -51,7 +51,7 @@ |
| 202 |
* For OpenSSL version 1.x, EVP_PKEY_encrypt no longer |
| 203 |
* exists. It was not an official API. |
| 204 |
*/ |
| 205 |
-#ifdef HAVE_OPENSSLv1 |
| 206 |
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) |
| 207 |
#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old |
| 208 |
#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old |
| 209 |
#endif |
| 210 |
--- src/lib/tls.c |
| 211 |
+++ src/lib/tls.c |
| 212 |
@@ -315,7 +315,7 @@ bool tls_postconnect_verify_host(JCR *jc |
| 213 |
extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext))); |
| 214 |
|
| 215 |
if (strcmp(extname, "subjectAltName") == 0) { |
| 216 |
-#ifdef HAVE_OPENSSLv1 |
| 217 |
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) |
| 218 |
const X509V3_EXT_METHOD *method; |
| 219 |
#else |
| 220 |
X509V3_EXT_METHOD *method; |
| 221 |
|
| 222 |
|
| 223 |
|
| 224 |
1.1 app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch |
| 225 |
|
| 226 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch?rev=1.1&view=markup |
| 227 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch?rev=1.1&content-type=text/plain |
| 228 |
|
| 229 |
Index: bacula-5.2.3-as-needed.patch |
| 230 |
=================================================================== |
| 231 |
# see bug #310087 |
| 232 |
diff -urN bacula-5.2.1.orig/src/findlib/Makefile.in bacula-5.2.1/src/findlib/Makefile.in |
| 233 |
--- bacula-5.2.1.orig/src/findlib/Makefile.in 2010-02-24 16:33:48.000000000 +0100 |
| 234 |
+++ bacula-5.2.1/src/findlib/Makefile.in 2010-03-22 17:37:43.772805754 +0100 |
| 235 |
@@ -59,7 +59,7 @@ |
| 236 |
|
| 237 |
libbacfind.la: Makefile $(LIBBACFIND_LOBJS) |
| 238 |
@echo "Making $@ ..." |
| 239 |
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE) |
| 240 |
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE) -L../lib -lbac $(LIBS) $(OPENSSL_LIBS) |
| 241 |
|
| 242 |
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status |
| 243 |
cd $(topdir) \ |
Archives