Really install /etc/dma/*.conf as root/mail/640.

Debian:		#544664
Reported by:	Tino Keitel <tino.keitel+debbugs@tikei.de>

diff --git a/changelog b/changelog
index a6689bed1dfac3a34c84f9944a501c51c154798c..a337501b53a44fc67a33fa5cfb9a965e04c27198 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+dma (0.0.2009.07.17-3) unstable; urgency=low
+
+  * Really install the files in /etc/dma/ as root/mail/640.
+    Closes: #544664
+
+ -- Peter Pentchev <roam@ringlet.net>  Wed, 04 Nov 2009 14:09:45 +0200
+
 dma (0.0.2009.07.17-2) unstable; urgency=low
 
   * Allow the spool directory to live on a filesystem that does not

diff --git a/dma.lintian-overrides b/dma.lintian-overrides
index 46cc64180e74aa967cad5354ab38d952d89c8f5e..fbf2e1d9106b9182e04afa292034f96e0a0308e6 100644 (file)
--- a/dma.lintian-overrides
+++ b/dma.lintian-overrides
@@ -1,4 +1,5 @@
 dma: setgid-binary usr/sbin/dma 2755 root/mail
 dma: non-standard-dir-perm var/spool/dma/ 0770 != 0755
+dma: non-standard-file-perm etc/dma/*
 dma: no-upstream-changelog
 dma: manpage-has-errors-from-man *Unknown DragonFly version*

diff --git a/patches/04-debian-setgid.patch b/patches/04-debian-setgid.patch
index d71824752be16c05cadc07919441ade6fa064e25..430cafa7072bd9433dd4baeeeb158a0fb0cb2ff5 100644 (file)
--- a/patches/04-debian-setgid.patch
+++ b/patches/04-debian-setgid.patch
@@ -1,10 +1,12 @@
 Description: Install the dma binary with the correct permissions.
  As per the Debian Policy, change the /usr/sbin/dma permissions from 2555
  to 2755, since removing root write access gains us nothing.
+ Also, install the etc/ files with the correct owner and group; it seems
+ that Debian pmake's bsd.files.mk does not understand SHAREOWN and SHAREGRP.
 Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
 Forwarded: not-needed
 Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2009-09-01
+Last-Update: 2009-11-04
 
 --- a/Makefile
 +++ b/Makefile
@@ -17,3 +19,16 @@ Last-Update: 2009-09-01
  WARNS?=       6
  
  # The pmake Debian package does not seem to deal properly with y.tab.h
+--- a/etc/Makefile
++++ b/etc/Makefile
+@@ -1,8 +1,8 @@
+ # $DragonFly: src/etc/dma/Makefile,v 1.3 2008/02/12 22:10:20 matthias Exp $
+ 
+ FILESDIR=     /etc/dma
+-SHAREOWN=     root
+-SHAREGRP=     mail
++FILESOWN=     root
++FILESGRP=     mail
+ FILESMODE=    640
+ 
+ .if !exists(${DESTDIR}/etc/dma/auth.conf)

diff --git a/rules b/rules
index acc0cdf5b6a20f98cf6086ef4d0eac7eee0a745a..a6ed15cf7ffc6d97ad0d40d0d72c762053dd61d4 100755 (executable)
--- a/rules
+++ b/rules
@@ -44,7 +44,7 @@ override_dh_auto_install:
        install -d -o root -g mail -m 770 $(CURDIR)/debian/$(PACKAGE)/var/spool/dma
 
 override_dh_fixperms:
-       dh_fixperms -Xusr/sbin/dma -Xvar/spool/dma
+       dh_fixperms -Xusr/sbin/dma -Xvar/spool/dma -Xetc/dma
 
 %:
        dh --with quilt $@