rpms/nmh/FC-4 nmh-1.1-empty-content-type.patch, NONE, 1.1 nmh.spec, 1.6, 1.7

[Josh Bressers (bressers)]

Author: bressers

Update of /cvs/extras/rpms/nmh/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27414/FC-4

Modified Files:
	nmh.spec 
Added Files:
	nmh-1.1-empty-content-type.patch 
Log Message:
* Thu Nov 03 2005 Josh Bressers <bressers at redhat.com> 0:1.1-10.fc5
- Prevent mhshow from trying to close a file stream twice


nmh-1.1-empty-content-type.patch:

--- NEW FILE nmh-1.1-empty-content-type.patch ---
Index: uip/mhparse.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhparse.c,v
retrieving revision 1.11
diff -a -u -r1.11 mhparse.c
--- uip/mhparse.c	30 Sep 2003 16:58:43 -0000	1.11
+++ uip/mhparse.c	3 Nov 2005 19:11:50 -0000
@@ -1056,7 +1056,6 @@
 
 	    if (!(p = get_content (fp, ct->c_file,
 			ct->c_subtype == MULTI_DIGEST ? -1 : 0))) {
-		fclose (ct->c_fp);
 		ct->c_fp = NULL;
 		return NOTOK;
 	    }


Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/FC-4/nmh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nmh.spec	25 Aug 2005 21:41:29 -0000	1.6
+++ nmh.spec	3 Nov 2005 19:22:03 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        9.fc4
+Release:        10.fc4
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -9,6 +9,7 @@
 Source0:        http://savannah.nongnu.org/download/nmh/nmh-1.1.tar.gz
 Patch0:         nmh-1.1-makefile.patch
 Patch1:         nmh-1.1-lock_file.patch
+Patch2:         nmh-1.1-empty-content-type.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
@@ -28,6 +29,7 @@
 %setup -q -n nmh
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 
 
 %build
@@ -62,6 +64,9 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Thu Nov 03 2005 Josh Bressers <bressers at redhat.com> 0:1.1-10.fc4
+- Prevent mhshow from trying to close a file stream twice
+
 * Thu Aug 25 2005 Josh Bressers <bressers at redhat.com> 0:1.1-9.fc4
 - Fix the specfile to honor the $RPM_OPT_FLAGS