[gentoo-commits] gentoo-x86 commit in app-backup/bacula/files/5.0.3: bacula-fd.confd bacula-5.0.3-lib-search-path.patch bacula-fd.initd bacula-dir.initd bacula-dir.confd bacula-sd.initd bacula-5.0.3-Makefile.patch bacula-sd.confd bacula-5.0.3-ldflags.patch bacula-5.0.3-openssl-1.patch

[Thomas Beierlein (tomjbe)]

tomjbe      10/08/21 07:09:25

  Added:                bacula-fd.confd bacula-5.0.3-lib-search-path.patch
                        bacula-fd.initd bacula-dir.initd bacula-dir.confd
                        bacula-sd.initd bacula-5.0.3-Makefile.patch
                        bacula-sd.confd bacula-5.0.3-ldflags.patch
                        bacula-5.0.3-openssl-1.patch
  Log:
  Version bump to 5.0.3. Cleanup of old versions.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-backup/bacula/files/5.0.3/bacula-fd.confd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-fd.confd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-fd.confd?rev=1.1&content-type=text/plain

Index: bacula-fd.confd
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-fd.confd,v 1.1 2010/08/21 07:09:25 tomjbe Exp $

# Config file for /etc/init.d/bacula-fd

# Options for the file daemon.
FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"



1.1                  app-backup/bacula/files/5.0.3/bacula-5.0.3-lib-search-path.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-5.0.3-lib-search-path.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-5.0.3-lib-search-path.patch?rev=1.1&content-type=text/plain

Index: bacula-5.0.3-lib-search-path.patch
===================================================================
# 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)
 



1.1                  app-backup/bacula/files/5.0.3/bacula-fd.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-fd.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-fd.initd?rev=1.1&content-type=text/plain

Index: bacula-fd.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-fd.initd,v 1.1 2010/08/21 07:09:25 tomjbe Exp $

depend() {
	need net
	use dns
}

start() {
	ebegin "Starting bacula file daemon"
	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
		-- ${FD_OPTIONS}
	eend $?
}

stop() {
	ebegin "Stopping bacula file daemon"
	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
	eend $?
}



1.1                  app-backup/bacula/files/5.0.3/bacula-dir.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-dir.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-dir.initd?rev=1.1&content-type=text/plain

Index: bacula-dir.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-dir.initd,v 1.1 2010/08/21 07:09:25 tomjbe Exp $

depend() {
	need net
	if [ "${LOCAL_DB}" -eq 1 ]; then
		need "%database%"
	fi
	use dns bacula-fd bacula-sd
}

start() {
	ebegin "Starting bacula director"
	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
		-- ${DIR_OPTIONS}
	eend $?
}

stop() {
	ebegin "Stopping bacula director"
	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
	eend $?
}



1.1                  app-backup/bacula/files/5.0.3/bacula-dir.confd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-dir.confd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-dir.confd?rev=1.1&content-type=text/plain

Index: bacula-dir.confd
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-dir.confd,v 1.1 2010/08/21 07:09:25 tomjbe Exp $

# Config file for /etc/init.d/bacula-dir

# If the database server where you store your bacula catalog
# is on a different machine, please set this to 0.
# Setting it to 1 makes bacula-dir depend on the corresponding
# database service selected at package compile time.
LOCAL_DB=1

# Options for the director daemon.
# The director can be run as a non-root user, however
# please ensure that this user has proper permissions to
# access your backup devices.
DIR_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-dir.conf"



1.1                  app-backup/bacula/files/5.0.3/bacula-sd.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-sd.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-sd.initd?rev=1.1&content-type=text/plain

Index: bacula-sd.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-sd.initd,v 1.1 2010/08/21 07:09:25 tomjbe Exp $

depend() {
	need net
	use dns
}

start() {
	ebegin "Starting bacula storage daemon"
	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
		-- ${SD_OPTIONS}
	eend $?
}

stop() {
	ebegin "Stopping bacula storage daemon"
	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid 
	eend $?
}



1.1                  app-backup/bacula/files/5.0.3/bacula-5.0.3-Makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-5.0.3-Makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-5.0.3-Makefile.patch?rev=1.1&content-type=text/plain

Index: bacula-5.0.3-Makefile.patch
===================================================================
--- 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
 
 #-------------------------------------------------------------------------



1.1                  app-backup/bacula/files/5.0.3/bacula-sd.confd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-sd.confd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-sd.confd?rev=1.1&content-type=text/plain

Index: bacula-sd.confd
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-sd.confd,v 1.1 2010/08/21 07:09:25 tomjbe Exp $

# Config file for /etc/init.d/bacula-sd

# Options for the storage daemon.
# The storage daemon can be run as a non-root user, however
# please ensure that this user has proper permissions to
# access your backup devices.
SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"



1.1                  app-backup/bacula/files/5.0.3/bacula-5.0.3-ldflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-5.0.3-ldflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-5.0.3-ldflags.patch?rev=1.1&content-type=text/plain

Index: bacula-5.0.3-ldflags.patch
===================================================================
--- 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@ 



1.1                  app-backup/bacula/files/5.0.3/bacula-5.0.3-openssl-1.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-5.0.3-openssl-1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/5.0.3/bacula-5.0.3-openssl-1.patch?rev=1.1&content-type=text/plain

Index: bacula-5.0.3-openssl-1.patch
===================================================================
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;