Package: exim
Version: 3.36-18.1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my exim 3.36-18.2 NMU. I will not NMU, but I
thought it would be good to have this in the BTS.
--
.''`. Fuck your fascist beauty standards
: :' :
`. `' Proudly running unstable Debian GNU/Linux
`- www.amayita.com www.malapecora.com www.chicasduras.com
diff -u exim-3.36/debian/changelog exim-3.36/debian/changelog
--- exim-3.36/debian/changelog
+++ exim-3.36/debian/changelog
@@ -1,3 +1,12 @@
+exim (3.36-18.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Get rid of the /usr/doc link in postinst (Closes: #359397, #359404,
#332303).
+ * Now consistently using invoke-rc.d in maintainer scripts (Closes: #367741).
+ * Add a depencency on libdb3-util (Closes: #375965).
+
+ -- Amaya Rodrigo Sastre <[EMAIL PROTECTED]> Fri, 14 Jul 2006 13:34:09 +0200
+
exim (3.36-18.1) unstable; urgency=low
* Non-maintainer upload.
@@ -43,7 +52,7 @@
list instead (Closes: #295844)
* debian/postinst: tell people exim 3 is obsolete on new installations
or upgrades from woody versions
- * debian/postinst: only chown databases if db directory exists (Closes:
+ * debian/postinst: only chown databases if db directory exists (Closes:
#297897)
* src/readconf.c: validate pid_file_path to avoid security problem (note
that this is only a security hole if you don't trust someone who has
diff -u exim-3.36/debian/control exim-3.36/debian/control
--- exim-3.36/debian/control
+++ exim-3.36/debian/control
@@ -12,7 +12,7 @@
Provides: mail-transport-agent
Conflicts: mail-transport-agent, exim-doc-html (<=3.00-2), suidregister
(<<0.50)
Replaces: mail-transport-agent
-Depends: ${shlibs:Depends}, cron (>=3.0pl1-42)
+Depends: ${shlibs:Depends}, cron (>=3.0pl1-42), libdb3-util
Recommends: netbase
Description: An obsolete MTA (Mail Transport Agent), replaced by exim4
This package contains exim 3, an outdated version of the exim Mail
diff -u exim-3.36/debian/config exim-3.36/debian/config
--- exim-3.36/debian/config
+++ exim-3.36/debian/config
@@ -37,7 +37,7 @@
system( 'update-rc.d exim defaults >/dev/null' ) ;
# Restart daemon
- system( '/etc/init.d/exim start' ) ;
+ system( ' invoke-rc.d exim start' ) ;
exit 0 ;
}
diff -u exim-3.36/debian/postinst exim-3.36/debian/postinst
--- exim-3.36/debian/postinst
+++ exim-3.36/debian/postinst
@@ -23,10 +23,10 @@
install -d -omail -gmail /var/run/exim
- # Create /usr/doc symlink
- if [ -d /usr/doc -a ! -e /usr/doc/exim ]; then
- ln -sf ../share/doc/exim /usr/doc/exim
- fi
+ # Remove /usr/doc symlink
+ if [ -d /usr/doc -a -h /usr/doc/exim -a -d /usr/share/doc/exim ]; then
+ rm -f /usr/doc/exim
+ fi
# If we're upgrading from woody version, or this is a new installation,
# display message suggesting upgrade to exim4
@@ -134,7 +134,7 @@
is now disabled! When you want to re-enable it, you should do
"eximconfig -i".
-Please read /usr/doc/exim/README.UPDATING.gz for more information.
+Please read /usr/share/doc/exim/README.UPDATING.gz for more information.
EOM
press_return
@@ -158,7 +158,12 @@
update-rc.d exim defaults >/dev/null
# Start running exim (maybe)
- /etc/init.d/exim start || true
+ #/etc/init.d/exim start || true
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d exim start
+ else
+ /etc/init.d/exim start
+ fi
fi
fi
@@ -168,5 +173,11 @@
# Restart exim
- /etc/init.d/exim start || true
+ #/etc/init.d/exim start || true
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d exim start
+ else
+ /etc/init.d/exim start
+ fi
+
;;
esac
diff -u exim-3.36/debian/prerm exim-3.36/debian/prerm
--- exim-3.36/debian/prerm
+++ exim-3.36/debian/prerm
@@ -4,10 +4,13 @@
remove|upgrade|remove-in-favour|deconfigure-in-favour)
# Stop running exim
- if [ -x /etc/init.d/exim ]; then
- /etc/init.d/exim stop
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d exim stop
+ else
+ if [ -x /etc/init.d/exim ]; then
+ /etc/init.d/exim stop
+ fi
fi
-
# Disable in inetd
if [ -x /usr/sbin/update-inetd ]; then
update-inetd --comment-chars \#disabled\# --disable smtp
diff -u exim-3.36/debian/postinst-eximon exim-3.36/debian/postinst-eximon
--- exim-3.36/debian/postinst-eximon
+++ exim-3.36/debian/postinst-eximon
@@ -3,10 +3,9 @@
case "$1" in
configure)
- # Create /usr/doc symlink
- if [ -d /usr/doc -a ! -e /usr/doc/eximon ]; then
- ln -sf ../share/doc/eximon /usr/doc/eximon
- fi
+ if [ -d /usr/doc -a -h /usr/doc/eximon -a -d /usr/share/doc/eximon ];
then
+ rm -f /usr/doc/eximon
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -u exim-3.36/debian/exim_lock.8 exim-3.36/debian/exim_lock.8
--- exim-3.36/debian/exim_lock.8
+++ exim-3.36/debian/exim_lock.8
@@ -55,7 +55,7 @@
.BR exim (8)
.PP
There is also extensive documentation available in
-.I /usr/doc/exim
+.I /usr/share/doc/exim
and in the
.B info
system (try "info exim").
