This commit is contained in:
committed by
Git OBS Bridge
parent
a0a98d80a9
commit
df9d4e1511
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:30717a2673e42df9913dc79da15c48f01947debb87fdfc9c0bf7805dae42f2e3
|
||||
size 603833
|
@@ -1,139 +0,0 @@
|
||||
--- nmh-1.1-RC4/etc/Makefile.in
|
||||
+++ nmh-1.1-RC4/etc/Makefile.in
|
||||
@@ -83,13 +83,13 @@
|
||||
install: install-bin-files install-etc-files
|
||||
|
||||
install-bin-files:
|
||||
- $(top_srcdir)/mkinstalldirs $(bindir)
|
||||
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
|
||||
for script in $(GENERATED_BIN_FILES); do \
|
||||
- $(INSTALL_PROGRAM) $$script $(bindir)/$$script; \
|
||||
+ $(INSTALL_PROGRAM) $$script $(DESTDIR)$(bindir)/$$script; \
|
||||
done
|
||||
|
||||
install-etc-files:
|
||||
- $(top_srcdir)/mkinstalldirs $(etcdir)
|
||||
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)
|
||||
INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
|
||||
for file in $(STATIC_FILES); do \
|
||||
INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
|
||||
@@ -97,11 +97,11 @@
|
||||
for path in $$INSTALL_FILES; do \
|
||||
file=`basename $$path`; \
|
||||
echo "Installing $$file..."; \
|
||||
- if [ -f $(etcdir)/$$file ]; then \
|
||||
- mv $(etcdir)/$$file $(etcdir)/$$file.prev; \
|
||||
- $(INSTALL_DATA) $$path $(etcdir)/$$file; \
|
||||
- if diff $(etcdir)/$$file.prev $(etcdir)/$$file; then \
|
||||
- rm $(etcdir)/$$file.prev; \
|
||||
+ if [ -f $(DESTDIR)$(etcdir)/$$file ]; then \
|
||||
+ mv $(DESTDIR)$(etcdir)/$$file $(DESTDIR)$(etcdir)/$$file.prev; \
|
||||
+ $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
|
||||
+ if diff $(DESTDIR)$(etcdir)/$$file.prev $(DESTDIR)$(etcdir)/$$file; then \
|
||||
+ rm $(DESTDIR)$(etcdir)/$$file.prev; \
|
||||
else \
|
||||
echo; \
|
||||
echo " Previous version of $$file saved as $$file.prev due\c";\
|
||||
@@ -111,7 +111,7 @@
|
||||
echo; \
|
||||
fi; \
|
||||
else \
|
||||
- $(INSTALL_DATA) $$path $(etcdir)/$$file; \
|
||||
+ $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
|
||||
fi; \
|
||||
done
|
||||
|
||||
--- nmh-1.1-RC4/man/Makefile.in
|
||||
+++ nmh-1.1-RC4/man/Makefile.in
|
||||
@@ -130,27 +130,27 @@
|
||||
|
||||
# install the man pages in man1
|
||||
install-man1:
|
||||
- $(top_srcdir)/mkinstalldirs $(mandir)/man$(manext1)
|
||||
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext1)
|
||||
for file in $(MAN1); do \
|
||||
- $(INSTALL_DATA) $$file $(mandir)/man$(manext1) ; \
|
||||
+ $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext1) ; \
|
||||
done
|
||||
|
||||
# install the man pages in man5
|
||||
install-man5:
|
||||
- $(top_srcdir)/mkinstalldirs $(mandir)/man$(manext5)
|
||||
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext5)
|
||||
for file in $(MAN5); do \
|
||||
- $(INSTALL_DATA) $$file $(mandir)/man$(manext5) ; \
|
||||
+ $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext5) ; \
|
||||
done
|
||||
- if [ ! -f $(mandir)/man$(manext5)/mh_profile.$(manext5) ] ; then \
|
||||
- ( cd $(mandir)/man$(manext5) ; ln mh-profile.$(manext5) \
|
||||
+ if [ ! -f $(DESTDIR)$(mandir)/man$(manext5)/mh_profile.$(manext5) ] ; then \
|
||||
+ ( cd $(DESTDIR)$(mandir)/man$(manext5) ; ln mh-profile.$(manext5) \
|
||||
mh_profile.$(manext5) ) \
|
||||
fi
|
||||
|
||||
# install the man pages in man8
|
||||
install-man8:
|
||||
- $(top_srcdir)/mkinstalldirs $(mandir)/man$(manext8)
|
||||
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext8)
|
||||
for file in $(MAN8); do \
|
||||
- $(INSTALL_DATA) $$file $(mandir)/man$(manext8) ; \
|
||||
+ $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext8) ; \
|
||||
done
|
||||
|
||||
# ========= UNINSTALL TARGETS =========
|
||||
--- nmh-1.1-RC4/uip/Makefile.in
|
||||
+++ nmh-1.1-RC4/uip/Makefile.in
|
||||
@@ -255,37 +255,37 @@
|
||||
|
||||
# install commands
|
||||
install-cmds:
|
||||
- $(top_srcdir)/mkinstalldirs $(bindir)
|
||||
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(bindir)
|
||||
for cmd in $(CMDS); do \
|
||||
- $(INSTALL_PROGRAM) $$cmd $(bindir)/$$cmd; \
|
||||
+ $(INSTALL_PROGRAM) $$cmd $(DESTDIR)/$(bindir)/$$cmd; \
|
||||
done
|
||||
|
||||
# install links
|
||||
install-lcmds:
|
||||
- rm -f $(bindir)/flists
|
||||
- rm -f $(bindir)/folders
|
||||
- rm -f $(bindir)/prev
|
||||
- rm -f $(bindir)/next
|
||||
- rm -f $(libdir)/install-mh
|
||||
- $(LN) $(bindir)/flist $(bindir)/flists
|
||||
- $(LN) $(bindir)/folder $(bindir)/folders
|
||||
- $(LN) $(bindir)/show $(bindir)/prev
|
||||
- $(LN) $(bindir)/show $(bindir)/next
|
||||
- $(LN) $(bindir)/install-mh $(libdir)/install-mh
|
||||
+ rm -f $(DESTDIR)/$(bindir)/flists
|
||||
+ rm -f $(DESTDIR)/$(bindir)/folders
|
||||
+ rm -f $(DESTDIR)/$(bindir)/prev
|
||||
+ rm -f $(DESTDIR)/$(bindir)/next
|
||||
+ rm -f $(DESTDIR)/$(libdir)/install-mh
|
||||
+ $(LN) flist $(DESTDIR)/$(bindir)/flists
|
||||
+ $(LN) folder $(DESTDIR)/$(bindir)/folders
|
||||
+ $(LN) show $(DESTDIR)/$(bindir)/prev
|
||||
+ $(LN) show $(DESTDIR)/$(bindir)/next
|
||||
+ $(LN) install-mh $(DESTDIR)/$(libdir)/install-mh
|
||||
|
||||
# install misc support binaries
|
||||
install-misc:
|
||||
- $(top_srcdir)/mkinstalldirs $(libdir)
|
||||
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)
|
||||
for misc in $(MISC); do \
|
||||
- $(INSTALL_PROGRAM) $$misc $(libdir)/$$misc; \
|
||||
+ $(INSTALL_PROGRAM) $$misc $(DESTDIR)/$(libdir)/$$misc; \
|
||||
done
|
||||
|
||||
# install commands with special installation needs (thus no $(SCMDS) use here)
|
||||
install-scmds:
|
||||
if test x$(SETGID_MAIL) != x; then \
|
||||
- $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(bindir)/$$cmd; \
|
||||
+ $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(DESTDIR)/$(bindir)/$$cmd; \
|
||||
else \
|
||||
- $(INSTALL_PROGRAM) inc $(bindir)/$$cmd; \
|
||||
+ $(INSTALL_PROGRAM) inc $(DESTDIR)/$(bindir)/$$cmd; \
|
||||
fi
|
||||
|
||||
uninstall:
|
@@ -1,11 +0,0 @@
|
||||
--- uip/msgchk.c
|
||||
+++ uip/msgchk.c
|
||||
@@ -307,7 +307,7 @@
|
||||
if (vecp == 0) {
|
||||
char *home;
|
||||
|
||||
- home = (uid = geteuid()) ? home = getenv ("HOME") : NULL;
|
||||
+ home = (uid = geteuid()) ? getenv ("HOME") : NULL;
|
||||
if (home == NULL) {
|
||||
pw = getpwnam (user);
|
||||
if (pw == NULL)
|
3
nmh-1.2.tar.bz2
Normal file
3
nmh-1.2.tar.bz2
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2f38399437543a848aa09a2ce986ca84f77b682921c16d76822833fd2a57e011
|
||||
size 659871
|
76
nmh-warnings.patch
Normal file
76
nmh-warnings.patch
Normal file
@@ -0,0 +1,76 @@
|
||||
--- h/nmh.h
|
||||
+++ h/nmh.h
|
||||
@@ -113,9 +113,13 @@
|
||||
#include <signal.h>
|
||||
|
||||
#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/getans.c
|
||||
+++ sbr/getans.c
|
||||
@@ -30,9 +30,8 @@
|
||||
SIGNAL_HANDLER istat;
|
||||
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
|
||||
@@ -542,7 +542,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;
|
||||
}
|
||||
--- uip/mhbuildsbr.c
|
||||
+++ uip/mhbuildsbr.c
|
||||
@@ -3619,10 +3619,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 */
|
||||
char *cp, buffer[BUFSIZ];
|
||||
struct text *t;
|
||||
--- uip/msgchk.c
|
||||
+++ uip/msgchk.c
|
||||
@@ -307,13 +307,12 @@
|
||||
if (vecp == 0) {
|
||||
char *home;
|
||||
|
||||
- home = (uid = geteuid()) ? home = getenv ("HOME") : NULL;
|
||||
+ home = (uid = geteuid()) ? getenv ("HOME") : NULL;
|
||||
if (home == NULL) {
|
||||
pw = getpwnam (user);
|
||||
if (pw == NULL)
|
||||
adios (NULL, "unable to get information about user");
|
||||
- if (home == NULL)
|
||||
- home = pw->pw_dir;
|
||||
+ home = pw->pw_dir;
|
||||
}
|
||||
status = checkmail (user, home, datesw, notifysw, 1);
|
||||
} else {
|
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 28 18:03:34 CEST 2007 - max@suse.de
|
||||
|
||||
- Update to version 1.2, which fixes a crash (#230763) and a
|
||||
performance problem (#230764).
|
||||
- Fixed several compiler warnings (#232416).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 23 15:07:19 CET 2007 - rguenther@suse.de
|
||||
|
||||
|
29
nmh.spec
29
nmh.spec
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package nmh (Version 1.1)
|
||||
# spec file for package nmh (Version 1.2)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@@ -13,18 +13,17 @@
|
||||
Name: nmh
|
||||
BuildRequires: gdbm-devel ncurses-devel postfix
|
||||
License: Other License(s), see package
|
||||
Group: Productivity/Networking/Email/Utilities
|
||||
Group: Productivity/Networking/Email/Clients
|
||||
Requires: smtp_daemon, less
|
||||
Provides: mh
|
||||
Obsoletes: mh
|
||||
Autoreqprov: on
|
||||
Version: 1.1
|
||||
Release: 227
|
||||
Version: 1.2
|
||||
Release: 1
|
||||
Summary: Unix Mail Handler
|
||||
URL: http://www.mhost.com/nmh/
|
||||
Source: %{name}-%{version}-RC4.tar.bz2
|
||||
Patch: %{name}-%{version}-destdir.diff
|
||||
Patch1: %{name}-%{version}-warning.diff
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Patch0: nmh-warnings.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@@ -44,12 +43,16 @@ ways.
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Richard Coleman (coleman@math.gatech.edu)
|
||||
Richard Coleman <coleman@math.gatech.edu>
|
||||
Dan Harkless <dan-nmh@dilvish.speed.net>
|
||||
Shantonu Sen <ssen@mit.edu>
|
||||
Doug Morris <doug@mhost.com>
|
||||
de Rooij <ruud@ruud.org>
|
||||
Oliver Kiddle <okiddle@yahoo.co.uk>
|
||||
|
||||
%prep
|
||||
%setup -q -n %name-%version-RC4
|
||||
%patch -p1
|
||||
%patch1
|
||||
%setup -q
|
||||
%patch0
|
||||
|
||||
%build
|
||||
libtoolize --copy --force
|
||||
@@ -80,6 +83,10 @@ make CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT install
|
||||
%doc docs/TODO docs/README* COPYRIGHT
|
||||
|
||||
%changelog
|
||||
* Wed Mar 28 2007 - max@suse.de
|
||||
- Update to version 1.2, which fixes a crash (#230763) and a
|
||||
performance problem (#230764).
|
||||
- Fixed several compiler warnings (#232416).
|
||||
* Fri Mar 23 2007 - rguenther@suse.de
|
||||
- add gdbm-devel and ncurses-devel BuildRequires
|
||||
* Fri Jan 26 2007 - ro@suse.de
|
||||
|
Reference in New Issue
Block a user