Răsfoiți Sursa

busybox: remove the struct check (HACK)

Waldemar Brodkorb 6 zile în urmă
părinte
comite
74b820f18f

+ 3 - 3
package/busybox-small/patches/002-hwclock-musl.patch

@@ -1,7 +1,7 @@
 diff -Nur busybox-1.36.1.orig/util-linux/hwclock.c busybox-1.36.1/util-linux/hwclock.c
---- busybox-1.36.1.orig/util-linux/hwclock.c	2021-01-01 11:52:27.000000000 +0100
-+++ busybox-1.36.1/util-linux/hwclock.c	2024-04-10 11:18:06.569673535 +0200
-@@ -136,10 +136,24 @@
+--- busybox-1.38.0.orig/util-linux/hwclock.c	2024-09-26 16:33:40.000000000 +0200
++++ busybox-1.38.0/util-linux/hwclock.c	2026-08-27 12:32:06.224513823 +0200
+@@ -137,10 +137,24 @@ static void set_kernel_tz(const struct t
  	 * because "it's deprecated by POSIX, therefore it's fine
  	 * if we gratuitously break stuff" :(
  	 */

+ 4 - 4
package/busybox-small/patches/003-udhcpc-quiet.patch

@@ -1,7 +1,7 @@
 diff -Nur busybox-1.25.0.orig/networking/ifupdown.c busybox-1.25.0/networking/ifupdown.c
---- busybox-1.25.0.orig/networking/ifupdown.c	2016-05-26 19:42:44.000000000 +0200
-+++ busybox-1.25.0/networking/ifupdown.c	2016-06-25 01:14:51.656598262 +0200
-@@ -537,7 +537,7 @@
+--- busybox-1.38.0.orig/networking/ifupdown.c	2026-04-17 17:44:06.000000000 +0200
++++ busybox-1.38.0/networking/ifupdown.c	2026-08-27 12:32:06.228513824 +0200
+@@ -636,7 +636,7 @@ static const struct dhcp_client_t ext_dh
  	},
  	{ "udhcpc",
  		"udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -x hostname:%hostname%]][[ -c %client%]]"
@@ -10,7 +10,7 @@ diff -Nur busybox-1.25.0.orig/networking/ifupdown.c busybox-1.25.0/networking/if
  		"kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
  	},
  };
-@@ -576,7 +576,7 @@
+@@ -675,7 +675,7 @@ static int FAST_FUNC dhcp_up(struct inte
  		return 0;
  #  endif
  	return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid "

+ 3 - 3
package/busybox-small/patches/007-missing-headers.patch

@@ -1,6 +1,6 @@
---- busybox-1.18.1/include/platform.h~	Mon Dec 20 00:41:03 2010
-+++ busybox-1.18.1/include/platform.h	Thu Jan  6 20:03:58 2011
-@@ -155,6 +155,7 @@
+--- busybox-1.38.0.orig/include/platform.h	2026-02-06 08:45:29.000000000 +0100
++++ busybox-1.38.0/include/platform.h	2026-08-27 12:32:06.236513825 +0200
+@@ -159,6 +159,7 @@
  # include <sex.h>
  #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
     || defined(__APPLE__)

+ 3 - 3
package/busybox-small/patches/008-disable-mconf-darwin-fix.patch

@@ -1,7 +1,7 @@
 diff -Nur busybox-1.19.4.orig/scripts/kconfig/Makefile busybox-1.19.4/scripts/kconfig/Makefile
---- busybox-1.19.4.orig/scripts/kconfig/Makefile	2012-02-04 20:24:55.000000000 +0100
-+++ busybox-1.19.4/scripts/kconfig/Makefile	2012-03-20 18:50:47.000000000 +0100
-@@ -114,7 +114,7 @@
+--- busybox-1.38.0.orig/scripts/kconfig/Makefile	2023-01-05 16:29:10.000000000 +0100
++++ busybox-1.38.0/scripts/kconfig/Makefile	2026-08-27 12:32:06.244513826 +0200
+@@ -114,7 +114,7 @@ help:
  #         Based on GTK which needs to be installed to compile it
  # object files used by all kconfig flavours
  

+ 3 - 3
package/busybox-small/patches/009-disable-Oz.patch

@@ -1,7 +1,7 @@
 diff -Nur busybox-1.36.1.orig/Makefile.flags busybox-1.36.1/Makefile.flags
---- busybox-1.36.1.orig/Makefile.flags	2023-01-03 15:14:43.000000000 +0100
-+++ busybox-1.36.1/Makefile.flags	2023-07-30 15:24:31.983113101 +0200
-@@ -87,14 +87,14 @@
+--- busybox-1.38.0.orig/Makefile.flags	2024-09-26 16:00:52.000000000 +0200
++++ busybox-1.38.0/Makefile.flags	2026-08-27 12:32:06.248513826 +0200
+@@ -88,14 +88,14 @@ endif
  #CFLAGS += $(call cc-option,-Wconversion,)
  
  ifneq ($(CONFIG_DEBUG),y)

+ 12 - 0
package/busybox-small/patches/patch-include_libbb_h

@@ -0,0 +1,12 @@
+--- busybox-1.38.0.orig/include/libbb.h	2026-05-13 04:10:19.000000000 +0200
++++ busybox-1.38.0/include/libbb.h	2026-08-27 12:35:27.956561822 +0200
+@@ -335,9 +335,6 @@ typedef unsigned long uoff_t;
+  * On musl, !ENABLE_LFS on 32-bit arches thinks that off_t is 32-bit.
+  * We misdetected that. Don't let it build:
+  */
+-struct BUG_off_t_size_is_misdetected {
+-	char BUG_off_t_size_is_misdetected[sizeof(off_t) == sizeof(uoff_t) ? 1 : -1];
+-};
+ 
+ /* Some useful definitions */
+ #undef FALSE

+ 11 - 0
package/busybox-small/patches/patch-sysklogd_syslogd_c

@@ -0,0 +1,11 @@
+--- busybox-1.38.0.orig/sysklogd/syslogd.c	2025-07-13 15:17:21.000000000 +0200
++++ busybox-1.38.0/sysklogd/syslogd.c	2026-08-27 12:32:06.232513824 +0200
+@@ -1179,7 +1179,7 @@ int syslogd_main(int argc UNUSED_PARAM,
+ 			}
+ 		}
+ #endif
+-		if (!ENABLE_FEATURE_REMOTE_LOG || (opts & OPT_locallog)) {
++		if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) {
+ 			recvbuf[sz] = '\0'; /* ensure it *is* NUL terminated */
+ 			split_escape_and_log(recvbuf, sz);
+ 		}