r74323 - in /trunk/pperl/debian: changelog patches/287119_no-umask0.patch

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Fri May 13 12:06:07 2011
New Revision: 74323

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=74323
Log:
Update the test part of 287119_no-umask0.patch: don't check for mode 664
but test explicitly that the files are not world-writable. Otherwise the
test fails with umask 0002 and only works with 0022.

Modified:
    trunk/pperl/debian/changelog
    trunk/pperl/debian/patches/287119_no-umask0.patch

Modified: trunk/pperl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/pperl/debian/changelog?rev=74323&op=diff
==============================================================================
--- trunk/pperl/debian/changelog (original)
+++ trunk/pperl/debian/changelog Fri May 13 12:06:07 2011
@@ -1,27 +1,5 @@
 pperl (0.25-6) UNRELEASED; urgency=low
 
-   FIXME: tests fail leaving background processes when built outside of
-   chroot (dam)
-   
-   The error is about:
-     ok(S_IMODE($mode), 0644);
-   My usual umask is 0002, with this setting I trigger the error; if I  
-   set "umask 0022" and then call dpkg-buildpackage, the test suite
-   passes. - Setting it in d/rules doesn't seem to help
-   
-   and this check is added in debian/patches/287119_no-umask0.patch because of
-   #287119
-   
-   my current guess is that the check is too strict ...; AIUI this is about
-   not creating world-writable files, so 664 and 644 should both be fine;
-   actually the patch removes changing the umask, so maybe we can save it and
-   check it's the same afterwards?
-   
-   after reading `perldoc perlfunc' --> stat(): the following seems to work:
-   - ok(S_IMODE($mode), 0644);
-   + ok(( $mode & S_IWOTH ) ? 0 : 1) # not world-writable
-   (passes with umask 0002 and 0022, fails with 0000)
-   
   [ Damyan Ivanov ]
   * Take over for the Debian Perl Group on maintainer's request
     (http://lists.debian.org/debian-perl/2008/04/msg00070.html)
@@ -46,6 +24,9 @@
   * Integrate patch from Niko Tyni, that was applied in the -5.1 NMU, as a
     separate patch.
   * Include NMU changelog entry.
+  * Update the test part of 287119_no-umask0.patch: don't check for mode 664
+    but test explicitly that the files are not world-writable. Otherwise the
+    test fails with umask 0002 and only works with 0022.
 
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.

Modified: trunk/pperl/debian/patches/287119_no-umask0.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/pperl/debian/patches/287119_no-umask0.patch?rev=74323&op=diff
==============================================================================
--- trunk/pperl/debian/patches/287119_no-umask0.patch (original)
+++ trunk/pperl/debian/patches/287119_no-umask0.patch Fri May 13 12:06:07 2011
@@ -1,3 +1,11 @@
+Description: Don't change umaks when becoming a daemon to avoid world-writable files.
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/287119
+Forwarded: no
+Author: Florian Weimer <fw at deneb.enyo.de>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-05-13
+
 --- a/pperl.h.header
 +++ b/pperl.h.header
 @@ -188,7 +188,6 @@ sub become_daemon {
@@ -27,7 +35,7 @@
 +    my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
 +	$atime,$mtime,$ctime,$blksize,$blocks)
 +	= stat($file);
-+    ok(S_IMODE($mode), 0644);
++    ok(( $mode & S_IWOTH ) ? 0 : 1); # not world-writable
 +}
 +
  `$^X t/autoclose.plx $file foo`;