[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, squeeze-backports, updated. debian/5.2.6+dfsg-7-18-g32d7ccc

[Bart Swedrowski]

The following commit has been merged in the squeeze-backports branch:
commit 081a7692220175c49728a159cda76e607a4aa85e
Merge: ab040aa4480c7976427785e2a425c2fb34251c17 0b948569e6ec1245251691bd00ca0f58510ee6f2
Author: Bart Swedrowski <bart at timedout.org>
Date:   Tue Jan 22 15:49:35 2013 +0000

    Merge debian/5.2.6+dfsg-6 with squeeze-backports branch

diff --combined debian/changelog
index 9ad6b8d,a7843c9..525c1dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,36 +1,43 @@@
- bacula (5.2.6+dfsg-5~bpo60+2) squeeze-backports; urgency=low
+ bacula (5.2.6+dfsg-6) unstable; urgency=high
  
-   [ Bart Swedrowski ]
-   * switch back to using /var/run
- 
-  -- Bart Swedrowski <bart at timedout.org>  Mon, 01 Oct 2012 12:01:31 +0100
+   [ Alexander Golovko ]
+   * debian/bacula-director-*.{install,postinst},
+     debian/additions/sqlite3/delete_catalog_backup.md5sum,
+     debian/additions/common-functions.dpkg (Closes: #688199):
+     + switch /etc/bacula/scripts/delete_catalog_backup under ucf control.
+   * debian/control:
+     - remove mtx from build-depends on Hurd, due to package unavailability and
+       unneccessary functionality on this platform.
+   * debian/rules:
+     + add lintian overrides for hardening for all packages.
+     - disable xattr and acl on Hurd.
+   * Debconf templates and debian/control reviewed by the debian-l10n-
+     english team as part of the Smith review project. (Closes: #687240)
+ 
+   [ Debconf translation updates ]
+   * Russian (Yuri Kozlov). Closes: #689442
+   * Spanish; (# traductor (campo Last-Translator) y ponga en copia a la
+     lista de Javier Fernández-Sanguino).  Closes: #689467
+   * Danish (Joe Hansen).  Closes: #689643
+   * French (Julien Patriarca).  Closes: #689796
+   * Czech (Michal Simunek).  Closes: #689797
+   * German (Holger Wansing).  Closes: #690077
+   * Japanese (victory).  Closes: #690550
+   * Galician (Jorge Barreiro).  Closes: #690595
+   * Polish (Michał Kułach).  Closes: #690732
+   * Italian (Beatrice Torracca).  Closes: #690745
+   * Portuguese (Rui Branco).  Closes: #690779
+   * Swedish (Martin Bagge / brother).  Closes: #690896
+ 
+  -- Alexander Golovko <alexandro at ankalagon.ru>  Wed, 24 Oct 2012 15:19:49 +0400
  
 +bacula (5.2.6+dfsg-5~bpo60+1) squeeze-backports; urgency=low
 +
 +  [ Bart Swedrowski ]
 +  * Rebuild for squeeze-backports.
 +
 + -- Bart Swedrowski <bart at timedout.org>  Tue, 25 Sep 2012 14:55:00 +0100
 +
  bacula (5.2.6+dfsg-5) unstable; urgency=low
  
    * debian/control:
@@@ -123,13 -142,6 +149,13 @@@ bacula (5.2.6+dfsg-2) unstable; urgency
  
   -- Luca Capello <luca at pca.it>  Fri, 29 Jun 2012 05:59:45 +0200
  
 +bacula (5.2.6+dfsg-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * Change Build-Depends debhelper (>= 8.0.0), libpq-dev (>= 8.4)
 +
 + -- Bart Swedrowski <bart at timedout.org>  Fri, 22 Jun 2012 16:12:23 +0100
 +
  bacula (5.2.6+dfsg-1) unstable; urgency=high
  
    [ Alexander Golovko ]
diff --combined debian/rules
index 5a436c8,485cfe2..ba6123e
--- a/debian/rules
+++ b/debian/rules
@@@ -46,7 -46,7 +46,7 @@@ CONF_ALL	= 
  	--with-pid-dir=/run/bacula \
  	--with-smtp-host=localhost \
  	--with-working-dir=/var/lib/bacula \
 -	--with-subsys-dir=/run/lock \
 +	--with-subsys-dir=/var/run/lock \
  	--with-dump-email=root \
  	--with-job-email=root \
  	--with-systemd=/lib/systemd/system \
@@@ -57,6 -57,10 +57,10 @@@ ifeq ($(DEB_HOST_ARCH_OS),kfreebsd
  CONF_ALL	+= --disable-acl --disable-xattr
  endif
  
+ ifeq ($(DEB_HOST_ARCH_OS),hurd)
+ CONF_ALL	+= --disable-acl --disable-xattr
+ endif
+ 
  LONGNAME_mysql		= mysql
  LONGNAME_pgsql		= postgresql
  LONGNAME_sqlite3	= sqlite3
@@@ -166,6 -170,19 +170,19 @@@ override_dh_clean
  	dh_autotools-dev_restoreconfig
  	dh_clean
  
+ override_dh_lintian:
+ 	dh_lintian
+ 	# override hardening for all packages, due to upstream not recommend
+ 	# it usage: 
+ 	# https://bugs.launchpad.net/ubuntu/+source/bacula/+bug/265102/
+ 	for pkg in $$(sed -ne 's/Package: \(.*\)/\1/p' debian/control); do \
+ 		install -d "debian/$$pkg/usr/share/lintian/overrides"; \
+ 		echo hardening-no-fortify-functions \
+ 			>>"debian/$$pkg/usr/share/lintian/overrides/$$pkg"; \
+ 		echo hardening-no-relro \
+ 			>>"debian/$$pkg/usr/share/lintian/overrides/$$pkg"; \
+ 	done
+ 
  override_dh_fixperms:
  	dh_fixperms
  	chmod -x debian/bacula-sd/etc/bacula/scripts/mtx-changer.conf

-- 
Bacula, a network backup, recovery and verification program