Package: exim
Version: 3.36-18.1
Severity: normal
Tags: patch
Hi,
The following is the diff for my exim 3.36-18.2 NMU.
Greetings
Marc
diff -u exim-3.36/OS/os.h-Linux exim-3.36/OS/os.h-Linux
--- exim-3.36/OS/os.h-Linux
+++ exim-3.36/OS/os.h-Linux
@@ -25,0 +26,15 @@
+
+/* Fudge added because this Linux doesn't appear to have a definition
+for ip_options in /usr/include/linux/ip.h. */
+
+#define ip_options options
+
+/* Fudge added because this Linux doesn't appear to have a definition
+for ip_options in /usr/include/linux/ip.h. */
+
+#define ip_options options
+
+/* Fudge added because this Linux doesn't appear to have a definition
+for ip_options in /usr/include/linux/ip.h. */
+
+#define ip_options options
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,22 @@
+exim (3.36-18.2) unstable; urgency=low
+
+ * Non-maintainer upload prepared by Amaya - thanks!
+ * the "make exim 3 to be released with etch" release, courtesy of
+ the stable release team
+ * 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).
+ * Move exim_lock man page from 1 to 8
+ * Add netbase dependency for exim binary package
+ * debian/copyright:
+ * Fix FSF postal address
+ * Fix Debian GNU/Linux spelling error
+ * manually strip exim_* and eximon.bin
+ * Standards-Version: 3.7.2.2 (no changes necessary with a lot of good will).
+
+ -- Marc Haber <[EMAIL PROTECTED]> Sat, 11 Nov 2006 10:45:55 +0100
+
exim (3.36-18.1) unstable; urgency=low
* Non-maintainer upload.
@@ -43,7 +62,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
@@ -2,7 +2,7 @@
Section: mail
Priority: extra
Maintainer: Mark Baker <[EMAIL PROTECTED]>
-Standards-Version: 3.1.0
+Standards-Version: 3.7.2.2
Build-Depends: libpcre3-dev, libldap2-dev, libpam0g-dev, libident-dev,
libwrap0-dev, libdb3-dev, libice-dev, libxaw7-dev, libxmu-dev, libxt-dev,
libxext-dev, libx11-dev
Package: exim
@@ -12,8 +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)
-Recommends: netbase
+Depends: ${shlibs:Depends}, netbase, cron (>=3.0pl1-42), libdb3-util
Description: An obsolete MTA (Mail Transport Agent), replaced by exim4
This package contains exim 3, an outdated version of the exim Mail
Transport Agent. This package is not going to be updated any more,
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/rules exim-3.36/debian/rules
--- exim-3.36/debian/rules
+++ exim-3.36/debian/rules
@@ -96,6 +96,8 @@
install -m 0644 doc/ChangeLog debian/tmp/usr/share/doc/exim/changelog
gzip -9v debian/tmp/usr/share/doc/exim/*
install -m 0644 debian/copyright debian/tmp/usr/share/doc/exim
+ # strip binaries
+ strip --remove-section=.comment --remove-section=.note --strip-unneeded
debian/tmp/usr/sbin/exim_*
# Generate md5sums
(cd debian/tmp; find -type f | sed s#^./## | grep -v DEBIAN | \
xargs md5sum > DEBIAN/md5sums )
@@ -123,6 +125,8 @@
# Move eximon back
mv eximon debian/tmp/usr/sbin
mv eximon.bin debian/tmp/usr/lib/exim
+ #
+ strip --remove-section=.comment --remove-section=.note --strip-unneeded
debian/tmp/usr/lib/exim/eximon.bin
# Install man page
cp debian/eximon.8 debian/tmp/usr/share/man/man8
gzip -9v debian/tmp/usr/share/man/man8/*
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/copyright exim-3.36/debian/copyright
--- exim-3.36/debian/copyright
+++ exim-3.36/debian/copyright
@@ -1,4 +1,4 @@
-This is Debian/GNU Linux's prepackaged version of exim, a powerful yet easy
+This is Debian GNU/Linux's prepackaged version of exim, a powerful yet easy
to configure mail transport agent.
This package was originally made by Tim Cutts <[EMAIL PROTECTED]>,
@@ -35,7 +35,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+USA.
UNSOLICITED E-MAIL
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
@@ -1,4 +1,4 @@
-.TH exim_lock 1 "Jan 31, 2002" "Debian GNU/Linux" "Exim"
+.TH exim_lock 8 "Jan 31, 2002" "Debian GNU/Linux" "Exim"
.SH NAME
exim_lock \- A program to lock a file exactly as Exim would
.SH SYNOPSIS
@@ -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").
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
