From 0308c8abd724929749d76561ed61fb82ae34ed10 Mon Sep 17 00:00:00 2001
From: WernerFink <>
Date: Nov 30 2020 08:53:48 +0000
Subject: Update procmail to version 3.22 / rev 34 via SR 850903


https://build.opensuse.org/request/show/850903
by user WernerFink + dimstar_suse
Add reproducible2.patch to negate influences from preinstallimage to make package build reproducible (forwarded request 850841 from bmwiedemann)

---

diff --git a/.files b/.files
index 10cdbae..b010b2f 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 3fbb1e7..51cd4bd 100644
--- a/.rev
+++ b/.rev
@@ -252,4 +252,12 @@
     <comment>Automatic submission by obs-autosubmit</comment>
     <requestid>844980</requestid>
   </revision>
+  <revision rev="34" vrev="276">
+    <srcmd5>67068db5bd74a7748641be81f8734ef2</srcmd5>
+    <version>3.22</version>
+    <time>1606726389</time>
+    <user>dimstar_suse</user>
+    <comment>Add reproducible2.patch to negate influences from preinstallimage to make package build reproducible (forwarded request 850841 from bmwiedemann)</comment>
+    <requestid>850903</requestid>
+  </revision>
 </revisionlist>
diff --git a/procmail.changes b/procmail.changes
index 99610a0..c8a9c05 100644
--- a/procmail.changes
+++ b/procmail.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Thu Nov 26 03:15:35 UTC 2020 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Add reproducible2.patch to negate influences from preinstallimage
+  to make package build reproducible
+
+-------------------------------------------------------------------
 Fri Oct 23 06:58:01 UTC 2020 - Dr. Werner Fink <werner@suse.de>
 
 - Do not use lto compiler flags at all with this kind of code 
diff --git a/procmail.spec b/procmail.spec
index ac79454..13a0e4f 100644
--- a/procmail.spec
+++ b/procmail.spec
@@ -35,6 +35,7 @@ Patch6:         procmail-%{version}-ipv6.patch
 # PATCH-FIX-SUSE bmwiedemann -- make build reproducible
 Patch8:         reproducible.patch
 Patch10:        procmail-fix-Werror=return-type.patch
+Patch11:        reproducible2.patch
 BuildRequires:  pcre-devel
 BuildRequires:  postfix
 Requires:       /bin/sed
@@ -61,6 +62,7 @@ done
 %patch6 -p1
 %patch8 -p1
 %patch10 -p1
+%patch11 -p1
 sed -ri '\@^/\*@,\@\*/@{ s@^(/\*[^*]*)(/\*)@\1\*/ \2@; }' config.h
 sed -ri '\@^/\*@,\@\*/@{ s@^(/\*[^*]*)(/\*)@\1\*/ \2@; }' src/includes.h
 sed -ri '\@^#.*[[:blank:]]+/\*[^/]*$@M,\@\*/$@{ s@(^[[:blank:]]+)/\*@\1  @;}' src/includes.h
diff --git a/reproducible2.patch b/reproducible2.patch
new file mode 100644
index 0000000..6d5e7d1
--- /dev/null
+++ b/reproducible2.patch
@@ -0,0 +1,23 @@
+Author: Bernhard M. Wiedemann <bwiedemann suse de>
+Date: 2020-11-26
+
+always set setrgid_RUNTIME_CHECK
+
+without this patch, builds with preinstallimage did not have this flag
+but builds without preinstallimage did have setrgid_RUNTIME_CHECK defined
+causing problems for verification of binaries
+
+diff --git a/src/autoconf b/src/autoconf
+index b0fef8a..f2f8351 100755
+--- a/src/autoconf
++++ b/src/autoconf
+@@ -1302,8 +1302,7 @@ int main(argc,argv)int argc;const char*argv[];
+ 	   if(!setrgid(groups[i])&&getgid()!=groups[i])
+ 	      puts("#define setrgid_BRAIN_DAMAGE");
+ 	 }
+-	else
+-	   puts("#define setrgid_RUNTIME_CHECK");
++	puts("#define setrgid_RUNTIME_CHECK");
+       }
+ #endif
+ skipsetrgid:;