diff --git a/nmh-1.3.tar.bz2 b/nmh-1.3.tar.bz2 deleted file mode 100644 index 926e1b5..0000000 --- a/nmh-1.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a988d36ab0325db0fa43de9cbb45a7df9414cfa7f0573a7773e6af544fc16f55 -size 658405 diff --git a/nmh-1.5.tar.gz b/nmh-1.5.tar.gz new file mode 100644 index 0000000..643c30c --- /dev/null +++ b/nmh-1.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af5342de8fe9fba5d615caccc9fbcb43cac60b6eb71432f7e112d43850d31c39 +size 935919 diff --git a/nmh-warnings.patch b/nmh-warnings.patch deleted file mode 100644 index 23ddefb..0000000 --- a/nmh-warnings.patch +++ /dev/null @@ -1,117 +0,0 @@ ---- h/nmh.h -+++ h/nmh.h -@@ -113,9 +113,13 @@ - #include - - #define bcmp(b1,b2,length) memcmp(b1, b2, length) -+#ifndef bcopy - #define bcopy(b1,b2,length) memcpy (b2, b1, length) -+#endif - #define bcpy(b1,b2,length) memcmp (b1, b2, length) -+#ifndef bzero - #define bzero(b,length) memset (b, 0, length) -+#endif - - #ifdef HAVE_KILLPG - # define KILLPG(pgrp,sig) killpg(pgrp,sig); ---- sbr/addrsbr.c -+++ sbr/addrsbr.c -@@ -105,6 +105,7 @@ - note = ap->note; - if (ap->err && *ap->err) - strncpy (err, ap->err, sizeof(err)); -+ err[sizeof(err)-1] = '\0'; - - return adr; - } -@@ -119,7 +120,7 @@ - char *dp; - #endif /* not DUMB */ - -- if (err && err[0]) { -+ if (err[0]) { - if (eresult) - strcpy (eresult, err); - else ---- sbr/getans.c -+++ sbr/getans.c -@@ -30,9 +30,8 @@ - SIGNAL_HANDLER istat = NULL; - char *cp, **cpp; - -- if (!(setjmp (sigenv))) { -- istat = SIGNAL (SIGINT, intrser); -- } else { -+ istat = SIGNAL (SIGINT, intrser); -+ if (setjmp (sigenv)) { - SIGNAL (SIGINT, istat); - return NULL; - } ---- uip/inc.c -+++ uip/inc.c -@@ -545,7 +545,7 @@ - adios (NULL, "no mail to incorporate"); - - if ((cp = strdup(newmail)) == (char *)0) -- adios (maildir, "error allocating memory to copy newmail"); -+ adios (newmail, "error allocating memory to copy newmail"); - - newmail = cp; - } -@@ -582,6 +582,19 @@ - if (!(mp = folder_read (folder))) - adios (NULL, "unable to read folder %s", folder); - -+#ifdef MHE -+ if (context_find ("mhe")) { -+ cp = concat (maildir, "/++", NULL); -+ i = stat (cp, &st); -+ if ((mhe = fopen (cp, "a")) == NULL) -+ admonish (cp, "unable to append to"); -+ else -+ if (i == NOTOK) -+ chmod (cp, m_gmprot ()); -+ free (cp); -+ } -+#endif /* MHE */ -+ - #ifdef POP - go_to_it: - #endif /* POP */ -@@ -632,19 +645,6 @@ - #endif /* POP */ - } - --#ifdef MHE -- if (context_find ("mhe")) { -- cp = concat (maildir, "/++", NULL); -- i = stat (cp, &st); -- if ((mhe = fopen (cp, "a")) == NULL) -- admonish (cp, "unable to append to"); -- else -- if (i == NOTOK) -- chmod (cp, m_gmprot ()); -- free (cp); -- } --#endif /* MHE */ -- - /* Get new format string */ - nfs = new_fs (form, format, FORMAT); - ---- uip/mhbuildsbr.c -+++ uip/mhbuildsbr.c -@@ -3706,10 +3706,10 @@ - scan_content (CT ct) - { - int len; -- int check8bit, contains8bit = 0; /* check if contains 8bit data */ -- int checklinelen, linelen = 0; /* check for long lines */ -- int checkboundary, boundaryclash = 0; /* check if clashes with multipart boundary */ -- int checklinespace, linespace = 0; /* check if any line ends with space */ -+ int check8bit = 0, contains8bit = 0; /* check if contains 8bit data */ -+ int checklinelen = 0, linelen = 0; /* check for long lines */ -+ int checkboundary = 0, boundaryclash = 0; /* check if clashes with multipart boundary */ -+ int checklinespace = 0, linespace = 0; /* check if any line ends with space */ - int checkebcdic, ebcdicunsafe = 0; /* check if contains ebcdic unsafe characters */ - unsigned char *cp, buffer[BUFSIZ]; - struct text *t; diff --git a/nmh.changes b/nmh.changes index 1bece99..1bc21f2 100644 --- a/nmh.changes +++ b/nmh.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Oct 22 15:56:48 UTC 2013 - max@suse.com + +- New version 1.5: + * comp, forw, and dist now process all drafts through + mh-format(5) and now support new command line arguments -from, + -to, -cc, -fcc, and -subject. + * Nmh's idea of the local mailbox is now configurable via a new + profile entry, Local-Mailbox. + * post now requires a “From:” header in all message that it + processes. All components files have been adjusted to include + an appropriate “From:” header by default. The release notes + have more information on how this transition will affect + users. + * The -attach option is now the default for send (using the + header Nmh-Attachment) and -attachformat 1 is the default + attachment type. + * Command editing and filename completion (via readline) is now + available in whatnow + * Support for using an external command to filter the body of a + message through in mhl. See mhl(1) for more details, + specifically the format keyword, the formatproc entry in + mh-profile(5), and the -fmtproc switch for mhl and repl. + * Preliminary support for improved MIME handling when replying + to messages. Yes, a long requested feature has a solution. See + the release notes and docs/contrib/replyfilter for more + information. +- Obsoletes nmh-warnings.patch + ------------------------------------------------------------------- Wed Nov 23 12:50:59 UTC 2011 - coolo@suse.com diff --git a/nmh.spec b/nmh.spec index 6389fd0..0c93be1 100644 --- a/nmh.spec +++ b/nmh.spec @@ -1,7 +1,7 @@ # # spec file for package nmh # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: nmh -BuildRequires: gdbm-devel libtool ncurses-devel postfix +BuildRequires: gdbm-devel +BuildRequires: libtool +BuildRequires: ncurses-devel +BuildRequires: postfix +Requires: less +Requires: smtp_daemon +Provides: mh +Obsoletes: mh <= 6.8.4 +Version: 1.5 +Release: 0 +Summary: Unix Mail Handler License: BSD-3-Clause Group: Productivity/Networking/Email/Clients -Requires: smtp_daemon, less -Provides: mh -Obsoletes: mh -Version: 1.3 -Release: 1 -Summary: Unix Mail Handler Url: http://www.mhost.com/nmh/ -Source: %{name}-%{version}.tar.bz2 -Patch0: nmh-warnings.patch +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,19 +60,14 @@ Authors: %prep %setup -q -%patch0 %build -libtoolize --copy --force -autoreconf --force --install CFLAGS="$RPM_OPT_FLAGS" \ -./configure --prefix=/usr \ - --mandir=$DESTDIR/%{_mandir} \ +%configure --libdir=/usr/lib/%name \ + --docdir=%_defaultdocdir/%name \ --sysconfdir=/etc/nmh \ - --sharedstatedir=/var \ --enable-pop \ - --with-pager=/usr/bin/less \ - --libdir=/usr/lib/nmh + --with-pager=/usr/bin/less make %install @@ -83,10 +79,7 @@ make CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT install /usr/lib/nmh %dir /etc/nmh/ %config /etc/nmh/* -%{_mandir}/man1/* -%{_mandir}/man5/* -%{_mandir}/man8/* -%doc docs/COMPLETION-* docs/DIFFERENCES docs/FAQ docs/MAIL.FILTERING VERSION -%doc docs/TODO docs/README* COPYRIGHT ChangeLog +%{_mandir}/man*/* +%_defaultdocdir/%name %changelog