rpms/nmh/devel nmh-1.1-context_read.patch, NONE, 1.1 nmh.spec, 1.10, 1.11

Josh Bressers (bressers) fedora-extras-commits at redhat.com
Wed Dec 14 02:38:02 UTC 2005


Author: bressers

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

Modified Files:
	nmh.spec 
Added Files:
	nmh-1.1-context_read.patch 
Log Message:
Add a patch to prevent multiple reads to read_context from squashing
mhn.defaults settings.


nmh-1.1-context_read.patch:

--- NEW FILE nmh-1.1-context_read.patch ---
diff -urNp nmh-orig/sbr/context_read.c nmh/sbr/context_read.c
--- nmh-orig/sbr/context_read.c	2005-12-13 21:13:07.000000000 -0500
+++ nmh/sbr/context_read.c	2005-12-13 21:13:54.000000000 -0500
@@ -39,6 +39,13 @@ context_read (void)
     register	FILE		*ib;		/* profile and context file pointer */
 
     /*
+     *  If this routine _is_ called again (despite the wanings in the
+     *  comments above), return immediately.
+     */
+    if ( m_defs != 0 )
+        return;
+
+    /*
      *	Find user's home directory.  Try the HOME environment variable first,
      *	the home directory field in the password file if that's not found.
      */


Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/devel/nmh.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nmh.spec	13 Dec 2005 04:00:24 -0000	1.10
+++ nmh.spec	14 Dec 2005 02:38:00 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        13.fc5
+Release:        14.fc5
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Patch1:         nmh-1.1-lock_file.patch
 Patch2:         nmh-1.1-empty-content-type.patch
 Patch3:         nmh-1.1-annotate.patch
+Patch4:         nmh-1.1-context_read.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
@@ -34,6 +35,7 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -68,6 +70,10 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Tue Dec 13 2005 Josh Bressers <bressers at redhat.com> 0:1.1-14.fc5
+- Add a patch to prevent multiple calls to context_read from squashing
+  settings.
+
 * Mon Dec 12 2005 Josh Bressers <bressers at redhat.com> 0:1.1-13.fc5
 - Add a patch to allow repl to properly annotate messages.
 




More information about the scm-commits mailing list