Upgrade to 7.4.2

see http://www.bacula.org/release-7-4-2/

5 files changed, 15 insertions, 47 deletions

diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index d42b272104dd..ea00e1331c39 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
-DISTVERSION=	7.4.0
-PORTREVISION=   2
+DISTVERSION=	7.4.2
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
diff --git a/sysutils/bacula-server/distinfo b/sysutils/bacula-server/distinfo
index 090e3f9911e3..df17a06c4579 100644
--- a/sysutils/bacula-server/distinfo
+++ b/sysutils/bacula-server/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bacula-7.4.0.tar.gz) = fe850b783523edb19fb4dbfa8c44752d20955121b71a52b0740a9e765bfd73cb
-SIZE (bacula-7.4.0.tar.gz) = 3314218
+TIMESTAMP = 1469108764
+SHA256 (bacula-7.4.2.tar.gz) = 0c5f7fe1d35fc2aa4ffba73e977b710b955b1fe3e45ab90c67b47b279152ad67
+SIZE (bacula-7.4.2.tar.gz) = 3311355
diff --git a/sysutils/bacula-server/files/patch-src_console_Makefile.in b/sysutils/bacula-server/files/patch-src_console_Makefile.in
index 4b59666d296a..d41747a16d07 100644
--- a/sysutils/bacula-server/files/patch-src_console_Makefile.in
+++ b/sysutils/bacula-server/files/patch-src_console_Makefile.in
@@ -1,20 +1,5 @@
 --- src/console/Makefile.in.orig	2015-08-13 13:52:24 UTC
 +++ src/console/Makefile.in
-@@ -48,12 +48,12 @@ all: Makefile bconsole @STATIC_CONS@
- 
- 
- 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)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-+	$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
- 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- 	      $(OPENSSL_LIBS)
- 	strip $@
 @@ -121,7 +121,7 @@ uninstall:
  depend:
  	@$(MV) Makefile Makefile.bak
diff --git a/sysutils/bacula-server/files/patch-src_dird_Makefile.in b/sysutils/bacula-server/files/patch-src_dird_Makefile.in
index 1254a5e508e3..132291431a90 100644
--- a/sysutils/bacula-server/files/patch-src_dird_Makefile.in
+++ b/sysutils/bacula-server/files/patch-src_dird_Makefile.in
@@ -1,23 +1,6 @@
 --- src/dird/Makefile.in.orig	2015-08-13 13:52:24 UTC
 +++ src/dird/Makefile.in
-@@ -65,14 +65,14 @@ bacula-dir: Makefile $(SVROBJS) ../lib/l
- 	    ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
- 	    ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
- 	@echo "Linking $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-+	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) -L../lib -L../cats -L../findlib $(LDFLAGS) -o $@ $(SVROBJS) \
- 	      -lbacfind -lbacsql -lbaccats -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \
- 	      $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
- 
- static-bacula-dir:  Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
- 		   ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
- 		   ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-+	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) -static -L../lib -L../cats -L../findlib $(LDFLAGS) -o $@ $(SVROBJS) \
- 	      -lbacfind -lbacsql -lbaccats -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \
- 	      $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
- 	strip $@
-@@ -137,7 +137,7 @@ uninstall:
+@@ -140,7 +140,7 @@ uninstall:
  depend:
  	@$(MV) Makefile Makefile.bak
  	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
diff --git a/sysutils/bacula-server/files/patch-src_tools_Makefile.in b/sysutils/bacula-server/files/patch-src_tools_Makefile.in
index 623f7c488976..ba2f1c1ff041 100644
--- a/sysutils/bacula-server/files/patch-src_tools_Makefile.in
+++ b/sysutils/bacula-server/files/patch-src_tools_Makefile.in
@@ -1,6 +1,6 @@
---- src/tools/Makefile.in.orig	2015-08-13 13:52:24 UTC
-+++ src/tools/Makefile.in
-@@ -57,26 +57,26 @@ all: Makefile $(TOOLS) gigaslam grow
+--- src/tools/Makefile.in.orig	2016-07-06 19:03:41.000000000 +0000
++++ src/tools/Makefile.in	2016-07-21 14:48:28.406720193 +0000
+@@ -58,26 +58,26 @@
  	@echo " "
  
  bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)	    
@@ -20,7 +20,7 @@
  	 ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS)
 -	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \
 +	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) -o $@ dbcheck.o $(DIRCONFOBJS) \
- 	  -lbaccats -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 	  -lbaccats -lbacsql -lbaccfg -lbac -lm $(ZLIBS) $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
  
  fstype: Makefile fstype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
 -	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm \
@@ -33,7 +33,7 @@
  	  $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
  
  dird_conf.o: ../dird/dird_conf.c
-@@ -94,29 +94,29 @@ timelimit: timelimit.o
+@@ -95,29 +95,29 @@
  
  testfind: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
  	  ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(FINDOBJS)
@@ -60,16 +60,16 @@
  	../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bbatch.o
 -	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \
 +	$(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib $(LDFLAGS) -o $@ bbatch.o \
- 	  -lbaccats -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 	  -lbaccats -lbacsql -lbac -lm $(ZLIBS) $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
  
  bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \
  	   ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o
 -	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bvfs_test.o  \
 +	$(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ bvfs_test.o  \
- 	  -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 	  -lbaccats -lbacsql -lbacfind -lbac -lm $(ZLIBS) $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
  
  cats_test.o: cats_test.c
-@@ -124,7 +124,7 @@ cats_test.o: cats_test.c
+@@ -125,7 +125,7 @@
  	$(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
  
  cats_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) cats_test.o
@@ -78,7 +78,7 @@
  	  -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
  
  gigaslam.o: gigaslam.c
-@@ -134,13 +134,13 @@ gigaslam: gigaslam.o
+@@ -135,13 +135,13 @@
  	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o
  
  grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@@ -94,7 +94,7 @@
  
  Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
  	cd $(topdir) \
-@@ -197,7 +197,7 @@ uninstall:
+@@ -198,7 +198,7 @@
  depend:
  	@$(MV) Makefile Makefile.bak
  	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile