[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#769027: (pre-approval for) unblock: dhcpy6d/0.4-2



Hi,

Axel Beckert wrote:
> Since the minimal fix for #767817 introduced a new lintian warning
> (executable-not-elf-or-script usr/share/dhcpy6d/default/dhcpy6d) and
> because the fix #768989 already modifies the one line in
> debian/dhcpy6d.postinst which needs to be changed to fix the remaining
> part of ...
> 
> #769006 [m|  |  ] [dhcpy6d] dhcpy6d: Multiple files with unnecessary executable bit
> 
> .... I included a fix for this issue/lintian warning, too, but I have
> neither yet pushed that part nor uploaded 0.4-2 yet.
> 
> So if the fix for #769006 included below is not ok, and the lintian
> warning "executable-not-elf-or-script" is ok to be introduced by the
> RC fix, I'll upload 0.4-2 without the #769006 fix (and send a new
> debdiff afterwards).

After having sent this mail, I noticed that there is one more facet of
#769006. The following patch would also remove the executable bit of
rotated logs:

diff --git a/etc/logrotate.d/dhcpy6d b/etc/logrotate.d/dhcpy6d
index 6a11d52..d4169bb 100644
--- a/etc/logrotate.d/dhcpy6d
+++ b/etc/logrotate.d/dhcpy6d
@@ -4,6 +4,6 @@
        rotate 4
        compress
        notifempty
-       create 770 dhcpy6d dhcpy6d
+       create 660 dhcpy6d dhcpy6d
 }

Actually this has been fixed upstream just today.
 
Since this is upstream code which I don't want to touch anymore for
Jessie, I'd replace the current symlink (debian/dhcpy6d.logrotate ->
../etc/logrotate.d/dhcpy6d) with a copy patched as above. The full git
diff would be:

diff --git a/debian/dhcpy6d.logrotate b/debian/dhcpy6d.logrotate
deleted file mode 120000
index ff6efc1..0000000
--- a/debian/dhcpy6d.logrotate
+++ /dev/null
@@ -1 +0,0 @@
-../etc/logrotate.d/dhcpy6d
\ No newline at end of file
diff --git a/debian/dhcpy6d.logrotate b/debian/dhcpy6d.logrotate
new file mode 100644
index 0000000..d4169bb
--- /dev/null
+++ b/debian/dhcpy6d.logrotate
@@ -0,0 +1,9 @@
+/var/log/dhcpy6d.log {
+	weekly
+	missingok
+	rotate 4
+	compress
+	notifempty
+	create 660 dhcpy6d dhcpy6d
+}
+

I'd like to add that to the upload, too. But I'm ok if that's out of
scope. (I'm also fine with splitting up #769006 into multiple issues
and only fixing some of them for Jessie.)

		Regards, Axel
-- 
 ,''`.  |  Axel Beckert <abe@debian.org>, http://people.debian.org/~abe/
: :' :  |  Debian Developer, ftp.ch.debian.org Admin
`. `'   |  1024D: F067 EA27 26B9 C3FC 1486  202E C09E 1D89 9593 0EDE
  `-    |  4096R: 2517 B724 C5F6 CA99 5329  6E61 2FF9 CD59 6126 16B5


Reply to: