- rediffed

diff --git a/procmail-lockf.patch b/procmail-lockf.patch
index 8e93abba262142c3e97bf56a64a8b0271544859b..d02e48bd7a8b4f1e4a5a3be3f2af3c98743b878a 100644 (file)
--- a/procmail-lockf.patch
+++ b/procmail-lockf.patch
@@ -1,7 +1,7 @@
-diff -urN procmail-3.14.org/config.h procmail-3.14/config.h
---- procmail-3.14.org/config.h Thu Mar  9 11:54:32 2000
-+++ procmail-3.14/config.h     Thu Mar  9 11:57:51 2000
-@@ -51,8 +51,8 @@
+diff -urNp -x '*.orig' procmail-3.22.org/config.h procmail-3.22/config.h
+--- procmail-3.22.org/config.h 2001-09-11 04:53:50.000000000 +0000
++++ procmail-3.22/config.h     2022-04-04 18:03:38.380223294 +0000
+@@ -77,8 +77,8 @@
  #define TRUSTED_IDS   {"root","daemon","uucp","mail","x400","network",\
                         "list","slist","lists","news",0}
  
@@ -10,5 +10,5 @@ diff -urN procmail-3.14.org/config.h procmail-3.14/config.h
 +#define NO_fcntl_LOCK         /* uncomment any of these three if you       */
 +#define NO_lockf_LOCK         /* definitely do not want procmail to make   */
  /*#define NO_flock_LOCK               /* use of those kernel-locking methods       */
- 
- /*#define RESTRICT_EXEC 100   /* uncomment to prevent users with uids equal
+                               /* If you set LOCKINGTEST to a binary number
+       than there's no need to set these.  These #defines are only useful

diff --git a/procmail.spec b/procmail.spec
index 9819ffd49a17aa84d871067bc55e5ef5b268cf7a..8e91595d30208e42940dadb38966b3221d62606d 100644 (file)
--- a/procmail.spec
+++ b/procmail.spec
@@ -11,7 +11,7 @@ Summary(zh_CN.UTF-8): [服务器]分发mail到用户的守护进程
 Summary(zh_TW.UTF-8):  [祀務器]分蛛mail到用戶的佐鰾園評
 Name:          procmail
 Version:       3.22
-Release:       20
+Release:       21
 License:       GPL v2+ or Artistic
 Group:         Applications/Mail
 Source0:       http://www.procmail.org/%{name}-%{version}.tar.gz