The following commit has been merged in the master branch:
commit f5b9b28a55b6a786fd6192b9fde06bef19206e30
Author: Niels Thykier <[email protected]>
Date: Fri Jul 29 14:08:57 2011 +0200
Made two tests resistant to umask variance on clone system
diff --git a/t/debs/control-files-weird-files/Makefile
b/t/debs/control-files-weird-files/Makefile
index 29445d8..c10ee59 100644
--- a/t/debs/control-files-weird-files/Makefile
+++ b/t/debs/control-files-weird-files/Makefile
@@ -9,11 +9,12 @@ all:
chown 0:0 control
chmod 644 control
md5sum usr/share/doc/$(name)/* > md5sums
+ touch triggers
tar -czf control.tar.gz control md5sums \
special-file isinstallable triggers
ar rc $(name).deb \
debian-binary control.tar.gz data.tar.gz
clean:
- rm -f *.tar.gz *.tar.lzma *.deb md5sums debian-binary
+ rm -f *.tar.gz *.tar.lzma *.deb md5sums debian-binary triggers
rm -rf usr
diff --git a/t/tests/files-bad-perm-owner/debian/debian/rules
b/t/tests/files-bad-perm-owner/debian/debian/rules
index 78aa93a..b352395 100644
--- a/t/tests/files-bad-perm-owner/debian/debian/rules
+++ b/t/tests/files-bad-perm-owner/debian/debian/rules
@@ -14,15 +14,18 @@ override_dh_auto_build:
pod2man --section 1 script > script.1
override_dh_fixperms:
+ dh_fixperms
# game
chown 'root:games' debian/$(GPKG)/usr/games/script
# binary
- find debian/$(PKG)/ -name 'README' -exec chown "daemon:daemon" {} \;
- find debian/$(PKG)/ -name 'read-only' -exec chmod a=r {} \;
- chmod +x,u+s debian/$(PKG)/usr/bin/script-uid
- chmod +x,g+s debian/$(PKG)/usr/bin/script-gid
- chmod +x,ug+s debian/$(PKG)/usr/bin/script-ugid
- chmod +x,g+w debian/$(PKG)/usr/bin/script-wexec
- chmod u+x,u+s debian/$(PKG)/usr/bin/script-wuid
- chmod +x,o-r debian/$(PKG)/usr/bin/script-ro
- chmod go-x debian/$(PKG)/usr/share/doc/$(PKG)
+ chown "daemon:daemon" debian/$(PKG)/usr/share/doc/$(PKG)/README
+ chmod 0444 debian/$(PKG)/usr/share/doc/$(PKG)/read-only
+ chmod 4755 debian/$(PKG)/usr/bin/script-uid
+ chmod 2755 debian/$(PKG)/usr/bin/script-gid
+ chmod 6755 debian/$(PKG)/usr/bin/script-ugid
+ chmod 0775 debian/$(PKG)/usr/bin/script-wexec
+ chmod 4744 debian/$(PKG)/usr/bin/script-wuid
+ chmod 0751 debian/$(PKG)/usr/bin/script-ro
+ chmod 0744 debian/$(PKG)/usr/share/doc/$(PKG)
+ chmod 0755 debian/$(PKG)/etc/cron.d/script
+ chmod 0755 debian/$(PKG)/etc/emacs.d/script
--
Debian package checker
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
