[pkg-bacula-commits] [bacula] 15/27: Updated debian/patches/switch-nonfree-sha1-to-openssl.patch

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

cl-guest pushed a commit to branch master
in repository bacula.

commit 0227da9e7b095b804fb38d8cecb4e2a1b3ad65af
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Jul 20 00:14:17 2015 +0200

    Updated debian/patches/switch-nonfree-sha1-to-openssl.patch
---
 debian/patches/switch-nonfree-sha1-to-openssl.patch | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian/patches/switch-nonfree-sha1-to-openssl.patch b/debian/patches/switch-nonfree-sha1-to-openssl.patch
index 18c1d59..a4e1835 100644
--- a/debian/patches/switch-nonfree-sha1-to-openssl.patch
+++ b/debian/patches/switch-nonfree-sha1-to-openssl.patch
@@ -5,9 +5,8 @@ Author: Alexander Golovko <alexandro at ankalagon.ru>
 Reviewed-by: Luca Capello <luca at pca.it>
 Last-Update: 2012-06-02
 
-diff -Nur a/src/lib/lib.h bacula-5.0.2/src/lib/lib.h
---- a/src/lib/lib.h	2012-05-10 01:23:02.083871937 +0400
-+++ b/src/lib/lib.h	2012-05-10 01:23:39.303998930 +0400
+--- a/src/lib/lib.h
++++ b/src/lib/lib.h
 @@ -59,7 +59,7 @@
  #include "fnmatch.h"
  #endif
@@ -17,9 +16,8 @@ diff -Nur a/src/lib/lib.h bacula-5.0.2/src/lib/lib.h
  #include "tree.h"
  #include "watchdog.h"
  #include "btimers.h"
-diff -Nur a/src/lib/Makefile.in bacula-5.0.2/src/lib/Makefile.in
---- a/src/lib/Makefile.in	2012-05-10 01:23:02.083871937 +0400
-+++ b/src/lib/Makefile.in	2012-05-10 01:31:31.079883130 +0400
+--- a/src/lib/Makefile.in
++++ b/src/lib/Makefile.in
 @@ -39,7 +39,7 @@
  		fnmatch.h guid_to_name.h htable.h lex.h \
  		lib.h md5.h mem_pool.h message.h mntent_cache.h \
@@ -39,20 +37,20 @@ diff -Nur a/src/lib/Makefile.in bacula-5.0.2/src/lib/Makefile.in
  	      util.c var.c watchdog.c workq.c btimers.c \
  	      address_conf.c breg.c htable.c lockmgr.c devlock.c
 @@ -193,13 +193,6 @@
- 	rm -f md5.o
+ 	$(RMF) md5.o
  	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) md5.c
  
 -sha1sum: Makefile sha1.o
--	rm -f 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)
--	rm -f sha1.o
+-	$(RMF) sha1.o
 -	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) sha1.c
 -
  bsnprintf: Makefile bsnprintf.o
- 	rm -f bsnprintf.o
+ 	$(RMF) bsnprintf.o
  	$(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE)  $(CFLAGS) bsnprintf.c
-@@ -247,7 +240,7 @@
+@@ -250,7 +243,7 @@
  
  clean:	libtool-clean
  	@$(RMF) core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git