SLFO-pool/procmail
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main procmail revision 6babc1a7027daa8c0dbcb5cd4081d077

Browse Source
This commit is contained in:
Adrian Schröter 2024-10-03 17:50:05 +02:00
parent 94bd9561c0
commit acec15f07f
3 changed files with 53 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
procmail.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Feb 29 14:34:26 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Sun Dec 3 08:06:34 UTC 2023 - Bernhard Wiedemann <bwiedemann@suse.com>
- Update reproducible.patch to drop more benchmarking (boo#1041534)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 9 09:09:55 UTC 2023 - Dr. Werner Fink <werner@suse.de> Wed Aug 9 09:09:55 UTC 2023 - Dr. Werner Fink <werner@suse.de>

20
procmail.spec
View File

@ -52,16 +52,16 @@ for p in ../procmail-%{version}-patches/* ; do
echo Patch $p echo Patch $p
patch -s -p1 --fuzz=0 < $p patch -s -p1 --fuzz=0 < $p
done done
%patch0 %patch -P 0
%patch1 %patch -P 1
%patch2 %patch -P 2
%patch3 %patch -P 3
%patch4 %patch -P 4
%patch5 %patch -P 5
%patch6 %patch -P 6
%patch8 -p1 %patch -P 8 -p1
%patch10 -p1 %patch -P 10 -p1
%patch11 -p1 %patch -P 11 -p1
sed -ri '\@^/\*@,\@\*/@{ s@^(/\*[^*]*)(/\*)@\1\*/ \2@; }' config.h sed -ri '\@^/\*@,\@\*/@{ s@^(/\*[^*]*)(/\*)@\1\*/ \2@; }' config.h
sed -ri '\@^/\*@,\@\*/@{ s@^(/\*[^*]*)(/\*)@\1\*/ \2@; }' src/includes.h sed -ri '\@^/\*@,\@\*/@{ s@^(/\*[^*]*)(/\*)@\1\*/ \2@; }' src/includes.h
sed -ri '\@^#.*[[:blank:]]+/\*[^/]*$@M,\@\*/$@{ s@(^[[:blank:]]+)/\*@\1 @;}' src/includes.h sed -ri '\@^#.*[[:blank:]]+/\*[^/]*$@M,\@\*/$@{ s@(^[[:blank:]]+)/\*@\1 @;}' src/includes.h

44
reproducible.patch
View File

@ -1,16 +1,38 @@
Index: procmail-3.22/src/autoconf https://bugzilla.opensuse.org/show_bug.cgi?id=1041534
===================================================================
---
src/autoconf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/autoconf Avoid benchmarking the build machine
+++ b/src/autoconf 2023-08-09 08:57:47.506347981 +0000 to determine compilation results
@@ -1251,7 +1251,7 @@ int main(argc,argv)int argc;const char*a
/* Your system's strstr() is %.2f times %sER than my C-routine */\n", Index: procmail-3.24/src/autoconf
syscnt>=iter?(double)syscnt/iter:(double)iter/syscnt, ===================================================================
syscnt>=iter?"SLOW":"FAST"); --- procmail-3.24.orig/src/autoconf
+++ procmail-3.24/src/autoconf
@@ -951,6 +951,7 @@ void*realloc(),*malloc();
#endif
int main()
{ char*p=malloc(1),*q=0;
+#if 0
size_t len,last,max=BLKSIZ*64; /* 1M on non-SMALLHEAP systems */
int count=0;
for(last=len=INITIAL;len<=max+INITIAL;len+=BLKSIZ)
@@ -968,6 +969,7 @@ int main()
{ puts("#define INEFFICIENTrealloc");
exit(1);
}
+#endif
exit(0);
}
HERE
@@ -1248,10 +1250,9 @@ int main(argc,argv)int argc;const char*a
if(!iter)
iter=1;
printf("\
-/* Your system's strstr() is %.2f times %sER than my C-routine */\n",
- syscnt>=iter?(double)syscnt/iter:(double)iter/syscnt,
- syscnt>=iter?"SLOW":"FAST");
- if(syscnt>iter+iter/16) /* if at least 1.0625 times slower */ - if(syscnt>iter+iter/16) /* if at least 1.0625 times slower */
+/* Your system's strstr() is %sER than my C-routine */\n",
+ "FAST");
+ if(0) /* always use system strstr to have reproducible binaries */ + if(0) /* always use system strstr to have reproducible binaries */
printf("\ printf("\
#define SLOWstrstr\t\t\t /* using my substitute instead */\n"); #define SLOWstrstr\t\t\t /* using my substitute instead */\n");