Hi Cyril and Julien, this a diff from the version currently sitting in testing (6.0.6-1) and a possible upload to t-p-u (6.0.6-2~wheezy1).
As you may see, I limited all changes to what is strictly required in order to fix two really important bugs already corrected in unstable. If you approve this, then I will upload the packages to t-p-u. Thanks, Giuseppe diff -ruN 6.0.6-1/debian/changelog 6.0.6-2~wheezy1/debian/changelog --- 6.0.6-1/debian/changelog 2012-06-20 09:19:56.000000000 +0200 +++ 6.0.6-2~wheezy1/debian/changelog 2012-10-13 00:12:55.000000000 +0200 @@ -1,3 +1,10 @@ +hylafax (3:6.0.6-2~wheezy1) testing-proposed-updates; urgency=high + + * Added restricted deletion flag on tmp directory (Closes: #682824) + * Update postinst and postrm scripts for hylafax-client (Closes: #661482) + + -- Giuseppe Sacco <eppes...@debian.org> Fri, 12 Oct 2012 22:02:09 +0000 + hylafax (3:6.0.6-1) unstable; urgency=low * New upstream relase. Converted to 6.0 branch instead of 6.1 since the diff -ruN 6.0.6-1/debian/hylafax-client.postinst 6.0.6-2~wheezy1/debian/hylafax-client.postinst --- 6.0.6-1/debian/hylafax-client.postinst 2012-01-16 09:31:30.000000000 +0100 +++ 6.0.6-2~wheezy1/debian/hylafax-client.postinst 2012-10-12 23:55:15.000000000 +0200 @@ -38,6 +38,9 @@ ucf "$newfile" /etc/hylafax/pagesizes fi +# register config file with package name to ucf +ucfr hylafax-client /etc/hylafax/pagesizes + rm -f "$newfile" # diff -ruN 6.0.6-1/debian/hylafax-client.postrm 6.0.6-2~wheezy1/debian/hylafax-client.postrm --- 6.0.6-1/debian/hylafax-client.postrm 2010-06-20 00:29:50.000000000 +0200 +++ 6.0.6-2~wheezy1/debian/hylafax-client.postrm 2012-10-12 23:53:34.000000000 +0200 @@ -4,8 +4,9 @@ if [ "$1" = "purge" ]; then [ -d /etc/hylafax ] && rm -f /etc/hylafax/pagesizes - rmdir --ignore-fail-on-non-empty /etc/hylafax - if which ucf >/dev/null 2>&1; then - ucf --purge /etc/hylafax/pagesizes - fi + #rmdir --ignore-fail-on-non-empty /etc/hylafax + + # clear and deregister config file out from ucf database + which ucf >/dev/null && ucf --purge /etc/hylafax/pagesizes + which ucfr >/dev/null && ucfr --purge hylafax-client /etc/hylafax/pagesizes fi diff -ruN 6.0.6-1/debian/rules 6.0.6-2~wheezy1/debian/rules --- 6.0.6-1/debian/rules 2012-06-17 14:47:42.000000000 +0200 +++ 6.0.6-2~wheezy1/debian/rules 2012-10-13 00:08:17.000000000 +0200 @@ -224,6 +224,7 @@ do chmod 755 $(d_server)/var/spool/hylafax/$$i; done chmod 775 $(d_server)/var/spool/hylafax chmod 4777 $(d_server)/var/spool/hylafax/tmp + chmod og+t $(d_server)/var/spool/hylafax/tmp chmod 755 $(d_server)/var/spool/hylafax/dev chown uucp $(d_server)/etc/hylafax/hosts.hfaxd chmod 600 $(d_server)/etc/hylafax/hosts.hfaxd
signature.asc
Description: This is a digitally signed message part