--- heirloom-mailx-12.5.orig/getopt.c +++ heirloom-mailx-12.5/getopt.c @@ -43,7 +43,7 @@ char *optarg; int optind = 1; int opterr = 1; -int optopt; +int optoptc; static void error(const char *s, int c) @@ -69,7 +69,7 @@ *bp++ = *s++; while (*msg) *bp++ = *msg++; - *bp++ = optopt; + *bp++ = optoptc; *bp++ = '\n'; write(2, buf, bp - buf); ac_free(buf); @@ -101,13 +101,13 @@ } curp = &argv[optind][1]; } - optopt = curp[0] & 0377; + optoptc = curp[0] & 0377; while (optstring[0]) { if (optstring[0] == ':') { optstring++; continue; } - if ((optstring[0] & 0377) == optopt) { + if ((optstring[0] & 0377) == optoptc) { if (optstring[1] == ':') { if (curp[1] != '\0') { optarg = (char *)&curp[1]; @@ -127,7 +127,7 @@ optind++; optarg = 0; } - return optopt; + return optoptc; } optstring++; } --- heirloom-mailx-12.5.orig/mailx.1 +++ heirloom-mailx-12.5/mailx.1 @@ -3575,7 +3575,7 @@ .TP .B ssl-method Selects a SSL/TLS protocol version; -valid values are `ssl2', `ssl3', and `tls1'. +valid values are `ssl3', and `tls1'. If unset, the method is selected automatically, if possible. .TP @@ -3781,7 +3781,7 @@ .sp .fi which might cause -.N mailx +.B mailx to respond with, for example: .nf .sp --- heirloom-mailx-12.5.orig/Makefile +++ heirloom-mailx-12.5/Makefile @@ -6,7 +6,7 @@ # See the file INSTALL if you need help. # -PREFIX = /usr/local +PREFIX = /usr BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/share/man SYSCONFDIR = /etc @@ -17,14 +17,14 @@ DESTDIR = -UCBINSTALL = /usr/ucb/install +UCBINSTALL = /usr/bin/install # Define compiler, preprocessor, and linker flags here. # Note that some Linux/glibc versions need -D_GNU_SOURCE in CPPFLAGS, or # wcwidth() will not be available and multibyte characters will not be # displayed correctly. #CFLAGS = -#CPPFLAGS = +CPPFLAGS = -D_GNU_SOURCE #LDFLAGS = #WARN = -Wall -Wno-parentheses -Werror @@ -50,12 +50,13 @@ # If you know that the IPv6 functions work on your machine, you can enable # them here. -#IPv6 = -DHAVE_IPv6_FUNCS +IPv6 = -DHAVE_IPv6_FUNCS # # Binaries are stripped with this command after installation. # -STRIP = strip +# STRIP = strip +STRIP = true ########################################################################### ########################################################################### --- heirloom-mailx-12.5.orig/openssl.c +++ heirloom-mailx-12.5/openssl.c @@ -216,9 +216,7 @@ cp = ssl_method_string(uhp); if (cp != NULL) { - if (equal(cp, "ssl2")) - method = SSLv2_client_method(); - else if (equal(cp, "ssl3")) + if (equal(cp, "ssl3")) method = SSLv3_client_method(); else if (equal(cp, "tls1")) method = TLSv1_client_method(); --- heirloom-mailx-12.5.orig/debian/changelog +++ heirloom-mailx-12.5/debian/changelog @@ -0,0 +1,454 @@ +heirloom-mailx (12.5-1build1) oneiric; urgency=low + + * Rebuild for OpenSSL 1.0.0. + + -- Colin Watson Sat, 21 May 2011 11:57:31 +0100 + +heirloom-mailx (12.5-1) unstable; urgency=low + + * New upstream version + - Fixes FTBFS with OpenSSL 1.0.0. Closes: #622060 + * Patched out SSL2 support since it is no longer supported by OpenSSL. + * Removed watch file since upstream no longer distributes tarballs. + * Removed HTML version of manpage. + + -- Hilko Bengen Tue, 26 Apr 2011 23:52:57 +0200 + +heirloom-mailx (12.4-2) unstable; urgency=low + + * Got rid of the "nail" binary package + * postinst: removed unnecessary check around update-alternatives(8) that + gave a bogus error message on new installs. Thanks to Petter + Reinholdtsen for spotting this. Closes: #579287 + * package maintenance: bumped debhelper compat level, Standards-Version + + -- Hilko Bengen Fri, 28 May 2010 23:09:44 +0200 + +heirloom-mailx (12.4-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Don't reuse weak symbol optopt (Closes: #535660). + + -- Luk Claes Sat, 11 Jul 2009 07:44:12 +0000 + +heirloom-mailx (12.4-1) unstable; urgency=low + + * New upstream version + * Fixed nail.1.gz link (Closes: #511639) + + -- Hilko Bengen Tue, 13 Jan 2009 22:32:54 +0100 + +heirloom-mailx (12.3+cvs20080629-1) unstable; urgency=high + + * New release from upstream CVS + - Closes: #487019. + * This should take care of #465484, too, therefore reverting the earlier + fix: No longer set `ttycharset' in the global configuration file. + * Now Provides: mailx + * Added symlinks to nail package; changed description accordingly. + * Updated Standards-Version. + * Changed doc-base section. + + -- Hilko Bengen Fri, 04 Jul 2008 00:00:21 +0200 + +heirloom-mailx (12.3-4) unstable; urgency=low + + * Modified system-wide config file so that UTF-8 is accepted if no + locale is set. Closes: #465484 + * Turned .N into .B in manpage. Thanks, lintian! + * Removed the -1 from the libssl-dev dependency. + + -- Hilko Bengen Mon, 18 Feb 2008 20:45:00 +0100 + +heirloom-mailx (12.3-3) unstable; urgency=low + + * Renamed package + * Made /usr/bin/mailx a possible candidate for mailx (Closes: #272256) + * Fixed watch file (Closes: #449803) + * Added `Homepage:' header + + -- Hilko Bengen Mon, 10 Dec 2007 23:57:48 +0100 + +nail (12.3-2) unstable; urgency=low + + * Updated menu file (Closes: #444895) + + -- Hilko Bengen Mon, 01 Oct 2007 23:50:37 +0200 + +nail (12.3-1) unstable; urgency=low + + * New upstream version + * Build process now honors the nostrip build option (Closes: #437602) + + -- Hilko Bengen Tue, 21 Aug 2007 23:29:34 +0200 + +nail (12.2-1) unstable; urgency=low + + * New upstream release + * Include nail.1.html (Closes: #408168) + + -- Hilko Bengen Tue, 23 Jan 2007 23:42:51 +0100 + +nail (12.1-1) unstable; urgency=low + + * New upstream version (Closes: #392191) + We'll keep the original name for the binary, nail, for now. + + -- Hilko Bengen Thu, 12 Oct 2006 00:05:49 +0200 + +nail (11.25-2) unstable; urgency=low + + * Depend on newer libssl-dev for OpenSSL transition + + -- Hilko Bengen Mon, 10 Oct 2005 17:03:29 +0200 + +nail (11.25-1) unstable; urgency=low + + * New upstream version + * Includes fix for IMAP/POP3 segfault in connection with OpenSSL + + -- Hilko Bengen Tue, 2 Aug 2005 22:01:06 +0200 + +nail (11.24-2) unstable; urgency=low + + * Fixed a bug in base64 encoding which affected SMTP AUTH + * Fixed typo in nail.1 + + -- Hilko Bengen Fri, 22 Jul 2005 17:24:02 +0200 + +nail (11.24-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Fri, 15 Jul 2005 19:32:40 +0200 + +nail (11.23-2) unstable; urgency=low + + * Added HTML manual + * Fixed two bogs discussed on the nail-devel mailing list + - Off-by-one bug (tty.c) + - Segfault (sendout.c) + + -- Hilko Bengen Fri, 8 Jul 2005 13:36:02 +0200 + +nail (11.23-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Tue, 28 Jun 2005 23:22:06 +0200 + +nail (11.22-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Sun, 20 Mar 2005 20:39:55 +0100 + +nail (11.21-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Fri, 25 Feb 2005 01:30:06 +0100 + +nail (11.20-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Thu, 13 Jan 2005 23:00:48 +0100 + +nail (11.19-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Tue, 4 Jan 2005 22:56:23 +0100 + +nail (11.18-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Thu, 9 Dec 2004 22:14:00 +0100 + +nail (11.17-1) unstable; urgency=low + + * New upstream version (Two new releases per day -- Not bad, man...) + + -- Hilko Bengen Sat, 20 Nov 2004 00:20:54 +0100 + +nail (11.15-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Thu, 11 Nov 2004 11:37:54 +0100 + +nail (11.14-1) unstable; urgency=low + + * New upstream version + * Defined _GNU_SOURCE, so junk.c compiles cleanly + + -- Hilko Bengen Fri, 5 Nov 2004 18:57:40 +0100 + +nail (11.13-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Thu, 28 Oct 2004 09:34:39 +0200 + +nail (11.12-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Fri, 22 Oct 2004 14:33:41 +0200 + +nail (11.11-1) unstable; urgency=medium + + * New upstream version (Schnapszahl!) + + -- Hilko Bengen Wed, 13 Oct 2004 21:39:37 +0200 + +nail (11.10-1) unstable; urgency=low + + * New upstream version + - 11.9-1 wan't uploaded. + + -- Hilko Bengen Sun, 3 Oct 2004 18:07:06 +0200 + +nail (11.9-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Sun, 3 Oct 2004 03:33:08 +0200 + +nail (11.8-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Fri, 24 Sep 2004 01:23:24 +0200 + +nail (11.7-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Mon, 20 Sep 2004 23:29:43 +0200 + +nail (11.6-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Wed, 8 Sep 2004 19:42:35 +0200 + +nail (11.5-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Mon, 6 Sep 2004 13:57:28 +0200 + +nail (11.4-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Tue, 31 Aug 2004 12:50:53 +0200 + +nail (11.3-1) unstable; urgency=low + + * New upstream version + * Build-Depends on libkrb5-dev + + -- Hilko Bengen Wed, 18 Aug 2004 23:06:39 +0200 + +nail (11.2-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Mon, 16 Aug 2004 20:30:24 +0200 + +nail (11.1-1) unstable; urgency=low + + * New upstream version + - Enhanced IMAP support, speed improvements, IMAP offline operations + + -- Hilko Bengen Sun, 8 Aug 2004 19:23:52 +0200 + +nail (11.0-1) unstable; urgency=low + + * New upstream version + * Build with IPv6 + * Added TODO to the documentation directory + * Updated description + + -- Hilko Bengen Sun, 1 Aug 2004 02:59:00 +0200 + +nail (10.8-1) unstable; urgency=low + + * New upstream version + + -- Hilko Bengen Mon, 5 Jul 2004 21:42:47 +0200 + +nail (10.7-1) unstable; urgency=low + + * New upstream version (includes portions of IEEE Std 1003.1 docs) + * Updated Standards-Version + + -- Hilko Bengen Thu, 1 Apr 2004 12:58:06 +0200 + +nail (10.6-2) unstable; urgency=low + + * Added Benjamin C. W. Sittler's patch to cure base64 decoding problems + (Closes: #233717) + + -- Hilko Bengen Fri, 20 Feb 2004 14:21:16 +0100 + +nail (10.6-1) unstable; urgency=low + + * New upstream version + * Changed dependency (Closes: #228559) + + -- Hilko Bengen Tue, 20 Jan 2004 11:59:33 +0100 + +nail (10.5-1) unstable; urgency=low + + * New maintainer (Closes: #188806) + * New upstream release. + * Removed cruft from changelog + * Removed autogenerated files from .diff.gz. + + -- Hilko Bengen Tue, 29 Apr 2003 02:13:58 +0200 + +nail (10.4-2) unstable; urgency=low + + * ORPHANED: changed maintainer to packages@qa.debian.org + + -- Arthur Korn Fri, 11 Apr 2003 20:41:30 +0200 + +nail (10.4-1) unstable; urgency=low + + * New upstream release + - IPv6 support for network client functionality. + + -- Arthur Korn Tue, 21 Jan 2003 14:33:15 +0100 + +nail (10.3-1) unstable; urgency=low + + * New upstream release + - bugfixes + * added watchfile for uscan + * rules: don't use automake/autoconf anymore + * rules: clean uses make clean, not make distclean + * control: removed build dependency on automake + + -- Arthur Korn Wed, 11 Dec 2002 22:59:56 +0100 + +nail (10.2-1) unstable; urgency=low + + * New upstream release + - integrated #169461 patch + - SSL capable POP3 client + - lots of fixes and new options/commands + * Now using sensible-{editor,pager} instead of editor/pager + * New dependency to libssl / build-dep to libssl-dev. I didn't + split the package for convenience and because I figure most + people using nail in space restricted applications will have + ssh around anyway, and the rest can easily recomplie + --without-openssl in debian/rules. + * added debian/compat to avoid duplicated conffiles. + * upgrading to policy version 0.5.8.0 + - building with -g per default, accepting DEB_BUILD_OPTIONS=noopt + for setting -O0. + + -- Arthur Korn Fri, 29 Nov 2002 10:45:41 +0100 + +nail (10.1-3) unstable; urgency=low + + * actually, those getc(c) vars need to be int, I'm learning + closes: #169461 + + -- Arthur Korn Thu, 21 Nov 2002 09:43:31 +0100 + +nail (10.1-2) unstable; urgency=low + + * explicitely make chars signed when necessery, closes: #169461 + + -- Arthur Korn Wed, 20 Nov 2002 22:57:15 +0100 + +nail (10.1-1) unstable; urgency=low + + * New upstream release + + -- Arthur Korn Tue, 29 Oct 2002 17:20:00 +0100 + +nail (9.31-1) unstable; urgency=low + + * New upstream release + - new escape for attachment list editing: ~@ (replaces ~a) + * now Provides: mail-reader, closes: #140489 + + -- Arthur Korn Thu, 20 Jun 2002 12:42:03 +0200 + +nail (9.30-1) unstable; urgency=low + + * New upstream release + + -- Arthur Korn Sat, 9 Mar 2002 18:45:58 +0100 + +nail (9.29-1) unstable; urgency=low + + * New upstream release + + -- Arthur Korn Mon, 10 Dec 2001 22:03:43 +0100 + +nail (9.28-1) unstable; urgency=low + + * New upstream release + + -- Arthur Korn Tue, 23 Oct 2001 20:21:57 +0200 + +nail (9.27-2) unstable; urgency=low + + * Standards-Version 3.5.4.0 + - Explicitely setting mailspool to /var/mail with + --with-mailspool=/var/mail/ in debian/rules. + - dependency on base-files (>= 2.2.0). + * removed dh_testversion from debian/rules. + + -- Arthur Korn Sun, 3 Jun 2001 18:07:40 +0200 + +nail (9.27-1) unstable; urgency=low + + * New upstream release + + -- Arthur Korn Sun, 13 May 2001 22:56:59 +0200 + +nail (9.26-2) unstable; urgency=low + + * The download location in "copyright" showed a "403 Forbidden", using the + homepage of nail instead. + + -- Arthur Korn Sun, 13 May 2001 22:43:29 +0200 + +nail (9.26-1) unstable; urgency=high + + * New upstream release + * Removed SGID mail, thus no more dot locking (you can uncomment it in the + debian/rules file in the source and rebuild if you really need it) because + of a buffer overflow (see http://www.debian.org/security/2001/dsa-044). + Mailx was never written to run S[UG]ID. + + -- Arthur Korn Thu, 15 Mar 2001 17:54:00 +0100 + +nail (9.25-2) unstable; urgency=low + + * Fixed Makefile.am and misc/Makefile.am to allow use of DESTDIR. + + -- Arthur Korn Thu, 1 Feb 2001 21:26:00 +0100 + +nail (9.25-1) unstable; urgency=low + + * New upstream release + * Don't have to run autoconf anymore in debian/rules. + + -- Arthur Korn Thu, 25 Jan 2001 18:15:24 +0100 + +nail (9.24-1) unstable; urgency=low + + * Initial Release. (closes: Bug#82960) + * Hacked up configure.in to allow for other fallbacks for editor and pager. + + -- Arthur Korn Sat, 20 Jan 2001 16:28:10 +0100 --- heirloom-mailx-12.5.orig/debian/rules +++ heirloom-mailx-12.5/debian/rules @@ -0,0 +1,88 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +CFLAGS=-Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS+=-O0 +else + CFLAGS+=-O2 +endif + +build: build-stamp +build-stamp: + dh_testdir + + $(MAKE) CFLAGS="$(CFLAGS)" + + touch build-stamp + +debian/copyright: debian/copyright.head AUTHORS COPYING + dh_testdir + (cat debian/copyright.head; \ + echo 'Upstream Authors:'; \ + echo '-----------------'; echo; \ + cat AUTHORS; echo; \ + echo 'Copyright:'; \ + echo '----------'; echo; \ + cat COPYING) > debian/copyright + +clean: + dh_testdir + dh_testroot + + rm -f build-stamp + + $(MAKE) clean + + rm -f LIBS config.h config.log + rm -f debian/copyright + + dh_clean + +install: debian/copyright build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/heirloom-mailx/ + + # This should change once we rename the package. + mv $(CURDIR)/debian/heirloom-mailx/usr/bin/mailx \ + $(CURDIR)/debian/heirloom-mailx/usr/bin/heirloom-mailx + mv $(CURDIR)/debian/heirloom-mailx/usr/share/man/man1/mailx.1 \ + $(CURDIR)/debian/heirloom-mailx/usr/share/man/man1/heirloom-mailx.1 + +# This is dangerous!! If you really need dot locking, enable at your own risk. +# chgrp mail $(CURDIR)/debian/heirloom-mailx/usr/bin/heirloom-mailx +# chmod 2755 $(CURDIR)/debian/heirloom-mailx/usr/bin/heirloom-mailx + + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installmenu + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms -X/usr/bin/heirloom-mailx + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure + +# vim:nosta --- heirloom-mailx-12.5.orig/debian/menu +++ heirloom-mailx-12.5/debian/menu @@ -0,0 +1,6 @@ +?package(heirloom-mailx):\ + needs="text"\ + section="Applications/Network/Communication"\ + title="heirloom-mailx"\ + command="/usr/bin/heirloom-mailx"\ + hints="Mail" --- heirloom-mailx-12.5.orig/debian/compat +++ heirloom-mailx-12.5/debian/compat @@ -0,0 +1 @@ +5 --- heirloom-mailx-12.5.orig/debian/prerm +++ heirloom-mailx-12.5/debian/prerm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + update-alternatives --remove "mailx" "/usr/bin/heirloom-mailx" +fi + +#DEBHELPER# + --- heirloom-mailx-12.5.orig/debian/control +++ heirloom-mailx-12.5/debian/control @@ -0,0 +1,24 @@ +Source: heirloom-mailx +Section: mail +Priority: optional +Maintainer: Hilko Bengen +Build-Depends: debhelper (>> 5), libssl-dev (>= 0.9.8), libkrb5-dev +Standards-Version: 3.8.4 +Homepage: http://heirloom.sourceforge.net/mailx.html + +Package: heirloom-mailx +Architecture: any +Depends: base-files (>= 2.2.0), ${shlibs:Depends}, ${misc:Depends} +Replaces: nail +Conflicts: mailutils (<< 1:1.1+dfsg1-4), mailx (<< 1:20071201) +Suggests: exim4 | mail-transport-agent +Provides: mailx +Description: feature-rich BSD mail(1) + Workalike of the classical mail(1). Heirloom mailx can produce and + read MIME and S/MIME messages and has greatly improved character-set + handling, including support for UTF-8. + . + It can send messages through a local /usr/bin/sendmail interface or + SMTP, using a smarthost. Mail can be read from local mailboxes as + well as via POP3 or IMAP connections. Network protocols can be + encrypted using SSL/TLS. --- heirloom-mailx-12.5.orig/debian/copyright.head +++ heirloom-mailx-12.5/debian/copyright.head @@ -0,0 +1,9 @@ +This package was debianized by Arthur Korn on +Sat, 20 Jan 2001 16:28:10 +0100. + +As of Tue, 29 Apr 2003 02:13:58 +0200, this package is maintained by +Hilko Bengen . + +The sources were downloaded from +http://heirloom.sourceforge.net/ + --- heirloom-mailx-12.5.orig/debian/postinst +++ heirloom-mailx-12.5/debian/postinst @@ -0,0 +1,20 @@ +#!/bin/sh + +set -e + +bindir=/usr/bin +mandir=/usr/share/man/man1 +program=heirloom-mailx +priority=60 + +if [ "$1" = "configure" ]; then + update-alternatives \ + --install "$bindir/mailx" mailx "$bindir/$program" "$priority" \ + --slave "$bindir/mail" mail "$bindir/$program" \ + --slave "$bindir/Mail" Mail "$bindir/$program" \ + --slave "$mandir/mailx.1.gz" mailx.1.gz "$mandir/$program.1.gz" \ + --slave "$mandir/mail.1.gz" mail.1.gz "$mandir/$program.1.gz" \ + --slave "$mandir/Mail.1.gz" Mail.1.gz "$mandir/$program.1.gz" +fi + +#DEBHELPER# --- heirloom-mailx-12.5.orig/debian/docs +++ heirloom-mailx-12.5/debian/docs @@ -0,0 +1,3 @@ +README +TODO +