Followup-For: Bug #776095 Control: retitle -1 wheezy-pu: package sudo/1.8.5p2-1+nmu3
Rebased patch after the recent security update. Andreas
diff -Nru sudo-1.8.5p2/debian/changelog sudo-1.8.5p2/debian/changelog --- sudo-1.8.5p2/debian/changelog 2015-02-16 13:44:24.000000000 +0100 +++ sudo-1.8.5p2/debian/changelog 2015-03-14 03:07:47.000000000 +0100 @@ -1,3 +1,12 @@ +sudo (1.8.5p2-1+nmu3) wheezy; urgency=medium + + * Non-maintainer upload. + * Backport from 1.8.7-1: "recognize lenny and squeeze unmodified sudoers" to + avoid dpkg questions about modified conffiles on upgrades to wheezy. + (Closes: #660594) + + -- Andreas Beckmann <a...@debian.org> Sat, 14 Mar 2015 03:05:19 +0100 + sudo (1.8.5p2-1+nmu2) wheezy-security; urgency=high * Non-maintainer upload by the Security Team. diff -Nru sudo-1.8.5p2/debian/control sudo-1.8.5p2/debian/control --- sudo-1.8.5p2/debian/control 2015-02-16 13:44:24.000000000 +0100 +++ sudo-1.8.5p2/debian/control 2015-03-14 03:07:47.000000000 +0100 @@ -4,8 +4,8 @@ Maintainer: Bdale Garbee <bd...@gag.com> Build-Depends: debhelper (>= 7), libpam0g-dev, libldap2-dev, libsasl2-dev, libselinux1-dev [linux-any], autoconf, autotools-dev, bison, flex Standards-Version: 3.9.3 -Vcs-Git: git://git.gag.com/debian/sudo -Vcs-Browser: http://git.gag.com/?p=debian/sudo +Vcs-Git: git://anonscm.debian.org/collab-maint/sudo.git -b wheezy +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/sudo.git Package: sudo Architecture: any diff -Nru sudo-1.8.5p2/debian/gbp.conf sudo-1.8.5p2/debian/gbp.conf --- sudo-1.8.5p2/debian/gbp.conf 2015-02-16 13:44:24.000000000 +0100 +++ sudo-1.8.5p2/debian/gbp.conf 2015-03-14 03:07:47.000000000 +0100 @@ -8,7 +8,7 @@ # the default branch for upstream sources: upstream-branch = upstream # the default branch for the debian patch: -debian-branch = master +debian-branch = wheezy # the default tag formats used: #upstream-tag = upstream/%(version)s #debian-tag = debian/%(version)s diff -Nru sudo-1.8.5p2/debian/sudo-ldap.preinst sudo-1.8.5p2/debian/sudo-ldap.preinst --- sudo-1.8.5p2/debian/sudo-ldap.preinst 2015-02-16 13:44:24.000000000 +0100 +++ sudo-1.8.5p2/debian/sudo-ldap.preinst 2015-03-14 03:07:47.000000000 +0100 @@ -8,7 +8,9 @@ if [ -e "$SUDOERS" ]; then md5sum="$(md5sum $SUDOERS | sed -e 's/ .*//')" - if [ "$md5sum" = "c5dab0f2771411ed7e67d6dab60a311f" ]; then + if [ "$md5sum" = "c310ef4892a00cca8134f6e4fcd64b6d" ] || #lenny/sudo + [ "$md5sum" = "4f29c034a4229544ffdd9168a14f6cde" ] || #lenny/sudo-ldap + [ "$md5sum" = "c5dab0f2771411ed7e67d6dab60a311f" ]; then #squeeze # move unchanged sudoers file to avoid conffile question mv "$SUDOERS" "$SUDOERS.pre-conffile" fi diff -Nru sudo-1.8.5p2/debian/sudo.preinst sudo-1.8.5p2/debian/sudo.preinst --- sudo-1.8.5p2/debian/sudo.preinst 2015-02-16 13:44:24.000000000 +0100 +++ sudo-1.8.5p2/debian/sudo.preinst 2015-03-14 03:07:47.000000000 +0100 @@ -8,7 +8,9 @@ if [ -e "$SUDOERS" ]; then md5sum="$(md5sum $SUDOERS | sed -e 's/ .*//')" - if [ "$md5sum" = "c5dab0f2771411ed7e67d6dab60a311f" ]; then + if [ "$md5sum" = "c310ef4892a00cca8134f6e4fcd64b6d" ] || #lenny/sudo + [ "$md5sum" = "4f29c034a4229544ffdd9168a14f6cde" ] || #lenny/sudo-ldap + [ "$md5sum" = "c5dab0f2771411ed7e67d6dab60a311f" ]; then #squeeze # move unchanged sudoers file to avoid conffile question mv "$SUDOERS" "$SUDOERS.pre-conffile" fi
