Package: bacula / 7.4.4+dfsg-6

switch-nonfree-sha1-to-openssl.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
Description: Switch from non-free SHA1 implementation to openssl
Bug-Debian: 658326
Bug: http://bugs.bacula.org/view.php?id=1869
Author: Alexander Golovko <alexandro@ankalagon.ru>
Reviewed-by: Luca Capello <luca@pca.it>
Last-Update: 2012-06-02

--- a/src/lib/lib.h
+++ b/src/lib/lib.h
@@ -50,7 +50,7 @@
 #include "fnmatch.h"
 #endif
 #include "md5.h"
-#include "sha1.h"
+#include "openssl/sha.h"
 #include "tree.h"
 #include "watchdog.h"
 #include "btimers.h"
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -38,7 +38,7 @@
 		fnmatch.h guid_to_name.h htable.h lex.h \
 		lib.h md5.h mem_pool.h message.h \
 		openssl.h plugins.h protos.h queue.h rblist.h \
-		runscript.h rwlock.h serial.h sellist.h sha1.h \
+		runscript.h rwlock.h serial.h sellist.h \
 		smartall.h status.h tls.h tree.h var.h \
 		waitq.h watchdog.h workq.h \
 		parse_conf.h ini.h \
@@ -54,7 +54,7 @@
 	      guid_to_name.c hmac.c jcr.c lex.c alist.c dlist.c \
 	      md5.c message.c mem_pool.c openssl.c \
 	      plugins.c priv.c queue.c bregex.c \
-	      runscript.c rwlock.c scan.c sellist.c serial.c sha1.c \
+	      runscript.c rwlock.c scan.c sellist.c serial.c \
 	      signal.c smartall.c rblist.c tls.c tree.c \
 	      util.c var.c watchdog.c workq.c btimers.c \
 	      address_conf.c breg.c htable.c lockmgr.c devlock.c
@@ -176,13 +176,6 @@
 	$(RMF) md5.o
 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) md5.c
 
-sha1sum: Makefile sha1.o
-	$(RMF) sha1.o
-	$(CXX) -DSHA1_SUM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE)	$(CFLAGS) sha1.c
-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L. -o $@ sha1.o $(DLIB) -lbac -lm $(LIBS) $(OPENSSL_LIBS)
-	$(RMF) sha1.o
-	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) sha1.c
-
 bsnprintf: Makefile bsnprintf.o
 	$(RMF) bsnprintf.o
 	$(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE)  $(CFLAGS) bsnprintf.c
@@ -232,7 +225,7 @@
 
 clean:	libtool-clean
 	@$(RMF) core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3
-	@$(RMF) rwlock_test md5sum sha1sum
+	@$(RMF) rwlock_test md5sum
 
 realclean: clean
 	@$(RMF) tags