summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/bind/Makefile4
-rw-r--r--package/cyrus-sasl/Makefile10
-rw-r--r--package/cyrus-sasl/patches/patch-config_ltconfig29
-rw-r--r--package/cyrus-sasl/patches/patch-config_ltmain_sh14
-rw-r--r--package/ltp/Makefile4
-rw-r--r--package/openssl/Makefile4
-rw-r--r--package/squid/Makefile13
-rw-r--r--target/linux/Config.in.kernelversion4
-rw-r--r--target/linux/patches/a320d39840745502d420f56b3d49b3723a12058f/defconfig.patch54
9 files changed, 76 insertions, 60 deletions
diff --git a/package/bind/Makefile b/package/bind/Makefile
index b2e60c35f..32eb0bbef 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= bind
-PKG_VERSION:= 9.18.32
+PKG_VERSION:= 9.18.33
PKG_RELEASE:= 1
-PKG_HASH:= dc840cdf9d54578d98400f2edf7008b1b33a1721be6e490eb1e42d0d11d9cff4
+PKG_HASH:= fb373fac5ebbc41c645160afd5a9fb451918f6c0e69ab1d9474154e2b515de40
PKG_DESCR:= dns server
PKG_SECTION:= net/dns
PKG_DEPENDS:= libxml2 libopenssl libuv openssl-util
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index fa6503bd2..8dd026ecc 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -4,26 +4,28 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= cyrus-sasl
-PKG_VERSION:= 2.1.26
-PKG_RELEASE:= 2
-PKG_HASH:= 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3
+PKG_VERSION:= 2.1.28
+PKG_RELEASE:= 1
+PKG_HASH:= 3e38933a30b9ce183a5488b4f6a5937a702549cde0d3287903d80968ad4ec341
PKG_DESCR:= general purpose authentication library
PKG_SECTION:= libs/crypto
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP:= openssl
PKG_URL:= http://cyrusimap.org/
-PKG_SITES:= ftp://ftp.cyrusimap.org/cyrus-sasl/
+PKG_SITES:= https://github.com/cyrusimap/cyrus-sasl/archive/refs/tags/
PKG_LIBNAME:= libsasl2
PKG_OPTS:= dev
PKG_NOPARALLEL:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_NAME)-${PKG_VERSION}
include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+AUTOTOOL_STYLE:= autogen
CONFIGURE_ARGS+= --enable-plain \
--enable-login \
--disable-anon \
diff --git a/package/cyrus-sasl/patches/patch-config_ltconfig b/package/cyrus-sasl/patches/patch-config_ltconfig
deleted file mode 100644
index 1a04b28e0..000000000
--- a/package/cyrus-sasl/patches/patch-config_ltconfig
+++ /dev/null
@@ -1,29 +0,0 @@
---- cyrus-sasl-2.1.26.orig/config/ltconfig 2012-10-12 16:05:48.000000000 +0200
-+++ cyrus-sasl-2.1.26/config/ltconfig 2014-03-07 07:46:01.000000000 +0100
-@@ -2024,7 +2024,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux-*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -2034,16 +2034,7 @@ linux-gnu*)
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- deplibs_check_method=pass_all
--
-- if test -f /lib/ld.so.1; then
-- dynamic_linker='GNU ld.so'
-- else
-- # Only the GNU ld.so supports shared libraries on MkLinux.
-- case "$host_cpu" in
-- powerpc*) dynamic_linker=no ;;
-- *) dynamic_linker='Linux ld.so' ;;
-- esac
-- fi
-+ dynamic_linker='Linux ld.so'
- ;;
-
- netbsd*)
diff --git a/package/cyrus-sasl/patches/patch-config_ltmain_sh b/package/cyrus-sasl/patches/patch-config_ltmain_sh
deleted file mode 100644
index 01b5a992c..000000000
--- a/package/cyrus-sasl/patches/patch-config_ltmain_sh
+++ /dev/null
@@ -1,14 +0,0 @@
---- cyrus-sasl-2.1.23.orig/config/ltmain.sh 2003-07-02 15:29:00.000000000 +0200
-+++ cyrus-sasl-2.1.23/config/ltmain.sh 2011-03-30 21:20:59.111809629 +0200
-@@ -1081,6 +1081,11 @@ compiler."
- esac
- ;;
-
-+ -fstack-protector*|-flto*)
-+ linkopts="$linkopts $arg"
-+ continue
-+ ;;
-+
- -l*)
- if test "$arg" = "-lc"; then
- case "$host" in
diff --git a/package/ltp/Makefile b/package/ltp/Makefile
index d2d2358a0..8f9ebaa88 100644
--- a/package/ltp/Makefile
+++ b/package/ltp/Makefile
@@ -4,10 +4,10 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= ltp
-PKG_VERSION:= 20240930
+PKG_VERSION:= 20250130
PKG_RELEASE:= 1
PKG_DESCR:= linux test project
-PKG_HASH:= 3e9e806405aa602e2d21d221d885fd4914ff2da23eb8bba3d0f0f468bdf60238
+PKG_HASH:= 02e4ec326be54c3fd92968229a468c02c665d168a8a673edc38a891f7395ae10
PKG_DEPENDS:= bash mke2fs mkfs shadow libtirpc libaio
PKG_DEPENDS+= kmod dosfstools
PKG_BUILDDEP+= libtirpc libaio
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 6a2eccf64..fbf5b1b78 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= openssl
-PKG_VERSION:= 3.3.2
+PKG_VERSION:= 3.4.0
PKG_RELEASE:= 1
-PKG_HASH:= 2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281
+PKG_HASH:= e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf
PKG_DESCR:= ssl/tls library
PKG_SECTION:= libs/crypto
PKG_URL:= https://openssl-library.org/
diff --git a/package/squid/Makefile b/package/squid/Makefile
index e4e83cdc4..7a1199e69 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -4,16 +4,19 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= squid
-PKG_VERSION:= 6.10
+PKG_VERSION:= 6.13
PKG_RELEASE:= 1
-PKG_HASH:= 0b07b187e723f04770dd25beb89aec12030a158696aa8892d87c8b26853408a7
+PKG_HASH:= 9b33de09d733b5933f6c2b54ebe0be51a9fa4751f183f3aead90b3c5d930aa72
PKG_DESCR:= web and cache proxy
PKG_SECTION:= net/proxy
-PKG_DEPENDS:= libltdl
+PKG_DEPENDS:= libltdl libxcrypt
PKG_BUILDDEP:= libtool
+PKG_BUILDDEP_GLIBC:= libxcrypt
PKG_NEEDS:= threads c++
PKG_URL:= http://www.squid-cache.org/
-PKG_SITES:= http://www.squid-cache.org/Versions/v6/
+PKG_SITES:= https://github.com/squid-cache/squid/releases/download/SQUID_6_13/
+
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SUBPKGS:= SQUID SQUID_MOD_BASIC_AUTH_GETPWNAM SQUID_MOD_BASIC_AUTH_NCSA
PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_FILE
@@ -110,7 +113,7 @@ $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,ext_unix_group_
$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKE,ntlm_fake_auth))
TARGET_LDFLAGS+= -lpthread
-HOST_CXXFLAGS+= -static-libstdc++
+HOST_CXXFLAGS+= -std=c++17 -static-libstdc++
CONFIGURE_ENV+= ac_cv_func_setresuid=yes \
ac_cv_func_va_copy=yes \
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index 2efbfc4c2..d4af242ed 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -246,7 +246,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT
default "f6e9dab9d1dc1e8fa2acb75504bf5ff86b885b8e" if ADK_TARGET_CPU_ARC_ARC32 || ADK_TARGET_CPU_ARC_ARC64
default "b02c139d3608c8ae87f5398a3a29854f6df7a041" if ADK_TARGET_ARCH_KVX
default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32
- default "ba0f2212e0e100ee16bdde76b7efca6bb8ee9446" if ADK_TARGET_BOARD_BCM28XX
+ default "a320d39840745502d420f56b3d49b3723a12058f" if ADK_TARGET_BOARD_BCM28XX
default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537
default "e7c8afc1dda7b7c18596d90ad6a17ae886650b72" if ADK_TARGET_SYSTEM_KINETIS_K70
default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
@@ -258,7 +258,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT
config ADK_TARGET_LINUX_KERNEL_GIT_VER
string "kernel version"
depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT
- default "6.6.47" if ADK_TARGET_BOARD_BCM28XX
+ default "6.6.74" if ADK_TARGET_BOARD_BCM28XX
default "5.16" if ADK_TARGET_CPU_ARC_ARC32 || ADK_TARGET_CPU_ARC_ARC64
default "5.10.110" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
default "6.6.32" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
diff --git a/target/linux/patches/a320d39840745502d420f56b3d49b3723a12058f/defconfig.patch b/target/linux/patches/a320d39840745502d420f56b3d49b3723a12058f/defconfig.patch
new file mode 100644
index 000000000..bab9a96aa
--- /dev/null
+++ b/target/linux/patches/a320d39840745502d420f56b3d49b3723a12058f/defconfig.patch
@@ -0,0 +1,54 @@
+diff -Nur linux-a320d39840745502d420f56b3d49b3723a12058f.orig/arch/arm/configs/bcm2709_defconfig linux-a320d39840745502d420f56b3d49b3723a12058f/arch/arm/configs/bcm2709_defconfig
+--- linux-a320d39840745502d420f56b3d49b3723a12058f.orig/arch/arm/configs/bcm2709_defconfig 2025-01-29 11:26:07.000000000 +0100
++++ linux-a320d39840745502d420f56b3d49b3723a12058f/arch/arm/configs/bcm2709_defconfig 2025-01-30 10:01:43.360002642 +0100
+@@ -1,4 +1,4 @@
+-CONFIG_LOCALVERSION="-v7"
++CONFIG_LOCALVERSION=""
+ # CONFIG_LOCALVERSION_AUTO is not set
+ CONFIG_SYSVIPC=y
+ CONFIG_POSIX_MQUEUE=y
+@@ -61,7 +61,7 @@
+ CONFIG_MODULE_UNLOAD=y
+ CONFIG_MODVERSIONS=y
+ CONFIG_MODULE_SRCVERSION_ALL=y
+-CONFIG_MODULE_COMPRESS_XZ=y
++CONFIG_MODULE_COMPRESS_NONE=y
+ CONFIG_PARTITION_ADVANCED=y
+ CONFIG_MAC_PARTITION=y
+ CONFIG_BINFMT_MISC=m
+diff -Nur linux-a320d39840745502d420f56b3d49b3723a12058f.orig/arch/arm/configs/bcm2711_defconfig linux-a320d39840745502d420f56b3d49b3723a12058f/arch/arm/configs/bcm2711_defconfig
+--- linux-a320d39840745502d420f56b3d49b3723a12058f.orig/arch/arm/configs/bcm2711_defconfig 2025-01-29 11:26:07.000000000 +0100
++++ linux-a320d39840745502d420f56b3d49b3723a12058f/arch/arm/configs/bcm2711_defconfig 2025-01-30 10:01:21.870272370 +0100
+@@ -1,4 +1,4 @@
+-CONFIG_LOCALVERSION="-v7l"
++CONFIG_LOCALVERSION=""
+ # CONFIG_LOCALVERSION_AUTO is not set
+ CONFIG_SYSVIPC=y
+ CONFIG_POSIX_MQUEUE=y
+@@ -61,7 +61,7 @@
+ CONFIG_MODULE_UNLOAD=y
+ CONFIG_MODVERSIONS=y
+ CONFIG_MODULE_SRCVERSION_ALL=y
+-CONFIG_MODULE_COMPRESS_XZ=y
++CONFIG_MODULE_COMPRESS_NONE=y
+ CONFIG_BLK_DEV_THROTTLING=y
+ CONFIG_PARTITION_ADVANCED=y
+ CONFIG_MAC_PARTITION=y
+diff -Nur linux-a320d39840745502d420f56b3d49b3723a12058f.orig/arch/arm64/configs/bcm2711_defconfig linux-a320d39840745502d420f56b3d49b3723a12058f/arch/arm64/configs/bcm2711_defconfig
+--- linux-a320d39840745502d420f56b3d49b3723a12058f.orig/arch/arm64/configs/bcm2711_defconfig 2025-01-29 11:26:08.000000000 +0100
++++ linux-a320d39840745502d420f56b3d49b3723a12058f/arch/arm64/configs/bcm2711_defconfig 2025-01-30 10:02:18.394060065 +0100
+@@ -1,4 +1,4 @@
+-CONFIG_LOCALVERSION="-v8"
++CONFIG_LOCALVERSION=""
+ # CONFIG_LOCALVERSION_AUTO is not set
+ CONFIG_SYSVIPC=y
+ CONFIG_POSIX_MQUEUE=y
+@@ -71,7 +71,7 @@
+ CONFIG_MODULE_UNLOAD=y
+ CONFIG_MODVERSIONS=y
+ CONFIG_MODULE_SRCVERSION_ALL=y
+-CONFIG_MODULE_COMPRESS_XZ=y
++CONFIG_MODULE_COMPRESS_NONE=y
+ CONFIG_BLK_DEV_THROTTLING=y
+ CONFIG_PARTITION_ADVANCED=y
+ CONFIG_MAC_PARTITION=y
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 23:22:48 +0000