Conversation
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
gabifalk
added a commit
to gabifalk/gentoo
that referenced
this pull request
May 19, 2024
Added the patch from the upstream pull request (thanks to Jaroslav Škarvada). Link: BuGlessRB/procmail#7 Fixes: https://bugs.gentoo.org/919024 Signed-off-by: Gabi Falk <gabifalk@gmx.com>
gabifalk
added a commit
to gabifalk/gentoo
that referenced
this pull request
May 19, 2024
Added the patch from the upstream pull request (thanks to Jaroslav Škarvada). Link: BuGlessRB/procmail#7 Closes: https://bugs.gentoo.org/919024 Signed-off-by: Gabi Falk <gabifalk@gmx.com>
4 tasks
gentoo-bot
pushed a commit
to gentoo/gentoo
that referenced
this pull request
May 22, 2024
Added the patch from the upstream pull request (thanks to Jaroslav Škarvada). Link: BuGlessRB/procmail#7 Closes: https://bugs.gentoo.org/919024 Signed-off-by: Gabi Falk <gabifalk@gmx.com> Closes: #36747 Signed-off-by: Sam James <sam@gentoo.org>
|
Without the moved code, the change to src/autoconf is this: diff -u --label \#\<buffer\ guix-build-procmail-3.22.drv-0/autoconf\> --label \#\<buffer\ guix-build-procmail-3.22.drv-1/autoconf\> /tmp/buffer-content-sHksph /tmp/buffer-content-1e8jf1
--- #<buffer guix-build-procmail-3.22.drv-0/autoconf>
+++ #<buffer guix-build-procmail-3.22.drv-1/autoconf>
@@ -363,6 +363,7 @@
#include <unistd.h> /* getpid() getppid() */
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <time.h>
#include <fcntl.h>
#include <signal.h> /* SIGKILL */
@@ -437,7 +438,7 @@
return pid;
}
-int main(argc,argv)char*argv[];
+int main(argc,argv)int argc;char*argv[];
{ int goodlock,testlock,i,pip[2],pipw[2];time_t otimet;unsigned dtimet;
static char filename[]="_locktst.l0";
close(0);goodlock=0;testlock=FIRST_lock;signal(SIGPIPE,SIG_DFL);
@@ -587,13 +588,13 @@
return 0;
}
-int sfdlock(fd)
+int sfdlock(int fd)
{ int i;unsigned gobble[GOBBLE>>2];
for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */
return fdlock(fd);
}
-static oldfdlock;
+static int oldfdlock;
#ifdef F_SETLKW
static struct flock flck; /* why can't it be a local variable? */
#endif
@@ -601,7 +602,7 @@
static off_t oldlockoffset;
#endif
-int fdlock(fd)
+int fdlock(int fd)
{ int i;unsigned gobble[GOBBLE>>2];
for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */
oldfdlock=fd;fd=0;
@@ -658,6 +659,7 @@
for(i=GOBBLE;i&&gobble[--i]==~(unsigned)0;);
return i;
}
+
HERE
if $MAKE _autotst >_autotst.rrr 2>&1
@@ -1033,6 +1035,10 @@
#ifndef NO_COMSAT
#include "network.h"
#endif
+#include <string.h>
+#include <unistd.h>
+int setrgid();
+int setresgid();
int main(){char a[2];
endpwent();endgrent();memmove(a,"0",1);bcopy("0",a,1);strcspn(a,"0");
strtol("0",(char**)0,10);strchr("0",'0');strpbrk(a,"0");rename(a,"0");
@@ -1059,7 +1065,7 @@
echo ' rename, setrgid, setegid, pow, opendir, mkdir, waitpid, fsync,'
echo ' ftruncate, strtod, strncasecmp, strerror, strlcat,'
echo ' memset, bzero, and _exit'
-if $MAKE _autotst.$O >$DEVNULL 2>&1
+if $MAKE _autotst.$O >_autotst.rrr 2>&1
then
:
else
Diff finished. Tue Jul 29 09:00:31 2025So this looks good to me. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
gcc-14 is in Fedora Rawhide (f40). There are more things to fix, but with this patch it compiles in f40 with default CFLAGS.