Merge ~liushuyu-011/ubuntu/+source/pike8.0:ubuntu/devel into ubuntu/+source/pike8.0:ubuntu/devel

[Zixing Liu]

This MP fixes the FTBFS issue on armhf caused by an improper libz detection logic that make pike8.0 fallback to a broken vendored zlib source.

[Zixing Liu (liushuyu-011)]

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/15927302/+listing-archive-extra

[Vladimir Petko (vpa1977)]

Uploaded, thank you!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 870e689..f81b809 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pike8.0 (8.0.1738-1.3ubuntu1) noble; urgency=medium
+
+  * debian/patches/gz_test_fix.patch: Fix zlib detection logic.
+  * debian/patches/threads_undefined_var_fix.patch: Fix incorrect
+    variable referencing in threads.c.  Closes LP: #2061023.
+
+ -- Zixing Liu <[e-mail]>  Thu, 11 Apr 2024 14:33:12 -0600
+
 pike8.0 (8.0.1738-1.3build1) noble; urgency=medium
 
   * No-change rebuild for CVE-2024-3094
diff --git a/debian/patches/gz_test_fix.patch b/debian/patches/gz_test_fix.patch
 new file mode 100644
index 0000000..4d8ce42
--- /dev/null
+++ b/debian/patches/gz_test_fix.patch
@@ -0,0 +1,18 @@
+Description: Fix zlib detection logic
+ Fixes the issue where vendored zlib fails to compile on armhf
+Author: Zixing Liu <[e-mail]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066378
+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/pike8.0/+bug/2061023
+Forwarded: no
+Last-Update: 2024-04-11
+--- pike8.0-8.0.1738.orig/src/modules/Gz/gz_test.c
++++ pike8.0-8.0.1738/src/modules/Gz/gz_test.c
+@@ -320,6 +320,8 @@ void test_sync(compr, comprLen, uncompr,
+     err = inflateSync(&d_stream);           /* but skip the damaged part */
+     CHECK_ERR(err, "inflateSync");
+ 
++    inflateEnd(&d_stream);
++    inflateInit(&d_stream);
+     err = inflate(&d_stream, Z_FINISH);
+     if (err != Z_DATA_ERROR) {
+         fprintf(stderr, "inflate should report DATA_ERROR\n");
diff --git a/debian/patches/series b/debian/patches/series
index 178507c..02e2fec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,5 @@ no_nostartfiles.patch
 undefined_htons.patch
 bad_size_t_redef.patch
 dont_disable_debug_symbols.patch
+gz_test_fix.patch
+threads_undefined_var_fix.patch
diff --git a/debian/patches/threads_undefined_var_fix.patch b/debian/patches/threads_undefined_var_fix.patch
 new file mode 100644
index 0000000..605db25
--- /dev/null
+++ b/debian/patches/threads_undefined_var_fix.patch
@@ -0,0 +1,16 @@
+Description: Fix incorrect variable referencing in threads.c
+Author: Zixing Liu <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/pike8.0/+bug/2061023
+Forwarded: no
+Last-Update: 2024-04-11
+--- pike8.0-8.0.1738.orig/src/threads.c
++++ pike8.0-8.0.1738/src/threads.c
+@@ -3422,7 +3422,7 @@ static TH_RETURN_TYPE farm(void *_a)
+     int current = prctl(PR_GET_DUMPABLE);
+ #endif
+ #ifdef HAVE_BROKEN_LINUX_THREAD_EUID
+-    if( setegid(arg.egid) != 0 || seteuid(arg.euid) != 0 )
++    if( setegid(me->egid) != 0 || seteuid(me->euid) != 0 )
+     {
+       fprintf (stderr, "%s:%d: Unexpected error from setegid(2). errno=%d\n",
+ 	       __FILE__, __LINE__, errno);