summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/dropbear/Makefile4
-rw-r--r--package/dropbear/patches/patch-src_svr-main_c16
-rw-r--r--package/dropbear/patches/patch-svr-main_c15
-rw-r--r--package/gdb/Makefile4
-rw-r--r--package/gdbserver/Makefile2
-rw-r--r--package/libffi/Makefile4
-rw-r--r--package/lynx/Makefile45
-rw-r--r--package/mosh/Makefile14
-rw-r--r--package/openocd/Makefile4
-rw-r--r--package/python3/Makefile17
-rw-r--r--package/uclibc-ng-test/Makefile4
11 files changed, 83 insertions, 46 deletions
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index fa8eecf66..e432de66e 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= dropbear
-PKG_VERSION:= 2024.84
+PKG_VERSION:= 2024.85
PKG_RELEASE:= 1
-PKG_HASH:= 16e22b66b333d6b7e504c43679d04ed6ca30f2838db40a21f935c850dfc01009
+PKG_HASH:= 86b036c433a69d89ce51ebae335d65c47738ccf90d13e5eb0fea832e556da502
PKG_DESCR:= ssh server/client designed for embedded systems
PKG_SECTION:= net/security
PKG_URL:= http://matt.ucc.asn.au/dropbear/
diff --git a/package/dropbear/patches/patch-src_svr-main_c b/package/dropbear/patches/patch-src_svr-main_c
new file mode 100644
index 000000000..f6f935004
--- /dev/null
+++ b/package/dropbear/patches/patch-src_svr-main_c
@@ -0,0 +1,16 @@
+--- dropbear-2024.85.orig/src/svr-main.c 2024-04-25 16:30:00.000000000 +0200
++++ dropbear-2024.85/src/svr-main.c 2024-05-07 14:35:09.650486568 +0200
+@@ -305,8 +305,13 @@ static void main_noinetd(int argc, char
+ #if DEBUG_NOFORK
+ fork_ret = 0;
+ #else
++#if DROPBEAR_VFORK
++ fork_ret = vfork();
++#else
++
+ fork_ret = fork();
+ #endif
++#endif
+ if (fork_ret < 0) {
+ dropbear_log(LOG_WARNING, "Error forking: %s", strerror(errno));
+ goto out;
diff --git a/package/dropbear/patches/patch-svr-main_c b/package/dropbear/patches/patch-svr-main_c
deleted file mode 100644
index b2d4007b8..000000000
--- a/package/dropbear/patches/patch-svr-main_c
+++ /dev/null
@@ -1,15 +0,0 @@
---- dropbear-2020.81.orig/svr-main.c 2020-10-29 14:35:50.000000000 +0100
-+++ dropbear-2020.81/svr-main.c 2020-11-04 05:04:33.736369225 +0100
-@@ -278,8 +278,12 @@ static void main_noinetd() {
- #if DEBUG_NOFORK
- fork_ret = 0;
- #else
-+#if DROPBEAR_VFORK
-+ fork_ret = vfork();
-+#else
- fork_ret = fork();
- #endif
-+#endif
- if (fork_ret < 0) {
- dropbear_log(LOG_WARNING, "Error forking: %s", strerror(errno));
- goto out;
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index e4cbe89a9..d9e4b91f5 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -14,13 +14,13 @@ PKG_DEPENDS:= libncurses libreadline zlib libexpat libthread-db libgmp mpfr
PKG_BUILDDEP:= ncurses readline expat zlib gmp mpfr
PKG_NEEDS:= c++
-PKG_ARCH_DEPENDS:= !cris !avr32 !microblaze
+PKG_ARCH_DEPENDS:= !cris !avr32 !microblaze !nds32
include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-XAKE_FLAGS+= MAKEINFO=true
+XAKE_FLAGS+= MAKEINFO=true V=1
WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 7238eb306..5eb676517 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -15,7 +15,7 @@ PKG_DEPENDS:= libthread-db libgmp
PKG_BUILDDEP:= gmp
PKG_LIBC_DEPENDS:= !musl
-PKG_ARCH_DEPENDS:= !microblaze
+PKG_ARCH_DEPENDS:= !microblaze !nds32
ifeq ($(ADK_TOOLCHAIN_GDB_6_7_1),y)
DISTFILES:= gdb-6.7.1-avr32-2.1.5.tar.bz2
diff --git a/package/libffi/Makefile b/package/libffi/Makefile
index 80857706b..c6cfe64e9 100644
--- a/package/libffi/Makefile
+++ b/package/libffi/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= libffi
-PKG_VERSION:= 3.4.4
+PKG_VERSION:= 3.4.6
PKG_RELEASE:= 1
-PKG_HASH:= d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676
+PKG_HASH:= b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e
PKG_DESCR:= foreign function interface library
PKG_SECTION:= libs/misc
HOST_BUILDDEP:= libtool-host
diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index f5488dc1f..945096303 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -4,13 +4,13 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= lynx
-PKG_VERSION:= 2.9.0
+PKG_VERSION:= 2.9.1
PKG_RELEASE:= 1
-PKG_HASH:= 746c926e28d50571a42d2477f9c50784b27fc8cba4c7db7f3e6c9e00dde89070
+PKG_HASH:= 085fb3924b8684485c6be1b1ca745417da6ace768f94428ead95caf9dd8b56b7
PKG_DESCR:= text browser
PKG_SECTION:= app/browser
-PKG_DEPENDS:= libncurses zlib libressl
-PKG_BUILDDEP:= ncurses zlib libressl
+PKG_DEPENDS:= libncurses zlib
+PKG_BUILDDEP:= ncurses zlib
PKG_URL:= https://lynx.invisible-island.net/
PKG_SITES:= https://invisible-island.net/archives/lynx/tarballs/
PKG_NOPARALLEL:= 1
@@ -18,13 +18,42 @@ PKG_NOPARALLEL:= 1
DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/$(PKG_NAME)$(PKG_VERSION)
+PKG_CHOICES_LYNX:= WITH_LIBRESSL WITH_OPENSSL WITH_GNUTLS WITHOUT_SSL
+PKGCD_WITH_LIBRESSL:= use libressl for crypto
+PKGCS_WITH_LIBRESSL:= libressl ca-certificates
+PKGCB_WITH_LIBRESSL:= libressl
+PKGCD_WITH_OPENSSL:= use libopenssl for crypto
+PKGCS_WITH_OPENSSL:= libopenssl ca-certificates
+PKGCB_WITH_OPENSSL:= openssl
+PKGCD_WITH_GNUTLS:= use gnutls for crypto
+PKGCS_WITH_GNUTLS:= libgnutls ca-certificates
+PKGCB_WITH_GNUTLS:= gnutls
+PKGCD_WITHOUT_SSL:= use no ssl
+
include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/include/openssl
-TARGET_CPPFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
-HOST_CFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
+#TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/include/openssl
+#TARGET_CPPFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
+#HOST_CFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
+
+ifeq (${ADK_PACKAGE_LYNX_WITH_LIBRESSL},y)
+CONFIGURE_ARGS+= --with-ssl="${STAGING_TARGET_DIR}/usr" \
+ --without-gnutls
+endif
+ifeq (${ADK_PACKAGE_LYNX_WITH_OPENSSL},y)
+CONFIGURE_ARGS+= --with-ssl="${STAGING_TARGET_DIR}/usr" \
+ --without-gnutls
+endif
+ifeq (${ADK_PACKAGE_LYNX_WITH_GNUTLS},y)
+CONFIGURE_ARGS+= --with-gnutls="${STAGING_TARGET_DIR}/usr" \
+ --without-ssl
+endif
+ifeq (${ADK_PACKAGE_LYNX_WITHOUT_SSL},y)
+CONFIGURE_ARGS+= --without-ssl \
+ --without-gnutls
+endif
CONFIGURE_ENV+= ac_cv_path_TELNET=telnet \
ac_cv_path_TN3270=tn3270 \
@@ -43,7 +72,6 @@ CONFIGURE_ENV+= ac_cv_path_TELNET=telnet \
ac_cv_path_NCURSES_CONFIG=${STAGING_TARGET_DIR}/usr/bin/ncurses5-config
CONFIGURE_ARGS+= --disable-warnings \
- --without-gnutls \
--without-socks \
--without-socks5 \
--enable-addrlist-page \
@@ -60,7 +88,6 @@ CONFIGURE_ARGS+= --disable-warnings \
--without-bzlib \
--without-x \
--with-zlib=${STAGING_TARGET_DIR}/usr \
- --with-ssl=${STAGING_TARGET_DIR}/usr \
--with-curses-dir=${STAGING_TARGET_DIR}/usr \
--disable-full-paths \
--with-cfg-file=/etc/lynx.cfg \
diff --git a/package/mosh/Makefile b/package/mosh/Makefile
index dc18e02bd..c156cb863 100644
--- a/package/mosh/Makefile
+++ b/package/mosh/Makefile
@@ -4,26 +4,30 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= mosh
-PKG_VERSION:= 1.3.2
+PKG_VERSION:= 1.4.0
PKG_RELEASE:= 1
-PKG_HASH:= da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216
+PKG_HASH:= ae581fbddf038730af9eee4d319a483288395a0722d0c94c7efb7fdbdbb0dbac
PKG_DESCR:= mobile shell
PKG_SECTION:= net/security
-PKG_DEPENDS:= zlib ncurses libressl perl
+PKG_DEPENDS:= zlib libncurses libressl perl protobuf
PKG_BUILDDEP:= protobuf-host protobuf zlib ncurses libressl
PKG_NEEDS:= c++
PKG_URL:= https://mosh.org/
-PKG_SITES:= https://mosh.org/
+PKG_SITES:= https://github.com/mobile-shell/mosh/archive/refs/tags/
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,MOSH,mosh,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+AUTOTOOL_STYLE:= autogen
+
mosh-install:
$(INSTALL_DIR) $(IDIR_MOSH)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/mosh \
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/mosh* \
$(IDIR_MOSH)/usr/bin
include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/openocd/Makefile b/package/openocd/Makefile
index 689df4011..078353c39 100644
--- a/package/openocd/Makefile
+++ b/package/openocd/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= openocd
-PKG_VERSION:= 0.11.0
+PKG_VERSION:= 0.12.0
PKG_RELEASE:= 1
-PKG_HASH:= 43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d
+PKG_HASH:= af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afa
PKG_DESCR:= jtag flash and debugging utility
PKG_SECTION:= dev/tools
HOST_BUILDDEP:= libusb-host
diff --git a/package/python3/Makefile b/package/python3/Makefile
index 060ca4003..3d8761af2 100644
--- a/package/python3/Makefile
+++ b/package/python3/Makefile
@@ -17,7 +17,7 @@ PKG_URL:= http://www.python.org/
PKG_SITES:= http://legacy.python.org/ftp/python/${PKG_VERSION}/
PKG_FLAVOURS_PYTHON3:= MOD_ZLIB MOD_BZ2 MOD_SQLITE MOD_GDBM
-PKG_FLAVOURS_PYTHON3+= MOD_NCURSES MOD_SSL MOD_READLINE
+PKG_FLAVOURS_PYTHON3+= MOD_NCURSES MOD_LIBRESSL MOD_OPENSSL MOD_READLINE
PKGFD_MOD_ZLIB:= zlib support
PKGFB_MOD_ZLIB:= zlib
@@ -37,9 +37,12 @@ PKGFS_MOD_NCURSES:= libncurses
PKGFD_MOD_READLINE:= readline support
PKGFB_MOD_READLINE:= readline
PKGFS_MOD_READLINE:= libreadline
-PKGFD_MOD_SSL:= ssl support
-PKGFB_MOD_SSL:= libressl
-PKGFS_MOD_SSL:= libressl
+PKGFD_MOD_LIBRESSL:= libressl support
+PKGFB_MOD_LIBRESSL:= libressl
+PKGFS_MOD_LIBRESSL:= libressl
+PKGFD_MOD_OPENSSL:= openssl support
+PKGFB_MOD_OPENSSL:= openssl
+PKGFS_MOD_OPENSSL:= libopenssl
DISTFILES:= Python-${PKG_VERSION}.tar.xz
WRKDIST= ${WRKDIR}/Python-${PKG_VERSION}
@@ -67,7 +70,8 @@ $(eval $(call PKG_template,PYTHON3_MOD_BZ2,python3-mod-bz2,$(PKG_VERSION)-${PKG_
$(eval $(call PKG_template,PYTHON3_MOD_SQLITE,python3-mod-sqlite,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_SQLITE},${PKGFD_MOD_SQLITE},${PKG_SECTION}))
$(eval $(call PKG_template,PYTHON3_MOD_GDBM,python3-mod-gdbm,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_GDBM},${PKGFD_MOD_GDBM},${PKG_SECTION}))
$(eval $(call PKG_template,PYTHON3_MOD_NCURSES,python3-mod-ncurses,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_NCURSES},${PKGFD_MOD_NCURSES},${PKG_SECTION}))
-$(eval $(call PKG_template,PYTHON3_MOD_SSL,python3-mod-ssl,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_SSL},${PKGFD_MOD_SSL},${PKG_SECTION}))
+$(eval $(call PKG_template,PYTHON3_MOD_LIBRESSL,python3-mod-libressl,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_LIBRESSL},${PKGFD_MOD_LIBRESSL},${PKG_SECTION}))
+$(eval $(call PKG_template,PYTHON3_MOD_OPENSSL,python3-mod-openssl,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_OPENSSL},${PKGFD_MOD_OPENSSL},${PKG_SECTION}))
$(eval $(call PKG_template,PYTHON3_MOD_READLINE,python3-mod-readline,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_READLINE},${PKGFD_MOD_READLINE},${PKG_SECTION}))
$(eval $(call PKG_mod_template,PYTHON3_MOD_ZLIB,zlib))
@@ -75,7 +79,8 @@ $(eval $(call PKG_mod_template,PYTHON3_MOD_BZ2,_bz2))
$(eval $(call PKG_mod_template,PYTHON3_MOD_SQLITE,_sqlite))
$(eval $(call PKG_mod_template,PYTHON3_MOD_GDBM,_gdbm))
$(eval $(call PKG_mod_template,PYTHON3_MOD_NCURSES,_curses))
-$(eval $(call PKG_mod_template,PYTHON3_MOD_SSL,_ssl))
+$(eval $(call PKG_mod_template,PYTHON3_MOD_LIBRESSL,_ssl))
+$(eval $(call PKG_mod_template,PYTHON3_MOD_OPENSSL,_ssl))
$(eval $(call PKG_mod_template,PYTHON3_MOD_READLINE,readline))
MAKE_ENV+= HOSTPGEN=$(STAGING_HOST_DIR)/usr/bin/pgen3
diff --git a/package/uclibc-ng-test/Makefile b/package/uclibc-ng-test/Makefile
index 44a7e9cde..ebc1f1b62 100644
--- a/package/uclibc-ng-test/Makefile
+++ b/package/uclibc-ng-test/Makefile
@@ -47,8 +47,8 @@ endif
ifeq ($(ADK_TARGET_ARCH_KVX),y)
XAKE_FLAGS+= NO_TLS=1
endif
-ifeq ($(ADK_TARGET_WITH_MMU),)
-XAKE_FLAGS+= NO_NPTL=1
+ifeq ($(ADK_TARGET_ARCH_NDS32),y)
+XAKE_FLAGS+= NO_TLS=1
endif
uclibc-ng-test-install:
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 15:13:33 +0000