summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch37
-rw-r--r--package/cfgfs/Makefile1
-rw-r--r--package/dbus-glib/Makefile4
-rw-r--r--package/dbus-glib/patches/patch-Makefile_in14
-rw-r--r--package/dbus-glib/patches/patch-dbus_Makefile_in8
-rw-r--r--package/iproute2/Makefile17
-rw-r--r--package/iproute2/patches/patch-bridge_mst_c10
-rw-r--r--package/iproute2/patches/patch-tc_tc_core_h11
-rw-r--r--package/iptables/Makefile4
-rw-r--r--package/libXt/Makefile5
-rw-r--r--package/libXt/patches/patch-util_Makefile_am10
-rw-r--r--package/linux-atm/Makefile39
-rw-r--r--package/linux-atm/files/br2684.hotplug19
-rw-r--r--package/linux-atm/patches/patch-src_Makefile_am7
-rw-r--r--package/linux-atm/patches/patch-src_Makefile_in11
-rw-r--r--package/linux-atm/patches/patch-src_sigd_Makefile_in11
-rw-r--r--package/linux-atm/patches/patch-src_sigd_cfg_l_l10
-rw-r--r--package/linux-atm/patches/patch-src_switch_Makefile_in11
-rw-r--r--package/linux-atm/patches/patch-src_switch_cfg_l_l10
-rw-r--r--package/linux-atm/patches/patch-src_switch_debug_Makefile_in11
-rw-r--r--package/linux-atm/patches/patch-src_switch_tcp_Makefile_in11
-rw-r--r--package/readline/Makefile4
-rw-r--r--package/toybox/Makefile6
23 files changed, 65 insertions, 206 deletions
diff --git a/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch b/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch
new file mode 100644
index 000000000..1dfd6f379
--- /dev/null
+++ b/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch
@@ -0,0 +1,37 @@
+From 34d331d642c3312e1c04e4650f547f1a67abee24 Mon Sep 17 00:00:00 2001
+From: Andrej Valek <andrej.v@skyrain.eu>
+Date: Wed, 16 Oct 2024 10:15:08 +0200
+Subject: [PATCH] syslogd: fix wrong OPT_locallog flag detection
+
+The OPT_locallog was set on "option_mask32" but checked on local
+"opts" variable. While this flag it's used on multiple places can't be
+has to be used with "option_mask32". Without this change syslogd
+is more-less unusable while no messages are logged locally.
+
+Signed-off-by: Andrej Valek <andrej.v@skyrain.eu>
+Upstream: https://lists.busybox.net/pipermail/busybox/2024-October/090969.html
+[Thomas: this was reported as beeing needed by Bernd Kuhls at
+https://lore.kernel.org/buildroot/pan$de0bb$35c5a64$ca9b6f21$2408ff40@ID-313208.user.individual.net/,
+but also on the Busybox mailing list at
+https://lists.busybox.net/pipermail/busybox/2023-September/090499.html]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ sysklogd/syslogd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
+index 7558051f0..fa03aa280 100644
+--- a/sysklogd/syslogd.c
++++ b/sysklogd/syslogd.c
+@@ -1179,7 +1179,7 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv)
+ }
+ }
+ #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);
+ }
+--
+2.48.1
+
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 209b9ff88..2253d2865 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -29,6 +29,7 @@ $(eval $(call PKG_template,CFGFS,cfgfs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
# runtime problems on x86_64 with O3
TARGET_CFLAGS:= $(subst O3,Os,$(TARGET_CFLAGS))
+TARGET_CFLAGS+= -Wno-incompatible-pointer-types
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile
index 47a00144c..e4af44995 100644
--- a/package/dbus-glib/Makefile
+++ b/package/dbus-glib/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= dbus-glib
-PKG_VERSION:= 0.102
+PKG_VERSION:= 0.114
PKG_RELEASE:= 1
-PKG_HASH:= 6964ed585bb8149a14ab744b5ded5e77cf71ec5446e6dcc5fcf5eebcc52df29c
+PKG_HASH:= c09c5c085b2a0e391b8ee7d783a1d63fe444e96717cc1814d61b5e8fc2827a7c
PKG_DESCR:= glib bindings for dbus
PKG_SECTION:= libs/misc
PKG_DEPENDS:= libdbus glib
diff --git a/package/dbus-glib/patches/patch-Makefile_in b/package/dbus-glib/patches/patch-Makefile_in
index b42b1d3ba..d9a3b3840 100644
--- a/package/dbus-glib/patches/patch-Makefile_in
+++ b/package/dbus-glib/patches/patch-Makefile_in
@@ -1,13 +1,13 @@
---- dbus-glib-0.86.orig/Makefile.in 2010-03-25 01:20:00.000000000 +0100
-+++ dbus-glib-0.86/Makefile.in 2010-04-11 12:29:52.000000000 +0200
-@@ -312,8 +312,8 @@ top_builddir = @top_builddir@
+--- dbus-glib-0.114.orig/Makefile.in 2025-03-13 19:45:45.000000000 +0100
++++ dbus-glib-0.114/Makefile.in 2025-04-07 12:35:46.540747017 +0200
+@@ -421,8 +421,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
GLIB_PC = dbus-glib-1.pc
--SUBDIRS = dbus tools test doc
--DIST_SUBDIRS = dbus tools test doc m4
-+SUBDIRS = dbus
-+DIST_SUBDIRS = dbus tools m4
+-SUBDIRS = dbus-gmain dbus tools test doc
+-DIST_SUBDIRS = dbus-gmain dbus tools test doc m4
++SUBDIRS = dbus-gmain dbus test
++DIST_SUBDIRS = dbus-gmain dbus test m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(GLIB_PC)
DISTCLEANFILES = \
diff --git a/package/dbus-glib/patches/patch-dbus_Makefile_in b/package/dbus-glib/patches/patch-dbus_Makefile_in
index 161f53563..692b875ad 100644
--- a/package/dbus-glib/patches/patch-dbus_Makefile_in
+++ b/package/dbus-glib/patches/patch-dbus_Makefile_in
@@ -1,11 +1,11 @@
---- dbus-glib-0.86.orig/dbus/Makefile.in 2010-03-25 01:19:59.000000000 +0100
-+++ dbus-glib-0.86/dbus/Makefile.in 2010-04-11 12:15:19.000000000 +0200
-@@ -369,7 +369,7 @@ target_vendor = @target_vendor@
+--- dbus-glib-0.114.orig/dbus/Makefile.in 2025-03-13 19:45:45.000000000 +0100
++++ dbus-glib-0.114/dbus/Makefile.in 2025-04-07 12:33:57.583768144 +0200
+@@ -637,7 +637,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = . examples
+SUBDIRS = .
- INCLUDES = \
+ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index d1f583742..1c7b61d64 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -4,23 +4,20 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= iproute2
-PKG_VERSION:= 6.11.0
+PKG_VERSION:= 6.14.0
PKG_RELEASE:= 1
-PKG_HASH:= 1f795398a04aeaacd06a8f6ace2cfd913c33fa5953ca99daae83bb5c534611c3
+PKG_HASH:= a6d23588150096591c3d00fc27a324a82ee71d7a1a9eea78df5df17ad9b8461f
PKG_DESCR:= routing control utility
PKG_SECTION:= net/route
-PKG_BUILDDEP:= iptables libnl linux-atm
+PKG_BUILDDEP:= iptables libnl
PKG_DEPENDS:= libnl
PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2
PKG_SITES:= http://www.kernel.org/pub/linux/utils/net/iproute2/
-PKG_SUBPKGS:= IP TC TC_ATM TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS
+PKG_SUBPKGS:= IP TC TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS
PKGSS_IP:= libmnl
PKGSD_TC:= traffic control utility
PKGSB_TC:= iptables
-PKGSD_TC_ATM:= traffic control atm support library
-PKGSS_TC_ATM:= tc libatm
-PKGSB_TC_ATM:= linux-atm
PKGSD_TC_IPT:= traffic control iptables support library
PKGSS_TC_IPT:= tc iptables
PKGSB_TC_IPT:= iptables
@@ -34,7 +31,6 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_TC},${PKGSD_TC},${PKG_SECTION}))
-$(eval $(call PKG_template,TC_ATM,tc-atm,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_TC_ATM},${PKGSD_TC_ATM},${PKG_SECTION}))
$(eval $(call PKG_template,TC_IPT,tc-iptables,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_TC_IPT},${PKGSD_TC_IPT},${PKG_SECTION}))
$(eval $(call PKG_template,IFSTAT,ifstat,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_IFSTAT},${PKG_SECTION}))
$(eval $(call PKG_template,LNSTAT,lnstat,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LNSTAT},${PKG_SECTION}))
@@ -56,11 +52,6 @@ tc-install:
${CP} ${WRKINST}/usr/lib/tc/*.dist ${IDIR_TC}/usr/lib/tc/
${INSTALL_BIN} ${WRKINST}/sbin/tc ${IDIR_TC}/usr/sbin/
-tc-atm-install:
- ${INSTALL_DIR} ${IDIR_TC_ATM}/usr/lib/tc
- ${INSTALL_DATA} ${WRKINST}/usr/lib/tc/q_atm.so \
- ${IDIR_TC_ATM}/usr/lib/tc/
-
tc-iptables-install:
${INSTALL_DIR} ${IDIR_TC_IPT}/usr/lib/tc
# use ${CP} here, since m_ipt.so is a symlink to m_xt.so
diff --git a/package/iproute2/patches/patch-bridge_mst_c b/package/iproute2/patches/patch-bridge_mst_c
deleted file mode 100644
index ed62eb842..000000000
--- a/package/iproute2/patches/patch-bridge_mst_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- iproute2-6.11.0.orig/bridge/mst.c 2024-09-15 21:42:26.000000000 +0200
-+++ iproute2-6.11.0/bridge/mst.c 2024-09-24 09:58:39.165522637 +0200
-@@ -4,6 +4,7 @@
- */
-
- #include <stdio.h>
-+#include <netinet/in.h>
- #include <linux/if_bridge.h>
- #include <net/if.h>
-
diff --git a/package/iproute2/patches/patch-tc_tc_core_h b/package/iproute2/patches/patch-tc_tc_core_h
deleted file mode 100644
index 25c259cee..000000000
--- a/package/iproute2/patches/patch-tc_tc_core_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- iproute2-6.11.0.orig/tc/tc_core.h 2024-09-15 21:42:26.000000000 +0200
-+++ iproute2-6.11.0/tc/tc_core.h 2024-09-24 09:43:33.562449121 +0200
-@@ -2,7 +2,7 @@
- #ifndef _TC_CORE_H_
- #define _TC_CORE_H_ 1
-
--#include <asm/types.h>
-+#include <sys/types.h>
- #include <linux/pkt_sched.h>
-
- enum link_layer {
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index f6e0ad777..b94edd0ef 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= iptables
-PKG_VERSION:= 1.8.10
+PKG_VERSION:= 1.8.11
PKG_RELEASE:= 1
-PKG_HASH:= 5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c
+PKG_HASH:= d87303d55ef8c92bcad4dd3f978b26d272013642b029425775f5bad1009fe7b2
PKG_DESCR:= netfilter firewalling software
PKG_SECTION:= net/firewall
PKG_DEPENDS:= libnetfilter_conntrack libmnl libnfnetlink
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index e0c6e9199..3c876be2c 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXt
-PKG_VERSION:= 1.1.5
+PKG_VERSION:= 1.3.1
PKG_RELEASE:= 1
-PKG_HASH:= b59bee38a9935565fa49dc1bfe84cb30173e2e07e1dcdf801430d4b54eb0caa3
+PKG_HASH:= cf2212189869adb94ffd58c7d9a545a369b83d2274930bfbe148da354030b355
PKG_DESCR:= x toolkit intrinsics libraries
PKG_SECTION:= x11/libs
PKG_DEPENDS:= libsm libice libuuid libx11 libxau libxdmcp libxcb
@@ -24,7 +24,6 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call HOST_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-AUTOTOOL_STYLE:= autoreconf
HOST_STYLE:= auto
CONFIGURE_ENV+= CFLAGS_FOR_BUILD="$(HOST_CPPFLAGS) $(HOST_CFLAGS)"
CONFIGURE_ARGS+= --disable-malloc0returnsnull
diff --git a/package/libXt/patches/patch-util_Makefile_am b/package/libXt/patches/patch-util_Makefile_am
deleted file mode 100644
index a97bc50dd..000000000
--- a/package/libXt/patches/patch-util_Makefile_am
+++ /dev/null
@@ -1,10 +0,0 @@
---- libXt-1.1.3.orig/util/Makefile.am 2012-03-16 06:52:08.000000000 +0100
-+++ libXt-1.1.3/util/Makefile.am 2014-01-07 13:22:11.833722316 +0100
-@@ -10,7 +10,6 @@ EXTRA_DIST = \
- StrDefs.ht \
- string.list
-
--AM_CFLAGS = $(XT_CFLAGS)
- makestrs_SOURCES = makestrs.c
-
-
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
deleted file mode 100644
index 276b63eaa..000000000
--- a/package/linux-atm/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${ADK_TOPDIR}/rules.mk
-
-PKG_NAME:= linux-atm
-PKG_VERSION:= 2.5.2
-PKG_RELEASE:= 1
-PKG_HASH:= 9645481a2b16476b59220aa2d6bc5bc41043f291326c9b37581018fbd16dd53a
-PKG_DESCR:= atm library
-PKG_SECTION:= libs/net
-PKG_BUILDDEP:= flex-host bison-host
-PKG_URL:= http://linux-atm.sourceforge.net/
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-atm/}
-PKG_NOPARALLEL:= 1
-PKG_LIBNAME:= libatm
-PKG_OPTS:= dev
-
-DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-PKG_SUBPKGS:= LIBATM BR2684CTL
-PKGSD_BR2684CTL:= br2684ctl ATM utility
-PKGSS_BR2684CTL:= libatm
-PKGSC_BR2684CTL:= net/route
-
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,LIBATM,libatm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,BR2684CTL,br2684ctl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BR2684CTL},${PKGSD_BR2684CTL},${PKGSC_BR2684CTL}))
-
-libatm-install:
- ${INSTALL_DIR} ${IDIR_LIBATM}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libatm.so* ${IDIR_LIBATM}/usr/lib
-
-br2684ctl-install:
- ${INSTALL_DIR} ${IDIR_BR2684CTL}/usr/sbin
- ${CP} ${WRKINST}/usr/sbin/br2684ctl ${IDIR_BR2684CTL}/usr/sbin
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/linux-atm/files/br2684.hotplug b/package/linux-atm/files/br2684.hotplug
deleted file mode 100644
index 242e7e515..000000000
--- a/package/linux-atm/files/br2684.hotplug
+++ /dev/null
@@ -1,19 +0,0 @@
-[ "${INTERFACE%%[0-9]*}" = "atm" ] && {
- case "$ACTION" in
- register)
- [ "$pppoe_atm" = 1 ] && {
- case "$atm_encaps" in
- 0|vc) ENCAPS=0 ;;
- 1|llc) ENCAPS=1 ;;
- *) ENCAPS=0 ;;
- esac
- insmod br2684 2>&- >&-
- br2684ctl -c0 -e${ENCAPS} -a${atm_vpi:-8}.${atm_vci:-35} &
- }
- ;;
- unregister)
- killall br2684ctl 2>&- >&-
- rmmod br2684
- ;;
- esac
-}
diff --git a/package/linux-atm/patches/patch-src_Makefile_am b/package/linux-atm/patches/patch-src_Makefile_am
deleted file mode 100644
index 378b4ca16..000000000
--- a/package/linux-atm/patches/patch-src_Makefile_am
+++ /dev/null
@@ -1,7 +0,0 @@
---- linux-atm-2.5.1.orig/src/Makefile.am 2009-08-03 22:36:56.000000000 +0200
-+++ linux-atm-2.5.1/src/Makefile.am 2020-09-14 15:09:51.650818873 +0200
-@@ -1,3 +1 @@
--SUBDIRS = include lib test debug qgen q2931 saal sigd maint arpd ilmid man led lane \
-- mpoad oamd switch config extra br2684
--
-+SUBDIRS = include lib br2684ctl
diff --git a/package/linux-atm/patches/patch-src_Makefile_in b/package/linux-atm/patches/patch-src_Makefile_in
deleted file mode 100644
index 17a162daa..000000000
--- a/package/linux-atm/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-atm-2.5.2.orig/src/Makefile.in 2010-12-28 17:06:09.000000000 +0100
-+++ linux-atm-2.5.2/src/Makefile.in 2020-09-14 15:27:36.454621754 +0200
-@@ -215,7 +215,7 @@ target_vendor = @target_vendor@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = include lib test debug qgen q2931 saal sigd maint arpd ilmid man led lane \
-+SUBDIRS = include lib debug qgen q2931 saal sigd ilmid led lane \
- mpoad oamd switch config extra br2684
-
- all: all-recursive
diff --git a/package/linux-atm/patches/patch-src_sigd_Makefile_in b/package/linux-atm/patches/patch-src_sigd_Makefile_in
deleted file mode 100644
index 62f0e5424..000000000
--- a/package/linux-atm/patches/patch-src_sigd_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-atm-2.5.2.orig/src/sigd/Makefile.in 2010-12-28 17:06:11.000000000 +0100
-+++ linux-atm-2.5.2/src/sigd/Makefile.in 2020-09-14 15:22:00.557233015 +0200
-@@ -245,7 +245,7 @@ atmsigd_XTRAS = mess.o $(top_builddir)/s
- $(top_builddir)/src/lib/libatm.la \
- $(top_builddir)/src/saal/libsaal.a
-
--atmsigd_LDADD = $(atmsigd_XTRAS) -lfl
-+atmsigd_LDADD = $(atmsigd_XTRAS)
- atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS)
- CLEANFILES = mess.c
- sysconf_DATA = atmsigd.conf
diff --git a/package/linux-atm/patches/patch-src_sigd_cfg_l_l b/package/linux-atm/patches/patch-src_sigd_cfg_l_l
deleted file mode 100644
index 38bde1e58..000000000
--- a/package/linux-atm/patches/patch-src_sigd_cfg_l_l
+++ /dev/null
@@ -1,10 +0,0 @@
---- linux-atm-2.5.1.orig/src/sigd/cfg_l.l 2004-09-25 13:25:48.000000000 +0200
-+++ linux-atm-2.5.1/src/sigd/cfg_l.l 2009-12-17 16:26:08.528422011 +0100
-@@ -16,6 +16,7 @@
-
- #include "cfg_y.h"
-
-+int yywrap(void) { return 1; }
-
- static int lineno = 1;
- static int token; /* f@#%ing flex doesn't grok return after BEGIN */
diff --git a/package/linux-atm/patches/patch-src_switch_Makefile_in b/package/linux-atm/patches/patch-src_switch_Makefile_in
deleted file mode 100644
index 0aabc8b69..000000000
--- a/package/linux-atm/patches/patch-src_switch_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-atm-2.5.2.orig/src/switch/Makefile.in 2010-12-28 17:06:11.000000000 +0100
-+++ linux-atm-2.5.2/src/switch/Makefile.in 2020-09-14 15:22:00.585234798 +0200
-@@ -250,7 +250,7 @@ target_vendor = @target_vendor@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = . debug tcp
-+SUBDIRS = . tcp
- noinst_LIBRARIES = libsw.a
- swc_SOURCES = swc.c swc.h
- swc_LDADD = $(top_builddir)/src/lib/libatm.la
diff --git a/package/linux-atm/patches/patch-src_switch_cfg_l_l b/package/linux-atm/patches/patch-src_switch_cfg_l_l
deleted file mode 100644
index ec00bc66b..000000000
--- a/package/linux-atm/patches/patch-src_switch_cfg_l_l
+++ /dev/null
@@ -1,10 +0,0 @@
---- linux-atm-2.5.1.orig/src/switch/cfg_l.l 2001-10-10 00:33:08.000000000 +0200
-+++ linux-atm-2.5.1/src/switch/cfg_l.l 2009-12-17 16:37:59.408538574 +0100
-@@ -15,6 +15,7 @@
-
- #include "cfg_y.h"
-
-+int yywrap(void) { return 1; }
-
- static int lineno = 1;
- static int token; /* f@#%ing flex doesn't grok return after BEGIN */
diff --git a/package/linux-atm/patches/patch-src_switch_debug_Makefile_in b/package/linux-atm/patches/patch-src_switch_debug_Makefile_in
deleted file mode 100644
index b7e08da25..000000000
--- a/package/linux-atm/patches/patch-src_switch_debug_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-atm-2.5.2.orig/src/switch/debug/Makefile.in 2010-12-28 17:06:11.000000000 +0100
-+++ linux-atm-2.5.2/src/switch/debug/Makefile.in 2020-09-14 15:22:00.573234034 +0200
-@@ -200,7 +200,7 @@ sw_debug_SOURCES = debug.c
- sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \
- $(top_builddir)/src/lib/libatm.la
-
--sw_debug_LDADD = $(sw_debug_XTRAS) -lfl
-+sw_debug_LDADD = $(sw_debug_XTRAS)
- sw_debug_DEPENDENCIES = $(sw_debug_XTRAS)
- EXTRA_DIST = demo README
- all: all-am
diff --git a/package/linux-atm/patches/patch-src_switch_tcp_Makefile_in b/package/linux-atm/patches/patch-src_switch_tcp_Makefile_in
deleted file mode 100644
index 04113eee1..000000000
--- a/package/linux-atm/patches/patch-src_switch_tcp_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-atm-2.5.2.orig/src/switch/tcp/Makefile.in 2010-12-28 17:06:11.000000000 +0100
-+++ linux-atm-2.5.2/src/switch/tcp/Makefile.in 2020-09-14 15:22:00.593235307 +0200
-@@ -200,7 +200,7 @@ sw_tcp_SOURCES = tcpsw.c
- sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \
- $(top_builddir)/src/lib/libatm.la
-
--sw_tcp_LDADD = $(sw_tcp_XTRAS) -lfl
-+sw_tcp_LDADD = $(sw_tcp_XTRAS)
- sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS)
- EXTRA_DIST = mkfiles README
- all: all-am
diff --git a/package/readline/Makefile b/package/readline/Makefile
index 8ac34cceb..d475f6c8d 100644
--- a/package/readline/Makefile
+++ b/package/readline/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= readline
-PKG_VERSION:= 8.1
+PKG_VERSION:= 8.2
PKG_RELEASE:= 1
-PKG_HASH:= f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02
+PKG_HASH:= 3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35
PKG_DESCR:= command line editing library
PKG_SECTION:= libs/misc
PKG_DEPENDS:= libncurses
diff --git a/package/toybox/Makefile b/package/toybox/Makefile
index c32c3aac5..9ab6d4d91 100644
--- a/package/toybox/Makefile
+++ b/package/toybox/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= toybox
-PKG_VERSION:= 0.8.3
+PKG_VERSION:= 0.8.12
PKG_RELEASE:= 1
-PKG_HASH:= eab28fd29d19d4e61ef09704e5871940e6f35fd35a3bb1285e41f204504b5c01
+PKG_HASH:= ad88a921133ae2231d9f2df875ec0bd42af4429145caea7d7db9e02208a6fd2e
PKG_DESCR:= linux tools collection
PKG_SECTION:= base/apps
PKG_URL:= http://landley.net/toybox/
@@ -24,6 +24,8 @@ XAKE_FLAGS+= CC="gcc" V=1 PREFIX="$(WRKINST)"
do-configure:
-rm $(WRKBUILD)/toys/other/swap*.c
+ -rm $(WRKBUILD)/toys/posix/getconf.c
+ -rm $(WRKBUILD)/toys/posix/iconv.c
cd $(WRKBUILD); CC="gcc" PATH='$(HOST_PATH)' $(MAKE) defconfig
toybox-install: