Wed Jun 18 14:33:40 UTC 2008

Author: buc

Update of /cvs/extras/rpms/mailx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32623

Modified Files:
	mailx.spec sources 
Added Files:
	nail-11.25-config.patch 
Removed Files:
	flock.c mailx-8.1.1-bug10074.patch mailx-8.1.1-bug134837.patch 
	mailx-8.1.1-bug15728.patch mailx-8.1.1-bug44798.patch 
	mailx-8.1.1-bug58672.patch mailx-8.1.1-close.patch 
	mailx-8.1.1-ctime.patch mailx-8.1.1-dir.patch 
	mailx-8.1.1-display.patch mailx-8.1.1-environ.patch 
	mailx-8.1.1-fhs.patch mailx-8.1.1-flock.patch 
	mailx-8.1.1-manfix.patch mailx-8.1.1-manpage-fix.patch 
	mailx-8.1.1-mbproblem.patch mailx-8.1.1-nostrip.patch 
	mailx-8.1.1-reproblem.patch mailx-8.1.1-siglj.patch 
	mailx-8.1.1-uidcheck.patch mailx-8.1.1-unread.patch 
	mailx-8.1.1.debian.patch mailx-8.1.1.debian2.patch 
	mailx-8.1.1.nolock.patch mailx-8.1.1.security.patch 
	mailx-nopanic.patch mailx-noroot.patch mailx-nullchar.patch 
Log Message:

Upgrade to the new upstream, Heirloom Mailx



nail-11.25-config.patch:

--- NEW FILE nail-11.25-config.patch ---
diff -Nrbu nail-11.25/nail.rc nail-11.25-OK/nail.rc
--- nail-11.25/nail.rc	2005-01-15 17:33:16.000000000 +0300
+++ nail-11.25-OK/nail.rc	2005-08-19 16:55:09.000000000 +0400
@@ -60,3 +60,7 @@
 
 # Only include selected header fields when forwarding messages.
 fwdretain subject date from to
+
+# For Linux and BSD, this should be set.
+set bsdcompat
+


Index: mailx.spec
===================================================================
RCS file: /cvs/extras/rpms/mailx/devel/mailx.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mailx.spec	20 Feb 2008 06:38:21 -0000	1.29
+++ mailx.spec	18 Jun 2008 14:32:51 -0000	1.30
@@ -1,270 +1,171 @@
-Summary: The /bin/mail program for sending e-mail messages
-Name: mailx
-Version: 8.1.1
-Release: 48%{?dist}
-License: BSD
-Group: Applications/Internet
-Source: ftp://ftp.debian.org/debian/pool/main/m/mailx/mailx-%{version}.tar.gz
-Source1: flock.c
-Patch0: mailx-8.1.1.debian.patch
-Patch1: mailx-8.1.1.security.patch
-Patch2: mailx-8.1.1.nolock.patch
-Patch3: mailx-8.1.1.debian2.patch
-Patch4: mailx-noroot.patch
-Patch5: mailx-nopanic.patch
-Patch6: mailx-nullchar.patch
-Patch7: mailx-8.1.1-fhs.patch
-Patch8: mailx-8.1.1-environ.patch
-Patch9: mailx-8.1.1-siglj.patch
-Patch10: mailx-8.1.1-bug15728.patch
-Patch11: mailx-8.1.1-bug10074.patch
-Patch12: mailx-8.1.1-uidcheck.patch
-Patch13: mailx-8.1.1-flock.patch
-Patch14: mailx-8.1.1-nostrip.patch
-Patch15: mailx-8.1.1-ctime.patch
-Patch16: mailx-8.1.1-bug134837.patch
-Patch17: mailx-8.1.1-manpage-fix.patch
-Patch18: mailx-8.1.1-manfix.patch
-Patch19: mailx-8.1.1-display.patch
-Patch20: mailx-8.1.1-bug44798.patch
-Patch21: mailx-8.1.1-bug58672.patch
-Patch22: mailx-8.1.1-reproblem.patch
-Patch23: mailx-8.1.1-mbproblem.patch
-Patch24: mailx-8.1.1-unread.patch
-Patch25: mailx-8.1.1-dir.patch
-Patch26: mailx-8.1.1-close.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-
-%description
-The mailx package installs the /bin/mail program, which is used to
-send quick email messages (i.e., without opening up a full-featured
-mail user agent). Mail is often used in shell scripts.
-
-You should install mailx because of its quick email sending ability,
-which is especially useful if you're planning on writing any shell
-scripts.
-
-%prep
-%setup -q
-cp %{SOURCE1} .
-%patch0 -p1 -b .debian
-%patch1 -p1 -b .security
-%patch2 -p1 -b .nolock
-%patch3 -p1 -b .debian2
-%patch4 -p1 -b .noroot
-%patch5 -p1 -b .nopanic
-%patch6 -p1 -b .nullchar
-%patch7 -p1 -b .fhs
-%patch8 -p1 -b .environ
-%patch9 -p1 -b .siglj
-%patch10 -p1 -b .bug15728
-%patch11 -p1 -b .bug10074
-%patch12 -p1 -b .uidcheck
-%patch13 -p1 -b .flock
-%patch14 -p1 -b .nostrip
-%patch15 -p1 -b .ctime
-%patch16 -p1 -b .bug134837
-%patch17 -p1 -b .manpage-fix
-%patch18 -p1 -b .manfix
-%patch19 -p1 -b .display
-%patch20 -p1 -b .bug44798
-%patch21 -p1 -b .bug58672
-%patch22 -p1 -b .reproblem
-%patch23 -p1 -b .mbproblem
-%patch24 -p1 -b .unread
-%patch25 -p1 -b .dir
-%patch26 -p1 -b .close
-
-%build
-make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}/{bin,etc}
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/mailx
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
-
-make DESTDIR=${RPM_BUILD_ROOT} bindir=%{_bindir} mandir=%{_mandir} install
-
-( cd ${RPM_BUILD_ROOT}
-  mv .%{_bindir}/mail ./bin/mail
-  chmod g-s ./bin/mail
-  ln -sf ../../bin/mail .%{_bindir}/Mail
-  ln -sf mail.1 .%{_mandir}/man1/Mail.1
-)
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-,root,root,-)
-%doc debian/copyright
-%attr(755,root,mail)	/bin/mail
-%{_bindir}/Mail
-%{_datadir}/mailx
-%{_datadir}/mailx/mail.help
-%{_datadir}/mailx/mail.tildehelp
-%config(noreplace) /etc/mail.rc
-%{_mandir}/man1/mail.1*
-%{_mandir}/man1/Mail.1*
-
-%changelog
-* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 8.1.1-48
-- Autorebuild for GCC 4.3
-
-* Fri Jan  4 2008 Ivana Varekova <varekova at redhat.com> - 8.1.1-47
-- close file descriptor, test mkstemp output (#427335)
-
-* Mon Mar  5 2007 Ivana Varekova <varekova at redhat.com> - 8.1.1-46
-- add /usr/share/mailx directory
-
-* Fri Feb 23 2007 Ivana Varekova <varekova at redhat.com> - 8.1.1-45
-- incorporate the package review feedback (226118)
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.1.1-44.2.2
-- rebuild
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.1.1-44.2.1
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.1.1-44.2
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+%define	use_nss	1
 
-* Tue Mar 08 2005 Jiri Ryska <jryska at redhat.com>
-- changed Copyright to License in mailx.spec
-
-* Fri Mar 04 2005 Jiri Ryska <jryska at redhat.com>
-- rebuilt
-
-* Fri Feb 18 2005 Jiri Ryska <jryska at redhat.com>
-- updated patch mailx-8.1.1-bug134837.patch
-
-* Mon Jan 24 2005 Ivana Varekova <varekova at redhat.com> 8.1.1-41
-- fix problem with command U - bug #145710
-
-* Thu Nov 18 2004 Ivana Varekova <varekova at redhat.com>
-- fix problem with patch bug44798
-
-* Tue Nov 16 2004 Ivana Varekova <varekova at redhat.com>
-- fix problem with Reply-To header #136429
-- fix problem with changes in mailbox #77069
-
-* Mon Nov 15 2004 Ivana Varekova <varekova at redhat.com>
-- fix tempnam problem #44798, fix problem with short number of lines #58672
-
-* Wed Nov 03 2004 Ivana Varekova <varekova at redhat.com>
-- fix man #121781, fix display problem #77183
-
-* Wed Oct 27 2004 Ivana Varekova <varekova at redhat.com>
-- fix manpage #63523
-
-* Wed Oct 20 2004 Jiri Ryska <jryska at redhat.com>
-- fix #134837
-
-* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
+Summary: Enhanced implementation of the mailx command
+Name: mailx
+Version: 12.3
+Release: 0%{?dist}
+Group: 	Applications/Internet
+License: BSD with advertising
+URL: http://heirloom.sourceforge.net/mailx.html
+Source0: http://dl.sourceforge.net/heirloom/mailx-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: nail-11.25-config.patch
+
+%if %{use_nss}
+BuildRequires: nss-devel, pkgconfig
+%else
+BuildRequires: openssl-devel
+%endif
 
-* Fri Aug 01 2003 Florian La Roche <Florian.LaRoche at redhat.de>
-- fix include file order #101251
+Obsoletes: nail <= 12.3
+Provides: nail
 
-* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
-- rebuilt
 
-* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
-- rebuilt
+%description
+Mailx is an enhanced mail command, which provides the functionality
+of the POSIX mailx command, as well as SysV mail and Berkeley Mail
+(from which it is derived).
+
+Additionally to the POSIX features, mailx can work with Maildir/ e-mail
+storage format (as well as mailboxes), supports IMAP, POP3 and SMTP
+procotols (including over SSL) to operate with remote hosts, handles mime
+types and different charsets. There are a lot of other useful features,
+see mailx(1).
+
+And as its ancient analogues, mailx can be used as a mail script language,
+both for sending and receiving mail.
+
+Besides the "mailx" command, this package provides "mail" and "Mail"
+(which should be compatible with its predecessors from the mailx-8.x source),
+as well as "nail" (the initial name of this project).
 
-* Tue Nov 19 2002 Tim Powers <timp at redhat.com>
-- rebuild on all arches
 
-* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
+%prep
+%setup -q
+%patch0 -p1
 
-* Wed Jun 19 2002 Florian La Roche <Florian.LaRoche at redhat.de>
-- do not strip apps
+# TODO:
+# - Choose proper config file name (currently /etc/mailx.rc)
+# - Avoid any referencies of "nail" in the doc and code (mailx.1)
+# - When "nobsdcompat", "pg" pager is chosen, which is missed in Linux...
+# - Work with upstream to differ config files and/or config directives
+# depending on the actual program name (fe. to allow "mail" with "bsdcompat",
+# but POSIX's "mailx" without "bsdcompat").
 
-* Thu May 23 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
 
-* Fri Jan 25 2002 Florian La Roche <Florian.LaRoche at redhat.de>
-- rebuild
+%build
 
-* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
-- Bump release + rebuild.
+%if %{use_nss}
+INCLUDES="$INCLUDES `pkg-config --cflags-only-I nss`"
+export INCLUDES
+%endif
+
+echo	PREFIX=%{_prefix} \
+	BINDIR=%{_bindir} \
+	MANDIR=%{_mandir} \
+	SYSCONFDIR=%{_sysconfdir} \
+	MAILRC=%{_sysconfdir}/%{name}.rc \
+	MAILSPOOL=%{_localstatedir}/mail \
+	SENDMAIL=%{_sbindir}/sendmail \
+	UCBINSTALL=install \
+> makeflags
 
-* Thu Aug 24 2000 Nalin Dahyabhai <nalin at redhat.com>
-- clean up flock() usage -- LOCK_EX shouldn't work on read-only descriptors
+#  %{?_smp_mflags} cannot be used here
+make `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 
-* Mon Aug 21 2000 Nalin Dahyabhai <nalin at redhat.com>
-- patch to use fcntl() for locking instead of flock() (#15779)
-- patch to ignore ~/.mailrc if it's owned by anyone other than the owner of
-  this process
-- clean up flock() emulation semantics
 
-* Thu Aug 17 2000 Jeff Johnson <jbj at redhat.com>
-- summaries from specspo.
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT STRIP=: `cat makeflags` install
 
-* Fri Aug 11 2000 Jeff Johnson <jbj at redhat.com>
-- time to use sigsetjmp/siglongjmp (#14010).
-- avoid indexing on NOSTR valued pointer (#15728).
-- ignore MAIL enviromment variable when invoked with -u (#10074).
+#  we need /bin/mail as basic path...
+install -d $RPM_BUILD_ROOT/bin
+pushd $RPM_BUILD_ROOT
+
+mv ./%{_bindir}/%{name} ./bin/mail
+pref=`echo %{_bindir} | sed 's,/[^/]*,../,g'`
+ln -s ${pref}bin/mail ./%{_bindir}/Mail
+ln -s ${pref}bin/mail ./%{_bindir}/nail
+ln -s ${pref}bin/mail ./%{_bindir}/%{name}
+
+pushd ./%{_mandir}/man1
+mv %{name}.1 mail.1
+ln -s mail.1 Mail.1
+ln -s mail.1 nail.1
+ln -s mail.1 %{name}.1
+popd
 
-* Mon Aug  7 2000 Nalin Dahyabhai <nalin at redhat.com>
-- disable security-prone variables-inherited-from-environment behavior
-- inherit only SHELL, DEAD, PAGER, LISTER, EDITOR, VISUAL, MBOX from environment
-- document the environment variables that are used
+popd
 
-* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
-- automatic rebuild
 
-* Wed Jun 21 2000 Preston Brown <pbrown at redhat.com>
-- noreplace mail.rc
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-* Sun Jun 18 2000 Jeff Johnson <jbj at redhat.com>
-- FHS packaging.
 
-* Sun May  7 2000 Bill Nottingham <notting at redhat.com>
-- fix explosions on ia64
+%files
+%defattr(-,root,root,-)
+%doc COPYING AUTHORS README
+%config(noreplace) %{_sysconfdir}/%{name}.rc
+/bin/*
+%{_bindir}/*
+%{_mandir}/*/*
 
-* Thu Feb 03 2000 Elliot Lee <sopwith at redhat.com>
-- Fix bug #8451
-- Fix bug #8100
 
-* Tue Aug 31 1999 Bill Nottingham <notting at redhat.com>
-- fix pathnames
-- take out makefile install crud
+%changelog
+* Wed Jun 18 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 12.3-0
+- Change the name from "nail" to upstream's "mailx".
+  Merge with the ordinary "mailx" cvs tree for Fedora 10.
+  Now this stuff supersedes the old ancient mailx-8.x in Feedora.
+- Build with nss instead of openssl, for "Security Consolidation" process.
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
-- auto rebuild in the new build environment (release 8)
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 12.3-4
+- Autorebuild for GCC 4.3
 
-* Thu Aug 27 1998 Alan Cox <alan at redhat.com>
-- Synchronized with the Debian people (more small edge case cures)
+* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 12.3-3
+ - Rebuild for deps
 
-* Tue Aug  4 1998 Jeff Johnson <jbj at redhat.com>
-- build root
+* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 12.3-2
+- Rebuild for selinux ppc32 issue.
 
-* Wed Jun 24 1998 Alan Cox <alan at redhat.com>
-- Switched dotlocking off. This fits the Red Hat model of not having setgid
-  mail agents and fixes the "lock" problem reported.
+* Fri Aug 17 2007 Dmitry Butskoy <Dmitry at Butskoy.name>
+- Change License tag to "BSD with advertising"
 
-* Mon Jun 22 1998 Alan Cox <alan at redhat.com>
-- Buffer overrun patches. These dont bite us when we don't run mailx setgid
-  but do want to be in as mailx needs to be setgid
+* Tue Jul 24 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 12.3-1
+- update to 12.3
 
-* Fri Jun 12 1998 Alan Cox <alan at redhat.com>
-- Moved from 5.5 to the OpenBSD 8.1 release plus Debian patches
+* Fri Jan 12 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 12.2-1
+- update to 12.2
+- spec file cleanups
 
-* Tue May 05 1998 Prospector System <bugs at redhat.com>
-- translations modified for de, fr, tr
+* Fri Jun 16 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 12.1-1
+- update to 12.1
 
-* Tue Oct 21 1997 Donnie Barnes <djb at redhat.com>
-- spec file cleanups
+* Wed Mar 22 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 12.0-2
+- complete "mailx to nail" changes in the manual and config files
+- drop _smp_mflags: it caused make to work incorrectly.
+
+* Tue Mar 21 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 12.0-1
+- upgrade to 12.0
+- change new upstream name "mailx" to the old name "nail" to avoid
+  conflicts with the Core mailx package.
+- drop Source1, use package's html file instead.
+
+* Mon Oct 17 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 11.25-4
+- don't strip binaries on makeinstall (#170972)
+
+* Mon Oct  3 2005 Dmitry Butskoy <Dmitry at Butskoy.name>
+- clear buildroot before install (Michael Schwendt)
+
+* Mon Sep 26 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 11.25-3
+- more spec file cleanups
+- accepted for Fedora Extra
+  (review by Aurelien Bompard <gauret at free.fr>)
+
+* Mon Aug 22 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 11.25-2
+- spec file cleanups (#166343)
+
+* Fri Aug 19 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 11.25-1
+- initial release
+- add "set bsdcompat" to nail.rc as default
+- copy nail web page to doc
 
-* Thu Jun 12 1997 Erik Troan <ewt at redhat.com>
-- built against glibc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mailx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 08:11:18 -0000	1.2
+++ sources	18 Jun 2008 14:32:51 -0000	1.3
@@ -1 +1 @@
-2a5b39e90b9d6d4e56b6cc930b0c4db4  mailx-8.1.1.tar.gz
+54406da3f55ded303c7a58bf9e307033  mailx-12.3.tar.bz2


--- flock.c DELETED ---


--- mailx-8.1.1-bug10074.patch DELETED ---


--- mailx-8.1.1-bug134837.patch DELETED ---


--- mailx-8.1.1-bug15728.patch DELETED ---


--- mailx-8.1.1-bug44798.patch DELETED ---


--- mailx-8.1.1-bug58672.patch DELETED ---


--- mailx-8.1.1-close.patch DELETED ---


--- mailx-8.1.1-ctime.patch DELETED ---


--- mailx-8.1.1-dir.patch DELETED ---


--- mailx-8.1.1-display.patch DELETED ---


--- mailx-8.1.1-environ.patch DELETED ---


--- mailx-8.1.1-fhs.patch DELETED ---


--- mailx-8.1.1-flock.patch DELETED ---


--- mailx-8.1.1-manfix.patch DELETED ---


--- mailx-8.1.1-manpage-fix.patch DELETED ---


--- mailx-8.1.1-mbproblem.patch DELETED ---


--- mailx-8.1.1-nostrip.patch DELETED ---


--- mailx-8.1.1-reproblem.patch DELETED ---


--- mailx-8.1.1-siglj.patch DELETED ---


--- mailx-8.1.1-uidcheck.patch DELETED ---


--- mailx-8.1.1-unread.patch DELETED ---


--- mailx-8.1.1.debian.patch DELETED ---


--- mailx-8.1.1.debian2.patch DELETED ---


--- mailx-8.1.1.nolock.patch DELETED ---


--- mailx-8.1.1.security.patch DELETED ---


--- mailx-nopanic.patch DELETED ---


--- mailx-noroot.patch DELETED ---


--- mailx-nullchar.patch DELETED ---


