commit 687ab6867a30a7e28587fc74aad63326f487753a
parent ea0ef93109036c64072ad2cb95a8439bfe2453c7
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Tue, 9 Dec 2025 23:28:25 +0000
nvi: patch includes for configure exit()
Diffstat:
8 files changed, 57 insertions(+), 21 deletions(-)
diff --git a/filelist.sha256 b/filelist.sha256
@@ -93,7 +93,7 @@ a21336df3bc3b267fbda940d9f533f66b0eacb520b8421cca3ddc943f620a791 files/mcm-musl
e91027b085cc83c7724fd6b624641a74256288b16e9f48a37d3ceeab6e498f3f files/nawk-20250116-proctab.c
98a8ddd1004034aeff4cc6d18e5df23f55d2869d879735c3b571594a44ba1212 files/nlist.h
ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417 files/noobjtool.patch
-4b849c5f9bbbd9b6bc5e191c220f32cf32ce2ca1a082dc9fc4e6027ebd173748 files/nvi-configure-implicit-return.patch
+95a10f2b9e6b31298a1485a17a63bd967986b50996bfd8eb35ebb11cfb2037da files/nvi-configure-implicit-return.patch
1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d files/pthbs-banginstall
627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e files/s6_clone3_newpid.patch
2a782825cd870e1fdf77a579c80701c0530bc6d8fa94100cab24bf31f0f457d3 files/s6_clone_newpid.patch
diff --git a/files/nvi-configure-implicit-return.patch b/files/nvi-configure-implicit-return.patch
@@ -1,6 +1,6 @@
diff -ru --no-dereference --show-c-function nvi-1.79.orig/build/configure nvi-1.79/build/configure
--- nvi-1.79.orig/build/configure 1996-10-23 13:53:07.000000000 +0000
-+++ nvi-1.79/build/configure 2025-12-09 23:11:04.128099821 +0000
++++ nvi-1.79/build/configure 2025-12-09 23:27:04.166164996 +0000
@@ -837,7 +837,7 @@ else
cat > conftest.$ac_ext <<EOF
#line 839 "configure"
@@ -10,16 +10,26 @@ diff -ru --no-dereference --show-c-function nvi-1.79.orig/build/configure nvi-1.
EOF
eval $ac_link
if test -s conftest && (./conftest; exit) 2>/dev/null; then
-@@ -886,7 +886,7 @@ else
+@@ -886,7 +886,9 @@ else
cat > conftest.$ac_ext <<EOF
#line 888 "configure"
#include "confdefs.h"
-main() { exit(0); }
++#include <stdlib.h>
++#include <stdlib.h>
+int main() { exit(0); }
EOF
eval $ac_link
if test -s conftest && (./conftest; exit) 2>/dev/null; then
-@@ -1980,7 +1980,7 @@ else
+@@ -1868,6 +1870,7 @@ cat > conftest.$ac_ext <<EOF
+ #line 1869 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
++#include <stdlib.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+@@ -1980,7 +1983,7 @@ else
cat > conftest.$ac_ext <<EOF
#line 1982 "configure"
#include "confdefs.h"
@@ -28,7 +38,23 @@ diff -ru --no-dereference --show-c-function nvi-1.79.orig/build/configure nvi-1.
/* Are we little or big endian? From Harbison&Steele. */
union
{
-@@ -3050,7 +3050,7 @@ sparc_address_test (arg) int arg;
+@@ -2845,6 +2848,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 2847 "configure"
+ #include "confdefs.h"
++#include <stdlib.h>
+
+ /* Thanks to Mike Haertel and Jim Avera for this test. */
+ #include <sys/types.h>
+@@ -3015,6 +3019,7 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 3017 "configure"
+ #include "confdefs.h"
++#include <stdlib.h>
+ /* Thanks to Paul Eggert for this test. */
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -3050,7 +3055,7 @@ sparc_address_test (arg) int arg;
}
}
}
@@ -37,92 +63,102 @@ diff -ru --no-dereference --show-c-function nvi-1.79.orig/build/configure nvi-1.
pid_t parent = getpid ();
pid_t child;
-@@ -3637,7 +3637,7 @@ else
+@@ -3637,7 +3642,8 @@ else
cat > conftest.$ac_ext <<EOF
#line 3639 "configure"
#include "confdefs.h"
-main(){char buf[20]; exit(sprintf(buf, "XXX") != 3);}
++#include <stdlib.h>
+int main(){char buf[20]; exit(sprintf(buf, "XXX") != 3);}
EOF
eval $ac_link
if test -s conftest && (./conftest; exit) 2>/dev/null; then
-@@ -3838,7 +3838,7 @@ else
+@@ -3838,7 +3844,8 @@ else
cat > conftest.$ac_ext <<EOF
#line 3840 "configure"
#include "confdefs.h"
-main(){exit(sizeof(unsigned char) != 1);}
++#include <stdlib.h>
+int main(){exit(sizeof(unsigned char) != 1);}
EOF
eval $ac_link
if test -s conftest && (./conftest; exit) 2>/dev/null; then
-@@ -3888,7 +3888,7 @@ else
+@@ -3888,7 +3895,8 @@ else
cat > conftest.$ac_ext <<EOF
#line 3890 "configure"
#include "confdefs.h"
-main(){exit(sizeof(unsigned short) != 2);}
++#include <stdlib.h>
+int main(){exit(sizeof(unsigned short) != 2);}
EOF
eval $ac_link
if test -s conftest && (./conftest; exit) 2>/dev/null; then
-@@ -3900,7 +3900,7 @@ else
+@@ -3900,7 +3908,8 @@ else
cat > conftest.$ac_ext <<EOF
#line 3902 "configure"
#include "confdefs.h"
-main(){exit(sizeof(unsigned int) != 2);}
++#include <stdlib.h>
+int main(){exit(sizeof(unsigned int) != 2);}
EOF
eval $ac_link
if test -s conftest && (./conftest; exit) 2>/dev/null; then
-@@ -3953,7 +3953,7 @@ else
+@@ -3953,7 +3962,8 @@ else
cat > conftest.$ac_ext <<EOF
#line 3955 "configure"
#include "confdefs.h"
-main(){exit(sizeof(short) != 2);}
++#include <stdlib.h>
+int main(){exit(sizeof(short) != 2);}
EOF
eval $ac_link
if test -s conftest && (./conftest; exit) 2>/dev/null; then
-@@ -3965,7 +3965,7 @@ else
+@@ -3965,7 +3975,8 @@ else
cat > conftest.$ac_ext <<EOF
#line 3967 "configure"
#include "confdefs.h"
-main(){exit(sizeof(int) != 2);}
++#include <stdlib.h>
+int main(){exit(sizeof(int) != 2);}
EOF
eval $ac_link
if test -s conftest && (./conftest; exit) 2>/dev/null; then
-@@ -4018,7 +4018,7 @@ else
+@@ -4018,7 +4029,8 @@ else
cat > conftest.$ac_ext <<EOF
#line 4020 "configure"
#include "confdefs.h"
-main(){exit(sizeof(unsigned int) != 4);}
++#include <stdlib.h>
+int main(){exit(sizeof(unsigned int) != 4);}
EOF
eval $ac_link
if test -s conftest && (./conftest; exit) 2>/dev/null; then
-@@ -4030,7 +4030,7 @@ else
+@@ -4030,7 +4042,8 @@ else
cat > conftest.$ac_ext <<EOF
#line 4032 "configure"
#include "confdefs.h"
-main(){exit(sizeof(unsigned long) != 4);}
++#include <stdlib.h>
+int main(){exit(sizeof(unsigned long) != 4);}
EOF
eval $ac_link
if test -s conftest && (./conftest; exit) 2>/dev/null; then
-@@ -4083,7 +4083,7 @@ else
+@@ -4083,7 +4096,8 @@ else
cat > conftest.$ac_ext <<EOF
#line 4085 "configure"
#include "confdefs.h"
-main(){exit(sizeof(int) != 4);}
++#include <stdlib.h>
+int main(){exit(sizeof(int) != 4);}
EOF
eval $ac_link
if test -s conftest && (./conftest; exit) 2>/dev/null; then
-@@ -4095,7 +4095,7 @@ else
+@@ -4095,7 +4109,8 @@ else
cat > conftest.$ac_ext <<EOF
#line 4097 "configure"
#include "confdefs.h"
-main(){exit(sizeof(long) != 4);}
++#include <stdlib.h>
+int main(){exit(sizeof(long) != 4);}
EOF
eval $ac_link
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -83,7 +83,7 @@
#+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5
#+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b
#+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007
-#+nvi.b258e00fdd447455c14613e35549f691d278115e1afb37718c76f13efbbef6d5
+#+nvi.941137322c92d1be71b040a634b4f102ac33c26888219eaae2be0517d12715f2
#+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
#+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
#+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af
diff --git a/variants/ccx-x86_64/nvi b/variants/ccx-x86_64/nvi
@@ -32,7 +32,7 @@
#+gnu-make.4034f4d785c5108ad387088199242aa8aa6920e7aab1f79ce51d1f43e97cb580
#+m4.3c2c0285db6a9478ec3d15df2ed5a84329ebf2770be190cdd64b375b505b336a
#+netbsd-curses.62fbfa6e36ad4c26813723d03cbfe75c3e7d20f081b985904d933a07a84a541e
-#@sha256:4b849c5f9bbbd9b6bc5e191c220f32cf32ce2ca1a082dc9fc4e6027ebd173748:nvi-configure-implicit-return.patch
+#@sha256:95a10f2b9e6b31298a1485a17a63bd967986b50996bfd8eb35ebb11cfb2037da:nvi-configure-implicit-return.patch
#+patch.2107bae5d78ad951bd28615d44c983d64e686d320b40f74e4f5137fd9bcc2c6a
#@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -83,7 +83,7 @@
#+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5
#+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b
#+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007
-#+nvi.b258e00fdd447455c14613e35549f691d278115e1afb37718c76f13efbbef6d5
+#+nvi.941137322c92d1be71b040a634b4f102ac33c26888219eaae2be0517d12715f2
#+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
#+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
#+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -83,7 +83,7 @@
#+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2
#+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b
#+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d
-#+nvi.15cbda87c4fc99f9725e3e4a2efca07c136455a466feed899f0a2297cc415ffc
+#+nvi.54935b3a24c891a568c33dc214554c6c5d998ce746a4ae5735ef42f784e7a37d
#+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
#+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
#+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8
diff --git a/variants/root-x86_64/nvi b/variants/root-x86_64/nvi
@@ -32,7 +32,7 @@
#+gnu-make.98dc2bc139672e6347bc2b2220304949f81b1851d2dc14778379568a0734db59
#+m4.9525a842f294db9ba4dff2f5c09131b12ebd35df0c9e06c5404c3b046ba13748
#+netbsd-curses.d3d7d0cf449972d5ce479a15d7298bad50ba445982cca9b12dc99d950330ce2c
-#@sha256:4b849c5f9bbbd9b6bc5e191c220f32cf32ce2ca1a082dc9fc4e6027ebd173748:nvi-configure-implicit-return.patch
+#@sha256:95a10f2b9e6b31298a1485a17a63bd967986b50996bfd8eb35ebb11cfb2037da:nvi-configure-implicit-return.patch
#+patch.05e92009b5904e5104c194a4a2b66427c75b14619e0bdd0f541954e8b13d30f4
#@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -83,7 +83,7 @@
#+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2
#+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b
#+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d
-#+nvi.15cbda87c4fc99f9725e3e4a2efca07c136455a466feed899f0a2297cc415ffc
+#+nvi.54935b3a24c891a568c33dc214554c6c5d998ce746a4ae5735ef42f784e7a37d
#+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
#+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
#+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8
\ No newline at end of file
