[Pkg-clamav-commits] [SCM] packaging for clamav-unoffical-sigs branch, master, updated. debian/3.3-2-43-gcfca1cd

[Paul Wise]

The following commit has been merged in the master branch:
commit cfca1cd27befce1c9ce8ceabb9a3fc51f89896da
Author: Paul Wise <pabs at debian.org>
Date:   Fri Feb 11 15:34:03 2011 +0800

    Allow sysadmins to easily override default configs (Closes: #566620)

diff --git a/debian/README b/debian/README
new file mode 100644
index 0000000..3e6626d
--- /dev/null
+++ b/debian/README
@@ -0,0 +1,2 @@
+# Please see the README.Debian file for more info:
+# /usr/share/doc/clamav-unofficial-sigs/README.Debian
diff --git a/debian/README.Debian b/debian/README.Debian
index 4118980..584419a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -6,6 +6,19 @@ Some of the default settings have been altered, see here for more info:
 /usr/share/clamav-unofficial-sigs/conf.d/01-debian.conf
 
 /----------------------------------------------------------------------------
+| Overriding default config
+
+To override the default configuration you can either modify [1] or
+or place files named *.conf in [2]. Any *.conf file in [2] that has
+the same name as one of the files in [3] will cause the file in [3]
+to be completely ignored. This makes it easy for a sysadmin to
+disable any unwanted configuration in [3].
+
+1. /etc/clamav-unofficial-sigs.conf
+2. /etc/clamav-unofficial-sigs.conf.d/
+3. /usr/share/clamav-unofficial-sigs/conf.d/
+
+/----------------------------------------------------------------------------
 | Enhanced security
 
 You might like to run the clamav-unofficial-sigs script as a non-root,
diff --git a/debian/changelog b/debian/changelog
index 9dfc390..6b6d1cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ clamav-unofficial-sigs (3.7.1-1) UNRELEASED; urgency=low
     - Fixes a minor bashism in the sig creation option (Closes: #547743)
     - Drops MSRBL signature, no updates since July 2009 (Closes: #612796)
     - Supports new uncompressed SecuriteInfo signatures (Closes: #612795)
+  * Allow sysadmins to easily override default configs (Closes: #566620)
 
  -- Paul Wise <pabs at debian.org>  Fri, 11 Feb 2011 14:41:14 +0800
 
diff --git a/debian/dirs b/debian/dirs
index c91941e..e01c4e1 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,4 +1,5 @@
 etc
+etc/clamav-unofficial-sigs.conf.d
 usr/sbin
 usr/share/clamav-unofficial-sigs/conf.d
 var/cache/clamav-unofficial-sigs/ss-dbs
diff --git a/debian/etc.conf b/debian/etc.conf
index 431b520..045c4d3 100644
--- a/debian/etc.conf
+++ b/debian/etc.conf
@@ -5,9 +5,13 @@
 # /usr/share/clamav-unofficial-sigs/conf.d/01-debian.conf
 
 # Source all the configuration files from upstream, Debian and elsewhere
-for f in /usr/share/clamav-unofficial-sigs/conf.d/*.conf ; do
-	if [ -s "$f" ] ; then
-		. $f
+etc=/etc/clamav-unofficial-sigs.conf.d/
+usr=/usr/share/clamav-unofficial-sigs/conf.d/
+for f in $(find $etc $usr -iname '*.conf' -printf '%f\n' 2>/dev/null | LC_ALL=C sort -u) ; do
+	if [ -f "$etc$f" ]; then
+		. "$etc$f"
+	elif [ -s "$usr$f" ]; then
+		. "$usr$f"
 	fi
 done
 
diff --git a/debian/install b/debian/install
index b99a970..cdb4e45 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,3 @@
 debian/publickey.gpg usr/share/clamav-unofficial-sigs/
+debian/README etc/clamav-unofficial-sigs.conf.d
 

-- 
packaging for clamav-unoffical-sigs