rpms/nmh/FC-3 nmh-1.1-lock_file.patch,NONE,1.1 nmh.spec,1.3,1.4
Josh Bressers (bressers)
fedora-extras-commits at redhat.com
Mon Apr 25 00:33:05 UTC 2005
Author: bressers
Update of /cvs/extras/rpms/nmh/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13559
Modified Files:
nmh.spec
Added Files:
nmh-1.1-lock_file.patch
Log Message:
Add a patch to automatically fail when trying to lock files in /dev
nmh-1.1-lock_file.patch:
--- NEW FILE nmh-1.1-lock_file.patch ---
diff -cr nmh.orig/sbr/lock_file.c nmh/sbr/lock_file.c
*** nmh.orig/sbr/lock_file.c 2003-10-24 13:17:37.000000000 -0700
--- nmh/sbr/lock_file.c 2005-04-23 16:23:52.000000000 -0700
***************
*** 373,378 ****
--- 373,381 ----
* Get the name of the eventual lock file, as well
* as a name for a temporary lock file.
*/
+ if( strncmp( file, "/dev", 4 ) == 0 ) {
+ return -1; /* don't lock in /dev */
+ }
lockname (file, &lkinfo, 1);
#if !defined(HAVE_LIBLOCKFILE)
Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/FC-3/nmh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nmh.spec 17 Apr 2005 18:51:30 -0000 1.3
+++ nmh.spec 25 Apr 2005 00:33:03 -0000 1.4
@@ -1,6 +1,6 @@
Name: nmh
Version: 1.1
-Release: 6.fc3
+Release: 7.fc3
Summary: A capable mail handling system with a command line interface.
Group: Applications/Internet
@@ -8,6 +8,7 @@
URL: http://savannah.nongnu.org/projects/nmh
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtermcap-devel
BuildRequires: db4-devel
@@ -26,6 +27,7 @@
%prep
%setup -q -n nmh
%patch0 -p1
+%patch1 -p1
%build
@@ -61,6 +63,9 @@
%doc docs/TODO docs/README* COPYRIGHT
%changelog
+* Sun Apr 24 2005 Josh Bressers <bressers at redhat.com> 0:1.1-7.fc3
+- Add patch from Jason Venner to avoid trying to lock files in /dev
+
* Sun Apr 17 2005 Josh Bressers <bressers at redhat.com> 0:1.1-6.fc3
- Remove what should have been commented out redinitions of the _sysconfdir
and _libdir macros.
More information about the fedora-extras-commits
mailing list