diff options
Diffstat (limited to 'package')
513 files changed, 4210 insertions, 6202 deletions
diff --git a/package/ant/Makefile b/package/ant/Makefile deleted file mode 100644 index b9d989ac3..000000000 --- a/package/ant/Makefile +++ /dev/null @@ -1,46 +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:= ant -PKG_VERSION:= 1.8.4 -PKG_RELEASE:= 1 -PKG_HASH:= 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 -PKG_DESCR:= java code build utility -PKG_SECTION:= dev/tools -HOST_BUILDDEP:= gcj-host -PKG_SITES:= http://archive.apache.org/dist/ant/source/ - -PKG_CFLINE_ANT:= depends on ADK_HOST_ONLY - -DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 -WRKDIST= $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION) - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,ANT,ant,$(PKG_VERSION)-${PKG_RELEASE})) - -HOST_STYLE:= manual - -host-build: - if [ ! -f $(WRKBUILD)/lib/optional/junit-4.9b2.jar ];then \ - cd $(WRKBUILD)/lib/optional; wget http://distfiles.openadk.org/junit-4.9b2.jar; \ - fi - cp $(DL_DIR)/ecj*.jar $(WRKBUILD)/lib/optional/ecj.jar - (cd ${WRKBUILD}; \ - export ANT_OPTS="-Xms256m -Xmx256m" ;\ - export JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ;\ - export CLASSPATH=$(STAGING_HOST_DIR)/usr/lib/jvm/lib/tools.jar ;\ - export JAVAC=$(STAGING_HOST_DIR)/usr/bin/ecj ;\ - export JAVACMD=$(STAGING_HOST_DIR)/usr/bin/gij ;\ - $(BASH) ./build.sh) - -ant-hostinstall: - cd $(WRKBUILD)/dist; \ - $(CP) bin/* $(STAGING_HOST_DIR)/usr/bin ; \ - $(CP) lib/* $(STAGING_HOST_DIR)/usr/lib - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/apcupsd/Makefile b/package/apcupsd/Makefile new file mode 100644 index 000000000..382f33e2d --- /dev/null +++ b/package/apcupsd/Makefile @@ -0,0 +1,44 @@ +# 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:= apcupsd +PKG_VERSION:= 3.14.14 +PKG_RELEASE:= 1 +PKG_HASH:= db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867 +PKG_DESCR:= APC UPS daemon with integrated tcp/ip remote shutdown +PKG_SECTION:= sys/misc +PKG_DEPENDS:= libusb +PKG_BUILDDEP:= libusb +PKG_KDEPENDS:= usb-hid usb-hiddev +PKG_URL:= http://www.apcupsd.org +PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=apcupsd/) +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +PKG_CFLINE_APCUPSD:= select BUSYBOX_WALL@ + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,APCUPSD,apcupsd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIGURE_ARGS+= --prefix="${WRKINST}" --sbindir="/usr/sbin" --enable-usb +CONFIGURE_ENV+= ac_cv_path_WALL=/usr/bin/wall +XAKE_FLAGS:= VERBOSE=1 STRIP="" LD="$(TARGET_CXX)" + +# XXX: custom init script? +apcupsd-install: + $(INSTALL_DIR) $(IDIR_APCUPSD)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/apc{access,test,upsd} \ + $(IDIR_APCUPSD)/usr/sbin + $(INSTALL_DIR) $(IDIR_APCUPSD)/etc + $(INSTALL_DATA) $(WRKINST)/etc/apcupsd.conf $(IDIR_APCUPSD)/etc + # default to USB-based UPS, avoid writing to /etc to keep cfgfs clean + $(SED) 's/^UPSCABLE smart/UPSCABLE usb/' \ + -e 's/^UPSTYPE apcsmart/UPSTYPE usb/' \ + -e 's,^DEVICE /dev/ttyS0,DEVICE,' \ + -e 's,^PWRFAILDIR /etc,PWRFAILDIR /tmp,' \ + $(IDIR_APCUPSD)/etc/apcupsd.conf + $(INSTALL_BIN) ./files/apccontrol $(IDIR_APCUPSD)/etc/ + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/apcupsd/files/apccontrol b/package/apcupsd/files/apccontrol new file mode 100644 index 000000000..e402c513d --- /dev/null +++ b/package/apcupsd/files/apccontrol @@ -0,0 +1,74 @@ +#!/bin/sh +# +# A custom apccontrol for use in embedded systems: just make sure there's no +# data in-flight and wait for the blackout to shut us down. + +# these filesystems are not relevant +IGNORE_FS="tmpfs proc sysfs devtmpfs devpts nfsd" + +get_rw_mounts() { + local excl='\((ro,\|type \(' + local sep="" + for fs in $IGNORE_FS; do + excl+="${sep}$fs" + sep='\|' + done + excl+='\)\)' + mount | grep -v "$excl" | while read dev on mnt opts; do + echo "$mnt" + done +} + +log() { + logger -s -t "$(basename $0)" -p daemon.crit "$*" +} +__mount() { # (ro/rw, txt, mnt) + local opt=$1 + local txt=$2 + local mnt="$3" + + mount -o remount,$opt "$mnt" + rc=$? + case $rc in + 0) log "remounted $mnt $txt" + *) log "failed to remount $mnt $txt: rc=$rc" + esac + return $rc +} +mount_ro() { + __mount ro read-only "$1" +} +mount_rw() { + __mount rw read-write "$1" +} + +romounts="/tmp/apcupsd.romounts" + +case "$1" in + emergency|failing) + log "UPS error condition happening" + ;& # fall through + doshutdown) + log "bracing for upcoming blackout" + + rm -f "$romounts" + sync + get_rw_mounts | while read mnt; do + mount_ro "$mnt" && echo "$mnt" >>"$romounts" + done + ;; + mainsback) + log "returning to routine after near blackout" + + touch "$romounts" + while read mnt; do + mount_rw "$mnt" + done <"$romounts" + rm "$romounts" + ;; + *) + log "Called for $1" + ;; +esac + +exit 0 diff --git a/package/apcupsd/files/apcupsd.conffiles b/package/apcupsd/files/apcupsd.conffiles new file mode 100644 index 000000000..7bae4c961 --- /dev/null +++ b/package/apcupsd/files/apcupsd.conffiles @@ -0,0 +1 @@ +/etc/apcupsd.conf diff --git a/package/apcupsd/files/apcupsd.init b/package/apcupsd/files/apcupsd.init new file mode 100644 index 000000000..a9817f1be --- /dev/null +++ b/package/apcupsd/files/apcupsd.init @@ -0,0 +1,38 @@ +#!/bin/sh +#PKG apcupsd +#INIT 15 +. /etc/rc.conf + +pidfile=$(echo "$apcupsd_flags" | \ + sed -n 's/.*\(-P\|--pid-file\) \([^ ]\+\).*/\2/p') +[ "$pidfile" ] || pidfile="/var/run/apcupsd.pid" + +case $1 in +autostop) ;; +autostart) + test x"${apcupsd:-NO}" = x"NO" && exit 0 + test x"$apcupsd" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start + exec sh $0 start + ;; +start) + mkdir -p /var/lock + /usr/sbin/apcupsd $apcupsd_flags + ;; +stop) + if [ -f "$pidfile" ]; then + kill $(<$pidfile) + rm -f $pidfile + else + kill $(pgrep -f /usr/sbin/apcupsd) + fi + ;; +restart) + sh $0 stop + sleep 1 + sh $0 start + ;; +*) + echo "usage: $0 (start | stop | restart)" + exit 1 +esac +exit $? diff --git a/package/apcupsd/files/apcupsd.postinst b/package/apcupsd/files/apcupsd.postinst new file mode 100644 index 000000000..299fabc0f --- /dev/null +++ b/package/apcupsd/files/apcupsd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf apcupsd NO diff --git a/package/apex/Makefile b/package/apex/Makefile new file mode 100644 index 000000000..7d2b79ea9 --- /dev/null +++ b/package/apex/Makefile @@ -0,0 +1,46 @@ +# 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:= apex +PKG_VERSION:= main +PKG_GIT:= branch +PKG_HASH:= d6c17d16012bc71989c2d608436c1954b27588510d5af69da7f5d5c04ef417aa +PKG_RELEASE:= 1 +PKG_DESCR:= bootloader for ixp4xx devices +PKG_SECTION:= base/boot +PKG_SITES:= https://github.com/linusw/apex.git + +PKG_SYSTEM_DEPENDS:= linksys-nslu2 + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,APEX,apex,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +TARGET_LDFLAGS:= + +do-configure: + (cd $(WRKBUILD) && PATH='$(HOST_PATH)' ARCH=arm $(MAKE) openwrt-nslu2-armeb_config ) + +do-build: + (cd $(WRKBUILD) && env \ + PATH='$(HOST_PATH)' \ + CROSS_COMPILE='$(TARGET_CROSS)' \ + KBUILD_HAVE_NLS=no \ + V=1 \ + ARCH=arm \ + $(MAKE) all) + +apex-install: + $(CP) $(WRKBUILD)/src/arch-arm/rom/apex.bin $(FW_DIR) + +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/apex/patches/patch-src_mach-ixp42x_openwrt-nslu2-armeb_config b/package/apex/patches/patch-src_mach-ixp42x_openwrt-nslu2-armeb_config new file mode 100644 index 000000000..fe182278c --- /dev/null +++ b/package/apex/patches/patch-src_mach-ixp42x_openwrt-nslu2-armeb_config @@ -0,0 +1,13 @@ +--- apex-main.orig/src/mach-ixp42x/openwrt-nslu2-armeb_config 2025-04-07 09:10:43.000000000 +0200 ++++ apex-main/src/mach-ixp42x/openwrt-nslu2-armeb_config 2025-04-08 20:18:52.524389031 +0200 +@@ -19,8 +19,8 @@ CONFIG_EXPERIMENTAL=y + # + # General Setup + # +-CONFIG_TARGET_DESCRIPTION="OpenWrt NSLU2/BE (8MiB Flash)" +-CONFIG_CROSS_COMPILE="armeb-openwrt-linux-" ++CONFIG_TARGET_DESCRIPTION="OpenADK NSLU2/BE (8MiB Flash)" ++CONFIG_CROSS_COMPILE="armeb-openadk-linux-" + CONFIG_AEABI=y + # CONFIG_DRIVER_LONG_LONG_SIZE is not set + CONFIG_CC_OPTIMIZE_FOR_SIZE=y diff --git a/package/arm-trusted-firmware/Makefile b/package/arm-trusted-firmware/Makefile index 10bb72a25..17f59c444 100644 --- a/package/arm-trusted-firmware/Makefile +++ b/package/arm-trusted-firmware/Makefile @@ -11,6 +11,8 @@ PKG_DESCR:= ARM Trusted Firmware PKG_SECTION:= base/boot PKG_SITES:= https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git +PKG_ARCH_DEPENDS:= arm + include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,ARM_TRUSTED_FIRMWARE,arm-trusted-firmware,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index bfda5995d..ced4fbacc 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,19 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 20.7.0 +PKG_VERSION:= 22.3.0 PKG_RELEASE:= 1 -PKG_HASH:= 3d47889d2c4501974a8adaaba49738e6268a836dc177c7887a93a8ecf1d38b26 +PKG_HASH:= 9cd9a29db5ebff861431f85b317a1f8263d49587f596886df1fcd298bd545593 PKG_DESCR:= open source pbx PKG_SECTION:= net/voip -PKG_DEPENDS:= libncurses libcurl libressl libedit libuuid libjansson +PKG_DEPENDS:= libncurses libcurl libopenssl libedit libuuid libjansson PKG_DEPENDS+= libxml2 libsqlite libxslt -PKG_BUILDDEP:= ncurses zlib curl popt libressl libedit util-linux libjansson +PKG_BUILDDEP:= ncurses zlib curl popt openssl libedit util-linux libjansson PKG_BUILDDEP+= libxml2 sqlite libxslt PKG_NEEDS:= threads c++ PKG_URL:= http://www.asterisk.org/ PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/ -#PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -54,7 +53,6 @@ $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)- $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_RES_AGI},${PKG_SECTION})) CONFIGURE_ARGS= --with-z=${STAGING_TARGET_DIR}/usr \ - --with-ncurses=${STAGING_TARGET_DIR}/usr \ --with-libedit=${STAGING_TARGET_DIR}/usr \ --with-jansson=${STAGING_TARGET_DIR}/usr \ --with-ssl=${STAGING_TARGET_DIR}/usr \ @@ -62,17 +60,14 @@ CONFIGURE_ARGS= --with-z=${STAGING_TARGET_DIR}/usr \ --without-tonezone \ --without-asound \ --without-gtk2 \ - --without-h323 \ --without-iksemel \ --without-imap \ --without-netsnmp \ --without-newt \ - --without-openais \ --without-osptk \ - --without-oss \ --without-popt \ + --without-portaudio \ --without-pri \ - --without-pwlib \ --without-tds \ --without-postgres @@ -98,9 +93,9 @@ endif INSTALL_STYLE:= manual -TARGET_CFLAGS+= -fgnu89-inline TARGET_LDFLAGS+= -lm -ltinfo -ldl -lpthread -MAKE_ENV= ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \ +MAKE_ENV:= PATH="$(HOST_PATH)" \ + ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \ ASTLDFLAGS="${TARGET_LDFLAGS} -z muldefs" MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ OPTIMIZE="${TARGET_CFLAGS}" \ @@ -108,10 +103,10 @@ MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ ALL_TARGET:= all install samples pre-configure: - cd "$(WRKBUILD)/menuselect"; ./configure + cd "$(WRKBUILD)/menuselect"; PATH="$(HOST_PATH)" ./configure pre-build: - $(MAKE) -C $(WRKBUILD)/menuselect + PATH="$(HOST_PATH)" $(MAKE) -C $(WRKBUILD)/menuselect #post-build: # cd ${WRKBUILD}/sounds ; \ diff --git a/package/at-spi2-atk/Makefile b/package/at-spi2-atk/Makefile index fd87d5d70..41ca90494 100644 --- a/package/at-spi2-atk/Makefile +++ b/package/at-spi2-atk/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= at-spi2-atk -PKG_VERSION:= 2.15.3 -PKG_EXTRAVER:= 2.15 -PKG_RELEASE:= 2 -PKG_HASH:= eaef8fcf2775e35e1e054840940808775dfa9b71bcd7bda1dd6ecbdf5b1a9e18 +PKG_VERSION:= 2.38.0 +PKG_EXTRAVER:= 2.38 +PKG_RELEASE:= 1 +PKG_HASH:= cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f PKG_DESCR:= d-bus based accessibility framework PKG_SECTION:= libs/misc PKG_DEPENDS:= glib libxtst -PKG_BUILDDEP:= glib libXtst +PKG_BUILDDEP:= meson-host glib libXtst PKG_URL:= http://www.gnome.org/ PKG_SITES:= $(MASTER_SITE_GNOME:=at-spi2-atk/$(PKG_EXTRAVER)/) PKG_OPTS:= dev @@ -20,6 +20,12 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,AT_SPI2_ATK,at-spi2-atk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + at-spi2-atk-install: $(INSTALL_DIR) $(IDIR_AT_SPI2_ATK)/usr/lib $(CP) $(WRKINST)/usr/lib/libat*.so* $(IDIR_AT_SPI2_ATK)/usr/lib diff --git a/package/at-spi2-core/Makefile b/package/at-spi2-core/Makefile index c6db623bf..29d2e40e9 100644 --- a/package/at-spi2-core/Makefile +++ b/package/at-spi2-core/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= at-spi2-core -PKG_VERSION:= 2.15.3 -PKG_EXTRAVER:= 2.15 +PKG_VERSION:= 2.56.0 +PKG_EXTRAVER:= 2.56 PKG_RELEASE:= 1 -PKG_HASH:= bae426d13d4a1ae3a35c6dd444e7fdef2159fbc9170eb39b6ae3213a27042d92 +PKG_HASH:= 80d7e8ea0be924e045525367f909d6668dfdd3e87cd40792c6cfd08e6b58e95c PKG_DESCR:= d-bus based accessibility framework PKG_SECTION:= libs/misc PKG_DEPENDS:= glib libxtst -PKG_BUILDDEP:= glib libXtst libSM intltool-host +PKG_BUILDDEP:= meson-host glib libXtst libSM intltool-host PKG_NEEDS:= intl PKG_URL:= http://www.gnome.org/ PKG_SITES:= $(MASTER_SITE_GNOME:=at-spi2-core/$(PKG_EXTRAVER)/) @@ -21,6 +21,12 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,AT_SPI2_CORE,at-spi2-core,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + at-spi2-core-install: $(INSTALL_DIR) $(IDIR_AT_SPI2_CORE)/usr/lib $(CP) $(WRKINST)/usr/lib/libat*.so* $(IDIR_AT_SPI2_CORE)/usr/lib diff --git a/package/atk/Makefile b/package/atk/Makefile deleted file mode 100644 index ad6335f1b..000000000 --- a/package/atk/Makefile +++ /dev/null @@ -1,35 +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:= atk -PKG_VERSION:= 2.36.0 -PKG_EXTRAVER:= 2.36 -PKG_RELEASE:= 1 -PKG_HASH:= fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 -PKG_DESCR:= accessibility toolkit library -PKG_SECTION:= libs/misc -PKG_BUILDDEP:= glib meson-host -PKG_URL:= http://www.gnome.org/ -PKG_SITES:= $(MASTER_SITE_GNOME:=atk/$(PKG_EXTRAVER)/) -PKG_LIBNAME:= libatk -PKG_OPTS:= dev - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,LIBATK,libatk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) - -WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj - -CONFIG_STYLE:= meson -BUILD_STYLE:= meson -INSTALL_STYLE:= meson - -MESON_FLAGS+= -Dintrospection=false - -libatk-install: - $(INSTALL_DIR) $(IDIR_LIBATK)/usr/lib - $(CP) $(WRKINST)/usr/lib/libatk-*.so* $(IDIR_LIBATK)/usr/lib - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/audit/Makefile b/package/audit/Makefile index 8f6eea1a0..105f30884 100644 --- a/package/audit/Makefile +++ b/package/audit/Makefile @@ -19,10 +19,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,AUDIT,audit,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -ifeq ($(OS_FOR_BUILD),Darwin) -HOST_CFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include -endif - CONFIGURE_ARGS+= --without-python \ --without-python3 \ --without-libcap-ng \ diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile index 874cb0617..e2d15cc67 100644 --- a/package/autoconf/Makefile +++ b/package/autoconf/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= autoconf -PKG_VERSION:= 2.69 +PKG_VERSION:= 2.72 PKG_RELEASE:= 1 -PKG_HASH:= 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 +PKG_HASH:= ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a PKG_DESCR:= automatically configure software source code packages PKG_SECTION:= dev/tools HOST_BUILDDEP:= m4-host diff --git a/package/autoconf/patches/patch-Makefile_in b/package/autoconf/patches/patch-Makefile_in deleted file mode 100644 index 502588165..000000000 --- a/package/autoconf/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- autoconf-2.69.orig/Makefile.in 2012-04-25 04:40:26.000000000 +0200 -+++ autoconf-2.69/Makefile.in 2015-12-06 17:42:13.000000000 +0100 -@@ -245,7 +245,7 @@ top_srcdir = @top_srcdir@ - # bin/ must be run first, as it builds executables needed for tests. - # autom4te uses autotest.m4f to generate `testsuite', so build tests last. - # Rules in man/ use scripts from both bin/ and tests/, so *it* goes last. --SUBDIRS = bin . lib doc tests man -+SUBDIRS = bin . lib - ACLOCAL_AMFLAGS = -I m4 - EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 ChangeLog.3 \ - BUGS COPYINGv3 COPYING.EXCEPTION \ diff --git a/package/barebox/Makefile b/package/barebox/Makefile index b4490f1d6..6a78a32c4 100644 --- a/package/barebox/Makefile +++ b/package/barebox/Makefile @@ -4,15 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= barebox -PKG_VERSION:= 2019.09.0 +PKG_VERSION:= 2025.03.0 PKG_RELEASE:= 1 -PKG_HASH:= beab6bdba2466bece57d23834daf4f0d530a594efc11ca0ddb69372981e6e159 +PKG_HASH:= 0bf7118004e445bdd57feeef89ee9064982acc221e8a046c4a7994d3da6da2ec PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot PKG_BUILDDEP:= lzop-host PKG_URL:= http://www.barebox.org PKG_SITES:= http://www.barebox.org/download/ +PKG_ARCH_DEPENDS:= aarch64 arm mips or1k ppc riscv32 riscv64 x86_64 + DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 include $(ADK_TOPDIR)/mk/package.mk @@ -25,15 +27,19 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual BAREBOX_ARCH:= $(ADK_TARGET_ARCH) -ifeq ($(ADK_TARGET_ARCH_X86),y) -CONFIG:= efi_defconfig -endif ifeq ($(ADK_TARGET_ARCH_X86_64),y) CONFIG:= efi_defconfig BAREBOX_ARCH:= x86 +BAREBOX:= barebox.efi endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS),y) +ifeq ($(ADK_TARGET_LITTLE_ENDIAN),y) +CONFIG:= qemu-maltael_defconfig +BAREBOX:= images/barebox-qemu-malta.img.swapped +else CONFIG:= qemu-malta_defconfig +BAREBOX:= images/barebox-qemu-malta.img +endif endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) CONFIG:= vexpress_ca9_defconfig @@ -53,6 +59,6 @@ do-build: $(MAKE)) barebox-install: - $(CP) $(WRKBUILD)/barebox.bin $(FW_DIR) + $(CP) $(WRKBUILD)/$(BAREBOX) $(FW_DIR) include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 9b3191ae7..0c7ce0b24 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -127,9 +127,6 @@ ifeq ($(ADK_TARGET_WITH_ROOT_RW),y) else echo 'export IPKGTMPDIR=/tmp' >> $(IDIR_BASE_FILES)/etc/profile endif -ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) - echo 'export LD_LIBRARY_PATH=/opt/vc/lib' >> $(IDIR_BASE_FILES)/etc/profile -endif endif ifeq (${ADK_TARGET_PACKAGE_IPKG},y) $(CP) ./files/ipkg.conf $(IDIR_BASE_FILES)/etc/ diff --git a/package/base-files/files/inittab.sysv b/package/base-files/files/inittab.sysv index f1fd8b126..a6684a4ea 100644 --- a/package/base-files/files/inittab.sysv +++ b/package/base-files/files/inittab.sysv @@ -1,5 +1,6 @@ null::sysinit:/bin/mount -t proc proc /proc null::sysinit:/bin/mount -t sysfs sys /sys +null::sysinit:/bin/mount -t devtmpfs devtmpfs /dev null::sysinit:/bin/mkdir -p /dev/pts null::sysinit:/bin/mkdir -p /dev/shm null::sysinit:/bin/mount -a -t devpts diff --git a/package/base-files/files/interfaces-dhcp b/package/base-files/files/interfaces-dhcp index 11174c152..652101214 100644 --- a/package/base-files/files/interfaces-dhcp +++ b/package/base-files/files/interfaces-dhcp @@ -22,6 +22,15 @@ iface eth0 inet dhcp # bridge-ports eth0 eth1 ## +## LACP configuration +#auto lacp0 +#iface lacp0 inet dhcp +# bond-ports eth0 eth1 +# bond-mode 802.3ad +# bond-miimon 100 +# bond-lacp-rate slow +# bond-xmit-hash-policy layer2+3 + ## pppoe configuration #auto ppp0 #iface ppp0 inet ppp @@ -55,4 +64,4 @@ iface eth0 inet dhcp # wireless-passphrase xxxxxxxx ## -# for more special cases see: http://www.openadk.org/doku.php?id=network +# for more special cases see: https://docs.openadk.org/html/manual.html#network-configuration diff --git a/package/base-files/files/rcdev.mdev b/package/base-files/files/rcdev.mdev index b8afd453c..93d678932 100644 --- a/package/base-files/files/rcdev.mdev +++ b/package/base-files/files/rcdev.mdev @@ -1,5 +1,5 @@ # remount /dev with smaller size -mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev +#mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev # start mdev dynamic device node management echo >/dev/mdev.seq @ADK_RUNTIME_DEV_MDEV_LOGGING@ diff --git a/package/base-files/src/etc/network/if-post-down.d/04-bonding b/package/base-files/src/etc/network/if-post-down.d/04-bonding new file mode 100755 index 000000000..0b9c9f362 --- /dev/null +++ b/package/base-files/src/etc/network/if-post-down.d/04-bonding @@ -0,0 +1,20 @@ +#!/bin/sh + +case "$IF_BOND_PORTS" in +"") + exit 0 + ;; +none) + INTERFACES="" + ;; +*) + INTERFACES="$IF_BOND_PORTS" + ;; +esac + +for IF in $INTERFACES; do + ip link set $IF nomaster + ip link set $IF down +done +ip link del $IFACE +exit 0 diff --git a/package/base-files/src/etc/network/if-pre-up.d/05-bonding b/package/base-files/src/etc/network/if-pre-up.d/05-bonding new file mode 100755 index 000000000..489a2fcad --- /dev/null +++ b/package/base-files/src/etc/network/if-pre-up.d/05-bonding @@ -0,0 +1,37 @@ +#!/bin/sh + +INTERFACES="" +BONDOPTS="" +for var in $(env | grep '^IF_BOND_'); do + val="${var#*=}" + opt="${var%%=*}" + if [ "$opt" == "IF_BOND_PORTS" ]; then + case "$val" in + none) + INTERFACES="" + ;; + *) + INTERFACES="$val" + ;; + esac + continue + fi + opt="$(tr '[A-Z]' '[a-z]' <<< ${opt#IF_BOND_})" + BONDOPTS+=" $opt" + [ -n "$val" ] && BONDOPTS+=" $val" +done + +[ -n "$INTERFACES" ] || exit 0 + +ip link add $IFACE type bond ${BONDOPTS} || exit 1 +for IF in $INTERFACES; do + if ! grep -q $IF /proc/net/dev; then + echo "Error: interface '$IF' does not exist!" + ip link del $IFACE + exit 1 + fi + ip link set $IF master $IFACE + ip link set $IF up +done + +exit 0 diff --git a/package/bash/Makefile b/package/bash/Makefile index bfed5373c..3d8acfc22 100644 --- a/package/bash/Makefile +++ b/package/bash/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bash -PKG_VERSION:= 5.2.21 +PKG_VERSION:= 5.2.37 PKG_RELEASE:= 1 -PKG_HASH:= c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8 +PKG_HASH:= 9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff PKG_DESCR:= bourne-again shell PKG_SECTION:= base/shells PKG_URL:= http://www.gnu.org/software/bash/ diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile index 83a594ad0..58ae843dc 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/package/bcm28xx-bootloader/Makefile @@ -66,7 +66,6 @@ ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_CUTDOWN),y) endif printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt -ifeq ($(ADK_PACKAGE_KODI),y) ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y) printf "dtoverlay=vc4-kms-v3d-pi4\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt @@ -75,7 +74,6 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI5),y) printf "dtoverlay=vc4-kms-v3d-pi5\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif -endif ifneq ($(ADK_TARGET_HARDWARE_HIFIBERRY_AMP),) printf "dtoverlay=hifiberry-amp\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt @@ -121,7 +119,7 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4),y) $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y) - printf "arm_control=0x200\n" >> \ + printf "arm_64bit=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "enable_uart=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt diff --git a/package/bcm28xx-bootloader/src/boot/bootcode.bin b/package/bcm28xx-bootloader/src/boot/bootcode.bin Binary files differindex 9e831a273..636933850 100644 --- a/package/bcm28xx-bootloader/src/boot/bootcode.bin +++ b/package/bcm28xx-bootloader/src/boot/bootcode.bin diff --git a/package/bcm28xx-bootloader/src/boot/fixup.dat b/package/bcm28xx-bootloader/src/boot/fixup.dat Binary files differindex 2ff966820..667cafba8 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4.dat b/package/bcm28xx-bootloader/src/boot/fixup4.dat Binary files differindex 4380d320e..9bf503434 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup4.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup4.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4cd.dat b/package/bcm28xx-bootloader/src/boot/fixup4cd.dat Binary files differindex 79a0b55e7..c0614cd5d 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup4cd.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup4cd.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4db.dat b/package/bcm28xx-bootloader/src/boot/fixup4db.dat Binary files differindex 4d13d6581..9ef1b932b 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup4db.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup4db.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4x.dat b/package/bcm28xx-bootloader/src/boot/fixup4x.dat Binary files differindex 4d8ff5a96..9c10b2d5e 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup4x.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup4x.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_cd.dat b/package/bcm28xx-bootloader/src/boot/fixup_cd.dat Binary files differindex 79a0b55e7..c0614cd5d 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_cd.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_cd.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_db.dat b/package/bcm28xx-bootloader/src/boot/fixup_db.dat Binary files differindex 3927ea52e..e695c9f9d 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_db.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_db.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_x.dat b/package/bcm28xx-bootloader/src/boot/fixup_x.dat Binary files differindex b93bc0620..ea04cdbdb 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_x.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_x.dat diff --git a/package/bcm28xx-bootloader/src/boot/start.elf b/package/bcm28xx-bootloader/src/boot/start.elf Binary files differindex f5d78d670..0af80e5cf 100644 --- a/package/bcm28xx-bootloader/src/boot/start.elf +++ b/package/bcm28xx-bootloader/src/boot/start.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4.elf b/package/bcm28xx-bootloader/src/boot/start4.elf Binary files differindex 300e7a8a4..a5b6bf0ef 100644 --- a/package/bcm28xx-bootloader/src/boot/start4.elf +++ b/package/bcm28xx-bootloader/src/boot/start4.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4cd.elf b/package/bcm28xx-bootloader/src/boot/start4cd.elf Binary files differindex b7fe9328d..eee7efc46 100644 --- a/package/bcm28xx-bootloader/src/boot/start4cd.elf +++ b/package/bcm28xx-bootloader/src/boot/start4cd.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4db.elf b/package/bcm28xx-bootloader/src/boot/start4db.elf Binary files differindex acd07e82c..f3e979f10 100644 --- a/package/bcm28xx-bootloader/src/boot/start4db.elf +++ b/package/bcm28xx-bootloader/src/boot/start4db.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4x.elf b/package/bcm28xx-bootloader/src/boot/start4x.elf Binary files differindex 274a62944..f9901aa7a 100644 --- a/package/bcm28xx-bootloader/src/boot/start4x.elf +++ b/package/bcm28xx-bootloader/src/boot/start4x.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_cd.elf b/package/bcm28xx-bootloader/src/boot/start_cd.elf Binary files differindex 5e616d0c6..46517c526 100644 --- a/package/bcm28xx-bootloader/src/boot/start_cd.elf +++ b/package/bcm28xx-bootloader/src/boot/start_cd.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_db.elf b/package/bcm28xx-bootloader/src/boot/start_db.elf Binary files differindex f10f87fa3..80a04b2ba 100644 --- a/package/bcm28xx-bootloader/src/boot/start_db.elf +++ b/package/bcm28xx-bootloader/src/boot/start_db.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_x.elf b/package/bcm28xx-bootloader/src/boot/start_x.elf Binary files differindex 26c1de866..b21614bc2 100644 --- a/package/bcm28xx-bootloader/src/boot/start_x.elf +++ b/package/bcm28xx-bootloader/src/boot/start_x.elf diff --git a/package/bcm28xx-utils/Makefile b/package/bcm28xx-utils/Makefile deleted file mode 100644 index e59dbde56..000000000 --- a/package/bcm28xx-utils/Makefile +++ /dev/null @@ -1,32 +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:= bcm28xx-utils -PKG_VERSION:= e65f5ec102e74218cda7da9fdc8b1caa0fd1127d -PKG_GIT:= hash -PKG_RELEASE:= 1 -PKG_DESCR:= videocore tools and utils -PKG_SECTION:= sys/hw -PKG_BUILDDEP:= cmake-host -PKG_NEEDS:= c++ threads -PKG_URL:= https://github.com/raspberrypi/utils -PKG_SITES:= https://github.com/raspberrypi/utils.git - -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi0 raspberry-pi2 raspberry-pi3 raspberry-pi3-64 raspberry-pi4 raspberry-pi4-64 raspberry-pi5 - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,BCM28XX_UTILS,bcm28xx-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -CONFIG_STYLE:= cmake - -bcm28xx-utils-install: - $(INSTALL_DIR) $(IDIR_BCM28XX_UTILS)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/vcgencmd \ - $(IDIR_BCM28XX_UTILS)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/vclog \ - $(IDIR_BCM28XX_UTILS)/usr/bin - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/bcm28xx-utils/patches/patch-CMakeLists_txt b/package/bcm28xx-utils/patches/patch-CMakeLists_txt deleted file mode 100644 index 956feac7e..000000000 --- a/package/bcm28xx-utils/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,16 +0,0 @@ ---- bcm28xx-utils-e65f5ec102e74218cda7da9fdc8b1caa0fd1127d.orig/CMakeLists.txt 2024-01-23 03:17:28.000000000 +0100 -+++ bcm28xx-utils-e65f5ec102e74218cda7da9fdc8b1caa0fd1127d/CMakeLists.txt 2024-01-23 03:21:39.257325745 +0100 -@@ -3,13 +3,10 @@ cmake_minimum_required(VERSION 3.1...3.2 - project(utils) - - # List of subsidiary CMakeLists --add_subdirectory(dtmerge) - add_subdirectory(eeptools) - add_subdirectory(otpset) - add_subdirectory(overlaycheck) - add_subdirectory(ovmerge) --add_subdirectory(pinctrl) - add_subdirectory(raspinfo) - add_subdirectory(vcgencmd) - add_subdirectory(vclog) --add_subdirectory(vcmailbox) diff --git a/package/bind/Makefile b/package/bind/Makefile index ac59cc624..32eb0bbef 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -4,16 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= bind -PKG_VERSION:= 9.18.24 +PKG_VERSION:= 9.18.33 PKG_RELEASE:= 1 -PKG_HASH:= 709d73023c9115ddad3bab65b6c8c79a590196d0d114f5d0ca2533dbd52ddf66 +PKG_HASH:= fb373fac5ebbc41c645160afd5a9fb451918f6c0e69ab1d9474154e2b515de40 PKG_DESCR:= dns server PKG_SECTION:= net/dns -PKG_DEPENDS:= libxml2 libressl libuv libressl-util -PKG_BUILDDEP:= libxml2 libressl libuv +PKG_DEPENDS:= libxml2 libopenssl libuv openssl-util +PKG_BUILDDEP:= libxml2 openssl libuv PKG_NEEDS:= c++ PKG_URL:= https://www.isc.org/software/bind/ -PKG_SITES:= ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/ +PKG_SITES:= https://ftp.isc.org/isc/bind9/${PKG_VERSION}/ PKG_LIBNAME:= libbind PKG_OPTS:= dev diff --git a/package/bind/files/named.init b/package/bind/files/named.init index e853202b4..ede96cabe 100644 --- a/package/bind/files/named.init +++ b/package/bind/files/named.init @@ -11,8 +11,11 @@ autostop) ;; exec sh $0 start ;; start) + if [ ! -f /etc/rndc.key ]; then + rndc-confgen -a 2>/dev/null + fi if [ -f /etc/bind/named.conf ]; then - /usr/sbin/named -c /etc/bind/named.conf + /usr/sbin/named -c /etc/bind/named.conf & fi ;; stop) diff --git a/package/bind/patches/patch-bin_rndc_Makefile_am b/package/bind/patches/patch-bin_rndc_Makefile_am deleted file mode 100644 index 4bf3b893c..000000000 --- a/package/bind/patches/patch-bin_rndc_Makefile_am +++ /dev/null @@ -1,18 +0,0 @@ ---- bind-9.18.24.orig/bin/rndc/Makefile.am 2024-02-11 11:42:55.296980787 +0100 -+++ bind-9.18.24/bin/rndc/Makefile.am 2024-02-20 08:02:25.039885442 +0100 -@@ -2,6 +2,7 @@ include $(top_srcdir)/Makefile.top - - AM_CPPFLAGS += \ - $(LIBISC_CFLAGS) \ -+ $(LIBNS_CFLAGS) \ - $(LIBDNS_CFLAGS) \ - $(LIBISCCFG_CFLAGS) \ - $(LIBISCCC_CFLAGS) \ -@@ -20,6 +21,7 @@ rndc_SOURCES = \ - - rndc_LDADD = \ - $(LIBISC_LIBS) \ -+ $(LIBNS_LIBS) \ - $(LIBDNS_LIBS) \ - $(LIBISCCC_LIBS) \ - $(LIBISCCFG_LIBS) \ diff --git a/package/binutils/Makefile b/package/binutils/Makefile index 27748b0d1..ef869e414 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -15,8 +15,6 @@ PKG_SUBPKGS:= BINUTILS LIBBFD PKGSD_LIBBFD:= binary file descriptor library PKGSC_LIBBFD:= libs/misc -PKG_HOST_DEPENDS:= !cygwin - include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 78b76ead5..c50e4af11 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.36.1 +PKG_VERSION:= 1.37.0 PKG_RELEASE:= 1 -PKG_HASH:= b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314 +PKG_HASH:= 3311dff32e746499f4df0d5df04d7eb396382d7e108bb9250e7b519b837043a4 PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base/apps PKG_URL:= http://www.busybox.net/ diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index d5cbed6a5..573c55f8c 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -108,6 +108,17 @@ config BUSYBOX_LFS programs that can benefit from large file support include dd, gzip, cp, mount, tar. +config BUSYBOX_TIME64 + bool "Support 64bit wide time types" + default y + depends on BUSYBOX_LFS + help + Make times later than 2038 representable for several libc syscalls + (stat, clk_gettime etc.). Note this switch is specific to glibc + and has no effect on platforms that already use 64bit wide time types + (i.e. all 64bit archs and some selected 32bit archs (currently riscv + and x32)). + config BUSYBOX_PAM bool "Support PAM (Pluggable Authentication Modules)" default n diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index 00d646599..ff7ab88ed 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -719,12 +719,12 @@ config BUSYBOX_SUM checksum and count the blocks in a file config BUSYBOX_SYNC bool "sync (3.8 kb)" - default y + default n help sync is used to flush filesystem buffers. config BUSYBOX_FEATURE_SYNC_FANCY bool "Enable -d and -f flags (requires syncfs(2) in libc)" - default y + default n depends on BUSYBOX_SYNC help sync -d FILE... executes fdatasync() on each FILE. diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in index d4aa403a5..ff1f5ed0c 100644 --- a/package/busybox/config/findutils/Config.in +++ b/package/busybox/config/findutils/Config.in @@ -136,6 +136,13 @@ config BUSYBOX_FEATURE_FIND_EXEC_PLUS Without this option, -exec + is a synonym for -exec ; (IOW: it works correctly, but without expected speedup) +config BUSYBOX_FEATURE_FIND_EXEC_OK + bool "Enable -ok: execute confirmed commands" + default y + depends on BUSYBOX_FEATURE_FIND_EXEC + help + Support the 'find -ok' option which prompts before executing. + config BUSYBOX_FEATURE_FIND_USER bool "Enable -user: username/uid matching" default y diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index 82aeff339..612d270e1 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -380,6 +380,11 @@ config BUSYBOX_FLASHCP help The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7. This utility is used to copy images into a MTD device. +config BUSYBOX_GETFATTR + bool "getfattr (12.3 kb)" + default y + help + Get extended attributes on files config BUSYBOX_HDPARM bool "hdparm (25 kb)" default y diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 341092334..9ed63b71f 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -582,6 +582,12 @@ config BUSYBOX_IPLINK help Short form of "ip link" +config BUSYBOX_FEATURE_IP_LINK_CAN + bool "ip link set type can" + default n + help + Configure CAN devices with "ip". + config BUSYBOX_IPROUTE bool "iproute (15 kb)" default y @@ -872,7 +878,7 @@ config BUSYBOX_SSL_CLIENT This tool pipes data to/from a socket, TLS-encrypting it. config BUSYBOX_TC bool "tc (8.3 kb)" - default y + default n help Show / manipulate traffic control settings diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in index 111e6b5f5..9018780aa 100644 --- a/package/busybox/config/networking/udhcp/Config.in +++ b/package/busybox/config/networking/udhcp/Config.in @@ -11,6 +11,13 @@ config BUSYBOX_UDHCPD udhcpd is a DHCP server geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. +config BUSYBOX_FEATURE_UDHCPD_BOOTP + bool "Answer to BOOTP requests as well" + default y + depends on BUSYBOX_UDHCPD + help + Support old BOOTP protocol too. + config BUSYBOX_FEATURE_UDHCPD_BASE_IP_ON_MAC bool "Select IP address based on client MAC" default n diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in index 6ffa3b2b0..b26195889 100644 --- a/package/busybox/config/shell/Config.in +++ b/package/busybox/config/shell/Config.in @@ -201,11 +201,6 @@ config BUSYBOX_ASH_TEST default y depends on BUSYBOX_SHELL_ASH -config BUSYBOX_ASH_SLEEP - bool "sleep builtin" - default y - depends on BUSYBOX_SHELL_ASH - config BUSYBOX_ASH_HELP bool "help builtin" default y diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index 77b2b83f1..5bc9673d3 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -660,7 +660,7 @@ config BUSYBOX_NOLOGIN_DEPENDENCIES disable this option. config BUSYBOX_NSENTER bool "nsenter (6.5 kb)" - default y + default n help Run program with namespaces of other processes. config BUSYBOX_PIVOT_ROOT diff --git a/package/busybox/patches/004-libbb-sha-add-missing-guard.patch b/package/busybox/patches/004-libbb-sha-add-missing-guard.patch new file mode 100644 index 000000000..ec41ba73a --- /dev/null +++ b/package/busybox/patches/004-libbb-sha-add-missing-guard.patch @@ -0,0 +1,17 @@ +diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c +index 57a801459..75a61c32c 100644 +--- a/libbb/hash_md5_sha.c ++++ b/libbb/hash_md5_sha.c +@@ -1313,7 +1313,9 @@ unsigned FAST_FUNC sha1_end(sha1_ctx_t *ctx, void *resbuf) + hash_size = 8; + if (ctx->process_block == sha1_process_block64 + #if ENABLE_SHA1_HWACCEL ++# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + || ctx->process_block == sha1_process_block64_shaNI ++# endif + #endif + ) { + hash_size = 5; +-- +2.48.1 + 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/ca-certificates/patches/patch-mozilla_Makefile b/package/ca-certificates/patches/patch-mozilla_Makefile index 768f26373..a9cd5ad44 100644 --- a/package/ca-certificates/patches/patch-mozilla_Makefile +++ b/package/ca-certificates/patches/patch-mozilla_Makefile @@ -5,7 +5,7 @@ all: - python3 certdata2pem.py -+ /bin/python3 certdata2pem.py ++ /usr/bin/python3 certdata2pem.py clean: -rm -f *.crt diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 315766c57..09960903b 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -4,91 +4,34 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= cairo -PKG_VERSION:= 1.14.6 +PKG_VERSION:= 1.18.2 PKG_RELEASE:= 1 -PKG_HASH:= 613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252 +PKG_HASH:= a62b9bb42425e844cc3d6ddde043ff39dbabedd1542eba57a2eb79f85889d45a PKG_DESCR:= graphics library PKG_SECTION:= libs/image PKG_DEPENDS:= fontconfig libfreetype libx11 pixman -PKG_DEPENDS+= libxrender +PKG_DEPENDS+= libxrender libpng PKG_BUILDDEP:= pixman freetype fontconfig libX11 libXrender glib -PKG_BUILDDEP+= libXext +PKG_BUILDDEP+= libXext libpng HOST_BUILDDEP:= libpng-host pixman-host freetype-host fontconfig-host PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ PKG_OPTS:= dev -PKG_FLAVOURS_CAIRO:= WITH_PS WITH_PDF WITH_XML WITH_PNG WITH_TEE WITH_SVG WITH_XRENDER -PKGFD_WITH_PS:= postscript support -PKGFD_WITH_PDF:= pdf support -PKGFD_WITH_XML:= xml support -PKGFD_WITH_PNG:= png support -PKGFB_WITH_PNG:= libpng -PKGFS_WITH_PNG:= libpng -PKGFD_WITH_TEE:= tee support -PKGFD_WITH_SVG:= svg support -PKGFD_WITH_XRENDER:= xorg xrender support - include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -HOST_STYLE:= auto -HOST_CONFIGURE_ARGS+= --enable-ft=yes \ - --enable-png=yes \ - --enable-fc=yes \ - --enable-tee=no \ - --enable-xlib=no \ - --enable-pdf=no \ - --enable-quartz=no \ - --disable-test-surfaces \ - --disable-full-testing +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -ifneq ($(ADK_PACKAGE_CAIRO_WITH_XRENDER),) -CONFIGURE_ARGS+= --enable-xlib-xrender=yes -else -CONFIGURE_ARGS+= --enable-xlib-xrender=no -endif -ifneq ($(ADK_PACKAGE_CAIRO_WITH_SVG),) -CONFIGURE_ARGS+= --enable-svg=yes \ - --enable-png=yes -else -CONFIGURE_ARGS+= --enable-svg=no -endif -ifneq ($(ADK_PACKAGE_CAIRO_WITH_PDF),) -CONFIGURE_ARGS+= --enable-pdf=yes -else -CONFIGURE_ARGS+= --enable-pdf=no -endif -ifneq ($(ADK_PACKAGE_CAIRO_WITH_PS),) -CONFIGURE_ARGS+= --enable-ps=yes -else -CONFIGURE_ARGS+= --enable-ps=no -endif -ifneq ($(ADK_PACKAGE_CAIRO_WITH_PNG)$(ADK_PACKAGE_CAIRO_WITH_SVG),) -CONFIGURE_ARGS+= --enable-png=yes -else -CONFIGURE_ARGS+= --enable-png=no -endif -ifneq ($(ADK_PACKAGE_CAIRO_WITH_XML),) -CONFIGURE_ARGS+= --enable-xml=yes -else -CONFIGURE_ARGS+= --enable-xml=no -endif -ifneq ($(ADK_PACKAGE_CAIRO_WITH_TEE),) -CONFIGURE_ARGS+= --enable-tee=yes -else -CONFIGURE_ARGS+= --enable-tee=no -endif +MESON_FLAGS+= -Dtests=disabled -CONFIGURE_ARGS+= --enable-ft=yes \ - --enable-fc=yes \ - --enable-xlib=yes \ - --enable-quartz=no \ - --disable-test-surfaces \ - --disable-full-testing +HOST_STYLE:= meson +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson cairo-install: ${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib/cairo diff --git a/package/cairo/patches/patch-Makefile_in b/package/cairo/patches/patch-Makefile_in deleted file mode 100644 index 8716b0820..000000000 --- a/package/cairo/patches/patch-Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ ---- cairo-1.14.0.orig/Makefile.in 2014-10-14 03:47:28.000000000 +0200 -+++ cairo-1.14.0/Makefile.in 2015-02-26 11:39:05.000000000 +0100 -@@ -63,7 +63,7 @@ EXTRA_PROGRAMS = - TESTS = - check_PROGRAMS = - # libpng is required for our test programs --@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate test perf -+@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate perf - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \ -@@ -417,7 +417,7 @@ MAINTAINERCLEANFILES = Makefile.in $(src - # $(srcdir)/build/Makefile.win32.features-h \ - # $(NULL) - ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} --DIST_SUBDIRS = src doc util boilerplate test perf -+DIST_SUBDIRS = src doc util boilerplate perf - SUBDIRS = src doc util $(am__append_1) - DISTCHECK_CONFIGURE_FLAGS = \ - --enable-gtk-doc \ diff --git a/package/cairo/patches/patch-configure b/package/cairo/patches/patch-configure deleted file mode 100644 index 9e0f39f0d..000000000 --- a/package/cairo/patches/patch-configure +++ /dev/null @@ -1,101 +0,0 @@ ---- cairo-1.14.0.orig/configure 2014-10-14 03:47:29.000000000 +0200 -+++ cairo-1.14.0/configure 2015-02-26 13:27:59.000000000 +0100 -@@ -18371,7 +18371,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false ; then - cairo_cc_flag=no - fi - -@@ -18418,7 +18418,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false ; then - cairo_cc_flag=no - fi - -@@ -18469,7 +18469,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false ; then - cairo_cc_flag=no - fi - -@@ -18516,7 +18516,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false ; then - cairo_cc_flag=no - fi - -@@ -18585,7 +18585,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false ; then - cairo_cc_flag=no - fi - -@@ -18641,7 +18641,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false ; then - cairo_cc_flag=no - fi - -@@ -20089,7 +20089,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false ; then - cairo_cc_flag=no - fi - -@@ -20136,7 +20136,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false ; then - cairo_cc_flag=no - fi - -@@ -33208,7 +33208,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false ; then - cairo_cc_flag=no - fi - -@@ -33327,7 +33327,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false ; then - cairo_cc_flag=no - fi - -@@ -33408,7 +33408,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - diff --git a/package/ccache/Makefile b/package/ccache/Makefile index 613cfe8aa..10dc9b945 100644 --- a/package/ccache/Makefile +++ b/package/ccache/Makefile @@ -4,12 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ccache -PKG_VERSION:= 3.3.4 +PKG_VERSION:= 4.11.3 PKG_RELEASE:= 1 -PKG_HASH:= 24f15bf389e38c41548c9c259532187774ec0cb9686c3497bbb75504c8dc404f +PKG_HASH:= d5a340e199977b7b1e89c0add794132c977fdc2ecc7ca5451e03d43627a1b1be PKG_DESCR:= compiler cache utility PKG_SECTION:= dev/tools -PKG_SITES:= http://samba.org/ftp/ccache/ +HOST_BUILDDEP:= cmake-host +PKG_SITES:= https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION)/ PKG_CFLINE_CCACHE:= depends on ADK_HOST_ONLY @@ -18,5 +19,15 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,CCACHE,ccache,$(PKG_VERSION)-${PKG_RELEASE})) +HOST_STYLE:= cmake + +host-build: + (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET}) + +hostpost-install: + (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET}) + include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk 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/cfgfs/src/c_lzo1x1.c b/package/cfgfs/src/c_lzo1x1.c index 570f8673c..94cf8322b 100644 --- a/package/cfgfs/src/c_lzo1x1.c +++ b/package/cfgfs/src/c_lzo1x1.c @@ -51,10 +51,10 @@ __RCSID("$MirOS: contrib/hosted/fwcf/c_lzo1x1.c,v 1.5 2007/03/13 18:31:07 tg Exp static void c_lzo1x1_load(void) __attribute__((constructor)); static int c_init(void); static int c_compress(char **, char *, size_t) - __attribute__((bounded (string, 2, 3))); + __attribute__((access (read_only, 2, 3))); static int c_decompress(char *, size_t, char *, size_t) - __attribute__((bounded (string, 1, 2))) - __attribute__((bounded (string, 3, 4))); + __attribute__((access (read_write, 1, 2))) + __attribute__((access (read_only, 3, 4))); static fwcf_compressor c_lzo1x1 = { c_init, /* init */ diff --git a/package/cfgfs/src/c_null.c b/package/cfgfs/src/c_null.c index 4806ae261..718550415 100644 --- a/package/cfgfs/src/c_null.c +++ b/package/cfgfs/src/c_null.c @@ -34,10 +34,10 @@ __RCSID("$MirOS: contrib/hosted/fwcf/c_null.c,v 1.5 2006/09/23 23:46:35 tg Exp $ static void c_null_load(void) __attribute__((constructor)); static int c_init(void); static int c_compress(char **, char *, size_t) - __attribute__((bounded (string, 2, 3))); + __attribute__((access (read_only, 2, 3))); static int c_decompress(char *, size_t, char *, size_t) - __attribute__((bounded (string, 1, 2))) - __attribute__((bounded (string, 3, 4))); + __attribute__((access (read_write, 1, 2))) + __attribute__((access (read_only, 3, 4))); static fwcf_compressor c_null = { c_init, /* init */ diff --git a/package/cfgfs/src/c_zlib.c b/package/cfgfs/src/c_zlib.c index 2285f2eeb..65245d507 100644 --- a/package/cfgfs/src/c_zlib.c +++ b/package/cfgfs/src/c_zlib.c @@ -34,10 +34,10 @@ __RCSID("$MirOS: contrib/hosted/fwcf/c_zlib.c,v 1.4 2006/09/23 23:46:35 tg Exp $ static void c_zlib_load(void) __attribute__((constructor)); static int c_init(void); static int c_compress(char **, char *, size_t) - __attribute__((bounded (string, 2, 3))); + __attribute__((access (read_only, 2, 3))); static int c_decompress(char *, size_t, char *, size_t) - __attribute__((bounded (string, 1, 2))) - __attribute__((bounded (string, 3, 4))); + __attribute__((access (read_write, 1, 2))) + __attribute__((access (read_only, 3, 4))); static fwcf_compressor c_zlib = { c_init, /* init */ diff --git a/package/cfgfs/src/compress.h b/package/cfgfs/src/compress.h index 413075d83..2237595c5 100644 --- a/package/cfgfs/src/compress.h +++ b/package/cfgfs/src/compress.h @@ -18,12 +18,12 @@ typedef int (*fwcf_compress_init_func)(void); /* in: *dst (malloc'd), src, size of source (max. INT_MAX) */ /* returns size of destination on success, -1 on failure */ typedef int (*fwcf_compress_work_func)(char **, char *, size_t) - __attribute__((bounded (string, 2, 3))); + __attribute__((access (read_only, 2, 3))); /* in: dst, max size of dst, src, size of source (max. INT_MAX) */ /* returns size of destination on success, -1 on failure */ typedef int (*fwcf_compress_rev_func)(char *, size_t, char *, size_t) - __attribute__((bounded (string, 1, 2))) - __attribute__((bounded (string, 3, 4))); + __attribute__((access (read_write, 1, 2))) + __attribute__((access (read_only, 3, 4))); typedef struct FWCF_COMPRESSOR { fwcf_compress_init_func init; diff --git a/package/cfgfs/src/ft_pack.c b/package/cfgfs/src/ft_pack.c index 5d04f8b5c..53fd98713 100644 --- a/package/cfgfs/src/ft_pack.c +++ b/package/cfgfs/src/ft_pack.c @@ -21,6 +21,7 @@ * the possibility of such damage or existence of a defect. */ +#define _GNU_SOURCE #include <sys/param.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/package/clamav/Makefile b/package/clamav/Makefile deleted file mode 100644 index 1812b4dcb..000000000 --- a/package/clamav/Makefile +++ /dev/null @@ -1,48 +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:= clamav -PKG_VERSION:= 0.103.4 -PKG_RELEASE:= 1 -PKG_HASH:= def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 -PKG_DESCR:= anti-virus software -PKG_SECTION:= sys/misc -PKG_DEPENDS:= libressl zlib libpcre libncurses libcurl libmspack -PKG_BUILDDEP:= libressl zlib pcre ncurses curl libmspack -PKG_NEEDS:= c++ threads -PKG_URL:= http://www.clamav.net/ -PKG_SITES:= http://www.clamav.net/downloads/production/ - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,CLAMAV,clamav,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) - -TARGET_LDFLAGS+= -ltinfo -CONFIGURE_ENV+= ac_cv_c_mmap_private=yes -CONFIGURE_ARGS+= --enable-mempool \ - --with-system-libmspack \ - --disable-xml \ - --disable-check \ - --with-libcurl="$(STAGING_TARGET_DIR)/usr" \ - --with-openssl="$(STAGING_TARGET_DIR)/usr" \ - --with-pcre="$(STAGING_TARGET_DIR)/usr" - -clamav-install: - $(INSTALL_DIR) $(IDIR_CLAMAV)/etc - $(CP) $(WRKINST)/etc/* \ - $(IDIR_CLAMAV)/etc - $(INSTALL_DIR) $(IDIR_CLAMAV)/usr/lib - $(CP) $(WRKINST)/usr/lib*/lib*.so* \ - $(IDIR_CLAMAV)/usr/lib - $(INSTALL_DIR) $(IDIR_CLAMAV)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/* \ - $(IDIR_CLAMAV)/usr/bin - $(INSTALL_DIR) $(IDIR_CLAMAV)/usr/sbin - $(INSTALL_BIN) $(WRKINST)/usr/sbin/clamd \ - $(IDIR_CLAMAV)/usr/sbin - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/clamav/patches/patch-clamdscan_proto_c b/package/clamav/patches/patch-clamdscan_proto_c deleted file mode 100644 index a1d18ce41..000000000 --- a/package/clamav/patches/patch-clamdscan_proto_c +++ /dev/null @@ -1,10 +0,0 @@ ---- clamav-0.103.0.orig/clamdscan/proto.c 2020-09-13 02:27:09.000000000 +0200 -+++ clamav-0.103.0/clamdscan/proto.c 2021-01-28 04:40:12.604606645 +0100 -@@ -39,6 +39,7 @@ - #include <errno.h> - #include <stdlib.h> - #include <sys/types.h> -+#include <sys/un.h> - #include <sys/stat.h> - #include <fcntl.h> - #include <sys/types.h> diff --git a/package/clamav/patches/patch-libclamav_mbox_c b/package/clamav/patches/patch-libclamav_mbox_c deleted file mode 100644 index 86e81131a..000000000 --- a/package/clamav/patches/patch-libclamav_mbox_c +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.103.0.orig/libclamav/mbox.c 2020-09-13 02:27:10.000000000 +0200 -+++ clamav-0.103.0/libclamav/mbox.c 2021-01-28 04:48:50.156979494 +0100 -@@ -91,7 +91,7 @@ - #include <features.h> - #endif - --#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 -+#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 && !defined(__UCLIBC__) || defined(__UCLIBC_HAS_BACKTRACE__) - #define HAVE_BACKTRACE - #endif - #endif diff --git a/package/classpath/Makefile b/package/classpath/Makefile deleted file mode 100644 index 65efa2900..000000000 --- a/package/classpath/Makefile +++ /dev/null @@ -1,56 +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:= classpath -PKG_VERSION:= 0.99 -PKG_RELEASE:= 1 -PKG_HASH:= f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8 26ca659f47d77384f518cf2b6463892fcd4f0b0d4d8c0de2addf697e63e7326b -PKG_DESCR:= java classpath -PKG_SECTION:= dev/tools -PKG_BUILDDEP:= libgtk2 gdk-pixbuf orbit2 gconf -PKG_DEPENDS:= libgtk2 gdk-pixbuf orbit2 gconf -HOST_BUILDDEP:= gcj-host ecj-host -PKG_URL:= http://www.gnu.org/software/classpath/home.html -PKG_SITES:= ftp://ftp.gnu.org/gnu/classpath/ \ - http://www.antlr3.org/download/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz antlr-3.5.2-complete.jar - -PKG_HOST_DEPENDS:= linux -PKG_CFLINE_CLASSPATH:= depends on ADK_HOST_ONLY - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE})) -$(eval $(call PKG_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -HOST_CONFIGURE_ARGS+= --disable-plugin \ - --enable-tools \ - --with-antlr-jar=${WRKBUILD}/antlr-3.5.2-complete.jar \ - --disable-examples \ - --disable-gtk-peer \ - --disable-gconf-peer \ - --disable-alsa \ - --disable-Werror \ - --without-x -CONFIGURE_ARGS+= --disable-plugin \ - --disable-tools \ - --disable-examples - -classpath-install: - $(INSTALL_DIR) $(IDIR_CLASSPATH)/usr/share/classpath - $(CP) $(WRKINST)/usr/share/classpath/glibj.zip \ - $(IDIR_CLASSPATH)/usr/share/classpath - $(INSTALL_DIR) $(IDIR_CLASSPATH)/usr/lib/classpath - $(CP) $(WRKINST)/usr/lib/classpath/lib*so.* \ - $(IDIR_CLASSPATH)/usr/lib/classpath - # install to staging directory - $(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/share/classpath - $(CP) $(WRKINST)/usr/share/classpath/glibj.zip \ - $(STAGING_TARGET_DIR)/usr/share/classpath - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/classpath/patches/classpath-fix.patch b/package/classpath/patches/classpath-fix.patch deleted file mode 100644 index 80fef0f35..000000000 --- a/package/classpath/patches/classpath-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur classpath-0.98.orig//lib/Makefile.in classpath-0.98/lib/Makefile.in ---- classpath-0.99.orig/lib/Makefile.in 2012-03-09 00:54:14.000000000 +0100 -+++ classpath-0.99/lib/Makefile.in 2014-08-24 21:21:19.000000000 +0200 -@@ -305,7 +305,7 @@ top_srcdir = @top_srcdir@ - uudecode = @uudecode@ - vm_classes = @vm_classes@ - JAVA_DEPEND = java.dep --compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(PATH_TO_GLIBJ_ZIP):$(PATH_TO_ESCHER) -+compile_classpath = $(vm_classes) -cp $(top_srcdir) -cp $(top_srcdir)/external/w3c_dom -cp $(top_srcdir)/external/sax -cp $(top_srcdir)/external/relaxngDatatype -cp $(top_srcdir)/external/jsr166 -cp . -cp $(PATH_TO_GLIBJ_ZIP) -cp $(PATH_TO_ESCHER) - @GCJ_JAVAC_FALSE@JCOMPILER = $(JAVAC) $(JAVACFLAGS) $(JAVAC_MEM_OPT) -source 1.5 -target 1.5 -bootclasspath '' -classpath $(compile_classpath) -d . @classes - - # handling source to bytecode compiler programs like gcj, jikes and kjc diff --git a/package/cmake/Makefile b/package/cmake/Makefile index 9ad0a74a3..b27983bb6 100644 --- a/package/cmake/Makefile +++ b/package/cmake/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= cmake -PKG_VERSION:= 3.21.3 +PKG_VERSION:= 4.1.2 PKG_RELEASE:= 1 -PKG_HASH:= d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f +PKG_HASH:= 643f04182b7ba323ab31f526f785134fb79cba3188a852206ef0473fee282a15 PKG_DESCR:= build utility PKG_SECTION:= dev/tools HOST_BUILDDEP:= curl-host PKG_URL:= http://www.cmake.org/ -PKG_SITES:= https://github.com/Kitware/CMake/releases/download/v3.21.3/ +PKG_SITES:= https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/cog/Makefile b/package/cog/Makefile new file mode 100644 index 000000000..7302f570f --- /dev/null +++ b/package/cog/Makefile @@ -0,0 +1,55 @@ +# 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:= cog +PKG_VERSION:= 0.18.5 +PKG_RELEASE:= 1 +PKG_HASH:= 0ede9d09ab635ac519beec0543378e3fc51b56561a5fb7aa9c0cbca54c31b97c +PKG_DESCR:= minimalistic browser +PKG_SECTION:= app/browser +PKG_DEPENDS:= wpewebkit wpebackend-fdo libinput glib-networking ca-certificates +PKG_BUILDDEP:= wpewebkit wpebackend-fdo libinput +PKG_URL:= https://wpewebkit.org +PKG_SITES:= https://wpewebkit.org/releases/ + +PKG_CHOICES_COG:= WITH_X11 WITH_WAYLAND +PKGCD_WITH_WAYLAND:= with wayland support +PKGCD_WITH_X11:= with X11 support + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,COG,cog,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +MESON_FLAGS+= -Ddocumentation=false \ + -Dmanpages=false \ + -Dprograms=true \ + -Dwpe_api=2.0 + +ifeq ($(ADK_PACKAGE_COG_WITH_WAYLAND),y) +MESON_FLAGS+= -Dplatforms="wayland" +endif + +ifeq ($(ADK_PACKAGE_COG_WITH_X11),y) +MESON_FLAGS+= -Dplatforms="x11" +endif + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +cog-install: + $(INSTALL_DIR) $(IDIR_COG)/usr/lib + $(CP) $(WRKINST)/usr/lib/libcogcore.so* \ + $(IDIR_COG)/usr/lib + $(INSTALL_DIR) $(IDIR_COG)/usr/lib/cog/modules + $(CP) $(WRKINST)/usr/lib/cog/modules/* \ + $(IDIR_COG)/usr/lib/cog/modules + $(INSTALL_DIR) $(IDIR_COG)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/cog \ + $(IDIR_COG)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile index f27fd4f00..04e0671eb 100644 --- a/package/coreutils/Makefile +++ b/package/coreutils/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= coreutils -PKG_VERSION:= 9.4 +PKG_VERSION:= 9.6 PKG_RELEASE:= 1 -PKG_HASH:= ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52 +PKG_HASH:= 7a0124327b398fd9eb1a6abde583389821422c744ffa10734b24f557610d3283 PKG_DESCR:= file, shell and text utilities PKG_SECTION:= base/apps PKG_NEEDS:= threads diff --git a/package/curl/Makefile b/package/curl/Makefile index d29044afd..c4711a7d2 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,12 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 8.7.1 +PKG_VERSION:= 8.16.0 PKG_RELEASE:= 1 -PKG_HASH:= 6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd +PKG_HASH:= 40c8cddbcb6cc6251c03dea423a472a6cea4037be654ba5cf5dec6eb2d22ff1d PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http PKG_BUILDDEP:= zlib +HOST_BUILDDEP:= openssl-host PKG_NEEDS:= threads PKG_URL:= https://curl.se/ PKG_SITES:= https://curl.se/download/ @@ -20,14 +21,14 @@ PKG_SUBPKGS:= LIBCURL CURL PKGSD_LIBCURL:= client-side url transfer library PKGSC_LIBCURL:= libs/net PKGSS_LIBCURL:= zlib -PKGSD_CURL:= client-side url transfer utiity +PKGSD_CURL:= client-side url transfer utility PKGSC_CURL:= net/http PKGSS_CURL:= zlib libcurl PKG_FLAVOURS_LIBCURL:= WITH_IPV6 PKGFD_WITH_IPV6:= enable ipv6 support -PKG_CHOICES_LIBCURL:= WITH_LIBRESSL WITH_OPENSSL WITH_GNUTLS WITH_WOLFSSL WITHOUT_SSL +PKG_CHOICES_LIBCURL:= WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITH_WOLFSSL WITHOUT_SSL PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCB_WITH_LIBRESSL:= libressl @@ -49,7 +50,7 @@ $(eval $(call HOST_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL},${PKG_OPTS})) $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -HOST_CONFIGURE_ARGS+= --without-ssl \ +HOST_CONFIGURE_ARGS+= --with-openssl="$(STAGING_HOST_DIR)/usr" \ --without-libpsl ifeq (${ADK_PACKAGE_LIBCURL_WITH_LIBRESSL},y) diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index a761f2e59..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:= libressl -PKG_BUILDDEP:= libressl +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/daq/Makefile b/package/daq/Makefile deleted file mode 100644 index 3e72dca8c..000000000 --- a/package/daq/Makefile +++ /dev/null @@ -1,35 +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:= daq -PKG_VERSION:= 2.0.7 -PKG_RELEASE:= 1 -PKG_HASH:= d1f6709bc5dbddee3fdf170cdc1e49fb926e2031d4869ecf367a8c47efc87279 -PKG_DESCR:= data acquisition library -PKG_SECTION:= libs/misc -PKG_DEPENDS:= libpcap libdnet -PKG_BUILDDEP:= libpcap libdnet -PKG_URL:= http://www.snort.org -PKG_SITES:= https://www.snort.org/downloads/snort/ -PKG_OPTS:= dev -PKG_NOPARALLEL:= 1 - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,DAQ,daq,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) - -AUTOTOOL_STYLE:= autoreconf -CONFIGURE_ARGS+= --disable-ipfw-module - -daq-install: - $(INSTALL_DIR) $(IDIR_DAQ)/usr/lib/daq - $(CP) $(WRKINST)/usr/lib/daq/*.so \ - $(IDIR_DAQ)/usr/lib/daq - $(CP) $(WRKINST)/usr/lib/*.so* \ - $(IDIR_DAQ)/usr/lib - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/daq/patches/patch-configure_ac b/package/daq/patches/patch-configure_ac deleted file mode 100644 index 4f8d40df3..000000000 --- a/package/daq/patches/patch-configure_ac +++ /dev/null @@ -1,10 +0,0 @@ ---- daq-2.0.0.orig/configure.ac 2012-09-06 17:17:23.000000000 +0200 -+++ daq-2.0.0/configure.ac 2013-11-15 15:21:19.546122100 +0100 -@@ -179,7 +179,6 @@ AC_ARG_ENABLE(pcap-module, - [enable_pcap_module="$enableval"], [enable_pcap_module="$DEFAULT_ENABLE"]) - if test "$enable_pcap_module" = yes; then - AC_CHECK_HEADER([pcap.h], [], [enable_pcap_module=no]) -- AC_CHECK_PCAP_VER("1.0.0") - if test "$enable_pcap_module" = yes; then - STATIC_LIBS="${STATIC_LIBS} -lpcap" - fi 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/dejavu-ttf-fonts/Makefile b/package/dejavu-ttf-fonts/Makefile new file mode 100644 index 000000000..c1bc7d6f5 --- /dev/null +++ b/package/dejavu-ttf-fonts/Makefile @@ -0,0 +1,30 @@ +# 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:= dejavu-fonts-ttf +PKG_VERSION:= 2.37 +PKG_RELEASE:= 1 +PKG_HASH:= fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7 +PKG_DESCR:= free fonts +PKG_SECTION:= x11/fonts +PKG_URL:= https://dejavu-fonts.github.io/ +PKG_SITES:= http://sourceforge.net/projects/dejavu/files/dejavu/$(PKG_VERSION)/ + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,DEJAVU_FONTS_TTF,dejavu-fonts-ttf,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +dejavu-fonts-ttf-install: + $(INSTALL_DIR) $(IDIR_DEJAVU_FONTS_TTF)/usr/share/fonts/dejavu + $(INSTALL_BIN) $(WRKBUILD)/ttf/*.ttf \ + $(IDIR_DEJAVU_FONTS_TTF)/usr/share/fonts/dejavu + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/dillo/Makefile b/package/dillo/Makefile index 0535edb69..8718e78e2 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -4,19 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= dillo -PKG_VERSION:= 3.0.5 +PKG_VERSION:= 3.2.0 PKG_RELEASE:= 1 -PKG_HASH:= db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b +PKG_HASH:= 1066ed42ea7fe0ce19e79becd029c651c15689922de8408e13e70bb5701931bf PKG_DESCR:= small graphical web browser PKG_SECTION:= x11/apps -PKG_DEPENDS:= libfltk libxi libpng zlib libjpeg-turbo libressl -PKG_BUILDDEP:= fltk libXi libjpeg-turbo libpng zlib libressl +PKG_DEPENDS:= libfltk libxi libpng zlib libjpeg-turbo libopenssl +PKG_DEPENDS+= libXrender libXfixes libXext fontconfig libxml2 +PKG_BUILDDEP:= fltk libXi libjpeg-turbo libpng zlib openssl PKG_NEEDS:= threads cxx -PKG_URL:= http://www.dillo.org/ -PKG_SITES:= http://www.dillo.org/download/ +PKG_URL:= https://dillo-browser.github.io/ +PKG_SITES:= https://github.com/dillo-browser/dillo/releases/download/v$(PKG_VERSION)/ -PKG_HOST_DEPENDS:= !cygwin -PKG_ARCH_DEPENDS:= arm mips mips64 x86 x86_64 +PKG_ARCH_DEPENDS:= aarch64 arm mips mips64 sh x86 x86_64 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -24,11 +24,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS+= -fcommon -TARGET_CXXFLAGS+= -fcommon -TARGET_LDFLAGS+= -liconv +TARGET_LDFLAGS+= -latomic CONFIGURE_ENV+= PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config -CONFIGURE_ARGS+= --enable-ssl +CONFIGURE_ARGS+= --enable-tls dillo-install: $(INSTALL_DIR) $(IDIR_DILLO)/etc/dillo diff --git a/package/dillo/patches/patch-src_decode_c b/package/dillo/patches/patch-src_decode_c new file mode 100644 index 000000000..012903a25 --- /dev/null +++ b/package/dillo/patches/patch-src_decode_c @@ -0,0 +1,11 @@ +--- dillo-3.2.0.orig/src/decode.c 2024-10-23 22:26:03.000000000 +0200 ++++ dillo-3.2.0/src/decode.c 2025-08-17 08:44:05.687194623 +0200 +@@ -373,7 +373,7 @@ Decode *a_Decode_charset_init(const char + iconv_t ic = iconv_open("UTF-8", format); + if (ic != (iconv_t) -1) { + dc = dNew(Decode, 1); +- dc->state = ic; ++ dc->state = (void *)ic; + dc->buffer = dNew(char, bufsize); + dc->leftover = dStr_new(""); + diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index d204305b0..d036235a1 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= dnsmasq -PKG_VERSION:= 2.90 +PKG_VERSION:= 2.91 PKG_RELEASE:= 1 -PKG_HASH:= 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 +PKG_HASH:= f622682848b33677adb2b6ad08264618a2ae0a01da486a93fd8cd91186b3d153 PKG_DESCR:= lightweight dns, dhcp and tftp server PKG_SECTION:= net/dns PKG_KDEPENDS:= inotify-user diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index e432de66e..22ab629b7 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= dropbear -PKG_VERSION:= 2024.85 +PKG_VERSION:= 2025.87 PKG_RELEASE:= 1 -PKG_HASH:= 86b036c433a69d89ce51ebae335d65c47738ccf90d13e5eb0fea832e556da502 +PKG_HASH:= 738b7f358547f0c64c3e1a56bbc5ef98d34d9ec6adf9ccdf01dc0bf2caa2bc8d 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/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 3e565c647..b47fe75ed 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= e2fsprogs -PKG_VERSION:= 1.47.0 +PKG_VERSION:= 1.47.2 PKG_RELEASE:= 1 -PKG_HASH:= 144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db +PKG_HASH:= 08242e64ca0e8194d9c1caad49762b19209a06318199b63ce74ae4ef2d74e63c PKG_DESCR:= ext2/3/4 filesystem utilities PKG_SECTION:= sys/fs PKG_BUILDDEP:= util-linux @@ -18,7 +18,7 @@ PKG_OPTS:= dev PKG_CFLINE_E2FSPROGS:= select BUSYBOX_FSCK PKG_SUBPKGS:= LIBE2FS LIBCOM_ERR LIBSS -PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS +PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS E4DEFRAG PKGSD_LIBE2FS:= e2fsprogs library PKGSC_LIBE2FS:= libs/misc PKGSD_LIBCOM_ERR:= common error library @@ -34,6 +34,9 @@ PKGSS_TUNE2FS:= libe2fs libcom-err libblkid libuuid PKGSD_E2FSCK:= ext2/3/4 filesystem check utility PKGSC_E2FSCK:= sys/fs PKGSS_E2FSCK:= libe2fs libcom-err libblkid libuuid +PKGSD_E4DEFRAG:= ext4 filesystem defragmentation utility +PKGSC_E4DEFRAG:= sys/fs +PKGSS_E4DEFRAG:= libe2fs libcom-err libblkid libuuid PKGSD_MKE2FS:= ext2/3/4 filesystem creation utility PKGSC_MKE2FS:= sys/fs PKGSS_MKE2FS:= libe2fs libcom-err libblkid libuuid libncurses @@ -49,6 +52,7 @@ $(eval $(call PKG_template,TUNE2FS,tune2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS $(eval $(call PKG_template,RESIZE2FS,resize2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_RESIZE2FS),$(PKGSD_RESIZE2FS),$(PKGSC_RESIZE2FS))) $(eval $(call PKG_template,MKE2FS,mke2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MKE2FS),$(PKGSD_MKE2FS),$(PKGSC_MKE2FS))) $(eval $(call PKG_template,E2FSCK,e2fsck,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_E2FSCK),$(PKGSD_E2FSCK),$(PKGSC_E2FSCK))) +$(eval $(call PKG_template,E4DEFRAG,e4defrag,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_E4DEFRAG),$(PKGSD_E4DEFRAG),$(PKGSC_E4DEFRAG))) HOST_CONFIGURE_ARGS+= --disable-rpath \ --disable-nls \ @@ -66,7 +70,7 @@ endif CONFIGURE_ARGS+= --disable-rpath \ --disable-uuidd \ --disable-testio-debug \ - --disable-defrag \ + --enable-defrag \ --disable-libblkid \ --disable-libuuid \ --disable-debugfs @@ -91,6 +95,10 @@ libe2fs-install: $(CP) $(WRKINST)/usr/lib/lib{e2p,ext2fs}.so.* \ $(IDIR_LIBE2FS)/usr/lib +e4defrag-install: + $(INSTALL_DIR) $(IDIR_E4DEFRAG)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/e4defrag $(IDIR_E4DEFRAG)/usr/sbin + e2fsck-install: $(INSTALL_DIR) $(IDIR_E2FSCK)/usr/sbin $(INSTALL_BIN) $(WRKINST)/usr/sbin/e2fsck $(IDIR_E2FSCK)/usr/sbin diff --git a/package/ecj/Makefile b/package/ecj/Makefile deleted file mode 100644 index 26bace2c8..000000000 --- a/package/ecj/Makefile +++ /dev/null @@ -1,43 +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:= ecj -PKG_VERSION:= 4.9 -PKG_RELEASE:= 1 -PKG_HASH:= 9506e75b862f782213df61af67338eb7a23c35ff425d328affc65585477d34cd -PKG_DESCR:= ecj java compiler -PKG_SECTION:= dev/lang -PKG_SITES:= ftp://sourceware.org/pub/java/ - -PKG_CFLINE_ECJ:= depends on ADK_HOST_ONLY -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.jar - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,ECJ,ecj,$(PKG_VERSION)-${PKG_RELEASE})) - -HOST_STYLE:= manual - -ecj-hostinstall: - env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \ - $(STAGING_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \ - -o ${STAGING_HOST_DIR}/usr/bin/ecj.native \ - --main=org.eclipse.jdt.internal.compiler.batch.Main \ - $(DL_DIR)/${PKG_NAME}-${PKG_VERSION}.jar - echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/ecj.native \$$@" > \ - ${STAGING_HOST_DIR}/usr/bin/ecj - chmod u+x ${STAGING_HOST_DIR}/usr/bin/ecj - # put a wrapper for java here - mv ${STAGING_HOST_DIR}/usr/bin/gij ${STAGING_HOST_DIR}/usr/bin/gij.native - echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ - ${STAGING_HOST_DIR}/usr/bin/hostjava - chmod u+x ${STAGING_HOST_DIR}/usr/bin/hostjava - echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ - ${STAGING_HOST_DIR}/usr/bin/gij - chmod u+x ${STAGING_HOST_DIR}/usr/bin/gij - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/elftoaout/Makefile b/package/elftoaout/Makefile index 51af97ee8..9f374e31d 100644 --- a/package/elftoaout/Makefile +++ b/package/elftoaout/Makefile @@ -20,10 +20,6 @@ $(eval $(call HOST_template,ELFTOAOUT,elftoaout,$(PKG_VERSION)-$(PKG_RELEASE))) HOST_STYLE:= manual -ifeq ($(OS_FOR_BUILD),Darwin) -HOST_CFLAGS+= -I$(ADK_TOPDIR)/adk/include -endif - host-build: $(HOST_CC) $(HOST_CFLAGS) -o $(WRKBUILD)/elftoaout $(WRKBUILD)/elftoaout.c diff --git a/package/elfutils/Makefile b/package/elfutils/Makefile index 825ab10eb..e4f1d49a9 100644 --- a/package/elfutils/Makefile +++ b/package/elfutils/Makefile @@ -4,16 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= elfutils -PKG_VERSION:= 0.161 +PKG_VERSION:= 0.189 PKG_RELEASE:= 1 -PKG_HASH:= 570c91a1783fa5386aaa2dfdd08dda1de777c2b63bf3b9c1437d635ffdd7a070 +PKG_HASH:= 39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8 PKG_DESCR:= libraries/utilities to handle elf objects (drop in replacement for libelf) PKG_SECTION:= base/libs -PKG_URL:= https://fedorahosted.org/elfutils/ -PKG_SITES:= https://fedorahosted.org/releases/e/l/elfutils/$(PKG_VERSION)/ +PKG_DEPENDS:= zlib +PKG_BUILDDEP:= zlib +PKG_NEEDS:= intl +PKG_SITES:= https://sourceware.org/elfutils/ftp/$(PKG_VERSION)/ # require argp() -PKG_LIBC_DEPENDS:= glibc +PKG_LIBC_DEPENDS:= glibc uclibc-ng DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -24,14 +26,16 @@ $(eval $(call PKG_template,ELFUTILS,elfutils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG # not only because we pass -DNDEBUG, this package won't build with -Werror TARGET_CFLAGS+= -Wno-error +AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --disable-symbol-versioning \ + --disable-debuginfod \ + --disable-libdebuginfod \ + --disable-demangler \ + --disable-progs + elfutils-install: $(INSTALL_DIR) $(IDIR_ELFUTILS)/usr/lib/elfutils $(CP) $(WRKINST)/usr/lib/lib{asm,dw,elf}*.so* \ $(IDIR_ELFUTILS)/usr/lib - $(CP) $(WRKINST)/usr/lib/elfutils/libebl*.so \ - $(IDIR_ELFUTILS)/usr/lib/elfutils - $(INSTALL_DIR) $(IDIR_ELFUTILS)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/* \ - $(IDIR_ELFUTILS)/usr/bin include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/elfutils/patches/patch-Makefile_am b/package/elfutils/patches/patch-Makefile_am new file mode 100644 index 000000000..579e76113 --- /dev/null +++ b/package/elfutils/patches/patch-Makefile_am @@ -0,0 +1,16 @@ +--- elfutils-0.189.orig/Makefile.am 2023-03-03 16:42:26.000000000 +0100 ++++ elfutils-0.189/Makefile.am 2025-01-08 20:12:14.302360288 +0100 +@@ -26,8 +26,12 @@ AM_MAKEFLAGS = --no-print-directory + + pkginclude_HEADERS = version.h + ++if ENABLE_PROGS ++PROGS_SUBDIR = src ++endif ++ + SUBDIRS = config lib libelf libcpu backends libebl libdwelf libdwfl libdw \ +- libasm debuginfod src po doc tests ++ libasm debuginfod $(PROGS_SUBDIR) po doc tests + + EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ + COPYING COPYING-GPLV2 COPYING-LGPLV3 diff --git a/package/elfutils/patches/patch-configure_ac b/package/elfutils/patches/patch-configure_ac new file mode 100644 index 000000000..40b65da79 --- /dev/null +++ b/package/elfutils/patches/patch-configure_ac @@ -0,0 +1,24 @@ +--- elfutils-0.189.orig/configure.ac 2023-03-03 16:42:26.000000000 +0100 ++++ elfutils-0.189/configure.ac 2025-01-08 20:12:14.302360288 +0100 +@@ -422,6 +422,12 @@ AS_HELP_STRING([--enable-tests-rpath],[b + [tests_use_rpath=$enableval], [tests_use_rpath=no]) + AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes) + ++AC_ARG_ENABLE([progs], ++ AS_HELP_STRING([--enable-progs], [enable progs]), ++ enable_progs=$enableval, ++ enable_progs=yes) ++AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes) ++ + dnl zlib is mandatory. + save_LIBS="$LIBS" + LIBS= +@@ -659,7 +665,7 @@ saved_LIBS="$LIBS" + AC_SEARCH_LIBS([_obstack_free], [obstack]) + LIBS="$saved_LIBS" + case "$ac_cv_search__obstack_free" in +- no) AC_MSG_FAILURE([failed to find _obstack_free]) ;; ++ no) obstack_LIBS= ;; + -l*) obstack_LIBS="$ac_cv_search__obstack_free" ;; + *) obstack_LIBS= ;; + esac diff --git a/package/enchant/Makefile b/package/enchant/Makefile index 84ffa533f..bfc5e9727 100644 --- a/package/enchant/Makefile +++ b/package/enchant/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= enchant -PKG_VERSION:= 1.6.0 +PKG_VERSION:= 2.8.2 PKG_RELEASE:= 1 -PKG_HASH:= 2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f +PKG_HASH:= 8f19535adb5577b83b00e02f330fe9b9eb40dd21f19e2899636fc4d3a7696375 PKG_DESCR:= spelling library PKG_SECTION:= libs/misc -PKG_SITES:= http://www.abisource.com/downloads/enchant/1.6.0/ +PKG_SITES:= https://github.com/rrthomas/enchant/releases/download/v$(PKG_VERSION)/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/package/enchant/patches/patch-src_Makefile_am b/package/enchant/patches/patch-src_Makefile_am new file mode 100644 index 000000000..35b03b11d --- /dev/null +++ b/package/enchant/patches/patch-src_Makefile_am @@ -0,0 +1,12 @@ +--- enchant-2.8.2.orig/src/Makefile.am 2024-04-25 14:23:39.000000000 +0200 ++++ enchant-2.8.2/src/Makefile.am 2025-03-30 13:10:04.475913008 +0200 +@@ -13,9 +13,6 @@ + + AM_CPPFLAGS = -I$(top_srcdir) $(ISYSTEM)$(top_builddir)/libgnu $(ISYSTEM)$(top_srcdir)/libgnu -I$(top_srcdir)/lib $(GLIB_CFLAGS) $(WARN_CFLAGS) -DG_LOG_DOMAIN='"libenchant"' + +-dist_man_MANS = enchant-@ENCHANT_MAJOR_VERSION@.1 enchant-lsmod-@ENCHANT_MAJOR_VERSION@.1 +-nodist_doc_DATA = enchant-@ENCHANT_MAJOR_VERSION@.html enchant-lsmod-@ENCHANT_MAJOR_VERSION@.html +- + edit = sed \ + -e 's|@PKGDATADIR[@]|$(pkgdatadir)|g' \ + -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' diff --git a/package/enchant/patches/patch-src_Makefile_in b/package/enchant/patches/patch-src_Makefile_in new file mode 100644 index 000000000..324c4016b --- /dev/null +++ b/package/enchant/patches/patch-src_Makefile_in @@ -0,0 +1,22 @@ +--- enchant-2.8.2.orig/src/Makefile.in 2024-08-14 11:33:20.000000000 +0200 ++++ enchant-2.8.2/src/Makefile.in 2025-04-01 05:16:13.945853550 +0200 +@@ -472,8 +472,8 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AM_CPPFLAGS = -I$(top_srcdir) $(ISYSTEM)$(top_builddir)/libgnu $(ISYSTEM)$(top_srcdir)/libgnu -I$(top_srcdir)/lib $(GLIB_CFLAGS) $(WARN_CFLAGS) -DG_LOG_DOMAIN='"libenchant"' +-dist_man_MANS = enchant-@ENCHANT_MAJOR_VERSION@.1 enchant-lsmod-@ENCHANT_MAJOR_VERSION@.1 +-nodist_doc_DATA = enchant-@ENCHANT_MAJOR_VERSION@.html enchant-lsmod-@ENCHANT_MAJOR_VERSION@.html ++dist_man_MANS = ++nodist_doc_DATA = + edit = sed \ + -e 's|@PKGDATADIR[@]|$(pkgdatadir)|g' \ + -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' +@@ -727,7 +727,7 @@ distdir-am: $(DISTFILES) + done + check-am: all-am + check: check-am +-all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) ++all-am: Makefile $(PROGRAMS) $(DATA) + installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile index 5360d31ee..ddf9ae9d8 100644 --- a/package/ethtool/Makefile +++ b/package/ethtool/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= ethtool -PKG_VERSION:= 5.15 +PKG_VERSION:= 6.14 PKG_RELEASE:= 1 -PKG_HASH:= 686fd6110389d49c2a120f00c3cd5dfe43debada8e021e4270d74bbe452a116d +PKG_HASH:= 9338bb00e492878d3bbe3cd2894e60db35813634c208db0b20f5c7ee84da69b1 PKG_DESCR:= display or change ethernet card settings PKG_DEPENDS:= libmnl PKG_BUILDDEP:= libmnl diff --git a/package/ethtool/patches/patch-netlink_msgbuff_c b/package/ethtool/patches/patch-netlink_msgbuff_c new file mode 100644 index 000000000..6c8338bb5 --- /dev/null +++ b/package/ethtool/patches/patch-netlink_msgbuff_c @@ -0,0 +1,15 @@ +--- ethtool-6.14.orig/netlink/msgbuff.c 2024-10-08 23:24:51.000000000 +0200 ++++ ethtool-6.14/netlink/msgbuff.c 2025-04-09 09:16:53.367670289 +0200 +@@ -4,10 +4,12 @@ + * Data structures and code for flexible message buffer abstraction. + */ + ++#define _BSD_SOURCE + #include <string.h> + #include <errno.h> + #include <stdlib.h> + #include <stdint.h> ++#include <unistd.h> + + #include "../internal.h" + #include "netlink.h" diff --git a/package/ethtool/patches/patch-netlink_permaddr_c b/package/ethtool/patches/patch-netlink_permaddr_c new file mode 100644 index 000000000..3230c13df --- /dev/null +++ b/package/ethtool/patches/patch-netlink_permaddr_c @@ -0,0 +1,14 @@ +--- ethtool-6.14.orig/netlink/permaddr.c 2022-12-08 13:20:15.000000000 +0100 ++++ ethtool-6.14/netlink/permaddr.c 2025-04-09 09:17:36.070462620 +0200 +@@ -4,9 +4,11 @@ + * Implementation of "ethtool -P <dev>" + */ + ++#define _BSD_SOURCE + #include <errno.h> + #include <string.h> + #include <stdio.h> ++#include <unistd.h> + #include <linux/rtnetlink.h> + #include <linux/if_link.h> + diff --git a/package/etrax-tools/src/e100boot/Makefile b/package/etrax-tools/src/e100boot/Makefile index 828b40221..f8e4ced02 100644 --- a/package/etrax-tools/src/e100boot/Makefile +++ b/package/etrax-tools/src/e100boot/Makefile @@ -11,7 +11,7 @@ INSTALL_PATH = /usr/local INSTALL_PATH_BIN = $(INSTALL_PATH)/bin INSTALL_PATH_DOC = $(INSTALL_PATH)/man/man1 -DIRS = libpcap-0.4 sbl doc +DIRS = libpcap-0.4 sbl -include $(AXIS_TOP_DIR)/tools/build/Rules.axis ifdef prefix diff --git a/package/etrax-tools/src/e100boot/libpcap-0.4/pcap-linux.c b/package/etrax-tools/src/e100boot/libpcap-0.4/pcap-linux.c index 089ea0ab8..1adc8ef95 100644 --- a/package/etrax-tools/src/e100boot/libpcap-0.4/pcap-linux.c +++ b/package/etrax-tools/src/e100boot/libpcap-0.4/pcap-linux.c @@ -37,6 +37,7 @@ static const char rcsid[] = #include <linux/if_ether.h> #include <netinet/in.h> +#include <linux/sockios.h> #include <errno.h> #include <malloc.h> diff --git a/package/eudev/Makefile b/package/eudev/Makefile index 8ed7c39d7..a14ee569c 100644 --- a/package/eudev/Makefile +++ b/package/eudev/Makefile @@ -4,15 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= eudev -PKG_VERSION:= 3.2.8 +PKG_VERSION:= 3.2.14 PKG_RELEASE:= 1 -PKG_HASH:= 61e4948e9e51271c3cce2bb5311a30b206dd03ef011062e6c627fb007e43f6b8 +PKG_HASH:= 8da4319102f24abbf7fff5ce9c416af848df163b29590e666d334cc1927f006f PKG_DESCR:= device manager PKG_SECTION:= sys/utils -PKG_BUILDDEP:= gperf-host glib -PKG_DEPENDS:= glib libkmod +PKG_BUILDDEP:= gperf-host +PKG_DEPENDS:= libkmod +PKG_KDEPENDS:= inotify-user PKG_URL:= http://wiki.gentoo.org/wiki/Project:Eudev -PKG_SITES:= http://dev.gentoo.org/~blueness/eudev/ +PKG_SITES:= https://github.com/eudev-project/eudev/releases/download/v$(PKG_VERSION)/ PKG_LIBNAME:= libudev PKG_OPTS:= dev diff --git a/package/eudev/files/udev.postinst b/package/eudev/files/udev.postinst index 67c5d00df..ac8535079 100644 --- a/package/eudev/files/udev.postinst +++ b/package/eudev/files/udev.postinst @@ -5,8 +5,10 @@ add_group dialout $(get_next_gid) add_group disk $(get_next_gid) add_group input $(get_next_gid) add_group kmem $(get_next_gid) +add_group kvm $(get_next_gid) add_group lp $(get_next_gid) add_group tape $(get_next_gid) +add_group sgx $(get_next_gid) echo Generating hwdb udevadm hwdb --update --root="$IPKG_INSTROOT" rm -rf "$IPKG_INSTROOT/etc/udev/hwdb.d" diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile index 908bfa3f0..11230e356 100644 --- a/package/evilwm/Makefile +++ b/package/evilwm/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= evilwm -PKG_VERSION:= 1.1.1 +PKG_VERSION:= 1.4.3 PKG_RELEASE:= 1 -PKG_HASH:= 79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a +PKG_HASH:= d5945b20b12c91db2412fac0dbda3fb9c3ec8debb8e1b109838992b2b1bbe5d4 PKG_DESCR:= minimalist window manager PKG_SECTION:= x11/apps PKG_DEPENDS:= libx11 libxext libxrandr diff --git a/package/evilwm/patches/patch-Makefile b/package/evilwm/patches/patch-Makefile index 3c24aa646..4abd6cdb0 100644 --- a/package/evilwm/patches/patch-Makefile +++ b/package/evilwm/patches/patch-Makefile @@ -1,17 +1,6 @@ ---- evilwm-1.1.1.orig/Makefile 2015-07-13 12:19:36.000000000 +0200 -+++ evilwm-1.1.1/Makefile 2016-11-10 02:38:08.961425099 +0100 -@@ -17,6 +17,10 @@ desktopfilesdir = $(datarootdir)/applica - ############################################################################ - # Features - -+XROOT ?= /usr/X11R6 -+OPT_CPPFLAGS += -I$(XROOT)/include -+OPT_LDLIBS += -L$(XROOT)/lib -+ - # Uncomment to enable info banner on holding Ctrl+Alt+I. - OPT_CPPFLAGS += -DINFOBANNER - -@@ -71,10 +75,10 @@ OPT_CPPFLAGS += -DVWM +--- evilwm-1.4.3.orig/Makefile 2024-03-09 11:20:46.000000000 +0100 ++++ evilwm-1.4.3/Makefile 2025-04-12 11:03:24.427876287 +0200 +@@ -83,10 +83,10 @@ OPT_CPPFLAGS += -DNDEBUG # disable asse # Build tools # Change this if you don't use gcc: @@ -24,12 +13,12 @@ WARN = -Wall -W -Wstrict-prototypes -Wpointer-arith -Wcast-align \ -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings \ -Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls -@@ -89,7 +93,7 @@ WARN = -Wall -W -Wstrict-prototypes -Wpo +@@ -100,7 +100,7 @@ WARN = -Wall -W -Wstrict-prototypes -Wpo + #EXEEXT = .exe - # Override INSTALL_STRIP if you don't want a stripped binary INSTALL = install --INSTALL_STRIP = -s -+INSTALL_STRIP = +-STRIP = strip ++STRIP ?= strip INSTALL_DIR = $(INSTALL) -d -m 0755 INSTALL_FILE = $(INSTALL) -m 0644 - INSTALL_PROGRAM = $(INSTALL) -m 0755 $(INSTALL_STRIP) + INSTALL_PROGRAM = $(INSTALL) -m 0755 diff --git a/package/evilwm/patches/patch-keymap_h b/package/evilwm/patches/patch-keymap_h deleted file mode 100644 index 9b8fa0f22..000000000 --- a/package/evilwm/patches/patch-keymap_h +++ /dev/null @@ -1,44 +0,0 @@ ---- evilwm-1.1.0.orig/keymap.h 2011-07-03 16:14:21.000000000 +0200 -+++ evilwm-1.1.0/keymap.h 2011-11-29 19:54:57.437509136 +0100 -@@ -2,23 +2,23 @@ - #define _KEYMAP_H - - #define KEY_NEXT XK_Tab --#define KEY_NEW XK_Return --#define KEY_TOPLEFT XK_y --#define KEY_TOPRIGHT XK_u --#define KEY_BOTTOMLEFT XK_b --#define KEY_BOTTOMRIGHT XK_n -+#define KEY_NEW XK_e -+#define KEY_TOPLEFT XK_a -+#define KEY_TOPRIGHT XK_s -+#define KEY_BOTTOMLEFT XK_y -+#define KEY_BOTTOMRIGHT XK_x - #define KEY_LEFT XK_h - #define KEY_RIGHT XK_l - #define KEY_DOWN XK_j --#define KEY_UP XK_k -+#define KEY_UP XK_g - #define KEY_LOWER XK_Insert - #define KEY_ALTLOWER XK_KP_Insert - #define KEY_INFO XK_i - #define KEY_MAXVERT XK_equal --#define KEY_MAX XK_x --#define KEY_DOCK_TOGGLE XK_d -+#define KEY_MAX XK_m -+#define KEY_DOCK_TOGGLE XK_f - #ifdef VWM --# define KEY_FIX XK_f -+# define KEY_FIX XK_d - # define KEY_PREVDESK XK_Left - # define KEY_NEXTDESK XK_Right - # define KEY_TOGGLEDESK XK_a -@@ -26,7 +26,7 @@ - /* Mixtures of Ctrl, Alt an Escape are used for things like VMWare and - * XFree86/Cygwin, so the KILL key is an option in the Makefile */ - #ifndef KEY_KILL --# define KEY_KILL XK_Escape -+# define KEY_KILL XK_k - #endif - - #endif diff --git a/package/exiv2/Makefile b/package/exiv2/Makefile new file mode 100644 index 000000000..4768487c1 --- /dev/null +++ b/package/exiv2/Makefile @@ -0,0 +1,33 @@ +# 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:= exiv2 +PKG_VERSION:= 0.28.7 +PKG_RELEASE:= 1 +PKG_HASH:= 5e292b02614dbc0cee40fe1116db2f42f63ef6b2ba430c77b614e17b8d61a638 +PKG_DESCR:= fast read and write access to the Exif, IPTC and XMP metadata of an image +PKG_SECTION:= libs/misc +PKG_DEPENDS:= libinih +PKG_BUILDDEP:= libinih +PKG_URL:= https://www.exiv2.org +PKG_SITES:= https://github.com/Exiv2/exiv2/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,EXIV2,exiv2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DEXIV2_ENABLE_BROTLI=OFF \ + -DBUILD_WITH_STACK_PROTECTOR=OFF + +exiv2-install: + $(INSTALL_DIR) $(IDIR_EXIV2)/usr/lib + $(CP) $(WRKINST)/usr/lib/libexiv2*.so* \ + $(IDIR_EXIV2)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/expat/Makefile b/package/expat/Makefile index 986a97218..d4f529697 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -4,14 +4,12 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= expat -PKG_VERSION:= 2.6.2 +PKG_VERSION:= 2.7.3 PKG_RELEASE:= 1 -PKG_HASH:= ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 +PKG_HASH:= 71df8f40706a7bb0a80a5367079ea75d91da4f8c65c58ec59bcdfbf7decdab9f PKG_DESCR:= xml parsing library PKG_SECTION:= libs/data -PKG_NEEDS:= c++ -PKG_URL:= http://expat.sourceforge.net -PKG_SITES:= https://github.com/libexpat/libexpat/releases/download/R_2_6_2/ +PKG_SITES:= https://github.com/libexpat/libexpat/releases/download/R_2_7_3/ PKG_LIBNAME:= libexpat PKG_OPTS:= dev @@ -26,7 +24,8 @@ TARGET_CFLAGS:= $(filter-out -static,$(TARGET_CFLAGS)) TARGET_LDFLAGS:=$(filter-out -static,$(TARGET_LDFLAGS)) endif -CONFIGURE_ARGS+= --without-docbook +CONFIGURE_ARGS+= --without-docbook \ + --without-tests libexpat-install: ${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib diff --git a/package/faad2/Makefile b/package/faad2/Makefile index 97c2e2995..8ed5cf72b 100644 --- a/package/faad2/Makefile +++ b/package/faad2/Makefile @@ -21,8 +21,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) AUTOTOOL_STYLE:= autoreconf -# check for lrintf fails on Darwin, don't know why -CONFIGURE_ENV+= ac_cv_c99_lrintf=yes CONFIGURE_ARGS+= --without-mpeg4ip \ --without-xmms TARGET_LDFLAGS+= -lm diff --git a/package/fastjar/Makefile b/package/fastjar/Makefile deleted file mode 100644 index bb19be675..000000000 --- a/package/fastjar/Makefile +++ /dev/null @@ -1,24 +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:= fastjar -PKG_VERSION:= 0.98 -PKG_RELEASE:= 1 -PKG_HASH:= f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145 -PKG_DESCR:= fastjar utility -PKG_SECTION:= dev/tools -PKG_SITES:= http://download.savannah.gnu.org/releases/fastjar/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -PKG_CFLINE_FASTJAR:= depends on ADK_HOST_ONLY - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,FASTJAR,fastjar,$(PKG_VERSION)-${PKG_RELEASE})) - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 8c00cdef4..ce7180293 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,20 +4,20 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 6.1.1 +PKG_VERSION:= 7.1.2 PKG_RELEASE:= 1 -PKG_HASH:= 5e3133939a61ef64ac9b47ffd29a5ea6e337a4023ef0ad972094b4da844e3a20 +PKG_HASH:= 5eb62f529114778333b7eb0381cb16e2b8725ce2ae081d07b1082effe22b12e9 PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs/video PKG_NEEDS:= threads -PKG_DEPENDS:= libncurses libressl -PKG_BUILDDEP:= ncurses libressl +PKG_DEPENDS:= libncurses +PKG_BUILDDEP:= ncurses PKG_URL:= http://www.ffmpeg.org/ PKG_SITES:= http://www.ffmpeg.org/releases/ PKG_LIBNAME:= libffmpeg PKG_OPTS:= dev -PKG_CHOICES_FFMPEG:= WITH_LIBRESSL WITH_OPENSSL +PKG_CHOICES_LIBFFMPEG:= WITH_OPENSSL WITH_LIBRESSL PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCB_WITH_LIBRESSL:= libressl @@ -196,7 +196,6 @@ CONFIGURE_ARGS:= --prefix=/usr \ --disable-doc \ --disable-debug \ --disable-iconv \ - --disable-yasm \ --disable-optimizations \ --disable-stripping \ --enable-shared \ @@ -206,6 +205,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --enable-swscale \ --enable-postproc \ --enable-openssl \ + --disable-x86asm \ $(CONFIGURE_CPU_OPTS) ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_BZIP2),y) diff --git a/package/ffmpeg/src/libavcodec/arm/synth_filter_vfp.S b/package/ffmpeg/src/libavcodec/arm/synth_filter_vfp.S deleted file mode 100644 index 451fe5ce9..000000000 --- a/package/ffmpeg/src/libavcodec/arm/synth_filter_vfp.S +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Copyright (c) 2013 RISC OS Open Ltd - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Author: Ben Avison <bavison@riscosopen.org> - */ - -#include "libavutil/arm/asm.S" - -IMDCT .req r0 -ORIG_P_SB .req r1 -P_SB_OFF .req r2 -I .req r0 -P_SB2_UP .req r1 -OLDFPSCR .req r2 -P_SB2_DN .req r3 -P_WIN_DN .req r4 -P_OUT_DN .req r5 -P_SB .req r6 -J_WRAP .req r7 -P_WIN_UP .req r12 -P_OUT_UP .req r14 - -SCALE .req s0 -SBUF_DAT_REV0 .req s4 -SBUF_DAT_REV1 .req s5 -SBUF_DAT_REV2 .req s6 -SBUF_DAT_REV3 .req s7 -VA0 .req s8 -VA3 .req s11 -VB0 .req s12 -VB3 .req s15 -VC0 .req s8 -VC3 .req s11 -VD0 .req s12 -VD3 .req s15 -SBUF_DAT0 .req s16 -SBUF_DAT1 .req s17 -SBUF_DAT2 .req s18 -SBUF_DAT3 .req s19 -SBUF_DAT_ALT0 .req s20 -SBUF_DAT_ALT1 .req s21 -SBUF_DAT_ALT2 .req s22 -SBUF_DAT_ALT3 .req s23 -WIN_DN_DAT0 .req s24 -WIN_UP_DAT0 .req s28 - - -.macro inner_loop half, tail, head - .if (OFFSET & (64*4)) == 0 @ even numbered call - SBUF_DAT_THIS0 .req SBUF_DAT0 - SBUF_DAT_THIS1 .req SBUF_DAT1 - SBUF_DAT_THIS2 .req SBUF_DAT2 - SBUF_DAT_THIS3 .req SBUF_DAT3 - .ifnc "\head","" - vldr d8, [P_SB, #OFFSET] @ d8 = SBUF_DAT - vldr d9, [P_SB, #OFFSET+8] - .endif - .else - SBUF_DAT_THIS0 .req SBUF_DAT_ALT0 - SBUF_DAT_THIS1 .req SBUF_DAT_ALT1 - SBUF_DAT_THIS2 .req SBUF_DAT_ALT2 - SBUF_DAT_THIS3 .req SBUF_DAT_ALT3 - .ifnc "\head","" - vldr d10, [P_SB, #OFFSET] @ d10 = SBUF_DAT_ALT - vldr d11, [P_SB, #OFFSET+8] - .endif - .endif - .ifnc "\tail","" - .ifc "\half","ab" - vmls.f VA0, SBUF_DAT_REV0, WIN_DN_DAT0 @ all operands treated as vectors - .else - vmla.f VD0, SBUF_DAT_REV0, WIN_DN_DAT0 @ all operands treated as vectors - .endif - .endif - .ifnc "\head","" - vldr d14, [P_WIN_UP, #OFFSET] @ d14 = WIN_UP_DAT - vldr d15, [P_WIN_UP, #OFFSET+8] - vldr d12, [P_WIN_DN, #OFFSET] @ d12 = WIN_DN_DAT - vldr d13, [P_WIN_DN, #OFFSET+8] - vmov SBUF_DAT_REV3, SBUF_DAT_THIS0 - vmov SBUF_DAT_REV2, SBUF_DAT_THIS1 - vmov SBUF_DAT_REV1, SBUF_DAT_THIS2 - vmov SBUF_DAT_REV0, SBUF_DAT_THIS3 - .ifc "\half","ab" - vmla.f VB0, SBUF_DAT_THIS0, WIN_UP_DAT0 - .else - vmla.f VC0, SBUF_DAT_THIS0, WIN_UP_DAT0 - .endif - teq J_WRAP, #J - bne 2f @ strongly predictable, so better than cond exec in this case - sub P_SB, P_SB, #512*4 -2: - .set J, J - 64 - .set OFFSET, OFFSET + 64*4 - .endif - .unreq SBUF_DAT_THIS0 - .unreq SBUF_DAT_THIS1 - .unreq SBUF_DAT_THIS2 - .unreq SBUF_DAT_THIS3 -.endm - - -/* void ff_synth_filter_float_vfp(FFTContext *imdct, - * float *synth_buf_ptr, int *synth_buf_offset, - * float synth_buf2[32], const float window[512], - * float out[32], const float in[32], float scale) - */ -function ff_synth_filter_float_vfp, export=1 - push {r3-r7,lr} - vpush {s16-s31} - ldr lr, [P_SB_OFF] - add a2, ORIG_P_SB, lr, LSL #2 @ calculate synth_buf to pass to imdct_half - mov P_SB, a2 @ and keep a copy for ourselves - bic J_WRAP, lr, #63 @ mangled to make testing for wrap easier in inner loop - sub lr, lr, #32 - and lr, lr, #512-32 - str lr, [P_SB_OFF] @ rotate offset, modulo buffer size, ready for next call - ldr a3, [sp, #(16+6+2)*4] @ fetch in from stack, to pass to imdct_half -VFP vmov s16, SCALE @ imdct_half is free to corrupt s0, but it contains one of our arguments in hardfp case - bl ff_imdct_half_c -VFP vmov SCALE, s16 - - vmrs OLDFPSCR, FPSCR - ldr lr, =0x03030000 @ RunFast mode, short vectors of length 4, stride 1 - vmsr FPSCR, lr - ldr P_SB2_DN, [sp, #16*4] - ldr P_WIN_DN, [sp, #(16+6+0)*4] - ldr P_OUT_DN, [sp, #(16+6+1)*4] -NOVFP vldr SCALE, [sp, #(16+6+3)*4] - -#define IMM_OFF_SKEW 956 /* also valid immediate constant when you add 16*4 */ - add P_SB, P_SB, #IMM_OFF_SKEW @ so we can use -ve offsets to use full immediate offset range - add P_SB2_UP, P_SB2_DN, #16*4 - add P_WIN_UP, P_WIN_DN, #16*4+IMM_OFF_SKEW - add P_OUT_UP, P_OUT_DN, #16*4 - add P_SB2_DN, P_SB2_DN, #16*4 - add P_WIN_DN, P_WIN_DN, #12*4+IMM_OFF_SKEW - add P_OUT_DN, P_OUT_DN, #16*4 - mov I, #4 -1: - vldmia P_SB2_UP!, {VB0-VB3} - vldmdb P_SB2_DN!, {VA0-VA3} - .set J, 512 - 64 - .set OFFSET, -IMM_OFF_SKEW - inner_loop ab,, head - .rept 7 - inner_loop ab, tail, head - .endr - inner_loop ab, tail - add P_WIN_UP, P_WIN_UP, #4*4 - sub P_WIN_DN, P_WIN_DN, #4*4 - vmul.f VB0, VB0, SCALE @ SCALE treated as scalar - add P_SB, P_SB, #(512+4)*4 - subs I, I, #1 - vmul.f VA0, VA0, SCALE - vstmia P_OUT_UP!, {VB0-VB3} - vstmdb P_OUT_DN!, {VA0-VA3} - bne 1b - - add P_SB2_DN, P_SB2_DN, #(16+28-12)*4 - sub P_SB2_UP, P_SB2_UP, #(16+16)*4 - add P_WIN_DN, P_WIN_DN, #(32+16+28-12)*4 - mov I, #4 -1: - vldr.d d4, zero @ d4 = VC0 - vldr.d d5, zero - vldr.d d6, zero @ d6 = VD0 - vldr.d d7, zero - .set J, 512 - 64 - .set OFFSET, -IMM_OFF_SKEW - inner_loop cd,, head - .rept 7 - inner_loop cd, tail, head - .endr - inner_loop cd, tail - add P_WIN_UP, P_WIN_UP, #4*4 - sub P_WIN_DN, P_WIN_DN, #4*4 - add P_SB, P_SB, #(512+4)*4 - subs I, I, #1 - vstmia P_SB2_UP!, {VC0-VC3} - vstmdb P_SB2_DN!, {VD0-VD3} - bne 1b - - vmsr FPSCR, OLDFPSCR - vpop {s16-s31} - pop {r3-r7,pc} -endfunc - - .align 3 -zero: .word 0, 0 diff --git a/package/firefox/Makefile b/package/firefox/Makefile index eb3cfeb9e..7256f3fe5 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -4,15 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= firefox -PKG_VERSION:= 108.0.1 +PKG_VERSION:= 129.0.2 PKG_RELEASE:= 1 -PKG_HASH:= 9821ac130dad01383e03276bf6cc92d41329d351da1fa7fa238168f8890611ea +PKG_HASH:= 35a1da121af474833d013ecbc1f77aa55bb35678fe06d438842d320dfab3f344 PKG_DESCR:= www browser PKG_SECTION:= app/browser PKG_DEPENDS:= pango libfreetype fontconfig libxcomposite libxcursor -PKG_DEPENDS+= libgtk3 dbus-glib alsa-lib libatk harfbuzz +PKG_DEPENDS+= libgtk3 dbus-glib alsa-lib harfbuzz PKG_BUILDDEP:= python3-host nodejs-host pango freetype fontconfig libXcomposite -PKG_BUILDDEP+= libXcursor libgtk3 dbus-glib alsa-lib atk harfbuzz +PKG_BUILDDEP+= libXcursor libgtk3 dbus-glib alsa-lib harfbuzz PKG_SITES:= https://ftp.mozilla.org/pub/firefox/releases/$(PKG_VERSION)/source/ PKG_ARCH_DEPENDS:= aarch64 @@ -41,7 +41,9 @@ CONFIGURE_ARGS+= --prefix=/usr \ --disable-audio-backends \ --without-wasm-sandboxed-libraries \ --disable-profiling \ - --with-clang-path=/usr/bin/clang-13 + --disable-crashreporter \ + --with-clang-path=/usr/bin/clang-18 \ + --with-libclang-path=/usr/lib/llvm-18/lib firefox-install: $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin diff --git a/package/firefox/patches/patch-build_moz_configure_flags_configure b/package/firefox/patches/patch-build_moz_configure_flags_configure new file mode 100644 index 000000000..c0ac77a7c --- /dev/null +++ b/package/firefox/patches/patch-build_moz_configure_flags_configure @@ -0,0 +1,13 @@ +--- firefox-129.0.2.orig/build/moz.configure/flags.configure 2024-08-19 21:21:42.000000000 +0200 ++++ firefox-129.0.2/build/moz.configure/flags.configure 2024-09-08 06:27:20.661198142 +0200 +@@ -72,10 +72,6 @@ def link_libstdcxx_statically( + ) + + +-@depends(when=link_libstdcxx_statically) +-def check_libstdcxx_linkage(): +- die("Firefox does not support linking statically with libstdc++") +- + + check_and_add_flag( + "-mieee", diff --git a/package/firefox/patches/patch-servo_components_style_traits_values_rs b/package/firefox/patches/patch-servo_components_style_traits_values_rs new file mode 100644 index 000000000..cc02de658 --- /dev/null +++ b/package/firefox/patches/patch-servo_components_style_traits_values_rs @@ -0,0 +1,37 @@ +--- firefox-129.0.2.orig/servo/components/style_traits/values.rs 2024-08-19 21:21:51.000000000 +0200 ++++ firefox-129.0.2/servo/components/style_traits/values.rs 2024-09-08 06:18:31.271680673 +0200 +@@ -388,11 +388,11 @@ impl Separator for Space { + where + F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>, + { +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. + let mut results = vec![parse_one(input)?]; + loop { +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. +- if let Ok(item) = input.try(&mut parse_one) { ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. ++ if let Ok(item) = input.try_parse(&mut parse_one) { + results.push(item); + } else { + return Ok(results); +@@ -413,14 +413,14 @@ impl Separator for CommaWithSpace { + where + F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>, + { +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. + let mut results = vec![parse_one(input)?]; + loop { +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. + let comma_location = input.current_source_location(); +- let comma = input.try(|i| i.expect_comma()).is_ok(); +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. +- if let Ok(item) = input.try(&mut parse_one) { ++ let comma = input.try_parse(|i| i.expect_comma()).is_ok(); ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. ++ if let Ok(item) = input.try_parse(&mut parse_one) { + results.push(item); + } else if comma { + return Err(comma_location.new_unexpected_token_error(Token::Comma)); diff --git a/package/firefox/patches/patch-servo_ports_geckolib_cbindgen_toml b/package/firefox/patches/patch-servo_ports_geckolib_cbindgen_toml new file mode 100644 index 000000000..7cf9a3d17 --- /dev/null +++ b/package/firefox/patches/patch-servo_ports_geckolib_cbindgen_toml @@ -0,0 +1,10 @@ +--- firefox-129.0.2.orig/servo/ports/geckolib/cbindgen.toml 2024-08-19 21:21:52.000000000 +0200 ++++ firefox-129.0.2/servo/ports/geckolib/cbindgen.toml 2024-09-08 06:18:31.275680774 +0200 +@@ -360,7 +360,6 @@ renaming_overrides_prefixing = true + "Keyframe" = "Keyframe" + "nsChangeHint" = "nsChangeHint" + "ServoElementSnapshotTable" = "ServoElementSnapshotTable" +-"Keyframe" = "Keyframe" + "ComputedKeyframeValues" = "ComputedKeyframeValues" + "OriginFlags" = "OriginFlags" + "ServoTraversalFlags" = "ServoTraversalFlags" diff --git a/package/flac/Makefile b/package/flac/Makefile index d6a89159d..ceeb695cd 100644 --- a/package/flac/Makefile +++ b/package/flac/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= flac -PKG_VERSION:= 1.3.4 +PKG_VERSION:= 1.5.0 PKG_RELEASE:= 1 -PKG_HASH:= 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 +PKG_HASH:= f2c1c76592a82ffff8413ba3c4a1299b6c7ab06c734dee03fd88630485c2b920 PKG_DESCR:= free lossless audio codec utility PKG_SECTION:= mm/audio PKG_DEPENDS:= libflac diff --git a/package/flatbuffers/Makefile b/package/flatbuffers/Makefile index f4811d7a8..719b5359e 100644 --- a/package/flatbuffers/Makefile +++ b/package/flatbuffers/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= flatbuffers -PKG_VERSION:= 2.0.6 +PKG_VERSION:= 25.9.23 PKG_RELEASE:= 1 -PKG_HASH:= e2dc24985a85b278dd06313481a9ca051d048f9474e0f199e372fea3ea4248c9 +PKG_HASH:= 9102253214dea6ae10c2ac966ea1ed2155d22202390b532d1dea64935c518ada PKG_DESCR:= cross platform serialization library PKG_SECTION:= libs/misc PKG_BUILDDEP:= flatbuffers-host diff --git a/package/flex/Makefile b/package/flex/Makefile index 5570365ff..812eb241b 100644 --- a/package/flex/Makefile +++ b/package/flex/Makefile @@ -23,6 +23,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,FLEX,flex,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,FLEX,flex,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +TARGET_CFLAGS+= -Wno-int-conversion -Wno-implicit-function-declaration AUTOTOOL_STYLE:= autoreconf HOST_MAKE_FLAGS+= STAGE1FLEX=$(WRKSRC)/src/stage1flex MAKE_FLAGS+= STAGE1FLEX=$(STAGING_HOST_DIR)/usr/bin/stage1flex diff --git a/package/flex/patches/patch-lib_malloc_c b/package/flex/patches/patch-lib_malloc_c new file mode 100644 index 000000000..e7b92c836 --- /dev/null +++ b/package/flex/patches/patch-lib_malloc_c @@ -0,0 +1,11 @@ +--- flex-2.6.4.orig/lib/malloc.c 2016-10-21 02:43:44.000000000 +0200 ++++ flex-2.6.4/lib/malloc.c 2025-04-11 16:38:56.667984564 +0200 +@@ -3,7 +3,7 @@ + + #include <sys/types.h> + +- void *malloc (); ++ void *malloc (size_t n); + + /* Allocate an N-byte block of memory from the heap. + If N is zero, allocate a 1-byte block. */ diff --git a/package/fltk/Makefile b/package/fltk/Makefile index ce17671e8..77d299cf9 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -4,19 +4,20 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= fltk -PKG_VERSION:= 1.3.8 +PKG_VERSION:= 1.3.11 PKG_RELEASE:= 1 -PKG_HASH:= f3c1102b07eb0e7a50538f9fc9037c18387165bc70d4b626e94ab725b9d4d1bf +PKG_HASH:= 92805abc84505e3e7e27aec775ab0754ecb4182fe2d8ff2a9d568ccdcb2811ac PKG_DESCR:= fast light toolkit PKG_SECTION:= libs/misc PKG_DEPENDS:= mesa libx11 libxi freeglut libfreetype PKG_BUILDDEP:= libX11 libXi mesa freeglut freetype +PKG_NEEDS:= locale PKG_URL:= http://www.fltk.org/ -PKG_SITES:= http://fltk.org/pub/fltk/$(PKG_VERSION)/ +PKG_SITES:= https://github.com/fltk/fltk/releases/download/release-$(PKG_VERSION)/ PKG_LIBNAME:= libfltk PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= x86 x86_64 mips arm +PKG_ARCH_DEPENDS:= aarch64 x86 x86_64 mips sh arm DISTFILES:= ${PKG_NAME}-$(PKG_VERSION)-source.tar.gz @@ -24,7 +25,10 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ARGS+= --disable-xinerama +CONFIGURE_ARGS+= --disable-xinerama \ + --disable-print \ + --disable-fluid \ + --disable-test libfltk-install: $(INSTALL_DIR) $(IDIR_LIBFLTK)/usr/lib diff --git a/package/fltk/patches/patch-Makefile b/package/fltk/patches/patch-Makefile index d6755ba24..1d7f0ea9b 100644 --- a/package/fltk/patches/patch-Makefile +++ b/package/fltk/patches/patch-Makefile @@ -1,11 +1,11 @@ ---- fltk-1.3.2.orig/Makefile 2011-07-19 06:49:30.000000000 +0200 -+++ fltk-1.3.2/Makefile 2014-05-28 13:50:10.000000000 +0200 -@@ -18,7 +18,7 @@ +--- fltk-1.3.11.orig/Makefile 2025-02-05 15:03:09.000000000 +0100 ++++ fltk-1.3.11/Makefile 2025-08-03 08:48:11.761069409 +0200 +@@ -16,7 +16,7 @@ include makeinclude -DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation -+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation ++DIRS = $(IMAGEDIRS) src $(CAIRODIR) all: makeinclude fltk-config for dir in $(DIRS); do\ diff --git a/package/fltk/patches/patch-makeinclude_in b/package/fltk/patches/patch-makeinclude_in deleted file mode 100644 index 8581117de..000000000 --- a/package/fltk/patches/patch-makeinclude_in +++ /dev/null @@ -1,12 +0,0 @@ ---- fltk-1.3.2.orig/makeinclude.in 2012-12-05 15:53:03.000000000 +0100 -+++ fltk-1.3.2/makeinclude.in 2014-05-28 16:08:25.000000000 +0200 -@@ -130,9 +130,6 @@ INSTALL_SCRIPT = $(INSTALL) -m 755 - INSTALL_DESKTOP = @INSTALL_DESKTOP@ - UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ - --# Be quiet when building... --.SILENT: -- - # Build commands and filename extensions... - .SUFFIXES: .0 .1 .3 .6 .c .cxx .mm .h .fl .man .o .z $(EXEEXT) - diff --git a/package/fmt/Makefile b/package/fmt/Makefile index 82d25c0cf..81d9d08aa 100644 --- a/package/fmt/Makefile +++ b/package/fmt/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= fmt -PKG_VERSION:= 8.1.1 +PKG_VERSION:= 11.2.0 PKG_RELEASE:= 1 -PKG_HASH:= 3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346 +PKG_HASH:= bc23066d87ab3168f27cef3e97d545fa63314f5c79df5ea444d41d56f962c6af PKG_DESCR:= modern formatting library PKG_SECTION:= libs/misc PKG_BUILDDEP:= cmake-host diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile index d0cd64f30..cf4f25c08 100644 --- a/package/font-adobe-100dpi/Makefile +++ b/package/font-adobe-100dpi/Makefile @@ -14,19 +14,15 @@ PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/font/ -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,FONT_ADOBE_100DPI,font-adobe-100dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -XAKE_FLAGS+= DESTDIR='' - font-adobe-100dpi-install: $(INSTALL_DIR) $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi - $(CP) ${STAGING_TARGET_DIR}/usr/share/fonts/X11/100dpi/* \ + $(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \ $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile index 68ae9963b..61dc6568a 100644 --- a/package/font-adobe-75dpi/Makefile +++ b/package/font-adobe-75dpi/Makefile @@ -14,19 +14,15 @@ PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/font/ -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,FONT_ADOBE_75DPI,font-adobe-75dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -XAKE_FLAGS+= DESTDIR='' - font-adobe-75dpi-install: $(INSTALL_DIR) $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi - $(CP) ${STAGING_TARGET_DIR}/usr/share/fonts/X11/75dpi/* \ + $(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \ $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-alias/Makefile b/package/font-alias/Makefile new file mode 100644 index 000000000..a65622140 --- /dev/null +++ b/package/font-alias/Makefile @@ -0,0 +1,35 @@ +# 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:= font-alias +PKG_VERSION:= 1.0.5 +PKG_RELEASE:= 1 +PKG_HASH:= f8e0ca6537003f11fcaf36c598f7de9c0428f8ed587388a8a37ff18ccc597730 +PKG_DESCR:= font alias utility +PKG_SECTION:= x11/fonts +PKG_URL:= http://www.x.org/ +PKG_SITES:= http://www.x.org/releases/individual/font/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz + +include ${ADK_TOPDIR}/mk/host.mk +include ${ADK_TOPDIR}/mk/package.mk + +$(eval $(call HOST_template,FONT_ALIAS,font-alias,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FONT_ALIAS,font-alias,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +font-alias-install: + ${INSTALL_DIR} ${IDIR_FONT_ALIAS}/usr/share/fonts/X11/misc + ${CP} ${WRKINST}/usr/share/fonts/X11/misc/fonts.alias \ + ${IDIR_FONT_ALIAS}/usr/share/fonts/X11/misc + ${INSTALL_DIR} ${IDIR_FONT_ALIAS}/usr/share/fonts/X11/100dpi + ${CP} ${WRKINST}/usr/share/fonts/X11/100dpi/fonts.alias \ + ${IDIR_FONT_ALIAS}/usr/share/fonts/X11/100dpi + ${INSTALL_DIR} ${IDIR_FONT_ALIAS}/usr/share/fonts/X11/75dpi + ${CP} ${WRKINST}/usr/share/fonts/X11/75dpi/fonts.alias \ + ${IDIR_FONT_ALIAS}/usr/share/fonts/X11/75dpi + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-bh-100dpi/Makefile b/package/font-bh-100dpi/Makefile index 4d7f0f702..392913fa9 100644 --- a/package/font-bh-100dpi/Makefile +++ b/package/font-bh-100dpi/Makefile @@ -13,8 +13,6 @@ PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/font/ -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/font-bh-75dpi/Makefile b/package/font-bh-75dpi/Makefile index 4e74525ff..2855c94d3 100644 --- a/package/font-bh-75dpi/Makefile +++ b/package/font-bh-75dpi/Makefile @@ -13,8 +13,6 @@ PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/font/ -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/font-bh-lucidatypewriter-100dpi/Makefile b/package/font-bh-lucidatypewriter-100dpi/Makefile index 7f0112666..f4dab632c 100644 --- a/package/font-bh-lucidatypewriter-100dpi/Makefile +++ b/package/font-bh-lucidatypewriter-100dpi/Makefile @@ -13,8 +13,6 @@ PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/font/ -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/font-bh-lucidatypewriter-75dpi/Makefile b/package/font-bh-lucidatypewriter-75dpi/Makefile index b5fd10f89..ae0315385 100644 --- a/package/font-bh-lucidatypewriter-75dpi/Makefile +++ b/package/font-bh-lucidatypewriter-75dpi/Makefile @@ -13,8 +13,6 @@ PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/font/ -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/font-bh-ttf/Makefile b/package/font-bh-ttf/Makefile index 203dcb36c..7a26e0292 100644 --- a/package/font-bh-ttf/Makefile +++ b/package/font-bh-ttf/Makefile @@ -13,8 +13,6 @@ PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/font/ -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/font-bh-type1/Makefile b/package/font-bh-type1/Makefile index e485ff58f..ed23ff38b 100644 --- a/package/font-bh-type1/Makefile +++ b/package/font-bh-type1/Makefile @@ -13,8 +13,6 @@ PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/font/ -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/font-bitstream-100dpi/Makefile b/package/font-bitstream-100dpi/Makefile index 3e7293563..aa1f8613f 100644 --- a/package/font-bitstream-100dpi/Makefile +++ b/package/font-bitstream-100dpi/Makefile @@ -13,8 +13,6 @@ PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/font/ -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/font-bitstream-75dpi/Makefile b/package/font-bitstream-75dpi/Makefile index f6009a628..7a9560911 100644 --- a/package/font-bitstream-75dpi/Makefile +++ b/package/font-bitstream-75dpi/Makefile @@ -13,8 +13,6 @@ PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/font/ -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/font-bitstream-type1/Makefile b/package/font-bitstream-type1/Makefile index fd7936466..2b1445fde 100644 --- a/package/font-bitstream-type1/Makefile +++ b/package/font-bitstream-type1/Makefile @@ -13,8 +13,6 @@ PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/font/ -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/font-cursor-misc/Makefile b/package/font-cursor-misc/Makefile new file mode 100644 index 000000000..bcc7c9687 --- /dev/null +++ b/package/font-cursor-misc/Makefile @@ -0,0 +1,29 @@ +# 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:= font-cursor-misc +PKG_VERSION:= 1.0.4 +PKG_RELEASE:= 1 +PKG_HASH:= 37ef2363b3cfa6f5e20b65feab736db77fad484127c267b78de95d55fa39f61d +PKG_DESCR:= font cursor-misc +PKG_SECTION:= x11/fonts +PKG_URL:= http://www.x.org/ +PKG_SITES:= http://www.x.org/releases/individual/font/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz + +include ${ADK_TOPDIR}/mk/host.mk +include ${ADK_TOPDIR}/mk/package.mk + +$(eval $(call HOST_template,FONT_CURSOR_MISC,font-cursor-misc,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FONT_CURSOR_MISC,font-cursor-misc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +font-cursor-misc-install: + ${INSTALL_DIR} ${IDIR_FONT_CURSOR_MISC}/usr/share/fonts/X11/misc + ${CP} ${WRKINST}/usr/share/fonts/X11/misc/cursor.pcf.gz \ + ${IDIR_FONT_CURSOR_MISC}/usr/share/fonts/X11/misc + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile index 43ba411f4..ee3f80426 100644 --- a/package/font-misc-misc/Makefile +++ b/package/font-misc-misc/Makefile @@ -13,8 +13,6 @@ PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/font/ -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/font-util/Makefile b/package/font-util/Makefile index 5b9289f89..eeb265a28 100644 --- a/package/font-util/Makefile +++ b/package/font-util/Makefile @@ -14,8 +14,10 @@ PKG_SITES:= http://www.x.org/releases/individual/font/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk +$(eval $(call HOST_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) # XXX: Push the mapping files to a place where we can find them @@ -38,4 +40,5 @@ font-util-install: ${CP} ${WRKINST}/usr/share/fonts/X11/util/* \ ${IDIR_FONT_UTIL}/usr/share/fonts/X11/util +include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-xfree86-type1/Makefile b/package/font-xfree86-type1/Makefile index 3fa93b93a..20bb46569 100644 --- a/package/font-xfree86-type1/Makefile +++ b/package/font-xfree86-type1/Makefile @@ -13,8 +13,6 @@ PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/font/ -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index 15e797efc..aeb6fc8e9 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -4,33 +4,32 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= fontconfig -PKG_VERSION:= 2.13.1 +PKG_VERSION:= 2.16.0 PKG_RELEASE:= 1 -PKG_HASH:= 9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f +PKG_HASH:= 6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220 PKG_DESCR:= library for configuring and customizing font access PKG_SECTION:= libs/fonts -PKG_DEPENDS:= libxml2 +PKG_DEPENDS:= libfreetype libxml2 PKG_BUILDDEP:= freetype libxml2 gperf-host util-linux HOST_BUILDDEP:= expat-host PKG_URL:= http://fontconfig.org/ PKG_SITES:= http://fontconfig.org/release/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -AUTOTOOL_STYLE:= autoreconf HOST_STYLE:= auto -CONFIGURE_ARGS+= --with-arch=${ADK_TARGET_ARCH} \ - --enable-libxml2 \ +CONFIGURE_ARGS+= --enable-libxml2 \ --disable-docs fontconfig-install: + ${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/fc-* \ + ${IDIR_FONTCONFIG}/usr/bin ${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/lib ${IDIR_FONTCONFIG}/etc/fonts ${CP} ${WRKINST}/usr/lib/libfontconfig.so* ${IDIR_FONTCONFIG}/usr/lib $(CP) ${WRKINST}/etc/fonts/* ${IDIR_FONTCONFIG}/etc/fonts diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile index 1ed30db0d..84f8246c5 100644 --- a/package/freeglut/Makefile +++ b/package/freeglut/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= freeglut -PKG_VERSION:= 3.2.1 +PKG_VERSION:= 3.6.0 PKG_RELEASE:= 1 -PKG_HASH:= d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 +PKG_HASH:= 9c3d4d6516fbfa0280edc93c77698fb7303e443c1aaaf37d269e3288a6c3ea52 PKG_DESCR:= opengl utility toolkit libraries PKG_SECTION:= libs/video PKG_DEPENDS:= libglu @@ -18,13 +18,14 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_ARCH_DEPENDS:= arm mips mipsel mips64 mips64el x86 x86_64 +PKG_ARCH_DEPENDS:= arm mips mipsel mips64 mips64el sh x86 x86_64 include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,FREEGLUT,freeglut,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DFREEGLUT_BUILD_DEMOS=OFF freeglut-install: $(INSTALL_DIR) $(IDIR_FREEGLUT)/usr/lib diff --git a/package/freeglut/patches/patch-Makefile_in b/package/freeglut/patches/patch-Makefile_in deleted file mode 100644 index 143efe98a..000000000 --- a/package/freeglut/patches/patch-Makefile_in +++ /dev/null @@ -1,31 +0,0 @@ ---- freeglut-2.6.0.orig/Makefile.in 2009-11-25 20:14:30.000000000 +0100 -+++ freeglut-2.6.0/Makefile.in 2012-03-12 15:05:53.767407283 +0100 -@@ -220,28 +220,6 @@ EXTRA_DIST = \ - freeglut_static_vs2008.vcproj \ - freeglut_vs2008.sln \ - freeglut_vs2008.vcproj \ -- progs/demos/CallbackMaker/CallbackMakerStatic.dsp \ -- progs/demos/CallbackMaker/CallbackMakerStatic_vs2008.vcproj \ -- progs/demos/CallbackMaker/CallbackMaker_vs2008.vcproj \ -- progs/demos/Fractals/FractalsStatic.dsp \ -- progs/demos/Fractals/FractalsStatic_vs2008.vcproj \ -- progs/demos/Fractals/Fractals_vs2008.vcproj \ -- progs/demos/Fractals_random/Fractals_randomStatic.dsp \ -- progs/demos/Fractals_random/Fractals_randomStatic_vs2008.vcproj \ -- progs/demos/Fractals_random/Fractals_random_vs2008.vcproj \ -- progs/demos/Lorenz/lorenzStatic.dsp \ -- progs/demos/Lorenz/lorenzStatic_vs2008.vcproj \ -- progs/demos/Lorenz/lorenz_vs2008.vcproj \ -- progs/demos/One/oneStatic.dsp \ -- progs/demos/One/oneStatic_vs2008.vcproj \ -- progs/demos/One/one_vs2008.vcproj \ -- progs/demos/demos_vs2008.sln \ -- progs/demos/shapes/shapesStatic.dsp \ -- progs/demos/shapes/shapesStatic_vs2008.vcproj \ -- progs/demos/shapes/shapes_vs2008.vcproj \ -- progs/demos/smooth_opengl3/smooth_opengl3Static.dsp \ -- progs/demos/smooth_opengl3/smooth_opengl3Static_vs2008.vcproj \ -- progs/demos/smooth_opengl3/smooth_opengl3_vs2008.vcproj - - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/package/freeglut/patches/patch-progs_Makefile_in b/package/freeglut/patches/patch-progs_Makefile_in deleted file mode 100644 index e5d2993d1..000000000 --- a/package/freeglut/patches/patch-progs_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- freeglut-2.6.0.orig/progs/Makefile.in 2009-11-25 20:14:29.000000000 +0100 -+++ freeglut-2.6.0/progs/Makefile.in 2012-03-12 15:06:38.667411355 +0100 -@@ -177,7 +177,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = demos -+SUBDIRS = - all: all-recursive - - .SUFFIXES: diff --git a/package/freeglut/patches/patch-src_fg_gl2_c b/package/freeglut/patches/patch-src_fg_gl2_c deleted file mode 100644 index dbd947a91..000000000 --- a/package/freeglut/patches/patch-src_fg_gl2_c +++ /dev/null @@ -1,23 +0,0 @@ ---- freeglut-3.2.1.orig/src/fg_gl2.c 2014-06-01 11:24:47.000000000 +0200 -+++ freeglut-3.2.1/src/fg_gl2.c 2021-11-02 10:29:44.673793670 +0100 -@@ -27,6 +27,20 @@ - #include "fg_internal.h" - #include "fg_gl2.h" - -+#ifndef GL_ES_VERSION_2_0 -+/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed -+ * names are defined in fg_gl2.h header to reference them, for any other case, -+ * define them as function pointers here. -+ */ -+FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+FGH_PFNGLBUFFERDATAPROC fghBufferData; -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+#endif -+ - void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { - if (fgStructure.CurrentWindow != NULL) - fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; diff --git a/package/freeglut/patches/patch-src_fg_gl2_h b/package/freeglut/patches/patch-src_fg_gl2_h deleted file mode 100644 index a552d4fa9..000000000 --- a/package/freeglut/patches/patch-src_fg_gl2_h +++ /dev/null @@ -1,23 +0,0 @@ ---- freeglut-3.2.1.orig/src/fg_gl2.h 2012-04-21 20:22:24.000000000 +0200 -+++ freeglut-3.2.1/src/fg_gl2.h 2021-11-02 10:29:44.673793670 +0100 -@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEV - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); - --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; --FGH_PFNGLBUFFERDATAPROC fghBufferData; --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+extern FGH_PFNGLBUFFERDATAPROC fghBufferData; -+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; - - # endif - diff --git a/package/freeglut/patches/patch-src_fg_version_h b/package/freeglut/patches/patch-src_fg_version_h deleted file mode 100644 index 6bb5f6d69..000000000 --- a/package/freeglut/patches/patch-src_fg_version_h +++ /dev/null @@ -1,16 +0,0 @@ ---- freeglut-3.2.1.orig/src/fg_version.h 2014-08-18 04:00:40.000000000 +0200 -+++ freeglut-3.2.1/src/fg_version.h 2021-11-02 09:37:27.466889937 +0100 -@@ -37,11 +37,11 @@ - #endif - - #ifndef VERSION_MINOR --#define VERSION_MINOR 0 -+#define VERSION_MINOR 2 - #endif - - #ifndef VERSION_PATCH --#define VERSION_PATCH 0 -+#define VERSION_PATCH 1 - #endif - - #endif diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile index b9c1f12f2..20b144231 100644 --- a/package/freeradius-server/Makefile +++ b/package/freeradius-server/Makefile @@ -4,16 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= freeradius-server -PKG_VERSION:= 3.2.3 +PKG_VERSION:= 3.2.7 PKG_RELEASE:= 1 -PKG_HASH:= 4bde047122e588c63fe2d599a73f7ab9a863806f9e716e88a3d77080b482c577 +PKG_HASH:= 3fd3b7725faa8b5e6c5a331a395e392ea9f7eceb3c0d42e82e82c32f2ff5b098 PKG_DESCR:= flexible radius server PKG_SECTION:= net/radius -PKG_DEPENDS:= libltdl libpcre libtalloc libressl libatomic -PKG_BUILDDEP:= libtool pcre talloc libressl +PKG_DEPENDS:= libltdl libpcre2 libtalloc libopenssl libatomic libreadline +PKG_BUILDDEP:= libtool pcre2 talloc openssl readline PKG_NEEDS:= threads PKG_URL:= http://www.freeradius.org/ -PKG_SITES:= https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_3/ +PKG_SITES:= https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_7/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -149,6 +149,7 @@ CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTS} \ --without-snmp \ --without-experimental-modules \ --without-rlm_attr-rewrite \ + --without-rlm_mschap \ --without-rlm_checkval \ --without-rlm_counter \ --without-rlm_dbm \ diff --git a/package/freeradius-server/patches/patch-raddb_all_mk b/package/freeradius-server/patches/patch-raddb_all_mk new file mode 100644 index 000000000..6fa765ca2 --- /dev/null +++ b/package/freeradius-server/patches/patch-raddb_all_mk @@ -0,0 +1,23 @@ +--- freeradius-server-3.2.6.orig/raddb/all.mk 2024-08-24 15:06:25.000000000 +0200 ++++ freeradius-server-3.2.6/raddb/all.mk 2024-08-26 16:30:35.470666078 +0200 +@@ -125,20 +125,6 @@ $(R)$(raddbdir)/users: $(R)$(modconfdir) + @[ -e $@ ] || echo LN-S $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) + @[ -e $@ ] || ln -s $(patsubst $(R)$(raddbdir)/%,./%,$<) $@ + +-ifneq "$(LOCAL_CERT_PRODUCTS)" "" +-$(LOCAL_CERT_PRODUCTS): +- @echo BOOTSTRAP raddb/certs/ +- @$(MAKE) -C $(R)$(raddbdir)/certs/ +- +-# Bootstrap is special +-$(R)$(raddbdir)/certs/bootstrap: | raddb/certs/bootstrap $(LOCAL_CERT_PRODUCTS) +- @echo INSTALL $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) +- @$(INSTALL) -m 750 $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) $@ +-else +-$(R)$(raddbdir)/certs/bootstrap: +- @echo INSTALL $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) +- @$(INSTALL) -m 750 $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) $@ +-endif + + # List directories before the file targets. + # It's not clear why GNU Make doesn't deal well with this. diff --git a/package/freeradius-server/patches/patch-scripts_libtool_mk b/package/freeradius-server/patches/patch-scripts_libtool_mk index bcfdeff89..9dcbbe114 100644 --- a/package/freeradius-server/patches/patch-scripts_libtool_mk +++ b/package/freeradius-server/patches/patch-scripts_libtool_mk @@ -1,13 +1,13 @@ ---- freeradius-server-3.2.3.orig/scripts/libtool.mk 2023-05-26 15:56:52.000000000 +0200 -+++ freeradius-server-3.2.3/scripts/libtool.mk 2024-02-27 03:44:17.243010645 +0100 -@@ -48,8 +48,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL" - # binary! - ${JLIBTOOL}: ${top_makedir}/jlibtool.c +--- freeradius-server-3.2.6.orig/scripts/libtool.mk 2024-08-24 15:06:25.000000000 +0200 ++++ freeradius-server-3.2.6/scripts/libtool.mk 2024-08-26 15:15:40.489814433 +0200 +@@ -40,8 +40,8 @@ all install: ${JLIBTOOL} + # binary! + ${JLIBTOOL}: ${top_makedir}/jlibtool.c $(Q)mkdir -p $(dir $@) - $(Q)echo CC jlibtool.c - $(Q)${CC} $< -o $@ ${JLIBTOOL_DEFS} + $(Q)echo CC_FOR_BUILD jlibtool.c + ${CC_FOR_BUILD} $< -o $@ ${JLIBTOOL_DEFS} - clean: jlibtool_clean + clean: jlibtool_clean diff --git a/package/freeswitch/Makefile b/package/freeswitch/Makefile deleted file mode 100644 index 0d6f067c8..000000000 --- a/package/freeswitch/Makefile +++ /dev/null @@ -1,58 +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:= freeswitch -PKG_VERSION:= 1.10.11 -PKG_RELEASE:= 1 -PKG_HASH:= 4437edfa08558aa407c9fad5e4eed58f757357c53ca735aed9977e48aa1c53e3 -PKG_DESCR:= cross-platform telephony platform -PKG_SECTION:= net/voip -PKG_DEPENDS:= libpcre libcurl zlib libjpeg-turbo libsqlite -PKG_DEPENDS+= libressl libopus spandsp sofia-sip -PKG_BUILDDEP:= util-linux zlib libjpeg-turbo sqlite curl pcre -PKG_BUILDDEP+= speex libressl opus spandsp sofia-sip -PKG_URL:= http://www.freeswitch.org/ -PKG_SITES:= https://github.com/signalwire/freeswitch/archive/refs/tags/ - -DISTFILES:= v$(PKG_VERSION).tar.gz - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,FREESWITCH,freeswitch,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -AUTOTOOL_STYLE:= bootstrap -CONFIGURE_ARGS+= --disable-core-libedit-support \ - --disable-libvpx -CONFIGURE_ENV+= ac_cv_file__dev_ptmx=yes \ - ac_cv_file__dev_zero=yes \ - ac_cv_file__dev_urandom=yes \ - ac_cv_sizeof_ssize_t=4 \ - ac_cv_func_realloc_0_nonnull=yes \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_gcc_supports_w_no_unused_result=no \ - apr_cv_tcp_nodelay_with_cork=yes \ - apr_cv_process_shared_works=no \ - ac_cv_file_dbd_apr_dbd_mysql_c=no \ - ac_cv_func_setpgrp_void=yes - -pre-configure: - $(SED) "/applications\/mod_av/d" $(WRKBUILD)/modules.conf - $(SED) "/applications\/mod_enum/d" $(WRKBUILD)/modules.conf - $(SED) "/applications\/mod_fsv/d" $(WRKBUILD)/modules.conf - $(SED) "/applications\/mod_signalwire/d" $(WRKBUILD)/modules.conf - $(SED) "/applications\/mod_spandsp/d" $(WRKBUILD)/modules.conf - $(SED) "/databases\/mod_pgsql/d" $(WRKBUILD)/modules.conf - $(SED) "/languages\/mod_lua/d" $(WRKBUILD)/modules.conf - $(SED) "/endpoints\/mod_sofia/d" $(WRKBUILD)/modules.conf - $(SED) "/endpoints\/mod_verto/d" $(WRKBUILD)/modules.conf - $(SED) "/codecs\/mod_vpx/d" $(WRKBUILD)/modules.conf - $(SED) "/formats\/mod_sndfile/d" $(WRKBUILD)/modules.conf - -freeswitch-install: - $(INSTALL_DIR) $(IDIR_FREESWITCH)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/freeswitch \ - $(IDIR_FREESWITCH)/usr/bin - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/freeswitch/patches/patch-libs_srtp_crypto_hash_hmac_ossl_c b/package/freeswitch/patches/patch-libs_srtp_crypto_hash_hmac_ossl_c deleted file mode 100644 index aab43c797..000000000 --- a/package/freeswitch/patches/patch-libs_srtp_crypto_hash_hmac_ossl_c +++ /dev/null @@ -1,22 +0,0 @@ ---- freeswitch-1.10.11.orig/libs/srtp/crypto/hash/hmac_ossl.c 2023-12-22 19:08:31.000000000 +0100 -+++ freeswitch-1.10.11/libs/srtp/crypto/hash/hmac_ossl.c 2024-02-29 00:19:04.687821875 +0100 -@@ -80,7 +80,8 @@ static srtp_err_status_t srtp_hmac_alloc - - /* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated - using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) - { - /* allocate memory for auth and HMAC_CTX structures */ - uint8_t *pointer; -@@ -126,7 +127,8 @@ static srtp_err_status_t srtp_hmac_deall - - hmac_ctx = (HMAC_CTX *)a->state; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) - HMAC_CTX_cleanup(hmac_ctx); - - /* zeroize entire state*/ diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 5db6dea81..1e427ecee 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= freetype -PKG_VERSION:= 2.11.1 -PKG_RELEASE:= 2 -PKG_HASH:= f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b +PKG_VERSION:= 2.14.1 +PKG_RELEASE:= 1 +PKG_HASH:= 174d9e53402e1bf9ec7277e22ec199ba3e55a6be2c0740cb18c0ee9850fc8c34 PKG_DESCR:= free, high-quality and portable font engine PKG_SECTION:= libs/fonts PKG_DEPENDS:= zlib diff --git a/package/gcj/Makefile b/package/gcj/Makefile deleted file mode 100644 index c4fdd7e06..000000000 --- a/package/gcj/Makefile +++ /dev/null @@ -1,45 +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:= gcj -PKG_VERSION:= 5.4.0 -PKG_RELEASE:= 1 -PKG_HASH:= 37089e80c3f2e9a0663d7ccc51c2a6c7dbbf3275bc1e4ed1ed3b1460cd5b3030 -PKG_DESCR:= java compiler -PKG_SECTION:= dev/lang -HOST_BUILDDEP:= zip-host -PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} - -PKG_CFLINE_GCJ:= depends on ADK_HOST_ONLY - -DISTFILES:= gcc-$(PKG_VERSION).tar.gz -WRKDIST= ${WRKDIR}/gcc-${PKG_VERSION} - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,GCJ,gcj,$(PKG_VERSION)-${PKG_RELEASE})) - -HOST_MAKE_ENV+= "JAR=no LDFLAGS=-liconv" -# http://gcc.gnu.org/bugzilla/attachment.cgi?id=30880&action=diff -HOST_CONFIGURE_ARGS:= --enable-dependency-tracking \ - --enable-java-home \ - --enable-languages=java \ - --enable-shared \ - --with-ffi \ - --with-mpc=$(STAGING_HOST_DIR) \ - --with-mpfr=$(STAGING_HOST_DIR) \ - --with-gmp=$(STAGING_HOST_DIR) \ - --disable-nls \ - --without-libiconv-prefix \ - --disable-libmudflap \ - --disable-libgomp \ - --disable-biarch \ - --disable-decimal-float \ - --disable-multilib \ - --disable-bootstrap - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 4a78eab3f..18f4e1b75 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gdb -PKG_VERSION:= 14.2 +PKG_VERSION:= 16.2 PKG_RELEASE:= 1 -PKG_HASH:= 2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772 +PKG_HASH:= 4002cb7f23f45c37c790536a13a720942ce4be0402d929c9085e92f10d480119 PKG_DESCR:= program debugger PKG_SECTION:= app/debug PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} @@ -14,7 +14,7 @@ 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 diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index 7238eb306..a8c55c504 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -4,18 +4,18 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gdbserver -PKG_VERSION:= 14.2 +PKG_VERSION:= 16.2 PKG_RELEASE:= 1 -PKG_HASH:= 2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772 +PKG_HASH:= 4002cb7f23f45c37c790536a13a720942ce4be0402d929c9085e92f10d480119 PKG_DESCR:= remote program debugger utility PKG_SECTION:= app/debug -PKG_NEEDS:= c++ +PKG_NEEDS:= c++ iconv PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} 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/gdbserver/patches/patch-gdb_nat_fork-inferior_c b/package/gdbserver/patches/patch-gdb_nat_fork-inferior_c deleted file mode 100644 index b1949c798..000000000 --- a/package/gdbserver/patches/patch-gdb_nat_fork-inferior_c +++ /dev/null @@ -1,10 +0,0 @@ ---- gdb-14.2.orig/gdb/nat/fork-inferior.c 2024-03-03 06:55:00.000000000 +0100 -+++ gdb-14.2/gdb/nat/fork-inferior.c 2024-03-22 17:02:35.981582750 +0100 -@@ -27,6 +27,7 @@ - #include "gdbsupport/pathstuff.h" - #include "gdbsupport/signals-state-save-restore.h" - #include "gdbsupport/gdb_tilde_expand.h" -+#include "linux-ptrace.h" - #include <vector> - - extern char **environ; diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index ee6d9c043..c47c5c131 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -4,14 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gdk-pixbuf -PKG_VERSION:= 2.34.0 -PKG_EXTRAVER:= 2.34 +PKG_VERSION:= 2.42.12 +PKG_EXTRAVER:= 2.42 PKG_RELEASE:= 1 -PKG_HASH:= d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879 +PKG_HASH:= b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7 PKG_DESCR:= image loading and pixel buffer manipulation library PKG_SECTION:= libs/image -PKG_BUILDDEP:= libjpeg-turbo libtiff glib libpng -HOST_BUILDDEP:= libiconv-host glib-host libffi-host +PKG_DEPENDS:= libjpeg-turbo libtiff glib libpng +PKG_BUILDDEP:= libjpeg-turbo libtiff glib libpng gdk-pixbuf-host +HOST_BUILDDEP:= glib-host libffi-host libpng-host libjpeg-turbo-host PKG_NEEDS:= c++ PKG_SITES:= $(MASTER_SITE_GNOME:=gdk-pixbuf/$(PKG_EXTRAVER)/) PKG_OPTS:= dev @@ -22,13 +23,26 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -HOST_STYLE:= auto -HOST_LDFLAGS+= -lffi -lz -ldl -lresolv -liconv -lmount -HOST_CONFIGURE_ARGS+= --disable-glibtest \ - --without-libjpeg \ - --without-libpng \ - --without-libtiff -CONFIGURE_ENV+= gio_can_sniff=no +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +HOST_LDFLAGS+= -lpng -ljpeg +HOST_STYLE:= meson +HOST_INSTALL_STYLE:= meson + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +HOST_MESON_FLAGS:= -Dgio_sniffing=false \ + -Dtests=false \ + -Dinstalled_tests=false \ + -Dintrospection=disabled \ + -Dman=false \ + --default-library=static +MESON_FLAGS:= -Dgio_sniffing=false \ + -Dtests=false \ + -Dinstalled_tests=false \ + -Dman=false gdk-pixbuf-install: $(INSTALL_DIR) $(IDIR_GDK_PIXBUF)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/ diff --git a/package/gdk-pixbuf/patches/patch-Makefile_in b/package/gdk-pixbuf/patches/patch-Makefile_in deleted file mode 100644 index dc5e3a98f..000000000 --- a/package/gdk-pixbuf/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- gdk-pixbuf-2.34.0.orig/Makefile.in 2016-03-24 20:17:33.000000000 +0100 -+++ gdk-pixbuf-2.34.0/Makefile.in 2016-04-04 01:04:57.039201579 +0200 -@@ -448,7 +448,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = gdk-pixbuf po docs tests contrib build -+SUBDIRS = gdk-pixbuf contrib build - EXTRA_DIST = \ - config.h.win32 \ - glib-tap.mk \ diff --git a/package/genimage/Makefile b/package/genimage/Makefile index 889d77eda..164d72e4e 100644 --- a/package/genimage/Makefile +++ b/package/genimage/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= genimage -PKG_VERSION:= 17 +PKG_VERSION:= 18 PKG_RELEASE:= 1 -PKG_HASH:= a8756e3567a0d4d82c36b08ccc1e088250b9006d5670c6b2b014185e6ec60671 +PKG_HASH:= ebc3f886c4d80064dd6c6d5e3c2e98e5a670078264108ce2f89ada8a2e13fedd PKG_DESCR:= image creation utility PKG_SECTION:= dev/tools HOST_BUILDDEP:= confuse-host diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 6594eb995..fb38bea8e 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gettext -PKG_VERSION:= 0.19.8 +PKG_VERSION:= 0.26 PKG_RELEASE:= 1 -PKG_HASH:= 9c1781328238caa1685d7bc7a2e1dcf1c6c134e86b42ed554066734b621bd12f +PKG_HASH:= d1fb86e260cfe7da6031f94d2e44c0da55903dbae0a2fa0fae78c91ae1b56f00 PKG_DESCR:= i18n tools and libs PKG_SECTION:= libs/misc HOST_BUILDDEP:= automake-host PKG_URL:= https://www.gnu.org/software/gettext/ -PKG_SITES:= http://ftp.gnu.org/pub/gnu/gettext/ +PKG_SITES:= ${MASTER_SITE_GNU:=gettext/} PKG_OPTS:= dev PKG_CFLINE_GETTEXT:= depends on !ADK_TARGET_LIBC_WITHOUT_LIBICONV diff --git a/package/git/Makefile b/package/git/Makefile index 2756d68fb..e128c3783 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 2.44.0 +PKG_VERSION:= 2.51.0 PKG_RELEASE:= 1 -PKG_HASH:= e358738dcb5b5ea340ce900a0015c03ae86e804e7ff64e47aa4631ddee681de3 +PKG_HASH:= 60a7c2251cc2e588d5cd87bae567260617c6de0c22dca9cdbfc4c7d2b8990b62 PKG_DESCR:= fast version control system PKG_SECTION:= dev/scm PKG_BUILDDEP:= zlib curl expat @@ -15,13 +15,13 @@ PKG_NEEDS:= threads PKG_URL:= http://git-scm.com/ PKG_SITES:= https://www.kernel.org/pub/software/scm/git/ -PKG_CHOICES_GIT:= WITH_LIBRESSL WITH_OPENSSL -PKGCD_WITH_LIBRESSL:= use libressl for crypto -PKGCB_WITH_LIBRESSL:= libressl -PKGCS_WITH_LIBRESSL:= libressl +PKG_CHOICES_GIT:= WITH_OPENSSL WITH_LIBRESSL PKGCD_WITH_OPENSSL:= use openssl for crypto PKGCB_WITH_OPENSSL:= openssl PKGCS_WITH_OPENSSL:= libopenssl +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCB_WITH_LIBRESSL:= libressl +PKGCS_WITH_LIBRESSL:= libressl include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/glib-networking/Makefile b/package/glib-networking/Makefile new file mode 100644 index 000000000..29108145e --- /dev/null +++ b/package/glib-networking/Makefile @@ -0,0 +1,38 @@ +# 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:= glib-networking +PKG_VERSION:= 2.80.1 +PKG_RELEASE:= 1 +PKG_HASH:= 35ca3d6ca638493765a7dc11c5f46b816dbc407ec939c1f69682960b6cfb76c9 +PKG_DESCR:= low-level core library for networking +PKG_SECTION:= libs/misc +PKG_DEPENDS:= glib +PKG_BUILDDEP:= glib +PKG_SITES:= https://gitlab.gnome.org/GNOME/glib-networking/-/archive/2.80.1/ + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,GLIB_NETWORKING,glib-networking,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dlibproxy=disabled \ + -Dgnome_proxy=disabled \ + -Dgnutls=disabled \ + -Dopenssl=enabled + +glib-networking-install: + $(INSTALL_DIR) $(IDIR_GLIB_NETWORKING)/usr/lib/gio/modules + $(CP) $(WRKINST)/usr/lib/gio/modules/*.so \ + $(IDIR_GLIB_NETWORKING)/usr/lib/gio/modules + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/glib/Makefile b/package/glib/Makefile index eb77cf8fe..51276ee1a 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.78.4 +PKG_VERSION:= 2.84.3 PKG_RELEASE:= 1 -PKG_EXTRAVER:= 2.78 -PKG_HASH:= 24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63 +PKG_EXTRAVER:= 2.84 +PKG_HASH:= aa4f87c3225bf57ca85f320888f7484901a17934ca37023c3bd8435a72db863e PKG_DESCR:= low-level core library that forms the basis of gtk+ PKG_SECTION:= libs/misc PKG_DEPENDS:= pcre2 zlib libffi PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre2 -HOST_BUILDDEP:= pkgconf-host libiconv-host libffi-host python3-host gettext-host util-linux-host -HOST_BUILDDEP+= pcre2-host meson-host +HOST_BUILDDEP:= pkgconf-host libffi-host python3-host gettext-host util-linux-host +HOST_BUILDDEP+= pcre2-host meson-host zlib-host libiconv-host PKG_NEEDS:= threads intl iconv PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/glib/$(PKG_EXTRAVER)/ @@ -28,29 +28,35 @@ $(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS HOSTWRKBUILD= $(WRKSRC) WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -HOST_CONFIG_STYLE:= manual -HOST_STYLE:= manual +HOST_STYLE:= meson +HOST_INSTALL_STYLE:= meson + CONFIG_STYLE:= meson BUILD_STYLE:= meson INSTALL_STYLE:= meson -MESON_FLAGS:= -Dtests=false -Dxattr=false -Doss_fuzz=disabled - -host-configure: - (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix $(STAGING_HOST_DIR)/usr _build) - -host-build: - (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) - -glib-hostinstall: - (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson install -C _build) - -do-configure: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix /usr \ - --libdir lib --cross-file $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf -Dtests=false _build) +HOST_MESON_FLAGS:= -Dintrospection=disabled \ + -Dnls=disabled \ + -Dtests=false \ + -Dxattr=false \ + -Doss_fuzz=disabled \ + -Dsysprof=disabled \ + --default-library=static +MESON_FLAGS:= -Dintrospection=disabled \ + -Dnls=disabled \ + -Dtests=false \ + -Dxattr=false \ + -Doss_fuzz=disabled \ + -Dglib_debug=disabled \ + -Dsysprof=disabled -do-build: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) +hostpost-install: + $(CP) $(HOSTWRKBUILD)/../glib-obj/meson-private/*.pc \ + $(STAGING_HOST_DIR)/usr/lib/pkgconfig + $(INSTALL_BIN) $(HOSTWRKBUILD)/../glib-obj/gobject/glib-mkenums \ + $(STAGING_HOST_DIR)/usr/bin + $(INSTALL_BIN) $(HOSTWRKBUILD)/../glib-obj/gobject/glib-genmarshal \ + $(STAGING_HOST_DIR)/usr/bin glib-install: $(INSTALL_DIR) $(IDIR_GLIB)/usr/lib @@ -59,6 +65,7 @@ glib-install: $(CP) $(WRKINST)/usr/lib/libgobject*.so* $(IDIR_GLIB)/usr/lib $(CP) $(WRKINST)/usr/lib/libgmodule*.so* $(IDIR_GLIB)/usr/lib $(CP) $(WRKINST)/usr/lib/libgthread*.so* $(IDIR_GLIB)/usr/lib + -$(CP) $(WRKINST)/usr/lib/libintl*.so* $(IDIR_GLIB)/usr/lib # workaround for dev subpackage $(INSTALL_DIR) $(IDIR_GLIB_DEV)/usr/include $(INSTALL_DIR) $(IDIR_GLIB_DEV)/usr/lib/glib-2.0/include diff --git a/package/glib/patches/patch-glib_gnulib_meson_build b/package/glib/patches/patch-glib_gnulib_meson_build index 4039f468f..bd37116c2 100644 --- a/package/glib/patches/patch-glib_gnulib_meson_build +++ b/package/glib/patches/patch-glib_gnulib_meson_build @@ -1,6 +1,6 @@ ---- glib-2.75.2.orig/glib/gnulib/meson.build 2023-01-06 13:49:52.000000000 +0100 -+++ glib-2.75.2/glib/gnulib/meson.build 2023-01-22 14:08:55.068305964 +0100 -@@ -312,9 +312,6 @@ endif +--- glib-2.84.0.orig/glib/gnulib/meson.build 2025-03-06 14:09:13.000000000 +0100 ++++ glib-2.84.0/glib/gnulib/meson.build 2025-03-30 06:00:21.051043526 +0200 +@@ -315,9 +315,6 @@ endif if not gl_cv_func_frexp_works and gl_cv_func_frexp_broken_beyond_repair error ('frexp() is missing or broken beyond repair, and we have nothing to replace it with') endif diff --git a/package/glib/patches/patch-meson_build b/package/glib/patches/patch-meson_build deleted file mode 100644 index c410eac33..000000000 --- a/package/glib/patches/patch-meson_build +++ /dev/null @@ -1,10 +0,0 @@ ---- glib-2.75.2.orig/meson.build 2023-01-06 13:49:52.000000000 +0100 -+++ glib-2.75.2/meson.build 2023-01-22 14:18:11.633406695 +0100 -@@ -513,6 +513,7 @@ if cc.get_id() == 'gcc' or cc.get_id() = - '-Werror=missing-include-dirs', - '-Werror=pointer-arith', - '-Werror=unused-result', -+ '-Wno-error=format-nonliteral', - ] - - warning_c_args = warning_common_args + [ diff --git a/package/glibc/Makefile b/package/glibc/Makefile index a36c30903..73a65372b 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -50,7 +50,7 @@ do-install: ifneq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) ${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH) $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH) - for file in libc libpthread librt libdl libm libanl libnsl libresolv libutil libnss_dns libnss_files; do \ + for file in libc libpthread librt libdl libm libanl libnsl libresolv libutil libnss_dns libnss_files libmvec; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ done else diff --git a/package/gmp/Makefile b/package/gmp/Makefile index 674c2323e..ccda78c16 100644 --- a/package/gmp/Makefile +++ b/package/gmp/Makefile @@ -13,8 +13,10 @@ PKG_NEEDS:= c++ PKG_LIBNAME:= libgmp PKG_OPTS:= dev +include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk +$(eval $(call HOST_template,LIBGMP,libgmp,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBGMP,libgmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) ifeq ($(ADK_TARGET_CPU_MIPS_MIPS32R6)$(ADK_TARGET_CPU_MIPS_MIPS64R6),y) @@ -26,4 +28,5 @@ libgmp-install: ${CP} ${WRKINST}/usr/lib/libgmp.so* \ ${IDIR_LIBGMP}/usr/lib +include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gmp/patches/patch-configure b/package/gmp/patches/patch-configure new file mode 100644 index 000000000..4b2862039 --- /dev/null +++ b/package/gmp/patches/patch-configure @@ -0,0 +1,11 @@ +--- gmp-6.3.0.orig/configure 2023-07-29 15:42:22.000000000 +0200 ++++ gmp-6.3.0/configure 2025-04-07 14:52:01.231530118 +0200 +@@ -6568,7 +6568,7 @@ if test "$gmp_prog_cc_works" = yes; then + + #if defined (__GNUC__) && ! defined (__cplusplus) + typedef unsigned long long t1;typedef t1*t2; +-void g(){} ++void g(int, const t1*, t1, t1*, const t1*, int){} + void h(){} + static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) + {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;} diff --git a/package/gnupg2/Makefile b/package/gnupg2/Makefile index a9e5a44c0..64e94c4da 100644 --- a/package/gnupg2/Makefile +++ b/package/gnupg2/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gnupg2 -PKG_VERSION:= 2.4.4 +PKG_VERSION:= 2.4.8 PKG_RELEASE:= 1 -PKG_HASH:= 67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6 +PKG_HASH:= b58c80d79b04d3243ff49c1c3fc6b5f83138eb3784689563bcdd060595318616 PKG_DESCR:= gnu privacy guard (modern) PKG_SECTION:= app/crypto PKG_DEPENDS:= libreadline libncurses libgcrypt libgpg-error libassuan @@ -15,7 +15,7 @@ PKG_BUILDDEP:= readline ncurses libgcrypt libgpg-error libassuan PKG_BUILDDEP+= libksba npth PKG_NEEDS:= iconv PKG_URL:= http://www.gnupg.org/ -PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/gnupg/ +PKG_SITES:= https://www.gnupg.org/ftp/gcrypt/gnupg/ DISTFILES:= gnupg-$(PKG_VERSION).tar.bz2 WRKDIST= ${WRKDIR}/gnupg-${PKG_VERSION} @@ -28,6 +28,7 @@ $(eval $(call PKG_template,GNUPG2,gnupg2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP $(eval $(call PKG_template,GPGV2,gpgv2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) CONFIGURE_ARGS+= --disable-dirmngr \ + --disable-keyboxd \ --disable-gpgsm \ --disable-scdaemon \ --disable-card-support \ diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index ae1db5a19..188d5b3d5 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -4,14 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gnutls -PKG_VERSION:= 3.8.4 +PKG_VERSION:= 3.8.10 PKG_RELEASE:= 1 -PKG_HASH:= 2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b +PKG_HASH:= db7fab7cce791e7727ebbef2334301c821d79a550ec55c9ef096b610b03eb6b7 PKG_DESCR:= transport layer security library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp libunistring PKG_BUILDDEP:= libgcrypt liblzo libtasn1 PKG_BUILDDEP+= zlib ncurses libnettle libunistring +HOST_BUILDDEP:= libnettle-host libtasn1-host libunistring-host PKG_URL:= http://www.gnutls.org/ PKG_SITES:= https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/ PKG_LIBNAME:= libgnutls @@ -27,8 +28,10 @@ PKG_FLAVOURS_LIBGNUTLS:=WITH_CRYPTODEV PKGFD_WITH_CRYPTODEV:= enable support for cryptodev-linux PKGFB_WITH_CRYPTODEV:= cryptodev-linux +include ${ADK_TOPDIR}/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBGNUTLS,libgnutls,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS),$(PKG_OPTS))) $(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_GNUTLS_UTILS),$(PKGSD_GNUTLS_UTILS),$(PKGSC_GNUTLS_UTILS))) @@ -37,6 +40,10 @@ CONFIGURE_ARGS+= --enable-cryptodev endif TARGET_LDFLAGS+= -pthread +HOST_CONFIGURE_ARGS+= --without-p11-kit \ + --disable-seccomp-tests \ + --disable-tests \ + --disable-doc CONFIGURE_ARGS+= --disable-rpath \ --disable-doc \ --disable-tests \ @@ -54,4 +61,5 @@ gnutls-utils-install: $(CP) $(WRKINST)/usr/bin/{{cert,psk}tool,gnutls-{cli,serv}} \ $(IDIR_GNUTLS_UTILS)/usr/bin +include ${ADK_TOPDIR}/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/gpgme/Makefile b/package/gpgme/Makefile index 8f531aa16..45cce6539 100644 --- a/package/gpgme/Makefile +++ b/package/gpgme/Makefile @@ -10,7 +10,7 @@ PKG_HASH:= 9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224 PKG_DESCR:= easy access to gnupg for applications PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgpg-error libassuan -PKG_BUILDDEP:= libgpg-error libassuan +PKG_BUILDDEP:= python3-setuptools-host libgpg-error libassuan PKG_NEEDS:= c++ PKG_URL:= https://gnupg.org/related_software/gpgme/index.html PKG_SITES:= https://gnupg.org/ftp/gcrypt/gpgme/ diff --git a/package/gptfdisk/Makefile b/package/gptfdisk/Makefile index 37d170761..af6efcb03 100644 --- a/package/gptfdisk/Makefile +++ b/package/gptfdisk/Makefile @@ -24,10 +24,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,GPTFDISK,gptfdisk,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,GPTFDISK,gptfdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -ifneq ($(OS_FOR_BUILD),Darwin) TARGET_LDFLAGS+= -ltinfo -endif - HOST_STYLE:= manual CONFIG_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/grep/Makefile b/package/grep/Makefile index 845ba5685..cc726bba7 100644 --- a/package/grep/Makefile +++ b/package/grep/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:= 1 PKG_HASH:= 1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab PKG_DESCR:= global search for a regex PKG_SECTION:= base/tools -PKG_DEPENDS:= libpcre -PKG_BUILDDEP:= pcre -HOST_BUILDDEP:= pcre-host +PKG_DEPENDS:= libpcre2 +PKG_BUILDDEP:= pcre2 +HOST_BUILDDEP:= pcre2-host PKG_URL:= http://www.gnu.org/software/grep/ PKG_SITES:= ${MASTER_SITE_GNU:=grep/} PKG_NOPARALLEL:= 1 diff --git a/package/grub/Makefile b/package/grub/Makefile index 519958096..3d7f8d868 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= grub -PKG_VERSION:= 2.06 +PKG_VERSION:= 2.12 PKG_RELEASE:= 1 -PKG_HASH:= b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1 +PKG_HASH:= f3c97391f7c4eaa677a78e090c7e97e6dc47b16f655f04683ebd37bef7fe0faa PKG_DESCR:= multiboot boot loader PKG_SECTION:= base/boot PKG_BUILDDEP:= bison-host grub-host @@ -66,6 +66,11 @@ GRUB_PREFIX= (hd0,msdos1)/boot/grub GRUB_TARGET= i386 GRUB_PLATFORM= pc GRUB_MODULES= boot linux ext2 fat part_msdos part_gpt normal biosdisk +ifeq ($(ADK_TARGET_QEMU_WITH_GRAPHIC),y) +GRUB_CFG= grub-pc-vga.cfg +else +GRUB_CFG= grub-pc-serial.cfg +endif endif ifeq ($(ADK_PACKAGE_GRUB_EFI_X86),y) @@ -77,6 +82,11 @@ GRUB_PREFIX= /EFI/BOOT GRUB_TARGET= i386 GRUB_PLATFORM= efi GRUB_MODULES= boot linux ext2 fat part_msdos part_gpt normal efi_gop +ifeq ($(ADK_TARGET_DUAL_BOOT),y) +GRUB_CFG= grub-efi-serial-dual.cfg +else +GRUB_CFG= grub-efi-serial.cfg +endif endif ifeq ($(ADK_PACKAGE_GRUB_EFI_X86_64),y) @@ -88,12 +98,11 @@ GRUB_PREFIX= /EFI/BOOT GRUB_TARGET= x86_64 GRUB_PLATFORM= efi GRUB_MODULES= boot linux ext2 fat part_msdos part_gpt normal efi_gop -endif - ifeq ($(ADK_TARGET_DUAL_BOOT),y) -GRUB_CFG= grub-dual.cfg +GRUB_CFG= grub-efi-dual-serial.cfg else -GRUB_CFG= grub.cfg +GRUB_CFG= grub-efi-serial.cfg +endif endif HOST_CONFIGURE_ARGS+= --enable-efiemu=no \ diff --git a/package/grub/files/grub-dual.cfg b/package/grub/files/grub-efi-dual-serial.cfg index 46b5451ad..fde844e09 100644 --- a/package/grub/files/grub-dual.cfg +++ b/package/grub/files/grub-efi-dual-serial.cfg @@ -1,13 +1,17 @@ +serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 +terminal_input serial +terminal_output serial + if [ "x\${timeout}" != "x-1" ]; then if keystatus; then if keystatus --shift; then set timeout=-1 else - set timeout=0 + set timeout=2 fi else if sleep --interruptible 2; then - set timeout=0 + set timeout=2 fi fi fi diff --git a/package/grub/files/grub.cfg b/package/grub/files/grub-efi-serial.cfg index 3fdc48eda..3fdc48eda 100644 --- a/package/grub/files/grub.cfg +++ b/package/grub/files/grub-efi-serial.cfg diff --git a/package/grub/files/grub-pc-serial.cfg b/package/grub/files/grub-pc-serial.cfg new file mode 100644 index 000000000..d48b82c45 --- /dev/null +++ b/package/grub/files/grub-pc-serial.cfg @@ -0,0 +1,14 @@ +serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 +terminal_input serial +terminal_output serial + +set default=0 +set timeout=3 + +menuentry "OpenADK" { + insmod msdospart + insmod ext2 + set root='hd0,1' + echo "Loading OpenADK" + linux /boot/kernel rootfstype=ext4 rootwait panic=10 +} diff --git a/package/grub/files/grub-pc-vga.cfg b/package/grub/files/grub-pc-vga.cfg new file mode 100644 index 000000000..8200624d6 --- /dev/null +++ b/package/grub/files/grub-pc-vga.cfg @@ -0,0 +1,10 @@ +set default=0 +set timeout=3 + +menuentry "OpenADK" { + insmod msdospart + insmod ext2 + set root='hd0,1' + echo "Loading OpenADK" + linux /boot/kernel console=tty0 rootfstype=ext4 rootwait panic=10 +} diff --git a/package/grub/src/grub-core/extra_deps.lst b/package/grub/src/grub-core/extra_deps.lst new file mode 100644 index 000000000..f44ad6a0c --- /dev/null +++ b/package/grub/src/grub-core/extra_deps.lst @@ -0,0 +1 @@ +depends bli part_gpt diff --git a/package/gst-plugins-base/Makefile b/package/gst-plugins-base/Makefile index c612cd63e..f7b0237aa 100644 --- a/package/gst-plugins-base/Makefile +++ b/package/gst-plugins-base/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gst-plugins-base -PKG_VERSION:= 1.19.3 +PKG_VERSION:= 1.26.0 PKG_RELEASE:= 1 -PKG_HASH:= e277f198623a26c1b0a1e19734656392e9368bebf3677cd94262a1316a960827 +PKG_HASH:= e23189fbed2ec486690382d1055c19eeaf5aae3e95e2576fc4c884d96a90e69e PKG_DESCR:= gstreamer base plugins PKG_SECTION:= libs/video PKG_DEPENDS:= gstreamer diff --git a/package/gst-plugins-good/Makefile b/package/gst-plugins-good/Makefile index 8feb16c2f..5a609d51f 100644 --- a/package/gst-plugins-good/Makefile +++ b/package/gst-plugins-good/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gst-plugins-good -PKG_VERSION:= 1.19.3 +PKG_VERSION:= 1.26.0 PKG_RELEASE:= 1 -PKG_HASH:= 79ea32a77fa47e6596530e38113bf97c113fd95658087d9a91ffb8af47d11d07 +PKG_HASH:= 9e18f139ef69ad0867c2dfbb8fe1d1736d76df11aac83f60e8d3adb1e2eaf03b PKG_DESCR:= gstreamer good plugins PKG_SECTION:= libs/video PKG_DEPENDS:= gstreamer diff --git a/package/gstreamer/Makefile b/package/gstreamer/Makefile index a59bbf7d1..8444d8fc2 100644 --- a/package/gstreamer/Makefile +++ b/package/gstreamer/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gstreamer -PKG_VERSION:= 1.19.3 +PKG_VERSION:= 1.26.0 PKG_RELEASE:= 1 -PKG_HASH:= 906d7d4bf92f941586c0cbce717d9cad6aac36994e16fa6f2f153e07e3221bca +PKG_HASH:= 1b2ee4028010c25b776effa7c396c7e3e1861b60b9417e416f4914abcdff279f PKG_DESCR:= opensource multimedia framework PKG_SECTION:= libs/video PKG_BUILDDEP:= glib diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile index 118648eab..c28c312a8 100644 --- a/package/harfbuzz/Makefile +++ b/package/harfbuzz/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= harfbuzz -PKG_VERSION:= 3.4.0 +PKG_VERSION:= 11.0.0 PKG_RELEASE:= 1 -PKG_HASH:= 810bcd3d22fae3c2c18c3688455abc1cd0d7fb2fae25404890b0d77e6443bd0a +PKG_HASH:= 85178b78f0e405269bbc0c17a55545708d86dae63a85f04cd29f71dd422879a8 PKG_DESCR:= opentype text shaping engine PKG_SECTION:= libs/fonts PKG_SITES:= https://github.com/harfbuzz/harfbuzz/archive/refs/tags/ diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 53390c29d..1c64e386d 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -26,11 +26,6 @@ $(eval $(call HOST_template,HEIMDAL,heimdal,$(PKG_VERSION)-${PKG_RELEASE})) AUTOTOOL_STYLE:= autoreconf HOST_STYLE:= manual - -ifeq ($(OS_FOR_BUILD),Darwin) -HOST_CFLAGS+= -DHAVE_STRLCPY -DHAVE_STRLCAT -endif - HOST_CONFIGURE_ARGS+= --disable-pk-init \ --without-openldap \ --without-x \ diff --git a/package/hush/files/config b/package/hush/files/config index 7e81b468e..a9d58aac4 100644 --- a/package/hush/files/config +++ b/package/hush/files/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.36.1 -# Thu Aug 31 12:09:53 2023 +# Wed Apr 9 19:47:50 2025 # CONFIG_HAVE_DOT_CONFIG=y @@ -107,13 +107,13 @@ CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set CONFIG_FEATURE_EDITING_HISTORY=255 -CONFIG_FEATURE_EDITING_SAVEHISTORY=y +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set # CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set -CONFIG_FEATURE_REVERSE_SEARCH=y -CONFIG_FEATURE_TAB_COMPLETION=y -CONFIG_FEATURE_USERNAME_COMPLETION=y -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_EDITING_WINCH=y +# CONFIG_FEATURE_REVERSE_SEARCH is not set +# CONFIG_FEATURE_TAB_COMPLETION is not set +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set +# CONFIG_FEATURE_EDITING_WINCH is not set # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set # CONFIG_LOCALE_SUPPORT is not set CONFIG_UNICODE_SUPPORT=y @@ -1130,21 +1130,21 @@ CONFIG_BASH_IS_HUSH=y # CONFIG_CTTYHACK is not set CONFIG_HUSH=y CONFIG_SHELL_HUSH=y -CONFIG_HUSH_BASH_COMPAT=y -CONFIG_HUSH_BRACE_EXPANSION=y -CONFIG_HUSH_BASH_SOURCE_CURDIR=y -CONFIG_HUSH_LINENO_VAR=y +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set +# CONFIG_HUSH_LINENO_VAR is not set CONFIG_HUSH_INTERACTIVE=y -CONFIG_HUSH_SAVEHISTORY=y +# CONFIG_HUSH_SAVEHISTORY is not set CONFIG_HUSH_JOB=y -CONFIG_HUSH_TICK=y -CONFIG_HUSH_IF=y -CONFIG_HUSH_LOOPS=y -CONFIG_HUSH_CASE=y -CONFIG_HUSH_FUNCTIONS=y -CONFIG_HUSH_LOCAL=y -CONFIG_HUSH_RANDOM_SUPPORT=y -CONFIG_HUSH_MODE_X=y +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_MODE_X is not set CONFIG_HUSH_ECHO=y CONFIG_HUSH_PRINTF=y CONFIG_HUSH_TEST=y @@ -1169,15 +1169,15 @@ CONFIG_HUSH_GETOPTS=y # # Options common to all shells # -CONFIG_FEATURE_SH_MATH=y -CONFIG_FEATURE_SH_MATH_64=y -CONFIG_FEATURE_SH_MATH_BASE=y +# CONFIG_FEATURE_SH_MATH is not set +# CONFIG_FEATURE_SH_MATH_64 is not set +# CONFIG_FEATURE_SH_MATH_BASE is not set CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set -CONFIG_FEATURE_SH_READ_FRAC=y -CONFIG_FEATURE_SH_HISTFILESIZE=y -CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y +# CONFIG_FEATURE_SH_READ_FRAC is not set +# CONFIG_FEATURE_SH_HISTFILESIZE is not set +# CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS is not set # # System Logging Utilities diff --git a/package/hwdata/patches/patch-hwdata_pc_in b/package/hwdata/patches/patch-hwdata_pc_in deleted file mode 100644 index fe88b5244..000000000 --- a/package/hwdata/patches/patch-hwdata_pc_in +++ /dev/null @@ -1,10 +0,0 @@ ---- hwdata-0.378.orig/hwdata.pc.in 2024-01-05 12:35:26.000000000 +0100 -+++ hwdata-0.378/hwdata.pc.in 2024-01-30 09:39:29.731448151 +0100 -@@ -1,6 +1,6 @@ - prefix=@prefix@ - datadir=@datadir@ --pkgdatadir=${pc_sysrootdir}@pkgdatadir@ -+pkgdatadir=@pkgdatadir@ - - Name: @NAME@ - Description: Hardware identification and configuration data diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 1040eb93c..1c7b61d64 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -4,22 +4,20 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= iproute2 -PKG_VERSION:= 5.8.0 +PKG_VERSION:= 6.14.0 PKG_RELEASE:= 1 -PKG_HASH:= cfcd1f890290f8c8afcc91d9444ad929b9252c16f9ab3f286c50dd3c59dc646e +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 @@ -33,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})) @@ -43,12 +40,11 @@ $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PK CONFIG_STYLE:= minimal TARGET_CFLAGS+= -D_GNU_SOURCE -XAKE_FLAGS+= CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\"" +XAKE_FLAGS+= CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\"" V=1 CONFIGURE_ENV+= CC="${TARGET_CC}" IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}" ip-install: - ${INSTALL_DIR} ${IDIR_IP}/{etc/iproute2,bin} - ${INSTALL_DATA} ${WRKINST}/etc/iproute2/* ${IDIR_IP}/etc/iproute2/ + ${INSTALL_DIR} ${IDIR_IP}/bin ${INSTALL_BIN} ${WRKINST}/sbin/ip ${IDIR_IP}/bin/ip tc-install: @@ -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-ip_iplink_can_c b/package/iproute2/patches/patch-ip_iplink_can_c index 491987005..f08774b36 100644 --- a/package/iproute2/patches/patch-ip_iplink_can_c +++ b/package/iproute2/patches/patch-ip_iplink_can_c @@ -1,6 +1,6 @@ ---- iproute2-4.9.0.orig/ip/iplink_can.c 2016-12-13 00:07:42.000000000 +0100 -+++ iproute2-4.9.0/ip/iplink_can.c 2016-12-26 01:27:39.734025890 +0100 -@@ -119,7 +119,7 @@ static int can_parse_opt(struct link_uti +--- iproute2-6.11.0.orig/ip/iplink_can.c 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/ip/iplink_can.c 2024-09-24 09:43:33.522450056 +0200 +@@ -137,7 +137,7 @@ static int can_parse_opt(struct link_uti if (get_u32(&bt.bitrate, *argv, 0)) invarg("invalid \"bitrate\" value\n", *argv); } else if (matches(*argv, "sample-point") == 0) { diff --git a/package/iproute2/patches/patch-misc_ifstat_c b/package/iproute2/patches/patch-misc_ifstat_c deleted file mode 100644 index 7f6584649..000000000 --- a/package/iproute2/patches/patch-misc_ifstat_c +++ /dev/null @@ -1,11 +0,0 @@ ---- iproute2-3.10.0.orig/misc/ifstat.c 2013-07-16 19:06:36.000000000 +0200 -+++ iproute2-3.10.0/misc/ifstat.c 2013-08-17 15:27:59.236199157 +0200 -@@ -21,7 +21,7 @@ - #include <sys/file.h> - #include <sys/socket.h> - #include <sys/un.h> --#include <sys/poll.h> -+#include <poll.h> - #include <sys/wait.h> - #include <sys/stat.h> - #include <signal.h> diff --git a/package/iproute2/patches/patch-misc_nstat_c b/package/iproute2/patches/patch-misc_nstat_c deleted file mode 100644 index feed4df14..000000000 --- a/package/iproute2/patches/patch-misc_nstat_c +++ /dev/null @@ -1,11 +0,0 @@ ---- iproute2-3.10.0.orig/misc/nstat.c 2013-07-16 19:06:36.000000000 +0200 -+++ iproute2-3.10.0/misc/nstat.c 2013-08-17 15:27:46.412360373 +0200 -@@ -21,7 +21,7 @@ - #include <sys/file.h> - #include <sys/socket.h> - #include <sys/un.h> --#include <sys/poll.h> -+#include <poll.h> - #include <sys/wait.h> - #include <sys/stat.h> - #include <signal.h> diff --git a/package/iproute2/patches/patch-misc_rtacct_c b/package/iproute2/patches/patch-misc_rtacct_c deleted file mode 100644 index ac0c7d5e2..000000000 --- a/package/iproute2/patches/patch-misc_rtacct_c +++ /dev/null @@ -1,11 +0,0 @@ ---- iproute2-3.10.0.orig/misc/rtacct.c 2013-07-16 19:06:36.000000000 +0200 -+++ iproute2-3.10.0/misc/rtacct.c 2013-08-17 15:26:02.313669072 +0200 -@@ -22,7 +22,7 @@ - #include <sys/file.h> - #include <sys/socket.h> - #include <sys/un.h> --#include <sys/poll.h> -+#include <poll.h> - #include <sys/wait.h> - #include <sys/stat.h> - #include <sys/mman.h> diff --git a/package/iproute2/patches/patch-netem_Makefile b/package/iproute2/patches/patch-netem_Makefile index 69141bd62..6583220fc 100644 --- a/package/iproute2/patches/patch-netem_Makefile +++ b/package/iproute2/patches/patch-netem_Makefile @@ -1,6 +1,6 @@ ---- iproute2-4.10.0.orig/netem/Makefile 2017-02-20 17:47:52.000000000 +0100 -+++ iproute2-4.10.0/netem/Makefile 2017-04-23 20:23:07.404790192 +0200 -@@ -1,14 +1,12 @@ +--- iproute2-6.11.0.orig/netem/Makefile 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/netem/Makefile 2024-09-24 09:43:33.530449869 +0200 +@@ -4,14 +4,12 @@ include ../config.mk DISTGEN = maketable normal pareto paretonormal DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist @@ -16,7 +16,7 @@ %.dist: % ./$* > $@ -@@ -17,7 +15,7 @@ experimental.dist: maketable experimenta +@@ -20,7 +18,7 @@ experimental.dist: maketable experimenta ./maketable experimental.dat > experimental.dist stats: stats.c diff --git a/package/iproute2/patches/patch-netem_maketable_c b/package/iproute2/patches/patch-netem_maketable_c index b6eb03405..0fe26932f 100644 --- a/package/iproute2/patches/patch-netem_maketable_c +++ b/package/iproute2/patches/patch-netem_maketable_c @@ -1,6 +1,6 @@ ---- iproute2-2.6.29-1.orig/netem/maketable.c 2009-03-24 23:40:54.000000000 +0100 -+++ iproute2-2.6.29-1/netem/maketable.c 2009-12-11 16:32:33.000000000 +0100 -@@ -10,7 +10,7 @@ +--- iproute2-6.11.0.orig/netem/maketable.c 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/netem/maketable.c 2024-09-24 09:43:33.538449682 +0200 +@@ -11,7 +11,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> diff --git a/package/iproute2/patches/patch-netem_normal_c b/package/iproute2/patches/patch-netem_normal_c index 3eada6d03..ddf1927b2 100644 --- a/package/iproute2/patches/patch-netem_normal_c +++ b/package/iproute2/patches/patch-netem_normal_c @@ -1,6 +1,6 @@ ---- iproute2-3.12.0.orig/netem/normal.c 2013-11-23 02:10:33.000000000 +0100 -+++ iproute2-3.12.0/netem/normal.c 2014-02-09 11:40:30.000000000 +0100 -@@ -8,9 +8,7 @@ +--- iproute2-6.11.0.orig/netem/normal.c 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/netem/normal.c 2024-09-24 09:43:33.542449589 +0200 +@@ -9,9 +9,7 @@ #include <string.h> #include <limits.h> diff --git a/package/iproute2/patches/patch-netem_pareto_c b/package/iproute2/patches/patch-netem_pareto_c index b422a56a0..1f6a9338f 100644 --- a/package/iproute2/patches/patch-netem_pareto_c +++ b/package/iproute2/patches/patch-netem_pareto_c @@ -1,6 +1,6 @@ ---- iproute2-3.12.0.orig/netem/pareto.c 2013-11-23 02:10:33.000000000 +0100 -+++ iproute2-3.12.0/netem/pareto.c 2014-02-09 11:46:07.000000000 +0100 -@@ -7,10 +7,8 @@ +--- iproute2-6.11.0.orig/netem/pareto.c 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/netem/pareto.c 2024-09-24 09:43:33.550449401 +0200 +@@ -8,10 +8,8 @@ #include <math.h> #include <limits.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 2716b71c8..000000000 --- a/package/iproute2/patches/patch-tc_tc_core_h +++ /dev/null @@ -1,11 +0,0 @@ ---- iproute2-3.12.0.orig/tc/tc_core.h 2013-11-23 02:10:33.000000000 +0100 -+++ iproute2-3.12.0/tc/tc_core.h 2014-02-08 20:19:59.000000000 +0100 -@@ -1,7 +1,7 @@ - #ifndef _TC_CORE_H_ - #define _TC_CORE_H_ 1 - --#include <asm/types.h> -+#include <sys/types.h> - #include <linux/pkt_sched.h> - - #define TIME_UNITS_PER_SEC 1000000 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/irssi/Makefile b/package/irssi/Makefile index 66bc9344e..9c8f42418 100644 --- a/package/irssi/Makefile +++ b/package/irssi/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= irssi -PKG_VERSION:= 1.4.4 +PKG_VERSION:= 1.4.5 PKG_RELEASE:= 1 -PKG_HASH:= fefe9ec8c7b1475449945c934a2360ab12693454892be47a6d288c63eb107ead +PKG_HASH:= 72a951cb0ad622785a8962801f005a3a412736c7e7e3ce152f176287c52fe062 PKG_DESCR:= irc text client PKG_SECTION:= app/chat PKG_DEPENDS:= glib libncurses @@ -14,10 +14,13 @@ PKG_BUILDDEP:= glib ncurses PKG_URL:= http://www.irssi.org/ PKG_SITES:= https://github.com/irssi/irssi/releases/download/$(PKG_VERSION)/ -PKG_CHOICES_IRSSI:= WITH_LIBRESSL WITHOUT_SSL +PKG_CHOICES_IRSSI:= WITH_OPENSSL WITH_LIBRESSL WITHOUT_SSL +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCB_WITH_OPENSSL:= openssl +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCB_WITH_LIBRESSL:= libressl -PKGCS_WITH_LIBRESSL:= libressl +PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCD_WITHOUT_SSL:= use no ssl PKG_FLAVOURS_IRSSI:= WITH_IPV6 @@ -27,7 +30,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,IRSSI,irssi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_LDFLAGS+= -ltinfo +TARGET_LDFLAGS+= -ltinfo -latomic CONFIGURE_ARGS+= --with-perl=no \ --with-textui \ --with-terminfo \ diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile deleted file mode 100644 index 4c5e86dd4..000000000 --- a/package/jamvm/Makefile +++ /dev/null @@ -1,49 +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:= jamvm -PKG_VERSION:= 2.0.0 -PKG_RELEASE:= 1 -PKG_HASH:= 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da -PKG_DESCR:= java virtual machine implementation -PKG_SECTION:= dev/lang -PKG_DEPENDS:= libffi zlib -PKG_BUILDDEP:= libffi zlib -PKG_NEEDS:= threads -PKG_URL:= http://jamvm.sourceforge.net -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} - -# use of deprecated swp{b} -PKG_SYSTEM_DEPENDS:= !raspberry-pi3 !raspberry-pi3p - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -include ${ADK_TOPDIR}/mk/host.mk -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call HOST_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -HOST_CONFIGURE_ARGS+= --libdir=$(STAGING_HOST_DIR)/usr/lib/jamvm \ - --includedir=$(STAGING_HOST_DIR)/usr/include/jamvm \ - --with-classpath-install-dir=$(STAGING_HOST_DIR)/usr - -CONFIGURE_ARGS+= --enable-ffi - -jamvm-install: - ${INSTALL_DIR} ${IDIR_JAMVM}/usr/bin - ${INSTALL_DIR} ${IDIR_JAMVM}/usr/lib - ${INSTALL_DIR} ${IDIR_JAMVM}/usr/share/jamvm - ${INSTALL_BIN} ${WRKINST}/usr/bin/jamvm \ - ${IDIR_JAMVM}/usr/bin - ${CP} ${WRKINST}/usr/share/jamvm/classes.zip \ - ${IDIR_JAMVM}/usr/share/jamvm - $(CP) ${WRKINST}/usr/lib/libjvm.so \ - ${IDIR_JAMVM}/usr/lib - $(CP) ${WRKINST}/usr/lib/rt.jar \ - ${IDIR_JAMVM}/usr/lib - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/jikes/Makefile b/package/jikes/Makefile deleted file mode 100644 index 5a4bd097d..000000000 --- a/package/jikes/Makefile +++ /dev/null @@ -1,26 +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:= jikes -PKG_VERSION:= 1.22 -PKG_RELEASE:= 1 -PKG_HASH:= 0cb02c763bc441349f6d38cacd52adf762302cce3a08e269f1f75f726e6e14e3 -PKG_DESCR:= java compiler -PKG_BUILDDEP:= jikes-host -PKG_SECTION:= dev/lang -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/} - -PKG_CFLINE_JIKES:= depends on ADK_HOST_ONLY - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE})) -$(eval $(call PKG_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/json-c/patches/patch-arraylist_c b/package/json-c/patches/patch-arraylist_c new file mode 100644 index 000000000..6143e8fd8 --- /dev/null +++ b/package/json-c/patches/patch-arraylist_c @@ -0,0 +1,17 @@ + Fix for gcc-14 + + Upstream did not just fix this, but delay (the implicit) memset() in + commit 4a546e7b2f471 ("In arraylist, use malloc instead of calloc, + avoid clearing with memeset until we really need to, and micro-optimize + array_list_add().") which is not suitable for a backport. +--- json-c-0.13.orig/arraylist.c 2017-11-30 05:41:30.000000000 +0100 ++++ json-c-0.13/arraylist.c 2025-01-08 02:21:28.914179381 +0100 +@@ -46,7 +46,7 @@ array_list_new(array_list_free_fn *free_ + arr->size = ARRAY_LIST_DEFAULT_SIZE; + arr->length = 0; + arr->free_fn = free_fn; +- if(!(arr->array = (void**)calloc(sizeof(void*), arr->size))) { ++ if(!(arr->array = (void**)calloc(arr->size, sizeof(void*)))) { + free(arr); + return NULL; + } diff --git a/package/json-c/patches/patch-json_object_c b/package/json-c/patches/patch-json_object_c new file mode 100644 index 000000000..09b93743e --- /dev/null +++ b/package/json-c/patches/patch-json_object_c @@ -0,0 +1,17 @@ + Fix for gcc-14 + + Upstream did not just fix this, but delay (the implicit) memset() in + commit 4a546e7b2f471 ("In arraylist, use malloc instead of calloc, + avoid clearing with memeset until we really need to, and micro-optimize + array_list_add().") which is not suitable for a backport. +--- json-c-0.13.orig/json_object.c 2017-12-05 05:44:03.000000000 +0100 ++++ json-c-0.13/json_object.c 2025-01-08 02:21:42.515180709 +0100 +@@ -218,7 +218,7 @@ static struct json_object* json_object_n + { + struct json_object *jso; + +- jso = (struct json_object*)calloc(sizeof(struct json_object), 1); ++ jso = (struct json_object*)calloc(1, sizeof(struct json_object)); + if (!jso) + return NULL; + jso->o_type = o_type; diff --git a/package/json/Makefile b/package/json/Makefile new file mode 100644 index 000000000..5d63e90ef --- /dev/null +++ b/package/json/Makefile @@ -0,0 +1,30 @@ +# 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:= json +PKG_VERSION:= 3.12.0 +PKG_RELEASE:= 1 +PKG_HASH:= 4b92eb0c06d10683f7447ce9406cb97cd4b453be18d7279320f7b2f025c10187 +PKG_DESCR:= C++ json library +PKG_SECTION:= libs/misc +PKG_URL:= https://github.com/nlohmann/json/ +PKG_SITES:= https://github.com/nlohmann/json/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,JSON,json,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +json-install: + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/kbd/Makefile b/package/kbd/Makefile index 7c0b62efa..97b2b691f 100644 --- a/package/kbd/Makefile +++ b/package/kbd/Makefile @@ -43,6 +43,10 @@ kbd-install: $(IDIR_KBD)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/loadkeys \ $(IDIR_KBD)/usr/bin +ifeq ($(ADK_TARGET_SYSTEM_HP_JORNADA),y) + $(INSTALL_DIR) $(IDIR_KBD)/etc + $(CP) ./files/hpjornada.map $(IDIR_KBD)/etc +endif ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) $(INSTALL_DIR) $(IDIR_KBD)/etc $(CP) ./files/zaurus.map $(IDIR_KBD)/etc diff --git a/package/kbd/files/hpjornada.map b/package/kbd/files/hpjornada.map new file mode 100644 index 000000000..c7fc2a670 --- /dev/null +++ b/package/kbd/files/hpjornada.map @@ -0,0 +1,279 @@ +# English keymap for Jornada 6xx devices. +# +# Created by Tibor Zenis ( zenis <at> fmph.uniba.sk ) +# (Lightly) Modified by Alex Palestras ( B_Linuz <at> yahoo.com ) +# plain, shift, altgr, ctrl, shift + ctrl, alt, ctrl + alt + +keymaps 0-2,4-5,8,12 +keycode 1 = Escape Escape + alt keycode 1 = Meta_Escape +keycode 2 = one exclam asciitilde + alt keycode 2 = Meta_one +keycode 3 = two at grave + alt keycode 3 = Meta_two +keycode 4 = three numbersign + alt keycode 4 = Meta_three + altgr keycode 4 = pound +keycode 5 = four dollar + control keycode 5 = Control_backslash + alt keycode 5 = Meta_four + altgr keycode 5 = currency +keycode 6 = five percent + control keycode 6 = Control_bracketright + alt keycode 6 = Meta_five +keycode 7 = six asciicircum + control keycode 7 = Control_asciicircum + alt keycode 7 = Meta_six +keycode 8 = seven ampersand braceleft + control keycode 8 = Control_underscore + altgr keycode 8 = KP_7 +keycode 9 = eight asterisk bracketleft + control keycode 9 = Delete + altgr keycode 9 = KP_8 +keycode 10 = nine parenleft bracketright + altgr keycode 10 = KP_9 +keycode 11 = zero parenright braceright + altgr keycode 11 = KP_Divide +keycode 12 = minus underscore backslash + control keycode 11 = Control_underscore + shift control keycode 11 = Control_underscore + alt keycode 11 = Meta_minus +keycode 13 = equal plus + alt keycode 13 = Meta_equal +keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete +keycode 15 = Tab Tab + alt keycode 15 = Meta_Tab +keycode 16 = q +keycode 17 = w +keycode 18 = e + Shift keycode 18 = E +keycode 19 = r +keycode 20 = t +keycode 21 = y + altgr keycode 21 = KP_4 +keycode 22 = u + altgr keycode 22 = KP_5 +keycode 23 = i + altgr keycode 23 = KP_6 +keycode 24 = o + altgr keycode 24 = KP_Multiply +keycode 25 = p + AltGr keycode 25 = braceleft +keycode 26 = backslash bar + AltGr keycode 26 = braceright +keycode 28 = Return + alt keycode 28 = Meta_Control_m +keycode 29 = Control + altgr keycode 29 = Num_Lock +keycode 30 = a +keycode 31 = s +keycode 32 = d +keycode 33 = f +keycode 34 = g +keycode 35 = h + altgr keycode 35 = KP_1 +keycode 36 = j + altgr keycode 36 = KP_2 +keycode 37 = k + altgr keycode 37 = KP_3 +keycode 38 = l + altgr keycode 38 = KP_Subtract +keycode 39 = semicolon colon bracketleft + alt keycode 39 = Meta_semicolon +keycode 40 = apostrophe quotedbl bracketright + control keycode 40 = Control_g + alt keycode 40 = Meta_apostrophe +keycode 41 = F11 + shift keycode 41 = F21 + altgr keycode 41 = Console_23 + alt keycode 41 = Console_11 + control alt keycode 41 = Console_11 +keycode 42 = Shift + altgr keycode 42 = Caps_Lock +keycode 44 = z +keycode 45 = x +keycode 46 = c +keycode 47 = v +keycode 48 = b +keycode 49 = n + altgr keycode 49 = KP_0 +keycode 50 = m + altgr keycode 50 = KP_Comma +keycode 51 = comma less + altgr keycode 51 = KP_Period +keycode 52 = period greater + control keycode 52 = Compose + altgr keycode 52 = KP_Add +keycode 54 = Shift +keycode 56 = Alt +keycode 57 = space space + alt keycode 57 = Meta_space +keycode 58 = F9 + shift keycode 58 = F19 + altgr keycode 58 = Console_21 + alt keycode 58 = Console_9 + control alt keycode 58 = Console_9 +keycode 59 = F1 + altgr keycode 59 = Console_13 + alt keycode 59 = Console_1 + control alt keycode 59 = Console_1 +keycode 60 = F2 + shift keycode 60 = F12 + altgr keycode 60 = Console_14 + alt keycode 60 = Console_2 + control alt keycode 60 = Console_2 +keycode 61 = F3 + shift keycode 61 = F13 + altgr keycode 61 = Console_15 + alt keycode 61 = Console_3 + control alt keycode 61 = Console_3 +keycode 62 = F4 + shift keycode 62 = F14 + altgr keycode 62 = Console_16 + alt keycode 62 = Console_4 + control alt keycode 62 = Console_4 +keycode 63 = F5 + shift keycode 63 = F15 + altgr keycode 63 = Console_17 + alt keycode 63 = Console_5 + control alt keycode 63 = Console_5 +keycode 64 = F6 + shift keycode 64 = F16 + altgr keycode 64 = Console_18 + alt keycode 64 = Console_6 + control alt keycode 64 = Console_6 +keycode 65 = F7 + shift keycode 65 = F17 + altgr keycode 65 = Console_19 + alt keycode 65 = Console_7 + control alt keycode 65 = Console_7 +keycode 66 = F8 + shift keycode 66 = F18 + altgr keycode 66 = Console_20 + alt keycode 66 = Console_8 + control alt keycode 66 = Console_8 +keycode 72 = Up + shift keycode 72 = Scroll_Backward + altgr keycode 72 = Scroll_Backward + alt keycode 72 = Prior +keycode 74 = Control +keycode 75 = Left + altgr keycode 75 = Decr_Console + alt keycode 75 = Find +keycode 77 = Right + altgr keycode 77 = Incr_Console + alt keycode 77 = Select +keycode 80 = Down + shift keycode 80 = Scroll_Forward + altgr keycode 80 = Scroll_Forward + alt keycode 80 = Next +keycode 83 = Remove Remove Meta_Delete + alt keycode 83 = Meta_Delete +keycode 112 = F10 + shift keycode 112 = F20 + altgr keycode 112 = Console_22 + alt keycode 112 = Console_10 + control alt keycode 112 = Console_10 +keycode 115 = slash question + control keycode 115 = Delete + alt keycode 115 = Meta_slash +keycode 123 = AltGr +keycode 0 = Insert +string F1 = "\033[[A" +string F2 = "\033[[B" +string F3 = "\033[[C" +string F4 = "\033[[D" +string F5 = "\033[[E" +string F6 = "\033[17~" +string F7 = "\033[18~" +string F8 = "\033[19~" +string F9 = "\033[20~" +string F10 = "\033[21~" +string F11 = "\033[23~" +string F12 = "\033[24~" +string F13 = "\033[25~" +string F14 = "\033[26~" +string F15 = "\033[28~" +string F16 = "\033[29~" +string F17 = "\033[31~" +string F18 = "\033[32~" +string F19 = "\033[33~" +string F20 = "\033[34~" +string Find = "\033[1~" +string Insert = "\033[2~" +string Remove = "\033[3~" +string Select = "\033[4~" +string Prior = "\033[5~" +string Next = "\033[6~" +string Macro = "\033[M" +string Pause = "\033[P" +compose '`' 'A' to 'À' +compose '`' 'a' to 'à' +compose '\'' 'A' to 'Á' +compose '\'' 'a' to 'á' +compose '^' 'A' to 'Â' +compose '^' 'a' to 'â' +compose '~' 'A' to 'Ã' +compose '~' 'a' to 'ã' +compose '"' 'A' to 'Ä' +compose '"' 'a' to 'ä' +compose 'O' 'A' to 'Å' +compose 'o' 'a' to 'å' +compose '0' 'A' to 'Å' +compose '0' 'a' to 'å' +compose 'A' 'A' to 'Å' +compose 'a' 'a' to 'å' +compose 'A' 'E' to 'Æ' +compose 'a' 'e' to 'æ' +compose ',' 'C' to 'Ç' +compose ',' 'c' to 'ç' +compose '`' 'E' to 'È' +compose '`' 'e' to 'è' +compose '\'' 'E' to 'É' +compose '\'' 'e' to 'é' +compose '^' 'E' to 'Ê' +compose '^' 'e' to 'ê' +compose '"' 'E' to 'Ë' +compose '"' 'e' to 'ë' +compose '`' 'I' to 'Ì' +compose '`' 'i' to 'ì' +compose '\'' 'I' to 'Í' +compose '\'' 'i' to 'í' +compose '^' 'I' to 'Î' +compose '^' 'i' to 'î' +compose '"' 'I' to 'Ï' +compose '"' 'i' to 'ï' +compose '-' 'D' to 'Ð' +compose '-' 'd' to 'ð' +compose '~' 'N' to 'Ñ' +compose '~' 'n' to 'ñ' +compose '`' 'O' to 'Ò' +compose '`' 'o' to 'ò' +compose '\'' 'O' to 'Ó' +compose '\'' 'o' to 'ó' +compose '^' 'O' to 'Ô' +compose '^' 'o' to 'ô' +compose '~' 'O' to 'Õ' +compose '~' 'o' to 'õ' +compose '"' 'O' to 'Ö' +compose '"' 'o' to 'ö' +compose '/' 'O' to 'Ø' +compose '/' 'o' to 'ø' +compose '`' 'U' to 'Ù' +compose '`' 'u' to 'ù' +compose '\'' 'U' to 'Ú' +compose '\'' 'u' to 'ú' +compose '^' 'U' to 'Û' +compose '^' 'u' to 'û' +compose '"' 'U' to 'Ü' +compose '"' 'u' to 'ü' +compose '\'' 'Y' to 'Ý' +compose '\'' 'y' to 'ý' +compose 'T' 'H' to 'Þ' +compose 't' 'h' to 'þ' +compose 's' 's' to 'ß' +compose '"' 'y' to 'ÿ' +compose 's' 'z' to 'ß' +compose 'i' 'j' to 'ÿ' diff --git a/package/kbd/files/kbd.postinst b/package/kbd/files/kbd.postinst index 2024d30cf..ec72bad23 100644 --- a/package/kbd/files/kbd.postinst +++ b/package/kbd/files/kbd.postinst @@ -1,4 +1,4 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh -add_rcconf kbd_map "de-latin1-nodeadkeys" +add_rcconf kbd_map "/etc/hpjornada.map" add_rcconf kbd NO diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 3e7d88f80..1d3e818d9 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kexec-tools -PKG_VERSION:= 2.0.23 -PKG_RELEASE:= 2 -PKG_HASH:= aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b +PKG_VERSION:= 2.0.31 +PKG_RELEASE:= 1 +PKG_HASH:= 8a8f350ddc66e1c905a3ab525a7e9ba96c81e04e70ef69397b0155b67b922c31 PKG_DESCR:= kernel exec tools PKG_SECTION:= sys/misc PKG_DEPENDS:= zlib diff --git a/package/kmod/Makefile b/package/kmod/Makefile index c46410927..36f4ea57f 100644 --- a/package/kmod/Makefile +++ b/package/kmod/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kmod -PKG_VERSION:= 31 +PKG_VERSION:= 34.2 PKG_RELEASE:= 1 -PKG_HASH:= f5a6949043cc72c001b728d8c218609c5a15f3c33d75614b78c79418fcf00d80 +PKG_HASH:= 5a5d5073070cc7e0c7a7a3c6ec2a0e1780850c8b47b3e3892226b93ffcb9cb54 PKG_DESCR:= kernel module utils PKG_SECTION:= sys/utils PKG_DEPENDS:= libkmod diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 9fb6deccb..cd1aaa91e 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -4,39 +4,39 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi -PKG_VERSION:= 21.0b2 +PKG_VERSION:= 22.0a1 PKG_RELEASE:= 1 -PKG_HASH:= b9d6ecbb8769cdfe00cbbe5da5c330a7624eee50cffb87d87f6271033f1ee74b +PKG_HASH:= da88f6aee01995caadfc6e194b8e3b51dfd193164a6c8d559d2443dd7f58f9f8 PKG_DESCR:= software media player PKG_SECTION:= mm/video -PKG_DEPENDS:= python3 libsquish libressl libxz libfmt rapidjson +PKG_DEPENDS:= python3 libsquish libopenssl libfmt rapidjson libpcre PKG_DEPENDS+= libass libmpeg2 libmad libmodplug libcurl libxshmfence -PKG_DEPENDS+= libflac libbz2 libtiff libnettle librtmp liblzo +PKG_DEPENDS+= libflac libbz2 libtiff libnettle librtmp liblzo libXext PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libncurses libpng -PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate libuuid -PKG_DEPENDS+= taglib libjasper libmp3lame libgpg-error giflib -PKG_DEPENDS+= glib libdcadec libffmpeg libxvidcore libiconv harfbuzz +PKG_DEPENDS+= libpcre2 libcdio libfreetype libsamplerate libuuid +PKG_DEPENDS+= taglib libjasper libmp3lame libgpg-error giflib nghttp2 +PKG_DEPENDS+= glib libdcadec libffmpeg libxvidcore harfbuzz exiv2 PKG_DEPENDS+= flatbuffers fstrcmp spdlog mesa libinput libxkbcommon -PKG_DEPENDS+= xkeyboard-config tinyxml2 libdisplay-info libudfread -PKG_BUILDDEP:= python3 libass ffmpeg rtmpdump libiconv libudfread +PKG_DEPENDS+= xkeyboard-config tinyxml2 libdisplay-info libudfread json +PKG_BUILDDEP:= python3 libass ffmpeg rtmpdump libudfread exiv2 PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo fmt rapidjson PKG_BUILDDEP+= curl flac bzip2 libtiff yajl cmake-host libdisplay-info -PKG_BUILDDEP+= tinyxml tinyxml2 sqlite pcre libcdio freetype libpng +PKG_BUILDDEP+= tinyxml tinyxml2 sqlite pcre2 libcdio freetype libpng PKG_BUILDDEP+= libsamplerate taglib libjasper giflib xkeyboard-config PKG_BUILDDEP+= glib libmodplug libgpg-error xvidcore libxshmfence PKG_BUILDDEP+= swig-host liblzo-host libpng-host libjpeg-turbo-host PKG_BUILDDEP+= zip-host unzip-host giflib-host libsquish libdcadec -PKG_BUILDDEP+= libcrossguid libressl xz bzip2 liblzo harfbuzz +PKG_BUILDDEP+= openssl bzip2 liblzo harfbuzz pcre json PKG_BUILDDEP+= flatbuffers fstrcmp spdlog mesa libinput libxkbcommon PKG_NEEDS:= threads c++ data iconv PKG_URL:= http://kodi.tv/ PKG_SITES:= https://github.com/xbmc/xbmc/archive/ -DISTFILES:= $(PKG_VERSION)-Omega.tar.gz -WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Omega +DISTFILES:= $(PKG_VERSION)-Piers.tar.gz +WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Piers WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi4 raspberry-pi4-64 rockpi4-plus raspberry-pi5 +PKG_SYSTEM_DEPENDS:= qemu-x86_64 raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi4 raspberry-pi4-64 rockpi4-plus raspberry-pi5 PKG_FLAVOURS_KODI:= WITH_ALSA WITH_CEC WITH_PULSEAUDIO WITH_SMB PKG_FLAVOURS_KODI+= WITH_MICROHTTPD WITH_SSH WITH_AVAHI @@ -69,17 +69,17 @@ $(eval $(call PKG_template,KODI,kodi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS HOST_CXXFLAGS:= -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -I$(WRKSRC)/xbmc/linux CONFIG_STYLE:= cmake CMAKE_FLAGS+= -DENABLE_CCACHE=OFF \ + -DENABLE_TESTING=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DVERBOSE=ON \ -DENABLE_DVDCSS=ON \ - -DENABLE_INTERNAL_CROSSGUID=OFF \ -DENABLE_INTERNAL_FFMPEG=OFF \ -DENABLE_INTERNAL_RapidJSON=OFF \ -DWITH_FFMPEG=$(STAGING_TARGET_DIR)/usr \ -DPYTHON_EXECUTABLE=$(STAGING_HOST_DIR)/usr/bin/python3 \ - -DPYTHON_INCLUDE_DIRS=$(STAGING_TARGET_DIR)/usr/include/python3.11 \ - -DPYTHON_PATH=$(STAGING_TARGET_DIR)/usr/lib/python3.11 \ - -DPYTHON_VER=3.11 \ + -DPYTHON_INCLUDE_DIRS=$(STAGING_TARGET_DIR)/usr/include/python3.13 \ + -DPYTHON_PATH=$(STAGING_TARGET_DIR)/usr/lib/python3.13 \ + -DPYTHON_VER=3.13 \ -DKODI_DEPENDSBUILD=OFF \ -DENABLE_OPENSSL=ON \ -DENABLE_MYSQLCLIENT=OFF \ @@ -99,9 +99,9 @@ CMAKE_FLAGS+= -DENABLE_CCACHE=OFF \ -DENABLE_PLIST=OFF \ -DNATIVEPREFIX=$(STAGING_HOST_DIR)/usr \ -DDEPENDS_PATH=$(STAGING_TARGET_DIR)/usr \ - -DWITH_TEXTUREPACKER=$(STAGING_HOST_DIR)/usr/bin/TexturePacker \ -DWITH_JSONSCHEMABUILDER=$(STAGING_HOST_DIR)/usr/bin/JsonSchemaBuilder \ - -DCMAKE_EXE_LINKER_FLAGS=-latomic \ + -DWITH_TEXTUREPACKER=$(STAGING_HOST_DIR)/usr/bin/TexturePacker \ + -DCMAKE_EXE_LINKER_FLAGS="-latomic" \ -DLIBDVDCSS_URL=$(DL_DIR)/libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz \ -DLIBDVDNAV_URL=$(DL_DIR)/libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz \ -DLIBDVDREAD_URL=$(DL_DIR)/libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz @@ -112,10 +112,17 @@ CMAKE_FLAGS+= -DWITH_ARCH=aarch64 \ -DENABLE_NEON=OFF endif ifeq ($(ADK_TARGET_ARCH_ARM),y) - -DWITH_ARCH=arm \ +CMAKE_FLAGS+= -DWITH_ARCH=arm \ -DWITH_CPU=arm \ -DENABLE_NEON=ON endif +ifeq ($(ADK_TARGET_ARCH_X86_64),y) +CMAKE_FLAGS+= -DWITH_ARCH=x86_64 \ + -DAPP_RENDER_SYSTEM=gl \ + -DCORE_PLATFORM_NAME=x11 \ + -DENABLE_OPENGL=ON \ + -DENABLE_X11=ON +endif ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) CMAKE_FLAGS+= -DCORE_PLATFORM_NAME=gbm \ @@ -162,24 +169,23 @@ CMAKE_FLAGS+= -DENABLE_SSH=OFF endif XAKE_FLAGS+= VERBOSE=1 -TARGET_LDFLAGS+= -latomic -liconv KODI_LIBDVDCSS_VERSION = 1.4.3-Next-Nexus-Alpha2-2 KODI_LIBDVDNAV_VERSION = 6.1.1-Next-Nexus-Alpha2-2 KODI_LIBDVDREAD_VERSION = 6.1.3-Next-Nexus-Alpha2-2 pre-configure: - #(cd $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src && PATH='$(HOST_PATH)' cmake .) - #PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src - #cp $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src/JsonSchemaBuilder \ - # $(STAGING_HOST_DIR)/usr/bin/JsonSchemaBuilder - #(cd $(WRKSRC)/tools/depends/native/TexturePacker/src && PATH='$(HOST_PATH)' cmake \ - # -DKODI_SOURCE_DIR=$(WRKSRC) \ - # -DCMAKE_MODULE_PATH=$(WRKSRC)/cmake/modules \ - # -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" .) - #PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/TexturePacker/src - #cp $(WRKSRC)/tools/depends/native/TexturePacker/src/TexturePacker \ - # $(STAGING_HOST_DIR)/usr/bin + (cd $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src && PATH='$(HOST_PATH)' cmake .) + PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src + cp $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src/JsonSchemaBuilder \ + $(STAGING_HOST_DIR)/usr/bin/JsonSchemaBuilder + (cd $(WRKSRC)/tools/depends/native/TexturePacker/src && PATH='$(HOST_PATH)' cmake \ + -DKODI_SOURCE_DIR=$(WRKSRC) \ + -DCMAKE_MODULE_PATH=$(WRKSRC)/cmake/modules \ + -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" .) + PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/TexturePacker/src + cp $(WRKSRC)/tools/depends/native/TexturePacker/src/TexturePacker \ + $(STAGING_HOST_DIR)/usr/bin (cd $(DL_DIR) && wget -O libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz https://github.com/xbmc/libdvdcss/archive/refs/tags/$(KODI_LIBDVDCSS_VERSION).tar.gz) (cd $(DL_DIR) && wget -O libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz https://github.com/xbmc/libdvdnav/archive/refs/tags/$(KODI_LIBDVDNAV_VERSION).tar.gz) (cd $(DL_DIR) && wget -O libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz https://github.com/xbmc/libdvdread/archive/refs/tags/$(KODI_LIBDVDREAD_VERSION).tar.gz) diff --git a/package/kodi/files/kodi.init b/package/kodi/files/kodi.init index c3dfdf893..fc53d4486 100644 --- a/package/kodi/files/kodi.init +++ b/package/kodi/files/kodi.init @@ -13,7 +13,7 @@ autostart) ;; start) if [ ! -d /data/kodi ]; then - mkdir /data/kodi + mkdir -p /data/kodi fi cd / && /usr/lib/kodi/kodi-gbm & ;; diff --git a/package/kodi/patches/patch-CMakeLists_txt b/package/kodi/patches/patch-CMakeLists_txt deleted file mode 100644 index 7fa65595b..000000000 --- a/package/kodi/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,27 +0,0 @@ ---- xbmc-21.0b2-Omega.orig/CMakeLists.txt 2023-12-09 22:24:46.000000000 +0100 -+++ xbmc-21.0b2-Omega/CMakeLists.txt 2024-01-31 10:45:45.831435209 +0100 -@@ -178,7 +178,6 @@ endforeach() - # Required tools. Keep in alphabetical order please - set(required_buildtools FlatC - JsonSchemaBuilder -- TexturePacker - ) - - # Optional build tools -@@ -468,7 +467,6 @@ endif() - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR}/gen_skin.timestamp - COMMAND ${CMAKE_COMMAND} -DBUNDLEDIR=${_bundle_dir} -- -DTEXTUREPACKER_EXECUTABLE=$<TARGET_FILE:TexturePacker::TexturePacker::Executable> - -P ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/GeneratedPackSkins.cmake - COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR} - COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR}/gen_skin.timestamp -@@ -481,7 +479,7 @@ add_custom_target(gen_skin_pack DEPENDS - - # Packaging target. This generates system addon, xbt creation, copy files to build tree - add_custom_target(generate-packaging ALL -- DEPENDS TexturePacker::TexturePacker::Executable export-files gen_skin_pack gen_system_addons) -+ DEPENDS export-files gen_skin_pack gen_system_addons) - # Make sure we build any libs before we look to export-files. - # We may need to export some shared libs/data (eg Python) - add_dependencies(export-files ${GLOBAL_TARGET_DEPS}) diff --git a/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp b/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp index 67e51c6e9..193f5987b 100644 --- a/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp +++ b/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp @@ -1,5 +1,5 @@ ---- xbmc-19.3-Matrix.orig/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2021-10-24 12:09:58.000000000 +0200 -+++ xbmc-19.3-Matrix/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2022-02-26 00:09:15.499548854 +0100 +--- xbmc-22.0a1-Piers.orig/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2025-08-18 23:49:12.000000000 +0200 ++++ xbmc-22.0a1-Piers/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2025-10-06 14:07:24.604055678 +0200 @@ -18,11 +18,11 @@ * */ diff --git a/package/kodi/patches/patch-xbmc_dbwrappers_dataset_h b/package/kodi/patches/patch-xbmc_dbwrappers_dataset_h new file mode 100644 index 000000000..f27f92975 --- /dev/null +++ b/package/kodi/patches/patch-xbmc_dbwrappers_dataset_h @@ -0,0 +1,10 @@ +--- xbmc-22.0a1-Piers.orig/xbmc/dbwrappers/dataset.h 2025-08-18 23:49:12.000000000 +0200 ++++ xbmc-22.0a1-Piers/xbmc/dbwrappers/dataset.h 2025-10-07 06:25:46.959580300 +0200 +@@ -14,6 +14,7 @@ + + #include "qry_dat.h" + ++#include <cstdarg> + #include <list> + #include <map> + #include <memory> diff --git a/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp b/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp deleted file mode 100644 index 27c420df8..000000000 --- a/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp +++ /dev/null @@ -1,31 +0,0 @@ ---- xbmc-21.0b2-Omega.orig/xbmc/platform/linux/CPUInfoLinux.cpp 2023-12-09 22:24:46.000000000 +0100 -+++ xbmc-21.0b2-Omega/xbmc/platform/linux/CPUInfoLinux.cpp 2024-01-30 15:52:43.704683194 +0100 -@@ -19,10 +19,7 @@ - #include <sstream> - #include <vector> - --#if (defined(__arm__) && defined(HAS_NEON)) || defined(__aarch64__) --#include <asm/hwcap.h> --#include <sys/auxv.h> --#elif defined(__i386__) || defined(__x86_64__) -+#if defined(__i386__) || defined(__x86_64__) - #include <cpuid.h> - #endif - -@@ -279,16 +276,6 @@ CCPUInfoLinux::CCPUInfoLinux() - - m_cpuModel = m_cpuModel.substr(0, m_cpuModel.find(char(0))); // remove extra null terminations - --#if defined(HAS_NEON) && defined(__arm__) -- if (getauxval(AT_HWCAP) & HWCAP_NEON) -- m_cpuFeatures |= CPU_FEATURE_NEON; --#endif -- --#if defined(HAS_NEON) && defined(__aarch64__) -- if (getauxval(AT_HWCAP) & HWCAP_ASIMD) -- m_cpuFeatures |= CPU_FEATURE_NEON; --#endif -- - // Set MMX2 when SSE is present as SSE is a superset of MMX2 and Intel doesn't set the MMX2 cap - if (m_cpuFeatures & CPU_FEATURE_SSE) - m_cpuFeatures |= CPU_FEATURE_MMX2; diff --git a/package/lftp/Makefile b/package/lftp/Makefile index 993df08b3..a3706227e 100644 --- a/package/lftp/Makefile +++ b/package/lftp/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= lftp -PKG_VERSION:= 4.9.2 +PKG_VERSION:= 4.9.3 PKG_RELEASE:= 1 -PKG_HASH:= c517c4f4f9c39bd415d7313088a2b1e313b2d386867fe40b7692b83a20f0670d +PKG_HASH:= 96e7199d7935be33cf6b1161e955b2aab40ab77ecdf2a19cea4fc1193f457edc PKG_DESCR:= ftp and http client PKG_SECTION:= net/http PKG_DEPENDS:= libncurses libexpat @@ -16,7 +16,10 @@ PKG_NEEDS:= c++ PKG_URL:= http://lftp.yar.ru/ PKG_SITES:= http://lftp.yar.ru/ftp/ -PKG_CHOICES_LFTP:= WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL +PKG_CHOICES_LFTP:= WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCB_WITH_LIBRESSL:= libressl @@ -41,6 +44,10 @@ ifeq (${ADK_PACKAGE_LFTP_WITH_GNUTLS},y) CONFIGURE_ARGS+= --without-openssl \ --with-gnutls endif +ifeq (${ADK_PACKAGE_LFTP_WITH_OPENSSL},y) +CONFIGURE_ARGS+= --with-openssl="$(STAGING_TARGET_DIR)/usr" \ + --without-gnutls +endif ifeq (${ADK_PACKAGE_LFTP_WITH_LIBRESSL},y) CONFIGURE_ARGS+= --with-openssl="$(STAGING_TARGET_DIR)/usr" \ --without-gnutls diff --git a/package/lftp/patches/patch-src_lftp_ssl_cc b/package/lftp/patches/patch-src_lftp_ssl_cc deleted file mode 100644 index d8569322e..000000000 --- a/package/lftp/patches/patch-src_lftp_ssl_cc +++ /dev/null @@ -1,38 +0,0 @@ ---- lftp-4.9.2.orig/src/lftp_ssl.cc 2020-01-29 21:36:37.000000000 +0100 -+++ lftp-4.9.2/src/lftp_ssl.cc 2024-02-22 14:42:11.060809468 +0100 -@@ -34,7 +34,7 @@ - #include "misc.h" - #include "network.h" - #include "buffer.h" --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject - #endif - extern "C" { -@@ -775,7 +775,7 @@ error: - #elif USE_OPENSSL - //static int lftp_ssl_passwd_callback(char *buf,int size,int rwflag,void *userdata); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000L) - // for compatibility with older versions - X509_OBJECT *X509_OBJECT_new() - { -@@ -840,7 +840,7 @@ lftp_ssl_openssl_instance::lftp_ssl_open - ssl_ctx=SSL_CTX_new(); - X509_set_default_verify_paths(ssl_ctx->cert); - #else --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - SSLeay_add_ssl_algorithms(); - #endif - ssl_ctx=SSL_CTX_new(SSLv23_client_method()); -@@ -1080,7 +1080,7 @@ void lftp_ssl_openssl::copy_sid(const lf - - const char *lftp_ssl_openssl::strerror() - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - SSL_load_error_strings(); - #endif - int error=ERR_get_error(); diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile index e8cb57341..d4405ed87 100644 --- a/package/libIDL/Makefile +++ b/package/libIDL/Makefile @@ -26,9 +26,6 @@ $(eval $(call HOST_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ENV+= libIDL_cv_long_long_format=ll -ifeq ($(OS_FOR_BUILD),Darwin) -HOST_LDFLAGS+= -liconv -endif libidl-install: $(INSTALL_DIR) $(IDIR_LIBIDL)/usr/lib 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/libarchive/Makefile b/package/libarchive/Makefile index 9757531ec..67923beea 100644 --- a/package/libarchive/Makefile +++ b/package/libarchive/Makefile @@ -9,7 +9,6 @@ PKG_RELEASE:= 1 PKG_HASH:= ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e PKG_DESCR:= multiformat archive and compression library PKG_SECTION:= libs/comp -PKG_BUILDDEP:= xz PKG_URL:= http://www.libarchive.org/ PKG_SITES:= http://www.libarchive.org/downloads/ PKG_OPTS:= dev diff --git a/package/libass/Makefile b/package/libass/Makefile index b7cf2d2f5..f9bcc9906 100644 --- a/package/libass/Makefile +++ b/package/libass/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= f0da0bbfba476c16ae3e1cfd862256d30915911f7abaa1b16ce62ee653192784 PKG_DESCR:= portable subtitle renderer PKG_SECTION:= libs/video -PKG_DEPENDS:= fribidi fontconfig -PKG_BUILDDEP:= fribidi fontconfig +PKG_DEPENDS:= fribidi fontconfig harfbuzz +PKG_BUILDDEP:= fribidi fontconfig harfbuzz PKG_SITES:= https://github.com/libass/libass/releases/download/$(PKG_VERSION)/ PKG_OPTS:= dev diff --git a/package/libassuan/Makefile b/package/libassuan/Makefile index 373947719..103939dd6 100644 --- a/package/libassuan/Makefile +++ b/package/libassuan/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libassuan -PKG_VERSION:= 2.5.6 +PKG_VERSION:= 3.0.2 PKG_RELEASE:= 1 -PKG_HASH:= e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426 +PKG_HASH:= d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6 PKG_DESCR:= implementation of assuan protocol PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgpg-error diff --git a/package/libcap/Makefile b/package/libcap/Makefile index 29c417237..dcf979717 100644 --- a/package/libcap/Makefile +++ b/package/libcap/Makefile @@ -19,10 +19,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBCAP,libcap,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,LIBCAP,libcap,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -ifeq ($(OS_FOR_BUILD),Darwin) -HOST_CFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include -endif - HOST_STYLE:= manual CONFIG_STYLE:= manual MAKE_ENV+= BUILD_CC="${HOST_CC}" diff --git a/package/libdisplay-info/Makefile b/package/libdisplay-info/Makefile index 89ee541d8..c90de5b58 100644 --- a/package/libdisplay-info/Makefile +++ b/package/libdisplay-info/Makefile @@ -4,15 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libdisplay-info -PKG_VERSION:= 0.1.1 +PKG_VERSION:= 0.2.0 PKG_RELEASE:= 1 -PKG_HASH:= 0d8731588e9f82a9cac96324a3d7c82e2ba5b1b5e006143fefe692c74069fb60 +PKG_HASH:= f7331fcaf5527251b84c8fb84238d06cd2f458422ce950c80e86c72927aa8c2b PKG_DESCR:= edid and displayid library PKG_SECTION:= libs/misc -PKG_BUILDDEP:= hwdata -PKG_SITES:= https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/0.1.1/downloads/ +PKG_BUILDDEP:= hwdata meson-host +PKG_SITES:= https://gitlab.freedesktop.org/emersion/libdisplay-info/-/archive/$(PKG_VERSION)/ PKG_OPTS:= dev +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBDISPLAY_INFO,libdisplay-info,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) diff --git a/package/libdrm/Makefile b/package/libdrm/Makefile index e5999416b..608ca2850 100644 --- a/package/libdrm/Makefile +++ b/package/libdrm/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libdrm -PKG_VERSION:= 2.4.120 +PKG_VERSION:= 2.4.124 PKG_RELEASE:= 1 -PKG_HASH:= 3bf55363f76c7250946441ab51d3a6cc0ae518055c0ff017324ab76cdefb327a +PKG_HASH:= ac36293f61ca4aafaf4b16a2a7afff312aa4f5c37c9fbd797de9e3c0863ca379 PKG_DESCR:= direct rendering manager library PKG_SECTION:= libs/video PKG_BUILDDEP:= meson-host libpthread-stubs cairo libpciaccess diff --git a/package/libedit/Makefile b/package/libedit/Makefile index 71c8e5dae..437811bf9 100644 --- a/package/libedit/Makefile +++ b/package/libedit/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 20230828-3.1 PKG_RELEASE:= 1 PKG_HASH:= 4ee8182b6e569290e7d1f44f0f78dac8716b35f656b76528f699c69c98814dad PKG_DESCR:= editline library +PKG_BUILDDEP:= ncurses PKG_SECTION:= libs/misc PKG_SITES:= https://www.thrysoee.dk/editline/ PKG_OPTS:= dev diff --git a/package/libelf/Makefile b/package/libelf/Makefile deleted file mode 100644 index 708b3bbd7..000000000 --- a/package/libelf/Makefile +++ /dev/null @@ -1,31 +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:= libelf -PKG_VERSION:= 0.8.13 -PKG_RELEASE:= 1 -PKG_HASH:= 591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d -PKG_DESCR:= elf library -PKG_SECTION:= libs/misc -PKG_SITES:= http://www.mr511.de/software/ -PKG_OPTS:= dev - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz - -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) - -CONFIGURE_ENV+= mr_cv_target_elf=yes \ - ac_cv_sizeof_long_long=8 -CONFIGURE_ARGS+= --enable-elf64=yes \ - --disable-sanity-checks -FAKE_FLAGS+= instroot="${WRKINST}" - -libelf-install: - ${INSTALL_DIR} ${IDIR_LIBELF}/usr/lib - ${CP} ${WRKINST}/usr/lib/libelf.so* ${IDIR_LIBELF}/usr/lib/ - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libelf/patches/patch-lib_Makefile_in b/package/libelf/patches/patch-lib_Makefile_in deleted file mode 100644 index 7630c7f5c..000000000 --- a/package/libelf/patches/patch-lib_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- libelf-0.8.13.orig/lib/Makefile.in 2009-11-01 14:04:19.000000000 +0100 -+++ libelf-0.8.13/lib/Makefile.in 2011-01-15 21:55:08.000000000 +0100 -@@ -158,7 +158,7 @@ libelf.a: $(OBJS) $(LIBOBJS) - - $(SHLIB): libelf.a - @$(RM) $(SHLIB) -- $(LINK_SHLIB) -o $(SHLIB) $(OBJS:.o=.os) $(LIBOBJS:.o=.os) $(DEPSHLIBS) -+ $(LINK_SHLIB) $(LDFLAGS) -o $(SHLIB) $(OBJS:.o=.os) $(LIBOBJS:.o=.os) $(DEPSHLIBS) - if test "$(SONAME)" = "$(SHLIB)"; then true; else \ - $(RM) $(SONAME) && $(LN_S) $(SHLIB) $(SONAME); \ - fi diff --git a/package/libepoxy/Makefile b/package/libepoxy/Makefile index fa224ad12..b659682bb 100644 --- a/package/libepoxy/Makefile +++ b/package/libepoxy/Makefile @@ -20,6 +20,8 @@ $(eval $(call PKG_template,LIBEPOXY,libepoxy,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj +MESON_FLAGS+= -Dtests=false + CONFIG_STYLE:= meson BUILD_STYLE:= meson INSTALL_STYLE:= meson diff --git a/package/libexif/Makefile b/package/libexif/Makefile new file mode 100644 index 000000000..f22edca4f --- /dev/null +++ b/package/libexif/Makefile @@ -0,0 +1,27 @@ +# 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:= libexif +PKG_VERSION:= 0.6.24 +PKG_RELEASE:= 1 +PKG_HASH:= d47564c433b733d83b6704c70477e0a4067811d184ec565258ac563d8223f6ae +PKG_DESCR:= Library for parsing, editing, and saving EXIF data +PKG_SECTION:= libs/image +PKG_URL:= https://libexif.github.io/ +PKG_SITES:= https://github.com/libexif/libexif/releases/download/v${PKG_VERSION}/ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBEXIF,libexif,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +libexif-install: + $(INSTALL_DIR) $(IDIR_LIBEXIF)/usr/lib + $(CP) $(WRKINST)/usr/lib/libexif*.so* \ + $(IDIR_LIBEXIF)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libffi/Makefile b/package/libffi/Makefile index c6cfe64e9..d944700bb 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.6 +PKG_VERSION:= 3.5.2 PKG_RELEASE:= 1 -PKG_HASH:= b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e +PKG_HASH:= f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc PKG_DESCR:= foreign function interface library PKG_SECTION:= libs/misc HOST_BUILDDEP:= libtool-host @@ -22,14 +22,9 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --disable-builddir --with-pic --disable-symvers CONFIGURE_ARGS+= --disable-builddir --with-pic --disable-symvers -ifeq ($(ADK_PACKAGE_OPENJDK7),y) -CONFIGURE_ARGS+= --enable-static -endif - libffi-install: ${INSTALL_DIR} ${IDIR_LIBFFI}/usr/lib ${CP} ${WRKINST}/usr/lib*/libffi.so* ${IDIR_LIBFFI}/usr/lib diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index 9ed07ce9c..16275b93a 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libgcrypt -PKG_VERSION:= 1.10.3 +PKG_VERSION:= 1.11.2 PKG_RELEASE:= 1 -PKG_HASH:= 8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa +PKG_HASH:= 6ba59dd192270e8c1d22ddb41a07d95dcdbc1f0fb02d03c4b54b235814330aac PKG_DESCR:= crypto library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgpg-error diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index c9d50ca65..b70992ef5 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libgpg-error -PKG_VERSION:= 1.47 +PKG_VERSION:= 1.55 PKG_RELEASE:= 1 -PKG_HASH:= 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb +PKG_HASH:= 95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78 PKG_DESCR:= helper library for common error codes and descriptions PKG_SECTION:= libs/misc PKG_URL:= http://www.gnupg.org/ -PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ +PKG_SITES:= https://www.gnupg.org/ftp/gcrypt/libgpg-error/ PKG_OPTS:= dev PKG_NOPARALLEL:= 1 @@ -44,6 +44,9 @@ endif ifeq ($(ADK_TARGET_ARCH_PPC64),y) LIBGPG_PREFIX:= powerpc64-unknown-linux-gnu endif +ifeq ($(ADK_TARGET_ARCH_RISCV64),y) +LIBGPG_PREFIX:= riscv64-unknown-linux-gnu +endif ifeq ($(ADK_TARGET_ARCH_SH),y) LIBGPG_PREFIX:= sh4-unknown-linux-gnu endif diff --git a/package/libgtk2/Makefile b/package/libgtk2/Makefile index 073108cc9..5a85efe3e 100644 --- a/package/libgtk2/Makefile +++ b/package/libgtk2/Makefile @@ -4,14 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libgtk2 -PKG_VERSION:= 2.24.30 +PKG_VERSION:= 2.24.33 PKG_EXTRAVER:= 2.24 PKG_RELEASE:= 1 -PKG_HASH:= 0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50 +PKG_HASH:= ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da PKG_DESCR:= multi-platform toolkit for creating graphical user interfaces PKG_SECTION:= libs/misc PKG_DEPENDS:= glib cairo -PKG_BUILDDEP:= glib cairo atk pango libXext renderproto libXrender +PKG_BUILDDEP:= glib cairo pango libXext renderproto libXrender PKG_BUILDDEP+= gdk-pixbuf libXcomposite libXdamage libX11 PKG_NEEDS:= c++ PKG_URL:= http://www.gtk.org/ diff --git a/package/libgtk3/Makefile b/package/libgtk3/Makefile index e0e087dd7..62af6e0b0 100644 --- a/package/libgtk3/Makefile +++ b/package/libgtk3/Makefile @@ -4,19 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libgtk3 -PKG_VERSION:= 3.24.31 +PKG_VERSION:= 3.24.43 PKG_EXTRAVER:= 3.24 PKG_RELEASE:= 1 -PKG_HASH:= 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 +PKG_HASH:= 7e04f0648515034b806b74ae5d774d87cffb1a2a96c468cb5be476d51bf2f3c7 PKG_DESCR:= multi-platform toolkit for creating graphical user interfaces PKG_SECTION:= libs/misc PKG_DEPENDS:= glib cairo libxi libepoxy pango at-spi2-core PKG_DEPENDS+= at-spi2-atk libxext libxrender libx11 -PKG_DEPENDS+= libxcomposite libxdamage fribidi -PKG_BUILDDEP:= cairo atk pango libXext renderproto libXrender +PKG_DEPENDS+= libxcomposite libxdamage fribidi libxkbcommon +PKG_BUILDDEP:= cairo pango libXext renderproto libXrender PKG_BUILDDEP+= gdk-pixbuf libXcomposite libXdamage libX11 libXi PKG_BUILDDEP+= at-spi2-core at-spi2-atk gdk-pixbuf-host libepoxy -PKG_BUILDDEP+= fribidi +PKG_BUILDDEP+= fribidi libxkbcommon PKG_NEEDS:= c++ PKG_URL:= http://www.gtk.org/ PKG_SITES:= $(MASTER_SITE_GNOME:=gtk+/$(PKG_EXTRAVER)/) @@ -34,16 +34,14 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBGTK3,libgtk3,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -HOST_CFLAGS+= -I$(STAGING_HOST_DIR)/usr/include/glib-2.0 -I$(STAGING_HOST_DIR)/usr/include/gdk-pixbuf-2.0 -HOST_LDFLAGS+= -lgobject-2.0 -lgmodule-2.0 -pthread -lrt -lglib-2.0 -lgdk_pixbuf-2.0 -CONFIGURE_ENV+= GLIB_COMPILE_RESOURCES=$(STAGING_HOST_DIR)/usr/bin/glib-compile-resources -CONFIGURE_ARGS+= --disable-gtk-doc-html \ - --disable-gtk-doc \ - --disable-modules \ - --disable-xinerama \ - --disable-cups \ - --disable-papi \ - --enable-introspection=no +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dwayland_backend=false \ + -Dintrospection=false libgtk3-install: $(INSTALL_DIR) $(IDIR_LIBGTK3)/usr/lib diff --git a/package/libinih/Makefile b/package/libinih/Makefile index d546f244a..c54a62331 100644 --- a/package/libinih/Makefile +++ b/package/libinih/Makefile @@ -32,5 +32,7 @@ libinih-install: $(INSTALL_DIR) $(IDIR_LIBINIH)/usr/lib $(CP) $(WRKINST)/usr/lib/libinih*.so* \ $(IDIR_LIBINIH)/usr/lib + $(CP) $(WRKINST)/usr/lib/libINIReader*.so* \ + $(IDIR_LIBINIH)/usr/lib include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libinput/Makefile b/package/libinput/Makefile index 8c0c6a759..dddc4831f 100644 --- a/package/libinput/Makefile +++ b/package/libinput/Makefile @@ -4,16 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libinput -PKG_VERSION:= 1.19.2 +PKG_VERSION:= 1.28.1 PKG_RELEASE:= 1 -PKG_HASH:= 0fc39f0af3ee1a77c60c34bc45391a4d0879169f7c0f7bbbeb5eef590b98b883 +PKG_HASH:= a13f8c9a7d93df3c85c66afd135f0296701d8d32f911991b7aa4273fdd6a42a3 PKG_DESCR:= input library PKG_DEPENDS:= mtdev libevdev libudev PKG_BUILDDEP:= mtdev libevdev eudev PKG_SECTION:= libs/misc -PKG_SITES:= https://www.freedesktop.org/software/libinput/ +PKG_SITES:= https://gitlab.freedesktop.org/libinput/libinput/-/archive/$(PKG_VERSION)/ PKG_OPTS:= dev +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBINPUT,libinput,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) diff --git a/package/libjpeg-turbo/Makefile b/package/libjpeg-turbo/Makefile index 15aa86202..0a74335ca 100644 --- a/package/libjpeg-turbo/Makefile +++ b/package/libjpeg-turbo/Makefile @@ -4,19 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libjpeg-turbo -PKG_VERSION:= 1.5.2 +PKG_VERSION:= 3.1.2 PKG_RELEASE:= 1 -PKG_HASH:= 9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528 +PKG_HASH:= 560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6 PKG_DESCR:= jpeg image library PKG_SECTION:= libs/image -PKG_BUILDDEP:= yasm-host -HOST_BUILDDEP:= yasm-host -PKG_URL:= http://libjpeg-turbo.virtualgl.org/ -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/} +PKG_BUILDDEP:= cmake-host yasm-host +HOST_BUILDDEP:= cmake-host yasm-host +PKG_URL:= http://libjpeg-turbo.org/ +PKG_SITES:= https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/ PKG_OPTS:= dev -PKG_NOPARALLEL:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= ${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -24,15 +23,8 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBJPEG_TURBO,libjpeg-turbo,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBJPEG_TURBO,libjpeg-turbo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CFLAGS+= -fPIC - -ifeq ($(ADK_x32),y) -CONFIGURE_ARGS+= --without-simd -endif - -CONFIGURE_ENV+= ac_cv_prog_NASM=yasm -CONFIGURE_ARGS+= --with-pic -HOST_CONFIGURE_ARGS+= --without-simd +HOST_CONFIG_STYLE:= cmake +CONFIG_STYLE:= cmake libjpeg-turbo-install: $(INSTALL_DIR) $(IDIR_LIBJPEG_TURBO)/usr/lib diff --git a/package/libnettle/Makefile b/package/libnettle/Makefile index c9d3f38e1..75cd70ea1 100644 --- a/package/libnettle/Makefile +++ b/package/libnettle/Makefile @@ -4,13 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libnettle -PKG_VERSION:= 3.9.1 +PKG_VERSION:= 3.10.1 PKG_RELEASE:= 1 -PKG_HASH:= ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3 +PKG_HASH:= b0fcdd7fc0cdea6e80dcf1dd85ba794af0d5b4a57e26397eee3bc193272d9132 PKG_DESCR:= crypto library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgmp PKG_BUILDDEP:= gmp +HOST_BUILDDEP:= gmp-host PKG_URL:= http://www.lysator.liu.se/~nisse/ PKG_SITES:= http://www.lysator.liu.se/~nisse/archive/ PKG_OPTS:= dev @@ -18,8 +19,10 @@ PKG_OPTS:= dev DISTFILES:= nettle-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/nettle-${PKG_VERSION} +include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBNETTLE,libnettle,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBNETTLE,libnettle,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ARGS+= --disable-documentation @@ -31,4 +34,5 @@ libnettle-install: $(CP) $(WRKINST)/usr/lib/libhogweed.so* \ $(IDIR_LIBNETTLE)/usr/lib +include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libnotify/Makefile b/package/libnotify/Makefile index 61581e4e5..466d6ddf3 100644 --- a/package/libnotify/Makefile +++ b/package/libnotify/Makefile @@ -4,23 +4,32 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libnotify -PKG_VERSION:= 0.4.5 -PKG_RELEASE:= 3 -PKG_HASH:= 0799db8ea1500b65a477421a8c930cc8c8b0bbc0596e55ea1601e2542f3fb0d9 +PKG_VERSION:= 0.8.6 +PKG_RELEASE:= 1 +PKG_HASH:= c5540aaefb60e1d63b1c587c05f2284ebe72ece7d0c0e5e4a778cfd5844b6b58 PKG_DESCR:= notify library PKG_SECTION:= libs/misc -PKG_BUILDDEP:= libgtk2 dbus-glib +PKG_BUILDDEP:= libgtk3 dbus-glib PKG_NEEDS:= c++ -PKG_URL:= http://www.galago-project.org/ -PKG_SITES:= http://www.galago-project.org/files/releases/source/libnotify/ +PKG_SITES:= https://download.gnome.org/sources/libnotify/0.8/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBNOTIFY,libnotify,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +MESON_FLAGS+= -Dtests=false \ + -Dman=false \ + -Dgtk_doc=false \ + -Ddocbook_docs=disabled \ + -Dintrospection=disabled + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + libnotify-install: $(INSTALL_DIR) $(IDIR_LIBNOTIFY)/usr/lib $(CP) $(WRKINST)/usr/lib/libnotify*.so* \ diff --git a/package/libogg/Makefile b/package/libogg/Makefile index e750fb7d3..d98bb61a1 100644 --- a/package/libogg/Makefile +++ b/package/libogg/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libogg -PKG_VERSION:= 1.3.1 +PKG_VERSION:= 1.3.6 PKG_RELEASE:= 1 -PKG_HASH:= 3a5bad78d81afb78908326d11761c0fb1a0662ee7150b6ad587cc586838cdcfa +PKG_HASH:= 5c8253428e181840cd20d41f3ca16557a9cc04bad4a3d04cce84808677fa1061 PKG_DESCR:= ogg bitstream handling library PKG_SECTION:= libs/audio PKG_URL:= http://www.xiph.org/ogg diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index efc9440da..b9772780d 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libpcap -PKG_VERSION:= 1.10.4 +PKG_VERSION:= 1.10.5 PKG_RELEASE:= 1 -PKG_HASH:= ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f +PKG_HASH:= 37ced90a19a302a7f32e458224a00c365c117905c2cd35ac544b6880a81488f0 PKG_DESCR:= low-level packet capture library PKG_SECTION:= libs/net PKG_URL:= http://www.tcpdump.org/ diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile index 89e388cd4..db5378c53 100644 --- a/package/libpciaccess/Makefile +++ b/package/libpciaccess/Makefile @@ -4,20 +4,24 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libpciaccess -PKG_VERSION:= 0.16 +PKG_VERSION:= 0.18.1 PKG_RELEASE:= 1 -PKG_HASH:= 84413553994aef0070cf420050aa5c0a51b1956b404920e21b81e96db6a61a27 +PKG_HASH:= 4af43444b38adb5545d0ed1c2ce46d9608cc47b31c2387fc5181656765a6fa76 PKG_DESCR:= pci access library PKG_SECTION:= x11/libs -PKG_SITES:= http://www.x.org/releases/individual/lib/ +PKG_SITES:= http://xorg.freedesktop.org/releases/individual/lib/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + libpciaccess-install: ${INSTALL_DIR} ${IDIR_LIBPCIACCESS}/usr/lib ${CP} ${WRKINST}/usr/lib/libpciaccess.so* \ diff --git a/package/libpsl/Makefile b/package/libpsl/Makefile new file mode 100644 index 000000000..b71f7cc29 --- /dev/null +++ b/package/libpsl/Makefile @@ -0,0 +1,32 @@ +# 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:= libpsl +PKG_VERSION:= 0.21.5 +PKG_RELEASE:= 1 +PKG_HASH:= 1dcc9ceae8b128f3c0b3f654decd0e1e891afc6ff81098f227ef260449dae208 +PKG_DESCR:= C library for the Public Suffix List +PKG_SECTION:= libs/misc +PKG_SITES:= https://github.com/rockdaboot/libpsl/releases/download/$(PKG_VERSION)/ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBPSL,libpsl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +libpsl-install: + $(INSTALL_DIR) $(IDIR_LIBPSL)/usr/lib + $(CP) $(WRKINST)/usr/lib/libpsl*.so* \ + $(IDIR_LIBPSL)/usr/lib + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libptytty/Makefile b/package/libptytty/Makefile index cb1126ce1..396e496e1 100644 --- a/package/libptytty/Makefile +++ b/package/libptytty/Makefile @@ -21,7 +21,8 @@ $(eval $(call PKG_template,LIBPTYTTY,libptytty,$(PKG_VERSION)-$(PKG_RELEASE),$(P TARGET_CFLAGS+= -lstdc++ CONFIG_STYLE:= cmake CMAKE_FLAGS+= -DTTY_GID_SUPPORT_EXITCODE=0 \ - -DTTY_GID_SUPPORT_EXITCODE__TRYRUN_OUTPUT=0 + -DUTMP_SUPPORT=0 \ + -DWTMP_SUPPORT=0 \ XAKE_FLAGS+= VERBOSE=1 libptytty-install: diff --git a/package/libressl/Makefile b/package/libressl/Makefile index ca08f24df..f5df34fc5 100644 --- a/package/libressl/Makefile +++ b/package/libressl/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libressl -PKG_VERSION:= 3.9.1 +PKG_VERSION:= 3.9.2 PKG_RELEASE:= 1 -PKG_HASH:= 6da0b954695f7ee62b03f64200a8a4f02af93717b60cce04ab6c8df262c07a51 +PKG_HASH:= 7b031dac64a59eb6ee3304f7ffb75dad33ab8c9d279c847f92c89fb846068f97 PKG_DESCR:= ssl/tls library PKG_SECTION:= libs/crypto PKG_URL:= http://www.libressl.org diff --git a/package/libsamplerate/Makefile b/package/libsamplerate/Makefile index 0b63904b6..a6a8bbb90 100644 --- a/package/libsamplerate/Makefile +++ b/package/libsamplerate/Makefile @@ -4,17 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libsamplerate -PKG_VERSION:= 0.1.9 +PKG_VERSION:= 0.2.2 PKG_RELEASE:= 1 -PKG_HASH:= 0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1 +PKG_HASH:= 3258da280511d24b49d6b08615bbe824d0cacc9842b0e4caf11c52cf2b043893 PKG_DESCR:= sample rate converter for audio PKG_SECTION:= libs/audio -PKG_URL:= http://www.mega-nerd.com/SRC/ -PKG_SITES:= http://www.mega-nerd.com/SRC/ +PKG_SITES:= https://github.com/libsndfile/libsamplerate/releases/download/$(PKG_VERSION)/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSAMPLERATE,libsamplerate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/libseat/Makefile b/package/libseat/Makefile index b408fcaf6..3c3b85d01 100644 --- a/package/libseat/Makefile +++ b/package/libseat/Makefile @@ -4,18 +4,30 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libseat -PKG_VERSION:= 0.7.0 +PKG_VERSION:= 0.8.0 PKG_RELEASE:= 1 -PKG_HASH:= ea6ccbaf86949dba4eda64761b11aa8d05b61fc60f569b0fc05f2c4d06baeb87 +PKG_HASH:= a562a44ee33ccb20954a1c1ec9a90ecb2db7a07ad6b18d0ac904328efbcf65a0 PKG_DESCR:= seat library PKG_SECTION:= libs/misc -PKG_URL:= https://git.sr.ht/~kennylevinsen/seatd -PKG_SITES:= https://git.sr.ht/~kennylevinsen/seatd +PKG_URL:= https://git.sr.ht/~kennylevinsen/seatd/ +PKG_SITES:= https://git.sr.ht/~kennylevinsen/seatd/archive/ +PKG_LIBNAME:= libseat PKG_OPTS:= dev +PKG_SUBPKGS:= LIBSEAT SEATD +PKGSD_LIBSEAT:= seat library +PKGSC_LIBSEAT:= libs/misc +PKGSD_SEATD:= seat daemon +PKGSC_SEATD:= sys/misc +PKGSS_SEATD:= libseat + +DISTFILES:= $(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/seatd-${PKG_VERSION} + include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSEAT,libseat,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +$(eval $(call PKG_template,SEATD,seatd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj @@ -28,4 +40,9 @@ libseat-install: $(CP) $(WRKINST)/usr/lib/libseat*.so* \ $(IDIR_LIBSEAT)/usr/lib +seatd-install: + $(INSTALL_DIR) $(IDIR_SEATD)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/seatd \ + $(IDIR_SEATD)/usr/bin + include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libsoup/Makefile b/package/libsoup/Makefile index e48dab11f..fc94c47f4 100644 --- a/package/libsoup/Makefile +++ b/package/libsoup/Makefile @@ -4,22 +4,28 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libsoup -PKG_VERSION:= 2.60.1 +PKG_VERSION:= 2.74.3 PKG_RELEASE:= 1 -PKG_HASH:= 023930032b20e6b14764feb847ea80d9e170622dee7370215d6feb9967b6aa9d +PKG_HASH:= e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13 PKG_DESCR:= http client/server library PKG_SECTION:= libs/net -PKG_DEPENDS:= libsqlite glib -PKG_BUILDDEP:= sqlite glib -PKG_URL:= https://wiki.gnome.org/LibSoup -PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.60/ +PKG_DEPENDS:= libsqlite glib libpsl +PKG_BUILDDEP:= sqlite glib libpsl +PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.74/ PKG_OPTS:= dev include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSOUP,libsoup,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -AUTOTOOL_STYLE:= autoreconf +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +MESON_FLAGS:= -Dtests=false \ + -Dtls_check=false \ + -Dsysprof=disabled +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson libsoup-install: $(INSTALL_DIR) $(IDIR_LIBSOUP)/usr/lib diff --git a/package/libsoup3/Makefile b/package/libsoup3/Makefile new file mode 100644 index 000000000..f7aa3fb9b --- /dev/null +++ b/package/libsoup3/Makefile @@ -0,0 +1,38 @@ +# 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:= libsoup3 +PKG_VERSION:= 3.6.5 +PKG_RELEASE:= 1 +PKG_HASH:= 6891765aac3e949017945c3eaebd8cc8216df772456dc9f460976fbdb7ada234 +PKG_DESCR:= http client/server library +PKG_SECTION:= libs/net +PKG_DEPENDS:= libsqlite glib libpsl nghttp2 +PKG_BUILDDEP:= sqlite glib libpsl nghttp2 +PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/libsoup/3.6/ +PKG_OPTS:= dev + +DISTFILES:= libsoup-$(PKG_VERSION).tar.xz +WRKDIST= $(WRKDIR)/libsoup-$(PKG_VERSION) + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBSOUP3,libsoup3,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +MESON_FLAGS:= -Dtests=false \ + -Dtls_check=false \ + -Dsysprof=disabled +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +libsoup3-install: + $(INSTALL_DIR) $(IDIR_LIBSOUP3)/usr/lib + $(CP) $(WRKINST)/usr/lib/libsoup*.so* \ + $(IDIR_LIBSOUP3)/usr/lib + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libsquish/Makefile b/package/libsquish/Makefile index 5ce5e6fcd..4b84d909f 100644 --- a/package/libsquish/Makefile +++ b/package/libsquish/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libsquish -PKG_VERSION:= 1.10 +PKG_VERSION:= 1.15 PKG_RELEASE:= 1 -PKG_HASH:= a0118a79d927058b656e94dc4ffce5da37839962e4952be1fedbbdd901b42848 +PKG_HASH:= 628796eeba608866183a61d080d46967c9dda6723bc0a3ec52324c85d2147269 PKG_DESCR:= c++ compression library PKG_SECTION:= libs/misc -PKG_SITES:= http://sources.openelec.tv/devel/ +PKG_SITES:= http://downloads.sourceforge.net/project/libsquish/ PKG_OPTS:= dev -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-openelec.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}-$(PKG_VERSION)-openelec +WRKDIST= ${WRKDIR}/ +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tgz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/libsquish/patches/patch-Makefile b/package/libsquish/patches/patch-Makefile deleted file mode 100644 index 702db40f5..000000000 --- a/package/libsquish/patches/patch-Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- libsquish-1.10-openelec.orig/Makefile 2015-01-09 09:52:04.000000000 -0600 -+++ libsquish-1.10-openelec/Makefile 2015-05-22 16:32:55.398921290 -0500 -@@ -10,6 +10,7 @@ LIB = libsquish.a - all : $(LIB) squish.pc - - install : $(LIB) squish.pc -+ mkdir -p $(INSTALL_DIR)/include $(INSTALL_DIR)/lib/pkgconfig - install squish.h $(INSTALL_DIR)/include - install libsquish.a $(INSTALL_DIR)/lib - install squish.pc $(INSTALL_DIR)/lib/pkgconfig diff --git a/package/libssh/Makefile b/package/libssh/Makefile index 231bae2c4..217cecc3b 100644 --- a/package/libssh/Makefile +++ b/package/libssh/Makefile @@ -4,15 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libssh -PKG_VERSION:= 0.9.5 +PKG_VERSION:= 0.11.1 PKG_RELEASE:= 1 -PKG_HASH:= acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718 +PKG_HASH:= 14b7dcc72e91e08151c58b981a7b570ab2663f630e7d2837645d5a9c612c1b79 PKG_DESCR:= secure shell library PKG_SECTION:= libs/crypto -PKG_DEPENDS:= zlib libressl -PKG_BUILDDEP:= cmake-host zlib libressl +PKG_DEPENDS:= zlib libopenssl +PKG_BUILDDEP:= cmake-host zlib openssl PKG_URL:= http://www.libssh.org/ -PKG_SITES:= https://www.libssh.org/files/0.9/ +PKG_SITES:= https://www.libssh.org/files/0.11/ PKG_OPTS:= dev include $(ADK_TOPDIR)/mk/package.mk @@ -21,14 +21,14 @@ $(eval $(call PKG_template,LIBSSH,libssh,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj CONFIG_STYLE:= cmake -CMAKE_FLAGS:= -DOPENSSL_INCLUDE_DIRS='$(STAGING_TARGET_DIR)/usr/include' \ +CMAKE_FLAGS:= -DOPENSSL_INCLUDE_DIR='$(STAGING_TARGET_DIR)/usr/include' \ -DOPENSSL_LIBRARIES='-lcrypto -lssl -lz' \ - -DZLIB_INCLUDE_DIR='$(STAGING_TARGET_DIR)/usr/include' \ - -DZLIB_LIBRARY='$(STAGING_TARGET_DIR)/usr/lib' \ - -DWITH_GSSAPI=off \ - -DWITH_STACK_PROTECTOR=off \ + -DWITH_GSSAPI=on \ + -DWITH_SYMBOL_VERSIONING=off \ -DWITH_EXAMPLES=off +XAKE_FLAGS+= VERBOSE=1 + libssh-install: $(INSTALL_DIR) $(IDIR_LIBSSH)/usr/lib $(CP) $(WRKINST)/usr/lib/libssh*.so* \ diff --git a/package/libssh/patches/patch-CompilerChecks_cmake b/package/libssh/patches/patch-CompilerChecks_cmake deleted file mode 100644 index 8f5d3d805..000000000 --- a/package/libssh/patches/patch-CompilerChecks_cmake +++ /dev/null @@ -1,32 +0,0 @@ ---- libssh-0.9.5.orig/CompilerChecks.cmake 2020-05-07 13:51:36.000000000 +0200 -+++ libssh-0.9.5/CompilerChecks.cmake 2021-03-01 23:53:39.370794233 +0100 -@@ -67,29 +67,6 @@ if (UNIX) - endif() - endif() - -- check_c_compiler_flag_ssp("-fstack-protector-strong" WITH_STACK_PROTECTOR_STRONG) -- if (WITH_STACK_PROTECTOR_STRONG) -- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector-strong") -- # This is needed as Solaris has a seperate libssp -- if (SOLARIS) -- list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector-strong") -- endif() -- else (WITH_STACK_PROTECTOR_STRONG) -- check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR) -- if (WITH_STACK_PROTECTOR) -- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector") -- # This is needed as Solaris has a seperate libssp -- if (SOLARIS) -- list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector") -- endif() -- endif() -- endif (WITH_STACK_PROTECTOR_STRONG) -- -- check_c_compiler_flag_ssp("-fstack-clash-protection" WITH_STACK_CLASH_PROTECTION) -- if (WITH_STACK_CLASH_PROTECTION) -- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-clash-protection") -- endif() -- - if (PICKY_DEVELOPER) - add_c_compiler_flag("-Wno-error=deprecated-declarations" SUPPORTED_COMPILER_FLAGS) - add_c_compiler_flag("-Wno-error=tautological-compare" SUPPORTED_COMPILER_FLAGS) diff --git a/package/libssh/patches/patch-include_libssh_libssh_h b/package/libssh/patches/patch-include_libssh_libssh_h deleted file mode 100644 index 39310ba16..000000000 --- a/package/libssh/patches/patch-include_libssh_libssh_h +++ /dev/null @@ -1,10 +0,0 @@ ---- libssh-0.9.5.orig/include/libssh/libssh.h 2020-09-10 14:43:02.000000000 +0200 -+++ libssh-0.9.5/include/libssh/libssh.h 2021-03-01 23:52:22.358253014 +0100 -@@ -58,6 +58,7 @@ - typedef unsigned long long uint64_t; - typedef int mode_t; - #else /* _MSC_VER */ -+ #include <sys/types.h> - #include <unistd.h> - #include <inttypes.h> - #include <sys/types.h> diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile index e91f75001..468ba9145 100644 --- a/package/libtasn1/Makefile +++ b/package/libtasn1/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libtasn1 -PKG_VERSION:= 4.19.0 +PKG_VERSION:= 4.20.0 PKG_RELEASE:= 1 -PKG_HASH:= 1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a +PKG_HASH:= 92e0e3bd4c02d4aeee76036b2ddd83f0c732ba4cda5cb71d583272b23587a76c PKG_DESCR:= asn.1 and der structures manipulation library PKG_SECTION:= libs/crypto PKG_URL:= http://www.gnupg.org/ @@ -15,8 +15,10 @@ PKG_OPTS:= dev DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz +include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBTASN1,libtasn1,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBTASN1,libtasn1,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) CONFIGURE_ARGS+= --disable-gtk-doc-html \ @@ -26,4 +28,5 @@ libtasn1-install: $(INSTALL_DIR) $(IDIR_LIBTASN1)/usr/lib $(CP) $(WRKINST)/usr/lib/libtasn1.so* $(IDIR_LIBTASN1)/usr/lib +include ${ADK_TOPDIR}/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libtheora/Makefile b/package/libtheora/Makefile index a49ce0c81..c74f07dca 100644 --- a/package/libtheora/Makefile +++ b/package/libtheora/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libtheora -PKG_VERSION:= 1.1.1 -PKG_RELEASE:= 2 -PKG_HASH:= b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc +PKG_VERSION:= 1.2.0 +PKG_RELEASE:= 1 +PKG_HASH:= 279327339903b544c28a92aeada7d0dcfd0397b59c2f368cc698ac56f515906e PKG_DESCR:= open source video codec library PKG_SECTION:= libs/video PKG_DEPENDS:= libogg libvorbis @@ -15,7 +15,7 @@ PKG_URL:= http://www.theora.org/ PKG_SITES:= http://downloads.xiph.org/releases/theora/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/libtheora/patches/patch-Makefile_in b/package/libtheora/patches/patch-Makefile_in deleted file mode 100644 index 41162985c..000000000 --- a/package/libtheora/patches/patch-Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ ---- libtheora-1.1.1.orig/Makefile.in 2009-10-01 20:04:07.000000000 +0200 -+++ libtheora-1.1.1/Makefile.in 2011-09-18 18:38:53.551740404 +0200 -@@ -164,7 +164,7 @@ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip - @THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples - @THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR = - --SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR) -+SUBDIRS = lib include m4 $(EXAMPLES_DIR) - - # we include the whole debian/ dir in EXTRA_DIST because there's a problem - # with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am -@@ -200,7 +200,7 @@ DIST_COMMON = README AUTHORS COPYING Mak - missing mkinstalldirs theora-uninstalled.pc.in theora.pc.in \ - theoradec-uninstalled.pc.in theoradec.pc.in \ - theoraenc-uninstalled.pc.in theoraenc.pc.in --DIST_SUBDIRS = lib include doc tests m4 examples -+DIST_SUBDIRS = lib include m4 examples - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index 960605be8..8f9ae30b2 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= tiff -PKG_VERSION:= 4.3.0 +PKG_VERSION:= 4.7.1 PKG_RELEASE:= 1 -PKG_HASH:= 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 +PKG_HASH:= f698d94f3103da8ca7438d84e0344e453fe0ba3b7486e04c5bf7a9a3fabe9b69 PKG_DESCR:= library for reading/writing tiff images PKG_SECTION:= libs/image PKG_NEEDS:= c++ -PKG_BUILDDEP:= zlib xz +PKG_BUILDDEP:= zlib PKG_URL:= http://simplesystems.org/libtiff/ PKG_SITES:= http://download.osgeo.org/libtiff/ PKG_LIBNAME:= libtiff @@ -18,12 +18,15 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk +$(eval $(call HOST_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) libtiff-install: ${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib ${CP} ${WRKINST}/usr/lib/libtiff.so* ${IDIR_LIBTIFF}/usr/lib/ +include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile index 5cbddde61..1d808d66a 100644 --- a/package/libtirpc/Makefile +++ b/package/libtirpc/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libtirpc -PKG_VERSION:= 1.3.4 +PKG_VERSION:= 1.3.6 PKG_RELEASE:= 1 -PKG_HASH:= 1e0b0c7231c5fa122e06c0609a76723664d068b0dba3b8219b63e6340b347860 +PKG_HASH:= bbd26a8f0df5690a62a47f6aa30f797f3ef8d02560d1bc449a83066b5a1d3508 PKG_DESCR:= transport independent rpc library PKG_SECTION:= libs/net PKG_URL:= http://sourceforge.net/projects/libtirpc/ diff --git a/package/libtirpc/patches/patch-src_auth_none_c b/package/libtirpc/patches/patch-src_auth_none_c new file mode 100644 index 000000000..765711342 --- /dev/null +++ b/package/libtirpc/patches/patch-src_auth_none_c @@ -0,0 +1,11 @@ +--- libtirpc-1.3.6.orig/src/auth_none.c 2024-10-17 09:50:55.000000000 +0200 ++++ libtirpc-1.3.6/src/auth_none.c 2025-04-30 13:30:55.736451017 +0200 +@@ -62,7 +62,7 @@ static bool_t authnone_validate (AUTH *, + static bool_t authnone_refresh (AUTH *, void *); + static void authnone_destroy (AUTH *); + +-extern bool_t xdr_opaque_auth(); ++extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *); + + static struct auth_ops *authnone_ops(); + diff --git a/package/libtirpc/patches/patch-src_auth_time_c b/package/libtirpc/patches/patch-src_auth_time_c new file mode 100644 index 000000000..67bfd0e80 --- /dev/null +++ b/package/libtirpc/patches/patch-src_auth_time_c @@ -0,0 +1,20 @@ +--- libtirpc-1.3.6.orig/src/auth_time.c 2024-10-17 09:50:55.000000000 +0200 ++++ libtirpc-1.3.6/src/auth_time.c 2025-04-30 13:33:25.507704020 +0200 +@@ -248,7 +248,7 @@ __rpc_get_time_offset(td, srv, thost, ua + char ut[64], ipuaddr[64]; + endpoint teps[32]; + nis_server tsrv; +- void (*oldsig)() = NULL; /* old alarm handler */ ++ void (*oldsig)(int) = NULL; /* old alarm handler */ + struct sockaddr_in sin; + int s = RPC_ANYSOCK; + socklen_t len; +@@ -417,7 +417,7 @@ __rpc_get_time_offset(td, srv, thost, ua + } else { + int res; + +- oldsig = (void (*)())signal(SIGALRM, alarm_hndler); ++ oldsig = (void (*)(int))signal(SIGALRM, alarm_hndler); + saw_alarm = 0; /* global tracking the alarm */ + alarm(20); /* only wait 20 seconds */ + res = connect(s, (struct sockaddr *)&sin, sizeof(sin)); diff --git a/package/libtirpc/patches/patch-src_getpublickey_c b/package/libtirpc/patches/patch-src_getpublickey_c new file mode 100644 index 000000000..637d6be22 --- /dev/null +++ b/package/libtirpc/patches/patch-src_getpublickey_c @@ -0,0 +1,11 @@ +--- libtirpc-1.3.6.orig/src/getpublickey.c 2024-10-17 09:50:55.000000000 +0200 ++++ libtirpc-1.3.6/src/getpublickey.c 2025-04-30 13:30:55.736451017 +0200 +@@ -52,7 +52,7 @@ + /* + * Hack to let ypserv/rpc.nisd use AUTH_DES. + */ +-int (*__getpublickey_LOCAL)() = 0; ++int (*__getpublickey_LOCAL)(const char *, char *) = 0; + + /* + * Get somebody's public key diff --git a/package/libtirpc/patches/patch-src_key_call_c b/package/libtirpc/patches/patch-src_key_call_c new file mode 100644 index 000000000..8a1c12921 --- /dev/null +++ b/package/libtirpc/patches/patch-src_key_call_c @@ -0,0 +1,15 @@ +--- libtirpc-1.3.6.orig/src/key_call.c 2024-10-17 09:50:55.000000000 +0200 ++++ libtirpc-1.3.6/src/key_call.c 2025-04-30 13:33:25.507704020 +0200 +@@ -72,9 +72,9 @@ + * implementations of these functions, and to call those in key_call(). + */ + +-cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0; +-cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0; +-des_block *(*__key_gendes_LOCAL)() = 0; ++cryptkeyres *(*__key_encryptsession_pk_LOCAL)(uid_t, char *) = 0; ++cryptkeyres *(*__key_decryptsession_pk_LOCAL)(uid_t, char *) = 0; ++des_block *(*__key_gendes_LOCAL)(uid_t, char *) = 0; + + static int key_call( u_long, xdrproc_t, void *, xdrproc_t, void *); + diff --git a/package/libtirpc/patches/patch-src_svc_auth_none_c b/package/libtirpc/patches/patch-src_svc_auth_none_c new file mode 100644 index 000000000..c21c67692 --- /dev/null +++ b/package/libtirpc/patches/patch-src_svc_auth_none_c @@ -0,0 +1,13 @@ +--- libtirpc-1.3.6.orig/src/svc_auth_none.c 2024-10-17 09:50:55.000000000 +0200 ++++ libtirpc-1.3.6/src/svc_auth_none.c 2025-04-30 13:30:55.736451017 +0200 +@@ -37,8 +37,8 @@ + + #include <rpc/rpc.h> + +-static bool_t svcauth_none_destroy(); +-static bool_t svcauth_none_wrap(); ++static bool_t svcauth_none_destroy(SVCAUTH *); ++static bool_t svcauth_none_wrap(SVCAUTH *, XDR *, bool_t (*)(XDR *, ...), char *); + + struct svc_auth_ops svc_auth_none_ops = { + svcauth_none_wrap, diff --git a/package/libunistring/Makefile b/package/libunistring/Makefile index 46b83438a..a6ea2f4b2 100755 --- a/package/libunistring/Makefile +++ b/package/libunistring/Makefile @@ -13,12 +13,15 @@ PKG_URL:= http://www.gnu.org/software/libunistring/ PKG_SITES:= ${MASTER_SITE_GNU:=libunistring/} PKG_OPTS:= dev +include $(ADK_TOPDIR)/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk +$(eval $(call HOST_template,LIBUNISTRING,libunistring,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBUNISTRING,libunistring,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) libunistring-install: ${INSTALL_DIR} ${IDIR_LIBUNISTRING}/usr/lib ${CP} ${WRKINST}/usr/lib/libunistring.so* ${IDIR_LIBUNISTRING}/usr/lib +include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libunwind/Makefile b/package/libunwind/Makefile index 2d26b81ad..a60f6e4b1 100644 --- a/package/libunwind/Makefile +++ b/package/libunwind/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libunwind -PKG_VERSION:= 1.2.1 +PKG_VERSION:= 1.8.1 PKG_RELEASE:= 1 -PKG_HASH:= 3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb +PKG_HASH:= ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157 PKG_DESCR:= determine the call-chain of a program PKG_SECTION:= libs/misc PKG_URL:= https://savannah.nongnu.org/projects/libunwind/ -PKG_SITES:= http://download.savannah.nongnu.org/releases/libunwind/ +PKG_SITES:= https://github.com/libunwind/libunwind/releases/download/v1.8.1/ PKG_OPTS:= dev DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/package/libunwind/patches/patch-tests_test-coredump-unwind_c b/package/libunwind/patches/patch-tests_test-coredump-unwind_c deleted file mode 100644 index 640ae9c3b..000000000 --- a/package/libunwind/patches/patch-tests_test-coredump-unwind_c +++ /dev/null @@ -1,21 +0,0 @@ ---- libunwind-1.2.orig/tests/test-coredump-unwind.c 2017-01-13 16:58:24.000000000 +0100 -+++ libunwind-1.2/tests/test-coredump-unwind.c 2017-04-17 18:52:13.963470134 +0200 -@@ -57,7 +57,9 @@ - #include <grp.h> - - /* For SIGSEGV handler code */ -+#ifndef __UCLIBC__ - #include <execinfo.h> -+#endif - #include <sys/ucontext.h> - - #include <libunwind-coredump.h> -@@ -242,7 +244,7 @@ void handle_sigsegv(int sig, siginfo_t * - void *array[50]; - int size; - size = backtrace(array, 50); --#ifdef __linux__ -+#if defined __linux__ && !defined __UCLIBC__ - backtrace_symbols_fd(array, size, 2); - #endif - } diff --git a/package/libuv/Makefile b/package/libuv/Makefile index 3a8b43a61..8ddad9e87 100644 --- a/package/libuv/Makefile +++ b/package/libuv/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libuv -PKG_VERSION:= 1.42.0 +PKG_VERSION:= 1.50.0 PKG_RELEASE:= 1 -PKG_HASH:= 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764 +PKG_HASH:= b1ec56444ee3f1e10c8bd3eed16ba47016ed0b94fe42137435aaf2e0bd574579 PKG_DESCR:= multi-platform support library PKG_SECTION:= libs/misc PKG_URL:= https://github.com/libuv/libuv/ diff --git a/package/libuv/patches/patch-libuv_pc_in b/package/libuv/patches/patch-libuv_pc_in deleted file mode 100644 index 4c7ae339d..000000000 --- a/package/libuv/patches/patch-libuv_pc_in +++ /dev/null @@ -1,12 +0,0 @@ ---- libuv-1.42.0.orig/libuv.pc.in 2021-07-20 04:44:04.000000000 +0200 -+++ libuv-1.42.0/libuv.pc.in 2021-10-29 13:40:49.561398557 +0200 -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=${prefix} --libdir=@libdir@ --includedir=@includedir@ -+libdir=${prefix}/@libdir@ -+includedir=${prefix}/@includedir@ - - Name: libuv - Version: @PACKAGE_VERSION@ diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index 163a030a3..4ef067c3a 100644 --- a/package/libvorbis/Makefile +++ b/package/libvorbis/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libvorbis -PKG_VERSION:= 1.3.5 +PKG_VERSION:= 1.3.7 PKG_RELEASE:= 1 -PKG_HASH:= 54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1 +PKG_HASH:= b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b PKG_DESCR:= vorbis general audio compression codec library PKG_SECTION:= libs/audio PKG_BUILDDEP:= libogg diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index 7f31d719c..a4dd44e9d 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libvpx -PKG_VERSION:= 1.14.0 +PKG_VERSION:= 1.15.2 PKG_RELEASE:= 1 -PKG_HASH:= 5f21d2db27071c8a46f1725928a10227ae45c5cd1cad3727e4aafbe476e321fa +PKG_HASH:= 26fcd3db88045dee380e581862a6ef106f49b74b6396ee95c2993a260b4636aa PKG_DESCR:= vp8/vp9 codec library PKG_SECTION:= libs/video PKG_BUILDDEP:= yasm-host @@ -20,7 +20,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBVPX,libvpx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ENV+= LD=$(TARGET_CC) +CONFIGURE_ENV+= LD="$(TARGET_CC)" CONFIG_STYLE:= minimal ifeq ($(ADK_TARGET_ARCH_AARCH64),y) diff --git a/package/libwebp/Makefile b/package/libwebp/Makefile index d894f3831..4f848ee5f 100644 --- a/package/libwebp/Makefile +++ b/package/libwebp/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libwebp -PKG_VERSION:= 1.2.2 +PKG_VERSION:= 1.6.0 PKG_RELEASE:= 1 -PKG_HASH:= 51e9297aadb7d9eb99129fe0050f53a11fcce38a0848fb2b0389e385ad93695e +PKG_HASH:= 93a852c2b3efafee3723efd4636de855b46f9fe1efddd607e1f42f60fc8f2136 PKG_DESCR:= new image format for the web PKG_SECTION:= libs/image PKG_BUILDDEP:= cmake-host @@ -19,9 +19,15 @@ DISTFILES:= v${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DBUILD_SHARED_LIBS=ON $(eval $(call PKG_template,LIBWEBP,libwebp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) libwebp-install: + $(INSTALL_DIR) $(IDIR_LIBWEBP)/usr/lib + $(CP) $(WRKINST)/usr/lib/libwebp*so* \ + $(IDIR_LIBWEBP)/usr/lib + $(CP) $(WRKINST)/usr/lib/libsharpyuv*so* \ + $(IDIR_LIBWEBP)/usr/lib include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libwpe/Makefile b/package/libwpe/Makefile new file mode 100644 index 000000000..b876264c0 --- /dev/null +++ b/package/libwpe/Makefile @@ -0,0 +1,30 @@ +# 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:= libwpe +PKG_VERSION:= 1.16.3 +PKG_RELEASE:= 1 +PKG_HASH:= c880fa8d607b2aa6eadde7d6d6302b1396ebc38368fe2332fa20e193c7ee1420 +PKG_DESCR:= general purpose library for wpe +PKG_SECTION:= libs/misc +PKG_DEPENDS:= libxkbcommon +PKG_BUILDDEP:= libxkbcommon +PKG_URL:= https://wpewebkit.org +PKG_SITES:= https://wpewebkit.org/releases/ +PKG_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBWPE,libwpe,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5 + +libwpe-install: + $(INSTALL_DIR) $(IDIR_LIBWPE)/usr/lib + $(CP) $(WRKINST)/usr/lib/libwpe*.so* \ + $(IDIR_LIBWPE)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libx264/Makefile b/package/libx264/Makefile index 394cbcd82..83fdb14e0 100644 --- a/package/libx264/Makefile +++ b/package/libx264/Makefile @@ -4,7 +4,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libx264 -PKG_VERSION:= 7d0ff22e8c96de126be9d3de4952edd6d1b75a8c +PKG_VERSION:= 0480cb05fa188d37ae87e8f4fd8f1aea3711f7ee PKG_RELEASE:= 1 PKG_GIT:= hash PKG_DESCR:= h264 encoding library @@ -13,16 +13,16 @@ PKG_URL:= http://www.videolan.org/developers/x264.html PKG_SITES:= http://git.videolan.org/git/x264.git PKG_OPTS:= dev +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIG_STYLE:= minimal -ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) -CONFIGURE_ARGS+= --disable-asm -endif -CONFIGURE_ARGS+= --disable-cli \ +CONFIGURE_ARGS+= --disable-asm \ + --disable-cli \ --disable-opencl \ --enable-shared \ --prefix=/usr \ diff --git a/package/libx265/Makefile b/package/libx265/Makefile index bde8655cd..d7834d365 100644 --- a/package/libx265/Makefile +++ b/package/libx265/Makefile @@ -4,8 +4,8 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libx265 -PKG_VERSION:= 3.2 -PKG_HASH:= 364d79bcd56116a9e070fdeb1d9d2aaef1a786b4970163fb56ff0991a183133b +PKG_VERSION:= 4.1 +PKG_HASH:= a31699c6a89806b74b0151e5e6a7df65de4b49050482fe5ebf8a4379d7af8f29 PKG_RELEASE:= 1 PKG_DESCR:= h265 encoding library PKG_SECTION:= libs/video diff --git a/package/libx265/patches/patch-source_CMakeLists_txt b/package/libx265/patches/patch-source_CMakeLists_txt new file mode 100644 index 000000000..239456945 --- /dev/null +++ b/package/libx265/patches/patch-source_CMakeLists_txt @@ -0,0 +1,18 @@ +--- x265_4.1.orig/source/CMakeLists.txt 2024-11-22 13:07:34.000000000 +0100 ++++ x265_4.1/source/CMakeLists.txt 2025-10-05 03:09:19.216070894 +0200 +@@ -6,15 +6,9 @@ if(NOT CMAKE_BUILD_TYPE) + FORCE) + endif() + message(STATUS "cmake version ${CMAKE_VERSION}") +-if(POLICY CMP0025) +- cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang +-endif() + if(POLICY CMP0042) + cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH + endif() +-if(POLICY CMP0054) +- cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted +-endif() + + project (x265) + cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8 diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile index 5dbd1b4b5..cc42bbc74 100644 --- a/package/libxcb/Makefile +++ b/package/libxcb/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libxcb -PKG_VERSION:= 1.16 +PKG_VERSION:= 1.17.0 PKG_RELEASE:= 1 -PKG_HASH:= bc0f75f84b28e6496a19a1d094d7e47def861a50cb7cce5b23b62eecdc2a4479 +PKG_HASH:= 2c69287424c9e2128cb47ffe92171e10417041ec2963bceafb65cb3fcf8f0b85 PKG_DESCR:= interface to the x window system protocol PKG_SECTION:= x11/libs PKG_BUILDDEP:= python3 libpthread-stubs libxslt libXau xcb-proto diff --git a/package/libxkbcommon/Makefile b/package/libxkbcommon/Makefile index 1650043a9..f1ffa28dd 100644 --- a/package/libxkbcommon/Makefile +++ b/package/libxkbcommon/Makefile @@ -4,12 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libxkbcommon -PKG_VERSION:= 1.5.0 +PKG_VERSION:= 1.7.0 PKG_RELEASE:= 1 -PKG_HASH:= 560f11c4bbbca10f495f3ef7d3a6aa4ca62b4f8fb0b52e7d459d18a26e46e017 +PKG_HASH:= 65782f0a10a4b455af9c6baab7040e2f537520caa2ec2092805cdfd36863b247 PKG_DESCR:= library for handling of keyboard descriptions PKG_SECTION:= libs/misc -PKG_BUILDDEP:= meson-host +PKG_DEPENDS:= wayland +PKG_BUILDDEP:= meson-host wayland wayland-protocols libxcb PKG_SITES:= https://xkbcommon.org/download/ PKG_OPTS:= dev @@ -18,7 +19,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXKBCOMMON,libxkbcommon,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) MESON_FLAGS+= -Denable-docs=false \ - -Denable-wayland=false \ + -Denable-wayland=true \ -Dxkb-config-root=/usr/share/X11/xkb WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile index 42812796d..e4391eddd 100644 --- a/package/libxkbfile/Makefile +++ b/package/libxkbfile/Makefile @@ -15,12 +15,15 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBXKBFILE,libxkbfile,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXKBFILE,libxkbfile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) libxkbfile-install: ${INSTALL_DIR} ${IDIR_LIBXKBFILE}/usr/lib ${CP} ${WRKINST}/usr/lib/libxkbfile.so* ${IDIR_LIBXKBFILE}/usr/lib +include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 20a1428b7..5a7c744cb 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libxml2 -PKG_VERSION:= 2.10.3 +PKG_VERSION:= 2.15.1 PKG_RELEASE:= 1 -PKG_HASH:= 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c +PKG_HASH:= c008bac08fd5c7b4a87f7b8a71f283fa581d80d80ff8d2efd3b26224c39bc54c PKG_DESCR:= xml parser and toolkit PKG_SECTION:= libs/data PKG_DEPENDS:= zlib PKG_BUILDDEP:= libxml2-host python3 zlib HOST_BUILDDEP:= python3-host PKG_URL:= http://www.xmlsoft.org/ -PKG_SITES:= https://download.gnome.org/sources/libxml2/2.10/ +PKG_SITES:= https://download.gnome.org/sources/libxml2/2.15/ PKG_OPTS:= dev include $(ADK_TOPDIR)/mk/host.mk @@ -22,7 +22,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBXML2,libxml2,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,LIBXML2,libxml2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --without-python \ --with-threads \ --without-iconv \ diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index 3c2522122..0f698eba8 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libxslt -PKG_VERSION:= 1.1.38 +PKG_VERSION:= 1.1.43 PKG_RELEASE:= 1 -PKG_HASH:= 1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1 +PKG_HASH:= 5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a PKG_DESCR:= xslt library PKG_SECTION:= libs/data PKG_DEPENDS:= libxml2 @@ -28,7 +28,6 @@ $(eval $(call HOST_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,XSLTPROC,xsltproc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XSLTPROC},${PKGSC_XSLTPROC})) -#AUTOTOOL_STYLE:= autoreconf HOST_LDFLAGS+= -lxml2 HOST_CONFIGURE_ARGS+= --without-python \ --without-crypto \ 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_ilmid_io_c b/package/linux-atm/patches/patch-src_ilmid_io_c deleted file mode 100644 index 9b88b0b49..000000000 --- a/package/linux-atm/patches/patch-src_ilmid_io_c +++ /dev/null @@ -1,15 +0,0 @@ ---- linux-atm-2.5.1.orig/src/ilmid/io.c 2007-07-11 18:07:57.000000000 +0200 -+++ linux-atm-2.5.1/src/ilmid/io.c 2013-08-15 21:40:35.168523713 +0200 -@@ -48,6 +48,12 @@ - be manually configured (after ilmid has - registered the "official" address) - HACK */ - -+#ifndef SUN_LEN -+# include <string.h> /* For prototype of `strlen'. */ -+ /* Evaluate to actual length of the `sockaddr_un' structure. */ -+# define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) + strlen ((ptr)->sun_path)) -+#endif -+ - extern SysGroup *remsys; - extern State ilmi_state; - static short atm_itf = -1; /* bad value */ diff --git a/package/linux-atm/patches/patch-src_mpoad_io_c b/package/linux-atm/patches/patch-src_mpoad_io_c deleted file mode 100644 index 14dd75d00..000000000 --- a/package/linux-atm/patches/patch-src_mpoad_io_c +++ /dev/null @@ -1,18 +0,0 @@ ---- linux-atm-2.5.1.orig/src/mpoad/io.c 2007-12-11 18:46:12.000000000 +0100 -+++ linux-atm-2.5.1/src/mpoad/io.c 2013-08-17 14:41:53.542968628 +0200 -@@ -10,14 +10,7 @@ - #include <errno.h> - #include <sys/ioctl.h> - #include <sys/param.h> /* for OPEN_MAX */ --#if __GLIBC__ >= 2 --#include <sys/poll.h> --#else /* ugly hack to make it compile on RH 4.2 - WA */ --#include <syscall.h> --#include <linux/poll.h> --#define SYS_poll 168 --_syscall3(int,poll,struct pollfd *,ufds,unsigned int,nfds,int,timeout); --#endif -+#include <poll.h> - #include <atm.h> - #include <linux/types.h> - #include <linux/atmioc.h> 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_atmsigd_c b/package/linux-atm/patches/patch-src_sigd_atmsigd_c deleted file mode 100644 index 7eb31abf9..000000000 --- a/package/linux-atm/patches/patch-src_sigd_atmsigd_c +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-atm-2.5.1.orig/src/sigd/atmsigd.c 2004-09-25 13:25:48.000000000 +0200 -+++ linux-atm-2.5.1/src/sigd/atmsigd.c 2013-08-15 21:22:05.226477574 +0200 -@@ -517,7 +517,7 @@ int main(int argc,char **argv) - exit(0); - } - } -- (void) on_exit(trace_on_exit,NULL); -+ (void) atexit(trace_on_exit); - poll_loop(); - close_all(); - for (sig = entities; sig; sig = sig->next) stop_saal(&sig->saal); 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/ltp/Makefile b/package/ltp/Makefile index 1a039c239..8f9ebaa88 100644 --- a/package/ltp/Makefile +++ b/package/ltp/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ltp -PKG_VERSION:= 20240129 +PKG_VERSION:= 20250130 PKG_RELEASE:= 1 PKG_DESCR:= linux test project -PKG_HASH:= c302f6b2ca09cbb7835f549777bdb9233fe31f7086d7ad8e65472a0804e3e025 +PKG_HASH:= 02e4ec326be54c3fd92968229a468c02c665d168a8a673edc38a891f7395ae10 PKG_DEPENDS:= bash mke2fs mkfs shadow libtirpc libaio PKG_DEPENDS+= kmod dosfstools PKG_BUILDDEP+= libtirpc libaio diff --git a/package/ltrace/Makefile b/package/ltrace/Makefile index c26099d09..1ce0e48c1 100644 --- a/package/ltrace/Makefile +++ b/package/ltrace/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= 0e6f8c077471b544c06def7192d983861ad2f8688dd5504beae62f0c5f5b9503 PKG_DESCR:= intercepts and records dynamic library calls PKG_SECTION:= app/debug -PKG_DEPENDS:= libelf -PKG_BUILDDEP:= libelf +PKG_DEPENDS:= elfutils +PKG_BUILDDEP:= elfutils PKG_NEEDS:= c++ PKG_URL:= http://ltrace.org/ PKG_SITES:= http://www.ltrace.org/ diff --git a/package/lynx/Makefile b/package/lynx/Makefile index 945096303..ab68c1dc0 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= lynx -PKG_VERSION:= 2.9.1 +PKG_VERSION:= 2.9.2 PKG_RELEASE:= 1 -PKG_HASH:= 085fb3924b8684485c6be1b1ca745417da6ace768f94428ead95caf9dd8b56b7 +PKG_HASH:= 99f8f28f860094c533100d1cedf058c27fb242ce25e991e2d5f30ece4457a3bf PKG_DESCR:= text browser PKG_SECTION:= app/browser PKG_DEPENDS:= libncurses zlib @@ -18,7 +18,7 @@ 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 +PKG_CHOICES_LYNX:= WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCB_WITH_LIBRESSL:= libressl @@ -34,9 +34,10 @@ 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_LDFLAGS+= -latomic +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" \ diff --git a/package/m4/Makefile b/package/m4/Makefile index 6973ed164..b9f57f5f4 100644 --- a/package/m4/Makefile +++ b/package/m4/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= m4 -PKG_VERSION:= 1.4.19 +PKG_VERSION:= 1.4.20 PKG_RELEASE:= 1 -PKG_HASH:= 63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96 +PKG_HASH:= e236ea3a1ccf5f6c270b1c4bb60726f371fa49459a8eaaebc90b216b328daf2b PKG_DESCR:= macro processor PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host @@ -22,7 +22,6 @@ $(eval $(call PKG_template,M4,m4,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${ CONFIGURE_ENV+= ac_cv_func_posix_spawn=yes \ ac_cv_func_posix_spawn_works=yes -TARGET_LDFLAGS+= -lrt m4-install: ${INSTALL_DIR} ${IDIR_M4}/usr/bin diff --git a/package/mailutils/Makefile b/package/mailutils/Makefile index a445aab6f..a17bdb2e5 100644 --- a/package/mailutils/Makefile +++ b/package/mailutils/Makefile @@ -14,8 +14,6 @@ PKG_DEPENDS:= libreadline PKG_URL:= http://mailutils.org/ PKG_SITES:= ftp://ftp.gnu.org/gnu/mailutils/ -PKG_HOST_DEPENDS:= x86 x86_64 - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,MAILUTILS,mailutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/make/Makefile b/package/make/Makefile index ee584771a..3a130489c 100644 --- a/package/make/Makefile +++ b/package/make/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3 PKG_DESCR:= c/c++ code buildtool PKG_SECTION:= dev/tools -PKG_DEPENDS:= libelf -PKG_BUILDDEP:= libelf +PKG_DEPENDS:= elfutils +PKG_BUILDDEP:= elfutils PKG_URL:= http://www.gnu.org/software/make PKG_SITES:= ${MASTER_SITE_GNU:=make/} diff --git a/package/mariadb/Makefile b/package/mariadb/Makefile index 33a865c1f..6f380f8a7 100644 --- a/package/mariadb/Makefile +++ b/package/mariadb/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mariadb -PKG_VERSION:= 10.11.7 +PKG_VERSION:= 10.11.9 PKG_RELEASE:= 1 -PKG_HASH:= 5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157 +PKG_HASH:= 0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20 PKG_DESCR:= sql client library PKG_SECTION:= libs/db PKG_DEPENDS:= libncurses zlib libevent libpcre boost libfmt libkrb5 diff --git a/package/mbedtls/Makefile b/package/mbedtls/Makefile deleted file mode 100644 index 9ce0d5468..000000000 --- a/package/mbedtls/Makefile +++ /dev/null @@ -1,30 +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:= mbedtls -PKG_VERSION:= 2.28.7 -PKG_RELEASE:= 1 -PKG_HASH:= 1df6073f0cf6a4e1953890bf5e0de2a8c7e6be50d6d6c69fa9fefcb1d14e981a -PKG_DESCR:= embedded ssl/tls library -PKG_SECTION:= libs/crypto -PKG_URL:= https://tls.mbed.org -PKG_SITES:= https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/ -PKG_LIBNAME:= libmbedtls -PKG_OPTS:= dev - -DISTFILES:= v$(PKG_VERSION).tar.gz - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,LIBMBEDTLS,libmbedtls,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) - -CONFIG_STYLE:= manual -ALL_TARGET:= lib -TARGET_CFLAGS+= -DSHARED - -libmbedtls-install: - $(INSTALL_DIR) $(IDIR_LIBMBEDTLS)/usr/lib - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/mbedtls/patches/patch-Makefile b/package/mbedtls/patches/patch-Makefile deleted file mode 100644 index 95c3340e1..000000000 --- a/package/mbedtls/patches/patch-Makefile +++ /dev/null @@ -1,35 +0,0 @@ ---- mbedtls-3.5.2.orig/Makefile 2024-01-24 10:49:11.000000000 +0100 -+++ mbedtls-3.5.2/Makefile 2024-02-22 19:10:23.460591189 +0100 -@@ -79,22 +79,22 @@ $(VISUALC_FILES): - - ifndef WINDOWS - install: no_test -- mkdir -p $(DESTDIR)/include/mbedtls -- cp -rp include/mbedtls $(DESTDIR)/include -- mkdir -p $(DESTDIR)/include/psa -- cp -rp include/psa $(DESTDIR)/include -+ mkdir -p $(DESTDIR)/usr/include/mbedtls -+ cp -rp include/mbedtls $(DESTDIR)/usr/include -+ mkdir -p $(DESTDIR)/usr/include/psa -+ cp -rp include/psa $(DESTDIR)/usr/include - -- mkdir -p $(DESTDIR)/lib -- cp -RP library/libmbedtls.* $(DESTDIR)/lib -- cp -RP library/libmbedx509.* $(DESTDIR)/lib -- cp -RP library/libmbedcrypto.* $(DESTDIR)/lib -+ mkdir -p $(DESTDIR)/usr/lib -+ cp -RP library/libmbedtls.* $(DESTDIR)/usr/lib -+ cp -RP library/libmbedx509.* $(DESTDIR)/usr/lib -+ cp -RP library/libmbedcrypto.* $(DESTDIR)/usr/lib - -- mkdir -p $(DESTDIR)/bin -+ mkdir -p $(DESTDIR)/usr/bin - for p in programs/*/* ; do \ - if [ -x $$p ] && [ ! -d $$p ] ; \ - then \ - f=$(PREFIX)`basename $$p` ; \ -- cp $$p $(DESTDIR)/bin/$$f ; \ -+ cp $$p $(DESTDIR)/usr/bin/$$f ; \ - fi \ - done - diff --git a/package/mdadm/Makefile b/package/mdadm/Makefile index 69d17ee2f..1301203cc 100644 --- a/package/mdadm/Makefile +++ b/package/mdadm/Makefile @@ -4,23 +4,32 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mdadm -PKG_VERSION:= 4.2 +PKG_VERSION:= 4.4 PKG_RELEASE:= 1 -PKG_HASH:= 461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d +PKG_HASH:= 556266fb8322de465eff2aa7e0f7d2b1056153770c70971834833f571dbc02a2 PKG_DESCR:= tool for managing software raid arrays PKG_DEPENDS:= libudev PKG_BUILDDEP:= eudev PKG_KDEPENDS:= blk-dev-md md md-raid0 md-raid1 md-raid456 PKG_SECTION:= sys/fs PKG_URL:= http://neil.brown.name/blog/mdadm -PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/raid/mdadm/} +PKG_SITES:= https://github.com/md-raid-utilities/mdadm/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,MDADM,mdadm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual -XAKE_FLAGS+= CROSS_COMPILE="${TARGET_CROSS}" CHECK_RUN_DIR=0 +# gcc-12.4.0 at least seems to get some things wrong +TARGET_CFLAGS+= -Wno-error=uninitialized +# Without this, I get "undefined reference to `__stack_chk_fail'" while linking +TARGET_CFLAGS+= -fno-stack-protector +XAKE_FLAGS+= CROSS_COMPILE="${TARGET_CROSS}" \ + CHECK_RUN_DIR=0 \ + CXFLAGS="${TARGET_CFLAGS}" mdadm-install: ${INSTALL_DIR} ${IDIR_MDADM}/usr/sbin diff --git a/package/mesa/Makefile b/package/mesa/Makefile index 75a10c003..0bd924989 100644 --- a/package/mesa/Makefile +++ b/package/mesa/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mesa -PKG_VERSION:= 23.3.3 +PKG_VERSION:= 25.0.2 PKG_RELEASE:= 1 -PKG_HASH:= 518307c0057fa3cee8b58df78be431d4df5aafa7edc60d09278b2d7a0a80f3b4 +PKG_HASH:= adf904d083b308df95898600ffed435f4b5c600d95fb6ec6d4c45638627fdc97 PKG_DESCR:= 3d graphics library PKG_SECTION:= libs/video PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat @@ -14,13 +14,18 @@ PKG_DEPENDS+= libxml2 PKG_BUILDDEP:= python3 libxml2 libXdamage libXfixes libXrandr PKG_BUILDDEP+= libXxf86vm libdrm dri2proto glproto expat libXext PKG_BUILDDEP+= eudev dri3proto presentproto xcb-proto libxcb -PKG_BUILDDEP+= libxshmfence python-mako-host +PKG_BUILDDEP+= libxshmfence python-mako-host python3-yaml-host PKG_NEEDS:= c++ PKG_URL:= http://www.mesa3d.org/ -PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/ +PKG_SITES:= https://archive.mesa3d.org/ PKG_LIBNAME:= mesa PKG_OPTS:= dev +PKG_CHOICES_MESA:= WITH_X11 WITH_WAYLAND +PKGCD_WITH_X11:= with X11 support +PKGCD_WITH_WAYLAND:= with wayland support +PKGCB_WITH_WAYLAND:= wayland wayland-protocols + PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el arm aarch64 include $(ADK_TOPDIR)/mk/package.mk @@ -33,22 +38,33 @@ BUILD_STYLE:= meson INSTALL_STYLE:= meson MESON_FLAGS+= -Dllvm=disabled \ - -Dgallium-drivers=swrast,panfrost,vc4,v3d \ + -Dgallium-drivers=panfrost,vc4,v3d,virgl \ -Dvulkan-drivers= \ -Dgbm=enabled \ - -Dplatforms=x11 + -Dglx=dri + +ifeq ($(ADK_PACKAGE_MESA_WITH_WAYLAND),y) +MESON_FLAGS+= -Dplatforms="wayland" +endif + +ifeq ($(ADK_PACKAGE_MESA_WITH_X11),y) +MESON_FLAGS+= -Dplatforms="x11" +endif mesa-install: $(INSTALL_DIR) $(IDIR_MESA)/usr/lib/dri + $(INSTALL_DIR) $(IDIR_MESA)/usr/lib/gbm $(CP) $(WRKINST)/usr/lib/libEGL*.so* \ $(IDIR_MESA)/usr/lib $(CP) $(WRKINST)/usr/lib/libGL*.so* \ $(IDIR_MESA)/usr/lib - $(CP) $(WRKINST)/usr/lib/libglapi.so* \ - $(IDIR_MESA)/usr/lib $(CP) $(WRKINST)/usr/lib/libgbm.so* \ $(IDIR_MESA)/usr/lib + $(CP) $(WRKINST)/usr/lib/libgallium*.so* \ + $(IDIR_MESA)/usr/lib ${CP} $(WRKINST)/usr/lib/dri/*.so \ ${IDIR_MESA}/usr/lib/dri/ + ${CP} $(WRKINST)/usr/lib/gbm/*.so \ + ${IDIR_MESA}/usr/lib/gbm/ include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mesa/patches/patch-meson_build b/package/mesa/patches/patch-meson_build new file mode 100644 index 000000000..6b7aaf7be --- /dev/null +++ b/package/mesa/patches/patch-meson_build @@ -0,0 +1,23 @@ +--- mesa-25.0.2.orig/meson.build 2025-03-20 14:32:27.000000000 +0100 ++++ mesa-25.0.2/meson.build 2025-04-02 20:40:53.964094916 +0200 +@@ -940,20 +940,6 @@ endif + # On Windows, a venv has no versioned aliased to 'python'. + prog_python = find_program('python3', 'python', version : '>= 3.8') + +-has_mako = run_command( +- prog_python, '-c', +- ''' +-try: +- from packaging.version import Version +-except: +- from distutils.version import StrictVersion as Version +-import mako +-assert Version(mako.__version__) >= Version("0.8.0") +- ''', check: false) +-if has_mako.returncode() != 0 +- error('Python (3.x) mako module >= 0.8.0 required to build mesa.') +-endif +- + has_yaml = run_command( + prog_python, '-c', + ''' diff --git a/package/meson/Makefile b/package/meson/Makefile index 314fac6dc..510b75b1c 100644 --- a/package/meson/Makefile +++ b/package/meson/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= meson -PKG_VERSION:= 1.3.2 +PKG_VERSION:= 1.7.0 PKG_RELEASE:= 1 -PKG_HASH:= 683082fb3c5cddf203b21d29bdf4c227e2f7964da5324a15e1a5f7db94322b4b +PKG_HASH:= a6ca46e2a11a0278bb6492ecd4e0520ff441b164ebfdef1e012b11beb848d26e PKG_DESCR:= build utility PKG_SECTION:= dev/tools -HOST_BUILDDEP:= python3-host ninja-host +HOST_BUILDDEP:= python3-host python3-setuptools-host ninja-host PKG_URL:= http://www.mesonbuild.com/ PKG_SITES:= https://github.com/mesonbuild/meson/archive/ diff --git a/package/meson/src/cross-compilation.conf.in b/package/meson/src/cross-compilation.conf.in index 24ef6ef53..b24c71cd8 100644 --- a/package/meson/src/cross-compilation.conf.in +++ b/package/meson/src/cross-compilation.conf.in @@ -9,6 +9,9 @@ cpp = '@TARGET_CROSS@g++' ar = '@TARGET_CROSS@ar' strip = '@TARGET_CROSS@strip' pkg-config = '@STAGING_HOST_DIR@/usr/bin/pkg-config' +glib-compile-resources = '@STAGING_HOST_DIR@/usr/bin/glib-compile-resources' +glib-compile-schemas = '@STAGING_HOST_DIR@/usr/bin/glib-compile-schemas' +gdbus-codegen = '@STAGING_HOST_DIR@/usr/bin/gdbus-codegen' [built-in options] c_args = [@TARGET_CFLAGS@] diff --git a/package/minidlna/Makefile b/package/minidlna/Makefile new file mode 100644 index 000000000..2a51c978d --- /dev/null +++ b/package/minidlna/Makefile @@ -0,0 +1,29 @@ +# 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:= minidlna +PKG_VERSION:= 1.3.3 +PKG_RELEASE:= 1 +PKG_HASH:= 39026c6d4a139b9180192d1c37225aa3376fdf4f1a74d7debbdbb693d996afa4 +PKG_DESCR:= DLNA/UPnP-AV compliant media server +PKG_SECTION:= mm/video +PKG_DEPENDS:= libffmpeg libjpeg-turbo libexif libid3tag libogg libflac libvorbis libsqlite libiconv +PKG_BUILDDEP:= ffmpeg libjpeg-turbo libexif libid3tag libogg flac libvorbis sqlite libiconv +PKG_URL:= http://sourceforge.net/projects/minidlna/ +PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=minidlna/) +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MINIDLNA,minidlna,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +minidlna-install: + $(INSTALL_DIR) $(IDIR_MINIDLNA)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/minidlnad \ + $(IDIR_MINIDLNA)/usr/sbin + $(INSTALL_DIR) $(IDIR_MINIDLNA)/etc/ + $(INSTALL_DATA) $(WRKSRC)/minidlna.conf $(IDIR_MINIDLNA)/etc/ + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/minidlna/files/minidlna.init b/package/minidlna/files/minidlna.init new file mode 100644 index 000000000..c4a1fe795 --- /dev/null +++ b/package/minidlna/files/minidlna.init @@ -0,0 +1,36 @@ +#!/bin/sh +#PKG minidlna +#INIT 60 +. /etc/rc.conf + +pidfile=$(echo "$minidlna_flags" | sed -n 's/.*-P \([^ ]\+\).*/\1/p') +[ "$pidfile" ] || pidfile="/var/run/minidlna/minidlna.pid" + +case $1 in +autostop) ;; +autostart) + test x"${minidlna:-NO}" = x"NO" && exit 0 + test x"$minidlna" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start + exec sh $0 start + ;; +start) + /usr/sbin/minidlnad $minidlna_flags + ;; +stop) + if [ -f "$pidfile" ]; then + kill $(<$pidfile) + rm $pidfile + else + kill $(pgrep -f /usr/sbin/minidlnad) + fi + ;; +restart) + sh $0 stop + sleep 1 + sh $0 start + ;; +*) + echo "usage: $0 (start | stop | restart)" + exit 1 +esac +exit $? diff --git a/package/minidlna/files/minidlna.postinst b/package/minidlna/files/minidlna.postinst new file mode 100644 index 000000000..6c14ff1e8 --- /dev/null +++ b/package/minidlna/files/minidlna.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf minidlna NO diff --git a/package/minidlna/patches/0001-log-Try-syslog-if-no-log-path-was-given.patch b/package/minidlna/patches/0001-log-Try-syslog-if-no-log-path-was-given.patch new file mode 100644 index 000000000..c42c28097 --- /dev/null +++ b/package/minidlna/patches/0001-log-Try-syslog-if-no-log-path-was-given.patch @@ -0,0 +1,104 @@ +From 989841a0c4e83b0ac1b9d276be3797bcfa83bcb1 Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil@nwl.cc> +Date: Sun, 27 Nov 2022 23:45:41 +0100 +Subject: [PATCH] log: Try syslog if no log path was given + +Signed-off-by: Phil Sutter <phil@nwl.cc> +--- + log.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- + minidlna.c | 2 -- + 2 files changed, 42 insertions(+), 4 deletions(-) + +diff --git a/log.c b/log.c +index a989904a24d93..840a8c02e678b 100644 +--- a/log.c ++++ b/log.c +@@ -23,6 +23,7 @@ + #include <stdio.h> + #include <stdarg.h> + #include <string.h> ++#include <syslog.h> + #include <time.h> + + #include "upnpglobalvars.h" +@@ -147,6 +148,40 @@ log_init(const char *debug) + return 0; + } + ++static int ++syslog_err(int level, enum _log_facility facility, ++ char *fname, int lineno, char *fmt, va_list *ap) ++{ ++ char myfmt[1024]; ++ int level_to_syslog[E_MAXDEBUG + 1] = { ++ /* [E_OFF] = 0, */ ++ [E_FATAL] = LOG_CRIT, ++ [E_ERROR] = LOG_ERR, ++ [E_WARN] = LOG_WARNING, ++ [E_INFO] = LOG_NOTICE, ++ [E_DEBUG] = LOG_INFO, ++ [E_MAXDEBUG] = LOG_DEBUG, ++ }; ++ ++ if (level == E_OFF) ++ return 0; ++ ++ if (level > E_MAXDEBUG) ++ return -1; ++ ++ if (level) ++ snprintf(myfmt, 1024, "%s:%d: %s: %s", fname, lineno, level_name[level], fmt); ++ else ++ snprintf(myfmt, 1024, "%s:%d: %s", fname, lineno, fmt); ++ ++ vsyslog(level_to_syslog[level], myfmt, *ap); ++ ++ if (level == E_FATAL) ++ exit(-1); ++ ++ return 0; ++} ++ + void + log_err(int level, enum _log_facility facility, char *fname, int lineno, char *fmt, ...) + { +@@ -155,8 +190,14 @@ log_err(int level, enum _log_facility facility, char *fname, int lineno, char *f + if (level && level>log_level[facility] && level>E_FATAL) + return; + +- if (!log_fp) ++ va_start(ap, fmt); ++ if (!log_fp) { ++ if (!syslog_err(level, facility, fname, lineno, fmt, &ap)) { ++ va_end(ap); ++ return; ++ } + log_fp = stdout; ++ } + + // timestamp + if (!GETFLAG(SYSTEMD_MASK)) +@@ -176,7 +217,6 @@ log_err(int level, enum _log_facility facility, char *fname, int lineno, char *f + fprintf(log_fp, "%s:%d: ", fname, lineno); + + // user log +- va_start(ap, fmt); + if (vfprintf(log_fp, fmt, ap) == -1) + { + va_end(ap); +diff --git a/minidlna.c b/minidlna.c +index 999adee977353..db29d603d1e28 100644 +--- a/minidlna.c ++++ b/minidlna.c +@@ -817,8 +817,6 @@ init(int argc, char **argv) + optionsfile); + } + } +- if (!log_path[0]) +- strncpyt(log_path, DEFAULT_LOG_PATH, sizeof(log_path)); + if (!db_path[0]) + strncpyt(db_path, DEFAULT_DB_PATH, sizeof(db_path)); + +-- +2.38.1 + diff --git a/package/miniinit/Makefile b/package/miniinit/Makefile new file mode 100644 index 000000000..bef48e965 --- /dev/null +++ b/package/miniinit/Makefile @@ -0,0 +1,31 @@ +# 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:= miniinit +PKG_VERSION:= 1.0 +PKG_RELEASE:= 1 +PKG_DESCR:= minimal init +PKG_SECTION:= base/init + +NO_DISTFILES:= 1 + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MINIINIT,miniinit,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +do-build: + PATH='$(HOST_PATH)' \ + $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ + -o $(WRKBUILD)/miniinit $(WRKBUILD)/miniinit.c + +do-install: + $(INSTALL_DIR) $(IDIR_MINIINIT)/sbin + $(INSTALL_BIN) $(WRKBUILD)/miniinit $(IDIR_MINIINIT)/sbin/init + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/miniinit/src/miniinit.c b/package/miniinit/src/miniinit.c new file mode 100644 index 000000000..69ad095c6 --- /dev/null +++ b/package/miniinit/src/miniinit.c @@ -0,0 +1,44 @@ +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <sys/wait.h> +#include <unistd.h> + +int main() +{ + pid_t pid; + + printf("Started OpenADK miniinit\n"); + putenv("TERM=vt102"); + + // Redirect stdio to /dev/console + close(0); + close(1); + close(2); + open("/dev/console", O_RDWR); // stdin + dup(0); // stdout + dup(0); // stderr + + pid = vfork(); + if (pid == 0) { + setsid(); //new session + putenv("HOME=/"); + putenv("PATH=/sbin:/usr/sbin:/bin:/usr/bin"); + putenv("SHELL=/bin/sh"); + putenv("USER=root"); + // Child: start a shell (e.g., /bin/sh) + execl("/bin/sh", "/bin/sh", "-l", NULL); + perror("execl"); + exit(1); + } else if (pid > 0) { + // Parent: wait for child to exit + int status; + waitpid(pid, &status, 0); + printf("Shell exited, shutting down\n"); + } else if (pid < 0) { + printf("vfork failed"); + sleep(1); + return 0; + } + _exit(0); +} diff --git a/package/mkfontscale/Makefile b/package/mkfontscale/Makefile index 431fba9cd..0d687b735 100644 --- a/package/mkfontscale/Makefile +++ b/package/mkfontscale/Makefile @@ -4,11 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mkfontscale -PKG_VERSION:= 1.1.0 +PKG_VERSION:= 1.2.3 PKG_RELEASE:= 1 -PKG_HASH:= 53515d688c8d0ed24f74374d9c33e36a20b024d59b8127d9f23b481ab5e98150 +PKG_HASH:= 3a026b468874eb672a1d0a57dbd3ddeda4f0df09886caf97d30097b70c2df3f8 PKG_DESCR:= font utility PKG_SECTION:= x11/fonts +PKG_DEPENDS:= freetype libfontenc PKG_BUILDDEP:= freetype libfontenc PKG_SITES:= http://www.x.org/releases/individual/app/ diff --git a/package/mongrel2/Makefile b/package/mongrel2/Makefile deleted file mode 100644 index 9ae849160..000000000 --- a/package/mongrel2/Makefile +++ /dev/null @@ -1,37 +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:= mongrel2 -PKG_VERSION:= 1.13.0 -PKG_RELEASE:= 1 -PKG_HASH:= b6f1f50c9f65b605342d8792b1cc8a1c151105339030313b9825b6a68d400c10 -PKG_DESCR:= application, language, and network architecture agnostic web server -PKG_SECTION:= net/http -PKG_BUILDDEP:= zeromq sqlite-host sqlite mbedtls -PKG_DEPENDS:= zeromq libsqlite mbedtls -PKG_NEEDS:= threads c++ -PKG_URL:= http://mongrel2.org -PKG_SITES:= https://github.com/mongrel2/mongrel2/releases/download/v$(PKG_VERSION)/ - -DISTFILES:= $(PKG_NAME)-v$(PKG_VERSION).tar.bz2 -WRKDIST= ${WRKDIR}/$(PKG_NAME)-v$(PKG_VERSION) - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,MONGREL2,mongrel2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -CONFIG_STYLE:= manual - -mongrel2-install: - $(INSTALL_DIR) $(IDIR_MONGREL2)/etc/mongrel2 - $(CP) $(WRKBUILD)/examples/configs/sample.conf \ - $(IDIR_MONGREL2)/etc/mongrel2/site.conf - $(INSTALL_DIR) $(IDIR_MONGREL2)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/m2sh \ - $(IDIR_MONGREL2)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/mongrel2 \ - $(IDIR_MONGREL2)/usr/bin - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/mongrel2/patches/patch-Makefile b/package/mongrel2/patches/patch-Makefile deleted file mode 100644 index 14ede92ab..000000000 --- a/package/mongrel2/patches/patch-Makefile +++ /dev/null @@ -1,20 +0,0 @@ ---- mongrel2-v1.13.0.orig/Makefile 2021-12-25 01:03:28.000000000 +0100 -+++ mongrel2-v1.13.0/Makefile 2024-02-22 19:19:16.724583955 +0100 -@@ -2,7 +2,7 @@ CFLAGS?=-g -O2 - CFLAGS += -Wall -Wextra -Wno-implicit-fallthrough -Wno-unused-const-variable -I./src -DNDEBUG -D_FILE_OFFSET_BITS=64 -pthread - CFLAGS += ${OPTFLAGS} - LIBS+=-lzmq -ldl -lsqlite3 -lmbedtls -lmbedx509 -lmbedcrypto --PREFIX?=/usr/local -+PREFIX?=/usr - - get_objs = $(addsuffix .o,$(basename $(wildcard $(1)))) - -@@ -18,7 +18,7 @@ TEST_SRC=$(wildcard tests/*_tests.c) - TESTS=$(patsubst %.c,%,${TEST_SRC}) - MAKEOPTS=OPTFLAGS="${CFLAGS} ${NOEXTCFLAGS} ${OPTFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" - --all: bin/mongrel2 tests m2sh procer -+all: bin/mongrel2 m2sh procer - - ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS} - ${OBJECTS}: | builddirs diff --git a/package/mongrel2/patches/patch-tools_m2sh_Makefile b/package/mongrel2/patches/patch-tools_m2sh_Makefile deleted file mode 100644 index abec82a1f..000000000 --- a/package/mongrel2/patches/patch-tools_m2sh_Makefile +++ /dev/null @@ -1,31 +0,0 @@ ---- mongrel2-v1.13.0.orig/tools/m2sh/Makefile 2021-12-25 01:03:28.000000000 +0100 -+++ mongrel2-v1.13.0/tools/m2sh/Makefile 2024-02-22 19:03:20.332596928 +0100 -@@ -1,7 +1,8 @@ --CFLAGS=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS) -+CFLAGS?= -+CFLAGS+=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS) - LIBS=-lzmq -lsqlite3 ../../build/libm2.a $(OPTLIBS) - --PREFIX?=/usr/local -+PREFIX?=/usr - SOURCES=$(wildcard src/*.c src/**/*.c) - OBJECTS=$(patsubst %.c,%.o,${SOURCES}) - TEST_SRC=$(wildcard tests/*.c) -@@ -12,7 +13,7 @@ RAGEL_OBJECTS=src/lexer.o src/cli.o - - $(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter - --all: ../lemon/lemon tests build/m2sh -+all: ../lemon/lemon build/m2sh - - dev: CFLAGS=-g -Wall -Wextra -Isrc -I../../src $(OPTFLAGS) - dev: all -@@ -32,7 +33,7 @@ build/m2sh: ../lemon/lemon ../../build/l - $(CC) $(CFLAGS) -o build/m2sh ${OBJECTS} ../../build/libm2.a $(LDFLAGS) $(LIBS) - - ../lemon/lemon: ../lemon/lemon.c -- $(CC) -O2 ../lemon/lemon.c -o ../lemon/lemon -+ $(CC) $(CFLAGS) ../lemon/lemon.c -o ../lemon/lemon - - tests: build/libm2sh.a ${TESTS} - sh ./tests/runtests.sh diff --git a/package/mongrel2/patches/patch-tools_procer_Makefile b/package/mongrel2/patches/patch-tools_procer_Makefile deleted file mode 100644 index 82b0e85e0..000000000 --- a/package/mongrel2/patches/patch-tools_procer_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- mongrel2-v1.11.0.orig/tools/procer/Makefile 2015-12-31 10:25:18.000000000 +0100 -+++ mongrel2-v1.11.0/tools/procer/Makefile 2016-04-25 20:05:39.765826160 +0200 -@@ -1,5 +1,6 @@ --CFLAGS=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS) --PREFIX?=/usr/local -+CFLAGS?= -+CFLAGS+=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS) -+PREFIX?=/usr - LIBS?=-lzmq - SOURCES=$(wildcard *.c) - OBJECTS=$(patsubst %.c,%.o,${SOURCES}) diff --git a/package/mtd-utils/Makefile b/package/mtd-utils/Makefile index 9922e7310..483f30532 100644 --- a/package/mtd-utils/Makefile +++ b/package/mtd-utils/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mtd-utils -PKG_VERSION:= 2.0.0 -PKG_RELEASE:= 2 -PKG_HASH:= 20a377aa86af4c102e930b0d0bb9859e3a10aeb16445f6a1273989b206a717c8 +PKG_VERSION:= 2.2.1 +PKG_RELEASE:= 1 +PKG_HASH:= f7ae20b2eb79ee83441468f0b99d897024cd96ff853eea59106fb1952065c803 PKG_DESCR:= flash filesystem utilities PKG_SECTION:= sys/fs PKG_DEPENDS:= libuuid liblzo @@ -47,9 +47,6 @@ HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --disable-tests HOST_CPPFLAGS+= -DWITHOUT_XATTR=1 -I./include HOST_MAKE_FLAGS+= WITHOUT_LZO=1 -ifeq ($(OS_FOR_BUILD),Darwin) -HOST_CPPFLAGS+= -D_DARWIN_C_SOURCE -endif host-build: (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ diff --git a/package/mtd-utils/patches/patch-Makefile_in b/package/mtd-utils/patches/patch-Makefile_in deleted file mode 100644 index ddcbcf9e3..000000000 --- a/package/mtd-utils/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- mtd-utils-2.0.0.orig/Makefile.in 2016-12-22 11:21:54.000000000 +0100 -+++ mtd-utils-2.0.0/Makefile.in 2017-04-26 09:13:34.000000000 +0200 -@@ -232,7 +232,7 @@ am__EXEEXT_11 = ftl_format$(EXEEXT) doc_ - flash_lock$(EXEEXT) flash_unlock$(EXEEXT) \ - flash_otp_info$(EXEEXT) flash_otp_dump$(EXEEXT) \ - flash_otp_lock$(EXEEXT) flash_otp_write$(EXEEXT) \ -- flashcp$(EXEEXT) mtdpart$(EXEEXT) -+ flashcp$(EXEEXT) - am__EXEEXT_12 = nanddump$(EXEEXT) nandwrite$(EXEEXT) nandtest$(EXEEXT) \ - nftldump$(EXEEXT) nftl_format$(EXEEXT) - am__EXEEXT_13 = rfddump$(EXEEXT) rfdformat$(EXEEXT) diff --git a/package/mtd-utils/patches/patch-include_common_h b/package/mtd-utils/patches/patch-include_common_h deleted file mode 100644 index 1109ab485..000000000 --- a/package/mtd-utils/patches/patch-include_common_h +++ /dev/null @@ -1,19 +0,0 @@ ---- mtd-utils-2.0.0.orig/include/common.h 2016-12-14 10:06:35.000000000 +0100 -+++ mtd-utils-2.0.0/include/common.h 2017-04-26 01:52:28.000000000 +0200 -@@ -26,10 +26,15 @@ - #include <string.h> - #include <fcntl.h> - #include <errno.h> -+#ifndef __APPLE__ - #include <features.h> -+#include <sys/sysmacros.h> -+#endif - #include <inttypes.h> - #include <unistd.h> --#include <sys/sysmacros.h> -+ -+#include <time.h> -+#include "os-compat.h" - - #include "config.h" - diff --git a/package/mtd-utils/patches/patch-include_mtd_ubi-media_h b/package/mtd-utils/patches/patch-include_mtd_ubi-media_h deleted file mode 100644 index c53899bfd..000000000 --- a/package/mtd-utils/patches/patch-include_mtd_ubi-media_h +++ /dev/null @@ -1,11 +0,0 @@ ---- mtd-utils-2.0.0.orig/include/mtd/ubi-media.h 2016-07-12 14:16:45.000000000 +0200 -+++ mtd-utils-2.0.0/include/mtd/ubi-media.h 2017-04-25 21:14:34.000000000 +0200 -@@ -30,7 +30,7 @@ - #ifndef __UBI_MEDIA_H__ - #define __UBI_MEDIA_H__ - --#include <asm/byteorder.h> -+#include <linux/types.h> - - /* The version of UBI images supported by this implementation */ - #define UBI_VERSION 1 diff --git a/package/mtd-utils/patches/patch-include_mtd_ubifs-media_h b/package/mtd-utils/patches/patch-include_mtd_ubifs-media_h deleted file mode 100644 index 471454799..000000000 --- a/package/mtd-utils/patches/patch-include_mtd_ubifs-media_h +++ /dev/null @@ -1,11 +0,0 @@ ---- mtd-utils-2.0.0.orig/include/mtd/ubifs-media.h 2016-07-12 14:16:45.000000000 +0200 -+++ mtd-utils-2.0.0/include/mtd/ubifs-media.h 2017-04-25 21:47:14.000000000 +0200 -@@ -33,7 +33,7 @@ - #ifndef __UBIFS_MEDIA_H__ - #define __UBIFS_MEDIA_H__ - --#include <asm/byteorder.h> -+#include <linux/types.h> - - /* UBIFS node magic number (must not have the padding byte first or last) */ - #define UBIFS_NODE_MAGIC 0x06101831 diff --git a/package/mtd-utils/patches/patch-jffsX-utils_rbtree_h b/package/mtd-utils/patches/patch-jffsX-utils_rbtree_h deleted file mode 100644 index 7df21dc96..000000000 --- a/package/mtd-utils/patches/patch-jffsX-utils_rbtree_h +++ /dev/null @@ -1,11 +0,0 @@ ---- mtd-utils-2.0.0.orig/jffsX-utils/rbtree.h 2016-07-12 14:16:45.000000000 +0200 -+++ mtd-utils-2.0.0/jffsX-utils/rbtree.h 2017-04-26 02:27:35.000000000 +0200 -@@ -94,7 +94,7 @@ static inline struct page * rb_insert_pa - #ifndef _LINUX_RBTREE_H - #define _LINUX_RBTREE_H - --#include <linux/kernel.h> -+#include <endian.h> - #include <linux/stddef.h> - - struct rb_node diff --git a/package/mtd-utils/patches/patch-misc-utils_docfdisk_c b/package/mtd-utils/patches/patch-misc-utils_docfdisk_c deleted file mode 100644 index f3378c525..000000000 --- a/package/mtd-utils/patches/patch-misc-utils_docfdisk_c +++ /dev/null @@ -1,10 +0,0 @@ ---- mtd-utils-2.0.0.orig/misc-utils/docfdisk.c 2016-12-14 10:06:35.000000000 +0100 -+++ mtd-utils-2.0.0/misc-utils/docfdisk.c 2017-04-26 08:56:40.000000000 +0200 -@@ -19,6 +19,7 @@ - #define PROGRAM_NAME "docfdisk" - - #define _XOPEN_SOURCE 500 /* for pread/pwrite */ -+#include <sys/types.h> - #include <unistd.h> - #include <stdlib.h> - #include <stdio.h> diff --git a/package/mtd-utils/patches/patch-misc-utils_recv_image_c b/package/mtd-utils/patches/patch-misc-utils_recv_image_c deleted file mode 100644 index ab07ab59a..000000000 --- a/package/mtd-utils/patches/patch-misc-utils_recv_image_c +++ /dev/null @@ -1,13 +0,0 @@ ---- mtd-utils-2.0.0.orig/misc-utils/recv_image.c 2016-07-12 14:16:45.000000000 +0200 -+++ mtd-utils-2.0.0/misc-utils/recv_image.c 2017-04-26 09:06:48.000000000 +0200 -@@ -4,6 +4,10 @@ - #define _BSD_SOURCE /* struct ip_mreq */ - #define _DEFAULT_SOURCE - -+#ifndef IPV6_ADD_MEMBERSHIP -+#define IPV6_ADD_MEMBERSHIP 20 -+#endif -+ - #include <errno.h> - #include <stdio.h> - #include <netdb.h> diff --git a/package/mtd-utils/patches/patch-nand-utils_nftl_format_c b/package/mtd-utils/patches/patch-nand-utils_nftl_format_c deleted file mode 100644 index ff25489ef..000000000 --- a/package/mtd-utils/patches/patch-nand-utils_nftl_format_c +++ /dev/null @@ -1,10 +0,0 @@ ---- mtd-utils-2.0.0.orig/nand-utils/nftl_format.c 2016-12-14 10:06:35.000000000 +0100 -+++ mtd-utils-2.0.0/nand-utils/nftl_format.c 2017-04-26 08:57:07.000000000 +0200 -@@ -23,6 +23,7 @@ - #define PROGRAM_NAME "nftl_format" - - #define _XOPEN_SOURCE 500 /* for pread/pwrite */ -+#include <sys/types.h> - #include <unistd.h> - #include <stdlib.h> - #include <stdio.h> diff --git a/package/mtd-utils/patches/patch-ubifs-utils_mkfs_ubifs_defs_h b/package/mtd-utils/patches/patch-ubifs-utils_mkfs_ubifs_defs_h deleted file mode 100644 index e3f61b1e7..000000000 --- a/package/mtd-utils/patches/patch-ubifs-utils_mkfs_ubifs_defs_h +++ /dev/null @@ -1,18 +0,0 @@ ---- mtd-utils-2.0.0.orig/ubifs-utils/mkfs.ubifs/defs.h 2016-07-12 14:16:45.000000000 +0200 -+++ mtd-utils-2.0.0/ubifs-utils/mkfs.ubifs/defs.h 2017-04-26 01:55:07.000000000 +0200 -@@ -39,6 +39,7 @@ struct qstr - size_t len; - }; - -+#ifndef __APPLE__ - /** - * fls - find last (most-significant) bit set - * @x: the word to search -@@ -74,6 +75,7 @@ static inline int fls(int x) - } - return r; - } -+#endif - - #define do_div(n,base) ({ \ - int __res; \ diff --git a/package/mtd-utils/src/include/asm/types.h b/package/mtd-utils/src/include/asm/types.h deleted file mode 100644 index 5726d9ef9..000000000 --- a/package/mtd-utils/src/include/asm/types.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) Bernhard Walle <bernhard@bwalle.de>, 2012 - * - * 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 2 of the License, 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; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Comatibility with BSD-like userland. - */ -#ifndef ASM_TYPES_H_ -#define ASM_TYPES_H_ - -#ifdef __linux__ -#include_next <asm/types.h> -#endif - -#endif /* ASM_TYPES_H_ */ - diff --git a/package/mtd-utils/src/include/byteswap.h b/package/mtd-utils/src/include/byteswap.h deleted file mode 100644 index 6f9839f7a..000000000 --- a/package/mtd-utils/src/include/byteswap.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) Bernhard Walle <bernhard@bwalle.de>, 2012 - * - * 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 2 of the License, 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; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Comatibility with BSD-like userland. - */ -#ifndef BYTESWAP_H_ -#define BYTESWAP_H_ - -#ifdef __linux__ -#include_next <byteswap.h> -#else - -#include <stdint.h> - -static inline uint16_t bswap_16(uint16_t value) -{ - return ((value & 0xff00) >> 8) | ((value & 0xff) << 8); -} - -static inline uint32_t bswap_32(uint32_t value) -{ - return ((value & 0xff000000) >> 24) | - ((value & 0x00ff0000) >> 8) | - ((value & 0x0000ff00) << 8) | - ((value & 0x000000ff) << 24); -} - -static inline uint64_t bswap_64(uint64_t value) -{ - return ((value & 0xff00000000000000ull) >> 56) | - ((value & 0x00ff000000000000ull) >> 40) | - ((value & 0x0000ff0000000000ull) >> 24) | - ((value & 0x000000ff00000000ull) >> 8) | - ((value & 0x00000000ff000000ull) << 8) | - ((value & 0x0000000000ff0000ull) << 24) | - ((value & 0x000000000000ff00ull) << 40) | - ((value & 0x00000000000000ffull) << 56); -} - -#endif - -#endif /* BYTESWAP_H_ */ diff --git a/package/mtd-utils/src/include/endian.h b/package/mtd-utils/src/include/endian.h deleted file mode 100644 index 0d72bb888..000000000 --- a/package/mtd-utils/src/include/endian.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) Bernhard Walle <bernhard@bwalle.de>, 2012 - * - * 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 2 of the License, 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; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Comatibility with BSD-like userland. - */ -#ifndef ENDIAN_H_ -#define ENDIAN_H_ - -#ifdef __linux__ -#include_next <endian.h> -#elif __APPLE__ - -#include <machine/endian.h> - -#ifndef __DARWIN_BYTE_ORDER -#error "No __DARWIN_BYTE_ORDER defined" -#endif - -#define __BYTE_ORDER __DARWIN_BYTE_ORDER -#define __LITTLE_ENDIAN __DARWIN_LITTLE_ENDIAN -#define __BIG_ENDIAN __DARWIN_BIG_ENDIAN - -#else -#error "No byteswap.h found" -#endif - -#endif /* ENDIAN_H_ */ diff --git a/package/mtd-utils/src/include/linux/fs.h b/package/mtd-utils/src/include/linux/fs.h deleted file mode 100644 index b28168d37..000000000 --- a/package/mtd-utils/src/include/linux/fs.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) Bernhard Walle <bernhard@bwalle.de>, 2012 - * - * 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 2 of the License, 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; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Comatibility with BSD-like userland. - */ -#ifndef LINUX_FS_H_ -#define LINUX_FS_H_ - -#ifdef __linux__ -#include_next <linux/fs.h> -#else - -#define FS_IOC_GETFLAGS _IOR('f', 1, long) -#define FS_IOC_SETFLAGS _IOW('f', 2, long) -#define FS_IOC_GETVERSION _IOR('v', 1, long) -#define FS_IOC_SETVERSION _IOW('v', 2, long) -#define FS_IOC_FIEMAP _IOWR('f', 11, struct fiemap) -#define FS_IOC32_GETFLAGS _IOR('f', 1, int) -#define FS_IOC32_SETFLAGS _IOW('f', 2, int) -#define FS_IOC32_GETVERSION _IOR('v', 1, int) -#define FS_IOC32_SETVERSION _IOW('v', 2, int) - -/* - * Inode flags (FS_IOC_GETFLAGS / FS_IOC_SETFLAGS) - */ -#define FS_SECRM_FL 0x00000001 /* Secure deletion */ -#define FS_UNRM_FL 0x00000002 /* Undelete */ -#define FS_COMPR_FL 0x00000004 /* Compress file */ -#define FS_SYNC_FL 0x00000008 /* Synchronous updates */ -#define FS_IMMUTABLE_FL 0x00000010 /* Immutable file */ -#define FS_APPEND_FL 0x00000020 /* writes to file may only append */ -#define FS_NODUMP_FL 0x00000040 /* do not dump file */ -#define FS_NOATIME_FL 0x00000080 /* do not update atime */ -/* Reserved for compression usage... */ -#define FS_DIRTY_FL 0x00000100 -#define FS_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */ -#define FS_NOCOMP_FL 0x00000400 /* Don't compress */ -#define FS_ECOMPR_FL 0x00000800 /* Compression error */ -/* End compression flags --- maybe not all used */ -#define FS_BTREE_FL 0x00001000 /* btree format dir */ -#define FS_INDEX_FL 0x00001000 /* hash-indexed directory */ -#define FS_IMAGIC_FL 0x00002000 /* AFS directory */ -#define FS_JOURNAL_DATA_FL 0x00004000 /* Reserved for ext3 */ -#define FS_NOTAIL_FL 0x00008000 /* file tail should not be merged */ -#define FS_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */ -#define FS_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/ -#define FS_EXTENT_FL 0x00080000 /* Extents */ -#define FS_DIRECTIO_FL 0x00100000 /* Use direct i/o */ -#define FS_NOCOW_FL 0x00800000 /* Do not cow file */ -#define FS_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ - -#define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ -#define FS_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ - -#endif - -#endif /* LINUX_FS_H_ */ diff --git a/package/mtd-utils/src/include/linux/stddef.h b/package/mtd-utils/src/include/linux/stddef.h deleted file mode 100644 index 492cf6173..000000000 --- a/package/mtd-utils/src/include/linux/stddef.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) Bernhard Walle <bernhard@bwalle.de>, 2012 - * - * 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 2 of the License, 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; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Comatibility with BSD-like userland. - */ -#ifndef LINUX_STDDEF_H_ -#define LINUX_STDDEF_H_ - -#ifdef __linux__ -#include_next <linux/stddef.h> -#endif - -#endif /* LINUX_STDDEF_H_ */ diff --git a/package/mtd-utils/src/include/linux/types.h b/package/mtd-utils/src/include/linux/types.h deleted file mode 100644 index 8de4c8a58..000000000 --- a/package/mtd-utils/src/include/linux/types.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) Bernhard Walle <bernhard@bwalle.de>, 2012 - * - * 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 2 of the License, 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; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Comatibility with BSD-like userland. - */ -#ifndef LINUX_TYPES_H_ -#define LINUX_TYPES_H_ - -#ifdef __linux__ -#include_next <linux/types.h> -#else - -#include <stdint.h> /* get uint8_t etc. */ -#include <sys/types.h> /* get u_long etc. */ - -/* This types are provided to Linux userland */ - -typedef uint8_t __u8; -typedef uint16_t __u16; -typedef uint32_t __u32; -typedef uint64_t __u64; - -typedef int8_t __s8; -typedef int16_t __s16; -typedef int32_t __s32; -typedef int64_t __s64; - -/* - * The type itself has no endianess. It's only used for code checkers - * but we don't need to run that checkers on non-Linux OSes - */ -typedef __u16 __le16; -typedef __u16 __be16; -typedef __u32 __le32; -typedef __u32 __be32; -typedef __u64 __le64; -typedef __u64 __be64; - -/* from /usr/include/asm-generic/posix_types.h on Linux */ -typedef long __kernel_off_t; -typedef long long __kernel_loff_t; - -typedef long long loff_t; -typedef long long off64_t; - -#endif - -#endif /* LINUX_TYPES_H_ */ diff --git a/package/mtd-utils/src/include/os-compat.h b/package/mtd-utils/src/include/os-compat.h deleted file mode 100644 index 0982bfad7..000000000 --- a/package/mtd-utils/src/include/os-compat.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) Bernhard Walle <bernhard@bwalle.de>, 2012 - * - * 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 2 of the License, 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; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Comatibility with BSD-like userland. - */ -#ifndef OS_COMPAT_H_ -#define OS_COMPAT_H_ - -#ifdef __APPLE__ - -/* off_t is already 64 bits wide, even on i386 */ -#define O_LARGEFILE 0 -#define lseek64(fd, offset, whence) lseek((fd), (offset), (whence)) - -#endif /* __APPLE__ */ - -#endif /* OS_COMPAT_H_ */ diff --git a/package/mtools/Makefile b/package/mtools/Makefile index 2072e88d7..cbf4acb97 100644 --- a/package/mtools/Makefile +++ b/package/mtools/Makefile @@ -20,10 +20,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,MTOOLS,mtools,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,MTOOLS,mtools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(OS_FOR_BUILD),Darwin) -HOST_LDFLAGS+= -liconv -endif - CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes mtools-install: diff --git a/package/mutt/Makefile b/package/mutt/Makefile index a8578b6ad..25fb74dd7 100644 --- a/package/mutt/Makefile +++ b/package/mutt/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mutt -PKG_VERSION:= 2.2.12 +PKG_VERSION:= 2.2.15 PKG_RELEASE:= 1 -PKG_HASH:= 043af312f64b8e56f7fd0bf77f84a205d4c498030bd9586457665c47bb18ce38 +PKG_HASH:= a51686104e4203f4c2a3b176527be3b95d08e808e94fd2dcadb7c30566bf894d PKG_DESCR:= mail client for console PKG_SECTION:= net/mail PKG_DEPENDS:= libncurses @@ -14,7 +14,10 @@ PKG_BUILDDEP:= ncurses PKG_URL:= http://www.mutt.org/ PKG_SITES:= ftp://ftp.mutt.org/pub/mutt/ -PKG_CHOICES_MUTT:= WITH_LIBRESSL WITHOUT_SSL +PKG_CHOICES_MUTT:= WITH_OPENSSL WITH_LIBRESSL WITHOUT_SSL +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCB_WITH_OPENSSL:= openssl +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCB_WITH_LIBRESSL:= libressl PKGCS_WITH_LIBRESSL:= libressl ca-certificates @@ -31,6 +34,7 @@ CONFIGURE_ARGS+= --with-homespool="~/Maildir" \ --with-curses="$(STAGING_TARGET_DIR)/usr" \ --enable-pop \ --enable-imap \ + --enable-smtp \ --disable-doc ifeq ($(ADK_PACKAGE_MUTT_WITHOUT_SSL),y) diff --git a/package/ndisc6/patches/patch-src_traceroute_h b/package/ndisc6/patches/patch-src_traceroute_h index d47efc0c3..1571df884 100644 --- a/package/ndisc6/patches/patch-src_traceroute_h +++ b/package/ndisc6/patches/patch-src_traceroute_h @@ -8,9 +8,9 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -typedef ssize_t (*trace_parser_t) (const void *restrict data, size_t len, - int *restrict ttl, - unsigned *restrict n, uint16_t port); -+typedef ssize_t (*trace_parser_t) (const data, size_t len, -+ int ttl, -+ unsigned n, uint16_t port); ++typedef ssize_t (*trace_parser_t) (const void *data, size_t len, ++ int *ttl, ++ unsigned *n, uint16_t port); typedef struct tracetype { diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 58188d011..748d6ac6d 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf PKG_DESCR:= snmp agent PKG_SECTION:= net/misc -PKG_DEPENDS:= libnetsnmp libelf libnl -PKG_BUILDDEP:= libelf libnl +PKG_DEPENDS:= libnetsnmp elfutils libnl +PKG_BUILDDEP:= elfutils libnl PKG_URL:= http://www.net-snmp.org/ PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=net-snmp/) PKG_NOPARALLEL:= 1 @@ -21,9 +21,9 @@ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SUBPKGS:= SNMPD SNMP_UTILS LIBNETSNMP PKGSD_SNMP_UTILS:= snmp utilities -PKGSS_SNMP_UTILS:= libnetsnmp libelf +PKGSS_SNMP_UTILS:= libnetsnmp elfutils PKGSD_LIBNETSNMP:= snmp library -PKGSS_LIBNETSNMP:= libelf +PKGSS_LIBNETSNMP:= elfutils PKGSC_LIBNETSNMP:= libs/net PKG_FLAVOURS_SNMPD:= WITH_IPV6 diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index d2bdba4ba..18e0ecb29 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -4,14 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= nfs-utils -PKG_VERSION:= 2.6.4 +PKG_VERSION:= 2.8.3 PKG_RELEASE:= 1 -PKG_HASH:= c0ae376ac056011ed0954deba2362d7d8193c653b500b68a543aec512cd2ecfa +PKG_HASH:= de433cb673180ab4276430e036f785a3f401b66d2c5d7caad4b867c3cdbc1311 PKG_DESCR:= network filesystem utilities PKG_SECTION:= net/fs PKG_DEPENDS:= keyutils libtirpc rpcbind libmount libuuid libevent sqlite -PKG_DEPENDS+= libncurses libblkid -PKG_BUILDDEP:= keyutils libtirpc util-linux libevent sqlite ncurses +PKG_DEPENDS+= libncurses libblkid libxml2 libnl libreadline +PKG_BUILDDEP:= keyutils libtirpc util-linux libevent sqlite ncurses libxml2 +PKG_BUILDDEP:= libnl readline PKG_KDEPENDS:= nfs-fs PKG_NEEDS:= threads PKG_URL:= http://sourceforge.net/projects/nfs @@ -40,6 +41,8 @@ $(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE},${P $(eval $(call PKG_template,NFS_UTILS_CLIENT,nfs-utils-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_CLIENT},${PKGSD_NFS_UTILS_CLIENT},${PKG_SECTION})) $(eval $(call PKG_template,NFS_UTILS_SERVER,nfs-utils-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_SERVER},${PKGSD_NFS_UTILS_SERVER},${PKG_SECTION})) +TARGET_LDFLAGS+= -ltinfo + AUTOTOOL_STYLE:= autoreconf ifeq ($(ADK_PACKAGE_NFS_UTILS_V4),y) CONFIGURE_ARGS+= --enable-nfsv4 \ diff --git a/package/nghttp2/Makefile b/package/nghttp2/Makefile new file mode 100644 index 000000000..88e9256e4 --- /dev/null +++ b/package/nghttp2/Makefile @@ -0,0 +1,24 @@ +# 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:= nghttp2 +PKG_VERSION:= 1.67.1 +PKG_RELEASE:= 1 +PKG_HASH:= 153972aad57e7bf9d911666df7613f2390acf37ea7e1a97a0c5567e90f98e830 +PKG_DESCR:= http2 library +PKG_SECTION:= libs/misc +PKG_SITES:= https://github.com/nghttp2/nghttp2/releases/download/v$(PKG_VERSION)/ +PKG_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,NGHTTP2,nghttp2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +nghttp2-install: + $(INSTALL_DIR) $(IDIR_NGHTTP2)/usr/lib + $(CP) $(WRKINST)/usr/lib/libnghttp2*.so* \ + $(IDIR_NGHTTP2)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/nginx/Makefile b/package/nginx/Makefile index 6a13c1277..803371016 100644 --- a/package/nginx/Makefile +++ b/package/nginx/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= nginx -PKG_VERSION:= 1.25.3 +PKG_VERSION:= 1.26.1 PKG_RELEASE:= 1 -PKG_HASH:= 64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86 +PKG_HASH:= f9187468ff2eb159260bfd53867c25ff8e334726237acf227b9e870e53d3e36b PKG_DESCR:= powerful http reverse proxy and webserver PKG_SECTION:= net/http PKG_BUILDDEP:= pcre zlib @@ -58,7 +58,7 @@ ALL_TARGET:= nginx-install: $(INSTALL_DIR) $(IDIR_NGINX)/usr/sbin $(IDIR_NGINX)/etc/nginx - $(INSTALL_BIN) $(WRKINST)/usr/sbin/nginx \ + $(INSTALL_BIN) $(WRKBUILD)/objs/nginx \ $(IDIR_NGINX)/usr/sbin for f in nginx.conf mime.types fastcgi_params koi-utf koi-win win-utf; do \ cp ./files/$${f} \ diff --git a/package/nginx/patches/patch-auto_install b/package/nginx/patches/patch-auto_install deleted file mode 100644 index 0c9f06568..000000000 --- a/package/nginx/patches/patch-auto_install +++ /dev/null @@ -1,16 +0,0 @@ ---- nginx-1.9.13.orig/auto/install 2016-03-29 17:09:30.000000000 +0200 -+++ nginx-1.9.13/auto/install 2016-04-01 23:45:09.250318293 +0200 -@@ -107,11 +107,8 @@ $NGX_OBJS/nginx.8: $NGX_MAN $NGX_AUTO_CO - install: build $NGX_INSTALL_PERL_MODULES - test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX' - -- test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \\ -- || mkdir -p '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' -- test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' \\ -- || mv '\$(DESTDIR)$NGX_SBIN_PATH' \\ -- '\$(DESTDIR)$NGX_SBIN_PATH.old' -+ test -d '\$(DESTDIR)$NGX_SBIN_PATH' \\ -+ || mkdir -p '\$(DESTDIR)$NGX_SBIN_PATH' - cp $NGX_OBJS/nginx '\$(DESTDIR)$NGX_SBIN_PATH' - - test -d '\$(DESTDIR)$NGX_CONF_PREFIX' \\ diff --git a/package/nginx/patches/patch-auto_os_linux b/package/nginx/patches/patch-auto_os_linux deleted file mode 100644 index 0e33cb195..000000000 --- a/package/nginx/patches/patch-auto_os_linux +++ /dev/null @@ -1,59 +0,0 @@ ---- nginx-1.21.3.orig/auto/os/linux 2021-09-07 17:21:03.000000000 +0200 -+++ nginx-1.21.3/auto/os/linux 2021-10-29 14:50:09.089546624 +0200 -@@ -36,7 +36,7 @@ fi - - ngx_feature="epoll" - ngx_feature_name="NGX_HAVE_EPOLL" --ngx_feature_run=yes -+ngx_feature_run=no - ngx_feature_incs="#include <sys/epoll.h>" - ngx_feature_path= - ngx_feature_libs= -@@ -135,7 +135,7 @@ ngx_feature_test="int fd; struct stat sb - CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE" - ngx_feature="sendfile()" - ngx_feature_name="NGX_HAVE_SENDFILE" --ngx_feature_run=yes -+ngx_feature_run=no - ngx_feature_incs="#include <sys/sendfile.h> - #include <errno.h>" - ngx_feature_path= -@@ -156,7 +156,7 @@ fi - CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" - ngx_feature="sendfile64()" - ngx_feature_name="NGX_HAVE_SENDFILE64" --ngx_feature_run=yes -+ngx_feature_run=no - ngx_feature_incs="#include <sys/sendfile.h> - #include <errno.h>" - ngx_feature_path= -@@ -174,7 +174,7 @@ ngx_include="sys/prctl.h"; . auto/includ - - ngx_feature="prctl(PR_SET_DUMPABLE)" - ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE" --ngx_feature_run=yes -+ngx_feature_run=no - ngx_feature_incs="#include <sys/prctl.h>" - ngx_feature_path= - ngx_feature_libs= -@@ -215,20 +215,6 @@ ngx_feature_test="struct __user_cap_data - (void) SYS_capset" - . auto/feature - -- --# crypt_r() -- --ngx_feature="crypt_r()" --ngx_feature_name="NGX_HAVE_GNU_CRYPT_R" --ngx_feature_run=no --ngx_feature_incs="#include <crypt.h>" --ngx_feature_path= --ngx_feature_libs=-lcrypt --ngx_feature_test="struct crypt_data cd; -- crypt_r(\"key\", \"salt\", &cd);" --. auto/feature -- -- - ngx_include="sys/vfs.h"; . auto/include - - diff --git a/package/ngrep/Makefile b/package/ngrep/Makefile deleted file mode 100644 index 606b9a0b6..000000000 --- a/package/ngrep/Makefile +++ /dev/null @@ -1,31 +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:= ngrep -PKG_VERSION:= 1.45 -PKG_RELEASE:= 1 -PKG_HASH:= aea6dd337da8781847c75b3b5b876e4de9c58520e0d77310679a979fc6402fa7 -PKG_DESCR:= network grep -PKG_SECTION:= net/debug -PKG_DEPENDS:= libpcap libpcre -PKG_BUILDDEP:= libpcap pcre -PKG_URL:= http://ngrep.sourceforge.net/ -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ngrep/} - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,NGREP,ngrep,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -CONFIGURE_ARGS+= --disable-pcap-restart \ - --with-pcap-includes=$(STAGING_TARGET_DIR)/usr/include - -ngrep-install: - $(INSTALL_DIR) $(IDIR_NGREP)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/ngrep \ - $(IDIR_NGREP)/usr/bin - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/ngrep/patches/patch-Makefile_in b/package/ngrep/patches/patch-Makefile_in deleted file mode 100644 index 40659bb8d..000000000 --- a/package/ngrep/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- ngrep-1.45.orig/Makefile.in 2006-11-28 14:35:37.000000000 +0100 -+++ ngrep-1.45/Makefile.in 2016-02-08 06:24:48.000000000 +0100 -@@ -63,7 +63,7 @@ distclean: clean - rm -f config.status config.cache config.log config.h Makefile - - $(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h -- $(MAKE) $(MAKEFLAGS) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS)) -+ $(MAKE) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS)) - - $(OBJS): Makefile ngrep.c ngrep.h - diff --git a/package/ngrep/patches/patch-regex-0_12_Makefile_in b/package/ngrep/patches/patch-regex-0_12_Makefile_in deleted file mode 100644 index c0873516f..000000000 --- a/package/ngrep/patches/patch-regex-0_12_Makefile_in +++ /dev/null @@ -1,19 +0,0 @@ ---- ngrep-1.45.orig/regex-0.12/Makefile.in 2006-11-15 02:34:43.000000000 +0100 -+++ ngrep-1.45/regex-0.12/Makefile.in 2016-02-08 06:28:44.000000000 +0100 -@@ -26,13 +26,13 @@ version = 0.12 - # -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to - # the corresponding C procedures). If not -DDEBUG, the macros - # are used. --CPPFLAGS = -+CPPFLAGS ?= - - # Likewise, you can override CFLAGS to optimize, use -Wall, etc. --CFLAGS = -g -+CFLAGS ?= -g - - # Ditto for LDFLAGS and LOADLIBES. --LDFLAGS = -+LDFLAGS ?= - LOADLIBES = - - srcdir = @srcdir@ diff --git a/package/ngrep/patches/patch-regex-0_12_regex_c b/package/ngrep/patches/patch-regex-0_12_regex_c deleted file mode 100644 index 417504e0a..000000000 --- a/package/ngrep/patches/patch-regex-0_12_regex_c +++ /dev/null @@ -1,13 +0,0 @@ ---- ngrep-1.45.orig/regex-0.12/regex.c 2006-11-15 04:36:48.000000000 +0100 -+++ ngrep-1.45/regex-0.12/regex.c 2016-02-08 06:29:15.000000000 +0100 -@@ -39,10 +39,6 @@ - /* We need this for `regex.h', and perhaps for the Emacs include files. */ - #include <sys/types.h> - --#ifdef HAVE_CONFIG_H --#include "config.h" --#endif -- - /* The `emacs' switch turns on certain matching commands - that make sense only in Emacs. */ - #ifdef emacs diff --git a/package/ninja/Makefile b/package/ninja/Makefile index 2ab4e6df1..2eab0b4dc 100644 --- a/package/ninja/Makefile +++ b/package/ninja/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ninja -PKG_VERSION:= 1.8.2 -PKG_RELEASE:= 2 -PKG_HASH:= 86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4 +PKG_VERSION:= 1.13.1 +PKG_RELEASE:= 1 +PKG_HASH:= f0055ad0369bf2e372955ba55128d000cfcc21777057806015b45e4accbebf23 PKG_DESCR:= build utility PKG_SECTION:= dev/tools HOST_BUILDDEP:= python3-host diff --git a/package/ninja/patches/patch-configure_py b/package/ninja/patches/patch-configure_py deleted file mode 100644 index cb743c891..000000000 --- a/package/ninja/patches/patch-configure_py +++ /dev/null @@ -1,8 +0,0 @@ ---- ninja-1.8.2.orig/configure.py 2017-09-11 03:20:10.000000000 +0200 -+++ ninja-1.8.2/configure.py 2021-09-21 11:39:51.729841404 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Copyright 2001 Google Inc. All Rights Reserved. - # diff --git a/package/nmap/Makefile b/package/nmap/Makefile index d8164a379..fde000967 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= nmap -PKG_VERSION:= 7.92 +PKG_VERSION:= 7.95 PKG_RELEASE:= 1 -PKG_HASH:= a5479f2f8a6b0b2516767d2f7189c386c1dc858d997167d7ec5cfc798c7571a1 +PKG_HASH:= e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778 PKG_DESCR:= utility for network exploration or security auditing PKG_SECTION:= net/security -PKG_DEPENDS:= libdnet libpcap libpcre zlib -PKG_BUILDDEP:= libdnet libpcap pcre zlib +PKG_DEPENDS:= libdnet libpcap libpcre2 zlib +PKG_BUILDDEP:= libdnet libpcap pcre2 zlib PKG_NEEDS:= c++ PKG_URL:= http://nmap.org/ PKG_SITES:= http://download.insecure.org/nmap/dist/ diff --git a/package/nmap/patches/patch-liblinear_Makefile b/package/nmap/patches/patch-liblinear_Makefile deleted file mode 100644 index fdb24470d..000000000 --- a/package/nmap/patches/patch-liblinear_Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- nmap-6.40.orig/liblinear/Makefile 2011-09-23 23:15:09.000000000 +0200 -+++ nmap-6.40/liblinear/Makefile 2014-02-11 19:38:23.000000000 +0100 -@@ -1,10 +1,10 @@ - CXX ?= g++ - CC ?= gcc --CFLAGS = -Wall -Wconversion -O3 -fPIC -+CFLAGS ?= -Wall -Wconversion -O3 -fPIC - LIBS = blas/blas.a - SHVER = 1 --AR = ar --RANLIB = ranlib -+AR ?= ar -+RANLIB ?= ranlib - #LIBS = -lblas - - all: train predict diff --git a/package/nss/Makefile b/package/nss/Makefile index 1fe6b2b31..a340e0cc8 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -17,8 +17,6 @@ PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/ PKG_SITES:= https://ftp.mozilla.org/pub/security/nss/releases/NSS_${PKG_MAJ_VERSION}_${PKG_MIN_VERSION}_RTM/src/ PKG_NOPARALLEL:= 1 -PKG_HOST_DEPENDS:= !cygwin - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz WRKSRC= ${WRKDIST}/nss diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile deleted file mode 100644 index d757ba965..000000000 --- a/package/openjdk7/Makefile +++ /dev/null @@ -1,163 +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:= openjdk7 -PKG_VERSION:= 2.6.9 -PKG_RELEASE:= 1 -PKG_HASH:= 8e4f3eb8d41ef66f1797825343141046973c124b18bf7d4698fae0a9a25495ea -PKG_DESCR:= java virtual machine -PKG_SECTION:= dev/lang -PKG_BUILDDEP:= openjdk7-host alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups -PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst -PKG_BUILDDEP+= libpng giflib libgtk2 glib fontconfig nss gconf ncurses -HOST_BUILDDEP:= fastjar-host gcj-host ecj-host unzip-host ant-host libXcomposite-host -HOST_BUILDDEP+= libXtst-host libXt-host libXinerama-host libXrender-host -HOST_BUILDDEP+= cups-host qemu-host alsa-lib-host freetype-host libxslt-host -PKG_DEPENDS:= zlib libffi libxtst libxi cups gconf -PKG_DEPENDS+= libfreetype libxrender libx11 libxext nss libjpeg-turbo -PKG_DEPENDS+= libpng giflib libgtk2 glib fontconfig libncurses -PKG_NEEDS:= threads c++ -PKG_URL:= http://openjdk.org/ -PKG_SITES:= http://icedtea.classpath.org/download/source/ - -DISTFILES:= icedtea-$(PKG_VERSION).tar.xz -WRKDIST= ${WRKDIR}/icedtea-${PKG_VERSION} - -GCJ_VER:= 5.4.0 - -PKG_HOST_DEPENDS:= linux -PKG_ARCH_DEPENDS:= arm mips ppc x86 x86_64 - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk -include $(ADK_TOPDIR)/mk/qemu.mk - -$(eval $(call HOST_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE})) -$(eval $(call PKG_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= basic - -# uclibc with iconv-tiny/libiconv needs -liconv -ifeq ($(ADK_TARGET_LIBC_ICONV),) -ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y) -TARGET_LIBS:= -liconv -lm -endif -endif - -# for UINTPTR_MAX in stdint.h -TARGET_CFLAGS+= -D__STDC_LIMIT_MACROS -# segfaults with march=pentium-m/atom -TARGET_CFLAGS:= $(subst march=pentium-m,march=i686,$(TARGET_CFLAGS)) -TARGET_CFLAGS:= $(subst march=atom,march=i686,$(TARGET_CFLAGS)) - -BOOTSTRAPJDK:= ${STAGING_HOST_DIR}/bootstrap-jdk - -JDKARCH:= $(ADK_TARGET_CPU_ARCH) -ifeq ($(ADK_TARGET_ARCH),x86) -JDKARCH:= i386 -endif -ifeq ($(ADK_TARGET_CPU_ARCH),x86_64) -JDKARCH:= amd64 -endif - -CONFIGURE_ARGS:= --enable-zero \ - --disable-docs \ - --with-jdk-home=$(BOOTSTRAPJDK) \ - --with-java=$(BOOTSTRAPJDK)/bin/java \ - --with-javac=$(BOOTSTRAPJDK)/bin/javac \ - --with-javah=$(BOOTSTRAPJDK)/bin/javah \ - --with-jar=$(BOOTSTRAPJDK)/bin/jar \ - --with-rmic=$(BOOTSTRAPJDK)/bin/rmic \ - --with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \ - --without-gcj \ - --without-hotspot-build \ - --enable-nss \ - --enable-system-zlib \ - --enable-system-jpeg \ - --enable-system-png \ - --enable-system-gif \ - --enable-system-gtk \ - --enable-system-gio \ - --enable-system-fontconfig \ - --enable-system-gconf \ - --disable-system-sctp \ - --disable-system-pcsc \ - --disable-system-lcms \ - --disable-system-kerberos \ - --disable-compile-against-syscalls \ - --without-rhino \ - --disable-bootstrap - -CONFIGURE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib -MAKE_ENV+= ALT_COMPILER_PATH=$(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME)/bin \ - ALT_OPENWIN_HOME=$(STAGING_TARGET_DIR)/usr/ \ - ALT_CUPS_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \ - ALT_FREETYPE_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \ - OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ - OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ - OTHER_LDFLAGS='$(TARGET_LDFLAGS)' \ - OTHER_LDLIBS='$(TARGET_LIBS)' \ - NO_DOCS=true \ - CROSS_COMPILE_ARCH=$(JDKARCH) QEMU=$(QEMU) \ - LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib - -ALL_TARGET:= icedtea - -# host stuff -OPENJDK_NATIVE_ENV:= JAVACFLAGS="-cp ${STAGING_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar" \ - NO_DOCS=true \ - LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \ - BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" \ - OTHER_CPPFLAGS='$(HOST_CPPFLAGS)' \ - OTHER_LDFLAGS='$(HOST_LDFLAGS)' \ - ALSA_CPPFLAGS='$(HOST_CPPFLAGS)' \ - LIBFFI_CFLAGS='-I$(STAGING_HOST_DIR)/usr/include -L$(STAGING_HOST_DIR)/usr/lib' \ - ALT_OPENWIN_HOME='$(STAGING_HOST_DIR)/usr' \ - ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \ - ALT_FREETYPE_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \ - ALT_FREETYPE_LIB_PATH="$(STAGING_HOST_DIR)/usr/lib" - -HOST_CONFIGURE_ENV+= $(OPENJDK_NATIVE_ENV) -HOST_MAKE_ENV+= $(OPENJDK_NATIVE_ENV) -HOST_ALL_TARGET:= icedtea-boot -HOST_CONFIGURE_ARGS+= --enable-bootstrap \ - --enable-zero \ - --with-jdk-home=$(STAGING_HOST_DIR)/usr/lib/jvm \ - --with-java=$(STAGING_HOST_DIR)/usr/bin/hostjava \ - --with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \ - --with-ecj-jar=${DL_DIR}/ecj-4.9.jar \ - --without-hotspot-build \ - --disable-system-zlib \ - --disable-system-jpeg \ - --disable-system-lcms \ - --disable-system-png \ - --disable-system-gif \ - --disable-system-gtk \ - --disable-system-gio \ - --disable-system-kerberos \ - --disable-system-fontconfig \ - --disable-system-gconf \ - --disable-system-pcsc \ - --disable-system-sctp \ - --disable-compile-against-syscalls \ - --without-rhino \ - --enable-systemtap=no \ - --disable-docs - -hostpost-install: - -rm -rf $(STAGING_HOST_DIR)/bootstrap-jdk - $(CP) $(WRKBUILD)/openjdk.build-boot/j2sdk-image $(STAGING_HOST_DIR)/bootstrap-jdk - -openjdk7-install: - $(INSTALL_DIR) $(IDIR_OPENJDK7)/usr/lib/jvm/jre - $(INSTALL_DIR) $(IDIR_OPENJDK7)/usr/bin - $(CP) $(WRKBUILD)/openjdk.build/j2re-image/bin $(IDIR_OPENJDK7)/usr/lib/jvm/jre - $(CP) $(WRKBUILD)/openjdk.build/j2re-image/lib $(IDIR_OPENJDK7)/usr/lib/jvm/jre - (cd $(IDIR_OPENJDK7)/usr/bin && ln -sf ../lib/jvm/jre/bin/java .) - (cd $(IDIR_OPENJDK7)/usr/lib/jvm/jre/lib/$(JDKARCH) && ln -sf server/libjvm.so .) - $(CP) ./files/nss.cfg $(IDIR_OPENJDK7)/usr/lib/jvm/jre/lib/security - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openjdk7/files/nss.cfg b/package/openjdk7/files/nss.cfg deleted file mode 100644 index e0685918b..000000000 --- a/package/openjdk7/files/nss.cfg +++ /dev/null @@ -1,5 +0,0 @@ -name = NSS -nssLibraryDirectory = /usr/lib -nssDbMode = noDb -attributes = compatibility -handleStartupErrors = ignoreMultipleInitialisation diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch deleted file mode 100644 index 276f1fc79..000000000 --- a/package/openjdk7/patches/openadk.patch +++ /dev/null @@ -1,896 +0,0 @@ -diff -Nur icedtea-2.6.9.orig/Makefile.in icedtea-2.6.9/Makefile.in ---- icedtea-2.6.9.orig/Makefile.in 2017-02-14 01:37:03.478827012 +0100 -+++ icedtea-2.6.9/Makefile.in 2017-04-02 07:50:37.977789464 +0200 -@@ -647,7 +647,6 @@ - STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot - STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea - JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot --CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/test/cryptocheck.build - ECC_CHECK_BUILD_DIR = $(abs_top_builddir)/ecccheck.build - MIME_TYPE_CHECK_BUILD_DIR = $(abs_top_builddir)/test/mimetypecheck.build - STAGE1_BOOT_RUNTIME = $(STAGE1_BOOT_DIR)/jre/lib/rt.jar -@@ -791,7 +790,7 @@ - $(am__append_14) $(DISTRIBUTION_PATCHES) - - # Bootstrapping patches --ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \ -+ICEDTEA_BOOT_PATCHES = patches/openadk.patch patches/boot/javafiles.patch \ - patches/boot/corba-idlj.patch patches/boot/corba-no-gen.patch \ - patches/boot/corba-orb.patch patches/boot/demos.patch \ - patches/boot/fphexconstants.patch \ -@@ -1512,7 +1511,7 @@ - clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \ - clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \ - clean-add-systemtap clean-add-systemtap-debug clean-add-nss clean-add-tzdata-support \ -- clean-add-tzdata-support-debug clean-cryptocheck clean-policytool-@JAVA_VER@.desktop \ -+ clean-add-tzdata-support-debug clean-policytool-@JAVA_VER@.desktop \ - clean-jconsole-@JAVA_VER@.desktop clean-ecccheck clean-mimetypecheck - if [ -e bootstrap ]; then \ - rmdir bootstrap ; \ -@@ -1545,8 +1544,7 @@ - clean-add-systemtap-debug clean-add-systemtap-boot \ - clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \ - clean-add-tzdata-support-boot clean-check-mimetype clean-mimetypecheck \ -- clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \ -- clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \ -+ clean-add-archive clean-add-archive-debug clean-add-archive-boot \ - clean-download-hotspot clean-download-corba clean-download-jaxp \ - clean-download-jaxws clean-download-langtools clean-download-jdk clean-download-openjdk \ - clean-extract-corba clean-extract-jaxp clean-extract-jaxws clean-extract-jdk \ -@@ -2533,16 +2531,6 @@ - fi - rm -f stamps/add-tzdata-support.stamp - --stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp -- if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \ -- $(BUILD_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ -- fi -- mkdir -p stamps -- touch $@ -- --clean-check-crypto: -- rm -f stamps/check-crypto.stamp -- - stamps/add-archive.stamp: stamps/icedtea.stamp - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \ - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \ -@@ -2657,16 +2645,6 @@ - fi - rm -f stamps/add-tzdata-support-debug.stamp - --stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp -- if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \ -- $(BUILD_DEBUG_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ -- fi -- mkdir -p stamps -- touch $@ -- --clean-check-crypto-debug: -- rm -f stamps/check-crypto-debug.stamp -- - stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \ - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \ -@@ -2711,24 +2689,24 @@ - - stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \ - stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \ -- stamps/add-tzdata-support.stamp stamps/check-crypto.stamp stamps/add-archive.stamp \ -+ stamps/add-tzdata-support.stamp stamps/add-archive.stamp \ - stamps/split-debuginfo.stamp stamps/add-mime-types-file.stamp - mkdir -p stamps - touch $@ - --clean-icedtea-stage2: clean-add-jamvm clean-check-crypto clean-add-archive clean-split-debuginfo \ -+clean-icedtea-stage2: clean-add-jamvm clean-add-archive clean-split-debuginfo \ - clean-add-mime-types-file - rm -f stamps/icedtea-stage2.stamp - - stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \ - stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \ - stamps/add-systemtap-debug.stamp stamps/add-tzdata-support-debug.stamp \ -- stamps/check-crypto-debug.stamp stamps/add-archive-debug.stamp stamps/split-debuginfo-debug.stamp \ -+ stamps/add-archive-debug.stamp stamps/split-debuginfo-debug.stamp \ - stamps/add-mime-types-file-debug.stamp - mkdir -p stamps - touch $@ - --clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-check-crypto-debug \ -+clean-icedtea-debug-stage2: clean-add-jamvm-debug \ - clean-add-archive-debug clean-split-debuginfo-debug clean-add-mime-types-file-debug - rm -f stamps/icedtea-debug-stage2.stamp - -@@ -2799,16 +2777,6 @@ - fi - rm -f stamps/add-tzdata-support-boot.stamp - --stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-boot.stamp -- if [ -e $(BUILD_BOOT_SDK_DIR)/bin/java ] ; then \ -- $(BUILD_BOOT_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ -- fi -- mkdir -p stamps -- touch $@ -- --clean-check-crypto-boot: -- rm -f stamps/check-crypto-boot.stamp -- - stamps/add-archive-boot.stamp: stamps/icedtea-boot.stamp - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if [ -e $(BUILD_BOOT_SDK_DIR)/bin/java ] ; then \ - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \ -@@ -2853,13 +2821,13 @@ - - stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp \ - stamps/add-systemtap-boot.stamp stamps/add-tzdata-support-boot.stamp \ -- stamps/check-crypto-boot.stamp stamps/add-archive-boot.stamp \ -+ stamps/add-archive-boot.stamp \ - stamps/split-debuginfo-boot.stamp stamps/add-mime-types-file-boot.stamp - mkdir -p stamps - touch $@ - - clean-icedtea-stage1: clean-add-systemtap-boot clean-add-tzdata-support-boot \ -- clean-check-crypto-boot clean-add-archive-boot clean-split-debuginfo-boot \ -+ clean-add-archive-boot clean-split-debuginfo-boot \ - clean-add-mime-types-file-boot - rm -f stamps/icedtea-stage1.stamp - -@@ -2940,7 +2908,7 @@ - stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp - @BUILD_JAMVM_TRUE@ cd jamvm/jamvm && \ - @BUILD_JAMVM_TRUE@ ./autogen.sh --with-java-runtime-library=openjdk7 \ --@BUILD_JAMVM_TRUE@ --prefix=$(abs_top_builddir)/jamvm/install ; \ -+@BUILD_JAMVM_TRUE@ --prefix=$(abs_top_builddir)/jamvm/install $(CONFIGURE_ARGS); \ - @BUILD_JAMVM_TRUE@ $(MAKE) ; \ - @BUILD_JAMVM_TRUE@ $(MAKE) install - @BUILD_JAMVM_TRUE@ mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server -@@ -3323,19 +3291,6 @@ - chmod u+w $(STAGE1_BOOT_RUNTIME) ; \ - fi - --# Crypto Level Check -- --stamps/cryptocheck.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) -- mkdir -p $(CRYPTO_CHECK_BUILD_DIR) -- $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ -- -d $(CRYPTO_CHECK_BUILD_DIR) $(CRYPTO_CHECK_SRCS) -- mkdir -p stamps -- touch $@ -- --clean-cryptocheck: -- rm -rf $(CRYPTO_CHECK_BUILD_DIR) -- rm -f stamps/cryptocheck.stamp -- - # Mime Type Check - - stamps/mimetypecheck.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) -@@ -3422,7 +3377,6 @@ - ${mkinstalldirs} $(DESTDIR)${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib - ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/{.,headless,jli,xawt} - ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/ext -- ${mkinstalldirs} $(DESTDIR)${prefix}/tapset - @SPLIT_DEBUGINFO_TRUE@ ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/$(bindir) $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib - @SPLIT_DEBUGINFO_TRUE@ ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR) - @SPLIT_DEBUGINFO_TRUE@ ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli -@@ -3520,9 +3474,6 @@ - for files in $(BUILD_SDK_DIR)/jre/lib/ext/*.jar; do \ - $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib/ext,$(INSTALL_DATA));\ - done -- for files in $(BUILD_SDK_DIR)/tapset/*.stp; do \ -- $(call install_file,$${files},$(DESTDIR)${prefix}/tapset,$(INSTALL_DATA));\ -- done - $(abs_top_builddir)/pax-mark-vm $(DESTDIR)${prefix} false - - install-data-local: -@@ -3687,12 +3638,6 @@ - - cacao: stamps/cacao.stamp - --check-crypto: stamps/check-crypto.stamp -- --check-crypto-boot: stamps/check-crypto-boot.stamp -- --check-crypto-debug: stamps/check-crypto-debug.stamp -- - check-mimetype: stamps/check-mimetype.stamp - - check-ecc: stamps/check-ecc.stamp -@@ -3703,8 +3648,6 @@ - - clone-boot: stamps/clone-boot.stamp - --cryptocheck: stamps/cryptocheck.stamp -- - download: stamps/download.stamp - - download-cacao: stamps/download-cacao.stamp -diff -Nur icedtea-2.6.9.orig/patches/openadk.patch icedtea-2.6.9/patches/openadk.patch ---- icedtea-2.6.9.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea-2.6.9/patches/openadk.patch 2017-04-01 21:44:15.574904720 +0200 -@@ -0,0 +1,688 @@ -+diff -Nur openjdk.orig/corba/make/common/shared/Defs-utils.gmk openjdk/corba/make/common/shared/Defs-utils.gmk -+--- openjdk.orig/corba/make/common/shared/Defs-utils.gmk 2017-02-07 05:06:20.000000000 +0100 -++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2017-04-01 21:43:13.128492754 +0200 -+@@ -136,12 +136,12 @@ -+ TRUE = $(UTILS_COMMAND_PATH)true -+ UNAME = $(UTILS_COMMAND_PATH)uname -+ UNIQ = $(UTILS_USR_BIN_PATH)uniq -+-UNZIP = $(UTILS_USR_BIN_PATH)unzip -+-UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx -++UNZIP = unzip -++UNZIPSFX = unzipsfx -+ WC = $(UTILS_USR_BIN_PATH)wc -+ WHICH = $(UTILS_USR_BIN_PATH)which -+ YACC = $(UTILS_CCS_BIN_PATH)yacc -+-ZIPEXE = $(UTILS_DEVTOOL_PATH)zip -++ZIPEXE = zip -+ -+ # Special cases -+ #RM is defined by GNU Make as 'rm -f' -+diff -Nur openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make -+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2017-02-07 05:06:40.000000000 +0100 -++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2017-04-01 21:43:13.128492754 +0200 -+@@ -77,7 +77,7 @@ -+ VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO)) -+ -+ ifeq ($(TYPE),ZERO) -+-CFLAGS += $(LIBFFI_CFLAGS) -++CFLAGS += $(LIBFFI_CFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic -+ endif -+ ifeq ($(TYPE),SHARK) -+ CFLAGS += $(LIBFFI_CFLAGS) -+diff -Nur openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make -+--- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2017-02-07 05:06:40.000000000 +0100 -++++ openjdk/hotspot/make/linux/makefiles/vm.make 2017-04-01 21:43:13.128492754 +0200 -+@@ -301,27 +301,9 @@ -+ LIBJVM_MAPFILE$(LDNOMAP) = mapfile_reorder -+ LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE)) -+ LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM)) -+- -+- # JVM is statically linked with libgcc[_s] and libstdc++; this is needed to -+- # get around library dependency and compatibility issues. Must use gcc not -+- # g++ to link. -+- ifeq ($(STATIC_CXX), true) -+- LFLAGS_VM += $(STATIC_LIBGCC) -+- LIBS_VM += $(STATIC_STDCXX) -+- else -+- LIBS_VM += -lstdc++ -+- endif -+- -+- LIBS_VM += $(LIBS) -+-endif -+-ifeq ($(TYPE),ZERO) -+- LIBS_VM += $(LIBFFI_LIBS) -+-endif -+-ifeq ($(TYPE),SHARK) -+- LIBS_VM += $(LIBFFI_LIBS) $(LLVM_LIBS) -+- LFLAGS_VM += $(LLVM_LDFLAGS) -+ endif -+ -++LIBS_VM = $(LIBS) -lstdc++ $(LIBFFI_CFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic -+ LINK_VM = $(LINK_LIB.CC) -+ -+ # rule for building precompiled header -+@@ -358,6 +340,7 @@ -+ $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) -+ $(QUIETLY) { \ -+ echo Linking vm...; \ -++ echo DEBUG: $(LIBS_VM); \ -+ $(LINK_LIB.CXX/PRE_HOOK) \ -+ $(LINK_VM) $(LD_SCRIPT_FLAG) \ -+ $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ -+diff -Nur openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make -+--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2017-02-07 05:06:40.000000000 +0100 -++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2017-04-01 21:43:13.128492754 +0200 -+@@ -39,20 +39,20 @@ -+ -+ offsets_arm.s: mkoffsets -+ @echo Generating assembler offsets -+- ./mkoffsets > $@ -++ $(QEMU) ./mkoffsets > $@ -+ -+ bytecodes_arm.s: bytecodes_arm.def mkbc -+ @echo Generating ARM assembler bytecode sequences -+- $(CXX_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) -++ $(CXX_COMPILE) -E -x c++ - < $< | $(QEMU) ./mkbc - $@ $(COMPILE_DONE) -+ -+ mkbc: $(GAMMADIR)/tools/mkbc.c -+ @echo Compiling mkbc tool -+- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) -++ $(CC_COMPILE) -static -o $@ $< $(COMPILE_DONE) -+ -+ mkoffsets: asm_helper.cpp -+ @echo Compiling offset generator -+ $(QUIETLY) $(REMOVE_TARGET) -+- $(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) -++ $(CXX_COMPILE) -Wl,-static -static -static-libstdc++ -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) -+ -+ endif -+ endif -+diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp -+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2017-02-07 05:06:40.000000000 +0100 -++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2017-04-01 21:43:13.132492910 +0200 -+@@ -116,7 +116,6 @@ -+ # include <string.h> -+ # include <syscall.h> -+ # include <sys/sysinfo.h> -+-# include <gnu/libc-version.h> -+ # include <sys/ipc.h> -+ # include <sys/shm.h> -+ # include <link.h> -+@@ -674,9 +673,7 @@ -+ os::Linux::set_glibc_version(str); -+ } else { -+ // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version() -+- static char _gnu_libc_version[32]; -+- jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version), -+- "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release()); -++ static char _gnu_libc_version[32] = "2.9"; -+ os::Linux::set_glibc_version(_gnu_libc_version); -+ } -+ -+@@ -2977,10 +2974,7 @@ -+ // If we are running with earlier version, which did not have symbol versions, -+ // we should use the base version. -+ void* os::Linux::libnuma_dlsym(void* handle, const char *name) { -+- void *f = dlvsym(handle, name, "libnuma_1.1"); -+- if (f == NULL) { -+- f = dlsym(handle, name); -+- } -++ void *f = dlsym(handle, name); -+ return f; -+ } -+ -+@@ -5665,7 +5659,21 @@ -+ // Linux doesn't yet have a (official) notion of processor sets, -+ // so just return the system wide load average. -+ int os::loadavg(double loadavg[], int nelem) { -+- return ::getloadavg(loadavg, nelem); -++ FILE *LOADAVG; -++ double avg[3] = { 0.0, 0.0, 0.0 }; -++ int i, res = -1;; -++ -++ if ((LOADAVG = fopen("/proc/loadavg", "r"))) { -++ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]); -++ res = 0; -++ fclose(LOADAVG); -++ } -++ -++ for (i = 0; (i < nelem) && (i < 3); i++) { -++ loadavg[i] = avg[i]; -++ } -++ -++ return res; -+ } -+ -+ void os::pause() { -+diff -Nur openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp -+--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2017-02-07 05:06:40.000000000 +0100 -++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2017-04-01 21:43:13.132492910 +0200 -+@@ -36,7 +36,7 @@ -+ -+ // Atomically copy 64 bits of data -+ static void atomic_copy64(volatile void *src, volatile void *dst) { -+-#if defined(PPC32) -++#if defined(PPC32) && !defined(__NO_FPRS__) -+ double tmp; -+ asm volatile ("lfd %0, 0(%1)\n" -+ "stfd %0, 0(%2)\n" -+diff -Nur openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp -+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2017-02-07 05:06:40.000000000 +0100 -++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2017-04-01 21:43:13.132492910 +0200 -+@@ -245,7 +245,7 @@ -+ #elif defined(__APPLE__) -+ inline int g_isnan(double f) { return isnan(f); } -+ #elif defined(LINUX) || defined(_ALLBSD_SOURCE) -+-inline int g_isnan(float f) { return isnanf(f); } -++inline int g_isnan(float f) { return __isnanf(f); } -+ inline int g_isnan(double f) { return isnan(f); } -+ #else -+ #error "missing platform-specific definition here" -+@@ -259,8 +259,8 @@ -+ -+ // Checking for finiteness -+ -+-inline int g_isfinite(jfloat f) { return finite(f); } -+-inline int g_isfinite(jdouble f) { return finite(f); } -++inline int g_isfinite(jfloat f) { return isfinite(f); } -++inline int g_isfinite(jdouble f) { return isfinite(f); } -+ -+ -+ // Wide characters -+diff -Nur openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile -+--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2017-04-01 21:43:13.132492910 +0200 -+@@ -80,7 +80,7 @@ -+ OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB -+ endif -+ else -+- OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI -++ CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI -+ OTHER_LDLIBS += $(JVMLIB) -+ endif -+ -+diff -Nur openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile -+--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile 2017-04-01 21:43:13.132492910 +0200 -+@@ -75,8 +75,8 @@ -+ ifneq ($(COMPILER_WARNINGS_FATAL),false) -+ COMPILER_WARNINGS_FATAL=true -+ endif -+-#OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl -+-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -++#OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl -++OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -ljavanet -lpthread -+ endif -+ ifeq ($(PLATFORM), solaris) -+ #LIBSCTP = -lsctp -+diff -Nur openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk -+--- openjdk.orig/jdk/make/common/Defs.gmk 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/common/Defs.gmk 2017-04-01 21:43:13.132492910 +0200 -+@@ -207,7 +207,7 @@ -+ ifeq ($(PLATFORM), macosx) -+ FREETYPE_HEADERS_PATH = /usr/X11R6/include -+ else -+- FREETYPE_HEADERS_PATH = /usr/include -++ FREETYPE_HEADERS_PATH = /usr/include/disabled -+ endif -+ endif -+ endif -+diff -Nur openjdk.orig/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk -+--- openjdk.orig/jdk/make/common/Sanity.gmk 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/common/Sanity.gmk 2017-04-01 21:43:13.132492910 +0200 -+@@ -91,8 +91,7 @@ -+ sane-ld_run_path \ -+ sane-alt_bootdir \ -+ sane-bootdir \ -+- sane-local-bootdir \ -+- sane-alsa-headers -++ sane-local-bootdir -+ -+ ifdef OPENJDK -+ sanity-all:: sane-freetype -+diff -Nur openjdk.orig/jdk/make/common/shared/Defs-utils.gmk openjdk/jdk/make/common/shared/Defs-utils.gmk -+--- openjdk.orig/jdk/make/common/shared/Defs-utils.gmk 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2017-04-01 21:43:13.132492910 +0200 -+@@ -157,13 +157,13 @@ -+ TRUE = $(UTILS_COMMAND_PATH)true -+ UNAME = $(UTILS_COMMAND_PATH)uname -+ UNIQ = $(UTILS_USR_BIN_PATH)uniq -+-UNZIP = $(UTILS_USR_BIN_PATH)unzip -+-UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx -++UNZIP = unzip -++UNZIPSFX = unzipsfx -+ XARGS = $(UTILS_USR_BIN_PATH)xargs -+ WC = $(UTILS_USR_BIN_PATH)wc -+ WHICH = $(UTILS_USR_BIN_PATH)which -+ YACC = $(UTILS_CCS_BIN_PATH)yacc -+-ZIPEXE = $(UTILS_DEVTOOL_PATH)zip -++ZIPEXE = zip -+ -+ # Special cases -+ #RM is defined by GNU Make as 'rm -f' -+diff -Nur openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk -+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/common/shared/Platform.gmk 2017-04-01 21:43:13.132492910 +0200 -+@@ -170,9 +170,6 @@ -+ else -+ mach := $(shell uname -m) -+ endif -+- ifneq (,$(wildcard /usr/bin/dpkg-architecture)) -+- mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/;s/ppc64el/ppc64le/') -+- endif -+ archExpr = case "$(mach)" in \ -+ i[3-9]86) \ -+ echo i586 \ -+diff -Nur openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk -+--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/common/shared/Sanity.gmk 2017-04-01 21:43:13.132492910 +0200 -+@@ -114,11 +114,6 @@ -+ elif [ -f /etc/lsb-release ] ; then \ -+ $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \ -+ fi) -+- ALSA_INCLUDE=/usr/include/alsa/version.h -+- ALSA_LIBRARY=/usr/lib/libasound.so -+- _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \ -+- $(SED) -e 's@.*"\(.*\)".*@\1@' ) -+- ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION)) -+ endif -+ -+ ifeq ($(PLATFORM), macosx) -+@@ -225,7 +220,6 @@ -+ sane-compiler \ -+ sane-link \ -+ sane-cacerts \ -+- sane-alsa-headers \ -+ sane-ant_version \ -+ sane-zip_version \ -+ sane-unzip_version \ -+@@ -1381,34 +1375,6 @@ -+ endif -+ endif -+ -+-###################################################### -+-# Check that ALSA headers and libs are installed and -+-# that the header has the right version. We only -+-# need /usr/include/alsa/version.h and /usr/lib/libasound.so -+-###################################################### -+- -+-ifdef REQUIRED_ALSA_VERSION -+- ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION)) -+-endif -+-sane-alsa-headers: -+-ifdef REQUIRED_ALSA_VERSION -+- @if [ "$(ALSA_CHECK)" != "missing" ] ; then \ -+- if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer" ] ; then \ -+- $(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \ -+- " You have the following ALSA version installed: $${alsa_version} \n" \ -+- " Please reinstall ALSA (drivers and lib). You can download \n" \ -+- " the source distribution from http://www.alsa-project.org \n" \ -+- " or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ -+- "" >> $(ERROR_FILE) ; \ -+- fi ; \ -+- else \ -+- $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \ -+- " Please install ALSA (drivers and lib). You can download the \n" \ -+- " source distribution from http://www.alsa-project.org or go to \n" \ -+- " http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ -+- "" >> $(ERROR_FILE) ; \ -+- fi -+-endif -+ -+ # If a sanity file doesn't exist, just make sure it's dir exists -+ $(SANITY_FILES): -+diff -Nur openjdk.orig/jdk/make/java/fdlibm/Makefile openjdk/jdk/make/java/fdlibm/Makefile -+--- openjdk.orig/jdk/make/java/fdlibm/Makefile 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/java/fdlibm/Makefile 2017-04-01 21:43:13.132492910 +0200 -+@@ -81,7 +81,7 @@ -+ # -+ # Things that must be linked in. -+ # -+-OTHER_LDLIBS = -++OTHER_LDLIBS = -lm -+ -+ # -+ # Files to compile. -+diff -Nur openjdk.orig/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile -+--- openjdk.orig/jdk/make/java/net/Makefile 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/java/net/Makefile 2017-04-01 21:43:13.132492910 +0200 -+@@ -25,7 +25,7 @@ -+ -+ BUILDDIR = ../.. -+ PACKAGE = java.net -+-LIBRARY = net -++LIBRARY = javanet -+ PRODUCT = sun -+ JAVAC_MAX_WARNINGS = true -+ JAVAC_LINT_OPTIONS = -Xlint:all,-deprecation -+diff -Nur openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile -+--- openjdk.orig/jdk/make/java/nio/Makefile 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/java/nio/Makefile 2017-04-01 21:43:13.132492910 +0200 -+@@ -409,7 +409,7 @@ -+ endif -+ -+ ifeq ($(PLATFORM), linux) -+- OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL) -++ OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread $(LIBDL) -+ ifeq ($(SYSTEM_GIO), true) -+ OTHER_LDLIBS += $(GIO_LIBS) -+ OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO -+@@ -966,7 +966,7 @@ -+ -+ $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC) -+ $(prep-target) -+- ($(CD) $(TEMPDIR); $(NIO_CC) $(CPPFLAGS) $(LDDFLAGS) \ -++ ($(CD) $(TEMPDIR); $(HOST_CC) $(CPPFLAGS_FOR_BUILD) $(LDDFLAGS) \ -+ -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC)) -+ -+ ifdef NIO_PLATFORM_CLASSES_ROOT_DIR -+@@ -1002,7 +1002,7 @@ -+ -+ $(GENUC_EXE) : $(GENUC_SRC) -+ $(prep-target) -+- $(NIO_CC) $(CPPFLAGS) -o $@ $(GENUC_SRC) -++ $(HOST_CC) $(CPPFLAGS_FOR_BUILD) -o $@ $(GENUC_SRC) -+ -+ ifdef NIO_PLATFORM_CLASSES_ROOT_DIR -+ $(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java -+diff -Nur openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk/jdk/make/javax/sound/jsoundalsa/Makefile -+--- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2017-04-01 21:43:13.132492910 +0200 -+@@ -72,6 +72,7 @@ -+ -DUSE_PORTS=TRUE \ -+ -DUSE_PLATFORM_MIDI_OUT=TRUE \ -+ -DUSE_PLATFORM_MIDI_IN=TRUE \ -++ $(ALSA_CPPFLAGS) \ -+ -I$(SHARE_SRC)/native/com/sun/media/sound -+ -+ # -+diff -Nur openjdk.orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk -+--- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/sun/awt/mawt.gmk 2017-04-01 21:43:13.136493064 +0200 -+@@ -151,22 +151,6 @@ -+ #endif -+ -+ LIBXTST = -lXtst -+-ifeq ($(PLATFORM), linux) -+- ifeq ($(ARCH_DATA_MODEL), 64) -+- # XXX what about the rest of them? -+- LIBXT = -lXt -+- else -+- # Allows for builds on Debian GNU Linux, X11 is in a different place -+- LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \ -+- $(wildcard /usr/lib/libXt.a)) -+- LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \ -+- $(wildcard /usr/lib/libSM.a)) -+- LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \ -+- $(wildcard /usr/lib/libICE.a)) -+- LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \ -+- $(wildcard /usr/lib/libXtst.a)) -+- endif -+-endif -+ -+ # Use -lXmu for EditRes support -+ LIBXMU_DBG = -lXmu -+@@ -181,7 +165,7 @@ -+ OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH -+ # XXX what is this define below? Isn't it motif-related? -+ OTHER_CFLAGS += -DXMSTRINGDEFINES=1 -+-OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi -++OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext -lXt -lSM -lICE -lX11 -lXi -+ endif -+ -+ endif -+@@ -231,11 +215,6 @@ -+ CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/fontconfig2 -+ endif -+ -+-ifndef HEADLESS -+-CPPFLAGS += -I$(OPENWIN_HOME)/include -+-LDFLAGS += -L$(OPENWIN_LIB) -+- -+-endif # !HEADLESS -+ -+ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ -+ -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ -+@@ -270,11 +249,6 @@ -+ endif # !HEADLESS -+ endif # PLATFORM -+ -+-ifeq ($(PLATFORM), linux) -+- # Checking for the X11/extensions headers at the additional location -+- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \ -+- $(wildcard /usr/include/X11/extensions)) -+-endif -+ -+ ifeq ($(PLATFORM), macosx) -+ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ -+diff -Nur openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile -+--- openjdk.orig/jdk/make/sun/xawt/Makefile 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/sun/xawt/Makefile 2017-04-01 21:43:13.136493064 +0200 -+@@ -299,16 +299,10 @@ -+ SIZERS = $(SIZER).32 -+ SIZERS_C = $(SIZER_32_C) -+ SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 -+-ifdef CROSS_COMPILE_ARCH -+-CFLAGS_32 = -m32 -+-endif -+ else # !32 -+ SIZERS = $(SIZER).64 -+ SIZERS_C = $(SIZER_64_C) -+ SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64 -+-ifdef CROSS_COMPILE_ARCH -+-CFLAGS_64 = -m64 -+-endif -+ endif # 32 -+ endif # !macosx -+ endif # solaris -+@@ -344,11 +338,7 @@ -+ WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class -+ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt -+ -+-ifndef CROSS_COMPILE_ARCH -+-SIZERS_CC = $(CC) -+-else -+-SIZERS_CC = $(HOST_CC) -+-endif -++SIZERS_CC = $(CC) -static -+ -+ $(SIZERS): $(SIZERS_C) -+ $(prep-target) -+@@ -371,7 +361,7 @@ -+ $(CHMOD) +w $@;\ -+ else \ -+ $(ECHO) GENERATING $@; \ -+- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ -++ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ -+ fi -+ @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ -+ $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ -+diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java -+--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2017-04-01 21:43:13.136493064 +0200 -+@@ -78,7 +78,7 @@ -+ */ -+ static { -+ java.security.AccessController.doPrivileged( -+- new sun.security.action.LoadLibraryAction("net")); -++ new sun.security.action.LoadLibraryAction("javanet")); -+ } -+ -+ /** -+diff -Nur openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java -+--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2017-04-01 21:43:13.136493064 +0200 -+@@ -47,7 +47,7 @@ -+ */ -+ static { -+ java.security.AccessController.doPrivileged( -+- new sun.security.action.LoadLibraryAction("net")); -++ new sun.security.action.LoadLibraryAction("javanet")); -+ init(); -+ } -+ -+diff -Nur openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java -+--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2017-04-01 21:43:13.136493064 +0200 -+@@ -288,7 +288,7 @@ -+ static { -+ preferIPv6Address = java.security.AccessController.doPrivileged( -+ new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue(); -+- AccessController.doPrivileged(new LoadLibraryAction("net")); -++ AccessController.doPrivileged(new LoadLibraryAction("javanet")); -+ init(); -+ } -+ -+diff -Nur openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java -+--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2017-04-01 21:43:13.136493064 +0200 -+@@ -53,7 +53,7 @@ -+ private static final int defaultIndex; /* index of defaultInterface */ -+ -+ static { -+- AccessController.doPrivileged(new LoadLibraryAction("net")); -++ AccessController.doPrivileged(new LoadLibraryAction("javanet")); -+ init(); -+ defaultInterface = DefaultInterface.getDefault(); -+ if (defaultInterface != null) { -+diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java -+--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java 2017-04-01 21:43:13.136493064 +0200 -+@@ -76,6 +76,6 @@ -+ -+ static { -+ AccessController.doPrivileged( -+- new sun.security.action.LoadLibraryAction("net")); -++ new sun.security.action.LoadLibraryAction("javanet")); -+ } -+ } -+diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java -+--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2017-04-01 21:43:13.136493064 +0200 -+@@ -95,7 +95,7 @@ -+ }}); -+ if (b != null && b.booleanValue()) { -+ java.security.AccessController.doPrivileged( -+- new sun.security.action.LoadLibraryAction("net")); -++ new sun.security.action.LoadLibraryAction("javanet")); -+ hasSystemProxies = init(); -+ } -+ } -+diff -Nur openjdk.orig/jdk/src/solaris/bin/mipsel/jvm.cfg openjdk/jdk/src/solaris/bin/mipsel/jvm.cfg -+--- openjdk.orig/jdk/src/solaris/bin/mipsel/jvm.cfg 1970-01-01 01:00:00.000000000 +0100 -++++ openjdk/jdk/src/solaris/bin/mipsel/jvm.cfg 2017-04-01 21:43:13.136493064 +0200 -+@@ -0,0 +1,38 @@ -++# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -++# -++# This code is free software; you can redistribute it and/or modify it -++# under the terms of the GNU General Public License version 2 only, as -++# published by the Free Software Foundation. Oracle designates this -++# particular file as subject to the "Classpath" exception as provided -++# by Oracle in the LICENSE file that accompanied this code. -++# -++# This code 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 -++# version 2 for more details (a copy is included in the LICENSE file that -++# accompanied this code). -++# -++# You should have received a copy of the GNU General Public License version -++# 2 along with this work; if not, write to the Free Software Foundation, -++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -++# -++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -++# or visit www.oracle.com if you need additional information or have any -++# questions. -++# -++# List of JVMs that can be used as an option to java, javac, etc. -++# Order is important -- first in this list is the default JVM. -++# NOTE that this both this file and its format are UNSUPPORTED and -++# WILL GO AWAY in a future release. -++# -++# You may also select a JVM in an arbitrary location with the -++# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported -++# and may not be available in a future release. -++# -++-client KNOWN -++-server KNOWN -++-hotspot ERROR -++-classic WARN -++-native ERROR -++-green ERROR -+diff -Nur openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java -+--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2017-04-01 21:43:13.136493064 +0200 -+@@ -260,7 +260,7 @@ -+ -+ static { -+ java.security.AccessController.doPrivileged( -+- new sun.security.action.LoadLibraryAction("net")); -++ new sun.security.action.LoadLibraryAction("javanet")); -+ } -+ -+ } -+diff -Nur openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c -+--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2017-04-01 21:43:13.136493064 +0200 -+@@ -246,7 +246,8 @@ -+ if (wcs == NULL) -+ return NULL; -+ -+- n = len*MB_CUR_MAX + 1; -++ //evil hack for uclibc -++ n = len*1 + 1; -+ -+ mbs = (char *) malloc(n * sizeof(char)); -+ if (mbs == NULL) { -+diff -Nur openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c -+--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2017-04-01 21:43:13.136493064 +0200 -+@@ -27,9 +27,6 @@ -+ #include <X11/Xutil.h> -+ #include <X11/Xos.h> -+ #include <X11/Xatom.h> -+-#ifdef __linux__ -+-#include <execinfo.h> -+-#endif -+ -+ #include <jvm.h> -+ #include <jni.h> -+@@ -785,25 +782,6 @@ -+ return ret; -+ } -+ -+-#ifdef __linux__ -+-void print_stack(void) -+-{ -+- void *array[10]; -+- size_t size; -+- char **strings; -+- size_t i; -+- -+- size = backtrace (array, 10); -+- strings = backtrace_symbols (array, size); -+- -+- fprintf (stderr, "Obtained %zd stack frames.\n", size); -+- -+- for (i = 0; i < size; i++) -+- fprintf (stderr, "%s\n", strings[i]); -+- -+- free (strings); -+-} -+-#endif -+ -+ Window get_xawt_root_shell(JNIEnv *env) { -+ static jclass classXRootWindow = NULL; -+diff -Nur openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java -+--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2017-04-01 21:43:13.136493064 +0200 -+@@ -161,7 +161,7 @@ -+ -+ static { -+ java.security.AccessController.doPrivileged( -+- new sun.security.action.LoadLibraryAction("net")); -++ new sun.security.action.LoadLibraryAction("javanet")); -+ init0(); -+ -+ // start the address listener thread diff --git a/package/openjdk8/Makefile b/package/openjdk8/Makefile deleted file mode 100644 index 2b0d2b6c7..000000000 --- a/package/openjdk8/Makefile +++ /dev/null @@ -1,120 +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:= openjdk8 -PKG_VERSION:= 8u131-b11 -PKG_RELEASE:= 1 -PKG_HASH:= d57a81345acd26d8d2681201bcf00671ad54d5d6e4b61ad1fe621994ba1fb1ec -PKG_DESCR:= java virtual machine -PKG_SECTION:= dev/lang -PKG_DEPENDS:= alsa-lib freetype libx11 libxext libxrender libxtst -PKG_DEPENDS+= libxt libffi zlib -PKG_BUILDDEP:= openjdk7-host libX11 libXext libXrender libXtst libXt -PKG_BUILDDEP+= freetype alsa-lib cups libffi zlib -PKG_NEEDS:= threads c++ iconv -PKG_URL:= http://openjdk.org/ -PKG_HG:= http://hg.openjdk.java.net/jdk8u/jdk8u -PKG_SITES:= ${PKG_HG}/archive/ -PKG_NOPARALLEL:= 1 -ICEDTEA_VERSION:= 3.4.0 - -PKG_HOST_DEPENDS:= linux -PKG_ARCH_DEPENDS:= arm mips ppc x86 x86_64 - -DISTFILES:= jdk$(PKG_VERSION).tar.bz2 -WRKSRC= ${WRKDIST}/openjdk - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,OPENJDK8,openjdk8,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -JDKARCH:= $(ADK_TARGET_CPU_ARCH) -ifeq ($(ADK_TARGET_ARCH),x86) -JDKARCH:= i386 -endif -ifeq ($(ADK_TARGET_CPU_ARCH),x86_64) -JDKARCH:= amd64 -endif - -# https://bugzilla.redhat.com/show_bug.cgi?id=1306558 -TARGET_CFLAGS+= -fno-lifetime-dse -fno-delete-null-pointer-checks -TARGET_CXXFLAGS+= -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 - -CONFIG_STYLE:= basic -CONFIGURE_ARGS+= --prefix=$(WRKINST)/usr \ - --with-jvm-variants=zero \ - --with-stdc++lib=dynamic \ - --enable-unlimited-crypto \ - --disable-debug-symbols \ - --with-debug-level=release \ - --with-zlib=system \ - --enable-freetype-bundling \ - --with-freetype=$(STAGING_TARGET_DIR)/usr \ - --with-freetype-include=$(STAGING_TARGET_DIR)/usr/include/freetype2 \ - --with-boot-jdk=$(STAGING_HOST_DIR)/bootstrap-jdk \ - --with-extra-cflags="$(TARGET_CFLAGS)" \ - --with-extra-cxxflags="$(TARGET_CXXFLAGS)" \ - --with-extra-ldflags="$(TARGET_LDFLAGS)" \ - --with-cups=$(STAGING_TARGET_DIR)/usr \ - --with-alsa=$(STAGING_TARGET_DIR) \ - --with-x=$(STAGING_TARGET_DIR)/usr \ - --x-includes=$(STAGING_TARGET_DIR)/usr/include \ - --x-libraries=$(STAGING_TARGET_DIR)/usr/lib -CONFIGURE_ENV:= BUILD_CC=/usr/bin/gcc \ - BUILD_CXX=/usr/bin/g++ \ - BUILD_LD=/usr/bin/ld \ - ac_cv_path_POTENTIAL_CC=$(TARGET_CC) \ - ac_cv_path_POTENTIAL_CXX=$(TARGET_CXX) \ - LD=$(TARGET_CC) \ - OBJCOPY='$(TARGET_CROSS)objcopy' \ - STRIP='$(TARGET_CROSS)strip' \ - LIBFFI_CFLAGS="$(TARGET_CPPFLAGS)" \ - LIBFFI_LIBS="$(TARGET_LDFLAGS) -lffi" - -XAKE_FLAGS+= LD='$(TARGET_CC)' \ - STRIP='$(TARGET_CROSS)strip' \ - BUILD_CC='$(HOST_CC)' \ - BUILD_LD='$(HOST_CC)' \ - LOG=debug \ - JOBS="4" - -post-extract: - (cd $(DL_DIR); \ - for file in jdk corba hotspot jaxp jaxws langtools nashorn; do \ - if [ ! -f openjdk8-$${file}$(PKG_VERSION).tar.bz2 ]; then \ - wget -c -O openjdk8-$${file}$(PKG_VERSION).tar.bz2 $(PKG_HG)/$${file}/archive/jdk$(PKG_VERSION).tar.bz2 ; \ - fi; \ - done; \ - if [ ! -f icedtea-$(ICEDTEA_VERSION).tar.xz ]; then \ - wget -O icedtea-$(ICEDTEA_VERSION).tar.xz http://icedtea.classpath.org/download/source/icedtea-$(ICEDTEA_VERSION).tar.xz; \ - fi; \ - ) - mkdir -p $(WRKDIST)/openjdk - (cd $(WRKDIST); \ - tar --strip-components=1 -xvf $(DL_DIR)/icedtea-$(ICEDTEA_VERSION).tar.xz; \ - tar --strip-components=1 -C $(WRKDIST)/openjdk -xvf $(DL_DIR)/jdk$(PKG_VERSION).tar.bz2; \ - for file in jdk corba hotspot jaxp jaxws langtools nashorn; do \ - mkdir -p $(WRKDIST)/openjdk/$${file}; \ - tar --strip-components=1 -C $(WRKDIST)/openjdk/$${file} -xvf $(DL_DIR)/openjdk8-$${file}$(PKG_VERSION).tar.bz2 ; \ - done; \ - ) - (cd $(WRKDIST)/openjdk; patch -p1 < $(ADK_TOPDIR)/package/openjdk8/files/openadk.patch) - (cd $(WRKDIST); \ - PATH=$(HOST_PATH) sed -e 's|@abs_top_srcdir@|$(WRKDIST)|g' -e '/^patch.*/d' fsg.sh.in > fsg.sh; \ - ${BASH} fsg.sh; \ - ) - cat $(WRKDIST)/openjdk/common/autoconf/configure.ac | PATH=$(HOST_PATH) sed -e "s|@DATE_WHEN_GENERATED@|`LC_ALL=C date +%s`|" | $(STAGING_HOST_DIR)/usr/bin/autoconf \ - -W all -I$(WRKDIST)/openjdk/common/autoconf - > $(WRKDIST)/openjdk/common/autoconf/generated-configure.sh - $(SED) "s#^WARNINGS_ARE_ERRORS.*#WARNINGS_ARE_ERRORS=#" $(WRKDIST)/openjdk/hotspot/make/linux/makefiles/gcc.make - -openjdk8-install: - $(INSTALL_DIR) $(IDIR_OPENJDK8)/usr/bin - $(INSTALL_DIR) $(IDIR_OPENJDK8)/usr/lib/jvm - $(CP) $(WRKINST)//usr/jvm/openjdk-1.8.0-internal/* \ - $(IDIR_OPENJDK8)/usr/lib/jvm - (cd $(IDIR_OPENJDK8)/usr/bin && ln -sf ../lib/jvm/jre/bin/java .) - (cd $(IDIR_OPENJDK8)/usr/lib/jvm/jre/lib/$(JDKARCH) && ln -sf server/libjvm.so .) - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/openjdk8/files/openadk.patch b/package/openjdk8/files/openadk.patch deleted file mode 100644 index c7e93ca0e..000000000 --- a/package/openjdk8/files/openadk.patch +++ /dev/null @@ -1,295 +0,0 @@ -diff -Nur openjdk.orig/common/autoconf/platform.m4 openjdk/common/autoconf/platform.m4 ---- openjdk.orig/common/autoconf/platform.m4 2015-12-23 01:50:32.000000000 +0100 -+++ openjdk/common/autoconf/platform.m4 2016-01-08 17:54:55.814451099 +0100 -@@ -36,25 +36,85 @@ - VAR_CPU_BITS=64 - VAR_CPU_ENDIAN=little - ;; -- i?86) -+ x86|i?86) - VAR_CPU=x86 - VAR_CPU_ARCH=x86 - VAR_CPU_BITS=32 - VAR_CPU_ENDIAN=little - ;; -+ alpha*) -+ VAR_CPU=alpha -+ VAR_CPU_ARCH=alpha -+ VAR_CPU_BITS=64 -+ VAR_CPU_ENDIAN=little -+ ;; -+ arm*eb) -+ VAR_CPU=armeb -+ VAR_CPU_ARCH=arm -+ VAR_CPU_BITS=32 -+ VAR_CPU_ENDIAN=big -+ ;; - arm*) - VAR_CPU=arm - VAR_CPU_ARCH=arm - VAR_CPU_BITS=32 - VAR_CPU_ENDIAN=little - ;; -+ aarch64eb) -+ VAR_CPU=aarch64eb -+ VAR_CPU_ARCH=aarch64 -+ VAR_CPU_BITS=64 -+ VAR_CPU_ENDIAN=big -+ ;; - aarch64) - VAR_CPU=aarch64 - VAR_CPU_ARCH=aarch64 - VAR_CPU_BITS=64 - VAR_CPU_ENDIAN=little - ;; -- powerpc) -+ m68k) -+ VAR_CPU=m68k -+ VAR_CPU_ARCH=m68k -+ VAR_CPU_BITS=32 -+ VAR_CPU_ENDIAN=big -+ ;; -+ mips) -+ VAR_CPU=mips -+ VAR_CPU_ARCH=mips -+ VAR_CPU_BITS=32 -+ VAR_CPU_ENDIAN=big -+ ;; -+ mipsel) -+ VAR_CPU=mipsel -+ VAR_CPU_ARCH=mipsel -+ VAR_CPU_BITS=32 -+ VAR_CPU_ENDIAN=little -+ ;; -+ mipsn32) -+ VAR_CPU=mipsn32 -+ VAR_CPU_ARCH=mipsn32 -+ VAR_CPU_BITS=32 -+ VAR_CPU_ENDIAN=big -+ ;; -+ mipsn32el) -+ VAR_CPU=mipsn32el -+ VAR_CPU_ARCH=mipsn32el -+ VAR_CPU_BITS=32 -+ VAR_CPU_ENDIAN=little -+ ;; -+ mips64) -+ VAR_CPU=mips64 -+ VAR_CPU_ARCH=mips64 -+ VAR_CPU_BITS=64 -+ VAR_CPU_ENDIAN=big -+ ;; -+ mips64el) -+ VAR_CPU=mips64el -+ VAR_CPU_ARCH=mips64el -+ VAR_CPU_BITS=64 -+ VAR_CPU_ENDIAN=little -+ ;; -+ powerpc|ppc) - VAR_CPU=ppc - VAR_CPU_ARCH=ppc - VAR_CPU_BITS=32 -@@ -66,12 +126,18 @@ - VAR_CPU_BITS=64 - VAR_CPU_ENDIAN=big - ;; -- powerpc64le) -+ powerpc64le|ppc64le) - VAR_CPU=ppc64 - VAR_CPU_ARCH=ppc - VAR_CPU_BITS=64 - VAR_CPU_ENDIAN=little - ;; -+ sh*) -+ VAR_CPU=sh -+ VAR_CPU_ARCH=sh -+ VAR_CPU_BITS=32 -+ VAR_CPU_ENDIAN=little -+ ;; - s390) - VAR_CPU=s390 - VAR_CPU_ARCH=s390 -@@ -371,6 +437,11 @@ - - # ZERO_ARCHDEF is used to enable architecture-specific code - case "${OPENJDK_TARGET_CPU}" in -+ alpha*) ZERO_ARCHDEF=ALPHA ;; -+ m68k) ZERO_ARCHDEF=M68K ;; -+ mips|mipsn32|mips64) ZERO_ARCHDEF=MIPS ;; -+ mipsel|mipsn32el|mips64el) ZERO_ARCHDEF=MIPSEL ;; -+ sh*) ZERO_ARCHDEF=sh ;; - ppc) ZERO_ARCHDEF=PPC32 ;; - ppc64) ZERO_ARCHDEF=PPC64 ;; - s390*) ZERO_ARCHDEF=S390 ;; -diff -Nur openjdk.orig/hotspot/src/cpu/zero/vm/entry_zero.hpp openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/entry_zero.hpp 2015-12-23 01:50:46.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp 2016-01-06 11:43:50.108091228 +0100 -@@ -26,6 +26,8 @@ - #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP - #define CPU_ZERO_VM_ENTRY_ZERO_HPP - -+#include "interpreter/cppInterpreter.hpp" -+ - class ZeroEntry { - public: - ZeroEntry() { -diff -Nur openjdk.orig/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp 2015-12-23 01:50:46.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp 2016-01-06 11:43:50.108091228 +0100 -@@ -25,6 +25,7 @@ - - #include "precompiled.hpp" - #include "assembler_zero.inline.hpp" -+#include "entry_zero.hpp" - #include "memory/resourceArea.hpp" - #include "nativeInst_zero.hpp" - #include "oops/oop.inline.hpp" -diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2015-12-23 01:50:46.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2016-01-06 11:43:50.112090962 +0100 -@@ -94,7 +94,9 @@ - # include <string.h> - # include <syscall.h> - # include <sys/sysinfo.h> -+# ifndef __UCLIBC__ - # include <gnu/libc-version.h> -+# endif - # include <sys/ipc.h> - # include <sys/shm.h> - # include <link.h> -@@ -533,6 +535,7 @@ - # define _CS_GNU_LIBPTHREAD_VERSION 3 - # endif - -+# ifndef __UCLIBC__ - size_t n = confstr(_CS_GNU_LIBC_VERSION, NULL, 0); - if (n > 0) { - char *str = (char *)malloc(n, mtInternal); -@@ -545,6 +548,10 @@ - "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release()); - os::Linux::set_glibc_version(_gnu_libc_version); - } -+# else -+ size_t n = 1; -+ os::Linux::set_glibc_version("2"); -+# endif - - n = confstr(_CS_GNU_LIBPTHREAD_VERSION, NULL, 0); - if (n > 0) { -@@ -2789,10 +2796,14 @@ - // If we are running with earlier version, which did not have symbol versions, - // we should use the base version. - void* os::Linux::libnuma_dlsym(void* handle, const char *name) { -+#ifndef __UCLIBC__ - void *f = dlvsym(handle, name, "libnuma_1.1"); - if (f == NULL) { - f = dlsym(handle, name); - } -+#else -+ void *f = dlsym(handle, name); -+#endif - return f; - } - -@@ -4805,7 +4816,7 @@ - - Linux::capture_initial_stack(JavaThread::stack_size_at_create()); - --#if defined(IA32) -+#if defined(IA32) && !defined(ZERO) - workaround_expand_exec_shield_cs_limit(); - #endif - -@@ -5437,6 +5448,43 @@ - // System loadavg support. Returns -1 if load average cannot be obtained. - // Linux doesn't yet have a (official) notion of processor sets, - // so just return the system wide load average. -+#ifdef __UCLIBC__ -+static int getloadavg (double loadavg[], int nelem) -+{ -+ int fd; -+ -+ fd = open ("/proc/loadavg", O_RDONLY); -+ if (fd < 0) -+ return -1; -+ else -+ { -+ char buf[65], *p; -+ ssize_t nread; -+ int i; -+ -+ nread = read (fd, buf, sizeof buf - 1); -+ close (fd); -+ if (nread <= 0) -+ return -1; -+ buf[nread - 1] = '\0'; -+ -+ if (nelem > 3) -+ nelem = 3; -+ p = buf; -+ for (i = 0; i < nelem; ++i) -+ { -+ char *endp; -+ loadavg[i] = strtod (p, &endp); -+ if (endp == p) -+ return -1; -+ p = endp; -+ } -+ -+ return i; -+ } -+} -+#endif -+ - int os::loadavg(double loadavg[], int nelem) { - return ::getloadavg(loadavg, nelem); - } -diff -Nur openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp ---- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2015-12-23 01:50:46.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2016-01-06 11:43:50.220083765 +0100 -@@ -223,6 +223,10 @@ - #define BREAKPOINT ::breakpoint() - #endif - -+#ifdef __UCLIBC__ -+#define isnanf __isnanf -+#endif -+ - // checking for nanness - #ifdef SOLARIS - #ifdef SPARC -@@ -249,8 +253,13 @@ - - // Checking for finiteness - -+#ifdef __UCLIBC__ -+inline int g_isfinite(jfloat f) { return isfinite(f); } -+inline int g_isfinite(jdouble f) { return isfinite(f); } -+#else - inline int g_isfinite(jfloat f) { return finite(f); } - inline int g_isfinite(jdouble f) { return finite(f); } -+#endif - - - // Wide characters -diff -Nur openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c ---- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c 2015-12-23 01:50:56.000000000 +0100 -+++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2016-01-06 12:56:51.970983142 +0100 -@@ -27,7 +27,7 @@ - #include <X11/Xutil.h> - #include <X11/Xos.h> - #include <X11/Xatom.h> --#ifdef __linux__ -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - #include <execinfo.h> - #endif - -@@ -799,7 +799,7 @@ - return ret; - } - --#ifdef __linux__ -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - void print_stack(void) - { - void *array[10]; diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 2471893d1..ba69f6066 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openldap -PKG_VERSION:= 2.6.0 +PKG_VERSION:= 2.6.8 PKG_RELEASE:= 1 -PKG_HASH:= b71c580eac573e9aba15d95f33dd4dd08f2ed4f0d7fc09e08ad4be7ed1e41a4f +PKG_HASH:= 48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e PKG_DESCR:= ldap client libraries PKG_SECTION:= libs/misc -PKG_DEPENDS:= libsasl2 libdb libuuid libncurses libressl -PKG_BUILDDEP:= cyrus-sasl db util-linux libressl +PKG_DEPENDS:= libsasl2 libuuid libncurses libopenssl +PKG_BUILDDEP:= cyrus-sasl util-linux openssl PKG_NEEDS:= threads c++ PKG_URL:= http://www.openldap.org/ PKG_SITES:= https://openldap.org/software/download/OpenLDAP/openldap-release/ @@ -39,7 +39,7 @@ $(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RE CONFIGURE_ENV+= ac_cv_func_memcmp_working=yes CONFIGURE_ARGS+= --enable-slapd \ --libexecdir=/usr/sbin \ - --enable-bdb \ + --disable-bdb \ --disable-hdb \ --disable-relay \ --enable-dynamic \ diff --git a/package/openldap/files/slapd.conf b/package/openldap/files/slapd.conf index 3a065043b..df18922e5 100644 --- a/package/openldap/files/slapd.conf +++ b/package/openldap/files/slapd.conf @@ -13,9 +13,9 @@ argsfile /var/run/slapd.args # moduleload back_ldap.la ####################################################################### -# BDB database definitions +# MDB database definitions ####################################################################### -database bdb +database mdb suffix "o=openadk" rootdn "cn=admin,o=openadk" # Cleartext passwords, especially for the rootdn, should diff --git a/package/openldap/patches/patch-Makefile_in b/package/openldap/patches/patch-Makefile_in deleted file mode 100644 index c248c3f7e..000000000 --- a/package/openldap/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- openldap-2.4.23.orig/Makefile.in 2010-04-13 22:22:14.000000000 +0200 -+++ openldap-2.4.23/Makefile.in 2011-03-04 20:59:55.000000000 +0100 -@@ -13,7 +13,7 @@ - ## top-level directory of the distribution or, alternatively, at - ## <http://www.OpenLDAP.org/license.html>. - --SUBDIRS= include libraries clients servers tests doc -+SUBDIRS= include libraries clients servers - CLEANDIRS= - INSTALLDIRS= - diff --git a/package/openldap/patches/patch-configure b/package/openldap/patches/patch-configure deleted file mode 100644 index 248f06e8a..000000000 --- a/package/openldap/patches/patch-configure +++ /dev/null @@ -1,33 +0,0 @@ ---- openldap-2.4.42.orig/configure 2015-08-14 17:25:28.000000000 +0200 -+++ openldap-2.4.42/configure 2015-10-22 07:28:53.000000000 +0200 -@@ -22223,29 +22223,10 @@ $as_echo "$as_me: WARNING: Strong authen - fi - fi - --if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then -- dev=no -- if test -r /dev/urandom ; then -- dev="/dev/urandom"; -- elif test -r /idev/urandom ; then -- dev="/idev/urandom"; -- elif test -r /dev/srandom ; then -- dev="/dev/srandom"; -- elif test -r /dev/random ; then -- dev="/dev/random"; -- elif test -r /idev/random ; then -- dev="/idev/random"; -- fi -- -- if test $dev != no ; then -- - cat >>confdefs.h <<_ACEOF --#define URANDOM_DEVICE "$dev" -+#define URANDOM_DEVICE "/dev/urandom" - _ACEOF - -- fi --fi -- - ol_link_fetch=no - if test $ol_with_fetch != no ; then - ol_LIBS=$LIBS diff --git a/package/openldap/patches/patch-configure_in b/package/openldap/patches/patch-configure_in deleted file mode 100644 index 5bd5b2503..000000000 --- a/package/openldap/patches/patch-configure_in +++ /dev/null @@ -1,31 +0,0 @@ ---- openldap-2.4.42.orig/configure.in 2015-08-14 17:25:28.000000000 +0200 -+++ openldap-2.4.42/configure.in 2015-10-22 07:23:38.000000000 +0200 -@@ -2147,26 +2147,8 @@ else - fi - fi - --dnl ---------------------------------------------------------------- --dnl Check for entropy sources --if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then -- dev=no -- if test -r /dev/urandom ; then -- dev="/dev/urandom"; -- elif test -r /idev/urandom ; then -- dev="/idev/urandom"; -- elif test -r /dev/srandom ; then -- dev="/dev/srandom"; -- elif test -r /dev/random ; then -- dev="/dev/random"; -- elif test -r /idev/random ; then -- dev="/idev/random"; -- fi -- -- if test $dev != no ; then -- AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) -- fi --fi -+# set unconditionally to /dev/urandom for Linux cross-compilation -+AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"/dev/urandom",[set to urandom device]) - - dnl ---------------------------------------------------------------- - dnl diff --git a/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h b/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h deleted file mode 100644 index a80083bc2..000000000 --- a/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h +++ /dev/null @@ -1,21 +0,0 @@ ---- openldap-2.4.36.orig/libraries/librewrite/rewrite-int.h 2013-08-16 20:12:59.000000000 +0200 -+++ openldap-2.4.36/libraries/librewrite/rewrite-int.h 2013-11-01 14:30:43.000000000 +0100 -@@ -40,12 +40,18 @@ - - #include <rewrite.h> - -+/* -+#undef malloc - #define malloc(x) ber_memalloc(x) -+#undef calloc - #define calloc(x,y) ber_memcalloc(x,y) -+#undef realloc - #define realloc(x,y) ber_memrealloc(x,y) -+#undef free - #define free(x) ber_memfree(x) - #undef strdup - #define strdup(x) ber_strdup(x) -+*/ - - /* Uncomment to use ldap pvt threads */ - #define USE_REWRITE_LDAP_PVT_THREADS diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 7db2873a6..63c0682a0 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 9.7p1 +PKG_VERSION:= 10.0p1 PKG_RELEASE:= 1 -PKG_HASH:= 490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd +PKG_HASH:= 021a2e709a0edf4250b1256bd5a9e500411a90dddabea830ed59cef90eb9d85c PKG_DESCR:= secure shell implementation PKG_SECTION:= net/security PKG_BUILDDEP:= zlib @@ -37,13 +37,13 @@ PKGFD_WITH_KRB5:= enable kerberos 5 support PKGFS_WITH_KRB5:= libkrb5 libcom-err PKGFB_WITH_KRB5:= krb5 -PKG_CHOICES_OPENSSH:= WITH_LIBRESSL WITH_OPENSSL -PKGCD_WITH_LIBRESSL:= with libressl -PKGCS_WITH_LIBRESSL:= libressl -PKGCB_WITH_LIBRESSL:= libressl +PKG_CHOICES_OPENSSH:= WITH_OPENSSL WITH_LIBRESSL PKGCD_WITH_OPENSSL:= with openssl PKGCS_WITH_OPENSSL:= libopenssl PKGCB_WITH_OPENSSL:= openssl +PKGCD_WITH_LIBRESSL:= with libressl +PKGCS_WITH_LIBRESSL:= libressl +PKGCB_WITH_LIBRESSL:= libressl include ${ADK_TOPDIR}/mk/package.mk @@ -102,11 +102,16 @@ openssh-server-install: ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/etc/ssh ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/bin ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/sbin + ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/libexec ${CP} ./files/sshd_config ${IDIR_OPENSSH_SERVER}/etc/ssh ${INSTALL_BIN} ${WRKINST}/usr/bin/ssh-keygen \ ${IDIR_OPENSSH_SERVER}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/sbin/sshd \ ${IDIR_OPENSSH_SERVER}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/libexec/sshd-session \ + ${IDIR_OPENSSH_SERVER}/usr/libexec + ${INSTALL_BIN} ${WRKINST}/usr/libexec/sshd-auth \ + ${IDIR_OPENSSH_SERVER}/usr/libexec # ssh pubkey test -z $(ADK_RUNTIME_SSH_PUBKEY) || ( \ mkdir -p $(IDIR_OPENSSH_SERVER)/etc/ssh; \ diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 406a88681..c397e6dce 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -4,15 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= openssl -PKG_VERSION:= 3.0.13 +PKG_VERSION:= 3.5.4 PKG_RELEASE:= 1 -PKG_HASH:= 88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313 +PKG_HASH:= 967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99 PKG_DESCR:= ssl/tls library PKG_SECTION:= libs/crypto -PKG_URL:= https://www.openssl.org +PKG_URL:= https://openssl-library.org/ PKG_DEPENDS:= zlib PKG_BUILDDEP:= zlib -PKG_SITES:= https://www.openssl.org/source/ +PKG_SITES:= https://github.com/openssl/openssl/releases/download/openssl-$(PKG_VERSION)/ PKG_LIBNAME:= libopenssl PKG_OPTS:= dev @@ -38,7 +38,7 @@ OPENSSL_OPTIONS:= shared zlib-dynamic endif OPENSSL_OPTIONS+= threads no-err no-tests no-fuzz-libfuzzer no-fuzz-afl -OPENSSL_OPTIONS+= no-rc5 no-rc2 no-rc4 no-md2 no-idea +OPENSSL_OPTIONS+= no-rc5 no-rc2 no-rc4 no-md2 no-idea no-docs HOST_STYLE:= manual CONFIG_STYLE:= manual @@ -62,27 +62,17 @@ CONFIG:= linux-x86_64 endif ifeq ($(ADK_TARGET_ARCH_AARCH64),y) CONFIG:= linux-aarch64 -endif - -ifneq (,$(filter CYGWIN%,${OS_FOR_BUILD})) -HOSTCONFIG:= Cygwin-x86_64 -endif -ifeq ($(OS_FOR_BUILD),Darwin) -HOSTCONFIG:= darwin64-x86_64-cc +OPENSSL_OPTIONS+= no-asm endif host-configure: -ifeq ($(HOSTCONFIG),) - (cd $(WRKBUILD); ./config --prefix='$(STAGING_HOST_DIR)/usr' -fPIC -ldl) -else - (cd $(WRKBUILD); ./Configure $(HOSTCONFIG) --prefix='$(STAGING_HOST_DIR)/usr') -endif + (cd $(WRKBUILD); ./config --prefix='$(STAGING_HOST_DIR)/usr' -fPIC -ldl no-docs no-tests) host-build: - (cd $(WRKBUILD); make) + (cd $(WRKBUILD); $(MAKE)) openssl-hostinstall: - (cd $(WRKBUILD); make install) + (cd $(WRKBUILD); $(MAKE) install) do-configure: (cd $(WRKBUILD); \ @@ -99,7 +89,6 @@ do-configure: -DOPENSSL_NO_ASYNC \ $(OPENSSL_OPTIONS) \ ); - #$(SED) "s:-O[0-9]:$(TARGET_CFLAGS) -fPIC:" $(WRKBUILD)/Makefile libopenssl-install: ${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib diff --git a/package/openssl/patches/patch-Configurations_unix-Makefile_tmpl b/package/openssl/patches/patch-Configurations_unix-Makefile_tmpl deleted file mode 100644 index eb64f9a73..000000000 --- a/package/openssl/patches/patch-Configurations_unix-Makefile_tmpl +++ /dev/null @@ -1,20 +0,0 @@ ---- openssl-3.0.10.orig/Configurations/unix-Makefile.tmpl 2023-08-01 15:47:24.000000000 +0200 -+++ openssl-3.0.10/Configurations/unix-Makefile.tmpl 2023-08-12 19:44:43.932070216 +0200 -@@ -523,7 +523,7 @@ build_all_generated: $(GENERATED_MANDATO - @echo " then make will fail..." - @ : {- output_on() if $disabled{makedepend}; "" -} - --all: build_sw build_docs -+all: build_sw - - test: tests - {- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep link-utils run_tests -@@ -546,7 +546,7 @@ list-tests: - @echo "Tests are not supported with your chosen Configure options" - @ : {- output_on() if !$disabled{tests}; "" -} - --install: install_sw install_ssldirs install_docs {- $disabled{fips} ? "" : "install_fips" -} -+install: install_sw install_ssldirs {- $disabled{fips} ? "" : "install_fips" -} - - uninstall: uninstall_docs uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} - diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 8001a51ca..bdc8c9b96 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= openvpn -PKG_VERSION:= 2.6.10 +PKG_VERSION:= 2.6.15 PKG_RELEASE:= 1 -PKG_HASH:= 1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b +PKG_HASH:= e35513ee15995e3c71adfd8891b9f33522896c70b3baa2ed9a23c7a42c4d7bde PKG_DESCR:= vpn solution using ssl/tls -PKG_DEPENDS:= libressl libcap-ng -PKG_BUILDDEP:= libressl libcap-ng +PKG_DEPENDS:= libopenssl libcap-ng +PKG_BUILDDEP:= openssl libcap-ng PKG_KDEPENDS:= tun PKG_SECTION:= net/security PKG_URL:= http://openvpn.net/ @@ -31,6 +31,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_LDFLAGS+= -latomic CONFIGURE_ENV+= ac_cv_lib_nsl_inet_ntoa=no ifneq ($(ADK_PACKAGE_OPENVPN_WITH_LZ4),) diff --git a/package/opkg/Makefile b/package/opkg/Makefile index 17f2bf2e2..420a8e984 100644 --- a/package/opkg/Makefile +++ b/package/opkg/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= opkg -PKG_VERSION:= 0.6.2 +PKG_VERSION:= 0.6.3 PKG_RELEASE:= 1 -PKG_HASH:= ac73a90a2549cd04948e563d915912c78e1b8ba0f43af75c5a53fcca474adbd5 +PKG_HASH:= f3938e359646b406c40d5d442a1467c7e72357f91ab822e442697529641e06de PKG_DESCR:= embedded package manager -PKG_DEPENDS:= libcurl libarchive gpgme libressl xz -PKG_BUILDDEP:= curl libarchive gpgme xz libressl +PKG_DEPENDS:= libcurl libarchive gpgme libressl bzip2 +PKG_BUILDDEP:= curl libarchive gpgme bzip2 libressl HOST_BUILDDEP:= libarchive-host curl-host cpio-host PKG_NEEDS:= threads PKG_SECTION:= sys/misc @@ -28,10 +28,10 @@ HOST_CONFIGURE_ARGS+= --disable-openssl \ --disable-gpg \ --disable-xz \ --disable-ssl-curl -CONFIGURE_ARGS+= --disable-bzip2 \ +CONFIGURE_ARGS+= --enable-bzip2 \ --enable-ssl-curl \ --enable-openssl \ - --enable-xz \ + --disable-xz \ --enable-gpg opkg-install: diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile index 459fd537f..43e05c05f 100644 --- a/package/orbit2/Makefile +++ b/package/orbit2/Makefile @@ -27,10 +27,8 @@ $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP HOST_CFLAGS+= $(shell env $(HOST_CONFIGURE_ENV) libIDL-config-2 --cflags 2>/dev/null) HOST_LIBS:= $(shell env $(HOST_CONFIGURE_ENV) libIDL-config-2 --libs 2>/dev/null) -ifneq ($(OS_FOR_BUILD),Darwin) HOST_LDFLAGS+= -static HOST_LIBS+= -lrt -endif HOST_LIBS+= -lgmodule-2.0 -ldl -lpthread -lglib-2.0 CONFIGURE_ENV+= ac_cv_alignof_CORBA_octet=1 \ ac_cv_alignof_CORBA_boolean=1 \ diff --git a/package/pam/Makefile b/package/pam/Makefile index 1030dd69a..8a40b8157 100644 --- a/package/pam/Makefile +++ b/package/pam/Makefile @@ -4,37 +4,41 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pam -PKG_VERSION:= 1.1.8 -PKG_RELEASE:= 3 -PKG_HASH:= 4183409a450708a976eca5af561dbf4f0490141a08e86e4a1e649c7c1b094876 +PKG_VERSION:= 1.7.0 +PKG_RELEASE:= 1 +PKG_HASH:= 1dad9cb50b4a19accd7d7b9716777caf5a0f33d26f018f27d63e9e095998f12b PKG_DESCR:= pluggable authentication modules -PKG_BUILDDEP:= flex +PKG_DEPENDS_GLIBC:= libxcrypt +PKG_BUILDDEP:= meson-host +PKG_BUILDDEP_GLIBC:= libxcrypt PKG_SECTION:= sys/misc PKG_URL:= http://www.linux-pam.org/ -PKG_SITES:= http://www.linux-pam.org/library/ +PKG_SITES:= https://github.com/linux-pam/linux-pam/archive/refs/tags/ PKG_OPTS:= dev -DISTFILES:= Linux-PAM-$(PKG_VERSION).tar.gz -WRKDIST= ${WRKDIR}/Linux-PAM-${PKG_VERSION} +DISTFILES:= v$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/linux-pam-${PKG_VERSION} include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,PAM,pam,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -AUTOTOOL_STYLE:= autoreconf -CONFIGURE_ARGS+= --disable-nis \ - --disable-regenerate-docu \ - --enable-db=no +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +MESON_FLAGS+= -Ddocs=disabled +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson pam-install: $(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/lib - $(CP) $(WRKINST)/lib/libpam*.so* \ + $(CP) $(WRKINST)/usr/lib/libpam*.so* \ $(STAGING_TARGET_DIR)/usr/lib $(INSTALL_DIR) $(IDIR_PAM)/etc/security $(CP) $(WRKINST)/etc/security/* $(IDIR_PAM)/etc/security - $(INSTALL_DIR) $(IDIR_PAM)/lib/security - $(CP) $(WRKINST)/lib/libpam*.so* $(IDIR_PAM)/lib - $(CP) $(WRKINST)/lib/security/*.so* $(IDIR_PAM)/lib/security + $(INSTALL_DIR) $(IDIR_PAM)/usr/lib/security + $(CP) $(WRKINST)/usr/lib/libpam*.so* $(IDIR_PAM)/usr/lib + $(CP) $(WRKINST)/usr/lib/security/*.so* $(IDIR_PAM)/usr/lib/security $(CP) ./files/pam.conf $(IDIR_PAM)/etc include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pam/patches/patch-Makefile_am b/package/pam/patches/patch-Makefile_am deleted file mode 100644 index d43150124..000000000 --- a/package/pam/patches/patch-Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- Linux-PAM-1.1.8.orig/Makefile.am 2013-06-18 16:11:21.000000000 +0200 -+++ Linux-PAM-1.1.8/Makefile.am 2014-05-27 07:49:28.180418627 +0200 -@@ -4,7 +4,7 @@ - - AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news - --SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests -+SUBDIRS = libpam libpamc libpam_misc modules conf - - CLEANFILES = *~ - diff --git a/package/pam/patches/patch-configure_in b/package/pam/patches/patch-configure_in deleted file mode 100644 index 9f3b68ca2..000000000 --- a/package/pam/patches/patch-configure_in +++ /dev/null @@ -1,34 +0,0 @@ ---- Linux-PAM-1.1.8.orig/configure.in 2013-09-18 14:30:13.000000000 +0200 -+++ Linux-PAM-1.1.8/configure.in 2014-05-27 07:50:43.868499284 +0200 -@@ -28,12 +28,7 @@ dnl If we use /usr as prefix, use /etc f - fi - if test ${libdir} = '${exec_prefix}/lib' - then -- case "`uname -m`" in -- x86_64|ppc64|s390x|sparc64) -- libdir="/lib64" ;; -- *) -- libdir="/lib" ;; -- esac -+ libdir="/lib" - fi - if test ${sbindir} = '${exec_prefix}/sbin' - then -@@ -404,7 +399,7 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" = - [crypt_libs="crypt"]) - - BACKUP_LIBS=$LIBS --AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="") -+AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-lcrypt", LIBCRYPT="") - AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) - LIBS=$BACKUP_LIBS - AC_SUBST(LIBCRYPT) -@@ -565,8 +560,6 @@ AM_CONDITIONAL(ENABLE_REGENERATE_MAN, te - AM_CONDITIONAL(ENABLE_GENERATE_PDF, test ! -z "$FO2PDF") - - --AM_GNU_GETTEXT_VERSION([0.15]) --AM_GNU_GETTEXT([external]) - AC_CHECK_FUNCS(dngettext) - - AH_BOTTOM([#ifdef ENABLE_NLS diff --git a/package/pam/patches/patch-meson_build b/package/pam/patches/patch-meson_build new file mode 100644 index 000000000..dd47c8e64 --- /dev/null +++ b/package/pam/patches/patch-meson_build @@ -0,0 +1,11 @@ +--- linux-pam-1.7.0.orig/meson.build 2024-10-24 10:00:00.000000000 +0200 ++++ linux-pam-1.7.0/meson.build 2025-04-11 18:17:54.666763491 +0200 +@@ -2,7 +2,7 @@ project('Linux-PAM', 'c', + version: '1.7.0', + license: 'BSD-3-Clause OR GPL-2.0-or-later', + default_options: [ +- 'b_pie=true', ++ 'b_pie=false', + 'prefix=/usr', + 'warning_level=2', + ], diff --git a/package/pam/patches/patch-modules_Makefile_am b/package/pam/patches/patch-modules_Makefile_am deleted file mode 100644 index b70eaef1b..000000000 --- a/package/pam/patches/patch-modules_Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- Linux-PAM-1.1.8.orig/modules/Makefile.am 2013-06-18 16:11:21.000000000 +0200 -+++ Linux-PAM-1.1.8/modules/Makefile.am 2014-05-25 20:13:15.415984289 +0200 -@@ -7,7 +7,7 @@ SUBDIRS = pam_access pam_cracklib pam_de - pam_group pam_issue pam_keyinit pam_lastlog pam_limits \ - pam_listfile pam_localuser pam_loginuid pam_mail \ - pam_mkhomedir pam_motd pam_namespace pam_nologin \ -- pam_permit pam_pwhistory pam_rhosts pam_rootok pam_securetty \ -+ pam_permit pam_pwhistory pam_rootok pam_securetty \ - pam_selinux pam_sepermit pam_shells pam_stress \ - pam_succeed_if pam_tally pam_tally2 pam_time pam_timestamp \ - pam_tty_audit pam_umask \ diff --git a/package/pam/patches/patch-modules_pam_group_pam_group_c b/package/pam/patches/patch-modules_pam_group_pam_group_c deleted file mode 100644 index bbf25bcfd..000000000 --- a/package/pam/patches/patch-modules_pam_group_pam_group_c +++ /dev/null @@ -1,17 +0,0 @@ ---- Linux-PAM-1.1.8.orig/modules/pam_group/pam_group.c 2013-06-18 16:11:21.000000000 +0200 -+++ Linux-PAM-1.1.8/modules/pam_group/pam_group.c 2013-12-21 18:30:19.000000000 +0100 -@@ -655,10 +655,13 @@ static int check_account(pam_handle_t *p - continue; - } - /* If buffer starts with @, we are using netgroups */ -+#ifdef HAVE_INNETGR - if (buffer[0] == '@') - good &= innetgr (&buffer[1], NULL, user, NULL); - /* otherwise, if the buffer starts with %, it's a UNIX group */ -- else if (buffer[0] == '%') -+ else -+#endif -+ if (buffer[0] == '%') - good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]); - else - good &= logic_field(pamh,user, buffer, count, is_same); diff --git a/package/pam/patches/patch-modules_pam_lastlog_pam_lastlog_c b/package/pam/patches/patch-modules_pam_lastlog_pam_lastlog_c deleted file mode 100644 index b20bd413d..000000000 --- a/package/pam/patches/patch-modules_pam_lastlog_pam_lastlog_c +++ /dev/null @@ -1,21 +0,0 @@ ---- Linux-PAM-1.1.8.orig/modules/pam_lastlog/pam_lastlog.c 2013-06-18 16:11:21.000000000 +0200 -+++ Linux-PAM-1.1.8/modules/pam_lastlog/pam_lastlog.c 2013-12-21 18:34:07.000000000 +0100 -@@ -10,6 +10,7 @@ - - #include "config.h" - -+#include <paths.h> - #include <fcntl.h> - #include <time.h> - #include <errno.h> -@@ -50,6 +51,10 @@ struct lastlog { - # define _PATH_BTMP "/var/log/btmp" - #endif - -+#ifndef __GLIBC__ -+#define logwtmp(args...) -+#endif -+ - /* XXX - time before ignoring lock. Is 1 sec enough? */ - #define LASTLOG_IGNORE_LOCK_TIME 1 - diff --git a/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c b/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c deleted file mode 100644 index 2d51fab3f..000000000 --- a/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c +++ /dev/null @@ -1,23 +0,0 @@ ---- Linux-PAM-1.1.8.orig/modules/pam_succeed_if/pam_succeed_if.c 2013-06-18 16:11:21.000000000 +0200 -+++ Linux-PAM-1.1.8/modules/pam_succeed_if/pam_succeed_if.c 2014-05-24 10:49:28.000000000 +0200 -@@ -233,16 +233,20 @@ evaluate_notingroup(pam_handle_t *pamh, - static int - evaluate_innetgr(const char *host, const char *user, const char *group) - { -+#ifdef HAVE_INNETGR - if (innetgr(group, host, user, NULL) == 1) - return PAM_SUCCESS; -+#endif - return PAM_AUTH_ERR; - } - /* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */ - static int - evaluate_notinnetgr(const char *host, const char *user, const char *group) - { -+#ifdef HAVE_INNETGR - if (innetgr(group, host, user, NULL) == 0) - return PAM_SUCCESS; -+#endif - return PAM_AUTH_ERR; - } - diff --git a/package/pam/patches/patch-modules_pam_time_pam_time_c b/package/pam/patches/patch-modules_pam_time_pam_time_c deleted file mode 100644 index e122cece5..000000000 --- a/package/pam/patches/patch-modules_pam_time_pam_time_c +++ /dev/null @@ -1,14 +0,0 @@ ---- Linux-PAM-1.1.8.orig/modules/pam_time/pam_time.c 2013-06-18 16:11:21.000000000 +0200 -+++ Linux-PAM-1.1.8/modules/pam_time/pam_time.c 2014-05-24 10:49:28.000000000 +0200 -@@ -554,9 +554,11 @@ check_account(pam_handle_t *pamh, const - continue; - } - /* If buffer starts with @, we are using netgroups */ -+#ifdef HAVE_INNETGR - if (buffer[0] == '@') - good &= innetgr (&buffer[1], NULL, user, NULL); - else -+#endif - good &= logic_field(pamh, user, buffer, count, is_same); - D(("with user: %s", good ? "passes":"fails" )); - diff --git a/package/pcre/Makefile b/package/pcre/Makefile index c9814fbae..8964db4aa 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -46,3 +46,4 @@ libpcrecpp-install: include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk + diff --git a/package/pcre2/Makefile b/package/pcre2/Makefile index 3bd0d9935..fb2444c06 100644 --- a/package/pcre2/Makefile +++ b/package/pcre2/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pcre2 -PKG_VERSION:= 10.42 +PKG_VERSION:= 10.45 PKG_RELEASE:= 1 -PKG_HASH:= a8e52a9bd1bca8f51c5c24823adc2a99acb12288e289a6507090c1a4a4815010 +PKG_HASH:= 35ce7d21f511c4a81d7079164077d25fbc41af00f19e1b547801df905c5f0fab PKG_DESCR:= perl compatible regular expression library PKG_SECTION:= libs/misc PKG_BUILDDEP:= cmake-host @@ -23,13 +23,11 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,PCRE2,pcre2,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,PCRE2,pcre2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -HOST_STYLE:= cmake +HOST_CONFIG_STYLE:= cmake +HOST_CMAKE_FLAGS+= -DBUILD_SHARED_LIBS=ON CONFIG_STYLE:= cmake -CMAKE_FLAGS+= -DBUILD_SHARED_LIBS=ON - -pcre2-hostinstall: - cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -j${ADK_MAKE_JOBS} -f ${MAKE_FILE} \ - ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} +CMAKE_FLAGS+= -DBUILD_SHARED_LIBS=ON \ + -DPCRE2_BUILD_TESTS=OFF pcre2-install: $(INSTALL_DIR) $(IDIR_PCRE2)/usr/lib diff --git a/package/perl/Makefile b/package/perl/Makefile index 788d08745..4da8aaabd 100644 --- a/package/perl/Makefile +++ b/package/perl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= perl -PKG_VERSION:= 5.38.2 +PKG_VERSION:= 5.40.2 PKG_RELEASE:= 1 -PKG_HASH:= d91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 +PKG_HASH:= 0551c717458e703ef7972307ab19385edfa231198d88998df74e12226abf563b PKG_DESCR:= perl interpreter PKG_SECTION:= dev/lang PKG_NEEDS:= threads @@ -14,7 +14,7 @@ PKG_URL:= http://www.perl.org/ PKG_SITES:= http://www.cpan.org/src/ PKG_NOPARALLEL:= 1 -PC_VERSION:= 1.5.2 +PC_VERSION:= 1.6.2 PC_SITE:= https://github.com/arsv/perl-cross/releases/download/$(PC_VERSION) include ${ADK_TOPDIR}/mk/host.mk @@ -36,7 +36,9 @@ CONFIGURE_ARGS:= --target=$(GNU_TARGET_NAME) \ -Dmyuname="$(ADK_VENDOR)" \ -Dosname=linux \ -Dosvers=4.0 \ - -Dperladmin=root + -Dperladmin=root \ + -Ud_strlcat \ + -Ud_strlcpy ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) CONFIGURE_ARGS+= --all-static --no-dynaloader diff --git a/package/php/Makefile b/package/php/Makefile index 7b9a1e81b..0c6fd2389 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 8.3.2 +PKG_VERSION:= 8.3.11 PKG_RELEASE:= 1 -PKG_HASH:= 4ffa3e44afc9c590e28dc0d2d31fc61f0139f8b335f11880a121b9f9b9f0634e +PKG_HASH:= b862b098a08ab9bf4b36ed12c7d0d9f65353656b36fb0e3c5344093aceb35802 PKG_DESCR:= php language interpreter PKG_SECTION:= dev/lang PKG_NEEDS:= threads @@ -34,6 +34,8 @@ PKGFB_MOD_CURL:= curl PKGFS_MOD_CURL:= libcurl PKGFD_MOD_FTP:= ftp support PKGFD_MOD_GD:= gd support +PKGFB_MOD_GD:= libpng +PKGFS_MOD_GD:= libpng PKGFD_MOD_GMP:= gmp support PKGFB_MOD_GMP:= gmp PKGFS_MOD_GMP:= libgmp @@ -44,8 +46,8 @@ PKGFD_MOD_MARIADB:= mariadb support PKGFS_MOD_MARIADB:= libmariadbclient PKGFB_MOD_MARIADB:= mariadb PKGFD_MOD_SSL:= ssl support -PKGFB_MOD_SSL:= libressl -PKGFS_MOD_SSL:= libressl +PKGFB_MOD_SSL:= openssl +PKGFS_MOD_SSL:= libopenssl PKGFD_MOD_PCNTL:= process control support PKGFD_MOD_SESSION:= session support PKGFD_MOD_SNMP:= snmp support diff --git a/package/pinentry/Makefile b/package/pinentry/Makefile index 93fd39c59..d0fae2eb6 100644 --- a/package/pinentry/Makefile +++ b/package/pinentry/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pinentry -PKG_VERSION:= 1.2.0 +PKG_VERSION:= 1.3.2 PKG_RELEASE:= 1 -PKG_HASH:= 10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470 +PKG_HASH:= 8e986ed88561b4da6e9efe0c54fa4ca8923035c99264df0b0464497c5fb94e9e PKG_DESCR:= pinentry application PKG_SECTION:= app/crypto PKG_URL:= https://www.gnupg.org diff --git a/package/pixman/Makefile b/package/pixman/Makefile index 71cca40fb..1841acab2 100644 --- a/package/pixman/Makefile +++ b/package/pixman/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pixman -PKG_VERSION:= 0.34.0 +PKG_VERSION:= 0.44.2 PKG_RELEASE:= 1 -PKG_HASH:= 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e +PKG_HASH:= 6349061ce1a338ab6952b92194d1b0377472244208d47ff25bef86fc71973466 PKG_DESCR:= pixel manipulation library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= libpng -HOST_BUILDDEP:= libpng-host +PKG_BUILDDEP:= libpng meson-host +HOST_BUILDDEP:= libpng-host meson-host PKG_SITES:= http://www.cairographics.org/releases/ PKG_OPTS:= dev @@ -22,9 +22,15 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,PIXMAN,pixman,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,PIXMAN,pixman,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -HOST_STYLE:= auto -CONFIGURE_ARGS+= --disable-gtk \ - --disable-arm-iwmmxt +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +MESON_FLAGS+= -Dtests=disabled \ + -Ddemos=disabled + +HOST_STYLE:= meson +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson pixman-install: ${INSTALL_DIR} ${IDIR_PIXMAN}/usr/lib diff --git a/package/pixman/patches/patch-Makefile_in b/package/pixman/patches/patch-Makefile_in deleted file mode 100644 index cebc19113..000000000 --- a/package/pixman/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- pixman-0.32.4.orig/Makefile.in 2013-11-18 03:11:20.000000000 +0100 -+++ pixman-0.32.4/Makefile.in 2014-03-30 21:54:18.000000000 +0200 -@@ -369,7 +369,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = pixman demos test -+SUBDIRS = pixman - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = pixman-1.pc - GPGKEY = 3892336E diff --git a/package/pkgconf/Makefile b/package/pkgconf/Makefile index 77dbba517..38f9b4c4a 100644 --- a/package/pkgconf/Makefile +++ b/package/pkgconf/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pkgconf -PKG_VERSION:= 1.1.0 -PKG_RELEASE:= 2 -PKG_HASH:= 5f1ef65d73a880fa5e7012102a17f7b32010e5e46139aed85851a541ba828a63 +PKG_VERSION:= 2.3.0 +PKG_RELEASE:= 1 +PKG_HASH:= 3a9080ac51d03615e7c1910a0a2a8df08424892b5f13b0628a204d3fcce0ea8b PKG_DESCR:= smart pkg-config replacement PKG_SECTION:= dev/tools HOST_BUILDDEP:= sed-host diff --git a/package/pkgconf/patches/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch b/package/pkgconf/patches/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch new file mode 100644 index 000000000..986058d40 --- /dev/null +++ b/package/pkgconf/patches/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch @@ -0,0 +1,150 @@ +From c912e9bb8d5be414fda74b2019deb2a6d2d041a0 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +Date: Sun, 16 Dec 2018 11:52:18 +0100 +Subject: [PATCH] Only prefix with the sysroot a subset of variables + +The standard logic of pkg-config is to prefix all absolute paths by +the sysroot defined in PKG_CONFIG_SYSROOT_DIR. However, while some +paths (like includedir, libdir, and paths used in -L and -I options) +indeed need to be prefixed by the sysroot, it is not necessarily the +case for paths that are used on the target. If they get prefixed by +the sysroot, the runtime path on the target is incorrect. + +Unfortunately, pkg-config doesn't have a sense of which path needs to +be prefixed by the sysroot, and which path should not be prefixed by +the sysroot. + +So, let's simply have a whitelist of paths that should be prefixed: +g_ir_scanner, g_ir_compiler, g_ir_generate, includedir, libdir, mapdir, +pkgdatadir and sdkdir. This list of variables was collected over years of +Buildroot development. All other paths are not prefixed by the sysroot. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +[Updated to include gobject-introspection paths] +Signed-off-by: Adam Duskett <aduskett@gmail.com> +[Dropped the pkgdatadir path] +Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com> +--- + libpkgconf/tuple.c | 64 ++++++++++++++++++++++++++++++++-------------- + 1 file changed, 45 insertions(+), 19 deletions(-) + +diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c +index 83f6a47..d56fcec 100644 +--- a/libpkgconf/tuple.c ++++ b/libpkgconf/tuple.c +@@ -178,6 +178,20 @@ dequote(const char *value) + return buf; + } + ++static char * ++pkgconf_tuple_parse_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags, bool add_sysroot); ++ ++const char *sysrooted_keys[] = { ++ "g_ir_scanner", ++ "g_ir_compiler", ++ "g_ir_generate", ++ "includedir", ++ "libdir", ++ "mapdir", ++ "sdkdir", ++ NULL, ++}; ++ + static const char * + find_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars) + { +@@ -237,14 +251,20 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch + { + char *dequote_value; + pkgconf_tuple_t *tuple = calloc(1, sizeof(pkgconf_tuple_t)); ++ bool add_sysroot = false; ++ int i; + + pkgconf_tuple_find_delete(list, key); + + dequote_value = dequote(value); + ++ for (i = 0; sysrooted_keys[i] != NULL; i++) ++ if (!strcmp(key, sysrooted_keys[i])) ++ add_sysroot = true; ++ + tuple->key = strdup(key); + if (parse) +- tuple->value = pkgconf_tuple_parse(client, list, dequote_value, flags); ++ tuple->value = pkgconf_tuple_parse_sysroot(client, list, dequote_value, flags, add_sysroot); + else + tuple->value = strdup(dequote_value); + +@@ -294,22 +314,8 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c + return NULL; + } + +-/* +- * !doc +- * +- * .. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags) +- * +- * Parse an expression for variable substitution. +- * +- * :param pkgconf_client_t* client: The pkgconf client object to access. +- * :param pkgconf_list_t* list: The variable list to search for variables (along side the global variable list). +- * :param char* value: The ``key=value`` string to parse. +- * :param uint flags: Any flags to consider while parsing. +- * :return: the variable data with any variables substituted +- * :rtype: char * +- */ +-char * +-pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags) ++static char * ++pkgconf_tuple_parse_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags, bool add_sysroot) + { + char buf[PKGCONF_BUFSIZE]; + const char *ptr; +@@ -318,7 +324,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const + if (!(client->flags & PKGCONF_PKG_PKGF_FDO_SYSROOT_RULES) && + (!(flags & PKGCONF_PKG_PROPF_UNINSTALLED) || (client->flags & PKGCONF_PKG_PKGF_PKGCONF1_SYSROOT_RULES))) + { +- if (*value == '/' && client->sysroot_dir != NULL && strncmp(value, client->sysroot_dir, strlen(client->sysroot_dir))) ++ if (add_sysroot && *value == '/' && client->sysroot_dir != NULL && strncmp(value, client->sysroot_dir, strlen(client->sysroot_dir))) + bptr += pkgconf_strlcpy(buf, client->sysroot_dir, sizeof buf); + } + +@@ -381,7 +387,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const + { + size_t nlen; + +- parsekv = pkgconf_tuple_parse(client, vars, kv, flags); ++ parsekv = pkgconf_tuple_parse_sysroot(client, vars, kv, flags, add_sysroot); + nlen = pkgconf_strlcpy(bptr, parsekv, remain); + free(parsekv); + +@@ -432,6 +438,26 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const + return strdup(buf); + } + ++/* ++ * !doc ++ * ++ * .. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags) ++ * ++ * Parse an expression for variable substitution. ++ * ++ * :param pkgconf_client_t* client: The pkgconf client object to access. ++ * :param pkgconf_list_t* list: The variable list to search for variables (along side the global variable list). ++ * :param char* value: The ``key=value`` string to parse. ++ * :param uint flags: Any flags to consider while parsing. ++ * :return: the variable data with any variables substituted ++ * :rtype: char * ++ */ ++char * ++pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags) ++{ ++ return pkgconf_tuple_parse_sysroot(client, vars, value, flags, true); ++} ++ + /* + * !doc + * +-- +2.43.0 + diff --git a/package/poco/Makefile b/package/poco/Makefile index dfaab9299..70e373a75 100644 --- a/package/poco/Makefile +++ b/package/poco/Makefile @@ -4,18 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= poco -PKG_VERSION:= 1.9.4 +PKG_VERSION:= 1.14.1 PKG_RELEASE:= 1 -PKG_HASH:= 1bcaff7b1f7dfcbe573ddf0bf7e251e93072355ecc468c075339920c97e39c8f +PKG_HASH:= 58e386e48bf82ca84005eb7f5fbf543e1d55ebf2e86c5914185c643cd3951632 PKG_DESCR:= c++ network libraries PKG_SECTION:= libs/misc -PKG_BUILDDEP:= zlib pcre -PKG_DEPENDS:= zlib libpcre +PKG_BUILDDEP:= zlib pcre2 +PKG_DEPENDS:= zlib libpcre2 PKG_URL:= http://pocoproject.org -PKG_SITES:= http://pocoproject.org/releases/poco-1.9.4/ +PKG_SITES:= http://pocoproject.org/releases/poco-1.14.1/ PKG_OPTS:= dev -PKG_LIBC_DEPENDS:= glibc +#PKG_LIBC_DEPENDS:= glibc DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -23,8 +23,11 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,POCO,poco,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +TARGET_LDFLAGS+= -latomic +XAKE_FLAGS+= POCO_TARGET_OSARCH=$(ADK_TARGET_CPU_ARCH) CONFIG_STYLE:= minimal CONFIGURE_ARGS+= --prefix=/usr \ + --ldflags='$(TARGET_LDFLAGS)' \ --no-tests \ --no-samples diff --git a/package/postfix/Makefile b/package/postfix/Makefile index d0944711a..d85399afd 100644 --- a/package/postfix/Makefile +++ b/package/postfix/Makefile @@ -15,7 +15,6 @@ PKG_SITES:= http://de.postfix.org/ftpmirror/official/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_HOST_DEPENDS:= !darwin # missing res_send support in resolver PKG_LIBC_DEPENDS:= glibc musl diff --git a/package/presentproto/Makefile b/package/presentproto/Makefile index b2e8ccd71..b3221f20b 100644 --- a/package/presentproto/Makefile +++ b/package/presentproto/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= presentproto -PKG_VERSION:= 1.0 +PKG_VERSION:= 1.1 PKG_RELEASE:= 1 -PKG_HASH:= 02f8042cb351dd5c3699a0dbdb2ab25f86532efe3e1e3e97897e7f44b5c67040 +PKG_HASH:= 114252e97afb4dfae8b31e6b0d5e24e4babda26b364e2be57abc2f3c30248b87 PKG_DESCR:= present protocol headers PKG_SECTION:= dev/header PKG_SITES:= http://www.x.org/releases/individual/proto/ diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile index 1482463a1..10df39d3c 100644 --- a/package/privoxy/Makefile +++ b/package/privoxy/Makefile @@ -4,14 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= privoxy -PKG_VERSION:= 3.0.26 +PKG_VERSION:= 4.0.0 PKG_RELEASE:= 1 PKG_VARIANT:= stable -PKG_HASH:= 57e415b43ee5dfdca74685cc034053eaae962952fdabd086171551a86abf9cd8 +PKG_HASH:= c08e2ba0049307017bf9d8a63dd2a0dfb96aa0cdeb34ae007776e63eba62a26f PKG_DESCR:= web proxy with advanced filtering capabilities PKG_SECTION:= net/proxy -PKG_DEPENDS:= libpcre -PKG_BUILDDEP:= pcre +PKG_DEPENDS:= libpcre2 +PKG_BUILDDEP:= pcre2 PKG_NEEDS:= threads PKG_URL:= http://www.privoxy.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ijbswa/} @@ -25,7 +25,6 @@ $(eval $(call PKG_template,PRIVOXY,privoxy,${PKG_VERSION}-${PKG_RELEASE},${PKG_D AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --disable-editor \ - --disable-jar-files \ --sysconfdir=/etc/privoxy # uClibc setpgrp does not take arguments CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes \ diff --git a/package/python-mako/Makefile b/package/python-mako/Makefile index bb069a434..0fe5b1923 100644 --- a/package/python-mako/Makefile +++ b/package/python-mako/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= d60a3903dc3bb01a18ad6a89cdbe2e4eadc69c0bc8ef1e3773ba53d44c3f7a34 PKG_DESCR:= fast, expressive, extensible templating engine PKG_SECTION:= dev/tools -PKG_BUILDDEP:= python3-host +HOST_BUILDDEP:= python3-host python-markupsafe-host PKG_SITES:= https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6ddc1dddf9958677f76f5f80c236bd65309d280b166d3e/ DISTFILES:= Mako-$(PKG_VERSION).tar.gz diff --git a/package/python-markupsafe/Makefile b/package/python-markupsafe/Makefile new file mode 100644 index 000000000..16e385c54 --- /dev/null +++ b/package/python-markupsafe/Makefile @@ -0,0 +1,33 @@ +# 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:= python-markupsafe +PKG_VERSION:= 3.0.2 +PKG_RELEASE:= 1 +PKG_HASH:= ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0 +PKG_DESCR:= implements a XML/HTML/XHTML markup safe string +PKG_SECTION:= dev/tools +HOST_BUILDDEP:= python3-host +PKG_SITES:= https://files.pythonhosted.org/packages/b2/97/5d42485e71dfc078108a86d6de8fa46db44a1a9295e89c5d6d4a06e23a62/ + +DISTFILES:= markupsafe-$(PKG_VERSION).tar.gz + +WRKDIST= $(WRKDIR)/markupsafe-$(PKG_VERSION) + +include ${ADK_TOPDIR}/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,PYTHON_MAKO,python-markupsafe,${PKG_VERSION}-${PKG_RELEASE})) + +include $(ADK_TOPDIR)/mk/python3.mk + +HOST_STYLE:= manual + +python-markupsafe-hostinstall: + (cd $(WRKBUILD); PATH='$(HOST_PATH)' python3 ./setup.py install \ + --prefix=$(STAGING_HOST_DIR)/usr) + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/python3-jinja2/Makefile b/package/python3-jinja2/Makefile index 5cde4fc47..3a5108562 100644 --- a/package/python3-jinja2/Makefile +++ b/package/python3-jinja2/Makefile @@ -22,7 +22,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,PYTHON3_JINJA2,python3-jinja2,${PKG_VERSION}-${PKG_RELEASE})) -include $(ADK_TOPDIR)/mk/python.mk +include $(ADK_TOPDIR)/mk/python3.mk HOST_STYLE:= manual diff --git a/package/python-setuptools/Makefile b/package/python3-setuptools/Makefile index 4a05cb202..31c9e85a4 100644 --- a/package/python-setuptools/Makefile +++ b/package/python3-setuptools/Makefile @@ -3,14 +3,14 @@ include $(ADK_TOPDIR)/rules.mk -PKG_NAME:= python-setuptools -PKG_VERSION:= 69.0.3 +PKG_NAME:= python3-setuptools +PKG_VERSION:= 78.1.0 PKG_RELEASE:= 1 -PKG_HASH:= be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 -PKG_DESCR:= python setuptools +PKG_HASH:= 18fd474d4a82a5f83dac888df697af65afa82dec7323d09c3e37d1f14288da54 +PKG_DESCR:= python installer PKG_SECTION:= dev/tools PKG_BUILDDEP:= python3-host -PKG_SITES:= https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7/ +PKG_SITES:= https://files.pythonhosted.org/packages/a9/5a/0db4da3bc908df06e5efae42b44e75c81dd52716e10192ff36d0c1c8e379/ DISTFILES:= setuptools-$(PKG_VERSION).tar.gz @@ -19,13 +19,13 @@ WRKDIST= $(WRKDIR)/setuptools-$(PKG_VERSION) include ${ADK_TOPDIR}/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call HOST_template,PYTHON_SETUPTOOLS,python-setuptools,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call HOST_template,PYTHON3_SETUPTOOLS,python3-setuptools,${PKG_VERSION}-${PKG_RELEASE})) include $(ADK_TOPDIR)/mk/python3.mk HOST_STYLE:= manual -python-setuptools-hostinstall: +python3-setuptools-hostinstall: (cd $(WRKBUILD); PATH='$(HOST_PATH)' python3 ./setup.py install \ --prefix=$(STAGING_HOST_DIR)/usr) diff --git a/package/python3-yaml/Makefile b/package/python3-yaml/Makefile new file mode 100644 index 000000000..ea4abc415 --- /dev/null +++ b/package/python3-yaml/Makefile @@ -0,0 +1,33 @@ +# 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:= python3-yaml +PKG_VERSION:= 6.0.2 +PKG_RELEASE:= 1 +PKG_HASH:= d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e +PKG_DESCR:= fast, expressive, extensible templating engine +PKG_SECTION:= dev/tools +PKG_BUILDDEP:= python3-host +PKG_SITES:= https://files.pythonhosted.org/packages/54/ed/79a089b6be93607fa5cdaedf301d7dfb23af5f25c398d5ead2525b063e17/ + +DISTFILES:= pyyaml-$(PKG_VERSION).tar.gz + +WRKDIST= $(WRKDIR)/pyyaml-$(PKG_VERSION) + +include ${ADK_TOPDIR}/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,PYTHON3_YAML,python3-yaml,${PKG_VERSION}-${PKG_RELEASE})) + +include $(ADK_TOPDIR)/mk/python3.mk + +HOST_STYLE:= manual + +python3-yaml-hostinstall: + (cd $(WRKBUILD); PATH='$(HOST_PATH)' python3 ./setup.py install \ + --prefix=$(STAGING_HOST_DIR)/usr) + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/python3/Makefile b/package/python3/Makefile index 3d8761af2..bbe408591 100644 --- a/package/python3/Makefile +++ b/package/python3/Makefile @@ -4,20 +4,20 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= python3 -PKG_VERSION:= 3.11.8 +PKG_VERSION:= 3.13.8 PKG_RELEASE:= 1 -PKG_HASH:= 9e06008c8901924395bc1da303eac567a729ae012baa182ab39269f650383bb3 +PKG_HASH:= b9910730526b298299b46b35595ced9055722df60c06ad6301f6a4e2c728a252 PKG_DESCR:= python scripting language PKG_SECTION:= dev/lang PKG_DEPENDS:= libffi zlib libexpat PKG_BUILDDEP:= python3-host libffi zlib expat -HOST_BUILDDEP:= libffi-host libressl-host zlib-host bzip2-host ncurses-host sqlite-host +HOST_BUILDDEP:= libffi-host openssl-host zlib-host bzip2-host ncurses-host sqlite-host PKG_NEEDS:= threads 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_LIBRESSL MOD_OPENSSL MOD_READLINE +PKG_FLAVOURS_PYTHON3+= MOD_NCURSES MOD_OPENSSL MOD_READLINE PKGFD_MOD_ZLIB:= zlib support PKGFB_MOD_ZLIB:= zlib @@ -37,9 +37,6 @@ PKGFS_MOD_NCURSES:= libncurses PKGFD_MOD_READLINE:= readline support PKGFB_MOD_READLINE:= readline PKGFS_MOD_READLINE:= libreadline -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 @@ -55,9 +52,9 @@ define PKG_mod_template INSTALL_MODS_$${ADK_PACKAGE_${1}}+= ${2}-install ${2}-install: - ${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/python3.11/lib-dynload + ${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/python3.13/lib-dynload for m in ${2}; do \ - ${INSTALL_DATA} $(WRKINST)/usr/lib/python3.11/lib-dynload/$$$${m}*.so $$(IDIR_$(1))/usr/lib/python3.11/lib-dynload ;\ + ${INSTALL_DATA} $(WRKINST)/usr/lib/python3.13/lib-dynload/$$$${m}*.so $$(IDIR_$(1))/usr/lib/python3.13/lib-dynload ;\ done endef @@ -70,7 +67,6 @@ $(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_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})) @@ -79,17 +75,17 @@ $(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_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 FAKE_FLAGS+= ENSUREPIP=no CONFIGURE_ARGS:= --with-system-expat \ - --disable-ipv6 \ - --with-build-python + --disable-test-modules \ + --with-build-python=$(STAGING_HOST_DIR)/usr/bin/python3 CONFIGURE_ENV+= ac_cv_have_long_long_format=yes \ + ac_cv_buggy_getaddrinfo=no \ ac_cv_file__dev_ptmx=yes \ ac_cv_file__dev_ptc=no \ ac_cv_header_libintl_h=no @@ -102,15 +98,15 @@ endif python3-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/bin ${IDIR_PYTHON3}/usr/lib - ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/lib/python3.11 - ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/include/python3.11 + ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/lib/python3.13 + ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/include/python3.13 ${INSTALL_BIN} ${WRKINST}/usr/bin/python3 ${IDIR_PYTHON3}/usr/bin ${CP} ${WRKINST}/usr/lib/libpython*.so* ${IDIR_PYTHON3}/usr/lib - ${CP} ${WRKINST}/usr/lib/python3.11/* ${IDIR_PYTHON3}/usr/lib/python3.11 - ${CP} ${WRKINST}/usr/include/python3.11/pyconfig.h \ - ${IDIR_PYTHON3}/usr/include/python3.11 + ${CP} ${WRKINST}/usr/lib/python3.13/* ${IDIR_PYTHON3}/usr/lib/python3.13 + ${CP} ${WRKINST}/usr/include/python3.13/pyconfig.h \ + ${IDIR_PYTHON3}/usr/include/python3.13 @-for i in zlib _bz2 _curses _ssl _gdbm _sqlite pyexpat readline; do \ - rm ${IDIR_PYTHON3}/usr/lib/python3.11/lib-dynload/$${i}*so; \ + rm ${IDIR_PYTHON3}/usr/lib/python3.13/lib-dynload/$${i}*so; \ done include ${ADK_TOPDIR}/mk/host-bottom.mk diff --git a/package/quickjs/Makefile b/package/quickjs/Makefile new file mode 100644 index 000000000..68ed4982e --- /dev/null +++ b/package/quickjs/Makefile @@ -0,0 +1,29 @@ +# 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:= quickjs +PKG_VERSION:= 2024-01-13 +PKG_RELEASE:= 1 +PKG_HASH:= 3c4bf8f895bfa54beb486c8d1218112771ecfc5ac3be1036851ef41568212e03 +PKG_DESCR:= javascript engine +PKG_SECTION:= dev/lang +PKG_URL:= https://bellard.org/quickjs/ +PKG_SITES:= https://bellard.org/quickjs/ + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,QUICKJS,quickjs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +XAKE_FLAGS+= CROSS_PREFIX=$(TARGET_CROSS) +TARGET_CFLAGS:= +TARGET_LDFLAGS+= -latomic +CONFIG_STYLE:= manual + +quickjs-install: + $(INSTALL_DIR) $(IDIR_QUICKJS)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/qjs \ + $(IDIR_QUICKJS)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/quickjs/patches/patch-Makefile b/package/quickjs/patches/patch-Makefile new file mode 100644 index 000000000..cbe266da6 --- /dev/null +++ b/package/quickjs/patches/patch-Makefile @@ -0,0 +1,29 @@ +--- quickjs-2024-01-13.orig/Makefile 2024-01-13 11:20:39.000000000 +0100 ++++ quickjs-2024-01-13/Makefile 2025-03-31 22:09:50.810771963 +0200 +@@ -28,7 +28,7 @@ endif + # Windows cross compilation from Linux + #CONFIG_WIN32=y + # use link time optimization (smaller and faster executables but slower build) +-CONFIG_LTO=y ++#CONFIG_LTO=y + # consider warnings as errors (for development) + #CONFIG_WERROR=y + # force 32 bit build for some utilities +@@ -37,7 +37,7 @@ CONFIG_LTO=y + #CONFIG_COSMO=y + + # installation directory +-PREFIX?=/usr/local ++PREFIX?=/usr + + # use the gprof profiler + #CONFIG_PROFILE=y +@@ -217,7 +217,7 @@ ifneq ($(CROSS_PREFIX),) + + $(QJSC): $(OBJDIR)/qjsc.host.o \ + $(patsubst %.o, %.host.o, $(QJS_LIB_OBJS)) +- $(HOST_CC) $(LDFLAGS) -o $@ $^ $(HOST_LIBS) ++ $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ $^ $(HOST_LIBS) + + endif #CROSS_PREFIX + diff --git a/package/readline/Makefile b/package/readline/Makefile index 8ac34cceb..3db889ad9 100644 --- a/package/readline/Makefile +++ b/package/readline/Makefile @@ -4,13 +4,11 @@ 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 -PKG_BUILDDEP:= ncurses PKG_SITES:= ${MASTER_SITE_GNU:=readline/} PKG_LIBNAME:= libreadline PKG_OPTS:= dev @@ -23,9 +21,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,READLINE,readline,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBREADLINE,libreadline,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ARGS+= --with-curses -TARGET_LDFLAGS+= -ltinfo - libreadline-install: ${INSTALL_DIR} ${IDIR_LIBREADLINE}/usr/lib ${CP} ${WRKINST}/usr/lib/libhistory.so* ${IDIR_LIBREADLINE}/usr/lib diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile index b0c175a04..f4eb1c9f5 100644 --- a/package/rpcbind/Makefile +++ b/package/rpcbind/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= rpcbind -PKG_VERSION:= 1.2.6 +PKG_VERSION:= 1.2.7 PKG_RELEASE:= 1 -PKG_HASH:= 5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de +PKG_HASH:= f6edf8cdf562aedd5d53b8bf93962d61623292bfc4d47eedd3f427d84d06f37e PKG_DESCR:= converts rpc program numbers into universal addresses PKG_SECTION:= net/misc PKG_DEPENDS:= libtirpc diff --git a/package/rsync/Makefile b/package/rsync/Makefile index 9971074f3..b18291929 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -4,14 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= rsync -PKG_VERSION:= 3.2.7 +PKG_VERSION:= 3.4.1 PKG_RELEASE:= 1 -PKG_HASH:= 4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb +PKG_HASH:= 2924bcb3a1ed8b551fc101f740b9f0fe0a202b115027647cf69850d65fd88c52 PKG_DESCR:= utility that provides fast incremental file transfer PKG_SECTION:= net/misc -PKG_DEPENDS:= libpopt libressl -PKG_BUILDDEP:= popt libressl -HOST_BUILDDEP:= libressl-host +PKG_DEPENDS:= libpopt libopenssl +PKG_BUILDDEP:= popt openssl +HOST_BUILDDEP:= openssl-host PKG_URL:= http://rsync.samba.org/ PKG_SITES:= http://rsync.samba.org/ftp/rsync/ @@ -28,7 +28,6 @@ HOST_CONFIGURE_ARGS:= --disable-xxhash \ --disable-lz4 CONFIGURE_ARGS:= --disable-xxhash \ --disable-zstd \ - --disable-simd \ --disable-lz4 rsync-install: diff --git a/package/ruby/Makefile b/package/ruby/Makefile index f0a55595b..8553eb5c5 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -4,17 +4,17 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= ruby -PKG_VERSION:= 3.3.0 +PKG_VERSION:= 3.4.6 PKG_RELEASE:= 1 -PKG_HASH:= 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b +PKG_HASH:= 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 PKG_DESCR:= scripting language PKG_SECTION:= dev/lang -PKG_DEPENDS:= libressl zlib -PKG_BUILDDEP:= ruby-host libressl zlib -HOST_BUILDDEP:= libressl-host +PKG_DEPENDS:= libopenssl zlib +PKG_BUILDDEP:= ruby-host openssl zlib +HOST_BUILDDEP:= openssl-host yaml-host PKG_NEEDS:= threads PKG_URL:= http://www.ruby-lang.org/ -PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/3.3/ +PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/3.4/ include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile index 8b977427d..3e6e625d9 100644 --- a/package/rxvt-unicode/Makefile +++ b/package/rxvt-unicode/Makefile @@ -10,7 +10,7 @@ PKG_HASH:= fe1c93d12f385876457a989fc3ae05c0915d2692efc59289d0f70fabe5b44d2d PKG_DESCR:= terminal emulator with unicode support PKG_SECTION:= x11/apps PKG_DEPENDS:= libx11 fontconfig libxft libxml2 gdk-pixbuf libptytty -PKG_DEPENDS+= libffi libmount +PKG_DEPENDS+= libffi libmount glib PKG_BUILDDEP:= libX11 fontconfig libXft libxml2 gdk-pixbuf libptytty PKG_BUILDDEP+= libffi util-linux PKG_NEEDS:= c++ diff --git a/package/samba/Makefile b/package/samba/Makefile index e47d34af3..63085b06a 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= samba PKG_VERSION:= 4.19.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c PKG_DESCR:= file and print server PKG_SECTION:= net/fs @@ -68,8 +68,11 @@ pre-configure: echo 'Checking uname machine type: "$(ADK_TARGET_ARCH)"' >>$(WRKSRC)/cache.txt ifneq ($(ADK_LINUX_64),) echo 'Checking for a 64-bit host to support lmdb: OK' >>$(WRKSRC)/cache.txt + echo 'Checking for large file support without additional flags: OK' >>$(WRKSRC)/cache.txt else echo 'Checking for a 64-bit host to support lmdb: NO' >>$(WRKSRC)/cache.txt + echo 'Checking for large file support without additional flags: NO' >>$(WRKSRC)/cache.txt + echo 'Checking for -D_FILE_OFFSET_BITS=64: OK' >>$(WRKSRC)/cache.txt endif samba-install: diff --git a/package/samba/files/cache.txt b/package/samba/files/cache.txt index 9ab9fcd5b..e08011165 100644 --- a/package/samba/files/cache.txt +++ b/package/samba/files/cache.txt @@ -2,8 +2,6 @@ Checking simple C program: OK rpath library support: OK -Wl,--version-script support: OK Checking getconf LFS_CFLAGS: NO -Checking for large file support without additional flags: OK -Checking for -D_LARGE_FILES: OK Checking correct behavior of strtoll: NO Checking for working strptime: OK Checking for C99 vsnprintf: OK diff --git a/package/sash/Makefile b/package/sash/Makefile index 03c12a965..370a0bd7a 100644 --- a/package/sash/Makefile +++ b/package/sash/Makefile @@ -16,6 +16,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,SASH,sash,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +#TARGET_CFLAGS:= -Wno-incompatible-pointer-types CONFIG_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/screen/Makefile b/package/screen/Makefile index 1756f3166..9aa49a79f 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= screen -PKG_VERSION:= 4.9.0 +PKG_VERSION:= 5.0.1 PKG_RELEASE:= 1 -PKG_HASH:= f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4 +PKG_HASH:= 2dae36f4db379ffcd14b691596ba6ec18ac3a9e22bc47ac239789ab58409869d PKG_DESCR:= window manager for the terminal session PKG_SECTION:= sys/utils -PKG_DEPENDS:= libncurses libelf -PKG_BUILDDEP:= ncurses libelf +PKG_DEPENDS:= libncurses +PKG_BUILDDEP:= ncurses PKG_NEEDS:= mmu PKG_URL:= http://www.gnu.org/software/screen/ PKG_SITES:= ${MASTER_SITE_GNU:=screen/} @@ -21,19 +21,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,SCREEN,screen,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf -TARGET_LDFLAGS+= -ltinfo -CONFIGURE_ENV+= $(foreach flag,rename fchmod fchown strerror lstat _exit utimes vsnprintf getcwd setlocale strftime,ac_cv_func_${flag}=yes) -CONFIGURE_ARGS+= --with-sys-screenrc=/etc/screenrc - -pre-build: - echo '#undef UTMPOK' >> ${WRKBUILD}/config.h - echo '#undef LOGINDEFAULT' >> ${WRKBUILD}/config.h - echo '#define LOGINDEFAULT 0' >> ${WRKBUILD}/config.h - echo '#undef GETUTENT' >> ${WRKBUILD}/config.h - echo '#undef UTHOST' >> ${WRKBUILD}/config.h - echo '#undef BUGGYGETLOGIN' >> ${WRKBUILD}/config.h - mv ${WRKBUILD}/sched.h ${WRKBUILD}/my_sched.h +CONFIGURE_ARGS+= --disable-pam screen-install: ${INSTALL_DIR} ${IDIR_SCREEN}/usr/bin diff --git a/package/screen/patches/patch-pty_c b/package/screen/patches/patch-pty_c deleted file mode 100644 index 90d5636b4..000000000 --- a/package/screen/patches/patch-pty_c +++ /dev/null @@ -1,15 +0,0 @@ ---- screen-4.2.1.orig/pty.c 2014-04-26 12:58:35.000000000 +0200 -+++ screen-4.2.1/pty.c 2014-05-01 13:04:48.000000000 +0200 -@@ -39,9 +39,9 @@ - #endif - - /* for solaris 2.1, Unixware (SVR4.2) and possibly others */ --#ifdef HAVE_STROPTS_H --# include <sys/stropts.h> --#endif -+//#ifdef HAVE_STROPTS_H -+//# include <sys/stropts.h> -+//#endif - - #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL) - # include <sys/ttold.h> diff --git a/package/screen/patches/patch-sched_h b/package/screen/patches/patch-sched_h deleted file mode 100644 index 56508f1cd..000000000 --- a/package/screen/patches/patch-sched_h +++ /dev/null @@ -1,20 +0,0 @@ ---- screen-4.2.1.orig/sched.h 2014-04-26 12:58:35.000000000 +0200 -+++ screen-4.2.1/sched.h 2014-05-01 13:04:48.000000000 +0200 -@@ -27,6 +27,11 @@ - * $Id$ GNU - */ - -+#ifndef __SCHED_H -+#define __SCHED_H -+ -+#include <sys/time.h> -+ - struct event - { - struct event *next; -@@ -46,3 +51,5 @@ struct event - #define EV_READ 1 - #define EV_WRITE 2 - #define EV_ALWAYS 3 -+ -+#endif diff --git a/package/screen/patches/patch-screen_h b/package/screen/patches/patch-screen_h deleted file mode 100644 index ef6e5ea54..000000000 --- a/package/screen/patches/patch-screen_h +++ /dev/null @@ -1,11 +0,0 @@ ---- screen-4.2.1.orig/screen.h 2014-04-28 00:08:06.000000000 +0200 -+++ screen-4.2.1/screen.h 2015-02-19 02:36:51.299000393 +0100 -@@ -43,7 +43,7 @@ - #include "osdef.h" - - #include "ansi.h" --#include "sched.h" -+#include "my_sched.h" - #include "acls.h" - #include "comm.h" - #include "layer.h" diff --git a/package/sed/Makefile b/package/sed/Makefile index c265dfe1b..d0eababa6 100644 --- a/package/sed/Makefile +++ b/package/sed/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= sed -PKG_VERSION:= 4.4 +PKG_VERSION:= 4.9 PKG_RELEASE:= 1 -PKG_HASH:= cbd6ebc5aaf080ed60d0162d7f6aeae58211a1ee9ba9bb25623daa6cd942683b +PKG_HASH:= 6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181 PKG_DESCR:= stream editor PKG_SECTION:= base/tools PKG_URL:= http://www.gnu.org/software/sed/ diff --git a/package/simpleinit/Makefile b/package/simpleinit/Makefile index 4de28ba48..91fe5141f 100644 --- a/package/simpleinit/Makefile +++ b/package/simpleinit/Makefile @@ -20,6 +20,7 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual TARGET_CPPFLAGS+= -DCONFIG_USER_INIT_CONSOLE_SH +TARGET_CFLAGS+= -Wno-incompatible-pointer-types do-build: PATH='$(HOST_PATH)' \ diff --git a/package/snort/Makefile b/package/snort/Makefile deleted file mode 100644 index 1c044e190..000000000 --- a/package/snort/Makefile +++ /dev/null @@ -1,55 +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:= snort -PKG_VERSION:= 2.9.20 -PKG_RELEASE:= 1 -PKG_HASH:= 29400e13f53b1831e0b8b10ec1224a1cbaa6dc1533a5322a20dd80bb84b4981c -PKG_DESCR:= flexible network intrusion detection system -PKG_SECTION:= net/security -PKG_DEPENDS:= libnet libpcap libpcre libtirpc daq -PKG_BUILDDEP:= libnet libpcap pcre libtirpc daq -PKG_URL:= http://www.snort.org/ -PKG_SITES:= https://www.snort.org/downloads/snort/ -PKG_NOPARALLEL:= 1 - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -PKG_LIBC_DEPENDS:= uclibc-ng glibc - -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,SNORT,snort,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -AUTOTOOL_STYLE:= autoreconf -TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/tirpc -TARGET_LDFLAGS+= -ltirpc -CONFIGURE_ENV+= have_inaddr_none=yes -CONFIGURE_ARGS+= --disable-static-daq \ - --disable-open-appid \ - --with-libpcap-includes="${STAGING_TARGET_DIR}/usr/include" \ - --with-libpcap-libraries="${STAGING_TARGET_DIR}/usr/lib" \ - --with-libpcre-includes="${STAGING_TARGET_DIR}/usr/include" \ - --with-libpcre-libraries="${STAGING_TARGET_DIR}/usr/lib" \ - --with-dnet-includes="${STAGING_TARGET_DIR}/usr/include" \ - --with-dnet-libraries="${STAGING_TARGET_DIR}/usr/lib" - -snort-install: - ${INSTALL_DIR} ${IDIR_SNORT}/usr/bin - ${INSTALL_DIR} ${IDIR_SNORT}/etc/snort - ${INSTALL_DATA} ${WRKBUILD}/etc/snort.conf ${IDIR_SNORT}/etc/snort - ${INSTALL_DATA} ${WRKBUILD}/etc/classification.config \ - ${IDIR_SNORT}/etc/snort - ${INSTALL_DATA} ${WRKBUILD}/etc/gen-msg.map \ - ${IDIR_SNORT}/etc/snort - ${INSTALL_DATA} ${WRKBUILD}/etc/reference.config \ - ${IDIR_SNORT}/etc/snort - ${INSTALL_DATA} ${WRKBUILD}/etc/threshold.conf \ - ${IDIR_SNORT}/etc/snort - ${INSTALL_DATA} ${WRKBUILD}/etc/unicode.map \ - ${IDIR_SNORT}/etc/snort - ${INSTALL_BIN} ${WRKINST}/usr/bin/snort ${IDIR_SNORT}/usr/bin - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/snort/files/snort.conffiles b/package/snort/files/snort.conffiles deleted file mode 100644 index a224c4c1d..000000000 --- a/package/snort/files/snort.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/snort/snort.conf -/etc/snort/threshold.conf diff --git a/package/snort/files/snort.init b/package/snort/files/snort.init deleted file mode 100644 index 13a5e302c..000000000 --- a/package/snort/files/snort.init +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -#PKG snort -#INIT 60 -. /etc/rc.conf - -case $1 in -autostop) ;; -autostart) - test x"${snort:-NO}" = x"NO" && exit 0 - test x"$snort" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start - exec sh $0 start - ;; -start) - /usr/sbin/snort $snort_flags - ;; -stop) - kill $(pgrep -f /usr/sbin/snort) - ;; -*) - echo "usage: $0 {start | stop | restart}" - exit 1 -esac -exit $? diff --git a/package/snort/files/snort.postinst b/package/snort/files/snort.postinst deleted file mode 100644 index 764927b00..000000000 --- a/package/snort/files/snort.postinst +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf snort NO -add_rcconf snort_flags "-i eth0.0 -c /etc/snort/snort.conf -D -N -q -s" diff --git a/package/snort/patches/patch-configure b/package/snort/patches/patch-configure deleted file mode 100644 index 915650ed6..000000000 --- a/package/snort/patches/patch-configure +++ /dev/null @@ -1,139 +0,0 @@ ---- snort-2.9.14.1.orig/configure 2019-08-02 08:33:43.000000000 +0200 -+++ snort-2.9.14.1/configure 2019-10-08 14:35:23.506350397 +0200 -@@ -14408,50 +14408,6 @@ _ACEOF - fi - - --# In case INADDR_NONE is not defined (like on Solaris) --have_inaddr_none="no" --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INADDR_NONE" >&5 --$as_echo_n "checking for INADDR_NONE... " >&6; } --if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#include <sys/types.h> --#include <netinet/in.h> --#include <arpa/inet.h> -- --int --main () --{ -- -- if (inet_addr("10,5,2") == INADDR_NONE); -- return 0; -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- have_inaddr_none="yes" --else -- have_inaddr_none="no" --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_inaddr_none" >&5 --$as_echo "$have_inaddr_none" >&6; } --if test "x$have_inaddr_none" = "xno"; then -- --$as_echo "#define INADDR_NONE -1" >>confdefs.h -- --fi - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -14861,45 +14817,6 @@ if test "x$LPCAP" = "xno"; then - fi - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_lex_destroy" >&5 --$as_echo_n "checking for pcap_lex_destroy... " >&6; } --if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#include <pcap.h> -- --int --main () --{ -- -- pcap_lex_destroy(); -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- have_pcap_lex_destroy="yes" --else -- have_pcap_lex_destroy="no" --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pcap_lex_destroy" >&5 --$as_echo "$have_pcap_lex_destroy" >&6; } --if test "x$have_pcap_lex_destroy" = "xyes"; then -- --$as_echo "#define HAVE_PCAP_LEX_DESTROY 1" >>confdefs.h -- --fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_lib_version" >&5 - $as_echo_n "checking for pcap_lib_version... " >&6; } -@@ -15830,38 +15747,7 @@ fi - - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for daq address space ID" >&5 --$as_echo_n "checking for daq address space ID... " >&6; } --if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#include <daq.h> -- --int --main () --{ -- -- DAQ_PktHdr_t hdr; -- hdr.address_space_id = 0; -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- have_daq_address_space_id="yes" --else -- have_daq_address_space_id="no" --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -+have_daq_address_space_id="yes" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_daq_address_space_id" >&5 - $as_echo "$have_daq_address_space_id" >&6; } diff --git a/package/snort/patches/patch-configure_in b/package/snort/patches/patch-configure_in deleted file mode 100644 index 5ed8dc9f1..000000000 --- a/package/snort/patches/patch-configure_in +++ /dev/null @@ -1,279 +0,0 @@ ---- snort-2.9.14.1.orig/configure.in 2019-08-02 08:16:45.000000000 +0200 -+++ snort-2.9.14.1/configure.in 2019-10-08 14:40:16.073097068 +0200 -@@ -70,8 +70,10 @@ case "$host" in - *-linux*) - linux="yes" - AC_DEFINE([LINUX],[1],[Define if Linux]) -- AC_SUBST(extra_incl) -- extra_incl="-I/usr/include/pcap" -+ if test -z "x$with_libpcap_includes"; then -+ AC_SUBST(extra_incl) -+ extra_incl="-I/usr/include/pcap" -+ fi - ;; - *-hpux10*|*-hpux11*) - AC_DEFINE([HPUX],[1],[Define if HP-UX 10 or 11]) -@@ -282,8 +284,8 @@ AC_CHECK_TYPES([int8_t,int16_t,int32_t,i - AC_CHECK_TYPES([boolean]) - - # In case INADDR_NONE is not defined (like on Solaris) -+AC_CACHE_CHECK([for INADDR_NONE], [have_inaddr_none], [ - have_inaddr_none="no" --AC_MSG_CHECKING([for INADDR_NONE]) - AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[ -@@ -296,7 +298,7 @@ AC_RUN_IFELSE( - return 0; - ]])], - [have_inaddr_none="yes"], --[have_inaddr_none="no"]) -+[have_inaddr_none="no"])]) - AC_MSG_RESULT($have_inaddr_none) - if test "x$have_inaddr_none" = "xno"; then - AC_DEFINE([INADDR_NONE],[-1],[For INADDR_NONE definition]) -@@ -429,7 +431,7 @@ if test "x$LPCAP" = "xno"; then - fi - - AC_MSG_CHECKING([for pcap_lex_destroy]) --AC_RUN_IFELSE( -+AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ - #include <pcap.h> -@@ -717,17 +719,11 @@ fi - AC_CHECK_FUNCS([daq_hup_apply] [daq_acquire_with_meta] [daq_dp_add_dc]) - - AC_MSG_CHECKING([for daq real addresses]) --AC_RUN_IFELSE( --[AC_LANG_PROGRAM( --[[ --#include <daq.h> --]], --[[ -- DAQ_PktHdr_t hdr; -- hdr.n_real_dPort = 0; --]])], --[have_daq_real_addresses="yes"], --[have_daq_real_addresses="no"]) -+ -+AC_CHECK_MEMBERS([DAQ_PktHdr_t hdr.n_real_dPort], -+ [have_daq_real_addresses="yes"], -+ [have_daq_real_addresses="no"], -+ [[#include <daq.h>]]) - AC_MSG_RESULT($have_daq_real_addresses) - if test "x$have_daq_real_addresses" = "xyes"; then - AC_DEFINE([HAVE_DAQ_REAL_ADDRESSES],[1], -@@ -771,17 +767,11 @@ if test "x$ac_cv_func_daq_dp_add_dc" = " - fi - - AC_MSG_CHECKING([for daq address space ID]) --AC_RUN_IFELSE( --[AC_LANG_PROGRAM( --[[ --#include <daq.h> --]], --[[ -- DAQ_PktHdr_t hdr; -- hdr.address_space_id = 0; --]])], --[have_daq_address_space_id="yes"], --[have_daq_address_space_id="no"]) -+ -+AC_CHECK_MEMBERS([DAQ_PktHdr_t hdr.address_space_id], -+ [have_daq_address_space_id="yes"], -+ [have_daq_address_space_id="no"], -+ [[#include <daq.h>]]) - AC_MSG_RESULT($have_daq_address_space_id) - if test "x$have_daq_address_space_id" = "xyes"; then - AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1], -@@ -789,17 +779,10 @@ if test "x$have_daq_address_space_id" = - fi - - AC_MSG_CHECKING([for daq flow ID]) --AC_RUN_IFELSE( --[AC_LANG_PROGRAM( --[[ --#include <daq.h> --]], --[[ -- DAQ_PktHdr_t hdr; -- hdr.flow_id = 0; --]])], --[have_daq_flow_id="yes"], --[have_daq_flow_id="no"]) -+AC_CHECK_MEMBERS([DAQ_PktHdr_t hdr.flow_id], -+ [have_daq_flow_id="yes"], -+ [have_daq_flow_id="no"], -+ [[#include <daq.h>]]) - AC_MSG_RESULT($have_daq_flow_id) - if test "x$have_daq_flow_id" = "xyes"; then - AC_DEFINE([HAVE_DAQ_FLOW_ID],[1], -@@ -807,19 +790,10 @@ if test "x$have_daq_flow_id" = "xyes"; t - fi - - AC_MSG_CHECKING([for daq extended flow modifiers]) --AC_RUN_IFELSE( --[AC_LANG_PROGRAM( --[[ --#include <daq.h> --]], --[[ -- DAQ_ModFlow_t mod; -- mod.type = 0; -- mod.length = 0; -- mod.value = NULL; --]])], --[have_daq_ext_modflow="yes"], --[have_daq_ext_modflow="no"]) -+AC_CHECK_MEMBERS([DAQ_ModFlow_t mod.type, DAQ_ModFlow_t mod.length, DAQ_ModFlow_t mod.value], -+ [have_daq_ext_modflow="yes"], -+ [have_daq_ext_modflow="no"], -+ [[#include <daq.h>]]) - AC_MSG_RESULT($have_daq_ext_modflow) - if test "x$have_daq_ext_modflow" = "xyes"; then - CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_EXT_MODFLOW" -@@ -828,19 +802,11 @@ if test "x$have_daq_ext_modflow" = "xyes - fi - - AC_MSG_CHECKING([for daq query flow]) --AC_RUN_IFELSE( --[AC_LANG_PROGRAM( --[[ --#include <daq.h> --]], --[[ -- DAQ_QueryFlow_t mod; -- mod.type = 0; -- mod.length = 0; -- mod.value = NULL; --]])], --[have_daq_queryflow="yes"], --[have_daq_queryflow="no"]) -+ -+AC_CHECK_MEMBERS([DAQ_QueryFlow_t mod.type, DAQ_QueryFlow_t mod.length, DAQ_QueryFlow_t mod.value], -+ [have_daq_queryflow="yes"], -+ [have_daq_queryflow="no"], -+ [[#include <daq.h>]]) - AC_MSG_RESULT($have_daq_queryflow) - if test "x$have_daq_queryflow" = "xyes"; then - CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_QUERYFLOW" -@@ -849,16 +815,11 @@ if test "x$have_daq_queryflow" = "xyes"; - fi - - AC_MSG_CHECKING([for daq data channel flags]) --AC_RUN_IFELSE( --[AC_LANG_PROGRAM( --[[ --#include <daq.h> --]], --[[ -- DAQ_Data_Channel_Params_t params; --]])], --[have_daq_data_channel_flags="yes"], --[have_daq_data_channel_flags="no"]) -+ -+AC_CHECK_MEMBERS([DAQ_Data_Channel_Params_t params.flags], -+ [have_daq_data_channel_flags="yes"], -+ [have_daq_data_channel_flags="no"], -+ [[#include <daq.h>]]) - AC_MSG_RESULT($have_daq_data_channel_flags) - if test "x$have_daq_data_channel_flags" = "xyes"; then - CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_DATA_CHANNEL_PARAMS" -@@ -867,17 +828,10 @@ if test "x$have_daq_data_channel_flags" - fi - - AC_MSG_CHECKING([for separate IP versions on pinhole endpoints]) --AC_RUN_IFELSE( --[AC_LANG_PROGRAM( --[[ --#include <daq.h> --]], --[[ -- DAQ_DP_key_t dpKey; -- dpKey.src_af = 0; --]])], --[have_daq_data_channel_separate_ip_versions="yes"], --[have_daq_data_channel_separate_ip_versions="no"]) -+AC_CHECK_MEMBERS([DAQ_DP_key_t dpKey.src_af], -+ [have_daq_data_channel_separate_ip_versions="yes"], -+ [have_daq_data_channel_separate_ip_versions="no"], -+ [[#include <daq.h>]]) - AC_MSG_RESULT($have_daq_data_channel_separate_ip_versions) - if test "x$have_daq_data_channel_separate_ip_versions" = "xyes"; then - CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_DATA_CHANNEL_SEPARATE_IP_VERSIONS" -@@ -886,7 +840,7 @@ if test "x$have_daq_data_channel_separat - fi - - AC_MSG_CHECKING([for DAQ_VERDICT_RETRY]) --AC_RUN_IFELSE( -+AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ - #include <daq.h> -@@ -904,17 +858,10 @@ if test "x$have_daq_verdict_retry" = "xy - fi - - AC_MSG_CHECKING([for daq packet trace]) --AC_RUN_IFELSE( --[AC_LANG_PROGRAM( --[[ --#include <daq.h> --]], --[[ -- DAQ_PktHdr_t hdr; -- hdr.flags = DAQ_PKT_FLAG_TRACE_ENABLED; --]])], --[have_daq_packet_trace="yes"], --[have_daq_packet_trace="no"]) -+AC_CHECK_MEMBERS([DAQ_PktHdr_t hdr.flags], -+ [have_daq_packet_trace="yes"], -+ [have_daq_packet_trace="no"], -+ [[#include <daq.h>]]) - AC_MSG_RESULT($have_daq_packet_trace) - if test "x$have_daq_packet_trace" = "xyes"; then - AC_DEFINE([HAVE_DAQ_PKT_TRACE],[1], -@@ -924,17 +871,11 @@ else - fi - - AC_MSG_CHECKING([for daq verdict reason]) --AC_RUN_IFELSE( --[AC_LANG_PROGRAM( --[[ --#include <daq.h> --]], --[[ -- DAQ_ModFlow_t fl; -- fl.type = DAQ_MODFLOW_TYPE_VER_REASON; --]])], --[have_daq_verdict_reason="yes"], --[have_daq_verdict_reason="no"]) -+ -+AC_CHECK_MEMBERS([DAQ_ModFlow_t fl.type], -+ [have_daq_verdict_reason="yes"], -+ [have_daq_verdict_reason="no"], -+ [[#include <daq.h>]]) - AC_MSG_RESULT($have_daq_verdict_reason) - if test "x$have_daq_verdict_reason" = "xyes"; then - AC_DEFINE([HAVE_DAQ_VERDICT_REASON],[1], -@@ -959,10 +900,8 @@ fi - - # check for sparc %time register - if eval "echo $host_cpu|grep -i sparc >/dev/null"; then -- OLD_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -mcpu=v9 " - AC_MSG_CHECKING([for sparc %time register]) -- AC_RUN_IFELSE( -+ AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[]], - [[ -@@ -974,8 +913,6 @@ if eval "echo $host_cpu|grep -i sparc >/ - AC_MSG_RESULT($sparcv9) - if test "x$sparcv9" = "xyes"; then - AC_DEFINE([SPARCV9],[1],[For sparc v9 with %time register]) -- else -- CFLAGS="$OLD_CFLAGS" - fi - fi - diff --git a/package/snort/patches/patch-src_dynamic-preprocessors_appid_service_plugins_service_rpc_c b/package/snort/patches/patch-src_dynamic-preprocessors_appid_service_plugins_service_rpc_c deleted file mode 100644 index fee10a196..000000000 --- a/package/snort/patches/patch-src_dynamic-preprocessors_appid_service_plugins_service_rpc_c +++ /dev/null @@ -1,11 +0,0 @@ ---- snort-2.9.14.1.orig/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c 2019-08-02 08:16:46.000000000 +0200 -+++ snort-2.9.14.1/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c 2019-10-08 14:40:22.925536140 +0200 -@@ -32,7 +32,7 @@ - #include "flow.h" - #include "service_api.h" - --#if defined(FREEBSD) || defined(OPENBSD) -+#if defined(FREEBSD) || defined(OPENBSD) || (defined(LINUX) && defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__)) - #include "rpc/rpc.h" - #endif - diff --git a/package/snort/patches/patch-tools_u2boat_Makefile_in b/package/snort/patches/patch-tools_u2boat_Makefile_in deleted file mode 100644 index 24fec7746..000000000 --- a/package/snort/patches/patch-tools_u2boat_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- snort-2.9.14.1.orig/tools/u2boat/Makefile.in 2019-08-02 08:33:42.000000000 +0200 -+++ snort-2.9.14.1/tools/u2boat/Makefile.in 2019-10-08 14:35:23.514350918 +0200 -@@ -327,7 +327,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign - u2boat_SOURCES = u2boat.c u2boat.h --u2boat_CFLAGS = @CFLAGS@ $(AM_CFLAGS) -+#u2boat_CFLAGS = @CFLAGS@ $(AM_CFLAGS) - u2boat_LDADD = -lpcap - dist_doc_DATA = README.u2boat - all: all-am diff --git a/package/snort/patches/patch-tools_u2spewfoo_Makefile_in b/package/snort/patches/patch-tools_u2spewfoo_Makefile_in deleted file mode 100644 index 8583bebb6..000000000 --- a/package/snort/patches/patch-tools_u2spewfoo_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- snort-2.9.14.1.orig/tools/u2spewfoo/Makefile.in 2019-08-02 08:33:42.000000000 +0200 -+++ snort-2.9.14.1/tools/u2spewfoo/Makefile.in 2019-10-08 14:35:23.526351677 +0200 -@@ -298,7 +298,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign - u2spewfoo_SOURCES = u2spewfoo.c --u2spewfoo_CFLAGS = @CFLAGS@ $(AM_CFLAGS) -+#u2spewfoo_CFLAGS = @CFLAGS@ $(AM_CFLAGS) - EXTRA_DIST = \ - u2spewfoo.dsp - diff --git a/package/spandsp/Makefile b/package/spandsp/Makefile deleted file mode 100644 index a54a2fb9e..000000000 --- a/package/spandsp/Makefile +++ /dev/null @@ -1,30 +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:= spandsp -PKG_VERSION:= 7b0b8cf3d42b725405bcc63145de5e280265ce4e -PKG_GIT:= hash -PKG_RELEASE:= 1 -PKG_DESCR:= dsp library -PKG_SECTION:= libs/misc -PKG_BUILDDEP:= libtiff -PKG_DEPENDS:= libtiff -PKG_SITES:= https://github.com/freeswitch/spandsp.git -PKG_OPTS:= dev - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,SPANDSP,spandsp,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) - -AUTOTOOL_STYLE:= autogen -CONFIGURE_ENV+= ac_cv_func_realloc_0_nonnull=yes -CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes - -spandsp-install: - $(INSTALL_DIR) $(IDIR_SPANDSP)/usr/lib - $(CP) $(WRKINST)/usr/lib/libspandsp*.so* \ - $(IDIR_SPANDSP)/usr/lib - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/spdlog/Makefile b/package/spdlog/Makefile index 3d96eecb9..ba38c8468 100644 --- a/package/spdlog/Makefile +++ b/package/spdlog/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= spdlog -PKG_VERSION:= 1.9.2 +PKG_VERSION:= 1.15.3 PKG_RELEASE:= 1 -PKG_HASH:= 6fff9215f5cb81760be4cc16d033526d1080427d236e86d70bb02994f85e3d38 +PKG_HASH:= 15a04e69c222eb6c01094b5c7ff8a249b36bb22788d72519646fb85feb267e67 PKG_DESCR:= very fast, header-only/compiled, C++ logging library PKG_BUILDDEP:= fmt PKG_SECTION:= libs/misc diff --git a/package/squashfs/Makefile b/package/squashfs-tools/Makefile index 77cc880ac..c839e5dde 100644 --- a/package/squashfs/Makefile +++ b/package/squashfs-tools/Makefile @@ -3,33 +3,32 @@ include $(ADK_TOPDIR)/rules.mk -PKG_NAME:= squashfs -PKG_VERSION:= 4.2 +PKG_NAME:= squashfs-tools +PKG_VERSION:= 4.6.1 PKG_RELEASE:= 1 -PKG_HASH:= d9e0195aa922dbb665ed322b9aaa96e04a476ee650f39bbeadb0d00b24022e96 +PKG_HASH:= e847913868349b6336dc73e30ae888010d03485a158188747ff010c13f051440 PKG_DESCR:= squashfs filesystem utilities PKG_SECTION:= sys/fs -HOST_BUILDDEP:= xz-host -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=squashfs/} +PKG_SITES:= https://github.com/plougher/squashfs-tools/archive/refs/tags/ -DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/$(PKG_NAME)${PKG_VERSION} +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_NAME)-${PKG_VERSION} PKG_CFLINE_SQUASHFS:= depends on ADK_HOST_ONLY include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call HOST_template,SQUASHFS,squashfs,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call HOST_template,SQUASHFS-TOOLS,squashfs-tools,$(PKG_VERSION)-${PKG_RELEASE})) HOST_STYLE:= manual -HOST_MAKE_FLAGS+= LZMA_SUPPORT=0 XATTR_SUPPORT=0 XZ_SUPPORT=1 EXTRA_LDFLAGS=$(LDFLAGS_FOR_BUILD) +HOST_MAKE_FLAGS+= LZMA_SUPPORT=0 XATTR_SUPPORT=0 XZ_SUPPORT=0 EXTRA_LDFLAGS=$(LDFLAGS_FOR_BUILD) host-build: (cd ${WRKBUILD}/squashfs-tools && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET}) -squashfs-hostinstall: +squashfs-tools-hostinstall: ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/bin ${INSTALL_BIN} ${WRKBUILD}/squashfs-tools/mksquashfs \ ${STAGING_HOST_DIR}/usr/bin diff --git a/package/squashfs/patches/patch-squashfs-tools_Makefile b/package/squashfs/patches/patch-squashfs-tools_Makefile deleted file mode 100644 index cc764141f..000000000 --- a/package/squashfs/patches/patch-squashfs-tools_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- squashfs4.2.orig/squashfs-tools/Makefile 2011-02-28 21:04:15.000000000 +0100 -+++ squashfs4.2/squashfs-tools/Makefile 2014-03-29 15:02:11.000000000 +0100 -@@ -93,7 +93,7 @@ XATTR_DEFAULT = 1 - # End of BUILD options section # - ############################################### - --INCLUDEDIR = -I. -+INCLUDEDIR = -I. $(CPPFLAGS_FOR_BUILD) - INSTALL_DIR = /usr/local/bin - - MKSQUASHFS_OBJS = mksquashfs.o read_fs.o sort.o swap.o pseudo.o compressor.o diff --git a/package/squashfs/patches/patch-squashfs-tools_mksquashfs_c b/package/squashfs/patches/patch-squashfs-tools_mksquashfs_c deleted file mode 100644 index 877894c6c..000000000 --- a/package/squashfs/patches/patch-squashfs-tools_mksquashfs_c +++ /dev/null @@ -1,47 +0,0 @@ ---- squashfs4.2.orig/squashfs-tools/mksquashfs.c 2011-02-28 23:24:09.000000000 +0100 -+++ squashfs4.2/squashfs-tools/mksquashfs.c 2014-03-29 15:02:16.000000000 +0100 -@@ -60,6 +60,10 @@ - #include <sys/sysinfo.h> - #endif - -+#ifndef FNM_EXTMATCH -+#define FNM_EXTMATCH 0 -+#endif -+ - #ifdef SQUASHFS_TRACE - #define TRACE(s, args...) \ - do { \ -@@ -721,13 +725,13 @@ void cache_block_put(struct file_buffer - + (((char *)A) - data_cache))) - - --inline void inc_progress_bar() -+static inline void inc_progress_bar() - { - cur_uncompressed ++; - } - - --inline void update_progress_bar() -+static inline void update_progress_bar() - { - pthread_mutex_lock(&progress_mutex); - pthread_cond_signal(&progress_wait); -@@ -735,7 +739,7 @@ inline void update_progress_bar() - } - - --inline void waitforthread(int i) -+static inline void waitforthread(int i) - { - TRACE("Waiting for thread %d\n", i); - while(thread[i] != 0) -@@ -3340,7 +3344,7 @@ struct inode_info *lookup_inode(struct s - } - - --inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir, -+static inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir, - struct inode_info *inode_info, struct dir_info *dir) - { - if((dir->count % DIR_ENTRIES) == 0) { diff --git a/package/squashfs/patches/patch-squashfs-tools_unsquashfs_c b/package/squashfs/patches/patch-squashfs-tools_unsquashfs_c deleted file mode 100644 index d57b184de..000000000 --- a/package/squashfs/patches/patch-squashfs-tools_unsquashfs_c +++ /dev/null @@ -1,39 +0,0 @@ ---- squashfs4.2.orig/squashfs-tools/unsquashfs.c 2011-02-28 23:27:06.000000000 +0100 -+++ squashfs4.2/squashfs-tools/unsquashfs.c 2014-03-29 15:02:16.000000000 +0100 -@@ -29,7 +29,13 @@ - #include "compressor.h" - #include "xattr.h" - -+#ifndef FNM_EXTMATCH -+#define FNM_EXTMATCH 0 -+#endif -+ -+#ifdef __linux__ - #include <sys/sysinfo.h> -+#endif - #include <sys/types.h> - - struct cache *fragment_cache, *data_cache; -@@ -1810,7 +1816,7 @@ void initialise_threads(int fragment_buf - "\n"); - - if(processors == -1) { --#ifndef linux -+#if 0 - int mib[2]; - size_t len = sizeof(processors); - -@@ -1821,11 +1827,13 @@ void initialise_threads(int fragment_buf - mib[1] = HW_NCPU; - #endif - -+#ifdef __linux__ - if(sysctl(mib, 2, &processors, &len, NULL, 0) == -1) { - ERROR("Failed to get number of available processors. " - "Defaulting to 1\n"); - processors = 1; - } -+#endif - #else - processors = sysconf(_SC_NPROCESSORS_ONLN); - #endif diff --git a/package/squid/Makefile b/package/squid/Makefile index 93fa2c328..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.1 +PKG_VERSION:= 6.13 PKG_RELEASE:= 1 -PKG_HASH:= 6b029096cf531fc7bf83a305efeb0fdb2628cd42a4d20a61e0ab22e85a39c4e7 +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/package/strace/Makefile b/package/strace/Makefile index dc4541f9c..11360944a 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= strace -PKG_VERSION:= 6.8 +PKG_VERSION:= 6.16 PKG_RELEASE:= 1 -PKG_HASH:= ba6950a96824cdf93a584fa04f0a733896d2a6bc5f0ad9ffe505d9b41e970149 +PKG_HASH:= 3d7aee7e4f044b2f67f3d51a8a76eda18076e9fb2774de54ac351d777d4ebffa PKG_DESCR:= system call trace program PKG_SECTION:= app/debug PKG_URL:= https://strace.io @@ -18,11 +18,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,STRACE,strace,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(OS_FOR_BUILD),Darwin) -XAKE_FLAGS+= CPPFLAGS_FOR_BUILD="-I$(STAGING_TARGET_DIR)/usr/include -I$(LINUX_DIR)/include/uapi -I$(LINUX_DIR)/arch/$(ADK_TARGET_ARCH)/include/generated" -else XAKE_FLAGS+= CPPFLAGS_FOR_BUILD="-I$(LINUX_DIR)/include/uapi -I$(LINUX_DIR)/arch/$(ADK_TARGET_ARCH)/include/generated" -endif ifeq ($(ADK_TARGET_LIB_MUSL),y) TARGET_CPPFLAGS+= -DMSG_EXCEPT=020000 -D_LARGEFILE64_SOURCE=1 diff --git a/package/stress-ng/Makefile b/package/stress-ng/Makefile index d9758801c..607cb922c 100644 --- a/package/stress-ng/Makefile +++ b/package/stress-ng/Makefile @@ -4,16 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= stress-ng -PKG_VERSION:= 0.07.29 +PKG_VERSION:= 0.18.12 PKG_RELEASE:= 1 -PKG_HASH:= 71a9555d1d9ee0a4a9bca9ee14294289ee77e998a951c7071df6cc8e153d8410 -PKG_DESCR:= stress-ng will stress test a computer system in various selectable ways +PKG_HASH:= 20401a5a52a3b3b5d84fbdd561e4daf1076b0368a1ccbbbc8d41af2be6ea6f34 +PKG_DESCR:= stress test a computer system in various selectable ways PKG_SECTION:= sys/utils -PKG_SITES:= http://kernel.ubuntu.com/~cking/tarballs/stress-ng/ +PKG_SITES:= https://github.com/ColinIanKing/stress-ng/archive/refs/tags/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -PKG_CFLINE_STRESS_NG:= depends on ADK_BROKEN +DISTFILES:= V${PKG_VERSION}.tar.gz include ${ADK_TOPDIR}/mk/package.mk @@ -22,12 +20,12 @@ $(eval $(call PKG_template,STRESS_NG,stress-ng,${PKG_VERSION}-${PKG_RELEASE},${P CONFIG_STYLE:= manual BUILD_STYLE:= manual +do-build: + PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} stress-ng + stress-ng-install: ${INSTALL_DIR} ${IDIR_STRESS_NG}/usr/bin/ ${INSTALL_BIN} ${WRKINST}/usr/bin/stress-ng ${IDIR_STRESS_NG}/usr/bin/ -do-build: - PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} stress-ng - include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/stress-ng/patches/patch-Makefile b/package/stress-ng/patches/patch-Makefile new file mode 100644 index 000000000..2548f682c --- /dev/null +++ b/package/stress-ng/patches/patch-Makefile @@ -0,0 +1,25 @@ +--- stress-ng-0.18.12.orig/Makefile 2025-03-30 14:58:32.000000000 +0200 ++++ stress-ng-0.18.12/Makefile 2025-04-24 12:52:34.277715554 +0200 +@@ -127,22 +127,6 @@ SANITIZE_FLAGS := \ + override CFLAGS += $(foreach flag,$(SANITIZE_FLAGS),$(cc_supports_flag)) + endif + +-# +-# Test for hardening flags and apply them if applicable +-# +-MACHINE := $(shell make -f Makefile.machine) +-ifneq ($(PRESERVE_CFLAGS),1) +-ifneq ($(MACHINE),$(filter $(MACHINE),alpha hppa ia64)) +-flag = -Wformat -fstack-protector-strong -Werror=format-security +-# +-# add -D_FORTIFY_SOURCE=2 if _FORTIFY_SOURCE is not already defined +-# +-ifeq ($(shell echo _FORTIFY_SOURCE | $(CC) $(CFLAGS) -E -xc - | tail -1),_FORTIFY_SOURCE) +-flag += -D_FORTIFY_SOURCE=2 +-endif +-override CFLAGS += $(cc_supports_flag) +-endif +-endif + + # + # Optimization flags diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile index b2ce09edf..d8cb5e86d 100644 --- a/package/syslog-ng/Makefile +++ b/package/syslog-ng/Makefile @@ -4,16 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= syslog-ng -PKG_VERSION:= 4.6.0 +PKG_VERSION:= 4.8.1 PKG_RELEASE:= 1 -PKG_HASH:= a5f8b089887767b5e87f523562fc3c6d5ef4dd320fc9b1f44953cb2d6bd50026 +PKG_HASH:= f54acc615215d8efac2955c3d0bfa040b61e39f19f18bd05fa933f587a863d40 PKG_DESCR:= powerful syslog daemon PKG_SECTION:= sys/misc -PKG_BUILDDEP:= cmake-host glib ivykis libressl json-c libnet -PKG_BUILDDEP+= pcre flex -PKG_DEPENDS:= glib ivykis libressl json-c libnet -PKG_URL:= http://www.balabit.com/ -PKG_SITES:= https://github.com/balabit/syslog-ng/archive/ +PKG_BUILDDEP:= cmake-host glib ivykis openssl json-c libnet +PKG_BUILDDEP+= pcre2 flex-host +PKG_DEPENDS:= glib ivykis libopenssl json-c libnet +PKG_SITES:= https://github.com/syslog-ng/syslog-ng/archive/refs/tags/ +PKG_NEEDS:= iconv DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION) @@ -36,6 +36,9 @@ CMAKE_FLAGS+= -DSYSLOG_NG_ENABLE_SYSTEMD=OFF \ syslog-ng-install: ${INSTALL_DIR} ${IDIR_SYSLOG_NG}/usr/sbin \ ${IDIR_SYSLOG_NG}/etc/syslog-ng + ${INSTALL_DIR} ${IDIR_SYSLOG_NG}/usr/lib + ${CP} ${WRKINST}/usr/lib/lib*.so* \ + ${IDIR_SYSLOG_NG}/usr/lib/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/syslog-ng \ ${IDIR_SYSLOG_NG}/usr/sbin/ ${INSTALL_DATA} ./files/syslog-ng.conf \ diff --git a/package/taglib/Makefile b/package/taglib/Makefile index 9297caf75..1a1edec98 100644 --- a/package/taglib/Makefile +++ b/package/taglib/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= taglib -PKG_VERSION:= 1.13.1 +PKG_VERSION:= 2.1.1 PKG_RELEASE:= 1 -PKG_HASH:= c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b +PKG_HASH:= 3716d31f7c83cbf17b67c8cf44dd82b2a2f17e6780472287a16823e70305ddba PKG_DESCR:= audio meta-data library PKG_SECTION:= libs/audio PKG_DEPENDS:= zlib diff --git a/package/talloc/Makefile b/package/talloc/Makefile index a296a7306..0b6c76b78 100644 --- a/package/talloc/Makefile +++ b/package/talloc/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= talloc -PKG_VERSION:= 2.4.2 +PKG_VERSION:= 2.4.3 PKG_RELEASE:= 1 -PKG_HASH:= 85ecf9e465e20f98f9950a52e9a411e14320bc555fa257d87697b7e7a9b1d8a6 +PKG_HASH:= dc46c40b9f46bb34dd97fe41f548b0e8b247b77a918576733c528e83abd854dd PKG_DESCR:= memory allocation library PKG_SECTION:= libs/misc PKG_BUILDDEP:= python3-host python3 diff --git a/package/talloc/patches/patch-wscript b/package/talloc/patches/patch-wscript new file mode 100644 index 000000000..a1d880ed9 --- /dev/null +++ b/package/talloc/patches/patch-wscript @@ -0,0 +1,12 @@ +--- talloc-2.4.3.orig/wscript 2025-02-06 13:36:55.107552800 +0100 ++++ talloc-2.4.3/wscript 2025-04-09 16:37:03.721515766 +0200 +@@ -122,8 +122,7 @@ def build(bld): + public_headers=('' if private_library else 'talloc.h'), + pc_files='talloc.pc', + public_headers_install=not private_library, +- private_library=private_library, +- manpages='man/talloc.3') ++ private_library=private_library) + + if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL'): + name = bld.pyembed_libname('pytalloc-util') diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 1bfaaa7b7..85ef22357 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= tcpdump -PKG_VERSION:= 4.99.4 +PKG_VERSION:= 4.99.5 PKG_RELEASE:= 1 -PKG_HASH:= 0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea +PKG_HASH:= 8c75856e00addeeadf70dad67c9ff3dd368536b2b8563abf6854d7c764cd3adb PKG_DESCR:= tool for network monitoring and data acquisition PKG_SECTION:= net/debug PKG_DEPENDS:= libpcap diff --git a/package/tinyx/Makefile b/package/tinyx/Makefile new file mode 100644 index 000000000..17f79a2df --- /dev/null +++ b/package/tinyx/Makefile @@ -0,0 +1,39 @@ +# 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:= tinyx +PKG_VERSION:= git +PKG_RELEASE:= 1 +PKG_HASH:= db206aeef89104e1bd4cab40508eb1160f8a6bc69848eaf16cbc35eda1c62864 +PKG_DESCR:= tiny x server +PKG_SECTION:= x11/drivers +PKG_DEPENDS:= libxcvt libfontenc xkeyboard-config xkbcomp libxau libxaw +PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext +PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libdrm libxtst +PKG_DEPENDS+= libxshmfence libfreetype libfontenc libxfont +PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto +PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto +PKG_BUILDDEP+= compositeproto evieext xf86dgaproto recordproto dri3proto +PKG_BUILDDEP+= xineramaproto presentproto xf86driproto glproto libXtst +PKG_BUILDDEP+= xorgproto libxcvt font-util-host libXfont +PKG_NEEDS:= threads c++ +PKG_SITES:= https://github.com/tinycorelinux/tinyx.git + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +PKG_CFLINE_TINYX:=depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,TINYX,tinyx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --with-fontdir=/usr/share/fonts/X11 + +tinyx-install: + $(INSTALL_DIR) $(IDIR_TINYX)/usr/bin + ${CP} ${WRKINST}/usr/bin/Xfbdev $(IDIR_TINYX)/usr/bin + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/toolbox/src/lib/fgetln.h b/package/toolbox/src/lib/fgetln.h new file mode 100644 index 000000000..ae655c23d --- /dev/null +++ b/package/toolbox/src/lib/fgetln.h @@ -0,0 +1 @@ +char *fgetln(FILE *, size_t *); diff --git a/package/toolbox/src/sed/main.c b/package/toolbox/src/sed/main.c index afa10d4df..1d9e3ebaa 100644 --- a/package/toolbox/src/sed/main.c +++ b/package/toolbox/src/sed/main.c @@ -53,6 +53,7 @@ #include "defs.h" #include "extern.h" +#include "fgetln.h" __RCSID("$MirOS: src/usr.bin/sed/main.c,v 1.3 2017/11/20 01:23:57 tg Exp $"); diff --git a/package/tor/Makefile b/package/tor/Makefile index fc690de3d..39735dcd5 100644 --- a/package/tor/Makefile +++ b/package/tor/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= tor -PKG_VERSION:= 0.4.8.10 +PKG_VERSION:= 0.4.8.16 PKG_RELEASE:= 1 -PKG_HASH:= e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86 +PKG_HASH:= 6540dd377a120fb8e7d27530aa3b7ff72a0fa5b4f670fe1d64c987c1cfd390cb PKG_DESCR:= anonymous internet communication system PKG_SECTION:= net/proxy -PKG_DEPENDS:= libevent zlib libressl -PKG_BUILDDEP:= libevent zlib libressl +PKG_DEPENDS:= libevent zlib libopenssl +PKG_BUILDDEP:= libevent zlib openssl PKG_NEEDS:= threads PKG_URL:= https://www.torproject.org/ PKG_SITES:= https://www.torproject.org/dist/ diff --git a/package/toybox/Makefile b/package/toybox/Makefile index c32c3aac5..9c54468eb 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,9 +24,16 @@ XAKE_FLAGS+= CC="gcc" V=1 PREFIX="$(WRKINST)" do-configure: -rm $(WRKBUILD)/toys/other/swap*.c - cd $(WRKBUILD); CC="gcc" PATH='$(HOST_PATH)' $(MAKE) defconfig + -rm $(WRKBUILD)/toys/other/gpiod.c + -rm $(WRKBUILD)/toys/other/lsattr.c + -rm $(WRKBUILD)/toys/other/nsenter.c + -rm $(WRKBUILD)/toys/posix/getconf.c + -rm $(WRKBUILD)/toys/posix/iconv.c + cp ./files/config $(WRKBUILD)/.config toybox-install: $(CP) $(WRKINST)/* $(IDIR_TOYBOX)/ + $(INSTALL_DIR) $(IDIR_TOYBOX)/etc + $(CP) ./files/inittab $(IDIR_TOYBOX)/etc include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/toybox/files/config b/package/toybox/files/config new file mode 100644 index 000000000..5a14b8dd2 --- /dev/null +++ b/package/toybox/files/config @@ -0,0 +1,393 @@ +# +# Automatically generated make config: don't edit +# ToyBox version: KCONFIG_VERSION +# Tue Apr 8 13:12:22 2025 +# +# CONFIG_TOYBOX_ON_ANDROID is not set +# CONFIG_TOYBOX_FORK is not set + +# +# Posix commands +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +CONFIG_CHGRP=y +CONFIG_CHOWN=y +CONFIG_CHMOD=y +# CONFIG_CKSUM is not set +# CONFIG_CRC32 is not set +# CONFIG_CMP is not set +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_MV=y +# CONFIG_INSTALL is not set +# CONFIG_CPIO is not set +# CONFIG_CUT is not set +CONFIG_DATE=y +CONFIG_DD=y +CONFIG_DF=y +# CONFIG_DIRNAME is not set +CONFIG_DU=y +CONFIG_ECHO=y +CONFIG_ENV=y +# CONFIG_EXPAND is not set +# CONFIG_FALSE is not set +# CONFIG_FILE is not set +# CONFIG_FIND is not set +# CONFIG_FOLD is not set +# CONFIG_GETCONF is not set +# CONFIG_GREP is not set +# CONFIG_EGREP is not set +# CONFIG_FGREP is not set +# CONFIG_HEAD is not set +# CONFIG_ICONV is not set +# CONFIG_ID is not set +# CONFIG_ID_Z is not set +# CONFIG_GROUPS is not set +# CONFIG_LOGNAME is not set +# CONFIG_WHOAMI is not set +CONFIG_KILL=y +# CONFIG_KILLALL5 is not set +# CONFIG_LINK is not set +CONFIG_LN=y +# CONFIG_LOGGER is not set +CONFIG_LS=y +CONFIG_MKDIR=y +# CONFIG_MKDIR_Z is not set +# CONFIG_MKFIFO is not set +# CONFIG_MKFIFO_Z is not set +# CONFIG_NICE is not set +# CONFIG_NL is not set +# CONFIG_NOHUP is not set +# CONFIG_OD is not set +# CONFIG_PASTE is not set +# CONFIG_PATCH is not set +# CONFIG_PRINTF is not set +CONFIG_PS=y +CONFIG_TOP=y +# CONFIG_IOTOP is not set +# CONFIG_PGREP is not set +# CONFIG_PKILL is not set +CONFIG_PWD=y +# CONFIG_RENICE is not set +CONFIG_RM=y +CONFIG_RMDIR=y +# CONFIG_SED is not set +# CONFIG_SLEEP is not set +# CONFIG_SORT is not set +CONFIG_SORT_FLOAT=y +# CONFIG_SPLIT is not set +# CONFIG_STRINGS is not set +# CONFIG_TAIL is not set +# CONFIG_TAR is not set +# CONFIG_TEE is not set +# CONFIG_TEST is not set +CONFIG_TEST_GLUE=y +# CONFIG_TIME is not set +# CONFIG_TOUCH is not set +# CONFIG_TRUE is not set +# CONFIG_TSORT is not set +# CONFIG_TTY is not set +# CONFIG_ULIMIT is not set +# CONFIG_ARCH is not set +CONFIG_UNAME=y +# CONFIG_UNIQ is not set +# CONFIG_UNLINK is not set +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +# CONFIG_WC is not set +# CONFIG_WHO is not set +CONFIG_XARGS=y + +# +# Pending (unfinished) commands +# +# CONFIG_ARP is not set +# CONFIG_ARPING is not set +# CONFIG_AWK is not set +# CONFIG_BC is not set +# CONFIG_BOOTCHARTD is not set +# CONFIG_BRCTL is not set +# CONFIG_CHSH is not set +# CONFIG_CROND is not set +# CONFIG_CRONTAB is not set +# CONFIG_CSPLIT is not set +# CONFIG_DHCP is not set +# CONFIG_DHCP6 is not set +# CONFIG_DHCPD is not set +# CONFIG_DEBUG_DHCP is not set +# CONFIG_DIFF is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_EXPR is not set +# CONFIG_FDISK is not set +# CONFIG_FSCK is not set +# CONFIG_GETFATTR is not set +CONFIG_GETTY=y +# CONFIG_GITCOMPAT is not set +# CONFIG_GITCLONE is not set +# CONFIG_GITINIT is not set +# CONFIG_GITREMOTE is not set +# CONFIG_GITFETCH is not set +# CONFIG_GITCHECKOUT is not set +# CONFIG_GROUPADD is not set +# CONFIG_GROUPDEL is not set +# CONFIG_HEXDUMP is not set +# CONFIG_HD is not set +# CONFIG_INIT is not set +# CONFIG_IP is not set +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +# CONFIG_KLOGD is not set +# CONFIG_LAST is not set +# CONFIG_LSOF is not set +# CONFIG_MAN is not set +# CONFIG_MDEV is not set +# CONFIG_MDEV_CONF is not set +# CONFIG_MODPROBE is not set +# CONFIG_MORE is not set +# CONFIG_ROUTE is not set +CONFIG_SH=y +# CONFIG_BREAK is not set +# CONFIG_CD is not set +# CONFIG_CONTINUE is not set +# CONFIG_DECLARE is not set +# CONFIG_EXIT is not set +# CONFIG_SET is not set +# CONFIG_UNSET is not set +# CONFIG_EVAL is not set +# CONFIG_EXEC is not set +# CONFIG_EXPORT is not set +# CONFIG_JOBS is not set +# CONFIG_LOCAL is not set +# CONFIG_RETURN is not set +# CONFIG_SHIFT is not set +# CONFIG_SOURCE is not set +# CONFIG_WAIT is not set +# CONFIG_STRACE is not set +# CONFIG_STTY is not set +# CONFIG_SULOGIN is not set +# CONFIG_SYSLOGD is not set +# CONFIG_TCPSVD is not set +# CONFIG_TELNET is not set +# CONFIG_TELNETD is not set +# CONFIG_TFTP is not set +# CONFIG_TFTPD is not set +# CONFIG_TR is not set +# CONFIG_TRACEROUTE is not set +# CONFIG_USERADD is not set +# CONFIG_USERDEL is not set +# CONFIG_VI is not set +# CONFIG_XZCAT is not set + +# +# Other commands +# +# CONFIG_ACPI is not set +# CONFIG_ASCII is not set +# CONFIG_UNICODE is not set +# CONFIG_BASE64 is not set +# CONFIG_BASE32 is not set +# CONFIG_BLKDISCARD is not set +# CONFIG_BLKID is not set +# CONFIG_FSTYPE is not set +# CONFIG_BLOCKDEV is not set +# CONFIG_BUNZIP2 is not set +# CONFIG_BZCAT is not set +# CONFIG_CHCON is not set +# CONFIG_CHROOT is not set +# CONFIG_CHRT is not set +CONFIG_CLEAR=y +# CONFIG_COUNT is not set +# CONFIG_DEVMEM is not set +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +# CONFIG_EJECT is not set +# CONFIG_FACTOR is not set +# CONFIG_FALLOCATE is not set +# CONFIG_FLOCK is not set +# CONFIG_FMT is not set +CONFIG_FREE=y +# CONFIG_FREERAMDISK is not set +# CONFIG_FSFREEZE is not set +# CONFIG_FSYNC is not set +# CONFIG_GETOPT is not set +# CONFIG_GPIODETECT is not set +# CONFIG_GPIOFIND is not set +# CONFIG_GPIOINFO is not set +# CONFIG_GPIOGET is not set +# CONFIG_GPIOSET is not set +# CONFIG_HELP is not set +# CONFIG_HEXEDIT is not set +# CONFIG_HWCLOCK is not set +# CONFIG_I2CDETECT is not set +# CONFIG_I2CDUMP is not set +# CONFIG_I2CGET is not set +# CONFIG_I2CSET is not set +# CONFIG_I2CTRANSFER is not set +# CONFIG_INOTIFYD is not set +# CONFIG_INSMOD is not set +# CONFIG_IONICE is not set +# CONFIG_IORENICE is not set +# CONFIG_LINUX32 is not set +# CONFIG_LOGIN is not set +# CONFIG_LOSETUP is not set +# CONFIG_LSATTR is not set +# CONFIG_CHATTR is not set +# CONFIG_LSMOD is not set +# CONFIG_LSPCI is not set +# CONFIG_LSUSB is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_MCOOKIE is not set +# CONFIG_MEMEATER is not set +# CONFIG_MIX is not set +# CONFIG_MKPASSWD is not set +# CONFIG_MKSWAP is not set +# CONFIG_MODINFO is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_NBD_CLIENT is not set +# CONFIG_NBD_SERVER is not set +# CONFIG_UNSHARE is not set +# CONFIG_NSENTER is not set +# CONFIG_ONEIT is not set +# CONFIG_OPENVT is not set +# CONFIG_CHVT is not set +# CONFIG_DEALLOCVT is not set +# CONFIG_PARTPROBE is not set +# CONFIG_PIVOT_ROOT is not set +# CONFIG_PMAP is not set +# CONFIG_PRINTENV is not set +# CONFIG_PWDX is not set +# CONFIG_PWGEN is not set +# CONFIG_READAHEAD is not set +# CONFIG_READELF is not set +# CONFIG_READLINK is not set +# CONFIG_REALPATH is not set +CONFIG_REBOOT=y +# CONFIG_RESET is not set +# CONFIG_REV is not set +# CONFIG_RMMOD is not set +# CONFIG_RTCWAKE is not set +# CONFIG_SETFATTR is not set +# CONFIG_SETSID is not set +# CONFIG_SHA3SUM is not set +# CONFIG_SHRED is not set +# CONFIG_SHUF is not set +CONFIG_STAT=y +# CONFIG_SWAPOFF is not set +# CONFIG_SWAPON is not set +# CONFIG_SWITCH_ROOT is not set +# CONFIG_SYSCTL is not set +# CONFIG_TAC is not set +# CONFIG_NPROC is not set +# CONFIG_TASKSET is not set +# CONFIG_TIMEOUT is not set +# CONFIG_TRUNCATE is not set +# CONFIG_TS is not set +# CONFIG_UCLAMPSET is not set +CONFIG_UPTIME=y +# CONFIG_USLEEP is not set +# CONFIG_UUIDGEN is not set +# CONFIG_VCONFIG is not set +# CONFIG_VMSTAT is not set +# CONFIG_W is not set +# CONFIG_WATCH is not set +# CONFIG_WATCHDOG is not set +# CONFIG_WHICH is not set +# CONFIG_XXD is not set +# CONFIG_YES is not set + +# +# Networking commands +# +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_HOST is not set +# CONFIG_HTTPD is not set +CONFIG_IFCONFIG=y +# CONFIG_MICROCOM is not set +# CONFIG_NETCAT is not set +CONFIG_NETSTAT=y +CONFIG_PING=y +# CONFIG_RFKILL is not set +# CONFIG_SNTP is not set +# CONFIG_TUNCTL is not set +# CONFIG_WGET is not set +# CONFIG_WGET_LIBTLS is not set + +# +# Linux Standard Base commands +# +CONFIG_DMESG=y +# CONFIG_GZIP is not set +# CONFIG_GUNZIP is not set +# CONFIG_ZCAT is not set +CONFIG_HOSTNAME=y +# CONFIG_DNSDOMAINNAME is not set +# CONFIG_KILLALL is not set +# CONFIG_MD5SUM is not set +# CONFIG_SHA1SUM is not set +# CONFIG_SHA224SUM is not set +# CONFIG_SHA256SUM is not set +# CONFIG_SHA384SUM is not set +# CONFIG_SHA512SUM is not set +# CONFIG_MKNOD is not set +# CONFIG_MKNOD_Z is not set +# CONFIG_MKTEMP is not set +CONFIG_MOUNT=y +# CONFIG_PASSWD is not set +# CONFIG_PASSWD_SAD is not set +# CONFIG_PIDOF is not set +# CONFIG_SEQ is not set +# CONFIG_SU is not set +CONFIG_SYNC=y +CONFIG_UMOUNT=y + +# +# Example commands +# +# CONFIG_DEMO_MANY_OPTIONS is not set +# CONFIG_DEMO_NUMBER is not set +# CONFIG_DEMO_SCANKEY is not set +# CONFIG_DEMO_UTF8TOWC is not set +# CONFIG_HELLO is not set +# CONFIG_HOSTID is not set +# CONFIG_LOGPATH is not set +# CONFIG_SKELETON is not set +# CONFIG_SKELETON_ALIAS is not set + +# +# Android commands +# +# CONFIG_GETENFORCE is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_LOG is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_SENDEVENT is not set +# CONFIG_SETENFORCE is not set + +# +# +# + +# +# Toybox global settings +# +CONFIG_TOYBOX=y +CONFIG_TOYBOX_SUID=y +CONFIG_TOYBOX_LSM_NONE=y +# CONFIG_TOYBOX_SELINUX is not set +# CONFIG_TOYBOX_SMACK is not set +# CONFIG_TOYBOX_LIBCRYPTO is not set +# CONFIG_TOYBOX_LIBZ is not set +CONFIG_TOYBOX_FLOAT=y +CONFIG_TOYBOX_HELP=y +CONFIG_TOYBOX_HELP_DASHDASH=y +CONFIG_TOYBOX_ZHELP=y +# CONFIG_TOYBOX_FREE is not set +# CONFIG_TOYBOX_NORECURSE is not set +# CONFIG_TOYBOX_DEBUG is not set +CONFIG_TOYBOX_UID_SYS=100 +CONFIG_TOYBOX_UID_USR=500 +CONFIG_TOYBOX_FORCE_NOMMU=y diff --git a/package/toybox/files/inittab b/package/toybox/files/inittab new file mode 100644 index 000000000..6372bd6c0 --- /dev/null +++ b/package/toybox/files/inittab @@ -0,0 +1 @@ +/dev/ttySC2::askfirst:-/bin/sh diff --git a/package/toybox/patches/patch-main_c b/package/toybox/patches/patch-main_c new file mode 100644 index 000000000..e3e978763 --- /dev/null +++ b/package/toybox/patches/patch-main_c @@ -0,0 +1,16 @@ +--- toybox-0.8.12.orig/main.c 2025-01-18 21:20:33.000000000 +0100 ++++ toybox-0.8.12/main.c 2025-04-07 09:40:53.646935573 +0200 +@@ -179,13 +179,6 @@ void toy_singleinit(struct toy_list *whi + toys.old_umask = umask(0); + if (!(which->flags & TOYFLAG_UMASK)) umask(toys.old_umask); + +- // Try user's locale, but if that isn't UTF-8 merge in a UTF-8 locale's +- // character type data. (Fall back to en_US for MacOS.) +- setlocale(LC_CTYPE, ""); +- if (strcmp("UTF-8", nl_langinfo(CODESET))) +- uselocale(newlocale(LC_CTYPE_MASK, "C.UTF-8", 0) ? : +- newlocale(LC_CTYPE_MASK, "en_US.UTF-8", 0)); +- + if (which->flags & TOYFLAG_LINEBUF) btype = _IOLBF; + else if (which->flags & TOYFLAG_NOBUF) btype = _IONBF; + else buf = xmalloc(4096); diff --git a/package/toybox/patches/patch-toys_pending_init_c b/package/toybox/patches/patch-toys_pending_init_c new file mode 100644 index 000000000..3a69442ed --- /dev/null +++ b/package/toybox/patches/patch-toys_pending_init_c @@ -0,0 +1,12 @@ +--- toybox-0.8.12.orig/toys/pending/init.c 2025-01-18 21:20:33.000000000 +0100 ++++ toybox-0.8.12/toys/pending/init.c 2025-04-07 15:31:14.276281021 +0200 +@@ -246,8 +246,7 @@ static pid_t final_run(struct action_lis + + sigfillset(&signal_set); + sigprocmask(SIG_BLOCK, &signal_set, NULL); +- if (x->action & ASKFIRST) pid = fork(); +- else pid = vfork(); ++ pid = vfork(); + + if (pid > 0) { + //parent process or error diff --git a/package/toybox/patches/patch-toys_pending_sh_c b/package/toybox/patches/patch-toys_pending_sh_c new file mode 100644 index 000000000..37a7a3338 --- /dev/null +++ b/package/toybox/patches/patch-toys_pending_sh_c @@ -0,0 +1,29 @@ +--- toybox-0.8.12.orig/toys/pending/sh.c 2025-01-18 21:20:33.000000000 +0100 ++++ toybox-0.8.12/toys/pending/sh.c 2025-04-07 16:43:09.861935892 +0200 +@@ -1398,18 +1398,6 @@ static int run_subshell(char *str, int l + pid_t pid; + //dprintf(2, "%d run_subshell %.*s\n", getpid(), len, str); debug_show_fds(); + // The with-mmu path is significantly faster. +- if (CFG_TOYBOX_FORK) { +- if ((pid = fork())<0) perror_msg("fork"); +- else if (!pid) { +- call_function()->pp = (void *)1; +- if (str) { +- TT.ff->source = fmemopen(str, len, "r"); +- longjmp(TT.forkchild, 1); +- } +- } +- +- // On nommu vfork, exec /proc/self/exe, and pipe state data to ourselves. +- } else { + int pipes[2]; + unsigned i; + char **oldenv = environ, *ss = str ? : pl2str(TT.ff->pl->next, 0); +@@ -1446,7 +1434,6 @@ static int run_subshell(char *str, int l + dprintf(pipes[1], "0 0\n%.*s\n", len, ss); + if (!str) free(ss); + close(pipes[1]); +- } + + return pid; + } diff --git a/package/u-boot-avr32/Makefile b/package/u-boot-avr32/Makefile index 2886ddd3c..40f70681d 100644 --- a/package/u-boot-avr32/Makefile +++ b/package/u-boot-avr32/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot -HOST_BUILDDEP:= libressl-host dtc-host -PKG_BUILDDEP:= u-boot-host +HOST_BUILDDEP:= gnutls-host openssl-host dtc-host +PKG_BUILDDEP:= u-boot-avr32-host PKG_URL:= http://www.denx.de/wiki/U-Boot PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/ @@ -54,39 +54,21 @@ do-build: PATH='$(HOST_PATH)' \ CROSS_COMPILE='$(TARGET_CROSS)' \ $(MAKE)) -ifneq ($(OS_FOR_BUILD),Darwin) (cd $(WRKBUILD) && env \ PATH='$(HOST_PATH)' \ CROSS_COMPILE='$(TARGET_CROSS)' \ $(MAKE) env) -endif u-boot-install: $(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR) $(INSTALL_DIR) $(IDIR_U_BOOT)/etc $(CP) ./files/fw_env.config $(IDIR_U_BOOT)/etc -ifneq ($(OS_FOR_BUILD),Darwin) $(INSTALL_DIR) $(IDIR_U_BOOT)/usr/bin $(INSTALL_BIN) $(WRKBUILD)/tools/env/fw_printenv \ $(IDIR_U_BOOT)/usr/bin (cd $(IDIR_U_BOOT)/usr/bin && ln -sf fw_printenv fw_setenv) $(INSTALL_BIN) ./files/uboot_print_env $(IDIR_U_BOOT)/usr/bin $(INSTALL_BIN) ./files/uboot_set_env $(IDIR_U_BOOT)/usr/bin -endif -ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) - $(INSTALL_BIN) ./files/boot.script.bpi $(FW_DIR) -endif -ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) - $(INSTALL_BIN) ./files/boot.script.clearfog $(FW_DIR) -endif -ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) - $(INSTALL_BIN) $(WRKBUILD)/SPL $(FW_DIR) - $(INSTALL_BIN) ./files/boot.script.imx6 $(FW_DIR) -endif -ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y) - $(CP) ./files/uEnv.txt.bbb $(FW_DIR)/uEnv.txt - $(INSTALL_BIN) $(WRKBUILD)/MLO $(FW_DIR) -endif include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/u-boot-h8300/Makefile b/package/u-boot-h8300/Makefile index bfd0824df..e818a688e 100644 --- a/package/u-boot-h8300/Makefile +++ b/package/u-boot-h8300/Makefile @@ -3,24 +3,25 @@ include $(ADK_TOPDIR)/rules.mk -PKG_NAME:= u-boot -# last working hash fa0e8426833edc1be3c2ea3acaf248157048a15a -PKG_VERSION:= h8300 -PKG_GIT:= branch +PKG_NAME:= u-boot-h8300 +PKG_VERSION:= 0.1 PKG_RELEASE:= 1 +PKG_HASH:= 65461cc0cab37251e2487c0f5d4ae34c7ca89767bdf790b9a863800206b83539 PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot -HOST_BUILDDEP:= libressl-host dtc-host +HOST_BUILDDEP:= openssl-host dtc-host PKG_BUILDDEP:= u-boot-h8300-host -PKG_SITES:= git://git.pf.osdn.jp/gitroot/y/ys/ysato/uboot.git +PKG_SITES:= https://distfiles.openadk.org/ PKG_SYSTEM_DEPENDS:= hitachi-edosk2674 +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call HOST_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +$(eval $(call HOST_template,U_BOOT_H8300,u-boot-h8300,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,U_BOOT_8300,u-boot-h8300,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) UBOOT:= u-boot.bin @@ -37,7 +38,7 @@ host-build: (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ $(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) ) -u-boot-hostinstall: +u-boot-h8300-hostinstall: $(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \ $(STAGING_HOST_DIR)/usr/bin @@ -48,15 +49,13 @@ do-build: (cd $(WRKBUILD) && env \ PATH='$(HOST_PATH)' \ CROSS_COMPILE='$(TARGET_CROSS)' \ - GCC_HONOUR_COPTS=s $(MAKE)) -ifneq ($(OS_FOR_BUILD),Darwin) + $(MAKE)) (cd $(WRKBUILD) && env \ PATH='$(HOST_PATH)' \ CROSS_COMPILE='$(TARGET_CROSS)' \ - GCC_HONOUR_COPTS=s $(MAKE) env) -endif + $(MAKE) env) -u-boot-install: +u-boot-h8300-install: $(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR) $(INSTALL_DIR) $(IDIR_U_BOOT)/etc $(CP) ./files/fw_env.config $(IDIR_U_BOOT)/etc diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 704465fe9..65c430802 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot -PKG_VERSION:= 2024.04 +PKG_VERSION:= 2025.04 PKG_RELEASE:= 1 -PKG_HASH:= 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a +PKG_HASH:= 439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718 PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot -HOST_BUILDDEP:= libressl-host dtc-host swig-host python3-host python-setuptools-host -PKG_BUILDDEP:= python3-host python-setuptools-host swig-host u-boot-host +HOST_BUILDDEP:= gnutls-host openssl-host dtc-host swig-host python3-host python3-setuptools-host +PKG_BUILDDEP:= python3-host python3-setuptools-host swig-host u-boot-host PKG_URL:= http://www.denx.de/wiki/U-Boot PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/ @@ -27,7 +27,7 @@ $(eval $(call PKG_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP UBOOT:= u-boot.bin ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) CONFIG:= clearfog_defconfig -UBOOT:= u-boot-spl.kwb +UBOOT:= u-boot-with-spl.kwb endif ifeq ($(ADK_TARGET_SYSTEM_PHYTEC_IMX6),y) CONFIG:= pcm058_defconfig @@ -39,6 +39,7 @@ UBOOT:= u-boot.img endif ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y) CONFIG:= Linksprite_pcDuino3_defconfig +UBOOT:= u-boot-sunxi-with-spl.bin endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFIG:= rpi_defconfig @@ -91,6 +92,8 @@ CONFIG:= starfive_visionfive2_defconfig UBOOT:= u-boot.itb endif +MAKE_FLAGS+= HOSTCFLAGS="-I$(STAGING_HOST_DIR)/usr/include" \ + HOSTLDFLAGS="$(HOST_LDFLAGS)" HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl" HOST_STYLE:= manual @@ -104,16 +107,16 @@ endif host-build: (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ - $(HOST_MAKE_FLAGS) sandbox_defconfig ) + $(HOST_MAKE_FLAGS) tools-only_defconfig ) (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ - $(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) ) + $(HOST_MAKE_FLAGS) tools-only $(MAKE_TRACE) ) u-boot-hostinstall: $(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \ $(STAGING_HOST_DIR)/usr/bin do-configure: - (cd $(WRKBUILD) && $(MAKE) $(CONFIG)) + (cd $(WRKBUILD) && PATH='$(HOST_PATH)' $(MAKE) $(CONFIG)) do-build: (cd $(WRKBUILD) && env \ @@ -143,6 +146,7 @@ ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y) endif ifeq ($(ADK_TARGET_SYSTEM_IMGTEC_CI20),y) $(CP) $(WRKBUILD)/spl/u-boot-spl.bin $(FW_DIR) + cat ./files/uboot-env.txt.ci20 | PATH='$(HOST_PATH)' mkenvimage -s "32768" -o $(FW_DIR)/uboot-env.bin - endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) $(INSTALL_BIN) ./files/boot.script.bpi $(FW_DIR) diff --git a/package/u-boot/files/uboot-env.txt.ci20 b/package/u-boot/files/uboot-env.txt.ci20 new file mode 100644 index 000000000..c66316928 --- /dev/null +++ b/package/u-boot/files/uboot-env.txt.ci20 @@ -0,0 +1,10 @@ +baudrate=115200 +board_mfr=NP +bootargs=console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000 rootwait root=/dev/mmcblk0p1 devtmpfs.mount=1 +bootcmd=run ethargs; ext4load mmc 0:1 0x88000000 /boot/kernel; bootm 0x88000000 +bootdelay=1 +ethargs=env set bootargs ${bootargs} +loads_echo=1 +stderr=eserial0,eserial4 +stdin=eserial0,eserial4 +stdout=eserial0,eserial4 diff --git a/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig b/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig deleted file mode 100644 index 818529353..000000000 --- a/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig +++ /dev/null @@ -1,11 +0,0 @@ ---- u-boot-2023.07.02.orig/configs/rock-pi-4-rk3399_defconfig 2023-07-11 17:20:44.000000000 +0200 -+++ u-boot-2023.07.02/configs/rock-pi-4-rk3399_defconfig 2023-09-29 15:54:05.235780393 +0200 -@@ -70,7 +70,7 @@ CONFIG_REGULATOR_PWM=y - CONFIG_REGULATOR_RK8XX=y - CONFIG_PWM_ROCKCHIP=y - CONFIG_RAM_ROCKCHIP_LPDDR4=y --CONFIG_BAUDRATE=1500000 -+CONFIG_BAUDRATE=115200 - CONFIG_DEBUG_UART_SHIFT=2 - CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y diff --git a/package/u-boot/patches/patch-configs_rock-pi-4c-rk3399_defconfig b/package/u-boot/patches/patch-configs_rock-pi-4c-rk3399_defconfig deleted file mode 100644 index 87e4bd238..000000000 --- a/package/u-boot/patches/patch-configs_rock-pi-4c-rk3399_defconfig +++ /dev/null @@ -1,11 +0,0 @@ ---- u-boot-2023.07.02.orig/configs/rock-pi-4c-rk3399_defconfig 2023-07-11 17:20:44.000000000 +0200 -+++ u-boot-2023.07.02/configs/rock-pi-4c-rk3399_defconfig 2023-09-29 15:54:16.927583546 +0200 -@@ -67,7 +67,7 @@ CONFIG_REGULATOR_PWM=y - CONFIG_REGULATOR_RK8XX=y - CONFIG_PWM_ROCKCHIP=y - CONFIG_RAM_ROCKCHIP_LPDDR4=y --CONFIG_BAUDRATE=1500000 -+CONFIG_BAUDRATE=115200 - CONFIG_DEBUG_UART_SHIFT=2 - CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y diff --git a/package/u-boot/patches/patch-tools_Makefile b/package/u-boot/patches/patch-tools_Makefile deleted file mode 100644 index fc284ad58..000000000 --- a/package/u-boot/patches/patch-tools_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- u-boot-2024.01.orig/tools/Makefile 2024-01-08 16:37:48.000000000 +0100 -+++ u-boot-2024.01/tools/Makefile 2024-01-17 17:56:21.004096375 +0100 -@@ -250,7 +250,7 @@ HOSTLDLIBS_mkeficapsule += \ - $(shell pkg-config --libs gnutls 2> /dev/null || echo "-lgnutls") - HOSTLDLIBS_mkeficapsule += \ - $(shell pkg-config --libs uuid 2> /dev/null || echo "-luuid") --hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule -+#hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule - - mkfwumdata-objs := mkfwumdata.o generated/lib/crc32.o - HOSTLDLIBS_mkfwumdata += -luuid diff --git a/package/uclibc-ng-test/Makefile b/package/uclibc-ng-test/Makefile index d05e57c91..ebc1f1b62 100644 --- a/package/uclibc-ng-test/Makefile +++ b/package/uclibc-ng-test/Makefile @@ -47,6 +47,9 @@ endif ifeq ($(ADK_TARGET_ARCH_KVX),y) XAKE_FLAGS+= NO_TLS=1 endif +ifeq ($(ADK_TARGET_ARCH_NDS32),y) +XAKE_FLAGS+= NO_TLS=1 +endif uclibc-ng-test-install: ${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/etc diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index c1f2215c4..38903074a 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -54,6 +54,11 @@ uclibc-ng-dev-install: -${CP} ${STAGING_TARGET_DIR}/usr/lib/libc.so ${IDIR_UCLIBC_NG_DEV}/usr/lib -${CP} ${STAGING_TARGET_DIR}/usr/lib/uclibc_nonshared.a ${IDIR_UCLIBC_NG_DEV}/usr/lib -${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libm.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libdl.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/librt.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libutil.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread.a ${IDIR_UCLIBC_NG_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt*.o ${IDIR_UCLIBC_NG_DEV}/usr/lib ${KERNEL_MAKE} INSTALL_HDR_PATH=$(IDIR_UCLIBC_NG_DEV)/usr headers_install $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \ diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index d9fa07f5f..7af256546 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -33,8 +33,6 @@ PKGSB_ULOGD_MOD_PCAP:= libpcap PKGSS_ULOGD_MOD_PCAP:= libpcap PKGSN_ULOGD_MOD_PCAP:= ulogd -PKG_HOST_DEPENDS:= !cygwin - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/unifdef/Makefile b/package/unifdef/Makefile new file mode 100644 index 000000000..64f8cbafc --- /dev/null +++ b/package/unifdef/Makefile @@ -0,0 +1,37 @@ +# 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:= unifdef +PKG_VERSION:= 2.12 +PKG_RELEASE:= 1 +PKG_HASH:= fba564a24db7b97ebe9329713ac970627b902e5e9e8b14e19e024eb6e278d10b +PKG_DESCR:= build utility +PKG_SECTION:= dev/tools +PKG_SITES:= https://dotat.at/prog/unifdef/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz + +PKG_CFLINE_UNIFDEF:= depends on ADK_HOST_ONLY + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,UNIFDEF,unifdef,$(PKG_VERSION)-${PKG_RELEASE})) + +HOST_STYLE:= manual +HOST_FAKE_FLAGS+= prefix=$(STAGING_HOST_DIR)/usr + +host-configure: + +host-build: + (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -j${ADK_MAKE_JOBS} -f ${MAKE_FILE} \ + ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET}) $(MAKE_TRACE) + +unifdef-hostinstall: + cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -j${ADK_MAKE_JOBS} -f ${MAKE_FILE} \ + ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/unifdef/patches/patch-Makefile b/package/unifdef/patches/patch-Makefile new file mode 100644 index 000000000..e83f0c0fd --- /dev/null +++ b/package/unifdef/patches/patch-Makefile @@ -0,0 +1,13 @@ +--- unifdef-2.12.orig/Makefile 2020-02-14 17:58:51.000000000 +0100 ++++ unifdef-2.12/Makefile 2025-03-30 19:25:30.876075366 +0200 +@@ -25,10 +25,6 @@ install: unifdef unifdefall.sh unifdef.1 + install -m 755 -d ${bindest} + install -m 755 unifdef ${bindest}/ + install -m 755 unifdefall.sh ${bindest}/unifdefall +- : manual +- install -m 755 -d ${man1dest} +- install -m 644 unifdef.1 ${man1dest}/ +- ln -s unifdef.1 ${man1dest}/unifdefall.1 + + clean: + rm -f unifdef version.h diff --git a/package/upslug2/Makefile b/package/upslug2/Makefile new file mode 100644 index 000000000..203baed31 --- /dev/null +++ b/package/upslug2/Makefile @@ -0,0 +1,31 @@ +# 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:= upslug2 +PKG_VERSION:= 5ce4239b8e6da802904b30aaa2ebcc7bc25d0200 +PKG_RELEASE:= 1 +PKG_HASH:= af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afa +PKG_DESCR:= flash utility for Linksys NSLU2 +PKG_SECTION:= dev/tools +PKG_SITES:= https://github.com/nslu2-linux/UpSlug2.git + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz + +PKG_CFLINE_UPSLUG2:= depends on ADK_HOST_ONLY + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,UPSLUG2,upslug2,$(PKG_VERSION)-${PKG_RELEASE})) + +AUTOTOOL_STYLE:= autoreconf +HOST_STYLE:= auto + +upslug2-hostinstall: + cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/userspace-rcu/Makefile b/package/userspace-rcu/Makefile deleted file mode 100644 index 9df243279..000000000 --- a/package/userspace-rcu/Makefile +++ /dev/null @@ -1,30 +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:= userspace-rcu -PKG_VERSION:= 0.9.2 -PKG_RELEASE:= 1 -PKG_HASH:= 8f7fa313b1e0a3f742cea24ce63a39c0efe63e615a769e2961e55bd2663ecaa3 -PKG_DESCR:= userspace rcu library -PKG_SECTION:= libs/misc -PKG_URL:= http://lttng.org/ -PKG_SITES:= http://lttng.org/files/urcu/ -PKG_LIBNAME:= liburcu -PKG_OPTS:= dev - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,LIBURCU,liburcu,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) - -CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes - -liburcu-install: - $(INSTALL_DIR) $(IDIR_LIBURCU)/usr/lib - $(CP) $(WRKINST)/usr/lib/liburcu*.so* \ - $(IDIR_LIBURCU)/usr/lib - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 7d2510443..c1712235e 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -4,18 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= util-linux -PKG_VERSION:= 2.39.3 +PKG_VERSION:= 2.41.1 PKG_RELEASE:= 1 -PKG_HASH:= 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f +PKG_HASH:= be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57 PKG_DESCR:= basic utilities PKG_SECTION:= base/apps PKG_BUILDDEP:= ncurses PKG_NEEDS:= threads -PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.39/ +PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.41/ PKG_OPTS:= dev -PKG_SUBPKGS:= FDISK AGETTY SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT -PKG_SUBPKGS+= LIBFDISK LIBUUID LIBBLKID LIBMOUNT CFDISK MKFS +PKG_SUBPKGS:= FDISK AGETTY SFDISK SWAP_UTILS LOSETUP LSFD MCOOKIE MOUNT +PKG_SUBPKGS+= LIBFDISK LIBUUID LIBBLKID LIBMOUNT LIBSMARTCOLS CFDISK MKFS +PKG_SUBPKGS+= SWITCHROOT PKGSD_LIBUUID:= uuid library PKGSC_LIBUUID:= libs/misc PKGSD_LIBBLKID:= blkid library @@ -24,9 +25,12 @@ PKGSD_LIBFDISK:= fdisk library PKGSC_LIBFDISK:= libs/misc PKGSD_LIBMOUNT:= mount library PKGSC_LIBMOUNT:= libs/misc +PKGSS_LIBMOUNT:= libblkid +PKGSD_LIBSMARTCOLS:= smartcols library +PKGSC_LIBSMARTCOLS:= libs/misc PKGSD_FDISK:= partition table manipulation utility PKGSC_FDISK:= sys/fs -PKGSS_FDISK:= libfdisk libblkid libuuid libncurses +PKGSS_FDISK:= libfdisk libblkid libuuid libncurses libscmartcols PKGSD_AGETTY:= getty utility PKGSC_AGETTY:= sys/utils PKGSS_AGETTY:= libncurses @@ -41,13 +45,19 @@ PKGSS_SWAP_UTILS:= libblkid PKGSC_SWAP_UTILS:= sys/fs PKGSD_LOSETUP:= loop devices management utilities PKGSC_LOSETUP:= sys/fs +PKGSD_LSFD:= modern lsof alternative program +PKGSC_LSFD:= sys/utils +PKGSS_LSFD:= libsmartcols libncurses PKGSD_MKFS:= filesystem creation frontend PKGSC_MKFS:= sys/fs PKGSD_MOUNT:= mount/umount utilities PKGSS_MOUNT:= libblkid libmount libuuid libncurses PKGSC_MOUNT:= sys/fs +PKGSD_SWITCHROOT:= switch_root utility +PKGSC_SWITCHROOT:= sys/utils PKGSD_MCOOKIE:= generate magic cookies for xauth PKGSC_MCOOKIE:= x11/utils +PKGSS_MCOOKIE:= libncurses include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -59,13 +69,16 @@ $(eval $(call PKG_template,CFDISK,cfdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP $(eval $(call PKG_template,SFDISK,sfdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_SFDISK),$(PKGSC_SFDISK))) $(eval $(call PKG_template,SWAP_UTILS,swap-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_SWAP_UTILS),$(PKGSD_SWAP_UTILS),$(PKGSC_SWAP_UTILS))) $(eval $(call PKG_template,LOSETUP,losetup,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_LOSETUP),$(PKGSD_LOSETUP),$(PKGSC_LOSETUP))) +$(eval $(call PKG_template,LSFD,lsfd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_LSFD),$(PKGSD_LSFD),$(PKGSC_LSFD))) $(eval $(call PKG_template,MKFS,mkfs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MKFS),$(PKGSD_MKFS),$(PKGSC_MKFS))) $(eval $(call PKG_template,MOUNT,mount,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MOUNT),$(PKGSD_MOUNT),$(PKGSC_MOUNT))) +$(eval $(call PKG_template,SWITCHROOT,switchroot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MOUNT),$(PKGSD_MOUNT),$(PKGSC_MOUNT))) $(eval $(call PKG_template,MCOOKIE,mcookie,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_MCOOKIE),$(PKGSC_MCOOKIE))) $(eval $(call PKG_template,LIBUUID,libuuid,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBUUID),$(PKGSC_LIBUUID),$(PKG_OPTS))) $(eval $(call PKG_template,LIBBLKID,libblkid,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBBLKID),$(PKGSC_LIBBLKID),$(PKG_OPTS))) $(eval $(call PKG_template,LIBFDISK,libfdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBFDISK),$(PKGSC_LIBFDISK),$(PKG_OPTS))) $(eval $(call PKG_template,LIBMOUNT,libmount,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBMOUNT),$(PKGSC_LIBMOUNT),$(PKG_OPTS))) +$(eval $(call PKG_template,LIBSMARTCOLS,libsmartcols,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBSMARTCOLS),$(PKGSC_LIBSMARTCOLS),$(PKG_OPTS))) TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK TARGET_LDFLAGS+= -ltinfo @@ -89,21 +102,23 @@ CONFIGURE_ARGS+= --exec-prefix=/usr \ --disable-cramfs \ --disable-login \ --disable-eject \ - --disable-switch_root \ --disable-nsenter \ --disable-unshare \ --disable-wall \ + --disable-liblastlog2 \ --disable-symvers \ --without-python \ --without-systemd \ --without-user \ + --enable-switch_root \ --enable-libfdisk \ --enable-libuuid \ --enable-libblkid \ --enable-libmount - -ifeq ($(ADK_PACKAGE_FDISK)$(ADK_PACKAGE_AGETTY)$(ADK_PACKAGE_SFDISK)$(ADK_PACKAGE_CFDISK)$(ADK_PACKAGE_MKFS)$(ADK_PACKAGE_MOUNT)$(ADK_PACKAGE_SWAP_UTILS)$(ADK_PACKAGE_MCOOKIE),) -CONFIGURE_ARGS+= --disable-all-programs +ifneq (${ADK_PACKAGE_LSFD},) +CONFIGURE_ARGS+= --enable-lsfd +else +CONFIGURE_ARGS+= --disable-lsfd endif TARGET_CFLAGS+= -fPIC @@ -112,10 +127,8 @@ HOST_CONFIGURE_ARGS+= --enable-libblkid \ --enable-libuuid \ --enable-libmount \ --disable-all-programs \ - --disable-use-tty-group -ifneq ($(OS_FOR_BUILD),Darwin) -HOST_CONFIGURE_ARGS+= --enable-libuuid -endif + --disable-use-tty-group \ + --enable-libuuid fdisk-install: $(INSTALL_DIR) $(IDIR_FDISK)/usr/sbin @@ -137,6 +150,10 @@ losetup-install: $(INSTALL_DIR) $(IDIR_LOSETUP)/usr/sbin $(CP) $(WRKINST)/sbin/losetup $(IDIR_LOSETUP)/usr/sbin +lsfd-install: + $(INSTALL_DIR) $(IDIR_LSFD)/usr/bin + $(CP) $(WRKINST)/usr/bin/lsfd $(IDIR_LSFD)/usr/bin + swap-utils-install: $(INSTALL_DIR) $(IDIR_SWAP_UTILS)/usr/sbin $(CP) $(WRKINST)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin @@ -150,9 +167,13 @@ mount-install: $(INSTALL_DIR) $(IDIR_MOUNT)/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/{u,}mount $(IDIR_MOUNT)/bin +switchroot-install: + $(INSTALL_DIR) $(IDIR_SWITCHROOT)/sbin + $(INSTALL_BIN) $(WRKINST)/sbin/switch_root $(IDIR_SWITCHROOT)/sbin + mcookie-install: - $(INSTALL_DIR) $(IDIR_MCOOKIE)/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/mcookie $(IDIR_MCOOKIE)/bin + $(INSTALL_DIR) $(IDIR_MCOOKIE)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/mcookie $(IDIR_MCOOKIE)/usr/bin libuuid-install: $(INSTALL_DIR) $(IDIR_LIBUUID)/usr/lib @@ -165,11 +186,15 @@ libblkid-install: libfdisk-install: $(INSTALL_DIR) $(IDIR_LIBFDISK)/usr/lib $(CP) $(WRKINST)/usr/lib/libfdisk.so* $(IDIR_LIBFDISK)/usr/lib - $(CP) $(WRKINST)/usr/lib/libsmartcols.so* $(IDIR_LIBFDISK)/usr/lib libmount-install: $(INSTALL_DIR) $(IDIR_LIBMOUNT)/usr/lib $(CP) $(WRKINST)/usr/lib/libmount.so* $(IDIR_LIBMOUNT)/usr/lib +libsmartcols-install: + $(INSTALL_DIR) $(IDIR_LIBSMARTCOLS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libsmartcols.so* $(IDIR_LIBSMARTCOLS)/usr/lib + + include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index 10e7b35fc..4ea3e65cf 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= valgrind -PKG_VERSION:= 3.22.0 +PKG_VERSION:= 3.24.0 PKG_RELEASE:= 1 -PKG_HASH:= c811db5add2c5f729944caf47c4e7a65dcaabb9461e472b578765dd7bf6d2d4c +PKG_HASH:= 71aee202bdef1ae73898ccf7e9c315134fa7db6c246063afc503aef702ec03bd PKG_DESCR:= memory management debugging tool PKG_SECTION:= app/debug PKG_URL:= http://valgrind.org/ diff --git a/package/vtun/Makefile b/package/vtun/Makefile index 2bc582e42..4f5ff2ed4 100644 --- a/package/vtun/Makefile +++ b/package/vtun/Makefile @@ -16,8 +16,6 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vtun/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_HOST_DEPENDS:= !freebsd - include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,VTUN,vtun,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/wayland-protocols/Makefile b/package/wayland-protocols/Makefile index 9c1f8ad1d..308ae62f1 100644 --- a/package/wayland-protocols/Makefile +++ b/package/wayland-protocols/Makefile @@ -4,15 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= wayland-protocols -PKG_VERSION:= 1.31 +PKG_VERSION:= 1.45 PKG_RELEASE:= 1 -PKG_HASH:= a07fa722ed87676ec020d867714bc9a2f24c464da73912f39706eeef5219e238 +PKG_HASH:= 460dad72a6c84b2a7d80745bee43d96ba117f4e3dfc4d7c45f83f66469ea27df PKG_DESCR:= wayland protocols PKG_SECTION:= x11/libs PKG_BUILDDEP:= meson-host wayland-host -PKG_SITES:= https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(PKG_VERSION)/downloads/ +PKG_SITES:= https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/$(PKG_VERSION)/ PKG_OPTS:= dev +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,WAYLAND_PROTOCOLS,wayland-protocols,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) diff --git a/package/wayland-protocols/patches/patch-meson_build b/package/wayland-protocols/patches/patch-meson_build deleted file mode 100644 index ad075be1c..000000000 --- a/package/wayland-protocols/patches/patch-meson_build +++ /dev/null @@ -1,11 +0,0 @@ ---- wayland-protocols-1.23.orig/meson.build 2021-09-15 14:52:03.136998200 +0200 -+++ wayland-protocols-1.23/meson.build 2021-11-14 04:45:19.472983046 +0100 -@@ -93,7 +93,7 @@ pkgconfig_configuration.set('abs_top_src - pkgconfig_configuration.set('PACKAGE', 'wayland-protocols') - pkgconfig_configuration.set('WAYLAND_PROTOCOLS_VERSION', wayland_protocols_version) - --pkg_install_dir = join_paths(get_option('datadir'), 'pkgconfig') -+pkg_install_dir = join_paths(get_option('libdir'), 'pkgconfig') - configure_file( - input: 'wayland-protocols.pc.in', - output: 'wayland-protocols.pc', diff --git a/package/wayland-protocols/patches/patch-wayland-protocols_pc_in b/package/wayland-protocols/patches/patch-wayland-protocols_pc_in deleted file mode 100644 index ce3da7fb2..000000000 --- a/package/wayland-protocols/patches/patch-wayland-protocols_pc_in +++ /dev/null @@ -1,10 +0,0 @@ ---- wayland-protocols-1.23.orig/wayland-protocols.pc.in 2021-09-15 14:52:03.145998200 +0200 -+++ wayland-protocols-1.23/wayland-protocols.pc.in 2021-11-14 04:59:17.121707638 +0100 -@@ -1,6 +1,6 @@ - prefix=@prefix@ - datarootdir=@datarootdir@ --pkgdatadir=${pc_sysrootdir}${datarootdir}/@PACKAGE@ -+pkgdatadir=${datarootdir}/@PACKAGE@ - - Name: Wayland Protocols - Description: Wayland protocol files diff --git a/package/wayland/Makefile b/package/wayland/Makefile index 796af73f6..24535f1cf 100644 --- a/package/wayland/Makefile +++ b/package/wayland/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= wayland -PKG_VERSION:= 1.22.0 +PKG_VERSION:= 1.24.0 PKG_RELEASE:= 1 -PKG_HASH:= 1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842 +PKG_HASH:= 82892487a01ad67b334eca83b54317a7c86a03a89cfadacfef5211f11a5d0536 PKG_DESCR:= wayland PKG_SECTION:= x11/libs -PKG_BUILDDEP:= wayland-host +PKG_BUILDDEP:= wayland-host libffi HOST_BUILDDEP:= meson-host expat-host libxml2-host libffi-host PKG_SITES:= https://gitlab.freedesktop.org/wayland/wayland/-/releases/$(PKG_VERSION)/downloads/ PKG_OPTS:= dev diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile index b6ad084a5..aed00abd7 100644 --- a/package/webkitgtk/Makefile +++ b/package/webkitgtk/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= webkitgtk -PKG_VERSION:= 2.34.6 +PKG_VERSION:= 2.48.1 PKG_RELEASE:= 1 -PKG_HASH:= 6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6 +PKG_HASH:= 98efdf21c4cdca0fe0b73ab5a8cb52093b5aa52d9b1b016a93f71dbfa1eb258f PKG_DESCR:= web browser engine PKG_SECTION:= libs/misc PKG_DEPENDS:= glib icu4c zlib libwebp libgtk3 libsoup @@ -15,7 +15,7 @@ PKG_DEPENDS+= gstreamer libnotify libwebp gst-plugins-base PKG_BUILDDEP:= glib icu4c zlib libwebp libgtk3 cmake-host PKG_BUILDDEP+= libsoup libsecret libXt harfbuzz libnotify PKG_BUILDDEP+= gstreamer cairo enchant libwebp gst-plugins-base -PKG_BUILDDEP+= gnutls libgcrypt ruby-host +PKG_BUILDDEP+= gst-plugins-good gnutls libgcrypt ruby-host unifdef-host PKG_URL:= http://www.webkitgtk.org/ PKG_SITES:= http://webkitgtk.org/releases/ PKG_OPTS:= dev @@ -26,7 +26,7 @@ $(eval $(call PKG_template,WEBKITGTK,webkitgtk,$(PKG_VERSION)-$(PKG_RELEASE),$(P WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj XAKE_FLAGS+= VERBOSE=1 -TARGET_CXXFLAGS+= -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS +#TARGET_CXXFLAGS+= -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS CONFIG_STYLE:= cmake CMAKE_FLAGS+= -DPORT=GTK \ @@ -36,17 +36,25 @@ CMAKE_FLAGS+= -DPORT=GTK \ -DENABLE_API_TESTS=OFF \ -DENABLE_GTKDOC=OFF \ -DENABLE_GEOLOCATION=OFF \ + -DENABLE_SPEECH_SYNTHESIS=OFF \ + -DENABLE_JOURNALD_LOG=OFF \ -DENABLE_MINIBROWSER=ON \ -DUSE_SYSTEM_MALLOC=ON \ -DUSE_LIBNOTIFY=OFF \ + -DUSE_JPEGXL=OFF \ + -DUSE_AVIF=OFF \ + -DUSE_LIBBACKTRACE=OFF \ + -DUSE_GSTREAMER_TRANSCODER=OFF \ -DENABLE_JIT=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_SOUP2=ON \ + -DUSE_GTK4=OFF \ -DUSE_WPE_RENDERER=OFF \ -DENABLE_GAMEPAD=OFF \ -DUSE_OPENJPEG=OFF \ -DUSE_WOFF2=OFF \ -DUSE_SYSTEMD=OFF \ + -DUSE_SYSTEM_SYSPROF_CAPTURE=NO \ -DUSE_LCMS=OFF \ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ -DENABLE_INTROSPECTION=OFF diff --git a/package/weston/Makefile b/package/weston/Makefile index a3d374355..76f4e5bb6 100644 --- a/package/weston/Makefile +++ b/package/weston/Makefile @@ -4,34 +4,36 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= weston -PKG_VERSION:= 11.0.0 -PKG_RELEASE:= 1 -PKG_HASH:= 5816a9e7bd67d03f268553a7af2f0c3430b409f7606244dada65188478f90800 +PKG_VERSION:= 14.0.2 +PKG_RELEASE:= 2 +PKG_HASH:= 633f4e0f232ad150300c95ffcbc646fedf1349487bf389dbd2045fa69013d6e2 PKG_DESCR:= wayland compositor PKG_SECTION:= x11/drivers -PKG_DEPENDS:= wayland libxkbcommon libinput libpng libjpeg-turbo libseat -PKG_DEPENDS+= libwebp pam libxcursor libudev xkeyboard-config cairo libffi -PKG_BUILDDEP:= wayland libxkbcommon libinput libpng libjpeg-turbo -PKG_BUILDDEP+= libwebp pam libXcursor eudev cairo libseat libffi -PKG_SITES:= https://github.com/wayland-project/weston/archive/refs/tags/ +PKG_DEPENDS:= wayland libxkbcommon libinput libpng libjpeg-turbo libseat mesa libexpat +PKG_DEPENDS+= libwebp pam libxcursor libudev xkeyboard-config cairo libffi libdrm seatd +PKG_DEPENDS+= libdisplay-info +PKG_BUILDDEP:= wayland wayland-protocols libxkbcommon libinput libpng libjpeg-turbo expat +PKG_BUILDDEP+= libwebp pam libXcursor eudev cairo libseat libffi libdrm libdisplay-info mesa +PKG_SITES:= https://gitlab.freedesktop.org/wayland/weston/-/archive/$(PKG_VERSION)/ -PKG_CFLINE_WESTON:= select ADK_PACKAGE_CAIRO_WITH_PNG@ - -DISTFILES:= $(PKG_VERSION).tar.gz +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,WESTON,weston,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -MESON_FLAGS+= -Dlauncher-logind=false \ - -Dlauncher-libseat=true \ - -Dsystemd=false \ +MESON_FLAGS+= -Dsystemd=false \ -Dbackend-drm-screencast-vaapi=false \ -Dbackend-rdp=false \ -Dcolor-management-lcms=false \ -Dremoting=false \ -Dpipewire=false \ - -Ddemo-clients=false + -Dbackend-pipewire=false \ + -Dxwayland=false \ + -Dtest-junit-xml=false \ + -Ddemo-clients=false \ + -Dshell-fullscreen=true \ + -Drenderer-gl=true WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj @@ -49,12 +51,12 @@ weston-install: $(INSTALL_DIR) $(IDIR_WESTON)/usr/lib $(CP) $(WRKINST)/usr/lib/weston \ $(IDIR_WESTON)/usr/lib/ - $(CP) $(WRKINST)/usr/lib/libweston-11 \ + $(CP) $(WRKINST)/usr/lib/libweston-14 \ $(IDIR_WESTON)/usr/lib/ - $(CP) $(WRKINST)/usr/lib/libweston*so* \ + $(CP) $(WRKINST)/usr/lib/*so* \ $(IDIR_WESTON)/usr/lib/ $(INSTALL_DIR) $(IDIR_WESTON)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/weston \ + $(INSTALL_BIN) $(WRKINST)/usr/bin/* \ $(IDIR_WESTON)/usr/bin include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/wget/Makefile b/package/wget/Makefile index cd05c3724..8f345a1ff 100644 --- a/package/wget/Makefile +++ b/package/wget/Makefile @@ -4,19 +4,22 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= wget -PKG_VERSION:= 1.19.4 +PKG_VERSION:= 1.25.0 PKG_RELEASE:= 1 -PKG_HASH:= 93fb96b0f48a20ff5be0d9d9d3c4a986b469cb853131f9d5fe4cc9cecbc8b5b5 +PKG_HASH:= 766e48423e79359ea31e41db9e5c289675947a7fcf2efdcedb726ac9d0da3784 PKG_DESCR:= retrieving files using http(s) and ftp PKG_SECTION:= net/http -HOST_BUILDDEP:= libressl-host +HOST_BUILDDEP:= openssl-host PKG_URL:= http://www.gnu.org/software/wget/ PKG_SITES:= ${MASTER_SITE_GNU:=wget/} PKG_BB:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_CHOICES_WGET:= WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL +PKG_CHOICES_WGET:= WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates libgmp PKGCB_WITH_LIBRESSL:= libressl @@ -36,6 +39,11 @@ CONFIGURE_ARGS+= --disable-pcre ifeq (${ADK_PACKAGE_WGET_WITHOUT_SSL},y) CONFIGURE_ARGS+= --with-ssl=no endif +ifeq (${ADK_PACKAGE_WGET_WITH_OPENSSL},y) +CONFIGURE_ARGS+= --with-ssl=openssl \ + --with-openssl=yes \ + --with-libssl-prefix=${STAGING_TARGET_DIR} +endif ifeq (${ADK_PACKAGE_WGET_WITH_LIBRESSL},y) CONFIGURE_ARGS+= --with-ssl=openssl \ --with-openssl=yes \ diff --git a/package/wolfssl/Makefile b/package/wolfssl/Makefile index bc91eddcc..0623fd4aa 100644 --- a/package/wolfssl/Makefile +++ b/package/wolfssl/Makefile @@ -4,25 +4,25 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= wolfssl -PKG_VERSION:= 5.7.0 +PKG_VERSION:= 5.7.6 PKG_RELEASE:= 1 -PKG_HASH:= 2de93e8af588ee856fe67a6d7fce23fc1b226b74d710b0e3946bc8061f6aa18f +PKG_HASH:= 52b1e439e30d1ed8162a16308a8525a862183b67aa30373b11166ecbab000d63 PKG_DESCR:= portable embedded ssl library PKG_SECTION:= libs/crypto +PKG_BUILDDEP:= cmake-host PKG_URL:= http://www.wolfssl.com PKG_SITES:= https://github.com/wolfSSL/wolfssl/archive/refs/tags/ PKG_OPTS:= dev DISTFILES:= v$(PKG_VERSION)-stable.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-stable +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,WOLFSSL,wolfssl,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -AUTOTOOL_STYLE:= autogen -CONFIGURE_ARGS+= --disable-examples -CONFIGURE_ENV+= C_EXTRA_FLAGS='$(TARGET_CFLAGS)' +CONFIG_STYLE:= cmake wolfssl-install: $(INSTALL_DIR) $(IDIR_WOLFSSL)/usr/lib diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 873b6f2d3..93c80b0e8 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -21,7 +21,10 @@ PKG_DFLT_WPA_SUPPLICANT:= y if ADK_TARGET_WITH_WIFI WRKSRC= ${WRKDIST}/${PKG_NAME} -PKG_CHOICES_WPA_SUPPLICANT:= WITH_INTERNAL WITH_LIBRESSL WITH_GNUTLS +PKG_CHOICES_WPA_SUPPLICANT:= WITH_INTERNAL WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCS_WITH_OPENSSL:= libopenssl +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl PKGCB_WITH_LIBRESSL:= libressl diff --git a/package/wpebackend-fdo/Makefile b/package/wpebackend-fdo/Makefile new file mode 100644 index 000000000..e47faad6b --- /dev/null +++ b/package/wpebackend-fdo/Makefile @@ -0,0 +1,33 @@ +# 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:= wpebackend-fdo +PKG_VERSION:= 1.16.0 +PKG_RELEASE:= 1 +PKG_HASH:= beddf321232d5bd08106c179dbc600f8ce88eb3620b4a59a6329063b78f64635 +PKG_DESCR:= freedesktop.org wpe backend +PKG_SECTION:= libs/misc +PKG_DEPENDS:= libwpe +PKG_BUILDDEP:= wayland libwpe +PKG_URL:= https://wpewebkit.org +PKG_SITES:= https://wpewebkit.org/releases/ +PKG_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,WPEBACKEND_FDO,wpebackend-fdo,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +wpebackend-fdo-install: + $(INSTALL_DIR) $(IDIR_WPEBACKEND_FDO)/usr/lib + $(CP) $(WRKINST)/usr/lib/libWPEBackend-fdo*.so* \ + $(IDIR_WPEBACKEND_FDO)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/wpewebkit/Makefile b/package/wpewebkit/Makefile new file mode 100644 index 000000000..163a3908e --- /dev/null +++ b/package/wpewebkit/Makefile @@ -0,0 +1,56 @@ +# 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:= wpewebkit +PKG_VERSION:= 2.50.0 +PKG_RELEASE:= 1 +PKG_HASH:= a9af62c5e18551b7386b7db864e8ba8156f219b8e6c639934bf6f3a567969922 +PKG_DESCR:= web platform for embedded +PKG_SECTION:= libs/misc +PKG_DEPENDS:= libwpe libsoup3 harfbuzz libjpeg-turbo libgcrypt +PKG_DEPENDS+= libtasn1 libwebp gstreamer gst-plugins-base libxslt +PKG_DEPENDS+= libpsl libmount libblkid libepoxy +PKG_BUILDDEP:= cmake-host libwpe libsoup3 harfbuzz libjpeg-turbo +PKG_BUILDDEP+= libgcrypt libtasn1 libwebp gstreamer gst-plugins-base +PKG_BUILDDEP+= libxslt libpsl libepoxy unifdef-host libatomic +PKG_URL:= https://wpewebkit.org +PKG_SITES:= https://wpewebkit.org/releases/ +PKG_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,WPEWEBKIT,wpewebkit,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +XAKE_FLAGS+= VERBOSE=1 +CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DPORT=WPE \ + -DUSE_SYSTEM_SYSPROF_CAPTURE=NO \ + -DENABLE_API_TESTS=OFF \ + -DENABLE_DOCUMENTATION=OFF \ + -DENABLE_INTROSPECTION=OFF \ + -DENABLE_MINIBROWSER=OFF \ + -DENABLE_WEB_RTC=OFF \ + -DENABLE_SPEECH_SYNTHESIS=OFF \ + -DENABLE_JOURNALD_LOG=OFF \ + -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ + -DENABLE_WEB_DRIVER=ON \ + -DUSE_GSTREAMER_TRANSCODER=OFF \ + -DUSE_LIBBACKTRACE=OFF \ + -DUSE_JPEGXL=OFF \ + -DUSE_LCMS=OFF \ + -DUSE_WOFF2=OFF \ + -DUSE_AVIF=OFF \ + -DUSE_ATK=OFF \ + -DUSE_SKIA=OFF + +wpewebkit-install: + $(INSTALL_DIR) $(IDIR_WPEWEBKIT)/usr/lib + $(CP) $(WRKINST)/usr/lib/libWPEWebKit*.so* \ + $(IDIR_WPEWEBKIT)/usr/lib + $(INSTALL_DIR) $(IDIR_WPEWEBKIT)/usr/libexec/wpe-webkit-2.0 + $(INSTALL_BIN) $(WRKINST)/usr/libexec/wpe-webkit-2.0/* \ + $(IDIR_WPEWEBKIT)/usr/libexec/wpe-webkit-2.0 + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/wpewebkit/patches/patch-Source_bmalloc_libpas_src_libpas_pas_probabilistic_guard_malloc_allocator_c b/package/wpewebkit/patches/patch-Source_bmalloc_libpas_src_libpas_pas_probabilistic_guard_malloc_allocator_c new file mode 100644 index 000000000..548167711 --- /dev/null +++ b/package/wpewebkit/patches/patch-Source_bmalloc_libpas_src_libpas_pas_probabilistic_guard_malloc_allocator_c @@ -0,0 +1,20 @@ +--- wpewebkit-2.50.0.orig/Source/bmalloc/libpas/src/libpas/pas_probabilistic_guard_malloc_allocator.c 2025-08-11 09:56:57.555220800 +0200 ++++ wpewebkit-2.50.0/Source/bmalloc/libpas/src/libpas/pas_probabilistic_guard_malloc_allocator.c 2025-09-26 23:53:28.359719212 +0200 +@@ -47,17 +47,12 @@ + #include <unistd.h> + #endif + +-/* PlayStation does not currently support the backtrace API. Android API versions < 33 don't, either. Windows does not either. */ +-#if !PAS_PLATFORM(PLAYSTATION) && (!PAS_OS(ANDROID) || __ANDROID_API__ >= 33) && !PAS_OS(WINDOWS) +-#include <execinfo.h> +-#else + size_t backtrace(void** buffer, size_t size) + { + PAS_UNUSED_PARAM(buffer); + PAS_UNUSED_PARAM(size); + return 0; + } +-#endif + + static size_t free_wasted_mem = PAS_PGM_MAX_WASTED_MEMORY; + static size_t free_virtual_mem = PAS_PGM_MAX_VIRTUAL_MEMORY; diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index d5639997b..b96619e75 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xcb-proto -PKG_VERSION:= 1.16.0 +PKG_VERSION:= 1.17.0 PKG_RELEASE:= 1 -PKG_HASH:= a75a1848ad2a89a82d841a51be56ce988ff3c63a8d6bf4383ae3219d8d915119 +PKG_HASH:= 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c PKG_DESCR:= xml-xcb protocol descriptions PKG_SECTION:= dev/header HOST_BUILDDEP:= python3-host diff --git a/package/xcb-proto/patches/patch-xcb-proto_pc_in b/package/xcb-proto/patches/patch-xcb-proto_pc_in deleted file mode 100644 index 3732f4310..000000000 --- a/package/xcb-proto/patches/patch-xcb-proto_pc_in +++ /dev/null @@ -1,14 +0,0 @@ ---- xcb-proto-1.16.0.orig/xcb-proto.pc.in 2023-08-16 22:10:21.000000000 +0200 -+++ xcb-proto-1.16.0/xcb-proto.pc.in 2024-01-21 13:00:16.488006595 +0100 -@@ -2,9 +2,9 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ - datadir=@datadir@ --xcbincludedir=${pc_sysrootdir}@xcbincludedir@ -+xcbincludedir=@xcbincludedir@ - PYTHON_PREFIX=@PYTHON_PREFIX@ --pythondir=${pc_sysrootdir}@pythondir@ -+pythondir=@pythondir@ - - Name: XCB Proto - Description: X protocol descriptions for XCB diff --git a/package/xf86-input-libinput/Makefile b/package/xf86-input-libinput/Makefile new file mode 100644 index 000000000..8f6bac4c1 --- /dev/null +++ b/package/xf86-input-libinput/Makefile @@ -0,0 +1,30 @@ +# 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:= xf86-input-libinput +PKG_VERSION:= 1.5.0 +PKG_RELEASE:= 1 +PKG_HASH:= 2524c35f196554ea11aef3bba1cf324759454e1d49f98ac026ace2f6003580e6 +PKG_DESCR:= x11 driver for libinput +PKG_SECTION:= x11/drivers +PKG_DEPENDS:= xorg-server libudev libevdev mtdev libinput +PKG_BUILDDEP:= xorg-server eudev libevdev mtdev libinput +PKG_SITES:= https://www.x.org/releases/individual/driver/ + +PKG_CFLINE_XF86_INPUT_LIBINPUT:= depends on ADK_TARGET_WITH_INPUT || ADK_TARGET_QEMU + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XF86_INPUT_LIBINPUT,xf86-input-libinput,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +xf86-input-libinput-install: + ${INSTALL_DIR} ${IDIR_XF86_INPUT_LIBINPUT}/usr/lib/xorg/modules/input + ${CP} ${WRKINST}/usr/lib/xorg/modules/input/*.so \ + ${IDIR_XF86_INPUT_LIBINPUT}/usr/lib/xorg/modules/input/ + ${INSTALL_DIR} ${IDIR_XF86_INPUT_LIBINPUT}/usr/share/X11/xorg.conf.d + ${CP} ${WRKINST}/usr/share/X11/xorg.conf.d/40-libinput.conf \ + ${IDIR_XF86_INPUT_LIBINPUT}/usr/share/X11/xorg.conf.d + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile index 4df0982a5..90f850545 100644 --- a/package/xf86-video-fbdev/Makefile +++ b/package/xf86-video-fbdev/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xf86-video-fbdev -PKG_VERSION:= 0.4.4 +PKG_VERSION:= 0.5.1 PKG_RELEASE:= 1 -PKG_HASH:= 49e545951ea5fddc0d9b3ed3bf60e9a588a9c09401cc93ac082e064530bc0f81 +PKG_HASH:= 5e73c01f6ede09ddbc1f553fecdf35dd8efe76b44c7ed263de786a5968c5116f PKG_DESCR:= x11 driver for framebuffer devices PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index e21801f9f..a3d453b8f 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= xfsprogs -PKG_VERSION:= 6.6.0 +PKG_VERSION:= 6.9.0 PKG_RELEASE:= 1 -PKG_HASH:= 50ca2f4676df8fab4cb4c3ef3dd512d5551e6844d40a65a31d5b8e03593d22df +PKG_HASH:= 975284783fb3fbc4e1ae640bd804d788e4237a86b07582acee86b6e48f6521b7 PKG_DESCR:= utilities for xfs filesystems PKG_SECTION:= sys/fs PKG_DEPENDS:= libuuid libblkid libncurses libinih liburcu diff --git a/package/xinit/Makefile b/package/xinit/Makefile index a6f74d1e8..ba5160351 100644 --- a/package/xinit/Makefile +++ b/package/xinit/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xinit -PKG_VERSION:= 1.2.1 -PKG_RELEASE:= 6 -PKG_HASH:= 3079d3fb86af99f4c2c2907b5725e5820fdb2144d3be6002ec367bfcebc5c480 +PKG_VERSION:= 1.4.4 +PKG_RELEASE:= 1 +PKG_HASH:= 45cca1b0f3a963105f43cecc24e9cc4db0d14faa87bd9860b9ec563e8c73fc47 PKG_DESCR:= x window system initializer PKG_SECTION:= x11/utils PKG_DEPENDS:= xorg-server mcookie xauth xset @@ -33,8 +33,8 @@ xinit-install: $(IDIR_XINIT)/usr/bin/ $(INSTALL_BIN) $(WRKINST)/usr/bin/xinit \ $(IDIR_XINIT)/usr/bin/ - $(INSTALL_DIR) $(IDIR_XINIT)/usr/lib/X11/xinit - $(INSTALL_DATA) $(WRKINST)/usr/lib/X11/xinit/xinitrc \ - $(IDIR_XINIT)/usr/lib/X11/xinit/ + $(INSTALL_DIR) $(IDIR_XINIT)/etc/X11/xinit + $(INSTALL_DATA) $(WRKINST)/etc/X11/xinit/xinitrc \ + $(IDIR_XINIT)/etc/X11/xinit/ include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/xinit/patches/patch-xinitrc_in b/package/xinit/patches/patch-xinitrc_in new file mode 100644 index 000000000..9b76cf237 --- /dev/null +++ b/package/xinit/patches/patch-xinitrc_in @@ -0,0 +1,13 @@ +--- xinit-1.4.4.orig/xinitrc.in 2025-03-09 21:44:26.000000000 +0100 ++++ xinit-1.4.4/xinitrc.in 2025-09-27 00:32:37.482563426 +0200 +@@ -49,8 +49,5 @@ if [ -d "$xinitdir"/xinitrc.d ] ; then + unset f + fi + +-"$twm" & +-"$xclock" -geometry 50x50-1+1 & +-"$xterm" -geometry 80x50+494+51 & +-"$xterm" -geometry 80x20+494-0 & +-exec "$xterm" -geometry 80x66+0+0 -name login ++evilwm -fn fixed -term xterm & ++exec "$xterm" -geometry 80x18 diff --git a/package/xkbcomp/Makefile b/package/xkbcomp/Makefile index 03da06b23..50be6a1a1 100644 --- a/package/xkbcomp/Makefile +++ b/package/xkbcomp/Makefile @@ -4,23 +4,25 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xkbcomp -PKG_VERSION:= 1.0.5 -PKG_RELEASE:= 2 -PKG_HASH:= 817e2bda2ca51ffc1fc664e3f9ab88b359cd91246f0f4736fc747d6fbc59f2e7 +PKG_VERSION:= 1.4.7 +PKG_RELEASE:= 1 +PKG_HASH:= 0a288114e5f44e31987042c79aecff1ffad53a8154b8ec971c24a69a80f81f77 PKG_DESCR:= x11 keyboard compiler PKG_SECTION:= x11/misc PKG_BUILDDEP:= libxkbfile libX11 PKG_DEPENDS:= libxkbfile libx11 -PKG_SITES:= http://xorg.freedesktop.org/releases/X11R7.4/src/everything/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +HOST_BUILDDEP:= libxkbfile-host +PKG_SITES:= http://xorg.freedesktop.org/releases/individual/app/ +include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk +$(eval $(call HOST_template,XKBCOMP,xkbcomp,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,XKBCOMP,xkbcomp,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) xkbcomp-install: ${INSTALL_DIR} ${IDIR_XKBCOMP}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/xkbcomp ${IDIR_XKBCOMP}/usr/bin +include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index 182812e57..5724468e0 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xkeyboard-config -PKG_VERSION:= 2.37 +PKG_VERSION:= 2.45 PKG_RELEASE:= 1 -PKG_HASH:= eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c +PKG_HASH:= 169e075a92d957a57787c199e84e359df2931b7196c1c5b4a3d576ee6235a87c PKG_DESCR:= keyboard config PKG_SECTION:= x11/misc -PKG_BUILDDEP:= util-macros-host xkbcomp meson-host +PKG_BUILDDEP:= util-macros-host xkbcomp-host xkbcomp meson-host PKG_SITES:= http://www.x.org/releases/individual/data/xkeyboard-config/ include $(ADK_TOPDIR)/mk/package.mk @@ -23,9 +23,10 @@ BUILD_STYLE:= meson INSTALL_STYLE:= meson xkeyboard-config-install: - ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb - ${CP} ${WRKINST}/usr/share/X11/xkb/* \ - ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb - rm -rf ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/symbols/sun_vndr + ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11 + ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/xkeyboard-config-2 + ${CP} ${WRKINST}/usr/share/xkeyboard-config-2/* \ + ${IDIR_XKEYBOARD_CONFIG}/usr/share/xkeyboard-config-2 + (cd $(IDIR_XKEYBOARD_CONFIG)/usr/share/X11 && ln -sf ../xkeyboard-config-2 xkb) include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 9c6c12ffc..a4b5ad899 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xorg-server -PKG_VERSION:= 21.1.6 +PKG_VERSION:= 21.1.18 PKG_RELEASE:= 1 -PKG_HASH:= 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 +PKG_HASH:= c878d1930d87725d4a5bf498c24f4be8130d5b2646a9fd0f2994deff90116352 PKG_DESCR:= xorg server PKG_SECTION:= x11/drivers PKG_DEPENDS:= libxfont2 pixman libpciaccess libxkbfile libxcvt @@ -14,13 +14,13 @@ PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libdrm PKG_DEPENDS+= libxshmfence libfreetype libfontenc libpciaccess -PKG_DEPENDS+= libepoxy +PKG_DEPENDS+= libepoxy libdbus PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont2 pixman PKG_BUILDDEP+= libpciaccess xf86dgaproto recordproto dri3proto PKG_BUILDDEP+= xineramaproto presentproto xf86driproto glproto mesa -PKG_BUILDDEP+= xorgproto libxcvt libdrm libepoxy +PKG_BUILDDEP+= xorgproto libxcvt libdrm libepoxy font-util-host dbus PKG_NEEDS:= threads c++ PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/xserver/ @@ -28,10 +28,10 @@ PKG_OPTS:= dev PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC -PKG_FLAVOURS_XORG_SERVER:= WITH_KDRIVE -PKGFD_WITH_KDRIVE:= build kdrive xfbdev server - -PKG_CHOICES_XORG_SERVER:= WITH_LIBRESSL WITH_GCRYPT +PKG_CHOICES_XORG_SERVER:= WITH_OPENSSL WITH_LIBRESSL WITH_GCRYPT +PKGCD_WITH_OPENSSL:= use openssl crypto for sha1 +PKGCS_WITH_OPENSSL:= libopenssl +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_LIBRESSL:= use libressl crypto for sha1 PKGCS_WITH_LIBRESSL:= libressl PKGCB_WITH_LIBRESSL:= libressl @@ -44,6 +44,13 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CPPFLAGS+= -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t +TARGET_LDFLAGS+= -latomic -lstdc++ + +AUTOTOOL_STYLE:= autoreconf + +ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_OPENSSL},y) +CONFIGURE_ARGS+= --with-sha1=libcrypto +endif ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y) CONFIGURE_ARGS+= --with-sha1=libgcrypt @@ -60,10 +67,10 @@ CONFIGURE_ARGS+= --enable-dga \ --enable-vgahw \ --enable-dpms \ --enable-xinerama \ + --enable-config-udev \ + --disable-debug \ --disable-docs \ - --disable-glamor \ --disable-config-hal \ - --disable-config-udev \ --disable-xace \ --disable-xephyr \ --disable-xf86bigfont \ @@ -75,6 +82,8 @@ CONFIGURE_ARGS+= --enable-dga \ --disable-xvmc \ --disable-selective-werror \ --disable-strict-compilation \ + --disable-systemd-logind \ + --without-systemd-daemon \ --enable-dri \ --enable-dri2 \ --enable-dri3 \ @@ -84,12 +93,6 @@ CONFIGURE_ARGS+= --enable-dga \ --with-fontrootdir=/usr/share/fonts/X11/ \ --with-vendor-web="$(ADK_VENDOR_URL)" -ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_KDRIVE},y) -CONFIGURE_ARGS+= --enable-kdrive --enable-kdrive-kbd --enable-kdrive-mouse --enable-kdrive-evdev -else -CONFIGURE_ARGS+= --disable-kdrive -endif - ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) CONFIGURE_ARGS+= --with-int10=stub endif @@ -118,6 +121,10 @@ ifeq (${ADK_TARGET_SYSTEM_SHARP_ZAURUS},y) ${CP} ./files/xorg.conf.sharp-zaurus \ $(IDIR_XORG_SERVER)/etc/X11/xorg.conf endif +ifeq (${ADK_TARGET_SYSTEM_RASPBERRY_PI5},y) + ${CP} ./files/xorg.conf.raspberry-pi5 \ + $(IDIR_XORG_SERVER)/etc/X11/xorg.conf +endif # add m4 file to host directory $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal $(CP) ${WRKINST}/usr/share/aclocal/xorg-server.m4 \ diff --git a/package/xorg-server/files/xorg.conf.raspberry-pi5 b/package/xorg-server/files/xorg.conf.raspberry-pi5 new file mode 100644 index 000000000..f23cd1328 --- /dev/null +++ b/package/xorg-server/files/xorg.conf.raspberry-pi5 @@ -0,0 +1,6 @@ +Section "OutputClass" + Identifier "vc4" + MatchDriver "vc4" + Driver "modesetting" + Option "PrimaryGPU" "true" +EndSection diff --git a/package/xorg-server/patches/patch-configure b/package/xorg-server/patches/patch-configure index 378c27c1c..f7b7beab0 100644 --- a/package/xorg-server/patches/patch-configure +++ b/package/xorg-server/patches/patch-configure @@ -1,6 +1,6 @@ ---- xorg-server-21.1.5.orig/configure 2022-12-14 03:25:26.000000000 +0100 -+++ xorg-server-21.1.5/configure 2022-12-31 10:38:30.017910171 +0100 -@@ -29281,7 +29281,7 @@ printf "%s\n" "#define BASE_FONT_PATH \" +--- xorg-server-21.1.16.orig/configure 2025-02-25 18:56:12.000000000 +0000 ++++ xorg-server-21.1.16/configure 2025-04-19 02:08:40.369203750 +0000 +@@ -30272,7 +30272,7 @@ printf "%s\n" "#define BASE_FONT_PATH \" test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE diff --git a/package/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_Makefile_am b/package/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_Makefile_am new file mode 100644 index 000000000..c8cf55563 --- /dev/null +++ b/package/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_Makefile_am @@ -0,0 +1,11 @@ +--- xorg-server-21.1.16.orig/hw/xfree86/drivers/modesetting/Makefile.am 2025-02-25 18:56:05.000000000 +0000 ++++ xorg-server-21.1.16/hw/xfree86/drivers/modesetting/Makefile.am 2025-04-24 17:19:31.290883875 +0000 +@@ -41,7 +41,7 @@ AM_CPPFLAGS = \ + + modesetting_drv_la_LTLIBRARIES = modesetting_drv.la + modesetting_drv_la_LDFLAGS = -module -avoid-version +-modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS) ++modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS) $(GBM_LIBS) + modesetting_drv_ladir = @moduledir@/drivers + + modesetting_drv_la_SOURCES = \ diff --git a/package/xorgproto/Makefile b/package/xorgproto/Makefile index 264ee8da6..42b6879eb 100644 --- a/package/xorgproto/Makefile +++ b/package/xorgproto/Makefile @@ -4,11 +4,11 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xorgproto -PKG_VERSION:= 2021.5 +PKG_VERSION:= 2024.1 PKG_RELEASE:= 1 PKG_DESCR:= xorg extension headers PKG_SECTION:= dev/header -PKG_HASH:= be6ddd6590881452fdfa170c1c9ff87209a98d36155332cbf2ccbc431add86ff +PKG_HASH:= 4f6b9b4faf91e5df8265b71843a91fc73dc895be6210c84117a996545df296ce PKG_SITES:= http://www.x.org/releases/individual/proto/ PKG_OPTS:= dev devonly diff --git a/package/xterm/Makefile b/package/xterm/Makefile index 4bc96d25d..0c6f1c634 100644 --- a/package/xterm/Makefile +++ b/package/xterm/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xterm -PKG_VERSION:= 377 +PKG_VERSION:= 401 PKG_RELEASE:= 1 -PKG_HASH:= db108fe7a45d8ed97e604721b58443b473649e61e263631bf8759f8618a990b2 +PKG_HASH:= 3da2b5e64cb49b03aa13057d85e62e1f2e64f7c744719c00d338d11cd3e6ca1a PKG_DESCR:= terminal emulator PKG_SECTION:= x11/apps PKG_DEPENDS:= libxaw libxt libncurses libxft fontconfig libuuid diff --git a/package/xterm/patches/patch-Makefile_in b/package/xterm/patches/patch-Makefile_in deleted file mode 100644 index 1282767e2..000000000 --- a/package/xterm/patches/patch-Makefile_in +++ /dev/null @@ -1,22 +0,0 @@ - Fix shell compatibility problem. Note: this is rather hacky, as it - changes the actual semantics of the code - instead of evaluating the - shell statement when being used as parameter to a command, now the - $(shell) function is being used and therefore the result computed at - variable assignment stage. ---- xterm-259.orig/Makefile.in 2010-04-05 00:41:32.000000000 +0200 -+++ xterm-259/Makefile.in 2010-06-06 22:35:13.384934404 +0200 -@@ -175,10 +175,10 @@ resize$x : $(OBJS2) - - charproc$o : main.h @CHARPROC_DEPS@ - ################################################################################ --actual_xterm = `echo xterm| sed '$(transform)'` --actual_resize = `echo resize| sed '$(transform)'` --actual_uxterm = `echo uxterm| sed '$(transform)'` --actual_k8term = `echo koi8rxterm| sed '$(transform)'` -+actual_xterm = $(shell echo xterm| sed '$(transform)') -+actual_resize = $(shell echo resize| sed '$(transform)') -+actual_uxterm = $(shell echo uxterm| sed '$(transform)') -+actual_k8term = $(shell echo koi8rxterm| sed '$(transform)') - - binary_xterm = $(actual_xterm)$x - binary_resize = $(actual_resize)$x diff --git a/package/xterm/patches/patch-main_c b/package/xterm/patches/patch-main_c deleted file mode 100644 index 96d2398c8..000000000 --- a/package/xterm/patches/patch-main_c +++ /dev/null @@ -1,41 +0,0 @@ ---- xterm-325.orig/main.c 2016-06-01 11:13:46.000000000 +0200 -+++ xterm-325/main.c 2016-09-09 22:25:42.000000000 +0200 -@@ -2637,7 +2637,7 @@ main(int argc, char *argv[]ENVP_ARG) - } - } - --#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) -+#if defined(__osf__) || (defined(__linux__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) - #define USE_OPENPTY 1 - static int opened_tty = -1; - #endif -@@ -3204,7 +3204,7 @@ find_utmp(struct UTMP_STR *tofind) - - #define close_fd(fd) close(fd), fd = -1 - --#if defined(TIOCNOTTY) && (!defined(__GLIBC__) || (__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))) -+#if defined(TIOCNOTTY) && defined(__linux__) - #define USE_NO_DEV_TTY 1 - #else - #define USE_NO_DEV_TTY 0 -@@ -3537,7 +3537,8 @@ spawnXTerm(XtermWidget xw) - } - #endif /* __MVS__ */ - -- close_fd(ttyfd); -+ // do not close it here -+ // close_fd(ttyfd); - } - - if (get_pty(&screen->respond, XDisplayString(screen->display))) { -@@ -3966,8 +3967,9 @@ spawnXTerm(XtermWidget xw) - eg. by lineedit in the shell, or emacs, etc. then tio - will have bad values. Let's just get termio from the - new tty and tailor it. */ -- if (ttyGetAttr(ttyfd, &tio) == -1) -+ if (ttyGetAttr(ttyfd, &tio) == -1) { - SysError(ERROR_TIOCGETP); -+ } - tio.c_lflag |= ECHOE; - #endif /* umips */ - /* Now is also the time to change the modes of the diff --git a/package/xterm/patches/patch-ptyx_h b/package/xterm/patches/patch-ptyx_h deleted file mode 100644 index 6fa2d72d2..000000000 --- a/package/xterm/patches/patch-ptyx_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xterm-325.orig/ptyx.h 2016-05-29 22:32:48.000000000 +0200 -+++ xterm-325/ptyx.h 2016-09-09 22:25:42.000000000 +0200 -@@ -176,7 +176,7 @@ - #define USE_PTY_DEVICE 1 - #define USE_PTY_SEARCH 1 - --#if defined(__osf__) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) -+#if defined(__osf__) || defined(linux) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) - #undef USE_PTY_DEVICE - #undef USE_PTY_SEARCH - #define USE_PTS_DEVICE 1 diff --git a/package/xvidcore/Makefile b/package/xvidcore/Makefile index c7999cc4b..13e57b5a7 100644 --- a/package/xvidcore/Makefile +++ b/package/xvidcore/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xvidcore -PKG_VERSION:= 1.3.5 +PKG_VERSION:= 1.3.7 PKG_RELEASE:= 1 -PKG_HASH:= 165ba6a2a447a8375f7b06db5a3c91810181f2898166e7c8137401d7fc894cf0 +PKG_HASH:= abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d PKG_DESCR:= xvid codec library PKG_SECTION:= libs/video PKG_URL:= http://www.xvid.org/ diff --git a/package/xwayland/Makefile b/package/xwayland/Makefile index 2e0848cdd..5ec1dbc9a 100644 --- a/package/xwayland/Makefile +++ b/package/xwayland/Makefile @@ -4,18 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xwayland -PKG_VERSION:= 21.1.3 +PKG_VERSION:= 24.1.6 PKG_RELEASE:= 1 -PKG_HASH:= ebc2757f39fd4c7db1654fd86591589c211aa20172d43a54f77ae567cedbf8a2 +PKG_HASH:= 737e612ca36bbdf415a911644eb7592cf9389846847b47fa46dc705bd754d2d7 PKG_DESCR:= wayland server PKG_SECTION:= x11/drivers PKG_DEPENDS:= wayland wayland-protocols libepoxy libtirpc -PKG_DEPENDS+= pixman libxkbfile libxfont2 font-util libressl +PKG_DEPENDS+= pixman libxkbfile libxfont2 font-util libopenssl PKG_DEPENDS+= libxdmcp libxshmfence libx11 libxcb libxext PKG_DEPENDS+= libxau libfreetype libfontenc PKG_BUILDDEP:= wayland wayland-protocols libepoxy libtirpc PKG_BUILDDEP+= pixman xorgproto libxkbfile libXfont2 font-util -PKG_BUILDDEP+= libressl libXdmcp libxshmfence libX11 libxcb +PKG_BUILDDEP+= openssl libXdmcp libxshmfence libX11 libxcb PKG_BUILDDEP+= libXext libXau freetype libfontenc PKG_URL:= https://xorg.freedesktop.org/ PKG_SITES:= https://www.x.org/releases/individual/xserver/ diff --git a/package/yaboot/Makefile b/package/yaboot/Makefile index 48ddcdba8..573440bc0 100644 --- a/package/yaboot/Makefile +++ b/package/yaboot/Makefile @@ -13,6 +13,8 @@ PKG_BUILDDEP:= e2fsprogs PKG_URL:= http://yaboot.ozlabs.org/ PKG_SITES:= http://yaboot.ozlabs.org/releases/ +PKG_ARCH_DEPENDS:= ppc + DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/yaml/Makefile b/package/yaml/Makefile new file mode 100644 index 000000000..f524ed1b4 --- /dev/null +++ b/package/yaml/Makefile @@ -0,0 +1,29 @@ +# 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:= yaml +PKG_VERSION:= 0.2.5 +PKG_RELEASE:= 1 +PKG_HASH:= c642ae9b75fee120b2d96c712538bd2cf283228d2337df2cf2988e3c02678ef4 +PKG_DESCR:= yaml library +PKG_SECTION:= libs/misc +PKG_SITES:= https://github.com/yaml/libyaml/releases/download/$(PKG_VERSION)/ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,YAML,yaml,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call PKG_template,YAML,yaml,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +yaml-install: + $(INSTALL_DIR) $(IDIR_YAML)/usr/lib + $(CP) $(WRKINST)/usr/lib/libyaml*.so* \ + $(IDIR_YAML)/usr/lib + +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/zfs/Makefile b/package/zfs/Makefile new file mode 100644 index 000000000..0e3db6392 --- /dev/null +++ b/package/zfs/Makefile @@ -0,0 +1,70 @@ +# 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:= zfs +PKG_VERSION:= 2.2.6 +PKG_RELEASE:= 1 +PKG_HASH:= c92e02103ac5dd77bf01d7209eabdca55c7b3356aa747bb2357ec4222652a2a7 +PKG_DESCR:= Advanced file system and volume manager +PKG_SECTION:= sys/fs +PKG_DEPENDS:= libcurl +PKG_URL:= https://openzfs.org +PKG_SITES:= https://github.com/openzfs/zfs/releases/download/${PKG_NAME}-${PKG_VERSION}/ +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +PKG_SUBPKGS:= ZFS ZFS_TESTS +PKGSS_ZFS_TESTS:= bash +PKGSC_ZFS_TESTS:= base/tests +PKGSD_ZFS_TESTS:= OpenZFS testsuite + +include $(ADK_TOPDIR)/mk/package.mk +include $(ADK_TOPDIR)/mk/$(ADK_TARGET_OS)-ver.mk +include ${ADK_TOPDIR}/mk/kernel-vars.mk + +$(eval $(call PKG_template,ZFS,zfs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +$(eval $(call PKG_template,ZFS_TESTS,zfs-tests,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_ZFS_TESTS),$(PKGSD_ZFS_TESTS),$(PKGSC_ZFS_TESTS))) + +AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --with-linux=${LINUX_DIR} --without-python +CONFIGURE_ENV+= KERNEL_CC="${TARGET_CC}" \ + KERNEL_CROSS_COMPILE="${TARGET_CROSS}" \ + KERNEL_ARCH="${ADK_TARGET_KARCH}" + +zfs-install: + $(INSTALL_DIR) $(IDIR_ZFS)/sbin + $(INSTALL_BIN) $(WRKINST)/sbin/mount.zfs $(IDIR_ZFS)/sbin + $(INSTALL_DIR) $(IDIR_ZFS)/etc/zfs/zed.d + $(CP) $(WRKINST)/etc/zfs/zed.d/* $(IDIR_ZFS)/etc/zfs/zed.d + $(CP) $(WRKINST)/etc/zfs/zfs-functions $(IDIR_ZFS)/etc/zfs + $(INSTALL_DIR) $(IDIR_ZFS)/etc/zfs/zpool.d + $(CP) $(WRKINST)/etc/zfs/zpool.d/* $(IDIR_ZFS)/etc/zfs/zpool.d + $(INSTALL_DIR) $(IDIR_ZFS)/lib/modules/${KERNEL_VERSION}/ + $(CP) $(WRKINST)/lib/modules/${KERNEL_VERSION}/extra/{zfs,spl}.ko \ + $(IDIR_ZFS)/lib/modules/${KERNEL_VERSION}/ + $(INSTALL_DIR) $(IDIR_ZFS)/etc/modules.d/ + printf "spl\nzfs\n" >$(IDIR_ZFS)/etc/modules.d/2-zfs + $(INSTALL_DIR) $(IDIR_ZFS)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/* $(IDIR_ZFS)/usr/bin + $(INSTALL_DIR) $(IDIR_ZFS)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/* $(IDIR_ZFS)/usr/sbin + $(INSTALL_DIR) $(IDIR_ZFS)/usr/libexec/zfs/zed.d + $(INSTALL_BIN) $(WRKINST)/usr/libexec/zfs/zed.d/* \ + $(IDIR_ZFS)/usr/libexec/zfs/zed.d/ + $(INSTALL_DIR) $(IDIR_ZFS)/usr/libexec/zfs/zpool.d + $(INSTALL_BIN) $(WRKINST)/usr/libexec/zfs/zpool.d/* \ + $(IDIR_ZFS)/usr/libexec/zfs/zpool.d/ + $(INSTALL_BIN) $(WRKINST)/usr/libexec/zfs/zpool_influxdb \ + $(IDIR_ZFS)/usr/libexec/zfs/ + $(INSTALL_DIR) $(IDIR_ZFS)/usr/lib + $(CP) $(WRKINST)/usr/lib/*.so* $(IDIR_ZFS)/usr/lib/ + +zfs-tests-install: + $(INSTALL_DIR) $(IDIR_ZFS_TESTS)/usr/share + $(CP) $(WRKINST)/usr/share/zfs $(IDIR_ZFS_TESTS)/usr/share/ + +# XXX: use /usr/share/initramfs-tools for custom init scripts +# or just the files in root/etc/{conf,init}.d + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/zfs/patches/0001-Support-for-cross-compiling-kernel-modules.patch b/package/zfs/patches/0001-Support-for-cross-compiling-kernel-modules.patch new file mode 100644 index 000000000..b20c3ecf6 --- /dev/null +++ b/package/zfs/patches/0001-Support-for-cross-compiling-kernel-modules.patch @@ -0,0 +1,53 @@ +From 1d566bf169297faba7afbe59df151ac479b234d5 Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil@nwl.cc> +Date: Fri, 3 Jan 2025 16:30:24 +0100 +Subject: [PATCH] Support for cross-compiling kernel modules + +In order to correctly cross-compile, one has to pass ARCH and +CROSS_COMPILE make flags to kernel module build calls. Facilitate this +in the same way as for custom CC flag by recognizing KERNEL_-prefixed +configure environment variables of same name. + +Signed-off-by: Phil Sutter <phil@nwl.cc> +--- + config/kernel.m4 | 5 +++++ + module/Makefile.in | 2 ++ + 2 files changed, 7 insertions(+) + +diff --git a/config/kernel.m4 b/config/kernel.m4 +index 173c78a2a561a..c0a8355945dce 100644 +--- a/config/kernel.m4 ++++ b/config/kernel.m4 +@@ -663,11 +663,16 @@ AC_DEFUN([ZFS_LINUX_COMPILE], [ + building kernel modules]) + AC_ARG_VAR([KERNEL_LLVM], [Binary option to + build kernel modules with LLVM/CLANG toolchain]) ++ AC_ARG_VAR([KERNEL_CROSS_COMPILE], [Cross compile prefix ++ for kernel module builds]) ++ AC_ARG_VAR([KERNEL_ARCH], [Architecture to build kernel modules for]) + AC_TRY_COMMAND([ + KBUILD_MODPOST_NOFINAL="$5" KBUILD_MODPOST_WARN="$6" + make modules -k -j$TEST_JOBS ${KERNEL_CC:+CC=$KERNEL_CC} + ${KERNEL_LD:+LD=$KERNEL_LD} ${KERNEL_LLVM:+LLVM=$KERNEL_LLVM} + CONFIG_MODULES=y CFLAGS_MODULE=-DCONFIG_MODULES ++ ${KERNEL_CROSS_COMPILE:+CROSS_COMPILE=$KERNEL_CROSS_COMPILE} ++ ${KERNEL_ARCH:+ARCH=$KERNEL_ARCH} + -C $LINUX_OBJ $ARCH_UM M=$PWD/$1 >$1/build.log 2>&1]) + AS_IF([AC_TRY_COMMAND([$2])], [$3], [$4]) + ]) +diff --git a/module/Makefile.in b/module/Makefile.in +index b6338430e8125..b6e3c8e88ccac 100644 +--- a/module/Makefile.in ++++ b/module/Makefile.in +@@ -54,6 +54,8 @@ FMAKE = env -u MAKEFLAGS make $(FMAKEFLAGS) + list='$(SUBDIR_TARGETS)'; for td in $$list; do $(MAKE) -C $$td; done + $(MAKE) -C @LINUX_OBJ@ $(if @KERNEL_CC@,CC=@KERNEL_CC@) \ + $(if @KERNEL_LD@,LD=@KERNEL_LD@) $(if @KERNEL_LLVM@,LLVM=@KERNEL_LLVM@) \ ++ $(if @KERNEL_CROSS_COMPILE@,CROSS_COMPILE=@KERNEL_CROSS_COMPILE@) \ ++ $(if @KERNEL_ARCH@,ARCH=@KERNEL_ARCH@) \ + M="$$PWD" @KERNEL_MAKE@ CONFIG_ZFS=m modules + + modules-FreeBSD: +-- +2.43.0 + diff --git a/package/zip/Makefile b/package/zip/Makefile index 77f6c6f1c..991963c33 100644 --- a/package/zip/Makefile +++ b/package/zip/Makefile @@ -31,7 +31,7 @@ MAKE_FILE:= unix/Makefile ALL_TARGET:= generic_gcc host-build: - (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} CC="$(HOST_CC) -std=gnu89" ${MAKE} -f ${MAKE_FILE} \ ${HOST_MAKE_FLAGS} ${ALL_TARGET}) zip-hostinstall: diff --git a/package/zip/patches/patch-timezone_c b/package/zip/patches/patch-timezone_c new file mode 100644 index 000000000..9f549df5c --- /dev/null +++ b/package/zip/patches/patch-timezone_c @@ -0,0 +1,10 @@ +--- zip30.orig/timezone.c 2004-11-13 09:35:12.000000000 +0100 ++++ zip30/timezone.c 2025-10-05 03:57:25.603996335 +0200 +@@ -41,6 +41,7 @@ + #include "timezone.h" + #include <ctype.h> + #include <errno.h> ++#include <time.h> + + #ifdef IZTZ_DEFINESTDGLOBALS + long timezone = 0; diff --git a/package/zip/patches/patch-unix_configure b/package/zip/patches/patch-unix_configure new file mode 100644 index 000000000..d177b83f8 --- /dev/null +++ b/package/zip/patches/patch-unix_configure @@ -0,0 +1,14 @@ +--- zip30.orig/unix/configure 2008-06-20 05:32:20.000000000 +0200 ++++ zip30/unix/configure 2025-10-05 03:55:24.305239765 +0200 +@@ -519,7 +519,10 @@ done + + + echo Check for memset +-echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c ++cat > conftest.c << _EOF_ ++#include <string.h> ++int main(){ char k; memset(&k,0,0); return 0; } ++_EOF_ + $CC -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM" + diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 9d7cea2ae..e5de4a036 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -27,6 +27,7 @@ endif HOST_STYLE:= auto HOST_CONFIG_STYLE:= manual HOST_CONFIGURE_ENV+= uname=Linux +HOST_FAKE_FLAGS+= DESTDIR=/ CONFIG_STYLE:= manual CONFIGURE_ENV+= uname=Linux @@ -45,7 +46,7 @@ host-configure: CPPFLAGS="-I$(STAGING_HOST_DIR)/usr/include" \ LDFLAGS="-L$(STAGING_HOST_DIR)/usr/lib" \ ./configure \ - --prefix=/usr \ + --prefix=$(STAGING_HOST_DIR)/usr \ --shared \ ); |