Merge commit '87bc648720bb4e79ac99beff8a807019ac930233' into MyCruft
Jeff Moe
commit
7662a8d4ac
|
|
@ -1314,12 +1314,12 @@ package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch U
|
|||
package/samba4/0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch Upstream
|
||||
package/samba4/S91smb Indent Shellcheck Variables
|
||||
package/sane-backends/0001-sane_backend-add-missing-config.h.patch Upstream
|
||||
package/screen/0001-no-memcpy-fallback.patch Upstream
|
||||
package/screen/0002-install-no-backup-binary.patch Upstream
|
||||
package/screen/0003-install-always-chmod.patch Upstream
|
||||
package/screen/0004-install-nonversioned-binary.patch Upstream
|
||||
package/screen/0005-rename-sched_h.patch Upstream
|
||||
package/screen/0006-comm-h-now-depends-on-term-h.patch Upstream
|
||||
package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch Upstream
|
||||
package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch Upstream
|
||||
package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch Upstream
|
||||
package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch Upstream
|
||||
package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch Upstream
|
||||
package/screen/0006-comm.h-now-depends-on-term.h.patch Upstream
|
||||
package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch Upstream
|
||||
package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch Upstream
|
||||
package/sdl/0001-use-correct-directfb-config.patch Upstream
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Locally computed
|
||||
sha256 998d355294bb94072f40584272cf4424571c396c631620ce463f6ea97aa67d2e check-0.15.2.tar.gz
|
||||
sha256 20e7360f5774844c09fde696e5bf71d061e9f53b3d763d886d3318d8893fdda4 check-11970a7e112dfe243a2e68773f014687df2900e8.tar.gz
|
||||
# License files, locally calculated
|
||||
sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LESSER
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
CHECK_VERSION = 0.15.2
|
||||
# This is the same as tag 0.15.2, but we can't use it, as to avoid conflict
|
||||
# with the released tarball that was incomplete
|
||||
CHECK_VERSION = 11970a7e112dfe243a2e68773f014687df2900e8
|
||||
CHECK_SITE = $(call github,libcheck,check,$(CHECK_VERSION))
|
||||
CHECK_INSTALL_STAGING = YES
|
||||
CHECK_DEPENDENCIES = host-pkgconf
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Locally calculated
|
||||
sha256 0872dc1b82ff4cd7e8e4323faf5ee41a1f66ae80865d05429085b946355d86ee clamav-1.0.1.tar.gz
|
||||
sha256 71dd39fe0d3937747fc280ea07c15cc990269257c4abb12dc438b4409d1b44c7 clamav-1.0.2.tar.gz
|
||||
sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING.txt
|
||||
sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING/COPYING.bzip2
|
||||
sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING/COPYING.file
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
CLAMAV_VERSION = 1.0.1
|
||||
CLAMAV_VERSION = 1.0.2
|
||||
CLAMAV_SITE = https://www.clamav.net/downloads/production
|
||||
CLAMAV_LICENSE = GPL-2.0
|
||||
CLAMAV_LICENSE_FILES = \
|
||||
|
|
|
|||
|
|
@ -17,6 +17,9 @@ define ESP_HOSTED_LINUX_CONFIG_FIXUPS
|
|||
$(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211)
|
||||
$(call KCONFIG_ENABLE_OPT,CONFIG_MAC80211)
|
||||
$(call KCONFIG_ENABLE_OPT,CONFIG_BT)
|
||||
$(if $(BR2_PACKAGE_ESP_HOSTED_SPI),
|
||||
$(call KCONFIG_ENABLE_OPT,CONFIG_SPI),
|
||||
$(call KCONFIG_ENABLE_OPT,CONFIG_MMC))
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ESP_HOSTED_SPI),y)
|
||||
|
|
|
|||
|
|
@ -23,6 +23,11 @@ ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CP
|
|||
GMP_CONF_OPTS += --disable-assembly
|
||||
endif
|
||||
|
||||
# GMP needs M extension for riscv assembly
|
||||
ifeq ($(BR2_riscv):$(BR2_RISCV_ISA_CUSTOM_RVM),y:)
|
||||
GMP_CONF_OPTS += --disable-assembly
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
|
||||
GMP_CONF_OPTS += --enable-cxx
|
||||
else
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From a2116312068b6b2c5732dfebde19b751cc81d4f3 Mon Sep 17 00:00:00 2001
|
||||
From d242b011a8f0d84781bbf7667a44a12646903ca4 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Sun, 1 Aug 2021 23:21:35 +0200
|
||||
Subject: [PATCH] configure.ac: drop usage of git at configure time
|
||||
|
|
@ -8,12 +8,13 @@ which is not very useful, and causes a significant number of warning
|
|||
when regenerating the configure script.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Signed-off-by: Frank Vanbever <frank.vanbever@mind.be>
|
||||
---
|
||||
configure.ac | 23 -----------------------
|
||||
1 file changed, 23 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 20163e1e..14e5892a 100644
|
||||
index 66d6f4f2..746b1fb4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3,7 +3,6 @@
|
||||
|
|
@ -46,7 +47,7 @@ index 20163e1e..14e5892a 100644
|
|||
|
||||
|
||||
# Check for yajl
|
||||
@@ -217,10 +208,6 @@ AC_SUBST([MSC_VERSION_WITH_PATCHLEVEL])
|
||||
@@ -224,10 +215,6 @@ AC_SUBST([MSC_VERSION_WITH_PATCHLEVEL])
|
||||
MSC_VERSION=msc_version
|
||||
AC_SUBST([MSC_VERSION])
|
||||
|
||||
|
|
@ -55,9 +56,9 @@ index 20163e1e..14e5892a 100644
|
|||
-
|
||||
-
|
||||
AC_ARG_ENABLE(debug-logs,
|
||||
[AC_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])],
|
||||
[AS_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])],
|
||||
|
||||
@@ -412,16 +399,6 @@ AC_OUTPUT
|
||||
@@ -419,16 +406,6 @@ AC_OUTPUT
|
||||
|
||||
|
||||
# Print a fancy summary
|
||||
|
|
@ -66,14 +67,14 @@ index 20163e1e..14e5892a 100644
|
|||
-echo "ModSecurity - ${MSC_GIT_VERSION} for $PLATFORM"
|
||||
-echo " "
|
||||
-echo " Mandatory dependencies"
|
||||
-echo -n " + libInjection ...."
|
||||
-AS_ECHO_N(" + libInjection ....")
|
||||
-echo LIBINJECTION_VERSION
|
||||
-echo -n " + SecLang tests ...."
|
||||
-AS_ECHO_N(" + SecLang tests ....")
|
||||
-echo SECLANG_TEST_VERSION
|
||||
-
|
||||
echo " "
|
||||
echo " Optional dependencies"
|
||||
|
||||
--
|
||||
2.31.1
|
||||
2.39.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 1a84881b280eb08852d5495c57e44351a40d3f91 Mon Sep 17 00:00:00 2001
|
||||
From 4129643d657b5d0cce83f9ec4ca27289fd69ec43 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 26 Jul 2021 00:24:57 +0200
|
||||
Subject: [PATCH] modsecurity.pc.in: add -lstdc++
|
||||
|
|
@ -13,6 +13,7 @@ Fixes:
|
|||
- http://autobuild.buildroot.org/results/e5a9eb8448980f1c5cafe97180b7d1f48ddf02ca
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Signed-off-by: Frank Vanbever <frank.vanbever@mind.be>
|
||||
---
|
||||
modsecurity.pc.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
|
@ -28,5 +29,5 @@ index 96cdf5ca..7c895ddc 100644
|
|||
-Libs.private: @CURL_LDADD@ @GEOIP_LDADD@ @MAXMIND_LDADD@ @GLOBAL_LDADD@ @LIBXML2_LDADD@ @LMDB_LDADD@ @LUA_LDADD@ @PCRE_LDADD@ @SSDEEP_LDADD@ @YAJL_LDADD@
|
||||
+Libs.private: @CURL_LDADD@ @GEOIP_LDADD@ @MAXMIND_LDADD@ @GLOBAL_LDADD@ @LIBXML2_LDADD@ @LMDB_LDADD@ @LUA_LDADD@ @PCRE_LDADD@ @SSDEEP_LDADD@ @YAJL_LDADD@ -lstdc++
|
||||
--
|
||||
2.30.2
|
||||
2.39.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.9/modsecurity-v3.0.9.tar.gz.sha256
|
||||
sha256 a5111ecd23e332a1d7c9652dbdb18517a96b21573315cb887a8e86761b95d3d8 modsecurity-v3.0.9.tar.gz
|
||||
# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.10/modsecurity-v3.0.10.tar.gz.sha256
|
||||
sha256 d5d459f7c2e57a69a405f3222d8e285de419a594b0ea8829058709962227ead0 modsecurity-v3.0.10.tar.gz
|
||||
# Localy calculated
|
||||
sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
LIBMODSECURITY_VERSION = 3.0.9
|
||||
LIBMODSECURITY_VERSION = 3.0.10
|
||||
LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz
|
||||
LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION)
|
||||
LIBMODSECURITY_INSTALL_STAGING = YES
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
Upstream: https://sourceforge.net/p/mpg123/bugs/353/
|
||||
|
||||
diff -Nur mpg123-1.31.3.orig/src/libmpg123/getcpuflags.h mpg123-1.31.3/src/libmpg123/getcpuflags.h
|
||||
--- mpg123-1.31.3.orig/src/libmpg123/getcpuflags.h 2023-03-15 09:02:58.000000000 +0100
|
||||
+++ mpg123-1.31.3/src/libmpg123/getcpuflags.h 2023-08-07 15:57:19.444106173 +0200
|
||||
@@ -44,6 +44,8 @@
|
||||
|
||||
unsigned int getcpuflags(struct cpuflags* cf);
|
||||
|
||||
+#if ((defined OPT_X86) || (defined OPT_X86_64) || (defined OPT_NEON) || (defined OPT_NEON64)) && (defined OPT_MULTI)
|
||||
+
|
||||
#ifdef WANT_GETCPUFLAGS
|
||||
#include <string.h>
|
||||
// Wrapper needed for ignorant clang memory sanitizer that chokes
|
||||
@@ -55,8 +57,6 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if ((defined OPT_X86) || (defined OPT_X86_64) || (defined OPT_NEON) || (defined OPT_NEON64)) && (defined OPT_MULTI)
|
||||
-
|
||||
// We really evaluate the CPU flags.
|
||||
#define OPT_CPU_FLAGS
|
||||
|
||||
|
|
@ -4,7 +4,6 @@ config BR2_PACKAGE_NETWORK_MANAGER
|
|||
depends on BR2_USE_MMU # dbus
|
||||
depends on BR2_PACKAGE_HAS_UDEV
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
# Tested with 3.2, but may even work with earlier versions
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC # CLOCK_BOOTTIME, IPTOS_CLASS_*
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# From https://www.php.net/downloads.php
|
||||
sha256 cfe1055fbcd486de7d3312da6146949aae577365808790af6018205567609801 php-8.2.8.tar.xz
|
||||
sha256 1e6cb77f997613864ab3127fbfc6a8c7fdaa89a95e8ed6167617b913b4de4765 php-8.2.9.tar.xz
|
||||
|
||||
# License file
|
||||
sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PHP_VERSION = 8.2.8
|
||||
PHP_VERSION = 8.2.9
|
||||
PHP_SITE = https://www.php.net/distributions
|
||||
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
|
||||
PHP_INSTALL_STAGING = YES
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
comment "ramspeed needs a toolchain not affected by GCC bug 43744"
|
||||
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744
|
||||
|
||||
config BR2_PACKAGE_RAMSPEED
|
||||
bool "ramspeed"
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_43744
|
||||
help
|
||||
RAMspeed is a free open source command line utility
|
||||
to measure cache and memory performance.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
From f48d99fab8b79e573850067a3ff2d8c16aa95ce1 Mon Sep 17 00:00:00 2001
|
||||
From: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
Date: Wed, 28 Sep 2022 21:17:17 +0200
|
||||
Subject: [PATCH] Makefile: move 'EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)' at the
|
||||
end of EXTRA_FLAGS assignment
|
||||
|
||||
At the moment USER_EXTRA_CFLAGS can't override local Makfile EXTRA_CFLAGS
|
||||
since it's assigned at the beginning of the Makefile. For example it's not
|
||||
possible to undefine the hardcoded CONFIG_LITTLE_ENDIAN and this doesn't
|
||||
allow to build these modules for big endian architectures. So let's move
|
||||
the assignment of USER_EXTRA_CFLAGS to EXTRA_CFLAGS after the last
|
||||
EXTRA_CFLAGS assignment.
|
||||
|
||||
Upstream: https://github.com/jwrdegoede/rtl8189ES_linux/pull/101
|
||||
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
Makefile | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index dfca305..6f91d0a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,4 +1,3 @@
|
||||
-EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)
|
||||
EXTRA_CFLAGS += -O1
|
||||
#EXTRA_CFLAGS += -O3
|
||||
#EXTRA_CFLAGS += -Wall
|
||||
@@ -2208,6 +2207,8 @@ ifneq ($(USER_MODULE_NAME),)
|
||||
MODULE_NAME := $(USER_MODULE_NAME)
|
||||
endif
|
||||
|
||||
+EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)
|
||||
+
|
||||
ifneq ($(KERNELRELEASE),)
|
||||
|
||||
########### this part for *.mk ############################
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -8,10 +8,15 @@ RTL8189FS_VERSION = 75a566a830037c7d1309c5a9fe411562772a1cf2
|
|||
RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION))
|
||||
RTL8189FS_LICENSE = GPL-2.0
|
||||
|
||||
RTL8189FS_USER_EXTRA_CFLAGS = \
|
||||
-UCONFIG_LITTLE_ENDIAN \
|
||||
-DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN
|
||||
|
||||
RTL8189FS_MODULE_MAKE_OPTS = \
|
||||
CONFIG_RTL8189FS=m \
|
||||
KVER=$(LINUX_VERSION_PROBED) \
|
||||
KSRC=$(LINUX_DIR)
|
||||
KSRC=$(LINUX_DIR) \
|
||||
USER_EXTRA_CFLAGS="$(RTL8189FS_USER_EXTRA_CFLAGS)"
|
||||
|
||||
ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),)
|
||||
RTL8189FS_MODULE_MAKE_OPTS += CONFIG_RTW_DEBUG=n
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Locally calculated after checking pgp signature
|
||||
# https://download.samba.org/pub/samba/stable/samba-4.18.5.tar.asc
|
||||
sha256 095256ac332e1d9fbf9b7ff7823f92a3233d3ed658ce7fc9b33905c2243f447f samba-4.18.5.tar.gz
|
||||
# https://download.samba.org/pub/samba/stable/samba-4.18.6.tar.asc
|
||||
sha256 284c8a994ce989c87cd6808c390fcb9d00c36b21a0dc1a8a75474b67c9e715e7 samba-4.18.6.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
SAMBA4_VERSION = 4.18.5
|
||||
SAMBA4_VERSION = 4.18.6
|
||||
SAMBA4_SITE = https://download.samba.org/pub/samba/stable
|
||||
SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
|
||||
SAMBA4_INSTALL_STAGING = YES
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
From 545875ad0b6c9697fae41ae8770e95d117fe3cca Mon Sep 17 00:00:00 2001
|
||||
From: Maarten ter Huurne <maarten@treewalker.org>
|
||||
Date: Sat, 13 Sep 2014 11:37:59 +0200
|
||||
Subject: Do not use memcpy as an alternative for bcopy/memmove
|
||||
Subject: [PATCH] Do not use memcpy as an alternative for bcopy/memmove
|
||||
|
||||
The configure script runs a small test program to check whether
|
||||
memcpy can handle overlapping memory areas. However, it is not valid
|
||||
|
|
@ -16,15 +17,17 @@ Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
|
|||
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
|
||||
[Bernd: rebase on top of 4.7.0]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[Julien: rebase on top of 4.9.1]
|
||||
Signed-off-by: Julien Olivain <ju.o@free.fr>
|
||||
---
|
||||
acconfig.h | 3 +--
|
||||
configure.ac | 18 +-----------------
|
||||
configure.ac | 22 +---------------------
|
||||
os.h | 8 ++------
|
||||
osdef.h.in | 10 +---------
|
||||
4 files changed, 5 insertions(+), 34 deletions(-)
|
||||
4 files changed, 5 insertions(+), 38 deletions(-)
|
||||
|
||||
diff --git a/acconfig.h b/acconfig.h
|
||||
index 2e46985..9b0b9d4 100644
|
||||
index 46d62b0..f83572c 100644
|
||||
--- a/acconfig.h
|
||||
+++ b/acconfig.h
|
||||
@@ -476,7 +476,7 @@
|
||||
|
|
@ -45,43 +48,47 @@ index 2e46985..9b0b9d4 100644
|
|||
|
||||
/*
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 27690a6..b8e3bec 100644
|
||||
index 1a12c04..6f6c2da 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1145,7 +1145,7 @@ AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT))
|
||||
AC_CHECKING(fdwalk)
|
||||
AC_TRY_LINK([#include <stdlib.h>], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK))
|
||||
@@ -1278,7 +1278,7 @@ AC_TRY_LINK([
|
||||
fdwalk(NULL, NULL);
|
||||
],AC_DEFINE(HAVE_FDWALK))
|
||||
|
||||
-AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments)
|
||||
+AC_CHECKING(whether memmove/bcopy handles overlapping arguments)
|
||||
AC_TRY_RUN([
|
||||
main() {
|
||||
char buf[10];
|
||||
@@ -1175,22 +1175,6 @@ main() {
|
||||
exit(0); /* libc version works properly. */
|
||||
}], AC_DEFINE(USEMEMMOVE))
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
@@ -1319,26 +1319,6 @@ main() {
|
||||
}], AC_DEFINE(USEMEMMOVE),,
|
||||
AC_NOTE(- skipping check because we are cross compiling; use memmove) AC_DEFINE(USEMEMMOVE))
|
||||
|
||||
-
|
||||
-AC_TRY_RUN([
|
||||
-#include <string.h>
|
||||
-#include <stdlib.h>
|
||||
-
|
||||
-#define bcopy(s,d,l) memcpy(d,s,l)
|
||||
-
|
||||
-int
|
||||
-main() {
|
||||
- char buf[10];
|
||||
- strcpy(buf, "abcdefghi");
|
||||
- bcopy(buf, buf + 2, 3);
|
||||
- if (strncmp(buf, "ababcf", 6))
|
||||
- exit(1);
|
||||
- return 1;
|
||||
- strcpy(buf, "abcdefghi");
|
||||
- bcopy(buf + 2, buf, 3);
|
||||
- if (strncmp(buf, "cdedef", 6))
|
||||
- exit(1);
|
||||
- exit(0); /* libc version works properly. */
|
||||
- return 1;
|
||||
- return 0; /* libc version works properly. */
|
||||
-}], AC_DEFINE(USEMEMCPY),,:)
|
||||
-
|
||||
AC_SYS_LONG_FILE_NAMES
|
||||
|
||||
AC_MSG_CHECKING(for vsprintf)
|
||||
diff --git a/os.h b/os.h
|
||||
index e827ac9..0b41fb9 100644
|
||||
index 2a1c2ca..d1ac87e 100644
|
||||
--- a/os.h
|
||||
+++ b/os.h
|
||||
@@ -142,12 +142,8 @@ extern int errno;
|
||||
|
|
@ -100,7 +107,7 @@ index e827ac9..0b41fb9 100644
|
|||
#endif
|
||||
|
||||
diff --git a/osdef.h.in b/osdef.h.in
|
||||
index 8687b60..e4057a0 100644
|
||||
index 6ddbd66..abdacf7 100644
|
||||
--- a/osdef.h.in
|
||||
+++ b/osdef.h.in
|
||||
@@ -58,16 +58,8 @@ extern int bcmp __P((char *, char *, int));
|
||||
|
|
@ -122,5 +129,5 @@ index 8687b60..e4057a0 100644
|
|||
extern void bcopy __P((char *, char *, int));
|
||||
#endif
|
||||
--
|
||||
1.8.4.5
|
||||
2.41.0
|
||||
|
||||
|
|
@ -1,18 +1,21 @@
|
|||
From 86b5c7677c5bef780bd4c28cbbdaa97eda938230 Mon Sep 17 00:00:00 2001
|
||||
From: Maarten ter Huurne <maarten@treewalker.org>
|
||||
Date: Sun, 14 Sep 2014 23:58:34 +0200
|
||||
Subject: Do not create backup of old installed binary
|
||||
Subject: [PATCH] Do not create backup of old installed binary
|
||||
|
||||
This is a rather unusual feature that packagers will not expect.
|
||||
|
||||
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
|
||||
[baruch: update for 4.6.2]
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
[Julien: rebase on top of 4.9.1]
|
||||
Signed-off-by: Julien Olivain <ju.o@free.fr>
|
||||
---
|
||||
Makefile.in | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 187a69b..65549e9 100644
|
||||
index 26ec404..3efbbfd 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -83,12 +83,9 @@ screen: $(OFILES)
|
||||
|
|
@ -37,5 +40,5 @@ index 187a69b..65549e9 100644
|
|||
cd doc; $(MAKE) uninstall
|
||||
|
||||
--
|
||||
1.8.4.5
|
||||
2.41.0
|
||||
|
||||
|
|
@ -1,22 +1,25 @@
|
|||
From 4231969c47a8379f9113e0c9c9586bcfdd545c37 Mon Sep 17 00:00:00 2001
|
||||
From: Maarten ter Huurne <maarten@treewalker.org>
|
||||
Date: Mon, 15 Sep 2014 00:03:05 +0200
|
||||
Subject: Change binary permission flags even if chown fails
|
||||
Subject: [PATCH] Change binary permission flags even if chown fails
|
||||
|
||||
Typically when creating a package, the build is not run as root, so
|
||||
the chown will fail. But the chmod can still be done.
|
||||
|
||||
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
|
||||
[Julien: rebase on top of 4.9.1]
|
||||
Signed-off-by: Julien Olivain <ju.o@free.fr>
|
||||
---
|
||||
Makefile.in | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 65549e9..3c12fdb 100644
|
||||
index 3efbbfd..0315fde 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -84,7 +84,8 @@ screen: $(OFILES)
|
||||
|
||||
install_bin: .version screen
|
||||
install_bin: .version screen installdirs
|
||||
$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
|
||||
- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
|
||||
+ -chown root $(DESTDIR)$(bindir)/$(SCREEN)
|
||||
|
|
@ -25,5 +28,5 @@ index 65549e9..3c12fdb 100644
|
|||
rm -f $(DESTDIR)$(bindir)/screen
|
||||
(cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen)
|
||||
--
|
||||
1.8.4.5
|
||||
2.41.0
|
||||
|
||||
|
|
@ -1,20 +1,23 @@
|
|||
From 07d6e4d9da8bc7c6ed31aa9b643410ea093d164f Mon Sep 17 00:00:00 2001
|
||||
From: Maarten ter Huurne <maarten@treewalker.org>
|
||||
Date: Mon, 15 Sep 2014 00:06:20 +0200
|
||||
Subject: Support overriding SCREEN to get a non-versioned binary
|
||||
Subject: [PATCH] Support overriding SCREEN to get a non-versioned binary
|
||||
|
||||
If a packager runs "make install SCREEN=screen", do not create
|
||||
"screen" as a symlink to itself.
|
||||
|
||||
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
|
||||
[Julien: rebase on top of 4.9.1]
|
||||
Signed-off-by: Julien Olivain <ju.o@free.fr>
|
||||
---
|
||||
Makefile.in | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 3c12fdb..860f351 100644
|
||||
index 0315fde..4718f08 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -86,9 +86,11 @@ install_bin: .version screen
|
||||
@@ -86,9 +86,11 @@ install_bin: .version screen installdirs
|
||||
$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
|
||||
-chown root $(DESTDIR)$(bindir)/$(SCREEN)
|
||||
-chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
|
||||
|
|
@ -27,5 +30,5 @@ index 3c12fdb..860f351 100644
|
|||
|
||||
###############################################################################
|
||||
--
|
||||
1.8.4.5
|
||||
2.41.0
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
From 8b066a777b61600ff2c60cad0725f2089299ff56 Mon Sep 17 00:00:00 2001
|
||||
From: Maarten ter Huurne <maarten@treewalker.org>
|
||||
Date: Mon, 15 Sep 2014 00:24:41 +0200
|
||||
Subject: [PATCH] Renamed sched.h to eventqueue.h
|
||||
|
||||
There is a <sched.h> system header that got shadowed by "sched.h".
|
||||
While Screen itself doesn't include <sched.h>, other system headers
|
||||
might include it indirectly. This broke the build when using uClibc
|
||||
with pthread support.
|
||||
|
||||
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
|
||||
[Julien: rebase on top of 4.9.1]
|
||||
Signed-off-by: Julien Olivain <ju.o@free.fr>
|
||||
---
|
||||
sched.h => eventqueue.h | 0
|
||||
screen.h | 2 +-
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
rename sched.h => eventqueue.h (100%)
|
||||
|
||||
diff --git a/sched.h b/eventqueue.h
|
||||
similarity index 100%
|
||||
rename from sched.h
|
||||
rename to eventqueue.h
|
||||
diff --git a/screen.h b/screen.h
|
||||
index 4823efb..2d51788 100644
|
||||
--- a/screen.h
|
||||
+++ b/screen.h
|
||||
@@ -43,7 +43,7 @@
|
||||
#include "osdef.h"
|
||||
|
||||
#include "ansi.h"
|
||||
-#include "sched.h"
|
||||
+#include "eventqueue.h"
|
||||
#include "acls.h"
|
||||
#include "comm.h"
|
||||
#include "layer.h"
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
|
@ -1,142 +0,0 @@
|
|||
From: Maarten ter Huurne <maarten@treewalker.org>
|
||||
Date: Mon, 15 Sep 2014 00:24:41 +0200
|
||||
Subject: Renamed sched.h to eventqueue.h
|
||||
|
||||
There is a <sched.h> system header that got shadowed by "sched.h".
|
||||
While Screen itself doesn't include <sched.h>, other system headers
|
||||
might include it indirectly. This broke the build when using uClibc
|
||||
with pthread support.
|
||||
|
||||
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
|
||||
---
|
||||
eventqueue.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
sched.h | 48 ------------------------------------------------
|
||||
screen.h | 2 +-
|
||||
3 files changed, 49 insertions(+), 49 deletions(-)
|
||||
create mode 100644 eventqueue.h
|
||||
delete mode 100644 sched.h
|
||||
|
||||
diff --git a/eventqueue.h b/eventqueue.h
|
||||
new file mode 100644
|
||||
index 0000000..fdc3fc4
|
||||
--- /dev/null
|
||||
+++ b/eventqueue.h
|
||||
@@ -0,0 +1,48 @@
|
||||
+/* Copyright (c) 2008, 2009
|
||||
+ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de)
|
||||
+ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de)
|
||||
+ * Micah Cowan (micah@cowan.name)
|
||||
+ * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net)
|
||||
+ * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007
|
||||
+ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de)
|
||||
+ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de)
|
||||
+ * Copyright (c) 1987 Oliver Laumann
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License as published by
|
||||
+ * the Free Software Foundation; either version 3, or (at your option)
|
||||
+ * any later version.
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this program (see the file COPYING); if not, see
|
||||
+ * https://www.gnu.org/licenses/, or contact Free Software Foundation, Inc.,
|
||||
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
|
||||
+ *
|
||||
+ ****************************************************************
|
||||
+ * $Id$ GNU
|
||||
+ */
|
||||
+
|
||||
+struct event
|
||||
+{
|
||||
+ struct event *next;
|
||||
+ void (*handler) __P((struct event *, char *));
|
||||
+ char *data;
|
||||
+ int fd;
|
||||
+ int type;
|
||||
+ int pri;
|
||||
+ struct timeval timeout;
|
||||
+ int queued; /* in evs queue */
|
||||
+ int active; /* in fdset */
|
||||
+ int *condpos; /* only active if condpos - condneg > 0 */
|
||||
+ int *condneg;
|
||||
+};
|
||||
+
|
||||
+#define EV_TIMEOUT 0
|
||||
+#define EV_READ 1
|
||||
+#define EV_WRITE 2
|
||||
+#define EV_ALWAYS 3
|
||||
diff --git a/sched.h b/sched.h
|
||||
deleted file mode 100644
|
||||
index fdc3fc4..0000000
|
||||
--- a/sched.h
|
||||
+++ /dev/null
|
||||
@@ -1,48 +0,0 @@
|
||||
-/* Copyright (c) 2008, 2009
|
||||
- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de)
|
||||
- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de)
|
||||
- * Micah Cowan (micah@cowan.name)
|
||||
- * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net)
|
||||
- * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007
|
||||
- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de)
|
||||
- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de)
|
||||
- * Copyright (c) 1987 Oliver Laumann
|
||||
- *
|
||||
- * This program is free software; you can redistribute it and/or modify
|
||||
- * it under the terms of the GNU General Public License as published by
|
||||
- * the Free Software Foundation; either version 3, or (at your option)
|
||||
- * any later version.
|
||||
- *
|
||||
- * This program is distributed in the hope that it will be useful,
|
||||
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
- * GNU General Public License for more details.
|
||||
- *
|
||||
- * You should have received a copy of the GNU General Public License
|
||||
- * along with this program (see the file COPYING); if not, see
|
||||
- * https://www.gnu.org/licenses/, or contact Free Software Foundation, Inc.,
|
||||
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
|
||||
- *
|
||||
- ****************************************************************
|
||||
- * $Id$ GNU
|
||||
- */
|
||||
-
|
||||
-struct event
|
||||
-{
|
||||
- struct event *next;
|
||||
- void (*handler) __P((struct event *, char *));
|
||||
- char *data;
|
||||
- int fd;
|
||||
- int type;
|
||||
- int pri;
|
||||
- struct timeval timeout;
|
||||
- int queued; /* in evs queue */
|
||||
- int active; /* in fdset */
|
||||
- int *condpos; /* only active if condpos - condneg > 0 */
|
||||
- int *condneg;
|
||||
-};
|
||||
-
|
||||
-#define EV_TIMEOUT 0
|
||||
-#define EV_READ 1
|
||||
-#define EV_WRITE 2
|
||||
-#define EV_ALWAYS 3
|
||||
diff --git a/screen.h b/screen.h
|
||||
index 603ca3f..34238c8 100644
|
||||
--- a/screen.h
|
||||
+++ b/screen.h
|
||||
@@ -43,7 +43,7 @@
|
||||
#include "osdef.h"
|
||||
|
||||
#include "ansi.h"
|
||||
-#include "sched.h"
|
||||
+#include "eventqueue.h"
|
||||
#include "acls.h"
|
||||
#include "comm.h"
|
||||
#include "layer.h"
|
||||
--
|
||||
1.8.4.5
|
||||
|
||||
|
|
@ -1,28 +1,30 @@
|
|||
From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001
|
||||
From 23a8ca6be87ad374d66854cee66ab758880cc651 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gerwitz <mike@mikegerwitz.com>
|
||||
Date: Tue, 24 Dec 2013 22:16:31 -0500
|
||||
Subject: comm.h now depends on term.h
|
||||
Subject: [PATCH] comm.h now depends on term.h
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Patch retrieved and updated from:
|
||||
http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c]
|
||||
[Julien: rebase on top of 4.9.1]
|
||||
Signed-off-by: Julien Olivain <ju.o@free.fr>
|
||||
---
|
||||
src/Makefile.in | 2 +-
|
||||
Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index e791e79..d4f7c0b 100644
|
||||
index 4718f08..7082a3e 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -113,7 +113,7 @@ term.h: term.c term.sh
|
||||
|
||||
kmapdef.c: term.h
|
||||
@@ -132,7 +132,7 @@ kmapdef.c: term.h
|
||||
tty.c: tty.sh
|
||||
sh $(srcdir)/tty.sh tty.c
|
||||
|
||||
-comm.h: comm.c comm.sh config.h
|
||||
+comm.h: comm.c comm.sh config.h term.h
|
||||
AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
|
||||
|
||||
docs:
|
||||
osdef.h: osdef.sh config.h osdef.h.in
|
||||
--
|
||||
cgit v1.0-41-gc330
|
||||
2.41.0
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From b719314d201a3e9e1e57c65746a468c47bfc847f Mon Sep 17 00:00:00 2001
|
||||
From 8d8899b3ffd26d5049f8a9ccf12ff9ac65c352b4 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Wed, 3 Oct 2018 22:29:32 +0200
|
||||
Subject: [PATCH] comm.h needed for list_{display,generic}.o
|
||||
|
|
@ -12,15 +12,17 @@ Fixes:
|
|||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://savannah.gnu.org/bugs/index.php?54776]
|
||||
[Julien: rebase on top of 4.9.1]
|
||||
Signed-off-by: Julien Olivain <ju.o@free.fr>
|
||||
---
|
||||
Makefile.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index af5938b..e6d5247 100644
|
||||
index 7082a3e..cd363b7 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -265,7 +265,7 @@ braille.h
|
||||
@@ -349,7 +349,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a
|
||||
viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \
|
||||
comm.h layer.h term.h image.h display.h window.h extern.h \
|
||||
braille.h
|
||||
|
|
@ -31,5 +33,5 @@ index af5938b..e6d5247 100644
|
|||
list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h
|
||||
|
||||
--
|
||||
2.17.1
|
||||
2.41.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Locally calculated after checking pgp signature
|
||||
# https://ftp.gnu.org/gnu/screen/screen-4.9.0.tar.gz.sig
|
||||
sha256 f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4 screen-4.9.0.tar.gz
|
||||
# https://ftp.gnu.org/gnu/screen/screen-4.9.1.tar.gz.sig
|
||||
sha256 26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69 screen-4.9.1.tar.gz
|
||||
# Locally calculated
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
SCREEN_VERSION = 4.9.0
|
||||
SCREEN_VERSION = 4.9.1
|
||||
SCREEN_SITE = $(BR2_GNU_MIRROR)/screen
|
||||
SCREEN_LICENSE = GPL-3.0+
|
||||
SCREEN_LICENSE_FILES = COPYING
|
||||
|
|
|
|||
|
|
@ -35,4 +35,10 @@ else
|
|||
ZLIB_NG_CONF_OPTS += -DWITH_POWER8=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_powerpc_power9),y)
|
||||
ZLIB_NG_CONF_OPTS += -DWITH_POWER9=ON
|
||||
else
|
||||
ZLIB_NG_CONF_OPTS += -DWITH_POWER9=OFF
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
|
|
|||
Loading…
Reference in New Issue