tor 2012-08-23 klockan 17:54 +0200 skrev Cyril Brulebois: > Hi Mattias, > > I'm not sure we're going to consider unblocking bdii, at least in its > current form. It looks like a package which pretty much fails to comply > with the freeze policy, so unless you come up with minimal changes to > only fix actual bugs… > > (Hint: new upstream release, changing configuration, adding features, > fixing lintian warnings, rewriting copyright, etc. are *not* things to > do in unstable when you have RC bug fixes you want to get into testing.) > > Mraw, > KiBi. Thank you for your feedback. I here attach a debdiff for a proposed backport of the fix to the RC bug only. Is this an acceptable change?
diff -Nru bdii-5.2.5/debian/bdii.lintian-overrides bdii-5.2.5/debian/bdii.lintian-overrides --- bdii-5.2.5/debian/bdii.lintian-overrides 2011-06-14 11:58:13.000000000 +0200 +++ bdii-5.2.5/debian/bdii.lintian-overrides 2012-08-24 09:09:48.000000000 +0200 @@ -1,2 +1,2 @@ -bdii: non-standard-file-perm *etc/bdii/bdii-slapd.conf 0640 != 0644 -bdii: non-standard-file-perm *etc/bdii/bdii-top-slapd.conf 0640 != 0644 +bdii: non-standard-file-perm *usr/share/bdii/bdii-slapd.conf 0640 != 0644 +bdii: non-standard-file-perm *usr/share/bdii/bdii-top-slapd.conf 0640 != 0644 diff -Nru bdii-5.2.5/debian/bdii.postinst bdii-5.2.5/debian/bdii.postinst --- bdii-5.2.5/debian/bdii.postinst 2011-09-27 07:49:57.000000000 +0200 +++ bdii-5.2.5/debian/bdii.postinst 2012-08-24 11:00:12.000000000 +0200 @@ -3,14 +3,21 @@ set -e sed "s/\(rootpw *\)secret/\1$(mkpasswd -s 0 | tr '/' 'x')/" \ - -i /etc/bdii/bdii-slapd.conf /etc/bdii/bdii-top-slapd.conf + -i /usr/share/bdii/bdii-slapd.conf /usr/share/bdii/bdii-top-slapd.conf -chown openldap:openldap /etc/bdii/bdii-slapd.conf -chown openldap:openldap /etc/bdii/bdii-top-slapd.conf +chown openldap:openldap /usr/share/bdii/bdii-slapd.conf +chown openldap:openldap /usr/share/bdii/bdii-top-slapd.conf chown -R openldap:openldap /var/lib/bdii chown -R openldap:openldap /var/log/bdii +# Old versions with slapd configs listed in conffiles +dpkg-maintscript-helper rm_conffile \ + /etc/bdii/bdii-slapd.conf 5.2.5-2+wheezy1~ bdii -- "$@" +dpkg-maintscript-helper rm_conffile \ + /etc/bdii/bdii-top-slapd.conf 5.2.5-2+wheezy1~ bdii -- "$@" + # Remove obsolete cron script left behind by dpkg -rm -f /etc/cron.d/bdii-proxy +dpkg-maintscript-helper rm_conffile \ + /etc/cron.d/bdii-proxy 5.2.5-2+wheezy1~ bdii -- "$@" #DEBHELPER# diff -Nru bdii-5.2.5/debian/bdii.postrm bdii-5.2.5/debian/bdii.postrm --- bdii-5.2.5/debian/bdii.postrm 1970-01-01 01:00:00.000000000 +0100 +++ bdii-5.2.5/debian/bdii.postrm 2012-08-24 11:00:12.000000000 +0200 @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +# Old versions with slapd configs listed in conffiles +dpkg-maintscript-helper rm_conffile \ + /etc/bdii/bdii-slapd.conf 5.2.5-2+wheezy1~ bdii -- "$@" +dpkg-maintscript-helper rm_conffile \ + /etc/bdii/bdii-top-slapd.conf 5.2.5-2+wheezy1~ bdii -- "$@" + +# Remove obsolete cron script left behind by dpkg +dpkg-maintscript-helper rm_conffile \ + /etc/cron.d/bdii-proxy 5.2.5-2+wheezy1~ bdii -- "$@" + +#DEBHELPER# diff -Nru bdii-5.2.5/debian/bdii.preinst bdii-5.2.5/debian/bdii.preinst --- bdii-5.2.5/debian/bdii.preinst 1970-01-01 01:00:00.000000000 +0100 +++ bdii-5.2.5/debian/bdii.preinst 2012-08-24 11:00:12.000000000 +0200 @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +# Old versions with slapd configs listed in conffiles +dpkg-maintscript-helper rm_conffile \ + /etc/bdii/bdii-slapd.conf 5.2.5-2+wheezy1~ bdii -- "$@" +dpkg-maintscript-helper rm_conffile \ + /etc/bdii/bdii-top-slapd.conf 5.2.5-2+wheezy1~ bdii -- "$@" + +# Remove obsolete cron script left behind by dpkg +dpkg-maintscript-helper rm_conffile \ + /etc/cron.d/bdii-proxy 5.2.5-2+wheezy1~ bdii -- "$@" + +#DEBHELPER# diff -Nru bdii-5.2.5/debian/changelog bdii-5.2.5/debian/changelog --- bdii-5.2.5/debian/changelog 2011-09-27 07:58:08.000000000 +0200 +++ bdii-5.2.5/debian/changelog 2012-08-24 09:08:29.000000000 +0200 @@ -1,3 +1,9 @@ +bdii (5.2.5-2+wheezy1) testing; urgency=low + + * Backport RC bug fix to wheezy (Closes: #663444) + + -- Mattias Ellert <mattias.ellert@fysast.uu.se> Fri, 24 Aug 2012 09:00:09 +0200 + bdii (5.2.5-2) unstable; urgency=low * Remove obsolete cron script left behind by dpkg (Closes: #642589) diff -Nru bdii-5.2.5/debian/rules bdii-5.2.5/debian/rules --- bdii-5.2.5/debian/rules 2011-09-04 20:21:31.000000000 +0200 +++ bdii-5.2.5/debian/rules 2012-08-24 10:49:27.000000000 +0200 @@ -45,6 +45,13 @@ sed "s/BDII_USER=.*/BDII_USER=openldap/" \ -i debian/bdii/etc/bdii/bdii.conf + # Move bdii slapd config files out of /etc + mkdir debian/bdii/usr/share/bdii + mv debian/bdii/etc/bdii/bdii-slapd.conf debian/bdii/usr/share/bdii + mv debian/bdii/etc/bdii/bdii-top-slapd.conf debian/bdii/usr/share/bdii + ln -s ../../usr/share/bdii/bdii-slapd.conf debian/bdii/etc/bdii + ln -s ../../usr/share/bdii/bdii-top-slapd.conf debian/bdii/etc/bdii + binary-arch: # : @@ -60,6 +67,7 @@ dh_lintian dh_compress dh_fixperms -X .conf + dh_link dh_perl dh_pysupport dh_installdeb
Attachment:
signature.asc
Description: This is a digitally signed message part