emacs22 22.2+2-5
I've uploaded emacs22 22.2+2-5 unstable which contains two bug fixes
that I believe should be considered for Lenny. Please let me know if
you would like me to do anything further.
The first change fixes a bug that was affecting other packages.
Debian's Emacs would signal an error if /usr/bin/mail wasn't an
executable, even if it was never used. The change effectively delays
the error until the mailer is actually used, while still making sure
that the user will see the error.
The second fix makes Debian's Emacs more consistent across the various
architectures. Previously, the i386 emacs22 was compiled against
libasound2 and had sound support, but most of the other architectures
probably didn't. This package adds a build dependency on
libasound2-dev for all the Debian architectures except those based on
the Hurd or Freebsd.
Thanks for the help.
diff --git a/changelog b/changelog
index 9d63899..0ab32ac 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,18 @@
+emacs22 (22.2+2-5) unstable; urgency=low
+
+ * Add a build dependency on libasound2-dev which emacs22 is already
+ linked against on i386. This change just makes things consistent
+ across all the relevant platforms. Thanks to Sven Joachim
+ <svenjoac@gmx.de> for the fix. (closes: #503054)
+
+ * Set mail-interactive to t if /usr/bin/mail is not an executable and
+ fakemail is chosen. This should still help avoid silent mail loss,
+ but won't signal an error if the mailer is never invoked. Thanks to
+ Ralf Resack <horch_loeffelchen@yahoo.de> for proposing the
+ fix. (closes: #429059)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 09 Nov 2008 12:05:33 -0800
+
emacs22 (22.2+2-4) unstable; urgency=medium
* Fix a security problem related to the invocation of python
diff --git a/control b/control
index e3500bd..b15aa41 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Rob Browning <rlb@defaultvalue.org>
Uploaders: Jerome Marant <jerome@debian.org>
-Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42-1), debhelper (>= 4), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev
+Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42-1), debhelper (>= 4), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
Standards-Version: 3.7.2
Package: emacs
diff --git a/control.in b/control.in
index 8fb667f..8e49e6e 100644
--- a/control.in
+++ b/control.in
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Rob Browning <rlb@defaultvalue.org>
Uploaders: Jerome Marant <jerome@debian.org>
-Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42-1), debhelper (>= 4), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev
+Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42-1), debhelper (>= 4), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
Standards-Version: 3.7.2
Package: emacs
diff --git a/patches/avoid-fakemail-mail-loss.diff b/patches/avoid-fakemail-mail-loss.diff
index d8f2e99..b3f9857 100644
--- a/patches/avoid-fakemail-mail-loss.diff
+++ b/patches/avoid-fakemail-mail-loss.diff
@@ -12,15 +12,18 @@
For now, Debian sets fakemail's MAIL_PROGRAM_NAME to /usr/bin/mail
(which is the correct value for Debian systems) rather than
- /bin/mail. Debian also adjusts Emacs to test for the existence of
- /usr/bin/mail before trying to run fakemail. This is not an ideal
- solution, but it should be an improvement.
+ /bin/mail. Debian also adjusts Emacs to test whether or not
+ /usr/bin/mail exists and is executable. If either of these tests
+ fail, then mail-interactive is set to t. That should ensure that a
+ user will actually see an error if they attempt to use the broken
+ fakemail.
- Note that Debian forces the value to /usr/bin/mail. The build will
- fail if any other value is specified. This is done to ensure that
- MAIL_PROGRAM_NAME isn't accidentally set to some other value during
- the build process. If this is undesirable for some reason, just
- commment out avoid-fakemail-loss.diff in debian/patches/series.
+ Note that Debian actually forces the MAIL_PROGRAM_NAME value to
+ /usr/bin/mail. The build will fail if any other value is specified.
+ This is done to ensure that MAIL_PROGRAM_NAME isn't accidentally set
+ to some other value during the build process. If this is
+ undesirable for some reason, just comment out
+ avoid-fakemail-loss.diff in debian/patches/series.
Index: sid/lib-src/fakemail.c
===================================================================
@@ -43,14 +46,16 @@ Index: sid/lisp/mail/feedmail.el
===================================================================
--- sid.orig/lisp/mail/feedmail.el
+++ sid/lisp/mail/feedmail.el
-@@ -1348,7 +1348,10 @@
+@@ -1348,7 +1348,12 @@
"/usr/lib/sendmail")
((file-exists-p "/usr/ucblib/sendmail")
"/usr/ucblib/sendmail")
- (t "fakemail"))
+ (t
+ (if (not (file-executable-p "/usr/bin/mail"))
-+ (error "/usr/bin/mail is not executable"))
++ (progn
++ (message "/usr/bin/mail is not an executable. Setting mail-interactive to t.")
++ (setq mail-interactive t)))
+ "fakemail"))
nil errors-to nil "-oi" "-t")
;; provide envelope "from" to sendmail; results will vary
@@ -59,14 +64,16 @@ Index: sid/lisp/mail/sendmail.el
===================================================================
--- sid.orig/lisp/mail/sendmail.el
+++ sid/lisp/mail/sendmail.el
-@@ -53,7 +53,10 @@
+@@ -53,7 +53,12 @@
((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail")
((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail")
((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail")
- (t "fakemail")) ;In ../etc, to interface to /bin/mail.
+ (t
+ (if (not (file-executable-p "/usr/bin/mail"))
-+ (error "/usr/bin/mail is not executable"))
++ (progn
++ (message "/usr/bin/mail is not an executable. Setting mail-interactive to t.")
++ (setq mail-interactive t)))
+ "fakemail")) ;In ../etc, to interface to /bin/mail.
"Program used to send messages."
:group 'mail
@@ -75,16 +82,17 @@ Index: sid/lisp/gnus/message.el
===================================================================
--- sid.orig/lisp/gnus/message.el
+++ sid/lisp/gnus/message.el
-@@ -4026,7 +4026,12 @@
+@@ -4026,7 +4026,13 @@
"/usr/lib/sendmail")
((file-exists-p "/usr/ucblib/sendmail")
"/usr/ucblib/sendmail")
- (t "fakemail"))
+ (t
-+ (if (not
-+ (file-executable-p "/usr/bin/mail"))
-+ (error
-+ "/usr/bin/mail is not executable"))
++ (if (not (file-executable-p
++ "/usr/bin/mail"))
++ (progn
++ (message "/usr/bin/mail is not an executable. Setting mail-interactive to t.")
++ (setq mail-interactive t)))
+ "fakemail"))
nil errbuf nil "-oi")
;; Always specify who from,
--
Rob Browning
rlb @defaultvalue.org and @debian.org; previously @cs.utexas.edu
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4
Reply to: