diff options
Diffstat (limited to 'package')
1100 files changed, 9725 insertions, 39294 deletions
diff --git a/package/Config.in b/package/Config.in index fd578b8c9..248d66fff 100644 --- a/package/Config.in +++ b/package/Config.in @@ -26,6 +26,7 @@ source package/Config.in.auto.app.chat source package/Config.in.auto.app.crypto source package/Config.in.auto.app.debug source package/Config.in.auto.app.editor +source package/Config.in.auto.app.games source package/Config.in.auto.app.p2p endmenu diff --git a/package/Config.in.options b/package/Config.in.options index 39e6a0b96..cdf3f436a 100644 --- a/package/Config.in.options +++ b/package/Config.in.options @@ -2,14 +2,14 @@ config ADK_PACKAGE_SUFFIX string default "ipk" if ADK_TARGET_PACKAGE_IPKG default "ipk" if ADK_TARGET_PACKAGE_OPKG - default "tar.xz" if ADK_TARGET_PACKAGE_TXZ + default "tar.gz" if ADK_TARGET_PACKAGE_TGZ choice prompt "Package format" -default ADK_TARGET_PACKAGE_TXZ +default ADK_TARGET_PACKAGE_TGZ -config ADK_TARGET_PACKAGE_TXZ - bool "xz compressed tar archive" +config ADK_TARGET_PACKAGE_TGZ + bool "gzip compressed tar archive" help Create compressed tar archives of packages. Pre- and post install scripts will be executed in the target @@ -47,7 +47,7 @@ config ADK_LEAVE_ETC_ALONE config ADK_INSTALL_PACKAGE_INIT_SCRIPTS bool "ship custom init-scripts along with packages" - default y if !ADK_RUNTIME_INIT_SYSTEMD + default y depends on !ADK_LEAVE_ETC_ALONE help Turning this option to false will prevent the ADK from @@ -59,7 +59,7 @@ config ADK_INSTALL_PACKAGE_INIT_SCRIPTS config ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS bool "ship custom network-scripts along with packages" - default y if !ADK_RUNTIME_INIT_SYSTEMD + default y depends on !ADK_LEAVE_ETC_ALONE help Turning this option to false will prevent the ADK from diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index e669ee059..c3fec321b 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= DirectFB -PKG_VERSION:= 1.6.3 -PKG_RELEASE:= 3 -PKG_EXTRAVER:= 1.6-0 -PKG_HASH:= 7a96aced0f69b2ec0810e9923068e61c21e6b19dd593e09394c872414df75e70 +PKG_VERSION:= 1.7.7 +PKG_EXTRAVER:= 1.7-7 +PKG_RELEASE:= 1 +PKG_HASH:= b785c638dc31b8fe3a7c81be1475c89b2255ab3d67b777c747d3fbc52f8027a3 PKG_DESCR:= thin graphic library for framebuffer devices PKG_SECTION:= libs/image PKG_DEPENDS:= libpng libjpeg-turbo libfreetype PKG_BUILDDEP:= libpng libjpeg-turbo freetype PKG_URL:= http://www.directfb.org/ -PKG_SITES:= http://directfb.org/downloads/Core/DirectFB-1.6/ +PKG_SITES:= https://distfiles.openadk.org/ PKG_LIBNAME:= directfb PKG_OPTS:= dev diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 2981a2930..aca4f647f 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ImageMagick -PKG_VERSION:= 7.0.5 -PKG_EXTRAVER:= 10 +PKG_VERSION:= 7.1.1 +PKG_EXTRAVER:= 29 PKG_RELEASE:= 1 -PKG_HASH:= 0058fcde533986334458a5c99600b1b9633182dd9562cbad4ba618c5ccf2a28f +PKG_HASH:= f140465fbeb0b4724cba4394bc6f6fb32715731c1c62572d586f4f1c8b9b0685 PKG_DESCR:= image processing and converting utility PKG_SECTION:= mm/image PKG_BUILDDEP:= libpng libjpeg-turbo libtiff fontconfig diff --git a/package/adktest/Makefile b/package/adktest/Makefile index 3e1ad35c3..b6571a199 100644 --- a/package/adktest/Makefile +++ b/package/adktest/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= adktest PKG_VERSION:= 0.1 -PKG_RELEASE:= 10 +PKG_RELEASE:= 11 PKG_DESCR:= helper tools and scripts for qemu testing PKG_SECTION:= base/tests PKG_URL:= http://openadk.org/ diff --git a/package/adktest/files/adktest.init b/package/adktest/files/adktest.init index e1fe9a8c2..3969eb585 100755 --- a/package/adktest/files/adktest.init +++ b/package/adktest/files/adktest.init @@ -17,6 +17,7 @@ start) fi echo "Starting test script ..." if [ -x /run.sh ];then + mount -o remount,rw / /run.sh quit else diff --git a/package/adktest/src/quit b/package/adktest/src/quit index 74c5f01b8..00468d36a 100755 --- a/package/adktest/src/quit +++ b/package/adktest/src/quit @@ -1,7 +1,7 @@ #!/bin/sh arch=$(uname -m) case $arch in - arc|blackfin|m68k|metag|openrisc|riscv64|s390x|sh4eb) + arc|blackfin|kvx|m68k|metag|riscv64|s390x|sh4eb) poweroff ;; *) diff --git a/package/afboot-stm32/patches/patch-Makefile b/package/afboot-stm32/patches/patch-Makefile index 8f543cc4e..c063052c9 100644 --- a/package/afboot-stm32/patches/patch-Makefile +++ b/package/afboot-stm32/patches/patch-Makefile @@ -1,11 +1,18 @@ ---- afboot-stm32-3566acd582e5536fb60864281788a30f5527df2d.orig/Makefile 2021-04-09 08:03:07.000000000 +0200 -+++ afboot-stm32-3566acd582e5536fb60864281788a30f5527df2d/Makefile 2021-04-09 08:12:57.359735373 +0200 -@@ -13,7 +13,8 @@ DTB_ADDR?=0x08004000 +--- afboot-stm32-3566acd582e5536fb60864281788a30f5527df2d.orig/Makefile 2021-12-31 07:02:01.000000000 +0100 ++++ afboot-stm32-3566acd582e5536fb60864281788a30f5527df2d/Makefile 2021-12-31 12:02:33.236273664 +0100 +@@ -7,13 +7,14 @@ OBJDUMP = $(CROSS_COMPILE)objdump + SIZE = $(CROSS_COMPILE)size + GDB = $(CROSS_COMPILE)gdb + OPENOCD = openocd +-KERNEL_ADDR?=0x08008000 ++KERNEL_ADDR?=0x0800C000 + DTB_ADDR?=0x08004000 + CFLAGS := -mthumb -mcpu=cortex-m4 CFLAGS += -ffunction-sections -fdata-sections CFLAGS += -Os -std=gnu99 -Wall -LINKERFLAGS := -nostartfiles --gc-sections -+CFLAGS += -fno-builtin ++CFLAGS += -mno-fdpic -fno-builtin +LINKERFLAGS := --gc-sections obj-y += gpio.o mpu.o qspi.o start_kernel.o diff --git a/package/afpfs-ng/Makefile b/package/afpfs-ng/Makefile index 96380df46..28cbb57ba 100644 --- a/package/afpfs-ng/Makefile +++ b/package/afpfs-ng/Makefile @@ -11,7 +11,6 @@ PKG_DESCR:= client for apple filing protocol PKG_SECTION:= net/fs PKG_DEPENDS:= libgcrypt PKG_BUILDDEP:= fuse libgcrypt readline -PKG_URL:= https://sites.google.com/site/alexthepuffin/home PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=afpfs-ng/} PKG_LIBNAME:= libafpclient PKG_OPTS:= dev @@ -29,6 +28,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,AFPFS_NG,afpfs-ng,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBAFPCLIENT,libafpclient,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBAFPCLIENT},${PKGSD_LIBAFPCLIENT},${PKGSC_LIBAFPCLIENT},$(PKG_OPTS))) +TARGET_CFLAGS+= -fcommon AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --enable-gcrypt CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile index 40437b144..154e19922 100644 --- a/package/aircrack-ng/Makefile +++ b/package/aircrack-ng/Makefile @@ -4,31 +4,28 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= aircrack-ng -PKG_VERSION:= 1.2 +PKG_VERSION:= 1.7 PKG_RELEASE:= 1 -PKG_HASH:= d93ac16aade5b4d37ab8cdf6ce4b855835096ccf83deb65ffdeff6d666eaff36 +PKG_HASH:= 05a704e3c8f7792a17315080a21214a4448fd2452c1b0dd5226a3a55f90b58c3 PKG_DESCR:= set of tools for auditing wireless networks PKG_SECTION:= net/wifi -PKG_DEPENDS:= libpcap libnl libressl -PKG_BUILDDEP:= libpcap libnl libressl -PKG_NEEDS:= threads +PKG_DEPENDS:= libpcap libnl libressl zlib +PKG_BUILDDEP:= libpcap libnl libressl zlib +PKG_NEEDS:= threads c++ PKG_URL:= http://www.aircrack-ng.org/ PKG_SITES:= http://download.aircrack-ng.org/ # do not build parallel, otherwise libosdep.a may not be ready when compiling airtun-ng PKG_NOPARALLEL:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-rc4.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-rc4 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,AIRCRACK_NG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIG_STYLE:= manual - -XAKE_FLAGS+= CC="$(TARGET_CC)" \ - TOOL_PREFIX="$(TARGET_CROSS)" \ - OSNAME="Linux" prefix="/usr" +AUTOTOOL_STYLE:= autogen +XAKE_FLAGS+= V=1 +CONFIGURE_ARGS+= --with-libpcap-include='$(STAGING_TARGET_DIR)/usr/include' aircrack-ng-install: $(INSTALL_DIR) $(IDIR_AIRCRACK_NG)/usr/bin diff --git a/package/aircrack-ng/patches/patch-common_mak b/package/aircrack-ng/patches/patch-common_mak deleted file mode 100644 index 9a8bf9c3c..000000000 --- a/package/aircrack-ng/patches/patch-common_mak +++ /dev/null @@ -1,27 +0,0 @@ ---- aircrack-ng-1.2-rc4.orig/common.mak 2015-12-31 20:42:10.000000000 +0100 -+++ aircrack-ng-1.2-rc4/common.mak 2017-06-06 21:16:36.954790985 +0200 -@@ -1,6 +1,6 @@ - PKG_CONFIG ?= pkg-config - --NEWSSE = true -+NEWSSE = false - # Newer version of the core can be enabled via SIMDCORE - # but should be automatically flipped on thru autodetection - SIMDCORE = false -@@ -231,16 +231,6 @@ ifeq ($(GCC_OVER49), 0) - GCC_OVER49 = $(shell expr 4.9 \<= `$(CC) -dumpversion | awk -F. '{ print $1$2 }'`) - endif - --ifeq ($(GCC_OVER49), 0) -- ifeq ($(GCC_OVER41), 1) -- COMMON_CFLAGS += -fstack-protector -- endif --endif -- --ifeq ($(GCC_OVER49), 1) -- COMMON_CFLAGS += -fstack-protector-strong --endif -- - ifeq ($(GCC_OVER45), 1) - CFLAGS += -Wno-unused-but-set-variable -Wno-array-bounds - endif diff --git a/package/aircrack-ng/patches/patch-src_osdep_linux_c b/package/aircrack-ng/patches/patch-src_osdep_linux_c deleted file mode 100644 index 1811eb90a..000000000 --- a/package/aircrack-ng/patches/patch-src_osdep_linux_c +++ /dev/null @@ -1,26 +0,0 @@ - When search for wireless-tools, also check $PATH ---- aircrack-ng-1.2-rc4.orig/src/osdep/linux.c 2016-02-15 00:34:57.000000000 +0100 -+++ aircrack-ng-1.2-rc4/src/osdep/linux.c 2017-06-06 20:36:32.460367791 +0200 -@@ -263,6 +263,7 @@ static char * wiToolsPath(const char * t - "/usr/local/bin", - "/tmp" - }; -+ char *envpath, *token; - - // Also search in other known location just in case we haven't found it yet - nbelems = sizeof(paths) / sizeof(char *); -@@ -273,6 +274,14 @@ static char * wiToolsPath(const char * t - return path; - } - -+ /* search again in $PATH */ -+ for (envpath = getenv("PATH"); ; envpath = NULL) { -+ if ((token = strtok(envpath, ":")) == NULL) -+ break; -+ if ((path = searchInside(token, tool)) != NULL) -+ return path; -+ } -+ - return NULL; - } - diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index bf7f496d1..bbafdfd70 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= alsa-lib -PKG_VERSION:= 1.1.4 +PKG_VERSION:= 1.2.11 PKG_RELEASE:= 1 -PKG_HASH:= 82f50a09487079755d93e4c9384912196995bade6280bce9bfdcabf094bfb515 +PKG_HASH:= 9f3f2f69b995f9ad37359072fbc69a3a88bfba081fc83e9be30e14662795bb4d PKG_DESCR:= sound library PKG_SECTION:= libs/audio PKG_URL:= http://www.alsa-project.org/ @@ -28,7 +28,8 @@ endif HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --disable-python CONFIGURE_ARGS+= --disable-python \ - --without-versioned + --without-versioned \ + --disable-topology alsa-lib-install: ${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index cabc1ca31..2caa08f05 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= alsa-utils -PKG_VERSION:= 1.1.4 +PKG_VERSION:= 1.2.11 PKG_RELEASE:= 1 -PKG_HASH:= a7831044de92c5bf33bf3365a3f36e49397f4191e934df460ae1ca15138c9d9d +PKG_HASH:= 9ac6ca3a883f151e568dcf979b8d2e5cbecc51b819bb0e6bb8a2e9b34cc428a7 PKG_DESCR:= mixer/player/record utilities PKG_SECTION:= mm/audio PKG_DEPENDS:= alsa-lib diff --git a/package/alsa-utils/files/amixer.init b/package/alsa-utils/files/amixer.init index 884b2acf2..58813a96c 100644 --- a/package/alsa-utils/files/amixer.init +++ b/package/alsa-utils/files/amixer.init @@ -11,7 +11,7 @@ autostart) exec sh $0 start ;; start) - for shell in $(ls /etc/amixer.d/*.sh); do + for shell in $(ls /etc/amixer.d/*.sh 2>/dev/null); do ./$shell >/dev/null done ;; diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index 7046779ac..3ee12d26b 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -23,7 +23,8 @@ $(eval $(call PKG_template,APR_UTIL,apr-util,${PKG_VERSION}-${PKG_RELEASE},${PKG CONFIGURE_ARGS+= --without-berkeley-db \ --with-apr=${STAGING_TARGET_DIR}/usr \ - --with-expat=${STAGING_TARGET_DIR}/usr + --with-expat=${STAGING_TARGET_DIR}/usr \ + --without-iconv XAKE_FLAGS+= apr_builddir=${STAGING_TARGET_DIR}/usr/share/build-1 \ apr_builders=${STAGING_TARGET_DIR}/usr/share/build-1 diff --git a/package/arm-trusted-firmware/Makefile b/package/arm-trusted-firmware/Makefile new file mode 100644 index 000000000..10bb72a25 --- /dev/null +++ b/package/arm-trusted-firmware/Makefile @@ -0,0 +1,26 @@ +# 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:= arm-trusted-firmware +PKG_VERSION:= 6952ce49c29be021eb07159c2f472e9e23633135 +PKG_GIT:= hash +PKG_RELEASE:= 1 +PKG_DESCR:= ARM Trusted Firmware +PKG_SECTION:= base/boot +PKG_SITES:= https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git + +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))) + +TARGET_LDFLAGS:= +XAKE_FLAGS+= V=1 +ALL_TARGET:= bl31 +CONFIG_STYLE:= manual +INSTALL_STYLE:= manual + +arm-trusted-firmware-install: + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/arm-trusted-firmware/patches/patch-plat_rockchip_rk3328_rk3328_def_h b/package/arm-trusted-firmware/patches/patch-plat_rockchip_rk3328_rk3328_def_h new file mode 100644 index 000000000..cbe6a2b07 --- /dev/null +++ b/package/arm-trusted-firmware/patches/patch-plat_rockchip_rk3328_rk3328_def_h @@ -0,0 +1,11 @@ +--- arm-trusted-firmware-6952ce49c29be021eb07159c2f472e9e23633135.orig/plat/rockchip/rk3328/rk3328_def.h 2022-12-19 22:36:56.000000000 +0100 ++++ arm-trusted-firmware-6952ce49c29be021eb07159c2f472e9e23633135/plat/rockchip/rk3328/rk3328_def.h 2022-12-25 03:14:08.860679511 +0100 +@@ -103,7 +103,7 @@ + /************************************************************************** + * UART related constants + **************************************************************************/ +-#define RK3328_BAUDRATE 1500000 ++#define RK3328_BAUDRATE 115200 + #define RK3328_UART_CLOCK 24000000 + + /****************************************************************************** diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 2504e1abc..bfda5995d 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,24 +4,26 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 1.8.28.2 -PKG_RELEASE:= 2 -PKG_HASH:= 7b3d84a3403fce590377808eaa4b08b6320666ca0e37eba0ad578b66211b13c8 +PKG_VERSION:= 20.7.0 +PKG_RELEASE:= 1 +PKG_HASH:= 3d47889d2c4501974a8adaaba49738e6268a836dc177c7887a93a8ecf1d38b26 PKG_DESCR:= open source pbx PKG_SECTION:= net/voip -PKG_DEPENDS:= libncurses libcurl libressl -PKG_BUILDDEP:= ncurses zlib curl popt libressl +PKG_DEPENDS:= libncurses libcurl libressl libedit libuuid libjansson +PKG_DEPENDS+= libxml2 libsqlite libxslt +PKG_BUILDDEP:= ncurses zlib curl popt libressl 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 +#PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_LIBC_DEPENDS:= uclibc-ng glibc PKG_SUBPKGS:= ASTERISK ASTERISK_VOICEMAIL ASTERISK_SOUNDS -PKG_SUBPKGS+= ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM +PKG_SUBPKGS+= ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM PKG_SUBPKGS+= ASTERISK_PBX_DUNDI ASTERISK_RES_AGI PKGSD_ASTERISK_VOICEMAIL:= voicemail support PKGSN_ASTERISK_VOICEMAIL:= asterisk @@ -31,10 +33,6 @@ PKGSD_ASTERISK_PBX_DUNDI:= PBX dundi support PKGSN_ASTERISK_PBX_DUNDI:= asterisk PKGSD_ASTERISK_RES_AGI:= res agi support PKGSN_ASTERISK_RES_AGI:= asterisk -PKGSD_ASTERISK_CHAN_MGCP:= Media Gateway Control Protocol implementation -PKGSN_ASTERISK_CHAN_MGCP:= asterisk -PKGSD_ASTERISK_CHAN_SKINNY:= skinny client control protocol implementation -PKGSN_ASTERISK_CHAN_SKINNY:= asterisk PKGSD_ASTERISK_CHAN_IAX2:= support for the Inter Asterisk Protocol PKGSN_ASTERISK_CHAN_IAX2:= asterisk PKGSD_ASTERISK_CODEC_SPEEX:= speex/PCM16 Codec translator @@ -49,8 +47,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_VOICEMAIL},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_ASTERISK_SOUNDS},${PKGSD_ASTERISK_SOUNDS},${PKG_SECTION})) -#$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_MGCP},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_SKINNY},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_IAX2},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CODEC_SPEEX},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CODEC_GSM},${PKG_SECTION})) @@ -59,16 +55,16 @@ $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PK 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 \ --disable-xmldoc \ --without-tonezone \ --without-asound \ - --without-curses \ --without-gtk2 \ --without-h323 \ --without-iksemel \ --without-imap \ - --without-nbs \ --without-netsnmp \ --without-newt \ --without-openais \ @@ -78,12 +74,6 @@ CONFIGURE_ARGS= --with-z=${STAGING_TARGET_DIR}/usr \ --without-pri \ --without-pwlib \ --without-tds \ - --without-termcap \ - --without-tinfo \ - --without-vpb \ - --without-misdn \ - --without-isdnnet \ - --without-suppserv \ --without-postgres ifneq (${ADK_PACKAGE_ASTERISK_CODEC_GSM},) @@ -123,10 +113,10 @@ pre-configure: pre-build: $(MAKE) -C $(WRKBUILD)/menuselect -post-build: - cd ${WRKBUILD}/sounds ; \ - tar xzf asterisk-core-sounds-en-gsm-1.4.25.tar.gz ; \ - rm asterisk-core-sounds-en-gsm-1.4.25.tar.gz +#post-build: +# cd ${WRKBUILD}/sounds ; \ +# tar xzf asterisk-core-sounds-en-gsm-1.4.25.tar.gz ; \ +# rm asterisk-core-sounds-en-gsm-1.4.25.tar.gz do-install: $(CP) $(WRKINST)/* $(IDIR_ASTERISK) @@ -189,38 +179,19 @@ asterisk-sounds-install: asterisk-voicemail-install: ${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk ${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules - ${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample \ + ${INSTALL_DATA} $(WRKBUILD)/configs/samples/voicemail.conf.sample \ $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf ${CP} $(WRKBUILD)/apps/*voicemail.so \ $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/ ${INSTALL_BIN} $(WRKBUILD)/res/res_adsi.so \ $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/ - ${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds - $(CP) $(WRKBUILD)/sounds/vm-*.gsm \ - $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/ - -asterisk-chan-mgcp-install: - ${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk - ${INSTALL_DATA} $(WRKBUILD)/configs/mgcp.conf.sample \ - $(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk/mgcp.conf - ${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules - ${INSTALL_BIN} $(WRKBUILD)/channels/chan_mgcp.so \ - $(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules/ - -asterisk-chan-skinny-install: - ${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk - ${INSTALL_DATA} $(WRKBUILD)/configs/skinny.conf.sample \ - $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk/skinny.conf - ${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules - ${INSTALL_BIN} $(WRKBUILD)/channels/chan_skinny.so \ - $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules/ asterisk-chan-iax2-install: ${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk ${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules - ${INSTALL_DATA} $(WRKBUILD)/configs/iax.conf.sample \ + ${INSTALL_DATA} $(WRKBUILD)/configs/samples/iax.conf.sample \ $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iax.conf - ${INSTALL_DATA} $(WRKBUILD)/configs/iaxprov.conf.sample \ + ${INSTALL_DATA} $(WRKBUILD)/configs/samples/iaxprov.conf.sample \ $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iaxprov.conf ${INSTALL_BIN} $(WRKBUILD)/channels/chan_iax2.so \ $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules/ @@ -237,7 +208,7 @@ asterisk-codec-gsm-install: asterisk-pbx-dundi-install: ${INSTALL_DIR} $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk - ${INSTALL_DATA} $(WRKBUILD)/configs/dundi.conf.sample \ + ${INSTALL_DATA} $(WRKBUILD)/configs/samples/dundi.conf.sample \ $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk/dundi.conf ${INSTALL_DIR} $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules ${INSTALL_BIN} $(WRKBUILD)/pbx/pbx_dundi.so \ @@ -252,7 +223,7 @@ asterisk-res-agi-install: asterisk-meetme-install: ${INSTALL_DIR} ${IDIR_ASTERISK_MEETME}/etc/asterisk/ ${INSTALL_DIR} ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules - ${INSTALL_DATA} ${WRKBUILD}/configs/meetme.conf.sample \ + ${INSTALL_DATA} ${WRKBUILD}/configs/samples/meetme.conf.sample \ ${IDIR_ASTERISK_MEETME}/etc/asterisk/meetme.conf ${INSTALL_BIN} ${WRKBUILD}/apps/app_meetme.so \ ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules diff --git a/package/asterisk/files/asterisk.init b/package/asterisk/files/asterisk.init index 9dfbed4a1..9f3e2aa5c 100644 --- a/package/asterisk/files/asterisk.init +++ b/package/asterisk/files/asterisk.init @@ -11,7 +11,7 @@ autostart) exec sh $0 start ;; start) - for dir in run log spool lib; do + for dir in run log spool lib keys; do [ -d /var/$dir/asterisk ] || mkdir -p /var/$dir/asterisk done /usr/sbin/asterisk diff --git a/package/asterisk/patches/patch-main_dns_c b/package/asterisk/patches/patch-main_dns_c deleted file mode 100644 index 0c3684d52..000000000 --- a/package/asterisk/patches/patch-main_dns_c +++ /dev/null @@ -1,11 +0,0 @@ ---- asterisk-1.8.20.1.orig/main/dns.c 2012-06-15 17:56:08.000000000 +0200 -+++ asterisk-1.8.20.1/main/dns.c 2013-03-05 14:49:01.000000000 +0100 -@@ -45,6 +45,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi - #include "asterisk/dns.h" - #include "asterisk/endian.h" - -+#undef HAVE_RES_NINIT -+ - #define MAX_SIZE 4096 - - #ifdef __PDP_ENDIAN diff --git a/package/asterisk/patches/patch-main_tcptls_c b/package/asterisk/patches/patch-main_tcptls_c deleted file mode 100644 index bf1c21c25..000000000 --- a/package/asterisk/patches/patch-main_tcptls_c +++ /dev/null @@ -1,16 +0,0 @@ ---- asterisk-1.8.28.2.orig/main/tcptls.c 2014-06-13 07:06:27.000000000 +0200 -+++ asterisk-1.8.28.2/main/tcptls.c 2016-09-25 20:47:30.313327069 +0200 -@@ -753,9 +753,12 @@ static int __ssl_setup(struct ast_tls_co - cfg->ssl_ctx = SSL_CTX_new(SSLv2_client_method()); - } else - #endif -+#ifndef OPENSSL_NO_SSL3_METHOD - if (ast_test_flag(&cfg->flags, AST_SSL_SSLV3_CLIENT)) { - cfg->ssl_ctx = SSL_CTX_new(SSLv3_client_method()); -- } else if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) { -+ } else -+#endif -+ if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) { - cfg->ssl_ctx = SSL_CTX_new(TLSv1_client_method()); - } else { - /* SSLv23_client_method() sends SSLv2, this was the original diff --git a/package/asterisk/patches/patch-res_stasis_control_c b/package/asterisk/patches/patch-res_stasis_control_c new file mode 100644 index 000000000..5c80756e0 --- /dev/null +++ b/package/asterisk/patches/patch-res_stasis_control_c @@ -0,0 +1,11 @@ +--- asterisk-20.6.0.orig/res/stasis/control.c 2024-01-25 17:19:33.000000000 +0100 ++++ asterisk-20.6.0/res/stasis/control.c 2024-02-05 15:20:24.824145190 +0100 +@@ -25,6 +25,8 @@ + + #include "asterisk.h" + ++#include <signal.h> ++ + #include "asterisk/stasis_channels.h" + #include "asterisk/stasis_app.h" + diff --git a/package/atk/Makefile b/package/atk/Makefile index d199dec57..ad6335f1b 100644 --- a/package/atk/Makefile +++ b/package/atk/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= atk -PKG_VERSION:= 2.20.0 -PKG_EXTRAVER:= 2.20 +PKG_VERSION:= 2.36.0 +PKG_EXTRAVER:= 2.36 PKG_RELEASE:= 1 -PKG_HASH:= 493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0 +PKG_HASH:= fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 PKG_DESCR:= accessibility toolkit library PKG_SECTION:= libs/misc -PKG_BUILDDEP:= glib +PKG_BUILDDEP:= glib meson-host PKG_URL:= http://www.gnome.org/ PKG_SITES:= $(MASTER_SITE_GNOME:=atk/$(PKG_EXTRAVER)/) PKG_LIBNAME:= libatk @@ -20,6 +20,14 @@ 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 diff --git a/package/autofs/Makefile b/package/autofs/Makefile index 9fd28a258..63d41c44f 100644 --- a/package/autofs/Makefile +++ b/package/autofs/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= autofs -PKG_VERSION:= 5.1.3 +PKG_VERSION:= 5.1.9 PKG_RELEASE:= 1 -PKG_HASH:= e96eebfe3ed5fb1a30f4510f538198affde223e370c6dc2bed9780309272b1bf +PKG_HASH:= 87e6af6a03794b9462ea519781e50e7d23b5f7c92cd59e1142c85d2493b3c24b PKG_DESCR:= automount filesystems PKG_SECTION:= net/fs PKG_DEPENDS:= libtirpc @@ -17,12 +17,14 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,AUTOFS,autofs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --with-libtirpc autofs-install: - $(INSTALL_DIR) $(IDIR_AUTOFS)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/autofs \ - $(IDIR_AUTOFS)/usr/bin + $(INSTALL_DIR) $(IDIR_AUTOFS)/usr/lib/autofs + $(CP) $(WRKINST)/usr/lib/autofs/*.so \ + $(IDIR_AUTOFS)/usr/lib/autofs + $(INSTALL_DIR) $(IDIR_AUTOFS)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/automount \ + $(IDIR_AUTOFS)/usr/sbin include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/autofs/patches/patch-configure_in b/package/autofs/patches/patch-configure_in deleted file mode 100644 index bf4fe87a8..000000000 --- a/package/autofs/patches/patch-configure_in +++ /dev/null @@ -1,12 +0,0 @@ ---- autofs-5.1.3.orig/configure.in 2017-05-24 04:16:59.000000000 +0200 -+++ autofs-5.1.3/configure.in 2017-06-25 22:09:22.834510245 +0200 -@@ -124,8 +124,7 @@ AC_SUBST(flagdir) - # - # Use libtirpc - # --AF_WITH_LIBTIRPC() --AC_SUBST(TIRPCLIB) -+PKG_CHECK_MODULES([TIRPC], [tirpc]) - - # - # Optional include dmalloc diff --git a/package/automake16/Makefile b/package/automake16/Makefile new file mode 100644 index 000000000..a8df601a1 --- /dev/null +++ b/package/automake16/Makefile @@ -0,0 +1,43 @@ +# 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:= automake16 +PKG_VERSION:= 1.16.3 +PKG_EXTRAVER:= 1.16 +PKG_RELEASE:= 1 +PKG_HASH:= ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a +PKG_DESCR:= tool for automatically generating makefiles +PKG_SECTION:= dev/tools +PKG_BUILDDEP:= m4-host autoconf-host autoconf +HOST_BUILDDEP:= autoconf-host +PKG_URL:= http://www.gnu.org/software/automake/ +PKG_SITES:= $(MASTER_SITE_GNU:=automake/) +PKG_OPTS:= noscripts + +DISTFILES:= automake-${PKG_VERSION}.tar.xz + +WRKDIST= ${WRKDIR}/automake-$(PKG_VERSION) + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,AUTOMAKE16,automake16,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,AUTOMAKE16,automake16,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +XAKE_FLAGS+= PERL="/usr/bin/perl" + +automake16-install: + $(INSTALL_DIR) $(IDIR_AUTOMAKE16)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/automake $(IDIR_AUTOMAKE16)/usr/bin/automake16 + $(INSTALL_BIN) $(WRKINST)/usr/bin/aclocal $(IDIR_AUTOMAKE16)/usr/bin/aclocal16 + $(INSTALL_DIR) $(IDIR_AUTOMAKE16)/usr/share/aclocal-$(PKG_EXTRAVER) + $(CP) $(WRKINST)/usr/share/aclocal-$(PKG_EXTRAVER) \ + $(IDIR_AUTOMAKE16)/usr/share + $(INSTALL_DIR) $(IDIR_AUTOMAKE16)/usr/share/automake-$(PKG_EXTRAVER) + $(CP) $(WRKINST)/usr/share/automake-$(PKG_EXTRAVER) \ + $(IDIR_AUTOMAKE16)/usr/share + +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/avahi/Makefile b/package/avahi/Makefile index a5b7cd081..94b894c5b 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= avahi -PKG_VERSION:= 0.6.32 +PKG_VERSION:= 0.8 PKG_RELEASE:= 1 -PKG_HASH:= d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454 +PKG_HASH:= 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda PKG_DESCR:= multicast dns daemon and dns-sd server PKG_SECTION:= net/dns -PKG_BUILDDEP:= libdaemon expat gdbm glib +PKG_BUILDDEP:= libdaemon expat gdbm glib libevent PKG_NEEDS:= c++ intl PKG_URL:= http://avahi.org/ PKG_SITES:= https://github.com/lathiat/avahi/releases/download/v$(PKG_VERSION)/ @@ -31,12 +31,12 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,AVAHI,avahi,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_AVAHI),$(PKG_DESCR),$(PKG_SECTION))) $(eval $(call PKG_template,LIBAVAHI,libavahi,$(PKG_VERSION)-$(PKG_RELEASE),,$(PKGSD_LIBAVAHI),$(PKGSC_LIBAVAHI),$(PKG_OPTS))) -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --enable-glib \ --enable-libdaemon \ --enable-dbus \ --disable-qt3 \ --disable-qt4 \ + --disable-qt5 \ --disable-gtk \ --disable-gtk3 \ --disable-python \ diff --git a/package/avahi/patches/patch-Makefile_am b/package/avahi/patches/patch-Makefile_am deleted file mode 100644 index ff5160336..000000000 --- a/package/avahi/patches/patch-Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ ---- avahi-0.6.31.orig/Makefile.am 2011-12-30 22:26:44.000000000 +0100 -+++ avahi-0.6.31/Makefile.am 2014-03-04 09:57:29.000000000 +0100 -@@ -75,8 +75,7 @@ SUBDIRS = \ - avahi-compat-howl \ - avahi-autoipd \ - avahi-ui \ -- avahi-ui-sharp \ -- po -+ avahi-ui-sharp - - DX_INPUT = \ - $(srcdir)/avahi-common/address.h \ diff --git a/package/avahi/patches/patch-avahi-ui_Makefile_am b/package/avahi/patches/patch-avahi-ui_Makefile_am deleted file mode 100644 index c1744d9d0..000000000 --- a/package/avahi/patches/patch-avahi-ui_Makefile_am +++ /dev/null @@ -1,19 +0,0 @@ ---- avahi-0.6.31.orig/avahi-ui/Makefile.am 2012-02-14 23:22:16.000000000 +0100 -+++ avahi-0.6.31/avahi-ui/Makefile.am 2014-03-04 09:45:16.000000000 +0100 -@@ -79,9 +79,6 @@ libavahi_ui_gtk3_la_CFLAGS += -DDATABASE - endif - - bin_PROGRAMS = bssh --desktop_DATA += bssh.desktop bvnc.desktop --@INTLTOOL_DESKTOP_RULE@ -- - bssh_SOURCES = bssh.c - - if HAVE_GTK3 -@@ -108,6 +105,4 @@ endif # HAVE_GLIB - endif - endif - --@INTLTOOL_DESKTOP_RULE@ -- - CLEANFILES = $(desktop_DATA) $(desktop_DATA_in) diff --git a/package/avahi/patches/patch-configure_ac b/package/avahi/patches/patch-configure_ac deleted file mode 100644 index 53f1aea23..000000000 --- a/package/avahi/patches/patch-configure_ac +++ /dev/null @@ -1,14 +0,0 @@ ---- avahi-0.6.31.orig/configure.ac 2012-02-14 22:44:25.484742099 +0100 -+++ avahi-0.6.31/configure.ac 2014-06-15 20:50:12.072045207 +0200 -@@ -412,11 +412,9 @@ if test "x$have_kqueue" = "xyes" ; then - AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage]) - fi - --IT_PROG_INTLTOOL([0.35.0]) - GETTEXT_PACKAGE=avahi - AC_SUBST([GETTEXT_PACKAGE]) - AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) --AM_GLIB_GNU_GETTEXT - - avahilocaledir='${prefix}/${DATADIRNAME}/locale' - AC_SUBST(avahilocaledir) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 24e4e2432..9b3191ae7 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.1 -PKG_RELEASE:= 27 +PKG_RELEASE:= 29 PKG_SECTION:= base/apps PKG_DESCR:= basic files and scripts @@ -40,7 +40,6 @@ do-install: ln -sf ../run $(IDIR_BASE_FILES)/var/run chmod 600 $(IDIR_BASE_FILES)/etc/shadow chmod 1777 ${IDIR_BASE_FILES}/tmp -ifeq ($(ADK_RUNTIME_INIT_SYSTEMD),) echo $(ADK_RUNTIME_TMPFS_SIZE) > $(IDIR_BASE_FILES)/etc/tmpfs mkdir -p $(IDIR_BASE_FILES)/etc/init.d cp ./files/init.d/* $(IDIR_BASE_FILES)/etc/init.d @@ -64,7 +63,6 @@ ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y) else (cd $(IDIR_BASE_FILES)/etc; ln -sf ../tmp/resolv.conf .) endif -endif ifeq ($(ADK_RUNTIME_DEV_MDEV),y) $(CP) ./files/rcdev.mdev $(IDIR_BASE_FILES)/etc/init.d/rcdev $(SED) "s#@ADK_RUNTIME_DEV_MDEV_LOGGING@#"$(ADK_RUNTIME_DEV_MDEV_LOGGING_LINE)"#g" $(IDIR_BASE_FILES)/etc/init.d/rcdev @@ -222,9 +220,9 @@ endif ifeq ($(ADK_RUNTIME_ADDUSER),y) mkdir -p ${IDIR_BASE_FILES}/$(ADK_RUNTIME_USER_HOME) - printf "$(ADK_RUNTIME_USER_NAME):x:100:100:$(ADK_RUNTIME_USER_NAME):$(ADK_RUNTIME_USER_HOME):$(ADK_RUNTIME_USER_SHELL)" >> ${IDIR_BASE_FILES}/etc/passwd - printf "$(ADK_RUNTIME_USER_NAME):$(ADK_RUNTIME_USER_PASSWORD):16514:0:::::" >> ${IDIR_BASE_FILES}/etc/shadow - printf "$(ADK_RUNTIME_USER_NAME):x:100:" >> ${IDIR_BASE_FILES}/etc/group + printf "$(ADK_RUNTIME_USER_NAME):x:100:100:$(ADK_RUNTIME_USER_NAME):$(ADK_RUNTIME_USER_HOME):$(ADK_RUNTIME_USER_SHELL)\n" >> ${IDIR_BASE_FILES}/etc/passwd + printf "$(ADK_RUNTIME_USER_NAME):$(ADK_RUNTIME_USER_PASSWORD):16514:0:::::\n" >> ${IDIR_BASE_FILES}/etc/shadow + printf "$(ADK_RUNTIME_USER_NAME):x:100:\n" >> ${IDIR_BASE_FILES}/etc/group endif include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/base-files/files/base-files.conffiles b/package/base-files/files/base-files.conffiles index 2ee449379..4845c1855 100644 --- a/package/base-files/files/base-files.conffiles +++ b/package/base-files/files/base-files.conffiles @@ -1,4 +1,3 @@ -/etc/mdev.conf /etc/inittab /etc/banner /etc/group diff --git a/package/base-files/files/init.d/rcS b/package/base-files/files/init.d/rcS index db03a76e5..9015a71ac 100755 --- a/package/base-files/files/init.d/rcS +++ b/package/base-files/files/init.d/rcS @@ -17,6 +17,7 @@ fi mkdir -p /var/log mkdir -p /var/run mkdir -p /var/tmp +mkdir -p /var/lock touch /var/log/lastlog touch /var/log/wtmp diff --git a/package/base-files/files/profile b/package/base-files/files/profile index c89b12c92..22bf8655d 100644 --- a/package/base-files/files/profile +++ b/package/base-files/files/profile @@ -1,6 +1,7 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin export TERM=linux export EDITOR=/bin/vi +export M4=/usr/bin/m4 if [[ $(id -u) = 0 ]]; then export PS1='`whoami`@`hostname`:`pwd` # ' else diff --git a/package/base-files/src/etc/network/if-pre-up.d/04-wireless b/package/base-files/src/etc/network/if-pre-up.d/04-wireless index fa68058bf..ef070c5bc 100755 --- a/package/base-files/src/etc/network/if-pre-up.d/04-wireless +++ b/package/base-files/src/etc/network/if-pre-up.d/04-wireless @@ -81,6 +81,8 @@ case "$IF_WIRELESS_MODE" in cat /etc/hostapd.conf.post >> /tmp/hostapd.conf ;; sta) + # need to wait for wlan drivers to settle down + sleep 1 ip link set up dev ${IFACE} [ $IF_WIRELESS_EXTENSION -eq 1 ] && { [ -x /usr/sbin/iwconfig ] || { @@ -96,9 +98,9 @@ case "$IF_WIRELESS_MODE" in } driver=nl80211 [ $sec -eq 2 ] && { - iw dev ${IFACE} connect $IF_WIRELESS_SSID key d:0:$IF_WIRELESS_PASSPHRASE + iw dev ${IFACE} connect "$IF_WIRELESS_SSID" key d:0:$IF_WIRELESS_PASSPHRASE } || { - iw dev ${IFACE} connect $IF_WIRELESS_SSID + iw dev ${IFACE} connect "$IF_WIRELESS_SSID" 2>/dev/null } } [ $wpa2 -eq 1 ] && { diff --git a/package/bash/Makefile b/package/bash/Makefile index 99a4bfb97..bfed5373c 100644 --- a/package/bash/Makefile +++ b/package/bash/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bash -PKG_VERSION:= 5.1.8 +PKG_VERSION:= 5.2.21 PKG_RELEASE:= 1 -PKG_HASH:= 0cfb5c9bb1a29f800a97bd242d19511c997a1013815b805e0fdd32214113d6be +PKG_HASH:= c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8 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 4ea08bf74..83a594ad0 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/package/bcm28xx-bootloader/Makefile @@ -5,31 +5,25 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bcm28xx-bootloader # not cloned, local src directory used -PKG_VERSION:= 784fe6cebd9e5726c0c7b9e449f7cdbf2cf6959d -PKG_RELEASE:= 1 +PKG_VERSION:= 1e403e23baab5673f0494a200f57cd01287d5b1a +PKG_RELEASE:= 3 PKG_DESCR:= bootloader for bcm28xx PKG_SECTION:= base/boot PKG_URL:= https://github.com/raspberrypi/firmware PKG_SITES:= https://github.com/raspberrypi/firmware.git -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi0 raspberry-pi2 raspberry-pi3 raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 +PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi0 raspberry-pi2 raspberry-pi3 raspberry-pi3-64 raspberry-pi4 raspberry-pi4-64 raspberry-pi5 PKG_CHOICES_BCM28XX_BOOTLOADER:= DEFAULT EXTRA CUTDOWN PKGCD_DEFAULT:= default bootloader PKGCD_EXTRA:= bootloader with extra features and codecs PKGCD_CUTDOWN:= cut down bootloader -PKG_SUBPKGS:= BCM28XX_BOOTLOADER BCM28XX_DEBUGTOOL -PKGSD_BCM28XX_DEBUGTOOL:= bcm28xx debugtool (vcdbg) -PKGSC_BCM28XX_DEBUGTOOL:= sys/hw -PKGSS_BCM28XX_DEBUGTOOL:= bcm28xx-vc-debug bcm28xx-vc-libs - NO_DISTFILES:= 1 include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,BCM28XX_BOOTLOADER,bcm28xx-bootloader,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -$(eval $(call PKG_template,BCM28XX_DEBUGTOOL,bcm28xx-debugtool,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_BCM28XX_DEBUGTOOL))) CONFIG_STYLE:= manual BUILD_STYLE:= manual @@ -38,14 +32,28 @@ INSTALL_STYLE:= manual do-install: $(INSTALL_DIR) $(IDIR_BCM28XX_BOOTLOADER)/boot $(CP) $(WRKBUILD)/boot/bootcode.bin $(IDIR_BCM28XX_BOOTLOADER)/boot/ +ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY),y) + printf "console=serial0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" > \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt +endif +ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY),y) + printf "console=tty0 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" > \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt +endif printf "kernel=kernel\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "dtparam=audio,i2s,spi,i2c\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_DEFAULT),y) +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y) + $(CP) $(WRKBUILD)/boot/{start4.elf,fixup4.dat} $(IDIR_BCM28XX_BOOTLOADER)/boot/ + printf "start_file=start4.elf\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + printf "fixup_file=fixup4.dat\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +else $(CP) $(WRKBUILD)/boot/{start.elf,fixup.dat} $(IDIR_BCM28XX_BOOTLOADER)/boot/ printf "start_file=start.elf\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "fixup_file=fixup.dat\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif +endif ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_EXTRA),y) $(CP) $(WRKBUILD)/boot/{start_x.elf,fixup_x.dat} $(IDIR_BCM28XX_BOOTLOADER)/boot/ printf "start_file=start_x.elf\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt @@ -58,6 +66,16 @@ 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 +endif +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 @@ -98,12 +116,28 @@ ifeq ($(ADK_TARGET_HARDWARE_RPI3_SERIAL),y) printf "enable_uart=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif -ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64)$(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64),y) +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4),y) + printf "enable_uart=1\n" >> \ + $(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" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "enable_uart=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI5),y) + printf "dtparam=fan_temp0=0\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + printf "dtparam=fan_temp0_speed=64\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + printf "dtparam=fan_temp1_speed=64\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + printf "dtparam=fan_temp2_speed=64\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + printf "dtparam=fan_temp3_speed=64\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +endif ifneq ($(ADK_RUNTIME_MPEG2_KEY),) printf "decode_MPG2=$(ADK_RUNTIME_MPEG2_KEY)\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt @@ -112,10 +146,5 @@ ifneq ($(ADK_RUNTIME_VC1_KEY),) printf "decode_WVC1=$(ADK_RUNTIME_VC1_KEY)\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif -ifeq ($(ADK_PACKAGE_BCM28XX_DEBUGTOOL),y) - $(INSTALL_DIR) $(IDIR_BCM28XX_DEBUGTOOL)/usr/bin - $(INSTALL_BIN) ./files/vcdbg \ - $(IDIR_BCM28XX_DEBUGTOOL)/usr/bin -endif include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/bcm28xx-bootloader/files/vcdbg b/package/bcm28xx-bootloader/files/vcdbg Binary files differdeleted file mode 100755 index ba3e55e8e..000000000 --- a/package/bcm28xx-bootloader/files/vcdbg +++ /dev/null diff --git a/package/bcm28xx-bootloader/src/boot/bootcode.bin b/package/bcm28xx-bootloader/src/boot/bootcode.bin Binary files differindex 4800dab88..9e831a273 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 43beb3d3f..2ff966820 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 83376f3df..4380d320e 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 0deaa6727..79a0b55e7 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 79d7b04a1..4d13d6581 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 a1fa3f555..4d8ff5a96 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 0deaa6727..79a0b55e7 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 9b8318f27..3927ea52e 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 25e8b72c2..b93bc0620 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 9e0c14451..f5d78d670 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 cfbe7a32b..300e7a8a4 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 a679efb8b..b7fe9328d 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 8052a876d..acd07e82c 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 87d73d795..274a62944 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 f62941bce..5e616d0c6 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 6c4e1ffb8..f10f87fa3 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 011083598..26c1de866 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 new file mode 100644 index 000000000..e59dbde56 --- /dev/null +++ b/package/bcm28xx-utils/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:= 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 new file mode 100644 index 000000000..956feac7e --- /dev/null +++ b/package/bcm28xx-utils/patches/patch-CMakeLists_txt @@ -0,0 +1,16 @@ +--- 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/bcm28xx-vc/Makefile b/package/bcm28xx-vc/Makefile deleted file mode 100644 index c7337c859..000000000 --- a/package/bcm28xx-vc/Makefile +++ /dev/null @@ -1,84 +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-vc -PKG_VERSION:= 2448644657e5fbfd82299416d218396ee1115ece -PKG_GIT:= hash -PKG_RELEASE:= 1 -PKG_DESCR:= videocore tools and libraries -PKG_SECTION:= libs/video -PKG_BUILDDEP:= cmake-host -PKG_NEEDS:= c++ threads -PKG_URL:= https://github.com/raspberrypi/userland -PKG_SITES:= https://github.com/raspberrypi/userland.git - -PKG_SUBPKGS:= BCM28XX_VC_TOOLS BCM28XX_VC_LIBS BCM28XX_VC_GL_LIBS BCM28XX_VC_DEBUG -PKGSS_BCM28XX_VC_TOOLS:=bcm28xx-vc-libs -PKGSC_BCM28XX_VC_TOOLS:=sys/hw -PKGSD_BCM28XX_VC_TOOLS:=videocore tools (vcgencmd,..) -PKGSC_BCM28XX_VC_LIBS:= libs/misc -PKGSD_BCM28XX_VC_LIBS:=videocore library -PKGSC_BCM28XX_VC_DEBUG:=libs/misc -PKGSD_BCM28XX_VC_DEBUG:=videocore debug library -PKGSC_BCM28XX_VC_GL_LIBS:=libs/video -PKGSS_BCM28XX_VC_GL_LIBS:=bcm28xx-vc-libs -PKGSD_BCM28XX_VC_GL_LIBS:=videocore gl library - -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi0 raspberry-pi2 raspberry-pi3 raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,BCM28XX_VC_TOOLS,bcm28xx-vc-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_BCM28XX_VC_TOOLS),$(PKG_DESCR),$(PKGSC_BCM28XX_VC_TOOLS))) -$(eval $(call PKG_template,BCM28XX_VC_LIBS,bcm28xx-vc-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -$(eval $(call PKG_template,BCM28XX_VC_DEBUG,bcm28xx-vc-debug,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -$(eval $(call PKG_template,BCM28XX_VC_GL_LIBS,bcm28xx-vc-gl-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -CONFIG_STYLE:= cmake -CMAKE_FLAGS+= -DVMCS_INSTALL_PREFIX=/usr - -bcm28xx-vc-tools-install: - $(INSTALL_DIR) $(IDIR_BCM28XX_VC_TOOLS)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/vcgencmd \ - $(IDIR_BCM28XX_VC_TOOLS)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/dtoverlay \ - $(IDIR_BCM28XX_VC_TOOLS)/usr/bin - -bcm28xx-vc-debug-install: - $(INSTALL_DIR) $(IDIR_BCM28XX_VC_DEBUG)/usr/lib - $(CP) $(WRKINST)/usr/lib/libdebug_sym.so \ - $(IDIR_BCM28XX_VC_DEBUG)/usr/lib - -bcm28xx-vc-libs-install: - $(INSTALL_DIR) $(IDIR_BCM28XX_VC_LIBS)/usr/lib - $(CP) $(WRKINST)/usr/lib/libvcos.so \ - $(IDIR_BCM28XX_VC_LIBS)/usr/lib - $(CP) $(WRKINST)/usr/lib/libvchiq_arm.so \ - $(IDIR_BCM28XX_VC_LIBS)/usr/lib - $(CP) $(WRKINST)/usr/lib/libbcm_host.so \ - $(IDIR_BCM28XX_VC_LIBS)/usr/lib - $(CP) $(WRKINST)/usr/lib/libcontainers.so \ - $(IDIR_BCM28XX_VC_LIBS)/usr/lib - $(CP) $(WRKINST)/usr/lib/libdtovl.so \ - $(IDIR_BCM28XX_VC_LIBS)/usr/lib - -bcm28xx-vc-gl-libs-install: - $(INSTALL_DIR) $(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib - $(CP) $(WRKINST)/usr/lib/libmmal*.so \ - $(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib - $(CP) $(WRKINST)/usr/lib/libopenmaxil.so \ - $(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib - $(CP) $(WRKINST)/usr/lib/libvcsm.so \ - $(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib - $(CP) $(WRKINST)/usr/lib/libEGL.so \ - $(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib - $(CP) $(WRKINST)/usr/lib/libGLESv2.so \ - $(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib - $(CP) $(WRKINST)/usr/lib/libOpenVG.so \ - $(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib - $(CP) $(WRKINST)/usr/lib/libbrcm*.so \ - $(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib - (cd $(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib && ln -sf libEGL.so libEGL.so.1) - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/bcm28xx-vc/patches/patch-host_applications_android_apps_vidtex_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-host_applications_android_apps_vidtex_CMakeLists_txt deleted file mode 100644 index a36625f8e..000000000 --- a/package/bcm28xx-vc/patches/patch-host_applications_android_apps_vidtex_CMakeLists_txt +++ /dev/null @@ -1,10 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/host_applications/android/apps/vidtex/CMakeLists.txt 2015-10-27 10:59:47.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/host_applications/android/apps/vidtex/CMakeLists.txt 2015-11-16 20:31:58.396542125 +0100 -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 2.8) - --SET(COMPILE_DEFINITIONS -Werror -Wall) -+SET(COMPILE_DEFINITIONS -Wall) - include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) - - set (VIDTEX_SOURCES diff --git a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_dtmerge_dtmerge_c b/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_dtmerge_dtmerge_c deleted file mode 100644 index fa78c0e3a..000000000 --- a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_dtmerge_dtmerge_c +++ /dev/null @@ -1,10 +0,0 @@ ---- bcm28xx-vc-7c026fa7a4ded2c525916cc853a32731c072ed1e.orig/host_applications/linux/apps/dtmerge/dtmerge.c 2016-09-20 09:43:37.000000000 +0200 -+++ bcm28xx-vc-7c026fa7a4ded2c525916cc853a32731c072ed1e/host_applications/linux/apps/dtmerge/dtmerge.c 2016-09-20 10:22:23.000000000 +0200 -@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI - #include <stdio.h> - #include <stdlib.h> - #include <libfdt.h> -+#include <stdarg.h> - - #include "dtoverlay.h" - diff --git a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_gencmd_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_gencmd_CMakeLists_txt deleted file mode 100644 index d67980b11..000000000 --- a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_gencmd_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/host_applications/linux/apps/gencmd/CMakeLists.txt 2015-10-27 10:59:47.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/host_applications/linux/apps/gencmd/CMakeLists.txt 2015-11-16 20:30:46.553286656 +0100 -@@ -4,7 +4,7 @@ if (WIN32) - set(VCOS_PLATFORM win32) - else () - set(VCOS_PLATFORM pthreads) -- add_definitions(-Wall -Werror) -+ add_definitions(-Wall) - endif () - - include_directories( ../../../.. diff --git a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_raspicam_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_raspicam_CMakeLists_txt deleted file mode 100644 index b92e1e625..000000000 --- a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_raspicam_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm28xx-vc-8d518460723779f95b49efafc04c183e83da3a18.orig/host_applications/linux/apps/raspicam/CMakeLists.txt 2017-06-27 18:59:31.000000000 +0200 -+++ bcm28xx-vc-8d518460723779f95b49efafc04c183e83da3a18/host_applications/linux/apps/raspicam/CMakeLists.txt 2017-06-30 23:35:09.949011873 +0200 -@@ -1,8 +1,6 @@ - - # raspistill/raspivid/raspiyuv - --SET(COMPILE_DEFINITIONS -Werror) -- - include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) - include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/apps/raspicam/) - include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/sm) diff --git a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_smem_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_smem_CMakeLists_txt deleted file mode 100644 index f1e293abe..000000000 --- a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_smem_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/host_applications/linux/apps/smem/CMakeLists.txt 2015-10-27 10:59:48.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/host_applications/linux/apps/smem/CMakeLists.txt 2015-11-16 20:31:12.527571311 +0100 -@@ -4,7 +4,7 @@ get_filename_component (VIDEOCORE_ROOT . - include (${VIDEOCORE_ROOT}/makefiles/cmake/global_settings.cmake) - - if (NOT WIN32) -- add_definitions(-Wall -Werror) -+ add_definitions(-Wall) - endif () - - include_directories ( diff --git a/package/bcm28xx-vc/patches/patch-host_applications_linux_libs_bcm_host_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-host_applications_linux_libs_bcm_host_CMakeLists_txt deleted file mode 100644 index 2b6a25111..000000000 --- a/package/bcm28xx-vc/patches/patch-host_applications_linux_libs_bcm_host_CMakeLists_txt +++ /dev/null @@ -1,19 +0,0 @@ ---- bcm28xx-vc-8d518460723779f95b49efafc04c183e83da3a18.orig/host_applications/linux/libs/bcm_host/CMakeLists.txt 2017-06-27 18:59:31.000000000 +0200 -+++ bcm28xx-vc-8d518460723779f95b49efafc04c183e83da3a18/host_applications/linux/libs/bcm_host/CMakeLists.txt 2017-07-01 14:33:21.139286425 +0200 -@@ -3,7 +3,7 @@ if (WIN32) - set(VCOS_PLATFORM win32) - else () - set(VCOS_PLATFORM pthreads) -- add_definitions(-Wall -Werror) -+ add_definitions(-Wall) - endif () - - include_directories( ../../../.. -@@ -20,3 +20,7 @@ target_link_libraries(bcm_host vcos vcho - - install(TARGETS bcm_host DESTINATION lib) - -+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bcm_host.pc.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/bcm_host.pc" @ONLY) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/bcm_host.pc" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") diff --git a/package/bcm28xx-vc/patches/patch-host_applications_linux_libs_sm_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-host_applications_linux_libs_sm_CMakeLists_txt deleted file mode 100644 index 3269c550c..000000000 --- a/package/bcm28xx-vc/patches/patch-host_applications_linux_libs_sm_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/host_applications/linux/libs/sm/CMakeLists.txt 2015-10-27 10:59:48.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/host_applications/linux/libs/sm/CMakeLists.txt 2015-11-16 20:31:27.946553043 +0100 -@@ -3,7 +3,7 @@ if (WIN32) - set(VCOS_PLATFORM win32) - else () - set(VCOS_PLATFORM pthreads) -- add_definitions(-Wall -Werror) -+ add_definitions(-Wall) - endif () - - include_directories( ../../../.. diff --git a/package/bcm28xx-vc/patches/patch-interface_khronos_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-interface_khronos_CMakeLists_txt deleted file mode 100644 index 068283106..000000000 --- a/package/bcm28xx-vc/patches/patch-interface_khronos_CMakeLists_txt +++ /dev/null @@ -1,17 +0,0 @@ ---- bcm28xx-vc-8d518460723779f95b49efafc04c183e83da3a18.orig/interface/khronos/CMakeLists.txt 2017-06-27 18:59:31.000000000 +0200 -+++ bcm28xx-vc-8d518460723779f95b49efafc04c183e83da3a18/interface/khronos/CMakeLists.txt 2017-07-01 14:33:21.139286425 +0200 -@@ -80,6 +80,14 @@ target_link_libraries(OpenVG EGL) - - install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION lib) - install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION lib) -+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/egl/egl.pc.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/egl/egl.pc" @ONLY) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/egl/egl.pc" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") -+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/glxx/glesv2.pc.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/glxx/glesv2.pc" @ONLY) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glxx/glesv2.pc" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") - - # recommended names to use to avoid conflicts with mesa libs - add_library(brcmEGL ${SHARED} ${EGL_SOURCE}) diff --git a/package/bcm28xx-vc/patches/patch-interface_mmal_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-interface_mmal_CMakeLists_txt deleted file mode 100644 index 8e4a1dace..000000000 --- a/package/bcm28xx-vc/patches/patch-interface_mmal_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/interface/mmal/CMakeLists.txt 2015-10-27 10:59:48.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/interface/mmal/CMakeLists.txt 2015-11-16 20:18:59.755962062 +0100 -@@ -3,7 +3,7 @@ if (NOT DEFINED LIBRARY_TYPE) - set(LIBRARY_TYPE SHARED) - endif (NOT DEFINED LIBRARY_TYPE) - --add_definitions(-Wall -Werror) -+add_definitions(-Wall) - - add_library(mmal SHARED util/mmal_util.c) - diff --git a/package/bcm28xx-vc/patches/patch-interface_vcos_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-interface_vcos_CMakeLists_txt deleted file mode 100644 index c962c3acf..000000000 --- a/package/bcm28xx-vc/patches/patch-interface_vcos_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/interface/vcos/CMakeLists.txt 2015-10-27 10:59:48.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/interface/vcos/CMakeLists.txt 2015-11-16 20:22:22.274588157 +0100 -@@ -43,7 +43,7 @@ foreach (header ${HEADERS}) - endforeach () - - if (CMAKE_COMPILER_IS_GNUCC) -- add_definitions (-ggdb -Werror -Wall) -+ add_definitions (-Wall) - endif () - - if (CMAKE_COMPILER_2005) diff --git a/package/bcm28xx-vc/patches/patch-interface_vcos_pthreads_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-interface_vcos_pthreads_CMakeLists_txt deleted file mode 100644 index 34ac618fb..000000000 --- a/package/bcm28xx-vc/patches/patch-interface_vcos_pthreads_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/interface/vcos/pthreads/CMakeLists.txt 2015-10-27 10:59:48.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/interface/vcos/pthreads/CMakeLists.txt 2015-11-16 20:22:39.353464208 +0100 -@@ -1,7 +1,7 @@ - # MSVC5 does not fully support C99, enabling declaration-after-statement - # warnings allows a common MSVC5 build error to be detected in Linux builds. - if (CMAKE_COMPILER_IS_GNUCC) -- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wdeclaration-after-statement") -+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wdeclaration-after-statement") - add_definitions (-D_GNU_SOURCE) - endif () - diff --git a/package/bcm28xx-vc/patches/patch-interface_vmcs_host_linux_vcfiled_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-interface_vmcs_host_linux_vcfiled_CMakeLists_txt deleted file mode 100644 index 06bc3da60..000000000 --- a/package/bcm28xx-vc/patches/patch-interface_vmcs_host_linux_vcfiled_CMakeLists_txt +++ /dev/null @@ -1,9 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/interface/vmcs_host/linux/vcfiled/CMakeLists.txt 2015-10-27 10:59:48.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/interface/vmcs_host/linux/vcfiled/CMakeLists.txt 2015-11-16 20:16:31.801734911 +0100 -@@ -1,6 +1,4 @@ - --add_definitions(-Werror) -- - # vcfiled - serves files to videocore. used for media handlers from - # OpenMAX/IL and loading VLLs. - add_executable(vcfiled vcfiled.c) diff --git a/package/bcm28xx-vc/patches/patch-interface_vmcs_host_vc_vchi_tvservice_c b/package/bcm28xx-vc/patches/patch-interface_vmcs_host_vc_vchi_tvservice_c deleted file mode 100644 index 2dfbf722c..000000000 --- a/package/bcm28xx-vc/patches/patch-interface_vmcs_host_vc_vchi_tvservice_c +++ /dev/null @@ -1,18 +0,0 @@ ---- bcm28xx-vc-9cc14b29288f913ef0e3286f4b3232bf73ab59d2.orig/interface/vmcs_host/vc_vchi_tvservice.c 2015-05-25 13:22:55.000000000 -0500 -+++ bcm28xx-vc-9cc14b29288f913ef0e3286f4b3232bf73ab59d2/interface/vmcs_host/vc_vchi_tvservice.c 2015-06-08 13:01:47.348595327 -0500 -@@ -417,7 +417,6 @@ VCHPRE_ void VCHPOST_ vc_tv_register_cal - ***********************************************************/ - VCHPRE_ void VCHPOST_ vc_tv_unregister_callback(TVSERVICE_CALLBACK_T callback) - { -- vcos_assert(callback != NULL); - - vcos_log_trace("[%s]", VCOS_FUNCTION); - if(tvservice_lock_obtain() == 0) -@@ -433,7 +432,6 @@ VCHPRE_ void VCHPOST_ vc_tv_unregister_c - done = 1; - } // if - } // for -- vcos_assert(done); - tvservice_lock_release(); - } - } diff --git a/package/bcm28xx-vc/src/host_applications/linux/libs/bcm_host/bcm_host.pc.in b/package/bcm28xx-vc/src/host_applications/linux/libs/bcm_host/bcm_host.pc.in deleted file mode 100644 index d40d35049..000000000 --- a/package/bcm28xx-vc/src/host_applications/linux/libs/bcm_host/bcm_host.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: bcm_host -Description: Broadcom VideoCore host API library -Version: 1 -Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm -Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM diff --git a/package/bcm28xx-vc/src/interface/khronos/egl/egl.pc.in b/package/bcm28xx-vc/src/interface/khronos/egl/egl.pc.in deleted file mode 100644 index 58687062b..000000000 --- a/package/bcm28xx-vc/src/interface/khronos/egl/egl.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: egl -Description: RasberryPi implementation of EGL -Version: 10 -Libs: -L${libdir} -lEGL -lGLESv2 -lbcm_host -lvchostif -Cflags: -I${includedir}/ -I${includedir}/interface/vcos/pthreads/ \ - -I${includedir}/interface/vmcs_host/linux/ diff --git a/package/bcm28xx-vc/src/interface/khronos/glxx/glesv2.pc.in b/package/bcm28xx-vc/src/interface/khronos/glxx/glesv2.pc.in deleted file mode 100644 index 2f58eede5..000000000 --- a/package/bcm28xx-vc/src/interface/khronos/glxx/glesv2.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: glesv2 -Description: RasberryPi implementation of OpenGL ESv2 -Version: 2.0 -Libs: -L${libdir} -lGLESv2 -Cflags: -I${includedir}/ diff --git a/package/bind/Makefile b/package/bind/Makefile index 0a2852fcc..ac59cc624 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -4,21 +4,19 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= bind -PKG_VERSION:= 9.10.4 +PKG_VERSION:= 9.18.24 PKG_RELEASE:= 1 -PKG_HASH:= f8d412b38d5ac390275b943bde69f4608f67862a45487ec854b30e4448fcb056 +PKG_HASH:= 709d73023c9115ddad3bab65b6c8c79a590196d0d114f5d0ca2533dbd52ddf66 PKG_DESCR:= dns server PKG_SECTION:= net/dns -PKG_DEPENDS:= libxml2 libressl -PKG_BUILDDEP:= libxml2 libressl +PKG_DEPENDS:= libxml2 libressl libuv libressl-util +PKG_BUILDDEP:= libxml2 libressl libuv PKG_NEEDS:= c++ PKG_URL:= https://www.isc.org/software/bind/ PKG_SITES:= ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/ PKG_LIBNAME:= libbind PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - PKG_SUBPKGS:= LIBBIND BIND_SERVER BIND_NSUPDATE BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG PKGSD_LIBBIND:= library for the bind software suite PKGSC_LIBBIND:= libs/net @@ -44,9 +42,6 @@ PKGSD_BIND_DIG:= dig utility PKGSC_BIND_DIG:= net/dns PKGSS_BIND_DIG:= libbind libxml2 -PKG_FLAVOURS_LIBBIND:= WITH_IPV6 -PKGFD_WITH_IPV6:= enable IPv6 support - include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -60,22 +55,10 @@ $(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKGS AUTOTOOL_STYLE:= autoreconf CONFIGURE_ENV+= BUILD_CC="${HOST_CC}" BUILD_CFLAGS='${HOST_CFLAGS}' BUILD_LDFLAGS='${HOST_LDFLAGS}' -CONFIGURE_ARGS+= --with-randomdev=/dev/urandom \ - --with-export-libdir=/usr/lib \ - --enable-exportlib \ - --with-ecdsa=no \ - --with-gost=no \ - --with-gssapi=no \ +CONFIGURE_ARGS+= --with-gssapi=no \ --with-openssl=${STAGING_TARGET_DIR}/usr \ - --with-libxml2=${STAGING_TARGET_DIR}/usr \ - --enable-epoll \ - --with-libtool - -ifneq (${ADK_PACKAGE_LIBBIND_WITH_IPV6},) -CONFIGURE_ARGS+= --enable-ipv6 -else -CONFIGURE_ARGS+= --disable-ipv6 -endif + --disable-linux-caps \ + --disable-doh bind-server-install: ${INSTALL_DIR} ${IDIR_BIND_SERVER}/usr/sbin ${IDIR_BIND_SERVER}/etc @@ -93,18 +76,18 @@ bind-rndc-install: ${IDIR_BIND_RNDC}/usr/sbin bind-check-install: - ${INSTALL_DIR} ${IDIR_BIND_CHECK}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf \ - ${IDIR_BIND_CHECK}/usr/sbin/ - ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone \ - ${IDIR_BIND_CHECK}/usr/sbin/ + ${INSTALL_DIR} ${IDIR_BIND_CHECK}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/named-checkconf \ + ${IDIR_BIND_CHECK}/usr/bin/ + ${INSTALL_BIN} ${WRKINST}/usr/bin/named-checkzone \ + ${IDIR_BIND_CHECK}/usr/bin/ bind-dnssec-install: - ${INSTALL_DIR} ${IDIR_BIND_DNSSEC}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen \ - ${IDIR_BIND_DNSSEC}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone \ - ${IDIR_BIND_DNSSEC}/usr/sbin + ${INSTALL_DIR} ${IDIR_BIND_DNSSEC}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/dnssec-keygen \ + ${IDIR_BIND_DNSSEC}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/dnssec-signzone \ + ${IDIR_BIND_DNSSEC}/usr/bin bind-host-install: ${INSTALL_DIR} ${IDIR_BIND_HOST}/usr/bin @@ -116,11 +99,12 @@ bind-dig-install: libbind-install: ${INSTALL_DIR} ${IDIR_LIBBIND}/usr/lib - ${CP} ${WRKINST}/usr/lib/libbind9.so.* ${IDIR_LIBBIND}/usr/lib - ${CP} ${WRKINST}/usr/lib/libdns.so.* ${IDIR_LIBBIND}/usr/lib - ${CP} ${WRKINST}/usr/lib/libisccc.so.* ${IDIR_LIBBIND}/usr/lib - ${CP} ${WRKINST}/usr/lib/libisccfg.so.* ${IDIR_LIBBIND}/usr/lib - ${CP} ${WRKINST}/usr/lib/libisc.so.* ${IDIR_LIBBIND}/usr/lib - ${CP} ${WRKINST}/usr/lib/liblwres.so.* ${IDIR_LIBBIND}/usr/lib + ${CP} ${WRKINST}/usr/lib/libbind9*.so ${IDIR_LIBBIND}/usr/lib + ${CP} ${WRKINST}/usr/lib/libdns*.so ${IDIR_LIBBIND}/usr/lib + ${CP} ${WRKINST}/usr/lib/libisccc*.so ${IDIR_LIBBIND}/usr/lib + ${CP} ${WRKINST}/usr/lib/libisccfg*.so ${IDIR_LIBBIND}/usr/lib + ${CP} ${WRKINST}/usr/lib/libisc*.so ${IDIR_LIBBIND}/usr/lib + ${CP} ${WRKINST}/usr/lib/libirs*.so ${IDIR_LIBBIND}/usr/lib + ${CP} ${WRKINST}/usr/lib/libns*.so ${IDIR_LIBBIND}/usr/lib include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bind/files/bind/named.conf.example b/package/bind/files/bind/named.conf index 162454955..162454955 100644 --- a/package/bind/files/bind/named.conf.example +++ b/package/bind/files/bind/named.conf diff --git a/package/bind/patches/patch-bin_rndc_Makefile_am b/package/bind/patches/patch-bin_rndc_Makefile_am new file mode 100644 index 000000000..4bf3b893c --- /dev/null +++ b/package/bind/patches/patch-bin_rndc_Makefile_am @@ -0,0 +1,18 @@ +--- 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 9efce8208..27748b0d1 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -36,6 +36,7 @@ else CONFIGURE_ARGS+= --enable-multilib endif CONFIGURE_ARGS+= --disable-werror \ + --disable-gprofng \ --disable-gdb \ --disable-sim \ --disable-install-libiberty \ diff --git a/package/bison/Makefile b/package/bison/Makefile index f7716611e..5bc9cce8d 100644 --- a/package/bison/Makefile +++ b/package/bison/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bison -PKG_VERSION:= 3.0.4 +PKG_VERSION:= 3.8.2 PKG_RELEASE:= 1 -PKG_HASH:= a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1 +PKG_HASH:= 9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2 PKG_DESCR:= parser generator PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host bison-host diff --git a/package/bison/patches/patch-lib_fseterr_c b/package/bison/patches/patch-lib_fseterr_c deleted file mode 100644 index 06af7469f..000000000 --- a/package/bison/patches/patch-lib_fseterr_c +++ /dev/null @@ -1,11 +0,0 @@ ---- bison-3.0.4.orig/lib/fseterr.c 2015-01-04 16:43:50.000000000 +0000 -+++ bison-3.0.4/lib/fseterr.c 2019-05-06 08:24:42.407830562 +0000 -@@ -29,7 +29,7 @@ fseterr (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags |= _IO_ERR_SEEN; - #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ - fp_->_flags |= __SERR; diff --git a/package/bison/patches/patch-lib_vasnprintf_c b/package/bison/patches/patch-lib_vasnprintf_c deleted file mode 100644 index cb21d90fa..000000000 --- a/package/bison/patches/patch-lib_vasnprintf_c +++ /dev/null @@ -1,28 +0,0 @@ ---- bison-3.0.4.orig/lib/vasnprintf.c 2015-01-04 17:46:03.000000000 +0100 -+++ bison-3.0.4/lib/vasnprintf.c 2018-02-24 21:13:43.000000000 +0100 -@@ -4858,7 +4858,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) -+# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ -+ && !defined __UCLIBC__) \ -+ || (defined __APPLE__ && defined __MACH__) \ -+ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; -@@ -4872,6 +4875,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - in format strings in writable memory may crash the program - (if compiled with _FORTIFY_SOURCE=2), so we should avoid it - in this situation. */ -+ /* On Mac OS X 10.3 or newer, we know that snprintf's return -+ value conforms to ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 -+ and gl_SNPRINTF_TRUNCATION_C99 pass. -+ Therefore we can avoid using %n in this situation. -+ On Mac OS X 10.13 or newer, the use of %n in format strings -+ in writable memory by default crashes the program, so we -+ should avoid it in this situation. */ - /* On native Windows systems (such as mingw), we can avoid using - %n because: - - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index dae6d01c4..d9a8cf6b8 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= bitlbee -PKG_VERSION:= 3.5.1 +PKG_VERSION:= 3.6 PKG_RELEASE:= 1 -PKG_HASH:= 9636d7fd89ebb3756c13a9a3387736ca6d56ccf66ec0580d512f07b21db0fa69 +PKG_HASH:= 9f15de46f29b46bf1e39fc50bdf4515e71b17f551f3955094c5da792d962107e PKG_DESCR:= irc gateway to im chat networks PKG_SECTION:= app/chat PKG_DEPENDS:= glib libressl @@ -35,6 +35,7 @@ CONFIGURE_ARGS:= --target=${GNU_TARGET_NAME} \ --ipv6=1 \ --ssl=openssl INSTALL_TARGET= install-etc install-bin +XAKE_ENV+= VERBOSE=1 post-configure: @echo 'CFLAGS+="-I${STAGING_TARGET_DIR}/usr/include/iconv"' >> \ diff --git a/package/bitlbee/patches/patch-lib_Makefile b/package/bitlbee/patches/patch-lib_Makefile index f55340876..a0f65192c 100644 --- a/package/bitlbee/patches/patch-lib_Makefile +++ b/package/bitlbee/patches/patch-lib_Makefile @@ -1,8 +1,8 @@ ---- bitlbee-3.5.1.orig/lib/Makefile 2017-01-30 21:45:59.000000000 +0100 -+++ bitlbee-3.5.1/lib/Makefile 2017-05-20 12:20:09.898551807 +0200 +--- bitlbee-3.6.orig/lib/Makefile 2019-02-07 20:53:38.000000000 +0100 ++++ bitlbee-3.6/lib/Makefile 2024-02-14 17:50:24.243531011 +0100 @@ -14,7 +14,7 @@ endif # [SH] Program variables - objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o + objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o -LFLAGS += -r +LFLAGS += -Wl,-r -nostdlib @@ -13,8 +13,8 @@ lib.o: $(objects) $(subdirs) @echo '*' Linking lib.o -- @$(LD) $(LFLAGS) $(objects) -o lib.o -+ @$(CC) $(LFLAGS) $(objects) -o lib.o +- $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o lib.o ++ $(VERBOSE) $(CC) $(LFLAGS) $(objects) -o lib.o $(objects): ../Makefile.settings Makefile diff --git a/package/bitlbee/patches/patch-protocols_Makefile b/package/bitlbee/patches/patch-protocols_Makefile index 77ce80f3d..80407a7e6 100644 --- a/package/bitlbee/patches/patch-protocols_Makefile +++ b/package/bitlbee/patches/patch-protocols_Makefile @@ -1,5 +1,5 @@ ---- bitlbee-3.5.1.orig/protocols/Makefile 2017-01-30 21:45:59.000000000 +0100 -+++ bitlbee-3.5.1/protocols/Makefile 2017-05-20 12:17:34.748567834 +0200 +--- bitlbee-3.6.orig/protocols/Makefile 2019-02-07 20:53:38.000000000 +0100 ++++ bitlbee-3.6/protocols/Makefile 2024-02-14 17:50:36.259530848 +0100 @@ -24,7 +24,7 @@ subdirobjs = $(PROTOOBJS) # Expansion of variables @@ -13,8 +13,8 @@ protocols.o: $(objects) $(subdirs) @echo '*' Linking protocols.o -- @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o -+ @$(CC) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o +- $(VERBOSE) $(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o ++ $(VERBOSE) $(CC) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o $(objects): ../Makefile.settings Makefile diff --git a/package/bitlbee/patches/patch-protocols_jabber_Makefile b/package/bitlbee/patches/patch-protocols_jabber_Makefile index 9bf83badc..3eca97198 100644 --- a/package/bitlbee/patches/patch-protocols_jabber_Makefile +++ b/package/bitlbee/patches/patch-protocols_jabber_Makefile @@ -1,5 +1,5 @@ ---- bitlbee-3.5.1.orig/protocols/jabber/Makefile 2017-01-30 21:45:59.000000000 +0100 -+++ bitlbee-3.5.1/protocols/jabber/Makefile 2017-05-20 12:15:26.360306005 +0200 +--- bitlbee-3.6.orig/protocols/jabber/Makefile 2019-02-07 20:53:38.000000000 +0100 ++++ bitlbee-3.6/protocols/jabber/Makefile 2024-02-14 17:50:47.363530697 +0100 @@ -14,7 +14,7 @@ endif # [SH] Program variables objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o hipchat.o @@ -13,7 +13,7 @@ jabber_mod.o: $(objects) @echo '*' Linking jabber_mod.o -- @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o -+ @$(CC) $(LFLAGS) $(objects) -o jabber_mod.o +- $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o jabber_mod.o ++ $(VERBOSE) $(CC) $(LFLAGS) $(objects) -o jabber_mod.o -include .depend/*.d diff --git a/package/bitlbee/patches/patch-protocols_msn_Makefile b/package/bitlbee/patches/patch-protocols_msn_Makefile deleted file mode 100644 index b2b730cc7..000000000 --- a/package/bitlbee/patches/patch-protocols_msn_Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- bitlbee-3.5.1.orig/protocols/msn/Makefile 2017-01-30 21:45:59.000000000 +0100 -+++ bitlbee-3.5.1/protocols/msn/Makefile 2017-05-20 12:15:47.329655386 +0200 -@@ -14,7 +14,7 @@ endif - # [SH] Program variables - objects = msn.o msn_util.o ns.o soap.o tables.o gw.o - --LFLAGS += -r -+LFLAGS += -Wl,-r -nostdlib - - # [SH] Phony targets - all: msn_mod.o -@@ -41,6 +41,6 @@ $(objects): %.o: $(_SRCDIR_)%.c - - msn_mod.o: $(objects) - @echo '*' Linking msn_mod.o -- @$(LD) $(LFLAGS) $(objects) -o msn_mod.o -+ @$(CC) $(LFLAGS) $(objects) -o msn_mod.o - - -include .depend/*.d diff --git a/package/bitlbee/patches/patch-protocols_oscar_Makefile b/package/bitlbee/patches/patch-protocols_oscar_Makefile deleted file mode 100644 index b9dcedf9f..000000000 --- a/package/bitlbee/patches/patch-protocols_oscar_Makefile +++ /dev/null @@ -1,24 +0,0 @@ ---- bitlbee-3.5.1.orig/protocols/oscar/Makefile 2017-01-30 21:45:59.000000000 +0100 -+++ bitlbee-3.5.1/protocols/oscar/Makefile 2017-05-20 12:16:09.175061142 +0200 -@@ -15,7 +15,7 @@ endif - # [SH] Program variables - objects = admin.o auth.o bos.o buddylist.o chat.o chatnav.o conn.o icq.o im.o info.o misc.o msgcookie.o rxhandlers.o rxqueue.o search.o service.o snac.o ssi.o stats.o tlv.o txqueue.o oscar_util.o oscar.o - --LFLAGS += -r -+LFLAGS += -Wl,-r -nostdlib - - # [SH] Phony targets - all: oscar_mod.o -@@ -38,10 +38,10 @@ $(objects): ../../Makefile.settings Make - - $(objects): %.o: $(_SRCDIR_)%.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ -+ $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ - - oscar_mod.o: $(objects) - @echo '*' Linking oscar_mod.o -- @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o -+ $(CC) $(LFLAGS) $(objects) -o oscar_mod.o - - -include .depend/*.d diff --git a/package/bitlbee/patches/patch-protocols_twitter_Makefile b/package/bitlbee/patches/patch-protocols_twitter_Makefile index 1dba18e51..f9be7d888 100644 --- a/package/bitlbee/patches/patch-protocols_twitter_Makefile +++ b/package/bitlbee/patches/patch-protocols_twitter_Makefile @@ -1,5 +1,5 @@ ---- bitlbee-3.5.1.orig/protocols/twitter/Makefile 2017-01-30 21:45:59.000000000 +0100 -+++ bitlbee-3.5.1/protocols/twitter/Makefile 2017-05-20 12:16:01.590573095 +0200 +--- bitlbee-3.6.orig/protocols/twitter/Makefile 2019-02-07 20:53:38.000000000 +0100 ++++ bitlbee-3.6/protocols/twitter/Makefile 2024-02-14 17:50:59.239530536 +0100 @@ -14,7 +14,7 @@ endif # [SH] Program variables objects = twitter.o twitter_http.o twitter_lib.o @@ -13,7 +13,7 @@ twitter_mod.o: $(objects) @echo '*' Linking twitter_mod.o -- @$(LD) $(LFLAGS) $(objects) -o twitter_mod.o -+ @$(CC) $(LFLAGS) $(objects) -o twitter_mod.o +- $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o twitter_mod.o ++ $(VERBOSE) $(CC) $(LFLAGS) $(objects) -o twitter_mod.o -include .depend/*.d diff --git a/package/bluez/Makefile b/package/bluez/Makefile index bf12c5187..4741808b9 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bluez -PKG_VERSION:= 5.43 +PKG_VERSION:= 5.66 PKG_RELEASE:= 1 -PKG_HASH:= 16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15 +PKG_HASH:= 39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574 PKG_DESCR:= bluetooth applications PKG_SECTION:= net/wifi PKG_DEPENDS:= glib dbus libreadline libudev @@ -36,6 +36,7 @@ CONFIGURE_ARGS+= --enable-tools \ --enable-udev \ --with-udevdir=/usr/bin \ --disable-test \ + --disable-manpages \ --disable-systemd \ --disable-obex \ --disable-cups diff --git a/package/bluez/patches/patch-tools_csr_usb_c b/package/bluez/patches/patch-tools_csr_usb_c deleted file mode 100644 index 509061b56..000000000 --- a/package/bluez/patches/patch-tools_csr_usb_c +++ /dev/null @@ -1,10 +0,0 @@ ---- bluez-5.12.orig/tools/csr_usb.c 2013-09-16 10:36:07.000000000 +0200 -+++ bluez-5.12/tools/csr_usb.c 2013-12-21 19:22:48.000000000 +0100 -@@ -29,6 +29,7 @@ - #include <errno.h> - #include <ctype.h> - #include <fcntl.h> -+#include <limits.h> - #include <unistd.h> - #include <stdlib.h> - #include <string.h> diff --git a/package/bluez/patches/patch-tools_hciattach_bcm43xx_c b/package/bluez/patches/patch-tools_hciattach_bcm43xx_c deleted file mode 100644 index 0b8799193..000000000 --- a/package/bluez/patches/patch-tools_hciattach_bcm43xx_c +++ /dev/null @@ -1,32 +0,0 @@ ---- bluez-5.40.orig/tools/hciattach_bcm43xx.c 2015-03-11 11:01:57.000000000 +0100 -+++ bluez-5.40/tools/hciattach_bcm43xx.c 2016-06-18 23:25:59.991459117 +0200 -@@ -43,7 +43,7 @@ - #include "hciattach.h" - - #ifndef FIRMWARE_DIR --#define FIRMWARE_DIR "/etc/firmware" -+#define FIRMWARE_DIR "/lib/firmware" - #endif - - #define FW_EXT ".hcd" -@@ -366,11 +366,8 @@ int bcm43xx_init(int fd, int def_speed, - return -1; - - if (bcm43xx_locate_patch(FIRMWARE_DIR, chip_name, fw_path)) { -- fprintf(stderr, "Patch not found, continue anyway\n"); -+ fprintf(stderr, "Patch not found for %s, continue anyway\n", chip_name); - } else { -- if (bcm43xx_set_speed(fd, ti, speed)) -- return -1; -- - if (bcm43xx_load_firmware(fd, fw_path)) - return -1; - -@@ -380,6 +377,7 @@ int bcm43xx_init(int fd, int def_speed, - return -1; - } - -+ sleep(1); - if (bcm43xx_reset(fd)) - return -1; - } diff --git a/package/boost/Makefile b/package/boost/Makefile index d6aca3295..4bd846e0f 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= boost -PKG_VERSION:= 1.77.0 -PKG_EXTRAVER:= 1_77 +PKG_VERSION:= 1.84.0 +PKG_EXTRAVER:= 1_84 PKG_RELEASE:= 1 -PKG_HASH:= 5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131 +PKG_HASH:= a5800f405508f5df8114558ca9855d2640a2de8f0445f051fa1c7c3383045724 PKG_DESCR:= portable c++ library PKG_SECTION:= libs/misc -PKG_BUILDDEP:= python2-host +PKG_BUILDDEP:= python3-host PKG_NEEDS:= c++ PKG_URL:= http://www.boost.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/} @@ -19,12 +19,13 @@ PKG_OPTS:= dev DISTFILES:= boost_$(PKG_EXTRAVER)_0.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}_$(PKG_EXTRAVER)_0 -PKG_FLAVOURS_BOOST:= DATE_TIME GRAPH GRAPH_PARALLEL IOSTREAMS LOG MATH PROGRAM_OPTIONS PYTHON REGEX SERIALIZATION TEST WAVE +PKG_FLAVOURS_BOOST:= DATE_TIME JSON GRAPH GRAPH_PARALLEL IOSTREAMS LOG MATH PROGRAM_OPTIONS PYTHON REGEX SERIALIZATION TEST WAVE PKGFD_DATE_TIME:= with date-time +PKGFD_JSON:= with json PKGFD_PYTHON:= with python -PKGFB_PYTHON:= python2 -PKGFS_PYTHON:= python2 +PKGFB_PYTHON:= python3 +PKGFS_PYTHON:= python3 PKGFD_IOSTREAMS:= with iostreams PKGFD_GRAPH:= with graph PKGFD_GRAPH_PARALLEL:= with graph_parallel @@ -40,7 +41,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,BOOST,boost,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -include ${ADK_TOPDIR}/mk/python.mk +include ${ADK_TOPDIR}/mk/python3.mk CONFIG_STYLE:= manual BUILD_STYLE:= manual @@ -64,6 +65,9 @@ endif ifeq (${ADK_PACKAGE_BOOST_DATE_TIME},) CONFIGURE_ARGS+= --without-date_time endif +ifeq (${ADK_PACKAGE_BOOST_JSON},) +CONFIGURE_ARGS+= --without-json +endif ifeq (${ADK_PACKAGE_BOOST_PYTHON},) CONFIGURE_ARGS+= --without-python endif @@ -92,6 +96,9 @@ ifeq (${ADK_PACKAGE_BOOST_WAVE},) CONFIGURE_ARGS+= --without-wave endif +ifeq ($(ADK_TARGET_ARCH),aarch64) +BOOST_ARCH:= architecture=arm +endif ifeq ($(ADK_TARGET_ARCH),arm) BOOST_ARCH:= architecture=arm endif @@ -117,6 +124,9 @@ endif ifeq ($(ADK_TARGET_ARCH),arm) BOOST_ABI:= abi=aapcs endif +ifeq ($(ADK_TARGET_ARCH),aarch64) +BOOST_ABI:= abi=aapcs +endif ifeq ($(ADK_TARGET_ARCH),mips) BOOST_ABI:= abi=o32 endif @@ -124,7 +134,7 @@ endif # some variables for build GPP_PATH:= ${TOOLCHAIN_DIR}/usr/bin/${GNU_TARGET_NAME}-g++ GPP_VERSION:= "`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`" -BJAM_PATH:= "`find ${WRKBUILD} -type f -name "bjam$(EXEEXT)"`" +BJAM_PATH:= "`find ${WRKBUILD} -type f -name "b2$(EXEEXT)"`" PYTHON_PATH:= ${STAGING_HOST_DIR}/usr/bin/python PYTHON_INCLUDE:="`find ${STAGING_TARGET_DIR}/usr/include/ -maxdepth 1 -type d -name "python*" | head -1`" PYTHON_LIB:= "`find ${STAGING_TARGET_DIR}/usr/lib/ -maxdepth 1 -type d -name "python*" | head -1`" diff --git a/package/brcm-bluetooth/files/hci b/package/brcm-bluetooth/files/hci index 69716e147..ecc86a210 100644 --- a/package/brcm-bluetooth/files/hci +++ b/package/brcm-bluetooth/files/hci @@ -11,10 +11,9 @@ start) target=$(cat /etc/.adktarget) case $target in raspberry-pi3 | raspberry-pi3p) - hciattach /dev/ttyAMA0 bcm43xx 921600 noflow - + btattach -B /dev/ttyAMA0 -P bcm ;; *) - echo "No supported target found" ;; esac ;; diff --git a/package/brcm-bluetooth/src/BCM4345C5.hcd b/package/brcm-bluetooth/src/BCM4345C5.hcd Binary files differnew file mode 100644 index 000000000..f92310c94 --- /dev/null +++ b/package/brcm-bluetooth/src/BCM4345C5.hcd diff --git a/package/brcmfmac-firmware/Makefile b/package/brcmfmac-firmware/Makefile index 4fd65ab52..c714fd044 100644 --- a/package/brcmfmac-firmware/Makefile +++ b/package/brcmfmac-firmware/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= brcmfmac-firmware PKG_VERSION:= 1.0 -PKG_RELEASE:= 3 +PKG_RELEASE:= 6 PKG_DESCR:= firmware for broadcom wireless cards PKG_SECTION:= sys/firmware @@ -21,6 +21,8 @@ INSTALL_STYLE:= manual do-install: ${INSTALL_DIR} ${IDIR_BRCMFMAC_FIRMWARE}/lib/firmware/brcm - ${CP} ${WRKBUILD}/* ${IDIR_BRCMFMAC_FIRMWARE}/lib/firmware/brcm + ${CP} ${WRKBUILD}/brcm/* ${IDIR_BRCMFMAC_FIRMWARE}/lib/firmware/brcm + ${INSTALL_DIR} ${IDIR_BRCMFMAC_FIRMWARE}/lib/firmware/cypress + ${CP} ${WRKBUILD}/cypress/* ${IDIR_BRCMFMAC_FIRMWARE}/lib/firmware/cypress include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/brcmfmac-firmware/src/BCM43430A1.hcd b/package/brcmfmac-firmware/src/BCM43430A1.hcd Binary files differdeleted file mode 100644 index 9b087f1b6..000000000 --- a/package/brcmfmac-firmware/src/BCM43430A1.hcd +++ /dev/null diff --git a/package/brcmfmac-firmware/src/BCM4345C0.hcd b/package/brcmfmac-firmware/src/BCM4345C0.hcd Binary files differdeleted file mode 100644 index 6870153de..000000000 --- a/package/brcmfmac-firmware/src/BCM4345C0.hcd +++ /dev/null diff --git a/package/brcmfmac-firmware/src/brcm/BCM-0a5c-6410.hcd b/package/brcmfmac-firmware/src/brcm/BCM-0a5c-6410.hcd new file mode 120000 index 000000000..df0229362 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM-0a5c-6410.hcd @@ -0,0 +1 @@ +BCM-0bb4-0306.hcd
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/BCM-0bb4-0306.hcd b/package/brcmfmac-firmware/src/brcm/BCM-0bb4-0306.hcd Binary files differnew file mode 100644 index 000000000..dee1dc756 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM-0bb4-0306.hcd diff --git a/package/brcmfmac-firmware/src/brcm/BCM43430A1.hcd b/package/brcmfmac-firmware/src/brcm/BCM43430A1.hcd Binary files differnew file mode 100644 index 000000000..2a7ec965f --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM43430A1.hcd diff --git a/package/brcmfmac-firmware/src/brcm/BCM43430A1.raspberrypi,3-model-b.hcd b/package/brcmfmac-firmware/src/brcm/BCM43430A1.raspberrypi,3-model-b.hcd new file mode 120000 index 000000000..51441492a --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM43430A1.raspberrypi,3-model-b.hcd @@ -0,0 +1 @@ +BCM43430A1.hcd
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/BCM43430A1.raspberrypi,model-zero-2-w.hcd b/package/brcmfmac-firmware/src/brcm/BCM43430A1.raspberrypi,model-zero-2-w.hcd new file mode 120000 index 000000000..2bc194fc9 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM43430A1.raspberrypi,model-zero-2-w.hcd @@ -0,0 +1 @@ +../synaptics/SYN43430A1.hcd
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/BCM43430A1.raspberrypi,model-zero-w.hcd b/package/brcmfmac-firmware/src/brcm/BCM43430A1.raspberrypi,model-zero-w.hcd new file mode 120000 index 000000000..51441492a --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM43430A1.raspberrypi,model-zero-w.hcd @@ -0,0 +1 @@ +BCM43430A1.hcd
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/BCM43430B0.hcd b/package/brcmfmac-firmware/src/brcm/BCM43430B0.hcd Binary files differnew file mode 100644 index 000000000..5c44f2a5d --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM43430B0.hcd diff --git a/package/brcmfmac-firmware/src/brcm/BCM43430B0.raspberrypi,model-zero-2-w.hcd b/package/brcmfmac-firmware/src/brcm/BCM43430B0.raspberrypi,model-zero-2-w.hcd new file mode 120000 index 000000000..d62254786 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM43430B0.raspberrypi,model-zero-2-w.hcd @@ -0,0 +1 @@ +../synaptics/SYN43430B0.hcd
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/BCM4345C0.hcd b/package/brcmfmac-firmware/src/brcm/BCM4345C0.hcd Binary files differnew file mode 100644 index 000000000..007611e37 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM4345C0.hcd diff --git a/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,3-model-a-plus.hcd b/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,3-model-a-plus.hcd new file mode 120000 index 000000000..d8d4f1d34 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,3-model-a-plus.hcd @@ -0,0 +1 @@ +BCM4345C0.hcd
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,3-model-b-plus.hcd b/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,3-model-b-plus.hcd new file mode 120000 index 000000000..d8d4f1d34 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,3-model-b-plus.hcd @@ -0,0 +1 @@ +BCM4345C0.hcd
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,4-compute-module.hcd b/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,4-compute-module.hcd new file mode 120000 index 000000000..d8d4f1d34 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,4-compute-module.hcd @@ -0,0 +1 @@ +BCM4345C0.hcd
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,4-model-b.hcd b/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,4-model-b.hcd new file mode 120000 index 000000000..d8d4f1d34 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,4-model-b.hcd @@ -0,0 +1 @@ +BCM4345C0.hcd
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,5-model-b.hcd b/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,5-model-b.hcd new file mode 120000 index 000000000..d8d4f1d34 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM4345C0.raspberrypi,5-model-b.hcd @@ -0,0 +1 @@ +BCM4345C0.hcd
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/BCM4345C5.hcd b/package/brcmfmac-firmware/src/brcm/BCM4345C5.hcd Binary files differnew file mode 100644 index 000000000..762359d31 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM4345C5.hcd diff --git a/package/brcmfmac-firmware/src/brcm/BCM4345C5.raspberrypi,4-compute-module.hcd b/package/brcmfmac-firmware/src/brcm/BCM4345C5.raspberrypi,4-compute-module.hcd new file mode 120000 index 000000000..00da8bb90 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM4345C5.raspberrypi,4-compute-module.hcd @@ -0,0 +1 @@ +BCM4345C5.hcd
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/BCM4345C5.raspberrypi,400.hcd b/package/brcmfmac-firmware/src/brcm/BCM4345C5.raspberrypi,400.hcd new file mode 120000 index 000000000..00da8bb90 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/BCM4345C5.raspberrypi,400.hcd @@ -0,0 +1 @@ +BCM4345C5.hcd
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/bcm43xx-0.fw b/package/brcmfmac-firmware/src/brcm/bcm43xx-0.fw Binary files differindex 9ee5ccc10..9ee5ccc10 100644 --- a/package/brcmfmac-firmware/src/bcm43xx-0.fw +++ b/package/brcmfmac-firmware/src/brcm/bcm43xx-0.fw diff --git a/package/brcmfmac-firmware/src/bcm43xx_hdr-0.fw b/package/brcmfmac-firmware/src/brcm/bcm43xx_hdr-0.fw Binary files differindex a6db78de0..a6db78de0 100644 --- a/package/brcmfmac-firmware/src/bcm43xx_hdr-0.fw +++ b/package/brcmfmac-firmware/src/brcm/bcm43xx_hdr-0.fw diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43012-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43012-sdio.bin new file mode 120000 index 000000000..6ed9407a6 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43012-sdio.bin @@ -0,0 +1 @@ +../cypress/cyfmac43012-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43012-sdio.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43012-sdio.clm_blob new file mode 120000 index 000000000..4715e14ce --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43012-sdio.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac43012-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcmfmac43143-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43143-sdio.bin Binary files differindex e4f56f3d1..e4f56f3d1 100644 --- a/package/brcmfmac-firmware/src/brcmfmac43143-sdio.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43143-sdio.bin diff --git a/package/brcmfmac-firmware/src/brcmfmac43143.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43143.bin Binary files differindex 28b8db998..28b8db998 100644 --- a/package/brcmfmac-firmware/src/brcmfmac43143.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43143.bin diff --git a/package/brcmfmac-firmware/src/brcmfmac43236b.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43236b.bin Binary files differindex 8a2004a91..8a2004a91 100644 --- a/package/brcmfmac-firmware/src/brcmfmac43236b.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43236b.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43241b0-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43241b0-sdio.bin Binary files differnew file mode 100644 index 000000000..8cc3cd208 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43241b0-sdio.bin diff --git a/package/brcmfmac-firmware/src/brcmfmac43241b4-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43241b4-sdio.bin Binary files differindex 5d10c24f1..5d10c24f1 100644 --- a/package/brcmfmac-firmware/src/brcmfmac43241b4-sdio.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43241b4-sdio.bin diff --git a/package/brcmfmac-firmware/src/brcmfmac43241b5-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43241b5-sdio.bin Binary files differindex 8d70d17cf..8d70d17cf 100644 --- a/package/brcmfmac-firmware/src/brcmfmac43241b5-sdio.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43241b5-sdio.bin diff --git a/package/brcmfmac-firmware/src/brcmfmac43242a.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43242a.bin Binary files differindex 80604d853..80604d853 100644 --- a/package/brcmfmac-firmware/src/brcmfmac43242a.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43242a.bin diff --git a/package/brcmfmac-firmware/src/brcmfmac4329-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.bin Binary files differindex d4c4560cd..d4c4560cd 100644 --- a/package/brcmfmac-firmware/src/brcmfmac4329-sdio.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.solidrun,cubox-i-dl.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.solidrun,cubox-i-dl.bin Binary files differnew file mode 100644 index 000000000..d4c4560cd --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.solidrun,cubox-i-dl.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.solidrun,cubox-i-dl.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.solidrun,cubox-i-dl.txt new file mode 100644 index 000000000..d0fa0f556 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.solidrun,cubox-i-dl.txt @@ -0,0 +1,70 @@ +# bcm4329 NVRAM +# $Copyright (C) 2008 Broadcom Corporation$ +# $id$ + +sromrev=3 +vendid=0x14e4 +devid=0x432f +boardtype=0x53e + +boardrev=0x41 + +#boardflags=0x1200 +boardflags=0x200 + +# Specify the xtalfreq if it is otherthan 38.4MHz +xtalfreq=37400 + +aa2g=3 +aa5g=0 + +ag0=255 +#tri2g=0x64 + +# 11g paparams +pa0b0=5542,5542,5542 +pa0b1=64244,64244,64244 +pa0b2=65202,65202,65202 + +pa0itssit=62 +pa0maxpwr=74 +opo=0 +mcs2gpo0=0x6666 +mcs2gpo1=0x6666 + +# 11g rssi params +rssismf2g=0xa,0xa,0xa +rssismc2g=0xb,0xb,0xb +rssisav2g=0x3,0x3,0x3 +bxa2g=0 + +# country code +ccode=ALL +cctl=0x0 +cckdigfilttype=0 +ofdmdigfilttype=1 + +rxpo2g=0 + +boardnum=1 +macaddr=00:90:4c:c5:00:34 + +# xtal pu and pd time control variable +# pu time is driver default (0x1501) +#r13t=0x1501 + +####### +nocrc=1 + +#for mfgc +otpimagesize=182 + +# sdio extra configs +hwhdr=0x05ffff031030031003100000 + +#This generates empty F1, F2 and F3 tuple chains, and may be used if the host SDIO stack does not require the standard tuples. +#RAW1=80 02 fe ff + +#This includes the standard FUNCID and FUNCE tuples in the F1, F2, F3 and common CIS. +RAW1=80 32 fe 21 02 0c 00 22 2a 01 01 00 00 c5 0 e6 00 00 00 00 00 40 00 00 ff ff 80 00 00 00 00 00 00 00 00 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 00 00 ff 20 04 D0 2 29 43 21 02 0c 00 22 04 00 20 00 5A +nvramver=4.218.214.0 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.solidrun,cubox-i-q.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.solidrun,cubox-i-q.bin Binary files differnew file mode 100644 index 000000000..d4c4560cd --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.solidrun,cubox-i-q.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.solidrun,cubox-i-q.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.solidrun,cubox-i-q.txt new file mode 100644 index 000000000..d0fa0f556 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.solidrun,cubox-i-q.txt @@ -0,0 +1,70 @@ +# bcm4329 NVRAM +# $Copyright (C) 2008 Broadcom Corporation$ +# $id$ + +sromrev=3 +vendid=0x14e4 +devid=0x432f +boardtype=0x53e + +boardrev=0x41 + +#boardflags=0x1200 +boardflags=0x200 + +# Specify the xtalfreq if it is otherthan 38.4MHz +xtalfreq=37400 + +aa2g=3 +aa5g=0 + +ag0=255 +#tri2g=0x64 + +# 11g paparams +pa0b0=5542,5542,5542 +pa0b1=64244,64244,64244 +pa0b2=65202,65202,65202 + +pa0itssit=62 +pa0maxpwr=74 +opo=0 +mcs2gpo0=0x6666 +mcs2gpo1=0x6666 + +# 11g rssi params +rssismf2g=0xa,0xa,0xa +rssismc2g=0xb,0xb,0xb +rssisav2g=0x3,0x3,0x3 +bxa2g=0 + +# country code +ccode=ALL +cctl=0x0 +cckdigfilttype=0 +ofdmdigfilttype=1 + +rxpo2g=0 + +boardnum=1 +macaddr=00:90:4c:c5:00:34 + +# xtal pu and pd time control variable +# pu time is driver default (0x1501) +#r13t=0x1501 + +####### +nocrc=1 + +#for mfgc +otpimagesize=182 + +# sdio extra configs +hwhdr=0x05ffff031030031003100000 + +#This generates empty F1, F2 and F3 tuple chains, and may be used if the host SDIO stack does not require the standard tuples. +#RAW1=80 02 fe ff + +#This includes the standard FUNCID and FUNCE tuples in the F1, F2, F3 and common CIS. +RAW1=80 32 fe 21 02 0c 00 22 2a 01 01 00 00 c5 0 e6 00 00 00 00 00 40 00 00 ff ff 80 00 00 00 00 00 00 00 00 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 00 00 ff 20 04 D0 2 29 43 21 02 0c 00 22 04 00 20 00 5A +nvramver=4.218.214.0 diff --git a/package/brcmfmac-firmware/src/brcmfmac4329-sdio.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.txt index 6be3013aa..6be3013aa 100644 --- a/package/brcmfmac-firmware/src/brcmfmac4329-sdio.txt +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4329-sdio.txt diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.Prowise-PT301.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.Prowise-PT301.txt new file mode 100644 index 000000000..67381ab43 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.Prowise-PT301.txt @@ -0,0 +1,89 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2018 Linaro Ltd +# NVRAM config file for the Ampak AP6330 4330 WiFi/BT module found on the +# Prowise PT301 tablet +aa2g=1 +aa5g=1 +ag0=0x40 +ag1=0xBF +boardflags=0x10080a00 +# boardflags3 is not set +boardnum=22 +boardrev=0x1202 +boardtype=0x05e1 +bphyscale=17 +# btc_params is not set +cckPwrIdxCorr=-15 +cckPwrOffset=6 +cckdigfilttype=20 +ccode=X2 +# cldo_pwm is not set +dacrate2g=160 +dacrate5g=160 +devid=0x4360 +il0macaddr=00:90:4c:c5:12:38 +macaddr=00:90:4c:c5:12:38 +manfid=0x2d0 +maxp2ga0=0x44 +maxp5ga0=0x3A +maxp5gha0=0x3A +maxp5gla0=0x3A +mcs2gpo0=0x4444 +mcs2gpo1=0x4444 +mcs5ghpo0=0x2222 +mcs5ghpo1=0x2222 +mcs5glpo0=0x2222 +mcs5glpo1=0x2222 +mcs5gpo0=0x2222 +mcs5gpo1=0x2222 +nocrc=1 +noise_cal_adj_2g=-3 +noise_cal_ref_2g=53 +ofdm2gpo=0x22222222 +ofdm5ghpo=0x00000000 +ofdm5glpo=0x00000000 +ofdm5gpo=0x00000000 +pa0b0=4924 +pa0b1=-595 +pa0b2=-157 +pa0itssit=0x20 +pa1b0=4880 +pa1b1=-625 +pa1b2=-200 +pa1hib0=4880 +pa1hib1=-620 +pa1hib2=-190 +pa1lob0=5050 +pa1lob1=-630 +pa1lob2=-195 +pacalpwr2g=13 +pacalpwr5g1=11 +pacalpwr5g=13 +pacalpwr5ghi1=11 +pacalpwr5ghi=13 +pacalpwr5glo1=11 +pacalpwr5glo=13 +prodid=0x0547 +rfreg033=0x19 +rfreg033_cck=0x1f +rfreg088=15 +rssisav2g=0x7 +rssisav5g=0x7 +rssismc2g=0x3 +rssismc5g=0x3 +rssismf2g=0xa +rssismf5g=0x4 +rxpo5g=0 +sd_gpdc=0 +sd_gpout=0 +sd_gpval=1 +sromrev=3 +swctrlmap_2g=0x04040404,0x02020202,0x02020202,0x18282,0x1ff +swctrlmap_5g=0x10101010,0x28282020,0x20202020,0x10202,0x0f8 +triso2g=3 +triso5g=6 +txalpfbyp2g=1 +txgaintbl=1 +vendid=0x14e4 +wl0id=0x431b +xtalfreq=26000 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.bin Binary files differnew file mode 100644 index 000000000..3dd04446e --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.bin diff --git a/package/brcmfmac-firmware/src/brcmfmac4330-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.solidrun,cubox-i-dl.bin Binary files differindex e3bc35546..e3bc35546 100644 --- a/package/brcmfmac-firmware/src/brcmfmac4330-sdio.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.solidrun,cubox-i-dl.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.solidrun,cubox-i-dl.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.solidrun,cubox-i-dl.txt new file mode 100644 index 000000000..09a044f78 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.solidrun,cubox-i-dl.txt @@ -0,0 +1,118 @@ +manfid=0x2d0 +prodid=0x0532 +vendid=0x14e4 +devid=0x4360 +boardtype=0x0532 +boardrev=0x20 +boardflags=0x10080201 + +nocrc=1 +xtalfreq=37400 +xtalmode=0x20,0x4,0 +boardnum=22 +macaddr=00:90:4c:c5:12:38 +ag0=252 +ag1=252 +aa2g=1 +aa5g=1 +ccode=EU +regrev=5 + +#for BT-coexistence +btc_params80=0 +btc_params6=10 +btc_params8=10000 + +sd_gpout=0 +# sd_oobonly=1 +muxenab=0x10 + +# 2G PA param_B42R 110927 +pa0b0=0x12E4 +pa0b1=0xFE09 +pa0b2=0xFF9A +#pa0itssit=62 +rssismf2g=0xa +rssismc2g=0x3 +rssisav2g=0x7 + +# rssi params for 5GHz B42R_110803 +#rssismf5g=0x4 +rssismf5g=0xa +rssismc5g=0x7 +rssisav5g=0x1 +#PA parameters for lower band +pa1lob0=0x144F +pa1lob1=0xFD6B +pa1lob2=0xFF3B +#PA parameters for midband +pa1b0=0x139C +pa1b1=0xFD87 +pa1b2=0xFF4F +#PA parameters for high band +pa1hib0=0x12CA +pa1hib1=0xFD9A +pa1hib2=0xFF4E + +# 2G PA offset +maxp2ga0=64 +sromrev=3 +cckpo=0 +ofdm2gpo=0x66666666 +mcs2gpo0=0xaaaa +mcs2gpo1=0xaaaa + +# 5G PA offset +maxp5ga0=66 +maxp5gla0=66 +maxp5gha0=66 +ofdm5gpo=0x22222222 +ofdm5glpo=0x11111111 +ofdm5ghpo=0x22222222 +mcs5gpo0=0x6666 +mcs5gpo1=0x6666 +mcs5glpo0=0x5555 +mcs5glpo1=0x5555 +mcs5ghpo0=0x6666 +mcs5ghpo1=0x6666 + +cckPwrOffset=4 +cckdigfilttype=22 +ofdmdigfilttype=2 +extpagain5g=2 +#wl0id=0x431b + +# For 2GHz Tx EVM/SM +rfreg033=0x19 +rfreg033_cck=0x1d +pacalidx2g=65 +dacrate2g=160 +txalpfbyp2g=1 +bphyscale=17 + +# 5GHz LOFT and IQ CAL +txgaintbl5g=1 +txiqlopapu5g=1 +txiqlopag5g=0x10 +iqlocalidx5g=24 + +# 5GHz Noise CAL parameter +noise_cal_po_5g=5 +noise_cal_enable_5g=0 + +# 2GHz RxPER at low rates +noise_cal_ref_2g=56 +noise_cal_po_bias_2g=-4 +noise_cal_enable_2g=1 + +# Max input level on a-band +triso5g=9 + +# Tx power control, especially temp. +tssitime=1 + +#fc+1.7GHz Spur Elimination +loidacmode5g=1 + +swctrlmap_2g=0x84048404, 0x82028202, 0x84048404, 0x010202, 0x1ff +swctrlmap_5g=0xC040C040, 0xB030A020, 0xA020C040, 0x010A02, 0x2F8 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.solidrun,cubox-i-q.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.solidrun,cubox-i-q.bin Binary files differnew file mode 100644 index 000000000..e3bc35546 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.solidrun,cubox-i-q.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.solidrun,cubox-i-q.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.solidrun,cubox-i-q.txt new file mode 100644 index 000000000..09a044f78 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.solidrun,cubox-i-q.txt @@ -0,0 +1,118 @@ +manfid=0x2d0 +prodid=0x0532 +vendid=0x14e4 +devid=0x4360 +boardtype=0x0532 +boardrev=0x20 +boardflags=0x10080201 + +nocrc=1 +xtalfreq=37400 +xtalmode=0x20,0x4,0 +boardnum=22 +macaddr=00:90:4c:c5:12:38 +ag0=252 +ag1=252 +aa2g=1 +aa5g=1 +ccode=EU +regrev=5 + +#for BT-coexistence +btc_params80=0 +btc_params6=10 +btc_params8=10000 + +sd_gpout=0 +# sd_oobonly=1 +muxenab=0x10 + +# 2G PA param_B42R 110927 +pa0b0=0x12E4 +pa0b1=0xFE09 +pa0b2=0xFF9A +#pa0itssit=62 +rssismf2g=0xa +rssismc2g=0x3 +rssisav2g=0x7 + +# rssi params for 5GHz B42R_110803 +#rssismf5g=0x4 +rssismf5g=0xa +rssismc5g=0x7 +rssisav5g=0x1 +#PA parameters for lower band +pa1lob0=0x144F +pa1lob1=0xFD6B +pa1lob2=0xFF3B +#PA parameters for midband +pa1b0=0x139C +pa1b1=0xFD87 +pa1b2=0xFF4F +#PA parameters for high band +pa1hib0=0x12CA +pa1hib1=0xFD9A +pa1hib2=0xFF4E + +# 2G PA offset +maxp2ga0=64 +sromrev=3 +cckpo=0 +ofdm2gpo=0x66666666 +mcs2gpo0=0xaaaa +mcs2gpo1=0xaaaa + +# 5G PA offset +maxp5ga0=66 +maxp5gla0=66 +maxp5gha0=66 +ofdm5gpo=0x22222222 +ofdm5glpo=0x11111111 +ofdm5ghpo=0x22222222 +mcs5gpo0=0x6666 +mcs5gpo1=0x6666 +mcs5glpo0=0x5555 +mcs5glpo1=0x5555 +mcs5ghpo0=0x6666 +mcs5ghpo1=0x6666 + +cckPwrOffset=4 +cckdigfilttype=22 +ofdmdigfilttype=2 +extpagain5g=2 +#wl0id=0x431b + +# For 2GHz Tx EVM/SM +rfreg033=0x19 +rfreg033_cck=0x1d +pacalidx2g=65 +dacrate2g=160 +txalpfbyp2g=1 +bphyscale=17 + +# 5GHz LOFT and IQ CAL +txgaintbl5g=1 +txiqlopapu5g=1 +txiqlopag5g=0x10 +iqlocalidx5g=24 + +# 5GHz Noise CAL parameter +noise_cal_po_5g=5 +noise_cal_enable_5g=0 + +# 2GHz RxPER at low rates +noise_cal_ref_2g=56 +noise_cal_po_bias_2g=-4 +noise_cal_enable_2g=1 + +# Max input level on a-band +triso5g=9 + +# Tx power control, especially temp. +tssitime=1 + +#fc+1.7GHz Spur Elimination +loidacmode5g=1 + +swctrlmap_2g=0x84048404, 0x82028202, 0x84048404, 0x010202, 0x1ff +swctrlmap_5g=0xC040C040, 0xB030A020, 0xA020C040, 0x010A02, 0x2F8 diff --git a/package/brcmfmac-firmware/src/brcmfmac4330-sdio.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.txt index 9546246b9..9546246b9 100644 --- a/package/brcmfmac-firmware/src/brcmfmac4330-sdio.txt +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4330-sdio.txt diff --git a/package/brcmfmac-firmware/src/brcmfmac4334-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4334-sdio.bin Binary files differindex ade994fbf..ade994fbf 100644 --- a/package/brcmfmac-firmware/src/brcmfmac4334-sdio.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4334-sdio.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43340-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43340-sdio.bin new file mode 120000 index 000000000..ffd98c6fd --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43340-sdio.bin @@ -0,0 +1 @@ +../cypress/cyfmac43340-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43340-sdio.meegopad-t08.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43340-sdio.meegopad-t08.txt new file mode 100644 index 000000000..9535a4b6f --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43340-sdio.meegopad-t08.txt @@ -0,0 +1,98 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2018 Linaro Ltd +# NVRAM config file for the Ampak AP6234 43340 WiFi/BT module found on the +# Meegopad T08 HDMI stick +aa2g=1 +ag0=255 +boardflags=0x0090201 +boardnum=22 +boardrev=0x1203 +boardtype=0x0653 +btc_flags=71 +btc_params22=8000 +btc_params83=9000 +btc_params84=4500 +btc_params8=15000 +cck2gpo=0x2222 +cckPwrOffset=3 +cckpapden=0 +ccode=X2 +dacrate2xen=1 +devid=0x4386 +dlocalidx5g=70 +dlorange_lowlimit=5 +gain=32 +gain_settle_dly_2g=4 +gain_settle_dly_5g=4 +iqcalidx5g=50 +iqlocalidx5g=40 +loflag=0 +lpbckmode5g=1 +macaddr=00:90:4c:c5:12:38 +manfid=0x2d0 +maxp2ga0=80 +maxp5ga0=80 +maxp5gha0=78 +maxp5gla0=78 +mcs2gpo0=0x5555 +mcs2gpo1=0x5555 +mcs5ghpo0=0x7777 +mcs5ghpo1=0x7777 +mcs5glpo0=0x7777 +mcs5glpo1=0x7777 +mcs5gpo0=0x8888 +mcs5gpo1=0x8888 +nocrc=1 +noise_cal_high_gain_2g=73 +noise_cal_high_gain_5g=73 +noise_cal_nf_substract_val_2g=346 +noise_cal_nf_substract_val_5g=346 +noise_cal_po_2g=-1 +noise_cal_po_40_2g=-1 +noise_cal_po_40_5g=-1 +noise_cal_po_5g=-1 +ofdm2gpo=0x333333333 +ofdm5ghpo=0x66666666 +ofdm5glpo=0x66666666 +ofdm5gpo=0x66666666 +pa0b0=6957 default +pa0b1=-808 +pa0b2=-178 +pa0itssit=0x20 +pa1b0=5372 +pa1b1=-671 +pa1b2=-212 +pa1hib0=5620 +pa1hib1=-663 +pa1hib2=-179 +pa1lob0=5859 +pa1lob1=-693 +pa1lob2=-178 +papden2g=1 +papden5g=1 +prodid=0x0653 +rssisav2g=0x1 +rssisav5g=0x3 +rssismc2g=0x8 +rssismc5g=0x7 +rssismf2g=0xf +rssismf5g=0xf +rxpo5g=0 +sd_gpdc=0 +sd_gpout=4 +sd_gpval=1 +sromrev=3 +swctrlmap_2g=0x00080008,0x00100010,0x00080008,0x011010,0x11f +swctrlmap_5g=0x00040004,0x00020002,0x00040004,0x011010,0x2fe +triso2g=8 +triso5g=8 +tssifloor2g=69 +tssifloor5gh=74 +tssifloor5gl=77 +tssifloor5gm=77 +txalpfbyp=1 +txalpfpu=1 +txiqlopapu2g=0 +txiqlopapu5g=0 +vendid=0x14e4 +xtalfreq=37400 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43340-sdio.pov-tab-p1006w-data.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43340-sdio.pov-tab-p1006w-data.txt new file mode 100644 index 000000000..1bec11e4a --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43340-sdio.pov-tab-p1006w-data.txt @@ -0,0 +1,98 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2018 Linaro Ltd +# NVRAM config file for the Ampak AP6234 43340 WiFi/BT module found on the +# Point of View TAB-P1006W-232-3G tablet +aa2g=1 +ag0=255 +boardflags=0x0090201 +boardnum=22 +boardrev=0x1203 +boardtype=0x0653 +btc_flags=71 +btc_params22=8000 +btc_params83=9000 +btc_params84=4500 +btc_params8=15000 +cck2gpo=0x2222 +cckPwrOffset=3 +cckpapden=0 +ccode=X2 +dacrate2xen=1 +devid=0x4386 +dlocalidx5g=70 +dlorange_lowlimit=5 +gain=32 +gain_settle_dly_2g=4 +gain_settle_dly_5g=4 +iqcalidx5g=50 +iqlocalidx5g=40 +loflag=0 +lpbckmode5g=1 +macaddr=00:90:4c:c5:12:38 +manfid=0x2d0 +maxp2ga0=72 +maxp5ga0=68 +maxp5gha0=68 +maxp5gla0=68 +mcs2gpo0=0x5555 +mcs2gpo1=0x5555 +mcs5ghpo0=0x7777 +mcs5ghpo1=0x7777 +mcs5glpo0=0x7777 +mcs5glpo1=0x7777 +mcs5gpo0=0x8888 +mcs5gpo1=0x8888 +nocrc=1 +noise_cal_high_gain_2g=73 +noise_cal_high_gain_5g=73 +noise_cal_nf_substract_val_2g=346 +noise_cal_nf_substract_val_5g=346 +noise_cal_po_2g=-1 +noise_cal_po_40_2g=-1 +noise_cal_po_40_5g=-1 +noise_cal_po_5g=-1 +ofdm2gpo=0x333333333 +ofdm5ghpo=0x66666666 +ofdm5glpo=0x66666666 +ofdm5gpo=0x66666666 +pa0b0=0x1ce6 +pa0b1=0xfca1 +pa0b2=0xff62 +pa0itssit=0x20 +pa1b0=0x10cb +pa1b1=0xfdac +pa1b2=0xfefa +pa1hib0=0x1481 +pa1hib1=0xfd90 +pa1hib2=0xff56 +pa1lob0=0x15ef +pa1lob1=0xfd61 +pa1lob2=0xff57 +papden2g=1 +papden5g=1 +prodid=0x0653 +rssisav2g=0x1 +rssisav5g=0x3 +rssismc2g=0x8 +rssismc5g=0x7 +rssismf2g=0xf +rssismf5g=0xf +rxpo5g=0 +sd_gpdc=0 +sd_gpout=4 +sd_gpval=1 +sromrev=3 +swctrlmap_2g=0x00080008,0x00100010,0x00080008,0x011010,0x11f +swctrlmap_5g=0x00040004,0x00020002,0x00040004,0x011010,0x2fe +triso2g=8 +triso5g=8 +tssifloor2g=69 +tssifloor5gh=74 +tssifloor5gl=77 +tssifloor5gm=77 +txalpfbyp=1 +txalpfpu=1 +txiqlopapu2g=0 +txiqlopapu5g=0 +vendid=0x14e4 +xtalfreq=37400 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43340-sdio.predia-basic.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43340-sdio.predia-basic.txt new file mode 100644 index 000000000..c899475cc --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43340-sdio.predia-basic.txt @@ -0,0 +1,98 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2018 Linaro Ltd +# NVRAM config file for the Ampak AP6234 43340 WiFi/BT module found on the +# Predia Basic tablet +aa2g=1 +ag0=255 +boardflags=0x0090201 +boardnum=22 +boardrev=0x1203 +boardtype=0x0653 +btc_flags=71 +btc_params22=8000 +btc_params83=9000 +btc_params84=4500 +btc_params8=15000 +cck2gpo=0x2222 +cckPwrOffset=3 +cckpapden=0 +ccode=X2 +dacrate2xen=1 +devid=0x4386 +dlocalidx5g=70 +dlorange_lowlimit=5 +gain=32 +gain_settle_dly_2g=4 +gain_settle_dly_5g=4 +iqcalidx5g=50 +iqlocalidx5g=40 +loflag=0 +lpbckmode5g=1 +macaddr=00:90:4c:c5:12:38 +manfid=0x2d0 +maxp2ga0=76 +maxp5ga0=68 +maxp5gha0=68 +maxp5gla0=68 +mcs2gpo0=0x5555 +mcs2gpo1=0x5555 +mcs5ghpo0=0x7777 +mcs5ghpo1=0x7777 +mcs5glpo0=0x7777 +mcs5glpo1=0x7777 +mcs5gpo0=0x8888 +mcs5gpo1=0x8888 +nocrc=1 +noise_cal_high_gain_2g=73 +noise_cal_high_gain_5g=73 +noise_cal_nf_substract_val_2g=346 +noise_cal_nf_substract_val_5g=346 +noise_cal_po_2g=-1 +noise_cal_po_40_2g=-1 +noise_cal_po_40_5g=-1 +noise_cal_po_5g=-1 +ofdm2gpo=0x333333333 +ofdm5ghpo=0x66666666 +ofdm5glpo=0x66666666 +ofdm5gpo=0x66666666 +pa0b0=6957 default +pa0b1=-808 +pa0b2=-178 +pa0itssit=0x20 +pa1b0=5372 +pa1b1=-671 +pa1b2=-212 +pa1hib0=5620 +pa1hib1=-663 +pa1hib2=-179 +pa1lob0=5859 +pa1lob1=-693 +pa1lob2=-178 +papden2g=1 +papden5g=1 +prodid=0x0653 +rssisav2g=0x1 +rssisav5g=0x3 +rssismc2g=0x8 +rssismc5g=0x7 +rssismf2g=0xf +rssismf5g=0xf +rxpo5g=0 +sd_gpdc=0 +sd_gpout=4 +sd_gpval=1 +sromrev=3 +swctrlmap_2g=0x00080008,0x00100010,0x00080008,0x011010,0x11f +swctrlmap_5g=0x00040004,0x00020002,0x00040004,0x011010,0x2fe +triso2g=8 +triso5g=8 +tssifloor2g=69 +tssifloor5gh=74 +tssifloor5gl=77 +tssifloor5gm=77 +txalpfbyp=1 +txalpfpu=1 +txiqlopapu2g=0 +txiqlopapu5g=0 +vendid=0x14e4 +xtalfreq=37400 diff --git a/package/brcmfmac-firmware/src/brcmfmac4335-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4335-sdio.bin Binary files differindex a670e962c..a670e962c 100644 --- a/package/brcmfmac-firmware/src/brcmfmac4335-sdio.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4335-sdio.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43362-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43362-sdio.bin new file mode 120000 index 000000000..459879f13 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43362-sdio.bin @@ -0,0 +1 @@ +../cypress/cyfmac43362-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt new file mode 100644 index 000000000..90b46682f --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt @@ -0,0 +1,45 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2018 Linaro Ltd +# NVRAM config file for the Ampak AP6210 43362 WiFi/BT module found on the +# Cubietech Cubietruck board +aa2g=1 +ag0=2 +boardflags2=0x80 +boardflags=0x80201 +boardnum=777 +boardrev=0x1307 +boardtype=0x0598 +btc_flags=0x6 +btc_params0=5000 +btc_params1=1000 +btc_params6=63 +cck2gpo=0x2222 +cckPwrOffset=5 +ccode=0 +devid=0x4343 +macaddr=00:90:4c:c5:12:38 +manfid=0x2d0 +maxp2ga0=74 +mcs2gpo0=0x6666 +mcs2gpo1=0x6666 +noise_cal_enable_2g=0 +noise_cal_po_2g=0 +ofdm2gpo=0x44444444 +pa0b0=5447 +pa0b1=-607 +pa0b2=-160 +pa0itssit=62 +pa0maxpwr=56 +pa1itssit=62 +prodid=0x492 +rssisav2g=0x7 +rssismc2g=0x3 +rssismf2g=0xa +sromrev=3 +swctrlmap_2g=0x04040404,0x02020202,0x02020202,0x010101,0x1ff +temp_add=29767 +temp_mult=425 +triso2g=0 +vendid=0x14e4 +wl0id=0x431b +xtalfreq=26000 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43362-sdio.lemaker,bananapro.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43362-sdio.lemaker,bananapro.txt new file mode 120000 index 000000000..c3f3fe933 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43362-sdio.lemaker,bananapro.txt @@ -0,0 +1 @@ +brcmfmac43362-sdio.cubietech,cubietruck.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4339-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4339-sdio.bin new file mode 120000 index 000000000..ee51e67ff --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4339-sdio.bin @@ -0,0 +1 @@ +../cypress/cyfmac4339-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.AP6212.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.AP6212.txt new file mode 100644 index 000000000..901854e67 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.AP6212.txt @@ -0,0 +1,44 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2018 Linaro Ltd +# NVRAM config file for the Ampak AP6212 43430 WiFi/BT module +aa2g=1 +ag0=255 +AvVmid_c0=0x0,0xc8 +boardflags=0x00404201 +# boardflags3 is not set +boardnum=22 +boardrev=0x1101 +boardtype=0x0726 +# btc_params is not set +cckbw202gpo=0x5555 +cckpwroffset0=5 +ccode=ALL +# cldo_pwm is not set +deadman_to=0xffffffff +devid=0x43e2 +extpagain2g=0 +il0macaddr=00:90:4c:c5:12:38 +legofdmbw202gpo=0x77777777 +macaddr=00:90:4c:c5:12:38 +manfid=0x2d0 +maxp2ga0=90 +mcsbw202gpo=0xaaaaaaaa +muxenab=0x10 +nocrc=1 +ofdmdigfilttype=7 +# ofdmdigfilttypebe is not set +pa0itssit=0x20 +pa2ga0=-168,7161,-820 +# pacalidx2g is not set +# papdendidx is not set +# papdepsoffset is not set +papdmode=2 +# papdvalidtest is not set +prodid=0x0726 +# propbw202gpois not set +# spurconfig is not set +sromrev=11 +txpwrbckof=6 +vendid=0x14e4 +wl0id=0x431b +xtalfreq=26000 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt new file mode 100644 index 000000000..5b854d430 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2018 Linaro Ltd +# NVRAM config file for the 43430 WiFi/BT chip as found on the Chuwi Vi8 Plus +# tablet's mainboard +aa2g=1 +ag0=255 +AvVmid_c0=0x0,0xc8 +boardflags=0x00404201 +# boardflags3 is not set +boardnum=22 +boardrev=0x1101 +boardtype=0x0726 +# btc_params is not set +cckbw202gpo=0 +cckpwroffset0=5 +ccode=X2 +# cldo_pwm is not set +deadman_to=0xffffffff +devid=0x43e2 +extpagain2g=0 +il0macaddr=00:90:4c:c5:12:38 +legofdmbw202gpo=0x66111111 +macaddr=00:90:4c:c5:12:38 +manfid=0x2d0 +maxp2ga0=90 +mcsbw202gpo=0x77711111 +muxenab=0x1 +nocrc=1 +ofdmdigfilttype=18 +ofdmdigfilttypebe=18 +pa0itssit=0x20 +pa2ga0=-168,7161,-820 +# pacalidx2g is not set +# papdendidx is not set +# papdepsoffset is not set +papdmode=1 +# papdvalidtest is not set +prodid=0x0726 +# propbw202gpois not set +sd_gpdc=0 +sd_gpout=0 +sd_gpval=1 +# spurconfig is not set +sromrev=11 +txpwrbckof=6 +vendid=0x14e4 +wl0id=0x431b +xtalfreq=26000 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.MUR1DX.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.MUR1DX.txt new file mode 100644 index 000000000..06d4e3169 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.MUR1DX.txt @@ -0,0 +1,44 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2018 Linaro Ltd +# NVRAM config file for the Murata 1DX 43430 WiFi/BT module +aa2g=1 +ag0=0 +AvVmid_c0=0x0,0xc8 +boardflags=0x00404201 +boardflags3=0x08000000 +boardnum=22 +boardrev=0x1202 +boardtype=0x0726 +# btc_params is not set +cckbw202gpo=0x0 +cckpwroffset0=2 +ccode=ALL +# cldo_pwm is not set +# deadman_to is not set +devid=0x43e2 +extpagain2g=0 +il0macaddr=00:90:4c:c5:12:38 +legofdmbw202gpo=0x88888888 +macaddr=00:90:4c:c5:12:38 +manfid=0x2d0 +maxp2ga0=74 +mcsbw202gpo=0xaaaaaaaa +muxenab=0x10 +nocrc=1 +ofdmdigfilttype=18 +ofdmdigfilttypebe=18 +# pa0itssit is not set +pa2ga0=-145,6667,-751 +pacalidx2g=48 +papdendidx=58 +papdepsoffset=-22 +papdmode=1 +papdvalidtest=1 +prodid=0x0726 +propbw202gpo=0xdd +# spurconfig is not set +sromrev=11 +# txpwrbckof is not set +vendid=0x14e4 +wl0id=0x431b +xtalfreq=37400 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.bin new file mode 120000 index 000000000..1c68d4a58 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.bin @@ -0,0 +1 @@ +../cypress/cyfmac43430-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.clm_blob new file mode 120000 index 000000000..6e69616c4 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac43430-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.bin new file mode 120000 index 000000000..1c68d4a58 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.bin @@ -0,0 +1 @@ +../cypress/cyfmac43430-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.clm_blob new file mode 120000 index 000000000..6e69616c4 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac43430-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt new file mode 120000 index 000000000..2ed668982 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt @@ -0,0 +1 @@ +brcmfmac43430-sdio.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.bin new file mode 120000 index 000000000..81b110413 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.bin @@ -0,0 +1 @@ +brcmfmac43436s-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.txt new file mode 120000 index 000000000..8d4e628b8 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.txt @@ -0,0 +1 @@ +brcmfmac43436s-sdio.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.bin new file mode 120000 index 000000000..1c68d4a58 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.bin @@ -0,0 +1 @@ +../cypress/cyfmac43430-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.clm_blob new file mode 120000 index 000000000..6e69616c4 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac43430-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt new file mode 120000 index 000000000..2ed668982 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt @@ -0,0 +1 @@ +brcmfmac43430-sdio.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt new file mode 120000 index 000000000..e06912f7d --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt @@ -0,0 +1 @@ +brcmfmac43430-sdio.AP6212.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt new file mode 120000 index 000000000..e06912f7d --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt @@ -0,0 +1 @@ +brcmfmac43430-sdio.AP6212.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt new file mode 120000 index 000000000..e06912f7d --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt @@ -0,0 +1 @@ +brcmfmac43430-sdio.AP6212.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt new file mode 120000 index 000000000..e06912f7d --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt @@ -0,0 +1 @@ +brcmfmac43430-sdio.AP6212.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcmfmac43430-sdio.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.txt index 3d917a7fd..25a4f9b6e 100644 --- a/package/brcmfmac-firmware/src/brcmfmac43430-sdio.txt +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430-sdio.txt @@ -57,3 +57,8 @@ muxenab=0x1 #VCO freq 326.4MHz spurconfig=0x3 + +# Improved Bluetooth coexistence parameters from Cypress +btc_mode=1 +btc_params8=0x4e20 +btc_params1=0x7530 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430a0-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43430a0-sdio.bin Binary files differnew file mode 100644 index 000000000..dc5ef912d --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430a0-sdio.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430a0-sdio.ilife-S806.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43430a0-sdio.ilife-S806.txt new file mode 100644 index 000000000..c0ec87375 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430a0-sdio.ilife-S806.txt @@ -0,0 +1,47 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2018 Linaro Ltd +# NVRAM config file for the 43430a0 WiFi/BT chip found on the Chuwi Hi8 tablet +aa2g=1 +ag0=255 +AvVmid_c0=0x0,0xc8 +boardflags=0x00404201 +# boardflags3 is not set +boardnum=22 +boardrev=0x1101 +boardtype=0x0726 +# btc_params is not set +cckbw202gpo=0 +cckpwroffset0=5 +ccode=X2 +# cldo_pwm is not set +deadman_to=0xffffffff +devid=0x43e2 +extpagain2g=0 +il0macaddr=00:90:4c:c5:12:38 +legofdmbw202gpo=0x66111111 +macaddr=00:90:4c:c5:12:38 +manfid=0x2d0 +maxp2ga0=90 +mcsbw202gpo=0x77711111 +muxenab=0x1 +nocrc=1 +ofdmdigfilttype=18 +ofdmdigfilttypebe=18 +pa0itssit=0x20 +pa2ga0=-168,7161,-820 +# pacalidx2g is not set +# papdendidx is not set +# papdepsoffset is not set +papdmode=1 +# papdvalidtest is not set +prodid=0x0726 +# propbw202gpois not set +sd_gpdc=0 +sd_gpout=0 +sd_gpval=1 +# spurconfig is not set +sromrev=11 +txpwrbckof=6 +vendid=0x14e4 +wl0id=0x431b +xtalfreq=26000 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt new file mode 100644 index 000000000..14f56292d --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt @@ -0,0 +1,49 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2018 Linaro Ltd +# NVRAM config file for the Ampak AP6212 43430a0 WiFi/BT module found on the +# Jumper EZpad mini 3 tablet +aa2g=1 +ag0=255 +AvVmid_c0=0x0,0xc8 +boardflags=0x00404201 +# boardflags3 is not set +boardnum=22 +boardrev=0x1101 +boardtype=0x0726 +# btc_params is not set +cckbw202gpo=0 +cckpwroffset0=5 +ccode=X2 +# cldo_pwm is not set +deadman_to=0xffffffff +devid=0x43e2 +extpagain2g=0 +il0macaddr=00:90:4c:c5:12:38 +legofdmbw202gpo=0x66111111 +macaddr=00:90:4c:c5:12:38 +manfid=0x2d0 +maxp2ga0=78 +mcsbw202gpo=0x77711111 +muxenab=0x1 +nocrc=1 +ofdmdigfilttype=18 +ofdmdigfilttypebe=18 +pa0itssit=0x20 +pa2ga0=-168,6009,-726 +# pacalidx2g is not set +# papdendidx is not set +# papdepsoffset is not set +papdmode=1 +# papdvalidtest is not set +prodid=0x0726 +# propbw202gpois not set +rssicorrnorm=15 +sd_gpdc=0 +sd_gpout=0 +sd_gpval=1 +# spurconfig is not set +sromrev=11 +txpwrbckof=6 +vendid=0x14e4 +wl0id=0x431b +xtalfreq=26000 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.bin new file mode 120000 index 000000000..3c46e4c67 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.bin @@ -0,0 +1 @@ +brcmfmac43436-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.clm_blob new file mode 120000 index 000000000..0b8821bd4 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.clm_blob @@ -0,0 +1 @@ +brcmfmac43436-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.txt new file mode 120000 index 000000000..545893f15 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.txt @@ -0,0 +1 @@ +brcmfmac43436-sdio.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.bin Binary files differnew file mode 100644 index 000000000..a09e0e1c9 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.clm_blob Binary files differnew file mode 100644 index 000000000..1efac5060 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.clm_blob diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.raspberrypi,model-zero-2-w.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.raspberrypi,model-zero-2-w.bin new file mode 120000 index 000000000..3c46e4c67 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.raspberrypi,model-zero-2-w.bin @@ -0,0 +1 @@ +brcmfmac43436-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.raspberrypi,model-zero-2-w.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.raspberrypi,model-zero-2-w.clm_blob new file mode 120000 index 000000000..0b8821bd4 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.raspberrypi,model-zero-2-w.clm_blob @@ -0,0 +1 @@ +brcmfmac43436-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.raspberrypi,model-zero-2-w.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.raspberrypi,model-zero-2-w.txt new file mode 120000 index 000000000..545893f15 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.raspberrypi,model-zero-2-w.txt @@ -0,0 +1 @@ +brcmfmac43436-sdio.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.txt new file mode 100644 index 000000000..8eba004ee --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43436-sdio.txt @@ -0,0 +1,93 @@ +# NVRAM file for BCM943430WLPTH, Bx Chip +# 2.4 GHz, 20 MHz BW mode +# $ Copyright Broadcom $ +# +# +# <<Broadcom-WL-IPTag/Proprietary:>> + +# The following parameter values are just placeholders, need to be updated. +manfid=0x2d0 +prodid=0x0727 +vendid=0x14e4 +devid=0x43e2 +boardtype=0x0727 +boardrev=0x1331 +boardnum=22 +macaddr=00:90:4c:c5:12:38 +sromrev=11 +boardflags=0x00404201 +boardflags3=0x08000000 +xtalfreq=37400 +nocrc=1 +ag0=255 +aa2g=1 +ccode=ALL + +pa0itssit=0x20 +extpagain2g=0 + +#PA parameters for 2.4GHz, measured at CHIP OUTPUT +pa2ga0=-203,6150,-732 + +#PA parameters for 2.4GHz, measured at CELL_BLOCK_PORT output +#pa2ga0=-191,6027,-713 + +#PA parameters for 2.4GHz, measured at LTE_BLOCK_PORT output +#pa2ga0=-161,5458,-639 + + +AvVmid_c0=0x0,0xc8 +cckpwroffset0=5 + +# PPR params +maxp2ga0=78 +txpwrbckof=6 +cckbw202gpo=0 +legofdmbw202gpo=0x66111111 +mcsbw202gpo=0x76611111 +propbw202gpo=0xcc + +# OFDM IIR : +ofdmdigfilttype=18 +ofdmdigfilttypebe=18 +# PAPD mode: +papdmode=1 +pacalidx2g=42 +papdepsoffset=-22 +papdendidx=58 + +# LTECX flags +#ltecxmux=0 +#ltecxpadnum=0x0102 +#ltecxfnsel=0x44 +#ltecxgcigpio=0x01 + +il0macaddr=00:90:4c:c5:12:38 +wl0id=0x431b + +deadman_to=0xffffffff +# muxenab: 0x1 for UART enable, 0x2 for GPIOs, 0x8 for JTAG, 0x10 for OOB +muxenab=0x10 +# CLDO PWM voltage settings - 0x4 - 1.1 volt +#cldo_pwm=0x4 + +#VCO freq 326.4MHz +spurconfig=0x3 + +AvVmidIQcal=0x2,0xa8 + +#SW based desense - Enable by default +#i.e using glitich statistcs as critria to change crsmin +glitch_based_crsmin=1 + +#/* EDTHRESH default value */ +edonthd20l=-62 +edoffthd20ul=-68 +#/* EDTHRESH adjust offset once ACI active */ +edonthd20l_adj=2 +edoffthd20ul_adj=2 + +# Improved Bluetooth coexistence parameters +btc_mode=1 +btc_params8=0x4e20 +btc_params1=0x7530 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43436s-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43436s-sdio.bin Binary files differnew file mode 100644 index 000000000..85dca9790 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43436s-sdio.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43436s-sdio.raspberrypi,model-zero-2-w.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43436s-sdio.raspberrypi,model-zero-2-w.bin new file mode 120000 index 000000000..81b110413 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43436s-sdio.raspberrypi,model-zero-2-w.bin @@ -0,0 +1 @@ +brcmfmac43436s-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43436s-sdio.raspberrypi,model-zero-2-w.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43436s-sdio.raspberrypi,model-zero-2-w.txt new file mode 120000 index 000000000..8d4e628b8 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43436s-sdio.raspberrypi,model-zero-2-w.txt @@ -0,0 +1 @@ +brcmfmac43436s-sdio.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43436s-sdio.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43436s-sdio.txt new file mode 100644 index 000000000..bac892656 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43436s-sdio.txt @@ -0,0 +1,67 @@ +# NVRAM file for BCM943430WLPTH +# 2.4 GHz, 20 MHz BW mode + +# The following parameter values are just placeholders, need to be updated. +manfid=0x2d0 +prodid=0x0727 +vendid=0x14e4 +devid=0x43e2 +boardtype=0x0727 +boardrev=0x1101 +boardnum=22 +macaddr=00:90:4c:c5:12:38 +sromrev=11 +boardflags=0x00404201 +boardflags3=0x08000000 +xtalfreq=37400 +nocrc=1 +ag0=255 +aa2g=1 +ccode=ALL + +pa0itssit=0x20 +extpagain2g=0 + +#PA parameters for 2.4GHz +pa2ga0=-191,6027,-713 +AvVmid_c0=0x0,0xc8 +cckpwroffset0=5 + +# PPR params +maxp2ga0=78 +txpwrbckof=6 +cckbw202gpo=0 +legofdmbw202gpo=0x66111111 +mcsbw202gpo=0x77711111 +propbw202gpo=0xdd + +# OFDM IIR : +ofdmdigfilttype=18 +ofdmdigfilttypebe=18 +# PAPD mode: +papdmode=1 +papdvalidtest=1 +pacalidx2g=45 +papdepsoffset=-30 +papdendidx=58 + +il0macaddr=00:90:4c:c5:12:38 +wl0id=0x431b + +deadman_to=0xffffffff +# muxenab: 0x1 for UART enable, 0x2 for GPIOs, 0x8 for JTAG +muxenab=0x1 +# CLDO PWM voltage settings - 0x4 - 1.1 volt +#cldo_pwm=0x4 + +#VCO freq 326.4MHz +spurconfig=0x3 + +#SW based desense - Enable by default +#i.e using glitich statistcs as critria to change crsmin +glitch_based_crsmin=1 + +# Improved Bluetooth coexistence parameters +btc_mode=1 +btc_params8=0x4e20 +btc_params1=0x7530 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.AW-CM256SM.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.AW-CM256SM.txt new file mode 100644 index 000000000..4ca98ee71 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.AW-CM256SM.txt @@ -0,0 +1,66 @@ +aa2g=1 +aa5g=1 +AvVmid_c0=0,157,1,126,1,126,1,126,1,126 +boardflags=0x00080201 +boardflags2=0x40000000 +boardflags3=0x48200100 +boardrev=0x1304 +boardtype=0x6e4 +deadman_to=481500000 +devid=0x43ab +dot11agofdmhrbw202gpo=0x1553 +ed_thresh2g=-54 +ed_thresh5g=-54 +extpagain2g=2 +extpagain5g=2 +femctrl=0 +itrsw=1 +ltecxfnsel=0x22 +ltecxgcigpio=0x32 +ltecxmux=0 +ltecxpadnum=0x0504 +macaddr=00:90:4c:c5:12:38 +manfid=0x2d0 +maxp2ga0=64 +maxp5ga0=80,82,76,77 +mcsbw202gpo=0x99355533 +mcsbw205ghpo=0x99855000 +mcsbw205glpo=0x99755000 +mcsbw205gmpo=0x9df55000 +mcsbw405ghpo=0xd9755000 +mcsbw405glpo=0xb8555000 +mcsbw405gmpo=0xed955000 +mcsbw805ghpo=0xd9555000 +mcsbw805glpo=0xc8555000 +mcsbw805gmpo=0xe9555000 +muxenab=0x10 +nocrc=1 +ofdmlrbw202gpo=0x0033 +pa2ga0=-112,6296,-662 +pa2ga1=-165,3699,-515 +pa5ga0=-143,6016,-683,-141,6013,-678,-137,5988,-670,-136,5982,-670 +pa5ga1=-161,3544,-499,-166,3543,-497,-169,3569,-497,-171,3598,-498 +pdoffset2g40ma0=10 +pdoffset40ma0=0xaaaa +pdoffset80ma0=0xaaaa +prodid=0x06e4 +rxchain=1 +rxgains2gelnagaina0=0 +rxgains2gtrelnabypa0=0 +rxgains2gtrisoa0=0 +rxgains5gelnagaina0=0 +rxgains5gtrelnabypa0=0 +rxgains5gtrisoa0=0 +sromrev=11 +swctrlmap_2g=0x00040004,0x00020002,0x00040004,0x010a02,0x1ff +swctrlmap_5g=0x00100010,0x00200020,0x00100010,0x010a02,0x2f4 +swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x000 +swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x000 +tssipos2g=1 +tssipos5g=1 +tworangetssi2g=1 +tworangetssi5g=1 +txchain=1 +vcodivmode=1 +vendid=0x14e4 +xtalfreq=37400 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.bin new file mode 120000 index 000000000..9c392080f --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.bin @@ -0,0 +1 @@ +../cypress/cyfmac43455-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.clm_blob new file mode 120000 index 000000000..0ebe01506 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac43455-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.pine64,pinebook-pro.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.pine64,pinebook-pro.txt new file mode 120000 index 000000000..4c9a175e5 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.pine64,pinebook-pro.txt @@ -0,0 +1 @@ +brcmfmac43455-sdio.AW-CM256SM.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.pine64,pinephone-pro.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.pine64,pinephone-pro.txt new file mode 120000 index 000000000..4c9a175e5 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.pine64,pinephone-pro.txt @@ -0,0 +1 @@ +brcmfmac43455-sdio.AW-CM256SM.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.pine64,quartz64-b.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.pine64,quartz64-b.txt new file mode 120000 index 000000000..4c9a175e5 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.pine64,quartz64-b.txt @@ -0,0 +1 @@ +brcmfmac43455-sdio.AW-CM256SM.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.bin new file mode 120000 index 000000000..9c392080f --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.bin @@ -0,0 +1 @@ +../cypress/cyfmac43455-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.clm_blob new file mode 120000 index 000000000..0ebe01506 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac43455-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt new file mode 120000 index 000000000..2aba486e0 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt @@ -0,0 +1 @@ +brcmfmac43455-sdio.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.bin new file mode 120000 index 000000000..9c392080f --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.bin @@ -0,0 +1 @@ +../cypress/cyfmac43455-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.clm_blob new file mode 120000 index 000000000..0ebe01506 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac43455-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt new file mode 120000 index 000000000..2aba486e0 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt @@ -0,0 +1 @@ +brcmfmac43455-sdio.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.bin new file mode 120000 index 000000000..9c392080f --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.bin @@ -0,0 +1 @@ +../cypress/cyfmac43455-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.clm_blob new file mode 120000 index 000000000..0ebe01506 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac43455-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt new file mode 120000 index 000000000..2aba486e0 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt @@ -0,0 +1 @@ +brcmfmac43455-sdio.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.bin new file mode 120000 index 000000000..9c392080f --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.bin @@ -0,0 +1 @@ +../cypress/cyfmac43455-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.clm_blob new file mode 120000 index 000000000..0ebe01506 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac43455-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt new file mode 120000 index 000000000..2aba486e0 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt @@ -0,0 +1 @@ +brcmfmac43455-sdio.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.bin new file mode 120000 index 000000000..9c392080f --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.bin @@ -0,0 +1 @@ +../cypress/cyfmac43455-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.clm_blob new file mode 120000 index 000000000..0ebe01506 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac43455-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.txt new file mode 120000 index 000000000..2aba486e0 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.txt @@ -0,0 +1 @@ +brcmfmac43455-sdio.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcmfmac43455-sdio.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.txt index 260c9299c..9a20cb7e4 100644 --- a/package/brcmfmac-firmware/src/brcmfmac43455-sdio.txt +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43455-sdio.txt @@ -21,7 +21,7 @@ btc_mode=1 # bit1 for btcoex boardflags=0x00480201 boardflags2=0x40800000 -boardflags3=0x48200100 +boardflags3=0x44200100 phycal_tempdelta=15 rxchain=1 txchain=1 @@ -90,3 +90,9 @@ txpwr5gAdcScale=1 dot11b_opts=0x3aa85 cbfilttype=1 fdsslevel_ch11=6 + +# Improved Bluetooth coexistence parameters from Cypress +btc_mode=1 +btc_params8=0x4e20 +btc_params1=0x7530 +btc_params50=0x972c diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.bin Binary files differnew file mode 100644 index 000000000..0a9df2a4b --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.clm_blob Binary files differnew file mode 100644 index 000000000..36b865265 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.clm_blob diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.bin new file mode 120000 index 000000000..a8909e119 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.bin @@ -0,0 +1 @@ +brcmfmac43456-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.clm_blob new file mode 120000 index 000000000..ec7513b10 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.clm_blob @@ -0,0 +1 @@ +brcmfmac43456-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.txt new file mode 120000 index 000000000..94cd555b2 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.txt @@ -0,0 +1 @@ +brcmfmac43456-sdio.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,400.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,400.bin new file mode 120000 index 000000000..a8909e119 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,400.bin @@ -0,0 +1 @@ +brcmfmac43456-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,400.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,400.clm_blob new file mode 120000 index 000000000..ec7513b10 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,400.clm_blob @@ -0,0 +1 @@ +brcmfmac43456-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,400.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,400.txt new file mode 120000 index 000000000..94cd555b2 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.raspberrypi,400.txt @@ -0,0 +1 @@ +brcmfmac43456-sdio.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.txt new file mode 100644 index 000000000..a34c69167 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43456-sdio.txt @@ -0,0 +1,97 @@ +# Cloned from bcm94345wlpagb_p2xx.txt +NVRAMRev=$Rev: 498373 $ +sromrev=11 +vendid=0x14e4 +devid=0x43ab +manfid=0x2d0 +prodid=0x06e4 +#macaddr=00:90:4c:c5:12:38 +macaddr=b8:27:eb:74:f2:6c +nocrc=1 +boardtype=0x6e4 +boardrev=0x1304 + +#XTAL 37.4MHz +xtalfreq=37400 + +btc_mode=1 +#------------------------------------------------------ +#boardflags: 5GHz eTR switch by default +# 2.4GHz eTR switch by default +# bit1 for btcoex +boardflags=0x00480201 +boardflags2=0x40800000 +boardflags3=0x44200100 +phycal_tempdelta=15 +rxchain=1 +txchain=1 +aa2g=1 +aa5g=1 +tssipos5g=1 +tssipos2g=1 +femctrl=0 +AvVmid_c0=0,157,1,126,1,126,1,126,1,126 +pa2ga0=-170,5896,-680 +pa2ga1=-156,4032,-547 +pa5ga0=-150,5547,-628,-150,5583,-640,-158,5608,-649,-160,5757,-673 +pa5ga1=-109,3831,-519,-88,3821,-512,-125,3731,-528,-103,3829,-516 +itrsw=1 +pdoffsetcckma0=2 +pdoffset2gperchan=0,-2,1,0,1,0,1,1,1,0,0,-1,-1,0 +pdoffset2g40ma0=16 +pdoffset40ma0=0x8888 +pdoffset80ma0=0x8888 +extpagain5g=2 +extpagain2g=2 +tworangetssi2g=1 +tworangetssi5g=1 +# LTECX flags +# WCI2 +ltecxmux=0 +ltecxpadnum=0x0504 +ltecxfnsel=0x22 +ltecxgcigpio=0x32 + +maxp2ga0=80 +ofdmlrbw202gpo=0x0022 +dot11agofdmhrbw202gpo=0x4442 +mcsbw202gpo=0x98444422 +mcsbw402gpo=0x98444422 +maxp5ga0=82,82,82,82 +mcsbw205glpo=0xb9555000 +mcsbw205gmpo=0xb9555000 +mcsbw205ghpo=0xb9555000 +mcsbw405glpo=0xb9555000 +mcsbw405gmpo=0xb9555000 +mcsbw405ghpo=0xb9555000 +mcsbw805glpo=0xb9555000 +mcsbw805gmpo=0xb9555000 +mcsbw805ghpo=0xb9555000 + +swctrlmap_2g=0x00000000,0x00000000,0x00000000,0x010000,0x3ff +swctrlmap_5g=0x00100010,0x00200020,0x00200020,0x010000,0x3fe +swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x3 +swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x3 + +vcodivmode=1 +deadman_to=481500000 + +ed_thresh2g=-54 +ed_thresh5g=-54 +eu_edthresh2g=-54 +eu_edthresh5g=-54 +ldo1=4 +rawtempsense=0x1ff +cckPwrIdxCorr=3 +cckTssiDelay=150 +ofdmTssiDelay=150 +txpwr2gAdcScale=1 +txpwr5gAdcScale=1 +dot11b_opts=0x3aa85 +cbfilttype=1 +fdsslevel_ch11=6 + +# Improved Bluetooth coexistence parameters from Cypress +btc_mode=1 +btc_params8=0x4e20 +btc_params1=0x7530 diff --git a/package/brcmfmac-firmware/src/brcmfmac4350-pcie.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4350-pcie.bin Binary files differindex 303125197..303125197 100644 --- a/package/brcmfmac-firmware/src/brcmfmac4350-pcie.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4350-pcie.bin diff --git a/package/brcmfmac-firmware/src/brcmfmac4350c2-pcie.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4350c2-pcie.bin Binary files differindex 256ded123..256ded123 100644 --- a/package/brcmfmac-firmware/src/brcmfmac4350c2-pcie.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4350c2-pcie.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4354-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4354-sdio.bin new file mode 120000 index 000000000..083453ec9 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4354-sdio.bin @@ -0,0 +1 @@ +../cypress/cyfmac4354-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4354-sdio.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac4354-sdio.clm_blob new file mode 120000 index 000000000..cf94fd7ab --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4354-sdio.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac4354-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4356-pcie.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-pcie.bin new file mode 120000 index 000000000..6cc54b431 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-pcie.bin @@ -0,0 +1 @@ +../cypress/cyfmac4356-pcie.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4356-pcie.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-pcie.clm_blob new file mode 120000 index 000000000..7a86692d1 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-pcie.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac4356-pcie.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4356-pcie.gpd-win-pocket.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-pcie.gpd-win-pocket.txt new file mode 100644 index 000000000..16254f55a --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-pcie.gpd-win-pocket.txt @@ -0,0 +1,121 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2018 Linaro Ltd +# NVRAM config file for the Ampak AP6356 4356 WiFi/BT module found on the +# GPD win / pocket handheld +aa2g=3 +aa5g=3 +aga0=2 +aga1=2 +agbg0=2 +agbg1=2 +antswitch=0 +boardflags2=0x00802000 +boardflags3=0x0000000a +boardflags=0x02400201 +boardrev=0x1101 +boardtype=0x073e +cckbw202gpo=0x0000 +cckbw20ul2gpo=0x0000 +ccode=X2 +devid=0x43a3 +dot11agduphrpo=0x0 +dot11agduplrpo=0x0 +dot11agofdmhrbw202gpo=0x6666 +extpagain2g=2 +extpagain5g=2 +femctrl=10 +macaddr=00:90:4c:c5:12:38 +manfid=0x2d0 +maxp2ga0=80 +maxp2ga1=80 +maxp5ga0=78,78,78,78 +maxp5ga1=78,78,78,78 +mcsbw202gpo=0x99644422 +mcsbw205ghpo=0xdc666663 +mcsbw205glpo=0x88766663 +mcsbw205gmpo=0xd8666663 +mcsbw402gpo=0x99644422 +mcsbw405ghpo=0xaa666663 +mcsbw405glpo=0x88666663 +mcsbw405gmpo=0x88666663 +mcsbw805ghpo=0xdd666665 +mcsbw805glpo=0xbb666665 +mcsbw805gmpo=0xcc666665 +mcslr5ghpo=0x0000 +mcslr5glpo=0x0000 +mcslr5gmpo=0x0000 +nocrc=1 +ofdmlrbw202gpo=0x0022 +otpimagesize=502 +pa2ga0=-147,6192,-705 +pa2ga1=-161,6041,-701 +pa5ga0=-194,6069,-739,-188,6137,-743,-185,5931,-725,-171,5898,-715 +pa5ga1=-190,6248,-757,-190,6275,-759,-190,6225,-757,-184,6131,-746 +paprdis=0 +pdgain2g=4 +pdgain5g=4 +pdoffset40ma0=0x0000 +pdoffset40ma1=0x0000 +pdoffset80ma0=0x0000 +pdoffset80ma1=0x0000 +pdoffsetcckma0=0x4 +pdoffsetcckma1=0x4 +phycal_tempdelta=255 +rawtempsense=0x1ff +regrev=1 +rssicorrnorm5g_c0=1,2,3,1,2,3,6,6,8,6,6,8 +rssicorrnorm5g_c1=1,2,3,2,2,2,7,7,8,7,7,8 +rssicorrnorm_c0=4,4 +rssicorrnorm_c1=4,4 +rxchain=3 +rxgains2gelnagaina0=0 +rxgains2gelnagaina1=0 +rxgains2gtrelnabypa0=0 +rxgains2gtrelnabypa1=0 +rxgains2gtrisoa0=7 +rxgains2gtrisoa1=7 +rxgains5gelnagaina0=0 +rxgains5gelnagaina1=0 +rxgains5ghelnagaina0=0 +rxgains5ghelnagaina1=0 +rxgains5ghtrelnabypa0=0 +rxgains5ghtrelnabypa1=0 +rxgains5ghtrisoa0=12 +rxgains5ghtrisoa1=11 +rxgains5gmelnagaina0=0 +rxgains5gmelnagaina1=0 +rxgains5gmtrelnabypa0=0 +rxgains5gmtrelnabypa1=0 +rxgains5gmtrisoa0=13 +rxgains5gmtrisoa1=11 +rxgains5gtrelnabypa0=0 +rxgains5gtrelnabypa1=0 +rxgains5gtrisoa0=11 +rxgains5gtrisoa1=10 +sb20in40hrpo=0x0 +sb20in40lrpo=0x0 +sb20in80and160hr5ghpo=0x0 +sb20in80and160hr5glpo=0x0 +sb20in80and160hr5gmpo=0x0 +sb20in80and160lr5ghpo=0x0 +sb20in80and160lr5glpo=0x0 +sb20in80and160lr5gmpo=0x0 +sb40and80hr5ghpo=0x0 +sb40and80hr5glpo=0x0 +sb40and80hr5gmpo=0x0 +sb40and80lr5ghpo=0x0 +sb40and80lr5glpo=0x0 +sb40and80lr5gmpo=0x0 +sromrev=11 +subband5gver=0x4 +tempoffset=255 +temps_hysteresis=15 +temps_period=15 +tempthresh=255 +tssipos2g=1 +tssipos5g=1 +tworangetssi2g=0 +tworangetssi5g=0 +txchain=3 +vendid=0x14e4 +xtalfreq=37400 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.AP6356S.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.AP6356S.txt new file mode 100644 index 000000000..4b38c26e4 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.AP6356S.txt @@ -0,0 +1,122 @@ +aa2g=3 +aa5g=3 +aga0=2 +aga1=2 +agbg0=2 +agbg1=2 +antswitch=0 +boardflags=0x02400201 +boardflags2=0x00802000 +boardflags3=0x0000010a +boardrev=0x1121 +boardtype=0x073e +cckbw202gpo=0x1222 +cckbw20ul2gpo=0x0000 +ccode=0x5855 +devid=0x43a3 +dot11agduphrpo=0x0 +dot11agduplrpo=0x0 +dot11agofdmhrbw202gpo=0x4444 +extpagain2g=2 +extpagain5g=2 +femctrl=10 +macaddr=00:90:4c:1a:10:01 +manfid=0x2d0 +maxp2ga0=72 +maxp2ga1=71 +maxp5ga0=69,70,69,68 +maxp5ga1=67,67,67,67 +mcsbw202gpo=0x9E644422 +mcsbw205ghpo=0xCC986663 +mcsbw205glpo=0xEEA86661 +mcsbw205gmpo=0xAAA86663 +mcsbw402gpo=0xE9744424 +mcsbw405ghpo=0xEEA86663 +mcsbw405glpo=0xEEB86663 +mcsbw405gmpo=0xECB86663 +mcsbw805ghpo=0xEEA86663 +mcsbw805glpo=0xEEB86663 +mcsbw805gmpo=0xEEA86663 +mcslr5ghpo=0x0000 +mcslr5glpo=0x0000 +mcslr5gmpo=0x0000 +muxenab=0x10 +nocrc=1 +ofdmlrbw202gpo=0x0022 +otpimagesize=502 +pa2ga0=-135,5769,-647 +pa2ga1=-143,6023,-677 +pa5ga0=-183,5746,-697,-172,5801,-685,-176,5707,-680,-180,5445,-659 +pa5ga1=-186,5543,-669,-193,5506,-675,-210,5282,-661,-199,5367,-665 +paprdis=0 +pdgain2g=4 +pdgain5g=4 +pdoffset40ma0=0x0000 +pdoffset40ma1=0x0000 +pdoffset80ma0=0x0000 +pdoffset80ma1=0x0000 +pdoffsetcckma0=0x4 +pdoffsetcckma1=0x4 +phycal_tempdelta=255 +rawtempsense=0x1ff +regrev=1 +rssicorrnorm5g_c0=1,2,3,1,2,3,6,6,8,6,6,8 +rssicorrnorm5g_c1=1,2,3,2,2,2,7,7,8,7,7,8 +rssicorrnorm_c0=4,4 +rssicorrnorm_c1=4,4 +rxchain=3 +rxgains2gelnagaina0=0 +rxgains2gelnagaina1=0 +rxgains2gtrelnabypa0=0 +rxgains2gtrelnabypa1=0 +rxgains2gtrisoa0=7 +rxgains2gtrisoa1=7 +rxgains5gelnagaina0=0 +rxgains5gelnagaina1=0 +rxgains5ghelnagaina0=0 +rxgains5ghelnagaina1=0 +rxgains5ghtrelnabypa0=0 +rxgains5ghtrelnabypa1=0 +rxgains5ghtrisoa0=12 +rxgains5ghtrisoa1=11 +rxgains5gmelnagaina0=0 +rxgains5gmelnagaina1=0 +rxgains5gmtrelnabypa0=0 +rxgains5gmtrelnabypa1=0 +rxgains5gmtrisoa0=13 +rxgains5gmtrisoa1=11 +rxgains5gtrelnabypa0=0 +rxgains5gtrelnabypa1=0 +rxgains5gtrisoa0=11 +rxgains5gtrisoa1=10 +sb20in40hrpo=0x0 +sb20in40lrpo=0x0 +sb20in80and160hr5ghpo=0x0 +sb20in80and160hr5glpo=0x0 +sb20in80and160hr5gmpo=0x0 +sb20in80and160lr5ghpo=0x0 +sb20in80and160lr5glpo=0x0 +sb20in80and160lr5gmpo=0x0 +sb40and80hr5ghpo=0x0 +sb40and80hr5glpo=0x0 +sb40and80hr5gmpo=0x0 +sb40and80lr5ghpo=0x0 +sb40and80lr5glpo=0x0 +sb40and80lr5gmpo=0x0 +sromrev=11 +subband5gver=0x4 +swctrlmap_2g=0x00001040,0x00004010,0x00004010,0x200010,0xff +swctrlmap_5g=0x00000202,0x00000101,0x00000101,0x000000,0x47 +swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x000 +swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x000 +tempoffset=255 +temps_hysteresis=15 +temps_period=15 +tempthresh=255 +tssipos2g=1 +tssipos5g=1 +tworangetssi2g=0 +tworangetssi5g=0 +txchain=3 +vendid=0x14e4 +xtalfreq=37400 diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.bin new file mode 120000 index 000000000..53115e0cc --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.bin @@ -0,0 +1 @@ +../cypress/cyfmac4356-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.clm_blob new file mode 120000 index 000000000..bac41e636 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac4356-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.firefly,firefly-rk3399.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.firefly,firefly-rk3399.txt new file mode 120000 index 000000000..dffd0158f --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.firefly,firefly-rk3399.txt @@ -0,0 +1 @@ +brcmfmac4356-sdio.AP6356S.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.khadas,vim2.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.khadas,vim2.txt new file mode 120000 index 000000000..dffd0158f --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.khadas,vim2.txt @@ -0,0 +1 @@ +brcmfmac4356-sdio.AP6356S.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.txt new file mode 100644 index 000000000..fca63053f --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.txt @@ -0,0 +1,126 @@ +# Sample variables file for BCM94356Z NGFF 22x30mm iPA, iLNA board with PCIe for production package +NVRAMRev=$Rev: 492104 $ +#4356 chip = 4354 A2 chip +sromrev=11 +boardrev=0x1102 +boardtype=0x073e +boardflags=0x02400201 +#0x2000 enable 2G spur WAR +boardflags2=0x00802000 +boardflags3=0x0000000a +#boardflags3 0x00000100 /* to read swctrlmap from nvram*/ +#define BFL3_5G_SPUR_WAR 0x00080000 /* enable spur WAR in 5G band */ +#define BFL3_AvVim 0x40000000 /* load AvVim from nvram */ +macaddr=00:90:4c:1a:10:01 +ccode=0x5854 +regrev=205 +antswitch=0 +pdgain5g=4 +pdgain2g=4 +tworangetssi2g=0 +tworangetssi5g=0 +paprdis=0 +femctrl=10 +vendid=0x14e4 +devid=0x43ec +manfid=0x2d0 +#prodid=0x052e +nocrc=1 +otpimagesize=502 +xtalfreq=37400 +rxgains2gelnagaina0=0 +rxgains2gtrisoa0=7 +rxgains2gtrelnabypa0=0 +rxgains5gelnagaina0=0 +rxgains5gtrisoa0=11 +rxgains5gtrelnabypa0=0 +rxgains5gmelnagaina0=0 +rxgains5gmtrisoa0=13 +rxgains5gmtrelnabypa0=0 +rxgains5ghelnagaina0=0 +rxgains5ghtrisoa0=12 +rxgains5ghtrelnabypa0=0 +rxgains2gelnagaina1=0 +rxgains2gtrisoa1=7 +rxgains2gtrelnabypa1=0 +rxgains5gelnagaina1=0 +rxgains5gtrisoa1=10 +rxgains5gtrelnabypa1=0 +rxgains5gmelnagaina1=0 +rxgains5gmtrisoa1=11 +rxgains5gmtrelnabypa1=0 +rxgains5ghelnagaina1=0 +rxgains5ghtrisoa1=11 +rxgains5ghtrelnabypa1=0 +rxchain=3 +txchain=3 +aa2g=3 +aa5g=3 +agbg0=2 +agbg1=2 +aga0=2 +aga1=2 +tssipos2g=1 +extpagain2g=2 +tssipos5g=1 +extpagain5g=2 +tempthresh=255 +tempoffset=255 +rawtempsense=0x1ff +pa2ga0=-147,6192,-705 +pa2ga1=-161,6041,-701 +pa5ga0=-194,6069,-739,-188,6137,-743,-185,5931,-725,-171,5898,-715 +pa5ga1=-190,6248,-757,-190,6275,-759,-190,6225,-757,-184,6131,-746 +subband5gver=0x4 +pdoffsetcckma0=0x4 +pdoffsetcckma1=0x4 +pdoffset40ma0=0x0000 +pdoffset80ma0=0x0000 +pdoffset40ma1=0x0000 +pdoffset80ma1=0x0000 +maxp2ga0=76 +maxp5ga0=74,74,74,74 +maxp2ga1=76 +maxp5ga1=74,74,74,74 +cckbw202gpo=0x0000 +cckbw20ul2gpo=0x0000 +mcsbw202gpo=0x99644422 +mcsbw402gpo=0x99644422 +dot11agofdmhrbw202gpo=0x6666 +ofdmlrbw202gpo=0x0022 +mcsbw205glpo=0x88766663 +mcsbw405glpo=0x88666663 +mcsbw805glpo=0xbb666665 +mcsbw205gmpo=0xd8666663 +mcsbw405gmpo=0x88666663 +mcsbw805gmpo=0xcc666665 +mcsbw205ghpo=0xdc666663 +mcsbw405ghpo=0xaa666663 +mcsbw805ghpo=0xdd666665 +mcslr5glpo=0x0000 +mcslr5gmpo=0x0000 +mcslr5ghpo=0x0000 +sb20in40hrpo=0x0 +sb20in80and160hr5glpo=0x0 +sb40and80hr5glpo=0x0 +sb20in80and160hr5gmpo=0x0 +sb40and80hr5gmpo=0x0 +sb20in80and160hr5ghpo=0x0 +sb40and80hr5ghpo=0x0 +sb20in40lrpo=0x0 +sb20in80and160lr5glpo=0x0 +sb40and80lr5glpo=0x0 +sb20in80and160lr5gmpo=0x0 +sb40and80lr5gmpo=0x0 +sb20in80and160lr5ghpo=0x0 +sb40and80lr5ghpo=0x0 +dot11agduphrpo=0x0 +dot11agduplrpo=0x0 +phycal_tempdelta=255 +temps_period=15 +temps_hysteresis=15 +rssicorrnorm_c0=4,4 +rssicorrnorm_c1=4,4 +rssicorrnorm5g_c0=1,2,3,1,2,3,6,6,8,6,6,8 +rssicorrnorm5g_c1=1,2,3,2,2,2,7,7,8,7,7,8 + diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.vamrs,rock960.txt b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.vamrs,rock960.txt new file mode 120000 index 000000000..dffd0158f --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4356-sdio.vamrs,rock960.txt @@ -0,0 +1 @@ +brcmfmac4356-sdio.AP6356S.txt
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcmfmac43569.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43569.bin Binary files differindex 8323536a7..8323536a7 100644 --- a/package/brcmfmac-firmware/src/brcmfmac43569.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43569.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43570-pcie.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43570-pcie.bin new file mode 120000 index 000000000..b807c17a4 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43570-pcie.bin @@ -0,0 +1 @@ +../cypress/cyfmac43570-pcie.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac43570-pcie.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac43570-pcie.clm_blob new file mode 120000 index 000000000..3290c6c10 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43570-pcie.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac43570-pcie.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4358-pcie.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4358-pcie.bin Binary files differnew file mode 100644 index 000000000..17bdcaf98 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4358-pcie.bin diff --git a/package/brcmfmac-firmware/src/brcmfmac43602-pcie.ap.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43602-pcie.ap.bin Binary files differindex b4a589d5a..b4a589d5a 100644 --- a/package/brcmfmac-firmware/src/brcmfmac43602-pcie.ap.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43602-pcie.ap.bin diff --git a/package/brcmfmac-firmware/src/brcmfmac43602-pcie.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac43602-pcie.bin Binary files differindex 488b4c04a..488b4c04a 100644 --- a/package/brcmfmac-firmware/src/brcmfmac43602-pcie.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac43602-pcie.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4366b-pcie.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4366b-pcie.bin Binary files differnew file mode 100644 index 000000000..7df6d1805 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4366b-pcie.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4366c-pcie.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4366c-pcie.bin Binary files differnew file mode 100644 index 000000000..fcd19ac1b --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4366c-pcie.bin diff --git a/package/brcmfmac-firmware/src/brcmfmac4371-pcie.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4371-pcie.bin Binary files differindex 8b3a51b91..8b3a51b91 100644 --- a/package/brcmfmac-firmware/src/brcmfmac4371-pcie.bin +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4371-pcie.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4373-sdio.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4373-sdio.bin new file mode 120000 index 000000000..fb5b9c59f --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4373-sdio.bin @@ -0,0 +1 @@ +../cypress/cyfmac4373-sdio.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4373-sdio.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac4373-sdio.clm_blob new file mode 120000 index 000000000..be67c89aa --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4373-sdio.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac4373-sdio.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac4373.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac4373.bin Binary files differnew file mode 100644 index 000000000..e85d3fd79 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac4373.bin diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac54591-pcie.bin b/package/brcmfmac-firmware/src/brcm/brcmfmac54591-pcie.bin new file mode 120000 index 000000000..01e331714 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac54591-pcie.bin @@ -0,0 +1 @@ +../cypress/cyfmac54591-pcie.bin
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcm/brcmfmac54591-pcie.clm_blob b/package/brcmfmac-firmware/src/brcm/brcmfmac54591-pcie.clm_blob new file mode 120000 index 000000000..30efcb474 --- /dev/null +++ b/package/brcmfmac-firmware/src/brcm/brcmfmac54591-pcie.clm_blob @@ -0,0 +1 @@ +../cypress/cyfmac54591-pcie.clm_blob
\ No newline at end of file diff --git a/package/brcmfmac-firmware/src/brcmfmac43241b0-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac43241b0-sdio.bin Binary files differdeleted file mode 100644 index 729b89421..000000000 --- a/package/brcmfmac-firmware/src/brcmfmac43241b0-sdio.bin +++ /dev/null diff --git a/package/brcmfmac-firmware/src/brcmfmac43340-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac43340-sdio.bin Binary files differdeleted file mode 100644 index 368b0a150..000000000 --- a/package/brcmfmac-firmware/src/brcmfmac43340-sdio.bin +++ /dev/null diff --git a/package/brcmfmac-firmware/src/brcmfmac43362-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac43362-sdio.bin Binary files differdeleted file mode 100644 index c11dfb2a6..000000000 --- a/package/brcmfmac-firmware/src/brcmfmac43362-sdio.bin +++ /dev/null diff --git a/package/brcmfmac-firmware/src/brcmfmac4339-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac4339-sdio.bin Binary files differdeleted file mode 100644 index 8d1b3819a..000000000 --- a/package/brcmfmac-firmware/src/brcmfmac4339-sdio.bin +++ /dev/null diff --git a/package/brcmfmac-firmware/src/brcmfmac43430-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac43430-sdio.bin Binary files differdeleted file mode 100644 index 4b2945eac..000000000 --- a/package/brcmfmac-firmware/src/brcmfmac43430-sdio.bin +++ /dev/null diff --git a/package/brcmfmac-firmware/src/brcmfmac43455-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac43455-sdio.bin Binary files differdeleted file mode 100644 index 94f2add70..000000000 --- a/package/brcmfmac-firmware/src/brcmfmac43455-sdio.bin +++ /dev/null diff --git a/package/brcmfmac-firmware/src/brcmfmac43455-sdio.clm_blob b/package/brcmfmac-firmware/src/brcmfmac43455-sdio.clm_blob Binary files differdeleted file mode 100644 index 3b9b5bdc1..000000000 --- a/package/brcmfmac-firmware/src/brcmfmac43455-sdio.clm_blob +++ /dev/null diff --git a/package/brcmfmac-firmware/src/brcmfmac4354-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac4354-sdio.bin Binary files differdeleted file mode 100644 index 48afad606..000000000 --- a/package/brcmfmac-firmware/src/brcmfmac4354-sdio.bin +++ /dev/null diff --git a/package/brcmfmac-firmware/src/brcmfmac4356-pcie.bin b/package/brcmfmac-firmware/src/brcmfmac4356-pcie.bin Binary files differdeleted file mode 100644 index 9ed885214..000000000 --- a/package/brcmfmac-firmware/src/brcmfmac4356-pcie.bin +++ /dev/null diff --git a/package/brcmfmac-firmware/src/brcmfmac43570-pcie.bin b/package/brcmfmac-firmware/src/brcmfmac43570-pcie.bin Binary files differdeleted file mode 100644 index c0c82d005..000000000 --- a/package/brcmfmac-firmware/src/brcmfmac43570-pcie.bin +++ /dev/null diff --git a/package/brcmfmac-firmware/src/brcmfmac4366b-pcie.bin b/package/brcmfmac-firmware/src/brcmfmac4366b-pcie.bin Binary files differdeleted file mode 100644 index 6fc932ed9..000000000 --- a/package/brcmfmac-firmware/src/brcmfmac4366b-pcie.bin +++ /dev/null diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac43012-sdio.bin b/package/brcmfmac-firmware/src/cypress/cyfmac43012-sdio.bin Binary files differnew file mode 100644 index 000000000..7a78e15cb --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac43012-sdio.bin diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac43012-sdio.clm_blob b/package/brcmfmac-firmware/src/cypress/cyfmac43012-sdio.clm_blob Binary files differnew file mode 100644 index 000000000..59f09f6a7 --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac43012-sdio.clm_blob diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac43340-sdio.bin b/package/brcmfmac-firmware/src/cypress/cyfmac43340-sdio.bin Binary files differnew file mode 100644 index 000000000..dcf894beb --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac43340-sdio.bin diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac43362-sdio.bin b/package/brcmfmac-firmware/src/cypress/cyfmac43362-sdio.bin Binary files differnew file mode 100644 index 000000000..51d64d63e --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac43362-sdio.bin diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac4339-sdio.bin b/package/brcmfmac-firmware/src/cypress/cyfmac4339-sdio.bin Binary files differnew file mode 100644 index 000000000..43e86ca2e --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac4339-sdio.bin diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac43430-sdio.bin b/package/brcmfmac-firmware/src/cypress/cyfmac43430-sdio.bin Binary files differnew file mode 100644 index 000000000..7a35578b9 --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac43430-sdio.bin diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac43430-sdio.clm_blob b/package/brcmfmac-firmware/src/cypress/cyfmac43430-sdio.clm_blob Binary files differnew file mode 100644 index 000000000..d93449f28 --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac43430-sdio.clm_blob diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac43455-sdio-minimal.bin b/package/brcmfmac-firmware/src/cypress/cyfmac43455-sdio-minimal.bin Binary files differnew file mode 100644 index 000000000..cc9768bde --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac43455-sdio-minimal.bin diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac43455-sdio-standard.bin b/package/brcmfmac-firmware/src/cypress/cyfmac43455-sdio-standard.bin Binary files differnew file mode 100644 index 000000000..1e7f61272 --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac43455-sdio-standard.bin diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac43455-sdio.bin b/package/brcmfmac-firmware/src/cypress/cyfmac43455-sdio.bin Binary files differnew file mode 100644 index 000000000..1e7f61272 --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac43455-sdio.bin diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac43455-sdio.clm_blob b/package/brcmfmac-firmware/src/cypress/cyfmac43455-sdio.clm_blob Binary files differnew file mode 100644 index 000000000..c905a503e --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac43455-sdio.clm_blob diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac4354-sdio.bin b/package/brcmfmac-firmware/src/cypress/cyfmac4354-sdio.bin Binary files differnew file mode 100644 index 000000000..1e123ba6c --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac4354-sdio.bin diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac4354-sdio.clm_blob b/package/brcmfmac-firmware/src/cypress/cyfmac4354-sdio.clm_blob Binary files differnew file mode 100644 index 000000000..86d66e367 --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac4354-sdio.clm_blob diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac4356-pcie.bin b/package/brcmfmac-firmware/src/cypress/cyfmac4356-pcie.bin Binary files differnew file mode 100644 index 000000000..8904edc24 --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac4356-pcie.bin diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac4356-pcie.clm_blob b/package/brcmfmac-firmware/src/cypress/cyfmac4356-pcie.clm_blob Binary files differnew file mode 100644 index 000000000..c6ff1701f --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac4356-pcie.clm_blob diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac4356-sdio.bin b/package/brcmfmac-firmware/src/cypress/cyfmac4356-sdio.bin Binary files differnew file mode 100644 index 000000000..63896b607 --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac4356-sdio.bin diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac4356-sdio.clm_blob b/package/brcmfmac-firmware/src/cypress/cyfmac4356-sdio.clm_blob Binary files differnew file mode 100644 index 000000000..35ce3751b --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac4356-sdio.clm_blob diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac43570-pcie.bin b/package/brcmfmac-firmware/src/cypress/cyfmac43570-pcie.bin Binary files differnew file mode 100644 index 000000000..97898b548 --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac43570-pcie.bin diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac43570-pcie.clm_blob b/package/brcmfmac-firmware/src/cypress/cyfmac43570-pcie.clm_blob Binary files differnew file mode 100644 index 000000000..f14fd9244 --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac43570-pcie.clm_blob diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac4373-sdio.bin b/package/brcmfmac-firmware/src/cypress/cyfmac4373-sdio.bin Binary files differnew file mode 100644 index 000000000..00ecde003 --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac4373-sdio.bin diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac4373-sdio.clm_blob b/package/brcmfmac-firmware/src/cypress/cyfmac4373-sdio.clm_blob Binary files differnew file mode 100644 index 000000000..9d0299772 --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac4373-sdio.clm_blob diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac54591-pcie.bin b/package/brcmfmac-firmware/src/cypress/cyfmac54591-pcie.bin Binary files differnew file mode 100644 index 000000000..70ef9f9e0 --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac54591-pcie.bin diff --git a/package/brcmfmac-firmware/src/cypress/cyfmac54591-pcie.clm_blob b/package/brcmfmac-firmware/src/cypress/cyfmac54591-pcie.clm_blob Binary files differnew file mode 100644 index 000000000..61f0d562a --- /dev/null +++ b/package/brcmfmac-firmware/src/cypress/cyfmac54591-pcie.clm_blob diff --git a/package/btrfs-progs/Makefile b/package/btrfs-progs/Makefile new file mode 100644 index 000000000..585b02574 --- /dev/null +++ b/package/btrfs-progs/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:= btrfs-progs +PKG_VERSION:= 6.1.3 +PKG_RELEASE:= 1 +PKG_HASH:= d37fc9ec4fa5778b20aa7548fe706eb3a300338c1473318271ae54024dac7167 +PKG_DESCR:= btrfs progs +PKG_DEPENDS:= zstd +PKG_BUILDDEP:= zstd +PKG_KDEPENDS:= btrfs-fs +PKG_SECTION:= sys/fs +PKG_SITES:= https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/ + +DISTFILES:= $(PKG_NAME)-v$(PKG_VERSION).tar.xz +WRKDIST= $(WRKDIR)/$(PKG_NAME)-v$(PKG_VERSION) + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,BTRFS_PROGS,btrfs-progs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIGURE_ARGS+= --disable-backtrace \ + --disable-documentation \ + --disable-python \ + --disable-libudev + +btrfs-progs-install: + $(INSTALL_DIR) $(IDIR_BTRFS_PROGS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libbtrfs*.so* \ + $(IDIR_BTRFS_PROGS)/usr/lib + $(INSTALL_DIR) $(IDIR_BTRFS_PROGS)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/* \ + $(IDIR_BTRFS_PROGS)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual index 80554efd4..48c6212e0 100644 --- a/package/busybox/Config.in.manual +++ b/package/busybox/Config.in.manual @@ -10,219 +10,6 @@ config ADK_PACKAGE_BUSYBOX WWW: http://www.busybox.net -choice -prompt "Choose predefined set of applets" -depends on ADK_PACKAGE_BUSYBOX -default ADK_PACKAGE_BUSYBOX_MINIMAL if !ADK_TARGET_WITH_MMU - -config ADK_PACKAGE_BUSYBOX_DEFAULT - bool "activate standard set of applets" - select BUSYBOX_AWK - select BUSYBOX_BASENAME - select BUSYBOX_CLEAR - select BUSYBOX_CMP - select BUSYBOX_CAT - select BUSYBOX_CAL - select BUSYBOX_CHGRP - select BUSYBOX_CHMOD - select BUSYBOX_CHOWN - select BUSYBOX_CHROOT - select BUSYBOX_CP - select BUSYBOX_CUT - select BUSYBOX_DATE - select BUSYBOX_DD - select BUSYBOX_DF - select BUSYBOX_DIFF - select BUSYBOX_DIRNAME - select BUSYBOX_DU - select BUSYBOX_ECHO - select BUSYBOX_EGREP if !BUSYBOX_DISABLE_GREP - select BUSYBOX_ENV - select BUSYBOX_EXPR - select BUSYBOX_FDISK if !BUSYBOX_DISABLE_FDISK - select BUSYBOX_FIND if !BUSYBOX_DISABLE_FIND - select BUSYBOX_GREP if !BUSYBOX_DISABLE_GREP - select BUSYBOX_GROUPS - select BUSYBOX_GUNZIP - select BUSYBOX_GZIP - select BUSYBOX_HALT - select BUSYBOX_HEAD - select BUSYBOX_ID - select BUSYBOX_INIT if ADK_RUNTIME_INIT_SYSV - select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS - select BUSYBOX_LN - select BUSYBOX_LOSETUP - select BUSYBOX_LS - select BUSYBOX_MD5SUM - select BUSYBOX_MKDIR - select BUSYBOX_MKFIFO - select BUSYBOX_MKNOD - select BUSYBOX_MKTEMP - select BUSYBOX_MV - select BUSYBOX_NC - select BUSYBOX_PASSWD - select BUSYBOX_PRINTF - select BUSYBOX_PWD - select BUSYBOX_RDATE if !BUSYBOX_DISABLE_RDATE - select BUSYBOX_READLINK - select BUSYBOX_RESET - select BUSYBOX_RFKILL if !BUSYBOX_DISABLE_RFKILL - select BUSYBOX_RM - select BUSYBOX_RMDIR - select BUSYBOX_RUN_PARTS - select BUSYBOX_SED if !BUSYBOX_DISABLE_SED - select BUSYBOX_SEQ - select BUSYBOX_SLEEP - select BUSYBOX_SORT - select BUSYBOX_FEATURE_SORT_BIG - select BUSYBOX_STAT - select BUSYBOX_STRINGS - select BUSYBOX_SU - select BUSYBOX_SYNC - select BUSYBOX_TAIL - select BUSYBOX_FEATURE_FANCY_TAIL - select BUSYBOX_TAR if !BUSYBOX_DISABLE_TAR - select BUSYBOX_TEE - select BUSYBOX_TEST - select BUSYBOX_TIME - select BUSYBOX_TOUCH - select BUSYBOX_TOP - select BUSYBOX_TR - select BUSYBOX_TRUE - select BUSYBOX_UNAME - select BUSYBOX_VI - select BUSYBOX_WC - select BUSYBOX_WHOAMI - select BUSYBOX_WHO - select BUSYBOX_WHICH - select BUSYBOX_XARGS - -config ADK_PACKAGE_BUSYBOX_MINIMAL - bool "activate minimal set of applets" - select BUSYBOX_AWK - select BUSYBOX_BASENAME - select BUSYBOX_CAT - select BUSYBOX_CHGRP - select BUSYBOX_CHMOD - select BUSYBOX_CHOWN - select BUSYBOX_CHROOT - select BUSYBOX_CMP - select BUSYBOX_CP - select BUSYBOX_CUT - select BUSYBOX_DATE - select BUSYBOX_DD - select BUSYBOX_DF - select BUSYBOX_DIRNAME - select BUSYBOX_DIFF - select BUSYBOX_DU - select BUSYBOX_ECHO - select BUSYBOX_ENV - select BUSYBOX_EXPR - select BUSYBOX_FIND if !BUSYBOX_DISABLE_FIND - select BUSYBOX_GREP if !BUSYBOX_DISABLE_GREP - select BUSYBOX_HALT - select BUSYBOX_HEAD - select BUSYBOX_ID - select BUSYBOX_INIT - select BUSYBOX_LN - select BUSYBOX_LS - select BUSYBOX_MKDIR - select BUSYBOX_MV - select BUSYBOX_PRINTF - select BUSYBOX_PWD - select BUSYBOX_RM - select BUSYBOX_READLINK - select BUSYBOX_RUN_PARTS - select BUSYBOX_SED if !BUSYBOX_DISABLE_SED - select BUSYBOX_SORT - select BUSYBOX_TAIL - select BUSYBOX_FEATURE_FANCY_TAIL - select BUSYBOX_TEE - select BUSYBOX_TEST - select BUSYBOX_TOUCH - select BUSYBOX_TRUE - select BUSYBOX_UNAME - select BUSYBOX_VI - select BUSYBOX_WHICH - select BUSYBOX_WHOAMI - -config ADK_PACKAGE_BUSYBOX_ALL - bool "activate all applets" - select BUSYBOX_AWK - select BUSYBOX_BASENAME - select BUSYBOX_CAL - select BUSYBOX_CAT - select BUSYBOX_CHGRP - select BUSYBOX_CHMOD - select BUSYBOX_CHOWN - select BUSYBOX_CHROOT - select BUSYBOX_CLEAR - select BUSYBOX_CMP - select BUSYBOX_CP - select BUSYBOX_CUT - select BUSYBOX_DATE - select BUSYBOX_DD - select BUSYBOX_DESKTOP - select BUSYBOX_DF - select BUSYBOX_DIFF if !BUSYBOX_DISABLE_DIFF - select BUSYBOX_DIRNAME - select BUSYBOX_DU - select BUSYBOX_ECHO - select BUSYBOX_EGREP if !BUSYBOX_DISABLE_GREP - select BUSYBOX_ENV - select BUSYBOX_EXPR - select BUSYBOX_FDISK if !BUSYBOX_DISABLE_FDISK - select BUSYBOX_FIND if !BUSYBOX_DISABLE_FIND - select BUSYBOX_FEATURE_UTMP - select BUSYBOX_GREP if !BUSYBOX_DISABLE_GREP - select BUSYBOX_GROUPS - select BUSYBOX_GUNZIP - select BUSYBOX_GZIP - select BUSYBOX_HALT - select BUSYBOX_HEAD - select BUSYBOX_ID - select BUSYBOX_INIT if ADK_RUNTIME_INIT_SYSV - select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS - select BUSYBOX_LN - select BUSYBOX_LS - select BUSYBOX_MD5SUM - select BUSYBOX_MKDIR - select BUSYBOX_MKFIFO - select BUSYBOX_MKNOD - select BUSYBOX_MKTEMP - select BUSYBOX_MV - select BUSYBOX_PRINTF - select BUSYBOX_PWD - select BUSYBOX_READLINK - select BUSYBOX_RESET - select BUSYBOX_RUN_PARTS - select BUSYBOX_RM - select BUSYBOX_SED if !BUSYBOX_DISABLE_SED - select BUSYBOX_SLEEP - select BUSYBOX_SORT - select BUSYBOX_STAT - select BUSYBOX_STRINGS - select BUSYBOX_SU - select BUSYBOX_SYNC - select BUSYBOX_TAIL - select BUSYBOX_TAR if !BUSYBOX_DISABLE_TAR - select BUSYBOX_TEE - select BUSYBOX_FEATURE_FANCY_TAIL - select BUSYBOX_TRUE - select BUSYBOX_TEST - select BUSYBOX_TIME - select BUSYBOX_TOUCH - select BUSYBOX_TR - select BUSYBOX_UNAME - select BUSYBOX_VI - select BUSYBOX_WC - select BUSYBOX_WHICH - select BUSYBOX_WHO - select BUSYBOX_WHOAMI - select BUSYBOX_XARGS - -endchoice - config ADK_PACKAGE_BUSYBOX_HIDE bool "hide packages provided by busybox applets" depends on ADK_PACKAGE_BUSYBOX diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 5aad49e2f..78b76ead5 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.33.0 +PKG_VERSION:= 1.36.1 PKG_RELEASE:= 1 -PKG_HASH:= d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd +PKG_HASH:= b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314 PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base/apps PKG_URL:= http://www.busybox.net/ @@ -69,7 +69,6 @@ do-build: do-install: PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} install $(MAKE_TRACE) $(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/ -ifeq ($(ADK_RUNTIME_INIT_SYSTEMD),) ifeq ($(BUSYBOX_IFUP),y) $(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/init.d ifeq ($(ADK_RUNTIME_WAIT_FOR_ETHERNET),y) @@ -78,7 +77,6 @@ else $(INSTALL_BIN) ./files/network $(IDIR_BUSYBOX)/etc/init.d/network endif endif -endif ifeq ($(ADK_DEBUG),y) ${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \ $(IDIR_BUSYBOX)/bin/busybox diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index 6f19502f4..d5cbed6a5 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -371,7 +371,7 @@ config BUSYBOX_STATIC config BUSYBOX_PIE bool "Build position independent executable" - default n + default y if !ADK_TARGET_WITH_MMU && ADK_TARGET_BINFMT_ELF depends on !BUSYBOX_STATIC help Hardened code option. PIE binaries are loaded at a different @@ -382,7 +382,7 @@ config BUSYBOX_PIE config BUSYBOX_NOMMU bool "Force NOMMU build" - default n + default y if !ADK_TARGET_WITH_MMU help Busybox tries to detect whether architecture it is being built against supports MMU or not. If this detection fails, diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in index f2788041a..fe68eeb18 100644 --- a/package/busybox/config/archival/Config.in +++ b/package/busybox/config/archival/Config.in @@ -204,6 +204,20 @@ config BUSYBOX_FEATURE_CPIO_P depends on BUSYBOX_FEATURE_CPIO_O help Passthrough mode. Rarely used. + +config BUSYBOX_FEATURE_CPIO_IGNORE_DEVNO + bool "Support --ignore-devno like GNU cpio" + default y + depends on BUSYBOX_FEATURE_CPIO_O && BUSYBOX_LONG_OPTS + help + Optionally ignore device numbers when creating archives. + +config BUSYBOX_FEATURE_CPIO_RENUMBER_INODES + bool "Support --renumber-inodes like GNU cpio" + default y + depends on BUSYBOX_FEATURE_CPIO_O && BUSYBOX_LONG_OPTS + help + Optionally renumber inodes when creating archives. config BUSYBOX_DPKG bool "dpkg (43 kb)" default y diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index 6293694de..00d646599 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -6,6 +6,47 @@ menu "Coreutils" +config BUSYBOX_FEATURE_VERBOSE + bool "Support verbose options (usually -v) for various applets" + default y + help + Enable cp -v, rm -v and similar messages. + Also enables long option (--verbose) if it exists. + Without this option, -v is accepted but ignored. + +comment "Common options for date and touch" + +config BUSYBOX_FEATURE_TIMEZONE + bool "Allow timezone in dates" + default y + depends on BUSYBOX_DESKTOP + help + Permit the use of timezones when parsing user-provided data + strings, e.g. '1996-04-09 12:45:00 -0500'. + + This requires support for the '%z' extension to strptime() which + may not be available in all implementations. + +comment "Common options for cp and mv" + depends on BUSYBOX_CP || BUSYBOX_MV + +config BUSYBOX_FEATURE_PRESERVE_HARDLINKS + bool "Preserve hard links" + default y + depends on BUSYBOX_CP || BUSYBOX_MV + help + Allow cp and mv to preserve hard links. + +comment "Common options for df, du, ls" + depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS + +config BUSYBOX_FEATURE_HUMAN_READABLE + bool "Support human readable output (example 13k, 23M, 235G)" + default y + depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS + help + Allow df, du, and ls to have human readable output. + config BUSYBOX_BASENAME bool "basename (438 bytes)" default y @@ -63,8 +104,10 @@ config BUSYBOX_CHROOT config BUSYBOX_CKSUM bool "cksum (4.1 kb)" default y - help - cksum is used to calculate the CRC32 checksum of a file. + +config BUSYBOX_CRC32 + bool "crc32 (4.1 kb)" + default y config BUSYBOX_COMM bool "comm (4.2 kb)" default y @@ -95,6 +138,13 @@ config BUSYBOX_CUT help cut is used to print selected parts of lines from each file to stdout. + +config BUSYBOX_FEATURE_CUT_REGEX + bool "cut -F" + default y + depends on BUSYBOX_CUT + help + Allow regex based delimiters. config BUSYBOX_DATE bool "date (7 kb)" default y @@ -191,6 +241,26 @@ config BUSYBOX_FEATURE_DF_FANCY -a Show all filesystems -i Inodes -B <SIZE> Blocksize + +config BUSYBOX_FEATURE_SKIP_ROOTFS + bool "Skip rootfs in mount table" + default y + depends on BUSYBOX_DF + help + Ignore rootfs entry in mount table. + + In Linux, kernel has a special filesystem, rootfs, which is initially + mounted on /. It contains initramfs data, if kernel is configured + to have one. Usually, another file system is mounted over / early + in boot process, and therefore most tools which manipulate + mount table, such as df, will skip rootfs entry. + + However, some systems do not mount anything on /. + If you need to configure busybox for one of these systems, + you may find it useful to turn this option off to make df show + initramfs statistics. + + Otherwise, choose Y. config BUSYBOX_DIRNAME bool "dirname (329 bytes)" default y @@ -583,7 +653,7 @@ config BUSYBOX_SORT sort is used to sort lines of text in specified files. config BUSYBOX_FEATURE_SORT_BIG - bool "Full SuSv3 compliant sort (support -ktcbdfiogM)" + bool "Full SuSv3 compliant sort (support -ktcbdfioghM)" default y depends on BUSYBOX_SORT help @@ -739,16 +809,8 @@ config BUSYBOX_TOUCH touch is used to create or change the access and/or modification timestamp of specified files. -config BUSYBOX_FEATURE_TOUCH_NODEREF - bool "Add support for -h" - default y - depends on BUSYBOX_TOUCH - help - Enable touch to have the -h option. - This requires libc support for lutimes() function. - config BUSYBOX_FEATURE_TOUCH_SUSV3 - bool "Add support for SUSV3 features (-d -t -r)" + bool "Add support for SUSV3 features (-a -d -m -t -r)" default y depends on BUSYBOX_TOUCH help @@ -789,6 +851,11 @@ config BUSYBOX_TRUNCATE help truncate truncates files to a given size. If a file does not exist, it is created unless told otherwise. +config BUSYBOX_TSORT + bool "tsort (0.7 kb)" + default y + help + tsort performs a topological sort. config BUSYBOX_TTY bool "tty (3.6 kb)" default y @@ -895,34 +962,4 @@ config BUSYBOX_YES yes is used to repeatedly output a specific string, or the default string 'y'. -comment "Common options" - -config BUSYBOX_FEATURE_VERBOSE - bool "Support verbose options (usually -v) for various applets" - default y - help - Enable cp -v, rm -v and similar messages. - Also enables long option (--verbose) if it exists. - Without this option, -v is accepted but ignored. - -comment "Common options for cp and mv" - depends on BUSYBOX_CP || BUSYBOX_MV - -config BUSYBOX_FEATURE_PRESERVE_HARDLINKS - bool "Preserve hard links" - default y - depends on BUSYBOX_CP || BUSYBOX_MV - help - Allow cp and mv to preserve hard links. - -comment "Common options for df, du, ls" - depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS - -config BUSYBOX_FEATURE_HUMAN_READABLE - bool "Support human readable output (example 13k, 23M, 235G)" - default y - depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS - help - Allow df, du, and ls to have human readable output. - endmenu diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in index 3e48e371d..2858f60d1 100644 --- a/package/busybox/config/editors/Config.in +++ b/package/busybox/config/editors/Config.in @@ -110,6 +110,14 @@ config BUSYBOX_FEATURE_VI_COLON Enable a limited set of colon commands. This does not provide an "ex" mode. +config BUSYBOX_FEATURE_VI_COLON_EXPAND + bool "Expand \"%\" and \"#\" in colon commands" + default y + depends on BUSYBOX_FEATURE_VI_COLON + help + Expand the special characters \"%\" (current filename) + and \"#\" (alternate filename) in colon commands. + config BUSYBOX_FEATURE_VI_YANKMARK bool "Enable yank/put commands and mark cmds" default y @@ -217,6 +225,14 @@ config BUSYBOX_FEATURE_VI_UNDO_QUEUE_MAX Unless you want more (or less) frequent "undo points" while typing, you should probably leave this unchanged. +config BUSYBOX_FEATURE_VI_VERBOSE_STATUS + bool "Enable verbose status reporting" + default y + depends on BUSYBOX_VI + help + Enable more verbose reporting of the results of yank, change, + delete, undo and substitution commands. + config BUSYBOX_FEATURE_ALLOW_EXEC bool "Allow vi and awk to execute shell commands" default y diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in index 8a81483e2..d4aa403a5 100644 --- a/package/busybox/config/findutils/Config.in +++ b/package/busybox/config/findutils/Config.in @@ -23,21 +23,53 @@ config BUSYBOX_FEATURE_FIND_PRINT0 interpreted by other programs. config BUSYBOX_FEATURE_FIND_MTIME - bool "Enable -mtime: modified time matching" + bool "Enable -mtime: modification time matching" default y depends on BUSYBOX_FIND help Allow searching based on the modification time of files, in days. +config BUSYBOX_FEATURE_FIND_ATIME + bool "Enable -atime: access time matching" + default y + depends on BUSYBOX_FEATURE_FIND_MTIME + help + Allow searching based on the access time of + files, in days. + +config BUSYBOX_FEATURE_FIND_CTIME + bool "Enable -ctime: status change timestamp matching" + default y + depends on BUSYBOX_FEATURE_FIND_MTIME + help + Allow searching based on the status change timestamp of + files, in days. + config BUSYBOX_FEATURE_FIND_MMIN - bool "Enable -mmin: modified time matching by minutes" + bool "Enable -mmin: modification time matching by minutes" default y depends on BUSYBOX_FIND help Allow searching based on the modification time of files, in minutes. +config BUSYBOX_FEATURE_FIND_AMIN + bool "Enable -amin: access time matching by minutes" + default y + depends on BUSYBOX_FEATURE_FIND_MMIN + help + Allow searching based on the access time of + files, in minutes. + +config BUSYBOX_FEATURE_FIND_CMIN + bool "Enable -cmin: status change timestamp matching by minutes" + default y + depends on BUSYBOX_FEATURE_FIND_MMIN + help + Allow searching based on the status change timestamp of + files, in minutes. + config BUSYBOX_FEATURE_FIND_PERM bool "Enable -perm: permissions matching" default y @@ -79,6 +111,13 @@ config BUSYBOX_FEATURE_FIND_INUM default y depends on BUSYBOX_FIND +config BUSYBOX_FEATURE_FIND_SAMEFILE + bool "Enable -samefile: reference file matching" + default y + depends on BUSYBOX_FIND + help + Support the 'find -samefile' option for searching by a reference file. + config BUSYBOX_FEATURE_FIND_EXEC bool "Enable -exec: execute commands" default y diff --git a/package/busybox/config/klibc-utils/Config.in b/package/busybox/config/klibc-utils/Config.in index fdaddc397..f2ff057fb 100644 --- a/package/busybox/config/klibc-utils/Config.in +++ b/package/busybox/config/klibc-utils/Config.in @@ -13,7 +13,7 @@ config BUSYBOX_MINIPS Alias to "ps". config BUSYBOX_NUKE bool "nuke (2.9 kb)" - default y + default n # off by default: too "accidentally destructive" help Alias to "rm -rf". config BUSYBOX_RESUME diff --git a/package/busybox/config/libbb/Config.in b/package/busybox/config/libbb/Config.in index 1dd61c62e..66c135ec6 100644 --- a/package/busybox/config/libbb/Config.in +++ b/package/busybox/config/libbb/Config.in @@ -98,51 +98,118 @@ config BUSYBOX_MD5_SMALL default 1 # all "fast or small" options default to small range 0 3 help - Trade binary size versus speed for the md5sum algorithm. + Trade binary size versus speed for the md5 algorithm. Approximate values running uClibc and hashing linux-2.4.4.tar.bz2 were: - value user times (sec) text size (386) - 0 (fastest) 1.1 6144 - 1 1.4 5392 - 2 3.0 5088 - 3 (smallest) 5.1 4912 + value user times (sec) text size (386) + 0 (fastest) 1.1 6144 + 1 1.4 5392 + 2 3.0 5088 + 3 (smallest) 5.1 4912 + +config BUSYBOX_SHA1_SMALL + int "SHA1: Trade bytes for speed (0:fast, 3:slow)" + default 3 # all "fast or small" options default to small + range 0 3 + help + Trade binary size versus speed for the sha1 algorithm. + With FEATURE_COPYBUF_KB=64: + throughput MB/s size of sha1_process_block64 + value 486 x86-64 486 x86-64 + 0 440 485 3481 3502 + 1 265 265 641 696 + 2,3 220 210 342 364 + +config BUSYBOX_SHA1_HWACCEL + bool "SHA1: Use hardware accelerated instructions if possible" + default y + help + On x86, this adds ~590 bytes of code. Throughput + is about twice as fast as fully-unrolled generic code. + +config BUSYBOX_SHA256_HWACCEL + bool "SHA256: Use hardware accelerated instructions if possible" + default y + help + On x86, this adds ~1k bytes of code. config BUSYBOX_SHA3_SMALL int "SHA3: Trade bytes for speed (0:fast, 1:slow)" default 1 # all "fast or small" options default to small range 0 1 help - Trade binary size versus speed for the sha3sum algorithm. + Trade binary size versus speed for the sha3 algorithm. SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate): 64-bit x86: +270 bytes of code, 45% faster 32-bit x86: +450 bytes of code, 75% faster -config BUSYBOX_FEATURE_FAST_TOP - bool "Faster /proc scanning code (+100 bytes)" - default n # all "fast or small" options default to small +config BUSYBOX_FEATURE_NON_POSIX_CP + bool "Non-POSIX, but safer, copying to special nodes" + default y help - This option makes top and ps ~20% faster (or 20% less CPU hungry), - but code size is slightly bigger. + With this option, "cp file symlink" will delete symlink + and create a regular file. This does not conform to POSIX, + but prevents a symlink attack. + Similarly, "cp file device" will not send file's data + to the device. (To do that, use "cat file >device") -config BUSYBOX_FEATURE_ETC_NETWORKS - bool "Support /etc/networks" +config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE + bool "Give more precise messages when copy fails (cp, mv etc)" default n help - Enable support for network names in /etc/networks. This is - a rarely used feature which allows you to use names - instead of IP/mask pairs in route command. + Error messages with this feature enabled: -config BUSYBOX_FEATURE_ETC_SERVICES - bool "Consult /etc/services even for well-known ports" - default n + $ cp file /does_not_exist/file + cp: cannot create '/does_not_exist/file': Path does not exist + $ cp file /vmlinuz/file + cp: cannot stat '/vmlinuz/file': Path has non-directory component + + If this feature is not enabled, they will be, respectively: + + cp: cannot create '/does_not_exist/file': No such file or directory + cp: cannot stat '/vmlinuz/file': Not a directory + + This will cost you ~60 bytes. + +config BUSYBOX_FEATURE_USE_SENDFILE + bool "Use sendfile system call" + default y + help + When enabled, busybox will use the kernel sendfile() function + instead of read/write loops to copy data between file descriptors + (for example, cp command does this a lot). + If sendfile() doesn't work, copying code falls back to read/write + loop. sendfile() was originally implemented for faster I/O + from files to sockets, but since Linux 2.6.33 it was extended + to work for many more file types. + +config BUSYBOX_FEATURE_COPYBUF_KB + int "Copy buffer size, in kilobytes" + range 1 1024 + default 4 + help + Size of buffer used by cp, mv, install, wget etc. + Buffers which are 4 kb or less will be allocated on stack. + Bigger buffers will be allocated with mmap, with fallback to 4 kb + stack buffer if mmap fails. + +config BUSYBOX_MONOTONIC_SYSCALL + bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" + default y + help + Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring + time intervals (time, ping, traceroute etc need this). + Probably requires Linux 2.6+. If not selected, gettimeofday + will be used instead (which gives wrong results if date/time + is reset). + +config BUSYBOX_IOCTL_HEX2STR_ERROR + bool "Use ioctl names rather than hex values in error messages" + default y help - Look up e.g. "telnet" and "http" in /etc/services file - instead of assuming ports 23 and 80. - This is almost never necessary (everybody uses standard ports), - and it makes sense to avoid reading this file. - If you disable this option, in the cases where port is explicitly - specified as a service name (e.g. "telnet HOST PORTNAME"), - it will still be looked up in /etc/services. + Use ioctl names rather than hex values in error messages + (e.g. VT_DISALLOCATE rather than 0x5608). If disabled this + saves about 1400 bytes. config BUSYBOX_FEATURE_EDITING bool "Command line editing" @@ -359,95 +426,24 @@ config BUSYBOX_UNICODE_PRESERVE_BROKEN at shell prompt will list file named 0xff (single char name with char value 255), not file named '?'. -config BUSYBOX_FEATURE_NON_POSIX_CP - bool "Non-POSIX, but safer, copying to special nodes" - default y - help - With this option, "cp file symlink" will delete symlink - and create a regular file. This does not conform to POSIX, - but prevents a symlink attack. - Similarly, "cp file device" will not send file's data - to the device. (To do that, use "cat file >device") - -config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE - bool "Give more precise messages when copy fails (cp, mv etc)" - default n - help - Error messages with this feature enabled: - - $ cp file /does_not_exist/file - cp: cannot create '/does_not_exist/file': Path does not exist - $ cp file /vmlinuz/file - cp: cannot stat '/vmlinuz/file': Path has non-directory component - - If this feature is not enabled, they will be, respectively: - - cp: cannot create '/does_not_exist/file': No such file or directory - cp: cannot stat '/vmlinuz/file': Not a directory - - This will cost you ~60 bytes. - -config BUSYBOX_FEATURE_USE_SENDFILE - bool "Use sendfile system call" - default y - help - When enabled, busybox will use the kernel sendfile() function - instead of read/write loops to copy data between file descriptors - (for example, cp command does this a lot). - If sendfile() doesn't work, copying code falls back to read/write - loop. sendfile() was originally implemented for faster I/O - from files to sockets, but since Linux 2.6.33 it was extended - to work for many more file types. - -config BUSYBOX_FEATURE_COPYBUF_KB - int "Copy buffer size, in kilobytes" - range 1 1024 - default 4 - help - Size of buffer used by cp, mv, install, wget etc. - Buffers which are 4 kb or less will be allocated on stack. - Bigger buffers will be allocated with mmap, with fallback to 4 kb - stack buffer if mmap fails. - -config BUSYBOX_FEATURE_SKIP_ROOTFS - bool "Skip rootfs in mount table" - default y +choice + prompt "Use LOOP_CONFIGURE for losetup and loop mounts" + default BUSYBOX_TRY_LOOP_CONFIGURE help - Ignore rootfs entry in mount table. + LOOP_CONFIGURE is added to Linux 5.8 + https://lwn.net/Articles/820408/ + This allows userspace to completely setup a loop device with a single + ioctl, removing the in-between state where the device can be partially + configured - eg the loop device has a backing file associated with it, + but is reading from the wrong offset. - In Linux, kernel has a special filesystem, rootfs, which is initially - mounted on /. It contains initramfs data, if kernel is configured - to have one. Usually, another file system is mounted over / early - in boot process, and therefore most tools which manipulate - mount table, such as df, will skip rootfs entry. +config BUSYBOX_LOOP_CONFIGURE + bool "use LOOP_CONFIGURE, needs kernel >= 5.8" - However, some systems do not mount anything on /. - If you need to configure busybox for one of these systems, - you may find it useful to turn this option off to make df show - initramfs statistics. +config BUSYBOX_NO_LOOP_CONFIGURE + bool "use LOOP_SET_FD + LOOP_SET_STATUS" - Otherwise, choose Y. +config BUSYBOX_TRY_LOOP_CONFIGURE + bool "try LOOP_CONFIGURE, fall back to LOOP_SET_FD + LOOP_SET_STATUS" -config BUSYBOX_MONOTONIC_SYSCALL - bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" - default y - help - Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring - time intervals (time, ping, traceroute etc need this). - Probably requires Linux 2.6+. If not selected, gettimeofday - will be used instead (which gives wrong results if date/time - is reset). - -config BUSYBOX_IOCTL_HEX2STR_ERROR - bool "Use ioctl names rather than hex values in error messages" - default y - help - Use ioctl names rather than hex values in error messages - (e.g. VT_DISALLOCATE rather than 0x5608). If disabled this - saves about 1400 bytes. - -config BUSYBOX_FEATURE_HWIB - bool "Support infiniband HW" - default y - help - Support for printing infiniband addresses in network applets. +endchoice diff --git a/package/busybox/config/mailutils/Config.in b/package/busybox/config/mailutils/Config.in index 1b793ef7c..29890dcbd 100644 --- a/package/busybox/config/mailutils/Config.in +++ b/package/busybox/config/mailutils/Config.in @@ -1,6 +1,13 @@ # DO NOT EDIT. This file is generated from Config.src menu "Mail Utilities" +config BUSYBOX_FEATURE_MIME_CHARSET + string "Default charset" + default "us-ascii" + depends on BUSYBOX_MAKEMIME || BUSYBOX_REFORMIME || BUSYBOX_SENDMAIL + help + Default charset of the message. + config BUSYBOX_MAKEMIME bool "makemime (5.4 kb)" default y @@ -41,11 +48,4 @@ config BUSYBOX_SENDMAIL help Barebones sendmail. -config BUSYBOX_FEATURE_MIME_CHARSET - string "Default charset" - default "us-ascii" - depends on BUSYBOX_MAKEMIME || BUSYBOX_REFORMIME || BUSYBOX_SENDMAIL - help - Default charset of the message. - endmenu diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index 549042515..82aeff339 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -12,6 +12,12 @@ config BUSYBOX_ADJTIMEX help Adjtimex reads and optionally sets adjustment parameters for the Linux clock adjustment algorithm. +config BUSYBOX_ASCII + bool "ascii" + default y + help + Print ascii table. + config BUSYBOX_BBCONFIG bool "bbconfig (9.7 kb)" default n @@ -693,6 +699,13 @@ config BUSYBOX_RX default y help Receive files using the Xmodem protocol. +config BUSYBOX_SEEDRNG + bool "seedrng (1.3 kb)" + default n + help + Seed the kernel RNG from seed files, meant to be called + once during startup, once during shutdown, and optionally + at some periodic interval in between. config BUSYBOX_SETFATTR bool "setfattr (3.7 kb)" default y @@ -716,6 +729,11 @@ config BUSYBOX_TIME The time command runs the specified program with the given arguments. When the command finishes, time writes a message to standard output giving timing statistics about this program run. +config BUSYBOX_TREE + bool "tree (0.6 kb)" + default y + help + List files and directories in a tree structure. config BUSYBOX_TS bool "ts (450 bytes)" default y @@ -783,4 +801,19 @@ config BUSYBOX_WATCHDOG certain amount of time, the watchdog device assumes the system has hung, and will cause the hardware to reboot. +config BUSYBOX_FEATURE_WATCHDOG_OPEN_TWICE + bool "Open watchdog device twice, closing it gracefully in between" + depends on BUSYBOX_WATCHDOG + default n # this behavior was essentially a hack for a broken driver + help + When enabled, the watchdog device is opened and then immediately + magic-closed, before being opened a second time. This may be necessary + for some watchdog devices, but can cause spurious warnings in the + kernel log if the nowayout feature is enabled. If this workaround + is really needed for you machine to work properly, consider whether + it should be fixed in the kernel driver instead. Even when disabled, + the behaviour is easily emulated with a "printf 'V' > /dev/watchdog" + immediately before starting the busybox watchdog daemon. Say n unless + you know that you absolutely need this. + endmenu diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 4832a82d0..341092334 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -47,6 +47,32 @@ config BUSYBOX_VERBOSE_RESOLUTION_ERRORS "can't resolve 'hostname.com'" and want to know more. This may increase size of your executable a bit. +config BUSYBOX_FEATURE_ETC_NETWORKS + bool "Support /etc/networks" + default n + help + Enable support for network names in /etc/networks. This is + a rarely used feature which allows you to use names + instead of IP/mask pairs in route command. + +config BUSYBOX_FEATURE_ETC_SERVICES + bool "Consult /etc/services even for well-known ports" + default n + help + Look up e.g. "telnet" and "http" in /etc/services file + instead of assuming ports 23 and 80. + This is almost never necessary (everybody uses standard ports), + and it makes sense to avoid reading this file. + If you disable this option, in the cases where port is explicitly + specified as a service name (e.g. "telnet HOST PORTNAME"), + it will still be looked up in /etc/services. + +config BUSYBOX_FEATURE_HWIB + bool "Support infiniband HW" + default y + help + Support for printing infiniband addresses in network applets. + config BUSYBOX_FEATURE_TLS_SHA1 bool "In TLS code, support ciphers which use deprecated SHA1" depends on BUSYBOX_TLS @@ -173,6 +199,12 @@ config BUSYBOX_HTTPD help HTTP server. +config BUSYBOX_FEATURE_HTTPD_PORT_DEFAULT + int "Default port" + default 80 + range 1 65535 + depends on BUSYBOX_HTTPD + config BUSYBOX_FEATURE_HTTPD_RANGES bool "Support 'Ranges:' header" default y @@ -939,6 +971,12 @@ config BUSYBOX_FEATURE_TELNETD_STANDALONE help Selecting this will make telnetd able to run standalone. +config BUSYBOX_FEATURE_TELNETD_PORT_DEFAULT + int "Default port" + default 23 + range 1 65535 + depends on BUSYBOX_FEATURE_TELNETD_STANDALONE + config BUSYBOX_FEATURE_TELNETD_INETD_WAIT bool "Support -w SEC option (inetd wait mode)" default y @@ -1086,6 +1124,13 @@ config BUSYBOX_FEATURE_WGET_STATUSBAR default y depends on BUSYBOX_WGET +config BUSYBOX_FEATURE_WGET_FTP + bool "Enable FTP protocol (+1k)" + default y + depends on BUSYBOX_WGET + help + To support FTPS, enable FEATURE_WGET_HTTPS as well. + config BUSYBOX_FEATURE_WGET_AUTHENTICATION bool "Enable HTTP authentication" default y @@ -1114,6 +1159,7 @@ config BUSYBOX_FEATURE_WGET_HTTPS select BUSYBOX_TLS help wget will use internal TLS code to connect to https:// URLs. + It also enables FTPS support, but it's not well tested yet. Note: On NOMMU machines, ssl_helper applet should be available in the $PATH for this to work. Make sure to select that applet. @@ -1202,7 +1248,8 @@ source package/busybox/config/networking/udhcp/Config.in config BUSYBOX_IFUPDOWN_UDHCPC_CMD_OPTIONS string "ifup udhcpc command line options" - default "-R -n" + default "-R -n" if BUSYBOX_NOMMU + default "-R -n -b" depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN help Command line options to pass to udhcpc from ifup. diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in index 52f1ef5b2..111e6b5f5 100644 --- a/package/busybox/config/networking/udhcp/Config.in +++ b/package/busybox/config/networking/udhcp/Config.in @@ -93,12 +93,17 @@ config BUSYBOX_FEATURE_UDHCPC_SANITIZEOPT config BUSYBOX_UDHCPC_DEFAULT_SCRIPT string "Absolute path to config script" default "/usr/share/udhcpc/default.script" - depends on BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 + depends on BUSYBOX_UDHCPC help This script is called after udhcpc receives an answer. See examples/udhcp for a working example. Normally it is safe to leave this untouched. +config BUSYBOX_UDHCPC6_DEFAULT_SCRIPT + string "Absolute path to config script for IPv6" + default "/usr/share/udhcpc/default6.script" + depends on BUSYBOX_UDHCPC6 + # udhcpc6 config is inserted here: config BUSYBOX_UDHCPC6 bool "udhcpc6 (21 kb)" @@ -142,6 +147,14 @@ config BUSYBOX_FEATURE_UDHCPC6_RFC5970 comment "Common options for DHCP applets" depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 || BUSYBOX_DHCPRELAY +config BUSYBOX_UDHCPC_DEFAULT_INTERFACE + string "Default interface name" + default "eth0" + depends on BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 + help + The interface that will be used if no other interface is + specified on the commandline. + config BUSYBOX_FEATURE_UDHCP_PORT bool "Enable '-P port' option for udhcpd and udhcpc" default n diff --git a/package/busybox/config/procps/Config.in b/package/busybox/config/procps/Config.in index 56086da2c..0c1733b9f 100644 --- a/package/busybox/config/procps/Config.in +++ b/package/busybox/config/procps/Config.in @@ -6,6 +6,21 @@ menu "Process Utilities" +config BUSYBOX_FEATURE_FAST_TOP + bool "Faster /proc scanning code (+100 bytes)" + default n # all "fast or small" options default to small + help + This option makes top and ps ~20% faster (or 20% less CPU hungry), + but code size is slightly bigger. + +config BUSYBOX_FEATURE_SHOW_THREADS + bool "Support thread display in ps/pstree/top" + default y + depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE + help + Enables the ps -T option, showing of threads in pstree, + and 'h' command in top. + config BUSYBOX_FREE bool "free (3.1 kb)" default y @@ -259,12 +274,4 @@ config BUSYBOX_WATCH watch is used to execute a program periodically, showing output to the screen. -config BUSYBOX_FEATURE_SHOW_THREADS - bool "Support thread display in ps/pstree/top" - default y - depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE - help - Enables the ps -T option, showing of threads in pstree, - and 'h' command in top. - endmenu diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in index 0ce917dc3..6ffa3b2b0 100644 --- a/package/busybox/config/shell/Config.in +++ b/package/busybox/config/shell/Config.in @@ -88,7 +88,7 @@ config BUSYBOX_SHELL_ASH config BUSYBOX_ASH bool "ash (78 kb)" - default n + default y depends on !BUSYBOX_NOMMU select BUSYBOX_SHELL_ASH help @@ -201,6 +201,11 @@ 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 @@ -299,11 +304,6 @@ config BUSYBOX_HUSH_BRACE_EXPANSION help Enable {abc,def} extension. -config BUSYBOX_HUSH_LINENO_VAR - bool "$LINENO variable" - default y - depends on BUSYBOX_HUSH_BASH_COMPAT - config BUSYBOX_HUSH_BASH_SOURCE_CURDIR bool "'source' and '.' builtins search current directory after $PATH" default n # do not encourage non-standard behavior @@ -311,6 +311,11 @@ config BUSYBOX_HUSH_BASH_SOURCE_CURDIR help This is not compliant with standards. Avoid if possible. +config BUSYBOX_HUSH_LINENO_VAR + bool "$LINENO variable (bashism)" + default y + depends on BUSYBOX_SHELL_HUSH + config BUSYBOX_HUSH_INTERACTIVE bool "Interactive mode" default y diff --git a/package/busybox/files/ntpd.init b/package/busybox/files/ntpd.init index 15c460dcc..0f578574a 100644 --- a/package/busybox/files/ntpd.init +++ b/package/busybox/files/ntpd.init @@ -1,6 +1,6 @@ #!/bin/sh #PKG busybox -#INIT 60 +#INIT 45 . /etc/rc.conf case $1 in diff --git a/package/busybox/patches/002-hwclock-musl.patch b/package/busybox/patches/002-hwclock-musl.patch new file mode 100644 index 000000000..a5b9ff50d --- /dev/null +++ b/package/busybox/patches/002-hwclock-musl.patch @@ -0,0 +1,31 @@ +diff -Nur busybox-1.36.1.orig/util-linux/hwclock.c busybox-1.36.1/util-linux/hwclock.c +--- busybox-1.36.1.orig/util-linux/hwclock.c 2021-01-01 11:52:27.000000000 +0100 ++++ busybox-1.36.1/util-linux/hwclock.c 2024-04-10 11:18:06.569673535 +0200 +@@ -136,10 +136,24 @@ + * because "it's deprecated by POSIX, therefore it's fine + * if we gratuitously break stuff" :( + */ +-#if !defined(SYS_settimeofday) && defined(SYS_settimeofday_time32) +-# define SYS_settimeofday SYS_settimeofday_time32 +-#endif ++# if !defined(SYS_settimeofday) && defined(SYS_settimeofday_time32) ++# define SYS_settimeofday SYS_settimeofday_time32 ++# endif ++# if defined(SYS_settimeofday) + int ret = syscall(SYS_settimeofday, NULL, tz); ++# else ++ /* Some new architectures have neither settimeofday nor ++ * settimeofday_time32, and the whole kernel timezone handling appears ++ * to have been dropped due to some oddities in the API. See: ++ * ++ * - glibc's commit c3f9aef063 ("Use clock_settime to implement settimeofday.") ++ * - https://github.com/systemd/systemd/issues/13305 ++ * - https://inbox.sourceware.org/libc-alpha/cb015d0d1d29e4b948c7118c5b12ff2bed83a6ec.1561421042.git.alistair.francis@wdc.com/ ++ * ++ * So instead just silently drop these calls. ++ */ ++ int ret = -ENOSYS; ++# endif + #else + int ret = settimeofday(NULL, tz); + #endif diff --git a/package/busybox/patches/009-disable-Oz.patch b/package/busybox/patches/009-disable-Oz.patch new file mode 100644 index 000000000..11830586f --- /dev/null +++ b/package/busybox/patches/009-disable-Oz.patch @@ -0,0 +1,20 @@ +diff -Nur busybox-1.36.1.orig/Makefile.flags busybox-1.36.1/Makefile.flags +--- busybox-1.36.1.orig/Makefile.flags 2023-01-03 15:14:43.000000000 +0100 ++++ busybox-1.36.1/Makefile.flags 2023-07-30 15:24:31.983113101 +0200 +@@ -87,14 +87,14 @@ + #CFLAGS += $(call cc-option,-Wconversion,) + + ifneq ($(CONFIG_DEBUG),y) +-CFLAGS += $(call cc-option,-Oz,$(call cc-option,-Os,$(call cc-option,-O2,))) ++CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,)) + else + CFLAGS += $(call cc-option,-g,) + #CFLAGS += "-D_FORTIFY_SOURCE=2" + ifeq ($(CONFIG_DEBUG_PESSIMIZE),y) + CFLAGS += $(call cc-option,-O0,) + else +-CFLAGS += $(call cc-option,-Oz,$(call cc-option,-Os,$(call cc-option,-O2,))) ++CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,)) + endif + endif + ifeq ($(CONFIG_DEBUG_SANITIZE),y) diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index d5e0fb860..723d1abcc 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/Makefile @@ -31,7 +31,7 @@ $(eval $(call PKG_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN $(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBZ2},${PKGSC_LIBBZ2},${PKG_OPTS})) HOST_STYLE:= manual -HOST_MAKE_FILE:= Makefile +HOST_MAKE_FILE:= Makefile-libbz2_so ifneq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) MAKE_FILE:= Makefile-libbz2_so @@ -50,8 +50,13 @@ host-build: PREFIX=${HOST_WRKINST}/usr ${HOST_ALL_TARGET}) bzip2-hostinstall: + ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/include + $(CP) ${WRKBUILD}/bzlib.h ${STAGING_HOST_DIR}/usr/include + ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/lib + $(CP) ${WRKBUILD}/libbz2.so* ${STAGING_HOST_DIR}/usr/lib + (cd ${STAGING_HOST_DIR}/usr/lib; ln -sf libbz2.so.1.0.8 libbz2.so) ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/bin - $(INSTALL_BIN) ${WRKBUILD}/bzip2 ${STAGING_HOST_DIR}/usr/bin/bzip2 + $(INSTALL_BIN) ${WRKBUILD}/bzip2-shared ${STAGING_HOST_DIR}/usr/bin/bzip2 do-install: ${INSTALL_DIR} $(STAGING_TARGET_DIR)/usr/include diff --git a/package/bzr/Makefile b/package/bzr/Makefile deleted file mode 100644 index 53f7d00fa..000000000 --- a/package/bzr/Makefile +++ /dev/null @@ -1,41 +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:= bzr -PKG_VERSION:= 2.6.0 -PKG_RELEASE:= 1 -PKG_HASH:= 0994797182eb828867eee81cccc79480bd2946c99304266bc427b902cf91dab0 -PKG_DESCR:= source code management system -PKG_SECTION:= dev/scm -PKG_BUILDDEP:= python2 -PKG_DEPENDS:= python2 -PKG_URL:= http://bazaar.canonical.com/en/ -PKG_SITES:= https://launchpad.net/bzr/2.6/2.6.0/+download/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -PKG_HOST_DEPENDS:= !darwin - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,BZR,bzr,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= manual -BUILD_STYLE:= manual -INSTALL_STYLE:= manual - -include $(ADK_TOPDIR)/mk/python.mk - -do-build: - cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix=$(WRKINST)/usr build_ext --allow-python-fallback - -do-install: - $(INSTALL_DIR) $(IDIR_BZR)/usr/lib/python$(PYTHON_VERSION)/site-packages - $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \ - $(IDIR_BZR)/usr/lib/python$(PYTHON_VERSION)/site-packages - $(INSTALL_DIR) $(IDIR_BZR)/usr/bin - $(INSTALL_BIN) $(WRKBUILD)/bzr $(IDIR_BZR)/usr/bin - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/c-ares/Makefile b/package/c-ares/Makefile index 49200cabc..6da3e7c7a 100644 --- a/package/c-ares/Makefile +++ b/package/c-ares/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= c-ares -PKG_VERSION:= 1.16.1 +PKG_VERSION:= 1.18.1 PKG_RELEASE:= 1 -PKG_HASH:= d08312d0ecc3bd48eee0a4cc0d2137c9f194e0a28de2028928c0f6cae85f86ce +PKG_HASH:= 1a7d52a8a84a9fbffb1be9133c0f6e17217d91ea5a6fa61f6b4729cda78ebbcf PKG_DESCR:= asynchronous dns library PKG_SECTION:= libs/net -PKG_URL:= http://c-ares.haxx.se -PKG_SITES:= http://c-ares.haxx.se/download/ +PKG_URL:= https://c-ares.org +PKG_SITES:= https://c-ares.org/download/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile index 3ee99af45..9316f738e 100644 --- a/package/ca-certificates/Makefile +++ b/package/ca-certificates/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ca-certificates -PKG_VERSION:= 20160104 +PKG_VERSION:= 20230311 PKG_RELEASE:= 1 -PKG_HASH:= 09eb770122e23260316120c0cbbddc8a1d33e7147210ce44e146084d5d5abcdd +PKG_HASH:= 83de934afa186e279d1ed08ea0d73f5cf43a6fbfb5f00874b6db3711c64576f3 PKG_DESCR:= collection of common ca certificates PKG_SECTION:= app/crypto PKG_URL:= http://packages.debian.org/sid/ca-certificates -PKG_SITES:= http://http.debian.net/debian/pool/main/c/ca-certificates/ +PKG_SITES:= https://snapshot.debian.org/archive/debian/20230317T205011Z/pool/main/c/ca-certificates/ DISTFILES:= $(PKG_NAME)_$(PKG_VERSION).tar.xz WRKDIST= $(WRKDIR)/ca-certificates diff --git a/package/ca-certificates/patches/patch-Makefile b/package/ca-certificates/patches/patch-Makefile index 24e9fab9c..ca81984e3 100644 --- a/package/ca-certificates/patches/patch-Makefile +++ b/package/ca-certificates/patches/patch-Makefile @@ -1,6 +1,5 @@ - fix for the completely empty DESTDIR ---- ca-certificates-20090814.orig/Makefile 2009-07-08 23:18:57.000000000 +0200 -+++ ca-certificates-20090814/Makefile 2009-08-22 20:36:42.614405912 +0200 +--- ca-certificates.orig/Makefile 2021-01-19 09:22:26.000000000 +0100 ++++ ca-certificates/Makefile 2023-05-26 05:48:59.304310295 +0200 @@ -17,7 +17,7 @@ clean: install: diff --git a/package/ca-certificates/patches/patch-mozilla_Makefile b/package/ca-certificates/patches/patch-mozilla_Makefile new file mode 100644 index 000000000..768f26373 --- /dev/null +++ b/package/ca-certificates/patches/patch-mozilla_Makefile @@ -0,0 +1,11 @@ +--- ca-certificates.orig/mozilla/Makefile 2022-01-11 14:34:24.000000000 +0100 ++++ ca-certificates/mozilla/Makefile 2023-09-22 10:25:22.731768501 +0200 +@@ -3,7 +3,7 @@ + # + + all: +- python3 certdata2pem.py ++ /bin/python3 certdata2pem.py + + clean: + -rm -f *.crt diff --git a/package/ca-certificates/patches/patch-sbin_Makefile b/package/ca-certificates/patches/patch-sbin_Makefile deleted file mode 100644 index ff59e4856..000000000 --- a/package/ca-certificates/patches/patch-sbin_Makefile +++ /dev/null @@ -1,9 +0,0 @@ - fix for the completely empty DESTDIR ---- ca-certificates-20090814.orig/sbin/Makefile 2007-02-02 07:23:19.000000000 +0100 -+++ ca-certificates-20090814/sbin/Makefile 2009-08-22 20:37:17.581921717 +0200 -@@ -8,4 +8,5 @@ all: - clean: - - install: -+ mkdir -p $(DESTDIR)/usr/sbin - install -m755 update-ca-certificates $(DESTDIR)/usr/sbin/ diff --git a/package/ccid/Makefile b/package/ccid/Makefile index e7750ba84..a4943716c 100644 --- a/package/ccid/Makefile +++ b/package/ccid/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ccid -PKG_VERSION:= 1.4.17 +PKG_VERSION:= 1.5.5 PKG_RELEASE:= 1 -PKG_HASH:= ccdab8a9bc1ad288242d5f9ef399405e9cb96fb09caadb43e3649cbaba84c451 +PKG_HASH:= 194708f75fe369d45dd7c15e8b3e8a7db8b49cfc5557574ca2a2e76ef12ca0ca PKG_DESCR:= generic usb ccid and iccd driver PKG_SECTION:= app/crypto PKG_BUILDDEP:= pcsc-lite -PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html -PKG_SITES:= http://distfiles.openadk.org/ +PKG_URL:= https://ccid.apdu.fr/ +PKG_SITES:= https://ccid.apdu.fr/files/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -19,14 +19,15 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,CCID,ccid,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --enable-twinserial +CONFIGURE_ARGS+= --disable-twinserial \ + --enable-libusb ccid-install: $(INSTALL_DIR) $(IDIR_CCID)/etc/reader.conf.d $(INSTALL_DIR) $(IDIR_CCID)/usr/lib/pcsc/drivers $(INSTALL_DATA) ./files/gemalto.conf \ $(IDIR_CCID)/etc/reader.conf.d - $(CP) $(WRKINST)/usr/lib/pcsc/drivers/* \ + -$(CP) $(WRKINST)/usr/lib/pcsc/drivers/* \ $(IDIR_CCID)/usr/lib/pcsc/drivers include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ccid/patches/patch-configure b/package/ccid/patches/patch-configure deleted file mode 100644 index 7235e9ef8..000000000 --- a/package/ccid/patches/patch-configure +++ /dev/null @@ -1,21 +0,0 @@ ---- ccid-1.4.4.orig/configure 2011-05-13 11:19:09.000000000 +0200 -+++ ccid-1.4.4/configure 2011-07-28 10:54:49.000000000 +0200 -@@ -12207,17 +12207,8 @@ done - # Select OS specific versions of source files. - - --BUNDLE_HOST=`uname | sed -e s,/,_,` -+BUNDLE_HOST=Linux - DYN_LIB_EXT="so" --case "$BUNDLE_HOST" in --Darwin) -- BUNDLE_HOST=MacOS -- DYN_LIB_EXT="dylib" -- ;; --SunOS) -- BUNDLE_HOST=Solaris -- ;; -- esac - - # --disable-libusb - # Check whether --enable-libusb was given. diff --git a/package/ccid/patches/patch-ltmain_sh b/package/ccid/patches/patch-ltmain_sh deleted file mode 100644 index 0801e7522..000000000 --- a/package/ccid/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ccid-1.4.4.orig/ltmain.sh 2011-05-13 11:19:08.000000000 +0200 -+++ ccid-1.4.4/ltmain.sh 2011-07-27 11:54:42.000000000 +0200 -@@ -5840,7 +5840,7 @@ func_mode_link () - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/cdrkit/patches/patch-Makefile b/package/cdrkit/patches/patch-Makefile deleted file mode 100644 index b4b1ce790..000000000 --- a/package/cdrkit/patches/patch-Makefile +++ /dev/null @@ -1,465 +0,0 @@ ---- cdrkit-1.1.11.orig/Makefile 2007-05-06 12:23:54.000000000 +0200 -+++ cdrkit-1.1.11/Makefile 2015-05-31 21:33:44.000000000 +0200 -@@ -1,72 +1,408 @@ --ifneq ($(CFLAGS),) --CMAKETWEAKS += ( cd build ; cmake .. -DCMAKE_C_FLAGS="$(CFLAGS)" ) || exit 1; --endif -+# CMAKE generated file: DO NOT EDIT! -+# Generated by "Unix Makefiles" Generator, CMake Version 3.2 - --ifneq ($(LDFLAGS),) --CMAKETWEAKS += (cd build ; cmake .. -DCMAKE_EXE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(LDFLAGS)" ) || exit 1; --endif -+# Default target executed when no arguments are given to make. -+default_target: all -+.PHONY : default_target - --ifneq ($(PREFIX),) --CMAKETWEAKS += ( cd build ; cmake .. -DCMAKE_INSTALL_PREFIX="$(PREFIX)") || exit 1; --endif -+# Allow only one "make -f Makefile2" at a time, but pass parallelism. -+.NOTPARALLEL: - --ifneq ($(MANSUBDIR),) --CMAKETWEAKS += ( cd build ; cmake .. -DMANSUBDIR="$(MANSUBDIR)" ) || exit 1; --endif -+#============================================================================= -+# Special targets provided by cmake. - --default_target: all -+# Disable implicit rules so canonical targets will work. -+.SUFFIXES: - --DISTNAME=cdrkit-$(shell cat VERSION) --DEBSRCNAME=cdrkit_$(shell cat VERSION | sed -e "s,pre,~pre,").orig.tar.gz -+# Remove some rules from gmake that .SUFFIXES does not remove. -+SUFFIXES = - --build/Makefile: -- @-mkdir build 2>/dev/null -- cd build && cmake .. -+.SUFFIXES: .hpux_make_needs_suffix_list - --cmakepurge: -- rm -rf install_manifest.txt progress.make CMakeFiles CMakeCache.txt cmake_install.cmake -- rm -rf */install_manifest.txt */progress.make */CMakeFiles */CMakeCache.txt */cmake_install.cmake -- rm -rf */*/install_manifest.txt */*/progress.make */*/CMakeFiles */*/CMakeCache.txt */*/cmake_install.cmake -- rm */Makefile */*/Makefile -+# Suppress display of executed commands. -+$(VERBOSE).SILENT: -+ -+# A target that is always out of date. -+cmake_force: -+.PHONY : cmake_force -+ -+#============================================================================= -+# Set environment variables for the build. -+ -+# The shell in which to execute make rules. -+SHELL = /bin/sh -+ -+# The CMake executable. -+CMAKE_COMMAND = /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -+ -+# The command to remove a file. -+RM = /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -E remove -f -+ -+# Escaping for special characters. -+EQUALS = = -+ -+# The top-level source directory on which CMake was run. -+CMAKE_SOURCE_DIR = /home/wbx/adk/build_raspberry-pi_uclibc-ng_arm_hard_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11 -+ -+# The top-level build directory on which CMake was run. -+CMAKE_BINARY_DIR = /home/wbx/adk/build_raspberry-pi_uclibc-ng_arm_hard_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11 -+ -+#============================================================================= -+# Targets provided globally by CMake. -+ -+# Special rule for the target install/strip -+install/strip: preinstall -+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..." -+ /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake -+.PHONY : install/strip -+ -+# Special rule for the target install/strip -+install/strip/fast: install/strip -+.PHONY : install/strip/fast -+ -+# Special rule for the target edit_cache -+edit_cache: -+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..." -+ /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -+.PHONY : edit_cache -+ -+# Special rule for the target edit_cache -+edit_cache/fast: edit_cache -+.PHONY : edit_cache/fast -+ -+# Special rule for the target rebuild_cache -+rebuild_cache: -+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." -+ /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -+.PHONY : rebuild_cache -+ -+# Special rule for the target rebuild_cache -+rebuild_cache/fast: rebuild_cache -+.PHONY : rebuild_cache/fast -+ -+# Special rule for the target install -+install: preinstall -+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." -+ /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -P cmake_install.cmake -+.PHONY : install -+ -+# Special rule for the target install -+install/fast: preinstall/fast -+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." -+ /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -P cmake_install.cmake -+.PHONY : install/fast -+ -+# Special rule for the target list_install_components -+list_install_components: -+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\"" -+.PHONY : list_install_components -+ -+# Special rule for the target list_install_components -+list_install_components/fast: list_install_components -+.PHONY : list_install_components/fast -+ -+# Special rule for the target install/local -+install/local: preinstall -+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..." -+ /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake -+.PHONY : install/local -+ -+# Special rule for the target install/local -+install/local/fast: install/local -+.PHONY : install/local/fast -+ -+# The main all target -+all: cmake_check_build_system -+ $(CMAKE_COMMAND) -E cmake_progress_start /home/wbx/adk/build_raspberry-pi_uclibc-ng_arm_hard_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles /home/wbx/adk/build_raspberry-pi_uclibc-ng_arm_hard_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles/progress.marks -+ $(MAKE) -f CMakeFiles/Makefile2 all -+ $(CMAKE_COMMAND) -E cmake_progress_start /home/wbx/adk/build_raspberry-pi_uclibc-ng_arm_hard_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles 0 -+.PHONY : all - -+# The main clean target - clean: -- rm -rf build -+ $(MAKE) -f CMakeFiles/Makefile2 clean -+.PHONY : clean - --tarball: --# if test "$(shell svn status | grep -v -i make)" ; then echo Uncommited files found. Run \"svn status\" to display them. ; exit 1 ; fi -- @if test -f ../$(DISTNAME).tar.gz ; then echo ../$(DISTNAME).tar.gz exists, not overwritting ; exit 1; fi -- -svn up -- rm -rf tmp -- mkdir tmp -- svn export . tmp/$(DISTNAME) -- rm -rf tmp/$(DISTNAME)/debian -- tar -f - -c -C tmp $(DISTNAME) | gzip -9 > ../$(DISTNAME).tar.gz -- rm -rf tmp -- test -e /etc/debian_version && ln -f ../$(DISTNAME).tar.gz ../$(DEBSRCNAME) || true -- test -e ../tarballs && ln -f ../$(DISTNAME).tar.gz ../tarballs/$(DEBSRCNAME) || true -+# The main clean target -+clean/fast: clean -+.PHONY : clean/fast - --tarball-remove: -- rm -f ../$(DISTNAME).tar.gz ../tarballs/$(DEBSRCNAME) ../$(DEBSRCNAME) -+# Prepare targets for installation. -+preinstall: all -+ $(MAKE) -f CMakeFiles/Makefile2 preinstall -+.PHONY : preinstall - --SVNBASE=$(shell svn info | grep URL: | cut -f2 -d' ' | xargs dirname) --release: tarball -- svn ci -- svn cp $(SVNBASE)/trunk $(SVNBASE)/tags/release_$(shell cat VERSION) -+# Prepare targets for installation. -+preinstall/fast: -+ $(MAKE) -f CMakeFiles/Makefile2 preinstall -+.PHONY : preinstall/fast - --#%:: --# $(MAKE) $(MAKE_FLAGS) build/Makefile --# $(CMAKETWEAKS) --# $(MAKE) -C build $(MAKE_FLAGS) $@ -+# clear depends -+depend: -+ $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 -+.PHONY : depend - --# needs to be explicite, for PHONY and install (AKA INSTALL) file on cygwin --install: build/Makefile -- $(CMAKETWEAKS) -- $(MAKE) -C build $(MAKE_FLAGS) $@ -+#============================================================================= -+# Target rules for targets named devdump - --all: build/Makefile -- $(CMAKETWEAKS) -- $(MAKE) -C build $(MAKE_FLAGS) $@ -+# Build rule for target. -+devdump: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 devdump -+.PHONY : devdump - --.PHONY: install all -+# fast build rule for target. -+devdump/fast: -+ $(MAKE) -f genisoimage/CMakeFiles/devdump.dir/build.make genisoimage/CMakeFiles/devdump.dir/build -+.PHONY : devdump/fast -+ -+#============================================================================= -+# Target rules for targets named genisoimage -+ -+# Build rule for target. -+genisoimage: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 genisoimage -+.PHONY : genisoimage -+ -+# fast build rule for target. -+genisoimage/fast: -+ $(MAKE) -f genisoimage/CMakeFiles/genisoimage.dir/build.make genisoimage/CMakeFiles/genisoimage.dir/build -+.PHONY : genisoimage/fast -+ -+#============================================================================= -+# Target rules for targets named isodebug -+ -+# Build rule for target. -+isodebug: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 isodebug -+.PHONY : isodebug -+ -+# fast build rule for target. -+isodebug/fast: -+ $(MAKE) -f genisoimage/CMakeFiles/isodebug.dir/build.make genisoimage/CMakeFiles/isodebug.dir/build -+.PHONY : isodebug/fast -+ -+#============================================================================= -+# Target rules for targets named isodump -+ -+# Build rule for target. -+isodump: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 isodump -+.PHONY : isodump -+ -+# fast build rule for target. -+isodump/fast: -+ $(MAKE) -f genisoimage/CMakeFiles/isodump.dir/build.make genisoimage/CMakeFiles/isodump.dir/build -+.PHONY : isodump/fast -+ -+#============================================================================= -+# Target rules for targets named isoinfo -+ -+# Build rule for target. -+isoinfo: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 isoinfo -+.PHONY : isoinfo -+ -+# fast build rule for target. -+isoinfo/fast: -+ $(MAKE) -f genisoimage/CMakeFiles/isoinfo.dir/build.make genisoimage/CMakeFiles/isoinfo.dir/build -+.PHONY : isoinfo/fast -+ -+#============================================================================= -+# Target rules for targets named isovfy -+ -+# Build rule for target. -+isovfy: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 isovfy -+.PHONY : isovfy -+ -+# fast build rule for target. -+isovfy/fast: -+ $(MAKE) -f genisoimage/CMakeFiles/isovfy.dir/build.make genisoimage/CMakeFiles/isovfy.dir/build -+.PHONY : isovfy/fast -+ -+#============================================================================= -+# Target rules for targets named wodim -+ -+# Build rule for target. -+wodim: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 wodim -+.PHONY : wodim -+ -+# fast build rule for target. -+wodim/fast: -+ $(MAKE) -f wodim/CMakeFiles/wodim.dir/build.make wodim/CMakeFiles/wodim.dir/build -+.PHONY : wodim/fast -+ -+#============================================================================= -+# Target rules for targets named wodimstuff -+ -+# Build rule for target. -+wodimstuff: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 wodimstuff -+.PHONY : wodimstuff -+ -+# fast build rule for target. -+wodimstuff/fast: -+ $(MAKE) -f wodim/CMakeFiles/wodimstuff.dir/build.make wodim/CMakeFiles/wodimstuff.dir/build -+.PHONY : wodimstuff/fast -+ -+#============================================================================= -+# Target rules for targets named edc -+ -+# Build rule for target. -+edc: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 edc -+.PHONY : edc -+ -+# fast build rule for target. -+edc/fast: -+ $(MAKE) -f libedc/CMakeFiles/edc.dir/build.make libedc/CMakeFiles/edc.dir/build -+.PHONY : edc/fast -+ -+#============================================================================= -+# Target rules for targets named hfs_iso -+ -+# Build rule for target. -+hfs_iso: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 hfs_iso -+.PHONY : hfs_iso -+ -+# fast build rule for target. -+hfs_iso/fast: -+ $(MAKE) -f libhfs_iso/CMakeFiles/hfs_iso.dir/build.make libhfs_iso/CMakeFiles/hfs_iso.dir/build -+.PHONY : hfs_iso/fast -+ -+#============================================================================= -+# Target rules for targets named paranoia -+ -+# Build rule for target. -+paranoia: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 paranoia -+.PHONY : paranoia -+ -+# fast build rule for target. -+paranoia/fast: -+ $(MAKE) -f libparanoia/CMakeFiles/paranoia.dir/build.make libparanoia/CMakeFiles/paranoia.dir/build -+.PHONY : paranoia/fast -+ -+#============================================================================= -+# Target rules for targets named icedax -+ -+# Build rule for target. -+icedax: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 icedax -+.PHONY : icedax -+ -+# fast build rule for target. -+icedax/fast: -+ $(MAKE) -f icedax/CMakeFiles/icedax.dir/build.make icedax/CMakeFiles/icedax.dir/build -+.PHONY : icedax/fast -+ -+#============================================================================= -+# Target rules for targets named usal -+ -+# Build rule for target. -+usal: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 usal -+.PHONY : usal -+ -+# fast build rule for target. -+usal/fast: -+ $(MAKE) -f libusal/CMakeFiles/usal.dir/build.make libusal/CMakeFiles/usal.dir/build -+.PHONY : usal/fast -+ -+#============================================================================= -+# Target rules for targets named rols -+ -+# Build rule for target. -+rols: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 rols -+.PHONY : rols -+ -+# fast build rule for target. -+rols/fast: -+ $(MAKE) -f librols/CMakeFiles/rols.dir/build.make librols/CMakeFiles/rols.dir/build -+.PHONY : rols/fast -+ -+#============================================================================= -+# Target rules for targets named unls -+ -+# Build rule for target. -+unls: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 unls -+.PHONY : unls -+ -+# fast build rule for target. -+unls/fast: -+ $(MAKE) -f libunls/CMakeFiles/unls.dir/build.make libunls/CMakeFiles/unls.dir/build -+.PHONY : unls/fast -+ -+#============================================================================= -+# Target rules for targets named readom -+ -+# Build rule for target. -+readom: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 readom -+.PHONY : readom -+ -+# fast build rule for target. -+readom/fast: -+ $(MAKE) -f readom/CMakeFiles/readom.dir/build.make readom/CMakeFiles/readom.dir/build -+.PHONY : readom/fast - -+#============================================================================= -+# Target rules for targets named netscsid -+ -+# Build rule for target. -+netscsid: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 netscsid -+.PHONY : netscsid -+ -+# fast build rule for target. -+netscsid/fast: -+ $(MAKE) -f netscsid/CMakeFiles/netscsid.dir/build.make netscsid/CMakeFiles/netscsid.dir/build -+.PHONY : netscsid/fast -+ -+# Help Target -+help: -+ @echo "The following are some of the valid targets for this Makefile:" -+ @echo "... all (the default if no target is provided)" -+ @echo "... clean" -+ @echo "... depend" -+ @echo "... install/strip" -+ @echo "... edit_cache" -+ @echo "... rebuild_cache" -+ @echo "... install" -+ @echo "... list_install_components" -+ @echo "... install/local" -+ @echo "... isodebug" -+ @echo "... genisoimage" -+ @echo "... isodump" -+ @echo "... isoinfo" -+ @echo "... devdump" -+ @echo "... isovfy" -+ @echo "... wodimstuff" -+ @echo "... wodim" -+ @echo "... edc" -+ @echo "... hfs_iso" -+ @echo "... paranoia" -+ @echo "... icedax" -+ @echo "... usal" -+ @echo "... rols" -+ @echo "... unls" -+ @echo "... readom" -+ @echo "... netscsid" -+.PHONY : help -+ -+ -+ -+#============================================================================= -+# Special targets to cleanup operation of make. -+ -+# Special rule to run CMake to check the build system integrity. -+# No rule that depends on this can have commands that come from listfiles -+# because they might be regenerated. -+cmake_check_build_system: -+ $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 -+.PHONY : cmake_check_build_system - diff --git a/package/cdrkit/patches/patch-genisoimage_genisoimage_h b/package/cdrkit/patches/patch-genisoimage_genisoimage_h new file mode 100644 index 000000000..99f696ded --- /dev/null +++ b/package/cdrkit/patches/patch-genisoimage_genisoimage_h @@ -0,0 +1,11 @@ +--- cdrkit-1.1.11.orig/genisoimage/genisoimage.h 2008-05-25 23:00:55.000000000 +0200 ++++ cdrkit-1.1.11/genisoimage/genisoimage.h 2024-02-12 14:32:15.046582134 +0100 +@@ -376,7 +376,7 @@ extern int use_fileversion; + extern int split_SL_component; + extern int split_SL_field; + extern char *trans_tbl; +-char *outfile; ++extern char *outfile; + + #define JMAX 64 /* maximum Joliet file name length (spec) */ + #define JLONGMAX 103 /* out of spec Joliet file name length */ diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index addec9a7f..209b9ff88 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -4,8 +4,8 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= cfgfs -PKG_VERSION:= 1.0.10 -PKG_RELEASE:= 4 +PKG_VERSION:= 1.0.12 +PKG_RELEASE:= 1 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base/adk PKG_URL:= http://www.openadk.org/ diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh index c6008e93a..8954c3645 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (c) 2006-2007 # Thorsten Glaser <tg@mirbsd.de> -# Copyright (c) 2009-2017 +# Copyright (c) 2009-2024 # Waldemar Brodkorb <wbx@openadk.org> # # Provided that these terms and disclaimer and all copyright notices @@ -43,7 +43,7 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin wd=$(pwd) cd / -what='Configuration Filesystem Utility (cfgfs), Version 1.10' +what='Configuration Filesystem Utility (cfgfs), Version 1.12' who=$(id -u) if [ $who -ne 0 ]; then @@ -56,7 +56,7 @@ usage() { $what Usage: { halt | poweroff | reboot } [-Ffn] [-d delay] - cfgfs { commit | erase | setup | status | dump | restore } [flags] + cfgfs { commit | erase | setup | status | diff | dump | restore } [flags] EOF exit 1 } @@ -101,7 +101,7 @@ if [[ $me != cfgfs ]]; then fi case $1 in -(commit|erase|setup|status|dump|restore) ;; +(commit|erase|setup|status|diff|dump|restore) ;; (*) cat >&2 <<EOF $what Syntax: @@ -109,6 +109,7 @@ Syntax: $0 erase $0 setup [-N] $0 status [-rq] + $0 diff [<diff options>] $0 { dump | restore } [<filename>] EOF exit 1 ;; @@ -139,6 +140,18 @@ if [ -f .cfgfs ]; then fi if [ -z $part ]; then part=$(fdisk -l /dev/sda 2>/dev/null|awk '{if ($2=="*") { print $1" "$9} else {print $1" "$8}}'|grep '^/dev.*88.*'|tail -1|awk '{ print $1 }') + # find GPT partition + if [ -z $part ]; then + partnum=$(gdisk -l $rootdisk 2>/dev/null|fgrep "cfgfs"|awk '{ print $1 }') + if [ ! -z $partnum ]; then + echo $rootdisk|grep mmcblk >/dev/null 2>&1 + if [ $? -eq 0 ]; then + part=${rootdisk}p${partnum} + else + part=${rootdisk}${partnum} + fi + fi + fi if [ -z $part ]; then # otherwise search for MTD device with name cfgfs part=/dev/mtd$(fgrep '"cfgfs"' /proc/mtd 2>/dev/null | sed 's/^mtd\([^:]*\):.*$/\1/')ro @@ -435,5 +448,42 @@ if test $1 = restore; then exit 0 fi +if test $1 = diff; then + if test ! -e /tmp/.cfgfs; then + cat >&2 <<-EOF + cfgfs: error: not yet initialised + explanation: "cfgfs setup" was not yet run + EOF + [[ $1 = -f ]] || exit 11 + fi + shift + tempd=/tmp/.cfgfs/temp + mount -t tmpfs none $tempd + (cd /tmp/.cfgfs/root; tar cf - .) | (cd $tempd; tar xpf - 2>/dev/null) + x=$(dd if="$part" bs=4 count=1 2>/dev/null) + [[ "$x" = "FWCF" ]] && cfgfs.helper -U $tempd <"$part" + + if test -e $tempd/.cfgfs_deleted; then + while IFS= read -r file; do + rm -f "$tempd/$file" + done <$tempd/.cfgfs_deleted + rm -f $tempd/.cfgfs_deleted + fi + (cd /etc; find . -type f; \ + cd $tempd; find . -type f \ + ) | grep -v -e '^./.cfgfs' -e '^./.rnd$' | sort -u | while read f; do + f=${f#./} + if [ ! -e "/etc/$f" ]; then + echo "Deleted: /etc/$f" + elif [ ! -e "$tempd/$f" ]; then + echo "New: /etc/$f" + else + diff "$@" "$tempd/$f" "/etc/$f" + fi + done + umount $tempd + exit 0 +fi + echo 'cfgfs: cannot be reached...' exit 255 diff --git a/package/cherokee/Makefile b/package/cherokee/Makefile index 571e3d81e..a701c7fd9 100644 --- a/package/cherokee/Makefile +++ b/package/cherokee/Makefile @@ -4,20 +4,24 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= cherokee -PKG_VERSION:= 1.2.101 +PKG_VERSION:= 1.2.103 PKG_RELEASE:= 1 -PKG_HASH:= ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8 +PKG_HASH:= 7ec379bf7e9d6fdf952d91fadc43eb6ee5295119aea7d8dabbf89f2799a53ae6 PKG_DESCR:= small and fast webserver PKG_SECTION:= net/http PKG_URL:= http://www.cherokee-project.com -PKG_SITES:= http://mirror.aarnet.edu.au/pub/cherokee/1.2/1.2.101/ +PKG_SITES:= https://github.com/cherokee/webserver/archive/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_CFLINE_CHEROKEE:= depends on ADK_BROKEN + +DISTFILES:= v${PKG_VERSION}.zip +WRKDIST= ${WRKDIR}/webserver-${PKG_VERSION} include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,CHEROKEE,cherokee,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autogen CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes CONFIGURE_ARGS+= --enable-static-module=all \ diff --git a/package/cherrypy/Makefile b/package/cherrypy/Makefile index 8f27f0dc8..602ca0738 100644 --- a/package/cherrypy/Makefile +++ b/package/cherrypy/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= 5fccc9ad3bf9a1df83bbb934772f34f42571421bdd75f90f74c170b6c0ef13b1 PKG_DESCR:= python web framework PKG_SECTION:= dev/python -PKG_DEPENDS:= python2 -PKG_BUILDDEP:= python2 +PKG_DEPENDS:= python3 +PKG_BUILDDEP:= python3 PKG_URL:= http://www.cherrypy.org/ PKG_SITES:= https://pypi.python.org/packages/source/C/CherryPy/ @@ -25,7 +25,7 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -include $(ADK_TOPDIR)/mk/python.mk +include $(ADK_TOPDIR)/mk/python3.mk do-build: cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py build @@ -35,6 +35,6 @@ do-install: $(INSTALL_DIR) $(IDIR_CHERRYPY)/usr/bin $(INSTALL_DIR) $(IDIR_CHERRYPY)/usr/lib/python$(PYTHON_VERSION) $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/* $(IDIR_CHERRYPY)/usr/lib/python$(PYTHON_VERSION) - $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/cherrypy/cherryd $(IDIR_CHERRYPY)/usr/bin + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/CherryPy-$(PKG_VERSION)-py3.9.egg/cherrypy/cherryd $(IDIR_CHERRYPY)/usr/bin include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/chocolate-doom/Makefile b/package/chocolate-doom/Makefile new file mode 100644 index 000000000..08ddc55d9 --- /dev/null +++ b/package/chocolate-doom/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:= chocolate-doom +PKG_VERSION:= 3.0.1 +PKG_RELEASE:= 1 +PKG_HASH:= a54383beef6a52babc5b00d58fcf53a454f012ced7b1936ba359b13f1f10ac66 +PKG_DESCR:= doom +PKG_SECTION:= app/games +PKG_DEPENDS:= libsdl2 libsdl2-mixer libsdl2-net +PKG_BUILDDEP:= sdl2 sdl2-mixer sdl2-net +PKG_URL:= https://www.chocolate-doom.org +PKG_SITES:= https://github.com/chocolate-doom/chocolate-doom/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,CHOCOLATE_DOOM,chocolate-doom,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +AUTOTOOL_STYLE:= autogen +TARGET_CFLAGS+= -fcommon + +chocolate-doom-install: + $(INSTALL_DIR) $(IDIR_CHOCOLATE_DOOM)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/chocolate-doom \ + $(IDIR_CHOCOLATE_DOOM)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile index 1ce067624..37084f9f3 100644 --- a/package/cifs-utils/Makefile +++ b/package/cifs-utils/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= cifs-utils -PKG_VERSION:= 6.7 +PKG_VERSION:= 7.0 PKG_RELEASE:= 1 -PKG_HASH:= b2f21612474ab012e75accd167aab607a0614ff67efb56ea0f36789fa785cfab +PKG_HASH:= 0defaab85bd3ea46ffc45ab41fb0d0ad54d05ae2cfaa7e503de86d4f12bc8161 PKG_DESCR:= network filesystem utilities PKG_SECTION:= net/fs PKG_KDEPENDS:= cifs @@ -20,6 +20,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,CIFS_UTILS,cifs-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes CONFIGURE_ARGS+= --disable-cifsupcall \ --disable-cifsidmap \ --disable-cifsacl \ diff --git a/package/cifs-utils/patches/patch-Makefile_am b/package/cifs-utils/patches/patch-Makefile_am index 81f21cd5a..98d2d616b 100644 --- a/package/cifs-utils/patches/patch-Makefile_am +++ b/package/cifs-utils/patches/patch-Makefile_am @@ -1,11 +1,12 @@ ---- cifs-utils-6.3.orig/Makefile.am 2014-01-09 17:19:53.000000000 +0100 -+++ cifs-utils-6.3/Makefile.am 2014-05-06 13:53:28.814703381 +0200 -@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I aclocal - root_sbindir = $(ROOTSBINDIR) - root_sbin_PROGRAMS = mount.cifs - mount_cifs_SOURCES = mount.cifs.c mtab.c resolve_host.c util.c --mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) $(RT_LDADD) -+mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) $(RT_LDADD) $(LIBOBJS) +--- cifs-utils-7.0.orig/Makefile.am 2022-08-11 22:40:15.000000000 +0200 ++++ cifs-utils-7.0/Makefile.am 2024-01-04 12:50:47.888452316 +0100 +@@ -117,9 +117,6 @@ endif - man_MANS = mount.cifs.8 - include_HEADERS = cifsidmap.h + SUBDIRS = contrib + +-install-exec-hook: install-sbinPROGRAMS +- (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) +- + install-data-hook: + if CONFIG_MAN + ( cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) diff --git a/package/cifs-utils/patches/patch-cifs_idmap_c b/package/cifs-utils/patches/patch-cifs_idmap_c deleted file mode 100644 index be55be79f..000000000 --- a/package/cifs-utils/patches/patch-cifs_idmap_c +++ /dev/null @@ -1,16 +0,0 @@ ---- cifs-utils-6.1.orig/cifs.idmap.c 2013-07-02 21:13:33.000000000 +0200 -+++ cifs-utils-6.1/cifs.idmap.c 2013-10-28 07:33:27.000000000 +0100 -@@ -27,7 +27,13 @@ - #endif /* HAVE_CONFIG_H */ - - #include <string.h> -+#ifdef HAVE_GNU_GETOPT_LONG - #include <getopt.h> -+#else -+#include "gnu_getopt.h" -+#define getopt_long gnu_getopt_long -+#define option gnu_option -+#endif - #include <syslog.h> - #include <dirent.h> - #include <sys/types.h> diff --git a/package/cifs-utils/patches/patch-configure_ac b/package/cifs-utils/patches/patch-configure_ac deleted file mode 100644 index 7355a238c..000000000 --- a/package/cifs-utils/patches/patch-configure_ac +++ /dev/null @@ -1,33 +0,0 @@ ---- cifs-utils-6.7.orig/configure.ac 2017-03-02 17:51:05.000000000 +0100 -+++ cifs-utils-6.7/configure.ac 2017-03-27 01:54:09.082783577 +0200 -@@ -93,13 +93,25 @@ AC_CHECK_TYPES([ptrdiff_t, ssize_t, uint - - # Checks for library functions. - AC_FUNC_GETMNTENT --AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK --AC_FUNC_MALLOC --AC_FUNC_REALLOC --AC_FUNC_STRNLEN - - # check for required functions --AC_CHECK_FUNCS([alarm atexit endpwent getmntent getpass gettimeofday inet_ntop memset realpath setenv strchr strcmp strdup strerror strncasecmp strndup strpbrk strrchr strstr strtol strtoul tolower uname], , [AC_MSG_ERROR([necessary functions(s) not found])]) -+AC_CHECK_FUNCS([alarm atexit endpwent getmntent getpass gettimeofday inet_ntop malloc memset realloc realpath setenv strchr strcmp strdup strerror strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul tolower uname], , [AC_MSG_ERROR([necessary functions(s) not found])]) -+ -+AC_CHECK_FUNCS([getopt_long], , [AC_MSG_ERROR([getopt_long function not found])]) -+AC_MSG_CHECKING([if getopt_long is GNU specific]) -+AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ -+#include <features.h> -+#ifndef __GLIBC__ -+#error No GNU extension -+#endif -+ ]],[[;]]) -+ ],[ -+ AC_DEFINE(HAVE_GNU_GETOPT_LONG, 1, [Whether getopt_long has GNU extensions]) -+ AC_MSG_RESULT([yes]) -+ ],[ -+ AC_LIBOBJ([gnu_getopt]) -+ AC_MSG_RESULT([no]) -+]) - - AC_CHECK_FUNCS(clock_gettime, [], [ - AC_CHECK_LIB(rt, clock_gettime, [ diff --git a/package/cifs-utils/patches/patch-mount_cifs_c b/package/cifs-utils/patches/patch-mount_cifs_c deleted file mode 100644 index 583514808..000000000 --- a/package/cifs-utils/patches/patch-mount_cifs_c +++ /dev/null @@ -1,24 +0,0 @@ ---- cifs-utils-6.7.orig/mount.cifs.c 2017-03-02 17:51:05.000000000 +0100 -+++ cifs-utils-6.7/mount.cifs.c 2017-03-27 18:57:14.519371156 +0200 -@@ -34,7 +34,13 @@ - #include <sys/utsname.h> - #include <sys/socket.h> - #include <arpa/inet.h> -+#ifdef HAVE_GNU_GETOPT_LONG - #include <getopt.h> -+#else -+#include "gnu_getopt.h" -+#define getopt_long gnu_getopt_long -+#define option gnu_option -+#endif - #include <errno.h> - #include <netdb.h> - #include <string.h> -@@ -61,7 +67,6 @@ - #include "mount.h" - #include "util.h" - #include "resolve_host.h" --#include "data_blob.h" - - #ifndef MS_MOVE - #define MS_MOVE 8192 diff --git a/package/cifs-utils/patches/patch-mtab_c b/package/cifs-utils/patches/patch-mtab_c deleted file mode 100644 index 90655935f..000000000 --- a/package/cifs-utils/patches/patch-mtab_c +++ /dev/null @@ -1,10 +0,0 @@ ---- cifs-utils-6.7.orig/mtab.c 2017-03-02 17:51:05.000000000 +0100 -+++ cifs-utils-6.7/mtab.c 2017-03-27 01:54:09.094784041 +0200 -@@ -36,6 +36,7 @@ - #include <time.h> - #include <fcntl.h> - #include <mntent.h> -+#include <paths.h> - #include <stdlib.h> - #include <signal.h> - #include <paths.h> diff --git a/package/clamav/Makefile b/package/clamav/Makefile index 132224245..1812b4dcb 100644 --- a/package/clamav/Makefile +++ b/package/clamav/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= clamav -PKG_VERSION:= 0.103.0 +PKG_VERSION:= 0.103.4 PKG_RELEASE:= 1 -PKG_HASH:= 32a9745277bfdda80e77ac9ca2f5990897418e9416880f3c31553ca673e80546 +PKG_HASH:= def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 PKG_DESCR:= anti-virus software PKG_SECTION:= sys/misc PKG_DEPENDS:= libressl zlib libpcre libncurses libcurl libmspack diff --git a/package/cmake/Makefile b/package/cmake/Makefile index b915f3e3e..9ad0a74a3 100644 --- a/package/cmake/Makefile +++ b/package/cmake/Makefile @@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= cmake PKG_VERSION:= 3.21.3 PKG_RELEASE:= 1 -PKG_HASH:= e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 +PKG_HASH:= d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f PKG_DESCR:= build utility PKG_SECTION:= dev/tools HOST_BUILDDEP:= curl-host diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 46fa04118..3948ed519 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= collectd -PKG_VERSION:= 5.7.0 +PKG_VERSION:= 5.12.0 PKG_RELEASE:= 1 -PKG_HASH:= 25a05fbdc6baad571554342bbac6141928bf95a47fc60ee3b32e46d0c89ef2b2 +PKG_HASH:= 5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6 PKG_DESCR:= system statistics collection daemon PKG_SECTION:= sys/misc PKG_BUILDDEP:= libtool diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile index 60d33c19a..f27fd4f00 100644 --- a/package/coreutils/Makefile +++ b/package/coreutils/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= coreutils -PKG_VERSION:= 8.25 +PKG_VERSION:= 9.4 PKG_RELEASE:= 1 -PKG_HASH:= 31e67c057a5b32a582f26408c789e11c2e8d676593324849dcf5779296cdce87 +PKG_HASH:= ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52 PKG_DESCR:= file, shell and text utilities PKG_SECTION:= base/apps PKG_NEEDS:= threads @@ -19,7 +19,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,COREUTILS,coreutils,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,COREUTILS,coreutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --disable-rpath coreutils-install: diff --git a/package/coreutils/patches/patch-Makefile_am b/package/coreutils/patches/patch-Makefile_am deleted file mode 100644 index 20f1fff1d..000000000 --- a/package/coreutils/patches/patch-Makefile_am +++ /dev/null @@ -1,27 +0,0 @@ ---- coreutils-8.24.orig/Makefile.am 2015-07-03 22:07:38.000000000 +0200 -+++ coreutils-8.24/Makefile.am 2015-07-06 20:55:18.000000000 +0200 -@@ -17,7 +17,7 @@ - - ALL_RECURSIVE_TARGETS = - --SUBDIRS = po . gnulib-tests -+SUBDIRS = . gnulib-tests - - changelog_etc = \ - ChangeLog-2005 \ -@@ -35,8 +35,7 @@ changelog_etc = \ - old/sh-utils/ChangeLog.0 \ - old/sh-utils/NEWS \ - old/textutils/ChangeLog \ -- old/textutils/NEWS \ -- po/ChangeLog-2007 -+ old/textutils/NEWS - - EXTRA_DIST = \ - $(changelog_etc) \ -@@ -223,5 +222,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib - include $(top_srcdir)/lib/local.mk - include $(top_srcdir)/src/local.mk - include $(top_srcdir)/doc/local.mk --include $(top_srcdir)/man/local.mk - include $(top_srcdir)/tests/local.mk diff --git a/package/coreutils/patches/patch-configure_ac b/package/coreutils/patches/patch-configure_ac deleted file mode 100644 index 2ec02088f..000000000 --- a/package/coreutils/patches/patch-configure_ac +++ /dev/null @@ -1,14 +0,0 @@ ---- coreutils-8.24.orig/configure.ac 2015-06-26 19:05:22.000000000 +0200 -+++ coreutils-8.24/configure.ac 2015-07-06 20:55:57.000000000 +0200 -@@ -589,11 +589,6 @@ AM_CONDITIONAL([CROSS_COMPILING], [test - - ############################################################################ - --# As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in --# translatable strings, we must use need-formatstring-macros here. --AM_GNU_GETTEXT([external], [need-formatstring-macros]) --AM_GNU_GETTEXT_VERSION([0.19.2]) -- - # For a test of uniq: it uses the $LOCALE_FR envvar. - gt_LOCALE_FR - diff --git a/package/coreutils/patches/patch-man_local_mk b/package/coreutils/patches/patch-man_local_mk deleted file mode 100644 index 5bf9e5cc1..000000000 --- a/package/coreutils/patches/patch-man_local_mk +++ /dev/null @@ -1,16 +0,0 @@ ---- coreutils-8.22.orig/man/local.mk 2013-12-04 15:48:30.000000000 +0100 -+++ coreutils-8.22/man/local.mk 2014-02-21 16:08:08.000000000 +0100 -@@ -18,12 +18,7 @@ - - EXTRA_DIST += man/help2man man/dummy-man - --## Graceful degradation for systems lacking perl. --if HAVE_PERL --run_help2man = $(PERL) -- $(srcdir)/man/help2man --else --run_help2man = $(SHELL) $(srcdir)/man/dummy-man --endif -+run_help2man = echo - - man1_MANS = @man1_MANS@ - EXTRA_DIST += $(man1_MANS:.1=.x) diff --git a/package/cpio/Makefile b/package/cpio/Makefile index c1764b566..e1f03e8fa 100644 --- a/package/cpio/Makefile +++ b/package/cpio/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= cpio -PKG_VERSION:= 2.11 +PKG_VERSION:= 2.15 PKG_RELEASE:= 1 -PKG_HASH:= 601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978 +PKG_HASH:= efa50ef983137eefc0a02fdb51509d624b5e3295c980aa127ceee4183455499e PKG_DESCR:= archive utility PKG_SECTION:= app/archive PKG_URL:= http://www.gnu.org/software/cpio/ diff --git a/package/cpio/patches/patch-gnu_stdio_in_h b/package/cpio/patches/patch-gnu_stdio_in_h deleted file mode 100644 index fa9b89fb8..000000000 --- a/package/cpio/patches/patch-gnu_stdio_in_h +++ /dev/null @@ -1,13 +0,0 @@ ---- cpio-2.11.orig/gnu/stdio.in.h 2010-03-10 10:27:03.000000000 +0100 -+++ cpio-2.11/gnu/stdio.in.h 2013-07-16 12:56:00.000000000 +0200 -@@ -138,8 +138,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ -+/* - #undef gets - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+*/ - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ diff --git a/package/cpio/patches/patch-src_filetypes_h b/package/cpio/patches/patch-src_filetypes_h deleted file mode 100644 index f33bfa9f3..000000000 --- a/package/cpio/patches/patch-src_filetypes_h +++ /dev/null @@ -1,8 +0,0 @@ ---- cpio-2.11.orig/src/filetypes.h 2010-02-12 11:19:23.000000000 +0100 -+++ cpio-2.11/src/filetypes.h 2010-06-08 18:26:43.633473938 +0200 -@@ -82,4 +82,4 @@ - #define lstat stat - #endif - int lstat (); --int stat (); -+//int stat (); diff --git a/package/crda/Makefile b/package/crda/Makefile deleted file mode 100644 index c63608b6e..000000000 --- a/package/crda/Makefile +++ /dev/null @@ -1,53 +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:= crda -PKG_VERSION:= 1.1.3 -PKG_RELEASE:= 1 -PKG_HASH:= aa8a7fe92f0765986c421a5b6768a185375ac210393df0605ee132f6754825f0 -PKG_DESCR:= central regulatory domain agent for wireless networks -PKG_SECTION:= net/wifi -PKG_DEPENDS:= libnl -PKG_BUILDDEP:= libnl -PKG_URL:= http://wireless.kernel.org/en/developers/Regulatory -PKG_SITES:= http://linuxwireless.org/download/crda/ - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 - -PKG_FLAVOURS_CRDA:= WITH_UDEV -PKGFD_WITH_UDEV:= install shipped udev rules -PKGFS_WITH_UDEV:= udev -PKGFB_WITH_UDEV:= eudev - -PKG_CHOICES_CRDA:= WITH_LIBRESSL WITH_GCRYPT -PKGCD_WITH_LIBRESSL:= ssl support via libressl library -PKGCB_WITH_LIBRESSL:= libressl -PKGCS_WITH_LIBRESSL:= libressl -PKGCD_WITH_GCRYPT:= ssl support via gcrypt library -PKGCB_WITH_GCRYPT:= libgcrypt -PKGCS_WITH_GCRYPT:= libgcrypt - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,CRDA,crda,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -CONFIG_STYLE:= manual -ALL_TARGET:= all_noverify - -ifneq ($(ADK_PACKAGE_CRDA_WITH_LIBRESSL),) -XAKE_FLAGS+= USE_OPENSSL=1 -endif - -crda-install: - $(INSTALL_DIR) $(IDIR_CRDA)/usr/sbin - $(INSTALL_BIN) $(WRKINST)/sbin/{crda,regdbdump} \ - $(IDIR_CRDA)/usr/sbin -ifneq ($(ADK_PACKAGE_CRDA_WITH_UDEV),) - $(INSTALL_DIR) $(IDIR_CRDA)/lib/udev/rules.d - $(INSTALL_DATA) $(WRKINST)/lib/udev/rules.d/85-regulatory.rules \ - $(IDIR_CRDA)/lib/udev/rules.d -endif - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/crda/patches/patch-Makefile b/package/crda/patches/patch-Makefile deleted file mode 100644 index 752b3aeb5..000000000 --- a/package/crda/patches/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- crda-1.1.3.orig/Makefile 2012-01-19 03:19:09.000000000 +0100 -+++ crda-1.1.3/Makefile 2015-11-14 09:17:04.000000000 +0100 -@@ -103,7 +103,7 @@ $(REG_BIN): - keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) - $(NQ) ' GEN ' $@ - $(NQ) ' Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem) -- $(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@ -+ $(Q)PATH="/usr/bin:/usr/local/bin" ./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@ - - %.o: %.c regdb.h reglib.h - $(NQ) ' CC ' $@ diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile index cfd060552..d81a1b918 100644 --- a/package/cryptodev-linux/Makefile +++ b/package/cryptodev-linux/Makefile @@ -4,7 +4,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= cryptodev-linux -PKG_VERSION:= a705360197260d28535746ae98c461ba2cfb7a9e +PKG_VERSION:= 5e7121e45ff283d30097da381fd7e97c4bb61364 PKG_GIT:= hash PKG_RELEASE:= 1 PKG_DESCR:= device that allows access to kernel cryptographic drivers diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 2661ac0ae..1a24306ac 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -4,22 +4,63 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= cryptsetup -PKG_VERSION:= 2.0.3 +PKG_VERSION:= 2.4.1 PKG_RELEASE:= 1 -PKG_HASH:= 4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4 -PKG_DESCR:= utility used to conveniently setup disk encryption +PKG_HASH:= a356a727a83a464ade566e95239622a22dbe4e0f482b198fdb04ab0d3a5a9c5f +PKG_DESCR:= utility used to conveniently setup disk encryption PKG_SECTION:= app/crypto PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt json-c libncurses PKG_BUILDDEP:= libgcrypt popt e2fsprogs lvm json-c ncurses +PKG_NEEDS:= iconv +PKG_KDEPENDS:= crypto-user-api-hash crypto-user-api-skcipher +PKG_KDEPENDS+= crypto-user-api-rng crypto-user-api-aead +# these are the default algorithms used by older and newer cryptsetup versions +PKG_KDEPENDS+= dm-crypt crypto-essiv crypto-cbc crypto-xts +PKG_KDEPENDS+= crypto-aes crypto-sha1 crypto-sha256 PKG_URL:= https://gitlab.com/cryptsetup/cryptsetup -PKG_SITES:= https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/ +PKG_SITES:= https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/ PKG_OPTS:= dev +PKG_FLAVOURS_CRYPTSETUP:= WITH_LIBARGON2 +PKGFD_WITH_LIBARGON2:= use libargon2 instead of the slow internal one +PKGFS_WITH_LIBARGON2:= libargon2 +PKGFB_WITH_LIBARGON2:= libargon2 +PKGFX_WITH_LIBARGON2:= y + +PKG_CHOICES_CRYPTSETUP:= WITH_GCRYPT WITH_KERNEL WITH_NETTLE WITH_OPENSSL +PKGCD_WITH_GCRYPT:= use libgcrypt crypto backend +PKGCS_WITH_GCRYPT:= libgcrypt libgpg-error +PKGCB_WITH_GCRYPT:= libgcrypt libgpg-error +PKGCD_WITH_KERNEL:= use kernel user API crypto backend (slow) +PKGCD_WITH_NETTLE:= use libnettle crypto backend +PKGCS_WITH_NETTLE:= libnettle +PKGCB_WITH_NETTLE:= libnettle +PKGCD_WITH_OPENSSL:= use OpenSSL crypto backend +PKGCS_WITH_OPENSSL:= libressl +PKGCB_WITH_OPENSSL:= libressl + include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ARGS+= --disable-selinux +CONFIGURE_ARGS+= --disable-selinux \ + --disable-ssh-token \ + --disable-udev \ + --disable-nls \ + --enable-libargon2 + +ifeq (${ADK_PACKAGE_CRYPTSETUP_WITH_GCRYPT},y) +CONFIGURE_ARGS+= --with-crypto_backend=gcrypt +endif +ifeq (${ADK_PACKAGE_CRYPTSETUP_WITH_KERNEL},y) +CONFIGURE_ARGS+= --with-crypto_backend=kernel +endif +ifeq (${ADK_PACKAGE_CRYPTSETUP_WITH_NETTLE},y) +CONFIGURE_ARGS+= --with-crypto_backend=nettle +endif +ifeq (${ADK_PACKAGE_CRYPTSETUP_WITH_OPENSSL},y) +CONFIGURE_ARGS+= --with-crypto_backend=openssl +endif cryptsetup-install: ${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin ${IDIR_CRYPTSETUP}/usr/lib diff --git a/package/cups/Makefile b/package/cups/Makefile index 1f4251669..9ecb5b17f 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -4,20 +4,19 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= cups -PKG_VERSION:= 1.7.1 -PKG_RELEASE:= 4 -PKG_HASH:= f52bec893d9daf92b6029be79c07e6c516b4c85ffae3e6e01885cc85e9081681 +PKG_VERSION:= 2.3.6 +PKG_RELEASE:= 1 +PKG_HASH:= 3a96912fc88f62c5d8ac9b251bf0652f1cbe7e69cde16919103aea39f31a1a84 PKG_DESCR:= common unix printing system PKG_SECTION:= net/misc PKG_DEPENDS:= zlib -PKG_BUILDDEP:= cups-host zlib -PKG_NEEDS:= threads c++ +PKG_BUILDDEP:= zlib +PKG_NEEDS:= threads c++ iconv PKG_URL:= http://www.cups.org/ -PKG_SITES:= http://www.cups.org/software/${PKG_VERSION}/ +PKG_SITES:= https://github.com/apple/cups/archive/refs/tags/ PKG_OPTS:= dev -PKG_NOPARALLEL:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2 +DISTFILES:= v${PKG_VERSION}.tar.gz include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk @@ -25,35 +24,25 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -ifeq ($(ADK_PACKAGE_LIBICONV),y) -TARGET_LDFLAGS+= -liconv -endif - ifneq ($(ADK_HOST_LINUX),y) HOST_LINUX_ONLY:= 1 endif -HOST_LDFLAGS+= -liconv HOST_CONFIGURE_ARGS+= --disable-tcp-wrappers \ --disable-webif \ --disable-gssapi \ --disable-avahi \ --disable-pam \ --disable-dbus \ - --without-java \ - --without-perl \ - --without-python \ - --without-php \ --disable-gnutls \ - --disable-openssl \ --disable-cdsassl \ --disable-dbus \ --disable-ssl \ + --disable-systemd \ --with-components=core \ --with-rcdir=$(STAGING_HOST_DIR)/etc CONFIGURE_ENV+= ac_cv_func_sigset=no \ OPTIM='-fPIC -std=c89' LSB_BUILD=y - CONFIGURE_ARGS+= --with-cups-user=cups \ --with-cups-group=cups \ --libdir=/usr/lib \ @@ -76,8 +65,6 @@ CONFIGURE_ARGS+= --with-cups-user=cups \ --with-components=core \ --with-rcdir=$(STAGING_TARGET_DIR)/etc -FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true" - cups-install: ${INSTALL_DIR} ${IDIR_CUPS}/usr/lib ${CP} ${WRKINST}/usr/lib/libcups*.so* ${IDIR_CUPS}/usr/lib/ diff --git a/package/cups/patches/patch-Makedefs_in b/package/cups/patches/patch-Makedefs_in deleted file mode 100644 index 1a8f91894..000000000 --- a/package/cups/patches/patch-Makedefs_in +++ /dev/null @@ -1,10 +0,0 @@ ---- cups-1.7.1.orig/Makedefs.in 2013-07-17 17:21:18.000000000 +0200 -+++ cups-1.7.1/Makedefs.in 2014-01-31 08:40:55.000000000 +0100 -@@ -238,7 +238,6 @@ DBUSDIR = @DBUSDIR@ - # Rules... - # - --.SILENT: - .SUFFIXES: .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz - - .c.o: diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure deleted file mode 100644 index 3a4974140..000000000 --- a/package/cups/patches/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ ---- cups-1.7.1.orig/configure 2014-01-08 17:26:27.000000000 +0100 -+++ cups-1.7.1/configure 2014-01-31 16:48:50.000000000 +0100 -@@ -2490,9 +2490,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - --uname=`uname` --uversion=`uname -r | sed -e '1,$s/^[^0-9]*\([0-9]*\)\.\([0-9]*\).*/\1\2/'` --uarch=`uname -m` -+uname=Linux -+uversion=3.0 - - case "$uname" in - Darwin*) diff --git a/package/curl/Makefile b/package/curl/Makefile index df4ac926a..f01184500 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,31 +4,36 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.75.0 +PKG_VERSION:= 8.6.0 PKG_RELEASE:= 1 -PKG_HASH:= fe0c49d8468249000bda75bcfdf9e30ff7e9a86d35f1a21f428d79c389d55675 +PKG_HASH:= 3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15 PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http -PKG_DEPENDS:= libcurl PKG_BUILDDEP:= zlib PKG_NEEDS:= threads -PKG_URL:= http://curl.haxx.se/ -PKG_SITES:= http://curl.haxx.se/download/ +PKG_URL:= https://curl.se/ +PKG_SITES:= https://curl.se/download/ PKG_LIBNAME:= libcurl PKG_OPTS:= dev -PKG_SUBPKGS:= CURL LIBCURL +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 +PKGSC_CURL:= net/http +PKGSS_CURL:= zlib libcurl -PKG_FLAVOURS_CURL:= WITH_IPV6 +PKG_FLAVOURS_LIBCURL:= WITH_IPV6 PKGFD_WITH_IPV6:= enable ipv6 support -PKG_CHOICES_CURL:= WITH_LIBRESSL WITH_GNUTLS WITH_WOLFSSL WITHOUT_SSL +PKG_CHOICES_LIBCURL:= WITH_LIBRESSL WITH_OPENSSL WITH_GNUTLS WITH_WOLFSSL WITHOUT_SSL PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCB_WITH_LIBRESSL:= libressl +PKGCD_WITH_OPENSSL:= use libopenssl for crypto +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_GNUTLS:= use gnutls for crypto PKGCS_WITH_GNUTLS:= libgnutls ca-certificates PKGCB_WITH_GNUTLS:= gnutls @@ -41,40 +46,43 @@ include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(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})) -ifeq (${ADK_PACKAGE_CURL_WITH_LIBRESSL},y) -CONFIGURE_ARGS+= --with-ssl="${STAGING_TARGET_DIR}/usr" \ - --without-gnutls \ - --without-axtls +HOST_CONFIGURE_ARGS+= --without-ssl \ + --without-libpsl + +ifeq (${ADK_PACKAGE_LIBCURL_WITH_LIBRESSL},y) +CONFIGURE_ARGS+= --with-openssl="${STAGING_TARGET_DIR}/usr" \ + --without-gnutls +endif +ifeq (${ADK_PACKAGE_LIBCURL_WITH_OPENSSL},y) +CONFIGURE_ARGS+= --with-openssl="${STAGING_TARGET_DIR}/usr" \ + --without-gnutls endif -ifeq (${ADK_PACKAGE_CURL_WITH_GNUTLS},y) +ifeq (${ADK_PACKAGE_LIBCURL_WITH_GNUTLS},y) CONFIGURE_ARGS+= --with-gnutls="${STAGING_TARGET_DIR}/usr" \ - --without-ssl \ - --without-axtls + --without-openssl endif -ifeq (${ADK_PACKAGE_CURL_WITH_WOLFSSL},y) +ifeq (${ADK_PACKAGE_LIBCURL_WITH_WOLFSSL},y) CONFIGURE_ARGS+= --with-cyassl="${STAGING_TARGET_DIR}/usr" \ - --without-ssl \ - --without-gnutls \ - --without-axtls + --without-openssl \ + --without-gnutls endif -ifeq (${ADK_PACKAGE_CURL_WITHOUT_SSL},y) +ifeq (${ADK_PACKAGE_LIBCURL_WITHOUT_SSL},y) CONFIGURE_ARGS+= --without-ssl \ - --without-gnutls \ - --without-axtls + --without-gnutls endif -CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t +CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t \ + LDFLAGS='$(TARGET_LDFLAGS) -latomic' CONFIGURE_ARGS+= --enable-cookies \ - --enable-crypto-auth \ - --enable-nonblocking \ --enable-file \ --enable-ftp \ --enable-http \ --enable-proxy \ --disable-curldebug \ + --disable-ntlm \ --disable-ntlm-wb \ --disable-symbol-hiding \ --disable-ares \ @@ -89,13 +97,13 @@ CONFIGURE_ARGS+= --enable-cookies \ --disable-telnet \ --disable-verbose \ --without-libssh2 \ + --without-libpsl \ --without-librtmp \ - --without-libidn \ --with-ca-path="/etc/ssl/certs" \ --with-random="/dev/urandom" \ --without-ca-bundle -ifneq (${ADK_PACKAGE_CURL_WITH_IPV6},) +ifneq (${ADK_PACKAGE_LIBCURL_WITH_IPV6},) CONFIGURE_ARGS+= --enable-ipv6 else CONFIGURE_ARGS+= --disable-ipv6 diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile deleted file mode 100644 index 0d02595c8..000000000 --- a/package/cxxtools/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:= cxxtools -PKG_VERSION:= 2.2.1 -PKG_RELEASE:= 2 -PKG_HASH:= 8cebb6d6cda7c93cc4f7c0d552a68d50dd5530b699cf87916bb3b708fdc4e342 -PKG_DESCR:= collection of general-purpose c++ classes -PKG_NEEDS:= c++ -PKG_SECTION:= libs/misc -PKG_URL:= http://www.tntnet.org/ -PKG_SITES:= http://www.tntnet.org/download/ -PKG_OPTS:= dev - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,CXXTOOLS,cxxtools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) - -ifeq ($(ADK_TARGET_ARCH_XTENSA),y) -CONFIGURE_ARGS+= --with-atomictype=generic -endif -ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3),y) -CONFIGURE_ARGS+= --with-atomictype=pthread -endif -ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3P),y) -CONFIGURE_ARGS+= --with-atomictype=pthread -endif -CONFIGURE_ARGS+= --disable-demos \ - --disable-unittest - -cxxtools-install: - ${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libcxxtools.so* ${IDIR_CXXTOOLS}/usr/lib - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile deleted file mode 100644 index 4d27872ed..000000000 --- a/package/dansguardian/Makefile +++ /dev/null @@ -1,41 +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:= dansguardian -PKG_VERSION:= 2.12.0.3 -PKG_RELEASE:= 2 -PKG_HASH:= c74e9a32b97f9a9a056fced3da23fe48fca2bc6aa9af670afe9a53dc819414f5 -PKG_DESCR:= web content filter proxy -PKG_SECTION:= net/proxy -PKG_DEPENDS:= libpcre zlib -PKG_BUILDDEP:= pcre zlib -PKG_NEEDS:= c++ -PKG_URL:= http://dansguardian.org/ -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=dansguardian/} - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,DANSGUARDIAN,dansguardian,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_ARGS+= --enable-orig-ip \ - --with-proxyuser=proxy \ - --with-proxygroup=proxy - -dansguardian-install: - ${INSTALL_DIR} ${IDIR_DANSGUARDIAN}/usr/sbin \ - ${IDIR_DANSGUARDIAN}/etc/dansguardian \ - ${IDIR_DANSGUARDIAN}/usr/share/dansguardian/languages/ukenglish - ${CP} ${WRKINST}/usr/share/dansguardian/languages/ukenglish/* \ - ${IDIR_DANSGUARDIAN}/usr/share/dansguardian/languages/ukenglish - ${CP} ${WRKINST}/usr/share/dansguardian/transparent1x1.gif \ - ${IDIR_DANSGUARDIAN}/usr/share/dansguardian - ${CP} ${WRKINST}/etc/dansguardian/* \ - ${IDIR_DANSGUARDIAN}/etc/dansguardian - ${INSTALL_BIN} ${WRKINST}/usr/sbin/dansguardian \ - ${IDIR_DANSGUARDIAN}/usr/sbin/ - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dansguardian/files/dansguardian.init b/package/dansguardian/files/dansguardian.init deleted file mode 100644 index f8f40a9ca..000000000 --- a/package/dansguardian/files/dansguardian.init +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -#PKG dansguardian -#INIT 80 - -. /etc/rc.conf - -case $1 in -autostop) ;; -autostart) - test x"${dansguardian:-NO}" = x"NO" && exit 0 - test x"$dansguardian" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start - exec sh $0 start - ;; -start) - if [ ! -f /var/log/dansguardian-access.log ];then - touch /var/log/dansguardian-access.log - chown proxy:proxy /var/log/dansguardian-access.log - fi - /usr/sbin/dansguardian - ;; -stop) - kill $(pgrep -f /usr/sbin/dansguardian) - ;; -restart) - sh $0 stop - sh $0 start - ;; - -*) - echo "usage: $0 {start | stop | restart}" - exit 1 -esac -exit $? diff --git a/package/dansguardian/files/dansguardian.postinst b/package/dansguardian/files/dansguardian.postinst deleted file mode 100644 index 8068f3d34..000000000 --- a/package/dansguardian/files/dansguardian.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -gid=$(get_next_gid) -add_user dansguardian $(get_next_uid) $gid /etc/dansguardian -add_group dansguardian $gid -add_rcconf dansguardian NO diff --git a/package/dansguardian/patches/patch-src_ImageContainer_cpp b/package/dansguardian/patches/patch-src_ImageContainer_cpp deleted file mode 100644 index 27ccecafc..000000000 --- a/package/dansguardian/patches/patch-src_ImageContainer_cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- dansguardian-2.12.0.3.orig/src/ImageContainer.cpp 2012-09-29 22:06:45.000000000 +0200 -+++ dansguardian-2.12.0.3/src/ImageContainer.cpp 2013-12-07 10:07:04.000000000 +0100 -@@ -16,6 +16,7 @@ - #include <stdexcept> - #include <cerrno> - #include <limits.h> -+#include <string.h> - - - // GLOBALS diff --git a/package/dansguardian/patches/patch-src_SocketArray_cpp b/package/dansguardian/patches/patch-src_SocketArray_cpp deleted file mode 100644 index c08c483eb..000000000 --- a/package/dansguardian/patches/patch-src_SocketArray_cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- dansguardian-2.12.0.3.orig/src/SocketArray.cpp 2011-08-02 15:31:45.000000000 +0200 -+++ dansguardian-2.12.0.3/src/SocketArray.cpp 2013-12-07 10:07:51.000000000 +0100 -@@ -14,6 +14,7 @@ - - #include <syslog.h> - #include <cerrno> -+#include <string.h> - - - // GLOBALS diff --git a/package/dansguardian/patches/patch-src_UDSocket_cpp b/package/dansguardian/patches/patch-src_UDSocket_cpp deleted file mode 100644 index 3922e98f1..000000000 --- a/package/dansguardian/patches/patch-src_UDSocket_cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- dansguardian-2.12.0.3.orig/src/UDSocket.cpp 2012-09-29 22:06:45.000000000 +0200 -+++ dansguardian-2.12.0.3/src/UDSocket.cpp 2013-12-07 10:05:50.000000000 +0100 -@@ -21,6 +21,7 @@ - #include <unistd.h> - #include <stdexcept> - #include <stddef.h> -+#include <string.h> - - #ifdef DGDEBUG - #include <iostream> diff --git a/package/daq/Makefile b/package/daq/Makefile index 536edead0..3e72dca8c 100644 --- a/package/daq/Makefile +++ b/package/daq/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= daq -PKG_VERSION:= 2.0.6 +PKG_VERSION:= 2.0.7 PKG_RELEASE:= 1 -PKG_HASH:= d41da5f7793e66044e6927dd868c0525e7ee4ec1a3515bf74ef9a30cd9273af0 +PKG_HASH:= d1f6709bc5dbddee3fdf170cdc1e49fb926e2031d4869ecf367a8c47efc87279 PKG_DESCR:= data acquisition library PKG_SECTION:= libs/misc PKG_DEPENDS:= libpcap libdnet diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index 79cb2f960..556ccb9f1 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= davfs2 -PKG_VERSION:= 1.5.2 +PKG_VERSION:= 1.7.0 PKG_RELEASE:= 1 -PKG_HASH:= be34a19ab57a6ea77ecb82083e9e4c1882e12b2de64257de567ad5ee7a17b358 +PKG_HASH:= 251db75a27380cca1330b1b971700c5e5dcc0c90e5a47622285f0140edfe3a2f PKG_DESCR:= webdav filesystem PKG_SECTION:= net/fs PKG_DEPENDS:= fuse-utils neon @@ -14,7 +14,7 @@ PKG_BUILDDEP:= neon fuse PKG_URL:= http://savannah.nongnu.org/projects/davfs2/ PKG_SITES:= http://download.savannah.gnu.org/releases/davfs2/ -PKG_LIBC_DEPENDS:= uclibc-ng glibc +PKG_LIBC_DEPENDS:= glibc DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -22,7 +22,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOLS_STYLE:= autoreconf +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --with-neon CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes diff --git a/package/davfs2/patches/patch-configure_ac b/package/davfs2/patches/patch-configure_ac new file mode 100644 index 000000000..c07fcf365 --- /dev/null +++ b/package/davfs2/patches/patch-configure_ac @@ -0,0 +1,11 @@ +--- davfs2-1.7.0.orig/configure.ac 2022-09-08 22:17:15.000000000 +0200 ++++ davfs2-1.7.0/configure.ac 2024-02-22 09:55:30.529042778 +0100 +@@ -36,7 +36,7 @@ AC_PROG_LN_S + # Checks for libraries. + AM_GNU_GETTEXT_VERSION(0.19.8) + AM_GNU_GETTEXT([external]) +-NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32]) ++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32 33]) + DAV_CHECK_NEON + + # Checks for header files. diff --git a/package/davfs2/patches/patch-src_Makefile_am b/package/davfs2/patches/patch-src_Makefile_am deleted file mode 100644 index 318ebd27b..000000000 --- a/package/davfs2/patches/patch-src_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ ---- davfs2-1.5.2.orig/src/Makefile.am 2014-04-22 21:19:02.000000000 +0200 -+++ davfs2-1.5.2/src/Makefile.am 2015-10-20 07:52:29.000000000 +0200 -@@ -32,8 +32,7 @@ mount_davfs_SOURCES = cache.c dav_coda.c - kernel_interface.h mount_davfs.h webdav.h - umount_davfs_SOURCES = umount_davfs.c defaults.h - --AM_CFLAGS = -Wall -Werror=format-security \ -- -fstack-protector --param=ssp-buffer-size=4 -+AM_CFLAGS = -Wall -Werror=format-security - DEFS = -DPROGRAM_NAME=\"mount.davfs\" \ - -DDAV_SYS_CONF_DIR=\"$(pkgsysconfdir)\" \ - -DDAV_LOCALSTATE_DIR=\"$(dav_localstatedir)\" \ diff --git a/package/davfs2/patches/patch-src_Makefile_in b/package/davfs2/patches/patch-src_Makefile_in deleted file mode 100644 index c99e6071d..000000000 --- a/package/davfs2/patches/patch-src_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ ---- davfs2-1.5.2.orig/src/Makefile.in 2014-08-23 20:13:17.000000000 +0200 -+++ davfs2-1.5.2/src/Makefile.in 2016-09-24 10:24:45.225043359 +0200 -@@ -248,8 +248,7 @@ mount_davfs_SOURCES = cache.c dav_coda.c - kernel_interface.h mount_davfs.h webdav.h - - umount_davfs_SOURCES = umount_davfs.c defaults.h --AM_CFLAGS = -Wall -Werror=format-security \ -- -fstack-protector --param=ssp-buffer-size=4 -+AM_CFLAGS = - - all: all-am - diff --git a/package/dbus-python/Makefile b/package/dbus-python/Makefile index 41bddeadd..ead0f05b9 100644 --- a/package/dbus-python/Makefile +++ b/package/dbus-python/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= dbus-python -PKG_VERSION:= 1.2.0 -PKG_RELEASE:= 2 -PKG_HASH:= e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df +PKG_VERSION:= 1.3.2 +PKG_RELEASE:= 1 +PKG_HASH:= ad67819308618b5069537be237f8e68ca1c7fcc95ee4a121fe6845b1418248f8 PKG_DESCR:= python bindings for dbus PKG_SECTION:= dev/python PKG_DEPENDS:= dbus dbus-glib @@ -20,15 +20,17 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,DBUS_PYTHON,dbus-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +include $(ADK_TOPDIR)/mk/python3.mk + dbus-python-install: - $(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/ - $(CP) $(WRKINST)/usr/lib/python2.7/site-packages/*.so \ - $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/ - $(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus - $(CP) $(WRKINST)/usr/lib/python2.7/site-packages/dbus/*.py \ - $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus/ - $(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus/mainloop - $(CP) $(WRKINST)/usr/lib/python2.7/site-packages/dbus/mainloop/*.py \ - $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus/mainloop + $(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages/ + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/*.so \ + $(IDIR_DBUS_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages/ + $(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages/dbus + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/dbus/*.py \ + $(IDIR_DBUS_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages/dbus/ + $(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages/dbus/mainloop + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/dbus/mainloop/*.py \ + $(IDIR_DBUS_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages/dbus/mainloop include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dbus-python/patches/patch-configure b/package/dbus-python/patches/patch-configure deleted file mode 100644 index f13116469..000000000 --- a/package/dbus-python/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- dbus-python-1.2.0.orig/configure 2013-05-08 09:48:42.000000000 +0200 -+++ dbus-python-1.2.0/configure 2013-12-13 12:52:44.522656370 +0100 -@@ -11762,7 +11762,7 @@ $as_echo "$as_me: PYTHON_INCLUDES overri - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python headers using $PYTHON-config --includes" >&5 - $as_echo_n "checking for Python headers using $PYTHON-config --includes... " >&6; } -- PYTHON_INCLUDES=`$PYTHON-config --includes` -+ PYTHON_INCLUDES=`python-config --includes` - if test $? = 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_INCLUDES" >&5 - $as_echo "$PYTHON_INCLUDES" >&6; } diff --git a/package/dbus/Makefile b/package/dbus/Makefile index c32a5fdcd..90ac2f089 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= dbus PKG_VERSION:= 1.10.20 -PKG_RELEASE:= 1 +PKG_RELEASE:= 3 PKG_HASH:= e574b9780b5425fde4d973bb596e7ea0f09e00fe2edd662da9016e976c460b48 PKG_DESCR:= desktop bus daemon PKG_SECTION:= sys/misc @@ -24,10 +24,6 @@ PKGSD_LIBDBUS:= DBUS library PKGSC_LIBDBUS:= libs/misc PKGSS_LIBDBUS:= libexpat libuuid -PKG_FLAVOURS_DBUS:= WITH_SYSTEMD -PKGFD_WITH_SYSTEMD:= enable systemd support -PKGFB_WITH_SYSTEMD:= systemd - include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -36,20 +32,15 @@ $(eval $(call PKG_template,LIBDBUS,libdbus,${PKG_VERSION}-${PKG_RELEASE},${PKGSS TARGET_LDFLAGS+= -luuid AUTOTOOL_STYLE:= autoreconf -ifeq ($(ADK_PACKAGE_DBUS_WITH_SYSTEMD),y) -CONFIGURE_ARGS+= --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system -TARGET_LDFLAGS+= -lsystemd -else -CONFIGURE_ARGS+= --disable-systemd -endif - -CONFIGURE_ARGS+= --disable-tests \ +CONFIGURE_ARGS+= --disable-systemd \ + --disable-tests \ --disable-asserts \ --enable-abstract-sockets \ --with-dbus-user=dbus \ --with-system-socket=/run/dbus/system_bus_socket \ --with-system-pid-file=/run/dbus/dbus.pid \ --disable-verbose-mode \ + --disable-apparmor \ --disable-kqueue \ --disable-selinux \ --disable-libaudit \ @@ -76,10 +67,6 @@ dbus-install: ${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc ${CP} ${WRKINST}/usr/share/dbus-1 ${IDIR_DBUS}/usr/share ${CP} ${WRKINST}/usr/bin/dbus-* ${IDIR_DBUS}/usr/bin -ifeq ($(ADK_PACKAGE_DBUS_WITH_SYSTEMD),y) - ${INSTALL_DIR} ${IDIR_DBUS}/usr/lib/systemd - ${CP} ${WRKINST}/usr/lib/systemd/* ${IDIR_DBUS}/usr/lib/systemd -endif # workaround for dev subpackage ${INSTALL_DIR} $(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus $(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \ diff --git a/package/deco/Makefile b/package/deco/Makefile index 532f9e22a..bb3c1ca08 100644 --- a/package/deco/Makefile +++ b/package/deco/Makefile @@ -20,6 +20,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,DECO,deco,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CFLAGS+= -fcommon TARGET_LDFLAGS+= -ltinfo INSTALL_STYLE:= manual diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile index d86e13725..a007837d1 100644 --- a/package/dhcp/Makefile +++ b/package/dhcp/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= dhcp -PKG_VERSION:= 4.3.5 +PKG_VERSION:= 4.4.3-P1 PKG_RELEASE:= 1 -PKG_HASH:= eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954 +PKG_HASH:= 0ac416bb55997ca8632174fd10737fd61cdb8dba2752160a335775bc21dc73c7 PKG_DESCR:= dhcp server PKG_SECTION:= net/dns PKG_URL:= https://www.isc.org/software/dhcp/ -PKG_SITES:= ftp://ftp.isc.org/isc/dhcp/${PKG_VERSION}/ +PKG_SITES:= https://downloads.isc.org/isc/dhcp/$(PKG_VERSION)/ PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/dhcp/patches/patch-bind_Makefile_in b/package/dhcp/patches/patch-bind_Makefile_in deleted file mode 100644 index 8f686ec26..000000000 --- a/package/dhcp/patches/patch-bind_Makefile_in +++ /dev/null @@ -1,13 +0,0 @@ ---- dhcp-4.3.5.orig/bind/Makefile.in 2016-09-27 21:54:32.000000000 +0200 -+++ dhcp-4.3.5/bind/Makefile.in 2016-11-26 07:21:39.000000000 +0100 -@@ -30,7 +30,9 @@ bindconfig = --disable-kqueue --disable- - --without-openssl --without-libxml2 --enable-exportlib \ - --with-gssapi=no --enable-threads=no @BINDCONFIG@ \ - --with-export-includedir=${binddir}/include \ -- --with-export-libdir=${binddir}/lib -+ --with-export-libdir=${binddir}/lib \ -+ --target=@target_alias@ --host=@host_alias@ \ -+ --build=@build_alias@ - - @BIND_ATF_FALSE@cleandirs = ./lib ./include - @BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf diff --git a/package/dhcp/patches/patch-common_discover_c b/package/dhcp/patches/patch-common_discover_c deleted file mode 100644 index 372ca8e1c..000000000 --- a/package/dhcp/patches/patch-common_discover_c +++ /dev/null @@ -1,13 +0,0 @@ ---- dhcp-4.3.5.orig/common/discover.c 2016-09-27 21:16:50.000000000 +0200 -+++ dhcp-4.3.5/common/discover.c 2016-11-26 07:09:35.000000000 +0100 -@@ -692,8 +692,8 @@ next_iface6(struct iface_info *info, int - for (i=0; i<16; i++) { - unsigned char byte; - static const char hex[] = "0123456789abcdef"; -- byte = ((index(hex, buf[i * 2]) - hex) << 4) | -- (index(hex, buf[i * 2 + 1]) - hex); -+ byte = ((strchr(hex, buf[i * 2]) - hex) << 4) | -+ (strchr(hex, buf[i * 2 + 1]) - hex); - addr.sin6_addr.s6_addr[i] = byte; - } - memcpy(&info->addr, &addr, sizeof(addr)); diff --git a/package/dillo/Makefile b/package/dillo/Makefile index 31316f69c..0535edb69 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -24,6 +24,8 @@ 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 CONFIGURE_ENV+= PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config CONFIGURE_ARGS+= --enable-ssl diff --git a/package/dillo/patches/patch-dpi_https_c b/package/dillo/patches/patch-dpi_https_c new file mode 100644 index 000000000..90c91198d --- /dev/null +++ b/package/dillo/patches/patch-dpi_https_c @@ -0,0 +1,14 @@ +--- dillo-3.0.5.orig/dpi/https.c 2015-06-30 16:06:08.000000000 +0200 ++++ dillo-3.0.5/dpi/https.c 2024-03-04 08:18:34.867259406 +0100 +@@ -476,7 +476,11 @@ static int handle_certificate_problem(SS + case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: + /*Either self signed and untrusted*/ + /*Extract CN from certificate name information*/ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) { ++#else ++ if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) { ++#endif + strcpy(buf, "(no CN given)"); + } else { + char *cn_end; diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 7c80b2be3..d204305b0 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= dnsmasq -PKG_VERSION:= 2.81 +PKG_VERSION:= 2.90 PKG_RELEASE:= 1 -PKG_HASH:= 749ca903537c5197c26444ac24b0dce242cf42595fdfe6b9a5b9e4c7ad32f8fb +PKG_HASH:= 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 PKG_DESCR:= lightweight dns, dhcp and tftp server PKG_SECTION:= net/dns PKG_KDEPENDS:= inotify-user diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile index f015fa37a..8238eced9 100644 --- a/package/dosfstools/Makefile +++ b/package/dosfstools/Makefile @@ -4,14 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= dosfstools -PKG_VERSION:= 4.1 +PKG_VERSION:= 4.2 PKG_RELEASE:= 1 -PKG_HASH:= e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173 +PKG_HASH:= 64926eebf90092dca21b14259a5301b7b98e7b1943e8a201c7d726084809b527 PKG_DESCR:= utilities to create and check fat filesystems PKG_SECTION:= sys/fs -PKG_NEEDS:= iconv PKG_URL:= http://www.daniel-baumann.ch/software/dosfstools/ -PKG_SITES:= https://github.com/dosfstools/dosfstools/releases/download/v$(PKG_VERSION)/ +PKG_SITES:= https://github.com/dosfstools/dosfstools/releases/download/v4.2/ + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CFLINE_DOSFSTOOLS:= select BUSYBOX_FSCK diff --git a/package/drbd-utils/Makefile b/package/drbd-utils/Makefile deleted file mode 100644 index 26445fbe7..000000000 --- a/package/drbd-utils/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:= drbd-utils -PKG_VERSION:= 8.9.6 -PKG_RELEASE:= 1 -PKG_HASH:= 297b77c9b3f88de2e7dae459234f2753ea4fc2805282b2d276e35cf51e292913 -PKG_DESCR:= admin tools for drbd-utils -PKG_SECTION:= sys/fs -PKG_SITES:= http://oss.linbit.com/drbd/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,DRBD_UTILS,drbd-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -XAKE_FLAGS+= GENETLINK_H=$(STAGING_TARGET_DIR)/usr/include/linux/genetlink.h -CONFIGURE_ARGS+= --with-distro=generic \ - --without-manual \ - --with-pacemaker \ - --without-heartbeat \ - --without-km \ - --without-xen \ - --without-udev - -drbd-utils-install: - $(INSTALL_DIR) $(IDIR_DRBD_UTILS)/etc - $(CP) ./files/drbd.conf $(IDIR_DRBD_UTILS)/etc - $(INSTALL_DIR) $(IDIR_DRBD_UTILS)/usr/lib/drbd - $(INSTALL_DIR) $(IDIR_DRBD_UTILS)/usr/sbin - $(CP) $(WRKINST)/usr/lib/drbd/* \ - $(IDIR_DRBD_UTILS)/usr/lib/drbd/ - $(INSTALL_BIN) $(WRKINST)/usr/sbin/drbd* \ - $(IDIR_DRBD_UTILS)/usr/sbin - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/drbd-utils/files/drbd.conf b/package/drbd-utils/files/drbd.conf deleted file mode 100644 index 8eb55e497..000000000 --- a/package/drbd-utils/files/drbd.conf +++ /dev/null @@ -1,21 +0,0 @@ -#resource r1 { -# protocol C; -# -# startup { wfc-timeout 0; degr-wfc-timeout 120; } -# disk { on-io-error detach; } -# net { timeout 60; connect-int 10; ping-int 10; -# max-buffers 2048; max-epoch-size 2048; } -# syncer { rate 5M; } # sync when r0 and r1 are finished syncing. -# on alice { -# address 192.168.1.1:7790; -# disk /dev/sdb1; -# device /dev/drbd1; -# meta-disk "internal"; -# } -# on bob { -# address 192.168.1.2:7790; -# disk "/dev/sdb1"; -# device "/dev/drbd2"; -# meta-disk "internal"; -# } -#} diff --git a/package/drbd-utils/files/drbd.conffiles b/package/drbd-utils/files/drbd.conffiles deleted file mode 100644 index 9096001bf..000000000 --- a/package/drbd-utils/files/drbd.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/drbd.conf diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 050729a5c..fa8eecf66 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= dropbear -PKG_VERSION:= 2020.81 +PKG_VERSION:= 2024.84 PKG_RELEASE:= 1 -PKG_HASH:= 48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b +PKG_HASH:= 16e22b66b333d6b7e504c43679d04ed6ca30f2838db40a21f935c850dfc01009 PKG_DESCR:= ssh server/client designed for embedded systems PKG_SECTION:= net/security PKG_URL:= http://matt.ucc.asn.au/dropbear/ @@ -39,6 +39,7 @@ CONFIGURE_ARGS+= --disable-pam \ --disable-wtmpx \ --disable-loginfunc \ --disable-pututxline \ + --disable-harden \ --disable-zlib ifeq (${ADK_PACKAGE_DROPBEAR_WITH_UTMP},) CONFIGURE_ARGS+= --disable-utmp --disable-pututline @@ -48,8 +49,8 @@ endif pre-configure: - $(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(WRKBUILD)/options.h - $(SED) 's,^#define DO_HOST_LOOKUP,/* & */,g' $(WRKBUILD)/options.h + echo "#define DO_HOST_LOOKUP 0" >>$(WRKBUILD)/localoptions.h + echo "#define DROPBEAR_X11FWD 1" >>$(WRKBUILD)/localoptions.h do-build: cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} \ @@ -75,9 +76,9 @@ do-install: $(IDIR_DBCONVERT)/usr/bin/dropbearconvert # ssh pubkey test -z $(ADK_RUNTIME_SSH_PUBKEY) || ( \ - $(INSTALL_DIR) $(IDIR_DROPBEAR)/etc/dropbear; \ + $(INSTALL_DIR) $(IDIR_DROPBEAR)/root/.ssh; \ echo $(ADK_RUNTIME_SSH_PUBKEY) \ - >$(IDIR_DROPBEAR)/etc/dropbear/authorized_keys; \ + >$(IDIR_DROPBEAR)/root/.ssh/authorized_keys; \ ) include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init index 9bf74098e..3e464e34b 100644 --- a/package/dropbear/files/dropbear.init +++ b/package/dropbear/files/dropbear.init @@ -24,19 +24,19 @@ start) test $rv = 0 || exit 1 test -f /etc/dropbear/dropbear_rsa_host_key || exit 1 fi - if test ! -f /etc/dropbear/dropbear_dss_host_key; then + if test ! -f /etc/dropbear/dropbear_ecdsa_host_key; then # take it easy here, since above already catched the worst cases if test -x /usr/bin/dropbearkey; then - echo "dropbear: generating SSH private key (DSS)" - /usr/bin/dropbearkey -f /etc/dropbear/dropbear_dss_host_key -t dss + echo "dropbear: generating SSH private key (ECDSA)" + /usr/bin/dropbearkey -f /etc/dropbear/dropbear_ecdsa_host_key -t ecdsa echo "dropbear: key generation exited with code $?" fi fi - if test ! -f /etc/dropbear/dropbear_ecdsa_host_key; then + if test ! -f /etc/dropbear/dropbear_ed25519_host_key; then # take it easy here, since above already catched the worst cases if test -x /usr/bin/dropbearkey; then - echo "dropbear: generating SSH private key (ECDSA)" - /usr/bin/dropbearkey -f /etc/dropbear/dropbear_ecdsa_host_key -t ecdsa + echo "dropbear: generating SSH private key (ED25519)" + /usr/bin/dropbearkey -f /etc/dropbear/dropbear_ed25519_host_key -t ed25519 echo "dropbear: key generation exited with code $?" fi fi diff --git a/package/dropbear/files/dropbear.service b/package/dropbear/files/dropbear.service deleted file mode 100644 index eeb86cfa7..000000000 --- a/package/dropbear/files/dropbear.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Dropbear SSH daemon -After=syslog.target network.target - -[Service] -EnvironmentFile=-/etc/default/dropbear -ExecStart=/usr/sbin/dropbear -F -R $DROPBEAR_ARGS -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/package/dropbear/patches/patch-Makefile_in b/package/dropbear/patches/patch-Makefile_in deleted file mode 100644 index b0b77949a..000000000 --- a/package/dropbear/patches/patch-Makefile_in +++ /dev/null @@ -1,35 +0,0 @@ ---- dropbear-2020.81.orig/Makefile.in 2020-10-29 14:35:50.000000000 +0100 -+++ dropbear-2020.81/Makefile.in 2020-11-04 03:02:49.901343218 +0100 -@@ -106,10 +106,10 @@ AR=@AR@ - RANLIB=@RANLIB@ - STRIP=@STRIP@ - INSTALL=@INSTALL@ --CPPFLAGS=@CPPFLAGS@ --CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ --LIBS+=@LIBS@ --LDFLAGS=@LDFLAGS@ -+CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) -+LIBS+=@LIBS@ @CRYPTLIB@ -+LDFLAGS+=@LDFLAGS@ -+ - - EXEEXT=@EXEEXT@ - -@@ -198,7 +198,7 @@ dropbearkey: $(dropbearkeyobjs) - dropbearconvert: $(dropbearconvertobjs) - - dropbear: $(HEADERS) $(LIBTOM_DEPS) Makefile -- $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) @CRYPTLIB@ $(PLUGIN_LIBS) -+ $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) $(PLUGIN_LIBS) - - dbclient: $(HEADERS) $(LIBTOM_DEPS) Makefile - $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) -@@ -219,7 +219,7 @@ ifeq ($(MULTI),1) - endif - - dropbearmulti$(EXEEXT): $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile -- $(CC) $(LDFLAGS) -o $@ $(MULTIOBJS) $(LIBTOM_LIBS) $(LIBS) @CRYPTLIB@ -+ $(CC) $(LDFLAGS) -o $@ $(MULTIOBJS) $(LIBTOM_LIBS) $(LIBS) - - multibinary: dropbearmulti$(EXEEXT) - diff --git a/package/dropbear/patches/patch-svr-authpubkey_c b/package/dropbear/patches/patch-svr-authpubkey_c deleted file mode 100644 index f3df0c58f..000000000 --- a/package/dropbear/patches/patch-svr-authpubkey_c +++ /dev/null @@ -1,109 +0,0 @@ ---- dropbear-2020.81.orig/svr-authpubkey.c 2020-10-29 14:35:50.000000000 +0100 -+++ dropbear-2020.81/svr-authpubkey.c 2020-11-04 03:14:22.641017199 +0100 -@@ -386,26 +386,32 @@ static int checkpubkey(const char* keyal - goto out; - } - -- /* we don't need to check pw and pw_dir for validity, since -- * its been done in checkpubkeyperms. */ -- len = strlen(ses.authstate.pw_dir); -- /* allocate max required pathname storage, -- * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */ -- filename = m_malloc(len + 22); -- snprintf(filename, len + 22, "%s/.ssh/authorized_keys", -- ses.authstate.pw_dir); -+ /* special case for root authorized_keys in /etc/dropbear/authorized_keys */ -+ if (ses.authstate.pw_uid != 0) { -+ /* we don't need to check pw and pw_dir for validity, since -+ * its been done in checkpubkeyperms. */ -+ len = strlen(ses.authstate.pw_dir); -+ /* allocate max required pathname storage, -+ * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */ -+ filename = m_malloc(len + 22); -+ snprintf(filename, len + 22, "%s/.ssh/authorized_keys", -+ ses.authstate.pw_dir); - --#if DROPBEAR_SVR_MULTIUSER -- /* open the file as the authenticating user. */ -- origuid = getuid(); -- origgid = getgid(); -- if ((setegid(ses.authstate.pw_gid)) < 0 || -- (seteuid(ses.authstate.pw_uid)) < 0) { -- dropbear_exit("Failed to set euid"); -- } --#endif -+ /* open the file as the authenticating user. */ -+ origuid = getuid(); -+ origgid = getgid(); -+ if ((setegid(ses.authstate.pw_gid)) < 0 || -+ (seteuid(ses.authstate.pw_uid)) < 0) { -+ dropbear_exit("Failed to set euid"); -+ } - -- authfile = fopen(filename, "r"); -+ authfile = fopen(filename, "r"); -+ -+ } else { -+ origuid = getuid(); -+ origgid = getgid(); -+ authfile = fopen("/etc/dropbear/authorized_keys","r"); -+ } - - #if DROPBEAR_SVR_MULTIUSER - if ((seteuid(origuid)) < 0 || -@@ -474,27 +480,37 @@ static int checkpubkeyperms() { - goto out; - } - -- /* allocate max required pathname storage, -- * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */ -- len += 22; -- filename = m_malloc(len); -- strlcpy(filename, ses.authstate.pw_dir, len); -+ if (ses.authstate.pw_uid != 0) { -+ /* allocate max required pathname storage, -+ * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */ -+ filename = m_malloc(len + 22); -+ strncpy(filename, ses.authstate.pw_dir, len+1); -+ -+ /* check ~ */ -+ if (checkfileperm(filename) != DROPBEAR_SUCCESS) { -+ goto out; -+ } - -- /* check ~ */ -- if (checkfileperm(filename) != DROPBEAR_SUCCESS) { -- goto out; -- } -+ /* check ~/.ssh */ -+ strncat(filename, "/.ssh", 5); /* strlen("/.ssh") == 5 */ -+ if (checkfileperm(filename) != DROPBEAR_SUCCESS) { -+ goto out; -+ } - -- /* check ~/.ssh */ -- strlcat(filename, "/.ssh", len); -- if (checkfileperm(filename) != DROPBEAR_SUCCESS) { -- goto out; -- } -+ /* now check ~/.ssh/authorized_keys */ -+ strncat(filename, "/authorized_keys", 16); -+ if (checkfileperm(filename) != DROPBEAR_SUCCESS) { -+ goto out; -+ } - -- /* now check ~/.ssh/authorized_keys */ -- strlcat(filename, "/authorized_keys", len); -- if (checkfileperm(filename) != DROPBEAR_SUCCESS) { -- goto out; -+ } else { -+ -+ if (checkfileperm("/etc/dropbear") != DROPBEAR_SUCCESS) { -+ goto out; -+ } -+ if (checkfileperm("/etc/dropbear/authorized_keys") != DROPBEAR_SUCCESS) { -+ goto out; -+ } - } - - /* file looks ok, return success */ diff --git a/package/dtc/Makefile b/package/dtc/Makefile index f822ba8e7..d0a95841a 100644 --- a/package/dtc/Makefile +++ b/package/dtc/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= dtc -PKG_VERSION:= 1.6.0 +PKG_VERSION:= 1.7.0 PKG_RELEASE:= 1 -PKG_HASH:= 3d15dee7126a6c4a015ab47ec908cab13e39774b0315efaaebb223cb4a4d349c +PKG_HASH:= 70d9c156ec86d63de0f7bdae50540ffa492b25ec1d69491c7520845c860b9a62 PKG_DESCR:= compiler for dts files PKG_SECTION:= sys/misc HOST_BUILDDEP:= m4-host flex-host bison-host PKG_URL:= http://www.devicetree.org/Device_Tree_Compiler -PKG_SITES:= https://github.com/dgibson/dtc/archive/ +PKG_SITES:= https://github.com/dgibson/dtc/archive/refs/tags/ DISTFILES:= v$(PKG_VERSION).tar.gz @@ -23,6 +23,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,DTC,dtc,$(PKG_VERSION)-$(PKG_RELEASE))) HOST_STYLE:= manual +HOST_MAKE_FLAGS+= NO_PYTHON=1 host-build: (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ diff --git a/package/dtc/patches/patch-Makefile b/package/dtc/patches/patch-Makefile new file mode 100644 index 000000000..9a4553381 --- /dev/null +++ b/package/dtc/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- dtc-1.6.1.orig/Makefile 2021-06-08 09:00:49.000000000 +0200 ++++ dtc-1.6.1/Makefile 2022-09-20 08:58:33.198381442 +0200 +@@ -23,7 +23,7 @@ ASSUME_MASK ?= 0 + CPPFLAGS = -I libfdt -I . -DFDT_ASSUME_MASK=$(ASSUME_MASK) + WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ + -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow +-CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS) ++CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) $(WARNINGS) $(EXTRA_CFLAGS) + + BISON = bison + LEX = flex diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index d3e9567e2..3e565c647 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= e2fsprogs -PKG_VERSION:= 1.44.2 +PKG_VERSION:= 1.47.0 PKG_RELEASE:= 1 -PKG_HASH:= 8324cf0b6e81805a741d94087b00e99f7e16144f1ee5a413709a1fa6948b126c +PKG_HASH:= 144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db PKG_DESCR:= ext2/3/4 filesystem utilities PKG_SECTION:= sys/fs PKG_BUILDDEP:= util-linux @@ -14,23 +14,17 @@ PKG_NEEDS:= threads PKG_URL:= http://e2fsprogs.sourceforge.net/ PKG_SITES:= https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/ PKG_OPTS:= dev -PKG_NOPARALLEL:= 1 PKG_CFLINE_E2FSPROGS:= select BUSYBOX_FSCK PKG_SUBPKGS:= LIBE2FS LIBCOM_ERR LIBSS PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS -PKG_SUBPKGS+= E2FSCK_STATIC TUNE2FS_STATIC PKGSD_LIBE2FS:= e2fsprogs library PKGSC_LIBE2FS:= libs/misc PKGSD_LIBCOM_ERR:= common error library PKGSC_LIBCOM_ERR:= libs/misc PKGSD_LIBSS:= subsystem command parsing library PKGSC_LIBSS:= libs/misc -PKGSD_E2FSCK_STATIC:= static build of e2fsck -PKGSC_E2FSCK_STATIC:= sys/fs -PKGSD_TUNE2FS_STATIC:= static build of tune2fs -PKGSC_TUNE2FS_STATIC:= sys/fs PKGSD_RESIZE2FS:= ext2/3/4 resize utility PKGSC_RESIZE2FS:= sys/fs PKGSS_RESIZE2FS:= libe2fs libcom-err libblkid @@ -55,14 +49,13 @@ $(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,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC})) -$(eval $(call PKG_template,TUNE2FS_STATIC,tune2fs-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC})) HOST_CONFIGURE_ARGS+= --disable-rpath \ --disable-nls \ --disable-uuidd \ --disable-defrag \ - --disable-debugfs + --disable-debugfs \ + --with-crond-dir="$(STAGING_HOST_DIR)/etc" ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) CONFIGURE_ARGS+= --disable-elf-shlibs @@ -130,17 +123,5 @@ libss-install: $(CP) $(WRKINST)/usr/lib/libss.so* \ $(IDIR_LIBSS)/usr/lib -e2fsck-static-install: - ${MAKE} -C ${WRKBUILD}/e2fsck e2fsck.static - ${INSTALL_DIR} ${IDIR_E2FSCK_STATIC}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static \ - ${IDIR_E2FSCK_STATIC}/usr/sbin/e2fsck - -tune2fs-static-install: - ${MAKE} -C ${WRKBUILD}/misc tune2fs.static - ${INSTALL_DIR} ${IDIR_TUNE2FS_STATIC}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/misc/tune2fs.static \ - ${IDIR_TUNE2FS_STATIC}/usr/sbin/tune2fs - include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/elinks/Makefile b/package/elinks/Makefile deleted file mode 100644 index 23d5c25fd..000000000 --- a/package/elinks/Makefile +++ /dev/null @@ -1,75 +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:= elinks -PKG_VERSION:= 0.11.7 -PKG_RELEASE:= 3 -PKG_HASH:= 94dc254cdecddee51819ae17962d9e606690bee3ec43fb43c635cb40197b4bc7 -PKG_DESCR:= advanced text web browser -PKG_SECTION:= app/browser -PKG_URL:= http://elinks.or.cz/ -PKG_SITES:= http://elinks.or.cz/download/ - -PKG_NOPARALLEL:= 1 - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -PKG_FLAVOURS_ELINKS:= WITH_IPV6 -PKGFD_WITH_IPV6:= enable IPv6 support - -PKG_CHOICES_ELINKS:= WITH_LIBRESSL WITHOUT_SSL -PKGCD_WITH_LIBRESSL:= use libressl for crypto -PKGCB_WITH_LIBRESSL:= libressl -PKGCS_WITH_LIBRESSL:= libressl ca-certificates -PKGCD_WITHOUT_SSL:= use no ssl - -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,ELINKS,elinks,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -INSTALL_STYLE:= manual -TARGET_CFLAGS+= -fPIC -CONFIGURE_ENV+= $(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=yes -CONFIGURE_ENV+= $(shell echo ac_cv_file_${WRKBUILD}/features.conf | tr [:blank:]-/. _)=yes -CONFIGURE_ARGS+= --enable-small \ - --enable-256-colors \ - --disable-backtrace \ - --disable-data \ - --disable-formhist \ - --disable-leds \ - --disable-mailcap \ - --disable-mouse \ - --disable-smb \ - --disable-uri-rewrite \ - --disable-xbel \ - --without-bzlib \ - --without-gpm \ - --without-idn \ - --without-gnutls \ - --without-libiconv \ - --without-lua \ - --without-spidermonkey \ - --without-x \ - --without-zlib -MAKE_FLAGS+= CC='${TARGET_CC}' - -ifneq (${ADK_PACKAGE_ELINKS_WITH_IPV6},) -CONFIGURE_ARGS+= --enable-ipv6 -else -CONFIGURE_ARGS+= --disable-ipv6 -endif - -ifeq ($(ADK_PACKAGE_ELINKS_WITH_LIBRESSL),y) -CONFIGURE_ARGS+= --with-openssl='${STAGING_TARGET_DIR}/usr' -endif -ifeq ($(ADK_PACKAGE_ELINKS_WITHOUT_SSL),y) -CONFIGURE_ARGS+= --without-openssl -endif - -do-install: - ${INSTALL_DIR} ${IDIR_ELINKS}/usr/bin - ${INSTALL_BIN} ${WRKBUILD}/src/elinks ${IDIR_ELINKS}/usr/bin/ - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/elinks/patches/patch-Makefile_lib b/package/elinks/patches/patch-Makefile_lib deleted file mode 100644 index 122e6c13d..000000000 --- a/package/elinks/patches/patch-Makefile_lib +++ /dev/null @@ -1,11 +0,0 @@ ---- elinks-0.11.7.orig/Makefile.lib 2009-08-22 13:15:08.000000000 +0200 -+++ elinks-0.11.7/Makefile.lib 2010-03-06 11:28:58.000000000 +0100 -@@ -43,7 +43,7 @@ quiet_cmd_compile = ' [$(CC_COLOR)C - - # Rule to compile a set of .o files into one .o file - quiet_cmd_ld_objs = " [$(LD_COLOR)LD$(END_COLOR)] $(RELPATH)$@" -- cmd_ld_objs = $(LD) -r -o $@ $(filter $(OBJS), $^) \ -+ cmd_ld_objs = $(CC) -Wl,-r -nostdlib -o $@ $(filter $(OBJS), $^) \ - $(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), \ - `test -e $(subdir)/$(LIB_O_NAME) && echo $(subdir)/$(LIB_O_NAME)`) - diff --git a/package/elinks/patches/patch-src_network_ssl_ssl_c b/package/elinks/patches/patch-src_network_ssl_ssl_c deleted file mode 100644 index f55f43ba4..000000000 --- a/package/elinks/patches/patch-src_network_ssl_ssl_c +++ /dev/null @@ -1,16 +0,0 @@ ---- elinks-0.11.7.orig/src/network/ssl/ssl.c 2009-08-22 13:15:08.000000000 +0200 -+++ elinks-0.11.7/src/network/ssl/ssl.c 2016-09-30 18:47:20.022831750 +0200 -@@ -49,11 +49,8 @@ init_openssl(struct module *module) - * cannot initialize the PRNG and so every attempt to use SSL fails. - * It's actually an OpenSSL FAQ, and according to them, it's up to the - * application coders to seed the RNG. -- William Yodlowsky */ -- if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) { -- /* Not an EGD, so read and write to it */ -- if (RAND_load_file(f_randfile, -1)) -- RAND_write_file(f_randfile); -- } -+ if (RAND_load_file(f_randfile, -1)) -+ RAND_write_file(f_randfile); - - SSLeay_add_ssl_algorithms(); - context = SSL_CTX_new(SSLv23_client_method()); diff --git a/package/esmtp/Makefile b/package/esmtp/Makefile deleted file mode 100644 index 777dd6862..000000000 --- a/package/esmtp/Makefile +++ /dev/null @@ -1,29 +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:= esmtp -PKG_VERSION:= 1.2 -PKG_RELEASE:= 1 -PKG_HASH:= a0d26931bf731f97514da266d079d8bc7d73c65b3499ed080576ab606b21c0ce -PKG_DESCR:= relay-only mail transfer agent -PKG_SECTION:= net/mail -PKG_DEPENDS:= libesmtp flex -PKG_BUILDDEP:= libesmtp flex -PKG_URL:= http://esmtp.sourceforge.net/ -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=esmtp/} - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,ESMTP,esmtp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -esmtp-install: - $(INSTALL_DIR) $(IDIR_ESMTP)/usr/{bin,sbin} - $(INSTALL_BIN) $(WRKINST)/usr/bin/esmtp $(IDIR_ESMTP)/usr/bin - $(CP) $(WRKINST)/usr/bin/{mailq,newaliases} $(IDIR_ESMTP)/usr/bin/ - $(CP) $(WRKINST)/usr/sbin/sendmail $(IDIR_ESMTP)/usr/sbin/ - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile index f432bc7d2..5360d31ee 100644 --- a/package/ethtool/Makefile +++ b/package/ethtool/Makefile @@ -4,10 +4,12 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= ethtool -PKG_VERSION:= 4.16 +PKG_VERSION:= 5.15 PKG_RELEASE:= 1 -PKG_HASH:= fe967a6722db2099fa63d847b6628e3e31cf9f53571a37503347dcc3e4015a03 +PKG_HASH:= 686fd6110389d49c2a120f00c3cd5dfe43debada8e021e4270d74bbe452a116d PKG_DESCR:= display or change ethernet card settings +PKG_DEPENDS:= libmnl +PKG_BUILDDEP:= libmnl PKG_SECTION:= net/misc PKG_SITES:= https://www.kernel.org/pub/software/network/ethtool/ diff --git a/package/expat/Makefile b/package/expat/Makefile index 2bb86dd21..986a97218 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -4,19 +4,17 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= expat -PKG_VERSION:= 2.2.5 +PKG_VERSION:= 2.6.2 PKG_RELEASE:= 1 -PKG_HASH:= d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6 +PKG_HASH:= ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 PKG_DESCR:= xml parsing library PKG_SECTION:= libs/data PKG_NEEDS:= c++ PKG_URL:= http://expat.sourceforge.net -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=expat/} +PKG_SITES:= https://github.com/libexpat/libexpat/releases/download/R_2_6_2/ PKG_LIBNAME:= libexpat PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk @@ -28,6 +26,8 @@ TARGET_CFLAGS:= $(filter-out -static,$(TARGET_CFLAGS)) TARGET_LDFLAGS:=$(filter-out -static,$(TARGET_LDFLAGS)) endif +CONFIGURE_ARGS+= --without-docbook + libexpat-install: ${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib ${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/ diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile index 16504d91d..b94227c61 100644 --- a/package/fetchmail/Makefile +++ b/package/fetchmail/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= fetchmail -PKG_VERSION:= 6.3.26 +PKG_VERSION:= 6.4.23 PKG_RELEASE:= 1 -PKG_HASH:= 79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850 +PKG_HASH:= 5f7a5e13731431134a2ca535bbced7adc666d3aeb93169a0830945d91f492300 PKG_DESCR:= fetch mail from a pop3 or imap server PKG_SECTION:= net/mail PKG_URL:= http://www.fetchmail.info @@ -22,7 +22,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,FETCHMAIL,fetchmail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ENV+= ac_cv_have_decl_TLS1_3_VERSION=no CONFIGURE_ARGS+= --without-hesiod ifeq (${ADK_PACKAGE_FETCHMAIL_WITH_LIBRESSL},y) diff --git a/package/fetchmail/patches/patch-config_h_in b/package/fetchmail/patches/patch-config_h_in deleted file mode 100644 index ec8b9c74e..000000000 --- a/package/fetchmail/patches/patch-config_h_in +++ /dev/null @@ -1,13 +0,0 @@ ---- fetchmail-6.3.26.orig/config.h.in 2013-04-23 23:36:55.000000000 +0200 -+++ fetchmail-6.3.26/config.h.in 2016-09-29 16:00:20.679625413 +0200 -@@ -53,6 +53,10 @@ - if you don't. */ - #undef HAVE_DECL_SSLV2_CLIENT_METHOD - -+/* Define to 1 if you have the declaration of `SSLv3_client_method', and to 0 -+ if you don't. */ -+#undef HAVE_DECL_SSLV3_CLIENT_METHOD -+ - /* Define to 1 if you have the declaration of `strerror', and to 0 if you - don't. */ - #undef HAVE_DECL_STRERROR diff --git a/package/fetchmail/patches/patch-configure_ac b/package/fetchmail/patches/patch-configure_ac deleted file mode 100644 index 7126bbc5f..000000000 --- a/package/fetchmail/patches/patch-configure_ac +++ /dev/null @@ -1,10 +0,0 @@ ---- fetchmail-6.3.26.orig/configure.ac 2013-04-23 22:51:10.000000000 +0200 -+++ fetchmail-6.3.26/configure.ac 2016-09-29 16:00:20.683625569 +0200 -@@ -803,6 +803,7 @@ fi - - case "$LIBS" in *-lssl*) - AC_CHECK_DECLS([SSLv2_client_method],,,[#include <openssl/ssl.h>]) -+ AC_CHECK_DECLS([SSLv3_client_method],,,[#include <openssl/ssl.h>]) - ;; - esac - diff --git a/package/fetchmail/patches/patch-fetchmail_c b/package/fetchmail/patches/patch-fetchmail_c deleted file mode 100644 index 160afa85d..000000000 --- a/package/fetchmail/patches/patch-fetchmail_c +++ /dev/null @@ -1,15 +0,0 @@ ---- fetchmail-6.3.26.orig/fetchmail.c 2013-04-23 22:00:45.000000000 +0200 -+++ fetchmail-6.3.26/fetchmail.c 2016-09-29 16:00:20.683625569 +0200 -@@ -263,6 +263,12 @@ int main(int argc, char **argv) - #ifdef SSL_ENABLE - "+SSL" - #endif -+#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0 -+ "-SSLv2" -+#endif -+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0 -+ "-SSLv3" -+#endif - #ifdef OPIE_ENABLE - "+OPIE" - #endif /* OPIE_ENABLE */ diff --git a/package/fetchmail/patches/patch-mxget_c b/package/fetchmail/patches/patch-mxget_c deleted file mode 100644 index 2dd74e8a3..000000000 --- a/package/fetchmail/patches/patch-mxget_c +++ /dev/null @@ -1,127 +0,0 @@ -$Id$ ---- fetchmail-6.3.9.orig/mxget.c 2007-06-10 10:32:47.000000000 +0200 -+++ fetchmail-6.3.9/mxget.c 2009-06-12 22:24:29.000000000 +0200 -@@ -56,6 +56,123 @@ - /* minimum possible size of MX record in packet */ - #define MIN_MX_SIZE 8 /* corresp to "a.com 0" w/ terminating space */ - -+/* from bind9 package: */ -+/* -+Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") -+Copyright (C) 1996-2003 Internet Software Consortium. -+ -+Permission to use, copy, modify, and distribute this software for any -+purpose with or without fee is hereby granted, provided that the above -+copyright notice and this permission notice appear in all copies. -+ -+THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+PERFORMANCE OF THIS SOFTWARE. -+ -+$Id: COPYRIGHT,v 1.9.18.3 2007/01/08 02:41:59 marka Exp $ -+ -+Portions Copyright (C) 1996-2001 Nominum, Inc. -+ -+Permission to use, copy, modify, and distribute this software for any -+purpose with or without fee is hereby granted, provided that the above -+copyright notice and this permission notice appear in all copies. -+ -+THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES -+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR -+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+*/ -+#define NS_TYPE_ELT 0x40 /*%< EDNS0 extended label -+type -+*/ -+#define NS_CMPRSFLGS 0xc0 /*%< Flag bits indicating name compression. */ -+#define DNS_LABELTYPE_BITSTRING 0x41 -+static int -+labellen(const u_char *lp) -+{ -+ int bitlen; -+ u_char l = *lp; -+ -+ if ((l & NS_CMPRSFLGS) == NS_CMPRSFLGS) { -+ /* should be avoided by the caller */ -+ return(-1); -+ } -+ -+ if ((l & NS_CMPRSFLGS) == NS_TYPE_ELT) { -+ if (l == DNS_LABELTYPE_BITSTRING) { -+ if ((bitlen = *(lp + 1)) == 0) -+ bitlen = 256; -+ return((bitlen + 7 ) / 8 + 1); -+ } -+ return(-1); /*%< unknwon ELT */ -+ } -+ return(l); -+} -+/*% -+ * Advance *ptrptr to skip over the compressed name it points at. -+ * -+ * return: -+ *\li 0 on success, -1 (with errno set) on failure. -+ */ -+int -+ns_name_skip(const u_char **ptrptr, const u_char *eom) -+{ -+ const u_char *cp; -+ u_int n; -+ int l; -+ -+ cp = *ptrptr; -+ while (cp < eom && (n = *cp++) != 0) { -+ /* Check for indirection. */ -+ switch (n & NS_CMPRSFLGS) { -+ case 0: /*%< normal case, n == len */ -+ cp += n; -+ continue; -+ case NS_TYPE_ELT: /*%< EDNS0 extended label */ -+ if ((l = labellen(cp - 1)) < 0) { -+// errno = EMSGSIZE; /*%< XXX */ -+ return(-1); -+ } -+ cp += l; -+ continue; -+ case NS_CMPRSFLGS: /*%< indirection */ -+ cp++; -+ break; -+ default: /*%< illegal type */ -+// errno = EMSGSIZE; -+ return (-1); -+ } -+ break; -+ } -+ if (cp > eom) { -+// errno = EMSGSIZE; -+ return (-1); -+ } -+ *ptrptr = cp; -+ return (0); -+} -+ -+/*% -+ * Skip over a compressed domain name. Return the size or -1. -+ */ -+int -+dn_skipname(const u_char *ptr, const u_char *eom) { -+ const u_char *saveptr = ptr; -+ -+ if (ns_name_skip(&ptr, eom) == -1) -+ return (-1); -+ return (ptr - saveptr); -+} -+/* End from Bind9 package */ -+ -+ - struct mxentry *getmxrecords(const char *name) - /* get MX records for given host */ - { diff --git a/package/fetchmail/patches/patch-socket_c b/package/fetchmail/patches/patch-socket_c index 54f6ff27a..a4e3f2dbf 100644 --- a/package/fetchmail/patches/patch-socket_c +++ b/package/fetchmail/patches/patch-socket_c @@ -1,20 +1,20 @@ ---- fetchmail-6.3.26.orig/socket.c 2013-04-23 22:00:45.000000000 +0200 -+++ fetchmail-6.3.26/socket.c 2016-09-29 16:00:20.683625569 +0200 -@@ -910,11 +910,16 @@ int SSLOpen(int sock, char *mycert, char - #if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 - _ctx[sock] = SSL_CTX_new(SSLv2_client_method()); - #else -- report(stderr, GT_("Your operating system does not support SSLv2.\n")); -+ report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n")); - return -1; +--- fetchmail-6.4.23.orig/socket.c 2021-08-28 11:13:58.000000000 +0200 ++++ fetchmail-6.4.23/socket.c 2021-11-12 23:58:36.082986247 +0100 +@@ -966,17 +966,9 @@ static int OSSL10X_proto_version_logic(i + report(stderr, GT_("Your OpenSSL version does not support TLS v1.2.\n")); + return -1; #endif - } else if(!strcasecmp("ssl3",myproto)) { -+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0 - _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); -+#else -+ report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n")); -+ return -1; -+#endif - } else if(!strcasecmp("tls1",myproto)) { - _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); - } else if (!strcasecmp("ssl23",myproto)) { +-#if defined(TLS1_3_VERSION) +- } else if (!strcasecmp("tls1.3", *myproto)) { +- _ctx[sock] = SSL_CTX_new(TLSv1_3_client_method()); +- } else if (!strcasecmp("tls1.3+", *myproto)) { +- *myproto = NULL; +- *avoid_ssl_versions |= SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2; +-#else + } else if(!strcasecmp("tls1.3",*myproto) || !strcasecmp("tls1.3+", *myproto)) { + report(stderr, GT_("Your OpenSSL version does not support TLS v1.3.\n")); + return -1; +-#endif + } else if (!strcasecmp("ssl23", *myproto) + || 0 == strcasecmp("auto", *myproto)) + { diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index ddb3e72e3..8c00cdef4 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 3.4.2 -PKG_RELEASE:= 2 -PKG_HASH:= eb0370bf223809b9ebb359fed5318f826ac038ce77933b3afd55ab1a0a21785a +PKG_VERSION:= 6.1.1 +PKG_RELEASE:= 1 +PKG_HASH:= 5e3133939a61ef64ac9b47ffd29a5ea6e337a4023ef0ad972094b4da844e3a20 PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs/video PKG_NEEDS:= threads @@ -17,13 +17,19 @@ PKG_SITES:= http://www.ffmpeg.org/releases/ PKG_LIBNAME:= libffmpeg PKG_OPTS:= dev -PKG_SUBPKGS:= LIBFFMPEG FFSERVER FFPROBE FFMPEG +PKG_CHOICES_FFMPEG:= WITH_LIBRESSL WITH_OPENSSL +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCS_WITH_LIBRESSL:= libressl ca-certificates +PKGCB_WITH_LIBRESSL:= libressl +PKGCD_WITH_OPENSSL:= use libopenssl for crypto +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates +PKGCB_WITH_OPENSSL:= openssl + + +PKG_SUBPKGS:= LIBFFMPEG FFPROBE FFMPEG PKGSD_FFMPEG:= video converter PKGSC_FFMPEG:= mm/video PKGSS_FFMPEG:= libffmpeg -PKGSD_FFSERVER:= streaming server -PKGSC_FFSERVER:= mm/video -PKGSS_FFSERVER:= libffmpeg PKGSD_FFPROBE:= simple multimedia stream analyzer PKGSC_FFPROBE:= mm/video PKGSS_FFPROBE:= libffmpeg @@ -97,7 +103,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBFFMPEG,libffmpeg,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_FDEPENDS),$(PKGSD_LIBFFMPEG),$(PKGSC_LIBFFMPEG),$(PKG_OPTS))) $(eval $(call PKG_template,FFMPEG,ffmpeg,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_FFMPEG),$(PKGSC_FFMPEG))) -$(eval $(call PKG_template,FFSERVER,ffserver,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_FFSERVER),$(PKGSC_FFSERVER))) $(eval $(call PKG_template,FFPROBE,ffprobe,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_FFPROBE),$(PKGSC_FFPROBE))) ifeq ($(ADK_DEBUG),y) @@ -106,6 +111,7 @@ else TARGET_CFLAGS:= $(subst Os,O2,$(TARGET_CFLAGS)) endif TARGET_CPPFLAGS+= -D_POSIX_SOURCE -D_GNU_SOURCE +TARGET_LDFLAGS+= -latomic ifeq ($(ADK_TARGET_CPU_WITH_MMX),y) CONFIGURE_CPU_OPTS+= --enable-mmx @@ -171,6 +177,8 @@ endif ifeq ($(ADK_TARGET_ARCH_ARM_WITH_NEON),y) CONFIGURE_CPU_OPTS+= --enable-neon +else ifeq ($(ADK_TARGET_ARCH_AARCH64),y) +CONFIGURE_CPU_OPTS+= --enable-neon else CONFIGURE_CPU_OPTS+= --disable-neon endif @@ -252,14 +260,6 @@ ffmpeg-install: $(INSTALL_BIN) $(WRKINST)/usr/bin/ffmpeg \ $(IDIR_FFMPEG)/usr/bin -ffserver-install: - $(INSTALL_DIR) $(IDIR_FFSERVER)/etc - $(INSTALL_DATA) $(WRKBUILD)/doc/ffserver.conf \ - $(IDIR_FFSERVER)/etc - $(INSTALL_DIR) $(IDIR_FFSERVER)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/ffserver \ - $(IDIR_FFSERVER)/usr/bin - ffprobe-install: $(INSTALL_DIR) $(IDIR_FFPROBE)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/ffprobe \ diff --git a/package/ffmpeg/patches/patch-libavcodec_arm_synth_filter_vfp_S b/package/ffmpeg/patches/patch-libavcodec_arm_synth_filter_vfp_S deleted file mode 100644 index 1472699be..000000000 --- a/package/ffmpeg/patches/patch-libavcodec_arm_synth_filter_vfp_S +++ /dev/null @@ -1,93 +0,0 @@ ---- ffmpeg-3.4.1.orig/libavcodec/arm/synth_filter_vfp.S 2016-03-29 04:25:11.000000000 +0200 -+++ ffmpeg-3.4.1/libavcodec/arm/synth_filter_vfp.S 2017-07-27 02:09:00.326946211 +0200 -@@ -1,6 +1,5 @@ - /* - * Copyright (c) 2013 RISC OS Open Ltd -- * Author: Ben Avison <bavison@riscosopen.org> - * - * This file is part of FFmpeg. - * -@@ -17,6 +16,8 @@ - * 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" -@@ -124,7 +125,7 @@ function ff_synth_filter_float_vfp, expo - 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 -+ 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 -@@ -132,12 +133,12 @@ function ff_synth_filter_float_vfp, expo - 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 X(ff_imdct_half_vfp) -+ bl ff_imdct_half_c - VFP vmov SCALE, s16 - -- fmrx OLDFPSCR, FPSCR -+ vmrs OLDFPSCR, FPSCR - ldr lr, =0x03030000 @ RunFast mode, short vectors of length 4, stride 1 -- fmxr FPSCR, lr -+ 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] -@@ -196,48 +197,10 @@ NOVFP vldr SCALE, [sp, #(16+6+3)*4] - vstmdb P_SB2_DN!, {VD0-VD3} - bne 1b - -- fmxr FPSCR, OLDFPSCR -+ vmsr FPSCR, OLDFPSCR - vpop {s16-s31} - pop {r3-r7,pc} - endfunc - -- .unreq IMDCT -- .unreq ORIG_P_SB -- .unreq P_SB_OFF -- .unreq I -- .unreq P_SB2_UP -- .unreq OLDFPSCR -- .unreq P_SB2_DN -- .unreq P_WIN_DN -- .unreq P_OUT_DN -- .unreq P_SB -- .unreq J_WRAP -- .unreq P_WIN_UP -- .unreq P_OUT_UP -- -- .unreq SCALE -- .unreq SBUF_DAT_REV0 -- .unreq SBUF_DAT_REV1 -- .unreq SBUF_DAT_REV2 -- .unreq SBUF_DAT_REV3 -- .unreq VA0 -- .unreq VA3 -- .unreq VB0 -- .unreq VB3 -- .unreq VC0 -- .unreq VC3 -- .unreq VD0 -- .unreq VD3 -- .unreq SBUF_DAT0 -- .unreq SBUF_DAT1 -- .unreq SBUF_DAT2 -- .unreq SBUF_DAT3 -- .unreq SBUF_DAT_ALT0 -- .unreq SBUF_DAT_ALT1 -- .unreq SBUF_DAT_ALT2 -- .unreq SBUF_DAT_ALT3 -- .unreq WIN_DN_DAT0 -- .unreq WIN_UP_DAT0 -- - .align 3 - zero: .word 0, 0 diff --git a/package/file/Makefile b/package/file/Makefile index 8a8007765..996be679e 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= file -PKG_VERSION:= 5.33 +PKG_VERSION:= 5.45 PKG_RELEASE:= 1 -PKG_HASH:= 1c52c8c3d271cd898d5511c36a68059cda94036111ab293f01f83c3525b737c6 +PKG_HASH:= fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82 PKG_DESCR:= file type guesser PKG_SECTION:= sys/utils -PKG_BUILDDEP:= file-host PKG_DEPENDS:= libmagic magic +PKG_BUILDDEP:= file-host PKG_URL:= http://www.darwinsys.com/file PKG_SITES:= ftp://ftp.astron.com/pub/file/ PKG_LIBNAME:= libmagic @@ -47,9 +47,9 @@ file-install: ${INSTALL_BIN} ${WRKINST}/usr/bin/file ${IDIR_FILE}/usr/bin magic-install: - ${INSTALL_DIR} ${IDIR_LIBMAGIC}/usr/share/misc + ${INSTALL_DIR} ${IDIR_MAGIC}/usr/share/misc ${INSTALL_DATA} ${WRKINST}/usr/share/misc/magic.mgc \ - ${IDIR_LIBMAGIC}/usr/share/misc + ${IDIR_MAGIC}/usr/share/misc libmagic-install: ${INSTALL_DIR} ${IDIR_LIBMAGIC}/usr/lib diff --git a/package/firefox/Makefile b/package/firefox/Makefile new file mode 100644 index 000000000..eb3cfeb9e --- /dev/null +++ b/package/firefox/Makefile @@ -0,0 +1,54 @@ +# 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:= firefox +PKG_VERSION:= 108.0.1 +PKG_RELEASE:= 1 +PKG_HASH:= 9821ac130dad01383e03276bf6cc92d41329d351da1fa7fa238168f8890611ea +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_BUILDDEP:= python3-host nodejs-host pango freetype fontconfig libXcomposite +PKG_BUILDDEP+= libXcursor libgtk3 dbus-glib alsa-lib atk harfbuzz +PKG_SITES:= https://ftp.mozilla.org/pub/firefox/releases/$(PKG_VERSION)/source/ + +PKG_ARCH_DEPENDS:= aarch64 + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).source.tar.xz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +ifeq ($(ADK_TARGET_ARCH),aarch64) +TARGET_NAME:= aarch64-linux-gnu +endif + +CONFIG_STYLE:= minimal +CONFIGURE_ENV+= CROSS_COMPILE=1 \ + BINDGEN_CFLAGS="--sysroot /usr/$(TARGET_NAME)" \ + AS="$(GNU_TARGET_NAME)-gcc" +CONFIGURE_ARGS+= --prefix=/usr \ + --target=$(TARGET_NAME) \ + --with-toolchain-prefix=$(GNU_TARGET_NAME)- \ + --enable-application=browser \ + --enable-official-branding \ + --disable-audio-backends \ + --without-wasm-sandboxed-libraries \ + --disable-profiling \ + --with-clang-path=/usr/bin/clang-13 + +firefox-install: + $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin + $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib/firefox + $(CP) $(WRKINST)/usr/bin/firefox \ + $(IDIR_FIREFOX)/usr/bin + $(CP) $(WRKINST)/usr/lib/firefox/* \ + $(IDIR_FIREFOX)/usr/lib/firefox + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/flac/Makefile b/package/flac/Makefile index 6ecb5ace9..d6a89159d 100644 --- a/package/flac/Makefile +++ b/package/flac/Makefile @@ -4,14 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= flac -PKG_VERSION:= 1.3.2 +PKG_VERSION:= 1.3.4 PKG_RELEASE:= 1 -PKG_HASH:= 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f +PKG_HASH:= 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 PKG_DESCR:= free lossless audio codec utility PKG_SECTION:= mm/audio PKG_DEPENDS:= libflac PKG_URL:= https://xiph.org/flac/ -PKG_SITES:= http://downloads.xiph.org/releases/flac/ +PKG_SITES:= https://ftp.osuosl.org/pub/xiph/releases/flac/ PKG_LIBNAME:= libflac PKG_OPTS:= dev @@ -25,6 +25,7 @@ $(eval $(call PKG_template,FLAC,flac,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ARGS+= --enable-asm-optimizations \ + --disable-stack-smash-protection \ --disable-xmms-plugin \ --disable-cpplibs \ --disable-ogg diff --git a/package/flashrom/Makefile b/package/flashrom/Makefile new file mode 100644 index 000000000..fc56a3828 --- /dev/null +++ b/package/flashrom/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:= flashrom +PKG_VERSION:= v1.2 +PKG_RELEASE:= 1 +PKG_HASH:= e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b +PKG_DESCR:= utility for identifying, reading, writing, verifying and erasing flash chips. +PKG_SECTION:= sys/hw +PKG_DEPENDS:= pciutils libusb zlib +PKG_BUILDDEP:= pciutils libusb zlib +PKG_URL:= https://www.flashrom.org/Flashrom +PKG_SITES:= https://download.flashrom.org/releases/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FLASHROM,flashrom,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +TARGET_CFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/libusb-1.0 + +flashrom-install: + ${INSTALL_DIR} ${IDIR_FLASHROM}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/local/sbin/flashrom ${IDIR_FLASHROM}/usr/sbin/ + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/flatbuffers/Makefile b/package/flatbuffers/Makefile new file mode 100644 index 000000000..f4811d7a8 --- /dev/null +++ b/package/flatbuffers/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:= flatbuffers +PKG_VERSION:= 2.0.6 +PKG_RELEASE:= 1 +PKG_HASH:= e2dc24985a85b278dd06313481a9ca051d048f9474e0f199e372fea3ea4248c9 +PKG_DESCR:= cross platform serialization library +PKG_SECTION:= libs/misc +PKG_BUILDDEP:= flatbuffers-host +PKG_URL:= https://github.com/google/flatbuffers +PKG_SITES:= https://github.com/google/flatbuffers/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,FLATBUFFERS,flatbuffers,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call PKG_template,FLATBUFFERS,flatbuffers,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +HOST_CONFIG_STYLE:= cmake +CONFIG_STYLE:= cmake + +CMAKE_FLAGS+= -DFLATBUFFERS_BUILD_TESTS=OFF \ + -DFLATBUFFERS_BUILD_FLATC=OFF \ + -DFLATBUFFERS_BUILD_FLATHASH=OFF + +HOST_CMAKE_FLAGS+= -DFLATBUFFERS_BUILD_TESTS=OFF \ + -DFLATBUFFERS_BUILD_FLATC=ON \ + -DFLATBUFFERS_BUILD_FLATHASH=ON + +flatbuffers-install: + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/fltk/Makefile b/package/fltk/Makefile index be3670a46..ce17671e8 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= fltk -PKG_VERSION:= 1.3.3 +PKG_VERSION:= 1.3.8 PKG_RELEASE:= 1 -PKG_HASH:= f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 +PKG_HASH:= f3c1102b07eb0e7a50538f9fc9037c18387165bc70d4b626e94ab725b9d4d1bf PKG_DESCR:= fast light toolkit PKG_SECTION:= libs/misc PKG_DEPENDS:= mesa libx11 libxi freeglut libfreetype diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile index 54d67f15d..d347fc0fc 100644 --- a/package/fluxbox/Makefile +++ b/package/fluxbox/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= fluxbox PKG_VERSION:= 1.3.7 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0 PKG_DESCR:= window manager featuring tabs and an iconbar PKG_SECTION:= x11/apps diff --git a/package/fluxbox/patches/patch-util_fluxbox-remote_cc b/package/fluxbox/patches/patch-util_fluxbox-remote_cc new file mode 100644 index 000000000..bc76ea43e --- /dev/null +++ b/package/fluxbox/patches/patch-util_fluxbox-remote_cc @@ -0,0 +1,11 @@ +--- fluxbox-1.3.7.orig/util/fluxbox-remote.cc 2015-02-08 11:44:45.377187009 +0100 ++++ fluxbox-1.3.7/util/fluxbox-remote.cc 2023-01-13 06:47:39.349301911 +0100 +@@ -73,7 +73,7 @@ int main(int argc, char **argv) { + if (strcmp(cmd, "result") == 0) { + XTextProperty text_prop; + if (XGetTextProperty(disp, root, &text_prop, atom_result) != 0 +- && text_prop.value > 0 ++ && text_prop.value != 0 + && text_prop.nitems > 0) { + + printf("%s", text_prop.value); diff --git a/package/fmt/Makefile b/package/fmt/Makefile index 2831edea5..82d25c0cf 100644 --- a/package/fmt/Makefile +++ b/package/fmt/Makefile @@ -4,11 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= fmt -PKG_VERSION:= 5.0.0 +PKG_VERSION:= 8.1.1 PKG_RELEASE:= 1 -PKG_HASH:= fc33d64d5aa2739ad2ca1b128628a7fc1b7dca1ad077314f09affc57d59cf88a +PKG_HASH:= 3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346 PKG_DESCR:= modern formatting library PKG_SECTION:= libs/misc +PKG_BUILDDEP:= cmake-host PKG_URL:= http://fmtlib.net/latest/index.html PKG_SITES:= https://github.com/fmtlib/fmt/archive/ PKG_LIBNAME:= libfmt diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile index 1f4a9a1f1..d0cd64f30 100644 --- a/package/font-adobe-100dpi/Makefile +++ b/package/font-adobe-100dpi/Makefile @@ -22,9 +22,11 @@ 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) ${WRKINST}/usr/share/fonts/X11/100dpi/* \ + $(CP) ${STAGING_TARGET_DIR}/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 e8220968a..68ae9963b 100644 --- a/package/font-adobe-75dpi/Makefile +++ b/package/font-adobe-75dpi/Makefile @@ -22,9 +22,11 @@ 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) ${WRKINST}/usr/share/fonts/X11/75dpi/* \ + $(CP) ${STAGING_TARGET_DIR}/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-util/Makefile b/package/font-util/Makefile index ec2559275..5b9289f89 100644 --- a/package/font-util/Makefile +++ b/package/font-util/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= font-util -PKG_VERSION:= 1.3.1 +PKG_VERSION:= 1.3.2 PKG_RELEASE:= 1 -PKG_HASH:= 34ebb0c9c14e0a392cdd5ea055c92489ad88d55ae148b2f1cfded0f3f63f2b5b +PKG_HASH:= f115a3735604de1e852a4bf669be0269d8ce8f21f8e0e74ec5934b31dadc1e76 PKG_DESCR:= font utility PKG_SECTION:= x11/fonts PKG_URL:= http://www.x.org/ diff --git a/package/font-util/patches/patch-fontutil_pc_in b/package/font-util/patches/patch-fontutil_pc_in index 4662db361..2b2ed3d53 100644 --- a/package/font-util/patches/patch-fontutil_pc_in +++ b/package/font-util/patches/patch-fontutil_pc_in @@ -1,11 +1,14 @@ ---- font-util-1.1.1.orig/fontutil.pc.in 2009-10-11 06:32:56.000000000 +0200 -+++ font-util-1.1.1/fontutil.pc.in 2010-12-02 22:28:16.000000000 +0100 -@@ -4,7 +4,7 @@ libdir=@libdir@ +--- font-util-1.3.2.orig/fontutil.pc.in 2019-08-26 00:25:25.000000000 +0200 ++++ font-util-1.3.2/fontutil.pc.in 2022-03-01 21:10:24.228234038 +0100 +@@ -2,9 +2,9 @@ prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ datarootdir=@datarootdir@ - datadir=@datadir@ +-datadir=@datadir@ ++datadir=${prefix}/share fontrootdir=@fontrootdir@ -mapdir=@MAPDIR@ -+mapdir=${prefix}/../@MAPDIR@ ++mapdir=${fontrootdir}/util Name: FontUtil Description: Font utilities dirs diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index 2642bf634..15e797efc 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= fontconfig -PKG_VERSION:= 2.12.3 -PKG_RELEASE:= 2 -PKG_HASH:= ffc3cbf6dd9fcd516ee42f48306a715e66698b238933d6fa7cef02ea8b3b818e +PKG_VERSION:= 2.13.1 +PKG_RELEASE:= 1 +PKG_HASH:= 9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f PKG_DESCR:= library for configuring and customizing font access PKG_SECTION:= libs/fonts PKG_DEPENDS:= libxml2 -PKG_BUILDDEP:= freetype libxml2 gperf-host +PKG_BUILDDEP:= freetype libxml2 gperf-host util-linux HOST_BUILDDEP:= expat-host PKG_URL:= http://fontconfig.org/ PKG_SITES:= http://fontconfig.org/release/ @@ -24,6 +24,7 @@ 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 \ diff --git a/package/fping/Makefile b/package/fping/Makefile index 613112d88..6340c32bc 100644 --- a/package/fping/Makefile +++ b/package/fping/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= fping -PKG_VERSION:= 3.16 +PKG_VERSION:= 5.1 PKG_RELEASE:= 1 -PKG_HASH:= 2f753094e4df3cdb1d99be1687c0fb7d2f14c0d526ebf03158c8c5519bc78f54 +PKG_HASH:= 1ee5268c063d76646af2b4426052e7d81a42b657e6a77d8e7d3d2e60fd7409fe PKG_DESCR:= program to ping hosts in parallel PKG_SECTION:= net/debug PKG_URL:= http://fping.org diff --git a/package/fprobe/patches/patch-src_fprobe_c b/package/fprobe/patches/patch-src_fprobe_c new file mode 100644 index 000000000..43197cf64 --- /dev/null +++ b/package/fprobe/patches/patch-src_fprobe_c @@ -0,0 +1,20 @@ +--- fprobe-1.1.orig/src/fprobe.c 2005-01-30 09:43:35.000000000 +0100 ++++ fprobe-1.1/src/fprobe.c 2024-02-20 07:18:30.403921178 +0100 +@@ -393,7 +393,7 @@ void gettime(struct Time *now) + now->usec = t.tv_usec; + } + +-inline time_t cmpmtime(struct Time *t1, struct Time *t2) ++time_t cmpmtime(struct Time *t1, struct Time *t2) + { + return (t1->sec - t2->sec) * 1000 + (t1->usec - t2->usec) / 1000; + } +@@ -411,7 +411,7 @@ hash_t hash_flow(struct Flow *flow) + else return hash(flow, sizeof(struct Flow_TL)); + } + +-inline void copy_flow(struct Flow *src, struct Flow *dst) ++void copy_flow(struct Flow *src, struct Flow *dst) + { + dst->sip = src->sip; + dst->dip = src->dip; diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile index cee02625d..1ed30db0d 100644 --- a/package/freeglut/Makefile +++ b/package/freeglut/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= freeglut -PKG_VERSION:= 3.0.0 +PKG_VERSION:= 3.2.1 PKG_RELEASE:= 1 -PKG_HASH:= 2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2 +PKG_HASH:= d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 PKG_DESCR:= opengl utility toolkit libraries PKG_SECTION:= libs/video PKG_DEPENDS:= libglu diff --git a/package/freeglut/patches/patch-src_fg_gl2_c b/package/freeglut/patches/patch-src_fg_gl2_c new file mode 100644 index 000000000..dbd947a91 --- /dev/null +++ b/package/freeglut/patches/patch-src_fg_gl2_c @@ -0,0 +1,23 @@ +--- 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 new file mode 100644 index 000000000..a552d4fa9 --- /dev/null +++ b/package/freeglut/patches/patch-src_fg_gl2_h @@ -0,0 +1,23 @@ +--- 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 new file mode 100644 index 000000000..6bb5f6d69 --- /dev/null +++ b/package/freeglut/patches/patch-src_fg_version_h @@ -0,0 +1,16 @@ +--- 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 5644f8afe..b9c1f12f2 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.0.21 +PKG_VERSION:= 3.2.3 PKG_RELEASE:= 1 -PKG_HASH:= 2bf914d471d4409fd72e708e308fa32ca8d01d698c518497a1d4b867d50132ae +PKG_HASH:= 4bde047122e588c63fe2d599a73f7ab9a863806f9e716e88a3d77080b482c577 PKG_DESCR:= flexible radius server PKG_SECTION:= net/radius PKG_DEPENDS:= libltdl libpcre libtalloc libressl libatomic PKG_BUILDDEP:= libtool pcre talloc libressl PKG_NEEDS:= threads PKG_URL:= http://www.freeradius.org/ -PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/ +PKG_SITES:= https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_3/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -71,7 +71,7 @@ endif ifneq (${ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL},) PKG_CONFIGURE_LIBS+= -lz -PKG_CONFIGURE_OPTS+= --with-mysql-include-dir="${STAGING_TARGET_DIR}/usr/include" \ +PKG_CONFIGURE_OPTS+= --with-mysql-include-dir="${STAGING_TARGET_DIR}/usr/include/mysql" \ --with-mysql-lib-dir="${STAGING_TARGET_DIR}/usr/lib/mysql" \ --without-threads \ --with-rlm_sql @@ -134,14 +134,14 @@ $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL,rlm_sql,)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_MYSQL,rlm_sql_mysql,)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_PGSQL,rlm_sql_postgresql,)) -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTS} \ --libdir=/usr/lib/freeradius \ --libexecdir=/usr/lib/freeradius \ --disable-openssl-version-check \ --with-execinfo-include-dir=/dev/null \ - --with-openssl-includes=${STAGING_TARGET_DIR}/usr/include \ - --with-openssl-libraries=${STAGING_TARGET_DIR}/usr/lib \ + --with-threads=yes \ + --with-openssl-include-dir=${STAGING_TARGET_DIR}/usr/include \ + --with-openssl-lib-dir=${STAGING_TARGET_DIR}/usr/lib \ --with-system-libltld \ --enable-strict-dependencies \ --with-raddbdir=/etc/freeradius \ @@ -157,15 +157,17 @@ CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTS} \ --without-rlm_eap_sim \ --without-rlm_example \ --without-rlm_ippool \ + --without-rlm_json \ --without-rlm_krb5 \ --without-rlm_otp \ --without-rlm_smsotp \ --without-rlm_pam \ --without-rlm_perl \ - --without-rlm_python \ + --without-rlm_python3 \ --without-rlm_radutmp \ --without-rlm_rest \ --without-rlm_ruby \ + --without-rlm_python \ --without-rlm_smb \ --without-rlm_sqlcounter \ --without-rlm_sql_db2 \ @@ -176,7 +178,9 @@ CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTS} \ --without-rlm_sql_unixodbc \ --without-rlm_sql_log \ --without-rlm_redis \ + --without-rlm_cache_redis \ --without-rlm_rediswho \ + --without-rlm_unbound \ --without-rlm_unix \ --without-rlm_eap_ikev2 \ --without-rlm_eap_tnc \ @@ -187,9 +191,10 @@ CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTS} \ CONFIGURE_ENV+= ax_cv_cc_builtin_choose_expr=yes \ ax_cv_cc_builtin_types_compatible_p=yes \ ax_cv_cc_builtin_bswap64=yes \ - ax_cv_cc_bounded_attribute=yes -FAKE_FLAGS+= R="${WRKINST}" \ - INSTALLSTRIP="" + ax_cv_cc_bounded_attribute=yes \ +FAKE_FLAGS+= INSTALLSTRIP="" +MAKE_ENV+= VERBOSE=1 \ + R="$(WRKINST)" freeradius-server-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} -${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/etc/freeradius diff --git a/package/freeradius-server/patches/patch-acinclude_m4 b/package/freeradius-server/patches/patch-acinclude_m4 deleted file mode 100644 index f1cefae77..000000000 --- a/package/freeradius-server/patches/patch-acinclude_m4 +++ /dev/null @@ -1,164 +0,0 @@ ---- freeradius-server-3.0.8.orig/acinclude.m4 2015-04-22 19:21:34.000000000 +0200 -+++ freeradius-server-3.0.8/acinclude.m4 2015-05-13 22:13:54.000000000 +0200 -@@ -218,22 +218,22 @@ ac_safe=`echo "$1" | sed 'y%./+-%__pm%'` - old_CPPFLAGS="$CPPFLAGS" - smart_include= - dnl # The default directories we search in (in addition to the compilers search path) --smart_include_dir="/usr/local/include /opt/include" -+dnl smart_include_dir="/usr/local/include /opt/include" - - dnl # Our local versions - _smart_try_dir= - _smart_include_dir= - - dnl # Add variants with the different prefixes and one with no prefix --for _prefix in $smart_prefix ""; do -- for _dir in $smart_try_dir; do -- _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}" -- done -- -- for _dir in $smart_include_dir; do -- _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}" -- done --done -+dnl for _prefix in $smart_prefix ""; do -+dnl for _dir in $smart_try_dir; do -+dnl _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}" -+dnl done -+dnl -+dnl for _dir in $smart_include_dir; do -+dnl _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}" -+dnl done -+dnl done - - dnl # - dnl # Try any user-specified directory first otherwise we may pick up -@@ -262,73 +262,73 @@ fi - dnl # - dnl # Try using the default includes (with prefixes). - dnl # --if test "x$smart_include" = "x"; then -- for _prefix in $smart_prefix; do -- AC_MSG_CHECKING([for ${_prefix}/$1]) -- -- AC_TRY_COMPILE([$2 -- #include <$1>], -- [int a = 1;], -- [ -- smart_include="-isystem ${_prefix}/" -- AC_MSG_RESULT(yes) -- break -- ], -- [ -- smart_include= -- AC_MSG_RESULT(no) -- ]) -- done --fi -+dnl if test "x$smart_include" = "x"; then -+dnl for _prefix in $smart_prefix; do -+dnl AC_MSG_CHECKING([for ${_prefix}/$1]) -+dnl -+dnl AC_TRY_COMPILE([$2 -+dnl #include <$1>], -+dnl [int a = 1;], -+dnl [ -+dnl smart_include="-isystem ${_prefix}/" -+dnl AC_MSG_RESULT(yes) -+dnl break -+dnl ], -+dnl [ -+dnl smart_include= -+dnl AC_MSG_RESULT(no) -+dnl ]) -+dnl done -+dnl fi - - dnl # - dnl # Try using the default includes (without prefixes). - dnl # - if test "x$smart_include" = "x"; then -- AC_MSG_CHECKING([for $1]) -- -- AC_TRY_COMPILE([$2 -+ AC_MSG_CHECKING([for $1]) -+ -+ AC_TRY_COMPILE([$2 - #include <$1>], -- [int a = 1;], -- [ -- smart_include=" " -- AC_MSG_RESULT(yes) -- break -- ], -- [ -- smart_include= -+ [int a = 1;], -+ [ -+ smart_include=" " -+ AC_MSG_RESULT(yes) -+ break -+ ], -+ [ -+ smart_include= - AC_MSG_RESULT(no) -- ]) -+ ]) - fi - - dnl # - dnl # Try to guess possible locations. - dnl # --if test "x$smart_include" = "x"; then -- -- for prefix in $smart_prefix; do -- FR_LOCATE_DIR(_smart_include_dir,"${_prefix}/${1}") -- done -- FR_LOCATE_DIR(_smart_include_dir, $1) -- -- for try in $_smart_include_dir; do -- AC_MSG_CHECKING([for $1 in $try]) -- CPPFLAGS="-isystem $try $old_CPPFLAGS" -- AC_TRY_COMPILE([$2 -- #include <$1>], -- [int a = 1;], -- [ -- smart_include="-isystem $try" -- AC_MSG_RESULT(yes) -- break -- ], -- [ -- smart_include= -- AC_MSG_RESULT(no) -- ]) -- done -- CPPFLAGS="$old_CPPFLAGS" --fi -+dnl if test "x$smart_include" = "x"; then -+dnl -+dnl for prefix in $smart_prefix; do -+dnl FR_LOCATE_DIR(_smart_include_dir,"${_prefix}/${1}") -+dnl done -+dnl FR_LOCATE_DIR(_smart_include_dir, $1) -+dnl -+dnl for try in $_smart_include_dir; do -+dnl AC_MSG_CHECKING([for $1 in $try]) -+dnl CPPFLAGS="-isystem $try $old_CPPFLAGS" -+dnl AC_TRY_COMPILE([$2 -+dnl #include <$1>], -+dnl [int a = 1;], -+dnl [ -+dnl smart_include="-isystem $try" -+dnl AC_MSG_RESULT(yes) -+dnl break -+dnl ], -+dnl [ -+dnl smart_include= -+dnl AC_MSG_RESULT(no) -+dnl ]) -+dnl done -+dnl CPPFLAGS="$old_CPPFLAGS" -+dnl fi - - dnl # - dnl # Found it, set the appropriate variable. diff --git a/package/freeradius-server/patches/patch-scripts_libtool_mk b/package/freeradius-server/patches/patch-scripts_libtool_mk index c9f83db69..bcfdeff89 100644 --- a/package/freeradius-server/patches/patch-scripts_libtool_mk +++ b/package/freeradius-server/patches/patch-scripts_libtool_mk @@ -1,11 +1,13 @@ ---- freeradius-server-3.0.13.orig/scripts/libtool.mk 2017-03-06 14:58:04.000000000 +0100 -+++ freeradius-server-3.0.13/scripts/libtool.mk 2017-03-30 05:46:58.583531343 +0200 -@@ -44,7 +44,7 @@ ifeq "${LIBTOOL}" "JLIBTOOL" +--- 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 $(Q)mkdir -p $(dir $@) - $(Q)echo CC jlibtool.c -- $(Q)${CC} $< -o $@ -+ $(Q)${CC_FOR_BUILD} $< -o $@ +- $(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 diff --git a/package/freeradius-server/patches/patch-src_include_threads_h b/package/freeradius-server/patches/patch-src_include_threads_h index 4626536e4..3011af0a9 100644 --- a/package/freeradius-server/patches/patch-src_include_threads_h +++ b/package/freeradius-server/patches/patch-src_include_threads_h @@ -1,10 +1,6 @@ - fix for: - | src/lib/log.c:37:31: error: 'fr_strerror_buffer' undeclared (first use in this function) - found in https://github.com/Optware/Optware-ng/commit/6ece960830b3291bc4ad5780cdb49b0a377aab2e - ---- freeradius-server-3.0.21.orig/src/include/threads.h 2020-03-24 15:55:09.000000000 +0100 -+++ freeradius-server-3.0.21/src/include/threads.h 2021-02-16 03:54:58.449715370 +0100 -@@ -89,7 +89,7 @@ static _t __fr_thread_local_init_##_n(pt +--- freeradius-server-3.2.3.orig/src/include/threads.h 2023-05-26 15:56:52.000000000 +0200 ++++ freeradius-server-3.2.3/src/include/threads.h 2024-02-27 04:03:53.806994686 +0100 +@@ -92,7 +92,7 @@ static _t __fr_thread_local_init_##_n(pt # define fr_thread_local_get(_n) _n #elif defined(HAVE_PTHREAD_H) # include <pthread.h> @@ -13,7 +9,7 @@ static pthread_key_t __fr_thread_local_key_##_n;\ static pthread_once_t __fr_thread_local_once_##_n = PTHREAD_ONCE_INIT;\ static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL;\ -@@ -100,17 +100,17 @@ static void __fr_thread_local_destroy_## +@@ -103,17 +103,17 @@ static void __fr_thread_local_destroy_## static void __fr_thread_local_key_init_##_n(void)\ {\ (void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destroy_##_n);\ @@ -27,10 +23,11 @@ + (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\ return _n;\ } - # define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f) +-# define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f) -# define fr_thread_local_set(_n, _v) __fr_thread_local_set_##_n(_v) -# define fr_thread_local_get(_n) __fr_thread_local_get_##_n() -+# define fr_thread_local_set(_n, _v) ((int)!((_n = _v) || 1)) -+# define fr_thread_local_get(_n) _n ++# define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f) ++# define fr_thread_local_set(_n, _v) ((int)!((_n = _v) || 1)) ++# define fr_thread_local_get(_n) _n #endif #endif diff --git a/package/freeswitch/Makefile b/package/freeswitch/Makefile index e5eeadf33..0d6f067c8 100644 --- a/package/freeswitch/Makefile +++ b/package/freeswitch/Makefile @@ -4,22 +4,25 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= freeswitch -PKG_VERSION:= 1.6.18 +PKG_VERSION:= 1.10.11 PKG_RELEASE:= 1 -PKG_HASH:= ac1b32f61e5c35680c5a2d6f145bc480cf26e6527af07d8b8b9fa2d5280252cd +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 +PKG_DEPENDS+= libressl libopus spandsp sofia-sip PKG_BUILDDEP:= util-linux zlib libjpeg-turbo sqlite curl pcre -PKG_BUILDDEP+= speex libressl opus +PKG_BUILDDEP+= speex libressl opus spandsp sofia-sip PKG_URL:= http://www.freeswitch.org/ -PKG_SITES:= http://files.freeswitch.org/freeswitch-releases/ +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 \ @@ -35,10 +38,15 @@ CONFIGURE_ENV+= ac_cv_file__dev_ptmx=yes \ 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 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 new file mode 100644 index 000000000..aab43c797 --- /dev/null +++ b/package/freeswitch/patches/patch-libs_srtp_crypto_hash_hmac_ossl_c @@ -0,0 +1,22 @@ +--- 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 da2c0a71e..5db6dea81 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= freetype -PKG_VERSION:= 2.7 -PKG_RELEASE:= 1 -PKG_HASH:= 7b657d5f872b0ab56461f3bd310bd1c5ec64619bd15f0d8e08282d494d9cfea4 +PKG_VERSION:= 2.11.1 +PKG_RELEASE:= 2 +PKG_HASH:= f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b PKG_DESCR:= free, high-quality and portable font engine PKG_SECTION:= libs/fonts PKG_DEPENDS:= zlib @@ -26,12 +26,22 @@ $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE} HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --with-zlib \ + --with-brotli=no \ --without-png \ - --without-bzip2 + --without-bzip2 \ + --enable-freetype-config CONFIGURE_ARGS+= --with-zlib \ --without-png \ --with-harfbuzz=no \ - --without-bzip2 + --with-brotli=no \ + --without-bzip2 \ + --enable-freetype-config + +hostpost-install: + $(SED) 's:^includedir=.*:includedir="$${prefix}/include":' \ + -e 's:^libdir=.*:libdir="$${exec_prefix}/lib":' \ + $(STAGING_HOST_DIR)/usr/bin/freetype-config + libfreetype-install: ${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib diff --git a/package/freetype/patches/patch-builds_unix_freetype-config_in b/package/freetype/patches/patch-builds_unix_freetype-config_in deleted file mode 100644 index 74135b0fd..000000000 --- a/package/freetype/patches/patch-builds_unix_freetype-config_in +++ /dev/null @@ -1,16 +0,0 @@ ---- freetype-2.6.1.orig/builds/unix/freetype-config.in 2015-09-25 07:58:57.000000000 +0200 -+++ freetype-2.6.1/builds/unix/freetype-config.in 2015-10-23 10:37:49.000000000 +0200 -@@ -13,10 +13,10 @@ LC_ALL=C - export LC_ALL - - prefix="%prefix%" --exec_prefix="%exec_prefix%" -+exec_prefix="${prefix}/bin" - exec_prefix_set="no" --includedir="%includedir%" --libdir="%libdir%" -+includedir="${prefix}/include" -+libdir="${prefix}/lib" - - usage() - { diff --git a/package/freetype/patches/patch-builds_unix_freetype2_in b/package/freetype/patches/patch-builds_unix_freetype2_in index 306057eb3..9dc78c081 100644 --- a/package/freetype/patches/patch-builds_unix_freetype2_in +++ b/package/freetype/patches/patch-builds_unix_freetype2_in @@ -1,14 +1,13 @@ ---- freetype-2.6.1.orig/builds/unix/freetype2.in 2015-09-25 07:58:57.000000000 +0200 -+++ freetype-2.6.1/builds/unix/freetype2.in 2015-10-23 10:43:36.000000000 +0200 -@@ -1,7 +1,8 @@ +--- freetype-2.11.1.orig/builds/unix/freetype2.in 2021-02-13 09:16:54.000000000 +0100 ++++ freetype-2.11.1/builds/unix/freetype2.in 2022-03-01 21:51:10.996321135 +0100 +@@ -1,7 +1,7 @@ prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% -+exec_prefix=${prefix} -+libdir=${prefix}/lib -+includedir=${prefix}/include -+ ++exec_prefix=%prefix% ++libdir=%prefix%/lib ++includedir=%prefix%/include Name: FreeType 2 - URL: http://freetype.org + URL: https://freetype.org diff --git a/package/fribidi/Makefile b/package/fribidi/Makefile index bef3bb69f..75bd11536 100644 --- a/package/fribidi/Makefile +++ b/package/fribidi/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= fribidi -PKG_VERSION:= 1.0.9 +PKG_VERSION:= 1.0.11 PKG_RELEASE:= 1 -PKG_HASH:= c5e47ea9026fb60da1944da9888b4e0a18854a0e2410bbfe7ad90a054d36e0c7 +PKG_HASH:= 30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d PKG_DESCR:= unicode bidirectional algorithm PKG_SECTION:= libs/misc PKG_URL:= http://www.fribidi.org/ -PKG_SITES:= https://github.com/fribidi/fribidi/releases/download/v1.0.9/ +PKG_SITES:= https://github.com/fribidi/fribidi/releases/download/v1.0.11/ PKG_OPTS:= dev include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/fstrcmp/Makefile b/package/fstrcmp/Makefile new file mode 100644 index 000000000..23eb0f6f1 --- /dev/null +++ b/package/fstrcmp/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:= fstrcmp +PKG_VERSION:= 0.7 +PKG_RELEASE:= 1 +PKG_HASH:= e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476 +PKG_DESCR:= make fuzzy comparisons of strings +PKG_SECTION:= libs/misc +PKG_SITES:= http://fstrcmp.sourceforge.net/ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).D001.tar.gz +WRKDIST= $(WRKDIR)/$(PKG_NAME)-$(PKG_VERSION).D001 + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FSTRCMP,fstrcmp,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +fstrcmp-install: + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/fstrcmp/patches/patch-Makefile_in b/package/fstrcmp/patches/patch-Makefile_in new file mode 100644 index 000000000..d947c7d30 --- /dev/null +++ b/package/fstrcmp/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- fstrcmp-0.7.D001.orig/Makefile.in 2014-03-05 01:13:45.000000000 +0100 ++++ fstrcmp-0.7.D001/Makefile.in 2022-02-26 01:14:24.379687998 +0100 +@@ -588,7 +588,7 @@ bin/test_user$(EXEEXT): $(test_user_obj) + $(LIBTOOL) --mode=link --tag=CC $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ \ + $(test_user_obj) lib/libfstrcmp.la $(LDFLAGS) $(LIBS) + +-all: all-bin all-doc ++all: all-bin + + all-bin: bin/fstrcmp$(EXEEXT) bin/test_prelude$(EXEEXT) bin/test_user$(EXEEXT) + diff --git a/package/fuse/Makefile b/package/fuse/Makefile index d1bf72e2a..48061955f 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -4,14 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= fuse -PKG_VERSION:= 2.9.4 +PKG_VERSION:= 2.9.9 PKG_RELEASE:= 1 -PKG_HASH:= 6be9c0bff6af8c677414935f31699ea5a7f8f5f791cfa5205be02ea186b97ce1 +PKG_HASH:= d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5 PKG_DESCR:= filesystem in userspace utility PKG_SECTION:= sys/fs PKG_DEPENDS:= libfuse -PKG_URL:= http://fuse.sourceforge.net/ -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} +PKG_SITES:= https://github.com/libfuse/libfuse/releases/download/fuse-$(PKG_VERSION)/ PKG_LIBNAME:= libfuse PKG_OPTS:= dev @@ -30,7 +29,6 @@ CONFIGURE_ARGS+= --enable-lib \ --enable-util \ --with-libiconv-prefix="${STAGING_TARGET_DIR}/usr" \ --disable-example \ - --disable-auto-modprobe \ --disable-mtab \ --disable-kernel-module diff --git a/package/fuse/patches/patch-include_fuse_kernel_h b/package/fuse/patches/patch-include_fuse_kernel_h new file mode 100644 index 000000000..41a1e7c7d --- /dev/null +++ b/package/fuse/patches/patch-include_fuse_kernel_h @@ -0,0 +1,16 @@ +--- fuse-2.9.9.orig/include/fuse_kernel.h 2019-01-04 14:33:33.000000000 +0100 ++++ fuse-2.9.9/include/fuse_kernel.h 2024-02-12 17:14:08.594450378 +0100 +@@ -88,12 +88,7 @@ + #ifndef _LINUX_FUSE_H + #define _LINUX_FUSE_H + +-#include <sys/types.h> +-#define __u64 uint64_t +-#define __s64 int64_t +-#define __u32 uint32_t +-#define __s32 int32_t +-#define __u16 uint16_t ++#include <linux/types.h> + + /* + * Version negotiation: diff --git a/package/fuse3/Makefile b/package/fuse3/Makefile new file mode 100644 index 000000000..f038dcea7 --- /dev/null +++ b/package/fuse3/Makefile @@ -0,0 +1,47 @@ +# 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:= fuse3 +PKG_VERSION:= 3.16.2 +PKG_RELEASE:= 1 +PKG_HASH:= 1bc306be1a1f4f6c8965fbdd79c9ccca021fdc4b277d501483a711cbd7dbcd6c +PKG_DESCR:= filesystem in userspace utility (v3) +PKG_SECTION:= sys/fs +PKG_DEPENDS:= libfuse3 +PKG_SITES:= https://github.com/libfuse/libfuse/archive/refs/tags/ +PKG_LIBNAME:= libfuse3 +PKG_OPTS:= dev + +DISTFILES:= fuse-${PKG_VERSION}.tar.gz +WRKDIST= $(WRKDIR)/libfuse-fuse-$(PKG_VERSION) + +PKG_SUBPKGS:= FUSE3_UTILS LIBFUSE3 +PKGSD_LIBFUSE3:= filesystem in userspace library (v3) +PKGSC_LIBFUSE3:= libs/misc + +include ${ADK_TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,FUSE3_UTILS,fuse-utils3,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBFUSE3,libfuse3,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBFUSE3},${PKGSC_LIBFUSE3},${PKG_OPTS})) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dinitscriptdir="" \ + -Dudevrulesdir="" + +fuse3-utils-install: + ${INSTALL_DIR} ${IDIR_FUSE_UTILS}/usr/bin + ${CP} ${WRKINST}/usr/bin/fusermount3 ${IDIR_FUSE_UTILS}/usr/bin + +libfuse3-install: + ${INSTALL_DIR} ${IDIR_LIBFUSE}/usr/lib + ${CP} ${WRKINST}/usr/lib/libfuse3.so* \ + ${IDIR_LIBFUSE}/usr/lib + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/fuse3/patches/patch-util_install_helper_sh b/package/fuse3/patches/patch-util_install_helper_sh new file mode 100644 index 000000000..02aa038fc --- /dev/null +++ b/package/fuse3/patches/patch-util_install_helper_sh @@ -0,0 +1,22 @@ +--- libfuse-fuse-3.16.2.orig/util/install_helper.sh 2023-10-10 09:38:49.000000000 +0200 ++++ libfuse-fuse-3.16.2/util/install_helper.sh 2024-02-11 19:19:21.423803542 +0100 +@@ -37,19 +37,3 @@ if $useroot; then + fi + fi + +-if [ "${udevrulesdir}" != "" ]; then +- install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ +- "${DESTDIR}${udevrulesdir}/99-fuse3.rules" +-fi +- +-if [ "$initscriptdir" != "" ]; then +- install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ +- "${DESTDIR}${initscriptdir}/fuse3" +- +- if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then +- /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true +- else +- echo "== FURTHER ACTION REQUIRED ==" +- echo "Make sure that your init system will start the ${DESTDIR}${initscriptdir}/init.d/fuse3 init script" +- fi +-fi diff --git a/package/fuse3/patches/patch-util_meson_build b/package/fuse3/patches/patch-util_meson_build new file mode 100644 index 000000000..6b8f915f8 --- /dev/null +++ b/package/fuse3/patches/patch-util_meson_build @@ -0,0 +1,12 @@ +--- libfuse-fuse-3.16.2.orig/util/meson.build 2023-10-10 09:38:49.000000000 +0200 ++++ libfuse-fuse-3.16.2/util/meson.build 2024-02-11 19:25:24.107798622 +0100 +@@ -26,9 +26,3 @@ if udevrulesdir == '' + warning('could not determine udevdir, udev.rules will not be installed') + endif + +-meson.add_install_script('install_helper.sh', +- join_paths(get_option('prefix'), get_option('sysconfdir')), +- join_paths(get_option('prefix'), get_option('bindir')), +- udevrulesdir, +- '@0@'.format(get_option('useroot')), +- get_option('initscriptdir')) diff --git a/package/fwupdate/Makefile b/package/fwupdate/Makefile index 8cf897ed4..738185fd9 100644 --- a/package/fwupdate/Makefile +++ b/package/fwupdate/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= fwupdate PKG_VERSION:= 1.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_DESCR:= update firmware PKG_SECTION:= base/adk PKG_DEPENDS:= mke2fs @@ -27,5 +27,9 @@ fwupdate-install: $(INSTALL_DIR) $(IDIR_FWUPDATE)/usr/sbin $(INSTALL_BIN) $(WRKBUILD)/fwupdate $(IDIR_FWUPDATE)/usr/sbin $(INSTALL_BIN) $(WRKBUILD)/fwvalidate $(IDIR_FWUPDATE)/usr/sbin + $(SED) "s/@@DISK@@/$(ADK_TARGET_ROOTDEV)/g" \ + $(IDIR_FWUPDATE)/usr/sbin/fwupdate + $(SED) "s/@@DISK@@/$(ADK_TARGET_ROOTDEV)/g" \ + $(IDIR_FWUPDATE)/usr/sbin/fwvalidate include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pdnsd/files/pdnsd.postinst b/package/fwupdate/files/fwupdate.postinst index 98ba25099..17871ff30 100644 --- a/package/pdnsd/files/pdnsd.postinst +++ b/package/fwupdate/files/fwupdate.postinst @@ -1,3 +1,3 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh -add_rcconf pdnsd NO +add_rcconf fwupdate NO diff --git a/package/fwupdate/files/fwupdate.service b/package/fwupdate/files/fwupdate.service deleted file mode 100644 index f54519547..000000000 --- a/package/fwupdate/files/fwupdate.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Firmware Update Validation -After=dropbear.service - -[Service] -ExecStart=/usr/sbin/fwvalidate - -[Install] -WantedBy=multi-user.target diff --git a/package/fwupdate/src/fwupdate b/package/fwupdate/src/fwupdate index 1efe08339..68796d7bd 100755 --- a/package/fwupdate/src/fwupdate +++ b/package/fwupdate/src/fwupdate @@ -2,8 +2,22 @@ # This file is part of the OpenADK project. # Do update. -PART0="/dev/sda2" -PART1="/dev/sda3" +GRUB=$(which grub-reboot) +if [ "${GRUB}" = "/usr/sbin/grub-reboot" ]; then + REVERSE=0 +else + REVERSE=1 +fi + +DISK=@@DISK@@ + +if [ $REVERSE -eq 1 ]; then + PART0="/dev/${DISK}p1" + PART1="/dev/${DISK}p2" +else + PART0="/dev/${DISK}2" + PART1="/dev/${DISK}3" +fi # Name of the archive, which is the firmware. For this file is the checksum calculated and # checked against the one from the tar archive. @@ -59,10 +73,12 @@ CURRENT_SYS="$(rdev /|awk '{ print $1 }')" case "$CURRENT_SYS" in "$PART0") MOUNTPART="$PART1" + PARTNUM=2 OS=OpenADK2 ;; "$PART1") MOUNTPART="$PART0" + PARTNUM=1 OS=OpenADK1 ;; *) @@ -130,18 +146,23 @@ fi cd / umount $MOUNTPART -grep /boot /proc/mounts 2>/dev/null -if [ $? -eq 0 ]; then - mount -o remount,rw /boot +if [ $REVERSE -eq 1 ]; then + echo "Switch bootable partition to new system" + sfdisk -A /dev/$DISK $PARTNUM >/dev/null 2>&1 else - mount /dev/sda1 /boot -fi -grub-reboot $OS grep /boot /proc/mounts 2>/dev/null -if [ $? -eq 0 ]; then - mount -o remount,ro /boot -else - umount /boot + if [ $? -eq 0 ]; then + mount -o remount,rw /boot + else + mount /dev/sda1 /boot + fi + grub-reboot $OS + grep /boot /proc/mounts 2>/dev/null + if [ $? -eq 0 ]; then + mount -o remount,ro /boot + else + umount /boot + fi fi sync echo "Reboot now to the updated system $OS" diff --git a/package/fwupdate/src/fwvalidate b/package/fwupdate/src/fwvalidate index e87c5beed..f388da784 100755 --- a/package/fwupdate/src/fwvalidate +++ b/package/fwupdate/src/fwvalidate @@ -2,8 +2,22 @@ # This file is part of the OpenADK project. # Validate update. -PART0="/dev/sda2" -PART1="/dev/sda3" +GRUB=$(which grub-reboot) +if [ "${GRUB}" = "/usr/sbin/grub-reboot" ]; then + REVERSE=0 +else + REVERSE=1 +fi + +DISK=@@DISK@@ + +if [ $REVERSE -eq 1 ]; then + PART0="/dev/${DISK}p1" + PART1="/dev/${DISK}p2" +else + PART0="/dev/${DISK}2" + PART1="/dev/${DISK}3" +fi APPLIANCE_NAME=OpenADK @@ -43,6 +57,24 @@ chk_initial_save(){ echo "please save configuration" fi } + +updatebootflag(){ + + case "$CURRENT_SYS" in + "$PART1") + sfdisk -A /dev/$DISK 1 + ;; + "$PART0") + sfdisk -A /dev/$DISK 2 + ;; + *) + echo "Current partition $CURRENT_SYS not recognized" + exit 1 + ;; + esac + +} + updategrub(){ mount -o remount,rw /boot @@ -120,12 +152,22 @@ if [ $TESTS -eq $TESTSUM ]; then logger -t update "All Tests passed." if [ "x$1" = "x" ]; then logger -t update "Set default boot partition for bootloader." + mount -o remount,rw / rm /firmware_check + mount -o remount,ro / echo "System check was successful" >> $STAT_FILE - updategrub + if [ $REVERSE -eq 1 ]; then + echo "Nothing todo. All fine." + logger -t update "Nothing todo. All fine." + else + updategrub + fi fi else - logger -t update "Not all tests passed. The the default system remains on the current partition." + if [ $REVERSE -eq 1 ]; then + updatebootflag + fi + logger -t update "Not all tests passed. The default system remains on the current partition." logger -t update "Please try to reboot the system and repeat the update." echo "ERROR last system update failed, please reboot and try again." >> $STAT_FILE exit 1 diff --git a/package/gatling/Makefile b/package/gatling/Makefile index 300d1690a..356ea4c3a 100644 --- a/package/gatling/Makefile +++ b/package/gatling/Makefile @@ -4,16 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gatling -PKG_VERSION:= 0.11 +PKG_VERSION:= 0.16 PKG_RELEASE:= 1 -PKG_HASH:= 9e1cb18612905b63755b0f463e6c5268789b3ab47db364bebe1ad077583e7571 +PKG_HASH:= 5f96438ee201d7f1f6c2e0849ff273b196bdc7493f29a719ce8ed08c8be6365b PKG_DESCR:= small non-forking webserver PKG_SECTION:= net/http PKG_BUILDDEP:= libowfat -PKG_URL:= http://www.fefe.de/gatling/ -PKG_SITES:= http://dl.fefe.de/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_NEEDS:= iconv +PKG_URL:= https://www.fefe.de/gatling/ +PKG_SITES:= https://www.fefe.de/gatling/ include ${ADK_TOPDIR}/mk/package.mk @@ -24,7 +23,6 @@ INSTALL_STYLE:= manual MAKE_FILE:= GNUmakefile ALL_TARGET:= gatling -TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/owfat XAKE_FLAGS+= CC='${TARGET_CC}' \ CFLAGS='${TARGET_CPPFLAGS} ${TARGET_CFLAGS}' \ ZLIB=0 DIET= prefix='${WRKINST}/usr' diff --git a/package/gatling/patches/patch-GNUmakefile b/package/gatling/patches/patch-GNUmakefile index 723400f5a..4c81b6a99 100644 --- a/package/gatling/patches/patch-GNUmakefile +++ b/package/gatling/patches/patch-GNUmakefile @@ -1,16 +1,16 @@ $Id$ ---- gatling-0.11.orig/GNUmakefile 2008-12-05 13:31:01.000000000 +0100 -+++ gatling-0.11/GNUmakefile 2011-01-15 14:10:40.000000000 +0100 -@@ -17,7 +17,7 @@ CROSS= - #CROSS=i686-mingw32- - CC=$(CROSS)gcc +--- gatling-0.16.orig/GNUmakefile 2020-05-13 15:53:27.000000000 +0200 ++++ gatling-0.16/GNUmakefile 2024-02-23 04:29:47.451896784 +0100 +@@ -25,7 +25,7 @@ CC=$(CROSS)gcc + endif + CFLAGS=-pipe -Wall -LDFLAGS= +LDFLAGS?= - path = $(subst :, ,$(PATH)) - diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet)) -@@ -147,9 +147,10 @@ havesetresuid.h: trysetresuid.c + #CFLAGS+=-DSTATE_DEBUG -DMOREDEBUG -DDEBUG_EVENTS -DSMDEBUG + +@@ -194,9 +194,10 @@ havesetresuid.h: trysetresuid.c dummy.c: touch $@ diff --git a/package/gatling/patches/patch-http_c b/package/gatling/patches/patch-http_c new file mode 100644 index 000000000..7e7c9ff93 --- /dev/null +++ b/package/gatling/patches/patch-http_c @@ -0,0 +1,19 @@ +--- gatling-0.16.orig/http.c 2020-11-26 16:36:13.000000000 +0100 ++++ gatling-0.16/http.c 2024-02-23 05:17:40.115857819 +0100 +@@ -2202,16 +2202,9 @@ static void get_md5_randomness(const uin + static int initialized; + if (!initialized) { + unsigned char buf[16]; +-#if defined(__linux__) || defined(__OpenBSD__) +- if (getentropy(buf, sizeof buf)) { +- buffer_putsflush(buffer_2, "getentropy failed (should never happen)\n"); +- // carry on with bad randomness +- } +-#else + int fd=open("/dev/urandom",O_RDONLY); + read(fd,buf,16); + close(fd); +-#endif + MD5Init(&md5_ctx); + MD5Update(&md5_ctx,buf,16); + initialized=1; diff --git a/package/gcc/Makefile b/package/gcc/Makefile index d7b2d072a..d08f01926 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -60,7 +60,7 @@ CONFIGURE_ENV+= have_sys_sdt_h=no CONFIGURE_ARGS+= --host=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ - --disable-__cxa_atexit \ + --enable-__cxa_atexit \ --without-headers \ --libexecdir=/usr/lib \ --disable-libssp \ diff --git a/package/gcr/Makefile b/package/gcr/Makefile index dae86a4dc..97de6c379 100644 --- a/package/gcr/Makefile +++ b/package/gcr/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gcr -PKG_VERSION:= 3.20.0 -PKG_EXTRAVER:= 3.20 -PKG_RELEASE:= 2 -PKG_HASH:= 90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379 +PKG_VERSION:= 3.40.0 +PKG_EXTRAVER:= 3.40 +PKG_RELEASE:= 1 +PKG_HASH:= b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5 PKG_DESCR:= gnome keyring library PKG_SECTION:= libs/crypto -PKG_BUILDDEP:= p11-kit +PKG_BUILDDEP:= p11-kit intltool-host libgtk3 meson-host PKG_URL:= https://wiki.gnome.org/action/show/Projects/GnomeKeyring PKG_SITES:= http://ftp.acc.umu.se/pub/gnome/sources/gcr/$(PKG_EXTRAVER)/ @@ -18,6 +18,15 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,GCR,gcr,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dintrospection=false \ + -Dgtk_doc=false + gcr-install: $(INSTALL_DIR) $(IDIR_GCR)/usr/lib $(CP) $(WRKINST)/usr/lib/lib*.so* \ diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 16ec9c66d..e4cbe89a9 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -4,14 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gdb -PKG_VERSION:= 10.1 +PKG_VERSION:= 14.2 PKG_RELEASE:= 1 -PKG_HASH:= f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0 +PKG_HASH:= 2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772 PKG_DESCR:= program debugger PKG_SECTION:= app/debug PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} -PKG_DEPENDS:= libncurses zlib libexpat libthread-db -PKG_BUILDDEP:= ncurses readline expat zlib +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 @@ -24,8 +24,10 @@ XAKE_FLAGS+= MAKEINFO=true WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj +CONFIGURE_ENV+= host_configargs='--with-libgmp-prefix="${STAGING_TARGET_DIR}/usr"' # --enable-static is required to build libbfd.a CONFIGURE_ARGS+= --enable-static \ + --disable-shared \ --without-uiout \ --disable-tui \ --disable-gdbtk \ @@ -43,6 +45,9 @@ CONFIGURE_ARGS+= --enable-static \ --with-system-zlib \ --with-system-readline \ --with-curses \ + --with-libexpat-prefix="${STAGING_TARGET_DIR}/usr" \ + --with-gmp="${STAGING_TARGET_DIR}/usr" \ + --with-mpfr="${STAGING_TARGET_DIR}/usr" \ --enable-gdbmi gdb-install: diff --git a/package/gdb/patches/patch-gdb_configure b/package/gdb/patches/patch-gdb_configure deleted file mode 100644 index 932db7d01..000000000 --- a/package/gdb/patches/patch-gdb_configure +++ /dev/null @@ -1,96 +0,0 @@ ---- gdb-8.3.1.orig/gdb/configure 2019-09-21 00:04:41.000000000 +0200 -+++ gdb-8.3.1/gdb/configure 2019-10-16 12:08:42.152038996 +0200 -@@ -15064,93 +15064,6 @@ $as_echo "$gdb_cv_bigtoc" >&6; } - ;; - esac - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the dynamic export flag" >&5 --$as_echo_n "checking for the dynamic export flag... " >&6; } --dynamic_list=false --if test "${gdb_native}" = yes; then -- # The dynamically loaded libthread_db needs access to symbols in the gdb -- # executable. Older GNU ld supports --export-dynamic but --dynamic-list -- # may not be supported there. -- old_LDFLAGS="$LDFLAGS" -- # Older GNU ld supports --export-dynamic but --dynamic-list it does not. -- RDYNAMIC="-Wl,--dynamic-list=${srcdir}/proc-service.list" -- LDFLAGS="$LDFLAGS $RDYNAMIC" -- if test "${have_libpython}" = no; then -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- dynamic_list=true --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- else -- # Workaround http://bugs.python.org/issue4434 where static -- # libpythonX.Y.a would get its symbols required for -- # pythonX.Y/lib-dynload/*.so modules hidden by -Wl,--dynamic-list. -- # Problem does not happen for the recommended libpythonX.Y.so linkage. -- -- # Note the workaround for Python -- # http://bugs.python.org/issue10112 earlier has removed -- # -export-dynamic from PYTHON_LIBS. That's exactly what we want -- # here too, as otherwise it'd make this -Wl,--dynamic-list test -- # always pass. -- old_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $PYTHON_CFLAGS" -- old_LIBS="$LIBS" -- LIBS="$LIBS $PYTHON_LIBS" -- old_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" -- if test "$cross_compiling" = yes; then : -- true --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include "Python.h" --int --main () --{ --int err; -- Py_Initialize (); -- err = PyRun_SimpleString ("import itertools\n"); -- Py_Finalize (); -- return err == 0 ? 0 : 1; -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- dynamic_list=true --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -- LIBS="$old_LIBS" -- CFLAGS="$old_CFLAGS" -- CPPFLAGS="$old_CPPFLAGS" -- fi -- LDFLAGS="$old_LDFLAGS" --fi --if $dynamic_list; then -- found="-Wl,--dynamic-list" -- RDYNAMIC='-Wl,--dynamic-list=$(srcdir)/proc-service.list' --else -- found="-rdynamic" -- RDYNAMIC="-rdynamic" --fi -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found" >&5 --$as_echo "$found" >&6; } -- - - if test ${build} = ${host} -a ${host} = ${target} ; then - case ${host_os} in diff --git a/package/gdb/patches/patch-gdb_riscv-tdep_c b/package/gdb/patches/patch-gdb_riscv-tdep_c deleted file mode 100644 index 17834f821..000000000 --- a/package/gdb/patches/patch-gdb_riscv-tdep_c +++ /dev/null @@ -1,12 +0,0 @@ ---- gdb-8.3.1.orig/gdb/riscv-tdep.c 2019-09-21 00:04:41.000000000 +0200 -+++ gdb-8.3.1/gdb/riscv-tdep.c 2019-10-16 12:18:34.569267544 +0200 -@@ -3131,9 +3131,6 @@ riscv_gdbarch_init (struct gdbarch_info - /* We do support running binaries compiled for 32-bit float on targets - with 64-bit float, so we only complain if the binary requires more - than the target has available. */ -- if (abi_features.flen > features.flen) -- error (_("bfd requires flen %d, but target has flen %d"), -- abi_features.flen, features.flen); - - /* If the ABI_FEATURES xlen is 0 then this indicates we got no useful abi - features from the INFO object. In this case we assume that the xlen diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index 4b27ffa1a..7238eb306 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -4,14 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gdbserver -PKG_VERSION:= 10.1 +PKG_VERSION:= 14.2 PKG_RELEASE:= 1 -PKG_HASH:= f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0 +PKG_HASH:= 2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772 PKG_DESCR:= remote program debugger utility PKG_SECTION:= app/debug PKG_NEEDS:= c++ PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} -PKG_DEPENDS:= libthread-db +PKG_DEPENDS:= libthread-db libgmp +PKG_BUILDDEP:= gmp PKG_LIBC_DEPENDS:= !musl PKG_ARCH_DEPENDS:= !microblaze @@ -29,11 +30,11 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,GDBSERVER,gdbserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --enable-static -ifneq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS_ONLY)$(ADK_TARGET_USE_STATIC_AND_SHARED_LIBS),) -TARGET_LDFLAGS+= -static-libstdc++ -CONFIGURE_ARGS+= --disable-build-with-cxx --with-libthread-db=$(STAGING_TARGET_DIR)/usr/lib/libthread_db.a -endif +CONFIGURE_ARGS+= --enable-static \ + --disable-gdb \ + --disable-sim \ + --without-curses \ + --without-system-zlib gdbserver-install: ${INSTALL_DIR} ${IDIR_GDBSERVER}/usr/bin diff --git a/package/gdbserver/patches/patch-gdb_nat_fork-inferior_c b/package/gdbserver/patches/patch-gdb_nat_fork-inferior_c new file mode 100644 index 000000000..b1949c798 --- /dev/null +++ b/package/gdbserver/patches/patch-gdb_nat_fork-inferior_c @@ -0,0 +1,10 @@ +--- 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 1d4df4dfd..ee6d9c043 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -10,8 +10,8 @@ PKG_RELEASE:= 1 PKG_HASH:= d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879 PKG_DESCR:= image loading and pixel buffer manipulation library PKG_SECTION:= libs/image -PKG_BUILDDEP:= libjpeg-turbo libtiff -HOST_BUILDDEP:= glib-host libffi-host +PKG_BUILDDEP:= libjpeg-turbo libtiff glib libpng +HOST_BUILDDEP:= libiconv-host glib-host libffi-host PKG_NEEDS:= c++ PKG_SITES:= $(MASTER_SITE_GNOME:=gdk-pixbuf/$(PKG_EXTRAVER)/) PKG_OPTS:= dev diff --git a/package/genimage/Makefile b/package/genimage/Makefile index 4791a76e1..889d77eda 100644 --- a/package/genimage/Makefile +++ b/package/genimage/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= genimage -PKG_VERSION:= 9 +PKG_VERSION:= 17 PKG_RELEASE:= 1 -PKG_HASH:= 69f35af7edf6f4dbdac7a18ddc69dcf38c501e43d8b50c524555754c51479078 +PKG_HASH:= a8756e3567a0d4d82c36b08ccc1e088250b9006d5670c6b2b014185e6ec60671 PKG_DESCR:= image creation utility PKG_SECTION:= dev/tools HOST_BUILDDEP:= confuse-host diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 82439e19e..6594eb995 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= 9c1781328238caa1685d7bc7a2e1dcf1c6c134e86b42ed554066734b621bd12f 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_OPTS:= dev diff --git a/package/git/Makefile b/package/git/Makefile index db209ca7e..2756d68fb 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,17 +4,25 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 2.31.1 +PKG_VERSION:= 2.44.0 PKG_RELEASE:= 1 -PKG_HASH:= 9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680 +PKG_HASH:= e358738dcb5b5ea340ce900a0015c03ae86e804e7ff64e47aa4631ddee681de3 PKG_DESCR:= fast version control system PKG_SECTION:= dev/scm -PKG_BUILDDEP:= curl expat libressl -PKG_DEPENDS:= libcurl libexpat libressl +PKG_BUILDDEP:= zlib curl expat +PKG_DEPENDS:= zlib curl libexpat 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 +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCB_WITH_OPENSSL:= openssl +PKGCS_WITH_OPENSSL:= libopenssl + include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,GIT,git,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/glib/Makefile b/package/glib/Makefile index 5dbfc4745..eb77cf8fe 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,15 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.56.1 +PKG_VERSION:= 2.78.4 PKG_RELEASE:= 1 -PKG_EXTRAVER:= 2.56 -PKG_HASH:= 40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d +PKG_EXTRAVER:= 2.78 +PKG_HASH:= 24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63 PKG_DESCR:= low-level core library that forms the basis of gtk+ PKG_SECTION:= libs/misc -PKG_DEPENDS:= libpcre zlib libffi -PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre -HOST_BUILDDEP:= pkgconf-host libiconv-host libffi-host python2-host gettext-host util-linux-host +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 PKG_NEEDS:= threads intl iconv PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/glib/$(PKG_EXTRAVER)/ @@ -24,42 +25,32 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -ifeq ($(ADK_PACKAGE_LIBICONV),y) -CONFIGURE_ARGS+= --with-libiconv=yes -else -CONFIGURE_ARGS+= --with-libiconv=no -endif -CONFIGURE_ARGS+= --disable-mem-pools \ - --disable-rebuilds \ - --disable-fam \ - --disable-dtrace \ - --disable-compile-warnings \ - --with-pcre=system \ - --with-threads=posix -CONFIGURE_ENV+= glib_cv_long_long_format=ll \ - glib_cv_stack_grows=no \ - glib_cv_have_strlcpy=no \ - glib_cv_uscore=no \ - ac_cv_func_posix_getpwuid_r=yes \ - ac_cv_func_posix_getgrgid_r=yes +HOSTWRKBUILD= $(WRKSRC) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -HOST_STYLE:= auto -HOST_CPPFLAGS+= -I$(STAGING_HOST_DIR)/usr/include/libmount -ifneq ($(OS_FOR_BUILD),CYGWIN) -HOST_CFLAGS+= -fPIC -endif -HOST_CONFIGURE_ARGS+= --disable-fam \ - --disable-selinux \ - --disable-dtrace \ - --enable-static \ - --with-pcre=internal \ - --with-libiconv=yes \ - --disable-shared \ - --disable-compile-warnings +HOST_CONFIG_STYLE:= manual +HOST_STYLE:= manual +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson -hostpost-install: - $(CP) $(STAGING_HOST_DIR)/usr/lib/glib-2.0/include/glibconfig.h \ - $(STAGING_HOST_DIR)/usr/include/glib-2.0/ +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) + +do-build: + (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) glib-install: $(INSTALL_DIR) $(IDIR_GLIB)/usr/lib diff --git a/package/glib/patches/patch-glib_gnulib_meson_build b/package/glib/patches/patch-glib_gnulib_meson_build new file mode 100644 index 000000000..4039f468f --- /dev/null +++ b/package/glib/patches/patch-glib_gnulib_meson_build @@ -0,0 +1,12 @@ +--- 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 + 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 +-if not gl_cv_func_frexpl_works and gl_cv_func_frexpl_broken_beyond_repair +- error ('frexpl() is missing or broken beyond repair, and we have nothing to replace it with') +-endif + + math_h_config.set ('REPLACE_FREXP', gl_cv_func_frexp_works ? 0 : 1) + math_h_config.set ('REPLACE_FREXPL', gl_cv_func_frexpl_works ? 0 : 1) diff --git a/package/glib/patches/patch-meson_build b/package/glib/patches/patch-meson_build new file mode 100644 index 000000000..c410eac33 --- /dev/null +++ b/package/glib/patches/patch-meson_build @@ -0,0 +1,10 @@ +--- 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 ec0d385a0..a36c30903 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -23,6 +23,9 @@ $(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPEN $(eval $(call PKG_template,GLIBC_DEV,glibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,GLIBC_GCONV,glibc-gconv,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_GLIBC_GCONV},${PKGSD_GLIBC_GCONV},${PKG_SECTION},${PKG_OPTS})) +GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ + --host=$(GNU_TARGET_NAME) + GLIBC_ENV:= PATH='${TARGET_PATH}' \ BUILD_CC='${CC_FOR_BUILD}' \ CFLAGS="$(TARGET_CFLAGS)" \ @@ -31,6 +34,7 @@ GLIBC_ENV:= PATH='${TARGET_PATH}' \ CXX="${TARGET_CXX}" \ AR="${TARGET_AR}" \ RANLIB="${TARGET_RANLIB}" \ + ARCH="${ADK_TARGET_KARCH}" \ libc_cv_forced_unwind=yes \ libc_cv_cc_with_libunwind=yes \ libc_cv_c_cleanup=yes \ @@ -46,19 +50,13 @@ 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) -ifeq ($(ADK_TARGET_ARCH_RISCV64),y) - ${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH)/$(ADK_TARGET_ABI_RISCV) - $(CP) $(STAGING_TARGET_DIR)/lib/$(ADK_TARGET_ABI_RISCV)/ld*.so* ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH)/$(ADK_TARGET_ABI_RISCV) -endif - for file in libc libpthread librt libcrypt libdl libm libanl libnsl libresolv libutil libnss_dns libnss_files; do \ - $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_ABI_PATH)/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ - #$(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_ABI_PATH)/$$file-$(PKG_GLIBCVER).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ + for file in libc libpthread librt libdl libm libanl libnsl libresolv libutil libnss_dns libnss_files; do \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ done else ${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH) - for file in libnss_dns libnss_files; do \ - $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_ABI_PATH)/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ - $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_ABI_PATH)/$$file-$(PKG_GLIBCVER).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ + -for file in libnss_dns libnss_files; do \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ done endif ${INSTALL_DIR} $(IDIR_GLIBC)/usr/bin @@ -76,11 +74,7 @@ glibc-gconv-install: glibc-dev-install: ${INSTALL_DIR} $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH) $(IDIR_GLIBC_DEV)/usr/lib -ifeq ($(ADK_TARGET_ARCH_RISCV64),y) - ${CP} ${STAGING_TARGET_DIR}/usr/lib/*/libc.so ${IDIR_GLIBC_DEV}/usr/lib -else - ${CP} ${STAGING_TARGET_DIR}/usr/lib/*/libc.so ${IDIR_GLIBC_DEV}/usr/lib -endif + ${CP} ${STAGING_TARGET_DIR}/usr/lib/libc.so ${IDIR_GLIBC_DEV}/usr/lib ifeq ($(ADK_TARGET_ABI_O32),y) ifeq ($(ADK_TARGET_BIG_ENDIAN),y) $(SED) "s#@@ELFTARGET@@#elf32-tradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so @@ -113,11 +107,7 @@ endif cd $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH); ln -sf $$file-$(PKG_GLIBCVER).so $$file.so; \ done # header package - ${KERNEL_MAKE_ENV} \ - $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_FILE_VER)-1/linux-$(KERNEL_FILE_VER) \ - $(KERNEL_MAKE_OPTS) \ - INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \ - headers_install + ${KERNEL_MAKE} INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr headers_install (cd $(WRKBUILD); \ $(GLIBC_ENV) \ $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/configure \ diff --git a/package/glu/Makefile b/package/glu/Makefile index ee8d70b32..ac25d5f29 100644 --- a/package/glu/Makefile +++ b/package/glu/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= glu -PKG_VERSION:= 9.0.0 +PKG_VERSION:= 9.0.2 PKG_RELEASE:= 1 -PKG_HASH:= 1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12 +PKG_HASH:= 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4 PKG_DESCR:= opengl utility library PKG_SECTION:= libs/video PKG_BUILDDEP:= mesa @@ -15,8 +15,6 @@ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/glu/ PKG_LIBNAME:= libglu PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBGLU,libglu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index 6b44af9c3..3b5a420db 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -5,11 +5,11 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gmediaserver PKG_VERSION:= 0.13.0 -PKG_RELEASE:= 2 +PKG_RELEASE:= 4 PKG_HASH:= 357030911bcce4ac9e47c2c9219b72e88705a8465899d4e0553bce540fb0fd12 PKG_DESCR:= media server PKG_SECTION:= mm/video -PKG_DEPENDS:= id3lib libupnp libmagic +PKG_DEPENDS:= id3lib libupnp libmagic magic PKG_BUILDDEP:= id3lib libupnp file PKG_NEEDS:= c++ PKG_URL:= http://www.gnu.org/software/gmediaserver diff --git a/package/gmediaserver/patches/patch-src_metadata_c b/package/gmediaserver/patches/patch-src_metadata_c new file mode 100644 index 000000000..86990d3d0 --- /dev/null +++ b/package/gmediaserver/patches/patch-src_metadata_c @@ -0,0 +1,78 @@ + - magic_file() returns strings like 'audio/mpeg; charset=binary', + ignore the last part + - Add flv and flac file type definitions +--- gmediaserver-0.13.0.orig/src/metadata.c 2007-10-20 11:41:32.000000000 +0200 ++++ gmediaserver-0.13.0/src/metadata.c 2022-03-28 07:44:13.332180349 +0200 +@@ -86,6 +86,8 @@ typedef enum { + FILE_JPG, + FILE_PNG, + FILE_TIFF, ++ FILE_FLV, ++ FILE_FLAC, + FILE_UNKNOWN, + FILE_TYPES_COUNT, + } FileType; +@@ -122,6 +124,8 @@ static const char *file_type_dlna_pn[] = + [FILE_JPG] = "JPEG_TN", + [FILE_PNG] = NULL, + [FILE_TIFF] = NULL, ++ [FILE_FLV] = NULL, ++ [FILE_FLAC] = NULL, + [FILE_UNKNOWN] = NULL, + }; + +@@ -134,6 +138,8 @@ static const char *file_type_mime_types[ + [FILE_OGG] = "audio/vorbis", + [FILE_MPG] = "video/mpeg", + [FILE_MP4] = "video/mp4", ++ [FILE_MP4] = "video/x-msvideo", ++ [FILE_MP4] = "video/x-matroska", + [FILE_PLS] = "audio/x-scpls", + [FILE_M3U] = "audio/m3u", + [FILE_EXTM3U] = "audio/m3u", +@@ -142,6 +148,8 @@ static const char *file_type_mime_types[ + [FILE_JPG] = "image/jpeg", + [FILE_PNG] = "image/png", + [FILE_TIFF] = "image/tiff", ++ [FILE_FLV] = "video/x-flv", ++ [FILE_FLAC] = "audio/flac", + [FILE_UNKNOWN] = "application/octet-stream", + }; + +@@ -162,6 +170,8 @@ static const char *file_type_names[] = { + [FILE_JPG] = "jpg", + [FILE_PNG] = "png", + [FILE_TIFF] = "tiff", ++ [FILE_FLV] = "flv", ++ [FILE_FLAC] = "flac", + [FILE_UNKNOWN] = "unknown", + }; + +@@ -183,6 +193,8 @@ static const char *file_type_descs[] = { + [FILE_JPG] = "JPEG image", + [FILE_PNG] = "PNG image", + [FILE_TIFF] = "TIFF image", ++ [FILE_FLV] = "Flash video", ++ [FILE_FLAC] = "FLAC audio", + }; + + static ItemClass file_type_item_classes[] = { +@@ -202,6 +214,8 @@ static ItemClass file_type_item_classes[ + [FILE_JPG] = ITEM_IMAGE, + [FILE_PNG] = ITEM_IMAGE, + [FILE_TIFF] = ITEM_IMAGE, ++ [FILE_FLV] = ITEM_VIDEO, ++ [FILE_FLAC] = ITEM_AUDIO, + }; + + static Entry *scan_entry(const char *fullpath, const char *name, int32_t parent, int indent_size, InodeList *inl); +@@ -325,6 +339,9 @@ check_file_content_type(const char *full + return FILE_UNKNOWN; + } + ++ /* ignore trailing data */ ++ *strchrnul(magic, ';') = '\0'; ++ + if (strcmp(magic, "application/octet-stream") != 0 + && strncmp(magic, "text/plain", 10) != 0) { + struct { diff --git a/package/gmp/patches/patch-longlong_h b/package/gmp/patches/patch-longlong_h deleted file mode 100644 index dd42a0ebc..000000000 --- a/package/gmp/patches/patch-longlong_h +++ /dev/null @@ -1,11 +0,0 @@ ---- gmp-5.1.3.orig/longlong.h 2013-09-30 12:18:28.000000000 +0200 -+++ gmp-5.1.3/longlong.h 2014-01-06 16:07:47.886035812 +0100 -@@ -1230,7 +1230,7 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype - #define UDIV_TIME 100 - #endif /* __mips */ - --#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 -+#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 && defined (_LP64) - #if __GMP_GNUC_PREREQ (4,4) - #define umul_ppmm(w1, w0, u, v) \ - do { \ diff --git a/package/gnupg2/Makefile b/package/gnupg2/Makefile index b0ffa5f49..a9e5a44c0 100644 --- a/package/gnupg2/Makefile +++ b/package/gnupg2/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gnupg2 -PKG_VERSION:= 2.3.2 +PKG_VERSION:= 2.4.4 PKG_RELEASE:= 1 -PKG_HASH:= e1d953e0e296072fca284215103ef168885eaac596c4660c5039a36a83e3041b +PKG_HASH:= 67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6 PKG_DESCR:= gnu privacy guard (modern) PKG_SECTION:= app/crypto PKG_DEPENDS:= libreadline libncurses libgcrypt libgpg-error libassuan diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 0465f6c59..69c14f21f 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gnutls -PKG_VERSION:= 3.6.16 +PKG_VERSION:= 3.8.3 PKG_RELEASE:= 1 -PKG_HASH:= 1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3 +PKG_HASH:= f74fc5954b27d4ec6dfbb11dea987888b5b124289a3703afcada0ee520f4173e 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 PKG_URL:= http://www.gnutls.org/ -PKG_SITES:= https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/ +PKG_SITES:= https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/ PKG_LIBNAME:= libgnutls PKG_OPTS:= dev @@ -41,7 +41,6 @@ CONFIGURE_ARGS+= --disable-rpath \ --disable-doc \ --disable-tests \ --disable-seccomp-tests \ - --with-libunistring-prefix='$(STAGING_TARGET_DIR)/usr' \ --without-libz-prefix \ --without-p11-kit CONFIGURE_ENV+= ac_cv_prog_AR='$(TARGET_CROSS)ar' @@ -52,7 +51,7 @@ libgnutls-install: gnutls-utils-install: $(INSTALL_DIR) $(IDIR_GNUTLS_UTILS)/usr/bin - $(CP) $(WRKINST)/usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \ + $(CP) $(WRKINST)/usr/bin/{{cert,psk}tool,gnutls-{cli,serv}} \ $(IDIR_GNUTLS_UTILS)/usr/bin include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/gpgme/Makefile b/package/gpgme/Makefile index 60a741c98..8f531aa16 100644 --- a/package/gpgme/Makefile +++ b/package/gpgme/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gpgme -PKG_VERSION:= 1.9.0 +PKG_VERSION:= 1.23.2 PKG_RELEASE:= 1 -PKG_HASH:= 1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb +PKG_HASH:= 9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224 PKG_DESCR:= easy access to gnupg for applications PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgpg-error libassuan diff --git a/package/gpm/patches/patch-src_headers_daemon_h b/package/gpm/patches/patch-src_headers_daemon_h new file mode 100644 index 000000000..2ae27b92b --- /dev/null +++ b/package/gpm/patches/patch-src_headers_daemon_h @@ -0,0 +1,11 @@ +--- gpm-1.20.7.orig/src/headers/daemon.h 2012-10-26 23:21:38.000000000 +0200 ++++ gpm-1.20.7/src/headers/daemon.h 2024-02-12 15:22:13.446541463 +0100 +@@ -180,7 +180,7 @@ extern struct mouse_features mouse_tabl + extern Gpm_Type mice[]; + extern Gpm_Type *repeated_type; + +-time_t last_selection_time; ++extern time_t last_selection_time; + + + diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index b0523f5d9..7b34eb0fa 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gpsd -PKG_VERSION:= 3.16 +PKG_VERSION:= 3.25 PKG_RELEASE:= 1 -PKG_HASH:= 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029 +PKG_HASH:= b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2 PKG_DESCR:= interface daemon for gps receivers PKG_SECTION:= sys/hw PKG_BUILDDEP:= scons-host ncurses @@ -31,7 +31,7 @@ INSTALL_STYLE:= manual do-install: (cd $(WRKBUILD); env PATH='$(TARGET_PATH)' CCFLAGS='' DESTDIR='$(WRKINST)' \ - scons install prefix=/usr platform=linux python=no chrpath=no bluez=no usb=no libgpsmm=no) + $(STAGING_HOST_DIR)/usr/bin/python3 $(STAGING_HOST_DIR)/usr/bin/scons install prefix=/usr platform=linux python=no chrpath=no bluez=no usb=no libgpsmm=no) gpsd-install: ${INSTALL_DIR} ${IDIR_GPSD}/usr/lib ${IDIR_GPSD}/usr/sbin diff --git a/package/gpsd/patches/patch-SConstruct b/package/gpsd/patches/patch-SConstruct deleted file mode 100644 index 0937d9f67..000000000 --- a/package/gpsd/patches/patch-SConstruct +++ /dev/null @@ -1,12 +0,0 @@ ---- gpsd-3.10.orig/SConstruct 2013-11-22 14:10:01.000000000 +0100 -+++ gpsd-3.10/SConstruct 2014-02-07 19:33:32.000000000 +0100 -@@ -231,6 +231,9 @@ for (name, default, help) in pathopts: - - env['VERSION'] = gpsd_version - env['PYTHON'] = sys.executable -+env['PLATFORM'] = "posix" -+env['SHLIBSUFFIX'] = ".so" -+env['SHLINKFLAGS'] = "-shared" - - # Set defaults from environment. Note that scons doesn't cope well - # with multi-word CPPFLAGS/LDFLAGS/SHLINKFLAGS values; you'll have to diff --git a/package/gpsd/patches/patch-gpsmon_c b/package/gpsd/patches/patch-gpsmon_c deleted file mode 100644 index ac52866d0..000000000 --- a/package/gpsd/patches/patch-gpsmon_c +++ /dev/null @@ -1,13 +0,0 @@ ---- gpsd-3.10.orig/gpsmon.c 2013-11-21 09:57:44.000000000 +0100 -+++ gpsd-3.10/gpsmon.c 2014-03-16 09:08:34.000000000 +0100 -@@ -505,6 +505,10 @@ static /*@null@*/ char *curses_get_comma - static char line[80]; - int c; - -+#ifndef __GLIBC__ -+#define CTRL(x) (x&037) -+#endif -+ - c = wgetch(cmdwin); - if (c == CTRL('L')) { - (void)clearok(stdscr, true); diff --git a/package/gptfdisk/Makefile b/package/gptfdisk/Makefile index bd01bc0ac..37d170761 100644 --- a/package/gptfdisk/Makefile +++ b/package/gptfdisk/Makefile @@ -9,8 +9,10 @@ PKG_RELEASE:= 1 PKG_HASH:= 864c8aee2efdda50346804d7e6230407d5f42a8ae754df70404dd8b2fdfaeac7 PKG_DESCR:= utilities to create gpt partition tables PKG_SECTION:= sys/fs -PKG_BUILDDEP:= util-linux popt +PKG_DEPENDS:= libncurses libuuid +PKG_BUILDDEP:= util-linux popt ncurses HOST_BUILDDEP:= util-linux-host popt-host +PKG_NEEDS:= c++ PKG_URL:= http://www.rodsbooks.com/gdisk/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=gptfdisk/} diff --git a/package/grep/Makefile b/package/grep/Makefile index 56f668e6c..845ba5685 100644 --- a/package/grep/Makefile +++ b/package/grep/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= grep -PKG_VERSION:= 3.0 +PKG_VERSION:= 3.11 PKG_RELEASE:= 1 -PKG_HASH:= e2c81db5056e3e8c5995f0bb5d0d0e1cad1f6f45c3b2fc77b6e81435aed48ab5 +PKG_HASH:= 1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab PKG_DESCR:= global search for a regex PKG_SECTION:= base/tools PKG_DEPENDS:= libpcre @@ -24,8 +24,9 @@ $(eval $(call HOST_template,GREP,grep,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,GREP,grep,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) grep-install: - $(INSTALL_DIR) $(IDIR_GREP)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/{e,f,}grep $(IDIR_GREP)/usr/bin + $(INSTALL_DIR) $(IDIR_GREP)/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/{e,f,}grep \ + $(IDIR_GREP)/bin include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/grub/Makefile b/package/grub/Makefile index 8a7a6b38f..519958096 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= grub -PKG_VERSION:= 2.04 +PKG_VERSION:= 2.06 PKG_RELEASE:= 1 -PKG_HASH:= e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d +PKG_HASH:= b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1 PKG_DESCR:= multiboot boot loader PKG_SECTION:= base/boot PKG_BUILDDEP:= bison-host grub-host -HOST_BUILDDEP:= python2-host +HOST_BUILDDEP:= python3-host PKG_URL:= http://www.gnu.org/software/grub PKG_SITES:= https://ftp.gnu.org/gnu/grub/ PKG_NOPARALLEL:= 1 diff --git a/package/grub/files/grub-dual.cfg b/package/grub/files/grub-dual.cfg index bae2fa414..46b5451ad 100644 --- a/package/grub/files/grub-dual.cfg +++ b/package/grub/files/grub-dual.cfg @@ -40,11 +40,15 @@ function savedefault { } menuentry "OpenADK1" { - set root=(hd0,2) - linux (hd0,2)/kernel root=/dev/@@ROOTDEV@@2 rootfstype=ext4 rootwait panic=5 + insmod part_gpt + insmod ext2 + set root=(hd0,gpt2) + linux (hd0,2)/boot/kernel root=/dev/@@ROOTDEV@@2 rootfstype=ext4 rootwait panic=5 } menuentry "OpenADK2" { - set root=(hd0,3) - linux (hd0,3)/kernel root=/dev/@@ROOTDEV@@3 rootfstype=ext4 rootwait panic=5 + insmod part_gpt + insmod ext2 + set root=(hd0,gpt3) + linux (hd0,3)/boot/kernel root=/dev/@@ROOTDEV@@3 rootfstype=ext4 rootwait panic=5 } diff --git a/package/grub/files/grub.cfg b/package/grub/files/grub.cfg index 8d20ab243..3fdc48eda 100644 --- a/package/grub/files/grub.cfg +++ b/package/grub/files/grub.cfg @@ -6,9 +6,9 @@ set default=0 set timeout=3 menuentry "OpenADK" { - insmod part_msdos + insmod part_gpt insmod ext2 - set root='hd0,msdos1' + set root='hd0,gpt2' echo "Loading OpenADK" - linux16 /boot/kernel root=/dev/sda1 rootfstype=ext4 rootwait panic=10 + linux /boot/kernel root=/dev/sda2 rootfstype=ext4 rootwait panic=10 } diff --git a/package/gst-plugins-base/Makefile b/package/gst-plugins-base/Makefile index 182ed4656..c612cd63e 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.8.2 +PKG_VERSION:= 1.19.3 PKG_RELEASE:= 1 -PKG_HASH:= 9d7109c8fb0a5dec8edb17b0053c59a46aba7ddf48dc48ea822ebbbd4339d38d +PKG_HASH:= e277f198623a26c1b0a1e19734656392e9368bebf3677cd94262a1316a960827 PKG_DESCR:= gstreamer base plugins PKG_SECTION:= libs/video PKG_DEPENDS:= gstreamer @@ -19,8 +19,13 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,GST_PLUGINS_BASE,gst-plugins-base,$(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 + TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE -CONFIGURE_ARGS+= --without-x gst-plugins-base-install: $(INSTALL_DIR) $(IDIR_GST_PLUGINS_BASE)/usr/lib/gstreamer-1.0/ diff --git a/package/gst-plugins-good/Makefile b/package/gst-plugins-good/Makefile index 53a6b0943..8feb16c2f 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.8.2 +PKG_VERSION:= 1.19.3 PKG_RELEASE:= 1 -PKG_HASH:= 8d7549118a3b7a009ece6bb38a05b66709c551d32d2adfd89eded4d1d7a23944 +PKG_HASH:= 79ea32a77fa47e6596530e38113bf97c113fd95658087d9a91ffb8af47d11d07 PKG_DESCR:= gstreamer good plugins PKG_SECTION:= libs/video PKG_DEPENDS:= gstreamer @@ -19,8 +19,13 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,GST_PLUGINS_GOOD,gst-plugins-good,$(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 + TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE -CONFIGURE_ARGS+= --without-x gst-plugins-good-install: $(INSTALL_DIR) $(IDIR_GST_PLUGINS_GOOD)/usr/lib/gstreamer-1.0/ diff --git a/package/gstreamer/Makefile b/package/gstreamer/Makefile index 07d54db05..a59bbf7d1 100644 --- a/package/gstreamer/Makefile +++ b/package/gstreamer/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gstreamer -PKG_VERSION:= 1.8.2 -PKG_RELEASE:= 2 -PKG_HASH:= 9dbebe079c2ab2004ef7f2649fa317cabea1feb4fb5605c24d40744b90918341 +PKG_VERSION:= 1.19.3 +PKG_RELEASE:= 1 +PKG_HASH:= 906d7d4bf92f941586c0cbce717d9cad6aac36994e16fa6f2f153e07e3221bca PKG_DESCR:= opensource multimedia framework PKG_SECTION:= libs/video PKG_BUILDDEP:= glib @@ -19,10 +19,15 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,GSTREAMER,gstreamer,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ARGS+= --disable-examples \ - --disable-tests \ - --disable-benchmarks \ - --disable-checks +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dcheck=disabled \ + -Ddoc=disabled \ + -Dexamples=disabled gstreamer-install: $(INSTALL_DIR) $(IDIR_GSTREAMER)/usr/lib diff --git a/package/gzip/Makefile b/package/gzip/Makefile index 7c0ff0341..cd26a977c 100644 --- a/package/gzip/Makefile +++ b/package/gzip/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gzip -PKG_VERSION:= 1.10 +PKG_VERSION:= 1.13 PKG_RELEASE:= 1 -PKG_HASH:= 8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0 +PKG_HASH:= 7454eb6935db17c6655576c2e1b0fabefd38b4d0936e0f87f48cd062ce91a057 PKG_DESCR:= compression utility PKG_SECTION:= app/archive PKG_URL:= http://www.gnu.org/software/gzip/ diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile index 41711b0e4..118648eab 100644 --- a/package/harfbuzz/Makefile +++ b/package/harfbuzz/Makefile @@ -4,19 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= harfbuzz -PKG_VERSION:= 1.4.2 +PKG_VERSION:= 3.4.0 PKG_RELEASE:= 1 -PKG_HASH:= 8f234dcfab000fdec24d43674fffa2fdbdbd654eb176afbde30e8826339cb7b3 +PKG_HASH:= 810bcd3d22fae3c2c18c3688455abc1cd0d7fb2fae25404890b0d77e6443bd0a PKG_DESCR:= opentype text shaping engine PKG_SECTION:= libs/fonts -PKG_SITES:= http://www.freedesktop.org/software/harfbuzz/release/ +PKG_SITES:= https://github.com/harfbuzz/harfbuzz/archive/refs/tags/ PKG_DEPENDS:= cairo icu4c PKG_BUILDDEP:= cairo icu4c HOST_BUILDDEP:= cairo-host icu4c-host PKG_NEEDS:= c++ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +DISTFILES:= ${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -24,8 +24,18 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -HOST_LDFLAGS+= -lpthread -lrt -HOST_STYLE:= auto +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +HOST_STYLE:= meson +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dtests=disabled + +host-postinstall: + $(CP) $(WRKBUILD)/meson-private/harfbuzz.pc \ + $(STAGING_HOST_DIR)/usr/lib/pkgconfig/ harfbuzz-install: $(INSTALL_DIR) $(IDIR_HARFBUZZ)/usr/lib diff --git a/package/harfbuzz/patches/patch-Makefile_in b/package/harfbuzz/patches/patch-Makefile_in deleted file mode 100644 index 9ef495e70..000000000 --- a/package/harfbuzz/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- harfbuzz-1.2.3.orig/Makefile.in 2016-02-25 04:26:05.967296536 +0100 -+++ harfbuzz-1.2.3/Makefile.in 2016-04-03 19:27:12.062508784 +0200 -@@ -373,7 +373,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - NULL = - ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = src util test docs win32 -+SUBDIRS = src - EXTRA_DIST = \ - autogen.sh \ - harfbuzz.doap \ diff --git a/package/harfbuzz/patches/patch-src_harfbuzz_pc_in b/package/harfbuzz/patches/patch-src_harfbuzz_pc_in deleted file mode 100644 index 291829515..000000000 --- a/package/harfbuzz/patches/patch-src_harfbuzz_pc_in +++ /dev/null @@ -1,18 +0,0 @@ ---- harfbuzz-1.2.3.orig/src/harfbuzz.pc.in 2016-01-06 13:00:36.113138042 +0100 -+++ harfbuzz-1.2.3/src/harfbuzz.pc.in 2016-03-12 21:55:46.457327612 +0100 -@@ -1,13 +1,10 @@ - prefix=%prefix% --exec_prefix=%exec_prefix% --libdir=%libdir% --includedir=%includedir% - - Name: harfbuzz - Description: HarfBuzz text shaping library - Version: %VERSION% - --Libs: -L${libdir} -lharfbuzz -+Libs: -L${prefix}/lib -lharfbuzz - Libs.private: %libs_private% - Requires.private: %requires_private% --Cflags: -I${includedir}/harfbuzz -+Cflags: -I${prefix}/include/harfbuzz diff --git a/package/haveged/Makefile b/package/haveged/Makefile index 4e7284017..2779bb55a 100644 --- a/package/haveged/Makefile +++ b/package/haveged/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= haveged -PKG_VERSION:= 1.9.1 +PKG_VERSION:= 1.9.18 PKG_RELEASE:= 1 -PKG_HASH:= 9c2363ed9542a6784ff08e247182137e71f2ddb79e8e6c1ac4ad50d21ced3715 +PKG_HASH:= b835fa02b52ee7d06276e028571cadcb14d08f5e5a4b5767adf81451f70561c7 PKG_DESCR:= entropy gathering daemon PKG_SECTION:= sys/misc -PKG_SITES:= http://www.issihosts.com/haveged/ +PKG_SITES:= https://github.com/jirka-h/haveged/archive/refs/tags/ PKG_ARCH_DEPENDS:= !arm !mips -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz +DISTFILES:= v$(PKG_VERSION).tar.gz include $(ADK_TOPDIR)/mk/package.mk @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --enable-clock_gettime=yes haveged-install: $(INSTALL_DIR) $(IDIR_HAVEGED)/usr/lib - $(CP) $(WRKINST)/usr/lib/libhaveg*.so* \ + -$(CP) $(WRKINST)/usr/lib/libhaveg*.so* \ $(IDIR_HAVEGED)/usr/lib $(INSTALL_DIR) $(IDIR_HAVEGED)/usr/sbin $(INSTALL_BIN) $(WRKINST)/usr/sbin/haveged \ diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile index 060fe36c0..df273806b 100644 --- a/package/hdparm/Makefile +++ b/package/hdparm/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= hdparm -PKG_VERSION:= 9.50 +PKG_VERSION:= 9.63 PKG_RELEASE:= 1 -PKG_HASH:= 0892b44bd817c251264a24f6ecbbb010958033e0395d2030f25f1c5608ac780e +PKG_HASH:= 70785deaebba5877a89c123568b41dee990da55fc51420f13f609a1072899691 PKG_DESCR:= get/set ata/sata drive parameters PKG_SECTION:= sys/hw PKG_URL:= http://sourceforge.net/projects/hdparm diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index ee1235a5e..53390c29d 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -4,13 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= heimdal -PKG_VERSION:= 1.5.3 -PKG_RELEASE:= 3 -PKG_HASH:= aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 +PKG_VERSION:= 7.7.0 +PKG_RELEASE:= 1 +PKG_HASH:= f02d3314d634cc55eb9cf04a1eae0d96b293e45a1f837de9d894e800161b7d1b PKG_DESCR:= kerberos server PKG_SECTION:= app/crypto +HOST_BUILDDEP:= ncurses-host PKG_URL:= http://www.h5l.org/ -PKG_SITES:= http://www.h5l.org/dist/src/ +PKG_SITES:= https://github.com/heimdal/heimdal/releases/download/heimdal-${PKG_VERSION}/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -21,6 +22,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,HEIMDAL,heimdal,$(PKG_VERSION)-${PKG_RELEASE})) +# patch changes configure.ac, have to recreate +AUTOTOOL_STYLE:= autoreconf + HOST_STYLE:= manual ifeq ($(OS_FOR_BUILD),Darwin) diff --git a/package/heimdal/patches/heimdal_tinfo.patch b/package/heimdal/patches/heimdal_tinfo.patch new file mode 100644 index 000000000..cd64c7553 --- /dev/null +++ b/package/heimdal/patches/heimdal_tinfo.patch @@ -0,0 +1,23 @@ + Found in Gentoo portage +--- heimdal-1.5/configure.ac.orig 2011-08-01 12:49:33.554689000 +0200 ++++ heimdal-1.5/configure.ac 2011-08-01 13:54:12.707009421 +0200 +@@ -444,7 +444,7 @@ + #endif + ],[0,0,0,0,0]) + +-AC_FIND_FUNC_NO_LIBS(tgetent, termcap ncurses curses,[ ++AC_FIND_FUNC_NO_LIBS(tgetent, tinfo ncurses curses termcap,[ + #ifdef HAVE_TERMCAP_H + #include <termcap.h> + #endif +--- heimdal-1.5/lib/libedit/configure.ac~ 2011-07-30 22:43:29.000000000 +0200 ++++ heimdal-1.5/lib/libedit/configure.ac 2011-08-01 13:54:30.657009419 +0200 +@@ -33,7 +33,7 @@ + EL_MANTYPE + + +-AC_CHECK_LIB(curses, tgetent,, ++AC_CHECK_LIB(tinfo, tgetent,, + [AC_CHECK_LIB(ncurses, tgetent,, + [AC_MSG_ERROR([libcurses or libncurses are required!])] )] ) + diff --git a/package/heimdal/patches/patch-cf_check-compile-et_m4 b/package/heimdal/patches/patch-cf_check-compile-et_m4 deleted file mode 100644 index 0211e2b8f..000000000 --- a/package/heimdal/patches/patch-cf_check-compile-et_m4 +++ /dev/null @@ -1,17 +0,0 @@ ---- heimdal-1.5.3.orig/cf/check-compile-et.m4 2012-12-09 23:06:44.000000000 +0100 -+++ heimdal-1.5.3/cf/check-compile-et.m4 2014-04-24 11:55:02.000000000 +0200 -@@ -3,12 +3,12 @@ dnl - dnl CHECK_COMPILE_ET - AC_DEFUN([CHECK_COMPILE_ET], [ - --AC_CHECK_PROG(COMPILE_ET, compile_et, [compile_et]) -+AC_CHECK_PROG(COMPILE_ET, compile_et, [compile_et],[no]) - - krb_cv_compile_et="no" - krb_cv_com_err_need_r="" - krb_cv_compile_et_cross=no --if test "${COMPILE_ET}" = "compile_et"; then -+if test "${COMPILE_ET}" != no; then - - dnl We have compile_et. Now let's see if it supports `prefix' and `index'. - AC_MSG_CHECKING(whether compile_et has the features we need) diff --git a/package/heimdal/patches/patch-lib_com_err_Makefile_am b/package/heimdal/patches/patch-lib_com_err_Makefile_am deleted file mode 100644 index 9c2faa8d8..000000000 --- a/package/heimdal/patches/patch-lib_com_err_Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- heimdal-1.5.3.orig/lib/com_err/Makefile.am 2012-12-09 23:06:44.000000000 +0100 -+++ heimdal-1.5.3/lib/com_err/Makefile.am 2014-05-27 11:51:26.000000000 +0200 -@@ -13,7 +13,7 @@ endif - - libcom_err_la_LIBADD = $(LIB_libintl) - --bin_PROGRAMS = compile_et -+libexec_heimdal_PROGRAMS = compile_et - - include_HEADERS = com_err.h com_right.h - diff --git a/package/heimdal/patches/patch-lib_krb5_crypto-rand_c b/package/heimdal/patches/patch-lib_krb5_crypto-rand_c deleted file mode 100644 index bb72effe0..000000000 --- a/package/heimdal/patches/patch-lib_krb5_crypto-rand_c +++ /dev/null @@ -1,30 +0,0 @@ ---- heimdal-1.5.3.orig/lib/krb5/crypto-rand.c 2012-12-09 23:06:44.000000000 +0100 -+++ heimdal-1.5.3/lib/krb5/crypto-rand.c 2015-11-03 19:30:39.336954603 +0100 -@@ -59,27 +59,6 @@ seed_something(void) - } else - seedfile[0] = '\0'; - -- /* Calling RAND_status() will try to use /dev/urandom if it exists so -- we do not have to deal with it. */ -- if (RAND_status() != 1) { --#ifndef _WIN32 -- krb5_context context; -- const char *p; -- -- /* Try using egd */ -- if (!krb5_init_context(&context)) { -- p = krb5_config_get_string(context, NULL, "libdefaults", -- "egd_socket", NULL); -- if (p != NULL) -- RAND_egd_bytes(p, ENTROPY_NEEDED); -- krb5_free_context(context); -- } --#else -- /* TODO: Once a Windows CryptoAPI RAND method is defined, we -- can use that and failover to another method. */ --#endif -- } -- - if (RAND_status() == 1) { - /* Update the seed file */ - if (seedfile[0]) diff --git a/package/heimdal/patches/patch-lib_roken_roken_h_in b/package/heimdal/patches/patch-lib_roken_roken_h_in deleted file mode 100644 index b571cc428..000000000 --- a/package/heimdal/patches/patch-lib_roken_roken_h_in +++ /dev/null @@ -1,11 +0,0 @@ ---- heimdal-1.5.3.orig/lib/roken/roken.h.in 2012-12-09 23:06:44.000000000 +0100 -+++ heimdal-1.5.3/lib/roken/roken.h.in 2014-04-24 10:36:35.000000000 +0200 -@@ -551,7 +551,7 @@ ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL ge - ROKEN_LIB_FUNCTION char * ROKEN_LIB_CALL strerror(int); - #endif - --#if (!defined(HAVE_STRERROR_R) && !defined(strerror_r)) || (!defined(STRERROR_R_PROTO_COMPATIBLE) && defined(HAVE_STRERROR_R)) -+#if (defined(HAVE_STRERROR_R) && !defined(strerror_r)) || (!defined(STRERROR_R_PROTO_COMPATIBLE) && defined(HAVE_STRERROR_R)) - int ROKEN_LIB_FUNCTION rk_strerror_r(int, char *, size_t); - #else - #define rk_strerror_r strerror_r diff --git a/package/heimdal/src/cf/roken-h-process.pl b/package/heimdal/src/cf/roken-h-process.pl deleted file mode 100644 index aa371a364..000000000 --- a/package/heimdal/src/cf/roken-h-process.pl +++ /dev/null @@ -1,184 +0,0 @@ -#!/usr/bin/perl - -require 'getopts.pl'; - -my $debug = 0; - -Getopts('dc:p:o:') || die "foo"; - -if ($opt_d) { - $debug = 1; -} - -die "missing arg" if (!defined $opt_c || !defined $opt_p || !defined $opt_o); - -my %defines; -my $IN; -my $OUT; - -print "parse config.h\n" if ($debug); - -open IN, $opt_c || die "failed open ${opt_c}"; - -my @nesting; - -push @nesting, 1; - -while (<IN>) { - if (m/\s*#ifdef\s+(.*)/) { - my $var = $1; - if (defined $defines{$var}) { - push @nesting, 1; - } else { - push @nesting, 0; - } - next; - } elsif (m/\s*#ifndef\s+(.*)/) { - my $var = $1; - if (defined $defines{$var}) { - push @nesting, 0; - } else { - push @nesting, 1; - } - next; - } elsif (m/\s*#else/) { - my $var = pop @nesting; - $var = !$var; - push @nesting, $var; - next; - } elsif ($nesting[$#nesting] and m/\s*#define\s+(\w+)\s+(\S+)/) { - my $res = $2; - $res = 1 if (!defined $res); - $defines{$1} = $res; - } -} - -close IN; - -if ($debug) { - foreach my $i (keys %defines) { - print "k: $i v: $defines{$i}\n"; - } -} - -open IN, "$opt_p" || die "failed open ${opt_p}"; -open OUT, ">$opt_o" || die "failed open ${opt_o}"; - -print "parse roken.h.in\n" if ($debug); - -print OUT "/* This is an OS dependent, generated file */\n"; -print OUT "\n"; -print OUT "\n"; -print OUT "#ifndef __ROKEN_H__\n"; -print OUT "#define __ROKEN_H__\n"; -print OUT "\n"; - -@nesting = (1); - -while (<IN>) { - if (m/\s*#ifdef\s+(.*)/) { - my $var = $1; - if (defined $defines{$var}) { - push @nesting, 1; - } else { - push @nesting, 0; - } - next; - } elsif (m/\s*#ifndef\s+(.*)/) { - my $var = $1; - if (defined $defines{$var}) { - push @nesting, 0; - } else { - push @nesting, 1; - } - next; - } elsif (m/\s*#if\s+(.*)/) { - my $res = parse_if($1); - print "line = $res: $1\n" if ($debug); - push @nesting, $res; - next; - } elsif (m/\s*#elif\s+(.*)/) { - my $res = pop @nesting; - if ($res gt 0) { - $res = -1; - } else { - my $res = parse_if($1); - } - push @nesting, $res; - next; - } elsif (m/\s*#else/) { - my $var = pop @nesting; - $var = !$var; - push @nesting, $var; - next; - } elsif (m/\s*#endif/) { - pop @nesting; - next; - } - print "line: $_\n" if ($debug); - print "nesting dep $#{nesting}\n" if ($debug); - my $i = 0, $t = 1; - while ($i le $#nesting) { - $t = 0 if ($nesting[$i] le 0); - print "nesting $i val $nesting[$i] -> $t\n" if ($debug); - $i++; - } - if ($t) { - print OUT; - } -} - -print OUT "\n"; -print OUT "#endif /* __ROKEN_H__ */\n"; - - -close IN; - -exit 0; - -sub parse_if -{ - my ($neg, $var); - - $_ = shift; - - if (m/^\s*$/) { - print "end $_\n" if ($debug); - return 1; - } elsif (m/^\(([^&]+)\&\&(.*)$/) { - print "$1 and $2\n" if ($debug); - return parse_if($1) and parse_if($2); - } elsif (m/^([^&]+)\&\&(.*)$/) { - print "$1 and $2\n" if ($debug); - return parse_if($1) and parse_if($2); - } elsif (m/^([^\|]+)\|\|(.*)$/) { - print "$1 or $2\n" if ($debug); - return parse_if($1) or parse_if($2); - } elsif (m/^\s*(\!)?\s*defined\((\w+)\)/) { - ($neg, $var) = ($1, $2); - print "def: ${neg}-defined(${var})\n" if ($debug); - my $res = defined $defines{$var}; - if ($neg eq "!") { - if ($res) { - $res = 0; - } else { - $res = 1; - } - } - print "res: $res\n" if ($debug); - return $res; - } elsif (m/^\s*(\!)?(\w+)/) { - ($neg, $var) = ($1, $2); - print "var: $neg $var\n" if ($debug); - my $res; - if (defined $defines{$var}) { - $res = $defines{$var}; - } else { - $res = 0; - } - $res = ! $res if ($neg =~ m/!/); - print "res: $res\n" if ($debug); - return $res; - } - die "failed parse: $_\n"; -} diff --git a/package/heyu/Makefile b/package/heyu/Makefile index e42604d2f..a3b10f9ce 100644 --- a/package/heyu/Makefile +++ b/package/heyu/Makefile @@ -4,18 +4,18 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= heyu -PKG_VERSION:= 2.6.0 +PKG_VERSION:= 2.10.3 PKG_RELEASE:= 1 -PKG_HASH:= 1284e793520d2e152d9d7032f6727e72fbaaf7c4f4eaf9abea2b85eed090b0d2 +PKG_HASH:= 0c3435ea9cd57cd78c29047b9c961f4bfbec39f42055c9949acd10dd9853b628 PKG_DESCR:= x10 home automation control utility PKG_SECTION:= sys/serial PKG_DEPENDS:= setserial -PKG_URL:= http://heyu.tanj.com/ -PKG_SITES:= http://heyu.tanj.com/download/ +PKG_URL:= https://heyu.org/ +PKG_SITES:= https://github.com/HeyuX10Automation/heyu/archive/refs/tags/ PKG_LIBC_DEPENDS:= uclibc-ng glibc -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz +DISTFILES:= v${PKG_VERSION}.tar.gz include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/heyu/patches/patch-tty_c b/package/heyu/patches/patch-tty_c deleted file mode 100644 index cb8acf6d9..000000000 --- a/package/heyu/patches/patch-tty_c +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- heyu-2.6.0.orig/tty.c 2009-01-19 03:57:00.000000000 +0100 -+++ heyu-2.6.0/tty.c 2009-05-29 14:08:06.087764489 +0200 -@@ -395,7 +395,7 @@ char *make_lock_name ( char *ttydev ) - struct stat stat_buf; - - /* strip the leading path name */ -- ptr = rindex(ttydev, '/'); -+ ptr = strrchr(ttydev, '/'); - - devstr = dev_string; - diff --git a/package/heyu/patches/patch-x10state_c b/package/heyu/patches/patch-x10state_c deleted file mode 100644 index c56f2489d..000000000 --- a/package/heyu/patches/patch-x10state_c +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- heyu-2.6.0.orig/x10state.c 2009-04-21 00:45:51.000000000 +0200 -+++ heyu-2.6.0/x10state.c 2009-05-29 14:17:51.812378291 +0200 -@@ -5601,7 +5601,7 @@ char **create_noenv_environment ( LAUNCH - - // launcherp = configp->launcherp; - -- if ( daemon == D_RELAY || (index >= 0 && launcherp && launcherp->type == L_POWERFAIL) ) -+ if ( daemon == D_RELAY || (launcherp && launcherp->type == L_POWERFAIL) ) - putenv("HEYU_PARENT=RELAY"); - else - putenv("HEYU_PARENT=ENGINE"); diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 22cfeba7d..2eeaefd20 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -4,15 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= hostapd -PKG_VERSION:= 2.5 +PKG_VERSION:= 2.10 PKG_RELEASE:= 1 -PKG_HASH:= 8e272d954dc0d7026c264b79b15389ec2b2c555b32970de39f506b9f463ec74a +PKG_HASH:= 206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d PKG_DESCR:= wireless authenticator PKG_SECTION:= net/wifi PKG_DEPENDS:= libnl PKG_BUILDDEP:= libnl -PKG_URL:= http://hostap.epitest.fi/ -PKG_SITES:= http://hostap.epitest.fi/releases/ +PKG_SITES:= http://w1.fi/releases/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/htop/Makefile b/package/htop/Makefile index 9d886a855..7ded657a6 100644 --- a/package/htop/Makefile +++ b/package/htop/Makefile @@ -4,17 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= htop -PKG_VERSION:= 2.0.1 +PKG_VERSION:= 3.2.2 PKG_RELEASE:= 1 -PKG_HASH:= f410626dfaf6b70fdf73cd7bb33cae768869707028d847fed94a978e974f5666 +PKG_HASH:= bac9e9ab7198256b8802d2e3b327a54804dc2a19b77a5f103645b11c12473dc8 PKG_DESCR:= graphical process manager PKG_SECTION:= sys/utils PKG_DEPENDS:= libncurses PKG_BUILDDEP:= ncurses PKG_URL:= http://hisham.hm/htop -PKG_SITES:= http://hisham.hm/htop/releases/$(PKG_VERSION)/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_SITES:= https://github.com/htop-dev/htop/releases/download/$(PKG_VERSION)/ include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/httping/Makefile b/package/httping/Makefile index f6ed4f4df..60c2ab6cf 100644 --- a/package/httping/Makefile +++ b/package/httping/Makefile @@ -4,26 +4,28 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= httping -PKG_VERSION:= 2.4 +PKG_VERSION:= 3.5 PKG_RELEASE:= 1 -PKG_HASH:= dab59f02b08bfbbc978c005bb16d2db6fe21e1fc841fde96af3d497ddfc82084 +PKG_HASH:= 8c081daae31cad586bce7742bd721c2a741d7ce0687fb3a12cafd389b90bf79c PKG_DESCR:= like ping but for http-requests PKG_SECTION:= net/http -PKG_DEPENDS:= libressl -PKG_BUILDDEP:= libressl -PKG_SITES:= http://www.vanheusden.com/httping/ +PKG_DEPENDS:= libressl ca-certificates +PKG_BUILDDEP:= cmake-host libressl +PKG_NEEDS:= intl +PKG_SITES:= https://github.com/folkertvanheusden/HTTPing/archive/refs/tags/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz +DISTFILES:= v${PKG_VERSION}.tar.gz +WRKDIST= ${WRKDIR}/HTTPing-${PKG_VERSION} include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,HTTPING,httping,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIG_STYLE:= manual -TARGET_CFLAGS+= -D_GNU_SOURCE +CONFIG_STYLE:= cmake +INSTALL_STYLE:= manual httping-install: ${INSTALL_DIR} ${IDIR_HTTPING}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/httping ${IDIR_HTTPING}/usr/bin/ + ${INSTALL_BIN} ${WRKBUILD}/httping ${IDIR_HTTPING}/usr/bin/ include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/hugo/Makefile b/package/hugo/Makefile deleted file mode 100644 index ab25a693f..000000000 --- a/package/hugo/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:= hugo -PKG_VERSION:= 0.18.1 -PKG_RELEASE:= 1 -PKG_HASH:= 29db2524a3042f507162164ec3ce9071277a7608547f4ea4f739d63cac4b39e4 -PKG_DESCR:= fast website generator -PKG_SECTION:= net/http -PKG_BUILDDEP:= go-host -PKG_URL:= https://gohugo.io -PKG_SITES:= https://github.com/spf13/hugo/archive/ - -DISTFILES:= v$(PKG_VERSION).tar.gz - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,HUGO,hugo,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -CONFIG_STYLE:= manual -BUILD_STYLE:= manual -INSTALL_STYLE:= manual - -include $(ADK_TOPDIR)/mk/go.mk - -do-build: - (cd $(WRKBUILD) && $(ADK_GO_TARGET_ENV) $(ADK_GO) \ - get -v github.com/spf13/hugo) - -hugo-install: - $(INSTALL_DIR) $(IDIR_HUGO)/usr/bin - $(INSTALL_BIN) $(ADK_GO_BINPATH)/hugo \ - $(IDIR_HUGO)/usr/bin - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/hush/Makefile b/package/hush/Makefile index 2e90466e9..dffc690ab 100644 --- a/package/hush/Makefile +++ b/package/hush/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= hush -PKG_VERSION:= 1.33.0 +PKG_VERSION:= 1.36.1 PKG_RELEASE:= 1 -PKG_HASH:= d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd +PKG_HASH:= b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314 PKG_DESCR:= hush standalone shell PKG_SECTION:= base/shells PKG_URL:= http://www.busybox.net/ diff --git a/package/hush/files/config b/package/hush/files/config index c4385b11f..7e81b468e 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.33.0 -# Fri Apr 9 22:37:09 2021 +# Busybox version: 1.36.1 +# Thu Aug 31 12:09:53 2023 # CONFIG_HAVE_DOT_CONFIG=y @@ -93,10 +93,16 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA1_SMALL=3 +CONFIG_SHA1_HWACCEL=y +CONFIG_SHA256_HWACCEL=y CONFIG_SHA3_SMALL=1 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set -# CONFIG_FEATURE_ETC_SERVICES is not set +CONFIG_FEATURE_NON_POSIX_CP=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_USE_SENDFILE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set @@ -120,14 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_FEATURE_NON_POSIX_CP=y -# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set -CONFIG_FEATURE_USE_SENDFILE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y +# CONFIG_LOOP_CONFIGURE is not set +# CONFIG_NO_LOOP_CONFIGURE is not set +CONFIG_TRY_LOOP_CONFIGURE=y # # Applets @@ -162,6 +163,8 @@ CONFIG_BZIP2_SMALL=0 # CONFIG_CPIO is not set # CONFIG_FEATURE_CPIO_O is not set # CONFIG_FEATURE_CPIO_P is not set +# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set +# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_GZIP is not set @@ -197,6 +200,14 @@ CONFIG_GZIP_FAST=0 # # Coreutils # +# CONFIG_FEATURE_VERBOSE is not set + +# +# Common options for date and touch +# +# CONFIG_FEATURE_TIMEZONE is not set +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set +# CONFIG_FEATURE_HUMAN_READABLE is not set # CONFIG_BASENAME is not set # CONFIG_CAT is not set # CONFIG_FEATURE_CATN is not set @@ -207,11 +218,13 @@ CONFIG_GZIP_FAST=0 # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set # CONFIG_CHROOT is not set # CONFIG_CKSUM is not set +# CONFIG_CRC32 is not set # CONFIG_COMM is not set # CONFIG_CP is not set # CONFIG_FEATURE_CP_LONG_OPTIONS is not set # CONFIG_FEATURE_CP_REFLINK is not set # CONFIG_CUT is not set +# CONFIG_FEATURE_CUT_REGEX is not set # CONFIG_DATE is not set # CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_NANO is not set @@ -223,6 +236,7 @@ CONFIG_GZIP_FAST=0 # CONFIG_FEATURE_DD_STATUS is not set # CONFIG_DF is not set # CONFIG_FEATURE_DF_FANCY is not set +# CONFIG_FEATURE_SKIP_ROOTFS is not set # CONFIG_DIRNAME is not set # CONFIG_DOS2UNIX is not set # CONFIG_UNIX2DOS is not set @@ -312,13 +326,13 @@ CONFIG_GZIP_FAST=0 # CONFIG_FEATURE_TEST_64 is not set # CONFIG_TIMEOUT is not set # CONFIG_TOUCH is not set -# CONFIG_FEATURE_TOUCH_NODEREF is not set # CONFIG_FEATURE_TOUCH_SUSV3 is not set # CONFIG_TR is not set # CONFIG_FEATURE_TR_CLASSES is not set # CONFIG_FEATURE_TR_EQUIV is not set # CONFIG_TRUE is not set # CONFIG_TRUNCATE is not set +# CONFIG_TSORT is not set # CONFIG_TTY is not set # CONFIG_UNAME is not set CONFIG_UNAME_OSNAME="" @@ -339,13 +353,6 @@ CONFIG_UNAME_OSNAME="" # CONFIG_YES is not set # -# Common options -# -# CONFIG_FEATURE_VERBOSE is not set -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set -# CONFIG_FEATURE_HUMAN_READABLE is not set - -# # Console Utilities # # CONFIG_CHVT is not set @@ -408,6 +415,7 @@ CONFIG_DEFAULT_SETFONT_DIR="" CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_8BIT is not set # CONFIG_FEATURE_VI_COLON is not set +# CONFIG_FEATURE_VI_COLON_EXPAND is not set # CONFIG_FEATURE_VI_YANKMARK is not set # CONFIG_FEATURE_VI_SEARCH is not set # CONFIG_FEATURE_VI_REGEX_SEARCH is not set @@ -421,6 +429,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_UNDO is not set # CONFIG_FEATURE_VI_UNDO_QUEUE is not set CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 +# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set # CONFIG_FEATURE_ALLOW_EXEC is not set # @@ -429,7 +438,11 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 # CONFIG_FIND is not set # CONFIG_FEATURE_FIND_PRINT0 is not set # CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_ATIME is not set +# CONFIG_FEATURE_FIND_CTIME is not set # CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_AMIN is not set +# CONFIG_FEATURE_FIND_CMIN is not set # CONFIG_FEATURE_FIND_PERM is not set # CONFIG_FEATURE_FIND_TYPE is not set # CONFIG_FEATURE_FIND_EXECUTABLE is not set @@ -437,6 +450,7 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 # CONFIG_FEATURE_FIND_MAXDEPTH is not set # CONFIG_FEATURE_FIND_NEWER is not set # CONFIG_FEATURE_FIND_INUM is not set +# CONFIG_FEATURE_FIND_SAMEFILE is not set # CONFIG_FEATURE_FIND_EXEC is not set # CONFIG_FEATURE_FIND_EXEC_PLUS is not set # CONFIG_FEATURE_FIND_USER is not set @@ -719,6 +733,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +# CONFIG_ASCII is not set # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set # CONFIG_BC is not set @@ -799,10 +814,12 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set +# CONFIG_SEEDRNG is not set # CONFIG_SETFATTR is not set # CONFIG_SETSERIAL is not set # CONFIG_STRINGS is not set # CONFIG_TIME is not set +# CONFIG_TREE is not set # CONFIG_TS is not set # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set @@ -814,6 +831,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set +# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set # # Networking Utilities @@ -822,6 +840,9 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set +# CONFIG_FEATURE_HWIB is not set # CONFIG_FEATURE_TLS_SHA1 is not set # CONFIG_ARP is not set # CONFIG_ARPING is not set @@ -840,6 +861,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_HOSTNAME is not set # CONFIG_DNSDOMAINNAME is not set # CONFIG_HTTPD is not set +CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0 # CONFIG_FEATURE_HTTPD_RANGES is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set @@ -932,6 +954,7 @@ CONFIG_FEATURE_IP_ROUTE_DIR="" # CONFIG_FEATURE_TELNET_WIDTH is not set # CONFIG_TELNETD is not set # CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set @@ -952,6 +975,7 @@ CONFIG_FEATURE_IP_ROUTE_DIR="" # CONFIG_WGET is not set # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set # CONFIG_FEATURE_WGET_STATUSBAR is not set +# CONFIG_FEATURE_WGET_FTP is not set # CONFIG_FEATURE_WGET_AUTHENTICATION is not set # CONFIG_FEATURE_WGET_TIMEOUT is not set # CONFIG_FEATURE_WGET_HTTPS is not set @@ -968,11 +992,13 @@ CONFIG_DHCPD_LEASES_FILE="" # CONFIG_FEATURE_UDHCPC_ARPING is not set # CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC6_DEFAULT_SCRIPT="" # CONFIG_UDHCPC6 is not set # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set +CONFIG_UDHCPC_DEFAULT_INTERFACE="" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 @@ -990,17 +1016,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" # # Mail Utilities # +CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_MAKEMIME is not set # CONFIG_POPMAILDIR is not set # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set # CONFIG_REFORMIME is not set # CONFIG_FEATURE_REFORMIME_COMPAT is not set # CONFIG_SENDMAIL is not set -CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_SHOW_THREADS is not set # CONFIG_FREE is not set # CONFIG_FUSER is not set # CONFIG_IOSTAT is not set @@ -1039,7 +1067,6 @@ CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_UPTIME is not set # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set # CONFIG_WATCH is not set -# CONFIG_FEATURE_SHOW_THREADS is not set # # Runit Utilities @@ -1096,6 +1123,7 @@ CONFIG_BASH_IS_HUSH=y # CONFIG_ASH_ECHO is not set # CONFIG_ASH_PRINTF is not set # CONFIG_ASH_TEST is not set +# CONFIG_ASH_SLEEP is not set # CONFIG_ASH_HELP is not set # CONFIG_ASH_GETOPTS is not set # CONFIG_ASH_CMDCMD is not set @@ -1104,8 +1132,8 @@ CONFIG_HUSH=y CONFIG_SHELL_HUSH=y CONFIG_HUSH_BASH_COMPAT=y CONFIG_HUSH_BRACE_EXPANSION=y -CONFIG_HUSH_LINENO_VAR=y CONFIG_HUSH_BASH_SOURCE_CURDIR=y +CONFIG_HUSH_LINENO_VAR=y CONFIG_HUSH_INTERACTIVE=y CONFIG_HUSH_SAVEHISTORY=y CONFIG_HUSH_JOB=y diff --git a/package/hwdata/Makefile b/package/hwdata/Makefile new file mode 100644 index 000000000..0387cf3c6 --- /dev/null +++ b/package/hwdata/Makefile @@ -0,0 +1,51 @@ +# 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:= hwdata +PKG_VERSION:= 0.378 +PKG_RELEASE:= 1 +PKG_HASH:= 098ea8db12a50290f4b23f7f521edf9c5bab25935d2740de17e4a487110b40c8 +PKG_DESCR:= combined repository of pci.ids and usb.ids +PKG_SECTION:= sys/hw +PKG_URL:= https://github.com/vcrhonek/hwdata +PKG_SITES:= https://github.com/vcrhonek/hwdata/archive/refs/tags/ + +DISTFILES:= v$(PKG_VERSION).tar.gz + +PKG_SUBPKGS:= HWDATA_NET HWDATA_PCI HWDATA_USB HWDATA_PNP +PKGSD_HWDATA_NET:= HWDATA files oui.txt and iab.txt +PKGSD_HWDATA_PCI:= HWDATA file pci.ids +PKGSD_HWDATA_USB:= HWDATA file usb.ids +PKGSD_HWDATA_PNP:= HWDATA file pnp.ids + +PKG_FLAVOURS_HWDATA:= WITH_GZIP +PKGFD_WITH_GZIP:= gzip ids before installation + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,HWDATA_NET,hwdata-net,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWDATA_NET),$(PKG_SECTION))) +$(eval $(call PKG_template,HWDATA_PCI,hwdata-pci,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWDATA_PCI),$(PKG_SECTION))) +$(eval $(call PKG_template,HWDATA_USB,hwdata-usb,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWDATA_USB),$(PKG_SECTION))) +$(eval $(call PKG_template,HWDATA_PNP,hwdata-pnp,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWDATA_PNP),$(PKG_SECTION))) + +define HWDATA_INSTALL_template +$(2)-install: + $$(INSTALL_DIR) $$(IDIR_$(1))/usr/share/hwdata + $$(INSTALL_DATA) $$(patsubst %,$$(WRKINST)/usr/share/hwdata/%,$(3)) \ + $$(IDIR_$(1))/usr/share/hwdata/ +endef + +$(eval $(call HWDATA_INSTALL_template,HWDATA_NET,hwdata-net,oui.txt iab.txt)) +ifeq ($(ADK_PACKAGE_HWDATA_WITH_GZIP),y) +$(eval $(call HWDATA_INSTALL_template,HWDATA_PCI,hwdata-pci,pci.ids.gz)) +$(eval $(call HWDATA_INSTALL_template,HWDATA_USB,hwdata-usb,usb.ids.gz)) +$(eval $(call HWDATA_INSTALL_template,HWDATA_PNP,hwdata-pnp,pnp.ids.gz)) +else +$(eval $(call HWDATA_INSTALL_template,HWDATA_PCI,hwdata-pci,pci.ids)) +$(eval $(call HWDATA_INSTALL_template,HWDATA_USB,hwdata-usb,usb.ids)) +$(eval $(call HWDATA_INSTALL_template,HWDATA_PNP,hwdata-pnp,pnp.ids)) +endif + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/hwdata/patches/patch-hwdata_pc_in b/package/hwdata/patches/patch-hwdata_pc_in new file mode 100644 index 000000000..fe88b5244 --- /dev/null +++ b/package/hwdata/patches/patch-hwdata_pc_in @@ -0,0 +1,10 @@ +--- 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/hwids/Makefile b/package/hwids/Makefile deleted file mode 100644 index ceeca3a72..000000000 --- a/package/hwids/Makefile +++ /dev/null @@ -1,61 +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:= hwids -PKG_VERSION:= 20150129 -PKG_RELEASE:= 1 -PKG_HASH:= 33a7f4dbf14704076b0fe1d0052e86bb618e386a1ff18107097311df44f979d7 -PKG_DESCR:= combined repository of pci.ids and usb.ids -PKG_SECTION:= sys/hw -PKG_URL:= https://github.com/gentoo/hwids -PKG_SITES:= https://github.com/gentoo/hwids/archive/ - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz -# typical problem of having tags like '<name>-<version>' in github -WRKDIST= $(WRKDIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION) - -PKG_SUBPKGS:= HWIDS_NET HWIDS_PCI HWIDS_USB -PKGSD_HWIDS_NET:= HWIDS files oui.txt and iab.txt -PKGSD_HWIDS_PCI:= HWIDS file pci.ids -PKGSD_HWIDS_USB:= HWIDS file usb.ids - -PKG_FLAVOURS_HWIDS:= WITH_GZIP -PKGFD_WITH_GZIP:= gzip pci.ids and usb.ids before installation - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,HWIDS_NET,hwids-net,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWIDS_NET),$(PKG_SECTION))) -$(eval $(call PKG_template,HWIDS_PCI,hwids-pci,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWIDS_PCI),$(PKG_SECTION))) -$(eval $(call PKG_template,HWIDS_USB,hwids-usb,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWIDS_USB),$(PKG_SECTION))) - -CONFIG_STYLE:= manual -XAKE_FLAGS+= NET=yes \ - PCI=yes \ - UDEV=no \ - USB=yes -# note: Can't pass GZIP=yes to make, as this will turn it -# into an env var automatically which makes gzip trip. -# Therefore assume here that GZIP=yes is the default. -ifneq ($(ADK_PACKAGE_HWIDS_WITH_GZIP),y) -XAKE_FLAGS+= GZIP=no -endif - -define HWIDS_INSTALL_template -$(2)-install: - $$(INSTALL_DIR) $$(IDIR_$(1))/usr/share/misc - $$(INSTALL_DATA) $$(patsubst %,$$(WRKINST)/usr/share/misc/%,$(3)) \ - $$(IDIR_$(1))/usr/share/misc/ -endef - -$(eval $(call HWIDS_INSTALL_template,HWIDS_NET,hwids-net,oui.txt iab.txt)) -ifeq ($(ADK_PACKAGE_HWIDS_WITH_GZIP),y) -$(eval $(call HWIDS_INSTALL_template,HWIDS_PCI,hwids-pci,pci.ids.gz)) -$(eval $(call HWIDS_INSTALL_template,HWIDS_USB,hwids-usb,usb.ids.gz)) -else -$(eval $(call HWIDS_INSTALL_template,HWIDS_PCI,hwids-pci,pci.ids)) -$(eval $(call HWIDS_INSTALL_template,HWIDS_USB,hwids-usb,usb.ids)) -endif - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/icecast/Makefile b/package/icecast/Makefile index df4fe30b7..08f0e0a45 100644 --- a/package/icecast/Makefile +++ b/package/icecast/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= icecast -PKG_VERSION:= 2.3.3 +PKG_VERSION:= 2.4.4 PKG_RELEASE:= 1 -PKG_HASH:= 1b1d06f5f83c9a983cd28cc78aa90e4038f933511b3d20d7fd2cfc116645c36d +PKG_HASH:= 49b5979f9f614140b6a38046154203ee28218d8fc549888596a683ad604e4d44 PKG_DESCR:= streaming media server PKG_SECTION:= mm/audio PKG_DEPENDS:= libcurl libvorbis libxml2 libxslt @@ -23,6 +23,7 @@ $(eval $(call PKG_template,ICECAST,icecast,${PKG_VERSION}-${PKG_RELEASE},${PKG_D AUTOTOOL_STYLE:= autoreconf TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/libxml2 +TARGET_LDFLAGS+= -lxml2 CONFIGURE_ARGS+= --disable-yp \ --with-curl="yes" \ --with-curl-config="${STAGING_TARGET_DIR}/usr/bin/curl-config" \ diff --git a/package/icu4c/Makefile b/package/icu4c/Makefile index c2baf3090..57851e92f 100644 --- a/package/icu4c/Makefile +++ b/package/icu4c/Makefile @@ -4,18 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= icu4c -PKG_VERSION:= 54.1 -PKG_RELEASE:= 2 -PKG_HASH:= d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3 +PKG_VERSION:= 70.1 +PKG_RELEASE:= 1 +PKG_HASH:= 8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5 PKG_DESCR:= unicode and globalization library PKG_SECTION:= libs/misc PKG_BUILDDEP:= icu4c-host PKG_NEEDS:= c++ PKG_URL:= http://icu-project.org -PKG_SITES:= http://download.icu-project.org/files/icu4c/$(PKG_VERSION)/ +PKG_SITES:= https://github.com/unicode-org/icu/releases/download/release-70-1/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-54_1-src.tgz +DISTFILES:= ${PKG_NAME}-70_1-src.tgz WRKDIST= ${WRKDIR}/icu/source diff --git a/package/ipmitool/Makefile b/package/ipmitool/Makefile index 2fec3dd77..938a59ed4 100644 --- a/package/ipmitool/Makefile +++ b/package/ipmitool/Makefile @@ -4,21 +4,21 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ipmitool -PKG_VERSION:= 1.8.15 +PKG_VERSION:= 1.8.19 PKG_RELEASE:= 1 -PKG_HASH:= f0964e644a8e693932a3e8da6929d5598ed24645bacd51fbb1a4a09b5e47cf78 +PKG_HASH:= 48b010e7bcdf93e4e4b6e43c53c7f60aa6873d574cbd45a8d86fa7aaeebaff9c PKG_DESCR:= utility for controlling ipmi enabled devices PKG_SECTION:= net/misc -PKG_URL:= http://ipmitool.sf.net/ -PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=ipmitool/) +PKG_SITES:= https://github.com/ipmitool/ipmitool/archive/refs/tags/ -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz +DISTFILES:= IPMITOOL_1_8_19.tar.gz +WRKDIST= ${WRKDIR}/$(PKG_NAME)-IPMITOOL_1_8_19 include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,IPMITOOL,ipmitool,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes +AUTOTOOL_STYLE:= bootstrap ipmitool-install: $(INSTALL_DIR) $(IDIR_IPMITOOL)/usr/bin diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile deleted file mode 100644 index c771132e2..000000000 --- a/package/iptables-snmp/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:= iptables-snmp -PKG_VERSION:= 0.1 -PKG_RELEASE:= 1 -PKG_HASH:= 3275bb3820809a311b9f92ea32f071888b9a92f60c831417490e811f46ec4d54 -PKG_DESCR:= iptables support for net-snmp -PKG_SECTION:= net/misc -PKG_BUILDDEP:= net-snmp -PKG_URL:= http://www.nobiscuit.com/iptables-snmp/ -PKG_SITES:= http://www.nobiscuit.com/iptables-snmp/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -PKG_LIBC_DEPENDS:= uclibc-ng glibc - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,IPTABLES_SNMP,iptables-snmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -FAKE_FLAGS+= INSTALL_PREFIX="${WRKINST}" - -iptables-snmp-install: - ${INSTALL_DIR} ${IDIR_IPTABLES_SNMP}/usr/lib - ${CP} ${WRKINST}/usr/lib/iptables-snmp.so ${IDIR_IPTABLES_SNMP}/usr/lib - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/iptables-snmp/patches/patch-Makefile_in b/package/iptables-snmp/patches/patch-Makefile_in deleted file mode 100644 index 164003986..000000000 --- a/package/iptables-snmp/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- iptables-snmp-0.1.orig/Makefile.in 2005-11-02 13:00:10.000000000 +0100 -+++ iptables-snmp-0.1/Makefile.in 2011-01-12 15:44:48.000000000 +0100 -@@ -67,7 +67,7 @@ OTHER = -Iinclude -DIPTABLES_VERSION=$( - - all: iptables-snmp.so - --iptables-snmp.so: $(OBJS) libiptc.a Makefile -+iptables-snmp.so: $(OBJS) Makefile - $(CC) $(CFLAGS) $(OTHER) $(DFLAGS) -shared -o $@ $(OBJS) $(LDFLAGS) - - libiptc.a: $(LIBIPTC_OBJS) Makefile diff --git a/package/iptables-snmp/patches/patch-iptables-snmp_c b/package/iptables-snmp/patches/patch-iptables-snmp_c deleted file mode 100644 index c129ff0e9..000000000 --- a/package/iptables-snmp/patches/patch-iptables-snmp_c +++ /dev/null @@ -1,12 +0,0 @@ ---- iptables-snmp-0.1.orig/iptables-snmp.c 2005-11-02 12:10:54.000000000 +0100 -+++ iptables-snmp-0.1/iptables-snmp.c 2011-01-12 15:46:19.000000000 +0100 -@@ -37,6 +37,9 @@ - - #include "libiptc/libiptc.h" - -+/* For backward compatibility */ -+//typedef struct iptc_handle *iptc_handle_t; -+ - static oid agent_version_oid[] = { - BASE_OID, 1, 0, AGENT_VERSION_INDEX - }; diff --git a/package/iptables-snmp/patches/patch-libiptc_libip6tc_c b/package/iptables-snmp/patches/patch-libiptc_libip6tc_c deleted file mode 100644 index 68ae9cf7f..000000000 --- a/package/iptables-snmp/patches/patch-libiptc_libip6tc_c +++ /dev/null @@ -1,11 +0,0 @@ ---- iptables-snmp-0.1.orig/libiptc/libip6tc.c 2005-07-05 00:11:28.000000000 +0200 -+++ iptables-snmp-0.1/libiptc/libip6tc.c 2009-11-13 23:18:45.195701184 +0100 -@@ -111,7 +111,7 @@ typedef unsigned int socklen_t; - #include "libiptc.c" - - #define BIT6(a, l) \ -- ((ntohl(a->in6_u.u6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1) -+ ((ntohl(a->s6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1) - - int - ipv6_prefix_length(const struct in6_addr *a) diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 141b6b192..f6e0ad777 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.5 +PKG_VERSION:= 1.8.10 PKG_RELEASE:= 1 -PKG_HASH:= d457d74512e63aa3f50336e0597d4023c0e3c6845594d38532efb6ebcb294309 +PKG_HASH:= 5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c PKG_DESCR:= netfilter firewalling software PKG_SECTION:= net/firewall PKG_DEPENDS:= libnetfilter_conntrack libmnl libnfnetlink @@ -17,8 +17,6 @@ PKG_URL:= http://www.netfilter.org/ PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) @@ -31,6 +29,7 @@ iptables-install: ${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc/xtables,usr/sbin} ${INSTALL_DATA} ./files/firewall.conf ${IDIR_IPTABLES}/etc ${INSTALL_DATA} ./files/connlabel.conf ${IDIR_IPTABLES}/etc/xtables + ${CP} ${WRKINST}/usr/sbin/xtables-legacy-multi ${IDIR_IPTABLES}/usr/sbin ${CP} ${WRKINST}/usr/sbin/iptables ${IDIR_IPTABLES}/usr/sbin ${CP} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IPTABLES}/usr/sbin ${CP} ${WRKINST}/usr/sbin/iptables-{save,restore} \ diff --git a/package/iptraf-ng/Makefile b/package/iptraf-ng/Makefile new file mode 100644 index 000000000..d6dbecc56 --- /dev/null +++ b/package/iptraf-ng/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:= iptraf-ng +PKG_GIT:= tag +PKG_HASH:= cf385d3a0d2344f0159be0ab859651de2f750b661d88d1f22f96b82a7cd4ae13 +PKG_VERSION:= v1.2.1 +PKG_RELEASE:= 1 +PKG_DESCR:= a console-based network monitoring program +PKG_SECTION:= net/perf +PKG_DEPENDS:= libncurses +PKG_BUILDDEP:= ncurses +PKG_URL:= https://github.com/iptraf-ng/iptraf-ng +PKG_SITES:= https://github.com/iptraf-ng/iptraf-ng.git + +include ${ADK_TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,IPTRAF_NG,iptraf-ng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +TARGET_LDFLAGS+= -ltinfo -lncurses -lpanel +XAKE_FLAGS+= PLATFORM="-DPLATFORM=\\\"Linux/${ARCH}\\\"" \ + TARGET="/usr/bin" \ + WORKDIR="/var/lib/iptraf-ng" V=1 + +iptraf-ng-install: + ${INSTALL_DIR} ${IDIR_IPTRAF_NG}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/iptraf-ng ${IDIR_IPTRAF_NG}/usr/sbin + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/iptraf-ng/patches/patch-Makefile b/package/iptraf-ng/patches/patch-Makefile new file mode 100644 index 000000000..597248cfe --- /dev/null +++ b/package/iptraf-ng/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- iptraf-ng-v1.2.1.orig/Makefile 2024-02-25 17:52:43.000000000 +0100 ++++ iptraf-ng-v1.2.1/Makefile 2024-02-25 17:54:46.973660535 +0100 +@@ -25,7 +25,7 @@ ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) $(IPT + ALL_LDFLAGS = $(LDFLAGS) + STRIP ?= strip + +-prefix = $(HOME) ++prefix = /usr + sbindir_relative = sbin + sbindir = $(prefix)/$(sbindir_relative) + mandir = $(prefix)/share/man diff --git a/package/iptraf/patches/patch-src_Makefile b/package/iptraf/patches/patch-src_Makefile index e03ebb770..031a96362 100644 --- a/package/iptraf/patches/patch-src_Makefile +++ b/package/iptraf/patches/patch-src_Makefile @@ -1,6 +1,6 @@ $Id$ --- iptraf-3.0.1.orig/src/Makefile 2005-09-13 11:11:17.000000000 +0200 -+++ iptraf-3.0.1/src/Makefile 2014-06-25 16:51:56.160654472 +0200 ++++ iptraf-3.0.1/src/Makefile 2024-02-25 18:13:10.945645560 +0100 @@ -17,8 +17,9 @@ VERSION = -DVERSION=\"$(VERNUMBER)\" # BINDIR = ../../iptraf-$(VERNUMBER).bin.$(ARCH) @@ -34,16 +34,17 @@ $Id$ # You can uncomment this one to disable the backspace key in input fields. # This means you must use the Del key or Ctrl+H combination to erase the -@@ -98,7 +101,7 @@ LOCKDIR = /var/run/iptraf +@@ -98,41 +101,39 @@ LOCKDIR = /var/run/iptraf # Object file names OBJS = iptraf.o itrafmon.o packet.o tcptable.o othptab.o ifstats.o deskman.o \ -ipcsum.o hostmon.o fltedit.o tr.o cidr.o \ +ipcsum.o hostmon.o fltedit.o cidr.o \ fltselect.o ipfilter.o fltmgr.o ipfrag.o serv.o servname.o instances.o \ - timer.o revname.o pktsize.o landesc.o isdntab.o options.o promisc.o ifaces.o \ +-timer.o revname.o pktsize.o landesc.o isdntab.o options.o promisc.o ifaces.o \ ++timer.o revname.o pktsize.o landesc.o options.o promisc.o ifaces.o \ error.o log.o mode.o getpath.o bar.o parseproto.o -@@ -106,33 +109,31 @@ error.o log.o mode.o getpath.o bar.o par + BINS = iptraf rvnamed rawtime all: $(BINS) diff --git a/package/iptraf/patches/patch-src_isdntab_c b/package/iptraf/patches/patch-src_isdntab_c new file mode 100644 index 000000000..cec46b383 --- /dev/null +++ b/package/iptraf/patches/patch-src_isdntab_c @@ -0,0 +1,10 @@ +--- iptraf-3.0.1.orig/src/isdntab.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.1/src/isdntab.c 2024-02-25 18:12:43.421645934 +0100 +@@ -20,7 +20,6 @@ details. + #include <stdlib.h> + #include <string.h> + #include <sys/ioctl.h> +-#include <linux/isdn.h> + #include "isdntab.h" + + diff --git a/package/iptraf/patches/patch-src_packet_c b/package/iptraf/patches/patch-src_packet_c index 85c402678..87c1c1ff4 100644 --- a/package/iptraf/patches/patch-src_packet_c +++ b/package/iptraf/patches/patch-src_packet_c @@ -1,14 +1,38 @@ --- iptraf-3.0.1.orig/src/packet.c 2007-09-25 11:21:18.000000000 +0200 -+++ iptraf-3.0.1/src/packet.c 2013-03-04 11:42:52.000000000 +0100 -@@ -36,7 +36,6 @@ details. ++++ iptraf-3.0.1/src/packet.c 2024-02-25 18:13:41.165645150 +0100 +@@ -36,8 +36,6 @@ details. #include <linux/if_ether.h> #include <linux/netdevice.h> #include <linux/if_fddi.h> -#include <linux/if_tr.h> - #include <linux/isdn.h> +-#include <linux/isdn.h> #include <linux/sockios.h> #include <msgboxes.h> -@@ -136,9 +135,6 @@ unsigned short getlinktype(unsigned shor + #include "deskman.h" +@@ -107,21 +105,7 @@ unsigned short getlinktype(unsigned shor + result = LINK_ETHERNET; + else if (strncmp(ifname, "tap", 3) == 0) + result = LINK_ETHERNET; +- else if ((strncmp(ifname, "isdn", 4) == 0) && (isdn_fd != -1)) { +- isdnent = isdn_table_lookup(isdnlist, ifname, isdn_fd); +- +- switch (isdnent->encap) { +- case ISDN_NET_ENCAP_RAWIP: +- result = LINK_ISDN_RAWIP; +- break; +- case ISDN_NET_ENCAP_CISCOHDLC: +- result = LINK_ISDN_CISCOHDLC; +- break; +- default: +- result = LINK_INVALID; +- break; +- } +- } else if (accept_unsupported_interfaces) ++ else if (accept_unsupported_interfaces) + result = LINK_ETHERNET; + break; + case ARPHRD_LOOPBACK: +@@ -136,9 +120,6 @@ unsigned short getlinktype(unsigned shor case ARPHRD_PPP: result = LINK_PPP; break; @@ -18,7 +42,7 @@ case ARPHRD_IEEE802: case ARPHRD_IEEE802_TR: result = LINK_TR; -@@ -194,36 +190,6 @@ void adjustpacket(char *tpacket, unsigne +@@ -194,36 +175,6 @@ void adjustpacket(char *tpacket, unsigne *packet = tpacket + 4; *readlen -= 4; break; @@ -55,3 +79,9 @@ case LINK_IPIP: *packet = tpacket; break; +@@ -463,5 +414,4 @@ void pkt_cleanup(void) + close(isdnfd); + isdnfd = -1; + destroyfraglist(); +- destroy_isdn_table(&isdntable); + } diff --git a/package/irssi/Makefile b/package/irssi/Makefile index 3af67de8c..66bc9344e 100644 --- a/package/irssi/Makefile +++ b/package/irssi/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= irssi -PKG_VERSION:= 1.0.7 +PKG_VERSION:= 1.4.4 PKG_RELEASE:= 1 -PKG_HASH:= 1b386ca026aa1875c380fd00ef1d24b71fb87cdae39ef5349ecca16c4567feac +PKG_HASH:= fefe9ec8c7b1475449945c934a2360ab12693454892be47a6d288c63eb107ead PKG_DESCR:= irc text client PKG_SECTION:= app/chat PKG_DEPENDS:= glib libncurses diff --git a/package/iw/Makefile b/package/iw/Makefile index f2fe9cc44..83e096fc8 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= iw -PKG_VERSION:= 4.9 +PKG_VERSION:= 5.19 PKG_RELEASE:= 1 -PKG_HASH:= 324cc805fad52cba2c16b9ab569906889fb645cc962aac4cfda1db85d2de97ce +PKG_HASH:= f167bbe947dd53bb9ebc0c1dcef5db6ad73ac1d6084f2c6f9376c5c360cc4d4e PKG_DESCR:= tools for setting up wifi cards PKG_SECTION:= net/wifi PKG_DEPENDS:= libnl diff --git a/package/jack/Makefile b/package/jack/Makefile index bc301976a..1104b7797 100644 --- a/package/jack/Makefile +++ b/package/jack/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_DESCR:= audio connection kit (v1) PKG_SECTION:= mm/audio PKG_DEPENDS:= alsa-lib libsndfile libsamplerate libdb -PKG_BUILDDEP:= db python2-host alsa-lib libsndfile libsamplerate +PKG_BUILDDEP:= db python3-host alsa-lib libsndfile libsamplerate PKG_NEEDS:= threads c++ PKG_URL:= http://jackaudio.org PKG_SITES:= https://github.com/jackaudio/jack1.git diff --git a/package/jack2/Makefile b/package/jack2/Makefile index 3610d6465..cebf85030 100644 --- a/package/jack2/Makefile +++ b/package/jack2/Makefile @@ -4,16 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= jack2 -PKG_VERSION:= 31d4ae97f296fe1c954cbb51e50d5e60578260b8 +PKG_VERSION:= 1.9.22 PKG_RELEASE:= 1 -PKG_GIT:= hash -PKG_DESCR:= audio connection kit (v2) +PKG_HASH:= 1e42b9fc4ad7db7befd414d45ab2f8a159c0b30fcd6eee452be662298766a849 PKG_SECTION:= mm/audio PKG_DEPENDS:= alsa-lib libsndfile libsamplerate -PKG_BUILDDEP:= python2-host alsa-lib libsndfile libsamplerate +PKG_BUILDDEP:= python3-host alsa-lib libsndfile libsamplerate PKG_NEEDS:= threads c++ PKG_URL:= http://jackaudio.org -PKG_SITES:= https://github.com/jackaudio/jack2.git +PKG_SITES:= https://github.com/jackaudio/jack2/archive/ + +DISTFILES:= v$(PKG_VERSION).tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/jack2/patches/patch-wscript b/package/jack2/patches/patch-wscript deleted file mode 100644 index 45e2728a3..000000000 --- a/package/jack2/patches/patch-wscript +++ /dev/null @@ -1,23 +0,0 @@ ---- jack2-31d4ae97f296fe1c954cbb51e50d5e60578260b8.orig/wscript 2017-06-01 19:03:37.000000000 +0200 -+++ jack2-31d4ae97f296fe1c954cbb51e50d5e60578260b8/wscript 2017-06-01 19:10:22.063929110 +0200 -@@ -506,8 +506,6 @@ def configure(conf): - if conf.env['BUILD_JACKDBUS'] != True: - conf.fatal('jackdbus was explicitly requested but cannot be built') - -- conf.recurse('example-clients') -- - # test for the availability of ucontext, and how it should be used - for t in ("gp_regs", "uc_regs", "mc_gregs", "gregs"): - fragment = "#include <ucontext.h>\n" -@@ -1016,11 +1014,6 @@ def build(bld): - - build_drivers(bld) - -- bld.recurse('example-clients') -- if bld.env['IS_LINUX']: -- bld.recurse('man') -- if not bld.env['IS_WINDOWS']: -- bld.recurse('tests') - if bld.env['BUILD_JACKDBUS']: - bld.recurse('dbus') - diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 55737c7cc..3e7d88f80 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.20 -PKG_RELEASE:= 1 -PKG_HASH:= dad8077f0315445d1f6335579fc4ade222facf82a67124974c7be5303ba4f8c8 +PKG_VERSION:= 2.0.23 +PKG_RELEASE:= 2 +PKG_HASH:= aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b PKG_DESCR:= kernel exec tools PKG_SECTION:= sys/misc PKG_DEPENDS:= zlib @@ -15,8 +15,6 @@ PKG_KDEPENDS:= kexec PKG_URL:= http://kernel.org/pub/linux/utils/kernel/kexec/ PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/kernel/kexec/} -PKG_ARCH_DEPENDS:= !aarch64 !m68k - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,KEXEC_TOOLS,kexec-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/kismet/Makefile b/package/kismet/Makefile index 1c1731add..c34a3cd68 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -4,56 +4,33 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= kismet -PKG_VERSION:= 2013-03-R1b +PKG_VERSION:= 2023-07-R1 PKG_RELEASE:= 1 -PKG_HASH:= 636d4d7ef8c67ae6ee8d8e1635f5115700eecb9fa4c208afaee30238db527c2c +PKG_HASH:= f08548e26ca65fa1e567b1debbea1ca4d0e7206bddb96a4f639c90171873e8f7 PKG_DESCR:= wireless network detector, sniffer, and intrusion detection system PKG_SECTION:= net/wifi -PKG_DEPENDS:= libpcap libncurses -PKG_BUILDDEP:= libpcap ncurses +PKG_BUILDDEP:= libpcap ncurses libwebsockets protobuf protobuf-c sqlite +PKG_DEPENDS:= libpcap libncurses libwebsockets protobuf protobuf-c libsqlite PKG_NEEDS:= threads PKG_URL:= http://www.kismetwireless.net/ -PKG_SITES:= http://www.kismetwireless.net/code/ - -PKG_SUBPKGS:= KISMET KISMET_CLIENT KISMET_DRONE KISMET_SERVER -PKGSD_KISMET_CLIENT:= kismet client -PKGSD_KISMET_SERVER:= kismet server -PKGSD_KISMET_DRONE:= kismet drone +PKG_SITES:= https://www.kismetwireless.net/code/ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,KISMET,kismet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_CLIENT},${PKG_SECTION})) -$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_DRONE},${PKG_SECTION})) -$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_SERVER},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf TARGET_LDFLAGS+= -lpthread -ltinfo -CONFIGURE_ARGS+= --sysconfdir=/etc/kismet - -pre-build: - (cd ${WRKBUILD} && ${MAKE} dep); +CONFIGURE_ARGS+= --sysconfdir=/etc/kismet \ + --disable-libusb \ + --disable-python-tools \ + --disable-wifi-coconut kismet-install: ${INSTALL_DIR} ${IDIR_KISMET}/usr/bin/ - ${INSTALL_BIN} ${WRKINST}/usr/bin/kismet ${IDIR_KISMET}/usr/bin/kismet - -kismet-client-install: - ${INSTALL_DIR} ${IDIR_KISMET_CLIENT}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_client \ - ${IDIR_KISMET_CLIENT}/usr/bin/ - -kismet-drone-install: - ${INSTALL_DIR} ${IDIR_KISMET_DRONE}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_drone \ - ${IDIR_KISMET_DRONE}/usr/bin/ - -kismet-server-install: - ${INSTALL_DIR} ${IDIR_KISMET_SERVER}/usr/bin - ${INSTALL_DIR} ${IDIR_KISMET_SERVER}/etc/kismet - ${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_server \ - ${IDIR_KISMET_SERVER}/usr/bin/ - ${INSTALL_DATA} ${WRKINST}/etc/kismet/kismet.conf \ - ${IDIR_KISMET_SERVER}/etc/kismet + ${INSTALL_BIN} ${WRKINST}/usr/bin/kismet \ + ${IDIR_KISMET}/usr/bin/kismet + ${INSTALL_DIR} ${IDIR_KISMET}/etc/kismet + ${CP} ${WRKINST}/etc/kismet/kismet*.conf \ + ${IDIR_KISMET}/etc/kismet/ include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/kismet/patches/patch-configure_in b/package/kismet/patches/patch-configure_in deleted file mode 100644 index cb7d45cbd..000000000 --- a/package/kismet/patches/patch-configure_in +++ /dev/null @@ -1,12 +0,0 @@ ---- kismet-2013-03-R1b.orig/configure.in 2013-03-27 15:41:48.000000000 +0100 -+++ kismet-2013-03-R1b/configure.in 2013-12-31 23:14:38.000000000 +0100 -@@ -406,9 +406,6 @@ AC_ARG_ENABLE(client, - ) - AC_SUBST(wantclient) - --# Add additional cflags since some distros bury panel.h --CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" -- - termcontrol="none"; - - if test "$wantclient" = "yes"; then diff --git a/package/kismet/patches/patch-dumpfile_tuntap_h b/package/kismet/patches/patch-dumpfile_tuntap_h deleted file mode 100644 index f669446f5..000000000 --- a/package/kismet/patches/patch-dumpfile_tuntap_h +++ /dev/null @@ -1,18 +0,0 @@ ---- kismet-2013-03-R1b.orig/dumpfile_tuntap.h 2013-03-27 15:41:48.000000000 +0100 -+++ kismet-2013-03-R1b/dumpfile_tuntap.h 2014-01-02 20:53:21.000000000 +0100 -@@ -65,7 +65,15 @@ - #include "dumpfile.h" - - #ifdef SYS_LINUX -+#if defined(__GLIBC__) - #include <linux/if_tun.h> -+#else -+#define IFF_TUN 0x0001 -+#define IFF_TAP 0x0002 -+#define IFF_NO_PI 0x1000 -+#define TUNSETNOCSUM _IOW('T', 200, int) -+#define TUNSETIFF _IOW('T', 202, int) -+#endif - - // Linux IEEE80211 link typ to set - #define LNX_LINKTYPE_80211 801 diff --git a/package/kmod/Makefile b/package/kmod/Makefile index e9fd271f7..c46410927 100644 --- a/package/kmod/Makefile +++ b/package/kmod/Makefile @@ -4,13 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kmod -PKG_VERSION:= 24 +PKG_VERSION:= 31 PKG_RELEASE:= 1 -PKG_HASH:= 610b8d1df172acc39a4fdf1eaa47a57b04873c82f32152e7a62e29b6ff9cb397 +PKG_HASH:= f5a6949043cc72c001b728d8c218609c5a15f3c33d75614b78c79418fcf00d80 PKG_DESCR:= kernel module utils PKG_SECTION:= sys/utils PKG_DEPENDS:= libkmod -PKG_URL:= http://profusion.mobi/index.php PKG_SITES:= https://www.kernel.org/pub/linux/utils/kernel/kmod/ PKG_LIBNAME:= libkmod PKG_OPTS:= dev diff --git a/package/knxd/Makefile b/package/knxd/Makefile index 661744db3..60ebe9b49 100644 --- a/package/knxd/Makefile +++ b/package/knxd/Makefile @@ -3,17 +3,20 @@ include $(ADK_TOPDIR)/rules.mk -# always use tab spaces as separator, no spaces PKG_NAME:= knxd -PKG_VERSION:= v0.14 +PKG_VERSION:= 0.14.61 PKG_RELEASE:= 1 -PKG_GIT:= branch -PKG_DESCR:= KNX daemon +PKG_HASH:= b5284c89a55a2c53e0ff769ec4f736fc1ad4b55afdd2a18b9258fa95f708d798 +PKG_DESCR:= knx daemon PKG_SECTION:= sys/hw PKG_DEPENDS:= libev PKG_BUILDDEP:= libev cmake-host PKG_URL:= https://github.com/knxd/knxd -PKG_SITES:= https://github.com/knxd/knxd.git +PKG_SITES:= https://github.com/knxd/knxd/archive/refs/tags/ + +PKG_CFLINE_KNXD:= depends on ADK_BROKEN + +DISTFILES:= $(PKG_VERSION).tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/knxd/patches/patch-tools_version_sh b/package/knxd/patches/patch-tools_version_sh deleted file mode 100644 index ff6a2f836..000000000 --- a/package/knxd/patches/patch-tools_version_sh +++ /dev/null @@ -1,10 +0,0 @@ ---- knxd-v0.14.orig/tools/version.sh 2020-04-18 16:44:30.000000000 +0200 -+++ knxd-v0.14/tools/version.sh 2020-04-18 19:38:03.451807369 +0200 -@@ -1,5 +1,6 @@ - #!/bin/sh --sed -ne '1s/.*(\(.*\)).*/\1/' -e '1s/-1$//' -e '1p' debian/changelog | tr -d "\n" -+#sed -ne '1s/.*(\(.*\)).*/\1/' -e '1s/-1$//' -e '1p' debian/changelog | tr -d "\n" -+echo "0.14" - test -d .git || exit - git=$(git rev-parse --short HEAD) - lgit=$(git rev-parse --short $(git rev-list -1 HEAD debian/changelog) ) diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 4e9a57a4c..9fb6deccb 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -4,36 +4,39 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi -PKG_VERSION:= 18.0a1 +PKG_VERSION:= 21.0b2 PKG_RELEASE:= 1 -PKG_HASH:= 8892498d5248eea29c30db7c128a5910afc60d1b0b894aea472604bb879a0310 +PKG_HASH:= b9d6ecbb8769cdfe00cbbe5da5c330a7624eee50cffb87d87f6271033f1ee74b PKG_DESCR:= software media player PKG_SECTION:= mm/video -PKG_DEPENDS:= python2 libsquish libressl libxz libfmt rapidjson -PKG_DEPENDS+= libass libmpeg2 libmad libmodplug libcurl +PKG_DEPENDS:= python3 libsquish libressl libxz libfmt rapidjson +PKG_DEPENDS+= libass libmpeg2 libmad libmodplug libcurl libxshmfence PKG_DEPENDS+= libflac libbz2 libtiff libnettle librtmp liblzo PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libncurses libpng PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate libuuid -PKG_DEPENDS+= taglib libjasper libmp3lame libgpg-error python2-mod-sqlite -PKG_DEPENDS+= glib libdcadec bcm28xx-vc-gl-libs libffmpeg libxvidcore -PKG_BUILDDEP:= python2 libass ffmpeg rtmpdump bcm28xx-vc +PKG_DEPENDS+= taglib libjasper libmp3lame libgpg-error giflib +PKG_DEPENDS+= glib libdcadec libffmpeg libxvidcore libiconv harfbuzz +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_BUILDDEP+= libmpeg2 libmad libjpeg-turbo fmt rapidjson -PKG_BUILDDEP+= curl flac bzip2 libtiff yajl cmake-host -PKG_BUILDDEP+= tinyxml sqlite pcre libcdio freetype libpng -PKG_BUILDDEP+= libsamplerate taglib libjasper -PKG_BUILDDEP+= glib libmodplug libgpg-error xvidcore +PKG_BUILDDEP+= curl flac bzip2 libtiff yajl cmake-host libdisplay-info +PKG_BUILDDEP+= tinyxml tinyxml2 sqlite pcre 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 +PKG_BUILDDEP+= libcrossguid libressl xz bzip2 liblzo harfbuzz +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)-Leia.tar.gz -WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Leia +DISTFILES:= $(PKG_VERSION)-Omega.tar.gz +WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Omega WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi3p raspberry-pi3p-64 +PKG_SYSTEM_DEPENDS:= 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 @@ -71,7 +74,12 @@ CMAKE_FLAGS+= -DENABLE_CCACHE=OFF \ -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 \ -DKODI_DEPENDSBUILD=OFF \ -DENABLE_OPENSSL=ON \ -DENABLE_MYSQLCLIENT=OFF \ @@ -87,17 +95,31 @@ CMAKE_FLAGS+= -DENABLE_CCACHE=OFF \ -DENABLE_OPTICAL=OFF \ -DENABLE_DBUS=OFF \ -DENABLE_EVENTCLIENTS=OFF \ - -DENABLE_UDEV=OFF \ + -DENABLE_UDEV=ON \ -DENABLE_PLIST=OFF \ -DNATIVEPREFIX=$(STAGING_HOST_DIR)/usr \ - -DDEPENDS_PATH=$(STAGING_HOST_DIR) \ - -DWITH_TEXTUREPACKER=$(STAGING_HOST_DIR)/usr/bin/TexturePacker - -ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) -CMAKE_FLAGS+= -DCORE_PLATFORM_NAME=rbpi \ + -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 \ + -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 + +ifeq ($(ADK_TARGET_ARCH_AARCH64),y) +CMAKE_FLAGS+= -DWITH_ARCH=aarch64 \ + -DWITH_CPU=aarch64 \ + -DENABLE_NEON=OFF +endif +ifeq ($(ADK_TARGET_ARCH_ARM),y) -DWITH_ARCH=arm \ -DWITH_CPU=arm \ - -DENABLE_NEON=ON \ + -DENABLE_NEON=ON +endif + +ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) +CMAKE_FLAGS+= -DCORE_PLATFORM_NAME=gbm \ + -DAPP_RENDER_SYSTEM=gles \ -DENABLE_OPENGL=OFF \ -DENABLE_X11=OFF \ -DENABLE_OPENGLES=ON @@ -140,19 +162,27 @@ 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 && PATH='$(HOST_PATH)' cmake .) - PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/JsonSchemaBuilder - cp $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder \ - $(STAGING_HOST_DIR)/usr/bin - (cd $(WRKSRC)/tools/depends/native/TexturePacker && PATH='$(HOST_PATH)' cmake \ - -DCORE_SOURCE_DIR=$(WRKSRC) \ - -DCMAKE_MODULE_PATH=$(WRKSRC)/cmake/modules \ - -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" .) - PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/TexturePacker - cp $(WRKSRC)/tools/depends/native/TexturePacker/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) kodi-install: $(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/share/kodi diff --git a/package/kodi/files/kodi.init b/package/kodi/files/kodi.init index 04ed8ea83..c3dfdf893 100644 --- a/package/kodi/files/kodi.init +++ b/package/kodi/files/kodi.init @@ -15,10 +15,10 @@ start) if [ ! -d /data/kodi ]; then mkdir /data/kodi fi - cd / && /usr/lib/kodi/kodi-rbpi & + cd / && /usr/lib/kodi/kodi-gbm & ;; stop) - kill $(pgrep -f /usr/lib/kodi/kodi-rbpi) + kill $(pgrep -f /usr/lib/kodi/kodi-gbm) ;; restart) sh $0 stop diff --git a/package/kodi/patches/patch-CMakeLists_txt b/package/kodi/patches/patch-CMakeLists_txt new file mode 100644 index 000000000..7fa65595b --- /dev/null +++ b/package/kodi/patches/patch-CMakeLists_txt @@ -0,0 +1,27 @@ +--- 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-cmake_KodiConfig_cmake_in b/package/kodi/patches/patch-cmake_KodiConfig_cmake_in deleted file mode 100644 index 3ebae759b..000000000 --- a/package/kodi/patches/patch-cmake_KodiConfig_cmake_in +++ /dev/null @@ -1,20 +0,0 @@ ---- xbmc-18.0a1-Leia.orig/cmake/KodiConfig.cmake.in 2018-03-04 10:21:28.000000000 +0100 -+++ xbmc-18.0a1-Leia/cmake/KodiConfig.cmake.in 2018-05-23 08:10:01.842094111 +0200 -@@ -8,7 +8,7 @@ if(NOT @APP_NAME_UC@_PREFIX) - set(@APP_NAME_UC@_PREFIX @APP_PREFIX@) - endif() - if(NOT @APP_NAME_UC@_INCLUDE_DIR) -- set(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@) -+ set(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@) - endif() - if(NOT @APP_NAME_UC@_LIB_DIR) - set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) -@@ -20,7 +20,7 @@ set(APP_RENDER_SYSTEM @APP_RENDER_SYSTEM - if(NOT WIN32) - set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") - endif() --list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake) -+list(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@ ${CMAKE_FIND_ROOT_PATH}/@APP_DATA_DIR@/cmake) - - string(REPLACE ";" " " ARCH_DEFINES "@ARCH_DEFINES@") - add_definitions(${ARCH_DEFINES} -DBUILD_KODI_ADDON) diff --git a/package/kodi/patches/patch-tools_depends_native_TexturePacker_CMakeLists_txt b/package/kodi/patches/patch-tools_depends_native_TexturePacker_CMakeLists_txt deleted file mode 100644 index 2b62c1465..000000000 --- a/package/kodi/patches/patch-tools_depends_native_TexturePacker_CMakeLists_txt +++ /dev/null @@ -1,20 +0,0 @@ ---- xbmc-18.0a1-Leia.orig/tools/depends/native/TexturePacker/CMakeLists.txt 2018-03-04 10:21:28.000000000 +0100 -+++ xbmc-18.0a1-Leia/tools/depends/native/TexturePacker/CMakeLists.txt 2018-05-26 06:54:36.060611270 +0200 -@@ -33,7 +33,7 @@ set(SOURCES src/md5.cpp - src/decoder/GifHelper.cpp - src/decoder/JPGDecoder.cpp - src/decoder/PNGDecoder.cpp -- ${CMAKE_SOURCE_DIR}/xbmc/guilib/XBTF.cpp) -+ ${CORE_SOURCE_DIR}/xbmc/guilib/XBTF.cpp) - - set(CMAKE_POSITITION_INDEPENDENT_CODE 1) - -@@ -42,7 +42,7 @@ target_include_directories(TexturePacker - PRIVATE ${PNG_INCLUDE_DIRS} - ${JPEG_INCLUDE_DIR} - ${GIF_INCLUDE_DIR} -- ${CMAKE_SOURCE_DIR}/xbmc -+ ${CORE_SOURCE_DIR}/xbmc - ${CMAKE_CURRENT_SOURCE_DIR}/src - ${CMAKE_CURRENT_SOURCE_DIR}/src/decoder) - target_link_libraries(TexturePacker 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 new file mode 100644 index 000000000..67e51c6e9 --- /dev/null +++ b/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp @@ -0,0 +1,15 @@ +--- 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 +@@ -18,11 +18,11 @@ + * + */ + +-#include "GifHelper.h" + + #include <algorithm> + #include <cstdlib> + #include <cstring> ++#include "GifHelper.h" + + #define UNSIGNED_LITTLE_ENDIAN(lo, hi) ((lo) | ((hi) << 8)) + #define GIF_MAX_MEMORY 82944000U // about 79 MB, which is equivalent to 10 full hd frames. diff --git a/package/kodi/patches/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA_cpp b/package/kodi/patches/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA_cpp deleted file mode 100644 index fa943b89a..000000000 --- a/package/kodi/patches/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA_cpp +++ /dev/null @@ -1,30 +0,0 @@ ---- xbmc-18.0a1-Leia.orig/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2018-03-04 10:21:28.000000000 +0100 -+++ xbmc-18.0a1-Leia/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2018-05-26 06:48:45.750618626 +0200 -@@ -1213,7 +1213,8 @@ void CAESinkALSA::EnumerateDevicesEx(AED - * found by the enumeration process. Skip them as well ("hw", "dmix", - * "plughw", "dsnoop"). */ - -- else if (baseName != "default" -+ else if (true) -+/* baseName != "default" - && baseName != "sysdefault" - && baseName != "surround40" - && baseName != "surround41" -@@ -1223,7 +1224,7 @@ void CAESinkALSA::EnumerateDevicesEx(AED - && baseName != "hw" - && baseName != "dmix" - && baseName != "plughw" -- && baseName != "dsnoop") -+ && baseName != "dsnoop")*/ - { - EnumerateDevice(list, name, desc ? desc : name, config); - } -@@ -1380,7 +1381,7 @@ void CAESinkALSA::EnumerateDevice(AEDevi - info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI") - { - /* We already know this is HDMI, strip it */ -- info.m_displayName.erase(info.m_displayName.size()-5); -+ /*info.m_displayName.erase(info.m_displayName.size()-5);*/ - } - - /* "CONEXANT Analog", "USB Audio", "HDMI 0", "ALC889 Digital" ... */ diff --git a/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp b/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp new file mode 100644 index 000000000..27c420df8 --- /dev/null +++ b/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp @@ -0,0 +1,31 @@ +--- 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/lame/Makefile b/package/lame/Makefile index e9838154f..40474a7d3 100644 --- a/package/lame/Makefile +++ b/package/lame/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= lame -PKG_VERSION:= 3.99 +PKG_VERSION:= 3.100 PKG_RELEASE:= 1 -PKG_HASH:= d71d804c25cac69592939865033787849cef52b6c9b783ed31ea8dcebeadbbba +PKG_HASH:= ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e PKG_DESCR:= mp3 encoder PKG_SECTION:= mm/audio PKG_DEPENDS:= libncurses diff --git a/package/lftp/Makefile b/package/lftp/Makefile index b160c8697..993df08b3 100644 --- a/package/lftp/Makefile +++ b/package/lftp/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= lftp -PKG_VERSION:= 4.7.7 +PKG_VERSION:= 4.9.2 PKG_RELEASE:= 1 -PKG_HASH:= 4483df04502660dcc65a11cf09d530e31bea99483d69328c1c5cbaa41d6619b4 +PKG_HASH:= c517c4f4f9c39bd415d7313088a2b1e313b2d386867fe40b7692b83a20f0670d PKG_DESCR:= ftp and http client PKG_SECTION:= net/http PKG_DEPENDS:= libncurses libexpat diff --git a/package/lftp/patches/patch-src_FileCopy_cc b/package/lftp/patches/patch-src_FileCopy_cc deleted file mode 100644 index a8b1d0d41..000000000 --- a/package/lftp/patches/patch-src_FileCopy_cc +++ /dev/null @@ -1,11 +0,0 @@ ---- lftp-4.7.7.orig/src/FileCopy.cc 2017-03-07 08:35:47.000000000 +0100 -+++ lftp-4.7.7/src/FileCopy.cc 2017-06-05 21:33:11.719033961 +0200 -@@ -36,7 +36,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> --#include <math.h> -+#include <cmath> - #include <stddef.h> - #include "FileCopy.h" - #include "url.h" diff --git a/package/lftp/patches/patch-src_NetAccess_cc b/package/lftp/patches/patch-src_NetAccess_cc deleted file mode 100644 index 2ed120587..000000000 --- a/package/lftp/patches/patch-src_NetAccess_cc +++ /dev/null @@ -1,11 +0,0 @@ ---- lftp-4.7.7.orig/src/NetAccess.cc 2016-12-15 13:25:36.000000000 +0100 -+++ lftp-4.7.7/src/NetAccess.cc 2017-06-05 22:14:19.905585919 +0200 -@@ -21,7 +21,7 @@ - - #include <errno.h> - #include <assert.h> --#include <math.h> -+#include <cmath> - #include <sys/types.h> - - #include "NetAccess.h" diff --git a/package/lftp/patches/patch-src_ResMgr_cc b/package/lftp/patches/patch-src_ResMgr_cc deleted file mode 100644 index ad66c2883..000000000 --- a/package/lftp/patches/patch-src_ResMgr_cc +++ /dev/null @@ -1,11 +0,0 @@ ---- lftp-4.7.7.orig/src/ResMgr.cc 2017-02-07 17:57:49.000000000 +0100 -+++ lftp-4.7.7/src/ResMgr.cc 2017-06-05 21:24:11.348321502 +0200 -@@ -23,7 +23,7 @@ - #include <ctype.h> - #include <unistd.h> - #include <stdlib.h> --#include <math.h> -+#include <cmath> - #include <sys/types.h> - #include <sys/stat.h> - #include <errno.h> diff --git a/package/lftp/patches/patch-src_Speedometer_cc b/package/lftp/patches/patch-src_Speedometer_cc deleted file mode 100644 index a5c3ec73e..000000000 --- a/package/lftp/patches/patch-src_Speedometer_cc +++ /dev/null @@ -1,11 +0,0 @@ ---- lftp-4.7.7.orig/src/Speedometer.cc 2016-02-20 14:57:53.000000000 +0100 -+++ lftp-4.7.7/src/Speedometer.cc 2017-06-05 21:41:06.185512853 +0200 -@@ -18,7 +18,7 @@ - */ - - #include <config.h> --#include <math.h> -+#include <cmath> - #include <stdlib.h> - #include "Speedometer.h" - #include "misc.h" diff --git a/package/lftp/patches/patch-src_lftp_ssl_cc b/package/lftp/patches/patch-src_lftp_ssl_cc new file mode 100644 index 000000000..d8569322e --- /dev/null +++ b/package/lftp/patches/patch-src_lftp_ssl_cc @@ -0,0 +1,38 @@ +--- 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/libX11/Makefile b/package/libX11/Makefile index f7aae2149..561d82ff0 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libX11 -PKG_VERSION:= 1.6.4 +PKG_VERSION:= 1.7.2 PKG_RELEASE:= 1 -PKG_HASH:= 5d7fbb9e15c27900ea8963218a59750b674a8d7c94161b66e96fcfbdaa1c6263 +PKG_HASH:= 2c26ccd08f43a6214de89110554fbe97c71692eeb7e7d4829f3004ae6fafd2c0 PKG_DESCR:= x11 client-side library PKG_SECTION:= x11/libs PKG_BUILDDEP:= libX11-host xproto xextproto xtrans libXdmcp libXau xcb-proto diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in deleted file mode 100644 index 8a194f2d1..000000000 --- a/package/libX11/patches/patch-src_util_Makefile_in +++ /dev/null @@ -1,13 +0,0 @@ ---- libX11-1.6.3.orig/src/util/Makefile.in 2015-03-09 23:29:02.000000000 +0100 -+++ libX11-1.6.3/src/util/Makefile.in 2016-01-08 10:43:16.257572082 +0100 -@@ -348,9 +348,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --AM_CFLAGS = \ -- $(X11_CFLAGS) \ -- $(CWARNFLAGS) -+AM_CFLAGS = - - AM_CPPFLAGS = \ - -I$(top_srcdir)/include diff --git a/package/libXrandr/Makefile b/package/libXrandr/Makefile index 85340713e..c6169652f 100644 --- a/package/libXrandr/Makefile +++ b/package/libXrandr/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= 2baa7fb3eca78fe7e11a09b373ba898b717f7eeba4a4bfd68187e04b4789b0d3 PKG_DESCR:= xrandr library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= randrproto libXrender +PKG_BUILDDEP:= randrproto libXrender libXext PKG_SITES:= http://www.x.org/releases/individual/lib/ PKG_LIBNAME:= libxrandr PKG_OPTS:= dev diff --git a/package/libaio/Makefile b/package/libaio/Makefile new file mode 100644 index 000000000..9c6b4d3b3 --- /dev/null +++ b/package/libaio/Makefile @@ -0,0 +1,28 @@ +# 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:= libaio +PKG_VERSION:= 0.3.112 +PKG_RELEASE:= 1 +PKG_HASH:= b7cf93b29bbfb354213a0e8c0e82dfcf4e776157940d894750528714a0af2272 +PKG_DESCR:= Asynchronous input/output library that uses the kernels native interface +PKG_SECTION:= libs/misc +PKG_URL:= https://pagure.io/libaio +PKG_SITES:= https://pagure.io/libaio/archive/libaio-${PKG_VERSION}/ + +DISTFILES:= $(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION).tar.gz +WRKDIST= $(WRKDIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION) + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBAIO,libaio,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= manual + +libaio-install: + $(INSTALL_DIR) $(IDIR_LIBAIO)/usr/lib + ${CP} ${WRKINST}/usr/lib/libaio*.so* ${IDIR_LIBAIO}/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libao/Makefile b/package/libao/Makefile index 1a015e2ce..9f308976b 100644 --- a/package/libao/Makefile +++ b/package/libao/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libao -PKG_VERSION:= 1.1.0 +PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 -PKG_HASH:= 29de5bb9b1726ba890455ef7e562d877df87811febb0d99ee69164b88c171bd4 +PKG_HASH:= 03ad231ad1f9d64b52474392d63c31197b0bc7bd416e58b1c10a329a5ed89caf PKG_DESCR:= cross platform audio library PKG_SECTION:= libs/audio PKG_DEPENDS:= alsa-lib diff --git a/package/libargon2/Makefile b/package/libargon2/Makefile new file mode 100644 index 000000000..af5cd6fd0 --- /dev/null +++ b/package/libargon2/Makefile @@ -0,0 +1,40 @@ +# 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:= libargon2 +PKG_VERSION:= 20190702 +PKG_RELEASE:= 1 +PKG_HASH:= daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c +PKG_DESCR:= Password hashing software that won the Password Hashing Competition (PHC) +PKG_SECTION:= libs/crypto +PKG_URL:= https://github.com/P-H-C/phc-winner-argon2 +PKG_SITES:= https://github.com/P-H-C/phc-winner-argon2/archive/refs/tags/ +DISTFILES:= $(PKG_VERSION).tar.gz +WRKDIST= $(WRKDIR)/phc-winner-argon2-$(PKG_VERSION) + +PKG_SUBPKGS:= LIBARGON2 ARGON2 +PKGSD_ARGON2:= libargon2 command-line utility +PKGSS_ARGON2:= libargon2 +PKGSC_ARGON2:= app/crypto + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBARGON2,libargon2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +$(eval $(call PKG_template,ARGON2,argon2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_ARGON2),$(PKGSD_ARGON2),$(PKGSC_ARGON2))) + +CONFIG_STYLE:= manual +MAKE_ENV+= LIBRARY_REL=lib + +libargon2-install: + $(INSTALL_DIR) ${IDIR_LIBARGON2}/usr/lib + $(CP) ${WRKINST}/usr/lib/libargon2.so* \ + ${IDIR_LIBARGON2}/usr/lib + +argon2-install: + $(INSTALL_DIR) $(IDIR_ARGON2)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/argon2 \ + $(IDIR_ARGON2)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libass/Makefile b/package/libass/Makefile index 38756fa5d..b7cf2d2f5 100644 --- a/package/libass/Makefile +++ b/package/libass/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libass -PKG_VERSION:= 0.13.0 +PKG_VERSION:= 0.17.1 PKG_RELEASE:= 1 -PKG_HASH:= e0071a3b2e95411c8d474014678368e3f0b852f7d663e0564b344e7335eb0671 +PKG_HASH:= f0da0bbfba476c16ae3e1cfd862256d30915911f7abaa1b16ce62ee653192784 PKG_DESCR:= portable subtitle renderer PKG_SECTION:= libs/video PKG_DEPENDS:= fribidi fontconfig diff --git a/package/libassuan/Makefile b/package/libassuan/Makefile index b46b31ad2..373947719 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.5 +PKG_VERSION:= 2.5.6 PKG_RELEASE:= 1 -PKG_HASH:= 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 +PKG_HASH:= e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426 PKG_DESCR:= implementation of assuan protocol PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgpg-error diff --git a/package/libbsd/Makefile b/package/libbsd/Makefile index b1dfbe191..744c627c6 100644 --- a/package/libbsd/Makefile +++ b/package/libbsd/Makefile @@ -4,11 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libbsd -PKG_VERSION:= 0.10.0 +PKG_VERSION:= 0.11.7 PKG_RELEASE:= 1 -PKG_HASH:= 34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887 +PKG_HASH:= 9baa186059ebbf25c06308e9f991fda31f7183c0f24931826d83aa6abd8a0261 PKG_DESCR:= bsd helper functions PKG_SECTION:= libs/misc +PKG_BUILDDEP:= libmd +PKG_DEPENDS:= libmd PKG_URL:= https://libbsd.freedesktop.org/ PKG_SITES:= https://libbsd.freedesktop.org/releases/ PKG_OPTS:= dev diff --git a/package/libcap-ng/Makefile b/package/libcap-ng/Makefile new file mode 100644 index 000000000..48ce9dee5 --- /dev/null +++ b/package/libcap-ng/Makefile @@ -0,0 +1,28 @@ +# 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:= libcap-ng +PKG_VERSION:= 0.8.4 +PKG_RELEASE:= 1 +PKG_HASH:= 5615c76a61039e283a6bd107c4faf345ae5ad4dcd45907defe5e474d8fdb6fd2 +PKG_DESCR:= capability library +PKG_SECTION:= libs/misc +PKG_SITES:= https://github.com/stevegrubb/libcap-ng/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBCAP_NG,libcap-ng,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +AUTOTOOL_STYLE:= autogen + +libcap-ng-install: + $(INSTALL_DIR) $(IDIR_LIBCAP_NG)/usr/lib + $(CP) $(WRKINST)/usr/lib/libcap-ng*.so* \ + $(IDIR_LIBCAP_NG)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libcap-ng/patches/patch-INSTALL b/package/libcap-ng/patches/patch-INSTALL new file mode 100644 index 000000000..b9ca10914 --- /dev/null +++ b/package/libcap-ng/patches/patch-INSTALL @@ -0,0 +1,521 @@ +--- libcap-ng-0.8.4.orig/INSTALL 2023-12-20 16:18:45.000000000 +0100 ++++ libcap-ng-0.8.4/INSTALL 2024-02-27 12:31:52.534581269 +0100 +@@ -1,8 +1,8 @@ + Installation Instructions + ************************* + +-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +-2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++ Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software ++Foundation, Inc. + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright +@@ -12,97 +12,96 @@ without warranty of any kind. + Basic Installation + ================== + +- Briefly, the shell commands `./configure; make; make install' should +-configure, build, and install this package. The following +-more-detailed instructions are generic; see the `README' file for ++ Briefly, the shell command './configure && make && make install' ++should configure, build, and install this package. The following ++more-detailed instructions are generic; see the 'README' file for + instructions specific to this package. Some packages provide this +-`INSTALL' file but do not implement all of the features documented ++'INSTALL' file but do not implement all of the features documented + below. The lack of an optional feature in a given package is not + necessarily a bug. More recommendations for GNU packages can be found + in *note Makefile Conventions: (standards)Makefile Conventions. + +- The `configure' shell script attempts to guess correct values for ++ The 'configure' shell script attempts to guess correct values for + various system-dependent variables used during compilation. It uses +-those values to create a `Makefile' in each directory of the package. +-It may also create one or more `.h' files containing system-dependent +-definitions. Finally, it creates a shell script `config.status' that ++those values to create a 'Makefile' in each directory of the package. ++It may also create one or more '.h' files containing system-dependent ++definitions. Finally, it creates a shell script 'config.status' that + you can run in the future to recreate the current configuration, and a +-file `config.log' containing compiler output (useful mainly for +-debugging `configure'). ++file 'config.log' containing compiler output (useful mainly for ++debugging 'configure'). + +- It can also use an optional file (typically called `config.cache' +-and enabled with `--cache-file=config.cache' or simply `-C') that saves +-the results of its tests to speed up reconfiguring. Caching is +-disabled by default to prevent problems with accidental use of stale +-cache files. ++ It can also use an optional file (typically called 'config.cache' and ++enabled with '--cache-file=config.cache' or simply '-C') that saves the ++results of its tests to speed up reconfiguring. Caching is disabled by ++default to prevent problems with accidental use of stale cache files. + + If you need to do unusual things to compile the package, please try +-to figure out how `configure' could check whether to do them, and mail +-diffs or instructions to the address given in the `README' so they can ++to figure out how 'configure' could check whether to do them, and mail ++diffs or instructions to the address given in the 'README' so they can + be considered for the next release. If you are using the cache, and at +-some point `config.cache' contains results you don't want to keep, you ++some point 'config.cache' contains results you don't want to keep, you + may remove or edit it. + +- The file `configure.ac' (or `configure.in') is used to create +-`configure' by a program called `autoconf'. You need `configure.ac' if +-you want to change it or regenerate `configure' using a newer version +-of `autoconf'. ++ The file 'configure.ac' (or 'configure.in') is used to create ++'configure' by a program called 'autoconf'. You need 'configure.ac' if ++you want to change it or regenerate 'configure' using a newer version of ++'autoconf'. + + The simplest way to compile this package is: + +- 1. `cd' to the directory containing the package's source code and type +- `./configure' to configure the package for your system. ++ 1. 'cd' to the directory containing the package's source code and type ++ './configure' to configure the package for your system. + +- Running `configure' might take a while. While running, it prints ++ Running 'configure' might take a while. While running, it prints + some messages telling which features it is checking for. + +- 2. Type `make' to compile the package. ++ 2. Type 'make' to compile the package. + +- 3. Optionally, type `make check' to run any self-tests that come with ++ 3. Optionally, type 'make check' to run any self-tests that come with + the package, generally using the just-built uninstalled binaries. + +- 4. Type `make install' to install the programs and any data files and ++ 4. Type 'make install' to install the programs and any data files and + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular +- user, and only the `make install' phase executed with root ++ user, and only the 'make install' phase executed with root + privileges. + +- 5. Optionally, type `make installcheck' to repeat any self-tests, but ++ 5. Optionally, type 'make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a +- regular user, particularly if the prior `make install' required ++ regular user, particularly if the prior 'make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the +- source code directory by typing `make clean'. To also remove the +- files that `configure' created (so you can compile the package for +- a different kind of computer), type `make distclean'. There is +- also a `make maintainer-clean' target, but that is intended mainly ++ source code directory by typing 'make clean'. To also remove the ++ files that 'configure' created (so you can compile the package for ++ a different kind of computer), type 'make distclean'. There is ++ also a 'make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +- 7. Often, you can also type `make uninstall' to remove the installed ++ 7. Often, you can also type 'make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + +- 8. Some packages, particularly those that use Automake, provide `make ++ 8. Some packages, particularly those that use Automake, provide 'make + distcheck', which can by used by developers to test that all other +- targets like `make install' and `make uninstall' work correctly. ++ targets like 'make install' and 'make uninstall' work correctly. + This target is generally not run by end users. + + Compilers and Options + ===================== + + Some systems require unusual options for compilation or linking that +-the `configure' script does not know about. Run `./configure --help' ++the 'configure' script does not know about. Run './configure --help' + for details on some of the pertinent environment variables. + +- You can give `configure' initial values for configuration parameters +-by setting variables in the command line or in the environment. Here +-is an example: ++ You can give 'configure' initial values for configuration parameters ++by setting variables in the command line or in the environment. Here is ++an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + +@@ -113,21 +112,21 @@ Compiling For Multiple Architectures + + You can compile the package for more than one kind of computer at the + same time, by placing the object files for each architecture in their +-own directory. To do this, you can use GNU `make'. `cd' to the ++own directory. To do this, you can use GNU 'make'. 'cd' to the + directory where you want the object files and executables to go and run +-the `configure' script. `configure' automatically checks for the +-source code in the directory that `configure' is in and in `..'. This +-is known as a "VPATH" build. ++the 'configure' script. 'configure' automatically checks for the source ++code in the directory that 'configure' is in and in '..'. This is known ++as a "VPATH" build. + +- With a non-GNU `make', it is safer to compile the package for one ++ With a non-GNU 'make', it is safer to compile the package for one + architecture at a time in the source code directory. After you have +-installed the package for one architecture, use `make distclean' before ++installed the package for one architecture, use 'make distclean' before + reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and + executables that work on multiple system types--known as "fat" or +-"universal" binaries--by specifying multiple `-arch' options to the +-compiler but only a single `-arch' option to the preprocessor. Like ++"universal" binaries--by specifying multiple '-arch' options to the ++compiler but only a single '-arch' option to the preprocessor. Like + this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ +@@ -136,100 +135,104 @@ this: + + This is not guaranteed to produce working output in all cases, you + may have to build one architecture at a time and combine the results +-using the `lipo' tool if you have problems. ++using the 'lipo' tool if you have problems. + + Installation Names + ================== + +- By default, `make install' installs the package's commands under +-`/usr/local/bin', include files under `/usr/local/include', etc. You +-can specify an installation prefix other than `/usr/local' by giving +-`configure' the option `--prefix=PREFIX', where PREFIX must be an ++ By default, 'make install' installs the package's commands under ++'/usr/local/bin', include files under '/usr/local/include', etc. You ++can specify an installation prefix other than '/usr/local' by giving ++'configure' the option '--prefix=PREFIX', where PREFIX must be an + absolute file name. + + You can specify separate installation prefixes for + architecture-specific files and architecture-independent files. If you +-pass the option `--exec-prefix=PREFIX' to `configure', the package uses ++pass the option '--exec-prefix=PREFIX' to 'configure', the package uses + PREFIX as the prefix for installing programs and libraries. + Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +-options like `--bindir=DIR' to specify different values for particular +-kinds of files. Run `configure --help' for a list of the directories +-you can set and what kinds of files go in them. In general, the +-default for these options is expressed in terms of `${prefix}', so that +-specifying just `--prefix' will affect all of the other directory ++options like '--bindir=DIR' to specify different values for particular ++kinds of files. Run 'configure --help' for a list of the directories ++you can set and what kinds of files go in them. In general, the default ++for these options is expressed in terms of '${prefix}', so that ++specifying just '--prefix' will affect all of the other directory + specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +-correct locations to `configure'; however, many packages provide one or ++correct locations to 'configure'; however, many packages provide one or + both of the following shortcuts of passing variable assignments to the +-`make install' command line to change installation locations without ++'make install' command line to change installation locations without + having to reconfigure or recompile. + + The first method involves providing an override variable for each +-affected directory. For example, `make install ++affected directory. For example, 'make install + prefix=/alternate/directory' will choose an alternate location for all + directory configuration variables that were expressed in terms of +-`${prefix}'. Any directories that were specified during `configure', +-but not in terms of `${prefix}', must each be overridden at install +-time for the entire installation to be relocated. The approach of +-makefile variable overrides for each directory variable is required by +-the GNU Coding Standards, and ideally causes no recompilation. +-However, some platforms have known limitations with the semantics of +-shared libraries that end up requiring recompilation when using this +-method, particularly noticeable in packages that use GNU Libtool. ++'${prefix}'. Any directories that were specified during 'configure', ++but not in terms of '${prefix}', must each be overridden at install time ++for the entire installation to be relocated. The approach of makefile ++variable overrides for each directory variable is required by the GNU ++Coding Standards, and ideally causes no recompilation. However, some ++platforms have known limitations with the semantics of shared libraries ++that end up requiring recompilation when using this method, particularly ++noticeable in packages that use GNU Libtool. + +- The second method involves providing the `DESTDIR' variable. For +-example, `make install DESTDIR=/alternate/directory' will prepend +-`/alternate/directory' before all installation names. The approach of +-`DESTDIR' overrides is not required by the GNU Coding Standards, and ++ The second method involves providing the 'DESTDIR' variable. For ++example, 'make install DESTDIR=/alternate/directory' will prepend ++'/alternate/directory' before all installation names. The approach of ++'DESTDIR' overrides is not required by the GNU Coding Standards, and + does not work on platforms that have drive letters. On the other hand, + it does better at avoiding recompilation issues, and works well even +-when some directory options were not specified in terms of `${prefix}' +-at `configure' time. ++when some directory options were not specified in terms of '${prefix}' ++at 'configure' time. + + Optional Features + ================= + + If the package supports it, you can cause programs to be installed +-with an extra prefix or suffix on their names by giving `configure' the +-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. ++with an extra prefix or suffix on their names by giving 'configure' the ++option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. + +- Some packages pay attention to `--enable-FEATURE' options to +-`configure', where FEATURE indicates an optional part of the package. +-They may also pay attention to `--with-PACKAGE' options, where PACKAGE +-is something like `gnu-as' or `x' (for the X Window System). The +-`README' should mention any `--enable-' and `--with-' options that the ++ Some packages pay attention to '--enable-FEATURE' options to ++'configure', where FEATURE indicates an optional part of the package. ++They may also pay attention to '--with-PACKAGE' options, where PACKAGE ++is something like 'gnu-as' or 'x' (for the X Window System). The ++'README' should mention any '--enable-' and '--with-' options that the + package recognizes. + +- For packages that use the X Window System, `configure' can usually ++ For packages that use the X Window System, 'configure' can usually + find the X include and library files automatically, but if it doesn't, +-you can use the `configure' options `--x-includes=DIR' and +-`--x-libraries=DIR' to specify their locations. ++you can use the 'configure' options '--x-includes=DIR' and ++'--x-libraries=DIR' to specify their locations. + + Some packages offer the ability to configure how verbose the +-execution of `make' will be. For these packages, running `./configure ++execution of 'make' will be. For these packages, running './configure + --enable-silent-rules' sets the default to minimal output, which can be +-overridden with `make V=1'; while running `./configure ++overridden with 'make V=1'; while running './configure + --disable-silent-rules' sets the default to verbose, which can be +-overridden with `make V=0'. ++overridden with 'make V=0'. + + Particular systems + ================== + +- On HP-UX, the default C compiler is not ANSI C compatible. If GNU +-CC is not installed, it is recommended to use the following options in ++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC ++is not installed, it is recommended to use the following options in + order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + + and if that doesn't work, install pre-built binaries of GCC for HP-UX. + ++ HP-UX 'make' updates targets which have the same time stamps as their ++prerequisites, which makes it generally unusable when shipped generated ++files such as 'configure' are involved. Use GNU 'make' instead. ++ + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +-parse its `<wchar.h>' header file. The option `-nodtk' can be used as +-a workaround. If GNU CC is not installed, it is therefore recommended +-to try ++parse its '<wchar.h>' header file. The option '-nodtk' can be used as a ++workaround. If GNU CC is not installed, it is therefore recommended to ++try + + ./configure CC="cc" + +@@ -237,26 +240,26 @@ and if that doesn't work, try + + ./configure CC="cc -nodtk" + +- On Solaris, don't put `/usr/ucb' early in your `PATH'. This ++ On Solaris, don't put '/usr/ucb' early in your 'PATH'. This + directory contains several dysfunctional programs; working variants of +-these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +-in your `PATH', put it _after_ `/usr/bin'. ++these programs are available in '/usr/bin'. So, if you need '/usr/ucb' ++in your 'PATH', put it _after_ '/usr/bin'. + +- On Haiku, software installed for all users goes in `/boot/common', +-not `/usr/local'. It is recommended to use the following options: ++ On Haiku, software installed for all users goes in '/boot/common', ++not '/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + + Specifying the System Type + ========================== + +- There may be some features `configure' cannot figure out ++ There may be some features 'configure' cannot figure out + automatically, but needs to determine by the type of machine the package + will run on. Usually, assuming the package is built to be run on the +-_same_ architectures, `configure' can figure that out, but if it prints ++_same_ architectures, 'configure' can figure that out, but if it prints + a message saying it cannot guess the machine type, give it the +-`--build=TYPE' option. TYPE can either be a short name for the system +-type, such as `sun4', or a canonical name which has the form: ++'--build=TYPE' option. TYPE can either be a short name for the system ++type, such as 'sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +@@ -265,101 +268,101 @@ where SYSTEM can have one of these forms + OS + KERNEL-OS + +- See the file `config.sub' for the possible values of each field. If +-`config.sub' isn't included in this package, then this package doesn't ++ See the file 'config.sub' for the possible values of each field. If ++'config.sub' isn't included in this package, then this package doesn't + need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +-use the option `--target=TYPE' to select the type of system they will ++use the option '--target=TYPE' to select the type of system they will + produce code for. + + If you want to _use_ a cross compiler, that generates code for a + platform different from the build platform, you should specify the + "host" platform (i.e., that on which the generated programs will +-eventually be run) with `--host=TYPE'. ++eventually be run) with '--host=TYPE'. + + Sharing Defaults + ================ + +- If you want to set default values for `configure' scripts to share, +-you can create a site shell script called `config.site' that gives +-default values for variables like `CC', `cache_file', and `prefix'. +-`configure' looks for `PREFIX/share/config.site' if it exists, then +-`PREFIX/etc/config.site' if it exists. Or, you can set the +-`CONFIG_SITE' environment variable to the location of the site script. +-A warning: not all `configure' scripts look for a site script. ++ If you want to set default values for 'configure' scripts to share, ++you can create a site shell script called 'config.site' that gives ++default values for variables like 'CC', 'cache_file', and 'prefix'. ++'configure' looks for 'PREFIX/share/config.site' if it exists, then ++'PREFIX/etc/config.site' if it exists. Or, you can set the ++'CONFIG_SITE' environment variable to the location of the site script. ++A warning: not all 'configure' scripts look for a site script. + + Defining Variables + ================== + + Variables not defined in a site shell script can be set in the +-environment passed to `configure'. However, some packages may run ++environment passed to 'configure'. However, some packages may run + configure again during the build, and the customized values of these + variables may be lost. In order to avoid this problem, you should set +-them in the `configure' command line, using `VAR=value'. For example: ++them in the 'configure' command line, using 'VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +-causes the specified `gcc' to be used as the C compiler (unless it is ++causes the specified 'gcc' to be used as the C compiler (unless it is + overridden in the site shell script). + +-Unfortunately, this technique does not work for `CONFIG_SHELL' due to +-an Autoconf bug. Until the bug is fixed you can use this workaround: ++Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an ++Autoconf limitation. Until the limitation is lifted, you can use this ++workaround: + +- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash ++ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash + +-`configure' Invocation ++'configure' Invocation + ====================== + +- `configure' recognizes the following options to control how it ++ 'configure' recognizes the following options to control how it + operates. + +-`--help' +-`-h' +- Print a summary of all of the options to `configure', and exit. ++'--help' ++'-h' ++ Print a summary of all of the options to 'configure', and exit. + +-`--help=short' +-`--help=recursive' ++'--help=short' ++'--help=recursive' + Print a summary of the options unique to this package's +- `configure', and exit. The `short' variant lists options used +- only in the top level, while the `recursive' variant lists options +- also present in any nested packages. ++ 'configure', and exit. The 'short' variant lists options used only ++ in the top level, while the 'recursive' variant lists options also ++ present in any nested packages. + +-`--version' +-`-V' +- Print the version of Autoconf used to generate the `configure' ++'--version' ++'-V' ++ Print the version of Autoconf used to generate the 'configure' + script, and exit. + +-`--cache-file=FILE' ++'--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, +- traditionally `config.cache'. FILE defaults to `/dev/null' to ++ traditionally 'config.cache'. FILE defaults to '/dev/null' to + disable caching. + +-`--config-cache' +-`-C' +- Alias for `--cache-file=config.cache'. ++'--config-cache' ++'-C' ++ Alias for '--cache-file=config.cache'. + +-`--quiet' +-`--silent' +-`-q' ++'--quiet' ++'--silent' ++'-q' + Do not print messages saying which checks are being made. To +- suppress all normal output, redirect it to `/dev/null' (any error ++ suppress all normal output, redirect it to '/dev/null' (any error + messages will still be shown). + +-`--srcdir=DIR' ++'--srcdir=DIR' + Look for the package's source code in directory DIR. Usually +- `configure' can determine that directory automatically. ++ 'configure' can determine that directory automatically. + +-`--prefix=DIR' +- Use DIR as the installation prefix. *note Installation Names:: +- for more details, including other options available for fine-tuning +- the installation locations. ++'--prefix=DIR' ++ Use DIR as the installation prefix. *note Installation Names:: for ++ more details, including other options available for fine-tuning the ++ installation locations. + +-`--no-create' +-`-n' ++'--no-create' ++'-n' + Run the configure checks, but stop before creating any output + files. + +-`configure' also accepts some other, not widely useful, options. Run +-`configure --help' for more details. +- ++'configure' also accepts some other, not widely useful, options. Run ++'configure --help' for more details. diff --git a/package/libcap-ng/patches/patch-autogen_sh b/package/libcap-ng/patches/patch-autogen_sh new file mode 100644 index 000000000..8efae3587 --- /dev/null +++ b/package/libcap-ng/patches/patch-autogen_sh @@ -0,0 +1,9 @@ +--- libcap-ng-0.8.4.orig/autogen.sh 2023-12-20 16:18:45.000000000 +0100 ++++ libcap-ng-0.8.4/autogen.sh 2024-02-27 12:33:16.298580133 +0100 +@@ -1,5 +1,5 @@ + #! /bin/sh + set -x -e + # --no-recursive is available only in recent autoconf versions +-touch NEWS ++touch NEWS README + autoreconf -fv --install diff --git a/package/libcap/Makefile b/package/libcap/Makefile index d509e1960..29c417237 100644 --- a/package/libcap/Makefile +++ b/package/libcap/Makefile @@ -25,6 +25,10 @@ endif HOST_STYLE:= manual CONFIG_STYLE:= manual +MAKE_ENV+= BUILD_CC="${HOST_CC}" +ifeq ($(ADK_PACKAGE_PAM),) +MAKE_ENV+= PAM_CAP=no +endif host-build: (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ diff --git a/package/libcdada/Makefile b/package/libcdada/Makefile new file mode 100644 index 000000000..4b18d20d5 --- /dev/null +++ b/package/libcdada/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:= libcdada +PKG_VERSION:= 0.5.2 +PKG_RELEASE:= 1 +PKG_HASH:= 507f0b7bf8cb7533c22731c64d92737e7536866be7c7dd317b89709cd6529867 +PKG_DESCR:= basic data structures in C +PKG_SECTION:= libs/misc +PKG_SITES:= https://github.com/msune/libcdada/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBCDADA,libcdada,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +AUTOTOOL_STYLE:= autogen +CONFIGURE_ARGS+= --disable-silent-rules \ + --without-tests \ + --without-examples + +libcdada-install: + $(INSTALL_DIR) $(IDIR_LIBCDADA)/usr/lib + $(CP) $(WRKINST)/usr/lib/libcdada*.so* \ + $(IDIR_LIBCDADA)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libcdada/patches/patch-configure_ac b/package/libcdada/patches/patch-configure_ac new file mode 100644 index 000000000..b9d2dd11d --- /dev/null +++ b/package/libcdada/patches/patch-configure_ac @@ -0,0 +1,22 @@ +--- libcdada-0.5.2.orig/configure.ac 2023-11-07 23:04:41.000000000 +0100 ++++ libcdada-0.5.2/configure.ac 2024-02-20 07:03:02.007933771 +0100 +@@ -4,7 +4,7 @@ AC_INIT(LIBCDADA, m4_esyscmd_s(cat VERSI + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) ++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) + + AC_GNU_SOURCE + +@@ -24,8 +24,8 @@ LT_INIT + AC_ENABLE_STATIC + + # Some useful default flags +-CFLAGS="-std=gnu89 -Werror -Wall $CFLAGS" +-CXXFLAGS="-Werror -Wall $CXXFLAGS" ++CFLAGS="-std=gnu89 -Wall $CFLAGS" ++CXXFLAGS="-Wall $CXXFLAGS" + AC_DEFINE([__STDC_FORMAT_MACROS], [], [Description]) + + # Check for Python3 diff --git a/package/libcdio/Makefile b/package/libcdio/Makefile index fca3550aa..955f44359 100644 --- a/package/libcdio/Makefile +++ b/package/libcdio/Makefile @@ -9,6 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= 8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b PKG_DESCR:= library for cd-rom and cd image access PKG_SECTION:= libs/misc +PKG_DEPENDS:= ncurses +PKG_BUILDDEP:= ncurses PKG_URL:= http://www.gnu.org/software/libcdio PKG_SITES:= http://ftp.gnu.org/gnu/libcdio/ PKG_OPTS:= dev diff --git a/package/libcec/Makefile b/package/libcec/Makefile index 422bf679b..302f03e4e 100644 --- a/package/libcec/Makefile +++ b/package/libcec/Makefile @@ -4,24 +4,29 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libcec -PKG_VERSION:= d156e7cb684f86a9d73f8dcf087d4799c62d9721 +PKG_VERSION:= 6.0.2 PKG_RELEASE:= 1 -PKG_GIT:= hash +PKG_HASH:= 090696d7a4fb772d7acebbb06f91ab92e025531c7c91824046b9e4e71ecb3377 PKG_DESCR:= control your device with your tv remote control PKG_SECTION:= libs/video -PKG_DEPENDS:= libudev libplatform -PKG_BUILDDEP:= eudev cmake-host platform +PKG_DEPENDS:= libudev p8-platform +PKG_BUILDDEP:= eudev cmake-host p8-platform PKG_URL:= http://libcec.pulse-eight.com/ -PKG_SITES:= https://github.com/Pulse-Eight/libcec.git +PKG_SITES:= https://github.com/Pulse-Eight/libcec/archive/refs/tags/ PKG_OPTS:= dev +PKG_DEPENDS_RASPBERRY_PI4:= bcm28xx-vc +PKG_BUILDDEP_RASPBERRY_PI4:= bcm28xx-vc PKG_DEPENDS_RASPBERRY_PI3:= bcm28xx-vc PKG_BUILDDEP_RASPBERRY_PI3:= bcm28xx-vc PKG_DEPENDS_RASPBERRY_PI2:= bcm28xx-vc PKG_BUILDDEP_RASPBERRY_PI2:= bcm28xx-vc PKG_DEPENDS_RASPBERRY_PI:= bcm28xx-vc PKG_BUILDDEP_RASPBERRY_PI:= bcm28xx-vc -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi3p solidrun-imx6 +PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi4 solidrun-imx6 + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz +WRKDIST= $(WRKDIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION) include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/libcec/patches/libcec-00-imx6-support.patch b/package/libcec/patches/libcec-00-imx6-support.patch deleted file mode 100644 index 2c24635c4..000000000 --- a/package/libcec/patches/libcec-00-imx6-support.patch +++ /dev/null @@ -1,879 +0,0 @@ -From a7f3315333c1a79259a763c6542a6cd71855b357 Mon Sep 17 00:00:00 2001 -From: Stefan Saraev <stefan@saraev.ca> -Date: Thu, 7 May 2015 11:35:04 +0300 -Subject: [PATCH] imx support - -note. I am NOT the author of the patch. just rebased it ---- - include/cectypes.h | 14 +- - src/libcec/CECTypeUtils.h | 2 + - src/libcec/adapter/AdapterFactory.cpp | 29 +- - src/libcec/adapter/IMX/AdapterMessageQueue.h | 134 +++++++++ - .../adapter/IMX/IMXCECAdapterCommunication.cpp | 328 +++++++++++++++++++++ - .../adapter/IMX/IMXCECAdapterCommunication.h | 119 ++++++++ - src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp | 42 +++ - src/libcec/adapter/IMX/IMXCECAdapterDetection.h | 36 +++ - src/libcec/cmake/CheckPlatformSupport.cmake | 10 + - src/libcec/cmake/DisplayPlatformSupport.cmake | 6 + - src/libcec/env.h.in | 3 + - 11 files changed, 720 insertions(+), 3 deletions(-) - create mode 100644 src/libcec/adapter/IMX/AdapterMessageQueue.h - create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp - create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterCommunication.h - create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp - create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterDetection.h - -diff --git a/include/cectypes.h b/include/cectypes.h -index acff259..0cfee8c 100644 ---- a/include/cectypes.h -+++ b/include/cectypes.h -@@ -309,6 +309,17 @@ namespace CEC { - #define CEC_EXYNOS_VIRTUAL_COM "Exynos" - - /*! -+ * the path to use for the i.MX CEC wire -+ */ -+#define CEC_IMX_PATH "/dev/mxc_hdmi_cec" -+ -+/*! -+ * the name of the virtual COM port to use for the i.MX CEC wire -+ */ -+#define CEC_IMX_VIRTUAL_COM "i.MX" -+ -+ -+/*! - * Mimimum client version - */ - #define CEC_MIN_LIB_VERSION 3 -@@ -876,7 +887,8 @@ typedef enum cec_adapter_type - ADAPTERTYPE_P8_DAUGHTERBOARD = 0x2, - ADAPTERTYPE_RPI = 0x100, - ADAPTERTYPE_TDA995x = 0x200, -- ADAPTERTYPE_EXYNOS = 0x300 -+ ADAPTERTYPE_EXYNOS = 0x300, -+ ADAPTERTYPE_IMX = 0x400 - } cec_adapter_type; - - /** force exporting through swig */ -diff --git a/src/libcec/CECTypeUtils.h b/src/libcec/CECTypeUtils.h -index fd8046a..48cb215 100644 ---- a/src/libcec/CECTypeUtils.h -+++ b/src/libcec/CECTypeUtils.h -@@ -765,6 +765,8 @@ namespace CEC - return "Raspberry Pi"; - case ADAPTERTYPE_TDA995x: - return "TDA995x"; -+ case ADAPTERTYPE_IMX: -+ return "i.MX"; - default: - return "unknown"; - } -diff --git a/src/libcec/adapter/AdapterFactory.cpp b/src/libcec/adapter/AdapterFactory.cpp -index da05725..92e378b 100644 ---- a/src/libcec/adapter/AdapterFactory.cpp -+++ b/src/libcec/adapter/AdapterFactory.cpp -@@ -58,6 +58,11 @@ - #include "Exynos/ExynosCECAdapterCommunication.h" - #endif - -+#if defined(HAVE_IMX_API) -+#include "IMX/IMXCECAdapterDetection.h" -+#include "IMX/IMXCECAdapterCommunication.h" -+#endif -+ - using namespace CEC; - - int8_t CAdapterFactory::FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */) -@@ -127,7 +132,22 @@ int8_t CAdapterFactory::DetectAdapters(cec_adapter_descriptor *deviceList, uint8 - #endif - - --#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) -+ -+#if defined(HAVE_IMX_API) -+ if (iAdaptersFound < iBufSize && CIMXCECAdapterDetection::FindAdapter() && -+ (!strDevicePath || !strcmp(strDevicePath, CEC_IMX_VIRTUAL_COM))) -+ { -+ snprintf(deviceList[iAdaptersFound].strComPath, sizeof(deviceList[iAdaptersFound].strComPath), CEC_IMX_PATH); -+ snprintf(deviceList[iAdaptersFound].strComName, sizeof(deviceList[iAdaptersFound].strComName), CEC_IMX_VIRTUAL_COM); -+ deviceList[iAdaptersFound].iVendorId = IMX_ADAPTER_VID; -+ deviceList[iAdaptersFound].iProductId = IMX_ADAPTER_PID; -+ deviceList[iAdaptersFound].adapterType = ADAPTERTYPE_IMX; -+ iAdaptersFound++; -+ } -+#endif -+ -+ -+#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) && !defined(HAVE_IMX_API) - #error "libCEC doesn't have support for any type of adapter. please check your build system or configuration" - #endif - -@@ -151,11 +171,16 @@ IAdapterCommunication *CAdapterFactory::GetInstance(const char *strPort, uint16_ - return new CRPiCECAdapterCommunication(m_lib->m_cec); - #endif - -+#if defined(HAVE_IMX_API) -+ if (!strcmp(strPort, CEC_IMX_VIRTUAL_COM)) -+ return new CIMXCECAdapterCommunication(m_lib->m_cec); -+#endif -+ - #if defined(HAVE_P8_USB) - return new CUSBCECAdapterCommunication(m_lib->m_cec, strPort, iBaudRate); - #endif - --#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) && !defined(HAVE_EXYNOS_API) -+#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) && !defined(HAVE_EXYNOS_API) && !defined(HAVE_IMX_API) - return NULL; - #endif - } -diff --git a/src/libcec/adapter/IMX/AdapterMessageQueue.h b/src/libcec/adapter/IMX/AdapterMessageQueue.h -new file mode 100644 -index 0000000..af6742c ---- /dev/null -+++ b/src/libcec/adapter/IMX/AdapterMessageQueue.h -@@ -0,0 +1,134 @@ -+#pragma once -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * This program is dual-licensed; 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ * Alternatively, you can license this library under a commercial license, -+ * please contact Pulse-Eight Licensing for more information. -+ * -+ * For more information contact: -+ * Pulse-Eight Licensing <license@pulse-eight.com> -+ * http://www.pulse-eight.com/ -+ * http://www.pulse-eight.net/ -+ */ -+ -+#include "platform/threads/mutex.h" -+ -+namespace CEC -+{ -+ using namespace PLATFORM; -+ -+ class CAdapterMessageQueueEntry -+ { -+ public: -+ CAdapterMessageQueueEntry(const cec_command &command) -+ : m_bWaiting(true), m_retval((uint32_t)-1), m_bSucceeded(false) -+ { -+ m_hash = hashValue( -+ uint32_t(command.opcode_set ? command.opcode : CEC_OPCODE_NONE), -+ command.initiator, command.destination); -+ } -+ -+ virtual ~CAdapterMessageQueueEntry(void) {} -+ -+ /*! -+ * @brief Query result from worker thread -+ */ -+ uint32_t Result() const -+ { -+ return m_retval; -+ } -+ -+ /*! -+ * @brief Signal waiting threads -+ */ -+ void Broadcast(void) -+ { -+ CLockObject lock(m_mutex); -+ m_condition.Broadcast(); -+ } -+ -+ /*! -+ * @brief Signal waiting thread(s) when message matches this entry -+ */ -+ bool CheckMatch(uint32_t opcode, cec_logical_address initiator, -+ cec_logical_address destination, uint32_t response) -+ { -+ uint32_t hash = hashValue(opcode, initiator, destination); -+ -+ if (hash == m_hash) -+ { -+ CLockObject lock(m_mutex); -+ -+ m_retval = response; -+ m_bSucceeded = true; -+ m_condition.Signal(); -+ return true; -+ } -+ -+ return false; -+ } -+ -+ /*! -+ * @brief Wait for a response to this command. -+ * @param iTimeout The timeout to use while waiting. -+ * @return True when a response was received before the timeout passed, false otherwise. -+ */ -+ bool Wait(uint32_t iTimeout) -+ { -+ CLockObject lock(m_mutex); -+ -+ bool bReturn = m_bSucceeded ? true : m_condition.Wait(m_mutex, m_bSucceeded, iTimeout); -+ m_bWaiting = false; -+ return bReturn; -+ } -+ -+ /*! -+ * @return True while a thread is waiting for a signal or isn't waiting yet, false otherwise. -+ */ -+ bool IsWaiting(void) -+ { -+ CLockObject lock(m_mutex); -+ return m_bWaiting; -+ } -+ -+ /*! -+ * @return Hash value for given cec_command -+ */ -+ static uint32_t hashValue(uint32_t opcode, -+ cec_logical_address initiator, -+ cec_logical_address destination) -+ { -+ return 1 | ((uint32_t)initiator << 8) | -+ ((uint32_t)destination << 16) | ((uint32_t)opcode << 16); -+ } -+ -+ private: -+ bool m_bWaiting; /**< true while a thread is waiting or when it hasn't started waiting yet */ -+ PLATFORM::CCondition<bool> m_condition; /**< the condition to wait on */ -+ PLATFORM::CMutex m_mutex; /**< mutex for changes to this class */ -+ uint32_t m_hash; -+ uint32_t m_retval; -+ bool m_bSucceeded; -+ }; -+ -+}; -diff --git a/src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp -new file mode 100644 -index 0000000..2daa8cb ---- /dev/null -+++ b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp -@@ -0,0 +1,328 @@ -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * IMX adpater port is Copyright (C) 2013 by Stephan Rafin -+ * -+ * You can redistribute this file 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ */ -+ -+#include "env.h" -+ -+#if defined(HAVE_IMX_API) -+#include "IMXCECAdapterCommunication.h" -+ -+#include "CECTypeUtils.h" -+#include "LibCEC.h" -+#include "platform/sockets/cdevsocket.h" -+#include "platform/util/StdString.h" -+#include "platform/util/buffer.h" -+ -+/* -+ * Ioctl definitions from kernel header -+ */ -+#define HDMICEC_IOC_MAGIC 'H' -+#define HDMICEC_IOC_SETLOGICALADDRESS _IOW(HDMICEC_IOC_MAGIC, 1, unsigned char) -+#define HDMICEC_IOC_STARTDEVICE _IO(HDMICEC_IOC_MAGIC, 2) -+#define HDMICEC_IOC_STOPDEVICE _IO(HDMICEC_IOC_MAGIC, 3) -+#define HDMICEC_IOC_GETPHYADDRESS _IOR(HDMICEC_IOC_MAGIC, 4, unsigned char[4]) -+ -+#define MAX_CEC_MESSAGE_LEN 17 -+ -+#define MESSAGE_TYPE_RECEIVE_SUCCESS 1 -+#define MESSAGE_TYPE_NOACK 2 -+#define MESSAGE_TYPE_DISCONNECTED 3 -+#define MESSAGE_TYPE_CONNECTED 4 -+#define MESSAGE_TYPE_SEND_SUCCESS 5 -+ -+typedef struct hdmi_cec_event{ -+ int event_type; -+ int msg_len; -+ unsigned char msg[MAX_CEC_MESSAGE_LEN]; -+}hdmi_cec_event; -+ -+ -+using namespace std; -+using namespace CEC; -+using namespace PLATFORM; -+ -+#include "AdapterMessageQueue.h" -+ -+#define LIB_CEC m_callback->GetLib() -+ -+// these are defined in nxp private header file -+#define CEC_MSG_SUCCESS 0x00 /*Message transmisson Succeed*/ -+#define CEC_CSP_OFF_STATE 0x80 /*CSP in Off State*/ -+#define CEC_BAD_REQ_SERVICE 0x81 /*Bad .req service*/ -+#define CEC_MSG_FAIL_UNABLE_TO_ACCESS 0x82 /*Message transmisson failed: Unable to access CEC line*/ -+#define CEC_MSG_FAIL_ARBITRATION_ERROR 0x83 /*Message transmisson failed: Arbitration error*/ -+#define CEC_MSG_FAIL_BIT_TIMMING_ERROR 0x84 /*Message transmisson failed: Bit timming error*/ -+#define CEC_MSG_FAIL_DEST_NOT_ACK 0x85 /*Message transmisson failed: Destination Address not aknowledged*/ -+#define CEC_MSG_FAIL_DATA_NOT_ACK 0x86 /*Message transmisson failed: Databyte not acknowledged*/ -+ -+ -+CIMXCECAdapterCommunication::CIMXCECAdapterCommunication(IAdapterCommunicationCallback *callback) : -+ IAdapterCommunication(callback)/*, -+ m_bLogicalAddressChanged(false)*/ -+{ -+ CLockObject lock(m_mutex); -+ -+ m_iNextMessage = 0; -+ //m_logicalAddresses.Clear(); -+ m_logicalAddress = CECDEVICE_UNKNOWN; -+ m_bLogicalAddressRegistered = false; -+ m_bInitialised = false; -+ m_dev = new CCDevSocket(CEC_IMX_PATH); -+} -+ -+CIMXCECAdapterCommunication::~CIMXCECAdapterCommunication(void) -+{ -+ Close(); -+ -+ CLockObject lock(m_mutex); -+ delete m_dev; -+ m_dev = 0; -+} -+ -+bool CIMXCECAdapterCommunication::IsOpen(void) -+{ -+ return IsInitialised() && m_dev->IsOpen(); -+} -+ -+bool CIMXCECAdapterCommunication::Open(uint32_t iTimeoutMs, bool UNUSED(bSkipChecks), bool bStartListening) -+{ -+ if (m_dev->Open(iTimeoutMs)) -+ { -+ if (!bStartListening || CreateThread()) { -+ if (m_dev->Ioctl(HDMICEC_IOC_STARTDEVICE, NULL) == 0) { -+ m_bInitialised = true; -+ return true; -+ } -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: Unable to start device\n", __func__); -+ } -+ m_dev->Close(); -+ } -+ -+ return false; -+} -+ -+ -+void CIMXCECAdapterCommunication::Close(void) -+{ -+ StopThread(0); -+ -+ CLockObject lock(m_mutex); -+ if (!m_bInitialised) { -+ return; -+ } -+ if (m_dev->Ioctl(HDMICEC_IOC_STOPDEVICE, NULL) != 0) { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: Unable to stop device\n", __func__); -+ } -+ m_dev->Close(); -+ m_bInitialised = false; -+} -+ -+ -+std::string CIMXCECAdapterCommunication::GetError(void) const -+{ -+ std::string strError(m_strError); -+ return strError; -+} -+ -+ -+cec_adapter_message_state CIMXCECAdapterCommunication::Write( -+ const cec_command &data, bool &UNUSED(bRetry), uint8_t UNUSED(iLineTimeout), bool UNUSED(bIsReply)) -+{ -+ //cec_frame frame; -+ unsigned char message[MAX_CEC_MESSAGE_LEN]; -+ int msg_len = 1; -+ cec_adapter_message_state rc = ADAPTER_MESSAGE_STATE_ERROR; -+ -+ if ((size_t)data.parameters.size + data.opcode_set + 1 > sizeof(message)) -+ { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: data size too large !", __func__); -+ return ADAPTER_MESSAGE_STATE_ERROR; -+ } -+ -+ message[0] = (data.initiator << 4) | (data.destination & 0x0f); -+ if (data.opcode_set) -+ { -+ message[1] = data.opcode; -+ msg_len++; -+ memcpy(&message[2], data.parameters.data, data.parameters.size); -+ msg_len+=data.parameters.size; -+ } -+ -+ if (m_dev->Write(message, msg_len) == msg_len) -+ { -+ rc = ADAPTER_MESSAGE_STATE_SENT_ACKED; -+ } -+ else -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: sent command error !", __func__); -+ -+ return rc; -+} -+ -+ -+uint16_t CIMXCECAdapterCommunication::GetFirmwareVersion(void) -+{ -+ /* FIXME add ioctl ? */ -+ return 0; -+} -+ -+ -+cec_vendor_id CIMXCECAdapterCommunication::GetVendorId(void) -+{ -+ return CEC_VENDOR_UNKNOWN; -+} -+ -+ -+uint16_t CIMXCECAdapterCommunication::GetPhysicalAddress(void) -+{ -+ uint32_t info; -+ uint16_t phy_addr; -+ -+ if (m_dev->Ioctl(HDMICEC_IOC_GETPHYADDRESS, &info) != 0) -+ { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: HDMICEC_IOC_GETPHYADDRESS failed !", __func__); -+ return CEC_INVALID_PHYSICAL_ADDRESS; -+ } -+ /* Rebuild 16 bit raw value from fsl 32 bits value */ -+ phy_addr = ((info & 0x0f) << 12) | (info & 0x0f00) | -+ ((info & 0x0f0000) >> 12) | ((info & 0x0f000000) >> 24); -+ -+ return phy_addr; -+} -+ -+ -+cec_logical_addresses CIMXCECAdapterCommunication::GetLogicalAddresses(void) -+{ -+ cec_logical_addresses addresses; -+ addresses.Clear(); -+ -+ CLockObject lock(m_mutex); -+ if ((m_logicalAddress & (CECDEVICE_UNKNOWN | CECDEVICE_UNREGISTERED)) == 0) -+ addresses.Set(m_logicalAddress); -+ -+ return addresses; -+} -+ -+void CIMXCECAdapterCommunication::HandleLogicalAddressLost(cec_logical_address UNUSED(oldAddress)) -+{ -+ UnregisterLogicalAddress(); -+} -+ -+bool CIMXCECAdapterCommunication::UnregisterLogicalAddress(void) -+{ -+ CLockObject lock(m_mutex); -+ if (!m_bLogicalAddressRegistered) -+ return true; -+ -+ if (m_dev->Ioctl(HDMICEC_IOC_SETLOGICALADDRESS, (void *)CECDEVICE_BROADCAST) != 0) -+ { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: HDMICEC_IOC_SETLOGICALADDRESS failed !", __func__); -+ return false; -+ } -+ -+ m_logicalAddress = CECDEVICE_UNKNOWN; -+ m_bLogicalAddressRegistered = false; -+ return true; -+} -+ -+bool CIMXCECAdapterCommunication::RegisterLogicalAddress(const cec_logical_address address) -+{ -+ CLockObject lock(m_mutex); -+ -+ if (m_logicalAddress == address && m_bLogicalAddressRegistered) -+ { -+ return true; -+ } -+ -+ if (m_dev->Ioctl(HDMICEC_IOC_SETLOGICALADDRESS, (void *)address) != 0) -+ { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: HDMICEC_IOC_SETLOGICALADDRESS failed !", __func__); -+ return false; -+ } -+ -+ m_logicalAddress = address; -+ m_bLogicalAddressRegistered = true; -+ return true; -+} -+ -+bool CIMXCECAdapterCommunication::SetLogicalAddresses(const cec_logical_addresses &addresses) -+{ -+ int log_addr = addresses.primary; -+ -+ return RegisterLogicalAddress((cec_logical_address)log_addr); -+} -+ -+void *CIMXCECAdapterCommunication::Process(void) -+{ -+ bool bHandled; -+ hdmi_cec_event event; -+ int ret; -+ -+ uint32_t opcode, status; -+ cec_logical_address initiator, destination; -+ -+ while (!IsStopped()) -+ { -+ ret = m_dev->Read((char *)&event, sizeof(event), 5000); -+ if (ret > 0) -+ { -+ -+ initiator = cec_logical_address(event.msg[0] >> 4); -+ destination = cec_logical_address(event.msg[0] & 0x0f); -+ -+ //LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: Read data : type : %d initiator %d dest %d", __func__, event.event_type, initiator, destination); -+ if (event.event_type == MESSAGE_TYPE_RECEIVE_SUCCESS) -+ /* Message received */ -+ { -+ cec_command cmd; -+ -+ cec_command::Format( -+ cmd, initiator, destination, -+ ( event.msg_len > 1 ) ? cec_opcode(event.msg[1]) : CEC_OPCODE_NONE); -+ -+ for( uint8_t i = 2; i < event.msg_len; i++ ) -+ cmd.parameters.PushBack(event.msg[i]); -+ -+ if (!IsStopped()) -+ m_callback->OnCommandReceived(cmd); -+ } -+ -+ if (event.event_type == MESSAGE_TYPE_CONNECTED) -+ /* HDMI has just been reconnected - Notify phy address*/ -+ { -+ uint16_t iNewAddress = GetPhysicalAddress(); -+ m_callback->HandlePhysicalAddressChanged(iNewAddress); -+ } -+ /* We are not interested in other events */ -+ } /*else { -+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: Read returned %d", __func__, ret); -+ }*/ -+ -+ } -+ -+ return 0; -+} -+ -+#endif // HAVE_IMX_API -diff --git a/src/libcec/adapter/IMX/IMXCECAdapterCommunication.h b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.h -new file mode 100644 -index 0000000..9e899a3 ---- /dev/null -+++ b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.h -@@ -0,0 +1,119 @@ -+#pragma once -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * IMX adpater port is Copyright (C) 2013 by Stephan Rafin -+ * -+ * You can redistribute this file 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ */ -+ -+#if defined(HAVE_IMX_API) -+ -+#include "platform/threads/mutex.h" -+#include "platform/threads/threads.h" -+#include "platform/sockets/socket.h" -+#include "adapter/AdapterCommunication.h" -+#include <map> -+ -+#define IMX_ADAPTER_VID 0x0471 /*FIXME TBD*/ -+#define IMX_ADAPTER_PID 0x1001 -+ -+ -+ -+namespace PLATFORM -+{ -+ class CCDevSocket; -+}; -+ -+ -+namespace CEC -+{ -+ class CAdapterMessageQueueEntry; -+ -+ class CIMXCECAdapterCommunication : public IAdapterCommunication, public PLATFORM::CThread -+ { -+ public: -+ /*! -+ * @brief Create a new USB-CEC communication handler. -+ * @param callback The callback to use for incoming CEC commands. -+ */ -+ CIMXCECAdapterCommunication(IAdapterCommunicationCallback *callback); -+ virtual ~CIMXCECAdapterCommunication(void); -+ -+ /** @name IAdapterCommunication implementation */ -+ ///{ -+ bool Open(uint32_t iTimeoutMs = CEC_DEFAULT_CONNECT_TIMEOUT, bool bSkipChecks = false, bool bStartListening = true); -+ void Close(void); -+ bool IsOpen(void); -+ std::string GetError(void) const; -+ cec_adapter_message_state Write(const cec_command &data, bool &bRetry, uint8_t iLineTimeout, bool bIsReply); -+ -+ bool SetLineTimeout(uint8_t UNUSED(iTimeout)) { return true; } -+ bool StartBootloader(void) { return false; } -+ bool SetLogicalAddresses(const cec_logical_addresses &addresses); -+ cec_logical_addresses GetLogicalAddresses(void); -+ bool PingAdapter(void) { return IsInitialised(); } -+ uint16_t GetFirmwareVersion(void); -+ uint32_t GetFirmwareBuildDate(void) { return 0; } -+ bool IsRunningLatestFirmware(void) { return true; } -+ bool PersistConfiguration(const libcec_configuration & UNUSED(configuration)) { return false; } -+ bool GetConfiguration(libcec_configuration & UNUSED(configuration)) { return false; } -+ std::string GetPortName(void) { return std::string("IMX"); } -+ uint16_t GetPhysicalAddress(void); -+ bool SetControlledMode(bool UNUSED(controlled)) { return true; } -+ cec_vendor_id GetVendorId(void); -+ bool SupportsSourceLogicalAddress(const cec_logical_address address) { return address > CECDEVICE_TV && address <= CECDEVICE_BROADCAST; } -+ cec_adapter_type GetAdapterType(void) { return ADAPTERTYPE_IMX; } -+ uint16_t GetAdapterVendorId(void) const { return IMX_ADAPTER_VID; } -+ uint16_t GetAdapterProductId(void) const { return IMX_ADAPTER_PID; } -+ void HandleLogicalAddressLost(cec_logical_address UNUSED(oldAddress)); -+ void SetActiveSource(bool UNUSED(bSetTo), bool UNUSED(bClientUnregistered)) {} -+ bool RegisterLogicalAddress(const cec_logical_address address); -+ ///} -+ -+ /** @name PLATFORM::CThread implementation */ -+ ///{ -+ void *Process(void); -+ ///} -+ -+ private: -+ bool IsInitialised(void) const { return m_bInitialised; }; -+ bool UnregisterLogicalAddress(void); -+ -+ std::string m_strError; /**< current error message */ -+ -+ //cec_logical_addresses m_logicalAddresses; -+ cec_logical_address m_logicalAddress; -+ -+ PLATFORM::CMutex m_mutex; -+ PLATFORM::CCDevSocket *m_dev; /**< the device connection */ -+ bool m_bLogicalAddressRegistered; -+ bool m_bInitialised; -+ -+ PLATFORM::CMutex m_messageMutex; -+ uint32_t m_iNextMessage; -+ std::map<uint32_t, CAdapterMessageQueueEntry *> m_messages; -+ }; -+ -+}; -+ -+#endif -diff --git a/src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp b/src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp -new file mode 100644 -index 0000000..6c93c45 ---- /dev/null -+++ b/src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp -@@ -0,0 +1,42 @@ -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * IMX adpater port is Copyright (C) 2013 by Stephan Rafin -+ * -+ * You can redistribute this file 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ */ -+ -+#include "env.h" -+#include <stdio.h> -+ -+#if defined(HAVE_IMX_API) -+#include "IMXCECAdapterDetection.h" -+ -+ -+using namespace CEC; -+ -+bool CIMXCECAdapterDetection::FindAdapter(void) -+{ -+ return access(CEC_IMX_PATH, 0) == 0; -+} -+ -+#endif -diff --git a/src/libcec/adapter/IMX/IMXCECAdapterDetection.h b/src/libcec/adapter/IMX/IMXCECAdapterDetection.h -new file mode 100644 -index 0000000..d54891d ---- /dev/null -+++ b/src/libcec/adapter/IMX/IMXCECAdapterDetection.h -@@ -0,0 +1,36 @@ -+#pragma once -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * IMX adpater port is Copyright (C) 2013 by Stephan Rafin -+ * -+ * You can redistribute this file 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ */ -+ -+namespace CEC -+{ -+ class CIMXCECAdapterDetection -+ { -+ public: -+ static bool FindAdapter(void); -+ }; -+} -diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake -index 828cdb2..8b47795 100644 ---- a/src/libcec/cmake/CheckPlatformSupport.cmake -+++ b/src/libcec/cmake/CheckPlatformSupport.cmake -@@ -8,6 +8,7 @@ - # HAVE_RANDR 1 if xrandr is supported - # HAVE_LIBUDEV 1 if udev is supported - # HAVE_RPI_API 1 if Raspberry Pi is supported -+# HAVE_IMX_API 1 if i.MX is supported - # HAVE_TDA995X_API 1 if TDA995X is supported - # HAVE_EXYNOS_API 1 if Exynos is supported - # HAVE_P8_USB_DETECT 1 if Pulse-Eight devices can be auto-detected -@@ -87,6 +88,15 @@ else() - list(APPEND CEC_SOURCES ${CEC_SOURCES_ADAPTER_RPI}) - endif() - -+ # i.MX -+ if (HAVE_IMX_API) -+ set(LIB_INFO "${LIB_INFO}, 'IMX'") -+ set(CEC_SOURCES_ADAPTER_IMX adapter/IMX/IMXCECAdapterDetection.cpp -+ adapter/IMX/IMXCECAdapterCommunication.cpp) -+ source_group("Source Files\\adapter\\IMX" FILES ${CEC_SOURCES_ADAPTER_IMX}) -+ list(APPEND CEC_SOURCES ${CEC_SOURCES_ADAPTER_IMX}) -+ endif() -+ - # TDA995x - check_include_files("tda998x_ioctl.h;comps/tmdlHdmiCEC/inc/tmdlHdmiCEC_Types.h" HAVE_TDA995X_API) - if (HAVE_TDA995X_API) -diff --git a/src/libcec/cmake/DisplayPlatformSupport.cmake b/src/libcec/cmake/DisplayPlatformSupport.cmake -index feee111..0309c56 100644 ---- a/src/libcec/cmake/DisplayPlatformSupport.cmake -+++ b/src/libcec/cmake/DisplayPlatformSupport.cmake -@@ -32,6 +32,12 @@ else() - message(STATUS "Raspberry Pi support: no") - endif() - -+if (HAVE_IMX_API) -+ message(STATUS "i.MX support: yes") -+else() -+ message(STATUS "i.MX support: no") -+endif() -+ - if (HAVE_TDA995X_API) - message(STATUS "TDA995x support: yes") - else() -diff --git a/src/libcec/env.h.in b/src/libcec/env.h.in -index a1a1f26..f90e729 100644 ---- a/src/libcec/env.h.in -+++ b/src/libcec/env.h.in -@@ -60,6 +60,9 @@ - /* Define to 1 for Raspberry Pi support */ - #cmakedefine HAVE_RPI_API @HAVE_RPI_API@ - -+/* Define to 1 for IMX support */ -+#cmakedefine HAVE_IMX_API @HAVE_IMX_API@ -+ - /* Define to 1 for TDA995x support */ - #cmakedefine HAVE_TDA995X_API @HAVE_TDA995X_API@ - --- -2.1.4 - diff --git a/package/libcec/patches/patch-src_cec-client_CMakeLists_txt b/package/libcec/patches/patch-src_cec-client_CMakeLists_txt deleted file mode 100644 index c6faee0ef..000000000 --- a/package/libcec/patches/patch-src_cec-client_CMakeLists_txt +++ /dev/null @@ -1,10 +0,0 @@ ---- libcec-185559110dc88aeca0915a90b3b369d2d42c0f7c.orig/src/cec-client/CMakeLists.txt 2015-05-22 14:47:17.000000000 -0500 -+++ libcec-185559110dc88aeca0915a90b3b369d2d42c0f7c/src/cec-client/CMakeLists.txt 2015-05-22 15:02:00.606971031 -0500 -@@ -44,6 +44,7 @@ if (NOT WIN32) - # curses - if (HAVE_CURSES_API) - target_link_libraries(cec-client curses) -+ target_link_libraries(cec-client tinfo) - endif() - - # rt diff --git a/package/libdisplay-info/Makefile b/package/libdisplay-info/Makefile new file mode 100644 index 000000000..89ee541d8 --- /dev/null +++ b/package/libdisplay-info/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:= libdisplay-info +PKG_VERSION:= 0.1.1 +PKG_RELEASE:= 1 +PKG_HASH:= 0d8731588e9f82a9cac96324a3d7c82e2ba5b1b5e006143fefe692c74069fb60 +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_OPTS:= dev + +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))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +libdisplay-info-install: + $(INSTALL_DIR) $(IDIR_LIBDISPLAY_INFO)/usr/lib + $(CP) $(WRKINST)/usr/lib/libdisplay-info*.so* \ + $(IDIR_LIBDISPLAY_INFO)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libdrm/Makefile b/package/libdrm/Makefile index 5ac234e0f..e5999416b 100644 --- a/package/libdrm/Makefile +++ b/package/libdrm/Makefile @@ -4,24 +4,27 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libdrm -PKG_VERSION:= 2.4.99 +PKG_VERSION:= 2.4.120 PKG_RELEASE:= 1 -PKG_HASH:= 597fb879e2f45193431a0d352d10cd79ef61a24ab31f44320168583e10cb6302 +PKG_HASH:= 3bf55363f76c7250946441ab51d3a6cc0ae518055c0ff017324ab76cdefb327a PKG_DESCR:= direct rendering manager library PKG_SECTION:= libs/video -PKG_BUILDDEP:= libpthread-stubs cairo libpciaccess +PKG_BUILDDEP:= meson-host libpthread-stubs cairo libpciaccess PKG_URL:= http://dri.freedesktop.org/wiki/ PKG_SITES:= http://dri.freedesktop.org/libdrm/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBDRM,libdrm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ARGS+= --disable-manpages \ - --disable-valgrind +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +MESON_FLAGS+= -Dvalgrind=disabled + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson libdrm-install: $(INSTALL_DIR) $(IDIR_LIBDRM)/usr/lib diff --git a/package/libedit/Makefile b/package/libedit/Makefile new file mode 100644 index 000000000..71c8e5dae --- /dev/null +++ b/package/libedit/Makefile @@ -0,0 +1,26 @@ +# 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:= libedit +PKG_VERSION:= 20230828-3.1 +PKG_RELEASE:= 1 +PKG_HASH:= 4ee8182b6e569290e7d1f44f0f78dac8716b35f656b76528f699c69c98814dad +PKG_DESCR:= editline library +PKG_SECTION:= libs/misc +PKG_SITES:= https://www.thrysoee.dk/editline/ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBEDIT,libedit,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +libedit-install: + $(INSTALL_DIR) $(IDIR_LIBEDIT)/usr/lib + $(CP) $(WRKINST)/usr/lib/libedit*.so* \ + $(IDIR_LIBEDIT)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libedit/patches/patch-src_sys_h b/package/libedit/patches/patch-src_sys_h new file mode 100644 index 000000000..4ee74acb0 --- /dev/null +++ b/package/libedit/patches/patch-src_sys_h @@ -0,0 +1,11 @@ +--- libedit-20230828-3.1.orig/src/sys.h 2023-08-27 09:50:35.000000000 +0200 ++++ libedit-20230828-3.1/src/sys.h 2023-12-19 16:51:25.734885959 +0100 +@@ -40,7 +40,7 @@ + #ifndef _h_sys + #define _h_sys + +-#if defined(HAVE_SYS_TYPES_H) && defined(__sun) ++#if defined(HAVE_SYS_TYPES_H) + #include <sys/types.h> + #endif + diff --git a/package/libepoxy/Makefile b/package/libepoxy/Makefile index 2d69a3aa4..fa224ad12 100644 --- a/package/libepoxy/Makefile +++ b/package/libepoxy/Makefile @@ -4,22 +4,26 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libepoxy -PKG_VERSION:= 1.2 +PKG_VERSION:= 1.5.9 PKG_RELEASE:= 1 -PKG_HASH:= 42c328440f60a5795835c5ec4bdfc1329e75bba16b6e22b3a87ed17e9679e8f6 +PKG_HASH:= d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4 PKG_DESCR:= opengl function pointer management PKG_SECTION:= libs/misc -PKG_BUILDDEP:= util-macros-host mesa -PKG_SITES:= http://crux.nu/files/ +PKG_DEPENDS:= mesa +PKG_BUILDDEP:= util-macros-host mesa meson-host +PKG_SITES:= https://github.com/anholt/libepoxy/releases/download/$(PKG_VERSION)/ PKG_OPTS:= dev -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBEPOXY,libepoxy,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -AUTOTOOL_STYLE:= autogen +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + libepoxy-install: $(INSTALL_DIR) $(IDIR_LIBEPOXY)/usr/lib diff --git a/package/libesmtp/Makefile b/package/libesmtp/Makefile index 4b7474cd5..fdfb7bdad 100644 --- a/package/libesmtp/Makefile +++ b/package/libesmtp/Makefile @@ -4,40 +4,38 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libesmtp -PKG_VERSION:= 1.0.6 -PKG_RELEASE:= 2 -PKG_HASH:= d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b +PKG_VERSION:= 1.1.0 +PKG_RELEASE:= 1 +PKG_HASH:= 32bc3614ca12d21c7d933f32d43410e8744b6f91fdca7732da9877a385e4e6c3 PKG_DESCR:= implements the client side of the smtp protocol PKG_SECTION:= libs/net -PKG_URL:= http://www.stafford.uklinux.net/libesmtp/ -PKG_SITES:= http://www.stafford.uklinux.net/libesmtp/ +PKG_URL:= https://libesmtp.github.io/index.html +PKG_SITES:= https://github.com/libesmtp/libESMTP/archive/refs/tags/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +DISTFILES:= v${PKG_VERSION}.tar.gz +WRKDIST= $(WRKDIR)/libESMTP-$(PKG_VERSION) -PKG_CHOICES_LIBESMTP:= WITH_LIBRESSL WITHOUT_SSL -PKGCD_WITH_LIBRESSL:= use libressl for crypto -PKGCB_WITH_LIBRESSL:= libressl -PKGCS_WITH_LIBRESSL:= libressl +PKG_CHOICES_LIBESMTP:= WITH_OPENSSL WITHOUT_SSL +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCB_WITH_OPENSSL:= openssl +PKGCS_WITH_OPENSSL:= libopenssl PKGCD_WITHOUT_SSL:= use no ssl include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBESMTP,libesmtp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -AUTOTOOL_STYLE:= autoreconf +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -ifeq (${ADK_PACKAGE_LIBESMTP_WITH_LIBRESSL},y) -CONFIGURE_ARGS+= --with-openssl -endif -ifeq (${ADK_PACKAGE_LIBESMTP_WITHOUT_SSL},y) -CONFIGURE_ARGS+= --without-openssl -endif +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson libesmtp-install: - $(INSTALL_DIR) $(IDIR_LIBESMTP)/usr/lib/esmtp-plugins + $(INSTALL_DIR) $(IDIR_LIBESMTP)/usr/lib/esmtp-plugins-6.2.0 $(CP) $(WRKINST)/usr/lib/libesmtp.so* $(IDIR_LIBESMTP)/usr/lib/ - $(CP) $(WRKINST)/usr/lib/esmtp-plugins/*.so \ - $(IDIR_LIBESMTP)/usr/lib/esmtp-plugins/ + $(CP) $(WRKINST)/usr/lib/esmtp-plugins-6.2.0/*.so \ + $(IDIR_LIBESMTP)/usr/lib/esmtp-plugins-6.2.0/ include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libesmtp/patches/patch-Makefile_am b/package/libesmtp/patches/patch-Makefile_am deleted file mode 100644 index f2f3d9dac..000000000 --- a/package/libesmtp/patches/patch-Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ - prevent doubly passing our CFLAGS ---- libesmtp-1.0.6.orig/Makefile.am 2010-08-09 22:25:24.000000000 +0200 -+++ libesmtp-1.0.6/Makefile.am 2014-06-05 22:29:30.049704289 +0200 -@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = gnu dist-bzip2 - INCLUDES = -I$(srcdir) $(VERSION_FLAGS) - SUBDIRS = @subdirs@ @SASL_PLUGINS@ - DIST_SUBDIRS = @subdirs@ @DIST_PLUGINS@ --AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ -+AM_CFLAGS = @EXTRA_CFLAGS@ - ACLOCAL_AMFLAGS = -I m4 - - lib_LTLIBRARIES = libesmtp.la diff --git a/package/libesmtp/patches/patch-crammd5_Makefile_am b/package/libesmtp/patches/patch-crammd5_Makefile_am deleted file mode 100644 index c640852b7..000000000 --- a/package/libesmtp/patches/patch-crammd5_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ - prevent doubly passing our CFLAGS ---- libesmtp-1.0.6.orig/crammd5/Makefile.am 2010-08-08 17:45:57.000000000 +0200 -+++ libesmtp-1.0.6/crammd5/Makefile.am 2014-06-05 22:29:43.615693205 +0200 -@@ -3,7 +3,7 @@ - libdir = @plugindir@ - - INCLUDES = -I@srcdir@ --AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ -+AM_CFLAGS = @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-cram-md5.la - diff --git a/package/libesmtp/patches/patch-login_Makefile_am b/package/libesmtp/patches/patch-login_Makefile_am deleted file mode 100644 index 4ba39571a..000000000 --- a/package/libesmtp/patches/patch-login_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ - prevent doubly passing our CFLAGS ---- libesmtp-1.0.6.orig/login/Makefile.am 2010-08-08 17:45:56.000000000 +0200 -+++ libesmtp-1.0.6/login/Makefile.am 2014-06-05 22:29:47.310690185 +0200 -@@ -5,7 +5,7 @@ libdir = @plugindir@ - INCLUDES = -I@srcdir@ - - lib_LTLIBRARIES = sasl-login.la --AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ -+AM_CFLAGS = @EXTRA_CFLAGS@ - - sasl_login_la_SOURCES = client-login.c - sasl_login_la_LDFLAGS = -module -avoid-version diff --git a/package/libesmtp/patches/patch-meson_build b/package/libesmtp/patches/patch-meson_build new file mode 100644 index 000000000..461311751 --- /dev/null +++ b/package/libesmtp/patches/patch-meson_build @@ -0,0 +1,42 @@ +--- libESMTP-1.1.0.orig/meson.build 2021-06-04 18:18:50.000000000 +0200 ++++ libESMTP-1.1.0/meson.build 2024-02-24 14:07:23.535476167 +0100 +@@ -63,6 +63,7 @@ add_project_arguments(cc.get_supported_a + ################################################################################ + dldep = cc.find_library('dl') + ssldep = dependency('openssl', version : '>=1.1.0', required : get_option('tls')) ++ntlmdep = dependency('openssl', version : '>=1.1.0', required : get_option('ntlm')) + threaddep = dependency('threads', required : get_option('pthreads')) + + #XXX add test for libbind9.so +@@ -71,6 +72,7 @@ lwresdep = cc.find_library('lwres', requ + deps = [ + dldep, + ssldep, ++ ntlmdep, + threaddep, + lwresdep, + ] +@@ -220,8 +222,13 @@ include_dir = include_directories('.') + subdir('login') + subdir('plain') + subdir('crammd5') +-if ssldep.found() +- subdir('ntlm') ++ ++if ntlmdep.found() ++ if cc.has_header('openssl/md4.h') and cc.has_function('MD4_Init', dependencies : ntlmdep) ++ subdir('ntlm') ++ else ++ error('MD4 is not supported in current openssl, unable to build NTLM plugin') ++ endif + endif + + ################################################################################ +@@ -247,4 +254,6 @@ summary({'current:revision:age': libesmt + 'STARTTLS': ssldep.found(), + 'CHUNKING': get_option('bdat'), + 'ETRN': get_option('etrn'), +- 'XUSR': get_option('xusr')}) ++ 'XUSR': get_option('xusr'), ++ 'NTLM': ntlmdep.found()}) ++ diff --git a/package/libesmtp/patches/patch-meson_options_txt b/package/libesmtp/patches/patch-meson_options_txt new file mode 100644 index 000000000..6f4e81431 --- /dev/null +++ b/package/libesmtp/patches/patch-meson_options_txt @@ -0,0 +1,7 @@ +--- libESMTP-1.1.0.orig/meson_options.txt 2021-06-04 18:18:50.000000000 +0200 ++++ libESMTP-1.1.0/meson_options.txt 2024-02-24 13:55:42.283485679 +0100 +@@ -5,3 +5,4 @@ option('lwres', type : 'feature', value + option('bdat', type : 'boolean', value : 'true', description : 'enable SMTP BDAT extension') + option('etrn', type : 'boolean', value : 'true', description : 'enable SMTP ETRN extension') + option('xusr', type : 'boolean', value : 'true', description : 'enable sendmail XUSR extension') ++option('ntlm', type : 'feature', value : 'disabled', description : 'build with support for NTLM authentication') diff --git a/package/libesmtp/patches/patch-ntlm_Makefile_am b/package/libesmtp/patches/patch-ntlm_Makefile_am deleted file mode 100644 index 94928b0a3..000000000 --- a/package/libesmtp/patches/patch-ntlm_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ - prevent doubly passing our CFLAGS ---- libesmtp-1.0.6.orig/ntlm/Makefile.am 2010-08-08 17:45:56.000000000 +0200 -+++ libesmtp-1.0.6/ntlm/Makefile.am 2014-06-05 22:29:51.995686387 +0200 -@@ -3,7 +3,7 @@ - libdir = @plugindir@ - - INCLUDES = -I@srcdir@ --AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ -+AM_CFLAGS = @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-ntlm.la - diff --git a/package/libesmtp/patches/patch-ntlm_meson_build b/package/libesmtp/patches/patch-ntlm_meson_build new file mode 100644 index 000000000..72dbdaccf --- /dev/null +++ b/package/libesmtp/patches/patch-ntlm_meson_build @@ -0,0 +1,11 @@ +--- libESMTP-1.1.0.orig/ntlm/meson.build 2021-06-04 18:18:50.000000000 +0200 ++++ libESMTP-1.1.0/ntlm/meson.build 2024-02-24 14:03:10.243479603 +0100 +@@ -5,7 +5,7 @@ sasl_ntlm_sources = [ + 'ntlmstruct.c', + ] + +-ntlm_deps = [ ssldep, ] ++ntlm_deps = [ ntlmdep, ] + + sasl_ntlm = shared_module('ntlm', sasl_ntlm_sources, + name_prefix : 'sasl-', diff --git a/package/libesmtp/patches/patch-plain_Makefile_am b/package/libesmtp/patches/patch-plain_Makefile_am deleted file mode 100644 index a22054804..000000000 --- a/package/libesmtp/patches/patch-plain_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ - prevent doubly passing our CFLAGS ---- libesmtp-1.0.6.orig/plain/Makefile.am 2010-08-08 17:45:54.000000000 +0200 -+++ libesmtp-1.0.6/plain/Makefile.am 2014-06-05 22:29:56.668682572 +0200 -@@ -3,7 +3,7 @@ - libdir = @plugindir@ - - INCLUDES = -I@srcdir@ --AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ -+AM_CFLAGS = @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-plain.la - diff --git a/package/libevdev/Makefile b/package/libevdev/Makefile new file mode 100644 index 000000000..b78cca1b1 --- /dev/null +++ b/package/libevdev/Makefile @@ -0,0 +1,25 @@ +# 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:= libevdev +PKG_VERSION:= 1.12.0 +PKG_RELEASE:= 1 +PKG_HASH:= 2f729e3480695791f9482e8388bd723402b89f0eaf118057bbdea3cecee9b237 +PKG_DESCR:= wrapper library for evdev devices +PKG_SECTION:= libs/misc +PKG_URL:= add project url +PKG_SITES:= https://www.freedesktop.org/software/libevdev/ +PKG_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBEVDEV,libevdev,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +libevdev-install: + $(INSTALL_DIR) $(IDIR_LIBEVDEV)/usr/lib + $(CP) $(WRKINST)/usr/lib/libevdev*.so* \ + $(IDIR_LIBEVDEV)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libevent/Makefile b/package/libevent/Makefile index bb3ae87d7..68094dd2f 100644 --- a/package/libevent/Makefile +++ b/package/libevent/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libevent -PKG_VERSION:= 2.0.22 +PKG_VERSION:= 2.1.12 PKG_RELEASE:= 1 -PKG_HASH:= 71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3 +PKG_HASH:= 92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb PKG_DESCR:= event notification library for event-driven network servers PKG_SECTION:= libs/net PKG_URL:= http://libevent.org/ @@ -24,6 +24,8 @@ ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) MAKE_FLAGS+= LDFLAGS="$(TARGET_LDFLAGS) -all-static" endif +CONFIGURE_ARGS+= --disable-openssl + libevent-install: $(INSTALL_DIR) $(IDIR_LIBEVENT)/usr/lib $(CP) $(WRKINST)/usr/lib/libevent*.so* $(IDIR_LIBEVENT)/usr/lib diff --git a/package/libffi/Makefile b/package/libffi/Makefile index c94c40e9a..80857706b 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -4,14 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libffi -PKG_VERSION:= 3.3 +PKG_VERSION:= 3.4.4 PKG_RELEASE:= 1 -PKG_HASH:= 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056 +PKG_HASH:= d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676 PKG_DESCR:= foreign function interface library PKG_SECTION:= libs/misc HOST_BUILDDEP:= libtool-host PKG_URL:= http://sourceware.org/libffi/ -PKG_SITES:= ftp://sourceware.org/pub/libffi/ +PKG_SITES:= https://github.com/libffi/libffi/releases/download/v${PKG_VERSION}/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -22,10 +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})) -AUTOTOOL_STYLE:= autoreconf HOST_STYLE:= auto -HOST_CONFIGURE_ARGS+= --disable-builddir --with-pic -CONFIGURE_ARGS+= --disable-builddir --with-pic +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 diff --git a/package/libgc/Makefile b/package/libgc/Makefile index 5971082e0..61d170970 100644 --- a/package/libgc/Makefile +++ b/package/libgc/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libgc -PKG_VERSION:= 7.4.0 -PKG_RELEASE:= 2 -PKG_HASH:= 61f8fc6991f8cb003a0d3c7d251c5b9a76093615ef793e0c588a4661e0b5e283 +PKG_VERSION:= 8.2.0 +PKG_RELEASE:= 1 +PKG_HASH:= 2540f7356cb74f6c5b75326c6d38a066edd796361fd7d4ed26e494d9856fed8f PKG_DESCR:= garbage collector library PKG_SECTION:= libs/misc PKG_BUILDDEP:= libatomic_ops diff --git a/package/libgc/patches/patch-os_dep_c b/package/libgc/patches/patch-os_dep_c deleted file mode 100644 index 6a5e00f87..000000000 --- a/package/libgc/patches/patch-os_dep_c +++ /dev/null @@ -1,39 +0,0 @@ ---- gc-7.4.0.orig/os_dep.c 2013-11-15 21:11:03.000000000 +0100 -+++ gc-7.4.0/os_dep.c 2014-04-10 07:14:09.000000000 +0200 -@@ -16,36 +16,6 @@ - - #include "private/gc_priv.h" - --#if defined(LINUX) && !defined(POWERPC) && !defined(NO_SIGCONTEXT_H) --# include <linux/version.h> --# if (LINUX_VERSION_CODE <= 0x10400) -- /* Ugly hack to get struct sigcontext_struct definition. Required */ -- /* for some early 1.3.X releases. Will hopefully go away soon. */ -- /* in some later Linux releases, asm/sigcontext.h may have to */ -- /* be included instead. */ --# define __KERNEL__ --# include <asm/signal.h> --# undef __KERNEL__ --# else -- /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */ -- /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */ -- /* prototypes, so we have to include the top-level sigcontext.h to */ -- /* make sure the former gets defined to be the latter if appropriate. */ --# include <features.h> --# if 2 <= __GLIBC__ --# if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__ -- /* glibc 2.1 no longer has sigcontext.h. But signal.h */ -- /* has the right declaration for glibc 2.1. */ --# include <sigcontext.h> --# endif /* 0 == __GLIBC_MINOR__ */ --# else /* __GLIBC__ < 2 */ -- /* libc5 doesn't have <sigcontext.h>: go directly with the kernel */ -- /* one. Check LINUX_VERSION_CODE to see which we should reference. */ --# include <asm/sigcontext.h> --# endif /* __GLIBC__ < 2 */ --# endif --#endif /* LINUX && !POWERPC */ -- - #if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MACOS) \ - && !defined(MSWINCE) && !defined(__CC_ARM) - # include <sys/types.h> diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index e9ae22b86..b00bb59c5 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -34,7 +34,7 @@ endif else ifeq ($(ADK_TARGET_ARCH_AVR32),) ifeq ($(ADK_TARGET_BINFMT_FLAT),) - ${CP} ${STAGING_TARGET_DIR}/usr/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) endif endif endif diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index 622eee62e..9ed07ce9c 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libgcrypt -PKG_VERSION:= 1.9.4 +PKG_VERSION:= 1.10.3 PKG_RELEASE:= 1 -PKG_HASH:= ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7 +PKG_HASH:= 8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa PKG_DESCR:= crypto library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgpg-error diff --git a/package/libgcrypt/patches/patch-cipher_Makefile_am b/package/libgcrypt/patches/patch-cipher_Makefile_am deleted file mode 100644 index ce89bc118..000000000 --- a/package/libgcrypt/patches/patch-cipher_Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- libgcrypt-1.9.4.orig/cipher/Makefile.am 2021-08-22 13:55:28.000000000 +0200 -+++ libgcrypt-1.9.4/cipher/Makefile.am 2021-09-20 10:05:44.047879135 +0200 -@@ -146,7 +146,7 @@ gost-sb.h: gost-s-box - - gost-s-box: gost-s-box.c - $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ -- $(CPPFLAGS_FOR_BUILD)-o $@ $(srcdir)/gost-s-box.c -+ $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/gost-s-box.c - - - if ENABLE_O_FLAG_MUNGING diff --git a/package/libgcrypt/patches/patch-cipher_Makefile_in b/package/libgcrypt/patches/patch-cipher_Makefile_in deleted file mode 100644 index 1f5d7f272..000000000 --- a/package/libgcrypt/patches/patch-cipher_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- libgcrypt-1.9.4.orig/cipher/Makefile.in 2021-08-22 18:00:24.000000000 +0200 -+++ libgcrypt-1.9.4/cipher/Makefile.in 2021-09-20 10:06:00.483879720 +0200 -@@ -1370,7 +1370,7 @@ gost-sb.h: gost-s-box - - gost-s-box: gost-s-box.c - $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ -- $(CPPFLAGS_FOR_BUILD)-o $@ $(srcdir)/gost-s-box.c -+ $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/gost-s-box.c - - # We need to lower the optimization for this module. - tiger.o: $(srcdir)/tiger.c Makefile diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index 4c43978b9..c9d50ca65 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libgpg-error -PKG_VERSION:= 1.42 +PKG_VERSION:= 1.47 PKG_RELEASE:= 1 -PKG_HASH:= fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23 +PKG_HASH:= 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb PKG_DESCR:= helper library for common error codes and descriptions PKG_SECTION:= libs/misc PKG_URL:= http://www.gnupg.org/ @@ -54,16 +54,24 @@ ifeq ($(ADK_TARGET_ARCH_SPARC64),y) LIBGPG_PREFIX:= sparc64-unknown-linux-gnu endif ifeq ($(ADK_TARGET_ARCH_X86),y) -LIBGPG_PREFIX:= i686-pc-linux-gnu +LIBGPG_PREFIX:= i686-unknown-linux-gnu endif ifeq ($(ADK_TARGET_ARCH_X86_64),y) -LIBGPG_PREFIX:= x86_64-pc-linux-gnu +LIBGPG_PREFIX:= x86_64-unknown-linux-gnu endif +ifeq ($(ADK_TARGET_ARCH_XTENSA),y) +LIBGPG_PREFIX:= xtensa-unknown-linux-gnu +endif + +CONFIGURE_ARGS+= --disable-tests \ + --disable-languages post-extract: - cd $(WRKSRC)/src/syscfg && \ + cd $(WRKSRC)/src/syscfg && ( \ + ln -s lock-obj-pub.$(LIBGPG_PREFIX).h \ + lock-obj-pub.$(GNU_TARGET_NAME).h ; \ ln -s lock-obj-pub.$(LIBGPG_PREFIX).h \ - lock-obj-pub.$(GNU_TARGET_NAME).h + lock-obj-pub.$(ADK_TARGET_LINUXTYPE)-$(ADK_TARGET_SUFFIX).h ) libgpg-error-install: ${INSTALL_DIR} ${IDIR_LIBGPG_ERROR}/usr/lib diff --git a/package/libgpg-error/patches/patch-src_gen-lock-obj_sh b/package/libgpg-error/patches/patch-src_gen-lock-obj_sh deleted file mode 100644 index 04961a5ff..000000000 --- a/package/libgpg-error/patches/patch-src_gen-lock-obj_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- libgpg-error-1.42.orig/src/gen-lock-obj.sh 2021-03-04 11:05:29.000000000 +0100 -+++ libgpg-error-1.42/src/gen-lock-obj.sh 2021-09-17 16:43:42.304505465 +0200 -@@ -38,7 +38,7 @@ - # AWK=gawk ./gen-lock-obj.sh - # - --if test -n `echo -n`; then -+if test -n "`echo -n`"; then - ECHO_C='\c' - ECHO_N='' - else diff --git a/package/libgpg-error/src/src/syscfg/lock-obj-pub.xtensa-unknown-linux-gnu.h b/package/libgpg-error/src/src/syscfg/lock-obj-pub.xtensa-unknown-linux-gnu.h new file mode 100644 index 000000000..60eadab8e --- /dev/null +++ b/package/libgpg-error/src/src/syscfg/lock-obj-pub.xtensa-unknown-linux-gnu.h @@ -0,0 +1,24 @@ +## lock-obj-pub.or1k-unknown-linux-gnu.h +## File created by gen-posix-lock-obj - DO NOT EDIT +## To be included by mkheader into gpg-error.h + +typedef struct +{ + long _vers; + union { + volatile char _priv[32]; + long _x_align; + long *_xp_align; + } u; +} gpgrt_lock_t; + +#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ + 0,0,0,0,0,0,0,0, \ + 0,0,0,0,0,0,0,0, \ + 0,0,0,0,0,0,0,0}}} +## +## Local Variables: +## mode: c +## buffer-read-only: t +## End: +## diff --git a/package/libgtk3/Makefile b/package/libgtk3/Makefile index 2d90fdf39..e0e087dd7 100644 --- a/package/libgtk3/Makefile +++ b/package/libgtk3/Makefile @@ -4,18 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libgtk3 -PKG_VERSION:= 3.20.6 -PKG_EXTRAVER:= 3.20 +PKG_VERSION:= 3.24.31 +PKG_EXTRAVER:= 3.24 PKG_RELEASE:= 1 -PKG_HASH:= 3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2 +PKG_HASH:= 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 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 +PKG_DEPENDS+= libxcomposite libxdamage fribidi PKG_BUILDDEP:= cairo atk 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_NEEDS:= c++ PKG_URL:= http://www.gtk.org/ PKG_SITES:= $(MASTER_SITE_GNOME:=gtk+/$(PKG_EXTRAVER)/) @@ -35,6 +36,7 @@ $(eval $(call PKG_template,LIBGTK3,libgtk3,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_D 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 \ diff --git a/package/libinih/Makefile b/package/libinih/Makefile index 81b70f308..d546f244a 100644 --- a/package/libinih/Makefile +++ b/package/libinih/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libinih -PKG_VERSION:= r53 +PKG_VERSION:= r58 PKG_RELEASE:= 1 -PKG_HASH:= 01b0366fdfdf6363efc070c2f856f1afa33e7a6546548bada5456ad94a516241 +PKG_HASH:= e79216260d5dffe809bda840be48ab0eec7737b2bb9f02d2275c1b46344ea7b7 PKG_DESCR:= ini parser library PKG_SECTION:= libs/misc PKG_BUILDDEP:= meson-host diff --git a/package/libinput/Makefile b/package/libinput/Makefile new file mode 100644 index 000000000..8c0c6a759 --- /dev/null +++ b/package/libinput/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:= libinput +PKG_VERSION:= 1.19.2 +PKG_RELEASE:= 1 +PKG_HASH:= 0fc39f0af3ee1a77c60c34bc45391a4d0879169f7c0f7bbbeb5eef590b98b883 +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_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBINPUT,libinput,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +MESON_FLAGS+= -Dlibwacom=false \ + -Dtests=false \ + -Ddebug-gui=false + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +libinput-install: + $(INSTALL_DIR) $(IDIR_LIBINPUT)/usr/share/libinput + $(CP) $(WRKINST)/usr/share/libinput/* \ + $(IDIR_LIBINPUT)/usr/share/libinput/ + $(INSTALL_DIR) $(IDIR_LIBINPUT)/usr/lib + $(CP) $(WRKINST)/usr/lib/libinput*.so* \ + $(IDIR_LIBINPUT)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libjansson/Makefile b/package/libjansson/Makefile index e75c8b199..c26b28812 100644 --- a/package/libjansson/Makefile +++ b/package/libjansson/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libjansson -PKG_VERSION:= 2.5 +PKG_VERSION:= 2.14 PKG_RELEASE:= 1 -PKG_HASH:= dd8bbfb38ad5031ce88e066b14d3b7e9c7113243daa7f4cde1994b7fc90bb1b1 +PKG_HASH:= fba956f27c6ae56ce6dfd52fbf9d20254aad42821f74fa52f83957625294afb9 PKG_DESCR:= json library PKG_SECTION:= libs/data PKG_URL:= http://www.digip.org/jansson/ -PKG_SITES:= http://www.digip.org/jansson/releases/ +PKG_SITES:= https://github.com/akheron/jansson/releases/download/v$(PKG_VERSION)/ PKG_OPTS:= dev -DISTFILES:= jansson-${PKG_VERSION}.tar.gz +DISTFILES:= jansson-${PKG_VERSION}.tar.bz2 WRKDIST= ${WRKDIR}/jansson-${PKG_VERSION} include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/libksba/Makefile b/package/libksba/Makefile index 0f95fb5d7..1d0565068 100644 --- a/package/libksba/Makefile +++ b/package/libksba/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libksba -PKG_VERSION:= 1.6.0 +PKG_VERSION:= 1.6.5 PKG_RELEASE:= 1 -PKG_HASH:= dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b +PKG_HASH:= a564628c574c99287998753f98d750babd91a4e9db451f46ad140466ef2a6d16 PKG_DESCR:= working with X.509 certificates PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgpg-error diff --git a/package/libmd/Makefile b/package/libmd/Makefile new file mode 100644 index 000000000..f95b7bf0e --- /dev/null +++ b/package/libmd/Makefile @@ -0,0 +1,25 @@ +# 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:= libmd +PKG_VERSION:= 1.1.0 +PKG_RELEASE:= 1 +PKG_HASH:= 1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332 +PKG_DESCR:= message digest implementations +PKG_SECTION:= libs/misc +PKG_URL:= https://www.hadrons.org/software/libmd/ +PKG_SITES:= https://archive.hadrons.org/software/libmd/ +PKG_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBMD,libmd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +libmd-install: + $(INSTALL_DIR) $(IDIR_LIBMD)/usr/lib + $(CP) $(WRKINST)/usr/lib/libmd*.so* \ + $(IDIR_LIBMD)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libmicrohttpd/Makefile b/package/libmicrohttpd/Makefile index 6b9590553..f8621deaa 100644 --- a/package/libmicrohttpd/Makefile +++ b/package/libmicrohttpd/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libmicrohttpd -PKG_VERSION:= 0.9.52 +PKG_VERSION:= 1.0.0 PKG_RELEASE:= 1 -PKG_HASH:= 54797f6e763d417627f89f60e4ae0a431dab0523f92f83def23ea02d0defafea +PKG_HASH:= a02792d3cd1520e2ecfed9df642079d44a36ed87167442b28d7ed19e906e3e96 PKG_DESCR:= library make it easy to run an webserver PKG_SECTION:= libs/net PKG_URL:= http://www.gnu.org/software/libmicrohttpd/ @@ -19,6 +19,8 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBMICROHTTPD,libmicrohttpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +CONFIGURE_ARGS+= --disable-https + libmicrohttpd-install: $(INSTALL_DIR) $(IDIR_LIBMICROHTTPD)/usr/lib $(CP) $(WRKINST)/usr/lib/libmicrohttpd*.so* \ diff --git a/package/libmpdclient/Makefile b/package/libmpdclient/Makefile index 2d9f31c75..e8a456c50 100644 --- a/package/libmpdclient/Makefile +++ b/package/libmpdclient/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libmpdclient -PKG_VERSION:= 2.13 +PKG_VERSION:= 2.22 PKG_RELEASE:= 1 -PKG_HASH:= 5115bd52bc20a707c1ecc7587e6389c17305348e2132a66cf767c62fc55ed45d +PKG_HASH:= eac15b82b5ba5ed0648af580221eb74657394f7fe768e966d9e9ebb27435429f PKG_DESCR:= library for interfacing music player daemon PKG_SECTION:= libs/audio PKG_BUILDDEP:= meson-host diff --git a/package/libmpdclient/patches/patch-src_socket_c b/package/libmpdclient/patches/patch-src_socket_c deleted file mode 100644 index 5417eccd7..000000000 --- a/package/libmpdclient/patches/patch-src_socket_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libmpdclient-2.8.orig/src/socket.c 2010-01-01 15:17:56.000000000 +0100 -+++ libmpdclient-2.8/src/socket.c 2013-09-18 11:03:04.000000000 +0200 -@@ -35,6 +35,7 @@ - #include <stdlib.h> - #include <stdio.h> - #include <fcntl.h> -+#include <sys/select.h> - #include <unistd.h> - - #ifdef WIN32 diff --git a/package/libmpdclient/patches/patch-src_sync_c b/package/libmpdclient/patches/patch-src_sync_c deleted file mode 100644 index b9c5ec10d..000000000 --- a/package/libmpdclient/patches/patch-src_sync_c +++ /dev/null @@ -1,11 +0,0 @@ ---- libmpdclient-2.8.orig/src/sync.c 2010-01-01 15:17:56.000000000 +0100 -+++ libmpdclient-2.8/src/sync.c 2013-09-18 11:04:49.000000000 +0200 -@@ -34,6 +34,8 @@ - #include <stdlib.h> - #include <stdio.h> - #include <fcntl.h> -+#include <time.h> -+#include <sys/select.h> - #include <unistd.h> - - static bool diff --git a/package/libnettle/Makefile b/package/libnettle/Makefile index ece913b1c..c9d3f38e1 100644 --- a/package/libnettle/Makefile +++ b/package/libnettle/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libnettle -PKG_VERSION:= 3.7.3 +PKG_VERSION:= 3.9.1 PKG_RELEASE:= 1 -PKG_HASH:= 661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0 +PKG_HASH:= ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3 PKG_DESCR:= crypto library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgmp diff --git a/package/libnl/patches/patch-autogen_sh b/package/libnl/patches/patch-autogen_sh new file mode 100644 index 000000000..2888ae770 --- /dev/null +++ b/package/libnl/patches/patch-autogen_sh @@ -0,0 +1,7 @@ +--- libnl-libnl3_2_29.orig/autogen.sh Fri Dec 30 15:57:01 2016 ++++ libnl-libnl3_2_29/autogen.sh Sat Jan 13 10:02:41 2024 +@@ -12,4 +12,3 @@ cd "$BASEDIR" || die "Could not change into base direc + autoreconf -fi || die "Error during autoreconf" + rm -Rf autom4te.cache; + +-doc/autogen.sh || die "Error during doc/autogen.sh" diff --git a/package/libnl/patches/patch-lib_utils_c b/package/libnl/patches/patch-lib_utils_c index 3e14d4739..3d75f7487 100644 --- a/package/libnl/patches/patch-lib_utils_c +++ b/package/libnl/patches/patch-lib_utils_c @@ -1,5 +1,5 @@ ---- libnl-libnl3_2_29.orig/lib/utils.c 2016-12-30 15:57:01.000000000 +0100 -+++ libnl-libnl3_2_29/lib/utils.c 2017-04-26 20:09:18.137933191 +0200 +--- libnl-libnl3_2_29.orig/lib/utils.c Fri Dec 30 15:57:01 2016 ++++ libnl-libnl3_2_29/lib/utils.c Sat Jan 13 09:58:56 2024 @@ -30,7 +30,9 @@ #include <netlink/utils.h> #include <linux/socket.h> @@ -10,7 +10,7 @@ /** * Global variable indicating the desired level of debugging output. -@@ -123,9 +125,10 @@ int __nl_read_num_str_file(const char *p +@@ -123,9 +125,10 @@ int __nl_read_num_str_file(const char *path, int (*cb) const char *nl_strerror_l(int err) { diff --git a/package/libnl/patches/patch-src_lib_utils_c b/package/libnl/patches/patch-src_lib_utils_c index 6d75c3acf..60117cbdc 100644 --- a/package/libnl/patches/patch-src_lib_utils_c +++ b/package/libnl/patches/patch-src_lib_utils_c @@ -1,6 +1,6 @@ ---- libnl-libnl3_2_29.orig/src/lib/utils.c 2016-12-30 15:57:01.000000000 +0100 -+++ libnl-libnl3_2_29/src/lib/utils.c 2017-04-26 20:09:18.149933980 +0200 -@@ -81,6 +81,7 @@ void nl_cli_fatal(int err, const char *f +--- libnl-libnl3_2_29.orig/src/lib/utils.c Fri Dec 30 15:57:01 2016 ++++ libnl-libnl3_2_29/src/lib/utils.c Sat Jan 13 09:58:56 2024 +@@ -81,6 +81,7 @@ void nl_cli_fatal(int err, const char *fmt, ...) fprintf(stderr, "\n"); } else { char *buf; @@ -8,7 +8,7 @@ locale_t loc = newlocale(LC_MESSAGES_MASK, "", (locale_t)0); if (loc == (locale_t)0) { if (errno == ENOENT) -@@ -91,9 +92,14 @@ void nl_cli_fatal(int err, const char *f +@@ -91,9 +92,14 @@ void nl_cli_fatal(int err, const char *fmt, ...) } if (loc != (locale_t)0) buf = strerror_l(err, loc); diff --git a/package/libowfat/Makefile b/package/libowfat/Makefile index c3ac0c0e9..5939a63aa 100644 --- a/package/libowfat/Makefile +++ b/package/libowfat/Makefile @@ -4,13 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libowfat -PKG_VERSION:= 0.30 +PKG_VERSION:= 0.33 PKG_RELEASE:= 1 -PKG_HASH:= db4a3a853cfbb9e83b27f565b580f6fdc519475b162edc1a656043e1c126e993 +PKG_HASH:= 311ec8b3f4b72bb442e323fb013a98f956fa745547f2bc9456287b20d027cd7d PKG_DESCR:= owfat library PKG_SECTION:= libs/misc -PKG_URL:= http://www.fefe.de/libowfat -PKG_SITES:= http://www.fefe.de/libowfat/ +PKG_URL:= https://www.fefe.de/libowfat +PKG_SITES:= https://www.fefe.de/libowfat/ + +PKG_NOPARALLEL:= 1 include ${ADK_TOPDIR}/mk/package.mk @@ -18,9 +20,8 @@ CONFIG_STYLE:= manual TARGET_CFLAGS+= ${TARGET_CPPFLAGS} MAKE_FILE= GNUmakefile -MAKE_FLAGS+= DIET= CC='${TARGET_CC}' CROSS=${TARGET_CROSS} \ +MAKE_FLAGS+= DIET= CROSS=${TARGET_CROSS} \ LDFLAGS='${TARGET_LDFLAGS}' -FAKE_FLAGS+= prefix='${WRKINST}/usr' \ - INCLUDEDIR='${WRKINST}/usr/include/owfat' +FAKE_FLAGS+= prefix='/usr' include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libowfat/patches/patch-GNUmakefile b/package/libowfat/patches/patch-GNUmakefile index fbe2b0a3b..4338cf8da 100644 --- a/package/libowfat/patches/patch-GNUmakefile +++ b/package/libowfat/patches/patch-GNUmakefile @@ -1,11 +1,25 @@ ---- libowfat-0.30.orig/GNUmakefile 2015-04-10 22:54:57.000000000 +0200 -+++ libowfat-0.30/GNUmakefile 2015-06-05 16:06:19.000000000 +0200 -@@ -18,7 +18,7 @@ all: ent $(LIBS) libowfat.a libsocket t +--- libowfat-0.33.orig/GNUmakefile 2021-04-24 12:47:51.000000000 +0200 ++++ libowfat-0.33/GNUmakefile 2024-02-23 05:07:36.527866006 +0100 +@@ -23,9 +23,9 @@ picx32 piex32: + CROSS= #CROSS=i686-mingw- - CC=$(CROSS)gcc --CFLAGS=-pipe -W -Wall -Wextra -O2 -fomit-frame-pointer +-CC?=gcc +-AR?=ar +-RANLIB?=ranlib ++CC=gcc ++AR=ar ++RANLIB=ranlib + CCC=$(CROSS)$(CC) + WERROR= + WARN=-W -Wall -Wextra $(WERROR) +@@ -41,7 +41,8 @@ OPT_PLUS=-O3 $(NATIVE) + + DEFINE=-D_REENTRANT + +-CFLAGS=-pipe $(WARN) $(DEFINE) $(OPT_REG) +CFLAGS?= - #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall ++CFLAGS+=-pipe $(WARN) $(DEFINE) $(OPT_REG) + CFLAGS_OPT=-pipe $(WARN) $(DEFINE) $(OPT_PLUS) - ent: ent.c haveuint128.h + #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall diff --git a/package/libp11/Makefile b/package/libp11/Makefile index 19681c0ba..1a6c3ddb0 100644 --- a/package/libp11/Makefile +++ b/package/libp11/Makefile @@ -4,15 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libp11 -PKG_VERSION:= 0.2.8 +PKG_VERSION:= 0.4.12 PKG_RELEASE:= 1 -PKG_HASH:= a4121015503ade98074b5e2a2517fc8a139f8b28aed10021db2bb77283f40691 +PKG_HASH:= 1e1a2533b3fcc45fde4da64c9c00261b1047f14c3f911377ebd1b147b3321cfd PKG_DESCR:= library implementing a small layer on top of pkcs11 api PKG_SECTION:= libs/crypto -PKG_DEPENDS:= libltdl libressl -PKG_BUILDDEP:= libtool libressl +PKG_DEPENDS:= libltdl libopenssl +PKG_BUILDDEP:= libtool openssl PKG_URL:= https://github.com/OpenSC/libp11/wiki -PKG_SITES:= http://sourceforge.net/projects/opensc/files/libp11/ +PKG_SITES:= https://github.com/OpenSC/libp11/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/libp11/patches/patch-ltmain_sh b/package/libp11/patches/patch-ltmain_sh deleted file mode 100644 index 409b69508..000000000 --- a/package/libp11/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- libp11-0.2.7.orig/ltmain.sh 2009-10-20 14:38:20.000000000 +0200 -+++ libp11-0.2.7/ltmain.sh 2011-01-15 22:58:43.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 6cac920ee..efc9440da 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libpcap -PKG_VERSION:= 1.9.1 +PKG_VERSION:= 1.10.4 PKG_RELEASE:= 1 -PKG_HASH:= 635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094 +PKG_HASH:= ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f 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 13abcdbeb..89e388cd4 100644 --- a/package/libpciaccess/Makefile +++ b/package/libpciaccess/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libpciaccess -PKG_VERSION:= 0.13.4 +PKG_VERSION:= 0.16 PKG_RELEASE:= 1 -PKG_HASH:= 74d92bda448e6fdb64fee4e0091255f48d625d07146a121653022ed3a0ca1f2f +PKG_HASH:= 84413553994aef0070cf420050aa5c0a51b1956b404920e21b81e96db6a61a27 PKG_DESCR:= pci access library PKG_SECTION:= x11/libs PKG_SITES:= http://www.x.org/releases/individual/lib/ diff --git a/package/libptytty/Makefile b/package/libptytty/Makefile new file mode 100644 index 000000000..cb1126ce1 --- /dev/null +++ b/package/libptytty/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:= libptytty +PKG_VERSION:= 2.0 +PKG_RELEASE:= 1 +PKG_HASH:= 8033ed3aadf28759660d4f11f2d7b030acf2a6890cb0f7926fb0cfa6739d31f7 +PKG_DESCR:= pty library +PKG_SECTION:= libs/misc +PKG_SITES:= http://dist.schmorp.de/libptytty/ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBPTYTTY,libptytty,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +TARGET_CFLAGS+= -lstdc++ +CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DTTY_GID_SUPPORT_EXITCODE=0 \ + -DTTY_GID_SUPPORT_EXITCODE__TRYRUN_OUTPUT=0 +XAKE_FLAGS+= VERBOSE=1 + +libptytty-install: + $(INSTALL_DIR) $(IDIR_LIBPTYTTY)/usr/lib + $(CP) $(WRKINST)/usr/lib/libptytty*.so* \ + $(IDIR_LIBPTYTTY)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libptytty/patches/patch-CMakeLists_txt b/package/libptytty/patches/patch-CMakeLists_txt new file mode 100644 index 000000000..09a108c5a --- /dev/null +++ b/package/libptytty/patches/patch-CMakeLists_txt @@ -0,0 +1,13 @@ +--- libptytty-2.0.orig/CMakeLists.txt 2021-08-04 16:07:44.000000000 +0200 ++++ libptytty-2.0/CMakeLists.txt 2024-03-03 19:23:33.085544136 +0100 +@@ -323,10 +323,6 @@ configure_file( + libptytty.pc.in + libptytty.pc) + +-add_executable(c-sample eg/c-sample.c) +-target_include_directories(c-sample PRIVATE src) +-target_link_libraries(c-sample ptytty) +- + add_custom_command( + OUTPUT ${CMAKE_SOURCE_DIR}/doc/libptytty.3 + DEPENDS ${CMAKE_SOURCE_DIR}/doc/libptytty.3.pod diff --git a/package/libressl/Makefile b/package/libressl/Makefile index 20c418587..6af4b2c0f 100644 --- a/package/libressl/Makefile +++ b/package/libressl/Makefile @@ -4,15 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libressl -PKG_VERSION:= 3.4.1 +PKG_VERSION:= 3.8.3 PKG_RELEASE:= 1 -PKG_HASH:= 107ceae6ca800e81cb563584c16afa36d6c7138fade94a2b3e9da65456f7c61c +PKG_HASH:= a65f40e3ef6e3c9451c8318e6f2c454c367e67f09c0cde1849731a4d6ecc7272 PKG_DESCR:= ssl/tls library PKG_SECTION:= libs/crypto PKG_URL:= http://www.libressl.org PKG_SITES:= http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/ PKG_OPTS:= dev +PKG_ARCH_DEPENDS:= !m68k !xtensa + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_SUBPKGS:= LIBRESSL LIBRESSL_UTIL @@ -27,6 +29,10 @@ $(eval $(call HOST_template,LIBRESSL,libressl,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBRESSL,libressl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBRESSL_UTIL,libressl-util,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBRESSL_UTIL},${PKGSD_LIBRESSL_UTIL},${PKGSC_LIBRESSL_UTIL})) +ifeq ($(ADK_TARGET_ARCH_ARM),y) +CONFIGURE_ARGS+= --disable-asm +endif + ifeq ($(ADK_TARGET_USE_SSP),y) CONFIGURE_ARGS+= --enable-hardening else @@ -34,13 +40,13 @@ CONFIGURE_ARGS+= --disable-hardening endif libressl-install: + ${INSTALL_DIR} ${IDIR_LIBRESSL}/etc/ssl + ${CP} ${WRKINST}/etc/ssl/openssl.cnf ${IDIR_LIBRESSL}/etc/ssl $(INSTALL_DIR) $(IDIR_LIBRESSL)/usr/lib $(CP) $(WRKINST)/usr/lib/lib{crypto,ssl,tls}.so* \ $(IDIR_LIBRESSL)/usr/lib libressl-util-install: - ${INSTALL_DIR} ${IDIR_LIBRESSL_UTIL}/etc/ssl - ${CP} ${WRKINST}/etc/ssl/openssl.cnf ${IDIR_LIBRESSL_UTIL}/etc/ssl ${INSTALL_DIR} ${IDIR_LIBRESSL_UTIL}/usr/bin ${CP} ${WRKINST}/usr/bin/openssl ${IDIR_LIBRESSL_UTIL}/usr/bin diff --git a/package/libressl/patches/patch-Makefile_in b/package/libressl/patches/patch-Makefile_in deleted file mode 100644 index 745dc246d..000000000 --- a/package/libressl/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- libressl-3.1.2.orig/Makefile.in 2020-05-21 05:00:51.000000000 +0200 -+++ libressl-3.1.2/Makefile.in 2020-06-06 20:50:41.000000000 +0200 -@@ -191,7 +191,7 @@ am__define_uniq_tagged_files = \ - ETAGS = etags - CTAGS = ctags - CSCOPE = cscope --DIST_SUBDIRS = crypto ssl tls include apps man tests -+DIST_SUBDIRS = crypto ssl tls include apps - am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libcrypto.pc.in \ - $(srcdir)/libssl.pc.in $(srcdir)/libtls.pc.in \ - $(srcdir)/openssl.pc.in COPYING ChangeLog INSTALL compile \ diff --git a/package/libseat/Makefile b/package/libseat/Makefile new file mode 100644 index 000000000..b408fcaf6 --- /dev/null +++ b/package/libseat/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:= libseat +PKG_VERSION:= 0.7.0 +PKG_RELEASE:= 1 +PKG_HASH:= ea6ccbaf86949dba4eda64761b11aa8d05b61fc60f569b0fc05f2c4d06baeb87 +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_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBSEAT,libseat,$(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 + +libseat-install: + $(INSTALL_DIR) $(IDIR_LIBSEAT)/usr/lib + $(CP) $(WRKINST)/usr/lib/libseat*.so* \ + $(IDIR_LIBSEAT)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libshout/Makefile b/package/libshout/Makefile index 7a79fb145..f43489234 100644 --- a/package/libshout/Makefile +++ b/package/libshout/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libshout -PKG_VERSION:= 2.3.1 +PKG_VERSION:= 2.4.6 PKG_RELEASE:= 1 -PKG_HASH:= cf3c5f6b4a5e3fcfbe09fb7024aa88ad4099a9945f7cb037ec06bcee7a23926e +PKG_HASH:= 39cbd4f0efdfddc9755d88217e47f8f2d7108fa767f9d58a2ba26a16d8f7c910 PKG_DESCR:= library which can be used to write a source client for streaming PKG_SECTION:= libs/audio PKG_DEPENDS:= libvorbis libogg diff --git a/package/libsndfile/Makefile b/package/libsndfile/Makefile index 00faca413..bea414e08 100644 --- a/package/libsndfile/Makefile +++ b/package/libsndfile/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libsndfile -PKG_VERSION:= 1.0.27 +PKG_VERSION:= 1.0.28 PKG_RELEASE:= 1 -PKG_HASH:= a391952f27f4a92ceb2b4c06493ac107896ed6c76be9a613a4731f076d30fac0 +PKG_HASH:= 1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9 PKG_DESCR:= reading and writing files containing sampled sound PKG_SECTION:= libs/audio PKG_URL:= http://www.mega-nerd.com/libsndfile/ diff --git a/package/libssh2/Makefile b/package/libssh2/Makefile index b832133e5..1227c0440 100644 --- a/package/libssh2/Makefile +++ b/package/libssh2/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libssh2 -PKG_VERSION:= 1.8.0 +PKG_VERSION:= 1.11.0 PKG_RELEASE:= 1 -PKG_HASH:= 39f34e2f6835f4b992cafe8625073a88e5a28ba78f83e8099610a7b3af4676d4 +PKG_HASH:= 3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461 PKG_DESCR:= client-side c library implementing ssh2 protocol PKG_SECTION:= libs/crypto PKG_BUILDDEP:= zlib libressl diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile index 9b4bc9ec6..e91f75001 100644 --- a/package/libtasn1/Makefile +++ b/package/libtasn1/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libtasn1 -PKG_VERSION:= 4.12 +PKG_VERSION:= 4.19.0 PKG_RELEASE:= 1 -PKG_HASH:= 6753da2e621257f33f5b051cc114d417e5206a0818fe0b1ecfd6153f70934753 +PKG_HASH:= 1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a PKG_DESCR:= asn.1 and der structures manipulation library PKG_SECTION:= libs/crypto PKG_URL:= http://www.gnupg.org/ diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index 7c0e72fce..960605be8 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= tiff -PKG_VERSION:= 4.0.8 +PKG_VERSION:= 4.3.0 PKG_RELEASE:= 1 -PKG_HASH:= 59d7a5a8ccd92059913f246877db95a2918e6c04fb9d43fd74e5c3390dac2910 +PKG_HASH:= 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 PKG_DESCR:= library for reading/writing tiff images PKG_SECTION:= libs/image PKG_NEEDS:= c++ -PKG_BUILDDEP:= cmake-host zlib xz +PKG_BUILDDEP:= zlib xz PKG_URL:= http://simplesystems.org/libtiff/ PKG_SITES:= http://download.osgeo.org/libtiff/ PKG_LIBNAME:= libtiff @@ -22,8 +22,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIG_STYLE:= cmake - libtiff-install: ${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib ${CP} ${WRKINST}/usr/lib/libtiff.so* ${IDIR_LIBTIFF}/usr/lib/ diff --git a/package/libtiff/patches/patch-libtiff-4_pc_in b/package/libtiff/patches/patch-libtiff-4_pc_in new file mode 100644 index 000000000..4cd57a213 --- /dev/null +++ b/package/libtiff/patches/patch-libtiff-4_pc_in @@ -0,0 +1,14 @@ +--- tiff-4.3.0.orig/libtiff-4.pc.in 2021-03-05 14:01:43.000000000 +0100 ++++ tiff-4.3.0/libtiff-4.pc.in 2021-11-06 16:42:35.662674034 +0100 +@@ -1,7 +1,7 @@ +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++prefix=/usr ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include + + Name: libtiff + Description: Tag Image File Format (TIFF) library. diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile index 165217fc5..5cbddde61 100644 --- a/package/libtirpc/Makefile +++ b/package/libtirpc/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libtirpc -PKG_VERSION:= 1.0.3 +PKG_VERSION:= 1.3.4 PKG_RELEASE:= 1 -PKG_HASH:= 86c3a78fc1bddefa96111dd233124c703b22a78884203c55c3e06b3be6a0fd5e +PKG_HASH:= 1e0b0c7231c5fa122e06c0609a76723664d068b0dba3b8219b63e6340b347860 PKG_DESCR:= transport independent rpc library PKG_SECTION:= libs/net PKG_URL:= http://sourceforge.net/projects/libtirpc/ @@ -26,7 +26,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTIRPC,libtirpc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) MAKE_ENV+= V=1 -AUTOTOOL_STYLE:= autoreconf HOST_CPPFLAGS+= -I/usr/include/tirpc ifeq (${ADK_PACKAGE_LIBTIRPC_WITH_GSS},y) @@ -42,10 +41,6 @@ else CONFIGURE_ARGS+= --disable-ipv6 endif -post-extract: - rm $(WRKBUILD)/tirpc/rpcsvc/crypt.h - rm $(WRKBUILD)/tirpc/rpc/rpcb_prot.h - libtirpc-install: ${INSTALL_DIR} ${IDIR_LIBTIRPC}/usr/lib ${IDIR_LIBTIRPC}/etc ${CP} ${WRKINST}/usr/lib/libtirpc*.so* ${IDIR_LIBTIRPC}/usr/lib/ diff --git a/package/libtirpc/patches/patch-Makefile_am b/package/libtirpc/patches/patch-Makefile_am deleted file mode 100644 index 80bc6991c..000000000 --- a/package/libtirpc/patches/patch-Makefile_am +++ /dev/null @@ -1,54 +0,0 @@ ---- libtirpc-1.0.1.orig/Makefile.am 2015-10-30 16:15:14.000000000 +0100 -+++ libtirpc-1.0.1/Makefile.am 2015-11-29 16:38:58.340674483 +0100 -@@ -1,6 +1,12 @@ --SUBDIRS = src man doc -+SUBDIRS = src man doc rpcgen - ACLOCAL_AMFLAGS = -I m4 - -+GENFILES = tirpc/rpcsvc/crypt.h \ -+ tirpc/rpcsvc/mount.h \ -+ tirpc/rpcsvc/nfs_prot.h \ -+ tirpc/rpcsvc/rquota.h \ -+ tirpc/rpc/rpcb_prot.h -+ - noinst_HEADERS = tirpc/reentrant.h \ - tirpc/getpeereid.h \ - tirpc/libc_private.h \ -@@ -8,7 +14,9 @@ noinst_HEADERS = tirpc/reentrant. - - nobase_include_HEADERS = tirpc/netconfig.h \ - tirpc/rpcsvc/crypt.x \ -- tirpc/rpcsvc/crypt.h \ -+ tirpc/rpcsvc/mount.x \ -+ tirpc/rpcsvc/nfs_prot.x \ -+ tirpc/rpcsvc/rquota.x \ - tirpc/rpc/xdr.h \ - tirpc/rpc/types.h \ - tirpc/rpc/svc_soc.h \ -@@ -21,7 +29,6 @@ nobase_include_HEADERS = tirpc/netconfig - tirpc/rpc/rpcent.h \ - tirpc/rpc/rpc_com.h \ - tirpc/rpc/rpcb_prot.x \ -- tirpc/rpc/rpcb_prot.h \ - tirpc/rpc/rpcb_clnt.h \ - tirpc/rpc/raw.h \ - tirpc/rpc/pmap_rmt.h \ -@@ -48,5 +55,17 @@ endif - pkgconfigdir=$(libdir)/pkgconfig - pkgconfig_DATA = libtirpc.pc - --CLEANFILES = cscope.* *~ -+nobase_nodist_include_HEADERS = $(GENFILES) -+BUILT_SOURCES = $(GENFILES) -+ -+$(GENFILES): %.h: %.x $(top_builddir)/rpcgen/rpcgen -+ mkdir -p $(dir $@) -+ $(top_builddir)/rpcgen/rpcgen -h -o $@ $< -+ -+$(top_builddir)/rpcgen/rpcgen: force -+ cd rpcgen && $(MAKE) -+ -+force: -+ -+CLEANFILES = cscope.* *~ $(GENFILES) - DISTCLEANFILES = Makefile.in libtirpc*.tar.gz diff --git a/package/libtirpc/patches/patch-configure_ac b/package/libtirpc/patches/patch-configure_ac deleted file mode 100644 index 659bdad8c..000000000 --- a/package/libtirpc/patches/patch-configure_ac +++ /dev/null @@ -1,23 +0,0 @@ ---- libtirpc-1.0.1.orig/configure.ac 2015-10-30 16:15:14.000000000 +0100 -+++ libtirpc-1.0.1/configure.ac 2015-11-29 16:38:38.817971632 +0100 -@@ -89,7 +89,19 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h li - AC_CHECK_LIB([pthread], [pthread_create]) - AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent]) - --AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile]) -+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) -+ -+AC_MSG_CHECKING([for a C compiler for build tools]) -+if test $cross_compiling = yes; then -+ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc) -+else -+ CC_FOR_BUILD=$CC -+fi -+AC_MSG_RESULT([$CC_FOR_BUILD]) -+AC_SUBST(CC_FOR_BUILD) -+ -+AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile rpcgen/Makefile]) -+ - AC_OUTPUT(libtirpc.pc) - - diff --git a/package/libtirpc/patches/patch-src_clnt_bcast_c b/package/libtirpc/patches/patch-src_clnt_bcast_c index d2dd1a38c..86f56c7f2 100644 --- a/package/libtirpc/patches/patch-src_clnt_bcast_c +++ b/package/libtirpc/patches/patch-src_clnt_bcast_c @@ -1,18 +1,11 @@ ---- libtirpc-1.0.1.orig/src/clnt_bcast.c 2015-10-30 16:15:14.000000000 +0100 -+++ libtirpc-1.0.1/src/clnt_bcast.c 2016-01-28 15:46:15.322676441 +0100 -@@ -40,7 +40,6 @@ +--- libtirpc-1.3.4.orig/src/clnt_bcast.c 2023-10-07 09:54:42.000000000 +0200 ++++ libtirpc-1.3.4/src/clnt_bcast.c 2024-02-08 16:26:57.298094444 +0100 +@@ -40,7 +40,7 @@ */ #include <sys/socket.h> #include <sys/types.h> -#include <sys/queue.h> ++#include "queue.h" #include <net/if.h> #include <netinet/in.h> -@@ -62,6 +61,7 @@ - #include <err.h> - #include <string.h> - -+#include "queue.h" - #include "rpc_com.h" - #include "debug.h" - diff --git a/package/libtirpc/patches/patch-src_clnt_fd_locks_h b/package/libtirpc/patches/patch-src_clnt_fd_locks_h new file mode 100644 index 000000000..6927fca68 --- /dev/null +++ b/package/libtirpc/patches/patch-src_clnt_fd_locks_h @@ -0,0 +1,11 @@ +--- libtirpc-1.3.4.orig/src/clnt_fd_locks.h 2023-10-07 09:54:42.000000000 +0200 ++++ libtirpc-1.3.4/src/clnt_fd_locks.h 2024-02-08 16:25:34.795598116 +0100 +@@ -30,7 +30,7 @@ + #ifndef _CLNT_FD_LOCKS_H + #define _CLNT_FD_LOCKS_H + +-#include <sys/queue.h> ++#include "queue.h" + #include <errno.h> + #include <reentrant.h> + #include <rpc/xdr.h> diff --git a/package/libtirpc/patches/patch-src_svc_auth_c b/package/libtirpc/patches/patch-src_svc_auth_c deleted file mode 100644 index 05436f3b7..000000000 --- a/package/libtirpc/patches/patch-src_svc_auth_c +++ /dev/null @@ -1,12 +0,0 @@ ---- libtirpc-1.0.1.orig/src/svc_auth.c 2015-10-30 16:15:14.000000000 +0100 -+++ libtirpc-1.0.1/src/svc_auth.c 2015-11-29 16:39:17.807381054 +0100 -@@ -114,9 +114,6 @@ _gss_authenticate(rqst, msg, no_dispatch - case AUTH_SHORT: - dummy = _svcauth_short(rqst, msg); - return (dummy); -- case AUTH_DES: -- dummy = _svcauth_des(rqst, msg); -- return (dummy); - #ifdef HAVE_RPCSEC_GSS - case RPCSEC_GSS: - dummy = _svcauth_gss(rqst, msg, no_dispatch); diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index f631b37fd..1ff5c5b01 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -4,29 +4,30 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libtorrent -PKG_VERSION:= 0.13.6 +PKG_VERSION:= 0.13.8 PKG_RELEASE:= 1 -PKG_HASH:= 2838a08c96edfd936aff8fbf99ecbb930c2bfca3337dd1482eb5fccdb80d5a04 +PKG_HASH:= ed115a28f4ae8cfcd33b94a597c076ca74fd549867a26e4fac9505c27288e983 PKG_DESCR:= bittorrent library PKG_SECTION:= libs/net PKG_DEPENDS:= libsigc++ zlib libressl PKG_BUILDDEP:= libsigc++ zlib libressl PKG_NEEDS:= intl PKG_URL:= https://rakshasa.github.io/rtorrent/ -PKG_SITES:= http://rtorrent.net/downloads/ +PKG_SITES:= https://github.com/rakshasa/rtorrent/releases/download/v0.9.8/ PKG_OPTS:= dev +PKG_CFLINE_LIBTORRENT:= depends on ADK_BROKEN + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --enable-aligned \ --without-kqueue \ --disable-instrumentation \ - --with-zlib=$(STAGING_TARGET_DIR) + --without-zlib libtorrent-install: ${INSTALL_DIR} ${IDIR_LIBTORRENT}/usr/lib diff --git a/package/libtorrent/patches/patch-configure_ac b/package/libtorrent/patches/patch-configure_ac deleted file mode 100644 index 00e1c2fec..000000000 --- a/package/libtorrent/patches/patch-configure_ac +++ /dev/null @@ -1,18 +0,0 @@ ---- libtorrent-0.13.6.orig/configure.ac 2015-09-03 20:57:38.000000000 +0200 -+++ libtorrent-0.13.6/configure.ac 2016-05-25 21:29:51.436557128 +0200 -@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO - - AM_INIT_AUTOMAKE - AC_CONFIG_HEADERS(config.h) --AM_PATH_CPPUNIT(1.9.6) - - AC_PROG_CXX - -@@ -99,7 +98,6 @@ AC_CHECK_FUNCS(posix_memalign) - TORRENT_CHECK_MADVISE() - TORRENT_CHECK_CACHELINE() - TORRENT_CHECK_POPCOUNT() --TORRENT_CHECK_EXECINFO() - TORRENT_CHECK_PTHREAD_SETNAME_NP() - TORRENT_MINCORE() - TORRENT_OTFD() diff --git a/package/libtorrent/patches/patch-scripts_ax_check_zlib_m4 b/package/libtorrent/patches/patch-scripts_ax_check_zlib_m4 deleted file mode 100644 index 1e629d011..000000000 --- a/package/libtorrent/patches/patch-scripts_ax_check_zlib_m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- libtorrent-0.13.6.orig/scripts/ax_check_zlib.m4 2015-08-08 17:01:32.000000000 +0200 -+++ libtorrent-0.13.6/scripts/ax_check_zlib.m4 2016-05-25 21:33:01.003893982 +0200 -@@ -79,7 +79,7 @@ AC_ARG_WITH([zlib], - AC_MSG_RESULT(yes) - if test -d "$withval" - then -- zlib_places="$withval $zlib_places" -+ zlib_places="$withval" - else - AC_MSG_WARN([Sorry, $withval does not exist, checking usual places]) - fi diff --git a/package/libudfread/Makefile b/package/libudfread/Makefile new file mode 100644 index 000000000..7426e3ba5 --- /dev/null +++ b/package/libudfread/Makefile @@ -0,0 +1,28 @@ +# 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:= libudfread +PKG_VERSION:= 1.1.2 +PKG_RELEASE:= 1 +PKG_HASH:= 2bf16726ac98d093156195bb049a663e07d3323e079c26912546f4e05c77bac5 +PKG_DESCR:= udf library +PKG_SECTION:= libs/misc +PKG_SITES:= http://mirrors.kodi.tv/build-deps/sources/ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBUDFREAD,libudfread,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +AUTOTOOL_STYLE:= bootstrap + +libudfread-install: + $(INSTALL_DIR) $(IDIR_LIBUDFREAD)/usr/lib + $(CP) $(WRKINST)/usr/lib/libudfread*.so* \ + $(IDIR_LIBUDFREAD)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/liburcu/Makefile b/package/liburcu/Makefile new file mode 100644 index 000000000..60477c389 --- /dev/null +++ b/package/liburcu/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:= liburcu +PKG_VERSION:= 0.14.0 +PKG_RELEASE:= 1 +PKG_HASH:= ca43bf261d4d392cff20dfae440836603bf009fce24fdc9b2697d837a2239d4f +PKG_DESCR:= userspace rcu (read-copy-update) libraries +PKG_SECTION:= libs/misc +PKG_SITES:= https://lttng.org/files/urcu/ +PKG_OPTS:= dev + +DISTFILES:= userspace-rcu-$(PKG_VERSION).tar.bz2 +WRKDIST= ${WRKDIR}/userspace-rcu-${PKG_VERSION} + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBURCU,liburcu,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +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/libuv/Makefile b/package/libuv/Makefile new file mode 100644 index 000000000..3a8b43a61 --- /dev/null +++ b/package/libuv/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:= libuv +PKG_VERSION:= 1.42.0 +PKG_RELEASE:= 1 +PKG_HASH:= 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764 +PKG_DESCR:= multi-platform support library +PKG_SECTION:= libs/misc +PKG_URL:= https://github.com/libuv/libuv/ +PKG_SITES:= https://github.com/libuv/libuv/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBUV,libuv,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +CONFIG_STYLE:= cmake + +libuv-install: + $(INSTALL_DIR) $(IDIR_LIBUV)/usr/lib + $(CP) $(WRKINST)/usr/lib/libuv*.so* \ + $(IDIR_LIBUV)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libuv/patches/patch-libuv_pc_in b/package/libuv/patches/patch-libuv_pc_in new file mode 100644 index 000000000..4c7ae339d --- /dev/null +++ b/package/libuv/patches/patch-libuv_pc_in @@ -0,0 +1,12 @@ +--- 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/libvncserver/Makefile b/package/libvncserver/Makefile new file mode 100644 index 000000000..a3812648c --- /dev/null +++ b/package/libvncserver/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:= libvncserver +PKG_VERSION:= 0.9.14 +PKG_RELEASE:= 1 +PKG_HASH:= 83104e4f7e28b02f8bf6b010d69b626fae591f887e949816305daebae527c9a5 +PKG_DESCR:= VNC library +PKG_SECTION:= libs/misc +PKG_BUILDDEP:= cmake-host +PKG_SITES:= https://github.com/LibVNC/libvncserver/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= LibVNCServer-$(PKG_VERSION).tar.gz + +WRKDIST= ${WRKDIR}/${PKG_NAME}-LibVNCServer-${PKG_VERSION} + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBVNCSERVER,libvncserver,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +CONFIG_STYLE:= cmake + +libvncserver-install: + $(INSTALL_DIR) $(IDIR_LIBVNCSERVER)/usr/lib + $(CP) $(WRKINST)/usr/lib/libvncserver*.so* \ + $(IDIR_LIBVNCSERVER)/usr/lib + $(CP) $(WRKINST)/usr/lib/libvncclient*.so* \ + $(IDIR_LIBVNCSERVER)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index 7aa126402..7f31d719c 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -4,19 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libvpx -PKG_VERSION:= 1.6.0 +PKG_VERSION:= 1.14.0 PKG_RELEASE:= 1 -PKG_HASH:= d0afbb5eb1ecae68f8d578abace160a97e2e8a230e3028cf4db115d59a695aad +PKG_HASH:= 5f21d2db27071c8a46f1725928a10227ae45c5cd1cad3727e4aafbe476e321fa PKG_DESCR:= vp8/vp9 codec library PKG_SECTION:= libs/video PKG_BUILDDEP:= yasm-host PKG_URL:= http://www.webmproject.org/about/ -PKG_SITES:= http://storage.googleapis.com/downloads.webmproject.org/releases/webm/ +PKG_SITES:= https://github.com/webmproject/libvpx/archive/refs/tags/ PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !m68k - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +DISTFILES:= v${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk @@ -25,6 +23,9 @@ $(eval $(call PKG_template,LIBVPX,libvpx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP CONFIGURE_ENV+= LD=$(TARGET_CC) CONFIG_STYLE:= minimal +ifeq ($(ADK_TARGET_ARCH_AARCH64),y) +CONFIGURE_ARGS+= --target=armv8-linux-gcc +endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) CONFIGURE_ARGS+= --target=armv7-linux-gcc endif @@ -43,6 +44,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3P),y) CONFIGURE_ARGS+= --target=armv7-linux-gcc endif +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4),y) +CONFIGURE_ARGS+= --target=armv7-linux-gcc +endif ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) CONFIGURE_ARGS+= --target=armv5te-linux-gcc endif diff --git a/package/libvpx/patches/patch-configure b/package/libvpx/patches/patch-configure deleted file mode 100644 index e3ceac490..000000000 --- a/package/libvpx/patches/patch-configure +++ /dev/null @@ -1,18 +0,0 @@ ---- libvpx-1.5.0.orig/configure 2015-11-09 23:12:38.000000000 +0100 -+++ libvpx-1.5.0/configure 2015-11-22 16:17:41.869446856 +0100 -@@ -111,6 +111,7 @@ all_platforms="${all_platforms} armv7-wi - all_platforms="${all_platforms} armv7s-darwin-gcc" - all_platforms="${all_platforms} mips32-linux-gcc" - all_platforms="${all_platforms} mips64-linux-gcc" -+all_platforms="${all_platforms} loongson2f-linux-gcc" - all_platforms="${all_platforms} sparc-solaris-gcc" - all_platforms="${all_platforms} x86-android-gcc" - all_platforms="${all_platforms} x86-darwin8-gcc" -@@ -242,6 +243,7 @@ ARCH_EXT_LIST=" - dspr2 - msa - mips64 -+ loongson2f - - mmx - sse diff --git a/package/libwebp/Makefile b/package/libwebp/Makefile index 967a686d5..d894f3831 100644 --- a/package/libwebp/Makefile +++ b/package/libwebp/Makefile @@ -4,24 +4,24 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libwebp -PKG_VERSION:= 0.3.1 +PKG_VERSION:= 1.2.2 PKG_RELEASE:= 1 -PKG_HASH:= b37932c625322a69fe4e9b88884b5c7aed2b3eaf9fd5e5b480aee339a92e6ee7 +PKG_HASH:= 51e9297aadb7d9eb99129fe0050f53a11fcce38a0848fb2b0389e385ad93695e PKG_DESCR:= new image format for the web PKG_SECTION:= libs/image +PKG_BUILDDEP:= cmake-host PKG_URL:= https://developers.google.com/speed/webp/ -PKG_SITES:= https://webp.googlecode.com/files/ +PKG_SITES:= https://github.com/webmproject/libwebp/archive/refs/tags/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= v${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk +CONFIG_STYLE:= cmake + $(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 include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libwebsockets/Makefile b/package/libwebsockets/Makefile new file mode 100644 index 000000000..87eb01678 --- /dev/null +++ b/package/libwebsockets/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:= libwebsockets +PKG_VERSION:= 4.3.3 +PKG_RELEASE:= 1 +PKG_HASH:= 6fd33527b410a37ebc91bb64ca51bdabab12b076bc99d153d7c5dd405e4bdf90 +PKG_DESCR:= lightweight network library +PKG_SECTION:= libs/net +PKG_BUILDDEP:= cmake-host zlib libressl +PKG_DEPENDS:= zlib libressl +PKG_URL:= https://libwebsockets.org/ +PKG_SITES:= https://github.com/warmcat/libwebsockets/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBWEBSOCKETS,libwebsockets,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +CONFIG_STYLE:= cmake + +libwebsockets-install: + $(INSTALL_DIR) $(IDIR_LIBWEBSOCKETS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libwebsockets*.so* \ + $(IDIR_LIBWEBSOCKETS)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libx264/Makefile b/package/libx264/Makefile index 18b92ffc1..394cbcd82 100644 --- a/package/libx264/Makefile +++ b/package/libx264/Makefile @@ -13,8 +13,6 @@ PKG_URL:= http://www.videolan.org/developers/x264.html PKG_SITES:= http://git.videolan.org/git/x264.git PKG_OPTS:= dev -PKG_BUILDDEP_IBM_X40:= yasm-host - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile index a8b52760d..5dbd1b4b5 100644 --- a/package/libxcb/Makefile +++ b/package/libxcb/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libxcb -PKG_VERSION:= 1.12 +PKG_VERSION:= 1.16 PKG_RELEASE:= 1 -PKG_HASH:= 092f147149d8a6410647a848378aaae749304d5b73e028ccb8306aa8a9e26f06 +PKG_HASH:= bc0f75f84b28e6496a19a1d094d7e47def861a50cb7cce5b23b62eecdc2a4479 PKG_DESCR:= interface to the x window system protocol PKG_SECTION:= x11/libs -PKG_BUILDDEP+= python2 libpthread-stubs libxslt libXau xcb-proto +PKG_BUILDDEP:= python3 libpthread-stubs libxslt libXau xcb-proto HOST_BUILDDEP:= libXau-host libpthread-stubs-host xcb-proto-host PKG_SITES:= http://xcb.freedesktop.org/dist/ PKG_OPTS:= dev @@ -22,10 +22,10 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -include $(ADK_TOPDIR)/mk/python.mk +include $(ADK_TOPDIR)/mk/python3.mk HOST_STYLE:= auto -CONFIGURE_ENV+= PYTHON=$(PYTHON) +CONFIGURE_ENV+= PYTHONPATH=$(PYTHON) PYTHON=python3 libxcb-install: ${INSTALL_DIR} ${IDIR_LIBXCB}/usr/lib diff --git a/package/libxcrypt/Makefile b/package/libxcrypt/Makefile new file mode 100644 index 000000000..3d6bb2907 --- /dev/null +++ b/package/libxcrypt/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:= libxcrypt +PKG_VERSION:= 4.4.36 +PKG_RELEASE:= 1 +PKG_HASH:= b979838d5f1f238869d467484793b72b8bca64c4eae696fdbba0a9e0b6c28453 +PKG_DESCR:= crypt library +PKG_SECTION:= libs/crypto +PKG_SITES:= https://github.com/besser82/libxcrypt/archive/refs/tags/ +PKG_OPTS:= dev + +PKG_LIBC_DEPENDS:= glibc + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBXCRYPT,libxcrypt,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +AUTOTOOL_STYLE:= autogen + +libxcrypt-install: + $(INSTALL_DIR) $(IDIR_LIBXCRYPT)/usr/lib + $(CP) $(WRKINST)/usr/lib/lib*crypt*.so* \ + $(IDIR_LIBXCRYPT)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libxcvt/Makefile b/package/libxcvt/Makefile new file mode 100644 index 000000000..952b7c7e7 --- /dev/null +++ b/package/libxcvt/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:= libxcvt +PKG_VERSION:= 0.1.1 +PKG_RELEASE:= 1 +PKG_HASH:= 27ebce180d355f94c1992930bedb40a36f6d7312ee50bf7f0acbcd22f33e8c29 +PKG_DESCR:= xcvt library +PKG_SECTION:= libs/misc +PKG_SITES:= https://www.x.org/releases/individual/lib/ +PKG_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBXCVT,libxcvt,$(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 + +libxcvt-install: + $(INSTALL_DIR) $(IDIR_LIBXCVT)/usr/lib + $(CP) $(WRKINST)/usr/lib/libxcvt*.so* \ + $(IDIR_LIBXCVT)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libxkbcommon/Makefile b/package/libxkbcommon/Makefile new file mode 100644 index 000000000..1650043a9 --- /dev/null +++ b/package/libxkbcommon/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:= libxkbcommon +PKG_VERSION:= 1.5.0 +PKG_RELEASE:= 1 +PKG_HASH:= 560f11c4bbbca10f495f3ef7d3a6aa4ca62b4f8fb0b52e7d459d18a26e46e017 +PKG_DESCR:= library for handling of keyboard descriptions +PKG_SECTION:= libs/misc +PKG_BUILDDEP:= meson-host +PKG_SITES:= https://xkbcommon.org/download/ +PKG_OPTS:= dev + +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 \ + -Dxkb-config-root=/usr/share/X11/xkb + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +libxkbcommon-install: + $(INSTALL_DIR) $(IDIR_LIBXKBCOMMON)/usr/lib + $(CP) $(WRKINST)/usr/lib/libxkbcommon*.so* \ + $(IDIR_LIBXKBCOMMON)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 5835c98d7..20a1428b7 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -4,48 +4,33 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libxml2 -PKG_VERSION:= 2.9.4 +PKG_VERSION:= 2.10.3 PKG_RELEASE:= 1 -PKG_HASH:= ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c +PKG_HASH:= 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c PKG_DESCR:= xml parser and toolkit PKG_SECTION:= libs/data PKG_DEPENDS:= zlib -PKG_BUILDDEP:= libxml2-host python2 zlib -HOST_BUILDDEP:= python2-host +PKG_BUILDDEP:= libxml2-host python3 zlib +HOST_BUILDDEP:= python3-host PKG_URL:= http://www.xmlsoft.org/ -PKG_SITES:= http://xmlsoft.org/sources/ +PKG_SITES:= https://download.gnome.org/sources/libxml2/2.10/ PKG_OPTS:= dev -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz - -PKG_SUBPKGS:= LIBXML2 LIBXML2_PYTHON -PKGSD_LIBXML2_PYTHON:= xml python bindings -PKGSC_LIBXML2_PYTHON:= libs/misc -PKGSB_LIBXML2_PYTHON:= python2 -PKGSS_LIBXML2_PYTHON:= python2 - include $(ADK_TOPDIR)/mk/host.mk 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))) -$(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBXML2_PYTHON),$(PKGSC_LIBXML2_PYTHON))) - -include $(ADK_TOPDIR)/mk/python.mk -TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/python$(PYTHON_VERSION) -HOST_CPPFLAGS+= -I$(STAGING_HOST_DIR)/usr/include/python$(PYTHON_VERSION) HOST_STYLE:= auto -HOST_CONFIGURE_ARGS+= --with-python \ +HOST_CONFIGURE_ARGS+= --without-python \ --with-threads \ --without-iconv \ --without-lzma \ --without-zlib -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --without-c14n \ --without-debug \ - --without-docbook \ --with-catalog \ --with-html \ --without-ftp \ @@ -69,17 +54,12 @@ CONFIGURE_ARGS+= --without-c14n \ --with-xinclude \ --with-xpath \ --with-xptr \ - --with-python \ + --without-python \ --with-zlib='$(STAGING_TARGET_DIR)/usr' libxml2-install: $(INSTALL_DIR) $(IDIR_LIBXML2)/usr/lib $(CP) $(WRKINST)/usr/lib/libxml2.so* $(IDIR_LIBXML2)/usr/lib -libxml2-python-install: - $(INSTALL_DIR) $(IDIR_LIBXML2_PYTHON)/usr/lib/python/site-packages - $(CP) $(WRKINST)/usr/lib/python/site-packages/*.{so,py} \ - $(IDIR_LIBXML2_PYTHON)/usr/lib/python/site-packages - include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libxml2/patches/patch-Makefile_am b/package/libxml2/patches/patch-Makefile_am deleted file mode 100644 index f14a120d9..000000000 --- a/package/libxml2/patches/patch-Makefile_am +++ /dev/null @@ -1,14 +0,0 @@ ---- libxml2-2.9.2.orig/Makefile.am 2014-10-13 05:02:53.000000000 -0500 -+++ libxml2-2.9.2/Makefile.am 2015-02-11 12:51:49.858163855 -0600 -@@ -2,9 +2,9 @@ - - ACLOCAL_AMFLAGS = -I m4 - --SUBDIRS = include . doc example xstc $(PYTHON_SUBDIR) -+SUBDIRS = include . xstc $(PYTHON_SUBDIR) - --DIST_SUBDIRS = include . doc example python xstc -+DIST_SUBDIRS = include . python xstc - - AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include - diff --git a/package/libxml2/patches/patch-configure_ac b/package/libxml2/patches/patch-configure_ac deleted file mode 100644 index 6cbef4845..000000000 --- a/package/libxml2/patches/patch-configure_ac +++ /dev/null @@ -1,96 +0,0 @@ ---- libxml2-2.9.2.orig/configure.ac 2014-10-15 23:06:15.000000000 -0500 -+++ libxml2-2.9.2/configure.ac 2015-02-11 12:53:35.494162888 -0600 -@@ -837,62 +837,13 @@ if test "$with_python" != "no" ; then - echo Found python in environment PYTHON=$PYTHON - with_python=`$PYTHON -c "import sys; print(sys.exec_prefix)"` - else -- AC_PATH_PROG(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) -- fi -- fi -- fi -- fi -- if test "$PYTHON" != "" -- then -- PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"` -- PYTHON_INCLUDES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_inc())"` --# does not work as it produce a /usr/lib/python path instead of/usr/lib64/python --# --# PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"` -- echo Found Python version $PYTHON_VERSION -- fi -- if test "$PYTHON_VERSION" != "" -a "$PYTHON_INCLUDES" = "" -- then -- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -- then -- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION -- else -- if test -r $prefix/include/python$PYTHON_VERSION/Python.h -- then -- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION -- else -- if test -r /usr/include/python$PYTHON_VERSION/Python.h -- then -- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION -- else -- if test -r $with_python/include/Python.h -- then -- PYTHON_INCLUDES=$with_python/include -- else -- echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h -- fi -+ AC_PATH_PROG(PYTHON, python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) - fi - fi - fi - fi -- if test "$with_python_install_dir" != "" -- then -- PYTHON_SITE_PACKAGES="$with_python_install_dir" -- fi -- if test "$PYTHON_VERSION" != "" -a "$PYTHON_SITE_PACKAGES" = "" -- then -- if test -d $libdir/python$PYTHON_VERSION/site-packages -- then -- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages -- else -- if test -d $with_python/lib/site-packages -- then -- PYTHON_SITE_PACKAGES=$with_python/lib/site-packages -- else -- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"` -- fi -- fi -- fi -+ PYTHON_INCLUDES=`python$PYTHON_VERSION-config --includes` -+ PYTHON_SITE_PACKAGES=${prefix}/lib/python$PYTHON_VERSION/site-packages - pythondir='$(PYTHON_SITE_PACKAGES)' - PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags` - else -@@ -1065,26 +1016,7 @@ else - THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS" - ;; - *linux*) -- if test "${GCC}" = "yes" ; then -- GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'` -- GCC_MAJOR=`echo ${GCC_VERSION} | sed 's+\..*++'` -- GCC_MEDIUM=`echo ${GCC_VERSION} | sed 's+[[0-9]]*\.++' | sed 's+\..*++'` -- if test "${THREAD_LIBS}" = "-lpthread" ; then -- if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null -- then -- THREAD_LIBS="" -- BASE_THREAD_LIBS="-lpthread" -- else -- if expr ${GCC_MAJOR} \> 3 > /dev/null -- then -- THREAD_LIBS="" -- BASE_THREAD_LIBS="-lpthread" -- else -- echo old GCC disabling weak symbols for pthread -- fi -- fi -- fi -- fi -+ THREAD_LIBS="-lpthread" - ;; - esac - if test "$WITH_THREADS" = "1" ; then diff --git a/package/libxml2/patches/patch-python_Makefile_am b/package/libxml2/patches/patch-python_Makefile_am deleted file mode 100644 index b3ac2539b..000000000 --- a/package/libxml2/patches/patch-python_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ ---- libxml2-2.9.2.orig/python/Makefile.am 2014-10-03 04:00:53.000000000 -0500 -+++ libxml2-2.9.2/python/Makefile.am 2015-02-11 12:53:07.150163147 -0600 -@@ -18,8 +18,7 @@ EXTRA_DIST = \ - if WITH_PYTHON - AM_CPPFLAGS = \ - -I$(top_builddir)/include \ -- -I$(top_srcdir)/include \ -- -I$(PYTHON_INCLUDES) -+ -I$(top_srcdir)/include - - python_LTLIBRARIES = libxml2mod.la - diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index 012ade2c1..3c2522122 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.29 +PKG_VERSION:= 1.1.38 PKG_RELEASE:= 1 -PKG_HASH:= b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce +PKG_HASH:= 1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1 PKG_DESCR:= xslt library PKG_SECTION:= libs/data PKG_DEPENDS:= libxml2 @@ -14,11 +14,9 @@ PKG_BUILDDEP:= libxslt-host libxml2 HOST_BUILDDEP:= libxml2-host PKG_NEEDS:= c++ PKG_URL:= http://xmlsoft.org/XSLT -PKG_SITES:= http://xmlsoft.org/sources/ +PKG_SITES:= https://download.gnome.org/sources/libxslt/1.1/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - PKG_SUBPKGS:= LIBXSLT XSLTPROC PKGSD_XSLTPROC:= xslt processor utility PKGSC_XSLTPROC:= sys/misc @@ -30,12 +28,14 @@ $(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 \ --with-libxml-prefix="${STAGING_HOST_DIR}/usr" \ --with-libxml-include-prefix="${STAGING_HOST_DIR}/usr/include/libxml2" \ --with-libxml-libs-prefix="${STAGING_HOST_DIR}/usr/lib" -AUTOTOOL_STYLE:= autoreconf +TARGET_LDFLAGS+= -lxml2 CONFIGURE_ARGS+= --with-libxml-prefix="${STAGING_TARGET_DIR}/usr" \ --with-libxml-include-prefix="${STAGING_TARGET_DIR}/usr/include/libxml2" \ --with-libxml-libs-prefix="${STAGING_TARGET_DIR}/usr/lib" \ diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index c6865c145..5c126e861 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= lighttpd -PKG_VERSION:= 1.4.45 +PKG_VERSION:= 1.4.68 PKG_RELEASE:= 1 -PKG_HASH:= 1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f +PKG_HASH:= e56f37ae52b63e1ada4d76ce78005affb6e56eea2f6bdb0ce17d6d36e9583384 PKG_DESCR:= lightweight web server PKG_SECTION:= net/http PKG_URL:= http://www.lighttpd.net/ @@ -22,9 +22,9 @@ PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCD_WITHOUT_SSL:= use no ssl PKG_SUBPKGS:= LIGHTTPD LIGHTTPD_MOD_ALIAS LIGHTTPD_MOD_AUTH -PKG_SUBPKGS+= LIGHTTPD_MOD_CGI LIGHTTPD_MOD_DIRLIST LIGHTTPD_MOD_EVASIVE LIGHTTPD_MOD_EXPIRE LIGHTTPD_MOD_FASTCGI +PKG_SUBPKGS+= LIGHTTPD_MOD_CGI LIGHTTPD_MOD_DIRLIST LIGHTTPD_MOD_EXPIRE LIGHTTPD_MOD_FASTCGI PKG_SUBPKGS+= LIGHTTPD_MOD_PROXY LIGHTTPD_MOD_REDIRECT LIGHTTPD_MOD_REWRITE LIGHTTPD_MOD_SETENV -PKG_SUBPKGS+= LIGHTTPD_MOD_VHOST LIGHTTPD_MOD_SSI LIGHTTPD_MOD_STATUS LIGHTTPD_MOD_USERTRACK +PKG_SUBPKGS+= LIGHTTPD_MOD_VHOST LIGHTTPD_MOD_SSI LIGHTTPD_MOD_STATUS PKGSD_LIGHTTPD_MOD_ALIAS:= alias support PKGSN_LIGHTTPD_MOD_ALIAS:= lighttpd PKGSD_LIGHTTPD_MOD_AUTH:= authentication support @@ -35,8 +35,6 @@ PKGSD_LIGHTTPD_MOD_DIRLIST:= Dirlisting support PKGSB_LIGHTTPD_MOD_DIRLIST:= pcre PKGSS_LIGHTTPD_MOD_DIRLIST:= libpcre PKGSN_LIGHTTPD_MOD_DIRLIST:= lighttpd -PKGSD_LIGHTTPD_MOD_EVASIVE:= Evasive support -PKGSN_LIGHTTPD_MOD_EVASIVE:= lighttpd PKGSD_LIGHTTPD_MOD_EXPIRE:= Expire support PKGSN_LIGHTTPD_MOD_EXPIRE:= lighttpd PKGSD_LIGHTTPD_MOD_FASTCGI:= FastCGI support @@ -55,8 +53,6 @@ PKGSD_LIGHTTPD_MOD_SSI:= SSI support PKGSN_LIGHTTPD_MOD_SSI:= lighttpd PKGSD_LIGHTTPD_MOD_STATUS:= Status support PKGSN_LIGHTTPD_MOD_STATUS:= lighttpd -PKGSD_LIGHTTPD_MOD_USERTRACK:= Usertracking support -PKGSN_LIGHTTPD_MOD_USERTRACK:= lighttpd PKGSD_LIGHTTPD_MOD_WEBDAV:= Webdav support PKGSB_LIGHTTPD_MOD_WEBDAV:= libxml2 sqlite util-linux PKGSS_LIGHTTPD_MOD_WEBDAV:= libxml2 libsqlite libuuid @@ -79,7 +75,6 @@ $(eval $(call PKG_template,LIGHTTPD_MOD_ALIAS,lighttpd-mod-alias,$(PKG_VERSION)- $(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_AUTH},${PKG_SECTION})) $(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_CGI},${PKG_SECTION})) $(eval $(call PKG_template,LIGHTTPD_MOD_DIRLIST,lighttpd-mod-dirlist,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_DIRLIST},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_EVASIVE,lighttpd-mod-evasive,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_EVASIVE},${PKG_SECTION})) $(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_EXPIRE},${PKG_SECTION})) $(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_FASTCGI},${PKG_SECTION})) $(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_PROXY},${PKG_SECTION})) @@ -89,13 +84,11 @@ $(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION $(eval $(call PKG_template,LIGHTTPD_MOD_VHOST,lighttpd-mod-vhost,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_VHOST},${PKG_SECTION})) $(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_SSI},${PKG_SECTION})) $(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_STATUS},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_USERTRACK},${PKG_SECTION})) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_ALIAS,alias)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_AUTH,auth)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_CGI,cgi)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_DIRLIST,dirlisting)) -$(eval $(call PKG_mod_template,LIGHTTPD_MOD_EVASIVE,evasive)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_EXPIRE,expire)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_FASTCGI,fastcgi)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_PROXY,proxy)) @@ -105,7 +98,6 @@ $(eval $(call PKG_mod_template,LIGHTTPD_MOD_SETENV,setenv)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_VHOST,simple_vhost)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_SSI,ssi)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_STATUS,status)) -$(eval $(call PKG_mod_template,LIGHTTPD_MOD_USERTRACK,usertrack)) CONFIGURE_ARGS+= --libdir=/usr/lib/lighttpd \ --sysconfdir=/etc/lighttpd \ @@ -113,10 +105,8 @@ CONFIGURE_ARGS+= --libdir=/usr/lib/lighttpd \ --without-zlib \ --without-bzip2 \ --without-fam \ - --without-gdbm \ --without-ldap \ --without-lua \ - --without-memcache \ --without-mysql \ --without-webdav-props \ --without-webdav-locks \ diff --git a/package/lirc/Makefile b/package/lirc/Makefile index b72992549..9f2e886c2 100644 --- a/package/lirc/Makefile +++ b/package/lirc/Makefile @@ -4,11 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= lirc -PKG_VERSION:= 0.9.4 +PKG_VERSION:= 0.10.2 PKG_RELEASE:= 1 -PKG_HASH:= dd18a6751674fd61e4a96eebc3b9e5c883389d6230811943513443522dfc5dd0 +PKG_HASH:= 3d44ec8274881cf262f160805641f0827ffcc20ade0d85e7e6f3b90e0d3d222a PKG_DESCR:= decode and send infra-red signals PKG_SECTION:= sys/hw +PKG_BUILDDEP:= libxml2-host libxslt-host PKG_URL:= http://www.lirc.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=lirc/} diff --git a/package/logitechmediaserver/Makefile b/package/logitechmediaserver/Makefile index 5fcd398c3..fdaa45edb 100644 --- a/package/logitechmediaserver/Makefile +++ b/package/logitechmediaserver/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= logitechmediaserver -PKG_VERSION:= 7.9.1 -PKG_EXTRAVER:= 1519287262-noCPAN +PKG_VERSION:= 8.4.1 +PKG_EXTRAVER:= 1708787582-noCPAN PKG_RELEASE:= 1 -PKG_HASH:= c57cb0158bed9804d30283890df186964ae6ad8fe72e21857b08b6592c00fd5f +PKG_HASH:= b521bb7e03ee24003e718298cf54c7aac29e59a2da37d55a3380904397341802 PKG_DESCR:= popular media server PKG_SECTION:= mm/audio PKG_NEEDS:= data @@ -19,7 +19,7 @@ PKG_DEPENDS+= p5-dbd-sqlite p5-tie-refhash p5-template-toolkit PKG_DEPENDS+= p5-class-xsaccessor p5-io-interface p5-anyevent PKG_BUILDDEP:= perl PKG_URL:= http://wiki.slimdevices.com/index.php/Logitech_Media_Server -PKG_SITES:= http://downloads.slimdevices.com/nightly/7.9/sc/a141d03b6489a3a1c65eebc34213e809d1c95df4/ +PKG_SITES:= https://downloads.slimdevices.com/nightly/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}.tgz WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER} diff --git a/package/logitechmediaserver/patches/patch-Slim_Utils_OS_Linux_pm b/package/logitechmediaserver/patches/patch-Slim_Utils_OS_Linux_pm deleted file mode 100644 index 39d9a53a6..000000000 --- a/package/logitechmediaserver/patches/patch-Slim_Utils_OS_Linux_pm +++ /dev/null @@ -1,13 +0,0 @@ ---- logitechmediaserver-7.9.1-1502887423-noCPAN.orig/Slim/Utils/OS/Linux.pm 2017-08-09 10:50:44.000000000 +0200 -+++ logitechmediaserver-7.9.1-1502887423-noCPAN/Slim/Utils/OS/Linux.pm 2017-08-17 20:44:24.015911172 +0200 -@@ -47,6 +47,10 @@ sub getFlavor { - - return 'Netgear RAIDiator'; - -+ } elsif (-f '/etc/.adktarget') { -+ -+ return 'OpenADK'; -+ - } elsif (-f '/etc/squeezeos.version') { - - return 'SqueezeOS'; diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile index 4701a9c0c..166edcbdb 100644 --- a/package/logrotate/Makefile +++ b/package/logrotate/Makefile @@ -4,24 +4,19 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= logrotate -PKG_VERSION:= 3.8.9 +PKG_VERSION:= 3.21.0 PKG_RELEASE:= 1 -PKG_HASH:= 700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7 +PKG_HASH:= 8fa12015e3b8415c121fc9c0ca53aa872f7b0702f543afda7e32b6c4900f6516 PKG_DESCR:= logfile rotation utility PKG_SECTION:= sys/misc PKG_DEPENDS:= libpopt PKG_BUILDDEP:= popt -PKG_SITES:= https://fedorahosted.org/releases/l/o/logrotate/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_SITES:= https://github.com/logrotate/logrotate/releases/download/$(PKG_VERSION)/ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,LOGROTATE,logrotate,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIG_STYLE:= manual -TARGET_CFLAGS+= -DVERSION=\"$(PKG_VERSION)\" - logrotate-install: ${INSTALL_DIR} ${IDIR_LOGROTATE}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/logrotate ${IDIR_LOGROTATE}/usr/sbin diff --git a/package/logrotate/patches/patch-Makefile b/package/logrotate/patches/patch-Makefile deleted file mode 100644 index 9b8fec9c3..000000000 --- a/package/logrotate/patches/patch-Makefile +++ /dev/null @@ -1,36 +0,0 @@ ---- logrotate-3.8.9.orig/Makefile 2015-02-13 07:11:21.000000000 +0100 -+++ logrotate-3.8.9/Makefile 2015-04-02 16:40:24.000000000 +0200 -@@ -1,11 +1,12 @@ - VERSION = $(shell awk '/Version:/ { print $$2 }' logrotate.spec) --OS_NAME = $(shell uname -s) --LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`) --CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" -DHAVE_STRPTIME=1 -DHAVE_QSORT $(RPM_OPT_FLAGS) $(LFS) -+OS_NAME = Linux -+#LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`) -+CFLAGS ?= -+CFLAGS += -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" -DHAVE_STRPTIME=1 -DHAVE_QSORT $(RPM_OPT_FLAGS) $(LFS) - PROG = logrotate - MAN = logrotate.8 - MAN5 = logrotate.conf.5 --LOADLIBES = -lpopt -+LIBS = -lpopt - SVNURL= svn+ssh://svn.fedorahosted.org/svn/logrotate - SVNPUBURL = http://svn.fedorahosted.org/svn/logrotate - SVNTAG = r$(subst .,-,$(VERSION)) -@@ -64,7 +65,7 @@ endif - # Red Hat Linux - ifeq ($(OS_NAME),Linux) - INSTALL = install -- BASEDIR = /usr -+ BASEDIR = $(DESTDIR)/usr - endif - - # FreeBSD -@@ -124,6 +125,7 @@ show_warning: - @echo "" - - $(PROG): $(OBJS) -+ $(CC) $(LDFLAGS) -o $(PROG) $^ $(LIBS) - - clean: - rm -f $(OBJS) $(PROG) core* .depend diff --git a/package/ltp/Makefile b/package/ltp/Makefile index c13b9489e..1a039c239 100644 --- a/package/ltp/Makefile +++ b/package/ltp/Makefile @@ -4,11 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ltp -PKG_VERSION:= 20210524 +PKG_VERSION:= 20240129 PKG_RELEASE:= 1 PKG_DESCR:= linux test project -PKG_HASH:= 831678c64b85a8c24957c71632752537b2266890f2d2f352da9ed0ec45458189 -PKG_DEPENDS:= bash mke2fs mkfs +PKG_HASH:= c302f6b2ca09cbb7835f549777bdb9233fe31f7086d7ad8e65472a0804e3e025 +PKG_DEPENDS:= bash mke2fs mkfs shadow libtirpc libaio +PKG_DEPENDS+= kmod dosfstools +PKG_BUILDDEP+= libtirpc libaio +PKG_KDEPENDS:= coredump bsd-process-acct ikconfig-proc cgroups +PKG_KDEPENDS+= user-ns net-ns time-ns bpf-syscall blk-dev-loop watch-queue PKG_NEEDS:= threads PKG_SECTION:= base/tests PKG_URL:= http://linux-test-project.github.io @@ -28,19 +32,12 @@ CONFIGURE_ARGS+= --with-open-posix-testsuite \ --without-power-management-testsuite \ --without-python \ --without-perl \ - --without-expect + --without-expect \ + --disable-metadata pre-configure: PATH="$(HOST_PATH)" $(MAKE) -C $(WRKBUILD) autotools -# bessel float and mallopt not implemented in uClibc-ng -pre-build: - -rm ${WRKBUILD}/testcases/misc/math/float/float_bessel.c - -rm -rf ${WRKBUILD}/testcases/misc/math/float/bessel - -rm -rf ${WRKBUILD}/testcases/network/{rpc,nfs*} - -rm -rf ${WRKBUILD}/testcases/kernel/syscalls/profil - -rm -rf ${WRKBUILD}/testcases/kernel/syscalls/mallopt - ltp-install: $(INSTALL_DIR) $(IDIR_LTP)/opt/ltp/tmp $(CP) $(WRKINST)/usr/* $(IDIR_LTP)/opt/ltp diff --git a/package/ltp/patches/patch-Makefile b/package/ltp/patches/patch-Makefile new file mode 100644 index 000000000..0c47a972d --- /dev/null +++ b/package/ltp/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- ltp-full-20220121.orig/Makefile 2022-01-21 20:33:16.000000000 +0100 ++++ ltp-full-20220121/Makefile 2022-02-23 15:14:48.211207957 +0100 +@@ -62,7 +62,7 @@ $(1):: | $$(abs_top_builddir)/$$(basenam + endif + endef + +-COMMON_TARGETS += testcases tools metadata ++COMMON_TARGETS += testcases tools + + # Don't want to nuke the original files if we're installing in-build-tree. + ifneq ($(BUILD_TREE_STATE),$(BUILD_TREE_SRCDIR_INSTALL)) diff --git a/package/ltp/patches/patch-runtest_mm b/package/ltp/patches/patch-runtest_mm deleted file mode 100644 index 968b15e1e..000000000 --- a/package/ltp/patches/patch-runtest_mm +++ /dev/null @@ -1,8 +0,0 @@ ---- ltp-full-20170929.orig/runtest/mm 2017-09-29 17:11:53.000000000 +0200 -+++ ltp-full-20170929/runtest/mm 2017-10-05 18:58:09.655415743 +0200 -@@ -100,4 +100,4 @@ overcommit_memory06 overcommit_memory -R - - max_map_count max_map_count -i 10 - --min_free_kbytes min_free_kbytes -+#min_free_kbytes min_free_kbytes diff --git a/package/ltp/patches/patch-runtest_sched b/package/ltp/patches/patch-runtest_sched deleted file mode 100644 index 829b1b3dd..000000000 --- a/package/ltp/patches/patch-runtest_sched +++ /dev/null @@ -1,13 +0,0 @@ ---- ltp-full-20190930.orig/runtest/sched 2019-09-30 13:30:25.000000000 +0200 -+++ ltp-full-20190930/runtest/sched 2019-10-29 14:36:35.718142489 +0100 -@@ -6,8 +6,8 @@ pth_str03 pth_str03 - time-schedule01 time-schedule - trace_sched01 trace_sched -c 1 - --hackbench01 hackbench 50 process 1000 --hackbench02 hackbench 20 thread 1000 -+#hackbench01 hackbench 50 process 500 -+#hackbench02 hackbench 20 thread 500 - - sched_cli_serv run_sched_cliserv.sh - # Run this stress test for 2 minutes diff --git a/package/ltp/patches/patch-runtest_syscalls b/package/ltp/patches/patch-runtest_syscalls deleted file mode 100644 index 3137ed3dc..000000000 --- a/package/ltp/patches/patch-runtest_syscalls +++ /dev/null @@ -1,11 +0,0 @@ ---- ltp-full-20190930.orig/runtest/syscalls 2019-09-30 13:30:25.000000000 +0200 -+++ ltp-full-20190930/runtest/syscalls 2019-10-29 14:36:35.746144285 +0100 -@@ -330,7 +330,7 @@ fork08 fork08 - fork09 fork09 - fork10 fork10 - fork11 fork11 --fork13 fork13 -i 1000000 -+fork13 fork13 -i 10000 - fork14 fork14 - - fpathconf01 fpathconf01 diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c deleted file mode 100644 index 0244804de..000000000 --- a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c +++ /dev/null @@ -1,10 +0,0 @@ ---- ltp-full-20190930.orig/testcases/kernel/syscalls/fanotify/fanotify02.c 2019-09-30 13:30:25.000000000 +0200 -+++ ltp-full-20190930/testcases/kernel/syscalls/fanotify/fanotify02.c 2019-10-29 14:36:35.762145321 +0100 -@@ -10,6 +10,7 @@ - #define _GNU_SOURCE - #include "config.h" - -+#define _GNU_SOURCE - #include <stdio.h> - #include <sys/stat.h> - #include <sys/types.h> diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c deleted file mode 100644 index 89c03fc74..000000000 --- a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c +++ /dev/null @@ -1,10 +0,0 @@ ---- ltp-full-20190930.orig/testcases/kernel/syscalls/fanotify/fanotify04.c 2019-09-30 13:30:25.000000000 +0200 -+++ ltp-full-20190930/testcases/kernel/syscalls/fanotify/fanotify04.c 2019-10-29 14:36:35.806148130 +0100 -@@ -11,6 +11,7 @@ - #define _GNU_SOURCE - #include "config.h" - -+#define _GNU_SOURCE - #include <stdio.h> - #include <sys/stat.h> - #include <sys/types.h> diff --git a/package/lttng-tools/Makefile b/package/lttng-tools/Makefile index f3505fe55..fe9678212 100644 --- a/package/lttng-tools/Makefile +++ b/package/lttng-tools/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= lttng-tools -PKG_VERSION:= 2.9.5 +PKG_VERSION:= 2.13.11 PKG_RELEASE:= 1 -PKG_HASH:= 77839eb6fc6c652125f08acfd9369701c2516eb05cc2084160e7efc7a3fb731c +PKG_HASH:= ac5baeef9fa690936b1ca01ecd1742da762c2c08511ff1b4e923938d94d0f979 PKG_DESCR:= open source tracing framework PKG_SECTION:= app/debug PKG_BUILDDEP:= popt libxml2 util-linux userspace-rcu ncurses @@ -20,7 +20,10 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LTTNG_TOOLS,lttng-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -CONFIGURE_ARGS+= --without-lttng-ust +AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --without-lttng-ust \ + --disable-tests \ + --disable-silent-rules lttng-tools-install: $(INSTALL_DIR) $(IDIR_LTTNG_TOOLS)/usr/bin diff --git a/package/lttng-tools/patches/patch-configure_ac b/package/lttng-tools/patches/patch-configure_ac new file mode 100644 index 000000000..fcde66d8b --- /dev/null +++ b/package/lttng-tools/patches/patch-configure_ac @@ -0,0 +1,19 @@ +--- lttng-tools-2.13.11.orig/configure.ac 2023-08-21 20:32:56.422853499 +0200 ++++ lttng-tools-2.13.11/configure.ac 2024-02-18 06:45:39.022802047 +0100 +@@ -884,6 +884,8 @@ AC_ARG_ENABLE([bin-lttng-sessiond], AS_H + [Disable the build of lttng-sessiond binaries])) + AC_ARG_ENABLE([extras], AS_HELP_STRING([--disable-extras], + [Disable the build of the extra components])) ++AC_ARG_ENABLE([tests], AS_HELP_STRING([--disable-tests], ++ [Disable the build of the test components])) + + + build_lib_consumer=no +@@ -1035,6 +1037,7 @@ AM_CONDITIONAL([BUILD_BIN_LTTNG_SESSIOND + + # Export the tests and extras build conditions. + AS_IF([\ ++test "x$enable_tests" != "xno" && \ + test "x$enable_bin_lttng" != "xno" && \ + test "x$enable_bin_lttng_consumerd" != "xno" && \ + test "x$enable_bin_lttng_crash" != "xno" && \ diff --git a/package/lttng-tools/patches/patch-src_bin_lttng-sessiond_thread_c b/package/lttng-tools/patches/patch-src_bin_lttng-sessiond_thread_c new file mode 100644 index 000000000..53652ccf1 --- /dev/null +++ b/package/lttng-tools/patches/patch-src_bin_lttng-sessiond_thread_c @@ -0,0 +1,11 @@ +--- lttng-tools-2.13.11.orig/src/bin/lttng-sessiond/thread.c 2023-08-21 20:32:56.490852554 +0200 ++++ lttng-tools-2.13.11/src/bin/lttng-sessiond/thread.c 2024-02-18 06:55:46.482793807 +0100 +@@ -134,7 +134,7 @@ void lttng_thread_put(struct lttng_threa + if (!thread) { + return; + } +- assert(thread->ref.refcount); ++ //assert(thread->ref.refcount); + urcu_ref_put(&thread->ref, lttng_thread_release); + } + diff --git a/package/lttng-tools/patches/patch-src_common_fd-handle_c b/package/lttng-tools/patches/patch-src_common_fd-handle_c new file mode 100644 index 000000000..079fcb539 --- /dev/null +++ b/package/lttng-tools/patches/patch-src_common_fd-handle_c @@ -0,0 +1,20 @@ +--- lttng-tools-2.13.11.orig/src/common/fd-handle.c 2023-08-21 20:32:56.530851999 +0200 ++++ lttng-tools-2.13.11/src/common/fd-handle.c 2024-02-18 06:50:31.478798080 +0100 +@@ -21,7 +21,7 @@ static void fd_handle_release(struct urc + int ret; + struct fd_handle *handle = container_of(ref, struct fd_handle, ref); + +- assert(handle->fd >= 0); ++ //assert(handle->fd >= 0); + ret = close(handle->fd); + if (ret == -1) { + PERROR("Failed to close file descriptor of fd_handle upon release: fd = %d", +@@ -78,7 +78,7 @@ void fd_handle_put(struct fd_handle *han + LTTNG_HIDDEN + int fd_handle_get_fd(struct fd_handle *handle) + { +- assert(handle); ++ //assert(handle); + return handle->fd; + } + diff --git a/package/lttng-tools/patches/patch-src_common_shm_c b/package/lttng-tools/patches/patch-src_common_shm_c new file mode 100644 index 000000000..e55463125 --- /dev/null +++ b/package/lttng-tools/patches/patch-src_common_shm_c @@ -0,0 +1,20 @@ +--- lttng-tools-2.13.11.orig/src/common/shm.c 2023-08-21 20:32:56.550851722 +0200 ++++ lttng-tools-2.13.11/src/common/shm.c 2024-02-18 06:56:33.822793165 +0100 +@@ -32,7 +32,7 @@ static int get_wait_shm(char *shm_path, + int wait_shm_fd, ret; + mode_t mode, old_mode; + +- assert(shm_path); ++ //assert(shm_path); + + /* Default permissions */ + mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP; +@@ -166,7 +166,7 @@ char *shm_ust_get_mmap(char *shm_path, i + char *wait_shm_mmap; + long sys_page_size; + +- assert(shm_path); ++ //assert(shm_path); + + sys_page_size = sysconf(_SC_PAGE_SIZE); + if (sys_page_size < 0) { diff --git a/package/luajit/Makefile b/package/luajit/Makefile index 4d1612cd1..21fec1a1e 100644 --- a/package/luajit/Makefile +++ b/package/luajit/Makefile @@ -4,17 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= luajit -PKG_VERSION:= 2.0.4 +PKG_VERSION:= 0d313b243194a0b8d2399d8b549ca5a0ff234db5 +PKG_GIT:= hash PKG_RELEASE:= 1 -PKG_HASH:= 620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d PKG_DESCR:= just in time compiler for lua PKG_SECTION:= dev/lang PKG_URL:= http://luajit.org/download/ -PKG_SITES:= http://luajit.org/download/ - -DISTFILES:= LuaJIT-$(PKG_VERSION).tar.gz - -WRKDIST= $(WRKDIR)/LuaJIT-$(PKG_VERSION) +PKG_SITES:= https://luajit.org/git/luajit.git include $(ADK_TOPDIR)/mk/package.mk @@ -30,7 +26,7 @@ XAKE_FLAGS+= STATIC_CC="$(TARGET_CC)" \ LDFLAGS='' \ TARGET_CFLAGS='$(TARGET_CFLAGS) -fPIC' \ TARGET_LDFLAGS='$(TARGET_LDFLAGS)' \ - HOST_CC='$(HOST_CC) -m32' \ + HOST_CC='$(HOST_CC)' \ HOST_CFLAGS='$(HOST_CFLAGS)' \ HOST_LDFLAGS='$(HOST_LDFLAGS)' \ Q='' diff --git a/package/lvm/Makefile b/package/lvm/Makefile index ac782d98c..82ff98a3a 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -4,13 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= lvm -PKG_VERSION:= 2.02.177 -PKG_RELEASE:= 1 -PKG_HASH:= 4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2 +PKG_VERSION:= 2.02.188 +PKG_RELEASE:= 2 +PKG_HASH:= 7101e8b0816ad77e4390fed9749a090214ba520061cd083437871e19e50cc9bd PKG_DESCR:= logical volume management PKG_SECTION:= sys/fs -PKG_DEPENDS:= libdevmapper libncurses -PKG_BUILDDEP:= ncurses util-linux +PKG_DEPENDS:= libdevmapper libncurses libaio +PKG_KDEPENDS:= blk-dev-dm +PKG_BUILDDEP:= ncurses util-linux libaio PKG_NEEDS:= threads PKG_URL:= http://sourceware.org/lvm2/ PKG_SITES:= http://ftp.gwdg.de/pub/linux/sources.redhat.com/lvm2/ @@ -40,6 +41,8 @@ CONFIGURE_ARGS+= --with-user="" --with-group="" \ --with-optimisation="" \ --disable-testing \ --disable-blkid_wiping \ + --disable-udev-systemd-background-jobs \ + --with-symvers=no \ --with-lvm1=none CONFIGURE_ENV+= ac_cv_flag_HAVE_PIE=no \ ac_cv_func_malloc_0_nonnull=yes \ @@ -49,6 +52,8 @@ lvm-install: ${INSTALL_DIR} ${IDIR_LVM}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm \ ${IDIR_LVM}/usr/sbin + ${INSTALL_DIR} ${IDIR_LVM}/etc/ + ${INSTALL_DATA} ./files/lvm.conf ${IDIR_LVM}/etc/ libdevmapper-install: ${INSTALL_DIR} ${IDIR_LIBDEVMAPPER}/usr/lib diff --git a/package/lvm/files/lvm.conf b/package/lvm/files/lvm.conf new file mode 100644 index 000000000..a2e77c05d --- /dev/null +++ b/package/lvm/files/lvm.conf @@ -0,0 +1,4 @@ +devices { + # avoid constant cfgfs updates + write_cache_state = 0 +} diff --git a/package/lvm/patches/0001-configure-support-builds-without-versioning.patch b/package/lvm/patches/0001-configure-support-builds-without-versioning.patch new file mode 100644 index 000000000..49c20cccc --- /dev/null +++ b/package/lvm/patches/0001-configure-support-builds-without-versioning.patch @@ -0,0 +1,273 @@ +From 7a45d4d688d4966664ca94619b2ad0fc8d333d77 Mon Sep 17 00:00:00 2001 +From: Zdenek Kabelac <zkabelac@redhat.com> +Date: Mon, 29 Mar 2021 21:46:12 +0200 +Subject: [PATCH] configure: support builds without versioning + +Not all libc (like musl, uclibc dietlibc) libraries support full symbol +version resolution in runtime like glibc. +Add support to not generate symbol versions when compiling against them. + +Additionally libdevmapper.so was broken when compiled against +uclibc. Runtime linker loader caused calling dm_task_get_info_base() +function recursively, leading to segmentation fault. + +Introduce --with-symvers=STYLE option, which allows to choose +between gnu and disabled symbol versioning. By default gnu symbol +versioning is used. +__GNUC__ check is replaced now with GNU_SYMVER. +Additionally ld version script is included only in +case of gnu option, which slightly reduces output size. + +Providing --without-symvers to configure script when building against +uclibc library fixes segmentation fault error described above, due to +lack of several versions of the same symbol in libdevmapper.so +library. + +Based on: +https://patchwork.kernel.org/project/dm-devel/patch/20180831144817.31207-1-m.niestroj@grinn-global.com/ + +Suggested-by: Marcin Niestroj <m.niestroj@grinn-global.com> +--- + configure | 35 ++++++++++++++++++++++++++++++++--- + configure.ac | 26 +++++++++++++++++++++++--- + include/configure.h.in | 3 +++ + lib/misc/lib.h | 4 ++-- + libdm/datastruct/bitset.c | 4 +--- + libdm/ioctl/libdm-iface.c | 2 +- + libdm/libdm-deptree.c | 2 +- + libdm/libdm-stats.c | 2 +- + 8 files changed, 64 insertions(+), 14 deletions(-) + +diff --git a/configure b/configure +index bb8d502209d60..eeb8397a27d0b 100755 +--- a/configure ++++ b/configure +@@ -942,6 +942,7 @@ enable_cmirrord + with_cmirrord_pidfile + enable_debug + with_optimisation ++with_symvers + enable_profiling + enable_valgrind_pool + enable_devmapper +@@ -1792,6 +1793,8 @@ Optional Packages: + --with-cmirrord-pidfile=PATH + cmirrord pidfile [PID_DIR/cmirrord.pid] + --with-optimisation=OPT C optimisation flag [OPT=-O2] ++ --with-symvers=STYLE use symbol versioning of the shared library ++ [default=gnu] + --with-lvmlockd-pidfile=PATH + lvmlockd pidfile [PID_DIR/lvmlockd.pid] + --with-lvmetad-pidfile=PATH +@@ -3168,13 +3171,11 @@ if test -z "$CFLAGS"; then : + fi + case "$host_os" in + linux*) +- CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" + # equivalent to -rdynamic + ELDFLAGS="-Wl,--export-dynamic" + # FIXME Generate list and use --dynamic-list=.dlopen.sym + CLDWHOLEARCHIVE="-Wl,-whole-archive" + CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive" +- LDDEPS="$LDDEPS .export.sym" + LIB_SUFFIX=so + DEVMAPPER=yes + BUILD_LVMETAD=no +@@ -3190,7 +3191,6 @@ case "$host_os" in + ;; + darwin*) + CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" +- CLDFLAGS="$CLDFLAGS" + ELDFLAGS= + CLDWHOLEARCHIVE="-all_load" + CLDNOWHOLEARCHIVE= +@@ -11182,6 +11182,35 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COPTIMISE_FLAG" >&5 + $as_echo "$COPTIMISE_FLAG" >&6; } + ++################################################################################ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use symbol versioning" >&5 ++$as_echo_n "checking whether to use symbol versioning... " >&6; } ++ ++# Check whether --with-symvers was given. ++if test "${with_symvers+set}" = set; then : ++ withval=$with_symvers; case "$withval" in ++ gnu|no) symvers=$withval ;; ++ *) as_fn_error $? "Unknown argument to with-symvers" "$LINENO" 5 ;; ++ esac ++else ++ symvers=gnu ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $symvers" >&5 ++$as_echo "$symvers" >&6; } ++ ++if test "$GCC" = "yes" && test "$symvers" = "gnu" ; then ++ ++$as_echo "#define GNU_SYMVER 1" >>confdefs.h ++ ++ case "$host_os" in ++ linux*) ++ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" ++ LDDEPS="$LDDEPS .export.sym" ++ ;; ++ esac ++fi ++ + ################################################################################ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to gather gcov profiling data" >&5 + $as_echo_n "checking whether to gather gcov profiling data... " >&6; } +diff --git a/configure.ac b/configure.ac +index f040a5a713d7f..a2697d15c9150 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,13 +30,11 @@ AC_CANONICAL_TARGET([]) + AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"]) + case "$host_os" in + linux*) +- CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" + # equivalent to -rdynamic + ELDFLAGS="-Wl,--export-dynamic" + # FIXME Generate list and use --dynamic-list=.dlopen.sym + CLDWHOLEARCHIVE="-Wl,-whole-archive" + CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive" +- LDDEPS="$LDDEPS .export.sym" + LIB_SUFFIX=so + DEVMAPPER=yes + BUILD_LVMETAD=no +@@ -52,7 +50,6 @@ case "$host_os" in + ;; + darwin*) + CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" +- CLDFLAGS="$CLDFLAGS" + ELDFLAGS= + CLDWHOLEARCHIVE="-all_load" + CLDNOWHOLEARCHIVE= +@@ -981,6 +978,29 @@ AC_ARG_WITH(optimisation, + COPTIMISE_FLAG=$withval) + AC_MSG_RESULT($COPTIMISE_FLAG) + ++################################################################################ ++dnl -- Symbol versioning ++AC_MSG_CHECKING(whether to use symbol versioning) ++AC_ARG_WITH(symvers, ++ AC_HELP_STRING([--with-symvers=STYLE], ++ [use symbol versioning of the shared library [default=gnu]]), ++ [ case "$withval" in ++ gnu|no) symvers=$withval ;; ++ *) AC_MSG_ERROR(Unknown argument to with-symvers) ;; ++ esac], symvers=gnu) ++AC_MSG_RESULT($symvers) ++ ++if test "$GCC" = "yes" && test "$symvers" = "gnu" ; then ++ AC_DEFINE(GNU_SYMVER, 1, ++ [Define to use GNU versioning in the shared library.]) ++ case "$host_os" in ++ linux*) ++ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" ++ LDDEPS="$LDDEPS .export.sym" ++ ;; ++ esac ++fi ++ + ################################################################################ + dnl -- Enable profiling + AC_MSG_CHECKING(whether to gather gcov profiling data) +diff --git a/include/configure.h.in b/include/configure.h.in +index 49663e484e0b2..af0fa31e063a3 100644 +--- a/include/configure.h.in ++++ b/include/configure.h.in +@@ -150,6 +150,9 @@ + /* Path to fsadm binary. */ + #undef FSADM_PATH + ++/* Define to use GNU versioning in the shared library. */ ++#undef GNU_SYMVER ++ + /* Define to 1 if you have the `alarm' function. */ + #undef HAVE_ALARM + +diff --git a/lib/misc/lib.h b/lib/misc/lib.h +index d7fa5c721c118..3cd7a76ae3486 100644 +--- a/lib/misc/lib.h ++++ b/lib/misc/lib.h +@@ -42,7 +42,7 @@ + * specified version string. + * + * Since versioning is only available when compiling with GCC the entire +- * compatibility version should be enclosed in '#if defined(__GNUC__)', ++ * compatibility version should be enclosed in '#if defined(GNU_SYMVER)', + * for example: + * + * int dm_foo(int bar) +@@ -67,7 +67,7 @@ + * versions of library symbols prior to the introduction of symbol + * versioning: it must never be used for new symbols. + */ +-#if defined(__GNUC__) ++#if defined(GNU_SYMVER) + #define DM_EXPORT_SYMBOL(func, ver) \ + __asm__(".symver " #func "_v" #ver ", " #func "@DM_" #ver ) + #define DM_EXPORT_SYMBOL_BASE(func) \ +diff --git a/libdm/datastruct/bitset.c b/libdm/datastruct/bitset.c +index b0826e1eb54ec..642587e5472b1 100644 +--- a/libdm/datastruct/bitset.c ++++ b/libdm/datastruct/bitset.c +@@ -242,7 +242,7 @@ bad: + return NULL; + } + +-#if defined(__GNUC__) ++#if defined(GNU_SYMVER) + /* + * Maintain backward compatibility with older versions that did not + * accept a 'min_num_bits' argument to dm_bitset_parse_list(). +@@ -254,6 +254,4 @@ dm_bitset_t dm_bitset_parse_list_v1_02_129(const char *str, struct dm_pool *mem) + } + DM_EXPORT_SYMBOL(dm_bitset_parse_list, 1_02_129); + +-#else /* if defined(__GNUC__) */ +- + #endif +diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c +index 14186e680d97d..4be7ab34a704f 100644 +--- a/libdm/ioctl/libdm-iface.c ++++ b/libdm/ioctl/libdm-iface.c +@@ -2176,7 +2176,7 @@ void dm_lib_exit(void) + _version_checked = 0; + } + +-#if defined(__GNUC__) ++#if defined(GNU_SYMVER) + /* + * Maintain binary backward compatibility. + * Version script mechanism works with 'gcc' compatible compilers only. +diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c +index ba1ed1991a0cf..802db076e27f1 100644 +--- a/libdm/libdm-deptree.c ++++ b/libdm/libdm-deptree.c +@@ -3849,7 +3849,7 @@ void dm_tree_node_set_callback(struct dm_tree_node *dnode, + dnode->callback_data = data; + } + +-#if defined(__GNUC__) ++#if defined(GNU_SYMVER) + /* + * Backward compatible implementations. + * +diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c +index a3697c74dfde8..9f09f1c2f082e 100644 +--- a/libdm/libdm-stats.c ++++ b/libdm/libdm-stats.c +@@ -5069,7 +5069,7 @@ int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path, + * current dm_stats_create_region() version. + */ + +-#if defined(__GNUC__) ++#if defined(GNU_SYMVER) + int dm_stats_create_region_v1_02_106(struct dm_stats *dms, uint64_t *region_id, + uint64_t start, uint64_t len, int64_t step, + int precise, const char *program_id, +-- +2.33.1 + diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in deleted file mode 100644 index 305822e5b..000000000 --- a/package/lvm/patches/patch-Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ ---- LVM2.2.02.177.orig/Makefile.in 2017-12-18 21:44:34.000000000 +0100 -+++ LVM2.2.02.177/Makefile.in 2018-06-07 03:09:57.000000000 +0200 -@@ -18,7 +18,7 @@ top_builddir = @top_builddir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ - --SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools -+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools - - ifeq ("@UDEV_RULES@", "yes") - SUBDIRS += udev -@@ -69,7 +69,7 @@ liblvm.device-mapper: include.device-map - daemons.device-mapper: libdm.device-mapper - tools.device-mapper: libdm.device-mapper - scripts.device-mapper: include.device-mapper --device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper -+device-mapper: tools.device-mapper daemons.device-mapper - - ifeq ("@INTL@", "yes") - lib.pofile: include.pofile diff --git a/package/lvm/patches/patch-conf_Makefile_in b/package/lvm/patches/patch-conf_Makefile_in deleted file mode 100644 index 5b910dba7..000000000 --- a/package/lvm/patches/patch-conf_Makefile_in +++ /dev/null @@ -1,23 +0,0 @@ ---- LVM2.2.02.168.orig/conf/Makefile.in 2016-12-01 00:17:28.000000000 +0100 -+++ LVM2.2.02.168/conf/Makefile.in 2017-03-27 19:47:20.000000000 +0200 -@@ -37,14 +37,16 @@ generate: - - install_conf: $(CONFSRC) - @if [ ! -e $(confdir)/$(CONFDEST) ]; then \ -- echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST)"; \ -- $(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST); \ -+ echo "$(INSTALL_WDATA) $< $(confdir)/$(CONFDEST)"; \ -+ $(INSTALL_DIR) $(confdir); \ -+ $(INSTALL_WDATA) $< $(confdir)/$(CONFDEST); \ - fi - - install_localconf: $(CONFLOCAL) - @if [ ! -e $(confdir)/$(CONFLOCAL) ]; then \ -- echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFLOCAL)"; \ -- $(INSTALL_WDATA) -D $< $(confdir)/$(CONFLOCAL); \ -+ echo "$(INSTALL_WDATA) $< $(confdir)/$(CONFLOCAL)"; \ -+ $(INSTALL_DIR) $(confdir); \ -+ $(INSTALL_WDATA) $< $(confdir)/$(CONFLOCAL); \ - fi - - install_profiles: $(PROFILES) diff --git a/package/lvm/patches/patch-configure_in b/package/lvm/patches/patch-configure_in deleted file mode 100644 index a1b99eae9..000000000 --- a/package/lvm/patches/patch-configure_in +++ /dev/null @@ -1,45 +0,0 @@ ---- LVM2.2.02.177.orig/configure.in 2017-12-18 21:44:34.000000000 +0100 -+++ LVM2.2.02.177/configure.in 2018-06-07 03:09:58.000000000 +0200 -@@ -29,7 +29,7 @@ AC_CANONICAL_TARGET([]) - - AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"]) - case "$host_os" in -- linux*) -+ *) - CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" - # equivalent to -rdynamic - ELDFLAGS="-Wl,--export-dynamic" -@@ -50,21 +50,6 @@ case "$host_os" in - FSADM=yes - BLKDEACTIVATE=yes - ;; -- darwin*) -- CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" -- CLDFLAGS="$CLDFLAGS" -- ELDFLAGS= -- CLDWHOLEARCHIVE="-all_load" -- CLDNOWHOLEARCHIVE= -- LIB_SUFFIX=dylib -- DEVMAPPER=yes -- ODIRECT=no -- DM_IOCTLS=no -- SELINUX=no -- CLUSTER=none -- FSADM=no -- BLKDEACTIVATE=no -- ;; - esac - - ################################################################################ -@@ -111,10 +96,8 @@ AC_CHECK_HEADERS([assert.h ctype.h diren - AC_CHECK_HEADERS(termios.h sys/statvfs.h sys/timerfd.h sys/vfs.h linux/magic.h linux/fiemap.h) - - case "$host_os" in -- linux*) -+ *) - AC_CHECK_HEADERS(asm/byteorder.h linux/fs.h malloc.h,,AC_MSG_ERROR(bailing out)) ;; -- darwin*) -- AC_CHECK_HEADERS(machine/endian.h sys/disk.h,,AC_MSG_ERROR(bailing out)) ;; - esac - - ################################################################################ diff --git a/package/lvm/patches/patch-lib_mm_memlock_c b/package/lvm/patches/patch-lib_mm_memlock_c deleted file mode 100644 index af53ad132..000000000 --- a/package/lvm/patches/patch-lib_mm_memlock_c +++ /dev/null @@ -1,76 +0,0 @@ ---- LVM2.2.02.177.orig/lib/mm/memlock.c 2017-12-18 21:44:35.000000000 +0100 -+++ LVM2.2.02.177/lib/mm/memlock.c 2018-06-07 03:09:58.000000000 +0200 -@@ -25,7 +25,6 @@ - #include <sys/mman.h> - #include <sys/time.h> - #include <sys/resource.h> --#include <malloc.h> - - #ifdef HAVE_VALGRIND - #include <valgrind.h> -@@ -152,10 +151,8 @@ static void _touch_memory(void *mem, siz - static void _allocate_memory(void) - { - #ifndef VALGRIND_POOL -- void *stack_mem; -+ void *stack_mem, *temp_malloc_mem; - struct rlimit limit; -- int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; -- char *areas[max_areas]; - - /* Check if we could preallocate requested stack */ - if ((getrlimit (RLIMIT_STACK, &limit) == 0) && -@@ -164,50 +161,13 @@ static void _allocate_memory(void) - _touch_memory(stack_mem, _size_stack); - /* FIXME else warn user setting got ignored */ - -- /* -- * When a brk() fails due to fragmented address space (which sometimes -- * happens when we try to grab 8M or so), glibc will make a new -- * arena. In this arena, the rules for using “direct” mmap are relaxed, -- * circumventing the MAX_MMAPs and MMAP_THRESHOLD settings. We can, -- * however, detect when this happens with mallinfo() and try to co-opt -- * malloc into using MMAP as a MORECORE substitute instead of returning -- * MMAP'd memory directly. Since MMAP-as-MORECORE does not munmap the -- * memory on free(), this is good enough for our purposes. -- */ -- while (missing > 0) { -- struct mallinfo inf = mallinfo(); -- hblks = inf.hblks; -- -- if ((areas[area] = malloc(_size_malloc_tmp))) -- _touch_memory(areas[area], _size_malloc_tmp); -- -- inf = mallinfo(); -- -- if (hblks < inf.hblks) { -- /* malloc cheated and used mmap, even though we told it -- not to; we try with twice as many areas, each half -- the size, to circumvent the faulty logic in glibc */ -- free(areas[area]); -- _size_malloc_tmp /= 2; -- } else { -- ++ area; -- missing -= _size_malloc_tmp; -- } -- -- if (area == max_areas && missing > 0) { -- /* Too bad. Warn the user and proceed, as things are -- * most likely going to work out anyway. */ -- log_warn("WARNING: Failed to reserve memory, %d bytes missing.", missing); -- break; -- } -- } -+ if ((temp_malloc_mem = malloc(_size_malloc_tmp))) -+ _touch_memory(temp_malloc_mem, _size_malloc_tmp); - - if ((_malloc_mem = malloc(_size_malloc))) - _touch_memory(_malloc_mem, _size_malloc); - -- /* free up the reserves so subsequent malloc's can use that memory */ -- for (i = 0; i < area; ++i) -- free(areas[i]); -+ free(temp_malloc_mem); - #endif - } - diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in deleted file mode 100644 index 4943fab06..000000000 --- a/package/lvm/patches/patch-libdm_Makefile_in +++ /dev/null @@ -1,49 +0,0 @@ ---- LVM2.2.02.168.orig/libdm/Makefile.in 2016-12-01 00:17:30.000000000 +0100 -+++ LVM2.2.02.168/libdm/Makefile.in 2017-03-27 20:24:52.000000000 +0200 -@@ -38,10 +38,7 @@ SOURCES =\ - - INCLUDES = -I$(srcdir)/$(interface) - --ifeq ("@STATIC_LINK@", "yes") - LIB_STATIC = $(interface)/libdevmapper.a --endif -- - LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX) - LIB_VERSION = $(LIB_VERSION_DM) - TARGETS = libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) -@@ -69,9 +66,7 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper. - - INSTALL_TYPE = install_dynamic - --ifeq ("@STATIC_LINK@", "yes") -- INSTALL_TYPE += install_static --endif -+INSTALL_TYPE += install_static - - ifeq ("@PKGCONFIG@", "yes") - INSTALL_TYPE += install_pkgconfig -@@ -82,7 +77,8 @@ install: $(INSTALL_TYPE) install_include - install_device-mapper: install - - install_include: $(srcdir)/libdevmapper.h -- $(INSTALL_DATA) -D $< $(includedir)/$(<F) -+ $(INSTALL_DIR) $(includedir) -+ $(INSTALL_DATA) $< $(includedir)/$(<F) - - install_dynamic: install_@interface@ - -@@ -91,10 +87,12 @@ install_static: install_@interface@_stat - install_ioctl: install_lib_shared - - install_pkgconfig: libdevmapper.pc -- $(INSTALL_DATA) -D $< $(pkgconfigdir)/devmapper.pc -+ $(INSTALL_DIR) $(pkgconfigdir) -+ $(INSTALL_DATA) $< $(pkgconfigdir)/devmapper.pc - - install_ioctl_static: $(LIB_STATIC) -- $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F) -+ $(INSTALL_DIR) $(usrlibdir) -+ $(INSTALL_DATA) $< $(usrlibdir)/$(<F) - - CLEAN_TARGETS += ioctl/libdevmapper.a - DISTCLEAN_TARGETS += libdevmapper.pc diff --git a/package/lvm/patches/patch-make_tmpl_in b/package/lvm/patches/patch-make_tmpl_in deleted file mode 100644 index 7ddf32071..000000000 --- a/package/lvm/patches/patch-make_tmpl_in +++ /dev/null @@ -1,28 +0,0 @@ ---- LVM2.2.02.177.orig/make.tmpl.in 2017-12-18 21:44:35.000000000 +0100 -+++ LVM2.2.02.177/make.tmpl.in 2018-06-07 03:09:58.000000000 +0200 -@@ -468,7 +468,8 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSI - CLEAN_TARGETS += $(LDDEPS) .exported_symbols_generated - - install_lib_shared: $(LIB_SHARED) -- $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION) -+ $(INSTALL_DIR) $(libdir) -+ $(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION) - $(INSTALL_DIR) $(usrlibdir) - $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F) - -@@ -476,11 +477,13 @@ install_lib_shared: $(LIB_SHARED) - # and for compatibility links in libdir are created - # when the code is fixed links could be removed. - install_dm_plugin: $(LIB_SHARED) -- $(INSTALL_PROGRAM) -D $< $(libdir)/device-mapper/$(<F) -+ $(INSTALL_DIR) $(libdir) -+ $(INSTALL_PROGRAM) $< $(libdir)/device-mapper/$(<F) - $(LN_S) -f device-mapper/$(<F) $(libdir)/$(<F) - - install_lvm2_plugin: $(LIB_SHARED) -- $(INSTALL_PROGRAM) -D $< $(libdir)/lvm2/$(<F) -+ $(INSTALL_DIR) $(libdir) -+ $(INSTALL_PROGRAM) $< $(libdir)/lvm2/$(<F) - $(LN_S) -f lvm2/$(<F) $(libdir)/$(<F) - $(LN_S) -f $(<F) $(libdir)/$(<F).$(LIB_VERSION) - endif diff --git a/package/lvm/patches/patch-scripts_Makefile_in b/package/lvm/patches/patch-scripts_Makefile_in deleted file mode 100644 index af1cea8cb..000000000 --- a/package/lvm/patches/patch-scripts_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ ---- LVM2.2.02.168.orig/scripts/Makefile.in 2016-12-01 00:17:31.000000000 +0100 -+++ LVM2.2.02.168/scripts/Makefile.in 2017-03-27 20:49:38.000000000 +0200 -@@ -51,7 +51,8 @@ vpath %.sh $(srcdir) - vpath %.ocf $(srcdir) - - %_install: %.sh -- $(INSTALL_PROGRAM) -D $< $(sbindir)/$(basename $(<F)) -+ $(INSTALL_DIR) $(sbindir) -+ $(INSTALL_PROGRAM) $< $(sbindir)/$(basename $(<F)) - - %_install: %.ocf - $(INSTALL_DIR) $(ocf_scriptdir) diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in deleted file mode 100644 index 9fc597990..000000000 --- a/package/lvm/patches/patch-tools_Makefile_in +++ /dev/null @@ -1,48 +0,0 @@ ---- LVM2.2.02.177.orig/tools/Makefile.in 2017-12-18 21:44:35.000000000 +0100 -+++ LVM2.2.02.177/tools/Makefile.in 2018-06-07 03:15:42.000000000 +0200 -@@ -217,18 +217,21 @@ endif - install_dmsetup_dynamic install_dmsetup_static - - install_cmdlib_include: $(srcdir)/lvm2cmd.h -- $(INSTALL_DATA) -D $< $(includedir)/$(<F) -+ $(INSTALL_DIR) $(includedir) -+ $(INSTALL_DATA) $< $(includedir)/$(<F) - - install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX) -- $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION) - $(INSTALL_DIR) $(usrlibdir) -+ $(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION) - $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F) - - install_cmdlib_static: liblvm2cmd-static.a -+ $(INSTALL_DIR) $(usrlibdir) - $(INSTALL_DATA) -D $< $(usrlibdir)/liblvm2cmd.a - - install_tools_dynamic: lvm .commands -- $(INSTALL_PROGRAM) -D lvm $(sbindir)/lvm -+ $(INSTALL_DIR) $(sbindir) -+ $(INSTALL_PROGRAM) lvm $(sbindir)/lvm - @echo Creating symbolic links for individual commands in $(sbindir) - @for v in `cat .commands`; do \ - echo "$(LN_S) -f lvm $(sbindir)/$$v"; \ -@@ -236,14 +239,17 @@ install_tools_dynamic: lvm .commands - done; - - install_tools_static: lvm.static -- $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) -+ $(INSTALL_DIR) $(staticdir) -+ $(INSTALL_PROGRAM) $< $(staticdir)/$(<F) - - install_dmsetup_dynamic: dmsetup -- $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F) -+ $(INSTALL_DIR) $(sbindir) -+ $(INSTALL_PROGRAM) $< $(sbindir)/$(<F) - $(LN_S) -f $(<F) $(sbindir)/dmstats - - install_dmsetup_static: dmsetup.static -- $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) -+ $(INSTALL_DIR) $(staticdir) -+ $(INSTALL_PROGRAM) $< $(staticdir)/$(<F) - $(LN_S) -f $(<F) $(staticdir)/dmstats - - install_device-mapper: $(INSTALL_DMSETUP_TARGETS) diff --git a/package/lvm/patches/patch-tools_lvmcmdline_c b/package/lvm/patches/patch-tools_lvmcmdline_c deleted file mode 100644 index 8c5cb5c6b..000000000 --- a/package/lvm/patches/patch-tools_lvmcmdline_c +++ /dev/null @@ -1,34 +0,0 @@ ---- LVM2.2.02.177.orig/tools/lvmcmdline.c 2017-12-18 21:44:35.000000000 +0100 -+++ LVM2.2.02.177/tools/lvmcmdline.c 2018-06-07 03:09:58.000000000 +0200 -@@ -3093,9 +3093,12 @@ int lvm_split(char *str, int *argc, char - static int _check_standard_fds(void) - { - int err = is_valid_fd(STDERR_FILENO); -+ FILE *stdin_stream = stdin; -+ FILE *stdout_stream = stdout; -+ FILE *stderr_stream = stderr; - - if (!is_valid_fd(STDIN_FILENO) && -- !(stdin = fopen(_PATH_DEVNULL, "r"))) { -+ !(stdin_stream = fopen(_PATH_DEVNULL, "r"))) { - if (err) - perror("stdin stream open"); - else -@@ -3105,7 +3108,7 @@ static int _check_standard_fds(void) - } - - if (!is_valid_fd(STDOUT_FILENO) && -- !(stdout = fopen(_PATH_DEVNULL, "w"))) { -+ !(stdout_stream = fopen(_PATH_DEVNULL, "w"))) { - if (err) - perror("stdout stream open"); - /* else no stdout */ -@@ -3113,7 +3116,7 @@ static int _check_standard_fds(void) - } - - if (!is_valid_fd(STDERR_FILENO) && -- !(stderr = fopen(_PATH_DEVNULL, "w"))) { -+ !(stderr_stream = fopen(_PATH_DEVNULL, "w"))) { - printf("stderr stream open: %s\n", - strerror(errno)); - return 0; diff --git a/package/lynx/Makefile b/package/lynx/Makefile index 8a1e2b2af..f5488dc1f 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -4,19 +4,19 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= lynx -PKG_VERSION:= 2.8.8 -PKG_RELEASE:= 3 -PKG_HASH:= 234c9dc77d4c4594ad6216d7df4d49eae3019a3880e602f39721b35b97fbc408 +PKG_VERSION:= 2.9.0 +PKG_RELEASE:= 1 +PKG_HASH:= 746c926e28d50571a42d2477f9c50784b27fc8cba4c7db7f3e6c9e00dde89070 PKG_DESCR:= text browser PKG_SECTION:= app/browser PKG_DEPENDS:= libncurses zlib libressl PKG_BUILDDEP:= ncurses zlib libressl -PKG_URL:= http://lynx.isc.org/ -PKG_SITES:= http://lynx.isc.org/${PKG_NAME}${PKG_VERSION}/ +PKG_URL:= https://lynx.invisible-island.net/ +PKG_SITES:= https://invisible-island.net/archives/lynx/tarballs/ PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/lynx2-8-8 +WRKDIST= ${WRKDIR}/$(PKG_NAME)$(PKG_VERSION) include ${ADK_TOPDIR}/mk/package.mk @@ -24,6 +24,7 @@ $(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/include/openssl TARGET_CPPFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT +HOST_CFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT CONFIGURE_ENV+= ac_cv_path_TELNET=telnet \ ac_cv_path_TN3270=tn3270 \ diff --git a/package/lynx/patches/patch-WWW_Library_Implementation_HTTP_c b/package/lynx/patches/patch-WWW_Library_Implementation_HTTP_c deleted file mode 100644 index 8f563a71b..000000000 --- a/package/lynx/patches/patch-WWW_Library_Implementation_HTTP_c +++ /dev/null @@ -1,11 +0,0 @@ ---- lynx2-8-8.orig/WWW/Library/Implementation/HTTP.c 2014-01-11 20:06:15.000000000 +0100 -+++ lynx2-8-8/WWW/Library/Implementation/HTTP.c 2017-06-05 13:30:53.165071650 +0200 -@@ -720,7 +720,7 @@ static int HTLoadHTTP(const char *arg, - #elif SSLEAY_VERSION_NUMBER >= 0x0900 - #ifndef USE_NSS_COMPAT_INCL - if (!try_tls) { -- handle->options |= SSL_OP_NO_TLSv1; -+ SSL_set_options(handle, SSL_OP_NO_TLSv1); - #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) - } else { - int ret = (int) SSL_set_tlsext_host_name(handle, ssl_host); diff --git a/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h b/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h deleted file mode 100644 index c8217b70e..000000000 --- a/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h +++ /dev/null @@ -1,34 +0,0 @@ ---- lynx2-8-8.orig/WWW/Library/Implementation/HTUtils.h 2014-02-05 01:50:18.000000000 +0100 -+++ lynx2-8-8/WWW/Library/Implementation/HTUtils.h 2014-03-21 22:14:07.000000000 +0100 -@@ -725,6 +725,8 @@ extern int WWW_TraceMask; - - #define SHORTENED_RBIND /* FIXME: do this in configure-script */ - -+#ifdef DONT_USE_SSL -+#else - #ifdef USE_SSL - - #define free_func free__func -@@ -765,6 +767,7 @@ extern int WWW_TraceMask; - - #undef free_func - #endif /* USE_SSL */ -+#endif - - #ifdef HAVE_BSD_STDLIB_H - #include <bsd/stdlib.h> /* prototype for arc4random.h */ -@@ -801,11 +804,14 @@ extern "C" { - - extern FILE *TraceFP(void); - -+#ifdef DONT_USE_SSL -+#else - #ifdef USE_SSL - extern SSL *HTGetSSLHandle(void); - extern void HTSSLInitPRNG(void); - extern int HTGetSSLCharacter(void *handle); - #endif /* USE_SSL */ -+#endif - - #ifdef __cplusplus - } diff --git a/package/lynx/patches/patch-makefile_in b/package/lynx/patches/patch-makefile_in deleted file mode 100644 index 5cb6b5962..000000000 --- a/package/lynx/patches/patch-makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- lynx2-8-8.orig/makefile.in 2014-03-09 22:43:10.000000000 +0100 -+++ lynx2-8-8/makefile.in 2014-03-21 23:17:26.000000000 +0100 -@@ -210,7 +210,7 @@ SRC_CFLAGS = \ - WWWINC=$(WWW_DIR) \ - WWWLIB="../$(WWW_DIR)/libwww.a" - --actual_PROG = `echo lynx| sed '$(transform)'` -+actual_PROG = lynx - binary_PROG = $(actual_PROG)$x - - all lynx$x: cfg_defs.h LYHelp.h diff --git a/package/lynx/patches/patch-src_chrtrans_makeuctb_c b/package/lynx/patches/patch-src_chrtrans_makeuctb_c deleted file mode 100644 index 9972a6f8c..000000000 --- a/package/lynx/patches/patch-src_chrtrans_makeuctb_c +++ /dev/null @@ -1,10 +0,0 @@ ---- lynx2-8-8.orig/src/chrtrans/makeuctb.c 2013-11-29 01:52:56.000000000 +0100 -+++ lynx2-8-8/src/chrtrans/makeuctb.c 2014-03-21 22:12:13.000000000 +0100 -@@ -28,6 +28,7 @@ - - #define DONT_USE_GETTEXT - #define DONT_USE_SOCKS5 -+#define DONT_USE_SSL - #include <UCDefs.h> - #include <UCkd.h> - diff --git a/package/lz4/Makefile b/package/lz4/Makefile index 605d446d0..148144693 100644 --- a/package/lz4/Makefile +++ b/package/lz4/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= lz4 -PKG_VERSION:= 1.9.2 +PKG_VERSION:= 1.9.4 PKG_RELEASE:= 1 -PKG_HASH:= 658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc +PKG_HASH:= 0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b PKG_DESCR:= compression utility PKG_SECTION:= app/archive PKG_DEPENDS:= liblz4 diff --git a/package/lz4/patches/patch-lib_liblz4_pc_in b/package/lz4/patches/patch-lib_liblz4_pc_in deleted file mode 100644 index 05fc1b2ca..000000000 --- a/package/lz4/patches/patch-lib_liblz4_pc_in +++ /dev/null @@ -1,10 +0,0 @@ ---- lz4-1.9.2.orig/lib/liblz4.pc.in 2019-08-15 13:59:59.000000000 +0200 -+++ lz4-1.9.2/lib/liblz4.pc.in 2019-10-07 22:01:00.003319055 +0200 -@@ -10,5 +10,5 @@ Name: lz4 - Description: extremely fast lossless compression algorithm library - URL: http://www.lz4.org/ - Version: @VERSION@ --Libs: -L@LIBDIR@ -llz4 --Cflags: -I@INCLUDEDIR@ -+Libs: -llz4 -+Cflags: diff --git a/package/lzip/Makefile b/package/lzip/Makefile index 564e8ee55..90fa5dbab 100644 --- a/package/lzip/Makefile +++ b/package/lzip/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= lzip -PKG_VERSION:= 1.21 +PKG_VERSION:= 1.24 PKG_RELEASE:= 1 -PKG_HASH:= e48b5039d3164d670791f9c5dbaa832bf2df080cb1fbb4f33aa7b3300b670d8b +PKG_HASH:= d42659229b10e066eeb6e81eb673cdd893b672e512d26719c2d95975556ca56c PKG_DESCR:= compression utility PKG_SECTION:= app/archive PKG_NEEDS:= c++ diff --git a/package/lzip/patches/patch-configure b/package/lzip/patches/patch-configure index 3ac80460f..f7e067a0e 100644 --- a/package/lzip/patches/patch-configure +++ b/package/lzip/patches/patch-configure @@ -1,9 +1,9 @@ ---- lzip-1.17.orig/configure 2015-07-09 18:58:33.000000000 +0200 -+++ lzip-1.17/configure 2016-09-24 13:07:38.493476268 +0200 -@@ -20,10 +20,10 @@ bindir='$(exec_prefix)/bin' - datarootdir='$(prefix)/share' - infodir='$(datarootdir)/info' - mandir='$(datarootdir)/man' +--- lzip-1.24.orig/configure 2024-01-26 14:01:44.000000000 +0100 ++++ lzip-1.24/configure 2024-02-12 07:10:37.674941547 +0100 +@@ -23,10 +23,10 @@ mandir='$(datarootdir)/man' + build=no + check=no + installdir= -CXX=g++ -CPPFLAGS= -CXXFLAGS='-Wall -W -O2' @@ -12,6 +12,6 @@ +CPPFLAGS?= +CXXFLAGS?='-Wall -W -O2' +LDFLAGS?= + MAKEINFO=makeinfo # checking whether we are using GNU C++. - ${CXX} --version > /dev/null 2>&1 diff --git a/package/m4/Makefile b/package/m4/Makefile index a6af849a3..6973ed164 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.18 +PKG_VERSION:= 1.4.19 PKG_RELEASE:= 1 -PKG_HASH:= f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07 +PKG_HASH:= 63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96 PKG_DESCR:= macro processor PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host diff --git a/package/m4/patches/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/package/m4/patches/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch deleted file mode 100644 index 5c5c11b99..000000000 --- a/package/m4/patches/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Mon, 5 Mar 2018 10:56:29 -0800 -Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem reported by Daniel P. Berrangé in: -https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html -* lib/fbufmode.c (fbufmode): -* lib/fflush.c (clear_ungetc_buffer_preserving_position) -(disable_seek_optimization, rpl_fflush): -* lib/fpending.c (__fpending): -* lib/fpurge.c (fpurge): -* lib/freadable.c (freadable): -* lib/freadahead.c (freadahead): -* lib/freading.c (freading): -* lib/freadptr.c (freadptr): -* lib/freadseek.c (freadptrinc): -* lib/fseeko.c (fseeko): -* lib/fseterr.c (fseterr): -* lib/fwritable.c (fwritable): -* lib/fwriting.c (fwriting): -Check _IO_EOF_SEEN instead of _IO_ftrylockfile. -* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: -Define if not already defined. - -[yann.morin.1998@free.fr: partially backport from upstream gnulib] -Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> - ---- - lib/fflush.c | 6 +++--- - lib/fpending.c | 2 +- - lib/fpurge.c | 2 +- - lib/freadahead.c | 2 +- - lib/freading.c | 2 +- - lib/fseeko.c | 4 ++-- - lib/stdio-impl.h | 6 ++++++ - 7 files changed, 15 insertions(+), 9 deletions(-) - -diff --git a/lib/fflush.c b/build-aux/gnulib/lib/fflush.c -index 983ade0ff..a6edfa105 100644 ---- a/lib/fflush.c -+++ b/lib/fflush.c -@@ -33,7 +33,7 @@ - #undef fflush - - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ - static void -@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) - - #endif - --#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) - - # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) - if (stream == NULL || ! freading (stream)) - return fflush (stream); - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - clear_ungetc_buffer_preserving_position (stream); - -diff --git a/lib/fpending.c b/build-aux/gnulib/lib/fpending.c -index c84e3a5b4..789f50e4e 100644 ---- a/lib/fpending.c -+++ b/lib/fpending.c -@@ -32,7 +32,7 @@ __fpending (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return fp->_IO_write_ptr - fp->_IO_write_base; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -diff --git a/lib/fpurge.c b/build-aux/gnulib/lib/fpurge.c -index b1d417c7a..3aedcc373 100644 ---- a/lib/fpurge.c -+++ b/lib/fpurge.c -@@ -62,7 +62,7 @@ fpurge (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_IO_read_end = fp->_IO_read_ptr; - fp->_IO_write_ptr = fp->_IO_write_base; - /* Avoid memory leak when there is an active ungetc buffer. */ -diff --git a/lib/freadahead.c b/build-aux/gnulib/lib/freadahead.c -index c2ecb5b28..23ec76ee5 100644 ---- a/lib/freadahead.c -+++ b/lib/freadahead.c -@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *); - size_t - freadahead (FILE *fp) - { --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; - return (fp->_IO_read_end - fp->_IO_read_ptr) -diff --git a/lib/freading.c b/build-aux/gnulib/lib/freading.c -index 73c28acdd..c24d0c88a 100644 ---- a/lib/freading.c -+++ b/lib/freading.c -@@ -31,7 +31,7 @@ freading (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return ((fp->_flags & _IO_NO_WRITES) != 0 - || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 - && fp->_IO_read_base != NULL)); -diff --git a/lib/fseeko.c b/build-aux/gnulib/lib/fseeko.c -index 0101ab55f..193f4e8ce 100644 ---- a/lib/fseeko.c -+++ b/lib/fseeko.c -@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) -@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -diff --git a/lib/stdio-impl.h b/build-aux/gnulib/lib/stdio-impl.h -index 78d896e9f..05c5752a2 100644 ---- a/lib/stdio-impl.h -+++ b/lib/stdio-impl.h -@@ -18,6 +18,12 @@ - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this -+ problem by defining it ourselves. FIXME: Do not rely on glibc -+ internals. */ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif - - /* BSD stdio derived implementations. */ - --- -2.14.1 - diff --git a/package/m4/patches/patch-lib_vasnprintf_c b/package/m4/patches/patch-lib_vasnprintf_c deleted file mode 100644 index 07b989cc6..000000000 --- a/package/m4/patches/patch-lib_vasnprintf_c +++ /dev/null @@ -1,28 +0,0 @@ ---- m4-1.4.18.orig/lib/vasnprintf.c 2016-12-31 14:54:42.000000000 +0100 -+++ m4-1.4.18/lib/vasnprintf.c 2018-02-24 20:59:00.000000000 +0100 -@@ -4858,7 +4858,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) -+# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ -+ && !defined __UCLIBC__) \ -+ || (defined __APPLE__ && defined __MACH__) \ -+ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; -@@ -4872,6 +4875,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - in format strings in writable memory may crash the program - (if compiled with _FORTIFY_SOURCE=2), so we should avoid it - in this situation. */ -+ /* On Mac OS X 10.3 or newer, we know that snprintf's return -+ value conforms to ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 -+ and gl_SNPRINTF_TRUNCATION_C99 pass. -+ Therefore we can avoid using %n in this situation. -+ On Mac OS X 10.13 or newer, the use of %n in format strings -+ in writable memory by default crashes the program, so we -+ should avoid it in this situation. */ - /* On native Windows systems (such as mingw), we can avoid using - %n because: - - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, diff --git a/package/make/Makefile b/package/make/Makefile index 670bbfe06..ee584771a 100644 --- a/package/make/Makefile +++ b/package/make/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= make -PKG_VERSION:= 4.2.1 -PKG_RELEASE:= 2 -PKG_HASH:= e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7 +PKG_VERSION:= 4.4.1 +PKG_RELEASE:= 1 +PKG_HASH:= dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3 PKG_DESCR:= c/c++ code buildtool PKG_SECTION:= dev/tools PKG_DEPENDS:= libelf diff --git a/package/make/patches/patch-configure_ac b/package/make/patches/patch-configure_ac deleted file mode 100644 index e155851b4..000000000 --- a/package/make/patches/patch-configure_ac +++ /dev/null @@ -1,14 +0,0 @@ ---- make-4.2.1.orig/configure.ac 2016-06-06 12:27:31.000000000 +0000 -+++ make-4.2.1/configure.ac 2018-02-28 20:57:40.797354623 +0000 -@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU g - #include <glob.h> - #include <fnmatch.h> - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include <gnu-versions.h> --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], diff --git a/package/mariadb/Makefile b/package/mariadb/Makefile index 2eee4c9c5..33a865c1f 100644 --- a/package/mariadb/Makefile +++ b/package/mariadb/Makefile @@ -4,14 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mariadb -PKG_VERSION:= 10.6.4 +PKG_VERSION:= 10.11.7 PKG_RELEASE:= 1 -PKG_HASH:= 75bf9b147a95d38160d01a73b098d50a1960563b46d16a235971fff64d99643c +PKG_HASH:= 5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157 PKG_DESCR:= sql client library PKG_SECTION:= libs/db -PKG_DEPENDS:= libncurses zlib libevent libpcre boost -PKG_BUILDDEP:= cmake-host mariadb-host ncurses zlib readline libevent pcre libressl -PKG_BUILDDEP+= boost +PKG_DEPENDS:= libncurses zlib libevent libpcre boost libfmt libkrb5 +PKG_BUILDDEP:= cmake-host mariadb-host ncurses zlib readline libevent +PKG_BUILDDEP+= boost fmt gnutls pcre2 krb5 HOST_BUILDDEP:= cmake-host PKG_NEEDS:= c++ PKG_URL:= http://www.mariadb.org/ @@ -19,6 +19,8 @@ PKG_SITES= https://downloads.mariadb.org/interstitial/mariadb-$(PKG_VERSION)/so PKG_LIBNAME:= libmariadbclient PKG_OPTS:= dev +PKG_CFLINE_MARIADB:= select ADK_PACKAGE_BOOST_DATE_TIME + # atomic ops not implemented PKG_ARCH_DEPENDS:= !mips @@ -38,8 +40,8 @@ HOST_ALL_TARGET:= import_executables CONFIG_STYLE:= cmake CMAKE_FLAGS+= -DCMAKE_CROSSCOMPILING=ON \ -DIMPORT_EXECUTABLES=${BASE_DIR}/host_build_${GNU_HOST_NAME}/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-host/$(PKG_NAME)-$(PKG_VERSION)/import_executables.cmake \ - -DWITH_SSL=system \ - -DWITHOUT_SERVER=OFF \ + -DWITHOUT_SERVER=ON \ + -DWITH_SSL=bundled \ -DWITH_SYSTEMD=auto \ -DSECURITY_HARDENED=OFF \ -DWITHOUT_DYNAMIC_PLUGINS=ON \ @@ -63,6 +65,8 @@ libmariadbclient-install: ${INSTALL_DIR} ${IDIR_LIBMARIADBCLIENT}/usr/lib ${CP} ${WRKINST}/usr/lib/libmysqlclient.so* \ ${IDIR_LIBMARIADBCLIENT}/usr/lib + ${CP} ${WRKINST}/usr/lib/libmariadb.so* \ + ${IDIR_LIBMARIADBCLIENT}/usr/lib include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mbedtls/Makefile b/package/mbedtls/Makefile index 9771ffc96..9ce0d5468 100644 --- a/package/mbedtls/Makefile +++ b/package/mbedtls/Makefile @@ -4,17 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mbedtls -PKG_VERSION:= 2.3.0 +PKG_VERSION:= 2.28.7 PKG_RELEASE:= 1 -PKG_HASH:= 590734c8bc8b3ac48e9123d44bf03562e91f8dce0d1ac2615c318c077f3215b2 +PKG_HASH:= 1df6073f0cf6a4e1953890bf5e0de2a8c7e6be50d6d6c69fa9fefcb1d14e981a PKG_DESCR:= embedded ssl/tls library PKG_SECTION:= libs/crypto PKG_URL:= https://tls.mbed.org -PKG_SITES:= https://tls.mbed.org/download/ +PKG_SITES:= https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/ PKG_LIBNAME:= libmbedtls PKG_OPTS:= dev -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-apache.tgz +DISTFILES:= v$(PKG_VERSION).tar.gz include $(ADK_TOPDIR)/mk/package.mk @@ -24,9 +24,7 @@ CONFIG_STYLE:= manual ALL_TARGET:= lib TARGET_CFLAGS+= -DSHARED -libpolarssl-install: +libmbedtls-install: $(INSTALL_DIR) $(IDIR_LIBMBEDTLS)/usr/lib - $(CP) $(WRKINST)/usr/lib/libpolarssl.so* \ - $(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 new file mode 100644 index 000000000..95c3340e1 --- /dev/null +++ b/package/mbedtls/patches/patch-Makefile @@ -0,0 +1,35 @@ +--- 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/mc/Makefile b/package/mc/Makefile index 49c0db187..539c292c4 100644 --- a/package/mc/Makefile +++ b/package/mc/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mc -PKG_VERSION:= 4.8.23 +PKG_VERSION:= 4.8.31 PKG_RELEASE:= 1 -PKG_HASH:= dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c +PKG_HASH:= 24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a PKG_DESCR:= norton commander clone PKG_SECTION:= sys/misc PKG_DEPENDS:= glib libncurses libssh2 @@ -19,11 +19,9 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,MC,mc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_LDFLAGS+= -ltinfo +TARGET_LDFLAGS+= -ltinfo -lncurses CONFIGURE_ARGS+= --enable-charset \ - --disable-extcharset \ --disable-background \ - --disable-gcc-warnings \ --disable-glibtest \ --disable-netcode \ --without-libiconv-prefix \ @@ -37,7 +35,7 @@ CONFIGURE_ARGS+= --enable-charset \ --without-ext2undel \ --with-subshell \ --with-screen=ncurses \ - --with-edit + --disable-silent-rules CONFIGURE_ENV+= mc_cv_have_zipinfo=yes \ am_cv_func_iconv=no @@ -48,7 +46,7 @@ mc-install: ${CP} ${WRKINST}/usr/share/mc/* ${IDIR_MC}/usr/share/mc ${INSTALL_BIN} ${WRKINST}/usr/bin/mc ${IDIR_MC}/usr/bin/ cd ${IDIR_MC}/usr/bin && ln -fs mc mcedit && ln -fs mc mcview - cd ${WRKINST}/etc/mc && ${CP} mcedit.menu mc.ext sfs.ini \ + cd ${WRKINST}/etc/mc && ${CP} mcedit.menu sfs.ini \ mc.menu ${IDIR_MC}/etc/mc/ include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mc/patches/patch-lib_tty_tty-ncurses_c b/package/mc/patches/patch-lib_tty_tty-ncurses_c new file mode 100644 index 000000000..34c0b53df --- /dev/null +++ b/package/mc/patches/patch-lib_tty_tty-ncurses_c @@ -0,0 +1,42 @@ +--- mc-4.8.31.orig/lib/tty/tty-ncurses.c 2024-01-20 20:34:38.000000000 +0100 ++++ mc-4.8.31/lib/tty/tty-ncurses.c 2024-02-14 11:53:54.151821148 +0100 +@@ -561,39 +561,11 @@ tty_fill_region (int y, int x, int rows, + void + tty_colorize_area (int y, int x, int rows, int cols, int color) + { +-#ifdef ENABLE_SHADOWS +- cchar_t *ctext; +- wchar_t wch[10]; /* TODO not sure if the length is correct */ +- attr_t attrs; +- short color_pair; +- +- if (!use_colors || !tty_clip (&y, &x, &rows, &cols)) +- return; +- +- tty_setcolor (color); +- ctext = g_malloc (sizeof (cchar_t) * (cols + 1)); +- +- for (int row = 0; row < rows; row++) +- { +- mvin_wchnstr (y + row, x, ctext, cols); +- +- for (int col = 0; col < cols; col++) +- { +- getcchar (&ctext[col], wch, &attrs, &color_pair, NULL); +- setcchar (&ctext[col], wch, attrs, color, NULL); +- } +- +- mvadd_wchnstr (y + row, x, ctext, cols); +- } +- +- g_free (ctext); +-#else + (void) y; + (void) x; + (void) rows; + (void) cols; + (void) color; +-#endif /* ENABLE_SHADOWS */ + } + + /* --------------------------------------------------------------------------------------------- */ diff --git a/package/mdadm/Makefile b/package/mdadm/Makefile index 22bcb3fc8..69d17ee2f 100644 --- a/package/mdadm/Makefile +++ b/package/mdadm/Makefile @@ -4,10 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mdadm -PKG_VERSION:= 4.1 +PKG_VERSION:= 4.2 PKG_RELEASE:= 1 -PKG_HASH:= ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a +PKG_HASH:= 461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d 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/} diff --git a/package/mdadm/patches/patch-Makefile b/package/mdadm/patches/patch-Makefile index 9c5057c22..7ce1f18b2 100644 --- a/package/mdadm/patches/patch-Makefile +++ b/package/mdadm/patches/patch-Makefile @@ -1,27 +1,23 @@ ---- mdadm-4.0.orig/Makefile 2017-01-09 22:46:34.000000000 +0100 -+++ mdadm-4.0/Makefile 2017-06-02 01:53:13.425906734 +0200 -@@ -42,8 +42,8 @@ KLIBC=/home/src/klibc/klibc-0.77 - KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32 - - CC ?= $(CROSS_COMPILE)gcc --CXFLAGS ?= -ggdb --CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -+CXFLAGS ?= -+CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter - ifdef WARN_UNUSED - CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 - endif -@@ -269,9 +269,10 @@ $(MON_OBJS) : $(INCL) mdmon.h +--- mdadm-4.2.orig/Makefile 2021-12-30 20:43:35.000000000 +0100 ++++ mdadm-4.2/Makefile 2024-02-11 17:01:11.419915988 +0100 +@@ -250,7 +250,7 @@ $(MON_OBJS) : $(INCL) mdmon.h sha1.o : sha1.c sha1.h md5.h $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c --install : mdadm mdmon install-man install-udev +-install : install-bin install-man install-udev ++install : install-bin install-udev + + install-static : mdadm.static install-man + $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm +@@ -301,8 +301,9 @@ install-systemd: systemd/mdmon@.service + if [ -f /etc/SuSE-release -o -n "$(SUSE)" ] ;then $(INSTALL) -D -m 755 systemd/SUSE-mdadm_env.sh $(DESTDIR)$(LIB_DIR)/mdadm_env.sh ;fi + + install-bin: mdadm mdmon - $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm - $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon -+install : mdadm mdmon install-udev + mkdir -p $(DESTDIR)$(BINDIR) + $(INSTALL) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm + $(INSTALL) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon - install-static : mdadm.static install-man - $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm + uninstall: + rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm diff --git a/package/mesa-demos/Makefile b/package/mesa-demos/Makefile index e1addc2ba..fec8cb4d3 100644 --- a/package/mesa-demos/Makefile +++ b/package/mesa-demos/Makefile @@ -4,28 +4,39 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mesa-demos -PKG_VERSION:= 8.2.0 +PKG_VERSION:= 8.5.0 PKG_RELEASE:= 1 -PKG_HASH:= 5f0e76215ffc6acdaa80c7aadf02e448cb95d0ae8f69dbb894382b9c349a19e2 +PKG_HASH:= 2472818cea452a34229d03084e7c81f94267d14a39c5287379de0fb1dc02caab PKG_DESCR:= opengl demo apps PKG_SECTION:= mm/video -PKG_DEPENDS:= mesa +PKG_DEPENDS:= mesa libglew libglu PKG_BUILDDEP:= mesa libglew glu PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/demos/${PKG_VERSION}/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el arm +PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el arm aarch64 -PKG_SUBPKGS:= GLXINFO +PKG_SUBPKGS:= GLXINFO GLXGEARS +PKGSD_GLXGEARS:= opengl demo app PKGSD_GLXINFO:= command-line tool for diagnosing problems with your 3D acceleration card -PKGSS_GLXINFO:= libxt libxau libxdmcp libxcb libx11 libxext libglew +PKGSS_GLXINFO:= libxt libxau libxdmcp libxcb libx11 libxext libglew +PKGSS_GLXINFO+= libxxf86vm include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,GLXINFO,glxinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,GLXGEARS,glxgears,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --disable-egl +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +glxgears-install: + $(INSTALL_DIR) $(IDIR_GLXGEARS)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/glxgears \ + $(IDIR_GLXGEARS)/usr/bin glxinfo-install: $(INSTALL_DIR) $(IDIR_GLXINFO)/usr/bin diff --git a/package/mesa/Makefile b/package/mesa/Makefile index 9a93ed590..75a10c003 100644 --- a/package/mesa/Makefile +++ b/package/mesa/Makefile @@ -4,41 +4,39 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mesa -PKG_VERSION:= 18.3.6 +PKG_VERSION:= 23.3.3 PKG_RELEASE:= 1 -PKG_HASH:= aaf17638dcf5a90b93b6389e152fdc9ef147768b09598f24d2c5cf482fcfc705 +PKG_HASH:= 518307c0057fa3cee8b58df78be431d4df5aafa7edc60d09278b2d7a0a80f3b4 PKG_DESCR:= 3d graphics library PKG_SECTION:= libs/video PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat -PKG_DEPENDS+= libxml2 libxml2-python -PKG_BUILDDEP:= python2 libxml2 libXdamage libXfixes libXrandr +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 +PKG_BUILDDEP+= libxshmfence python-mako-host PKG_NEEDS:= c++ PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/ PKG_LIBNAME:= mesa PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el arm +PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el arm aarch64 include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,MESA,mesa,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -DRI_DRIVERS:= swrast +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson -CONFIGURE_ARGS+= --disable-static \ - --disable-gallium-llvm \ - --without-gallium-drivers \ - --enable-dri \ - --enable-dri3 \ - --enable-glx=dri \ - --with-dri-driverdir=/usr/lib/dri \ - --with-dri-drivers=${DRI_DRIVERS} -CONFIGURE_ENV+= MISSING="echo" -XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD} +MESON_FLAGS+= -Dllvm=disabled \ + -Dgallium-drivers=swrast,panfrost,vc4,v3d \ + -Dvulkan-drivers= \ + -Dgbm=enabled \ + -Dplatforms=x11 mesa-install: $(INSTALL_DIR) $(IDIR_MESA)/usr/lib/dri @@ -48,6 +46,8 @@ mesa-install: $(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/dri/*.so \ ${IDIR_MESA}/usr/lib/dri/ diff --git a/package/mesa/patches/patch-src_mapi_glapi_glapi_gentable_c b/package/mesa/patches/patch-src_mapi_glapi_glapi_gentable_c deleted file mode 100644 index af6a53aa7..000000000 --- a/package/mesa/patches/patch-src_mapi_glapi_glapi_gentable_c +++ /dev/null @@ -1,14 +0,0 @@ ---- mesa-11.0.6.orig/src/mapi/glapi/glapi_gentable.c 2015-11-21 12:45:27.000000000 +0100 -+++ mesa-11.0.6/src/mapi/glapi/glapi_gentable.c 2016-01-05 22:36:19.266092512 +0100 -@@ -35,11 +35,6 @@ - #include <dix-config.h> - #endif - --#if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \ -- || (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)) --#define USE_BACKTRACE --#endif -- - #ifdef USE_BACKTRACE - #include <execinfo.h> - #endif diff --git a/package/meson/Makefile b/package/meson/Makefile index 8799b5463..314fac6dc 100644 --- a/package/meson/Makefile +++ b/package/meson/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= meson -PKG_VERSION:= 0.55.3 +PKG_VERSION:= 1.3.2 PKG_RELEASE:= 1 -PKG_HASH:= 2b276df50c5b13ccdbfb14d3333141e9e7985aca31b60400b3f3e0be2ee6897e +PKG_HASH:= 683082fb3c5cddf203b21d29bdf4c227e2f7964da5324a15e1a5f7db94322b4b PKG_DESCR:= build utility PKG_SECTION:= dev/tools HOST_BUILDDEP:= python3-host ninja-host @@ -42,6 +42,13 @@ meson-hostinstall: $(WRKBUILD)/cross-compilation.conf.in \ > $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf sed -i "s/\"/'/g" $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf + sed -e "s%@HOST_CFLAGS@%`printf '"%s", ' $(HOST_CFLAGS)`%g" \ + -e "s%@HOST_LDFLAGS@%`printf '"%s", ' $(HOST_LDFLAGS)`%g" \ + -e "s%@HOST_CXXFLAGS@%`printf '"%s", ' $(HOST_CXXFLAGS)`%g" \ + -e "s%@STAGING_HOST_DIR@%$(STAGING_HOST_DIR)%g" \ + $(WRKBUILD)/host-compilation.conf.in \ + > $(STAGING_HOST_DIR)/etc/meson/host-compilation.conf + sed -i "s/\"/'/g" $(STAGING_HOST_DIR)/etc/meson/host-compilation.conf include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/meson/src/cross-compilation.conf.in b/package/meson/src/cross-compilation.conf.in index a636ca329..24ef6ef53 100644 --- a/package/meson/src/cross-compilation.conf.in +++ b/package/meson/src/cross-compilation.conf.in @@ -8,12 +8,16 @@ c = '@TARGET_CROSS@gcc' cpp = '@TARGET_CROSS@g++' ar = '@TARGET_CROSS@ar' strip = '@TARGET_CROSS@strip' -pkgconfig = '@STAGING_HOST_DIR@/usr/bin/pkg-config' -[properties] +pkg-config = '@STAGING_HOST_DIR@/usr/bin/pkg-config' + +[built-in options] c_args = [@TARGET_CFLAGS@] c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] + +[properties] +needs_exe_wrapper = true [host_machine] system = 'linux' diff --git a/package/meson/src/host-compilation.conf.in b/package/meson/src/host-compilation.conf.in new file mode 100644 index 000000000..c67cec76e --- /dev/null +++ b/package/meson/src/host-compilation.conf.in @@ -0,0 +1,12 @@ +# Note: OpenADK's and Meson's terminologies differ about the meaning +# of 'build', 'host' and 'target': +# - OpenADK's 'host' is Meson's 'build' +# - OpenADK's 'target' is Meson's 'host' + +[binaries] +pkgconfig = '@STAGING_HOST_DIR@/usr/bin/pkg-config' +[properties] +c_args = [@HOST_CFLAGS@] +c_link_args = [@HOST_LDFLAGS@] +cpp_args = [@HOST_CXXFLAGS@] +cpp_link_args = [@HOST_LDFLAGS@] diff --git a/package/mgetty/Makefile b/package/mgetty/Makefile index c610f53b7..105da3001 100644 --- a/package/mgetty/Makefile +++ b/package/mgetty/Makefile @@ -4,15 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mgetty -PKG_VERSION:= 1.1.36 -PKG_EXTRAVER:= Jun15 +PKG_VERSION:= 1.2.1 PKG_RELEASE:= 1 -PKG_HASH:= 8b8642aa318604ad057ed161cacff5c600296cbfbc9b4d562134ee5c130c80ce +PKG_HASH:= c8a72f5ca4142e30627ad16725c40692fb09e6284514392b95ac02062cac9a89 PKG_DESCR:= mgetty + sendfax PKG_SECTION:= sys/misc -PKG_SITES:= ftp://alpha.greenie.net/pub/mgetty/source/1.1/ +PKG_SITES:= ftp://mgetty.greenie.net/pub/mgetty/source/1.2/ -DISTFILES:= ${PKG_NAME}${PKG_VERSION}-${PKG_EXTRAVER}.tar.gz +PKG_CFLINE_MGETTY:= depends on ADK_BROKEN + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/mgetty/patches/patch-Makefile b/package/mgetty/patches/patch-Makefile index 41f1203f0..d121e705a 100644 --- a/package/mgetty/patches/patch-Makefile +++ b/package/mgetty/patches/patch-Makefile @@ -1,86 +1,39 @@ ---- mgetty-1.1.36.orig/Makefile 2007-06-15 13:15:56.000000000 +0200 -+++ mgetty-1.1.36/Makefile 2011-02-28 21:22:07.000000000 +0100 -@@ -4,7 +4,7 @@ - # - # this is the C compiler to use (on SunOS, the standard "cc" does not +--- mgetty-1.2.1.orig/Makefile 2018-09-11 12:38:58.000000000 +0200 ++++ mgetty-1.2.1/Makefile 2024-02-13 16:33:13.023498839 +0100 +@@ -6,7 +6,7 @@ # grok my code, so please use gcc there. On ISC 4.0, use "icc".). --CC=gcc -+CC?=gcc - #CC=cc # - #### C Compiler Flags #### -@@ -102,7 +102,7 @@ CC=gcc + # if you are cross-compiling, this is the C compiler for the target platform +-CC=cc ++CC?=cc + #CC=gcc + # + # if you are cross-compiling, *this* needs to be the C compiler that +@@ -109,7 +109,7 @@ HOSTCC=$(CC) # USTAT - ustat(), no statfs etc. # #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL --CFLAGS=-O2 -Wall -pipe -+CFLAGS?=-O2 -Wall -pipe +-CFLAGS=-Wall -O2 -pipe ++CFLAGS?=-Wall -O2 -pipe #CFLAGS=-O -DSVR4 #CFLAGS=-O -DSVR4 -DSVR42 #CFLAGS=-O -DUSE_POLL -@@ -143,7 +143,7 @@ CFLAGS=-O2 -Wall -pipe +@@ -150,7 +150,7 @@ CFLAGS=-Wall -O2 -pipe # "utmp.o: unresolved symbol _login" # For Linux, add "-lutil" if the linker complains about "updwtmp". # -LDFLAGS= +LDFLAGS?= - LIBS= + #LIBS= #LIBS=-lprot -lsocket # SCO Unix #LIBS=-lsocket -@@ -164,7 +164,9 @@ LIBS= +@@ -171,7 +171,8 @@ LIBS=-lutil # FreeBSD or Linux/GNU l # # if your systems doesn't have one, use the shell script that I provide # in "inst.sh" (taken from X11R5). Needed on IRIX5.2 -INSTALL=install -c -o bin -g bin +STRIP= +INSTALL=install -c -o root -g root -+#INSTALL=install -c -o bin -g bin #INSTALL=install -c -o root -g wheel # NeXT/BSD #INSTALL=/usr/ucb/install -c -o bin -g bin # AIX, Solaris 2.x #INSTALL=installbsd -c -o bin -g bin # OSF/1, AIX 4.1, 4.2 -@@ -216,7 +218,7 @@ FAX_SPOOL_OUT=$(FAX_SPOOL)/outgoing - # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER - # MUST NOT BE root or any other privileged account). - # --FAX_OUT_USER=fax -+FAX_OUT_USER=root - # - # - # Where section 1 manual pages should be placed -@@ -421,7 +423,12 @@ sedscript: mksed - ./mksed >sedscript - chmod +x sedscript - --mksed: mksed.c policy.h Makefile -+REALGCC:=/usr/bin/gcc -+mksed: mksed.c policy.h Makefile -+ ( echo $(CC_FOR_BUILD); $(MAKE) "CC=$(CC_FOR_BUILD)" "CFLAGS=$(CFLAGS_FOR_BUILD)" mksed-wrong;\ -+ ); -+ -+mksed-wrong: mksed.c policy.h Makefile - $(CC) $(CFLAGS) -DBINDIR=\"$(BINDIR)\" -DSBINDIR=\"$(SBINDIR)\" \ - -DLIBDIR=\"$(LIBDIR)\" \ - -DCONFDIR=\"$(CONFDIR)\" \ -@@ -586,8 +593,10 @@ install.bin: mgetty sendfax newslock \ - -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) - -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old - -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old -- $(INSTALL) -s -m 700 mgetty $(SBINDIR) -- $(INSTALL) -s -m 755 sendfax $(SBINDIR) -+ $(INSTALL) -m 700 mgetty $(SBINDIR) -+ $(STRIP) $(SBINDIR)/mgetty -+ $(INSTALL) -m 755 sendfax $(SBINDIR) -+ $(STRIP) $(SBINDIR)/sendfax - # - # data files + directories - # -@@ -649,7 +658,8 @@ install.bin: mgetty sendfax newslock \ - if [ ! -z "$(INSTALL_MECHO)" ] ; then \ - cd compat ; \ - $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \ -- $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \ -+ $(INSTALL) -m 755 mg.echo $(BINDIR) && \ -+ $(STRIP) $(BINDIR)/mg.echo ; \ - fi - - # diff --git a/package/mgetty/patches/patch-g3_Makefile b/package/mgetty/patches/patch-g3_Makefile deleted file mode 100644 index 3cb6cf24e..000000000 --- a/package/mgetty/patches/patch-g3_Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- mgetty-1.1.36.orig/g3/Makefile 2006-02-22 18:25:34.000000000 +0100 -+++ mgetty-1.1.36/g3/Makefile 2009-08-28 15:17:14.239450922 +0200 -@@ -37,7 +37,8 @@ install: all - # install programs - # - for f in $(G3_PROGRAMS) ; do \ -- $(INSTALL) -s -m 755 $$f $(BINDIR) ; \ -+ $(INSTALL) -m 755 $$f $(BINDIR) ; \ -+ $(STRIP) $(BINDIR)/$$f ; \ - done - # - # make symlink for "g3topbm" (so third-party fax viewers won't fail) diff --git a/package/mgetty/patches/patch-g3_g3cat_c b/package/mgetty/patches/patch-g3_g3cat_c deleted file mode 100644 index 964eea4aa..000000000 --- a/package/mgetty/patches/patch-g3_g3cat_c +++ /dev/null @@ -1,38 +0,0 @@ ---- mgetty-1.1.36.orig/g3/g3cat.c 2005-02-27 20:03:37.000000000 +0100 -+++ mgetty-1.1.36/g3/g3cat.c 2017-06-03 23:40:23.804404768 +0200 -@@ -44,7 +44,7 @@ static int b_written = 0; /* bytes of a - /* written */ - - #ifdef __GNUC__ --inline -+static inline - #endif - void putcode _P2( (code, len), int code, int len ) - { -@@ -67,7 +67,7 @@ void putcode _P2( (code, len), int code, - } - - #ifdef __GNUC__ --inline -+static inline - #endif - void putwhitespan _P1( (l), int l ) - { -@@ -98,7 +98,7 @@ void putwhitespan _P1( (l), int l ) - } - - #ifdef __GNUC__ --inline -+static inline - #endif - void putblackspan _P1( (l), int l ) - { -@@ -129,7 +129,7 @@ void putblackspan _P1( (l), int l ) - } - - #ifdef __GNUC__ --inline -+static inline - #endif - void puteol _P0( void ) /* write byte-aligned EOL */ - { diff --git a/package/mgetty/patches/patch-g3_pbm2g3_c b/package/mgetty/patches/patch-g3_pbm2g3_c deleted file mode 100644 index f56292e84..000000000 --- a/package/mgetty/patches/patch-g3_pbm2g3_c +++ /dev/null @@ -1,38 +0,0 @@ ---- mgetty-1.1.36.orig/g3/pbm2g3.c 1998-05-07 13:32:04.000000000 +0200 -+++ mgetty-1.1.36/g3/pbm2g3.c 2017-06-03 23:32:07.020481555 +0200 -@@ -40,7 +40,7 @@ static unsigned int out_hibit = 0; - static int out_byte_tab[ 256 ]; /* for g3 byte reversal */ - - #ifdef __GNUC__ --inline -+static inline - #endif - void putcode _P2( (code, len), int code, int len ) - { -@@ -60,7 +60,7 @@ void putcode _P2( (code, len), int code, - } - - #ifdef __GNUC__ --inline -+static inline - #endif - void puteol _P0( void ) /* write byte-aligned EOL */ - { -@@ -69,7 +69,7 @@ void puteol _P0( void ) /* write byte- - } - - #ifdef __GNUC__ --inline -+static inline - #endif - void putwhitespan _P1( (l), int l ) - { -@@ -100,7 +100,7 @@ void putwhitespan _P1( (l), int l ) - } - - #ifdef __GNUC__ --inline -+static inline - #endif - void putblackspan _P1( (l), int l ) - { diff --git a/package/mgetty/patches/patch-logfile_c b/package/mgetty/patches/patch-logfile_c deleted file mode 100644 index e2c4fdc96..000000000 --- a/package/mgetty/patches/patch-logfile_c +++ /dev/null @@ -1,17 +0,0 @@ ---- mgetty-1.1.36.orig/logfile.c 2005-11-26 14:48:16.000000000 +0100 -+++ mgetty-1.1.36/logfile.c 2009-08-28 15:17:14.239450922 +0200 -@@ -327,12 +327,11 @@ static int first_open = TRUE; - } - else /* ERROR or FATAL */ - { -- fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: %s", -+ fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: #%d", - tm->tm_mon+1, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec, - log_infix, ws, -- ( errnr <= sys_nerr ) ? sys_errlist[errnr]: -- "<error not in list>" ); -+ errnr ); - #ifdef SYSLOG - syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws ); - #endif diff --git a/package/midori/Makefile b/package/midori/Makefile deleted file mode 100644 index 6f45300e0..000000000 --- a/package/midori/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:= midori -PKG_VERSION:= 0.5.11 -PKG_RELEASE:= 2 -PKG_HASH:= 3b8f3a0fe8283fcbb0f9c88b2165e2689d3e18f7c1b5d275fff97cf20e7be198 -PKG_DESCR:= graphical web browser -PKG_SECTION:= x11/apps -PKG_DEPENDS:= libnotify webkitgtk gcr pango libatk cairo libsqlite -PKG_DEPENDS+= gdk-pixbuf libgtk3 p11-kit libxcomposite at-spi2-atk -PKG_DEPENDS+= libpng icu4c gstreamer gst-plugins-base dbus libgnutls -PKG_DEPENDS+= libxslt libjpeg-turbo libtasn1 libnettle enchant -PKG_DEPENDS+= libgmp at-spi2-core libxext -PKG_BUILDDEP:= cmake-host vala-host libnotify webkitgtk gcr -PKG_BUILDDEP+= librsvg-host librsvg pango atk cairo sqlite -PKG_BUILDDEP+= gdk-pixbuf libgtk3 p11-kit libpng icu4c gstreamer -PKG_BUILDDEP+= libXext -PKG_URL:= http://www.midori-browser.org -PKG_SITES:= http://distfiles.openadk.org/ - -PKG_ARCH_DEPENDS:= !mips - -WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,MIDORI,midori,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= cmake -CMAKE_FLAGS+= -DUSE_GTK3=ON \ - -DHALF_BRO_INCOM_WEBKIT2=ON \ - -DENABLE_NLS=OFF \ - -DUSE_ZEITGEIST=OFF - -midori-install: - $(INSTALL_DIR) $(IDIR_MIDORI)/usr/lib - $(CP) $(WRKINST)/usr/lib/* \ - $(IDIR_MIDORI)/usr/lib - $(INSTALL_DIR) $(IDIR_MIDORI)/usr/share - $(CP) $(WRKINST)/usr/share/* \ - $(IDIR_MIDORI)/usr/share - $(INSTALL_DIR) $(IDIR_MIDORI)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/midori \ - $(IDIR_MIDORI)/usr/bin - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/midori/patches/patch-CMakeLists_txt b/package/midori/patches/patch-CMakeLists_txt deleted file mode 100644 index 2129969f6..000000000 --- a/package/midori/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,13 +0,0 @@ ---- midori-0.5.11.orig/CMakeLists.txt 2015-08-30 13:56:26.000000000 +0200 -+++ midori-0.5.11/CMakeLists.txt 2016-04-03 15:01:39.481595419 +0200 -@@ -206,8 +206,8 @@ if (HALF_BRO_INCOM_WEBKIT2) - elseif (USE_GTK3) - pkg_check_modules(DEPS_GTK REQUIRED - gtk+-3.0>=3.10.0 -- webkitgtk-3.0>=1.8.1 -- javascriptcoregtk-3.0 -+ webkitgtk-4.0>=1.8.1 -+ javascriptcoregtk-4.0 - ) - add_definitions("-DGTK_VERSION=\"${DEPS_GTK_gtk+-3.0_VERSION}\"") - add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkitgtk-3.0_VERSION}\"") diff --git a/package/minijail/Makefile b/package/minijail/Makefile new file mode 100644 index 000000000..4582ff62f --- /dev/null +++ b/package/minijail/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:= minijail +PKG_VERSION:= v17 +PKG_RELEASE:= 1 +PKG_HASH:= 1ee5a5916491a32c121c7422b4d8c16481c0396a3acab34bf1c44589dcf810ae +PKG_DESCR:= sandboxing and containment tool +PKG_SECTION:= sys/misc +PKG_DEPENDS:= libcap +PKG_BUILDDEP:= libcap +PKG_URL:= https://google.github.io/minijail/ +PKG_SITES:= https://github.com/google/minijail/archive/refs/tags/ + +DISTFILES:= linux-$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-linux-${PKG_VERSION} + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MINIJAIL,minijail,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= manual +INSTALL_STYLE:= manual + +minijail-install: + $(INSTALL_DIR) $(IDIR_MINIJAIL)/lib + $(CP) $(WRKBUILD)/libminijailpreload.so \ + $(IDIR_MINIJAIL)/lib + $(INSTALL_DIR) $(IDIR_MINIJAIL)/lib + $(CP) $(WRKBUILD)/libminijail.so \ + $(IDIR_MINIJAIL)/lib + $(INSTALL_DIR) $(IDIR_MINIJAIL)/usr/bin + $(INSTALL_BIN) $(WRKBUILD)/minijail0 \ + $(IDIR_MINIJAIL)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/minijail/patches/patch-common_mk b/package/minijail/patches/patch-common_mk new file mode 100644 index 000000000..23dc08e77 --- /dev/null +++ b/package/minijail/patches/patch-common_mk @@ -0,0 +1,15 @@ +--- minijail-linux-v17.orig/common.mk 2021-08-11 08:01:06.000000000 +0200 ++++ minijail-linux-v17/common.mk 2022-01-13 04:53:35.432449083 +0100 +@@ -306,12 +306,6 @@ check_libs_cxx = $(call check_compile,$( + check_cc = $(call check_compile_cc,'int main() { return 0; }',$(1),$(2)) + check_cxx = $(call check_compile_cxx,'int main() { return 0; }',$(1),$(2)) + +-# Choose the stack protector flags based on whats supported by the compiler. +-SSP_CFLAGS := $(call check_cc,-fstack-protector-strong) +-ifeq ($(SSP_CFLAGS),) +- SSP_CFLAGS := $(call check_cc,-fstack-protector-all) +-endif +- + # To update these from an including Makefile: + # CXXFLAGS += -mahflag # Append to the list + # CXXFLAGS := -mahflag $(CXXFLAGS) # Prepend to the list diff --git a/package/minijail/patches/patch-libminijail_c b/package/minijail/patches/patch-libminijail_c new file mode 100644 index 000000000..67b06094e --- /dev/null +++ b/package/minijail/patches/patch-libminijail_c @@ -0,0 +1,12 @@ +--- minijail-linux-v17.orig/libminijail.c 2021-08-11 08:01:06.000000000 +0200 ++++ minijail-linux-v17/libminijail.c 2022-01-13 04:24:57.190934413 +0100 +@@ -2620,9 +2620,6 @@ static int fd_is_open(int fd) + return fcntl(fd, F_GETFD) != -1 || errno != EBADF; + } + +-static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, +- "If true, ensure_no_fd_conflict will always find an unused fd."); +- + /* If parent_fd will be used by a child fd, move it to an unused fd. */ + static int ensure_no_fd_conflict(const fd_set *child_fds, + int child_fd, int *parent_fd) diff --git a/package/mongrel2/Makefile b/package/mongrel2/Makefile index 8fa6393b2..9ae849160 100644 --- a/package/mongrel2/Makefile +++ b/package/mongrel2/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mongrel2 -PKG_VERSION:= 1.11.0 +PKG_VERSION:= 1.13.0 PKG_RELEASE:= 1 -PKG_HASH:= 917f2ce07c0908cae63ac03f3039815839355d46568581902377ba7e41257bed +PKG_HASH:= b6f1f50c9f65b605342d8792b1cc8a1c151105339030313b9825b6a68d400c10 PKG_DESCR:= application, language, and network architecture agnostic web server PKG_SECTION:= net/http -PKG_BUILDDEP:= zeromq sqlite -PKG_DEPENDS:= zeromq libsqlite +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)/ diff --git a/package/mongrel2/patches/patch-Makefile b/package/mongrel2/patches/patch-Makefile index 182389538..14ede92ab 100644 --- a/package/mongrel2/patches/patch-Makefile +++ b/package/mongrel2/patches/patch-Makefile @@ -1,30 +1,20 @@ ---- mongrel2-v1.11.0.orig/Makefile 2015-12-31 10:25:17.000000000 +0100 -+++ mongrel2-v1.11.0/Makefile 2016-04-25 20:21:46.996240089 +0200 -@@ -1,6 +1,7 @@ --CFLAGS=-g -O2 -Wall -Wextra -Isrc -Isrc/mbedtls/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 -+CFLAGS?= -+CFLAGS+=-Wall -Wextra -Isrc -Isrc/mbedtls/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 - LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS) +--- 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)))) -@@ -29,7 +30,7 @@ ifdef $($(shell \ - fi )) - endif +@@ -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: builddirs bin/mongrel2 tests m2sh procer -+all: builddirs bin/mongrel2 m2sh procer +-all: bin/mongrel2 tests m2sh procer ++all: bin/mongrel2 m2sh procer - dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 - dev: all -@@ -160,8 +161,6 @@ install: all - || ( install -d $(DESTDIR)/$(PREFIX)/bin/ \ - && install bin/mongrel2 $(DESTDIR)/$(PREFIX)/bin/ ) - ${MAKE} ${MAKEOPTS} -C tools/m2sh install -- ${MAKE} ${MAKEOPTS} -C tools/config_modules install -- ${MAKE} ${MAKEOPTS} -C tools/filters install - ${MAKE} ${MAKEOPTS} -C tools/procer install - - examples/python/mongrel2/sql/config.sql: src/config/config.sql src/config/mimetypes.sql + ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS} + ${OBJECTS}: | builddirs diff --git a/package/mongrel2/patches/patch-tools_m2sh_Makefile b/package/mongrel2/patches/patch-tools_m2sh_Makefile index c6296496a..abec82a1f 100644 --- a/package/mongrel2/patches/patch-tools_m2sh_Makefile +++ b/package/mongrel2/patches/patch-tools_m2sh_Makefile @@ -1,5 +1,5 @@ ---- mongrel2-v1.11.0.orig/tools/m2sh/Makefile 2015-12-31 10:25:18.000000000 +0100 -+++ mongrel2-v1.11.0/tools/m2sh/Makefile 2016-04-25 20:14:36.744476585 +0200 +--- 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?= @@ -11,17 +11,17 @@ SOURCES=$(wildcard src/*.c src/**/*.c) OBJECTS=$(patsubst %.c,%.o,${SOURCES}) TEST_SRC=$(wildcard tests/*.c) -@@ -9,7 +10,7 @@ TESTS=$(patsubst %.c,%,${TEST_SRC}) - LIB_SRC=$(filter-out src/m2sh.c,${SOURCES}) - LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS}) +@@ -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 -@@ -27,7 +28,7 @@ build/m2sh: ../lemon/lemon ../../build/l - $(CC) $(CFLAGS) -o build/m2sh ${OBJECTS} ../../build/libm2.a $(LIBS) +@@ -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 diff --git a/package/monit/Makefile b/package/monit/Makefile index ace5b354d..2cc22ef74 100644 --- a/package/monit/Makefile +++ b/package/monit/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= monit -PKG_VERSION:= 5.23.0 +PKG_VERSION:= 5.33.0 PKG_RELEASE:= 1 -PKG_HASH:= dd39fe3a379c02402ba9c44c201b3ba925ebdc8f04225918820607b6c5d56713 +PKG_HASH:= 1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5 PKG_DESCR:= utility for system services monitoring PKG_SECTION:= sys/misc -PKG_DEPENDS:= libressl -PKG_BUILDDEP:= libressl +PKG_DEPENDS:= libressl zlib +PKG_BUILDDEP:= libressl zlib PKG_NEEDS:= threads PKG_URL:= http://mmonit.com/monit/ PKG_SITES:= https://mmonit.com/monit/dist/ diff --git a/package/monit/patches/patch-configure b/package/monit/patches/patch-configure new file mode 100644 index 000000000..5908d3b70 --- /dev/null +++ b/package/monit/patches/patch-configure @@ -0,0 +1,49 @@ +--- monit-5.33.0.orig/configure 2023-02-11 11:29:07.000000000 +0100 ++++ monit-5.33.0/configure 2024-02-13 16:51:40.139483822 +0100 +@@ -5428,46 +5428,6 @@ else $as_nop + : + fi + +-if test `uname` != "AIX"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstack-protector-all" >&5 +-printf %s "checking whether C compiler accepts -fstack-protector-all... " >&6; } +-if test ${ax_cv_check_cflags___fstack_protector_all+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- +- ax_check_save_flags=$CFLAGS +- CFLAGS="$CFLAGS -fstack-protector-all" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main (void) +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : +- ax_cv_check_cflags___fstack_protector_all=yes +-else $as_nop +- ax_cv_check_cflags___fstack_protector_all=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +- CFLAGS=$ax_check_save_flags +-fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_protector_all" >&5 +-printf "%s\n" "$ax_cv_check_cflags___fstack_protector_all" >&6; } +-if test "x$ax_cv_check_cflags___fstack_protector_all" = xyes +-then : +- CFLAGS="$CFLAGS -fstack-protector-all" +-else $as_nop +- : +-fi +- +-fi + + + # ------------------------------------------------------------------------ diff --git a/package/monit/patches/patch-libmonit_configure b/package/monit/patches/patch-libmonit_configure new file mode 100644 index 000000000..f86308419 --- /dev/null +++ b/package/monit/patches/patch-libmonit_configure @@ -0,0 +1,49 @@ +--- monit-5.33.0.orig/libmonit/configure 2023-02-11 11:29:10.000000000 +0100 ++++ monit-5.33.0/libmonit/configure 2024-02-13 16:56:07.859480191 +0100 +@@ -5130,46 +5130,6 @@ else $as_nop + : + fi + +-if test `uname` != "AIX"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstack-protector-all" >&5 +-printf %s "checking whether C compiler accepts -fstack-protector-all... " >&6; } +-if test ${ax_cv_check_cflags___fstack_protector_all+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- +- ax_check_save_flags=$CFLAGS +- CFLAGS="$CFLAGS -fstack-protector-all" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main (void) +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : +- ax_cv_check_cflags___fstack_protector_all=yes +-else $as_nop +- ax_cv_check_cflags___fstack_protector_all=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +- CFLAGS=$ax_check_save_flags +-fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_protector_all" >&5 +-printf "%s\n" "$ax_cv_check_cflags___fstack_protector_all" >&6; } +-if test "x$ax_cv_check_cflags___fstack_protector_all" = xyes +-then : +- CFLAGS="$CFLAGS -fstack-protector-all" +-else $as_nop +- : +-fi +- +-fi + + # --------------------------------------------------------------------------- + # Libtool diff --git a/package/mopd/Makefile b/package/mopd/Makefile index e3ffe9dd3..54245dc63 100644 --- a/package/mopd/Makefile +++ b/package/mopd/Makefile @@ -15,6 +15,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,MOPD,mopd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +TARGET_CFLAGS+= -fcommon CONFIG_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/mopd/src/Makefile b/package/mopd/src/Makefile index 980579251..522884369 100644 --- a/package/mopd/src/Makefile +++ b/package/mopd/src/Makefile @@ -12,7 +12,7 @@ MOP_PATH="-DMOP_FILE_PATH=\\\"/tftpboot/mop\\\"" # AOUT_SUPPORT="-DNOAOUT" AOUT_SUPPORT="" -CFLAGS="-g ${AOUT_SUPPORT} ${MOP_PATH} ${DEFAULT_HOSTNAME} ${REAL_HOSTNAME}" +CFLAGS="-fcommon ${AOUT_SUPPORT} ${MOP_PATH} ${DEFAULT_HOSTNAME} ${REAL_HOSTNAME}" #make file to build linux-mopd SUBDIRS=common mopd mopchk mopprobe moptrace diff --git a/package/mosquitto/Makefile b/package/mosquitto/Makefile index 836e1630b..2cafc703f 100644 --- a/package/mosquitto/Makefile +++ b/package/mosquitto/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mosquitto -PKG_VERSION:= 1.4.9 +PKG_VERSION:= 2.0.18 PKG_RELEASE:= 1 -PKG_HASH:= 1df3ae07de40b80a74cd37a7b026895c544cdd3b42c9e0719ae91623aa98c58b +PKG_HASH:= d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a PKG_DESCR:= mqtt broker PKG_SECTION:= net/misc PKG_DEPENDS:= c-ares libressl @@ -33,7 +33,7 @@ mosquitto-install: $(IDIR_MOSQUITTO)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/sbin/mosquitto* \ $(IDIR_MOSQUITTO)/usr/sbin - $(INSTALL_DATA) $(WRKINST)/etc/mosquitto/* \ + $(INSTALL_DATA) $(WRKINST)/usr/etc/mosquitto/* \ $(IDIR_MOSQUITTO)/etc/mosquitto $(CP) $(WRKINST)/usr/lib/*.so* \ $(IDIR_MOSQUITTO)/usr/lib diff --git a/package/motion/Makefile b/package/motion/Makefile index 4e2c7d4f7..f88db12bd 100644 --- a/package/motion/Makefile +++ b/package/motion/Makefile @@ -4,22 +4,24 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= motion -# actually a svn version from 25.06.2014 checkout -PKG_VERSION:= 4.0 -PKG_RELEASE:= 2 -PKG_HASH:= ff2931b0af037da126fed3e496430944132528132e71473aae478ff2e7f78e0d +PKG_VERSION:= 4.6.0 +PKG_RELEASE:= 1 +PKG_HASH:= 9268df31a5ebeaf8daca4747cdcd01c86e223625b6f971e9bcec98edf35ec06f PKG_DESCR:= webcam motion sensing and logging PKG_SECTION:= mm/video -PKG_DEPENDS:= libjpeg-turbo libsdl -PKG_BUILDDEP:= libjpeg-turbo sdl +PKG_DEPENDS:= libjpeg-turbo libmicrohttpd +PKG_BUILDDEP:= libjpeg-turbo libmicrohttpd PKG_NEEDS:= threads -PKG_URL:= http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome -PKG_SITES:= http://distfiles.openadk.org/ +PKG_SITES:= https://github.com/Motion-Project/motion/archive/refs/tags/ + +DISTFILES:= release-$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-release-${PKG_VERSION} include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,MOTION,motion,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --without-ffmpeg \ --without-jpeg-mmx \ --without-optimizecpu \ diff --git a/package/motion/patches/patch-config_h b/package/motion/patches/patch-config_h deleted file mode 100644 index 7c6d32ce8..000000000 --- a/package/motion/patches/patch-config_h +++ /dev/null @@ -1,33 +0,0 @@ ---- motion-4.0.orig/config.h 2011-09-18 22:49:29.000000000 +0200 -+++ motion-4.0/config.h 2012-07-25 14:54:50.000000000 +0200 -@@ -14,7 +14,7 @@ - #define HAVE_LINUX_VIDEODEV2_H 1 - - /* Define to 1 if you have the <linux/videodev.h> header file. */ --#define HAVE_LINUX_VIDEODEV_H 1 -+/* #undef HAVE_LINUX_VIDEODEV_H */ - - /* Define to 1 if you have the <memory.h> header file. */ - #define HAVE_MEMORY_H 1 -@@ -89,10 +89,10 @@ - #define SIZEOF_INT 4 - - /* The size of `int *', as computed by sizeof. */ --#define SIZEOF_INT_P 8 -+#define SIZEOF_INT_P 4 - - /* The size of `long int', as computed by sizeof. */ --#define SIZEOF_LONG_INT 8 -+#define SIZEOF_LONG_INT 4 - - /* The size of `long long', as computed by sizeof. */ - #define SIZEOF_LONG_LONG 8 -@@ -101,7 +101,7 @@ - #define SIZEOF_SHORT 2 - - /* The size of `void *', as computed by sizeof. */ --#define SIZEOF_VOID_P 8 -+#define SIZEOF_VOID_P 4 - - /* Define to 1 if you have the ANSI C header files. */ - #define STDC_HEADERS 1 diff --git a/package/motion/patches/patch-configure b/package/motion/patches/patch-configure deleted file mode 100644 index e4f923ce8..000000000 --- a/package/motion/patches/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- motion-4.0.orig/configure 2011-09-18 22:48:41.000000000 +0200 -+++ motion-4.0/configure 2012-07-25 15:29:03.000000000 +0200 -@@ -2395,7 +2395,7 @@ fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Darwin" >&5 - $as_echo_n "checking for Darwin... " >&6; } --Darwin=`uname -a | grep "Darwin"` -+Darwin= - - if test "${Darwin}" = ""; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -@@ -2403,7 +2403,7 @@ $as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for *BSD" >&5 - $as_echo_n "checking for *BSD... " >&6; } - -- FreeBSD=`uname -a | grep "BSD"` -+ FreeBSD= - if test "${FreeBSD}" = ""; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } diff --git a/package/motion/patches/patch-motion_init-Debian b/package/motion/patches/patch-motion_init-Debian deleted file mode 100644 index 18f9ef1a3..000000000 --- a/package/motion/patches/patch-motion_init-Debian +++ /dev/null @@ -1,11 +0,0 @@ ---- motion-4.0.orig/motion.init-Debian 2011-09-18 22:49:29.000000000 +0200 -+++ motion-4.0/motion.init-Debian 2012-07-25 14:54:50.000000000 +0200 -@@ -6,7 +6,7 @@ - - NAME=motion - PATH=/bin:/usr/bin:/sbin:/usr/sbin --DAEMON=/usr/local/bin/motion -+DAEMON=/usr/bin/motion - PIDFILE=/var/run/motion/$NAME.pid - - diff --git a/package/motion/patches/patch-motion_init-FreeBSD_sh b/package/motion/patches/patch-motion_init-FreeBSD_sh deleted file mode 100644 index 64a47fe11..000000000 --- a/package/motion/patches/patch-motion_init-FreeBSD_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- motion-4.0.orig/motion.init-FreeBSD.sh 2011-09-18 22:49:29.000000000 +0200 -+++ motion-4.0/motion.init-FreeBSD.sh 2012-07-25 14:54:50.000000000 +0200 -@@ -18,7 +18,7 @@ motion_enable="${motion_enable-NO}" - name="motion" - rcvar=`set_rcvar` - --command="/usr/local/bin/${name}" -+command="/usr/bin/${name}" - pidfile="/var/run/${name}.pid" - required_files="/usr/local/etc/${name}.conf" - diff --git a/package/mpc/Makefile b/package/mpc/Makefile index 7ccdb9a1e..0ae87e82d 100644 --- a/package/mpc/Makefile +++ b/package/mpc/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mpc -PKG_VERSION:= 0.28 +PKG_VERSION:= 0.35 PKG_RELEASE:= 1 -PKG_HASH:= a4337d06c85dc81a638821d30fce8a137a58d13d510be34a11c1cce95cabc547 +PKG_HASH:= 382959c3bfa2765b5346232438650491b822a16607ff5699178aa1386e3878d4 PKG_DESCR:= music player client PKG_SECTION:= mm/audio PKG_DEPENDS:= libmpdclient @@ -18,8 +18,11 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,MPC,mpc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --disable-iconv -CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson mpc-install: $(INSTALL_DIR) $(IDIR_MPC)/usr/bin diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 82e02ab0a..424358185 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -4,17 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mpd -PKG_VERSION:= 0.20.13 +PKG_VERSION:= 0.23.15 PKG_RELEASE:= 1 -PKG_HASH:= 46c1c534d80a52de00263e8ef43a6011ff9d765232443749539ef26b1b48ff40 +PKG_HASH:= 550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a PKG_DESCR:= music player daemon PKG_SECTION:= mm/audio -PKG_DEPENDS:= libmpdclient boost libncurses libexpat -PKG_BUILDDEP:= libmpdclient boost ncurses expat +PKG_DEPENDS:= libmpdclient boost libncurses libexpat libsqlite libfmt libxcb +PKG_DEPENDS+= libxau libxdmcp +PKG_BUILDDEP:= libmpdclient boost ncurses expat sqlite fmt libxcb +PKG_BUILDDEP+= libXau libXdmcp PKG_FDEPENDS:= libmpdclient PKG_NEEDS:= threads c++ data PKG_URL:= http://www.musicpd.org/ -PKG_SITES:= http://www.musicpd.org/download/mpd/0.20/ +PKG_SITES:= http://www.musicpd.org/download/mpd/0.23/ PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 PKG_FLAVOURS_MPD+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG @@ -91,7 +93,7 @@ PKGFD_WITH_CURL:= enable CURL support PKGFS_WITH_CURL:= libcurl PKGFB_WITH_CURL:= curl ifeq ($(ADK_PACKAGE_MPD_WITH_CURL),y) -PKG_FDEPENDS+= libcurl +PKG_FDEPENDS+= curl endif PKGFD_WITH_SAMPLERATE:= enable samplerate support @@ -135,142 +137,128 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,MPD,mpd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_FDEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE TARGET_CFLAGS+= -std=gnu99 -CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no -CONFIGURE_ARGS+= --disable-fifo \ - --disable-oss \ - --disable-icu \ - --disable-bzip2 \ - --disable-libwrap \ - --disable-smbclient \ - --disable-mpc \ - --disable-wavpack \ - --disable-modplug \ - --disable-sqlite \ - --disable-mpg123 \ - --disable-soundcloud \ - --enable-inotify \ - --enable-pipe-output + +MESON_FLAGS+= -Dfifo=false \ + -Doss=disabled ifneq ($(ADK_PACKAGE_MPD_WITH_JACK),) -CONFIGURE_ARGS+= --enable-jack +MESON_FLAGS+= -Djack=enabled else -CONFIGURE_ARGS+= --disable-jack +MESON_FLAGS+= -Djack=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_SNDFILE),) -CONFIGURE_ARGS+= --enable-sndfile +MESON_FLAGS+= -Dsndfile=enabled else -CONFIGURE_ARGS+= --disable-sndfile +MESON_FLAGS+= -Dsndfile=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_HTTPD),) -CONFIGURE_ARGS+= --enable-httpd-output +MESON_FLAGS+= -Dhttpd=true else -CONFIGURE_ARGS+= --disable-httpd-output +MESON_FLAGS+= -Dhttpd=false endif ifneq ($(ADK_PACKAGE_MPD_WITH_AVAHI),) -CONFIGURE_ARGS+= --with-zeroconf=avahi +MESON_FLAGS+= -Dzeroconf=avahi else -CONFIGURE_ARGS+= --with-zeroconf=no +MESON_FLAGS+= -Dzeroconf=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_PULSE),) -CONFIGURE_ARGS+= --enable-pulse +MESON_FLAGS+= -Dpulse=enabled else -CONFIGURE_ARGS+= --disable-pulse +MESON_FLAGS+= -Dpulse=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_ALSA),) -CONFIGURE_ARGS+= --enable-alsa +MESON_FLAGS+= -Dalsa=enabled else -CONFIGURE_ARGS+= --disable-alsa +MESON_FLAGS+= -Dalsa=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_AO),) -CONFIGURE_ARGS+= --enable-ao +MESON_FLAGS+= -Dao=enabled else -CONFIGURE_ARGS+= --disable-ao +MESON_FLAGS+= -Dao=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_MP3),) -CONFIGURE_ARGS+= --enable-id3 --enable-mad +MESON_FLAGS+= -Dmad=enabled else -CONFIGURE_ARGS+= --disable-id3 --disable-mad +MESON_FLAGS+= -Dmad=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_MP4),) -CONFIGURE_ARGS+= --enable-aac +MESON_FLAGS+= -Dfaad=enabled else -CONFIGURE_ARGS+= --disable-aac +MESON_FLAGS+= -Dfaad=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_OGG),) -CONFIGURE_ARGS+= --enable-vorbis +MESON_FLAGS+= -Dvorbis=enabled else -CONFIGURE_ARGS+= --disable-vorbis +MESON_FLAGS+= -Dvorbis=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_TREMOR),) -CONFIGURE_ARGS+= \ - --disable-vorbis \ - --with-tremor \ - --with-tremor-includes=$(STAGING_TARGET_DIR)/usr/include \ - --with-tremor-libraries=$(STAGING_TARGET_DIR)/usr/lib +MESON_FLAGS+= -Dtremor=enabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_FLAC),) -CONFIGURE_ARGS+= --enable-flac +MESON_FLAGS+= -Dflac=enabled else -CONFIGURE_ARGS+= --disable-flac +MESON_FLAGS+= -Dflac=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_WAV),) -CONFIGURE_ARGS+= --enable-audiofile +MESON_FLAGS+= -Daudiofile=enabled else -CONFIGURE_ARGS+= --disable-audiofile +MESON_FLAGS+= -Daudiofile=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_SHOUT),) -CONFIGURE_ARGS+= --enable-shout \ - --enable-lame-encoder \ - --enable-vorbis-encoder +MESON_FLAGS+= -Dshout=enabled else -CONFIGURE_ARGS+= --disable-shout \ - --disable-lame-encoder \ - --disable-vorbis-encoder +MESON_FLAGS+= -Dshout=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_CURL),) -CONFIGURE_ARGS+= --enable-curl +MESON_FLAGS+= -Dcurl=enabled else -CONFIGURE_ARGS+= --disable-curl +MESON_FLAGS+= -Dcurl=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_MMS),) -CONFIGURE_ARGS+= --enable-mms +MESON_FLAGS+= -Dmms=enabled else -CONFIGURE_ARGS+= --disable-mms +MESON_FLAGS+= -Dmms=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_FFMPEG),) -CONFIGURE_ARGS+= --enable-ffmpeg +MESON_FLAGS+= -Dffmpeg=enabled else -CONFIGURE_ARGS+= --disable-ffmpeg +MESON_FLAGS+= -Dffmpeg=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_SAMPLERATE),) -CONFIGURE_ARGS+= --enable-lsr +MESON_FLAGS+= -Dlibsamplerate=enabled else -CONFIGURE_ARGS+= --disable-lsr +MESON_FLAGS+= -Dlibsamplerate=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_OPUS),) -CONFIGURE_ARGS+= --enable-opus +MESON_FLAGS+= -Dopus=enabled else -CONFIGURE_ARGS+= --disable-opus +MESON_FLAGS+= -Dopus=disabled endif mpd-install: diff --git a/package/mpd/files/mpd.conf b/package/mpd/files/mpd.conf index 4c6cfe471..7e1c947d5 100644 --- a/package/mpd/files/mpd.conf +++ b/package/mpd/files/mpd.conf @@ -8,7 +8,6 @@ db_file "/data/mpd/database" pid_file "/var/run/mpd/mpd.pid" log_file "syslog" filesystem_charset "UTF-8" -id3v1_encoding "UTF-8" mixer_type "software" # An example of an ALSA output diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile index 9ef90c5cf..dbc9b0033 100644 --- a/package/mpg123/Makefile +++ b/package/mpg123/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mpg123 -PKG_VERSION:= 1.25.2 +PKG_VERSION:= 1.32.4 PKG_RELEASE:= 1 -PKG_HASH:= 5314b0fb8ad291bfc79ff4c5c321b971916819a65233ec065434358fcf8aee38 +PKG_HASH:= 5a99664338fb2f751b662f40ee25804d0c9db6b575dcb5ce741c6dc64224a08a PKG_DESCR:= mp3 console player PKG_SECTION:= mm/audio PKG_DEPENDS:= alsa-lib @@ -21,21 +21,20 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,MPG123,mpg123,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf - ifeq ($(ADK_TARGET_CPU_X86_I486),y) CONFIGURE_ARGS+= --with-cpu=i486 endif ifeq ($(ADK_TARGET_CPU_X86_I586),y) CONFIGURE_ARGS+= --with-cpu=i586 endif -ifeq ($(ADK_TARGET_CPU_WITH_NEON),y) +ifeq ($(ADK_TARGET_ARCH_ARM)$(ADK_TARGET_CPU_WITH_NEON),yy) CONFIGURE_ARGS+= --with-cpu=neon endif +ifeq ($(ADK_TARGET_ARCH_AARCH64),y) +CONFIGURE_ARGS+= --with-cpu=aarch64 +endif -TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE -CONFIGURE_ARGS+= --disable-shared \ - --with-default-audio=alsa +CONFIGURE_ARGS+= --with-default-audio=alsa --disable-shared mpg123-install: $(INSTALL_DIR) $(IDIR_MPG123)/usr/bin diff --git a/package/mpg123/patches/patch-configure_ac b/package/mpg123/patches/patch-configure_ac deleted file mode 100644 index 41a7e658e..000000000 --- a/package/mpg123/patches/patch-configure_ac +++ /dev/null @@ -1,11 +0,0 @@ ---- mpg123-1.21.0.orig/configure.ac 2014-09-28 16:27:28.000000000 -0500 -+++ mpg123-1.21.0/configure.ac 2015-02-16 13:31:29.910186926 -0600 -@@ -1548,7 +1548,7 @@ do - HAVE_ALSA=no - else - -- ALSA_LIBS="-lasound" -+ ALSA_LIBS="-lasound -lpthread" - # Check for ALSA - AC_CHECK_LIB( [asound], [snd_pcm_open], - [ AC_CHECK_HEADER( [alsa/asoundlib.h], diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 047e07a97..ef821a290 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mplayer -PKG_VERSION:= 1.3.0 +PKG_VERSION:= 1.5 PKG_RELEASE:= 1 -PKG_HASH:= 3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843 +PKG_HASH:= 650cd55bb3cb44c9b39ce36dac488428559799c5f18d16d98edb2b7256cbbf85 PKG_DESCR:= popular video player PKG_SECTION:= mm/video PKG_DEPENDS:= alsa-lib libjpeg-turbo libfaad2 libmad libncurses @@ -23,7 +23,7 @@ PKG_SITES:= http://www.mplayerhq.hu/MPlayer/releases/ DISTFILES:= MPlayer-$(PKG_VERSION).tar.xz WRKDIST= ${WRKDIR}/MPlayer-${PKG_VERSION} -PKG_ARCH_DEPENDS:= x86 x86_64 mips arm +PKG_ARCH_DEPENDS:= x86 x86_64 mips arm aarch64 PKG_FLAVOURS_MPLAYER:= WITH_DIRECTFB PKGFD_WITH_DIRECTFB:= enable DirectFB video output support @@ -161,7 +161,6 @@ CONFIGURE_ARGS:= --prefix=/usr \ --disable-live \ --disable-pvr \ --disable-ftp \ - --disable-ivtv \ --disable-freetype \ --disable-mpg123 \ --disable-arts \ diff --git a/package/mplayer/patches/patch-stream_asf_streaming_c b/package/mplayer/patches/patch-stream_asf_streaming_c deleted file mode 100644 index 4fa3b696b..000000000 --- a/package/mplayer/patches/patch-stream_asf_streaming_c +++ /dev/null @@ -1,27 +0,0 @@ ---- mplayer-1.0-32749.orig/stream/asf_streaming.c 2011-01-03 11:26:52.000000000 +0100 -+++ mplayer-1.0-32749/stream/asf_streaming.c 2011-07-29 17:54:35.013424616 +0200 -@@ -38,7 +38,6 @@ - - #include "stream.h" - #include "libmpdemux/demuxer.h" --#include "asf_mmst_streaming.h" - #include "network.h" - #include "tcp.h" - -@@ -87,16 +86,6 @@ static int asf_streaming_start( stream_t - if( fd==-2 ) return -1; - } - -- //Is protocol mms or mmst? -- if (!strcasecmp(proto, "mmst") || !strcasecmp(proto, "mms")) -- { -- mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/TCP...\n"); -- fd = asf_mmst_streaming_start( stream ); -- stream->streaming_ctrl->url->port = port; -- if( fd>-1 ) return fd; -- mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/TCP failed\n"); -- if( fd==-2 ) return -1; -- } - - //Is protocol http, http_proxy, or mms? - if (!strcasecmp(proto, "http_proxy") || !strcasecmp(proto, "http") || diff --git a/package/mtdev/Makefile b/package/mtdev/Makefile new file mode 100644 index 000000000..b4e2bfd3c --- /dev/null +++ b/package/mtdev/Makefile @@ -0,0 +1,26 @@ +# 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:= mtdev +PKG_VERSION:= 1.1.6 +PKG_RELEASE:= 1 +PKG_HASH:= 1325f389a2f25cd5f5a8ea4d29aad24aa7c3ec30401d679400dd79eb9c0a8dbb +PKG_DESCR:= library which transforms all variants of kernel MT events +PKG_SECTION:= libs/misc +PKG_SITES:= https://bitmath.org/code/mtdev/ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MTDEV,mtdev,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +mtdev-install: + $(INSTALL_DIR) $(IDIR_MTDEV)/usr/lib + $(CP) $(WRKINST)/usr/lib/libmtdev*.so* \ + $(IDIR_MTDEV)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/mtr/Makefile b/package/mtr/Makefile index 910dce00b..8076804f6 100644 --- a/package/mtr/Makefile +++ b/package/mtr/Makefile @@ -4,17 +4,17 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mtr -PKG_VERSION:= 0.75 -PKG_RELEASE:= 2 -PKG_HASH:= 1d1a5de6b233289bf17a21e3bf83c82db47d22bb269af986229b788689e1f0f3 +PKG_VERSION:= 0.95 +PKG_RELEASE:= 1 +PKG_HASH:= 12490fb660ba5fb34df8c06a0f62b4f9cbd11a584fc3f6eceda0a99124e8596f PKG_DESCR:= traceroute/ping tool PKG_SECTION:= net/debug PKG_DEPENDS:= libncurses PKG_BUILDDEP:= ncurses PKG_URL:= http://www.bitwizard.nl/mtr/ -PKG_SITES:= ftp://ftp.bitwizard.nl/mtr/ +PKG_SITES:= https://github.com/traviscross/mtr/archive/refs/tags/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= v${PKG_VERSION}.tar.gz PKG_LIBC_DEPENDS:= uclibc-ng glibc @@ -23,6 +23,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,MTR,mtr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TARGET_LDFLAGS+= -ltinfo +AUTOTOOL_STYLE:= bootstrap CONFIGURE_ENV+= ac_cv_lib_resolv_res_mkquery=yes CONFIGURE_ARGS+= --without-gtk diff --git a/package/mtr/patches/501-dns.patch b/package/mtr/patches/501-dns.patch deleted file mode 100644 index f1c915580..000000000 --- a/package/mtr/patches/501-dns.patch +++ /dev/null @@ -1,511 +0,0 @@ -diff -Naur mtr-0.69.old/dns.c mtr-0.69.new/dns.c ---- mtr-0.69.old/dns.c 2005-01-11 09:32:42.000000000 +0100 -+++ mtr-0.69.new/dns.c 2005-10-03 21:31:27.000000000 +0200 -@@ -853,6 +853,507 @@ - fputs("\r",stderr); - } - -+#ifdef __UCLIBC__ -+ -+static const char digits[] = "0123456789"; -+#define __set_errno(e) (errno = (e)) -+ -+#define NS_PUT16(s, cp) do { \ -+ register u_int16_t t_s = (u_int16_t)(s); \ -+ register u_char *t_cp = (u_char *)(cp); \ -+ *t_cp++ = t_s >> 8; \ -+ *t_cp = t_s; \ -+ (cp) += NS_INT16SZ; \ -+} while (0) -+ -+ -+ -+#define NS_PUT32(l, cp) do { \ -+ register u_int32_t t_l = (u_int32_t)(l); \ -+ register u_char *t_cp = (u_char *)(cp); \ -+ *t_cp++ = t_l >> 24; \ -+ *t_cp++ = t_l >> 16; \ -+ *t_cp++ = t_l >> 8; \ -+ *t_cp = t_l; \ -+ (cp) += NS_INT32SZ; \ -+} while (0) -+ -+ -+void -+ns_put16(u_int src, u_char *dst) { -+ NS_PUT16(src, dst); -+} -+ -+void -+ns_put32(u_long src, u_char *dst) { -+ NS_PUT32(src, dst); -+} -+ -+void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); } -+void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); } -+ -+int -+mklower(int ch) { -+ if (ch >= 0x41 && ch <= 0x5A) -+ return (ch + 0x20); -+ return (ch); -+} -+ -+ -+static int -+dn_find(const u_char *domain, const u_char *msg, -+ const u_char * const *dnptrs, -+ const u_char * const *lastdnptr) -+{ -+ const u_char *dn, *cp, *sp; -+ const u_char * const *cpp; -+ u_int n; -+ -+ for (cpp = dnptrs; cpp < lastdnptr; cpp++) { -+ sp = *cpp; -+ /* -+ * terminate search on: -+ * root label -+ * compression pointer -+ * unusable offset -+ */ -+ while (*sp != 0 && (*sp & NS_CMPRSFLGS) == 0 && -+ (sp - msg) < 0x4000) { -+ dn = domain; -+ cp = sp; -+ while ((n = *cp++) != 0) { -+ /* -+ * check for indirection -+ */ -+ switch (n & NS_CMPRSFLGS) { -+ case 0: /* normal case, n == len */ -+ if (n != *dn++) -+ goto next; -+ for ((void)NULL; n > 0; n--) -+ if (mklower(*dn++) != -+ mklower(*cp++)) -+ goto next; -+ /* Is next root for both ? */ -+ if (*dn == '\0' && *cp == '\0') -+ return (sp - msg); -+ if (*dn) -+ continue; -+ goto next; -+ -+ case NS_CMPRSFLGS: /* indirection */ -+ cp = msg + (((n & 0x3f) << 8) | *cp); -+ break; -+ -+ default: /* illegal type */ -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ } -+ next: -+ sp += *sp + 1; -+ } -+ } -+ __set_errno (ENOENT); -+ return (-1); -+} -+ -+ -+int -+ns_name_pack(const u_char *src, u_char *dst, int dstsiz, -+ const u_char **dnptrs, const u_char **lastdnptr) -+{ -+ u_char *dstp; -+ const u_char **cpp, **lpp, *eob, *msg; -+ const u_char *srcp; -+ int n, l, first = 1; -+ -+ srcp = src; -+ dstp = dst; -+ eob = dstp + dstsiz; -+ lpp = cpp = NULL; -+ if (dnptrs != NULL) { -+ if ((msg = *dnptrs++) != NULL) { -+ for (cpp = dnptrs; *cpp != NULL; cpp++) -+ (void)NULL; -+ lpp = cpp; /* end of list to search */ -+ } -+ } else -+ msg = NULL; -+ -+ /* make sure the domain we are about to add is legal */ -+ l = 0; -+ do { -+ n = *srcp; -+ if ((n & NS_CMPRSFLGS) != 0 && n != 0x41) { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ if (n == 0x41) -+ n = *++srcp / 8; -+ l += n + 1; -+ if (l > MAXCDNAME) { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ srcp += n + 1; -+ } while (n != 0); -+ -+ /* from here on we need to reset compression pointer array on error */ -+ srcp = src; -+ do { -+ /* Look to see if we can use pointers. */ -+ n = *srcp; -+ if (n != 0 && n != 0x41 && msg != NULL) { -+ l = dn_find(srcp, msg, (const u_char * const *)dnptrs, -+ (const u_char * const *)lpp); -+ if (l >= 0) { -+ if (dstp + 1 >= eob) { -+ goto cleanup; -+ } -+ *dstp++ = (l >> 8) | NS_CMPRSFLGS; -+ *dstp++ = l % 256; -+ return (dstp - dst); -+ } -+ /* Not found, save it. */ -+ if (lastdnptr != NULL && cpp < lastdnptr - 1 && -+ (dstp - msg) < 0x4000 && first) { -+ *cpp++ = dstp; -+ *cpp = NULL; -+ first = 0; -+ } -+ } -+ /* copy label to buffer */ -+ if ((n & NS_CMPRSFLGS) != 0 && n != 0x41) { /* Should not happen. */ -+ goto cleanup; -+ } -+ if (n == 0x41) { -+ n = *++srcp / 8; -+ if (dstp + 1 >= eob) -+ goto cleanup; -+ *dstp++ = 0x41; -+ } -+ if (dstp + 1 + n >= eob) { -+ goto cleanup; -+ } -+ memcpy(dstp, srcp, n + 1); -+ srcp += n + 1; -+ dstp += n + 1; -+ } while (n != 0); -+ -+ if (dstp > eob) { -+cleanup: -+ if (msg != NULL) -+ *lpp = NULL; -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ return (dstp - dst); -+} -+ -+ -+int -+ns_name_pton(const char *src, u_char *dst, size_t dstsiz) { -+ u_char *label, *bp, *eom; -+ int c, n, escaped; -+ char *cp; -+ -+ escaped = 0; -+ bp = dst; -+ eom = dst + dstsiz; -+ label = bp++; -+ -+ while ((c = *src++) != 0) { -+ if (escaped) { -+ if ((cp = strchr(digits, c)) != NULL) { -+ n = (cp - digits) * 100; -+ if ((c = *src++) == 0 || -+ (cp = strchr(digits, c)) == NULL) { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ n += (cp - digits) * 10; -+ if ((c = *src++) == 0 || -+ (cp = strchr(digits, c)) == NULL) { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ n += (cp - digits); -+ if (n > 255) { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ c = n; -+ } else if (c == '[' && label == bp - 1 && *src == 'x') { -+ /* Theoretically we would have to handle \[o -+ as well but we do not since we do not need -+ it internally. */ -+ *label = 0x41; -+ label = bp++; -+ ++src; -+ while (isxdigit (*src)) { -+ n = *src > '9' ? *src - 'a' + 10 : *src - '0'; -+ ++src; -+ if (! isxdigit(*src)) { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ n <<= 4; -+ n += *src > '9' ? *src - 'a' + 10 : *src - '0'; -+ if (bp + 1 >= eom) { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ *bp++ = n; -+ ++src; -+ } -+ *label = (bp - label - 1) * 8; -+ if (*src++ != ']' || *src++ != '.') { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ escaped = 0; -+ label = bp++; -+ if (bp >= eom) { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ continue; -+ } -+ escaped = 0; -+ } else if (c == '\\') { -+ escaped = 1; -+ continue; -+ } else if (c == '.') { -+ c = (bp - label - 1); -+ if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ if (label >= eom) { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ *label = c; -+ /* Fully qualified ? */ -+ if (*src == '\0') { -+ if (c != 0) { -+ if (bp >= eom) { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ *bp++ = '\0'; -+ } -+ if ((bp - dst) > MAXCDNAME) { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ return (1); -+ } -+ if (c == 0 || *src == '.') { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ label = bp++; -+ continue; -+ } -+ if (bp >= eom) { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ *bp++ = (u_char)c; -+ } -+ c = (bp - label - 1); -+ if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ if (label >= eom) { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ *label = c; -+ if (c != 0) { -+ if (bp >= eom) { -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ *bp++ = 0; -+ } -+ if ((bp - dst) > MAXCDNAME) { /* src too big */ -+ __set_errno (EMSGSIZE); -+ return (-1); -+ } -+ return (0); -+} -+ -+ -+ -+int -+ns_name_compress(const char *src, u_char *dst, size_t dstsiz, -+ const u_char **dnptrs, const u_char **lastdnptr) -+{ -+ u_char tmp[NS_MAXCDNAME]; -+ -+ if (ns_name_pton(src, tmp, sizeof tmp) == -1) -+ return (-1); -+ return (ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr)); -+} -+ -+ -+int -+dn_comp(const char *src, u_char *dst, int dstsiz, -+ u_char **dnptrs, u_char **lastdnptr) -+{ -+ return (ns_name_compress(src, dst, (size_t)dstsiz, -+ (const u_char **)dnptrs, -+ (const u_char **)lastdnptr)); -+} -+ -+ -+ -+ -+int -+res_nmkquery(res_state statp, -+ int op, /* opcode of query */ -+ const char *dname, /* domain name */ -+ int class, int type, /* class and type of query */ -+ const u_char *data, /* resource record data */ -+ int datalen, /* length of data */ -+ const u_char *newrr_in, /* new rr for modify or append */ -+ u_char *buf, /* buffer to put query */ -+ int buflen) /* size of buffer */ -+{ -+ register HEADER *hp; -+ register u_char *cp; -+ register int n; -+ u_char *dnptrs[20], **dpp, **lastdnptr; -+ -+#ifdef DEBUG -+ if (statp->options & RES_DEBUG) -+ printf(";; res_nmkquery(%s, %s, %s, %s)\n", -+ _res_opcodes[op], dname, p_class(class), p_type(type)); -+#endif -+ /* -+ * Initialize header fields. -+ */ -+ if ((buf == NULL) || (buflen < HFIXEDSZ)) -+ return (-1); -+ memset(buf, 0, HFIXEDSZ); -+ hp = (HEADER *) buf; -+ /* We randomize the IDs every time. The old code just -+ incremented by one after the initial randomization which -+ still predictable if the application does multiple -+ requests. */ -+#if 0 -+ hp->id = htons(++statp->id); -+#else -+ hp->id = htons(statp->id); -+ int randombits; -+ do -+ { -+#ifdef RANDOM_BITS -+ RANDOM_BITS (randombits); -+#else -+ struct timeval tv; -+ gettimeofday (&tv, NULL); -+ randombits = (tv.tv_sec << 8) ^ tv.tv_usec; -+#endif -+ } -+ while ((randombits & 0xffff) == 0); -+ statp->id = (statp->id + randombits) & 0xffff; -+#endif -+ hp->opcode = op; -+ hp->rd = (statp->options & RES_RECURSE) != 0; -+ hp->rcode = NOERROR; -+ cp = buf + HFIXEDSZ; -+ buflen -= HFIXEDSZ; -+ dpp = dnptrs; -+ *dpp++ = buf; -+ *dpp++ = NULL; -+ lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0]; -+ /* -+ * perform opcode specific processing -+ */ -+ switch (op) { -+ case QUERY: /*FALLTHROUGH*/ -+ case NS_NOTIFY_OP: -+ if ((buflen -= QFIXEDSZ) < 0) -+ return (-1); -+ if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0) -+ return (-1); -+ cp += n; -+ buflen -= n; -+ __putshort(type, cp); -+ cp += INT16SZ; -+ __putshort(class, cp); -+ cp += INT16SZ; -+ hp->qdcount = htons(1); -+ if (op == QUERY || data == NULL) -+ break; -+ /* -+ * Make an additional record for completion domain. -+ */ -+ buflen -= RRFIXEDSZ; -+ n = dn_comp((char *)data, cp, buflen, dnptrs, lastdnptr); -+ if (n < 0) -+ return (-1); -+ cp += n; -+ buflen -= n; -+ __putshort(T_NULL, cp); -+ cp += INT16SZ; -+ __putshort(class, cp); -+ cp += INT16SZ; -+ __putlong(0, cp); -+ cp += INT32SZ; -+ __putshort(0, cp); -+ cp += INT16SZ; -+ hp->arcount = htons(1); -+ break; -+ -+ case IQUERY: -+ /* -+ * Initialize answer section -+ */ -+ if (buflen < 1 + RRFIXEDSZ + datalen) -+ return (-1); -+ *cp++ = '\0'; /* no domain name */ -+ __putshort(type, cp); -+ cp += INT16SZ; -+ __putshort(class, cp); -+ cp += INT16SZ; -+ __putlong(0, cp); -+ cp += INT32SZ; -+ __putshort(datalen, cp); -+ cp += INT16SZ; -+ if (datalen) { -+ memcpy(cp, data, datalen); -+ cp += datalen; -+ } -+ hp->ancount = htons(1); -+ break; -+ -+ default: -+ return (-1); -+ } -+ return (cp - buf); -+} -+ -+int -+res_mkquery(int op, /* opcode of query */ -+ const char *dname, /* domain name */ -+ int class, int type, /* class and type of query */ -+ const u_char *data, /* resource record data */ -+ int datalen, /* length of data */ -+ const u_char *newrr_in, /* new rr for modify or append */ -+ u_char *buf, /* buffer to put query */ -+ int buflen) /* size of buffer */ -+{ -+ return (res_nmkquery(&_res, op, dname, class, type, -+ data, datalen, -+ newrr_in, buf, buflen)); -+} -+ -+#endif - - void dorequest(char *s,int type,word id) - { diff --git a/package/mtr/patches/patch-curses_c b/package/mtr/patches/patch-curses_c deleted file mode 100644 index 2e04bd4ce..000000000 --- a/package/mtr/patches/patch-curses_c +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- mtr-0.75.orig/curses.c 2008-08-19 18:55:48.000000000 +0200 -+++ mtr-0.75/curses.c 2008-10-10 15:04:37.000000000 +0200 -@@ -241,7 +241,7 @@ int mtr_curses_keyaction(void) - return ActionNone; - } - if (tolower(c) == 'j') { -- if( index(fld_active, 'N') ) { -+ if( strchr(fld_active, 'N') ) { - strcpy(fld_active, "DR AGJMXI"); /* GeoMean and jitter */ - } else { - strcpy(fld_active, "LS NABWV"); /* default */ -@@ -328,7 +328,7 @@ void mtr_curses_hosts(int startstat) - if (j == -1) continue; - - /* temporay hack for stats usec to ms... */ -- if( index( data_fields[j].format, 'f' ) ) { -+ if( strchr( data_fields[j].format, 'f' ) ) { - sprintf(buf + hd_len, data_fields[j].format, - data_fields[j].net_xxx(at) /1000.0 ); - } else { diff --git a/package/mtr/patches/patch-report_c b/package/mtr/patches/patch-report_c deleted file mode 100644 index bbae19253..000000000 --- a/package/mtr/patches/patch-report_c +++ /dev/null @@ -1,30 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- mtr-0.75.orig/report.c 2008-09-18 14:40:09.000000000 +0200 -+++ mtr-0.75/report.c 2008-10-10 15:05:00.000000000 +0200 -@@ -122,7 +122,7 @@ void report_close(void) - if (j < 0) continue; - - /* 1000.0 is a temporay hack for stats usec to ms, impacted net_loss. */ -- if( index( data_fields[j].format, 'f' ) ) { -+ if( strchr( data_fields[j].format, 'f' ) ) { - snprintf( buf + len, sizeof(buf), data_fields[j].format, - data_fields[j].net_xxx(at) /1000.0 ); - } else { -@@ -201,7 +201,7 @@ void xml_close(void) - strcat(name, data_fields[j].format); - strcat(name, "</%s>\n"); - /* 1000.0 is a temporay hack for stats usec to ms, impacted net_loss. */ -- if( index( data_fields[j].format, 'f' ) ) { -+ if( strchr( data_fields[j].format, 'f' ) ) { - printf( name, - data_fields[j].title, - data_fields[j].net_xxx(at) /1000.0, -@@ -280,7 +280,7 @@ void csv_close(void) - if (j < 0) continue; - - /* 1000.0 is a temporay hack for stats usec to ms, impacted net_loss. */ -- if( index( data_fields[j].format, 'f' ) ) { -+ if( strchr( data_fields[j].format, 'f' ) ) { - printf( ", %.2f", data_fields[j].net_xxx(at) / 1000.0); - } else { - printf( ", %d", data_fields[j].net_xxx(at) ); diff --git a/package/musl/Makefile b/package/musl/Makefile index ba31e1f5f..4e49aadd9 100644 --- a/package/musl/Makefile +++ b/package/musl/Makefile @@ -29,7 +29,7 @@ INSTALL_STYLE:= manual MUSL_LD_SO:= "`echo 'void main(void) {}' |${TARGET_CC} ${TARGET_CFLAGS} -x c -o \ $(BUILD_DIR)/.musl.tmp - >/dev/null 2>&1 ;\ ${TARGET_COMPILER_PREFIX}readelf -l $(BUILD_DIR)/.musl.tmp 2>/dev/null \ - | grep 'program interpreter: /lib/ld-musl' | sed -e 's|.*lib/||'|sed -e 's|]||' ;\ + | grep 'program interpreter: /lib.*/ld-musl' | sed -e 's|.*lib.*/||'|sed -e 's|]||' ;\ rm $(BUILD_DIR)/.musl.tmp`" # do nothing, musl is already build in toolchain directory @@ -48,11 +48,7 @@ endif musl-dev-install: ${INSTALL_DIR} ${IDIR_MUSL_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt*.o ${IDIR_MUSL_DEV}/usr/lib - ${KERNEL_MAKE_ENV} \ - $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)/linux-$(KERNEL_FILE_VER) \ - $(KERNEL_MAKE_OPTS) \ - INSTALL_HDR_PATH=$(IDIR_MUSL_DEV)/usr \ - headers_install + ${KERNEL_MAKE} INSTALL_HDR_PATH=$(IDIR_MUSL_DEV)/usr headers_install $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \ DESTDIR=$(IDIR_MUSL_DEV) \ install-headers diff --git a/package/mutt/Makefile b/package/mutt/Makefile index e268f761e..a8578b6ad 100644 --- a/package/mutt/Makefile +++ b/package/mutt/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mutt -PKG_VERSION:= 1.8.3 +PKG_VERSION:= 2.2.12 PKG_RELEASE:= 1 -PKG_HASH:= 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42 +PKG_HASH:= 043af312f64b8e56f7fd0bf77f84a205d4c498030bd9586457665c47bb18ce38 PKG_DESCR:= mail client for console PKG_SECTION:= net/mail PKG_DEPENDS:= libncurses diff --git a/package/mympd/Makefile b/package/mympd/Makefile new file mode 100644 index 000000000..ccef09b13 --- /dev/null +++ b/package/mympd/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:= mympd +PKG_VERSION:= 14.0.2 +PKG_RELEASE:= 1 +PKG_HASH:= 309476bcc352f5b9ddc365412cb636e41b3a9e675c0ef94c17b982af2dfc3aa8 +PKG_DESCR:= standalone music player daemon web gui +PKG_SECTION:= net/http +PKG_DEPENDS:= mpd libopenssl pcre2 +PKG_BUILDDEP:= cmake-host libmpdclient openssl pcre2 +PKG_URL:= https://github.com/jcorporation/myMPD +PKG_SITES:= https://github.com/jcorporation/myMPD/archive/refs/tags/ + +DISTFILES:= v$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/myMPD-${PKG_VERSION} + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MYMPD,mympd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj +CONFIG_STYLE:= cmake +CMAKE_FLAGS:= -DMYMPD_EMBEDDED_ASSETS=ON + +mympd-install: + $(INSTALL_DIR) $(IDIR_MYMPD)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/mympd \ + $(IDIR_MYMPD)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/mympd/files/mympd.init b/package/mympd/files/mympd.init new file mode 100644 index 000000000..f7eec5b6d --- /dev/null +++ b/package/mympd/files/mympd.init @@ -0,0 +1,31 @@ +#!/bin/sh +#PKG mympd +#INIT 90 + +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${mympd:-NO}" = x"NO" && exit 0 + test x"$mympd" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start + exec sh $0 start + ;; +start) + mkdir -p /var/cache/mympd 2>/dev/null + mkdir -p /etc/mympd 2>/dev/null + mympd -w /etc/mympd -s & + ;; +stop) + kill $(pgrep -f mympd) + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "Usage: $0 {start | stop | restart}" + exit 1 + ;; +esac +exit $? diff --git a/package/mympd/files/mympd.postinst b/package/mympd/files/mympd.postinst new file mode 100644 index 000000000..be700987b --- /dev/null +++ b/package/mympd/files/mympd.postinst @@ -0,0 +1,7 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf mympd NO +gid=$(get_next_gid) +add_group mympd $gid +add_user mympd $(get_next_uid) $gid /var/lib/mympd + diff --git a/package/mympd/patches/patch-src_compile_time_h_in b/package/mympd/patches/patch-src_compile_time_h_in new file mode 100644 index 000000000..5868aa338 --- /dev/null +++ b/package/mympd/patches/patch-src_compile_time_h_in @@ -0,0 +1,13 @@ +--- myMPD-14.0.2.orig/src/compile_time.h.in 2024-02-11 12:00:47.000000000 +0100 ++++ myMPD-14.0.2/src/compile_time.h.in 2024-02-13 06:02:38.922236003 +0100 +@@ -58,8 +58,8 @@ + #define MPD_VERSION_MIN_PATCH 0 + + //default paths from cmake +-#define MYMPD_DOC_ROOT "${MYMPD_DOC_ROOT}" +-#define MYMPD_WORK_DIR "${MYMPD_WORK_DIR}" ++#define MYMPD_DOC_ROOT "/srv/mympd" ++#define MYMPD_WORK_DIR "/etc/mympd" + #define MYMPD_CACHE_DIR "${MYMPD_CACHE_DIR}" + #define MYMPD_LUALIBS_PATH "${MYMPD_LUALIBS_PATH}" + diff --git a/package/mympd/patches/patch-src_main_c b/package/mympd/patches/patch-src_main_c new file mode 100644 index 000000000..971c4f1cd --- /dev/null +++ b/package/mympd/patches/patch-src_main_c @@ -0,0 +1,21 @@ +--- myMPD-14.0.2.orig/src/main.c 2024-02-11 12:00:47.000000000 +0100 ++++ myMPD-14.0.2/src/main.c 2024-02-13 05:31:53.330851831 +0100 +@@ -492,12 +492,12 @@ int main(int argc, char **argv) { + } + + //set output buffers +- if (setvbuf(stdout, NULL, _IOLBF, 0) != 0 || +- setvbuf(stderr, NULL, _IOLBF, 0) != 0) +- { +- MYMPD_LOG_EMERG(NULL, "Could not set stdout and stderr buffer"); +- goto cleanup; +- } ++ //if (setvbuf(stdout, NULL, _IOLBF, 0) != 0 || ++ // setvbuf(stderr, NULL, _IOLBF, 0) != 0) ++ //{ ++ // MYMPD_LOG_EMERG(NULL, "Could not set stdout and stderr buffer"); ++ // goto cleanup; ++ // } + + //init webserver + mgr = malloc_assert(sizeof(struct mg_mgr)); diff --git a/package/nano/Makefile b/package/nano/Makefile index f32a963e6..1c6ae32c7 100644 --- a/package/nano/Makefile +++ b/package/nano/Makefile @@ -4,15 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= nano -PKG_VERSION:= 4.5 +PKG_VERSION:= 5.9 PKG_RELEASE:= 1 -PKG_HASH:= ded5c38f5ecd9de2b624e0db8013a375c169d3fbbd49575967b868847df8f533 +PKG_HASH:= 757db8cda4bb2873599e47783af463e3b547a627b0cabb30ea7bf71fb4c24937 PKG_DESCR:= enhanced clone of the pico editor PKG_SECTION:= app/editor PKG_DEPENDS:= libncurses PKG_BUILDDEP:= ncurses PKG_URL:= http://www.nano-editor.org/ -PKG_SITES:= https://www.nano-editor.org/dist/v4/ +PKG_SITES:= https://www.nano-editor.org/dist/v5/ include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index dc6e02a15..915d7f49d 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= ncurses -PKG_VERSION:= 6.1 +PKG_VERSION:= 6.4 PKG_RELEASE:= 1 -PKG_HASH:= aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 +PKG_HASH:= 6931283d9ac87c5073f30b6290c4c75f21632bb4fc3603ac8100812bed248159 PKG_DESCR:= terminal handling library PKG_SECTION:= libs/misc PKG_BUILDDEP:= ncurses-host @@ -31,7 +31,7 @@ TARGET_CFLAGS:= $(filter-out -static,$(TARGET_CFLAGS)) TARGET_LDFLAGS:=$(filter-out -static,$(TARGET_LDFLAGS)) endif -ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) CONFIGURE_ARGS+= --with-static else CONFIGURE_ARGS+= --with-shared @@ -66,9 +66,10 @@ ALL_TARGET:= libs INSTALL_TARGET:= install.libs install.data # use sth which does not exist -HOST_ALL_TARGET:= progs -HOST_INSTALL_TARGET:= install.includes install.progs -HOST_CONFIGURE_ARGS+= --without-shared \ +#HOST_ALL_TARGET:= progs +#HOST_INSTALL_TARGET:= install.includes install.progs +HOST_CFLAGS+= -fPIC +HOST_CONFIGURE_ARGS+= --with-shared \ --with-build-cc="${HOST_CC}" \ --with-progs \ --with-ticlib \ diff --git a/package/neon/Makefile b/package/neon/Makefile index 936a1e030..68087268e 100644 --- a/package/neon/Makefile +++ b/package/neon/Makefile @@ -4,16 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= neon -PKG_VERSION:= 0.30.1 +PKG_VERSION:= 0.33.0 PKG_RELEASE:= 1 -PKG_HASH:= 00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd +PKG_HASH:= 659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8 PKG_DESCR:= http and webdav library PKG_SECTION:= libs/misc PKG_DEPENDS:= libxml2 zlib libressl PKG_BUILDDEP:= libxml2 zlib libressl PKG_NEEDS:= threads -PKG_URL:= http://webdav.org/neon/ -PKG_SITES:= http://webdav.org/neon/ +PKG_URL:= https://notroj.github.io/neon/ +PKG_SITES:= https://notroj.github.io/neon/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/netperf/Makefile b/package/netperf/Makefile index 713cd4b9a..59781944b 100644 --- a/package/netperf/Makefile +++ b/package/netperf/Makefile @@ -18,6 +18,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,NETPERF,netperf,${PKG_VERSION}${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CFLAGS+= -fcommon # uClibc setpgrp does not take arguments CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index fb0982fc7..d2bdba4ba 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -4,13 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= nfs-utils -PKG_VERSION:= 2.3.1 +PKG_VERSION:= 2.6.4 PKG_RELEASE:= 1 -PKG_HASH:= ca92f1ab86b2af4dcd62d7716d46a6cdec268e83fe8d564cd8ff1464cc495989 +PKG_HASH:= c0ae376ac056011ed0954deba2362d7d8193c653b500b68a543aec512cd2ecfa PKG_DESCR:= network filesystem utilities PKG_SECTION:= net/fs -PKG_DEPENDS:= keyutils libtirpc rpcbind -PKG_BUILDDEP:= keyutils libtirpc +PKG_DEPENDS:= keyutils libtirpc rpcbind libmount libuuid libevent sqlite +PKG_DEPENDS+= libncurses libblkid +PKG_BUILDDEP:= keyutils libtirpc util-linux libevent sqlite ncurses PKG_KDEPENDS:= nfs-fs PKG_NEEDS:= threads PKG_URL:= http://sourceforge.net/projects/nfs @@ -58,8 +59,7 @@ CONFIGURE_ARGS+= --without-tcp-wrappers \ --with-rpcgen=internal \ --disable-caps \ --enable-tirpc \ - --with-tirpcinclude=${STAGING_TARGET_DIR}/usr/include/tirpc \ - --disable-uuid + --with-tirpcinclude=${STAGING_TARGET_DIR}/usr/include/tirpc nfs-utils-client-install: ${INSTALL_DIR} ${IDIR_NFS_UTILS_CLIENT}/sbin diff --git a/package/nfs-utils/files/nfsd.exports b/package/nfs-utils/files/nfsd.exports index 432ebe177..1a9d3ef90 100644 --- a/package/nfs-utils/files/nfsd.exports +++ b/package/nfs-utils/files/nfsd.exports @@ -1,6 +1,6 @@ # on embedded devices with MTD you can _only_ export usb disks or sticks # for nfsv3 -#/media *(ro,no_root_squash,insecure,no_subtree_check,crossmnt) +#/media *(ro,fsid=0,no_root_squash,insecure,no_subtree_check,crossmnt) # for nfsv4, do mount --bind /srv/music /nfs4/music and # set nfs_server_version 4 in /etc/rc.conf #/nfs4 hostname(rw,sync,fsid=0,crossmnt,no_subtree_check) diff --git a/package/nfs-utils/patches/patch-support_export_hostname_c b/package/nfs-utils/patches/patch-support_export_hostname_c deleted file mode 100644 index 731d18fd9..000000000 --- a/package/nfs-utils/patches/patch-support_export_hostname_c +++ /dev/null @@ -1,20 +0,0 @@ ---- nfs-utils-1.3.4.orig/support/export/hostname.c 2016-08-03 20:25:15.000000000 +0200 -+++ nfs-utils-1.3.4/support/export/hostname.c 2016-10-08 17:55:01.000000000 +0200 -@@ -384,6 +384,7 @@ host_numeric_addrinfo(const struct socka - - ai = host_pton(buf); - -+#if !definded(__UCLIBC__) && defined(__GLIBC__) - /* - * getaddrinfo(AI_NUMERICHOST) never fills in ai_canonname - */ -@@ -394,7 +395,9 @@ host_numeric_addrinfo(const struct socka - ai = NULL; - } - } -+#endif - - return ai; - } -+ - #endif /* !HAVE_GETNAMEINFO */ diff --git a/package/nfs-utils/patches/patch-support_include_conffile_h b/package/nfs-utils/patches/patch-support_include_conffile_h deleted file mode 100644 index f49b79b38..000000000 --- a/package/nfs-utils/patches/patch-support_include_conffile_h +++ /dev/null @@ -1,11 +0,0 @@ ---- nfs-utils-2.1.1.orig/support/include/conffile.h 2017-01-12 16:21:39.000000000 +0100 -+++ nfs-utils-2.1.1/support/include/conffile.h 2017-08-12 18:53:54.262608096 +0200 -@@ -33,7 +33,7 @@ - #ifndef _CONFFILE_H_ - #define _CONFFILE_H_ - --#include <sys/queue.h> -+#include "queue.h" - #include <ctype.h> - #include <stdint.h> - #include <stdbool.h> diff --git a/package/nfs-utils/patches/patch-support_reexport_fsidd_c b/package/nfs-utils/patches/patch-support_reexport_fsidd_c new file mode 100644 index 000000000..562ed4caa --- /dev/null +++ b/package/nfs-utils/patches/patch-support_reexport_fsidd_c @@ -0,0 +1,10 @@ +--- nfs-utils-2.6.4.orig/support/reexport/fsidd.c 2023-11-17 18:32:39.000000000 +0100 ++++ nfs-utils-2.6.4/support/reexport/fsidd.c 2024-01-04 13:47:58.231661971 +0100 +@@ -6,6 +6,7 @@ + #ifdef HAVE_DLFCN_H + #include <dlfcn.h> + #endif ++#include <unistd.h> + #include <event2/event.h> + + #include "conffile.h" diff --git a/package/nfs-utils/patches/patch-support_reexport_reexport_c b/package/nfs-utils/patches/patch-support_reexport_reexport_c new file mode 100644 index 000000000..9a491bdaf --- /dev/null +++ b/package/nfs-utils/patches/patch-support_reexport_reexport_c @@ -0,0 +1,10 @@ +--- nfs-utils-2.6.4.orig/support/reexport/reexport.c 2023-11-17 18:32:39.000000000 +0100 ++++ nfs-utils-2.6.4/support/reexport/reexport.c 2024-01-04 13:47:43.771377090 +0100 +@@ -5,6 +5,7 @@ + #ifdef HAVE_DLFCN_H + #include <dlfcn.h> + #endif ++#include <unistd.h> + #include <sys/types.h> + #include <sys/vfs.h> + #include <errno.h> diff --git a/package/nfs-utils/patches/patch-tools_Makefile_am b/package/nfs-utils/patches/patch-tools_Makefile_am deleted file mode 100644 index dda2eeba5..000000000 --- a/package/nfs-utils/patches/patch-tools_Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ ---- nfs-utils-1.3.0.orig/tools/Makefile.am 2014-03-25 16:12:07.000000000 +0100 -+++ nfs-utils-1.3.0/tools/Makefile.am 2014-05-13 21:09:39.000000000 +0200 -@@ -6,6 +6,6 @@ if CONFIG_RPCGEN - OPTDIRS += rpcgen - endif - --SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat $(OPTDIRS) -+SUBDIRS = $(OPTDIRS) - - MAINTAINERCLEANFILES = Makefile.in diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am index 5da9c311e..83e03f263 100644 --- a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am +++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am @@ -1,25 +1,13 @@ ---- nfs-utils-1.3.0.orig/tools/rpcgen/Makefile.am 2014-03-25 16:12:07.000000000 +0100 -+++ nfs-utils-1.3.0/tools/rpcgen/Makefile.am 2014-05-20 11:40:39.333034278 +0200 -@@ -1,7 +1,9 @@ - ## Process this file with automake to produce Makefile.in +--- nfs-utils-2.6.4.orig/tools/rpcgen/Makefile.am 2023-11-17 18:32:39.000000000 +0100 ++++ nfs-utils-2.6.4/tools/rpcgen/Makefile.am 2024-01-04 13:27:43.388279004 +0100 +@@ -1,5 +1,10 @@ + CLEANFILES = *~ - CC=$(CC_FOR_BUILD) --LIBTOOL = @LIBTOOL@ --tag=CC ++CC=$(CC_FOR_BUILD) +CFLAGS=$(CFLAGS_FOR_BUILD) +CPPFLAGS=$(CPPFLAGS_FOR_BUILD) +LDFLAGS=$(LDFLAGS_FOR_BUILD) ++ + bin_PROGRAMS = rpcgen + man_MANS = rpcgen.1 - noinst_PROGRAMS = rpcgen - rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \ -@@ -9,11 +11,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout. - rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \ - rpc_scan.h rpc_util.h - --rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD) --rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD) --rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD) --rpcgen_LDADD=$(LIBTIRPC) -- - MAINTAINERCLEANFILES = Makefile.in - - EXTRA_DIST = rpcgen.new.1 diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c deleted file mode 100644 index a94015405..000000000 --- a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c +++ /dev/null @@ -1,10 +0,0 @@ ---- nfs-utils-1.2.3.orig/tools/rpcgen/rpc_cout.c 2010-09-28 14:24:16.000000000 +0200 -+++ nfs-utils-1.2.3/tools/rpcgen/rpc_cout.c 2010-12-24 15:51:41.000000000 +0100 -@@ -36,7 +36,6 @@ static char sccsid[] = "@(#)rpc_cout.c 1 - #include <stdio.h> - #include <string.h> - #include <stdlib.h> --#include <malloc.h> - #include <ctype.h> - #include "rpc_parse.h" - #include "rpc_util.h" diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c deleted file mode 100644 index 1d7937005..000000000 --- a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c +++ /dev/null @@ -1,38 +0,0 @@ ---- nfs-utils-1.3.4.orig/tools/rpcgen/rpc_main.c 2016-08-03 20:25:15.000000000 +0200 -+++ nfs-utils-1.3.4/tools/rpcgen/rpc_main.c 2016-10-08 09:58:39.000000000 +0200 -@@ -156,11 +156,7 @@ int timerflag; /* TRUE if !indefinite & - int newstyle; /* newstyle of passing arguments (by value) */ - int Cflag = 0 ; /* ANSI C syntax */ - static int allfiles; /* generate all files */ --#ifdef linux - int tirpcflag = 0; /* no tirpc by default */ --#else --int tirpcflag = 1; /* generating code for tirpc, by default */ --#endif - - int - main(int argc, char **argv) -@@ -544,13 +540,8 @@ s_output(int argc, char **argv, char *in - timerflag = 1; - } - --#ifndef linux -- if( !tirpcflag && inetdflag ) -- f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n"); --#else - if( !tirpcflag ) - f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n"); --#endif - if( Cflag && (inetdflag || pmflag ) ) { - f_print(fout, "#ifdef __cplusplus\n"); - f_print(fout, "#include <sysent.h> /* getdtablesize, open */\n"); -@@ -563,9 +554,6 @@ s_output(int argc, char **argv, char *in - f_print(fout, "#include <sys/types.h>\n"); - - f_print(fout, "#include <memory.h>\n"); --#ifndef linux -- f_print(fout, "#include <stropts.h>\n"); --#endif - if (inetdflag || !tirpcflag ) { - f_print(fout, "#include <sys/socket.h>\n"); - f_print(fout, "#include <netinet/in.h>\n"); diff --git a/package/nfs-utils/patches/patch-utils_mountd_v4root_c b/package/nfs-utils/patches/patch-utils_mountd_v4root_c deleted file mode 100644 index bba60a48d..000000000 --- a/package/nfs-utils/patches/patch-utils_mountd_v4root_c +++ /dev/null @@ -1,11 +0,0 @@ ---- nfs-utils-3e2ab78a2cfbc2d11c31ced8d3f538d5aae757f1.orig/utils/mountd/v4root.c 2016-10-01 21:41:15.000000000 +0200 -+++ nfs-utils-3e2ab78a2cfbc2d11c31ced8d3f538d5aae757f1/utils/mountd/v4root.c 2016-10-02 08:52:21.000000000 +0200 -@@ -13,7 +13,7 @@ - - #include <sys/types.h> - #include <sys/stat.h> --#include <sys/queue.h> -+#include "queue.h" - #include <stdio.h> - #include <stdlib.h> - #include <ctype.h> diff --git a/package/nfs-utils/patches/patch-utils_statd_rmtcall_c b/package/nfs-utils/patches/patch-utils_statd_rmtcall_c deleted file mode 100644 index 102794697..000000000 --- a/package/nfs-utils/patches/patch-utils_statd_rmtcall_c +++ /dev/null @@ -1,13 +0,0 @@ ---- nfs-utils-1.3.4.orig/utils/statd/rmtcall.c 2016-08-03 20:25:15.000000000 +0200 -+++ nfs-utils-1.3.4/utils/statd/rmtcall.c 2016-10-08 17:55:10.000000000 +0200 -@@ -93,8 +93,10 @@ statd_get_socket(void) - __func__); - break; - } -+#if 0 - se = getservbyport(sin.sin_port, "udp"); - if (se == NULL) -+#endif - break; - - if (retries == MAX_BRP_RETRIES) { diff --git a/package/nginx/Makefile b/package/nginx/Makefile index fc43d851d..6a13c1277 100644 --- a/package/nginx/Makefile +++ b/package/nginx/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= nginx -PKG_VERSION:= 1.12.0 +PKG_VERSION:= 1.25.3 PKG_RELEASE:= 1 -PKG_HASH:= b4222e26fdb620a8d3c3a3a8b955e08b713672e1bc5198d1e4f462308a795b30 +PKG_HASH:= 64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86 PKG_DESCR:= powerful http reverse proxy and webserver PKG_SECTION:= net/http PKG_BUILDDEP:= pcre zlib @@ -47,7 +47,8 @@ CONFIGURE_ARGS:= --prefix=/srv/www \ --http-proxy-temp-path=/var/lib/nginx/proxy \ --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \ --http-scgi-temp-path=/var/lib/nginx/uwsgi \ - --http-uwsgi-temp-path=/var/lib/nginx/uwsgi + --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \ + --without-http_upstream_zone_module ifeq ($(ADK_PACKAGE_NGINX_WITH_LIBRESSL),y) CONFIGURE_ARGS+= --with-http_ssl_module diff --git a/package/nginx/files/nginx.conf b/package/nginx/files/nginx.conf index ea11ef025..bc80bef6a 100644 --- a/package/nginx/files/nginx.conf +++ b/package/nginx/files/nginx.conf @@ -1,4 +1,5 @@ -worker_processes 1; +user nginx; +worker_processes 4; events { worker_connections 1024; @@ -16,7 +17,7 @@ http { root /srv/www/htdocs; location ~ \.php$ { - fastcgi_pass unix:/var/run/php5.sock; + fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_index index.php; include fastcgi_params; } diff --git a/package/nginx/files/nginx.postinst b/package/nginx/files/nginx.postinst index 557ccd181..322e99e06 100644 --- a/package/nginx/files/nginx.postinst +++ b/package/nginx/files/nginx.postinst @@ -1,3 +1,6 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh +gid=$(get_next_gid) +add_user nginx $(get_next_uid) $gid /srv/www +add_group nginx $gid add_rcconf nginx NO diff --git a/package/nginx/patches/patch-auto_cc_conf b/package/nginx/patches/patch-auto_cc_conf deleted file mode 100644 index 99550ab48..000000000 --- a/package/nginx/patches/patch-auto_cc_conf +++ /dev/null @@ -1,28 +0,0 @@ ---- nginx-1.9.12.orig/auto/cc/conf 2016-02-24 15:53:23.000000000 +0100 -+++ nginx-1.9.12/auto/cc/conf 2016-03-04 19:56:52.000000000 +0100 -@@ -181,6 +181,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then - ngx_feature="gcc builtin atomic operations" - ngx_feature_name=NGX_HAVE_GCC_ATOMIC - ngx_feature_run=yes -+ ngx_feature_run_force_result="$ngx_force_gcc_have_atomic" - ngx_feature_incs= - ngx_feature_path= - ngx_feature_libs= -@@ -200,7 +201,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then - else - ngx_feature="C99 variadic macros" - ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS" -- ngx_feature_run=yes -+ ngx_feature_run=no - ngx_feature_incs="#include <stdio.h> - #define var(dummy, ...) sprintf(__VA_ARGS__)" - ngx_feature_path= -@@ -214,7 +215,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then - - ngx_feature="gcc variadic macros" - ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS" -- ngx_feature_run=yes -+ ngx_feature_run=no - ngx_feature_incs="#include <stdio.h> - #define var(dummy, args...) sprintf(args)" - ngx_feature_path= diff --git a/package/nginx/patches/patch-auto_os_darwin b/package/nginx/patches/patch-auto_os_darwin index 456c4a7d3..eb10369e6 100644 --- a/package/nginx/patches/patch-auto_os_darwin +++ b/package/nginx/patches/patch-auto_os_darwin @@ -1,6 +1,6 @@ ---- nginx-1.9.12.orig/auto/os/darwin 2016-02-24 15:53:23.000000000 +0100 -+++ nginx-1.9.12/auto/os/darwin 2016-03-04 19:56:52.000000000 +0100 -@@ -30,6 +30,7 @@ NGX_KQUEUE_CHECKED=YES +--- nginx-1.21.3.orig/auto/os/darwin 2021-09-07 17:21:03.000000000 +0200 ++++ nginx-1.21.3/auto/os/darwin 2021-10-29 14:50:09.085546624 +0200 +@@ -33,6 +33,7 @@ NGX_KQUEUE_CHECKED=YES ngx_feature="kqueue's EVFILT_TIMER" ngx_feature_name="NGX_HAVE_TIMER_EVENT" ngx_feature_run=yes @@ -8,7 +8,7 @@ ngx_feature_incs="#include <sys/event.h> #include <sys/time.h>" ngx_feature_path= -@@ -60,6 +61,7 @@ ngx_feature_test="int kq; +@@ -63,6 +64,7 @@ ngx_feature_test="int kq; ngx_feature="Darwin 64-bit kqueue millisecond timeout bug" ngx_feature_name=NGX_DARWIN_KEVENT_BUG ngx_feature_run=bug @@ -16,7 +16,7 @@ ngx_feature_incs="#include <sys/event.h> #include <sys/time.h>" ngx_feature_path= -@@ -90,6 +92,7 @@ CC_AUX_FLAGS="$CC_AUX_FLAGS" +@@ -92,6 +94,7 @@ ngx_feature_test="int kq; ngx_feature="sendfile()" ngx_feature_name="NGX_HAVE_SENDFILE" ngx_feature_run=yes diff --git a/package/nginx/patches/patch-auto_os_linux b/package/nginx/patches/patch-auto_os_linux index 0281b2def..0e33cb195 100644 --- a/package/nginx/patches/patch-auto_os_linux +++ b/package/nginx/patches/patch-auto_os_linux @@ -1,5 +1,5 @@ ---- nginx-1.11.10.orig/auto/os/linux 2017-02-14 16:36:04.000000000 +0100 -+++ nginx-1.11.10/auto/os/linux 2017-03-18 08:19:23.069283778 +0100 +--- 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" @@ -9,7 +9,7 @@ ngx_feature_incs="#include <sys/epoll.h>" ngx_feature_path= ngx_feature_libs= -@@ -110,7 +110,7 @@ ngx_feature_test="int fd; struct stat sb +@@ -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" @@ -18,7 +18,7 @@ ngx_feature_incs="#include <sys/sendfile.h> #include <errno.h>" ngx_feature_path= -@@ -131,7 +131,7 @@ fi +@@ -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" @@ -27,7 +27,7 @@ ngx_feature_incs="#include <sys/sendfile.h> #include <errno.h>" ngx_feature_path= -@@ -149,7 +149,7 @@ ngx_include="sys/prctl.h"; . auto/includ +@@ -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" @@ -36,8 +36,8 @@ ngx_feature_incs="#include <sys/prctl.h>" ngx_feature_path= ngx_feature_libs= -@@ -170,20 +170,6 @@ ngx_feature_test="cpu_set_t mask; - sched_setaffinity(0, sizeof(cpu_set_t), &mask)" +@@ -215,20 +215,6 @@ ngx_feature_test="struct __user_cap_data + (void) SYS_capset" . auto/feature - diff --git a/package/nginx/patches/patch-auto_unix b/package/nginx/patches/patch-auto_unix index ceaf9eb2a..796bd5cc6 100644 --- a/package/nginx/patches/patch-auto_unix +++ b/package/nginx/patches/patch-auto_unix @@ -1,56 +1,6 @@ ---- nginx-1.11.10.orig/auto/unix 2017-02-14 16:36:04.000000000 +0100 -+++ nginx-1.11.10/auto/unix 2017-03-18 08:19:23.073283934 +0100 -@@ -100,6 +100,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then - ngx_feature="kqueue's EVFILT_TIMER" - ngx_feature_name="NGX_HAVE_TIMER_EVENT" - ngx_feature_run=yes -+ ngx_feature_run_force_result="$ngx_force_have_timer_event" - ngx_feature_incs="#include <sys/event.h> - #include <sys/time.h>" - ngx_feature_path= -@@ -702,6 +703,7 @@ ngx_feature_test="char buf[1]; struct io - ngx_feature="sys_nerr" - ngx_feature_name="NGX_SYS_NERR" - ngx_feature_run=value -+ngx_feature_run_force_result="$ngx_force_sys_nerr" - ngx_feature_incs='#include <errno.h> - #include <stdio.h>' - ngx_feature_path= -@@ -716,6 +718,7 @@ if [ $ngx_found = no ]; then - ngx_feature="_sys_nerr" - ngx_feature_name="NGX_SYS_NERR" - ngx_feature_run=value -+ ngx_feature_run_force_result="$ngx_force_sys_nerr" - ngx_feature_incs='#include <errno.h> - #include <stdio.h>' - ngx_feature_path= -@@ -731,6 +734,7 @@ if [ $ngx_found = no ]; then - ngx_feature='maximum errno' - ngx_feature_name=NGX_SYS_NERR - ngx_feature_run=value -+ ngx_feature_run_force_result="$ngx_force_sys_nerr" - ngx_feature_incs='#include <errno.h> - #include <string.h> - #include <stdio.h>' -@@ -788,7 +792,7 @@ ngx_feature_test="void *p; p = memalign( - - ngx_feature="mmap(MAP_ANON|MAP_SHARED)" - ngx_feature_name="NGX_HAVE_MAP_ANON" --ngx_feature_run=yes -+ngx_feature_run=no - ngx_feature_incs="#include <sys/mman.h>" - ngx_feature_path= - ngx_feature_libs= -@@ -801,7 +805,7 @@ ngx_feature_test="void *p; - - ngx_feature='mmap("/dev/zero", MAP_SHARED)' - ngx_feature_name="NGX_HAVE_MAP_DEVZERO" --ngx_feature_run=yes -+ngx_feature_run=no - ngx_feature_incs="#include <sys/mman.h> - #include <sys/stat.h> - #include <fcntl.h>" -@@ -816,7 +820,7 @@ ngx_feature_test='void *p; int fd; +--- nginx-1.21.3.orig/auto/unix 2021-09-07 17:21:03.000000000 +0200 ++++ nginx-1.21.3/auto/unix 2021-10-29 14:54:32.249555992 +0200 +@@ -833,7 +833,7 @@ ngx_feature_test='void *p; int fd; ngx_feature="System V shared memory" ngx_feature_name="NGX_HAVE_SYSVSHM" @@ -59,7 +9,7 @@ ngx_feature_incs="#include <sys/ipc.h> #include <sys/shm.h>" ngx_feature_path= -@@ -830,7 +834,7 @@ ngx_feature_test="int id; +@@ -847,7 +847,7 @@ ngx_feature_test="int id; ngx_feature="POSIX semaphores" ngx_feature_name="NGX_HAVE_POSIX_SEM" diff --git a/package/nginx/patches/patch-src_os_unix_ngx_errno_c b/package/nginx/patches/patch-src_os_unix_ngx_errno_c index 70020937a..fc9142273 100644 --- a/package/nginx/patches/patch-src_os_unix_ngx_errno_c +++ b/package/nginx/patches/patch-src_os_unix_ngx_errno_c @@ -1,5 +1,5 @@ ---- nginx-1.2.2.orig/src/os/unix/ngx_errno.c 2012-07-02 18:51:02.000000000 +0200 -+++ nginx-1.2.2/src/os/unix/ngx_errno.c 2012-07-16 09:32:48.000000000 +0200 +--- nginx-1.21.3.orig/src/os/unix/ngx_errno.c 2021-09-07 17:21:03.000000000 +0200 ++++ nginx-1.21.3/src/os/unix/ngx_errno.c 2021-10-29 14:50:09.101546624 +0200 @@ -8,6 +8,9 @@ #include <ngx_config.h> #include <ngx_core.h> @@ -8,5 +8,5 @@ +#define NGX_SYS_NERR 128 +#endif - /* - * The strerror() messages are copied because: + static ngx_str_t ngx_unknown_error = ngx_string("Unknown error"); + diff --git a/package/nmap/Makefile b/package/nmap/Makefile index eb6f34892..d8164a379 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= nmap -PKG_VERSION:= 7.40 +PKG_VERSION:= 7.92 PKG_RELEASE:= 1 -PKG_HASH:= 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 +PKG_HASH:= a5479f2f8a6b0b2516767d2f7189c386c1dc858d997167d7ec5cfc798c7571a1 PKG_DESCR:= utility for network exploration or security auditing PKG_SECTION:= net/security -PKG_DEPENDS:= libdnet libpcap libpcre -PKG_BUILDDEP:= libdnet libpcap pcre +PKG_DEPENDS:= libdnet libpcap libpcre zlib +PKG_BUILDDEP:= libdnet libpcap pcre zlib PKG_NEEDS:= c++ PKG_URL:= http://nmap.org/ PKG_SITES:= http://download.insecure.org/nmap/dist/ @@ -26,16 +26,18 @@ TARGET_LDFLAGS+= -lpthread CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no CONFIGURE_ARGS+= --without-openssl \ --without-zenmap \ + --without-nping \ --without-ndiff \ --without-liblua \ --with-libpcap="${STAGING_TARGET_DIR}/usr" \ --with-libpcre="${STAGING_TARGET_DIR}/usr" \ + --with-zlib="${STAGING_TARGET_DIR}/usr" \ --enable-static nmap-install: ${INSTALL_DIR} ${IDIR_NMAP}/usr/share/nmap ${INSTALL_DIR} ${IDIR_NMAP}/usr/bin - for file in mac-prefixes os-db protocols rpc service-probes services; do \ + for file in payloads mac-prefixes os-db protocols rpc service-probes services; do \ ${CP} ${WRKINST}/usr/share/nmap/nmap-$$file ${IDIR_NMAP}/usr/share/nmap; \ done ${INSTALL_BIN} ${WRKINST}/usr/bin/nmap ${IDIR_NMAP}/usr/bin/ diff --git a/package/nodejs/Makefile b/package/nodejs/Makefile index db6b8a1d3..02627aa6a 100644 --- a/package/nodejs/Makefile +++ b/package/nodejs/Makefile @@ -4,19 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= nodejs -PKG_VERSION:= 12.16.2 +PKG_VERSION:= 20.11.1 PKG_RELEASE:= 1 -PKG_HASH:= 48b21340eff95bfc6e7297e4a027f5db74d6d64257c476972a1b2f2fdccc9582 +PKG_HASH:= 4af1ba6ea848cc05908b8a62b02fb27684dd52b2a7988ee82b0cfa72deb90b94 PKG_DESCR:= asynchronous event driven framework PKG_SECTION:= net/http PKG_DEPENDS:= zlib -PKG_BUILDDEP:= python2-host nodejs-host zlib +PKG_BUILDDEP:= python3-host nodejs-host zlib PKG_NEEDS:= threads c++ PKG_URL:= https://nodejs.org/ PKG_SITES:= https://nodejs.org/dist/v$(PKG_VERSION)/ -PKG_SYSTEM_DEPENDS:= !mikrotik-rb532 - DISTFILES:= node-v$(PKG_VERSION).tar.gz WRKDIST= $(WRKDIR)/node-v$(PKG_VERSION) @@ -26,17 +24,16 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,NODEJS,nodejs,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,NODEJS,nodejs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +HOST_CFLAGS:= +HOST_CXXFLAGS:= HOST_STYLE:= manual CONFIG_STYLE:= manual host-configure: (cd $(WRKSRC); \ - PYTHON=$(STAGING_HOST_DIR)/usr/bin/python2 \ - $(STAGING_HOST_DIR)/usr/bin/python2 ./configure \ + PYTHON=$(STAGING_HOST_DIR)/usr/bin/python3 \ + $(STAGING_HOST_DIR)/usr/bin/python3 ./configure \ --prefix=/usr \ - --without-snapshot \ - --without-dtrace \ - --without-etw \ --without-intl \ --shared-zlib \ ) @@ -48,17 +45,16 @@ host-build: nodejs-hostinstall: cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ ${HOST_FAKE_FLAGS} DESTDIR='${STAGING_HOST_DIR}' ${HOST_INSTALL_TARGET} $(MAKE_TRACE) -# $(INSTALL_BIN) ${WRKBUILD}/out/Release/mkpeephole ${STAGING_HOST_DIR}/usr/bin + $(INSTALL_BIN) ${WRKBUILD}/out/Release/node_js2c ${STAGING_HOST_DIR}/usr/bin + $(INSTALL_BIN) ${WRKBUILD}/out/Release/bytecode_builtins_list_generator ${STAGING_HOST_DIR}/usr/bin + $(INSTALL_BIN) ${WRKBUILD}/out/Release/torque ${STAGING_HOST_DIR}/usr/bin do-configure: (cd $(WRKSRC); \ - PYTHON=$(STAGING_HOST_DIR)/usr/bin/python2 \ - $(STAGING_HOST_DIR)/usr/bin/python2 ./configure \ + PYTHON=$(STAGING_HOST_DIR)/usr/bin/python3 \ + $(STAGING_HOST_DIR)/usr/bin/python3 ./configure \ --prefix=/usr \ --cross-compiling \ - --without-snapshot \ - --without-dtrace \ - --without-etw \ --without-intl \ --shared-zlib \ ) diff --git a/package/nodejs/patches/patch-deps_v8_src_base_debug_stack_trace_posix_cc b/package/nodejs/patches/patch-deps_v8_src_base_debug_stack_trace_posix_cc deleted file mode 100644 index 433613981..000000000 --- a/package/nodejs/patches/patch-deps_v8_src_base_debug_stack_trace_posix_cc +++ /dev/null @@ -1,11 +0,0 @@ ---- node-v8.0.0.orig/deps/v8/src/base/debug/stack_trace_posix.cc 2017-05-30 19:31:35.000000000 +0200 -+++ node-v8.0.0/deps/v8/src/base/debug/stack_trace_posix.cc 2017-06-01 13:30:13.141625623 +0200 -@@ -25,7 +25,7 @@ - #include <string> - #include <vector> - --#if V8_LIBC_GLIBC || V8_LIBC_BSD || V8_LIBC_UCLIBC || V8_OS_SOLARIS -+#if V8_LIBC_GLIBC || V8_LIBC_BSD || V8_OS_SOLARIS - #define HAVE_EXECINFO_H 1 - #endif - diff --git a/package/nodejs/patches/patch-deps_v8_src_log-utils_h b/package/nodejs/patches/patch-deps_v8_src_log-utils_h deleted file mode 100644 index 4447e6403..000000000 --- a/package/nodejs/patches/patch-deps_v8_src_log-utils_h +++ /dev/null @@ -1,11 +0,0 @@ ---- node-v8.0.0.orig/deps/v8/src/log-utils.h 2017-05-30 19:31:39.000000000 +0200 -+++ node-v8.0.0/deps/v8/src/log-utils.h 2017-06-01 13:28:54.580576740 +0200 -@@ -9,6 +9,8 @@ - - #include <cstdarg> - -+#include <cstdarg> -+ - #include "src/allocation.h" - #include "src/base/compiler-specific.h" - #include "src/base/platform/mutex.h" diff --git a/package/nut/Makefile b/package/nut/Makefile index e44867f7f..c77daf708 100644 --- a/package/nut/Makefile +++ b/package/nut/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= nut -PKG_VERSION:= 2.7.3 +PKG_VERSION:= 2.8.1 PKG_RELEASE:= 1 -PKG_HASH:= ff44d95d06a51559a0a018eef7f8d17911c1002b6352a7d7580ff75acb12126b +PKG_HASH:= 7da48ee23b1f0d8d72560bb0af84f5c5ae4dbe35452b84cb49840132e47f099c PKG_DESCR:= network ups tools PKG_SECTION:= net/misc PKG_URL:= http://www.networkupstools.org/ -PKG_SITES:= http://www.networkupstools.org/source/2.7/ +PKG_SITES:= http://www.networkupstools.org/source/2.8/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile index fb79c412f..c940d7ac3 100644 --- a/package/olsrd/Makefile +++ b/package/olsrd/Makefile @@ -4,16 +4,17 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= olsrd -PKG_VERSION:= 0.9.0.3 +PKG_VERSION:= 0.9.8 PKG_RELEASE:= 1 -PKG_HASH:= 59d37570c58ec25636a71d5a7cf4460448be693f01d768ae369a7f66e58077fb +PKG_HASH:= ee9e524224e5d5304dcf61f1dc5485c569da09d382934ff85b233be3e24821a3 PKG_DESCR:= optimized link state routing protocol daemon PKG_SECTION:= net/wifi -PKG_URL:= http://www.olsr.org/ -PKG_SITES:= http://www.olsr.org/releases/0.9/ +PKG_BUILDDEP:= gpsd +PKG_DEPENDS:= gpsd +PKG_SITES:= https://github.com/OLSR/olsrd/archive/refs/tags/ PKG_NOPARALLEL:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= v${PKG_VERSION}.tar.gz PKG_SUBPKGS:= OLSRD OLSRD_MOD_DYN_GW OLSRD_MOD_HTTPINFO PKG_SUBPKGS+= OLSRD_MOD_NAMESERVICE OLSRD_MOD_TAS @@ -53,7 +54,7 @@ CONFIG_STYLE:= manual TARGET_CFLAGS+= -fPIC -D_GNU_SOURCE ALL_TARGET+= libs INSTALL_TARGET+= install_libs -MAKE_ENV+= OS="linux" DEBUG=0 STRIP="true" OFLAGS="${TARGET_CFLAGS}" prefix="/usr" +MAKE_ENV+= OS="linux" DEBUG=0 STRIP="true" VERBOSE=1 OFLAGS="${TARGET_CFLAGS}" prefix="/usr" post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_OLSRD}/usr/sbin ${IDIR_OLSRD}/etc/olsrd diff --git a/package/olsrd/patches/patch-lib_pud_Makefile b/package/olsrd/patches/patch-lib_pud_Makefile new file mode 100644 index 000000000..1367cac08 --- /dev/null +++ b/package/olsrd/patches/patch-lib_pud_Makefile @@ -0,0 +1,11 @@ +--- olsrd-0.9.8.orig/lib/pud/Makefile 2019-08-11 10:09:47.000000000 +0200 ++++ olsrd-0.9.8/lib/pud/Makefile 2024-02-29 11:26:30.299243074 +0100 +@@ -108,7 +108,7 @@ endif + + default_target: nmealib library $(PLUGIN_FULLNAME) + +-$(PLUGIN_FULLNAME): $(OBJS) version-script.txt ++$(PLUGIN_FULLNAME): $(OBJS) version-script.txt nmealib + ifeq ($(PUD_NMEALIB_STATICALLY_LINKED),) + ifeq ($(VERBOSE),0) + @echo "[LD] $@ (nmealib dynamically linked)" diff --git a/package/olsrd/patches/patch-lib_pud_src_gpsdclient_c b/package/olsrd/patches/patch-lib_pud_src_gpsdclient_c new file mode 100644 index 000000000..fc71997fc --- /dev/null +++ b/package/olsrd/patches/patch-lib_pud_src_gpsdclient_c @@ -0,0 +1,98 @@ +--- olsrd-0.9.8.orig/lib/pud/src/gpsdclient.c 2019-08-11 10:09:47.000000000 +0200 ++++ olsrd-0.9.8/lib/pud/src/gpsdclient.c 2024-02-29 11:26:48.195242832 +0100 +@@ -79,6 +79,23 @@ static void gpsdError(const char *s) { + syslog(LOG_ERR, "gpsd error: %s", s); + } + ++#if GPSD_API_MAJOR_VERSION >= 9 ++static double time_as_double(struct timespec *ts) { ++ return (ts->tv_sec + ts->tv_nsec * 1e-9); ++} ++ ++static bool is_online(struct gps_data_t *gpsdata) { ++ return !!gpsdata->online.tv_sec; ++} ++#else ++ ++#define time_as_double(x) *(x) ++ ++static bool is_online(struct gps_data_t *gpsdata) { ++ return !!gpsdata->online; ++} ++#endif ++ + /* standard parsing of a GPS data source spec */ + void gpsdParseSourceSpec(char *arg, GpsDaemon *gpsDaemon) { + if (!arg // +@@ -298,8 +315,8 @@ void nmeaInfoFromGpsd(struct gps_data_t + 8, // + dev->parity, // + dev->stopbits, // +- dev->cycle, // +- dev->mincycle); ++ time_as_double(&dev->cycle), // ++ time_as_double(&dev->mincycle)); + + connectionTracking->devSeen[i] = true; + connectionTracking->dev[i] = *dev; +@@ -353,11 +370,6 @@ void nmeaInfoFromGpsd(struct gps_data_t + ); + + gpsdata->set &= ~STATUS_SET; /* always valid */ +- if (gpsdata->status == STATUS_NO_FIX) { +- nmeaInfoClear(info); +- nmeaTimeSet(&info->utc, &info->present, NULL); +- return; +- } + + if (!gpsdata->set) { + return; +@@ -367,11 +379,18 @@ void nmeaInfoFromGpsd(struct gps_data_t + nmeaInfoSetPresent(&info->present, NMEALIB_PRESENT_SMASK); + + /* date & time */ ++#if GPSD_API_MAJOR_VERSION >= 9 ++ if (gpsdata->fix.time.tv_sec > 0) { ++ struct tm *time = gmtime(&gpsdata->fix.time.tv_sec); ++ unsigned int hsec = (unsigned int) (gpsdata->fix.time.tv_nsec / 10000000); ++#else + if (!isNaN(gpsdata->fix.time)) { + double seconds; + double fraction = modf(fabs(gpsdata->fix.time), &seconds); + long sec = lrint(seconds); + struct tm *time = gmtime(&sec); ++ unsigned int hsec = (unsigned int) lrint(fraction * 100); ++#endif + if (time) { + info->utc.year = (unsigned int) time->tm_year + 1900; + info->utc.mon = (unsigned int) time->tm_mon + 1; +@@ -379,7 +398,7 @@ void nmeaInfoFromGpsd(struct gps_data_t + info->utc.hour = (unsigned int) time->tm_hour; + info->utc.min = (unsigned int) time->tm_min; + info->utc.sec = (unsigned int) time->tm_sec; +- info->utc.hsec = (unsigned int) lrint(fraction * 100); ++ info->utc.hsec = hsec; + + nmeaInfoSetPresent(&info->present, NMEALIB_PRESENT_UTCDATE | NMEALIB_PRESENT_UTCTIME); + } +@@ -387,7 +406,7 @@ void nmeaInfoFromGpsd(struct gps_data_t + gpsdata->set &= ~TIME_SET; + + /* sig & fix */ +- if (!gpsdata->online) { ++ if (!is_online(gpsdata)) { + gpsdata->fix.mode = MODE_NO_FIX; + } + +@@ -454,7 +473,11 @@ void nmeaInfoFromGpsd(struct gps_data_t + if ((gpsdata->fix.mode >= MODE_3D) // + && !isNaN(gpsdata->fix.altitude)) { + info->elevation = gpsdata->fix.altitude; ++#if GPSD_API_MAJOR_VERSION >= 9 ++ info->height = gpsdata->fix.geoid_sep; ++#else + info->height = gpsdata->separation; ++#endif + nmeaInfoSetPresent(&info->present, NMEALIB_PRESENT_ELV | NMEALIB_PRESENT_HEIGHT); + } + gpsdata->set &= ~ALTITUDE_SET; diff --git a/package/olsrd/patches/patch-lib_pud_src_gpsdclient_h b/package/olsrd/patches/patch-lib_pud_src_gpsdclient_h new file mode 100644 index 000000000..635f97740 --- /dev/null +++ b/package/olsrd/patches/patch-lib_pud_src_gpsdclient_h @@ -0,0 +1,16 @@ +--- olsrd-0.9.8.orig/lib/pud/src/gpsdclient.h 2019-08-11 10:09:47.000000000 +0200 ++++ olsrd-0.9.8/lib/pud/src/gpsdclient.h 2024-02-29 11:24:18.019244869 +0100 +@@ -60,13 +60,6 @@ struct GpsdConnectionState { + struct devconfig_t dev[MAXUSERDEVS]; + }; + +-/* describe a data source */ +-struct fixsource_t { +- char spec[PATH_MAX]; /* working space, will be modified */ +- char *server; /* pointer into spec field */ +- char *port; /* pointer into spec field */ +- char *device; /* pointer into spec field */ +-}; + + /** + * The gpsd daemon spec diff --git a/package/olsrd/patches/patch-src_cfgparser_local_mk b/package/olsrd/patches/patch-src_cfgparser_local_mk new file mode 100644 index 000000000..4ef666d99 --- /dev/null +++ b/package/olsrd/patches/patch-src_cfgparser_local_mk @@ -0,0 +1,17 @@ +--- olsrd-0.9.8.orig/src/cfgparser/local.mk 2019-08-11 10:09:47.000000000 +0200 ++++ olsrd-0.9.8/src/cfgparser/local.mk 2024-02-29 09:47:24.131323729 +0100 +@@ -74,12 +74,8 @@ $(C)oparse.c: $(C)oparse.y $(C)olsrd_con + ifeq ($(VERBOSE),0) + @echo "[BISON] $@" + endif +- $(MAKECMDPREFIX)$(BISON) -d -o "$@-tmp" "$<" +- $(MAKECMDPREFIX)sed -e 's/register //' \ +- -e '/^#line/s/$(call quote,$@-tmp)/$(call quote,$@)/' \ +- < "$@-tmp" >"$@" +- $(MAKECMDPREFIX)mv "$(subst .c,.h,$@-tmp)" "$(subst .c,.h,$@)" +- $(MAKECMDPREFIX)$(RM) "$@-tmp" "$(subst .c,.h,$@-tmp)" ++ $(MAKECMDPREFIX)$(BISON) -d -o "$@" "$<" ++ $(MAKECMDPREFIX)sed -e 's/register //' "$@" > "$@.o" && mv "$@.o" "$@" + + $(C)oparse.o: CFLAGS := $(filter-out -Wunreachable-code,$(CFLAGS)) + diff --git a/package/open-iscsi/Makefile b/package/open-iscsi/Makefile index 5afb377bc..f33b52f1f 100644 --- a/package/open-iscsi/Makefile +++ b/package/open-iscsi/Makefile @@ -4,30 +4,34 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= open-iscsi -PKG_VERSION:= 2.0 -PKG_EXTRAVER:= 871 +PKG_VERSION:= 2.1.9 PKG_RELEASE:= 1 -PKG_HASH:= bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb +PKG_HASH:= 60e2a1e3058a8af7f702e86a5a0511b05b8754d29d3d2df4e0e301399b5cf70a PKG_DESCR:= iscsi utilities +PKG_DEPENDS:= libkmod libressl +PKG_BUILDDEP:= cmake-host kmod libressl PKG_SECTION:= sys/fs -PKG_URL:= http://www.open-iscsi.org/ -PKG_SITES:= http://www.open-iscsi.org/bits/ +PKG_SITES:= https://github.com/open-iscsi/open-iscsi/archive/refs/tags/ -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-$(PKG_EXTRAVER).tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER} +DISTFILES:= $(PKG_VERSION).tar.gz +#WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER} include $(ADK_TOPDIR)/mk/package.mk -ALL_TARGET:= user -INSTALL_TARGET:= install_user - $(eval $(call PKG_template,OPEN_ISCSI,open-iscsi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIG_STYLE:= manual +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dno_systemd=true \ + -Disns=disabled open-iscsi-install: - $(INSTALL_DIR) $(IDIR_OPEN_ISCSI)/sbin $(IDIR_OPEN_ISCSI)/etc/iscsi - $(INSTALL_BIN) $(WRKINST)/sbin/* $(IDIR_OPEN_ISCSI)/sbin + $(INSTALL_DIR) $(IDIR_OPEN_ISCSI)/usr/sbin $(IDIR_OPEN_ISCSI)/etc/iscsi + $(INSTALL_BIN) $(WRKINST)/usr/sbin/* $(IDIR_OPEN_ISCSI)/usr/sbin $(CP) $(WRKINST)/etc/iscsi/* $(IDIR_OPEN_ISCSI)/etc/iscsi include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/open-iscsi/patches/patch-usr_Makefile b/package/open-iscsi/patches/patch-usr_Makefile deleted file mode 100644 index af7106fd8..000000000 --- a/package/open-iscsi/patches/patch-usr_Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- open-iscsi-2.0-871.orig/usr/Makefile 2009-07-11 05:55:58.000000000 +0200 -+++ open-iscsi-2.0-871/usr/Makefile 2010-11-22 23:23:09.000000000 +0100 -@@ -1,6 +1,6 @@ - # This Makefile will work only with GNU make. - --OSNAME=$(shell uname -s) -+OSNAME=Linux - - # allow users to override these - # eg to compile for a kernel that you aren't currently running -@@ -55,7 +55,7 @@ iscsiadm: $(COMMON_SRCS) $(FW_BOOT_SRCS) - - iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o -- $(CC) $(CFLAGS) -static $^ -o $@ -+ $(CC) $(CFLAGS) $^ -o $@ - clean: - rm -f *.o $(PROGRAMS) .depend $(LIBSYS) - diff --git a/package/open-iscsi/patches/patch-usr_idbm_c b/package/open-iscsi/patches/patch-usr_idbm_c deleted file mode 100644 index 38838c9a1..000000000 --- a/package/open-iscsi/patches/patch-usr_idbm_c +++ /dev/null @@ -1,10 +0,0 @@ ---- open-iscsi-2.0-871.orig/usr/idbm.c 2009-07-11 05:55:58.000000000 +0200 -+++ open-iscsi-2.0-871/usr/idbm.c 2014-01-03 12:44:20.000000000 +0100 -@@ -29,6 +29,7 @@ - #include <limits.h> - #include <sys/stat.h> - #include <sys/file.h> -+#include <fcntl.h> - - #include "idbm.h" - #include "idbm_fields.h" diff --git a/package/open-iscsi/patches/patch-usr_iscsi_sysfs_c b/package/open-iscsi/patches/patch-usr_iscsi_sysfs_c deleted file mode 100644 index 42f5d0330..000000000 --- a/package/open-iscsi/patches/patch-usr_iscsi_sysfs_c +++ /dev/null @@ -1,10 +0,0 @@ ---- open-iscsi-2.0-871.orig/usr/iscsi_sysfs.c 2009-07-11 05:55:58.000000000 +0200 -+++ open-iscsi-2.0-871/usr/iscsi_sysfs.c 2010-11-22 23:16:35.000000000 +0100 -@@ -22,6 +22,7 @@ - #include <string.h> - #include <errno.h> - #include <dirent.h> -+#include <sys/stat.h> - - #include "log.h" - #include "initiator.h" diff --git a/package/open-iscsi/patches/patch-usr_log_h b/package/open-iscsi/patches/patch-usr_log_h deleted file mode 100644 index f4a5f9431..000000000 --- a/package/open-iscsi/patches/patch-usr_log_h +++ /dev/null @@ -1,17 +0,0 @@ ---- open-iscsi-2.0-871.orig/usr/log.h 2009-07-11 05:55:58.000000000 +0200 -+++ open-iscsi-2.0-871/usr/log.h 2010-11-22 22:45:22.000000000 +0100 -@@ -28,14 +28,12 @@ - - #include "iscsid.h" - --#if defined(Linux) - union semun { - int val; - struct semid_ds *buf; - unsigned short int *array; - struct seminfo *__buf; - }; --#endif - #include <sys/sem.h> - - #define DEFAULT_AREA_SIZE 16384 diff --git a/package/open-iscsi/patches/patch-usr_mgmt_ipc_c b/package/open-iscsi/patches/patch-usr_mgmt_ipc_c deleted file mode 100644 index d1d936e0f..000000000 --- a/package/open-iscsi/patches/patch-usr_mgmt_ipc_c +++ /dev/null @@ -1,35 +0,0 @@ ---- open-iscsi-2.0-871.orig/usr/mgmt_ipc.c 2009-07-11 05:55:58.000000000 +0200 -+++ open-iscsi-2.0-871/usr/mgmt_ipc.c 2014-01-03 12:35:32.000000000 +0100 -@@ -341,31 +341,7 @@ mgmt_ipc_notify_del_portal(queue_task_t - static int - mgmt_peeruser(int sock, char *user) - { --#if defined(SO_PEERCRED) -- /* Linux style: use getsockopt(SO_PEERCRED) */ -- struct ucred peercred; -- socklen_t so_len = sizeof(peercred); -- struct passwd *pass; -- -- errno = 0; -- if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &peercred, -- &so_len) != 0 || so_len != sizeof(peercred)) { -- /* We didn't get a valid credentials struct. */ -- log_error("peeruser_unux: error receiving credentials: %m"); -- return 0; -- } -- -- pass = getpwuid(peercred.uid); -- if (pass == NULL) { -- log_error("peeruser_unix: unknown local user with uid %d", -- (int) peercred.uid); -- return 0; -- } -- -- strlcpy(user, pass->pw_name, PEERUSER_MAX); -- return 1; -- --#elif defined(SCM_CREDS) -+#if defined(SCM_CREDS) - struct msghdr msg; - typedef struct cmsgcred Cred; - #define cruid cmcred_uid diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 34c6a6642..2471893d1 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -4,16 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openldap -PKG_VERSION:= 2.4.45 +PKG_VERSION:= 2.6.0 PKG_RELEASE:= 1 -PKG_HASH:= cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824 +PKG_HASH:= b71c580eac573e9aba15d95f33dd4dd08f2ed4f0d7fc09e08ad4be7ed1e41a4f 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_NEEDS:= threads c++ PKG_URL:= http://www.openldap.org/ -PKG_SITES:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ +PKG_SITES:= https://openldap.org/software/download/OpenLDAP/openldap-release/ PKG_LIBNAME:= libopenldap PKG_OPTS:= dev diff --git a/package/openldap/patches/patch-libraries_libldap_tls_o_c b/package/openldap/patches/patch-libraries_libldap_tls_o_c deleted file mode 100644 index f620c03f6..000000000 --- a/package/openldap/patches/patch-libraries_libldap_tls_o_c +++ /dev/null @@ -1,67 +0,0 @@ -Patch from Macports: -https://trac.macports.org/ticket/54275 ---- openldap-2.4.45.orig/libraries/libldap/tls_o.c 2017-06-01 22:01:07.000000000 +0200 -+++ openldap-2.4.45/libraries/libldap/tls_o.c 2017-10-08 19:45:58.513865858 +0200 -@@ -47,7 +47,7 @@ - #include <ssl.h> - #endif - --#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) - #define ASN1_STRING_data(x) ASN1_STRING_get0_data(x) - #endif - -@@ -157,7 +157,7 @@ tlso_init( void ) - (void) tlso_seed_PRNG( lo->ldo_tls_randfile ); - #endif - --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER) - SSL_load_error_strings(); - SSL_library_init(); - OpenSSL_add_all_digests(); -@@ -205,7 +205,7 @@ static void - tlso_ctx_ref( tls_ctx *ctx ) - { - tlso_ctx *c = (tlso_ctx *)ctx; --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER) - #define SSL_CTX_up_ref(ctx) CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX ) - #endif - SSL_CTX_up_ref( c ); -@@ -464,7 +464,7 @@ tlso_session_my_dn( tls_session *sess, s - if (!x) return LDAP_INVALID_CREDENTIALS; - - xn = X509_get_subject_name(x); --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER) - der_dn->bv_len = i2d_X509_NAME( xn, NULL ); - der_dn->bv_val = xn->bytes->data; - #else -@@ -500,7 +500,7 @@ tlso_session_peer_dn( tls_session *sess, - return LDAP_INVALID_CREDENTIALS; - - xn = X509_get_subject_name(x); --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER) - der_dn->bv_len = i2d_X509_NAME( xn, NULL ); - der_dn->bv_val = xn->bytes->data; - #else -@@ -721,7 +721,7 @@ struct tls_data { - Sockbuf_IO_Desc *sbiod; - }; - --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || defined(LIBRESSL_VERSION_NUMBER) - #define BIO_set_init(b, x) b->init = x - #define BIO_set_data(b, x) b->ptr = x - #define BIO_clear_flags(b, x) b->flags &= ~(x) -@@ -822,7 +822,7 @@ tlso_bio_puts( BIO *b, const char *str ) - return tlso_bio_write( b, str, strlen( str ) ); - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000) && !defined(LIBRESSL_VERSION_NUMBER) - struct bio_method_st { - int type; - const char *name; diff --git a/package/openobex/Makefile b/package/openobex/Makefile index 18fe0c5c3..b8208e861 100644 --- a/package/openobex/Makefile +++ b/package/openobex/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openobex -PKG_VERSION:= 1.7.1 +PKG_VERSION:= 1.7.2 PKG_RELEASE:= 1 -PKG_HASH:= 3b264665d90901ea4ff720332ffb9b6d1d8f67187463d3a3279caddc7205ea57 +PKG_HASH:= 158860aaea52f0fce0c8e4b64550daaae06df2689e05834697b7e8c7d73dd4fc PKG_DESCR:= implementation of the obex protocol PKG_SECTION:= sys/misc PKG_BUILDDEP:= eudev bluez diff --git a/package/opensbi/Makefile b/package/opensbi/Makefile new file mode 100644 index 000000000..be308d3db --- /dev/null +++ b/package/opensbi/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:= opensbi +PKG_VERSION:= 1.4 +PKG_RELEASE:= 1 +PKG_HASH:= 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1 +PKG_DESCR:= bootloader for riscv hardware +PKG_SECTION:= base/boot +PKG_URL:= https://github.com/riscv-software-src/opensbi +PKG_SITES:= https://github.com/riscv-software-src/opensbi/archive/refs/tags/ +PKG_ARCH_DEPENDS:= riscv32 riscv64 + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,OPENSBI,opensbi,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +MAKE_ENV+= PLATFORM=generic FW_TEXT_START=0x40000000 FW_OPTIONS=0 +CONFIG_STYLE:= manual + +opensbi-install: + $(CP) $(WRKBUILD)/build/platform/generic/firmware/*.bin \ + $(FW_DIR) + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 863074bee..9f4b1b0f3 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -4,15 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= opensc -PKG_VERSION:= 0.15.0 +PKG_VERSION:= 0.24.0 PKG_RELEASE:= 1 -PKG_HASH:= 7c8600a37d11f82410699ee5c60bfebc46f6714d0d87b4125dd99215c87d4db8 +PKG_HASH:= 24d03c69287291da32a30c4c38a304ad827f56cb85d83619e1f5403ab6480ef8 PKG_DESCR:= utilities to access smart cards PKG_SECTION:= app/crypto PKG_BUILDDEP:= openct pcsc-lite readline libressl PKG_DEPENDS:= libopensc libopenct pcsc-lite libreadline libressl PKG_URL:= https://github.com/OpenSC/OpenSC/wiki -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=opensc/} +PKG_SITES:= https://github.com/OpenSC/OpenSC/releases/download/$(PKG_VERSION)/ PKG_LIBNAME:= libopensc PKG_OPTS:= dev @@ -29,10 +29,11 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,OPENSC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBOPENSC,libopensc,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENSC},${PKGSD_LIBOPENSC},${PKGSC_LIBOPENSC},${PKG_OPTS})) -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --disable-man \ --disable-iconv \ --disable-pcsc \ + --disable-silent-rules \ + --disable-strict \ --enable-openct opensc-install: diff --git a/package/opensips/Makefile b/package/opensips/Makefile index 1165d4421..57495a60f 100644 --- a/package/opensips/Makefile +++ b/package/opensips/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= opensips -PKG_VERSION:= 2.2.3 +PKG_VERSION:= 3.4.4 PKG_RELEASE:= 1 -PKG_HASH:= ccf540f7aae4335a8319b83f6cb87b562e665991fe1c2adc4e8eb4d4f3042dd7 +PKG_HASH:= eab3608a464884fc40f33cc639a5b124dc838799bd4a9701b7a8af49fb937fc7 PKG_DESCR:= high-performance, configurable, free sip server PKG_SECTION:= net/voip PKG_DEPENDS:= libressl @@ -21,8 +21,8 @@ PKG_SUBPKGS+= OPENSIPS_MOD_AUTH_DB OPENSIPS_MOD_AVPOPS OPENSIPS_MOD_DISPATCHER PKG_SUBPKGS+= OPENSIPS_MOD_DIVERSION OPENSIPS_MOD_FLATSTORE OPENSIPS_MOD_GFLAGS PKG_SUBPKGS+= OPENSIPS_MOD_GROUP OPENSIPS_MOD_MEDIAPROXY OPENSIPS_MOD_MSILO PKG_SUBPKGS+= OPENSIPS_MOD_NATHELPER OPENSIPS_MOD_OPTIONS -PKG_SUBPKGS+= OPENSIPS_MOD_PERMISSIONS OPENSIPS_MOD_PIKE OPENSIPS_MOD_SMS -PKG_SUBPKGS+= OPENSIPS_MOD_UAC OPENSIPS_MOD_UAC_REDIRECT OPENSIPS_MOD_URI +PKG_SUBPKGS+= OPENSIPS_MOD_PERMISSIONS OPENSIPS_MOD_PIKE +PKG_SUBPKGS+= OPENSIPS_MOD_UAC OPENSIPS_MOD_UAC_REDIRECT PKGSD_OPENSIPS_MOD_ACCOUNTING:= accounting support PKGSN_OPENSIPS_MOD_ACCOUNTING:= opensips @@ -54,14 +54,10 @@ PKGSD_OPENSIPS_MOD_PERMISSIONS:= permissions support PKGSN_OPENSIPS_MOD_PERMISSIONS:= opensips PKGSD_OPENSIPS_MOD_PIKE:= pike support PKGSN_OPENSIPS_MOD_PIKE:= opensips -PKGSD_OPENSIPS_MOD_SMS:= sms support -PKGSN_OPENSIPS_MOD_SMS:= opensips PKGSD_OPENSIPS_MOD_UAC:= uac support PKGSN_OPENSIPS_MOD_UAC:= opensips PKGSD_OPENSIPS_MOD_UAC_REDIRECT:= uac redirect support PKGSN_OPENSIPS_MOD_UAC_REDIRECT:= opensips -PKGSD_OPENSIPS_MOD_URI:= uri support -PKGSN_OPENSIPS_MOD_URI:= opensips include $(ADK_TOPDIR)/mk/package.mk @@ -92,10 +88,8 @@ $(eval $(call PKG_template,OPENSIPS_MOD_NATHELPER,opensips-mod-nathelper,$(PKG_V $(eval $(call PKG_template,OPENSIPS_MOD_OPTIONS,opensips-mod-options,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,OPENSIPS_MOD_PERMISSIONS,opensips-mod-permissions,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,OPENSIPS_MOD_PIKE,opensips-mod-pike,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,OPENSIPS_MOD_SMS,opensips-mod-sms,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,OPENSIPS_MOD_UAC,opensips-mod-uac,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,OPENSIPS_MOD_UAC_REDIRECT,opensips-mod-uac-redirect,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,OPENSIPS_MOD_URI,opensips-mod-uri,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_mod_template,OPENSIPS_MOD_ACCOUNTING,acc)) $(eval $(call PKG_mod_template,OPENSIPS_MOD_AUTH,auth)) @@ -112,11 +106,9 @@ $(eval $(call PKG_mod_template,OPENSIPS_MOD_NATHELPER,nathelper)) $(eval $(call PKG_mod_template,OPENSIPS_MOD_OPTIONS,options)) $(eval $(call PKG_mod_template,OPENSIPS_MOD_PERMISSIONS,permissions)) $(eval $(call PKG_mod_template,OPENSIPS_MOD_PIKE,pike)) -$(eval $(call PKG_mod_template,OPENSIPS_MOD_SMS,sms)) $(eval $(call PKG_mod_template,OPENSIPS_MOD_SPEEDIAL,speeddial)) $(eval $(call PKG_mod_template,OPENSIPS_MOD_UAC,uac)) $(eval $(call PKG_mod_template,OPENSIPS_MOD_UAC_REDIRECT,uac_redirect)) -$(eval $(call PKG_mod_template,OPENSIPS_MOD_URI,uri)) # Select here the modules for the main package OPENSIPS_MODULES:= sl tm rr maxfwd usrloc registrar db_text textops exec mi_fifo signaling @@ -131,7 +123,6 @@ INSTALL_STYLE:= manual do-build: PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ prefix=/ \ - extra_defs="-DUSE_PTHREAD_MUTEX" \ TLS=1 \ FREERADIUS=0 \ NICER=0 \ diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 74f8fe117..7db2873a6 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,13 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 8.8p1 +PKG_VERSION:= 9.7p1 PKG_RELEASE:= 1 -PKG_HASH:= 4590890ea9bb9ace4f71ae331785a3a5823232435161960ed5fc86588f331fe9 +PKG_HASH:= 490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd PKG_DESCR:= secure shell implementation PKG_SECTION:= net/security -PKG_BUILDDEP:= zlib libressl -PKG_DEPENDS:= zlib libressl +PKG_BUILDDEP:= zlib +PKG_BUILDDEP_GLIBC:= libxcrypt +PKG_DEPENDS:= zlib PKG_NEEDS:= threads PKG_URL:= http://www.openssh.com/ PKG_SITES:= http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ @@ -36,6 +37,15 @@ 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 +PKGCD_WITH_OPENSSL:= with openssl +PKGCS_WITH_OPENSSL:= libopenssl +PKGCB_WITH_OPENSSL:= openssl + + include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,OPENSSH,openssh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -62,12 +72,14 @@ CONFIGURE_ARGS+= --without-pie endif CONFIGURE_ENV+= LD='${TARGET_CC}' \ + LDFLAGS='$(TARGET_LDFLAGS) -latomic' \ ac_cv_func_setlogin=no \ ac_cv_have_decl_PR_SET_NO_NEW_PRIVS=no \ ac_cv_lib_nsl_yp_match=no CONFIGURE_ARGS+= --disable-strip \ --disable-etc-default-login \ --disable-lastlog \ + --without-hardening \ --with-sandbox=no \ --disable-utmp \ --disable-utmpx \ diff --git a/package/openssl-pkcs11/Makefile b/package/openssl-pkcs11/Makefile deleted file mode 100644 index b7948e5a1..000000000 --- a/package/openssl-pkcs11/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:= openssl-pkcs11 -PKG_VERSION:= 0.1.8 -PKG_RELEASE:= 1 -PKG_HASH:= de7d7e41e7c42deef40c53e10ccc3f88d2c036d6656ecee7e82e8be07b06a2e5 -PKG_DESCR:= pkcs11 engine for openssl -PKG_SECTION:= app/crypto -PKG_BUILDDEP:= libp11 -PKG_URL:= http://www.opensc-project.org/engine_pkcs11 -PKG_SITES:= http://www.opensc-project.org/files/engine_pkcs11/ - -DISTFILES:= engine_pkcs11-${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/engine_pkcs11-${PKG_VERSION} - -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,OPENSSL_PKCS11,openssl-pkcs11,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_ARGS+= --with-openssl="${STAGING_TARGET_DIR}/usr" - -openssl-pkcs11-install: - ${INSTALL_DIR} ${IDIR_OPENSSL_PKCS11}/usr/lib/engines - ${INSTALL_DATA} ${WRKINST}/usr/lib/engines/engine_pkcs11.so \ - ${IDIR_OPENSSL_PKCS11}/usr/lib/engines - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openssl-pkcs11/patches/patch-ltmain_sh b/package/openssl-pkcs11/patches/patch-ltmain_sh deleted file mode 100644 index 317a0b26c..000000000 --- a/package/openssl-pkcs11/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- engine_pkcs11-0.1.8.orig/ltmain.sh 2010-01-07 11:21:35.000000000 +0100 -+++ engine_pkcs11-0.1.8/ltmain.sh 2011-01-16 13:57:19.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/openssl/Makefile b/package/openssl/Makefile new file mode 100644 index 000000000..406a88681 --- /dev/null +++ b/package/openssl/Makefile @@ -0,0 +1,117 @@ +# 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:= openssl +PKG_VERSION:= 3.0.13 +PKG_RELEASE:= 1 +PKG_HASH:= 88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313 +PKG_DESCR:= ssl/tls library +PKG_SECTION:= libs/crypto +PKG_URL:= https://www.openssl.org +PKG_DEPENDS:= zlib +PKG_BUILDDEP:= zlib +PKG_SITES:= https://www.openssl.org/source/ +PKG_LIBNAME:= libopenssl +PKG_OPTS:= dev + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +PKG_SUBPKGS:= LIBOPENSSL OPENSSL_UTIL +PKGSD_OPENSSL_UTIL:= openssl command line tool +PKGSC_OPENSSL_UTIL:= app/crypto +PKGSS_OPENSSL_UTIL:= libopenssl + + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,OPENSSL,openssl,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS))) +$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSL_UTIL},${PKGSD_OPENSSL_UTIL},${PKGSC_OPENSSL_UTIL})) + +ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +OPENSSL_OPTIONS:= no-shared zlib no-dso +else +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 + +HOST_STYLE:= manual +CONFIG_STYLE:= manual + +INSTALL_TARGET:= install_sw +FAKE_FLAGS+= INSTALL_PREFIX=${WRKINST} + +ifeq ($(ADK_TARGET_ARCH_MICROBLAZE),y) +TARGET_CFLAGS:= $(subst g3,g,$(TARGET_CFLAGS)) +endif +ifeq ($(ADK_TARGET_ARCH_XTENSA),y) +TARGET_CFLAGS:= $(subst g3,g,$(TARGET_CFLAGS)) +endif +ifeq ($(ADK_TARGET_ARCH_PPC),y) +TARGET_CFLAGS:= $(subst g3,g,$(TARGET_CFLAGS)) +endif + +CONFIG:= linux-generic32 +ifeq ($(ADK_TARGET_ARCH_X86_64),y) +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 +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 + +host-build: + (cd $(WRKBUILD); make) + +openssl-hostinstall: + (cd $(WRKBUILD); make install) + +do-configure: + (cd $(WRKBUILD); \ + PATH='$(TARGET_PATH)' \ + CROSS_COMPILE='' \ + CFLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS) -latomic" \ + ./Configure $(CONFIG) \ + --prefix=/usr \ + --openssldir=/etc/ssl \ + -I$(STAGING_TARGET_DIR)/usr/include \ + -L$(STAGING_TARGET_DIR)/usr/lib \ + -DOPENSSL_SMALL_FOOTPRINT \ + -DOPENSSL_NO_ASYNC \ + $(OPENSSL_OPTIONS) \ + ); + #$(SED) "s:-O[0-9]:$(TARGET_CFLAGS) -fPIC:" $(WRKBUILD)/Makefile + +libopenssl-install: + ${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib + ${CP} ${WRKINST}/usr/lib*/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib + chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so* + +openssl-util-install: + ${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/usr/bin + ${CP} ${WRKINST}/usr/bin/openssl ${IDIR_OPENSSL_UTIL}/usr/bin + ${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/etc/ssl/{,certs,private} + ${CP} ${WRKSRC}/apps/openssl.cnf ${IDIR_OPENSSL_UTIL}/etc/ssl/ + chmod 0700 ${IDIR_OPENSSL_UTIL}/etc/ssl/private + +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/openssl/patches/patch-Configurations_unix-Makefile_tmpl b/package/openssl/patches/patch-Configurations_unix-Makefile_tmpl new file mode 100644 index 000000000..eb64f9a73 --- /dev/null +++ b/package/openssl/patches/patch-Configurations_unix-Makefile_tmpl @@ -0,0 +1,20 @@ +--- 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/openswan/Makefile b/package/openswan/Makefile index 5a48daf15..41ec00201 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -4,22 +4,20 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openswan -PKG_VERSION:= 2.6.51.5 +PKG_VERSION:= 3.0.0 PKG_RELEASE:= 1 -PKG_HASH:= 4124f4ce970089f301c34b9c48f54b021cf6b2b8813877942337f8022104f70d +PKG_HASH:= 69fe7a71e54aaf0ea93b874db4963057c1ff4904b3617b36f2c9be2010c23331 PKG_DESCR:= ipsec software PKG_SECTION:= net/security PKG_DEPENDS:= libgmp PKG_BUILDDEP:= gmp PKG_NEEDS:= threads PKG_URL:= http://www.openswan.org/ -PKG_SITES:= http://www.openswan.org/download/ +PKG_SITES:= https://github.com/xelerance/Openswan/archive/refs/tags/ PKG_NOPARALLEL:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -# GLOB_BRACE usage -PKG_LIBC_DEPENDS:= uclibc-ng glibc +DISTFILES:= v${PKG_VERSION}.tar.gz +WRKDIST= $(WRKDIR)/Openswan-$(PKG_VERSION) include ${ADK_TOPDIR}/mk/package.mk @@ -32,7 +30,9 @@ XAKE_FLAGS+= KERNELSRC="${LINUX_DIR}" \ MODPROBE="insmod" \ OSDEP="linux" \ WERROR="" \ - BUILDENV="linux" + BUILDENV="linux" \ + ARCH=$(ADK_TARGET_KARCH) \ + V=1 ALL_TARGET:= programs openswan-install: diff --git a/package/openswan/patches/patch-Makefile_inc b/package/openswan/patches/patch-Makefile_inc index 2b3529ed1..ca00c7598 100644 --- a/package/openswan/patches/patch-Makefile_inc +++ b/package/openswan/patches/patch-Makefile_inc @@ -1,15 +1,20 @@ ---- openswan-2.6.51.5.orig/Makefile.inc 2019-06-14 21:35:45.000000000 +0200 -+++ openswan-2.6.51.5/Makefile.inc 2019-10-07 20:44:06.511702433 +0200 -@@ -194,10 +194,10 @@ BISONOSFLAGS= - #Example for a cross compile: - #USERCOMPILE?=-g ${PORTDEFINE} -I/usr/local/arm_tools/arm-elf/inc -L/usr/local/arm_tools/lib/gcc-lib - GCC_LINT ?= -DGCC_LINT --USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA} -+USERCOMPILE?=-g -fPIC -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA} +--- Openswan-3.0.0.orig/Makefile.inc 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/Makefile.inc 2022-03-21 19:40:09.287360911 +0100 +@@ -188,7 +188,7 @@ BISONOSFLAGS= + # USER* should be empty for end users/vendors to use + + OPTIMIZE?=-g -O3 +-GCCOPTIONS=${OPTIMIZE} -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA} ++GCCOPTIONS=${OPTIMIZE} -fPIE -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA} + # extra compile flags, for userland and kernel stuff, e.g. -g for debug info + # you can add to this in the defaults file using += + # -DGCC_LINT uses gcc-specific declarations to improve compile-time diagnostics. +@@ -199,7 +199,7 @@ GCC_LINT ?= -DGCC_LINT + USERCOMPILE?=${GCCOPTIONS} # on fedora/rhel #USERCOMPILE?=-g -O2 -g -pipe -Wall -Wp,-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fPIE -pie -DSUPPORT_BROKEN_ANDROID_ICS -KLIPSCOMPILE=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM -+KLIPSCOMPILE=-O2 -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM ++KLIPSCOMPILE=-O2 -fPIE -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM # Additional debugging for developers (warning: can crash openswan!) #USERCOMPILE?=-g -DLEAK_DETECTIVE ${LIBEFENCE} # You can also run this before starting openswan on glibc systems: diff --git a/package/openswan/patches/patch-include_arpa_nameser_h b/package/openswan/patches/patch-include_arpa_nameser_h deleted file mode 100644 index a59cd15b2..000000000 --- a/package/openswan/patches/patch-include_arpa_nameser_h +++ /dev/null @@ -1,128 +0,0 @@ ---- openswan-2.6.38.orig/include/arpa/nameser.h 2012-03-23 22:33:43.000000000 +0100 -+++ openswan-2.6.38/include/arpa/nameser.h 2014-03-26 19:50:18.000000000 +0100 -@@ -55,7 +55,6 @@ - - #include <sys/param.h> - #include <sys/types.h> --#include <sys/cdefs.h> - - /* - * Revision information. This is the release date in YYYYMMDD format. -@@ -505,62 +504,66 @@ typedef enum __ns_cert_types { - #define ns_makecanon __ns_makecanon - #define ns_samename __ns_samename - --__BEGIN_DECLS --int ns_msg_getflag __P((ns_msg, int)); --u_int ns_get16 __P((const u_char *)); --u_long ns_get32 __P((const u_char *)); --void ns_put16 __P((u_int, u_char *)); --void ns_put32 __P((u_long, u_char *)); --int ns_initparse __P((const u_char *, int, ns_msg *)); --int ns_skiprr __P((const u_char *, const u_char *, ns_sect, int)); --int ns_parserr __P((ns_msg *, ns_sect, int, ns_rr *)); --int ns_sprintrr __P((const ns_msg *, const ns_rr *, -- const char *, const char *, char *, size_t)); --int ns_sprintrrf __P((const u_char *, size_t, const char *, -+#ifdef __cplusplus -+extern "C" { -+#endif -+int ns_msg_getflag (ns_msg, int); -+u_int ns_get16 (const u_char *); -+u_long ns_get32 (const u_char *); -+void ns_put16 (u_int, u_char *); -+void ns_put32 (u_long, u_char *); -+int ns_initparse (const u_char *, int, ns_msg *); -+int ns_skiprr (const u_char *, const u_char *, ns_sect, int); -+int ns_parserr (ns_msg *, ns_sect, int, ns_rr *); -+int ns_sprintrr (const ns_msg *, const ns_rr *, -+ const char *, const char *, char *, size_t); -+int ns_sprintrrf (const u_char *, size_t, const char *, - ns_class, ns_type, u_long, const u_char *, - size_t, const char *, const char *, -- char *, size_t)); --int ns_format_ttl __P((u_long, char *, size_t)); --int ns_parse_ttl __P((const char *, u_long *)); --u_int32_t ns_datetosecs __P((const char *cp, int *errp)); --int ns_name_ntol __P((const u_char *, u_char *, size_t)); --int ns_name_ntop __P((const u_char *, char *, size_t)); --int ns_name_pton __P((const char *, u_char *, size_t)); --int ns_name_unpack __P((const u_char *, const u_char *, -- const u_char *, u_char *, size_t)); --int ns_name_pack __P((const u_char *, u_char *, int, -- const u_char **, const u_char **)); --int ns_name_uncompress __P((const u_char *, const u_char *, -- const u_char *, char *, size_t)); --int ns_name_compress __P((const char *, u_char *, size_t, -- const u_char **, const u_char **)); --int ns_name_skip __P((const u_char **, const u_char *)); --void ns_name_rollback __P((const u_char *, const u_char **, -- const u_char **)); --int ns_sign __P((u_char *, int *, int, int, void *, -- const u_char *, int, u_char *, int *, time_t)); --int ns_sign2 __P((u_char *, int *, int, int, void *, -+ char *, size_t); -+int ns_format_ttl (u_long, char *, size_t); -+int ns_parse_ttl (const char *, u_long *); -+u_int32_t ns_datetosecs (const char *cp, int *errp); -+int ns_name_ntol (const u_char *, u_char *, size_t); -+int ns_name_ntop (const u_char *, char *, size_t); -+int ns_name_pton (const char *, u_char *, size_t); -+int ns_name_unpack (const u_char *, const u_char *, -+ const u_char *, u_char *, size_t); -+int ns_name_pack (const u_char *, u_char *, int, -+ const u_char **, const u_char **); -+int ns_name_uncompress (const u_char *, const u_char *, -+ const u_char *, char *, size_t); -+int ns_name_compress (const char *, u_char *, size_t, -+ const u_char **, const u_char **); -+int ns_name_skip (const u_char **, const u_char *); -+void ns_name_rollback (const u_char *, const u_char **, -+ const u_char **); -+int ns_sign (u_char *, int *, int, int, void *, -+ const u_char *, int, u_char *, int *, time_t); -+int ns_sign2 (u_char *, int *, int, int, void *, - const u_char *, int, u_char *, int *, time_t, -- u_char **, u_char **)); --int ns_sign_tcp __P((u_char *, int *, int, int, -- ns_tcp_tsig_state *, int)); --int ns_sign_tcp2 __P((u_char *, int *, int, int, -+ u_char **, u_char **); -+int ns_sign_tcp (u_char *, int *, int, int, -+ ns_tcp_tsig_state *, int); -+int ns_sign_tcp2 (u_char *, int *, int, int, - ns_tcp_tsig_state *, int, -- u_char **, u_char **)); --int ns_sign_tcp_init __P((void *, const u_char *, int, -- ns_tcp_tsig_state *)); --u_char *ns_find_tsig __P((u_char *, u_char *)); --int ns_verify __P((u_char *, int *, void *, -+ u_char **, u_char **); -+int ns_sign_tcp_init (void *, const u_char *, int, -+ ns_tcp_tsig_state *); -+u_char *ns_find_tsig (u_char *, u_char *); -+int ns_verify (u_char *, int *, void *, - const u_char *, int, u_char *, int *, -- time_t *, int)); --int ns_verify_tcp __P((u_char *, int *, ns_tcp_tsig_state *, int)); --int ns_verify_tcp_init __P((void *, const u_char *, int, -- ns_tcp_tsig_state *)); --int ns_samedomain __P((const char *, const char *)); --int ns_subdomain __P((const char *, const char *)); --int ns_makecanon __P((const char *, char *, size_t)); --int ns_samename __P((const char *, const char *)); --__END_DECLS -+ time_t *, int); -+int ns_verify_tcp (u_char *, int *, ns_tcp_tsig_state *, int); -+int ns_verify_tcp_init (void *, const u_char *, int, -+ ns_tcp_tsig_state *); -+int ns_samedomain (const char *, const char *); -+int ns_subdomain (const char *, const char *); -+int ns_makecanon (const char *, char *, size_t); -+int ns_samename (const char *, const char *); -+#ifdef __cplusplus -+} -+#endif - - #ifdef BIND_4_COMPAT - #include <arpa/nameser_compat.h> diff --git a/package/openswan/patches/patch-lib_libalgoparse_kernel_alg_c b/package/openswan/patches/patch-lib_libalgoparse_kernel_alg_c new file mode 100644 index 000000000..dbb01fb0d --- /dev/null +++ b/package/openswan/patches/patch-lib_libalgoparse_kernel_alg_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/libalgoparse/kernel_alg.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/libalgoparse/kernel_alg.c 2022-03-22 16:18:54.795141065 +0100 +@@ -27,7 +27,7 @@ + #include <netinet/in.h> + #include <arpa/inet.h> + #include <unistd.h> +-#include <sys/queue.h> ++#include "queue.h" + + #include <openswan.h> + diff --git a/package/openswan/patches/patch-lib_libalgoparse_klips_interface_c b/package/openswan/patches/patch-lib_libalgoparse_klips_interface_c new file mode 100644 index 000000000..9f901deef --- /dev/null +++ b/package/openswan/patches/patch-lib_libalgoparse_klips_interface_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/libalgoparse/klips_interface.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/libalgoparse/klips_interface.c 2022-03-22 16:19:33.414205801 +0100 +@@ -22,7 +22,7 @@ + #include <netinet/in.h> + #include <arpa/inet.h> + #include <unistd.h> +-#include <sys/queue.h> ++#include "queue.h" + + #include <openswan.h> + diff --git a/package/openswan/patches/patch-lib_libipsecconf_keywords_c b/package/openswan/patches/patch-lib_libipsecconf_keywords_c new file mode 100644 index 000000000..671e9564b --- /dev/null +++ b/package/openswan/patches/patch-lib_libipsecconf_keywords_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/libipsecconf/keywords.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/libipsecconf/keywords.c 2022-03-22 16:20:38.212636657 +0100 +@@ -20,7 +20,7 @@ + * + */ + +-#include <sys/queue.h> ++#include "queue.h" + #include <string.h> + #include <assert.h> + #include <stdlib.h> diff --git a/package/openswan/patches/patch-lib_libipsecconf_oeconns_c b/package/openswan/patches/patch-lib_libipsecconf_oeconns_c new file mode 100644 index 000000000..f7e9ca9c9 --- /dev/null +++ b/package/openswan/patches/patch-lib_libipsecconf_oeconns_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/libipsecconf/oeconns.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/libipsecconf/oeconns.c 2022-03-22 16:21:06.271957222 +0100 +@@ -16,7 +16,7 @@ + #include <string.h> + #include <limits.h> + #include <assert.h> +-#include <sys/queue.h> ++#include "queue.h" + + #include "ipsecconf/parser.h" + #include "ipsecconf/confread.h" diff --git a/package/openswan/patches/patch-lib_libopenswan_kernel_alg_c b/package/openswan/patches/patch-lib_libopenswan_kernel_alg_c deleted file mode 100644 index 36cf64ee4..000000000 --- a/package/openswan/patches/patch-lib_libopenswan_kernel_alg_c +++ /dev/null @@ -1,11 +0,0 @@ ---- openswan-2.6.38.orig/lib/libopenswan/kernel_alg.c 2012-03-23 22:33:43.000000000 +0100 -+++ openswan-2.6.38/lib/libopenswan/kernel_alg.c 2014-03-26 20:04:18.000000000 +0100 -@@ -27,7 +27,7 @@ - #include <netinet/in.h> - #include <arpa/inet.h> - #include <unistd.h> --#include <sys/queue.h> -+#include "queue.h" - - #include <openswan.h> - diff --git a/package/openswan/patches/patch-lib_liboswlog_oswlog_c b/package/openswan/patches/patch-lib_liboswlog_oswlog_c new file mode 100644 index 000000000..4fb7e2ef7 --- /dev/null +++ b/package/openswan/patches/patch-lib_liboswlog_oswlog_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/liboswlog/oswlog.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/liboswlog/oswlog.c 2022-03-22 16:21:39.003164693 +0100 +@@ -25,7 +25,7 @@ + #include <string.h> + #include <unistd.h> + #include <signal.h> /* used only if MSG_NOSIGNAL not defined */ +-#include <sys/queue.h> ++#include "queue.h" + #include <libgen.h> + #include <sys/stat.h> + #include <sys/types.h> diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 0d2cb25a5..8001a51ca 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -4,17 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= openvpn -PKG_VERSION:= 2.4.7 +PKG_VERSION:= 2.6.10 PKG_RELEASE:= 1 -PKG_HASH:= a42f53570f669eaf10af68e98d65b531015ff9e12be7a62d9269ea684652f648 +PKG_HASH:= 1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b PKG_DESCR:= vpn solution using ssl/tls -PKG_DEPENDS:= libressl -PKG_BUILDDEP:= libressl +PKG_DEPENDS:= libressl libcap-ng +PKG_BUILDDEP:= libressl libcap-ng PKG_KDEPENDS:= tun PKG_SECTION:= net/security PKG_URL:= http://openvpn.net/ PKG_SITES:= http://swupdate.openvpn.org/community/releases/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz + PKG_FLAVOURS_OPENVPN:= WITH_LZO WITH_LZ4 WITH_MANAGEMENT WITH_SMALL PKGFD_WITH_LZO:= enable lzo compression support PKGFS_WITH_LZO:= liblzo diff --git a/package/openvpn/patches/patch-src_openvpn_ssl_openssl_c b/package/openvpn/patches/patch-src_openvpn_ssl_openssl_c deleted file mode 100644 index efcbc2600..000000000 --- a/package/openvpn/patches/patch-src_openvpn_ssl_openssl_c +++ /dev/null @@ -1,29 +0,0 @@ ---- openvpn-2.4.7.orig/src/openvpn/ssl_openssl.c 2019-02-20 13:28:23.000000000 +0100 -+++ openvpn-2.4.7/src/openvpn/ssl_openssl.c 2019-10-07 21:44:52.473323073 +0200 -@@ -459,7 +459,7 @@ tls_ctx_restrict_ciphers_tls13(struct tl - return; - } - --#if (OPENSSL_VERSION_NUMBER < 0x1010100fL) -+#if (OPENSSL_VERSION_NUMBER < 0x1010100fL) || defined(LIBRESSL_VERSION_NUMBER) - crypto_msg(M_WARN, "Not compiled with OpenSSL 1.1.1 or higher. " - "Ignoring TLS 1.3 only tls-ciphersuites '%s' setting.", - ciphers); -@@ -1846,7 +1846,7 @@ show_available_tls_ciphers_list(const ch - crypto_msg(M_FATAL, "Cannot create SSL_CTX object"); - } - --#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL) -+#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER)) - if (tls13) - { - SSL_CTX_set_min_proto_version(tls_ctx.ctx, TLS1_3_VERSION); -@@ -1867,7 +1867,7 @@ show_available_tls_ciphers_list(const ch - crypto_msg(M_FATAL, "Cannot create SSL object"); - } - --#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) -+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || defined(LIBRESSL_VERSION_NUMBER) - STACK_OF(SSL_CIPHER) *sk = SSL_get_ciphers(ssl); - #else - STACK_OF(SSL_CIPHER) *sk = SSL_get1_supported_ciphers(ssl); diff --git a/package/opkg/Makefile b/package/opkg/Makefile index da1647322..17f2bf2e2 100644 --- a/package/opkg/Makefile +++ b/package/opkg/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= opkg -PKG_VERSION:= 0.4.2 +PKG_VERSION:= 0.6.2 PKG_RELEASE:= 1 -PKG_HASH:= 86887852c43457edfff9d8b6d9520f3f1cdd55f25eb600a6eb31e1c4e151e106 +PKG_HASH:= ac73a90a2549cd04948e563d915912c78e1b8ba0f43af75c5a53fcca474adbd5 PKG_DESCR:= embedded package manager PKG_DEPENDS:= libcurl libarchive gpgme libressl xz PKG_BUILDDEP:= curl libarchive gpgme xz libressl @@ -24,7 +24,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,OPKG,opkg,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,OPKG,opkg,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf HOST_CONFIGURE_ARGS+= --disable-openssl \ --disable-gpg \ --disable-xz \ diff --git a/package/opus/Makefile b/package/opus/Makefile index cae0fca62..0785c74d8 100644 --- a/package/opus/Makefile +++ b/package/opus/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= opus -PKG_VERSION:= 1.1.5 +PKG_VERSION:= 1.3.1 PKG_RELEASE:= 1 -PKG_HASH:= eb84981ca0f40a3e5d5e58d2e8582cb2fee05a022825a6dfe14d14b04eb563e4 +PKG_HASH:= 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d PKG_DESCR:= open, royalty-free, highly versatile audio codec PKG_SECTION:= libs/audio PKG_URL:= http://opus-codec.org/ diff --git a/package/owfs/Makefile b/package/owfs/Makefile index 71df2bbf6..227fe8b04 100644 --- a/package/owfs/Makefile +++ b/package/owfs/Makefile @@ -4,14 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= owfs -PKG_VERSION:= 3.1p0 +PKG_VERSION:= 3.2p4 PKG_RELEASE:= 1 -PKG_HASH:= 62fca1b3e908cd4515c9eb499bf2b05020bbbea4a5b73611ddc6f205adec7a54 +PKG_HASH:= af0a5035f3f3df876ca15aea13486bfed6b3ef5409dee016db0be67755c35fcc PKG_DESCR:= software to access 1-wire devices PKG_SECTION:= sys/hw PKG_BUILDDEP:= fuse PKG_URL:= http://owfs.org/ -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=owfs/} +PKG_SITES:= https://github.com/owfs/owfs/releases/download/v$(PKG_VERSION)/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/p5-anyevent/Makefile b/package/p5-anyevent/Makefile index 8c1577dc5..a8bcb8179 100644 --- a/package/p5-anyevent/Makefile +++ b/package/p5-anyevent/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= p5-anyevent -PKG_VERSION:= 7.11 +PKG_VERSION:= 7.17 PKG_RELEASE:= 1 -PKG_HASH:= 8bf1b59860d04daeec4f6f56e3b86b581dfabacbc3ba0442e493e267b4b9f522 +PKG_HASH:= 50beea689c098fe4aaeb83806c40b9fe7f946d5769acf99f849f099091a4b985 PKG_DESCR:= anyevent PKG_SECTION:= dev/perl PKG_DEPENDS:= perl diff --git a/package/p5-html-parser/Makefile b/package/p5-html-parser/Makefile index 188c2fb98..7f5f09d10 100644 --- a/package/p5-html-parser/Makefile +++ b/package/p5-html-parser/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= p5-html-parser -PKG_VERSION:= 3.71 +PKG_VERSION:= 3.76 PKG_RELEASE:= 1 -PKG_HASH:= be918b3749d3ff93627f72ee4b825683332ecb4c81c67a3a8d72b0435ffbd802 +PKG_HASH:= 64d9e2eb2b420f1492da01ec0e6976363245b4be9290f03f10b7d2cb63fa2f61 PKG_DESCR:= html parser class PKG_SECTION:= dev/perl PKG_DEPENDS:= perl PKG_BUILDDEP:= perl-host perl -PKG_SITES:= http://cpan.metacpan.org/authors/id/G/GA/GAAS/ +PKG_SITES:= https://cpan.metacpan.org/authors/id/O/OA/OALDERS/ DISTFILES:= HTML-Parser-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/HTML-Parser-${PKG_VERSION} diff --git a/package/p5-parse-yapp/Makefile b/package/p5-parse-yapp/Makefile new file mode 100644 index 000000000..46b71fc7b --- /dev/null +++ b/package/p5-parse-yapp/Makefile @@ -0,0 +1,42 @@ +# 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 + +# always use tab spaces as separator, no spaces +PKG_NAME:= p5-parse-yapp +PKG_VERSION:= 1.21 +PKG_RELEASE:= 1 +PKG_HASH:= 3810e998308fba2e0f4f26043035032b027ce51ce5c8a52a8b8e340ca65f13e5 +PKG_DESCR:= Parse Yapp +PKG_SECTION:= dev/perl +PKG_DEPENDS:= perl +PKG_BUILDDEP:= perl-host perl +HOST_BUILDDEP:= perl-host +PKG_SITES:= https://cpan.metacpan.org/authors/id/W/WB/WBRASWELL/ + +DISTFILES:= Parse-Yapp-${PKG_VERSION}.tar.gz +WRKDIST= ${WRKDIR}/Parse-Yapp-${PKG_VERSION} + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,P5_PARSE_YAPP,p5-parse-yapp,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,P5_PARSE_YAPP,p5-parse-yapp,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +include $(ADK_TOPDIR)/mk/perl.mk + +HOST_STYLE:= perl +CONFIG_STYLE:= perl +XAKE_FLAGS+= $(PERL_ENV) + +hostpost-install: + (cd $(WRKBUILD) && PATH='$(HOST_PATH)' $(HOST_PERL_ENV) make install) + +p5-parse-yapp-install: + $(INSTALL_DIR) $(IDIR_P5_PARSE_YAPP)$(PERL_SITEDIR) + $(CP) $(WRKINST)$(PERL_SITEDIR)/* \ + $(IDIR_P5_PARSE_YAPP)$(PERL_SITEDIR) + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/p5-sub-name/Makefile b/package/p5-sub-name/Makefile index fbb246439..f7a55e3ba 100644 --- a/package/p5-sub-name/Makefile +++ b/package/p5-sub-name/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= p5-sub-name -PKG_VERSION:= 0.05 +PKG_VERSION:= 0.27 PKG_RELEASE:= 1 -PKG_HASH:= c9d1b805ea1f8e35fdde319468d6378dc1f1123cd8f2b22788238ba842713af1 +PKG_HASH:= ecf36fba1c47ca93e1daa394968ed39c4186867459d9cd173c421e2b972043e8 PKG_DESCR:= rename a sub PKG_SECTION:= dev/perl PKG_DEPENDS:= perl PKG_BUILDDEP:= perl-host perl -PKG_SITES:= http://cpan.metacpan.org/authors/id/F/FL/FLORA/ +PKG_SITES:= https://cpan.metacpan.org/authors/id/E/ET/ETHER/ DISTFILES:= Sub-Name-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/Sub-Name-${PKG_VERSION} diff --git a/package/p5-xml-parser-expat/Makefile b/package/p5-xml-parser-expat/Makefile index 16d92ff47..b7fb8244a 100644 --- a/package/p5-xml-parser-expat/Makefile +++ b/package/p5-xml-parser-expat/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= p5-xml-parser-expat -PKG_VERSION:= 2.44 +PKG_VERSION:= 2.47 PKG_RELEASE:= 1 -PKG_HASH:= 1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216 +PKG_HASH:= ad4aae643ec784f489b956abe952432871a622d4e2b5c619e8855accbfc4d1d8 PKG_DESCR:= lowlevel access to expat xml parser PKG_SECTION:= dev/perl PKG_DEPENDS:= perl libexpat diff --git a/package/p5-xml-parser/Makefile b/package/p5-xml-parser/Makefile index 90f0fed30..9783ae0b2 100644 --- a/package/p5-xml-parser/Makefile +++ b/package/p5-xml-parser/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= p5-xml-parser -PKG_VERSION:= 2.41 +PKG_VERSION:= 2.47 PKG_RELEASE:= 1 -PKG_HASH:= b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740894de9 +PKG_HASH:= ad4aae643ec784f489b956abe952432871a622d4e2b5c619e8855accbfc4d1d8 PKG_DESCR:= xml parser PKG_SECTION:= dev/perl PKG_DEPENDS:= perl libexpat diff --git a/package/p5-yaml-xs/Makefile b/package/p5-yaml-xs/Makefile index 326eb892a..282faaa83 100644 --- a/package/p5-yaml-xs/Makefile +++ b/package/p5-yaml-xs/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= p5-yaml-xs -PKG_VERSION:= 0.41 +PKG_VERSION:= 0.89 PKG_RELEASE:= 1 -PKG_HASH:= 9a654427a3a63de434c6d03b18bba144cc7ba0f0e61a7100c6d08d77a90145ce +PKG_HASH:= 155ab83675345c50add03311acf9dd915955707f909a2abd8b17d7792859b2ec PKG_DESCR:= yaml serialization using xs and libyaml PKG_SECTION:= dev/perl PKG_DEPENDS:= perl PKG_BUILDDEP:= perl-host perl -PKG_SITES:= http://cpan.metacpan.org/authors/id/I/IN/INGY/ +PKG_SITES:= https://cpan.metacpan.org/authors/id/T/TI/TINITA/ DISTFILES:= YAML-LibYAML-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/YAML-LibYAML-${PKG_VERSION} diff --git a/package/platform/Makefile b/package/p8-platform/Makefile index c23c3e21a..af0bd5a87 100644 --- a/package/platform/Makefile +++ b/package/p8-platform/Makefile @@ -3,24 +3,27 @@ include $(ADK_TOPDIR)/rules.mk -PKG_NAME:= platform -PKG_VERSION:= aafa6e9f3b86f2258f5f75809849743b1779072b +PKG_NAME:= p8-platform +PKG_VERSION:= 2.1.0.1 PKG_RELEASE:= 1 -PKG_GIT:= hash +PKG_HASH:= 064f8d2c358895c7e0bea9ae956f8d46f3f057772cb97f2743a11d478a0f68a0 PKG_DESCR:= platform library used by libcec PKG_SECTION:= libs/misc PKG_URL:= https://github.com/Pulse-Eight/platform -PKG_SITES:= https://github.com/Pulse-Eight/platform.git +PKG_SITES:= https://github.com/Pulse-Eight/platform/archive/refs/tags/ PKG_LIBNAME:= libplatform PKG_OPTS:= dev +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz +WRKDIST= $(WRKDIR)/platform-$(PKG_NAME)-$(PKG_VERSION) + include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBPLATFORM,libplatform,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +$(eval $(call PKG_template,P8_PLATFORM,p8-platform,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) CONFIG_STYLE:= cmake -libplatform-install: +p8-platform-install: : include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/pango/Makefile b/package/pango/Makefile index 352edeb4d..44fac2f88 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pango -PKG_VERSION:= 1.40.3 -PKG_EXTRAVER:= 1.40 +PKG_VERSION:= 1.50.4 +PKG_EXTRAVER:= 1.50 PKG_RELEASE:= 1 -PKG_HASH:= abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3 +PKG_HASH:= f4ad63e87dc2b145300542a4fb004d07a9f91b34152fae0ddbe50ecdd851c162 PKG_DESCR:= library for laying out and rendering of text PKG_SECTION:= libs/fonts -PKG_BUILDDEP:= libXft glib cairo harfbuzz fontconfig -HOST_BUILDDEP:= cairo-host harfbuzz-host +PKG_BUILDDEP:= libXft glib cairo harfbuzz fontconfig fribidi +HOST_BUILDDEP:= cairo-host harfbuzz-host glib-host meson-host PKG_NEEDS:= c++ PKG_URL:= http://www.pango.org/ PKG_SITES:= $(MASTER_SITE_GNOME:=pango/$(PKG_EXTRAVER)/) @@ -23,10 +23,12 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,PANGO,pango,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,PANGO,pango,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -HOST_LDFLAGS+= -lffi -HOST_STYLE:= auto -AUTOTOOLS_STYLE:= autoreconf -CONFIGURE_ARGS+= --disable-man +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +HOST_STYLE:= meson +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson pango-install: $(INSTALL_DIR) $(IDIR_PANGO)/etc/pango $(IDIR_PANGO)/usr/lib diff --git a/package/parted/Makefile b/package/parted/Makefile index b78783971..d439d93de 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= parted -PKG_VERSION:= 3.3 -PKG_RELEASE:= 5 -PKG_HASH:= 57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 +PKG_VERSION:= 3.6 +PKG_RELEASE:= 1 +PKG_HASH:= 3b43dbe33cca0f9a18601ebab56b7852b128ec1a3df3a9b30ccde5e73359e612 PKG_DESCR:= partition table editor PKG_SECTION:= sys/fs PKG_DEPENDS:= libblkid libuuid libncurses diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile index 3720f55f8..58a44a037 100644 --- a/package/pciutils/Makefile +++ b/package/pciutils/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pciutils PKG_VERSION:= 3.5.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_HASH:= 2bf3a4605a562fb6b8b7673bff85a474a5cf383ed7e4bd8886b4f0939013d42f PKG_DESCR:= pci utilities PKG_SECTION:= sys/hw @@ -13,7 +13,6 @@ PKG_DEPENDS:= zlib PKG_BUILDDEP:= zlib PKG_URL:= http://www.kernel.org/pub/software/utils/pciutils/ PKG_SITES:= http://www.kernel.org/pub/software/utils/pciutils/ -PKG_BB:= 1 include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/pcre/Makefile b/package/pcre/Makefile index 435d5dcb2..c9814fbae 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= pcre -PKG_VERSION:= 8.41 +PKG_VERSION:= 8.45 PKG_RELEASE:= 1 -PKG_HASH:= 244838e1f1d14f7e2fa7681b857b3a8566b74215f28133f14a8f5e59241b682c +PKG_HASH:= 4e6ce03e0336e8b4a3d6c2b70b1c5e18590a5673a98186da90d4f33c23defc09 PKG_DESCR:= perl compatible regular expression library PKG_SECTION:= libs/misc PKG_URL:= http://www.pcre.org/ diff --git a/package/pcre2/Makefile b/package/pcre2/Makefile new file mode 100644 index 000000000..3bd0d9935 --- /dev/null +++ b/package/pcre2/Makefile @@ -0,0 +1,40 @@ +# 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:= pcre2 +PKG_VERSION:= 10.42 +PKG_RELEASE:= 1 +PKG_HASH:= a8e52a9bd1bca8f51c5c24823adc2a99acb12288e289a6507090c1a4a4815010 +PKG_DESCR:= perl compatible regular expression library +PKG_SECTION:= libs/misc +PKG_BUILDDEP:= cmake-host +HOST_BUILDDEP:= cmake-host +PKG_SITES:= https://github.com/PCRE2Project/pcre2/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION) + +include $(ADK_TOPDIR)/mk/host.mk +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 +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} + +pcre2-install: + $(INSTALL_DIR) $(IDIR_PCRE2)/usr/lib + $(CP) $(WRKINST)/usr/lib/libpcre2*.so* \ + $(IDIR_PCRE2)/usr/lib + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/pdnsd/Makefile b/package/pdnsd/Makefile deleted file mode 100644 index 0cc15e88f..000000000 --- a/package/pdnsd/Makefile +++ /dev/null @@ -1,41 +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:= pdnsd -PKG_VERSION:= 1.2.9a -PKG_RELEASE:= 1 -PKG_HASH:= bb5835d0caa8c4b31679d6fd6a1a090b71bdf70950db3b1d0cea9cf9cb7e2a7b -PKG_DESCR:= proxy dns server -PKG_SECTION:= net/dns -PKG_NEEDS:= threads -PKG_URL:= http://members.home.nl/p.a.rombouts/pdnsd/index.html -PKG_SITES:= http://members.home.nl/p.a.rombouts/pdnsd/releases/ - -PKG_FLAVOURS_PDNSD:= WITH_IPV6 -PKGFD_WITH_IPV6:= enable IPv6 support - -PKG_HOST_DEPENDS:= !netbsd - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-par.tar.gz - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,PDNSD,pdnsd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_ARGS+= --with-target=Linux - -ifneq (${ADK_PACKAGE_PDNSD_WITH_IPV6},) -CONFIGURE_ARGS+= --enable-ipv6 -else -CONFIGURE_ARGS+= --disable-ipv6 -endif - -pdnsd-install: - $(INSTALL_DIR) $(IDIR_PDNSD)/etc - ${INSTALL_DATA} ./files/pdnsd.conf ${IDIR_PDNSD}/etc/ - $(INSTALL_DIR) $(IDIR_PDNSD)/usr/sbin - $(INSTALL_BIN) $(WRKINST)/usr/sbin/pdnsd{,-ctl} $(IDIR_PDNSD)/usr/sbin/ - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pdnsd/files/pdnsd.conf b/package/pdnsd/files/pdnsd.conf deleted file mode 100644 index 73690524a..000000000 --- a/package/pdnsd/files/pdnsd.conf +++ /dev/null @@ -1,36 +0,0 @@ -global { - perm_cache = 1024; - cache_dir = "/var/cache/pdnsd"; # do not change this! - run_as = "nobody"; - strict_setuid = on; - server_ip = 127.0.0.1; # Use eth0 here if you want to allow other - # machines on your network to query pdnsd. - status_ctl = on; -# paranoid=on; # This option reduces the chance of cache poisoning - # but may make pdnsd less efficient, unfortunately. - query_method=udp_tcp; - min_ttl=15m; # Retain cached entries at least 15 minutes. - max_ttl=1w; # One week. - timeout=10; # Global timeout option (10 seconds). - proc_limit = 20; -} - -# serve local host definitions -source { - owner = "localhost"; - serve_aliases = off; # skip everything after the first host for an IP - file = "/etc/hosts"; -} - -# for dns servers via dhcp -#server { -# label = "dhcp"; -# file = "/var/resolv.conf"; -# exclude = ".lan"; -# policy = fqdn_only; -# timeout = 4; -# uptest = if; -# interface = "eth0"; -# interval = 60; -#} - diff --git a/package/pdnsd/files/pdnsd.conffiles b/package/pdnsd/files/pdnsd.conffiles deleted file mode 100644 index c2ae46acb..000000000 --- a/package/pdnsd/files/pdnsd.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/pdnsd.conf diff --git a/package/pdnsd/files/pdnsd.init b/package/pdnsd/files/pdnsd.init deleted file mode 100644 index 5d6111e69..000000000 --- a/package/pdnsd/files/pdnsd.init +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -#PKG pdnsd -#INIT 60 -. /etc/rc.conf - -case $1 in -autostop) ;; -autostart) - test x"${pdnsd:-NO}" = x"NO" && exit 0 - test x"$pdnsd" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start - exec sh $0 start - ;; -start) - [ -f /etc/pdnsd.conf ] || exit - mkdir -p /var/cache/pdnsd - touch /var/cache/pdnsd/pdnsd.cache - # this allows for strict_setuid - chown -R nobody:nogroup /var/cache/pdnsd - /usr/sbin/pdnsd -d - ;; -stop) - kill $(pgrep -f /usr/sbin/pdnsd) - ;; -restart) - sh $0 stop - sleep 1 - sh $0 start - ;; -*) - echo "Usage: $0 {start | stop | restart}" - exit 1 - ;; -esac -exit $? diff --git a/package/perf/Makefile b/package/perf/Makefile index 2e7188c14..61680c399 100644 --- a/package/perf/Makefile +++ b/package/perf/Makefile @@ -28,12 +28,10 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-build: - $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" \ - $(KERNEL_MAKE_OPTS) WERROR=0 -C "$(LINUX_DIR)/tools/perf" all + ${KERNEL_MAKE} WERROR=0 -C "$(LINUX_DIR)/tools/perf" all do-install: - $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" \ - $(KERNEL_MAKE_OPTS) WERROR=0 -C "$(LINUX_DIR)/tools/perf" \ + ${KERNEL_MAKE} WERROR=0 -C "$(LINUX_DIR)/tools/perf" \ prefix="$(WRKINST)" install perf-install: diff --git a/package/perl/Makefile b/package/perl/Makefile index 63b56c2c5..788d08745 100644 --- a/package/perl/Makefile +++ b/package/perl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= perl -PKG_VERSION:= 5.24.1 +PKG_VERSION:= 5.38.2 PKG_RELEASE:= 1 -PKG_HASH:= 03a77bac4505c270f1890ece75afc7d4b555090b41aa41ea478747e23b2afb3f +PKG_HASH:= d91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 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.1.5 +PC_VERSION:= 1.5.2 PC_SITE:= https://github.com/arsv/perl-cross/releases/download/$(PC_VERSION) include ${ADK_TOPDIR}/mk/host.mk @@ -55,6 +55,7 @@ pre-configure: cd $(DL_DIR); wget $(PC_SITE)/perl-cross-$(PC_VERSION).tar.gz; \ fi) (cd $(WRKSRC); tar --strip-components=1 -xf $(DL_DIR)/perl-cross-$(PC_VERSION).tar.gz) + $(CP) $(SCRIPT_DIR)/config.* $(WRKSRC)/cnf perl-install: ${INSTALL_DIR} ${IDIR_PERL}/usr/bin diff --git a/package/php/Makefile b/package/php/Makefile index c7b7818d4..7b9a1e81b 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,13 +4,11 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 7.4.24 +PKG_VERSION:= 8.3.2 PKG_RELEASE:= 1 -PKG_HASH:= ff7658ee2f6d8af05b48c21146af5f502e121def4e76e862df5ec9fa06e98734 +PKG_HASH:= 4ffa3e44afc9c590e28dc0d2d31fc61f0139f8b335f11880a121b9f9b9f0634e PKG_DESCR:= php language interpreter PKG_SECTION:= dev/lang -PKG_BUILDDEP:= libpng -PKG_DEPENDS:= libpng PKG_NEEDS:= threads PHP_URL:= http://www.php.net/ PKG_SITES:= http://de2.php.net/distributions/ @@ -25,7 +23,7 @@ PKGSN_PHP_CLI:= php PKG_FLAVOURS_PHP:= MOD_BZ2 MOD_CURL MOD_FTP MOD_GD MOD_GMP MOD_MARIADB PKG_FLAVOURS_PHP+= MOD_SSL MOD_SESSION MOD_SNMP MOD_SQLITE -PKG_FLAVOURS_PHP+= MOD_SOCKETS MOD_XML MOD_SIMPLEXML MOD_ZLIB MOD_JSON +PKG_FLAVOURS_PHP+= MOD_SOCKETS MOD_XML MOD_SIMPLEXML MOD_ZLIB PKG_FLAVOURS_PHP+= MOD_LDAP MOD_PCNTL PKGFD_MOD_BZ2:= bzip2 support @@ -39,12 +37,11 @@ PKGFD_MOD_GD:= gd support PKGFD_MOD_GMP:= gmp support PKGFB_MOD_GMP:= gmp PKGFS_MOD_GMP:= libgmp -PKGFD_MOD_JSON:= json support PKGFD_MOD_LDAP:= ldap support PKGFB_MOD_LDAP:= openldap PKGFS_MOD_LDAP:= libopenldap PKGFD_MOD_MARIADB:= mariadb support -PKGFS_MOD_MARIADB:= libmariadb +PKGFS_MOD_MARIADB:= libmariadbclient PKGFB_MOD_MARIADB:= mariadb PKGFD_MOD_SSL:= ssl support PKGFB_MOD_SSL:= libressl @@ -135,11 +132,6 @@ PKG_CONFIGURE_OPTS+= --with-gmp=shared,"$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --without-gmp endif -ifneq ($(ADK_PACKAGE_PHP_MOD_JSON),) -PKG_CONFIGURE_OPTS+= --enable-json=shared,"$(STAGING_TARGET_DIR)/usr" -else -PKG_CONFIGURE_OPTS+= --disable-json -endif ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),) PKG_CONFIGURE_OPTS+= --with-ldap=shared,"$(STAGING_TARGET_DIR)/usr" \ --with-ldap-sasl="$(STAGING_TARGET_DIR)/usr" @@ -193,9 +185,9 @@ else PKG_CONFIGURE_OPTS+= --disable-xml endif ifneq ($(ADK_PACKAGE_PHP_MOD_SIMPLEXML),) -PKG_CONFIGURE_OPTS+= --enable-simplexml=shared --enable-libxml +PKG_CONFIGURE_OPTS+= --enable-simplexml=shared else -PKG_CONFIGURE_OPTS+= --disable-simplexml --disable-libxml +PKG_CONFIGURE_OPTS+= --disable-simplexml endif ifneq ($(ADK_PACKAGE_PHP_MOD_ZLIB),) PKG_CONFIGURE_OPTS+= --with-zlib=shared,"$(STAGING_TARGET_DIR)/usr" @@ -208,7 +200,6 @@ $(eval $(call PKG_template,PHP_MOD_CURL,php-mod-curl,$(PKG_VERSION)-${PKG_RELEAS $(eval $(call PKG_template,PHP_MOD_FTP,php-mod-ftp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_GD,php-mod-gd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_GMP,php-mod-gmp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,PHP_MOD_JSON,php-mod-json,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_MARIADB,php-mod-mariadb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_OPENSSL,php-mod-openssl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -225,7 +216,6 @@ $(eval $(call PKG_mod_template,PHP_MOD_CURL,curl)) $(eval $(call PKG_mod_template,PHP_MOD_FTP,ftp)) $(eval $(call PKG_mod_template,PHP_MOD_GD,gd)) $(eval $(call PKG_mod_template,PHP_MOD_GMP,gmp)) -$(eval $(call PKG_mod_template,PHP_MOD_JSON,json)) $(eval $(call PKG_mod_template,PHP_MOD_LDAP,ldap)) $(eval $(call PKG_mod_template,PHP_MOD_MARIADB,pdo_mysql)) $(eval $(call PKG_mod_template,PHP_MOD_OPENSSL,openssl)) diff --git a/package/php/files/php.init b/package/php/files/php.init index 5168bdd3e..a113500b6 100644 --- a/package/php/files/php.init +++ b/package/php/files/php.init @@ -16,14 +16,14 @@ start) if [ -x /usr/bin/php-cgi ];then /usr/bin/php-cgi -b /var/run/php5.sock & else - /usr/bin/php-fpm -D + /usr/bin/php -D fi ;; stop) if [ -x /usr/bin/php-cgi ];then pkill php-cgi else - pkill php-fpm + pkill php fi ;; restart) diff --git a/package/php/patches/patch-ext_standard_crc32_c b/package/php/patches/patch-ext_standard_crc32_c deleted file mode 100644 index c04b5b80c..000000000 --- a/package/php/patches/patch-ext_standard_crc32_c +++ /dev/null @@ -1,38 +0,0 @@ ---- php-7.4.24.orig/ext/standard/crc32.c 2021-09-21 13:23:20.000000000 +0200 -+++ php-7.4.24/ext/standard/crc32.c 2021-09-29 10:27:37.144637295 +0200 -@@ -23,7 +23,6 @@ - #if HAVE_AARCH64_CRC32 - # include <arm_acle.h> - # if defined(__linux__) --# include <sys/auxv.h> - # include <asm/hwcap.h> - # endif - -@@ -32,13 +31,6 @@ static inline int has_crc32_insn() { - static int res = -1; - if (res != -1) - return res; --# if defined(HWCAP_CRC32) -- res = getauxval(AT_HWCAP) & HWCAP_CRC32; -- return res; --# elif defined(HWCAP2_CRC32) -- res = getauxval(AT_HWCAP2) & HWCAP2_CRC32; -- return res; --# else - res = 0; - return res; - # endif -@@ -85,13 +77,6 @@ PHP_NAMED_FUNCTION(php_if_crc32) - - crc = crcinit^0xFFFFFFFF; - --#if HAVE_AARCH64_CRC32 -- if (has_crc32_insn()) { -- crc = crc32_aarch64(crc, p, nr); -- RETURN_LONG(crc^0xFFFFFFFF); -- } --#endif -- - for (; nr--; ++p) { - crc = ((crc >> 8) & 0x00FFFFFF) ^ crc32tab[(crc ^ (*p)) & 0xFF ]; - } diff --git a/package/picocom/Makefile b/package/picocom/Makefile index 6e06e23b7..e1a3e146a 100644 --- a/package/picocom/Makefile +++ b/package/picocom/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= picocom -PKG_VERSION:= 2.1 +PKG_VERSION:= 3.1 PKG_RELEASE:= 1 -PKG_HASH:= 6b152fc5f816eaef6b86336a4cec7cf1496b7c712061e5aea5a36f143a0b09ed +PKG_HASH:= e6761ca932ffc6d09bd6b11ff018bdaf70b287ce518b3282d29e0270e88420bb PKG_DESCR:= minimal dumb-terminal emulation program PKG_SECTION:= sys/serial PKG_URL:= https://github.com/npat-efault/picocom/ diff --git a/package/picocom/patches/patch-Makefile b/package/picocom/patches/patch-Makefile deleted file mode 100644 index 5d6911113..000000000 --- a/package/picocom/patches/patch-Makefile +++ /dev/null @@ -1,18 +0,0 @@ ---- picocom-2.1.orig/Makefile 2015-10-15 23:25:02.000000000 +0200 -+++ picocom-2.1/Makefile 2016-09-23 15:45:44.240688077 +0200 -@@ -1,12 +1,12 @@ - - VERSION = 2.1 - --#CC = gcc -+CC ?= gcc - CPPFLAGS = -DVERSION_STR=\"$(VERSION)\" --CFLAGS = -Wall -g -+CFLAGS ?= -Wall -g - - LD = $(CC) --LDFLAGS = -g -+LDFLAGS ?= -g - LDLIBS = - - all: picocom diff --git a/package/picocom/patches/patch-linenoise-1_0_Makefile b/package/picocom/patches/patch-linenoise-1_0_Makefile deleted file mode 100644 index d7c7a6526..000000000 --- a/package/picocom/patches/patch-linenoise-1_0_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- picocom-2.1.orig/linenoise-1.0/Makefile 2015-10-15 23:25:02.000000000 +0200 -+++ picocom-2.1/linenoise-1.0/Makefile 2016-09-23 15:44:57.086909523 +0200 -@@ -1,7 +1,7 @@ - linenoise_example: linenoise.h linenoise.c - - linenoise_example: linenoise.c example.c -- $(CC) -Wall -W -Os -g -o linenoise_example linenoise.c example.c -+ $(CC) $(CFLAGS) -o linenoise_example linenoise.c example.c - - clean: - rm -f linenoise_example diff --git a/package/pkgconf/Makefile b/package/pkgconf/Makefile index bded34468..77dbba517 100644 --- a/package/pkgconf/Makefile +++ b/package/pkgconf/Makefile @@ -4,16 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pkgconf -PKG_VERSION:= 0.9.6 -PKG_RELEASE:= 1 -PKG_HASH:= 8f5f48e52ddef0c3cbffe93f32d5148041e0030b8798b49b0b5fe72f4968d7ec +PKG_VERSION:= 1.1.0 +PKG_RELEASE:= 2 +PKG_HASH:= 5f1ef65d73a880fa5e7012102a17f7b32010e5e46139aed85851a541ba828a63 PKG_DESCR:= smart pkg-config replacement PKG_SECTION:= dev/tools HOST_BUILDDEP:= sed-host -PKG_URL:= https://github.com/pkgconf/pkgconf -PKG_SITES:= http://rabbit.dereferenced.org/~nenolod/distfiles/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_URL:= http://pkgconf.org/ +PKG_SITES:= https://distfiles.dereferenced.org/pkgconf/ include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -31,6 +29,9 @@ endif (cd $(STAGING_HOST_DIR)/usr/bin && ln -sf pkg-config $(GNU_TARGET_NAME)-pkg-config) pkgconf-install: + $(INSTALL_DIR) $(IDIR_PKGCONF)/usr/lib + $(CP) $(WRKINST)/usr/lib/libpkgconf*so* \ + $(IDIR_PKGCONF)/usr/lib $(INSTALL_DIR) $(IDIR_PKGCONF)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/pkgconf \ $(IDIR_PKGCONF)/usr/bin diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile index bfba469b8..1368c276c 100644 --- a/package/pmacct/Makefile +++ b/package/pmacct/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pmacct -PKG_VERSION:= 0.12.5 +PKG_VERSION:= 1.7.8 PKG_RELEASE:= 1 -PKG_HASH:= 5252d7df24e9baefcc5a36ed66e9cac5ae505c9d502c8cffb96e6808acbb2fe8 +PKG_HASH:= 4df50a3c6c7bdace3345bbf3bd4f6fa7a6722ec1fb45dfd266ad956b327da98a PKG_DESCR:= ip accounting tools PKG_SECTION:= net/acct -PKG_DEPENDS:= libpcap -PKG_BUILDDEP:= libpcap +PKG_DEPENDS:= libpcap libcdada +PKG_BUILDDEP:= libpcap libcdada PKG_URL:= http://www.pmacct.net/ PKG_SITES:= http://www.pmacct.net/ @@ -26,7 +26,8 @@ $(eval $(call PKG_template,SFACCTD,sfacctd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D $(eval $(call PKG_template,PMACCT_CLIENT,pmacct-client,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --with-pcap-includes="$(STAGING_TARGET_DIR)/usr/include" \ - --with-pcap-libs="$(STAGING_TARGET_DIR)/usr/lib" + --with-pcap-libs="$(STAGING_TARGET_DIR)/usr/lib" \ + --without-external-deps sfacctd-install: ${INSTALL_DIR} $(IDIR_SFACCTD)/usr/sbin diff --git a/package/pmacct/patches/patch-configure b/package/pmacct/patches/patch-configure deleted file mode 100644 index 0c7310ba6..000000000 --- a/package/pmacct/patches/patch-configure +++ /dev/null @@ -1,41 +0,0 @@ ---- pmacct-0.12.5.orig/configure 2010-12-28 17:26:21.000000000 +0100 -+++ pmacct-0.12.5/configure 2011-01-21 21:15:15.478658080 +0100 -@@ -1006,7 +1006,6 @@ fi - - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" --CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 - echo "configure:1012: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then -@@ -1022,22 +1021,6 @@ rm -f conftest* - - fi - --echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 --if test "$ac_test_CFLAGS" = set; then -- CFLAGS="$ac_save_CFLAGS" --elif test $ac_cv_prog_cc_g = yes; then -- if test "$GCC" = yes; then -- CFLAGS="-g -O2" -- else -- CFLAGS="-g" -- fi --else -- if test "$GCC" = yes; then -- CFLAGS="-O2" -- else -- CFLAGS= -- fi --fi - - host_os=`uname` - host_cpu=`uname -m` -@@ -1083,7 +1066,6 @@ fi - - - if test "x$ac_cv_prog_gcc" = xyes ; then -- CFLAGS="-O2" - case "$host_os" in - IRIX*) - CFLAGS="-mabi=n32 -fno-builtins ${CFLAGS}" diff --git a/package/popt/Makefile b/package/popt/Makefile index 89dbd91c9..bd1746a90 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -4,17 +4,20 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= popt -PKG_VERSION:= 1.16 -PKG_RELEASE:= 4 -PKG_HASH:= e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 +PKG_VERSION:= 1.19 +PKG_RELEASE:= 1 +PKG_HASH:= 6eb40d650526cb9fe63eb4415bcecdf9cf306f7556e77eff689abc5a44670060 PKG_DESCR:= command line option parsing library PKG_SECTION:= libs/misc PKG_URL:= http://rpm5.org/ -PKG_SITES:= https://distfiles.openadk.org/ +PKG_BUILDDEP:= gettext-host +HOST_BUILDDEP:= gettext-host libtool-host +PKG_SITES:= https://github.com/rpm-software-management/popt/archive/refs/tags/ PKG_LIBNAME:= libpopt PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-release.tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_NAME}-${PKG_VERSION}-release include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk @@ -22,6 +25,8 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,POPT,popt,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +AUTOTOOL_STYLE:= autogen + libpopt-install: ${INSTALL_DIR} ${IDIR_LIBPOPT}/usr/lib ${CP} ${WRKINST}/usr/lib/libpopt.so* ${IDIR_LIBPOPT}/usr/lib diff --git a/package/popt/patches/patch-Makefile_am b/package/popt/patches/patch-Makefile_am new file mode 100644 index 000000000..0c25da403 --- /dev/null +++ b/package/popt/patches/patch-Makefile_am @@ -0,0 +1,11 @@ +--- popt-popt-1.19-release.orig/Makefile.am 2022-09-16 09:05:46.000000000 +0200 ++++ popt-popt-1.19-release/Makefile.am 2022-09-21 02:11:30.830446841 +0200 +@@ -4,7 +4,7 @@ MCCABE = pmccabe + + EXTRA_DIST = autogen.sh CREDITS $(man_MANS) ci/Dockerfile build-aux popt.pdf + +-SUBDIRS = src po tests ++SUBDIRS = src + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = popt.pc diff --git a/package/popt/patches/patch-ltmain_sh b/package/popt/patches/patch-ltmain_sh deleted file mode 100644 index 821e07bad..000000000 --- a/package/popt/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- popt-1.16.orig/ltmain.sh 2010-05-04 22:55:45.000000000 +0200 -+++ popt-1.16/ltmain.sh 2011-02-05 23:13:17.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_plugin_c b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_plugin_c index 6a8cb0d8c..d6ec94c69 100644 --- a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_plugin_c +++ b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_plugin_c @@ -1,10 +1,11 @@ ---- ppp-2.4.6.orig/pppd/plugins/rp-pppoe/plugin.c 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppd/plugins/rp-pppoe/plugin.c 2014-06-05 20:42:29.000000000 +0200 -@@ -46,7 +46,6 @@ static char const RCSID[] = - #include <unistd.h> - #include <fcntl.h> - #include <signal.h> --#include <net/ethernet.h> +--- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/plugin.c 2014-08-09 14:31:39.000000000 +0200 ++++ ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c 2021-11-04 04:11:17.756625845 +0100 +@@ -49,6 +49,8 @@ static char const RCSID[] = + #include <net/ethernet.h> #include <net/if_arp.h> #include <linux/ppp_defs.h> ++#define _LINUX_IN_H ++#define _LINUX_IN6_H #include <linux/if_pppox.h> + + #ifndef _ROOT_PATH diff --git a/package/protobuf-c/Makefile b/package/protobuf-c/Makefile new file mode 100644 index 000000000..f2a218e4f --- /dev/null +++ b/package/protobuf-c/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:= protobuf-c +PKG_VERSION:= 1.5.0 +PKG_RELEASE:= 1 +PKG_HASH:= d4cb022d55f49796959b07a9d83040822e39129bc0eb28f4e8301da17d758f62 +PKG_DESCR:= protocol buffers implementation in c +PKG_SECTION:= libs/misc +PKG_BUILDDEP:= protobuf-c-host +PKG_SITES:= https://github.com/protobuf-c/protobuf-c/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,PROTOBUF_C,protobuf-c,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PROTOBUF_C,protobuf-c,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +AUTOTOOL_STYLE:= autogen +CONFIGURE_ENV+= PROTOC="$(STAGING_HOST_DIR)/usr/bin/protoc" + +protobuf-c-install: + $(INSTALL_DIR) $(IDIR_PROTOBUF_C)/usr/lib + $(CP) $(WRKINST)/usr/lib/libprotobuf-c*.so* \ + $(IDIR_PROTOBUF_C)/usr/lib + +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/protobuf/Makefile b/package/protobuf/Makefile index 780618167..10920ae2f 100644 --- a/package/protobuf/Makefile +++ b/package/protobuf/Makefile @@ -4,12 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= protobuf -PKG_VERSION:= 3.1.0 +PKG_VERSION:= 3.19.4 PKG_RELEASE:= 1 -PKG_HASH:= fb2a314f4be897491bb2446697be693d489af645cb0e165a85e7e64e07eb134d +PKG_HASH:= 3bd7828aa5af4b13b99c191e8b1e884ebfa9ad371b0ce264605d347f135d2568 PKG_DESCR:= extensible mechanism for serializing structured data PKG_SECTION:= libs/misc PKG_URL:= https://developers.google.com/protocol-buffers/ +PKG_BUILDDEP:= protobuf-host +PKG_NEEDS:= c++ PKG_SITES:= https://github.com/google/protobuf/archive/ PKG_OPTS:= dev diff --git a/package/proxychains-ng/Makefile b/package/proxychains-ng/Makefile new file mode 100644 index 000000000..ac09b78fb --- /dev/null +++ b/package/proxychains-ng/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:= proxychains-ng +PKG_VERSION:= 4.17 +PKG_RELEASE:= 1 +PKG_HASH:= 1a2dc68fcbcb2546a07a915343c1ffc75845f5d9cc3ea5eb3bf0b62a66c0196f +PKG_DESCR:= socks proxy +PKG_SECTION:= net/proxy +PKG_SITES:= https://github.com/rofl0r/proxychains-ng/archive/refs/tags/ + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PROXYCHAINS_NG,proxychains-ng,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +proxychains-ng-install: + $(INSTALL_DIR) $(IDIR_PROXYCHAINS_NG)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/proxychains4* \ + $(IDIR_PROXYCHAINS_NG)/usr/bin + $(INSTALL_DIR) $(IDIR_PROXYCHAINS_NG)/usr/lib + $(CP) $(WRKINST)/usr/lib/libproxychains4.so \ + $(IDIR_PROXYCHAINS_NG)/usr/lib + $(INSTALL_DIR) $(IDIR_PROXYCHAINS_NG)/etc + $(CP) $(WRKBUILD)/src/proxychains.conf \ + $(IDIR_PROXYCHAINS_NG)/etc + + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile index 68030d227..f0ff6e102 100644 --- a/package/pulseaudio/Makefile +++ b/package/pulseaudio/Makefile @@ -4,16 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pulseaudio -PKG_VERSION:= 10.0 +PKG_VERSION:= 15.0 PKG_RELEASE:= 1 -PKG_HASH:= a3186824de9f0d2095ded5d0d0db0405dc73133983c2fbb37291547e37462f57 +PKG_HASH:= a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0 PKG_DESCR:= sound system PKG_SECTION:= mm/audio PKG_DEPENDS:= libltdl json-c libsndfile libspeex libncurses PKG_DEPENDS+= libflac libvorbis libogg libuuid libsndfile -PKG_DEPENDS+= alsa-lib -PKG_BUILDDEP:= libtool json-c libsndfile speex +PKG_DEPENDS+= alsa-lib libICE libSM libxtst glib +PKG_BUILDDEP:= libtool json-c libsndfile speex check meson-host PKG_BUILDDEP+= flac libvorbis libogg util-linux ncurses alsa-lib +PKG_BUILDDEP+= libICE libSM libXtst glib PKG_NEEDS:= threads PKG_URL:= http://www.freedesktop.org/wiki/Software/PulseAudio/ PKG_SITES:= http://freedesktop.org/software/pulseaudio/releases/ @@ -23,40 +24,18 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,PULSEAUDIO,pulseaudio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -# use libtool from host directory -AUTOTOOL_STYLE:= autoreconf +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson -ifeq ($(ADK_TARGET_ARCH_ARM_WITH_NEON),y) -CONFIGURE_ARGS+= --enable-neon-opt -else -CONFIGURE_ARGS+= --disable-neon-opt -endif +TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE -CONFIGURE_ARGS+= --disable-manpages \ - --disable-tests \ - --disable-x11 \ - --disable-avahi \ - --disable-lirc \ - --disable-openssl \ - --disable-orc \ - --disable-tcpwrap \ - --disable-oss-output \ - --disable-oss-wrapper \ - --disable-esound \ - --disable-jack \ - --disable-gconf \ - --disable-udev \ - --disable-rpath \ - --disable-dbus \ - --disable-hal-compat \ - --disable-samplerate \ - --without-caps \ - --with-database=simple \ - --enable-alsa \ - --with-speex \ - --with-access-group=audio +MESON_FLAGS+= -Ddatabase=simple \ + -Ddoxygen=false \ + -Dgcov=false \ + -Dtests=false pulseaudio-install: $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/pulse diff --git a/package/pulseaudio/patches/patch-Makefile_am b/package/pulseaudio/patches/patch-Makefile_am deleted file mode 100644 index 11132dad5..000000000 --- a/package/pulseaudio/patches/patch-Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- pulseaudio-10.0.orig/Makefile.am 2017-01-18 04:45:11.000000000 +0100 -+++ pulseaudio-10.0/Makefile.am 2017-06-06 19:51:59.372820444 +0200 -@@ -42,7 +42,7 @@ EXTRA_DIST = \ - src/daemon/.gitignore \ - src/pulse/.gitignore - --SUBDIRS = src doxygen man po -+SUBDIRS = src - - MAINTAINERCLEANFILES = - noinst_DATA = diff --git a/package/pulseaudio/patches/patch-configure_ac b/package/pulseaudio/patches/patch-configure_ac deleted file mode 100644 index 2ba044a9b..000000000 --- a/package/pulseaudio/patches/patch-configure_ac +++ /dev/null @@ -1,55 +0,0 @@ ---- pulseaudio-10.0.orig/configure.ac 2017-01-13 04:02:18.000000000 +0100 -+++ pulseaudio-10.0/configure.ac 2017-06-06 20:05:26.400612037 +0200 -@@ -97,24 +97,8 @@ AS_IF([test "x$M4" = "xno"], AC_MSG_ERRO - - PKG_PROG_PKG_CONFIG - --# gettext -- --if test "x$enable_nls" != "xno"; then --IT_PROG_INTLTOOL([0.35.0]) -- --AM_GNU_GETTEXT_VERSION([0.18.1]) --AM_GNU_GETTEXT([external]) -- --GETTEXT_PACKAGE=pulseaudio --AC_SUBST([GETTEXT_PACKAGE]) --AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) --else --# workaround till an intltool m4 bug is fixed upstream --# (https://bugs.launchpad.net/intltool/+bug/904647) - USE_NLS=no - AC_SUBST(USE_NLS) --fi -- - - #### Determine host OS #### - -@@ -1486,27 +1470,10 @@ AM_CONDITIONAL([FORCE_PREOPEN], [test "x - AC_CONFIG_FILES([ - Makefile - src/Makefile --man/Makefile - libpulse.pc - libpulse-simple.pc - libpulse-mainloop-glib.pc --doxygen/Makefile --doxygen/doxygen.conf - src/pulse/version.h --po/Makefile.in --man/pulseaudio.1.xml --man/esdcompat.1.xml --man/pax11publish.1.xml --man/pacat.1.xml --man/pacmd.1.xml --man/pactl.1.xml --man/pasuspender.1.xml --man/padsp.1.xml --man/pulse-daemon.conf.5.xml --man/pulse-client.conf.5.xml --man/default.pa.5.xml --man/pulse-cli-syntax.5.xml --man/start-pulseaudio-x11.1.xml - ]) - - AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat]) diff --git a/package/py-spidev/Makefile b/package/py-spidev/Makefile index 00ee559c4..aa9a6ea84 100644 --- a/package/py-spidev/Makefile +++ b/package/py-spidev/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_GIT:= hash PKG_DESCR:= module for interfacing with spi devices from user space via the spidev linux kernel driver PKG_SECTION:= dev/python -PKG_DEPENDS:= python2 -PKG_BUILDDEP:= python2 +PKG_DEPENDS:= python3 +PKG_BUILDDEP:= python3 PKG_URL:= https://github.com/doceme/py-spidev PKG_SITES:= https://github.com/doceme/py-spidev.git @@ -18,7 +18,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,PY_SPIDEV,py-spidev,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -include $(ADK_TOPDIR)/mk/python.mk +include $(ADK_TOPDIR)/mk/python3.mk CONFIG_STYLE:= manual BUILD_STYLE:= manual diff --git a/package/pycurl/Makefile b/package/pycurl/Makefile index ddcce6c05..ee3c67b61 100644 --- a/package/pycurl/Makefile +++ b/package/pycurl/Makefile @@ -4,15 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pycurl -PKG_VERSION:= 7.19.0.2 +PKG_VERSION:= 7.45.2 PKG_RELEASE:= 1 -PKG_HASH:= 7a9e793b9181654d5eef3f6d22c244c57d2b51d38feb4c1b71d68efda99b0547 +PKG_HASH:= 5730590be0271364a5bddd9e245c9cc0fb710c4cbacbdd95264a3122d23224ca PKG_DESCR:= python module for fetching of files PKG_SECTION:= dev/python -PKG_BUILDDEP:= python2 curl -PKG_DEPENDS:= python2 libcurl -PKG_URL:= http://pycurl.sourceforge.net/ -PKG_SITES:= http://pycurl.sourceforge.net/download/ +PKG_BUILDDEP:= python3 curl +PKG_DEPENDS:= python3 libcurl +PKG_URL:= http://pycurl.io/ +PKG_SITES:= https://files.pythonhosted.org/packages/a8/af/24d3acfa76b867dbd8f1166853c18eefc890fc5da03a48672b38ea77ddae/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -28,7 +28,7 @@ TARGET_CFLAGS+= -fPIC MAKE_ENV+= LDSHARED="$(TARGET_CC) -shared" CURL_CONFIG:= $(STAGING_TARGET_DIR)/usr/bin/curl-config -include $(ADK_TOPDIR)/mk/python.mk +include $(ADK_TOPDIR)/mk/python3.mk do-build: (cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py --curl-config=$(CURL_CONFIG) build) diff --git a/package/pycurl/patches/patch-setup_py b/package/pycurl/patches/patch-setup_py deleted file mode 100644 index 26280ec36..000000000 --- a/package/pycurl/patches/patch-setup_py +++ /dev/null @@ -1,12 +0,0 @@ ---- pycurl-7.19.0.orig/setup.py 2008-09-09 19:40:34.000000000 +0200 -+++ pycurl-7.19.0/setup.py 2011-10-14 17:59:41.000000000 +0200 -@@ -115,9 +115,6 @@ else: - define_macros.append(('HAVE_CURL_SSL', 1)) - if not libraries: - libraries.append("curl") -- # Add extra compile flag for MacOS X -- if sys.platform[:-1] == "darwin": -- extra_link_args.append("-flat_namespace") - - - ############################################################################### diff --git a/package/pyrex/Makefile b/package/pyrex/Makefile deleted file mode 100644 index ffb37b511..000000000 --- a/package/pyrex/Makefile +++ /dev/null @@ -1,38 +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:= Pyrex -PKG_VERSION:= 0.9.9 -PKG_RELEASE:= 3 -PKG_HASH:= 5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50 -PKG_DESCR:= mixes python and c data types -PKG_SECTION:= dev/python -PKG_DEPENDS:= python2 -PKG_URL:= http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/ -PKG_SITES:= http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,PYREX,pyrex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= manual -BUILD_STYLE:= manual -INSTALL_STYLE:= manual - -include $(ADK_TOPDIR)/mk/python.mk - -do-build: - cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py build - cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(STAGING_HOST_DIR)/usr" - cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr" - -do-install: - $(INSTALL_DIR) $(IDIR_PYREX)/usr/lib/python$(PYTHON_VERSION) - $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/* \ - $(IDIR_PYREX)/usr/lib/python$(PYTHON_VERSION) - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/python-mako/Makefile b/package/python-mako/Makefile new file mode 100644 index 000000000..bb069a434 --- /dev/null +++ b/package/python-mako/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-mako +PKG_VERSION:= 1.2.4 +PKG_RELEASE:= 1 +PKG_HASH:= d60a3903dc3bb01a18ad6a89cdbe2e4eadc69c0bc8ef1e3773ba53d44c3f7a34 +PKG_DESCR:= fast, expressive, extensible templating engine +PKG_SECTION:= dev/tools +PKG_BUILDDEP:= python3-host +PKG_SITES:= https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6ddc1dddf9958677f76f5f80c236bd65309d280b166d3e/ + +DISTFILES:= Mako-$(PKG_VERSION).tar.gz + +WRKDIST= $(WRKDIR)/Mako-$(PKG_VERSION) + +include ${ADK_TOPDIR}/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,PYTHON_MAKO,python-mako,${PKG_VERSION}-${PKG_RELEASE})) + +include $(ADK_TOPDIR)/mk/python3.mk + +HOST_STYLE:= manual + +python-mako-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/python-setuptools/Makefile b/package/python-setuptools/Makefile new file mode 100644 index 000000000..4a05cb202 --- /dev/null +++ b/package/python-setuptools/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-setuptools +PKG_VERSION:= 69.0.3 +PKG_RELEASE:= 1 +PKG_HASH:= be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 +PKG_DESCR:= python setuptools +PKG_SECTION:= dev/tools +PKG_BUILDDEP:= python3-host +PKG_SITES:= https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7/ + +DISTFILES:= setuptools-$(PKG_VERSION).tar.gz + +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})) + +include $(ADK_TOPDIR)/mk/python3.mk + +HOST_STYLE:= manual + +python-setuptools-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/python2/Makefile b/package/python2/Makefile deleted file mode 100644 index 358866b0f..000000000 --- a/package/python2/Makefile +++ /dev/null @@ -1,150 +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:= python2 -PKG_VERSION:= 2.7.14 -PKG_RELEASE:= 1 -PKG_HASH:= 304c9b202ea6fbd0a4a8e0ad3733715fbd4749f2204a9173a58ec53c32ea73e8 -PKG_DESCR:= python2 script interpreter -PKG_SECTION:= dev/lang -PKG_DEPENDS:= libffi -PKG_BUILDDEP:= libffi python2-host -HOST_BUILDDEP:= libffi-host libressl-host -PKG_NEEDS:= threads -PKG_URL:= http://www.python.org/ -PKG_SITES:= http://www.python.org/ftp/python/${PKG_VERSION}/ -PKG_OPTS:= dev - -DISTFILES:= Python-${PKG_VERSION}.tgz -WRKDIST= ${WRKDIR}/Python-${PKG_VERSION} - -PKG_FLAVOURS_PYTHON2:= MOD_ZLIB MOD_BZ2 MOD_EXPAT MOD_SQLITE MOD_GDBM -PKG_FLAVOURS_PYTHON2+= MOD_NCURSES MOD_SSL MOD_READLINE - -PKGFD_MOD_ZLIB:= zlib support -PKGFB_MOD_ZLIB:= zlib -PKGFS_MOD_ZLIB:= zlib -PKGFD_MOD_BZ2:= bzip2 support -PKGFB_MOD_BZ2:= bzip2 -PKGFS_MOD_BZ2:= libbz2 -PKGFD_MOD_EXPAT:= xml support -PKGFB_MOD_EXPAT:= expat -PKGFS_MOD_EXPAT:= libexpat -PKGFD_MOD_SQLITE:= sqlite support -PKGFB_MOD_SQLITE:= sqlite -PKGFS_MOD_SQLITE:= libsqlite -PKGFD_MOD_GDBM:= gdbm support -PKGFB_MOD_GDBM:= gdbm -PKGFS_MOD_GDBM:= libgdbm -PKGFD_MOD_NCURSES:= ncurses support -PKGFB_MOD_NCURSES:= ncurses -PKGFS_MOD_NCURSES:= libncurses -PKGFD_MOD_READLINE:= readline support -PKGFB_MOD_READLINE:= readline -PKGFS_MOD_READLINE:= libreadline -PKGFD_MOD_SSL:= ssl support -PKGFB_MOD_SSL:= libressl -PKGFS_MOD_SSL:= libressl - -include ${ADK_TOPDIR}/mk/host.mk -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call HOST_template,PYTHON2,python2,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,PYTHON2,python2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) - -define PKG_mod_template - -INSTALL_MODS_$${ADK_PACKAGE_${1}}+= ${2}-install - -${2}-install: - ${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/python2.7/lib-dynload - for m in ${2}; do \ - ${INSTALL_DATA} $(WRKINST)/usr/lib/python2.7/lib-dynload/$$$${m}*.so $$(IDIR_$(1))/usr/lib/python2.7/lib-dynload ;\ - done -endef - -$(eval $(call PKG_template,PYTHON2_MOD_ZLIB,python2-mod-zlib,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_ZLIB},${PKGFD_MOD_ZLIB},${PKG_SECTION})) -$(eval $(call PKG_template,PYTHON2_MOD_BZ2,python2-mod-bz2,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_BZ2},${PKGFD_MOD_BZ2},${PKG_SECTION})) -$(eval $(call PKG_template,PYTHON2_MOD_EXPAT,python2-mod-expat,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_EXPAT},${PKGFD_MOD_EXPAT},${PKG_SECTION})) -$(eval $(call PKG_template,PYTHON2_MOD_SQLITE,python2-mod-sqlite,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_SQLITE},${PKGFD_MOD_SQLITE},${PKG_SECTION})) -$(eval $(call PKG_template,PYTHON2_MOD_GDBM,python2-mod-gdbm,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_GDBM},${PKGFD_MOD_GDBM},${PKG_SECTION})) -$(eval $(call PKG_template,PYTHON2_MOD_NCURSES,python2-mod-ncurses,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_NCURSES},${PKGFD_MOD_NCURSES},${PKG_SECTION})) -$(eval $(call PKG_template,PYTHON2_MOD_SSL,python2-mod-ssl,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_SSL},${PKGFD_MOD_SSL},${PKG_SECTION})) -$(eval $(call PKG_template,PYTHON2_MOD_READLINE,python2-mod-readline,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_READLINE},${PKGFD_MOD_READLINE},${PKG_SECTION})) - -$(eval $(call PKG_mod_template,PYTHON2_MOD_ZLIB,zlib)) -$(eval $(call PKG_mod_template,PYTHON2_MOD_BZ2,bz2)) -$(eval $(call PKG_mod_template,PYTHON2_MOD_EXPAT,pyexpat)) -$(eval $(call PKG_mod_template,PYTHON2_MOD_SQLITE,_sqlite)) -$(eval $(call PKG_mod_template,PYTHON2_MOD_GDBM,gdbm)) -$(eval $(call PKG_mod_template,PYTHON2_MOD_NCURSES,_curses)) -$(eval $(call PKG_mod_template,PYTHON2_MOD_SSL,_ssl)) -$(eval $(call PKG_mod_template,PYTHON2_MOD_READLINE,readline)) - -ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) -CONFIGURE_ARGS+= --disable-shared -endif - -HOST_CFLAGS+= -fPIC - -AUTOTOOL_STYLE:= autoreconf -CONFIGURE_ENV+= ac_cv_have_long_long_format=yes \ - ac_cv_file__dev_ptmx=yes \ - ac_cv_file__dev_ptc=no -CONFIGURE_ARGS+= --with-threads \ - --disable-toolbox-glue \ - --disable-ipv6 \ - --with-system-ffi \ - --without-cxx-main - -HOST_CONFIGURE_ENV+= MACOSX_DEPLOYMENT_TARGET=10.9 -HOST_CONFIGURE_ARGS+= --with-threads \ - --with-system-ffi \ - --disable-ipv6 \ - --disable-toolbox-glue \ - --without-cxx-main - -hostpre-configure: - $(CP) $(ADK_TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD) - $(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py - $(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py - (cd $(WRKBUILD) && ${PATCHP0} < patch-Lib_distutils_sysconfig_py) - $(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \ - $(WRKBUILD)/Misc/python-config.in - -hostpost-install: - $(CP) $(ADK_TOPDIR)/package/python2/files/python-config.patch $(WRKBUILD)/ - $(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/python-config.patch - $(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/python-config.patch - (cd $(STAGING_HOST_DIR)/usr/bin && \ - ${PATCHP0} < $(WRKBUILD)/python-config.patch) - -pre-configure: - $(CP) $(ADK_TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD) - $(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py - $(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py - (cd $(WRKBUILD) && ${PATCHP0} <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py) - $(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \ - $(WRKBUILD)/Misc/python-config.in - -ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) -python2-install: -else -python2-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} -endif - ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/bin ${IDIR_PYTHON2}/usr/lib - ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/include/python2.7 - ${INSTALL_BIN} ${WRKINST}/usr/bin/python ${IDIR_PYTHON2}/usr/bin - ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/lib/python2.7 - ${CP} ${WRKINST}/usr/lib/libpython*.* ${IDIR_PYTHON2}/usr/lib - ${CP} ${WRKINST}/usr/lib/python2.7/* ${IDIR_PYTHON2}/usr/lib/python2.7 - ${CP} ${WRKINST}/usr/include/python2.7/pyconfig.h \ - ${IDIR_PYTHON2}/usr/include/python2.7 - @-for i in zlib bz2 _curses _ssl gdbm _sqlite pyexpat readline; do \ - rm ${IDIR_PYTHON2}/usr/lib/python2.7/lib-dynload/$${i}*so 2>/dev/null; \ - done - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/python2/files/patch-Lib_distutils_sysconfig_py b/package/python2/files/patch-Lib_distutils_sysconfig_py deleted file mode 100644 index cbd51020d..000000000 --- a/package/python2/files/patch-Lib_distutils_sysconfig_py +++ /dev/null @@ -1,10 +0,0 @@ ---- Lib.orig/distutils/sysconfig.py 2013-05-12 05:32:42.000000000 +0200 -+++ Lib/distutils/sysconfig.py 2013-11-03 18:03:53.000000000 +0100 -@@ -76,6 +76,7 @@ def get_python_inc(plat_specific=0, pref - """ - if prefix is None: - prefix = plat_specific and EXEC_PREFIX or PREFIX -+ prefix = re.sub('@@STAGING_HOST_DIR@@', '@@STAGING_TARGET_DIR@@', prefix) - - if os.name == "posix": - if python_build: diff --git a/package/python2/files/python-config.patch b/package/python2/files/python-config.patch deleted file mode 100644 index 0a6ff7145..000000000 --- a/package/python2/files/python-config.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- python2.7-config.orig 2013-12-11 12:40:37.244519764 +0100 -+++ python2.7-config 2013-12-11 12:41:43.279093075 +0100 -@@ -3,6 +3,7 @@ - import sys - import os - import getopt -+import re - from distutils import sysconfig - - valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', -@@ -37,8 +38,8 @@ - print sysconfig.EXEC_PREFIX - - elif opt in ('--includes', '--cflags'): -- flags = ['-I' + sysconfig.get_python_inc(), -- '-I' + sysconfig.get_python_inc(plat_specific=True)] -+ flags = ['-I' + re.sub('@@STAGING_TARGET_DIR@@', '@@STAGING_HOST_DIR@@', sysconfig.get_python_inc()), -+ '-I' + re.sub('@@STAGING_TARGET_DIR@@', '@@STAGING_HOST_DIR@@', sysconfig.get_python_inc(plat_specific=True))] - if opt == '--cflags': - flags.extend(getvar('CFLAGS').split()) - print ' '.join(flags) diff --git a/package/python2/patches/0001-2.7-bpo-33127-Compatibility-patch-for-LibreSSL-2.7.0.patch b/package/python2/patches/0001-2.7-bpo-33127-Compatibility-patch-for-LibreSSL-2.7.0.patch deleted file mode 100644 index e5759db40..000000000 --- a/package/python2/patches/0001-2.7-bpo-33127-Compatibility-patch-for-LibreSSL-2.7.0.patch +++ /dev/null @@ -1,79 +0,0 @@ -From edd541897b9c28ee0d0f0131746aa5f19665a104 Mon Sep 17 00:00:00 2001 -From: Christian Heimes <christian@python.org> -Date: Sat, 24 Mar 2018 19:34:15 +0100 -Subject: [PATCH] [2.7] bpo-33127: Compatibility patch for LibreSSL 2.7.0 - (GH-6210) (GH-6215) - -LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects -LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and -LibreSSL < 2.7. - -Documentation updates and fixes for failing tests will be provided in -another patch set. - -Signed-off-by: Christian Heimes <christian@python.org>. -(cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1) - -Co-authored-by: Christian Heimes <christian@python.org> ---- - .../2018-03-24-15-08-24.bpo-33127.olJmHv.rst | 1 + - Modules/_ssl.c | 24 ++++++++++++++-------- - Tools/ssl/multissltests.py | 3 ++- - 3 files changed, 19 insertions(+), 9 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst - -diff --git a/Modules/_ssl.c b/Modules/_ssl.c -index da8b20f54f..d0ce913d3d 100644 ---- a/Modules/_ssl.c -+++ b/Modules/_ssl.c -@@ -102,6 +102,12 @@ struct py_ssl_library_code { - - #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - # define OPENSSL_VERSION_1_1 1 -+# define PY_OPENSSL_1_1_API 1 -+#endif -+ -+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL -+# define PY_OPENSSL_1_1_API 1 - #endif - - /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 -@@ -149,16 +155,18 @@ struct py_ssl_library_code { - #define INVALID_SOCKET (-1) - #endif - --#ifdef OPENSSL_VERSION_1_1 --/* OpenSSL 1.1.0+ */ --#ifndef OPENSSL_NO_SSL2 --#define OPENSSL_NO_SSL2 --#endif --#else /* OpenSSL < 1.1.0 */ --#if defined(WITH_THREAD) -+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ -+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD) - #define HAVE_OPENSSL_CRYPTO_LOCK - #endif - -+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) -+#define OPENSSL_NO_SSL2 -+#endif -+ -+#ifndef PY_OPENSSL_1_1_API -+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ -+ - #define TLS_method SSLv23_method - - static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) -@@ -201,7 +209,7 @@ static X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *store) - { - return store->param; - } --#endif /* OpenSSL < 1.1.0 or LibreSSL */ -+#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ - - - enum py_ssl_error { --- -2.16.1 - diff --git a/package/python2/patches/patch-Makefile_pre_in b/package/python2/patches/patch-Makefile_pre_in deleted file mode 100644 index bcb0e1f6b..000000000 --- a/package/python2/patches/patch-Makefile_pre_in +++ /dev/null @@ -1,40 +0,0 @@ ---- Python-2.7.13.orig/Makefile.pre.in 2016-12-17 21:05:06.000000000 +0100 -+++ Python-2.7.13/Makefile.pre.in 2017-03-16 19:38:14.000000000 +0100 -@@ -545,7 +545,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx - esac; \ - $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build -+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py build - - # Build static library - # avoid long command lines, same as LIBRARY_OBJS -@@ -1120,28 +1120,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL - $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -- -d $(LIBDEST) -f \ -- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ -- $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -- -d $(LIBDEST) -f \ -- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ -- $(DESTDIR)$(LIBDEST) -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -- -d $(LIBDEST)/site-packages -f \ -- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -- -d $(LIBDEST)/site-packages -f \ -- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt - - # Create the PLATDIR source directory, if one wasn't distributed.. - $(srcdir)/Lib/$(PLATDIR): diff --git a/package/python2/patches/patch-configure_ac b/package/python2/patches/patch-configure_ac deleted file mode 100644 index 1a09f6eed..000000000 --- a/package/python2/patches/patch-configure_ac +++ /dev/null @@ -1,22 +0,0 @@ ---- Python-2.7.13.orig/configure.ac 2016-12-17 21:05:07.000000000 +0100 -+++ Python-2.7.13/configure.ac 2017-03-16 19:29:41.000000000 +0100 -@@ -22,7 +22,7 @@ rm -f pybuilddir.txt - if test "$cross_compiling" = yes; then - AC_MSG_CHECKING([for python interpreter for cross build]) - if test -z "$PYTHON_FOR_BUILD"; then -- for interp in python$PACKAGE_VERSION python2 python; do -+ for interp in python; do - which $interp >/dev/null 2>&1 || continue - if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:>@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then - break -@@ -1079,9 +1079,7 @@ then - if test "$Py_DEBUG" = 'true' ; then - # Optimization messes up debuggers, so turn it off for - # debug builds. -- OPT="-g -O0 -Wall $STRICT_PROTO" -- else -- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO" -+ OPT="$STRICT_PROTO" - fi - ;; - *) diff --git a/package/python2/patches/patch-setup_py b/package/python2/patches/patch-setup_py deleted file mode 100644 index bf8e90c9d..000000000 --- a/package/python2/patches/patch-setup_py +++ /dev/null @@ -1,115 +0,0 @@ ---- Python-2.7.13.orig/setup.py 2016-12-17 21:05:07.000000000 +0100 -+++ Python-2.7.13/setup.py 2017-03-16 19:45:12.000000000 +0100 -@@ -74,7 +74,7 @@ def find_file(filename, std_dirs, paths) - 'paths' is a list of additional locations to check; if the file is - found in one of them, the resulting list will contain the directory. - """ -- if host_platform == 'darwin': -+ if host_platform == 'darwin' and not cross_compiling: - # Honor the MacOSX SDK setting when one was specified. - # An SDK is a directory with the same structure as a real - # system, but with only header files and libraries. -@@ -84,7 +84,7 @@ def find_file(filename, std_dirs, paths) - for dir in std_dirs: - f = os.path.join(dir, filename) - -- if host_platform == 'darwin' and is_macosx_sdk_path(dir): -+ if host_platform == 'darwin' and is_macosx_sdk_path(dir) and not cross_compiling: - f = os.path.join(sysroot, dir[1:], filename) - - if os.path.exists(f): return [] -@@ -93,7 +93,7 @@ def find_file(filename, std_dirs, paths) - for dir in paths: - f = os.path.join(dir, filename) - -- if host_platform == 'darwin' and is_macosx_sdk_path(dir): -+ if host_platform == 'darwin' and is_macosx_sdk_path(dir) and not cross_compiling: - f = os.path.join(sysroot, dir[1:], filename) - - if os.path.exists(f): -@@ -107,7 +107,7 @@ def find_library_file(compiler, libname, - if result is None: - return None - -- if host_platform == 'darwin': -+ if host_platform == 'darwin' and not cross_compiling: - sysroot = macosx_sdk_root() - - # Check whether the found file is in one of the standard directories -@@ -116,7 +116,7 @@ def find_library_file(compiler, libname, - # Ensure path doesn't end with path separator - p = p.rstrip(os.sep) - -- if host_platform == 'darwin' and is_macosx_sdk_path(p): -+ if host_platform == 'darwin' and is_macosx_sdk_path(p) and not cross_compiling: - # Note that, as of Xcode 7, Apple SDKs may contain textual stub - # libraries with .tbd extensions rather than the normal .dylib - # shared libraries installed in /. The Apple compiler tool -@@ -145,7 +145,7 @@ def find_library_file(compiler, libname, - # Ensure path doesn't end with path separator - p = p.rstrip(os.sep) - -- if host_platform == 'darwin' and is_macosx_sdk_path(p): -+ if host_platform == 'darwin' and is_macosx_sdk_path(p) and not cross_compiling: - if os.path.join(sysroot, p[1:]) == dirname: - return [ p ] - -@@ -178,6 +178,7 @@ class PyBuildExt(build_ext): - - def build_extensions(self): - -+ self.compiler.library_dirs = [] - # Detect which modules should be compiled - missing = self.detect_modules() - -@@ -299,6 +300,7 @@ class PyBuildExt(build_ext): - - def build_extension(self, ext): - -+ - if ext.name == '_ctypes': - if not self.configure_ctypes(ext): - return -@@ -460,7 +462,8 @@ class PyBuildExt(build_ext): - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - if cross_compiling: - self.add_gcc_paths() -- self.add_multiarch_paths() -+ if not cross_compiling: -+ self.add_multiarch_paths() - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. -@@ -497,7 +500,8 @@ class PyBuildExt(build_ext): - add_dir_to_list(dir_list, directory) - - if os.path.normpath(sys.prefix) != '/usr' \ -- and not sysconfig.get_config_var('PYTHONFRAMEWORK'): -+ and not sysconfig.get_config_var('PYTHONFRAMEWORK') \ -+ and not cross_compiling: - # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework - # (PYTHONFRAMEWORK is set) to avoid # linking problems when - # building a framework with different architectures than -@@ -515,8 +519,13 @@ class PyBuildExt(build_ext): - # lib_dirs and inc_dirs are used to search for files; - # if a file is found in one of those directories, it can - # be assumed that no additional -I,-L directives are needed. -+ if cross_compiling: -+ add_dir_to_list(self.compiler.library_dirs, -+ sysconfig.get_config_var('srcdir')) -+ - inc_dirs = self.compiler.include_dirs[:] - lib_dirs = self.compiler.library_dirs[:] -+ - if not cross_compiling: - for d in ( - '/usr/include', -@@ -550,7 +559,7 @@ class PyBuildExt(build_ext): - if host_platform == 'hp-ux11': - lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32'] - -- if host_platform == 'darwin': -+ if host_platform == 'darwin' and not cross_compiling: - # This should work on any unixy platform ;-) - # If the user has bothered specifying additional -I and -L flags - # in OPT and LDFLAGS we might as well use them here. diff --git a/package/python3/Makefile b/package/python3/Makefile index 7c50448ad..060ca4003 100644 --- a/package/python3/Makefile +++ b/package/python3/Makefile @@ -4,24 +4,20 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= python3 -PKG_VERSION:= 3.9.7 +PKG_VERSION:= 3.11.8 PKG_RELEASE:= 1 -PKG_HASH:= f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57 -PKG_DESCR:= python3 scripting language +PKG_HASH:= 9e06008c8901924395bc1da303eac567a729ae012baa182ab39269f650383bb3 +PKG_DESCR:= python scripting language PKG_SECTION:= dev/lang -PKG_DEPENDS:= libffi zlib -PKG_BUILDDEP:= python3-host libffi zlib -HOST_BUILDDEP:= libffi-host libressl-host zlib-host +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 PKG_NEEDS:= threads PKG_URL:= http://www.python.org/ PKG_SITES:= http://legacy.python.org/ftp/python/${PKG_VERSION}/ -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin - -PKG_FLAVOURS_PYTHON3:= MOD_ZLIB MOD_BZ2 MOD_EXPAT MOD_SQLITE MOD_GDBM -PKG_FLAVOURS_PYTHON3+= MOD_NCURSES MOD_SSL -# disabled -#MOD_READLINE +PKG_FLAVOURS_PYTHON3:= MOD_ZLIB MOD_BZ2 MOD_SQLITE MOD_GDBM +PKG_FLAVOURS_PYTHON3+= MOD_NCURSES MOD_SSL MOD_READLINE PKGFD_MOD_ZLIB:= zlib support PKGFB_MOD_ZLIB:= zlib @@ -29,9 +25,6 @@ PKGFS_MOD_ZLIB:= zlib PKGFD_MOD_BZ2:= bzip2 support PKGFB_MOD_BZ2:= bzip2 PKGFS_MOD_BZ2:= libbz2 -PKGFD_MOD_EXPAT:= xml support -PKGFB_MOD_EXPAT:= expat -PKGFS_MOD_EXPAT:= libexpat PKGFD_MOD_SQLITE:= sqlite support PKGFB_MOD_SQLITE:= sqlite PKGFS_MOD_SQLITE:= libsqlite @@ -59,9 +52,9 @@ define PKG_mod_template INSTALL_MODS_$${ADK_PACKAGE_${1}}+= ${2}-install ${2}-install: - ${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/python3.9/lib-dynload + ${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/python3.11/lib-dynload for m in ${2}; do \ - ${INSTALL_DATA} $(WRKINST)/usr/lib/python3.9/lib-dynload/$$$${m}*.so $$(IDIR_$(1))/usr/lib/python3.9/lib-dynload ;\ + ${INSTALL_DATA} $(WRKINST)/usr/lib/python3.11/lib-dynload/$$$${m}*.so $$(IDIR_$(1))/usr/lib/python3.11/lib-dynload ;\ done endef @@ -71,48 +64,48 @@ $(eval $(call PKG_template,PYTHON3,python3,${PKG_VERSION}-${PKG_RELEASE},${PKG_D $(eval $(call PKG_template,PYTHON3_MOD_ZLIB,python3-mod-zlib,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_ZLIB},${PKGFD_MOD_ZLIB},${PKG_SECTION})) $(eval $(call PKG_template,PYTHON3_MOD_BZ2,python3-mod-bz2,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_BZ2},${PKGFD_MOD_BZ2},${PKG_SECTION})) -$(eval $(call PKG_template,PYTHON3_MOD_EXPAT,python3-mod-expat,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_EXPAT},${PKGFD_MOD_EXPAT},${PKG_SECTION})) $(eval $(call PKG_template,PYTHON3_MOD_SQLITE,python3-mod-sqlite,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_SQLITE},${PKGFD_MOD_SQLITE},${PKG_SECTION})) $(eval $(call PKG_template,PYTHON3_MOD_GDBM,python3-mod-gdbm,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_GDBM},${PKGFD_MOD_GDBM},${PKG_SECTION})) $(eval $(call PKG_template,PYTHON3_MOD_NCURSES,python3-mod-ncurses,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_NCURSES},${PKGFD_MOD_NCURSES},${PKG_SECTION})) $(eval $(call PKG_template,PYTHON3_MOD_SSL,python3-mod-ssl,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_SSL},${PKGFD_MOD_SSL},${PKG_SECTION})) -#$(eval $(call PKG_template,PYTHON3_MOD_READLINE,python3-mod-readline,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_READLINE},${PKGFD_MOD_READLINE},${PKG_SECTION})) +$(eval $(call PKG_template,PYTHON3_MOD_READLINE,python3-mod-readline,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_READLINE},${PKGFD_MOD_READLINE},${PKG_SECTION})) $(eval $(call PKG_mod_template,PYTHON3_MOD_ZLIB,zlib)) $(eval $(call PKG_mod_template,PYTHON3_MOD_BZ2,_bz2)) -$(eval $(call PKG_mod_template,PYTHON3_MOD_EXPAT,pyexpat)) $(eval $(call PKG_mod_template,PYTHON3_MOD_SQLITE,_sqlite)) $(eval $(call PKG_mod_template,PYTHON3_MOD_GDBM,_gdbm)) $(eval $(call PKG_mod_template,PYTHON3_MOD_NCURSES,_curses)) $(eval $(call PKG_mod_template,PYTHON3_MOD_SSL,_ssl)) -#$(eval $(call PKG_mod_template,PYTHON3_MOD_READLINE,readline)) +$(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-threads \ - --with-system-ffi \ - --with-system-expat \ +CONFIGURE_ARGS:= --with-system-expat \ --disable-ipv6 \ - --without-cxx-main + --with-build-python CONFIGURE_ENV+= ac_cv_have_long_long_format=yes \ ac_cv_file__dev_ptmx=yes \ - ac_cv_file__dev_ptc=no + ac_cv_file__dev_ptc=no \ + ac_cv_header_libintl_h=no -HOST_CONFIGURE_ARGS+= --without-cxx-main \ - --with-threads +ifeq ($(ADK_TARGET_BIG_ENDIAN),y) +CONFIGURE_ENV+= ax_cv_c_float_words_bigendian=yes +else +CONFIGURE_ENV+= ax_cv_c_float_words_bigendian=no +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.9 - ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/include/python3.9 + ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/lib/python3.11 + ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/include/python3.11 ${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.9/* ${IDIR_PYTHON3}/usr/lib/python3.9 - ${CP} ${WRKINST}/usr/include/python3.9/pyconfig.h \ - ${IDIR_PYTHON3}/usr/include/python3.9 + ${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 @-for i in zlib _bz2 _curses _ssl _gdbm _sqlite pyexpat readline; do \ - rm ${IDIR_PYTHON3}/usr/lib/python3.8/lib-dynload/$${i}*so; \ + rm ${IDIR_PYTHON3}/usr/lib/python3.11/lib-dynload/$${i}*so; \ done include ${ADK_TOPDIR}/mk/host-bottom.mk diff --git a/package/python3/patches/patch-setup_py b/package/python3/patches/patch-setup_py deleted file mode 100644 index 90acd7eea..000000000 --- a/package/python3/patches/patch-setup_py +++ /dev/null @@ -1,11 +0,0 @@ ---- Python-3.8.2.orig/setup.py 2020-02-24 22:36:25.000000000 +0100 -+++ Python-3.8.2/setup.py 2020-04-15 22:28:11.208150620 +0200 -@@ -654,7 +654,7 @@ class PyBuildExt(build_ext): - # only change this for cross builds for 3.3, issues on Mageia - if CROSS_COMPILING: - self.add_cross_compiling_paths() -- self.add_multiarch_paths() -+# self.add_multiarch_paths() - self.add_ldflags_cppflags() - - def init_inc_lib_dirs(self): diff --git a/package/qingy/Makefile b/package/qingy/Makefile index 26e508d80..1a59fdb4f 100644 --- a/package/qingy/Makefile +++ b/package/qingy/Makefile @@ -21,6 +21,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,QINGY,qingy,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CFLAGS+= -fcommon TARGET_LDFLAGS+= -ltinfo CONFIGURE_ARGS+= --disable-screen-savers \ --disable-optimizations \ diff --git a/package/quagga/Makefile b/package/quagga/Makefile index 95cf6e288..e5628ff13 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= quagga -PKG_VERSION:= 1.2.0 +PKG_VERSION:= 1.2.4 PKG_RELEASE:= 1 -PKG_HASH:= 1043644d37975d9f920b76c593368cbe36ca43e27eb57cff316ee80ccb31dce3 +PKG_HASH:= e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3 PKG_DESCR:= routing software package PKG_SECTION:= net/route PKG_BUILDDEP:= readline ncurses c-ares PKG_DEPENDS:= c-ares PKG_NEEDS:= threads PKG_URL:= http://www.quagga.net/ -PKG_SITES:= http://download.savannah.gnu.org/releases/quagga/ +PKG_SITES:= https://github.com/Quagga/quagga/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -44,6 +44,7 @@ $(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,$(PKG_VERSION)-$(PKG_RELE $(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_QUAGGA_RIPD),$(PKG_SECTION))) $(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_QUAGGA_VTYSH),$(PKG_SECTION))) +TARGET_CFLAGS+= -fcommon CONFIGURE_ENV+= quagga_cv_ipforward_method="proc" CONFIGURE_ARGS+= --localstatedir=/var/run/quagga \ --sysconfdir=/etc/quagga \ diff --git a/package/rdesktop/Makefile b/package/rdesktop/Makefile index 98ccc84ca..2cd7636bc 100644 --- a/package/rdesktop/Makefile +++ b/package/rdesktop/Makefile @@ -4,25 +4,25 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= rdesktop -PKG_VERSION:= 1.8.1 +PKG_VERSION:= 1.9.0 PKG_RELEASE:= 1 -PKG_HASH:= 76cc834b89c34d8332f3cb3889483b2ae4d4e8118eeb45a8967c77dd18228246 +PKG_HASH:= d547c2e6f3e4c818a7e69a0f39adb39fac303633e0c25aa804bb588507ffc230 PKG_DESCR:= client for windows terminal services PKG_SECTION:= x11/apps -PKG_DEPENDS:= libsamplerate alsa-lib libao libressl -PKG_BUILDDEP:= libsamplerate alsa-lib libao libressl +PKG_DEPENDS:= libsamplerate alsa-lib libao libgnutls +PKG_BUILDDEP:= libsamplerate alsa-lib libao gnutls PKG_URL:= http://www.rdesktop.org/ -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=rdesktop/} +PKG_SITES:= https://github.com/rdesktop/rdesktop/archive/refs/tags/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= v${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,RDESKTOP,rdesktop,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TARGET_CFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE -CONFIGURE_ARGS+= --with-openssl="${STAGING_TARGET_DIR}/usr" \ - --disable-smartcard \ +AUTOTOOL_STYLE:= bootstrap +CONFIGURE_ARGS+= --disable-smartcard \ --disable-credssp rdesktop-install: diff --git a/package/readline/Makefile b/package/readline/Makefile index cdf2c04f6..8ac34cceb 100644 --- a/package/readline/Makefile +++ b/package/readline/Makefile @@ -24,6 +24,7 @@ $(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 diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile index ec4604c58..b0c175a04 100644 --- a/package/rpcbind/Makefile +++ b/package/rpcbind/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= rpcbind -PKG_VERSION:= 0.2.4 -PKG_RELEASE:= 2 -PKG_HASH:= 074a9a530dc7c11e0d905aa59bcb0847c009313f02e98d3d798aa9568f414c66 +PKG_VERSION:= 1.2.6 +PKG_RELEASE:= 1 +PKG_HASH:= 5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de PKG_DESCR:= converts rpc program numbers into universal addresses PKG_SECTION:= net/misc PKG_DEPENDS:= libtirpc @@ -27,8 +27,9 @@ CONFIGURE_ARGS+= --disable-libwrap \ rpcbind-install: $(INSTALL_DIR) $(IDIR_RPCBIND)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/rpcbind \ - $(IDIR_RPCBIND)/usr/bin + $(INSTALL_DIR) $(IDIR_RPCBIND)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/rpcbind \ + $(IDIR_RPCBIND)/usr/sbin $(INSTALL_BIN) $(WRKINST)/usr/bin/rpcinfo \ $(IDIR_RPCBIND)/usr/bin diff --git a/package/rpcbind/files/rpcbind.init b/package/rpcbind/files/rpcbind.init index 42c527c90..efc957fd3 100644 --- a/package/rpcbind/files/rpcbind.init +++ b/package/rpcbind/files/rpcbind.init @@ -11,10 +11,10 @@ autostart) exec sh $0 start ;; start) - /usr/bin/rpcbind + /usr/sbin/rpcbind ;; stop) - kill $(pgrep -f /usr/bin/rpcbind) + kill $(pgrep -f /usr/sbin/rpcbind) ;; restart) sh $0 stop diff --git a/package/rpcbind/patches/patch-src_security_c b/package/rpcbind/patches/patch-src_security_c deleted file mode 100644 index c183919c9..000000000 --- a/package/rpcbind/patches/patch-src_security_c +++ /dev/null @@ -1,50 +0,0 @@ ---- rpcbind-0.2.4.orig/src/security.c 2016-11-28 21:47:28.000000000 +0100 -+++ rpcbind-0.2.4/src/security.c 2016-12-31 16:11:48.723119783 +0100 -@@ -22,14 +22,6 @@ - /* - * XXX for special case checks in check_callit. - */ --#ifdef HAVE_RPCSVC_MOUNT_H --#include <rpcsvc/mount.h> --#include <rpcsvc/rquota.h> --#include <rpcsvc/nfs_prot.h> --#include <rpcsvc/yp.h> --#include <rpcsvc/ypclnt.h> --#include <rpcsvc/yppasswd.h> --#else - # define MOUNTPROC_MNT 1 - # define MOUNTPROC_UMNT 3 - # define NFS_PROGRAM 100003 -@@ -44,7 +36,6 @@ - # define YPPROC_FIRST 4 - # define YPPROC_NEXT 5 - # define YPPROC_ALL 8 --#endif - - #include "rpcbind.h" - -@@ -327,24 +318,9 @@ check_callit(SVCXPRT *xprt, struct r_rmt - args->rmt_proc != MOUNTPROC_UMNT) - break; - goto deny; -- case YPBINDPROG: -- if (args->rmt_proc != YPBINDPROC_SETDOM) -- break; -- /* FALLTHROUGH */ -- case YPPASSWDPROG: - case NFS_PROGRAM: - case RQUOTAPROG: - goto deny; -- case YPPROG: -- switch (args->rmt_proc) { -- case YPPROC_ALL: -- case YPPROC_MATCH: -- case YPPROC_FIRST: -- case YPPROC_NEXT: -- goto deny; -- default: -- break; -- } - default: - break; - } diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile index 7bf566a0d..bc46647f4 100644 --- a/package/rrdtool/Makefile +++ b/package/rrdtool/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= rrdtool -PKG_VERSION:= 1.6.0 +PKG_VERSION:= 1.8.0 PKG_RELEASE:= 1 -PKG_HASH:= cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 +PKG_HASH:= bd37614137d7a8dc523359648eb2a81631a34fd91a82ed5581916a52c08433f4 PKG_DESCR:= round robin database management library PKG_SECTION:= libs/misc PKG_DEPENDS:= libart libfreetype libpng zlib @@ -14,7 +14,7 @@ PKG_DEPENDS+= glib cairo pango PKG_BUILDDEP:= libxml2 cgilib freetype libart libpng PKG_BUILDDEP+= glib cairo pango PKG_URL:= http://oss.oetiker.ch/ -PKG_SITES:= http://oss.oetiker.ch/rrdtool/pub/ +PKG_SITES:= https://github.com/oetiker/rrdtool-1.x/releases/download/v$(PKG_VERSION)/ PKG_LIBNAME:= librrd PKG_OPTS:= dev @@ -41,7 +41,9 @@ CONFIGURE_ARGS+= --enable-rrdcgi \ --disable-ruby \ --disable-tcl \ --disable-python \ - --disable-libwrap + --disable-libwrap \ + --disable-docs \ + --disable-examples TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/freetype2 TARGET_LDFLAGS+= -lglib-2.0 -lm diff --git a/package/rsync/Makefile b/package/rsync/Makefile index 78147b6bb..9971074f3 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -4,12 +4,12 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= rsync -PKG_VERSION:= 3.2.2 +PKG_VERSION:= 3.2.7 PKG_RELEASE:= 1 -PKG_HASH:= 644bd3841779507665211fd7db8359c8a10670c57e305b4aab61b4e40037afa8 +PKG_HASH:= 4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb PKG_DESCR:= utility that provides fast incremental file transfer PKG_SECTION:= net/misc -PKG_DEPENDS:= libpopt +PKG_DEPENDS:= libpopt libressl PKG_BUILDDEP:= popt libressl HOST_BUILDDEP:= libressl-host PKG_URL:= http://rsync.samba.org/ @@ -28,6 +28,7 @@ HOST_CONFIGURE_ARGS:= --disable-xxhash \ --disable-lz4 CONFIGURE_ARGS:= --disable-xxhash \ --disable-zstd \ + --disable-simd \ --disable-lz4 rsync-install: diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile index 8777baf87..56034a7f9 100644 --- a/package/rtorrent/Makefile +++ b/package/rtorrent/Makefile @@ -15,6 +15,8 @@ PKG_NEEDS:= c++ PKG_URL:= https://rakshasa.github.io/rtorrent/ PKG_SITES:= http://rtorrent.net/downloads/ +PKG_CFLINE_RTORRENT:= depends on ADK_BROKEN + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/ruby/Makefile b/package/ruby/Makefile index b5e7689ce..f0a55595b 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= ruby -PKG_VERSION:= 3.0.2 +PKG_VERSION:= 3.3.0 PKG_RELEASE:= 1 -PKG_HASH:= 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40 +PKG_HASH:= 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b PKG_DESCR:= scripting language PKG_SECTION:= dev/lang PKG_DEPENDS:= libressl zlib @@ -14,7 +14,7 @@ PKG_BUILDDEP:= ruby-host libressl zlib HOST_BUILDDEP:= libressl-host PKG_NEEDS:= threads PKG_URL:= http://www.ruby-lang.org/ -PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/3.0/ +PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/3.3/ include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk @@ -22,10 +22,12 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf # uClibc setpgrp does not take arguments CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes \ stack_protector=no \ + ac_cv_func_finite=yes \ + ac_cv_func_isinf=yes \ + ac_cv_func_isnan=yes \ rb_cv_binary_elf=yes CONFIGURE_ARGS+= --disable-install-doc \ --with-out-ext=fiddle \ @@ -37,8 +39,9 @@ ALL_TARGET:= main INSTALL_TARGET:= install-nodoc HOST_CONFIGURE_ARGS+= --disable-install-doc \ + --disable-yjit \ --disable-shared \ - --with-out-ext=curses,readline \ + --with-out-ext=curses,readline,openssl \ --disable-rubygems HOST_ALL_TARGET:= main HOST_INSTALL_TARGET:= install-nodoc diff --git a/package/ruby/patches/0001-fix-default-coroutine-selection.patch b/package/ruby/patches/0001-fix-default-coroutine-selection.patch deleted file mode 100644 index ea84aa9bc..000000000 --- a/package/ruby/patches/0001-fix-default-coroutine-selection.patch +++ /dev/null @@ -1,21 +0,0 @@ -fixed default coroutine selection for musl/uclibc - -https://github.com/ruby/ruby/pull/3567/commits/b570e7de87aaad8c903176d835e8124127f627b3 - -Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> - -diff -Nur ruby-3.0.0.orig/configure.ac ruby-3.0.0/configure.ac ---- ruby-3.0.0.orig/configure.ac 2020-12-25 04:33:01.000000000 +0100 -+++ ruby-3.0.0/configure.ac 2021-02-22 13:00:53.990314464 +0100 -@@ -2441,7 +2441,10 @@ - rb_cv_coroutine=copy - ], - [ -- rb_cv_coroutine=ucontext -+ AC_CHECK_FUNCS([getcontext swapcontext makecontext], -+ [rb_cv_coroutine=ucontext], -+ [rb_cv_coroutine=copy; break] -+ ) - ] - ) - AC_MSG_RESULT(${rb_cv_coroutine}) diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile index 04e3c0c25..8b977427d 100644 --- a/package/rxvt-unicode/Makefile +++ b/package/rxvt-unicode/Makefile @@ -4,13 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= rxvt-unicode -PKG_VERSION:= 9.21 +PKG_VERSION:= 9.30 PKG_RELEASE:= 1 -PKG_HASH:= 75270ed72bc5895a64a1d7392bf45a622204192371c3965bd3dd978dc088956b +PKG_HASH:= fe1c93d12f385876457a989fc3ae05c0915d2692efc59289d0f70fabe5b44d2d PKG_DESCR:= terminal emulator with unicode support PKG_SECTION:= x11/apps -PKG_DEPENDS:= libx11 fontconfig libxft libxml2 gdk-pixbuf -PKG_BUILDDEP:= libX11 fontconfig libXft libxml2 gdk-pixbuf +PKG_DEPENDS:= libx11 fontconfig libxft libxml2 gdk-pixbuf libptytty +PKG_DEPENDS+= libffi libmount +PKG_BUILDDEP:= libX11 fontconfig libXft libxml2 gdk-pixbuf libptytty +PKG_BUILDDEP+= libffi util-linux PKG_NEEDS:= c++ PKG_URL:= http://software.schmorp.de/pkg/rxvt-unicode.html PKG_SITES:= http://dist.schmorp.de/rxvt-unicode/ @@ -22,9 +24,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,RXVT_UNICODE,rxvt-unicode,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TARGET_LDFLAGS+= -lpthread -CONFIGURE_ARGS+= --disable-perl \ - --disable-utmp \ - --disable-afterimage +CONFIGURE_ARGS+= --disable-perl rxvt-unicode-install: $(INSTALL_DIR) $(IDIR_RXVT_UNICODE)/usr/bin diff --git a/package/samba/Makefile b/package/samba/Makefile index 82d4a5f87..e47d34af3 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -4,15 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= samba -PKG_VERSION:= 4.6.9 +PKG_VERSION:= 4.19.4 PKG_RELEASE:= 1 -PKG_HASH:= c31db4aad82f0b9588ef6c4b4dab5dce3fa1787bd298e62d953c2628bb1af21a +PKG_HASH:= 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c PKG_DESCR:= file and print server PKG_SECTION:= net/fs PKG_DEPENDS:= libuuid libpopt libgnutls libtirpc -PKG_DEPENDS+= libtalloc -PKG_BUILDDEP:= util-linux popt python2 gnutls talloc -PKG_BUILDDEP+= heimdal-host python2-host libtirpc +PKG_DEPENDS+= libtalloc libkrb5 +PKG_BUILDDEP:= util-linux talloc p5-parse-yapp-host gnutls krb5 PKG_NEEDS:= threads intl PKG_URL:= http://www.samba.org/ PKG_SITES:= http://samba.org/samba/ftp/stable/ @@ -29,10 +28,12 @@ CONFIGURE_ARGS+= --enable-fhs \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --with-privatedir=/etc/samba \ + --with-privatedir=/var/lib/samba \ --cross-compile \ --cross-answers=$(WRKSRC)/cache.txt \ --hostcc=gcc \ + --with-system-mitkrb5 \ + --without-libunwind \ --without-pie \ --without-gettext \ --without-relro \ @@ -44,20 +45,32 @@ CONFIGURE_ARGS+= --enable-fhs \ --without-ads \ --without-ldap \ --without-acl-support \ + --without-ad-dc \ + --without-json \ + --without-libarchive \ + --without-iconv \ --disable-glusterfs \ --disable-iprint \ --disable-cups \ --disable-avahi \ --disable-rpath \ + --disable-python \ --bundled-libraries='com_err,!asn1_compile,!compile_et' \ + --with-shared-modules=!vfs_snapper \ --disable-rpath-install CONFIGURE_ENV+= PYTHON_CONFIG="$(STAGING_TARGET_DIR)/usr/bin/python-config" \ python_LDFLAGS="" \ - python_LIBDIR="" + python_LIBDIR="" \ + PERL="$(STAGING_HOST_DIR)/usr/bin/perl-host" pre-configure: $(CP) ./files/cache.txt $(WRKSRC) 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 +else + echo 'Checking for a 64-bit host to support lmdb: NO' >>$(WRKSRC)/cache.txt +endif samba-install: $(INSTALL_DIR) $(IDIR_SAMBA)/etc/samba diff --git a/package/samba/files/cache.txt b/package/samba/files/cache.txt index 3ba8a75ea..9ab9fcd5b 100644 --- a/package/samba/files/cache.txt +++ b/package/samba/files/cache.txt @@ -37,3 +37,12 @@ Checking value of NSIG: "65" Checking value of _NSIG: "65" Checking value of SIGRTMAX: "64" Checking value of SIGRTMIN: "34" +Checking errno of iconv for illegal multibyte sequence: "0" +checking for clnt_create(): OK +Checking for a 64-bit host to support lmdb: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: 29 +Checking value of GNUTLS_MAC_AES_CMAC_128: 203 +Checking whether fcntl supports flags to send direct I/O availability signals: OK +Checking for gnutls fips mode support: NO +Checking for readlink breakage: NO +Checking whether the WRFILE -keytab is supported: NO diff --git a/package/samba/files/samba.init b/package/samba/files/samba.init index 21b983530..8b9e7e375 100644 --- a/package/samba/files/samba.init +++ b/package/samba/files/samba.init @@ -11,12 +11,13 @@ autostart) exec sh $0 start ;; start) - [ -d /var/lib/samba ] || mkdir -p /var/lib/samba + [ -d /var/lib/samba/msg.sock ] || mkdir -p /var/lib/samba/msg.sock [ -d /var/run/samba ] || mkdir -p /var/run/samba [ -d /var/log/samba ] || mkdir -p /var/log/samba [ -d /var/cache/samba ] || mkdir -p /var/cache/samba [ -d /var/lock/samba ] || mkdir -p /var/lock/samba - /usr/sbin/nmbd -D + chmod 700 /var/lib/samba/msg.sock + /usr/sbin/nmbd -D /usr/sbin/smbd -D ;; stop) diff --git a/package/samba/patches/patch-nsswitch_wins_c b/package/samba/patches/patch-nsswitch_wins_c deleted file mode 100644 index 92aa624f5..000000000 --- a/package/samba/patches/patch-nsswitch_wins_c +++ /dev/null @@ -1,17 +0,0 @@ ---- samba-4.6.6.orig/nsswitch/wins.c 2017-01-09 09:12:30.000000000 +0100 -+++ samba-4.6.6/nsswitch/wins.c 2017-08-02 22:28:16.616627669 +0200 -@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = - #define INADDRSZ 4 - #endif - -+#ifndef NETDB_INTERNAL -+#define NETDB_INTERNAL -1 -+#endif -+ -+#ifndef NETDB_SUCCESS -+#define NETDB_SUCCESS 0 -+#endif -+ - NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname, - struct hostent *he, - char *buffer, diff --git a/package/samba/patches/patch-source3_lib_util_c b/package/samba/patches/patch-source3_lib_util_c deleted file mode 100644 index 5755bb837..000000000 --- a/package/samba/patches/patch-source3_lib_util_c +++ /dev/null @@ -1,18 +0,0 @@ ---- samba-4.6.6.orig/source3/lib/util.c 2017-02-09 08:45:27.000000000 +0100 -+++ samba-4.6.6/source3/lib/util.c 2017-08-02 21:54:59.695281066 +0200 -@@ -565,6 +565,7 @@ char *get_mydnsdomname(TALLOC_CTX *ctx) - } - } - -+#if 0 - #if (defined(HAVE_NETGROUP) && defined(WITH_AUTOMOUNT)) - /****************************************************************** - Remove any mount options such as -rsize=2048,wsize=2048 etc. -@@ -687,6 +688,7 @@ char *automount_lookup(TALLOC_CTX *ctx, - } - #endif /* WITH_NISPLUS_HOME */ - #endif -+#endif - - bool process_exists(const struct server_id pid) - { diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index fea9bd975..77d28add4 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -4,15 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= sane-backends -PKG_VERSION:= 1.0.22 -PKG_RELEASE:= 3 -PKG_HASH:= 9f84a16800497f0b79a278531bb1a0f438de6ce8cf509fefc65a252e29f90c54 +PKG_VERSION:= 1.2.1 +PKG_RELEASE:= 1 +PKG_HASH:= f832395efcb90bb5ea8acd367a820c393dda7e0dd578b16f48928b8f5bdd0524 PKG_DESCR:= scanner access now easy PKG_SECTION:= sys/misc PKG_BUILDDEP:= libusb libusb-compat PKG_NEEDS:= threads PKG_URL:= http://www.sane-project.org/ -PKG_SITES:= ftp://ftp2.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/ +PKG_SITES:= https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -226,7 +226,9 @@ $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX_PP,umax_pp)) $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX,umax)) TARGET_CFLAGS+= -D_GNU_SOURCE -CONFIGURE_ENV+= ac_cv_func_ioperm=no have_libv4l1=no +CONFIGURE_ENV+= ac_cv_func_ioperm=no \ + have_libv4l1=no \ + ac_cv_func_mmap_fixed_mapped=yes CONFIGURE_ARGS+= --disable-translations \ --without-gphoto2 \ --enable-libusb diff --git a/package/sane-backends/patches/patch-Makefile_in b/package/sane-backends/patches/patch-Makefile_in deleted file mode 100644 index b1796c56f..000000000 --- a/package/sane-backends/patches/patch-Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.22.orig/Makefile.in 2011-01-30 19:50:56.000000000 +0100 -+++ sane-backends-1.0.22/Makefile.in 2011-10-01 19:26:02.309066938 +0200 -@@ -293,7 +293,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = include lib sanei backend frontend tools doc po -+SUBDIRS = include lib sanei backend frontend - DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite - dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \ - README README.aix README.beos README.darwin README.djpeg README.freebsd \ diff --git a/package/sane-backends/patches/patch-backend_canon630u-common_c b/package/sane-backends/patches/patch-backend_canon630u-common_c deleted file mode 100644 index d9acb4bf1..000000000 --- a/package/sane-backends/patches/patch-backend_canon630u-common_c +++ /dev/null @@ -1,12 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/canon630u-common.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/canon630u-common.c 2014-03-18 08:33:31.000000000 +0100 -@@ -58,9 +58,7 @@ - #include <unistd.h> /* usleep */ - #include <time.h> - #include <math.h> /* exp() */ --#ifdef HAVE_OS2_H - #include <sys/types.h> /* mode_t */ --#endif - #include <sys/stat.h> - #include "lm9830.h" - diff --git a/package/sane-backends/patches/patch-backend_epson2-commands_c b/package/sane-backends/patches/patch-backend_epson2-commands_c deleted file mode 100644 index 3b2c46841..000000000 --- a/package/sane-backends/patches/patch-backend_epson2-commands_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/epson2-commands.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/epson2-commands.c 2014-03-18 08:34:27.000000000 +0100 -@@ -19,6 +19,7 @@ - - #include "sane/config.h" - -+#include <sys/types.h> - #include <byteorder.h> - #include <math.h> - diff --git a/package/sane-backends/patches/patch-backend_genesys_c b/package/sane-backends/patches/patch-backend_genesys_c deleted file mode 100644 index fc0398856..000000000 --- a/package/sane-backends/patches/patch-backend_genesys_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/genesys.c 2011-02-14 00:10:18.000000000 +0100 -+++ sane-backends-1.0.22/backend/genesys.c 2014-03-18 08:36:00.000000000 +0100 -@@ -65,6 +65,7 @@ - #include <errno.h> - #include <string.h> - #include <stdlib.h> -+#include <sys/types.h> - #include <unistd.h> - #include <math.h> - diff --git a/package/sane-backends/patches/patch-backend_genesys_h b/package/sane-backends/patches/patch-backend_genesys_h deleted file mode 100644 index efc830be1..000000000 --- a/package/sane-backends/patches/patch-backend_genesys_h +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/genesys.h 2011-01-16 02:01:28.000000000 +0100 -+++ sane-backends-1.0.22/backend/genesys.h 2014-03-18 08:36:42.000000000 +0100 -@@ -52,6 +52,7 @@ - */ - #undef UNIT_TESTING - -+#include <sys/types.h> - #include "genesys_low.h" - - #define FREE_IFNOT_NULL(x) if(x!=NULL) { free(x); x=NULL;} diff --git a/package/sane-backends/patches/patch-backend_genesys_low_c b/package/sane-backends/patches/patch-backend_genesys_low_c deleted file mode 100644 index 430ab3791..000000000 --- a/package/sane-backends/patches/patch-backend_genesys_low_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/genesys_low.c 2011-02-14 00:10:18.000000000 +0100 -+++ sane-backends-1.0.22/backend/genesys_low.c 2014-03-18 08:37:27.000000000 +0100 -@@ -46,6 +46,7 @@ - #include <errno.h> - #include <string.h> - #include <stdlib.h> -+#include <sys/types.h> - #include <unistd.h> - #include <math.h> - diff --git a/package/sane-backends/patches/patch-backend_hp3900_rts8822_c b/package/sane-backends/patches/patch-backend_hp3900_rts8822_c deleted file mode 100644 index 59b9b5a9b..000000000 --- a/package/sane-backends/patches/patch-backend_hp3900_rts8822_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/hp3900_rts8822.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/hp3900_rts8822.c 2014-03-18 08:38:21.000000000 +0100 -@@ -64,6 +64,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> /* bzero() */ -+#include <sys/types.h> - #include <time.h> /* clock() */ - #include <math.h> /* truncf() */ - #include <ctype.h> /* tolower() */ diff --git a/package/sane-backends/patches/patch-backend_hp5400_sanei_c b/package/sane-backends/patches/patch-backend_hp5400_sanei_c deleted file mode 100644 index 7f340d607..000000000 --- a/package/sane-backends/patches/patch-backend_hp5400_sanei_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/hp5400_sanei.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/hp5400_sanei.c 2014-03-18 08:39:35.000000000 +0100 -@@ -56,6 +56,7 @@ - #include "hp5400_xfer.h" - #include "hp5400_debug.h" - #include <stdio.h> -+#include <sys/types.h> - #include "../include/sane/sanei_usb.h" - - #define CMD_INITBULK1 0x0087 /* send 0x14 */ diff --git a/package/sane-backends/patches/patch-backend_hp5590_low_c b/package/sane-backends/patches/patch-backend_hp5590_low_c deleted file mode 100644 index 7812886dc..000000000 --- a/package/sane-backends/patches/patch-backend_hp5590_low_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/hp5590_low.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/hp5590_low.c 2014-03-18 08:38:55.000000000 +0100 -@@ -46,6 +46,7 @@ - - #include <stdio.h> - #include <string.h> -+#include <sys/types.h> - #include <errno.h> - #ifdef HAVE_NETINET_IN_H - # include <netinet/in.h> diff --git a/package/sane-backends/patches/patch-backend_kvs20xx_opt_c b/package/sane-backends/patches/patch-backend_kvs20xx_opt_c deleted file mode 100644 index 253699d14..000000000 --- a/package/sane-backends/patches/patch-backend_kvs20xx_opt_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/kvs20xx_opt.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/kvs20xx_opt.c 2014-03-18 08:41:24.000000000 +0100 -@@ -8,6 +8,7 @@ - - #include "../include/sane/config.h" - -+#include <sys/types.h> - #include <string.h> - - #define DEBUG_DECLARE_ONLY diff --git a/package/sane-backends/patches/patch-backend_microtek_c b/package/sane-backends/patches/patch-backend_microtek_c deleted file mode 100644 index dde369f2d..000000000 --- a/package/sane-backends/patches/patch-backend_microtek_c +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.22.orig/backend/microtek.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/microtek.c 2011-10-01 19:26:01.659066938 +0200 -@@ -59,6 +59,7 @@ - - #include "../include/sane/config.h" - -+#include <stdarg.h> - #include <stdlib.h> - #include <string.h> - #include <unistd.h> diff --git a/package/sane-backends/patches/patch-backend_pixma_bjnp_c b/package/sane-backends/patches/patch-backend_pixma_bjnp_c deleted file mode 100644 index 5d347c00e..000000000 --- a/package/sane-backends/patches/patch-backend_pixma_bjnp_c +++ /dev/null @@ -1,22 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.22.orig/backend/pixma_bjnp.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/pixma_bjnp.c 2011-10-01 19:26:01.699066938 +0200 -@@ -59,9 +59,6 @@ - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> - #endif --#ifdef HAVE_SYS_TIME_H --#include <sys/timeb.h> --#endif - - /* - * networking stuff -@@ -196,7 +193,7 @@ truncate_hostname (char *hostname, char - { - /* this is a hostname, not an ip-address, so remove domain part of the name */ - -- if ((dot = index (short_hostname, '.')) != NULL) -+ if ((dot = strchr(short_hostname, '.')) != NULL) - *dot = '\0'; - } - return short_hostname; diff --git a/package/sane-backends/patches/patch-backend_pixma_common_h b/package/sane-backends/patches/patch-backend_pixma_common_h deleted file mode 100644 index 822cc888e..000000000 --- a/package/sane-backends/patches/patch-backend_pixma_common_h +++ /dev/null @@ -1,13 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.20.orig/backend/pixma_common.h 2009-02-05 15:36:36.000000000 +0100 -+++ sane-backends-1.0.20/backend/pixma_common.h 2009-05-11 21:00:58.000000000 +0200 -@@ -220,8 +220,8 @@ void pixma_hexdump (int level, const voi - void pixma_dump (int level, const char *type, const void *data, int len, - int size, int max); - # define DEBUG_DECLARE_ONLY --# include "../include/sane/sanei_debug.h" - #endif /* NDEBUG */ - /** @} end of group debug */ -+# include "../include/sane/sanei_debug.h" - - #endif diff --git a/package/sane-backends/patches/patch-backend_pixma_imageclass_c b/package/sane-backends/patches/patch-backend_pixma_imageclass_c deleted file mode 100644 index cb265aedb..000000000 --- a/package/sane-backends/patches/patch-backend_pixma_imageclass_c +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.22.orig/backend/pixma_imageclass.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/pixma_imageclass.c 2011-10-01 19:26:01.779066938 +0200 -@@ -161,8 +161,6 @@ query_status (pixma_t * s) - if (error >= 0) - { - memcpy (mf->current_status, data, 12); -- DBG (3, "Current status: paper=%u cal=%u lamp=%u\n", -- data[1], data[8], data[7]); - PDBG (pixma_dbg (3, "Current status: paper=%u cal=%u lamp=%u\n", - data[1], data[8], data[7])); - } diff --git a/package/sane-backends/patches/patch-backend_rts88xx_lib_c b/package/sane-backends/patches/patch-backend_rts88xx_lib_c deleted file mode 100644 index 060f0a10e..000000000 --- a/package/sane-backends/patches/patch-backend_rts88xx_lib_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/rts88xx_lib.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/rts88xx_lib.c 2014-03-18 08:42:41.000000000 +0100 -@@ -54,6 +54,7 @@ - - #include <stdio.h> - #include <sys/time.h> -+#include <sys/types.h> - - #include "../include/_stdint.h" - diff --git a/package/sane-backends/patches/patch-backend_sm3600-scanutil_c b/package/sane-backends/patches/patch-backend_sm3600-scanutil_c deleted file mode 100644 index 436102a18..000000000 --- a/package/sane-backends/patches/patch-backend_sm3600-scanutil_c +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.22.orig/backend/sm3600-scanutil.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/sm3600-scanutil.c 2011-10-01 19:26:01.819066938 +0200 -@@ -47,6 +47,7 @@ $Id$ - - ====================================================================== */ - -+#include <stdarg.h> - #include <unistd.h> - #include "sm3600-scantool.h" - diff --git a/package/sane-backends/patches/patch-backend_umax1220u-common_c b/package/sane-backends/patches/patch-backend_umax1220u-common_c deleted file mode 100644 index 8889f7795..000000000 --- a/package/sane-backends/patches/patch-backend_umax1220u-common_c +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sane-backends-1.0.20.orig/backend/umax1220u-common.c 2006-04-17 14:46:41.000000000 +0200 -+++ sane-backends-1.0.20/backend/umax1220u-common.c 2009-05-11 21:17:47.000000000 +0200 -@@ -556,7 +556,7 @@ cwritev (UMAX_Handle * scan, UMAX_Cmd cm - /* Read the opcode back */ - - CHK (cread (scan, cmd, len, buf, NULL)); -- if (bcmp (buf, data, len)) -+ if (memcmp (buf, data, len)) - { - DBG (1, "cwritev: verification failed\n"); - return SANE_STATUS_IO_ERROR; diff --git a/package/sane-backends/patches/patch-backend_xerox_mfp_c b/package/sane-backends/patches/patch-backend_xerox_mfp_c deleted file mode 100644 index d58262197..000000000 --- a/package/sane-backends/patches/patch-backend_xerox_mfp_c +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/backend/xerox_mfp.c 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/backend/xerox_mfp.c 2014-03-18 08:44:56.000000000 +0100 -@@ -22,6 +22,7 @@ - #include <math.h> - #include <unistd.h> - #include <sys/time.h> -+#include <sys/types.h> - #include "../include/sane/sane.h" - #include "../include/sane/sanei.h" - #include "../include/sane/saneopts.h" diff --git a/package/sane-backends/patches/patch-configure b/package/sane-backends/patches/patch-configure deleted file mode 100644 index d8d5aca8d..000000000 --- a/package/sane-backends/patches/patch-configure +++ /dev/null @@ -1,90 +0,0 @@ ---- sane-backends-1.0.22.orig/configure 2011-02-14 02:27:52.000000000 +0100 -+++ sane-backends-1.0.22/configure 2011-10-01 19:32:51.919066675 +0200 -@@ -7529,77 +7529,7 @@ done - - - -- -- -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBV4L" >&5 --$as_echo_n "checking for LIBV4L... " >&6; } -- --if test -n "$LIBV4L_CFLAGS"; then -- pkg_cv_LIBV4L_CFLAGS="$LIBV4L_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_LIBV4L_CFLAGS=`$PKG_CONFIG --cflags "libv4l1" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$LIBV4L_LIBS"; then -- pkg_cv_LIBV4L_LIBS="$LIBV4L_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_LIBV4L_LIBS=`$PKG_CONFIG --libs "libv4l1" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- LIBV4L_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libv4l1" 2>&1` -- else -- LIBV4L_PKG_ERRORS=`$PKG_CONFIG --print-errors "libv4l1" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$LIBV4L_PKG_ERRORS" >&5 -- -- have_libv4l1=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- have_libv4l1=no --else -- LIBV4L_CFLAGS=$pkg_cv_LIBV4L_CFLAGS -- LIBV4L_LIBS=$pkg_cv_LIBV4L_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- have_libv4l1=yes --fi -+have_libv4l1=no - - - -@@ -16874,7 +16804,7 @@ ALL_BACKENDS="abaton agfafocus apple art - leo lexmark ma1509 magicolor \ - matsushita microtek microtek2 mustek mustek_pp \ - mustek_usb mustek_usb2 nec net niash pie pint \ -- pixma plustek plustek_pp qcam ricoh rts8891 s9036 \ -+ pixma plustek plustek_pp ricoh rts8891 s9036 \ - sceptre sharp sm3600 sm3840 snapscan sp15c st400 \ - stv680 tamarack teco1 teco2 teco3 test u12 umax - umax_pp umax1220u v4l xerox_mfp p5" diff --git a/package/sane-backends/patches/patch-configure_in b/package/sane-backends/patches/patch-configure_in deleted file mode 100644 index fbc410c70..000000000 --- a/package/sane-backends/patches/patch-configure_in +++ /dev/null @@ -1,11 +0,0 @@ ---- sane-backends-1.0.22.orig/configure.in 2011-02-14 00:27:15.000000000 +0100 -+++ sane-backends-1.0.22/configure.in 2011-10-01 19:26:02.249066938 +0200 -@@ -559,7 +559,7 @@ ALL_BACKENDS="abaton agfafocus apple art - leo lexmark ma1509 magicolor \ - matsushita microtek microtek2 mustek mustek_pp \ - mustek_usb mustek_usb2 nec net niash pie pint \ -- pixma plustek plustek_pp qcam ricoh rts8891 s9036 \ -+ pixma plustek plustek_pp ricoh rts8891 s9036 \ - sceptre sharp sm3600 sm3840 snapscan sp15c st400 \ - stv680 tamarack teco1 teco2 teco3 test u12 umax - umax_pp umax1220u v4l xerox_mfp p5" diff --git a/package/sane-backends/patches/patch-include_sane_sanei_tcp_h b/package/sane-backends/patches/patch-include_sane_sanei_tcp_h deleted file mode 100644 index 4ba390003..000000000 --- a/package/sane-backends/patches/patch-include_sane_sanei_tcp_h +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/include/sane/sanei_tcp.h 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/include/sane/sanei_tcp.h 2014-03-18 08:31:07.000000000 +0100 -@@ -20,6 +20,7 @@ - - #include <sane/sane.h> - -+#include <sys/types.h> - #include <netinet/in.h> - #include <netdb.h> - diff --git a/package/sane-backends/patches/patch-include_sane_sanei_udp_h b/package/sane-backends/patches/patch-include_sane_sanei_udp_h deleted file mode 100644 index 3d70edada..000000000 --- a/package/sane-backends/patches/patch-include_sane_sanei_udp_h +++ /dev/null @@ -1,10 +0,0 @@ ---- sane-backends-1.0.22.orig/include/sane/sanei_udp.h 2010-12-02 00:49:58.000000000 +0100 -+++ sane-backends-1.0.22/include/sane/sanei_udp.h 2014-03-18 08:31:40.000000000 +0100 -@@ -20,6 +20,7 @@ - - #include <sane/sane.h> - -+#include <sys/types.h> - #include <netinet/in.h> - #include <netdb.h> - diff --git a/package/scons/Makefile b/package/scons/Makefile index 7acc52c1a..b33c67318 100644 --- a/package/scons/Makefile +++ b/package/scons/Makefile @@ -4,19 +4,21 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= scons -PKG_VERSION:= 2.3.0 -PKG_RELEASE:= 2 -PKG_HASH:= 9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b +PKG_VERSION:= 3.1.2 +PKG_RELEASE:= 1 +PKG_HASH:= 7801f3f62f654528e272df780be10c0e9337e897650b62ddcee9f39fde13f8fb PKG_DESCR:= software construction tool PKG_SECTION:= dev/tools -HOST_BUILDDEP:= python2-host +HOST_BUILDDEP:= python3-host PKG_URL:= http://www.scons.org PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=scons/} -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= $(PKG_NAME)-${PKG_VERSION}.tar.gz PKG_CFLINE_SCONS:= depends on ADK_HOST_ONLY +#WRKDIST= ${WRKDIR}/SCons-${PKG_VERSION} + include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -26,7 +28,7 @@ HOST_STYLE:= manual scons-hostinstall: (cd $(WRKBUILD); PATH='$(HOST_PATH)' python setup.py install \ - --prefix=$(STAGING_HOST_DIR)/usr) + --prefix=$(STAGING_HOST_DIR)/usr --install-lib=$(STAGING_HOST_DIR)/usr/lib/scons-$(PKG_VERSION)) include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/screen/Makefile b/package/screen/Makefile index 209d211b6..1756f3166 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -4,13 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= screen -PKG_VERSION:= 4.7.0 +PKG_VERSION:= 4.9.0 PKG_RELEASE:= 1 -PKG_HASH:= da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1 +PKG_HASH:= f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4 PKG_DESCR:= window manager for the terminal session PKG_SECTION:= sys/utils PKG_DEPENDS:= libncurses libelf PKG_BUILDDEP:= ncurses libelf +PKG_NEEDS:= mmu PKG_URL:= http://www.gnu.org/software/screen/ PKG_SITES:= ${MASTER_SITE_GNU:=screen/} @@ -20,6 +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 diff --git a/package/sdl/Makefile b/package/sdl/Makefile deleted file mode 100644 index 351a65f01..000000000 --- a/package/sdl/Makefile +++ /dev/null @@ -1,65 +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:= sdl -PKG_VERSION:= 1.2.15 -PKG_RELEASE:= 1 -PKG_HASH:= d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 -PKG_DESCR:= simple directmedia layer -PKG_SECTION:= libs/misc -PKG_DEPENDS:= libusb alsa-lib libx11 libxext -PKG_BUILDDEP:= sdl-host libusb alsa-lib libX11 libXext -PKG_NEEDS:= threads -PKG_URL:= http://www.libsdl.org/ -PKG_SITES:= http://www.libsdl.org/release/ -PKG_LIBNAME:= libsdl -PKG_OPTS:= dev - -PKG_FLAVOURS_LIBSDL:= WITH_TSLIB -PKGFD_WITH_TSLIB:= enable touchscreen support -PKGFS_WITH_TSLIB:= tslib -PKGFB_WITH_TSLIB:= tslib - -DISTFILES:= SDL-${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/SDL-${PKG_VERSION} - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE})) -$(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) - -HOST_STYLE:= auto -HOST_CONFIGURE_ARGS+= --without-x \ - --enable-shared \ - --disable-cdrom \ - --disable-joystick \ - --disable-audio \ - --disable-video \ - --disable-assembly \ - --disable-input-tslib \ - --disable-video-directfb \ - --disable-video-cocoa \ - --disable-video-opengl - -ifeq ($(ADK_PACKAGE_SDL_WITH_TSLIB),y) -CONFIGURE_ARGS+= --enable-input-tslib -endif -CONFIGURE_ARGS+= --disable-esd \ - --disable-oss \ - --enable-alsa \ - --enable-video-fbcon \ - --disable-video-directfb \ - --disable-video-opengl \ - --disable-video-ps2gs \ - --disable-video-ps3 \ - --with-x - -libsdl-install: - $(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib - $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/sdl2-mixer/Makefile b/package/sdl2-mixer/Makefile new file mode 100644 index 000000000..f77239a75 --- /dev/null +++ b/package/sdl2-mixer/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:= sdl2-mixer +PKG_VERSION:= 2.6.3 +PKG_RELEASE:= 1 +PKG_HASH:= 7a6ba86a478648ce617e3a5e9277181bc67f7ce9876605eea6affd4a0d6eea8f +PKG_DESCR:= simple directmedia layer mixer 2 +PKG_SECTION:= libs/misc +PKG_URL:= http://www.libsdl.org/ +PKG_SITES:= http://www.libsdl.org/projects/SDL_mixer/release/ +PKG_LIBNAME:= libsdl2-mixer +PKG_OPTS:= dev + +DISTFILES:= SDL2_mixer-$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/SDL2_mixer-$(PKG_VERSION) + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBSDL2_MIXER,libsdl2-mixer,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +libsdl2-mixer-install: + $(INSTALL_DIR) $(IDIR_LIBSDL2_MIXER)/usr/lib + $(CP) $(WRKINST)/usr/lib/libSDL2*.so* \ + $(IDIR_LIBSDL2_MIXER)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/sdl2-net/Makefile b/package/sdl2-net/Makefile new file mode 100644 index 000000000..94691a884 --- /dev/null +++ b/package/sdl2-net/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:= sdl2-net +PKG_VERSION:= 2.2.0 +PKG_RELEASE:= 1 +PKG_HASH:= 4e4a891988316271974ff4e9585ed1ef729a123d22c08bd473129179dc857feb +PKG_DESCR:= simple directmedia layer net 2 +PKG_SECTION:= libs/misc +PKG_URL:= http://www.libsdl.org/ +PKG_SITES:= http://www.libsdl.org/projects/SDL_net/release/ +PKG_LIBNAME:= libsdl2-net +PKG_OPTS:= dev + +DISTFILES:= SDL2_net-$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/SDL2_net-$(PKG_VERSION) + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBSDL2_NET,libsdl2-net,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +libsdl2-net-install: + $(INSTALL_DIR) $(IDIR_LIBSDL2_NET)/usr/lib + $(CP) $(WRKINST)/usr/lib/libSDL2*.so* \ + $(IDIR_LIBSDL2_NET)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/sdl2/Makefile b/package/sdl2/Makefile new file mode 100644 index 000000000..3e3b3e091 --- /dev/null +++ b/package/sdl2/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:= sdl2 +PKG_VERSION:= 2.28.5 +PKG_RELEASE:= 1 +PKG_HASH:= 9f0556e4a24ef5b267010038ad9e9948b62f236d5bcc4b22179f95ef62d84023 +PKG_DESCR:= simple directmedia layer 2 +PKG_SECTION:= libs/misc +PKG_URL:= http://www.libsdl.org/ +PKG_SITES:= https://github.com/libsdl-org/SDL/archive/refs/tags/ +PKG_BUILDDEP:= mesa libdrm alsa-lib DirectFB +PKG_DEPENDS:= mesa libdrm alsa-lib directfb +PKG_LIBNAME:= libsdl2 +PKG_OPTS:= dev + +DISTFILES:= release-$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/SDL-release-$(PKG_VERSION) + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBSDL2,libsdl2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +CONFIGURE_ARGS+= --enable-video-directfb + +libsdl2-install: + $(INSTALL_DIR) $(IDIR_LIBSDL2)/usr/lib + $(CP) $(WRKINST)/usr/lib/libSDL2*.so* \ + $(IDIR_LIBSDL2)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/section.lst b/package/section.lst index 724fbdf32..a1fead9bb 100644 --- a/package/section.lst +++ b/package/section.lst @@ -19,6 +19,7 @@ app/chat Chat app/crypto Cryptography app/debug Debugging and Analyzing app/editor Editor and Pager +app/games Games app/p2p P2P net/acct IP Accounting net/dns DNS and DHCP diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile index 804eb68f8..9a3a9cde2 100644 --- a/package/serdisplib/Makefile +++ b/package/serdisplib/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= serdisplib -PKG_VERSION:= 1.97.8 +PKG_VERSION:= 2.02 PKG_RELEASE:= 1 -PKG_HASH:= b64738f2fd6a28f6d659945282a4a95eeaaabb0a5867f8a87b8cceb01ce1d029 +PKG_HASH:= 447b74007dc157b0378044245649850b26432b9185b6540ff681fcb0765c4d8b PKG_DESCR:= display drivers (serial, parallel, usb) PKG_SECTION:= sys/serial PKG_DEPENDS:= libusb-compat @@ -22,7 +22,6 @@ $(eval $(call PKG_template,SERDISPLIB,serdisplib,${PKG_VERSION}-${PKG_RELEASE},$ INSTALL_STYLE:= manual -CONFIGURE_ENV+= PACKAGE_VERSION_MAJOR=1 PACKAGE_VERSION_MINOR=97 CONFIGURE_ARGS+= --enable-libusb TARGET_CFLAGS+= ${TARGET_CPPFLAGS} diff --git a/package/serdisplib/patches/patch-Makefile_in b/package/serdisplib/patches/patch-Makefile_in deleted file mode 100644 index a140feb5e..000000000 --- a/package/serdisplib/patches/patch-Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id$ ---- serdisplib-1.97.8.orig/Makefile.in 2008-07-30 23:05:37.000000000 +0200 -+++ serdisplib-1.97.8/Makefile.in 2009-05-30 18:04:39.430445031 +0200 -@@ -20,7 +20,7 @@ CC = @CC@ - MAKE=@MAKE@ - - --subdirs = src tools -+subdirs = src - - - all: diff --git a/package/serdisplib/patches/patch-configure b/package/serdisplib/patches/patch-configure deleted file mode 100644 index b4ea718bd..000000000 --- a/package/serdisplib/patches/patch-configure +++ /dev/null @@ -1,22 +0,0 @@ -$Id$ ---- serdisplib-1.97.8.orig/configure 2008-07-19 00:40:38.000000000 +0200 -+++ serdisplib-1.97.8/configure 2009-05-30 18:04:39.526453915 +0200 -@@ -2661,18 +2661,6 @@ echo "${ECHO_T}no" >&6 - fi - - --# split version information --PACKAGE_VERSION_TEMP=${PACKAGE_VERSION/\./\ } --PACKAGE_VERSION_MAJOR=${PACKAGE_VERSION_TEMP/\ *} --PACKAGE_VERSION_MINTEMP=${PACKAGE_VERSION_TEMP/*\ } --if test "${PACKAGE_VERSION_TEMP/*\.*/\.}" = "\."; then -- PACKAGE_VERSION_MINOR=${PACKAGE_VERSION_MINTEMP/\.*} -- PACKAGE_VERSION_SUBMINOR=${PACKAGE_VERSION_MINTEMP/*\.} --else -- PACKAGE_VERSION_MINOR=$PACKAGE_VERSION_MINTEMP -- PACKAGE_VERSION_SUBMINOR="" --fi -- - - - diff --git a/package/serdisplib/patches/patch-include_serdisplib_serdisp_control_h b/package/serdisplib/patches/patch-include_serdisplib_serdisp_control_h deleted file mode 100644 index d8c819a34..000000000 --- a/package/serdisplib/patches/patch-include_serdisplib_serdisp_control_h +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- serdisplib-1.97.8.orig/include/serdisplib/serdisp_control.h 2008-07-31 00:55:12.000000000 +0200 -+++ serdisplib-1.97.8/include/serdisplib/serdisp_control.h 2009-05-31 16:24:16.000000000 +0200 -@@ -42,7 +42,7 @@ - - #define SERDISP_VERSION_MAJOR 1 /**< \brief major version of serdisplib \hideinitializer */ - #define SERDISP_VERSION_MINOR 97 /**< \brief minor version of serdisplib \hideinitializer */ --#define SERDISP_VERSION_EXTRA 8 /**< \brief extra version postfix (ignored) \hideinitializer */ -+#define SERDISP_VERSION_EXTRA /**< \brief extra version postfix (ignored) \hideinitializer */ - - /** \hideinitializer - * \brief calculates a serdisplib version code diff --git a/package/serdisplib/patches/patch-src_Makefile_in b/package/serdisplib/patches/patch-src_Makefile_in deleted file mode 100644 index ad9c6a9c7..000000000 --- a/package/serdisplib/patches/patch-src_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id$ ---- serdisplib-1.97.8.orig/src/Makefile.in 2008-07-30 23:05:37.000000000 +0200 -+++ serdisplib-1.97.8/src/Makefile.in 2009-05-30 18:04:39.534451861 +0200 -@@ -126,7 +126,7 @@ endif - - .SUFFIXES : .c .o - --all: libraries programs -+all: libraries - - libraries: library.static library.shared - diff --git a/package/serdisplib/patches/patch-src_serdisp_connect_c b/package/serdisplib/patches/patch-src_serdisp_connect_c deleted file mode 100644 index fae45be6f..000000000 --- a/package/serdisplib/patches/patch-src_serdisp_connect_c +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- serdisplib-1.97.8.orig/src/serdisp_connect.c 2008-07-20 09:50:41.000000000 +0200 -+++ serdisplib-1.97.8/src/serdisp_connect.c 2009-05-31 16:27:03.000000000 +0200 -@@ -304,7 +304,7 @@ serdisp_CONN_t* SDCONN_open(const char s - sdcd->sdcdev = (sdcdev == 0 || strlen((char*)sdcdev) > 0) ? (char*)sdcdev : SERDISP_DEFAULTDEVICE; - - /* split into protocol and device name */ -- idx = index(sdcd->sdcdev, ':'); -+ idx = strchr(sdcd->sdcdev, ':'); - if (!idx) { - devname = sdcd->sdcdev; - /* look if a default connection type can be found for given device */ -@@ -1405,7 +1405,7 @@ serdisp_CONN_t* SDCONN_import_PP(int dir - int SDCONN_getsignalindex(const char str[], short conntype, short hardwaretype) { - int i; - int n = strlen(str); -- char* idxpos = index(str, ','); -+ char* idxpos = strchr(str, ','); - - if (idxpos) - n = serdisp_ptrstrlen(idxpos, str); diff --git a/package/serdisplib/patches/patch-src_serdisp_connect_usb_c b/package/serdisplib/patches/patch-src_serdisp_connect_usb_c deleted file mode 100644 index c400ce875..000000000 --- a/package/serdisplib/patches/patch-src_serdisp_connect_usb_c +++ /dev/null @@ -1,39 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- serdisplib-1.97.8.orig/src/serdisp_connect_usb.c 2008-07-30 23:44:23.000000000 +0200 -+++ serdisplib-1.97.8/src/serdisp_connect_usb.c 2009-05-31 16:28:11.000000000 +0200 -@@ -220,7 +220,7 @@ serdisp_CONN_t* SDCONNusb_open(const cha - #endif - - devname = (char*)sdcdev; -- idx = index(devname, ':'); -+ idx = strchr(devname, ':'); - - if (serdisp_ptrdistance(idx, devname) >= 18) { - sd_error(SERDISP_ENXIO, "%s(): invalid protocol (too long)", __func__); -@@ -230,7 +230,7 @@ serdisp_CONN_t* SDCONNusb_open(const cha - sdtools_strncpy(protocol, devname, serdisp_ptrdistance(idx, devname)); - devname = (idx+1); - -- idx = index(devname, ':'); -+ idx = strchr(devname, ':'); - - if (idx) { - if (serdisp_ptrdistance(idx, devname) >= 8) { -@@ -242,7 +242,7 @@ serdisp_CONN_t* SDCONNusb_open(const cha - occurrence = (int)strtol(buffer, 0, 10); - } - -- idx = index(devname, '/'); -+ idx = strchr(devname, '/'); - if (idx && serdisp_ptrdistance(idx, devname) < 7) { - sdtools_strncpy(buffer, devname, serdisp_ptrdistance(idx, devname)); - vendorID = (int)strtol(buffer, &endptr, 16); -@@ -254,7 +254,7 @@ serdisp_CONN_t* SDCONNusb_open(const cha - - - if (vendorID != -1) { -- idx = index(devname, '/'); -+ idx = strchr(devname, '/'); - if (!idx) idx = devname + strlen(devname); - if (serdisp_ptrdistance(idx, devname) < 7) { - sdtools_strncpy(buffer, devname, serdisp_ptrdistance(idx, devname)); diff --git a/package/serdisplib/patches/patch-src_serdisp_control_c b/package/serdisplib/patches/patch-src_serdisp_control_c deleted file mode 100644 index f881ab3fe..000000000 --- a/package/serdisplib/patches/patch-src_serdisp_control_c +++ /dev/null @@ -1,48 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- serdisplib-1.97.8.orig/src/serdisp_control.c 2008-07-30 01:04:44.000000000 +0200 -+++ serdisplib-1.97.8/src/serdisp_control.c 2009-05-30 18:07:14.100111588 +0200 -@@ -450,7 +450,7 @@ serdisp_t* serdisp_init(serdisp_CONN_t* - } - - if (found) { -- char* idxpos = index(patternptr, '='); -+ char* idxpos = strchr(patternptr, '='); - int keylen = patternlen; - - /* '=' found and position not outside patternlen? */ -@@ -568,7 +568,7 @@ serdisp_t* serdisp_init(serdisp_CONN_t* - * \since 1.98 - */ - long serdisp_getversioncode(void) { -- return (long) SERDISP_VERSION_CODE; -+ return (long)SERDISP_VERSION_CODE; - } - - -@@ -1831,7 +1831,7 @@ int serdisp_setupwirings(serdisp_t* dd, - while( (patternptr = sdtools_nextpattern(patternptr, ',', &patternlen, &patternborder)) ) { - char* valueptr = 0; - int valuelen = 0; -- char* idxpos = index(patternptr, ':'); -+ char* idxpos = strchr(patternptr, ':'); - int keylen = patternlen; - - int tabidxkey = 0, tabidxvalue; -@@ -2003,7 +2003,7 @@ int serdisp_setupoptions(serdisp_t* dd, - while( (optionptr = sdtools_nextpattern(optionptr, ';', &optionlen, &optionborder)) ) { - char* valueptr = 0; - int valuelen = 0; -- char* idxpos = index(optionptr, '='); -+ char* idxpos = strchr(optionptr, '='); - int keylen = optionlen; - - int stdoptidx; /* index of an option found in standard options */ -@@ -2072,7 +2072,7 @@ int serdisp_setupoptions(serdisp_t* dd, - int definefound = 0; - - while( !definefound && (defineptr = sdtools_nextpattern(defineptr, ',', &definelen, &defineborder)) ) { -- char* defineidxpos = index(defineptr, '='); -+ char* defineidxpos = strchr(defineptr, '='); - int definekeylen = definelen; - char* definevalueptr = 0; - int definevaluelen = 0; diff --git a/package/serdisplib/patches/patch-src_serdisp_tools_c b/package/serdisplib/patches/patch-src_serdisp_tools_c deleted file mode 100644 index 6b972fafc..000000000 --- a/package/serdisplib/patches/patch-src_serdisp_tools_c +++ /dev/null @@ -1,30 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- serdisplib-1.97.8.orig/src/serdisp_tools.c 2008-07-17 01:44:52.000000000 +0200 -+++ serdisplib-1.97.8/src/serdisp_tools.c 2009-05-31 16:26:39.000000000 +0200 -@@ -688,7 +688,7 @@ int sdtools_isinelemlist(const char* ele - - if (strlen(lefttrimmedelemlist) == 0) return -1; - -- indexpos = index(lefttrimmedelemlist, ','); -+ indexpos = strchr(lefttrimmedelemlist, ','); - - /* this should never occur but to be sure: catch it and return 0 in such a case (invalid elemlist!) */ - if (indexpos == lefttrimmedelemlist) -@@ -762,7 +762,7 @@ char* sdtools_nextpattern(const char* st - char* idxpos; - - if (*len >= 0) { /* *len < 0: return first parameter, else: not first parameter */ -- idxpos = index(strstart, delim); -+ idxpos = strchr(strstart, delim); - if ( !idxpos || (((long)idxpos) >= (((long)strstart) + *border)) ) { - /* no more delim or found delim out of view => no more param */ - *len = -1; *border = 0; -@@ -783,7 +783,7 @@ char* sdtools_nextpattern(const char* st - *border -= n; - *len -= n; - -- idxpos = index(strstart, delim); -+ idxpos = strchr(strstart, delim); - - if ( idxpos && ((long)idxpos < ((long)strstart + (*border))) ) { - *len = serdisp_ptrstrlen(idxpos, strstart); diff --git a/package/shadow/Makefile b/package/shadow/Makefile new file mode 100644 index 000000000..bdcf45944 --- /dev/null +++ b/package/shadow/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:= shadow +PKG_VERSION:= 4.14.3 +PKG_RELEASE:= 1 +PKG_HASH:= 6969279236fe3152768573a38c9f83cb9ca109851a5a990aec1fc672ac2cfcd2 +PKG_DESCR:= utilities to deal with user accounts +PKG_BUILDDEP_GLIBC:= libxcrypt +PKG_SECTION:= sys/utils +PKG_SITES:= https://github.com/shadow-maint/shadow/releases/download/$(PKG_VERSION)/ + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,SHADOW,shadow,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIGURE_ARGS+= --without-libbsd + +shadow-install: + $(INSTALL_DIR) $(IDIR_SHADOW)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/* \ + $(IDIR_SHADOW)/usr/bin + $(INSTALL_DIR) $(IDIR_SHADOW)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/* \ + $(IDIR_SHADOW)/usr/sbin + $(INSTALL_DIR) $(IDIR_SHADOW)/lib + $(CP) $(WRKINST)/lib/*.so* \ + $(IDIR_SHADOW)/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/shairport-sync/Makefile b/package/shairport-sync/Makefile index c85f46ca1..75c6801f8 100644 --- a/package/shairport-sync/Makefile +++ b/package/shairport-sync/Makefile @@ -4,7 +4,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= shairport-sync -PKG_VERSION:= 3.3.6 +PKG_VERSION:= 3.3.8 PKG_RELEASE:= 1 PKG_GIT:= tag PKG_DESCR:= airplay daemon diff --git a/package/simpleinit/files/rc b/package/simpleinit/files/rc index e5d4f67d6..08d67601a 100755 --- a/package/simpleinit/files/rc +++ b/package/simpleinit/files/rc @@ -1,9 +1,8 @@ #!/bin/sh echo Starting OpenADK -hostname openadk mount -t proc proc /proc mount -t sysfs sys /sys -mkdir -m 755 /dev/pts +mkdir /dev/pts mount -t devpts devpts /dev/pts mount -t tmpfs tmpfs /tmp chmod 1777 /tmp diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile index d57ea8888..5442790d2 100644 --- a/package/siproxd/Makefile +++ b/package/siproxd/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= siproxd -PKG_VERSION:= 0.8.1 +PKG_VERSION:= 0.8.3 PKG_RELEASE:= 1 -PKG_HASH:= df2df04faf5bdb4980cbdfd5516a47898fc47ca1ebc2c628aa48305b20a09dad +PKG_HASH:= 9a6d7a6bb6fff162775b1e1fb7018de9c69642cbf8626185dc6ffceeeba07736 PKG_DESCR:= session initiation protocol proxy PKG_SECTION:= net/voip PKG_DEPENDS:= libosip2 diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile index 1903793ed..e55f9bc2b 100644 --- a/package/sipsak/Makefile +++ b/package/sipsak/Makefile @@ -4,15 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= sipsak -PKG_VERSION:= 0.9.6 -PKG_RELEASE:= 2 -PKG_HASH:= 5064c56d482a080b6a4aea71821b78c21b59d44f6d1aa14c27429441917911a9 +PKG_VERSION:= 0.9.8.1 +PKG_RELEASE:= 1 +PKG_HASH:= c6faa022cd8c002165875d4aac83b7a2b59194f0491802924117fc6ac980c778 PKG_DESCR:= sip stress and diagnostics utility PKG_SECTION:= net/voip -PKG_URL:= http://sourceforge.net/projects/sipsak.berlios/ -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sipsak.berlios/} +PKG_SITES:= https://github.com/nils-ohlmeier/sipsak/releases/download/$(PKG_VERSION)/ -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-1.tar.gz +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CHOICES_SIPSAK:= WITH_LIBRESSL WITHOUT_SSL PKGCD_WITH_LIBRESSL:= use libressl for crypto @@ -24,6 +23,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,SIPSAK,sipsak,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes CONFIGURE_ARGS+= --disable-gnutls diff --git a/package/sipsak/patches/patch-configure b/package/sipsak/patches/patch-configure deleted file mode 100644 index 128845ab3..000000000 --- a/package/sipsak/patches/patch-configure +++ /dev/null @@ -1,9009 +0,0 @@ ---- sipsak-0.9.6.orig/configure 2006-01-28 22:11:34.000000000 +0100 -+++ sipsak-0.9.6/configure 2016-09-23 18:46:18.305339828 +0200 -@@ -1,27 +1,56 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59 for sipsak 0.9.6. -+# Generated by GNU Autoconf 2.61 for sipsak 0.9.6. - # - # Report bugs to <nils@sipsak.org>. - # --# Copyright (C) 2003 Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. - ## --------------------- ## - ## M4sh Initialization. ## - ## --------------------- ## - --# Be Bourne compatible -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh - fi --DUALCASE=1; export DUALCASE # for MKS sh - - # Support unset when possible. - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -@@ -31,8 +60,43 @@ else - fi - - -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+as_nl=' -+' -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ - # Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done - PS1='$ ' - PS2='> ' - PS4='+ ' -@@ -46,18 +110,19 @@ do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else -- $as_unset $as_var -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi - done - - # Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false -@@ -65,157 +130,388 @@ fi - - - # Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || - echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - -+# CDPATH. -+$as_unset CDPATH - --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh -+if test "x$CONFIG_SHELL" = x; then -+ if (eval ":") 2>/dev/null; then -+ as_have_required=yes -+else -+ as_have_required=no - fi - -+ if test $as_have_required = yes && (eval ": -+(as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi - -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi - -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=\$LINENO -+ as_lineno_2=\$LINENO -+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && -+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -+") 2> /dev/null; then -+ : -+else -+ as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -+ case $as_dir in - /*) -- if ("$as_dir/$as_base" -c ' -+ for as_base in sh bash ksh sh5; do -+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" -+ done;; -+ esac -+done -+IFS=$as_save_IFS -+ -+ -+ for as_shell in $as_candidate_shells $SHELL; do -+ # Try only shells that exist, to save several forks. -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { ("$as_shell") 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+_ASEOF -+}; then -+ CONFIG_SHELL=$as_shell -+ as_have_required=yes -+ if { "$as_shell" 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+(as_func_return () { -+ (exit $1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = "$1" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test $exitcode = 0) || { (exit 1); exit 1; } -+ -+( - as_lineno_1=$LINENO - as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } -+ -+_ASEOF -+}; then -+ break -+fi -+ -+fi -+ -+ done -+ -+ if test "x$CONFIG_SHELL" != x; then -+ for as_var in BASH_ENV ENV -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+fi -+ -+ -+ if test $as_have_required = no; then -+ echo This script requires a shell more modern than all the -+ echo shells that I found on your system. Please install a -+ echo modern shell, or manually run the script under such a -+ echo shell if you do have one. -+ { (exit 1); exit 1; } -+fi -+ -+ -+fi -+ -+fi -+ -+ -+ -+(eval "as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0") || { -+ echo No shell found that supports shell functions. -+ echo Please tell autoconf@gnu.org about your system, -+ echo including any error possibly output before this -+ echo message -+} -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -+ chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - - --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - - rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir -+fi - echo >conf$$.file - if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -- else -- as_ln_s='ln -s' -- fi - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -@@ -224,7 +520,28 @@ else - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -233,39 +550,27 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH - -+exec 7<&0 </dev/null 6>&1 - - # Name of the host. - # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - --exec 6>&1 -- - # - # Initializations. - # - ac_default_prefix=/usr/local -+ac_clean_files= - ac_config_libobj_dir=. -+LIBOBJS= - cross_compiling=no - subdirs= - MFLAGS= - MAKEFLAGS= - SHELL=${CONFIG_SHELL-/bin/sh} - --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} -- - # Identity of this package. - PACKAGE_NAME='sipsak' - PACKAGE_TARNAME='sipsak' -@@ -277,42 +582,146 @@ ac_unique_file="sipsak.c" - # Factoring default headers for most tests. - ac_includes_default="\ - #include <stdio.h> --#if HAVE_SYS_TYPES_H -+#ifdef HAVE_SYS_TYPES_H - # include <sys/types.h> - #endif --#if HAVE_SYS_STAT_H -+#ifdef HAVE_SYS_STAT_H - # include <sys/stat.h> - #endif --#if STDC_HEADERS -+#ifdef STDC_HEADERS - # include <stdlib.h> - # include <stddef.h> - #else --# if HAVE_STDLIB_H -+# ifdef HAVE_STDLIB_H - # include <stdlib.h> - # endif - #endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H - # include <memory.h> - # endif - # include <string.h> - #endif --#if HAVE_STRINGS_H -+#ifdef HAVE_STRINGS_H - # include <strings.h> - #endif --#if HAVE_INTTYPES_H -+#ifdef HAVE_INTTYPES_H - # include <inttypes.h> --#else --# if HAVE_STDINT_H --# include <stdint.h> --# endif - #endif --#if HAVE_UNISTD_H -+#ifdef HAVE_STDINT_H -+# include <stdint.h> -+#endif -+#ifdef HAVE_UNISTD_H - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE DISTCC build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPP EGREP LIBOBJS DISABLE_GNUTLS LIBGNUTLS_CONFIG LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS SIPSAK_HAVE_ARES LTLIBOBJS' -+ac_subst_vars='SHELL -+PATH_SEPARATOR -+PACKAGE_NAME -+PACKAGE_TARNAME -+PACKAGE_VERSION -+PACKAGE_STRING -+PACKAGE_BUGREPORT -+exec_prefix -+prefix -+program_transform_name -+bindir -+sbindir -+libexecdir -+datarootdir -+datadir -+sysconfdir -+sharedstatedir -+localstatedir -+includedir -+oldincludedir -+docdir -+infodir -+htmldir -+dvidir -+pdfdir -+psdir -+libdir -+localedir -+mandir -+DEFS -+ECHO_C -+ECHO_N -+ECHO_T -+LIBS -+build_alias -+host_alias -+target_alias -+INSTALL_PROGRAM -+INSTALL_SCRIPT -+INSTALL_DATA -+CYGPATH_W -+PACKAGE -+VERSION -+ACLOCAL -+AUTOCONF -+AUTOMAKE -+AUTOHEADER -+MAKEINFO -+install_sh -+STRIP -+INSTALL_STRIP_PROGRAM -+mkdir_p -+AWK -+SET_MAKE -+am__leading_dot -+AMTAR -+am__tar -+am__untar -+MAINTAINER_MODE_TRUE -+MAINTAINER_MODE_FALSE -+MAINT -+CC -+CFLAGS -+LDFLAGS -+CPPFLAGS -+ac_ct_CC -+EXEEXT -+OBJEXT -+DEPDIR -+am__include -+am__quote -+AMDEP_TRUE -+AMDEP_FALSE -+AMDEPBACKSLASH -+CCDEPMODE -+am__fastdepCC_TRUE -+am__fastdepCC_FALSE -+DISTCC -+build -+build_cpu -+build_vendor -+build_os -+host -+host_cpu -+host_vendor -+host_os -+CPP -+GREP -+EGREP -+LIBOBJS -+DISABLE_GNUTLS -+LIBGNUTLS_CONFIG -+LIBGNUTLS_CFLAGS -+LIBGNUTLS_LIBS -+SIPSAK_HAVE_ARES -+LTLIBOBJS' - ac_subst_files='' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CPP' -+ - - # Initialize some variables set by options. - ac_init_help= -@@ -339,34 +748,48 @@ x_libraries=NONE - # and all the variables that are supposed to be based on exec_prefix - # by default will actually change. - # Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case $ac_option in -+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *) ac_optarg=yes ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; -@@ -388,33 +811,45 @@ do - --config-cache | -C) - cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -+ eval enable_$ac_feature=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -- esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -+ eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -441,6 +876,12 @@ do - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; -@@ -465,13 +906,16 @@ do - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -536,6 +980,16 @@ do - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; -@@ -588,24 +1042,20 @@ do - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -- esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -+ eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -+ eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. -@@ -636,8 +1086,7 @@ Try \`$0 --help' for more information." - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -+ eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) -@@ -657,27 +1106,19 @@ if test -n "$ac_prev"; then - { (exit 1); exit 1; }; } - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -- esac --done -- --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+# Be sure to have absolute directory names. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- eval ac_val=$`echo $ac_var` -+ eval ac_val=\$$ac_var - case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { (exit 1); exit 1; }; } - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -704,22 +1145,43 @@ test -n "$host_alias" && ac_tool_prefix= - test "$silent" = yes && exec 6>/dev/null - - -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ { echo "$as_me: error: Working directory cannot be determined" >&2 -+ { (exit 1); exit 1; }; } -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ { echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { (exit 1); exit 1; }; } -+ -+ - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes -- # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$0" || - $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || - echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. -@@ -728,50 +1190,31 @@ else - ac_srcdir_defaulted=no - fi - if test ! -r "$srcdir/$ac_unique_file"; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -- else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -- fi - fi --(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done - - # - # Report the --help message. -@@ -800,9 +1243,6 @@ Configuration: - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - --_ACEOF -- -- cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] -@@ -820,15 +1260,22 @@ Fine tuning of the installation director - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/sipsak] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -871,8 +1318,9 @@ Some influential environment variables: - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a - nonstandard directory <lib dir> -- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have -- headers in a nonstandard directory <include dir> -+ LIBS libraries to pass to the linker, e.g. -l<library> -+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if -+ you have headers in a nonstandard directory <include dir> - CPP C preprocessor - - Use these variables to override the choices made by `configure' or to help -@@ -880,120 +1328,86 @@ it to find libraries and programs with n - - Report bugs to <nils@sipsak.org>. - _ACEOF -+ac_status=$? - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -+ test -d "$ac_dir" || continue - ac_builddir=. - --if test "$ac_dir" != .; then -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } - done - fi - --test -n "$ac_init_help" && exit 0 -+test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF - sipsak configure 0.9.6 --generated by GNU Autoconf 2.59 -+generated by GNU Autoconf 2.61 - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -- exit 0 -+ exit - fi --exec 5>config.log --cat >&5 <<_ACEOF -+cat >config.log <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - - It was created by sipsak $as_me 0.9.6, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - - _ACEOF -+exec 5>>config.log - { - cat <<_ASUNAME - ## --------- ## -@@ -1012,7 +1426,7 @@ uname -v = `(uname -v) 2>/dev/null || ec - /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` - /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` - /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` - /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` - /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` - /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -@@ -1026,6 +1440,7 @@ do - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" - done -+IFS=$as_save_IFS - - } >&5 - -@@ -1047,7 +1462,6 @@ _ACEOF - ac_configure_args= - ac_configure_args0= - ac_configure_args1= --ac_sep= - ac_must_keep_next=false - for ac_pass in 1 2 - do -@@ -1058,7 +1472,7 @@ do - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -+ *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in -@@ -1080,9 +1494,7 @@ do - -* ) ac_must_keep_next=true ;; - esac - fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -+ ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -@@ -1093,8 +1505,8 @@ $as_unset ac_configure_args1 || test "${ - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there - # would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { -@@ -1107,20 +1519,34 @@ trap 'exit_status=$? - _ASBOX - echo - # The following way of writing the cache mishandles newlines in values, --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done - (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( - *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} -+ esac | -+ sort -+) - echo - - cat <<\_ASBOX -@@ -1131,22 +1557,28 @@ _ASBOX - echo - for ac_var in $ac_subst_vars - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## -+## ------------------- ## -+## File substitutions. ## -+## ------------------- ## - _ASBOX - echo - for ac_var in $ac_subst_files - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi -@@ -1158,26 +1590,24 @@ _ASBOX - ## ----------- ## - _ASBOX - echo -- sed "/^$/d" confdefs.h | sort -+ cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 -- rm -f core *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -- ' 0 -+' 0 - for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -+rm -f -r conftest* confdefs.h - - # Predefined preprocessor variables. - -@@ -1208,14 +1638,17 @@ _ACEOF - - # Let the site file select an alternate cache file if it wants to. - # Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi -+if test -n "$CONFIG_SITE"; then -+ set x "$CONFIG_SITE" -+elif test "x$prefix" != xNONE; then -+ set x "$prefix/share/config.site" "$prefix/etc/config.site" -+else -+ set x "$ac_default_prefix/share/config.site" \ -+ "$ac_default_prefix/etc/config.site" - fi --for ac_site_file in $CONFIG_SITE; do -+shift -+for ac_site_file -+do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 - echo "$as_me: loading site script $ac_site_file" >&6;} -@@ -1231,8 +1664,8 @@ if test -r "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 - echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; - esac - fi - else -@@ -1244,12 +1677,11 @@ fi - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -@@ -1274,8 +1706,7 @@ echo "$as_me: current value: $ac_new_v - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in -@@ -1292,12 +1723,6 @@ echo "$as_me: error: run \`make distclea - { (exit 1); exit 1; }; } - fi - --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- - - - -@@ -1322,33 +1747,44 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - am__api_version="1.9" - ac_aux_dir= --for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do -- if test -f $ac_dir/install-sh; then -+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} -+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or -@@ -1363,8 +1799,8 @@ ac_configure="$SHELL $ac_aux_dir/configu - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } - if test -z "$INSTALL"; then - if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -1386,7 +1822,7 @@ case $as_dir/ in - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -@@ -1405,21 +1841,22 @@ case $as_dir/ in - ;; - esac - done -+IFS=$as_save_IFS - - - fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else -- # As a last resort, use the slow shell script. We don't cache a -- # path for INSTALL within a source directory, because that will -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is -- # removed, or if the path is relative. -+ # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi - fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -+{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -+echo "${ECHO_T}$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -1429,8 +1866,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --echo "$as_me:$LINENO: checking whether build environment is sane" >&5 --echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } - # Just in case - sleep 1 - echo timestamp > conftest.file -@@ -1472,20 +1909,20 @@ echo "$as_me: error: newly created file - Check your system clock" >&2;} - { (exit 1); exit 1; }; } - fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+{ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - test "$program_prefix" != NONE && -- program_transform_name="s,^,$program_prefix,;$program_transform_name" -+ program_transform_name="s&^&$program_prefix&;$program_transform_name" - # Use a double $ so make ignores it. - test "$program_suffix" != NONE && -- program_transform_name="s,\$,$program_suffix,;$program_transform_name" -+ program_transform_name="s&\$&$program_suffix&;$program_transform_name" - # Double any \ or $. echo might interpret backslashes. - # By default was `s,x,x', remove it if useless. - cat <<\_ACEOF >conftest.sed - s/[\\$]/&&/g;s/;s,x,x,$// - _ACEOF - program_transform_name=`echo $program_transform_name | sed -f conftest.sed` --rm conftest.sed -+rm -f conftest.sed - - # expand $ac_aux_dir to an absolute path - am_aux_dir=`cd $ac_aux_dir && pwd` -@@ -1537,8 +1974,8 @@ for ac_prog in gawk mawk nawk awk - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1551,54 +1988,57 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - AWK=$ac_cv_prog_AWK - if test -n "$AWK"; then -- echo "$as_me:$LINENO: result: $AWK" >&5 --echo "${ECHO_T}$AWK" >&6 -+ { echo "$as_me:$LINENO: result: $AWK" >&5 -+echo "${ECHO_T}$AWK" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$AWK" && break - done - --echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 --set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` --if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.make <<\_ACEOF -+SHELL = /bin/sh - all: -- @echo 'ac_maketemp="$(MAKE)"' -+ @echo '@@@%%%=$(MAKE)=@@@%%%' - _ACEOF - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. --eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` --if test -n "$ac_maketemp"; then -- eval ac_cv_prog_make_${ac_make}_set=yes --else -- eval ac_cv_prog_make_${ac_make}_set=no --fi -+case `${MAKE-make} -f conftest.make 2>/dev/null` in -+ *@@@%%%=?*=@@@%%%*) -+ eval ac_cv_prog_make_${ac_make}_set=yes;; -+ *) -+ eval ac_cv_prog_make_${ac_make}_set=no;; -+esac - rm -f conftest.make - fi --if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - SET_MAKE= - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - -@@ -1669,8 +2109,8 @@ if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1683,32 +2123,34 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- echo "$as_me:$LINENO: result: $STRIP" >&5 --echo "${ECHO_T}$STRIP" >&6 -+ { echo "$as_me:$LINENO: result: $STRIP" >&5 -+echo "${ECHO_T}$STRIP" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1721,27 +2163,41 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" - fi - fi - ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP - if test -n "$ac_ct_STRIP"; then -- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 --echo "${ECHO_T}$ac_ct_STRIP" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+echo "${ECHO_T}$ac_ct_STRIP" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- STRIP=$ac_ct_STRIP -+ if test "x$ac_ct_STRIP" = x; then -+ STRIP=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ STRIP=$ac_ct_STRIP -+ fi - else - STRIP="$ac_cv_prog_STRIP" - fi -@@ -1761,17 +2217,17 @@ am__tar='${AMTAR} chof - "$$tardir"'; am - - - --echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 --echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 -- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. -+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } -+ # Check whether --enable-maintainer-mode was given. - if test "${enable_maintainer_mode+set}" = set; then -- enableval="$enable_maintainer_mode" -- USE_MAINTAINER_MODE=$enableval -+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval - else - USE_MAINTAINER_MODE=no --fi; -- echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 --echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 -+fi -+ -+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } - - - if test $USE_MAINTAINER_MODE = yes; then -@@ -1786,7 +2242,7 @@ fi - - - -- ac_config_headers="$ac_config_headers config.h" -+ac_config_headers="$ac_config_headers config.h" - - - # Checks for programs. -@@ -1798,8 +2254,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1812,32 +2268,34 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1850,36 +2308,51 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - else - CC="$ac_cv_prog_CC" - fi - - if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1892,74 +2365,34 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi - -+ fi - fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1973,7 +2406,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -@@ -1984,6 +2417,7 @@ do - fi - done - done -+IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. -@@ -2001,22 +2435,23 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2029,36 +2464,38 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$CC" && break - done - fi - if test -z "$CC"; then - ac_ct_CC=$CC -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2071,29 +2508,45 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$ac_ct_CC" && break - done - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - fi - - fi -@@ -2106,21 +2559,35 @@ See \`config.log' for more details." >&2 - { (exit 1); exit 1; }; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 -+echo "$as_me:$LINENO: checking for C compiler version" >&5 - ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 -- (eval $ac_compiler --version </dev/null >&5) 2>&5 -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 -- (eval $ac_compiler -v </dev/null >&5) 2>&5 -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 -- (eval $ac_compiler -V </dev/null >&5) 2>&5 -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -@@ -2145,47 +2612,77 @@ ac_clean_files="$ac_clean_files a.out a. - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } - ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -+# -+# List of possible output files, starting from the most likely. -+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -+# only as a last resort. b.out is created by i960 compilers. -+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -+# -+# The IRIX 6 linker writes into existing files which may not be -+# executable, retaining their permissions. Remove them first so a -+# subsequent execution test works. -+ac_rmfiles= -+for ac_file in $ac_files -+do -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { (ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link_default") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -- --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# in a Makefile. We should not override ac_cv_exeext if it was cached, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. - break;; - * ) - break;; - esac - done -+test "$ac_cv_exeext" = no && ac_cv_exeext= -+ - else -+ ac_file='' -+fi -+ -+{ echo "$as_me:$LINENO: result: $ac_file" >&5 -+echo "${ECHO_T}$ac_file" >&6; } -+if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -@@ -2197,19 +2694,21 @@ See \`config.log' for more details." >&2 - fi - - ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 - --# Check the compiler produces executables we can run. If not, either -+# Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } - # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 - # If not cross compiling, check that we can run a simple program. - if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -2228,22 +2727,27 @@ See \`config.log' for more details." >&2 - fi - fi - fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+{ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - - rm -f a.out a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either -+# Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -+echo "${ECHO_T}$cross_compiling" >&6; } - --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -@@ -2254,9 +2758,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext - break;; - * ) break;; - esac -@@ -2270,14 +2773,14 @@ See \`config.log' for more details." >&2 - fi - - rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -+echo "${ECHO_T}$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } - if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2297,14 +2800,20 @@ main () - } - _ACEOF - rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -@@ -2322,12 +2831,12 @@ fi - - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -+echo "${ECHO_T}$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } - if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2350,50 +2859,49 @@ main () - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } - GCC=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } - if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -2409,38 +2917,118 @@ main () - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_g=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ CFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_prog_cc_g=no -+ - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -2456,12 +3044,12 @@ else - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_prog_cc_stdc=no -+ ac_cv_prog_cc_c89=no - ac_save_CC=$CC - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -2495,12 +3083,17 @@ static char *f (char * (*g) (char **, in - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated -- as 'x'. The following induces an error, until -std1 is added to get -+ as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something -- that's true only with -std1. */ -+ that's true only with -std. */ - int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; -@@ -2515,205 +3108,57 @@ return f (e, argv, 0) != argv[0] || f - return 0; - } - _ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_c89=$ac_arg - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext -+ -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --rm -f conftest.$ac_ext conftest.$ac_objext -+rm -f conftest.$ac_ext - CC=$ac_save_CC - - fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } ;; -+ xno) -+ { echo "$as_me:$LINENO: result: unsupported" >&5 -+echo "${ECHO_T}unsupported" >&6; } ;; - *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; -+ CC="$CC $ac_cv_prog_cc_c89" -+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; - esac - --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --#include <stdlib.h> --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -2721,7 +3166,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA - ac_compiler_gnu=$ac_cv_c_compiler_gnu - DEPDIR="${am__leading_dot}deps" - -- ac_config_commands="$ac_config_commands depfiles" -+ac_config_commands="$ac_config_commands depfiles" - - - am_make=${MAKE-make} -@@ -2731,8 +3176,8 @@ am__doit: - .PHONY: am__doit - END - # If we don't find an include directive, just comment out the code. --echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 --echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } - am__include="#" - am__quote= - _am_result=none -@@ -2759,15 +3204,15 @@ if test "$am__include" = "#"; then - fi - - --echo "$as_me:$LINENO: result: $_am_result" >&5 --echo "${ECHO_T}$_am_result" >&6 -+{ echo "$as_me:$LINENO: result: $_am_result" >&5 -+echo "${ECHO_T}$_am_result" >&6; } - rm -f confinc confmf - --# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. -+# Check whether --enable-dependency-tracking was given. - if test "${enable_dependency_tracking+set}" = set; then -- enableval="$enable_dependency_tracking" -+ enableval=$enable_dependency_tracking; -+fi - --fi; - if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -@@ -2787,8 +3232,8 @@ fi - - depcc="$CC" am_compiler_list= - --echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } - if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2877,8 +3322,8 @@ else - fi - - fi --echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 --echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 -+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } - CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -@@ -2902,10 +3347,10 @@ fi - - ssp_cc=yes - if test "X$CC" != "X"; then -- echo "$as_me:$LINENO: checking whether ${CC} accepts -fstack-protector" >&5 --echo $ECHO_N "checking whether ${CC} accepts -fstack-protector... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether ${CC} accepts -fstack-protector" >&5 -+echo $ECHO_N "checking whether ${CC} accepts -fstack-protector... $ECHO_C" >&6; } - ssp_old_cflags="$CFLAGS" -- CFLAGS="$CFLAGS -fstack-protector" -+ CFLAGS="$CFLAGS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -2922,35 +3367,31 @@ main () - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - : - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ssp_cc=no -+ ssp_cc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - echo $ssp_cc - if test "X$ssp_cc" = "Xno"; then - CFLAGS="$ssp_old_cflags" -@@ -2964,12 +3405,11 @@ _ACEOF - fi - - -- echo "$as_me:$LINENO: checking for distcc" >&5 --echo $ECHO_N "checking for distcc... $ECHO_C" >&6 -- # Check whether --enable-distcc or --disable-distcc was given. -+ { echo "$as_me:$LINENO: checking for distcc" >&5 -+echo $ECHO_N "checking for distcc... $ECHO_C" >&6; } -+ # Check whether --enable-distcc was given. - if test "${enable_distcc+set}" = set; then -- enableval="$enable_distcc" -- -+ enableval=$enable_distcc; - distcc_dirs="/ /usr /usr/local /usr/local/gnu /usr/gnu" - for dir in $distcc_dirs; do - if test -x "$dir/bin/distcc"; then -@@ -2983,16 +3423,17 @@ if test "${enable_distcc+set}" = set; th - echo "$as_me: error: not found" >&2;} - { (exit 1); exit 1; }; } - else -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - - fi - - else -- echo "$as_me:$LINENO: result: not requested" >&5 --echo "${ECHO_T}not requested" >&6 -+ { echo "$as_me:$LINENO: result: not requested" >&5 -+echo "${ECHO_T}not requested" >&6; } -+ -+fi - --fi; - - - # Find a good install program. We prefer a C program (faster), -@@ -3008,8 +3449,8 @@ fi; - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } - if test -z "$INSTALL"; then - if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3031,7 +3472,7 @@ case $as_dir/ in - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -@@ -3050,21 +3491,22 @@ case $as_dir/ in - ;; - esac - done -+IFS=$as_save_IFS - - - fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else -- # As a last resort, use the slow shell script. We don't cache a -- # path for INSTALL within a source directory, because that will -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is -- # removed, or if the path is relative. -+ # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi - fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -+{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -+echo "${ECHO_T}$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -3077,57 +3519,86 @@ test -z "$INSTALL_DATA" && INSTALL_DATA= - - # Checks for libraries. - # Make sure we can run config.sub. --$ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 --echo "$as_me: error: cannot run $ac_config_sub" >&2;} -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - --echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking build system type" >&5 -+echo $ECHO_N "checking build system type... $ECHO_C" >&6; } - if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_build_alias=$build_alias --test -z "$ac_cv_build_alias" && -- ac_cv_build_alias=`$ac_config_guess` --test -z "$ac_cv_build_alias" && -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 - echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } --ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - - fi --echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -+echo "${ECHO_T}$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -+echo "$as_me: error: invalid value of canonical build" >&2;} -+ { (exit 1); exit 1; }; };; -+esac - build=$ac_cv_build --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking host system type" >&5 -+echo $ECHO_N "checking host system type... $ECHO_C" >&6; } - if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_host_alias=$host_alias --test -z "$ac_cv_host_alias" && -- ac_cv_host_alias=$ac_cv_build_alias --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -+fi - - fi --echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -+echo "${ECHO_T}$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -+echo "$as_me: error: invalid value of canonical host" >&2;} -+ { (exit 1); exit 1; }; };; -+esac - host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - -@@ -3147,8 +3618,8 @@ ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -3182,24 +3653,22 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -3208,9 +3677,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 - # Broken: fails on valid input. - continue - fi -+ - rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3220,24 +3690,22 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <ac_nonexistent.h> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -@@ -3248,6 +3716,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - ac_preproc_ok=: - break - fi -+ - rm -f conftest.err conftest.$ac_ext - - done -@@ -3265,8 +3734,8 @@ fi - else - ac_cv_prog_CPP=$CPP - fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 -+{ echo "$as_me:$LINENO: result: $CPP" >&5 -+echo "${ECHO_T}$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes - do -@@ -3289,24 +3758,22 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -3315,9 +3782,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 - # Broken: fails on valid input. - continue - fi -+ - rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3327,24 +3795,22 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <ac_nonexistent.h> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -@@ -3355,6 +3821,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - ac_preproc_ok=: - break - fi -+ - rm -f conftest.err conftest.$ac_ext - - done -@@ -3377,23 +3844,170 @@ ac_link='$CC -o conftest$ac_exeext $CFLA - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -+if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -+ # Extract the first word of "grep ggrep" to use in msg output -+if test -z "$GREP"; then -+set dummy grep ggrep; ac_prog_name=$2 -+if test "${ac_cv_path_GREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_path_GREP_found=false -+# Loop through the user's path and test for each of PROGNAME-LIST -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -+ # Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count - fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ -+ $ac_path_GREP_found && break 3 -+ done -+done -+ -+done -+IFS=$as_save_IFS -+ -+ - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep - -+GREP="$ac_cv_path_GREP" -+if test -z "$GREP"; then -+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } -+fi - --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -+else -+ ac_cv_path_GREP=$GREP -+fi -+ -+ -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -+echo "${ECHO_T}$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ echo "$as_me:$LINENO: checking for egrep" >&5 -+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -+if test "${ac_cv_path_EGREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ # Extract the first word of "egrep" to use in msg output -+if test -z "$EGREP"; then -+set dummy egrep; ac_prog_name=$2 -+if test "${ac_cv_path_EGREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_path_EGREP_found=false -+# Loop through the user's path and test for each of PROGNAME-LIST -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -+ # Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ -+ $ac_path_EGREP_found && break 3 -+ done -+done -+ -+done -+IFS=$as_save_IFS -+ -+ -+fi -+ -+EGREP="$ac_cv_path_EGREP" -+if test -z "$EGREP"; then -+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+else -+ ac_cv_path_EGREP=$EGREP -+fi -+ -+ -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" -+ -+ -+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } - if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -3417,35 +4031,31 @@ main () - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_header_stdc=no -+ ac_cv_header_stdc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -@@ -3501,6 +4111,7 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <ctype.h> -+#include <stdlib.h> - #if ((' ' & 0x0FF) == 0x020) - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -3520,18 +4131,27 @@ main () - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -3544,12 +4164,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 - ( exit $ac_status ) - ac_cv_header_stdc=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - fi - fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -+echo "${ECHO_T}$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -3572,9 +4194,9 @@ for ac_header in sys/types.h sys/stat.h - inttypes.h stdint.h unistd.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -3588,38 +4210,35 @@ $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_Header=no" -+ eval "$as_ac_Header=no" - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -@@ -3651,18 +4270,19 @@ done - for ac_header in ctype.h errno.h arpa/inet.h netdb.h netinet/in.h netinet/in_systm.h limits.h sys/poll.h regex.h signal.h stdlib.h stdio.h string.h sys/param.h sys/socket.h sys/time.h unistd.h sys/utsname.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -3673,41 +4293,37 @@ $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -3716,24 +4332,22 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -3741,9 +4355,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -3767,25 +4382,24 @@ echo "$as_me: WARNING: $ac_header: s - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -+ ( cat <<\_ASBOX - ## ------------------------------ ## - ## Report this to nils@sipsak.org ## - ## ------------------------------ ## - _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -3805,18 +4419,19 @@ done - for ac_header in getopt.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -3827,41 +4442,37 @@ $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -3870,24 +4481,22 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -3895,9 +4504,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -3921,25 +4531,24 @@ echo "$as_me: WARNING: $ac_header: s - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -+ ( cat <<\_ASBOX - ## ------------------------------ ## - ## Report this to nils@sipsak.org ## - ## ------------------------------ ## - _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -3951,8 +4560,8 @@ fi - - done - --echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 --echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 -+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } - if test "${ac_cv_header_sys_wait_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -3965,7 +4574,7 @@ cat >>conftest.$ac_ext <<_ACEOF - #include <sys/types.h> - #include <sys/wait.h> - #ifndef WEXITSTATUS --# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) - #endif - #ifndef WIFEXITED - # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -@@ -3982,38 +4591,34 @@ main () - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_header_sys_wait_h=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_header_sys_wait_h=no -+ ac_cv_header_sys_wait_h=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } - if test $ac_cv_header_sys_wait_h = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -4022,8 +4627,8 @@ _ACEOF - - fi - --echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 --echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } - if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -4047,38 +4652,34 @@ return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_header_time=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_header_time=no -+ ac_cv_header_time=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 --echo "${ECHO_T}$ac_cv_header_time" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -+echo "${ECHO_T}$ac_cv_header_time" >&6; } - if test $ac_cv_header_time = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -4094,9 +4695,9 @@ fi - for ac_header in netinet/ip.h netinet/udp.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -4115,38 +4716,35 @@ cat >>conftest.$ac_ext <<_ACEOF - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_Header=no" -+ eval "$as_ac_Header=no" - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -@@ -4162,9 +4760,9 @@ done - for ac_header in netinet/ip_icmp.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -4186,38 +4784,35 @@ cat >>conftest.$ac_ext <<_ACEOF - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_Header=no" -+ eval "$as_ac_Header=no" - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -@@ -4232,18 +4827,19 @@ done - for ac_header in cygwin/icmp.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4254,41 +4850,37 @@ $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4297,24 +4889,22 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -4322,9 +4912,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -4348,25 +4939,24 @@ echo "$as_me: WARNING: $ac_header: s - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -+ ( cat <<\_ASBOX - ## ------------------------------ ## - ## Report this to nils@sipsak.org ## - ## ------------------------------ ## - _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -4380,8 +4970,8 @@ done - - - # Checks for typedefs, structures, and compiler characteristics. --echo "$as_me:$LINENO: checking for size_t" >&5 --echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for size_t" >&5 -+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } - if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -4392,62 +4982,59 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+typedef size_t ac__type_new_; - int - main () - { --if ((size_t *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (size_t)) -+if (sizeof (ac__type_new_)) - return 0; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_size_t=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_size_t=no -+ ac_cv_type_size_t=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 --echo "${ECHO_T}$ac_cv_type_size_t" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -+echo "${ECHO_T}$ac_cv_type_size_t" >&6; } - if test $ac_cv_type_size_t = yes; then - : - else - - cat >>confdefs.h <<_ACEOF --#define size_t unsigned -+#define size_t unsigned int - _ACEOF - - fi - --echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 --echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } - if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -4471,38 +5058,34 @@ return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_header_time=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_header_time=no -+ ac_cv_header_time=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 --echo "${ECHO_T}$ac_cv_header_time" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -+echo "${ECHO_T}$ac_cv_header_time" >&6; } - if test $ac_cv_header_time = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -4517,18 +5100,19 @@ fi - for ac_header in stdlib.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4539,41 +5123,37 @@ $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4582,24 +5162,22 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -4607,9 +5185,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -4633,25 +5212,24 @@ echo "$as_me: WARNING: $ac_header: s - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -+ ( cat <<\_ASBOX - ## ------------------------------ ## - ## Report this to nils@sipsak.org ## - ## ------------------------------ ## - _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -4663,8 +5241,8 @@ fi - - done - --echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5 --echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5 -+echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6; } - if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -4677,7 +5255,7 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#if STDC_HEADERS || HAVE_STDLIB_H -+#if defined STDC_HEADERS || defined HAVE_STDLIB_H - # include <stdlib.h> - #else - char *malloc (); -@@ -4686,19 +5264,28 @@ char *malloc (); - int - main () - { --exit (malloc (0) ? 0 : 1); -+return ! malloc (0); - ; - return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -4711,11 +5298,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 - ( exit $ac_status ) - ac_cv_func_malloc_0_nonnull=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - fi --echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5 --echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5 -+echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6; } - if test $ac_cv_func_malloc_0_nonnull = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -4727,12 +5316,10 @@ else - #define HAVE_MALLOC 0 - _ACEOF - -- case $LIBOBJS in -- "malloc.$ac_objext" | \ -- *" malloc.$ac_objext" | \ -- "malloc.$ac_objext "* | \ -+ case " $LIBOBJS " in - *" malloc.$ac_objext "* ) ;; -- *) LIBOBJS="$LIBOBJS malloc.$ac_objext" ;; -+ *) LIBOBJS="$LIBOBJS malloc.$ac_objext" -+ ;; - esac - - -@@ -4749,18 +5336,19 @@ fi - for ac_header in sys/select.h sys/socket.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4771,41 +5359,37 @@ $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4814,24 +5398,22 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -4839,9 +5421,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -4865,25 +5448,24 @@ echo "$as_me: WARNING: $ac_header: s - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -+ ( cat <<\_ASBOX - ## ------------------------------ ## - ## Report this to nils@sipsak.org ## - ## ------------------------------ ## - _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -4895,13 +5477,13 @@ fi - - done - --echo "$as_me:$LINENO: checking types of arguments for select" >&5 --echo $ECHO_N "checking types of arguments for select... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking types of arguments for select" >&5 -+echo $ECHO_N "checking types of arguments for select... $ECHO_C" >&6; } - if test "${ac_cv_func_select_args+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - for ac_arg234 in 'fd_set *' 'int *' 'void *'; do -- for ac_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do -+ for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do - for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -4910,10 +5492,10 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --#if HAVE_SYS_SELECT_H -+#ifdef HAVE_SYS_SELECT_H - # include <sys/select.h> - #endif --#if HAVE_SYS_SOCKET_H -+#ifdef HAVE_SYS_SOCKET_H - # include <sys/socket.h> - #endif - -@@ -4928,34 +5510,31 @@ extern int select ($ac_arg1, - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3 - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - done - done -@@ -4963,8 +5542,8 @@ done - : ${ac_cv_func_select_args='int,int *,struct timeval *'} - - fi --echo "$as_me:$LINENO: result: $ac_cv_func_select_args" >&5 --echo "${ECHO_T}$ac_cv_func_select_args" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_func_select_args" >&5 -+echo "${ECHO_T}$ac_cv_func_select_args" >&6; } - ac_save_IFS=$IFS; IFS=',' - set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'` - IFS=$ac_save_IFS -@@ -5005,9 +5584,9 @@ rm -f conftest* - for ac_func in getchar gethostbyname gethostname getopt getpid gettimeofday memset ntohs regcomp select socket strchr strcmp strstr strtol uname - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -5033,68 +5612,60 @@ cat >>conftest.$ac_ext <<_ACEOF - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char $ac_func (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+#if defined __stub_$ac_func || defined __stub___$ac_func - choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != $ac_func; -+return $ac_func (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_var=no" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -5116,9 +5687,9 @@ done - for ac_func in calloc getdomainname getopt_long inet_ntop strncasecmp strcasestr - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -5144,68 +5715,60 @@ cat >>conftest.$ac_ext <<_ACEOF - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char $ac_func (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+#if defined __stub_$ac_func || defined __stub___$ac_func - choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != $ac_func; -+return $ac_func (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_var=no" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -5216,30 +5779,30 @@ done - - - --echo "$as_me:$LINENO: checking disabled gnutls" >&5 --echo $ECHO_N "checking disabled gnutls... $ECHO_C" >&6 --# Check whether --enable-gnutls or --disable-gnutls was given. -+{ echo "$as_me:$LINENO: checking disabled gnutls" >&5 -+echo $ECHO_N "checking disabled gnutls... $ECHO_C" >&6; } -+# Check whether --enable-gnutls was given. - if test "${enable_gnutls+set}" = set; then -- enableval="$enable_gnutls" -- -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ enableval=$enable_gnutls; -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - DISABLE_GNUTLS=yes - - - else -- echo "$as_me:$LINENO: result: not requested" >&5 --echo "${ECHO_T}not requested" >&6 -+ { echo "$as_me:$LINENO: result: not requested" >&5 -+echo "${ECHO_T}not requested" >&6; } - --fi; -+fi - --# Check whether --with-libgnutls-prefix or --without-libgnutls-prefix was given. -+ -+# Check whether --with-libgnutls-prefix was given. - if test "${with_libgnutls_prefix+set}" = set; then -- withval="$with_libgnutls_prefix" -- libgnutls_config_prefix="$withval" -+ withval=$with_libgnutls_prefix; libgnutls_config_prefix="$withval" - else - libgnutls_config_prefix="" --fi; -+fi -+ - - if test x$libgnutls_config_prefix != x ; then - if test x${LIBGNUTLS_CONFIG+set} != xset ; then -@@ -5250,8 +5813,8 @@ fi; - if test "$DISABLE_GNUTLS" != "yes"; then - # Extract the first word of "libgnutls-config", so it can be a program name with args. - set dummy libgnutls-config; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -5266,32 +5829,33 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - test -z "$ac_cv_path_LIBGNUTLS_CONFIG" && ac_cv_path_LIBGNUTLS_CONFIG="no" - ;; - esac - fi - LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG -- - if test -n "$LIBGNUTLS_CONFIG"; then -- echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5 --echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6 -+ { echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5 -+echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - min_libgnutls_version=1.0.0 -- echo "$as_me:$LINENO: checking for libgnutls - version >= $min_libgnutls_version" >&5 --echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for libgnutls - version >= $min_libgnutls_version" >&5 -+echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6; } - no_libgnutls="" - if test "$DISABLE_GNUTLS" = "yes"; then - LIBGNUTLS_CONFIG=no -@@ -5375,13 +5939,22 @@ main () - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -5394,15 +5967,17 @@ sed 's/^/| /' conftest.$ac_ext >&5 - ( exit $ac_status ) - no_libgnutls=yes - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - - if test "x$no_libgnutls" = x ; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - - cat >>confdefs.h <<\_ACEOF - #define HAVE_GNUTLS 1 -@@ -5415,8 +5990,8 @@ _ACEOF - if test -f conf.libgnutlstest ; then - : - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - if test "$LIBGNUTLS_CONFIG" != "no" ; then - if test -f conf.libgnutlstest ; then -@@ -5446,27 +6021,23 @@ main () - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong" - echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your" -@@ -5481,12 +6052,13 @@ else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed" - echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you" - echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -@@ -5506,18 +6078,19 @@ if test "X$LIBGNUTLS_LIBS" == "X";then - for ac_header in openssl/md5.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5528,41 +6101,37 @@ $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5571,24 +6140,22 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -5596,9 +6163,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -5622,33 +6190,32 @@ echo "$as_me: WARNING: $ac_header: s - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -+ ( cat <<\_ASBOX - ## ------------------------------ ## - ## Report this to nils@sipsak.org ## - ## ------------------------------ ## - _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -- echo "$as_me:$LINENO: checking for MD5_Init in -lcrypto" >&5 --echo $ECHO_N "checking for MD5_Init in -lcrypto... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for MD5_Init in -lcrypto" >&5 -+echo $ECHO_N "checking for MD5_Init in -lcrypto... $ECHO_C" >&6; } - if test "${ac_cv_lib_crypto_MD5_Init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -5661,56 +6228,53 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char MD5_Init (); - int - main () - { --MD5_Init (); -+return MD5_Init (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_crypto_MD5_Init=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_crypto_MD5_Init=no -+ ac_cv_lib_crypto_MD5_Init=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_MD5_Init" >&5 --echo "${ECHO_T}$ac_cv_lib_crypto_MD5_Init" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_MD5_Init" >&5 -+echo "${ECHO_T}$ac_cv_lib_crypto_MD5_Init" >&6; } - if test $ac_cv_lib_crypto_MD5_Init = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -5732,18 +6296,19 @@ fi - for ac_header in openssl/sha.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5754,41 +6319,37 @@ $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5797,24 +6358,22 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -5822,9 +6381,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -5848,33 +6408,32 @@ echo "$as_me: WARNING: $ac_header: s - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -+ ( cat <<\_ASBOX - ## ------------------------------ ## - ## Report this to nils@sipsak.org ## - ## ------------------------------ ## - _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -- echo "$as_me:$LINENO: checking for SHA1_Init in -lcrypto" >&5 --echo $ECHO_N "checking for SHA1_Init in -lcrypto... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for SHA1_Init in -lcrypto" >&5 -+echo $ECHO_N "checking for SHA1_Init in -lcrypto... $ECHO_C" >&6; } - if test "${ac_cv_lib_crypto_SHA1_Init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -5887,56 +6446,53 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char SHA1_Init (); - int - main () - { --SHA1_Init (); -+return SHA1_Init (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_crypto_SHA1_Init=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_crypto_SHA1_Init=no -+ ac_cv_lib_crypto_SHA1_Init=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SHA1_Init" >&5 --echo "${ECHO_T}$ac_cv_lib_crypto_SHA1_Init" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SHA1_Init" >&5 -+echo "${ECHO_T}$ac_cv_lib_crypto_SHA1_Init" >&6; } - if test $ac_cv_lib_crypto_SHA1_Init = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -5954,8 +6510,8 @@ done - - - -- echo "$as_me:$LINENO: checking for ares_version.h" >&5 --echo $ECHO_N "checking for ares_version.h... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for ares_version.h" >&5 -+echo $ECHO_N "checking for ares_version.h... $ECHO_C" >&6; } - - ares_incdir=NONE - ares_libdir=NONE -@@ -5973,14 +6529,14 @@ echo $ECHO_N "checking for ares_version. - done - - if test "$ares_incdir" = "NONE"; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - else -- echo "$as_me:$LINENO: result: found at $ares_incdir" >&5 --echo "${ECHO_T}found at $ares_incdir" >&6 -+ { echo "$as_me:$LINENO: result: found at $ares_incdir" >&5 -+echo "${ECHO_T}found at $ares_incdir" >&6; } - -- echo "$as_me:$LINENO: checking for c-ares lib" >&5 --echo $ECHO_N "checking for c-ares lib... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for c-ares lib" >&5 -+echo $ECHO_N "checking for c-ares lib... $ECHO_C" >&6; } - - for dir in $ares_libdirs; do - for extension in $ares_libexten; do -@@ -5997,15 +6553,15 @@ echo $ECHO_N "checking for c-ares lib... - done - - if test "$ares_libdir" = "NONE"; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - else -- echo "$as_me:$LINENO: result: found at $ares_libdir" >&5 --echo "${ECHO_T}found at $ares_libdir" >&6 -+ { echo "$as_me:$LINENO: result: found at $ares_libdir" >&5 -+echo "${ECHO_T}found at $ares_libdir" >&6; } - fi - -- echo "$as_me:$LINENO: checking for ares_version in -lcares" >&5 --echo $ECHO_N "checking for ares_version in -lcares... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for ares_version in -lcares" >&5 -+echo $ECHO_N "checking for ares_version in -lcares... $ECHO_C" >&6; } - if test "${ac_cv_lib_cares_ares_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -6018,56 +6574,53 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char ares_version (); - int - main () - { --ares_version (); -+return ares_version (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_cares_ares_version=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_cares_ares_version=no -+ ac_cv_lib_cares_ares_version=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_cares_ares_version" >&5 --echo "${ECHO_T}$ac_cv_lib_cares_ares_version" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_cares_ares_version" >&5 -+echo "${ECHO_T}$ac_cv_lib_cares_ares_version" >&6; } - if test $ac_cv_lib_cares_ares_version = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -6085,8 +6638,8 @@ fi - - if test "X$SIPSAK_HAVE_ARES" == "X"; then - -- echo "$as_me:$LINENO: checking for ruli.h" >&5 --echo $ECHO_N "checking for ruli.h... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for ruli.h" >&5 -+echo $ECHO_N "checking for ruli.h... $ECHO_C" >&6; } - - ruli_incdir=NONE - ruli_libdir=NONE -@@ -6103,14 +6656,14 @@ echo $ECHO_N "checking for ruli.h... $EC - done - - if test "$ruli_incdir" = "NONE"; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - else -- echo "$as_me:$LINENO: result: found at $ruli_incdir" >&5 --echo "${ECHO_T}found at $ruli_incdir" >&6 -+ { echo "$as_me:$LINENO: result: found at $ruli_incdir" >&5 -+echo "${ECHO_T}found at $ruli_incdir" >&6; } - -- echo "$as_me:$LINENO: checking for libruli" >&5 --echo $ECHO_N "checking for libruli... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for libruli" >&5 -+echo $ECHO_N "checking for libruli... $ECHO_C" >&6; } - - for dir in $ruli_libdirs; do - for extension in $ruli_libexten; do -@@ -6126,15 +6679,15 @@ echo $ECHO_N "checking for libruli... $E - done - - if test "$ruli_libdir" = "NONE"; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - else -- echo "$as_me:$LINENO: result: found at $ruli_libdir" >&5 --echo "${ECHO_T}found at $ruli_libdir" >&6 -+ { echo "$as_me:$LINENO: result: found at $ruli_libdir" >&5 -+echo "${ECHO_T}found at $ruli_libdir" >&6; } - fi - -- echo "$as_me:$LINENO: checking for ruli_sync_query in -lruli" >&5 --echo $ECHO_N "checking for ruli_sync_query in -lruli... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for ruli_sync_query in -lruli" >&5 -+echo $ECHO_N "checking for ruli_sync_query in -lruli... $ECHO_C" >&6; } - if test "${ac_cv_lib_ruli_ruli_sync_query+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -6147,56 +6700,53 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char ruli_sync_query (); - int - main () - { --ruli_sync_query (); -+return ruli_sync_query (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_ruli_ruli_sync_query=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_ruli_ruli_sync_query=no -+ ac_cv_lib_ruli_ruli_sync_query=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_ruli_ruli_sync_query" >&5 --echo "${ECHO_T}$ac_cv_lib_ruli_ruli_sync_query" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ruli_ruli_sync_query" >&5 -+echo "${ECHO_T}$ac_cv_lib_ruli_ruli_sync_query" >&6; } - if test $ac_cv_lib_ruli_ruli_sync_query = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -6215,18 +6765,19 @@ else - for ac_header in arpa/nameser.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -6237,41 +6788,37 @@ $ac_includes_default - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -6280,24 +6827,22 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -6305,9 +6850,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -6331,25 +6877,24 @@ echo "$as_me: WARNING: $ac_header: s - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -+ ( cat <<\_ASBOX - ## ------------------------------ ## - ## Report this to nils@sipsak.org ## - ## ------------------------------ ## - _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -6366,11 +6911,11 @@ fi - - # Check for T1 timer value - def_timeout=500 -- # Check whether --enable-timeout or --disable-timeout was given. -+ # Check whether --enable-timeout was given. - if test "${enable_timeout+set}" = set; then -- enableval="$enable_timeout" -- def_timeout=$enableval --fi; -+ enableval=$enable_timeout; def_timeout=$enableval -+fi -+ - if test "X$def_timeout" = "Xno"; then - # no timeout makes no sense - def_timeout=500 -@@ -6382,7 +6927,7 @@ _ACEOF - - - -- ac_config_files="$ac_config_files Makefile" -+ac_config_files="$ac_config_files Makefile" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -6402,39 +6947,58 @@ _ACEOF - - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. -+# So, we kill variables containing newlines. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done -+ - (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -+ ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} | -+ esac | -+ sort -+) | - sed ' -+ /^ac_cv_env_/b end - t clear -- : clear -+ :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -- if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ test "x$cache_file" != "x/dev/null" && -+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -+echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else -- echo "not updating unwritable cache $cache_file" -+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -6443,32 +7007,18 @@ test "x$prefix" = xNONE && prefix=$ac_de - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). --if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' --fi -- - DEFS=-DHAVE_CONFIG_H - - ac_libobjs= - ac_ltlibobjs= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. -- ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - -@@ -6520,17 +7070,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF - ## M4sh Initialization. ## - ## --------------------- ## - --# Be Bourne compatible -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh - fi --DUALCASE=1; export DUALCASE # for MKS sh - - # Support unset when possible. - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -@@ -6540,8 +7118,43 @@ else - fi - - -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+as_nl=' -+' -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ - # Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done - PS1='$ ' - PS2='> ' - PS4='+ ' -@@ -6555,18 +7168,19 @@ do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else -- $as_unset $as_var -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi - done - - # Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false -@@ -6574,159 +7188,120 @@ fi - - - # Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || - echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -- --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -+# CDPATH. -+$as_unset CDPATH - - -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done - -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -+ chmod +x "$as_me.lineno" || -+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - - --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - - rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir -+fi - echo >conf$$.file - if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -- else -- as_ln_s='ln -s' -- fi - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -@@ -6735,7 +7310,28 @@ else - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -6744,31 +7340,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- - exec 6>&1 - --# Open the log real soon, to keep \$[0] and so on meaningful, and to -+# Save the log message, to keep $[0] and so on meaningful, and to - # report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- -+# values after options handling. -+ac_log=" - This file was extended by sipsak $as_me 0.9.6, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -6776,30 +7355,20 @@ generated by GNU Autoconf 2.59. Invocat - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ - _ACEOF - -+cat >>$CONFIG_STATUS <<_ACEOF - # Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" -+config_commands="$ac_config_commands" - --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -+_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -- - ac_cs_usage="\ - \`$as_me' instantiates files from templates according to the - current configuration. -@@ -6807,7 +7376,7 @@ current configuration. - Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit -- -V, --version print version number, then exit -+ -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions -@@ -6826,19 +7395,21 @@ Configuration commands: - $config_commands - - Report bugs to <bug-autoconf@gnu.org>." --_ACEOF - -+_ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - ac_cs_version="\\ - sipsak config.status 0.9.6 --configured by $0, generated by GNU Autoconf 2.59, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.61, -+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2006 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir --INSTALL="$INSTALL" -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+INSTALL='$INSTALL' - _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -@@ -6849,39 +7420,24 @@ while test $# != 0 - do - case $1 in - --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; -- -*) -+ *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ echo "$ac_cs_version"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -@@ -6891,18 +7447,24 @@ Try \`$0 --help' for more information." - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; -+ --he | --h) -+ # Conflict between --help and --header -+ { echo "$as_me: error: ambiguous option: $1 -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; };; -+ --help | --hel | -h ) -+ echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -+ -*) { echo "$as_me: error: unrecognized option: $1 -+Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; - -- *) ac_config_targets="$ac_config_targets $1" ;; -+ *) ac_config_targets="$ac_config_targets $1" -+ ac_need_defaults=false ;; - - esac - shift -@@ -6918,37 +7480,49 @@ fi - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -+ CONFIG_SHELL=$SHELL -+ export CONFIG_SHELL -+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - fi - - _ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ echo "$ac_log" -+} >&5 - -+_ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - # --# INIT-COMMANDS section. -+# INIT-COMMANDS - # -- - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - - _ACEOF - -- -- - cat >>$CONFIG_STATUS <<\_ACEOF -+ -+# Handling of arguments. - for ac_config_target in $ac_config_targets - do -- case "$ac_config_target" in -- # Handling of arguments. -- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; -- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; -+ case $ac_config_target in -+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; -+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac - done - -+ - # If the user did not use the arguments to specify the items to instantiate, - # then the envvar interface is used. Set only those that are not. - # We use the long form for the default assignment because of an extremely -@@ -6960,592 +7534,539 @@ if $ac_need_defaults; then - fi - - # Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, -+# simply because there is no reason against having it here, and in addition, - # creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -+ tmp= -+ trap 'exit_status=$? -+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -+' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 - } -- - # Create a (secure) tmp directory for tmp files. - - { -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" - } || - { -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") - } || - { - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } - } - --_ACEOF -- --cat >>$CONFIG_STATUS <<_ACEOF -- - # --# CONFIG_FILES section. -+# Set up the sed scripts for CONFIG_FILES section. - # - - # No need to generate the scripts if there are no CONFIG_FILES. - # This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t --s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t --s,@INSTALL_DATA@,$INSTALL_DATA,;t t --s,@CYGPATH_W@,$CYGPATH_W,;t t --s,@PACKAGE@,$PACKAGE,;t t --s,@VERSION@,$VERSION,;t t --s,@ACLOCAL@,$ACLOCAL,;t t --s,@AUTOCONF@,$AUTOCONF,;t t --s,@AUTOMAKE@,$AUTOMAKE,;t t --s,@AUTOHEADER@,$AUTOHEADER,;t t --s,@MAKEINFO@,$MAKEINFO,;t t --s,@install_sh@,$install_sh,;t t --s,@STRIP@,$STRIP,;t t --s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t --s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t --s,@mkdir_p@,$mkdir_p,;t t --s,@AWK@,$AWK,;t t --s,@SET_MAKE@,$SET_MAKE,;t t --s,@am__leading_dot@,$am__leading_dot,;t t --s,@AMTAR@,$AMTAR,;t t --s,@am__tar@,$am__tar,;t t --s,@am__untar@,$am__untar,;t t --s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t --s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t --s,@MAINT@,$MAINT,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@DEPDIR@,$DEPDIR,;t t --s,@am__include@,$am__include,;t t --s,@am__quote@,$am__quote,;t t --s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t --s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t --s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t --s,@CCDEPMODE@,$CCDEPMODE,;t t --s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t --s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t --s,@DISTCC@,$DISTCC,;t t --s,@build@,$build,;t t --s,@build_cpu@,$build_cpu,;t t --s,@build_vendor@,$build_vendor,;t t --s,@build_os@,$build_os,;t t --s,@host@,$host,;t t --s,@host_cpu@,$host_cpu,;t t --s,@host_vendor@,$host_vendor,;t t --s,@host_os@,$host_os,;t t --s,@CPP@,$CPP,;t t --s,@EGREP@,$EGREP,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@DISABLE_GNUTLS@,$DISABLE_GNUTLS,;t t --s,@LIBGNUTLS_CONFIG@,$LIBGNUTLS_CONFIG,;t t --s,@LIBGNUTLS_CFLAGS@,$LIBGNUTLS_CFLAGS,;t t --s,@LIBGNUTLS_LIBS@,$LIBGNUTLS_LIBS,;t t --s,@SIPSAK_HAVE_ARES@,$SIPSAK_HAVE_ARES,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF -+if test -n "$CONFIG_FILES"; then - - _ACEOF - -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -- fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -+ -+ -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+SHELL!$SHELL$ac_delim -+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -+PACKAGE_NAME!$PACKAGE_NAME$ac_delim -+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -+PACKAGE_STRING!$PACKAGE_STRING$ac_delim -+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -+exec_prefix!$exec_prefix$ac_delim -+prefix!$prefix$ac_delim -+program_transform_name!$program_transform_name$ac_delim -+bindir!$bindir$ac_delim -+sbindir!$sbindir$ac_delim -+libexecdir!$libexecdir$ac_delim -+datarootdir!$datarootdir$ac_delim -+datadir!$datadir$ac_delim -+sysconfdir!$sysconfdir$ac_delim -+sharedstatedir!$sharedstatedir$ac_delim -+localstatedir!$localstatedir$ac_delim -+includedir!$includedir$ac_delim -+oldincludedir!$oldincludedir$ac_delim -+docdir!$docdir$ac_delim -+infodir!$infodir$ac_delim -+htmldir!$htmldir$ac_delim -+dvidir!$dvidir$ac_delim -+pdfdir!$pdfdir$ac_delim -+psdir!$psdir$ac_delim -+libdir!$libdir$ac_delim -+localedir!$localedir$ac_delim -+mandir!$mandir$ac_delim -+DEFS!$DEFS$ac_delim -+ECHO_C!$ECHO_C$ac_delim -+ECHO_N!$ECHO_N$ac_delim -+ECHO_T!$ECHO_T$ac_delim -+LIBS!$LIBS$ac_delim -+build_alias!$build_alias$ac_delim -+host_alias!$host_alias$ac_delim -+target_alias!$target_alias$ac_delim -+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -+INSTALL_DATA!$INSTALL_DATA$ac_delim -+CYGPATH_W!$CYGPATH_W$ac_delim -+PACKAGE!$PACKAGE$ac_delim -+VERSION!$VERSION$ac_delim -+ACLOCAL!$ACLOCAL$ac_delim -+AUTOCONF!$AUTOCONF$ac_delim -+AUTOMAKE!$AUTOMAKE$ac_delim -+AUTOHEADER!$AUTOHEADER$ac_delim -+MAKEINFO!$MAKEINFO$ac_delim -+install_sh!$install_sh$ac_delim -+STRIP!$STRIP$ac_delim -+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -+mkdir_p!$mkdir_p$ac_delim -+AWK!$AWK$ac_delim -+SET_MAKE!$SET_MAKE$ac_delim -+am__leading_dot!$am__leading_dot$ac_delim -+AMTAR!$AMTAR$ac_delim -+am__tar!$am__tar$ac_delim -+am__untar!$am__untar$ac_delim -+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim -+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim -+MAINT!$MAINT$ac_delim -+CC!$CC$ac_delim -+CFLAGS!$CFLAGS$ac_delim -+LDFLAGS!$LDFLAGS$ac_delim -+CPPFLAGS!$CPPFLAGS$ac_delim -+ac_ct_CC!$ac_ct_CC$ac_delim -+EXEEXT!$EXEEXT$ac_delim -+OBJEXT!$OBJEXT$ac_delim -+DEPDIR!$DEPDIR$ac_delim -+am__include!$am__include$ac_delim -+am__quote!$am__quote$ac_delim -+AMDEP_TRUE!$AMDEP_TRUE$ac_delim -+AMDEP_FALSE!$AMDEP_FALSE$ac_delim -+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -+CCDEPMODE!$CCDEPMODE$ac_delim -+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -+DISTCC!$DISTCC$ac_delim -+build!$build$ac_delim -+build_cpu!$build_cpu$ac_delim -+build_vendor!$build_vendor$ac_delim -+build_os!$build_os$ac_delim -+host!$host$ac_delim -+host_cpu!$host_cpu$ac_delim -+host_vendor!$host_vendor$ac_delim -+host_os!$host_os$ac_delim -+CPP!$CPP$ac_delim -+GREP!$GREP$ac_delim -+EGREP!$EGREP$ac_delim -+LIBOBJS!$LIBOBJS$ac_delim -+DISABLE_GNUTLS!$DISABLE_GNUTLS$ac_delim -+LIBGNUTLS_CONFIG!$LIBGNUTLS_CONFIG$ac_delim -+LIBGNUTLS_CFLAGS!$LIBGNUTLS_CFLAGS$ac_delim -+LIBGNUTLS_LIBS!$LIBGNUTLS_LIBS$ac_delim -+SIPSAK_HAVE_ARES!$SIPSAK_HAVE_ARES$ac_delim -+LTLIBOBJS!$LTLIBOBJS$ac_delim -+_ACEOF -+ -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then -+ break -+ elif $ac_last_try; then -+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi --fi # test -n "$CONFIG_FILES" -+done -+ -+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -+if test -n "$ac_eof"; then -+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -+ ac_eof=`expr $ac_eof + 1` -+fi - -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b - _ACEOF -+sed ' -+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -+s/^/s,@/; s/!/@,|#_!!_#|/ -+:n -+t n -+s/'"$ac_delim"'$/,g/; t -+s/$/\\/; p -+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -+' >>$CONFIG_STATUS <conf$$subs.sed -+rm -f conf$$subs.sed -+cat >>$CONFIG_STATUS <<_ACEOF -+CEOF$ac_eof -+_ACEOF -+ -+ -+# VPATH may cause trouble with some makes, so we remove $(srcdir), -+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=/{ -+s/:*\$(srcdir):*/:/ -+s/:*\${srcdir}:*/:/ -+s/:*@srcdir@:*/:/ -+s/^\([^=]*=[ ]*\):*/\1/ -+s/:*$// -+s/^[^=]*=[ ]*$// -+}' -+fi -+ - cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+fi # test -n "$CONFIG_FILES" -+ -+ -+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; - esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -+echo "$as_me: error: Invalid tag $ac_tag." >&2;} -+ { (exit 1); exit 1; }; };; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -+echo "$as_me: error: cannot find input file: $ac_f" >&2;} -+ { (exit 1); exit 1; }; };; -+ esac -+ ac_file_inputs="$ac_file_inputs $ac_f" -+ done -+ -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input="Generated from "`IFS=: -+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ fi -+ -+ case $ac_tag in -+ *:-:* | *:-) cat >"$tmp/stdin";; -+ esac -+ ;; -+ esac -+ -+ ac_dir=`$as_dirname -- "$ac_file" || - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || - echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ { as_dir="$ac_dir" -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || - $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || - echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break - done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } -- - ac_builddir=. - --if test "$ac_dir" != .; then -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac - -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; -+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac -+_ACEOF - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -- else -- configure_input="$ac_file. " -- fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -+cat >>$CONFIG_STATUS <<\_ACEOF -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= - -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -+case `sed -n '/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p -+' $ac_file_inputs` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac -+_ACEOF -+ -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub - $extrasub - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - :t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --s,@INSTALL@,$ac_INSTALL,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -- --done --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -- --# --# CONFIG_HEADER section. --# -+s&@configure_input@&$configure_input&;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+s&@INSTALL@&$ac_INSTALL&;t t -+$ac_datarootdir_hack -+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed 's/|#_!!_#|//g' >$tmp/out - --# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where --# NAME is the cpp macro being defined and VALUE is the value it is being given. --# --# ac_d sets the value in "#define NAME VALUE" lines. --ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' --ac_dB='[ ].*$,\1#\2' --ac_dC=' ' --ac_dD=',;t' --# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". --ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' --ac_uB='$,\1#\2define\3' --ac_uC=' ' --ac_uD=',;t' -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&5 -+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&2;} - --for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -+ rm -f "$tmp/stdin" - case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+ -) cat "$tmp/out"; rm -f "$tmp/out";; -+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac -- -- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- # Do quote $f, to prevent DOS paths from being IFS'd. -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -- # Remove the trailing spaces. -- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -- -+ ;; -+ :H) -+ # -+ # CONFIG_HEADER -+ # - _ACEOF - --# Transform confdefs.h into two sed scripts, `conftest.defines' and --# `conftest.undefs', that substitutes the proper values into --# config.h.in to produce config.h. The first handles `#define' --# templates, and the second `#undef' templates. --# And first: Protect against being on the right side of a sed subst in --# config.status. Protect against being in an unquoted here document --# in config.status. --rm -f conftest.defines conftest.undefs --# Using a here document instead of a string reduces the quoting nightmare. --# Putting comments in sed scripts is not portable. --# --# `end' is used to avoid that the second main sed command (meant for --# 0-ary CPP macros) applies to n-ary macro definitions. --# See the Autoconf documentation for `clear'. --cat >confdef2sed.sed <<\_ACEOF --s/[\\&,]/\\&/g --s,[\\$`],\\&,g --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp --t end --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp --: end --_ACEOF --# If some macros were called several times there might be several times --# the same #defines, which is useless. Nevertheless, we may not want to --# sort them, since we want the *last* AC-DEFINE to be honored. --uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines --sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs --rm -f confdef2sed.sed -+# Transform confdefs.h into a sed script `conftest.defines', that -+# substitutes the proper values into config.h.in to produce config.h. -+rm -f conftest.defines conftest.tail -+# First, append a space to every undef/define line, to ease matching. -+echo 's/$/ /' >conftest.defines -+# Then, protect against being on the right side of a sed subst, or in -+# an unquoted here document, in config.status. If some macros were -+# called several times there might be several #defines for the same -+# symbol, which is useless. But do not sort them, since the last -+# AC_DEFINE must be honored. -+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -+# NAME is the cpp macro being defined, VALUE is the value it is being given. -+# PARAMS is the parameter list in the macro definition--in most cases, it's -+# just an empty string. -+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -+ac_dB='\\)[ (].*,\\1define\\2' -+ac_dC=' ' -+ac_dD=' ,' - --# This sed command replaces #undef with comments. This is necessary, for -+uniq confdefs.h | -+ sed -n ' -+ t rset -+ :rset -+ s/^[ ]*#[ ]*define[ ][ ]*// -+ t ok -+ d -+ :ok -+ s/[\\&,]/\\&/g -+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p -+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p -+ ' >>conftest.defines -+ -+# Remove the space that was appended to ease matching. -+# Then replace #undef with comments. This is necessary, for - # example, in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. --cat >>conftest.undefs <<\_ACEOF --s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, --_ACEOF -+# (The regexp can be short, since the line contains either #define or #undef.) -+echo 's/ $// -+s,^[ #]*u.*,/* & */,' >>conftest.defines - --# Break up conftest.defines because some shells have a limit on the size --# of here documents, and old seds have small limits too (100 cmds). --echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS --echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS --echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS --echo ' :' >>$CONFIG_STATUS --rm -f conftest.tail --while grep . conftest.defines >/dev/null -+# Break up conftest.defines: -+ac_max_sed_lines=50 -+ -+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -+# et cetera. -+ac_in='$ac_file_inputs' -+ac_out='"$tmp/out1"' -+ac_nxt='"$tmp/out2"' -+ -+while : - do -- # Write a limited-size here document to $tmp/defines.sed. -- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS -- # Speed up: don't consider the non `#define' lines. -- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS -- # Work around the forget-to-reset-the-flag bug. -- echo 't clr' >>$CONFIG_STATUS -- echo ': clr' >>$CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS -+ # Write a here document: -+ cat >>$CONFIG_STATUS <<_ACEOF -+ # First, check the format of the line: -+ cat >"\$tmp/defines.sed" <<\\CEOF -+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -+b -+:def -+_ACEOF -+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF -- sed -f $tmp/defines.sed $tmp/in >$tmp/out -- rm -f $tmp/in -- mv $tmp/out $tmp/in --' >>$CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail -+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS -+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in -+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail -+ grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines - done --rm -f conftest.defines --echo ' fi # grep' >>$CONFIG_STATUS --echo >>$CONFIG_STATUS -- --# Break up conftest.undefs because some shells have a limit on the size --# of here documents, and old seds have small limits too (100 cmds). --echo ' # Handle all the #undef templates' >>$CONFIG_STATUS --rm -f conftest.tail --while grep . conftest.undefs >/dev/null --do -- # Write a limited-size here document to $tmp/undefs.sed. -- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS -- # Speed up: don't consider the non `#undef' -- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS -- # Work around the forget-to-reset-the-flag bug. -- echo 't clr' >>$CONFIG_STATUS -- echo ': clr' >>$CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS -- echo 'CEOF -- sed -f $tmp/undefs.sed $tmp/in >$tmp/out -- rm -f $tmp/in -- mv $tmp/out $tmp/in --' >>$CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail -- rm -f conftest.undefs -- mv conftest.tail conftest.undefs --done --rm -f conftest.undefs -+rm -f conftest.defines conftest.tail - -+echo "ac_result=$ac_in" >>$CONFIG_STATUS - cat >>$CONFIG_STATUS <<\_ACEOF -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- echo "/* Generated by configure. */" >$tmp/config.h -- else -- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h -- fi -- cat $tmp/in >>$tmp/config.h -- rm -f $tmp/in - if test x"$ac_file" != x-; then -- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then -+ echo "/* $configure_input */" >"$tmp/config.h" -+ cat "$ac_result" >>"$tmp/config.h" -+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 - echo "$as_me: $ac_file is unchanged" >&6;} - else -- ac_dir=`(dirname "$ac_file") 2>/dev/null || --$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -- - rm -f $ac_file -- mv $tmp/config.h $ac_file -+ mv "$tmp/config.h" $ac_file - fi - else -- cat $tmp/config.h -- rm -f $tmp/config.h -+ echo "/* $configure_input */" -+ cat "$ac_result" - fi -+ rm -f "$tmp/out12" - # Compute $ac_file's index in $config_headers. - _am_stamp_count=1 - for _am_header in $config_headers :; do -@@ -7556,135 +8077,39 @@ for _am_header in $config_headers :; do - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || -+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || - $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ -- X$ac_file : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X$ac_file : 'X\(/\)' \| . 2>/dev/null || - echo X$ac_file | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'`/stamp-h$_am_stamp_count --done --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -- --# --# CONFIG_COMMANDS section. --# --for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue -- ac_dest=`echo "$ac_file" | sed 's,:.*,,'` -- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_dir=`(dirname "$ac_dest") 2>/dev/null || --$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_dest" : 'X\(//\)[^/]' \| \ -- X"$ac_dest" : 'X\(//\)$' \| \ -- X"$ac_dest" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_dest" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -- -- ac_builddir=. -- --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -- --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'`/stamp-h$_am_stamp_count -+ ;; - --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac -+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -+echo "$as_me: executing $ac_file commands" >&6;} -+ ;; -+ esac - - -- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 --echo "$as_me: executing $ac_dest commands" >&6;} -- case $ac_dest in -- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do -+ case $ac_file$ac_mode in -+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. -@@ -7694,18 +8119,29 @@ echo "$as_me: executing $ac_dest command - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -- dirpart=`(dirname "$mf") 2>/dev/null || -+ dirpart=`$as_dirname -- "$mf" || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ -- X"$mf" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$mf" : 'X\(/\)' \| . 2>/dev/null || - echo X"$mf" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - else - continue - fi -@@ -7727,53 +8163,79 @@ echo X"$mf" | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue -- fdir=`(dirname "$file") 2>/dev/null || -+ fdir=`$as_dirname -- "$file" || - $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ -- X"$file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$file" : 'X\(/\)' \| . 2>/dev/null || - echo X"$file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p $dirpart/$fdir -- else -- as_dir=$dirpart/$fdir -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ { as_dir=$dirpart/$fdir -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || - $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || - echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break - done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 --echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } -- - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done - ;; -+ - esac --done --_ACEOF -+done # for ac_tag - --cat >>$CONFIG_STATUS <<\_ACEOF - - { (exit 0); exit 0; } - _ACEOF diff --git a/package/sipsak/patches/patch-configure_ac b/package/sipsak/patches/patch-configure_ac new file mode 100644 index 000000000..665ce59b2 --- /dev/null +++ b/package/sipsak/patches/patch-configure_ac @@ -0,0 +1,10 @@ +--- sipsak-0.9.8.1.orig/configure.ac 2021-01-08 06:31:40.000000000 +0100 ++++ sipsak-0.9.8.1/configure.ac 2024-02-29 01:40:07.115755921 +0100 +@@ -14,7 +14,6 @@ AC_PROG_CC + if test "x$GCC" = "xyes"; then + CFLAGS="$CFLAGS -Wall" + fi +-SIPSAK_GCC_STACK_PROTECT_CC + CHECK_PROG_DISTCC + + AC_PROG_INSTALL diff --git a/package/sipsak/patches/patch-header_f_c b/package/sipsak/patches/patch-header_f_c deleted file mode 100644 index ed142ade5..000000000 --- a/package/sipsak/patches/patch-header_f_c +++ /dev/null @@ -1,11 +0,0 @@ ---- sipsak-0.9.6.orig/header_f.c 2006-01-28 22:11:50.000000000 +0100 -+++ sipsak-0.9.6/header_f.c 2016-09-23 18:49:25.092385094 +0200 -@@ -604,7 +604,7 @@ void print_message_line(char *message) - } - - /* return pointer to the beginning of the message body */ --inline char* get_body(char *mes) { -+char* get_body(char *mes) { - char *cr; - - if ((cr = strstr(mes, "\r\n\r\n")) != NULL) { diff --git a/package/sipsak/patches/patch-header_f_h b/package/sipsak/patches/patch-header_f_h deleted file mode 100644 index 922599d28..000000000 --- a/package/sipsak/patches/patch-header_f_h +++ /dev/null @@ -1,9 +0,0 @@ ---- sipsak-0.9.6.orig/header_f.h 2006-01-28 22:11:50.000000000 +0100 -+++ sipsak-0.9.6/header_f.h 2016-09-23 18:49:14.964003070 +0200 -@@ -61,5 +61,5 @@ void new_transaction(char *message); - - void print_message_line(char *message); - --inline char* get_body(char *mes); -+char* get_body(char *mes); - #endif diff --git a/package/smartmontools/Makefile b/package/smartmontools/Makefile index 29ac4fe6b..0b480a09f 100644 --- a/package/smartmontools/Makefile +++ b/package/smartmontools/Makefile @@ -8,8 +8,8 @@ PKG_NAME:= smartmontools PKG_VERSION:= 7.1 PKG_RELEASE:= 1 PKG_HASH:= 3f734d2c99deb1e4af62b25d944c6252de70ca64d766c4c7294545a2e659b846 -PKG_DESCR:= add short description -PKG_SECTION:= sys/hw +PKG_DESCR:= Tools to provide advanced warning of disk degradation +PKG_SECTION:= sys/hw PKG_URL:= www.smartmontools.org PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=smartmontools/) diff --git a/package/sngrep/Makefile b/package/sngrep/Makefile index f87eb7292..c4689be62 100644 --- a/package/sngrep/Makefile +++ b/package/sngrep/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= sngrep -PKG_VERSION:= 1.4.3 +PKG_VERSION:= 1.4.10 PKG_RELEASE:= 1 -PKG_HASH:= 7385ac202de6d6a1feffb2fd514600563133d9dfa7fb47be052de839abcc1d52 +PKG_HASH:= cedbe521c9730deda004bff71e88c8c56ae66d3d147ddc6f5f965df2ca67a8df PKG_DESCR:= displaying sip calls message flows from terminal PKG_SECTION:= net/debug PKG_BUILDDEP:= libpcap ncurses diff --git a/package/snort/Makefile b/package/snort/Makefile index 73cde0a4d..1c044e190 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= snort -PKG_VERSION:= 2.9.14.1 +PKG_VERSION:= 2.9.20 PKG_RELEASE:= 1 -PKG_HASH:= 2472989da3aace000d1ea5931ece68f8e5cc0c511e272d65182113a2481e822d +PKG_HASH:= 29400e13f53b1831e0b8b10ec1224a1cbaa6dc1533a5322a20dd80bb84b4981c PKG_DESCR:= flexible network intrusion detection system PKG_SECTION:= net/security PKG_DEPENDS:= libnet libpcap libpcre libtirpc daq diff --git a/package/socat/Makefile b/package/socat/Makefile index 9ffac2fd9..5cfdef06a 100644 --- a/package/socat/Makefile +++ b/package/socat/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= socat -PKG_VERSION:= 1.7.3.2 +PKG_VERSION:= 1.7.4.3 PKG_RELEASE:= 1 -PKG_HASH:= ce3efc17e3e544876ebce7cd6c85b3c279fda057b2857fcaaf67b9ab8bdaf034 +PKG_HASH:= d697245144731423ddbbceacabbd29447089ea223e9a439b28f9ff90d0dd216e PKG_DESCR:= multipurpose relay PKG_SECTION:= net/misc PKG_NEEDS:= threads diff --git a/package/sofia-sip/Makefile b/package/sofia-sip/Makefile new file mode 100644 index 000000000..7e94193dc --- /dev/null +++ b/package/sofia-sip/Makefile @@ -0,0 +1,28 @@ +# 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:= sofia-sip +PKG_VERSION:= 1.13.17 +PKG_RELEASE:= 1 +PKG_HASH:= daca3d961b6aa2974ad5d3be69ed011726c3e4d511b2a0d4cb6d878821a2de7a +PKG_DESCR:= sip library +PKG_SECTION:= libs/misc +PKG_SITES:= https://github.com/freeswitch/sofia-sip/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,SOFIA_SIP,sofia-sip,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +AUTOTOOL_STYLE:= bootstrap + +sofia-sip-install: + $(INSTALL_DIR) $(IDIR_SOFIA_SIP)/usr/lib + $(CP) $(WRKINST)/usr/lib/libsofia-sip*.so* \ + $(IDIR_SOFIA_SIP)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/spandsp/Makefile b/package/spandsp/Makefile new file mode 100644 index 000000000..a54a2fb9e --- /dev/null +++ b/package/spandsp/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:= 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 new file mode 100644 index 000000000..3d96eecb9 --- /dev/null +++ b/package/spdlog/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:= spdlog +PKG_VERSION:= 1.9.2 +PKG_RELEASE:= 1 +PKG_HASH:= 6fff9215f5cb81760be4cc16d033526d1080427d236e86d70bb02994f85e3d38 +PKG_DESCR:= very fast, header-only/compiled, C++ logging library +PKG_BUILDDEP:= fmt +PKG_SECTION:= libs/misc +PKG_SITES:= https://github.com/gabime/spdlog/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,SPDLOG,spdlog,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DSPDLOG_BUILD_TESTS=OFF \ + -DSPDLOG_BUILD_EXAMPLE=OFF \ + -DSPDLOG_BUILD_BENCH=OFF \ + -DSPDLOG_FMT_EXTERNAL=ON + + +spdlog-install: + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile index cf035471f..b9d695fbb 100644 --- a/package/sqlite/Makefile +++ b/package/sqlite/Makefile @@ -4,28 +4,30 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= sqlite -PKG_VERSION:= 3.15.0 +PKG_VERSION:= 3.37.1 PKG_RELEASE:= 1 -PKG_HASH:= 77162da9b4a0336d7e77d5252b690662850f62b47c12d9125f74ab9de78ded27 +PKG_HASH:= 40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e PKG_DESCR:= embeddable sql database cli PKG_SECTION:= sys/misc PKG_BUILDDEP:= ncurses readline -PKG_DEPENDS:= libsqlite +PKG_DEPENDS:= libsqlite libreadline libncurses PKG_URL:= http://www.sqlite.org/ -PKG_SITES:= http://www.sqlite.org/2016/ +PKG_SITES:= http://www.sqlite.org/2021/ PKG_LIBNAME:= libsqlite PKG_OPTS:= dev PKG_NOPARALLEL:= 1 -DISTFILES:= sqlite-autoconf-3150000.tar.gz -WRKDIST= ${WRKDIR}/sqlite-autoconf-3150000 +DISTFILES:= sqlite-autoconf-3370100.tar.gz +WRKDIST= ${WRKDIR}/sqlite-autoconf-3370100 PKG_SUBPKGS:= SQLITE_CLI LIBSQLITE PKGSD_LIBSQLITE:= emeddable sql library PKGSC_LIBSQLITE:= libs/db +include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk +$(eval $(call HOST_template,SQLITE,sqlite,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBSQLITE},${PKGSD_LIBSQLITE},${PKGSC_LIBSQLITE},${PKG_OPTS})) $(eval $(call PKG_template,SQLITE_CLI,sqlite-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -57,4 +59,5 @@ sqlite-cli-install: ${INSTALL_DIR} ${IDIR_SQLITE_CLI}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/sqlite3 ${IDIR_SQLITE_CLI}/usr/bin +include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/squid/Makefile b/package/squid/Makefile index 665392d44..93fa2c328 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -4,18 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= squid -PKG_VERSION:= 3.5.26 +PKG_VERSION:= 6.1 PKG_RELEASE:= 1 -PKG_HASH:= baa1eecb7d6e18881f4455060d80ee7cb95ae7e2695fdccf7e21ccc8f879a982 +PKG_HASH:= 6b029096cf531fc7bf83a305efeb0fdb2628cd42a4d20a61e0ab22e85a39c4e7 PKG_DESCR:= web and cache proxy PKG_SECTION:= net/proxy PKG_DEPENDS:= libltdl PKG_BUILDDEP:= libtool PKG_NEEDS:= threads c++ PKG_URL:= http://www.squid-cache.org/ -PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.5/ - -PKG_SYSTEM_DEPENDS:= !mikrotik-rb532 +PKG_SITES:= http://www.squid-cache.org/Versions/v6/ 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 @@ -42,8 +40,6 @@ PKGSN_SQUID_MOD_BASIC_AUTH_LDAP:= squid PKGSS_SQUID_MOD_BASIC_AUTH_LDAP:= libopenldap PKGSB_SQUID_MOD_BASIC_AUTH_LDAP:= openldap -PKG_HOST_DEPENDS:= !netbsd !cygwin - ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},) BASIC_AUTH_HELPERS+= getpwnam endif @@ -116,52 +112,35 @@ $(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKE,ntlm_fake_auth)) TARGET_LDFLAGS+= -lpthread HOST_CXXFLAGS+= -static-libstdc++ -AUTOTOOL_STYLE:= autoreconf -CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \ - ac_cv_sizeof_short=2 \ - ac_cv_sizeof_int=4 \ - ac_cv_sizeof_long=4 \ - ac_cv_sizeof_long_long=8 \ - ac_cv_sizeof___int64=0 \ - ac_cv_sizeof_int16_t=2 \ - ac_cv_sizeof_uint16_t=2 \ - ac_cv_sizeof_u_int16_t=2 \ - ac_cv_sizeof_int32_t=4 \ - ac_cv_sizeof_uint32_t=4 \ - ac_cv_sizeof_u_int32_t=4 \ - ac_cv_sizeof_int64_t=8 \ - ac_cv_sizeof_uint64_t=8 \ - ac_cv_sizeof_u_int64_t=8 \ - ac_cv_func_setresuid=no \ - ac_cv_func_va_copy=no \ - ac_cv_func___va_copy=no \ +CONFIGURE_ENV+= ac_cv_func_setresuid=yes \ + ac_cv_func_va_copy=yes \ + ac_cv_func___va_copy=yes \ ac_cv_epoll_works=yes \ - ac_cv_lib_nsl_main=no \ ac_cv_func_strnstr=no \ - squid_cv_pf_inet6=yes \ - squid_cv_gnu_atomics=yes \ ac_cv_have_squid=yes XAKE_FLAGS+= MKDIR_P="mkdir -p" CONFIGURE_ARGS+= --datadir=/usr/share/squid \ --libexecdir=/usr/lib/squid \ --sysconfdir=/etc/squid \ + --disable-arch-native \ --with-gnu-ld \ --enable-x-accelerator-vary \ --with-pthreads \ --with-dl \ --disable-debug-cbdata \ --disable-strict-error-checking \ + --enable-dependency-tracking \ --enable-kill-parent-hack \ --enable-arp-acl \ --enable-err-languages=English \ --enable-default-err-language=English \ --enable-linux-netfilter \ - --enable-icmp \ --enable-underscores \ --enable-cache-digests \ --enable-referer-log \ --enable-delay-pools \ --without-libcap \ + --enable-icmp \ --disable-snmp \ --disable-esi \ --disable-ssl \ @@ -183,8 +162,6 @@ squid-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${IDIR_SQUID}/etc/squid/ ${INSTALL_DATA} ./files/squid.conf ${IDIR_SQUID}/etc/squid/ ${INSTALL_DIR} ${IDIR_SQUID}/usr/share/squid/errors - ${CP} ${WRKINST}/usr/share/squid/errors/en \ - ${IDIR_SQUID}/usr/share/squid/errors ${CP} ${WRKINST}/usr/share/squid/errors/templates \ ${IDIR_SQUID}/usr/share/squid/errors ${CP} ${WRKINST}/usr/share/squid/icons ${IDIR_SQUID}/usr/share/squid/ diff --git a/package/squid/patches/patch-configure_ac b/package/squid/patches/patch-configure_ac deleted file mode 100644 index 26d1ceac1..000000000 --- a/package/squid/patches/patch-configure_ac +++ /dev/null @@ -1,11 +0,0 @@ ---- squid-3.5.26.orig/configure.ac 2017-06-01 15:55:25.000000000 +0200 -+++ squid-3.5.26/configure.ac 2017-06-13 02:16:52.536880342 +0200 -@@ -1368,7 +1368,7 @@ if test "x$with_openssl" = "xyes"; then - AC_DEFINE(USE_OPENSSL,1,[OpenSSL support is available]) - - # check for other specific broken implementations -- SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS -+ #SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS - SQUID_CHECK_OPENSSL_CONST_SSL_METHOD - SQUID_CHECK_OPENSSL_TXTDB - SQUID_CHECK_OPENSSL_HELLO_OVERWRITE_HACK diff --git a/package/squid/patches/patch-include_SquidNew_h b/package/squid/patches/patch-include_SquidNew_h deleted file mode 100644 index 8223c3cb1..000000000 --- a/package/squid/patches/patch-include_SquidNew_h +++ /dev/null @@ -1,26 +0,0 @@ ---- squid-3.5.26.orig/include/SquidNew.h 2017-06-01 15:49:00.000000000 +0200 -+++ squid-3.5.26/include/SquidNew.h 2017-06-13 03:13:51.928727436 +0200 -@@ -18,19 +18,19 @@ - */ - #include <new> - --_SQUID_EXTERNNEW_ void *operator new(size_t size) throw (std::bad_alloc) -+_SQUID_EXTERNNEW_ void *operator new(size_t size) noexcept(false) - { - return xmalloc(size); - } --_SQUID_EXTERNNEW_ void operator delete (void *address) throw() -+_SQUID_EXTERNNEW_ void operator delete (void *address) noexcept(true) - { - xfree(address); - } --_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc) -+_SQUID_EXTERNNEW_ void *operator new[] (size_t size) noexcept(false) - { - return xmalloc(size); - } --_SQUID_EXTERNNEW_ void operator delete[] (void *address) throw() -+_SQUID_EXTERNNEW_ void operator delete[] (void *address) noexcept(true) - { - xfree(address); - } diff --git a/package/squid/patches/patch-libltdl_aclocal_m4 b/package/squid/patches/patch-libltdl_aclocal_m4 deleted file mode 100644 index 45b9c7e64..000000000 --- a/package/squid/patches/patch-libltdl_aclocal_m4 +++ /dev/null @@ -1,14 +0,0 @@ ---- squid-3.5.2.orig/libltdl/aclocal.m4 2015-02-18 06:17:49.000000000 -0600 -+++ squid-3.5.2/libltdl/aclocal.m4 2015-02-23 15:31:16.264583929 -0600 -@@ -486,9 +486,9 @@ _AM_IF_OPTION([no-define],, - # Some tools Automake needs. - AC_REQUIRE([AM_SANITY_CHECK])dnl - AC_REQUIRE([AC_ARG_PROGRAM])dnl --AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) -+AM_MISSING_PROG([ACLOCAL], [aclocal]) - AM_MISSING_PROG([AUTOCONF], [autoconf]) --AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) -+AM_MISSING_PROG([AUTOMAKE], [automake]) - AM_MISSING_PROG([AUTOHEADER], [autoheader]) - AM_MISSING_PROG([MAKEINFO], [makeinfo]) - AC_REQUIRE([AM_PROG_INSTALL_SH])dnl diff --git a/package/squid/patches/patch-src_Makefile_am b/package/squid/patches/patch-src_Makefile_in index 17c26aea6..b355e75b2 100644 --- a/package/squid/patches/patch-src_Makefile_am +++ b/package/squid/patches/patch-src_Makefile_in @@ -1,6 +1,6 @@ ---- squid-3.5.26.orig/src/Makefile.am 2017-06-01 15:49:00.000000000 +0200 -+++ squid-3.5.26/src/Makefile.am 2017-06-13 02:16:52.592883945 +0200 -@@ -968,7 +968,7 @@ cache_cf.o: cf_parser.cci +--- squid-5.2.orig/src/Makefile.in 2021-10-03 17:04:37.000000000 +0200 ++++ squid-5.2/src/Makefile.in 2021-11-16 13:09:30.751245296 +0100 +@@ -8142,7 +8142,7 @@ cache_cf.o: cf_parser.cci # cf_gen builds the configuration files. cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci diff --git a/package/strace/Makefile b/package/strace/Makefile index b386f634f..dc4541f9c 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -4,15 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= strace -PKG_VERSION:= 5.11 +PKG_VERSION:= 6.8 PKG_RELEASE:= 1 -PKG_HASH:= ffe340b10c145a0f85734271e9cce56457d23f21a7ea5931ab32f8cf4e793879 +PKG_HASH:= ba6950a96824cdf93a584fa04f0a733896d2a6bc5f0ad9ffe505d9b41e970149 PKG_DESCR:= system call trace program PKG_SECTION:= app/debug PKG_URL:= https://strace.io PKG_SITES:= https://strace.io/files/$(PKG_VERSION)/ -PKG_ARCH_DEPENDS:= !h8300 !nds32 +PKG_ARCH_DEPENDS:= !h8300 !nds32 !cris include ${ADK_TOPDIR}/mk/package.mk @@ -33,6 +33,7 @@ ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) TARGET_LDFLAGS+= -pthread endif +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --enable-mpers=check INSTALL_STYLE:= manual diff --git a/package/strace/patches/riscv32.patch b/package/strace/patches/riscv32.patch new file mode 100644 index 000000000..b3492845b --- /dev/null +++ b/package/strace/patches/riscv32.patch @@ -0,0 +1,282 @@ +# --- T2-COPYRIGHT-NOTE-BEGIN --- +# T2 SDE: package/*/strace/riscv32.patch +# Copyright (C) 2021 - 2022 The T2 SDE Project +# +# This Copyright note is generated by scripts/Create-CopyPatch, +# more information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License version 2 as used by the T2 SDE. +# --- T2-COPYRIGHT-NOTE-END --- + +Signed-off-by: Alistair Francis <alistair.francis at wdc.com> +--- + Makefile.am | 20 ++++++++-------- + configure.ac | 6 ++++- + dist/INSTALL | 2 +- + src/linux/{riscv64 => riscv}/arch_defs_.h | 16 +++++++++++++ + src/linux/{riscv64 => riscv}/arch_regs.c | 0 + src/linux/riscv/asm_stat.h | 26 +++++++++++++++++++++ + src/linux/{riscv64 => riscv}/get_error.c | 0 + src/linux/{riscv64 => riscv}/get_scno.c | 0 + src/linux/{riscv64 => riscv}/get_syscall_args.c | 0 + src/linux/{riscv64 => riscv}/ioctls_arch0.h | 0 + src/linux/riscv/ioctls_inc0.h | 7 ++++++ + src/linux/{riscv64 => riscv}/raw_syscall.h | 0 + src/linux/{riscv64 => riscv}/set_error.c | 0 + src/linux/{riscv64 => riscv}/set_scno.c | 0 + src/linux/{riscv64 => riscv}/syscallent.h | 8 ++++++- + src/linux/riscv64/ioctls_inc0.h | 1 - + src/riscv.c | 4 ++-- + 17 files changed, 74 insertions(+), 16 deletions(-) + create mode 100644 src/linux/riscv/arch_defs_.h + rename src/linux/{riscv64 => src/riscv}/arch_regs.c (100%) + create mode 100644 src/linux/riscv/asm_stat.h + rename src/linux/{riscv64 => src/riscv}/get_error.c (100%) + rename src/linux/{riscv64 => src/riscv}/get_scno.c (100%) + rename src/linux/{riscv64 => src/riscv}/get_syscall_args.c (100%) + rename src/linux/{riscv64 => src/riscv}/ioctls_arch0.h (100%) + create mode 100644 src/linux/riscv/ioctls_inc0.h + rename src/linux/{riscv64 => src/riscv}/raw_syscall.h (100%) + rename src/linux/{riscv64 => src/riscv}/set_error.c (100%) + rename src/linux/{riscv64 => src/riscv}/set_scno.c (100%) + rename src/linux/{riscv64 => src/riscv}/syscallent.h (64%) + delete mode 100644 src/linux/riscv64/ioctls_inc0.h + +diff --git a/Makefile.am b/Makefile.am +index 9c62218f..4955654b 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -802,19 +802,19 @@ extrA_DIST = + linux/powerpc64le/set_scno.c \ + linux/powerpc64le/syscallent.h \ + linux/powerpc64le/userent.h \ +- linux/riscv64/arch_defs_.h \ +- linux/riscv64/arch_prstatus_regset.c \ +- linux/riscv64/arch_prstatus_regset.h \ +- linux/riscv64/arch_regs.c \ +- linux/riscv64/get_error.c \ +- linux/riscv64/get_scno.c \ +- linux/riscv64/get_syscall_args.c \ +- linux/riscv64/ioctls_arch0.h \ +- linux/riscv64/ioctls_inc0.h \ +- linux/riscv64/raw_syscall.h \ +- linux/riscv64/set_error.c \ +- linux/riscv64/set_scno.c \ +- linux/riscv64/syscallent.h \ ++ linux/riscv/arch_defs_.h \ ++ linux/riscv/arch_prstatus_regset.c \ ++ linux/riscv/arch_prstatus_regset.h \ ++ linux/riscv/arch_regs.c \ ++ linux/riscv/get_error.c \ ++ linux/riscv/get_scno.c \ ++ linux/riscv/get_syscall_args.c \ ++ linux/riscv/ioctls_arch0.h \ ++ linux/riscv/ioctls_inc0.h \ ++ linux/riscv/raw_syscall.h \ ++ linux/riscv/set_error.c \ ++ linux/riscv/set_scno.c \ ++ linux/riscv/syscallent.h \ + linux/s390/arch_defs_.h \ + linux/s390/arch_prstatus_regset.c \ + linux/s390/arch_prstatus_regset.h \ +diff --git a/configure.ac b/configure.ac +index dd4f13f4..4a53681c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -157,9 +157,12 @@ + esac + fi + ;; ++riscv32*) ++ arch=riscv ++ AC_DEFINE([RISCV32], 1, [Define for the RISC-V 32-bit architecture]) ++ ;; + riscv64*) +- arch=riscv64 +- karch=riscv ++ arch=riscv + AC_DEFINE([RISCV64], 1, [Define for the RISC-V 64-bit architecture]) + ;; + s390) +diff --git a/dist/INSTALL b/dist/INSTALL +index 0d22512b..19e059cf 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -63,7 +63,7 @@ Taking the aforementioned into account, there are the following requirements: + + - gawk (at least version 3) + - Ability to compile for m32 personality (on architectures where it is supported) +- - On x86_64, x32, powerpc64, sparc64, riscv64, tile64: gcc -m32 ++ - On x86_64, x32, powerpc64, sparc64, riscv32, riscv64, tile64: gcc -m32 + - s390x: gcc -m31 + - AArch64: a separate compiler for armv7 EABI + - See information about configuration in "1.3.2. AArch64: AArch32 support" +diff --git a/src/linux/riscv64/arch_defs_.h b/src/linux/riscv/arch_defs_.h +similarity index 20% +rename from src/linux/riscv64/arch_defs_.h +rename to src/linux/riscv/arch_defs_.h +index 0d22512b..19e059cf 100644 +--- a/src/linux/riscv64/arch_defs_.h ++++ b/src/linux/riscv/arch_defs_.h +@@ -1 +1,8 @@ +-#define PERSONALITY0_AUDIT_ARCH { AUDIT_ARCH_RISCV64, 0 } ++#if defined(RISCV32) ++# define ARCH_TIMESIZE 64 ++# define HAVE_ARCH_TIME32_SYSCALLS 0 ++# define HAVE_ARCH_OLD_TIME64_SYSCALLS 0 ++# define PERSONALITY0_AUDIT_ARCH { AUDIT_ARCH_RISCV32, 0 } ++#else ++# define PERSONALITY0_AUDIT_ARCH { AUDIT_ARCH_RISCV64, 0 } ++#endif +diff --git a/src/linux/riscv64/arch_regs.c b/src/linux/riscv/arch_regs.c +similarity index 100% +rename from src/linux/riscv64/arch_regs.c +rename to src/linux/riscv/arch_regs.c +diff --git a/src/linux/riscv/asm_stat.h b/src/linux/riscv/asm_stat.h +new file mode 100644 +index 00000000..73341454 +--- /dev/null ++++ b/src/linux/riscv/asm_stat.h +@@ -0,0 +1,26 @@ ++/* ++ * Copyright (c) 2020 The strace developers. ++ * All rights reserved. ++ * ++ * SPDX-License-Identifier: LGPL-2.1-or-later ++ */ ++ ++#ifndef STRACE_RISCV_ASM_STAT_H ++# define STRACE_RISCV_ASM_STAT_H ++ ++# include "linux/generic/asm_stat.h" ++ ++# if defined(RISCV32) ++# undef dev_t ++# undef ino_t ++# undef off64_t ++# undef off_t ++# undef time_t ++ ++# define dev_t __kernel_loff_t ++# define ino_t __kernel_loff_t ++# define off64_t __kernel_off64_t ++# define off_t __kernel_off64_t ++# define time_t __kernel_time64_t ++# endif /* defined(RISCV32) */ ++#endif /* !STRACE_RISCV_ASM_STAT_H */ +diff --git a/src/linux/riscv64/arch_prstatus_regset.h b/src/linux/riscv/arch_prstatus_regset.h +similarity index 100% +rename from src/linux/riscv64/arch_prstatus_regset.h +rename to src/linux/riscv/arch_prstatus_regset.h +diff --git a/src/linux/riscv64/arch_prstatus_regset.c b/src/linux/riscv/arch_prstatus_regset.c +similarity index 100% +rename from src/linux/riscv64/arch_prstatus_regset.c +rename to src/linux/riscv/arch_prstatus_regset.c +diff --git a/src/linux/riscv64/get_error.c b/src/linux/riscv/get_error.c +similarity index 100% +rename from src/linux/riscv64/get_error.c +rename to src/linux/riscv/get_error.c +diff --git a/src/linux/riscv64/get_scno.c b/src/linux/riscv/get_scno.c +similarity index 100% +rename from src/linux/riscv64/get_scno.c +rename to src/linux/riscv/get_scno.c +diff --git a/src/linux/riscv64/get_syscall_args.c b/src/linux/riscv/get_syscall_args.c +similarity index 100% +rename from src/linux/riscv64/get_syscall_args.c +rename to src/linux/riscv/get_syscall_args.c +diff --git a/src/linux/riscv64/ioctls_arch0.h b/src/linux/riscv/ioctls_arch0.h +similarity index 100% +rename from src/linux/riscv64/ioctls_arch0.h +rename to src/linux/riscv/ioctls_arch0.h +diff --git a/src/linux/riscv/ioctls_inc0.h b/src/linux/riscv/ioctls_inc0.h +new file mode 100644 +index 00000000..cc39332f +--- /dev/null ++++ b/src/linux/riscv/ioctls_inc0.h +@@ -0,0 +1,7 @@ ++#if defined(RISCV64) ++# include "../64/ioctls_inc.h" ++#elif defined(RISCV32) ++# include "../32/ioctls_inc.h" ++#else ++# error "Unsupported RISC-V xlen" ++#endif +diff --git a/src/linux/riscv64/raw_syscall.h b/src/linux/riscv/raw_syscall.h +similarity index 100% +rename from src/linux/riscv64/raw_syscall.h +rename to src/linux/riscv/raw_syscall.h +diff --git a/src/linux/riscv64/set_error.c b/src/linux/riscv/set_error.c +similarity index 100% +rename from src/linux/riscv64/set_error.c +rename to src/linux/riscv/set_error.c +diff --git a/src/linux/riscv64/set_scno.c b/src/linux/riscv/set_scno.c +similarity index 100% +rename from src/linux/riscv64/set_scno.c +rename to src/linux/riscv/set_scno.c +diff --git a/src/linux/riscv64/syscallent.h b/src/linux/riscv/syscallent.h +similarity index 64% +rename from src/linux/riscv64/syscallent.h +rename to src/linux/riscv/syscallent.h +index 60c6ce58..c8fb3b8f 100644 +--- a/src/linux/riscv64/syscallent.h ++++ b/src/linux/riscv/syscallent.h +@@ -5,7 +5,13 @@ + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +-#include "../64/syscallent.h" ++#if defined(RISCV64) ++# include "../64/syscallent.h" ++#elif defined(RISCV32) ++# include "../32/syscallent.h" ++#else ++# error "Unsupported RISC-V xlen" ++#endif + + /* #define __NR_riscv_flush_icache (__NR_arch_specific_syscall + 15) */ + [259] = { 3, TM, SEN(riscv_flush_icache), "riscv_flush_icache" }, +diff --git a/src/linux/riscv64/ioctls_inc0.h b/src/linux/riscv64/ioctls_inc0.h +deleted file mode 100644 +index f9939faa..00000000 +--- a/src/linux/riscv64/ioctls_inc0.h ++++ /dev/null +@@ -1 +0,0 @@ +-#include "../64/ioctls_inc.h" +diff --git a/riscv.c b/riscv.c +index 825eb293..20094ba5 100644 +--- a/src/riscv.c ++++ b/src/riscv.c +@@ -9,7 +9,7 @@ + + #include "defs.h" + +-#ifdef RISCV64 ++#if defined(RISCV64) || defined(RISCV32) + + # include "xlat/riscv_flush_icache_flags.h" + +@@ -30,4 +30,4 @@ SYS_FUNC(riscv_flush_icache) + return RVAL_DECODED; + } + +-#endif /* RISCV64 */ ++#endif /* defined(RISCV64) || defined(RISCV32) */ +-- +2.25.0 + +--- strace-5.10/src/config.h.in.vanilla 2021-02-13 16:11:28.950662094 +0100 ++++ strace-5.10/src/config.h.in 2021-02-13 16:12:01.681663752 +0100 +@@ -3776,6 +3779,9 @@ + /* Define for the little endian PowerPC64 architecture. */ + #undef POWERPC64LE + ++/* Define for the RISC-V 32-bit architecture */ ++#undef RISCV32 ++ + /* Define for the RISC-V 64-bit architecture */ + #undef RISCV64 + + diff --git a/package/stress-ng/Makefile b/package/stress-ng/Makefile index aece6e635..d9758801c 100644 --- a/package/stress-ng/Makefile +++ b/package/stress-ng/Makefile @@ -13,6 +13,8 @@ PKG_SITES:= http://kernel.ubuntu.com/~cking/tarballs/stress-ng/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_CFLINE_STRESS_NG:= depends on ADK_BROKEN + include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,STRESS_NG,stress-ng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile index 0ae988fe6..790700436 100644 --- a/package/strongswan/Makefile +++ b/package/strongswan/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= strongswan -PKG_VERSION:= 5.8.1 +PKG_VERSION:= 5.9.5 PKG_RELEASE:= 1 -PKG_HASH:= d86490a09160016d1c1a20020fef832559a22531eb9a1b1659256e3ca1c8c97d +PKG_HASH:= 6db028c9033dfd7cab578ca7e4b0075922cffec7af8bffc7d67cac67f348a5be PKG_DESCR:= ipsec based vpn software PKG_SECTION:= net/security PKG_KDEPENDS:= net-key inet-esp xfrm-user inet-xfrm-mode-transport diff --git a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c index 2c88daa81..44915d63c 100644 --- a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c +++ b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c @@ -1,6 +1,6 @@ ---- strongswan-5.8.1.orig/src/libstrongswan/plugins/openssl/openssl_plugin.c 2019-08-27 15:26:53.000000000 +0200 -+++ strongswan-5.8.1/src/libstrongswan/plugins/openssl/openssl_plugin.c 2019-10-08 02:05:20.954742229 +0200 -@@ -310,7 +310,7 @@ static private_key_t *openssl_private_ke +--- strongswan-5.9.5.orig/src/libstrongswan/plugins/openssl/openssl_plugin.c 2022-01-08 12:54:02.000000000 +0100 ++++ strongswan-5.9.5/src/libstrongswan/plugins/openssl/openssl_plugin.c 2022-03-21 16:41:08.736944525 +0100 +@@ -329,7 +329,7 @@ static private_key_t *openssl_private_ke case EVP_PKEY_EC: return openssl_ec_private_key_create(key, FALSE); #endif @@ -9,7 +9,7 @@ case EVP_PKEY_ED25519: case EVP_PKEY_ED448: return openssl_ed_private_key_create(key, FALSE); -@@ -462,7 +462,7 @@ static private_key_t *openssl_private_ke +@@ -481,7 +481,7 @@ static private_key_t *openssl_private_ke case EVP_PKEY_EC: return openssl_ec_private_key_create(key, TRUE); #endif @@ -18,7 +18,7 @@ case EVP_PKEY_ED25519: case EVP_PKEY_ED448: return openssl_ed_private_key_create(key, TRUE); -@@ -814,7 +814,7 @@ plugin_t *openssl_plugin_create() +@@ -980,7 +980,7 @@ plugin_t *openssl_plugin_create() }, ); diff --git a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c.orig b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c.orig index 401bd7a64..2c88daa81 100644 --- a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c.orig +++ b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c.orig @@ -1,6 +1,24 @@ ---- strongswan-5.5.0.orig/src/libstrongswan/plugins/openssl/openssl_plugin.c 2016-06-30 16:20:10.000000000 +0200 -+++ strongswan-5.5.0/src/libstrongswan/plugins/openssl/openssl_plugin.c 2016-09-30 05:36:45.015692462 +0200 -@@ -573,7 +573,7 @@ plugin_t *openssl_plugin_create() +--- strongswan-5.8.1.orig/src/libstrongswan/plugins/openssl/openssl_plugin.c 2019-08-27 15:26:53.000000000 +0200 ++++ strongswan-5.8.1/src/libstrongswan/plugins/openssl/openssl_plugin.c 2019-10-08 02:05:20.954742229 +0200 +@@ -310,7 +310,7 @@ static private_key_t *openssl_private_ke + case EVP_PKEY_EC: + return openssl_ec_private_key_create(key, FALSE); + #endif +-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER) + case EVP_PKEY_ED25519: + case EVP_PKEY_ED448: + return openssl_ed_private_key_create(key, FALSE); +@@ -462,7 +462,7 @@ static private_key_t *openssl_private_ke + case EVP_PKEY_EC: + return openssl_ec_private_key_create(key, TRUE); + #endif +-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER) + case EVP_PKEY_ED25519: + case EVP_PKEY_ED448: + return openssl_ed_private_key_create(key, TRUE); +@@ -814,7 +814,7 @@ plugin_t *openssl_plugin_create() }, ); diff --git a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_rsa_private_key_c b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_rsa_private_key_c new file mode 100644 index 000000000..1e459f0ef --- /dev/null +++ b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_rsa_private_key_c @@ -0,0 +1,11 @@ +--- strongswan-5.9.5.orig/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c 2021-12-29 12:08:27.000000000 +0100 ++++ strongswan-5.9.5/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c 2022-03-21 16:48:57.605794714 +0100 +@@ -280,7 +280,7 @@ METHOD(private_key_t, sign, bool, + return build_emsa_pkcs1_signature(this, NID_sha384, data, signature); + case SIGN_RSA_EMSA_PKCS1_SHA2_512: + return build_emsa_pkcs1_signature(this, NID_sha512, data, signature); +-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_SHA3) ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_SHA3) && !defined(LIBRESSL_VERSION_NUMBER) + case SIGN_RSA_EMSA_PKCS1_SHA3_224: + return build_emsa_pkcs1_signature(this, NID_sha3_224, data, signature); + case SIGN_RSA_EMSA_PKCS1_SHA3_256: diff --git a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_rsa_public_key_c b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_rsa_public_key_c new file mode 100644 index 000000000..3571cad01 --- /dev/null +++ b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_rsa_public_key_c @@ -0,0 +1,11 @@ +--- strongswan-5.9.5.orig/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c 2021-12-29 12:08:27.000000000 +0100 ++++ strongswan-5.9.5/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c 2022-03-21 16:49:30.581005593 +0100 +@@ -281,7 +281,7 @@ METHOD(public_key_t, verify, bool, + return verify_emsa_pkcs1_signature(this, NID_sha384, data, signature); + case SIGN_RSA_EMSA_PKCS1_SHA2_512: + return verify_emsa_pkcs1_signature(this, NID_sha512, data, signature); +-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_SHA3) ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_SHA3) && !defined(LIBRESSL_VERSION_NUMBER) + case SIGN_RSA_EMSA_PKCS1_SHA3_224: + return verify_emsa_pkcs1_signature(this, NID_sha3_224, data, signature); + case SIGN_RSA_EMSA_PKCS1_SHA3_256: diff --git a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_x_diffie_hellman_c b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_x_diffie_hellman_c index f4738c4ca..d5dc7efa0 100644 --- a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_x_diffie_hellman_c +++ b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_x_diffie_hellman_c @@ -1,5 +1,5 @@ ---- strongswan-5.8.1.orig/src/libstrongswan/plugins/openssl/openssl_x_diffie_hellman.c 2018-12-14 16:48:24.000000000 +0100 -+++ strongswan-5.8.1/src/libstrongswan/plugins/openssl/openssl_x_diffie_hellman.c 2019-10-08 02:05:54.116867134 +0200 +--- strongswan-5.9.5.orig/src/libstrongswan/plugins/openssl/openssl_x_diffie_hellman.c 2022-01-08 12:54:02.000000000 +0100 ++++ strongswan-5.9.5/src/libstrongswan/plugins/openssl/openssl_x_diffie_hellman.c 2022-03-21 16:41:08.744944336 +0100 @@ -17,7 +17,7 @@ /* basic support for X25519 was added with 1.1.0a, but we require features (e.g. @@ -8,4 +8,4 @@ +#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_ECDH) && !defined(LIBRESSL_VERSION_NUMBER) #include "openssl_x_diffie_hellman.h" - + #include "openssl_util.h" diff --git a/package/strongswan/patches/patch-src_starter_netkey_c b/package/strongswan/patches/patch-src_starter_netkey_c deleted file mode 100644 index adb7e09eb..000000000 --- a/package/strongswan/patches/patch-src_starter_netkey_c +++ /dev/null @@ -1,18 +0,0 @@ ---- strongswan-5.5.0.orig/src/starter/netkey.c 2016-04-22 22:01:35.000000000 +0200 -+++ strongswan-5.5.0/src/starter/netkey.c 2016-09-30 05:30:43.681874545 +0200 -@@ -42,6 +42,7 @@ bool starter_netkey_init(void) - } - - /* make sure that all required IPsec modules are loaded */ -+ /* - if (stat(PROC_MODULES, &stb) == 0) - { - ignore_result(system("modprobe -qv ah4")); -@@ -50,6 +51,7 @@ bool starter_netkey_init(void) - ignore_result(system("modprobe -qv xfrm4_tunnel")); - ignore_result(system("modprobe -qv xfrm_user")); - } -+ */ - - DBG2(DBG_APP, "found netkey IPsec stack"); - return TRUE; diff --git a/package/subversion/Makefile b/package/subversion/Makefile index 6dee93e16..0c42d76a1 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= subversion -PKG_VERSION:= 1.9.5 +PKG_VERSION:= 1.14.1 PKG_RELEASE:= 1 -PKG_HASH:= 280ba586c5d51d7b976b65d22d5e8e42f3908ed1c968d71120dcf534ce857a83 +PKG_HASH:= dee2796abaa1f5351e6cc2a60b1917beb8238af548b20d3e1ec22760ab2f0cad PKG_DESCR:= revision control program PKG_SECTION:= dev/scm -PKG_DEPENDS:= zlib apr apr-util libexpat libsqlite neon -PKG_BUILDDEP:= apr-util expat apr zlib sqlite neon +PKG_DEPENDS:= zlib apr apr-util libexpat libsqlite neon liblz4 +PKG_BUILDDEP:= apr-util expat apr zlib sqlite neon lz4 PKG_URL:= http://subversion.apache.org/ PKG_SITES:= http://artfiles.org/apache.org/subversion/ @@ -23,6 +23,7 @@ $(eval $(call PKG_template,SUBVERSION,subversion,${PKG_VERSION}-${PKG_RELEASE},$ TARGET_LDFLAGS+= -ltinfo CONFIGURE_ARGS+= --with-apr=${STAGING_TARGET_DIR}/usr/bin/apr-1-config \ --with-apr-util=${STAGING_TARGET_DIR}/usr/bin/apr-1-config \ + --with-utf8proc=internal \ --disable-mod-activation \ --disable-keychain \ --without-apxs \ diff --git a/package/sudo/Makefile b/package/sudo/Makefile index 61de9df35..a4c5624dc 100644 --- a/package/sudo/Makefile +++ b/package/sudo/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= sudo -PKG_VERSION:= 1.8.28 +PKG_VERSION:= 1.9.15p5 PKG_RELEASE:= 1 -PKG_HASH:= 9129fa745a08caff0ce2042d2162b38eb9bf73bf43fcb248ac8b3a750c1f13a1 +PKG_HASH:= 558d10b9a1991fb3b9fa7fa7b07ec4405b7aefb5b3cb0b0871dbc81e3a88e558 PKG_DESCR:= su do PKG_SECTION:= sys/misc PKG_NEEDS:= mmu diff --git a/package/sudo/patches/patch-Makefile_in b/package/sudo/patches/patch-Makefile_in deleted file mode 100644 index db7f2d624..000000000 --- a/package/sudo/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- sudo-1.8.12.orig/Makefile.in 2015-02-09 12:53:54.000000000 -0600 -+++ sudo-1.8.12/Makefile.in 2015-02-17 14:32:12.001362549 -0600 -@@ -49,7 +49,7 @@ sudoers_mode = @SUDOERS_MODE@ - shlib_mode = @SHLIB_MODE@ - - SUBDIRS = lib/util @ZLIB_SRC@ plugins/group_file plugins/sudoers \ -- plugins/system_group src include doc examples -+ plugins/system_group src include - - SAMPLES = plugins/sample - diff --git a/package/sudo/patches/patch-lib_util_Makefile_in b/package/sudo/patches/patch-lib_util_Makefile_in deleted file mode 100644 index a05b6676e..000000000 --- a/package/sudo/patches/patch-lib_util_Makefile_in +++ /dev/null @@ -1,15 +0,0 @@ ---- sudo-1.8.15.orig/lib/util/Makefile.in 2015-11-01 00:35:24.000000000 +0100 -+++ sudo-1.8.15/lib/util/Makefile.in 2015-11-03 16:29:33.000000000 +0100 -@@ -160,10 +160,10 @@ signame.c: mksigname - ./mksigname > $@ - - mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h -- $(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksiglist.c -o $@ -+ $(CC_FOR_BUILD) -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) -I$(incdir) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(DEFS) $(srcdir)/mksiglist.c -o $@ - - mksigname: $(srcdir)/mksigname.c $(srcdir)/mksigname.h $(incdir)/sudo_compat.h $(top_builddir)/config.h -- $(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksigname.c -o $@ -+ $(CC_FOR_BUILD) -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) -I$(incdir) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(DEFS) $(srcdir)/mksigname.c -o $@ - - $(srcdir)/mksiglist.h: $(srcdir)/siglist.in - @if [ -n "$(DEVEL)" ]; then \ diff --git a/package/supl/Makefile b/package/supl/Makefile deleted file mode 100644 index 9d5dc4ad9..000000000 --- a/package/supl/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:= supl -PKG_VERSION:= 1.0.6 -PKG_RELEASE:= 1 -PKG_HASH:= 068dc47ce818ce5634f09a88159df85a6ce3456e2467b11b8c5f8543a99bb347 -PKG_DESCR:= tools for accessing sup/rrlp server -PKG_SECTION:= net/misc -PKG_DEPENDS:= libressl -PKG_BUILDDEP:= libressl -PKG_URL:= http://www.tajuma.com/supl/ -PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=supl/) - -DISTFILES:= $(PKG_NAME)_$(PKG_VERSION).tar.gz -WRKDIST= $(WRKDIR)/trunk - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,SUPL,supl,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -CONFIG_STYLE:= minimal -CONFIGURE_ARGS+= --prefix="$(WRKINST)/usr" \ - --precompiled-asn1=yes - -supl-install: - $(INSTALL_DIR) $(IDIR_SUPL)/usr/{bin,lib} - $(INSTALL_BIN) $(WRKINST)/usr/bin/supl-{cert,client,proxy} \ - $(IDIR_SUPL)/usr/bin - $(CP) $(WRKINST)/usr/lib/lib{asnrrlp,asnsupl,supl}.so* \ - $(IDIR_SUPL)/usr/lib - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/supl/patches/patch-configure b/package/supl/patches/patch-configure deleted file mode 100644 index 1c8f24d49..000000000 --- a/package/supl/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- trunk.orig/configure 2011-10-25 21:41:03.000000000 +0200 -+++ trunk/configure 2015-02-27 19:33:11.000000000 +0100 -@@ -91,7 +91,7 @@ cat <<EOF > config.mk - # Modifications to this file are lost if ./configure is ran again. - - CONF_VERSION = 1.0.5 --CONF_CFLAGS = -Wall -O2 $var_debug -+CONF_CFLAGS = -Wall $var_debug - CONF_ASN_CFLAGS = $var_asn1_debug - CONF_PREFIX = $var_prefix - CONF_PRECOMPILED_ASN = $var_precompiled_asn diff --git a/package/supl/patches/patch-src_Makefile b/package/supl/patches/patch-src_Makefile deleted file mode 100644 index cec5a4771..000000000 --- a/package/supl/patches/patch-src_Makefile +++ /dev/null @@ -1,16 +0,0 @@ - - use pkg-config everywhere, otherwise libs are not found ---- trunk.orig/src/Makefile 2011-10-17 20:09:22.000000000 +0200 -+++ trunk/src/Makefile 2015-02-09 16:48:37.244935714 +0100 -@@ -21,10 +21,10 @@ DIST = Makefile $(PROGRAM_SOURCE) $(SUPL - all: supl-client supl-proxy supl-cert - - supl-client: libsupl.so supl-client.o -- $(CC) -o $@ supl-client.o -L. -lsupl -lssl -lm -+ $(CC) -o $@ supl-client.o -L. -lsupl $(shell pkg-config --libs openssl) -lm - - supl-proxy: libsupl.so supl-proxy.o -- $(CC) -o $@ supl-proxy.o -L. -lsupl -lssl -lm -+ $(CC) -o $@ supl-proxy.o -L. -lsupl $(shell pkg-config --libs openssl) -lm - - supl-cert: supl-cert.o - $(CC) -o $@ supl-cert.o $(shell pkg-config --libs openssl) -lm diff --git a/package/supl/patches/patch-src_supl-client_c b/package/supl/patches/patch-src_supl-client_c deleted file mode 100644 index 15e2fa727..000000000 --- a/package/supl/patches/patch-src_supl-client_c +++ /dev/null @@ -1,40 +0,0 @@ - - implement bind to device functionality ---- trunk.orig/src/supl-client.c 2011-10-21 20:51:38.000000000 +0200 -+++ trunk/src/supl-client.c 2013-04-24 18:55:01.937252375 +0200 -@@ -252,6 +252,7 @@ static char *usage_str = - " --cell gsm:mcc,mns:lac,ci|wcdma:mcc,msn,uc set current gsm/wcdma cell id\n" - " --cell gsm:mcc,mns:lac,ci:lat,lon,uncert set known gsm cell id with position\n" - " --format|-f human machine parseable output\n" -+" --interface|-i iface bind to this interface\n" - " --debug|-d <n> 1 == RRLP, 2 == SUPL, 4 == DEBUG\n" - " --debug-file file write debug to file\n" - " --help|-h show this help\n" -@@ -267,6 +268,7 @@ static struct option long_opts[] = { - { "cell", 1, 0, 0 }, - { "debug", 1, 0, 'd' }, - { "format", 1, 0, 'f' }, -+ { "interface", 1, 0, 0}, - { "test", 1, 0, 't' }, - { "set-pos", 1, 0, 0 }, - { "pos-helper", 1, 0, 0 }, -@@ -310,7 +312,7 @@ int main(int argc, char *argv[]) { - int opt_index; - int c; - -- c = getopt_long(argc, argv, "ad:f:t:", long_opts, &opt_index); -+ c = getopt_long(argc, argv, "ad:f:i:t:", long_opts, &opt_index); - if (c == -1) break; - switch (c) { - case 0: -@@ -374,6 +376,11 @@ int main(int argc, char *argv[]) { - } - break; - -+ case 'i': -+ strncpy(ctx.iface, optarg, IFNAMSIZ); -+ ctx.iface[IFNAMSIZ] = 0; -+ break; -+ - case 'd': - { - int debug = atoi(optarg); diff --git a/package/supl/patches/patch-src_supl_c b/package/supl/patches/patch-src_supl_c deleted file mode 100644 index 26ab45b18..000000000 --- a/package/supl/patches/patch-src_supl_c +++ /dev/null @@ -1,46 +0,0 @@ - - implement bind to device functionality ---- trunk.orig/src/supl.c 2011-10-27 20:41:19.000000000 +0200 -+++ trunk/src/supl.c 2013-04-24 18:56:17.742529773 +0200 -@@ -41,7 +41,7 @@ static struct supl_debug_s { - } debug; - #endif - --static int server_connect(char *server); -+static int server_connect(char *server, char *iface); - static int pdu_make_ulp_start(supl_ctx_t *ctx, supl_ulp_t *pdu); - static int pdu_make_ulp_pos_init(supl_ctx_t *ctx, supl_ulp_t *pdu); - static int pdu_make_ulp_rrlp_ack(supl_ctx_t *ctx, supl_ulp_t *pdu, PDU_t *rrlp); -@@ -236,7 +236,7 @@ int EXPORT supl_server_connect(supl_ctx_ - if (!ctx->ssl) return E_SUPL_CONNECT; - - if (server) { -- ctx->fd = server_connect(server); -+ ctx->fd = server_connect(server, ctx->iface); - if (ctx->fd == -1) return E_SUPL_CONNECT; - } - -@@ -266,7 +266,7 @@ void EXPORT supl_close(supl_ctx_t *ctx) - } - - --static int server_connect(char *server) { -+static int server_connect(char *server, char *iface) { - int fd = -1; - struct addrinfo *ailist, *aip; - struct addrinfo hint; -@@ -283,6 +283,15 @@ static int server_connect(char *server) - if ((fd = socket(aip->ai_family, SOCK_STREAM, 0)) < 0) { - err = errno; - } -+ -+ if (strlen(iface)) { -+ struct ifreq ifr; -+ strncpy(ifr.ifr_name, iface, IFNAMSIZ); -+ ifr.ifr_name[IFNAMSIZ - 1] = 0; -+ if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) -+ fprintf(stderr, "Error: binding to device %s failed\n", iface); -+ } -+ - if (connect(fd, aip->ai_addr, aip->ai_addrlen) != 0) { - return -1; - } diff --git a/package/supl/patches/patch-src_supl_h b/package/supl/patches/patch-src_supl_h deleted file mode 100644 index c2e9e8da4..000000000 --- a/package/supl/patches/patch-src_supl_h +++ /dev/null @@ -1,19 +0,0 @@ - - implement bind to device functionality ---- trunk.orig/src/supl.h 2011-10-21 20:08:29.000000000 +0200 -+++ trunk/src/supl.h 2013-04-24 18:52:14.916232733 +0200 -@@ -19,6 +19,7 @@ - #include <openssl/ssl.h> - #include <PDU.h> - #include <ULP-PDU.h> -+#include <net/if.h> - - #define SUPL_PORT "7275" - -@@ -204,6 +205,7 @@ typedef struct supl_ctx_s { - size_t size; - } slp_session_id; - -+ char iface[IFNAMSIZ + 1]; - } supl_ctx_t; - - int supl_ctx_new(supl_ctx_t *ctx); diff --git a/package/sysdig/Makefile b/package/sysdig/Makefile deleted file mode 100644 index ddc36cd53..000000000 --- a/package/sysdig/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:= sysdig -PKG_VERSION:= ce24a1dd0925c0ed5df9c3e3e290817f536715cf -PKG_GIT:= hash -PKG_RELEASE:= 1 -PKG_DESCR:= system troubleshooting tool -PKG_SECTION:= app/debug -PKG_DEPENDS:= zlib jsoncpp luajit jq libressl libcurl -PKG_BUILDDEP:= cmake-host zlib jsoncpp luajit jq libressl -PKG_BUILDDEP+= curl -PKG_KDEPENDS:= ftrace generic-tracer function-tracer -PKG_NEEDS:= c++ -PKG_URL:= http://www.sysdig.org/ -PKG_SITES:= https://github.com/draios/sysdig.git - -PKG_SYSTEM_DEPENDS:= !mikrotik-rb532 - -include $(ADK_TOPDIR)/mk/package.mk -include $(ADK_TOPDIR)/mk/$(ADK_TARGET_OS)-ver.mk - -$(eval $(call PKG_template,SYSDIG,sysdig,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -CONFIG_STYLE:= cmake -CMAKE_FLAGS:= -DUSE_BUNDLED_DEPS=OFF -DUSE_BUNDLED_B64=ON -XAKE_FLAGS+= KERNELDIR="$(LINUX_DIR)" \ - ARCH=$(ADK_TARGET_ARCH) - -sysdig-install: - $(INSTALL_DIR) $(IDIR_SYSDIG)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/sysdig \ - $(IDIR_SYSDIG)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/csysdig \ - $(IDIR_SYSDIG)/usr/bin - $(INSTALL_DIR) $(IDIR_SYSDIG)/usr/share - $(CP) $(WRKINST)/usr/share/* \ - $(IDIR_SYSDIG)/usr/share - ${INSTALL_DIR} ${IDIR_SYSDIG}/etc/modules.d/ - echo "sysdig-probe" > ${IDIR_SYSDIG}/etc/modules.d/90-sysdig - ${INSTALL_DIR} ${IDIR_SYSDIG}/lib/modules/${KERNEL_VERSION}/ - ${INSTALL_DATA} ${WRKBUILD}/driver/sysdig-probe.ko \ - ${IDIR_SYSDIG}/lib/modules/${KERNEL_VERSION} - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile index 81ac044f3..b2ce09edf 100644 --- a/package/syslog-ng/Makefile +++ b/package/syslog-ng/Makefile @@ -4,12 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= syslog-ng -PKG_VERSION:= 3.14.1 +PKG_VERSION:= 4.6.0 PKG_RELEASE:= 1 -PKG_HASH:= 235b1ac46fe4f3b06b3e945d000276f07deb8243be05d63c04aff06ab6123b64 +PKG_HASH:= a5f8b089887767b5e87f523562fc3c6d5ef4dd320fc9b1f44953cb2d6bd50026 PKG_DESCR:= powerful syslog daemon PKG_SECTION:= sys/misc -PKG_BUILDDEP:= cmake-host glib ivykis libressl json-c libnet flex +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/ @@ -26,7 +27,11 @@ CMAKE_FLAGS+= -DSYSLOG_NG_ENABLE_SYSTEMD=OFF \ -DSYSLOG_NG_ENABLE_TCP_WRAPPER=OFF \ -DENABLE_CURL=OFF \ -DENABLE_JAVA=OFF \ - -DENABLE_JAVA_MODULES=OFF + -DENABLE_PYTHON=OFF \ + -DENABLE_JAVA_MODULES=OFF \ + -DBUILD_TESTING=OFF \ + -DENABLE_AFSNMP=OFF \ + -DENABLE_EXAMPLE_MODULES=OFF syslog-ng-install: ${INSTALL_DIR} ${IDIR_SYSLOG_NG}/usr/sbin \ diff --git a/package/syslog-ng/patches/patch-CMakeLists_txt b/package/syslog-ng/patches/patch-CMakeLists_txt new file mode 100644 index 000000000..a5cd89d57 --- /dev/null +++ b/package/syslog-ng/patches/patch-CMakeLists_txt @@ -0,0 +1,10 @@ +--- syslog-ng-syslog-ng-4.6.0.orig/CMakeLists.txt 2024-01-25 10:09:33.000000000 +0100 ++++ syslog-ng-syslog-ng-4.6.0/CMakeLists.txt 2024-02-13 15:32:51.471547962 +0100 +@@ -474,7 +474,6 @@ add_subdirectory(syslog-ng) + add_subdirectory(syslog-ng-ctl) + add_subdirectory(persist-tool) + add_subdirectory(tests) +-add_subdirectory(libtest) + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/syslog-ng-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/syslog-ng-config.h) + diff --git a/package/sysstat/Makefile b/package/sysstat/Makefile index bfba99de8..fb98f7d2b 100644 --- a/package/sysstat/Makefile +++ b/package/sysstat/Makefile @@ -4,17 +4,21 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= sysstat -PKG_VERSION:= 11.4.4 +PKG_VERSION:= 12.7.5 PKG_RELEASE:= 1 -PKG_HASH:= 6585f08e24347d2d6462aee6ef97e80fe4cc869605193184500df0f80fa61cc8 +PKG_HASH:= a4d30e37c0c894214b941b51184723e19d492118c946cfdeac74b6d1f0068016 PKG_DESCR:= system monitoring and performance analysis PKG_SECTION:= sys/utils -PKG_SITES:= http://pagesperso-orange.fr/sebastien.godard/ +PKG_SITES:= https://github.com/sysstat/sysstat/archive/refs/tags/ + +DISTFILES:= v$(PKG_VERSION).tar.gz include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,SYSSTAT,sysstat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ENV+= sa_lib_dir=/usr/lib/sa + sysstat-install: ${INSTALL_DIR} ${IDIR_SYSSTAT}/usr/lib/sa ${INSTALL_DIR} ${IDIR_SYSSTAT}/usr/bin diff --git a/package/sysstat/patches/patch-Makefile b/package/sysstat/patches/patch-Makefile deleted file mode 100644 index 21cc0e994..000000000 --- a/package/sysstat/patches/patch-Makefile +++ /dev/null @@ -1,79 +0,0 @@ -$Id$ - - removes manpages, some chown-stuff and the cron-stuff (no need for it) - fixes cross-compilation - ---- sysstat-7.0.3.orig/Makefile Sun Oct 22 16:27:03 2006 -+++ sysstat-7.0.3/Makefile Fri May 18 18:31:06 2007 -@@ -7,7 +7,7 @@ VERSION = 7.0.3 - include build/CONFIG - - # Compiler to use --CC = gcc -+CC ?= gcc - # Other commands - SED = sed - CHMOD = chmod -@@ -37,8 +37,9 @@ NLS_DIR = $(PREFIX)/share/locale - SYSCONFIG_DIR = /etc/sysconfig - - # Compiler flags --CFLAGS = -Wall -Wstrict-prototypes -pipe -O2 -fno-strength-reduce --LFLAGS = -s -+CFLAGS ?= -O2 -pipe -+CFLAGS += -Wall -Wstrict-prototypes -fno-strength-reduce -+LFLAGS = -s ${LDFLAGS} - # SAS_DFLAGS may also contain SMP_RACE definition - SAS_DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\" - -@@ -179,10 +180,8 @@ endif - .PHONY: clean distclean config install install_base install_all uninstall \ - uninstall_base uninstall_all dist bdist - --install_base: all man/sadc.8 man/sar.1 man/sadf.1 man/sa1.8 man/sa2.8 man/iostat.1 -+install_base: all - mkdir -p $(DESTDIR)$(SA_LIB_DIR) -- mkdir -p $(DESTDIR)$(MAN1_DIR) -- mkdir -p $(DESTDIR)$(MAN8_DIR) - mkdir -p $(DESTDIR)$(SA_DIR) - ifeq ($(CLEAN_SA_DIR),y) - rm -f $(DESTDIR)$(SA_DIR)/sa?? -@@ -191,19 +190,12 @@ endif - mkdir -p $(DESTDIR)$(DOC_DIR) - mkdir -p $(DESTDIR)$(SYSCONFIG_DIR) - install -m 755 sa1 $(DESTDIR)$(SA_LIB_DIR) -- install -m 644 $(MANGRPARG) man/sa1.8 $(DESTDIR)$(MAN8_DIR) - install -m 755 sa2 $(DESTDIR)$(SA_LIB_DIR) -- install -m 644 $(MANGRPARG) man/sa2.8 $(DESTDIR)$(MAN8_DIR) - install -m 755 sadc $(DESTDIR)$(SA_LIB_DIR) -- install -m 644 $(MANGRPARG) man/sadc.8 $(DESTDIR)$(MAN8_DIR) - install -m 755 sar $(DESTDIR)$(BIN_DIR) -- install -m 644 $(MANGRPARG) man/sar.1 $(DESTDIR)$(MAN1_DIR) - install -m 755 sadf $(DESTDIR)$(BIN_DIR) -- install -m 644 $(MANGRPARG) man/sadf.1 $(DESTDIR)$(MAN1_DIR) - install -m 755 iostat $(DESTDIR)$(BIN_DIR) -- install -m 644 $(MANGRPARG) man/iostat.1 $(DESTDIR)$(MAN1_DIR) - install -m 755 mpstat $(DESTDIR)$(BIN_DIR) -- install -m 644 $(MANGRPARG) man/mpstat.1 $(DESTDIR)$(MAN1_DIR) - install -m 644 sysstat.ioconf $(DESTDIR)$(SYSCONFIG_DIR); - install -m 644 CHANGES $(DESTDIR)$(DOC_DIR) - install -m 644 COPYING $(DESTDIR)$(DOC_DIR) -@@ -243,18 +235,6 @@ ifdef REQUIRE_NLS - endif - - install_all: install_base -- $(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR) -- if [ -d $(DESTDIR)/etc/cron.d ]; then \ -- install -m 644 sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \ -- elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \ -- install -m 755 sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \ -- install -m 755 sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \ -- else \ -- su $(CRON_OWNER) -c "crontab -l > /tmp/crontab-$(CRON_OWNER).save"; \ -- $(CP) -a /tmp/crontab-$(CRON_OWNER).save ./crontab-$(CRON_OWNER).`date '+%Y%m%d.%H%M%S'`.save; \ -- echo "USER PREVIOUS CRONTAB SAVED IN CURRENT DIRECTORY (USING .save SUFFIX)."; \ -- su $(CRON_OWNER) -c "crontab crontab"; \ -- fi - if [ -d $(DESTDIR)$(INIT_DIR) ]; then \ - install -m 755 sysstat $(DESTDIR)$(INIT_DIR)/sysstat; \ - if [ -x $(CHKCONFIG) ]; then \ diff --git a/package/systemd/Makefile b/package/systemd/Makefile deleted file mode 100644 index 2e38a7e8d..000000000 --- a/package/systemd/Makefile +++ /dev/null @@ -1,155 +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:= systemd -PKG_VERSION:= 249 -PKG_RELEASE:= 1 -PKG_HASH:= 174091ce5f2c02123f76d546622b14078097af105870086d18d55c1c2667d855 -PKG_DESCR:= system and service manager -PKG_SECTION:= base/init -PKG_DEPENDS:= libcap libmount libuuid libblkid libncurses libkmod -PKG_BUILDDEP:= intltool-host gperf-host libcap util-linux -PKG_BUILDDEP+= python3-host gettext-host kmod meson-host ninja-host -PKG_BUILDDEP+= python3-jinja2-host -PKG_KDEPENDS:= inotify-user cgroups namespaces fhandle tmpfs-posix-acl tmpfs-xattr -PKG_KDEPENDS+= uts-ns autofs4-fs fanotify -PKG_NEEDS:= locale intl -PKG_URL:= https://wiki.freedesktop.org/www/Software/systemd/ -PKG_SITES:= https://github.com/systemd/systemd/archive/ - -PKG_CFLINE_SYSTEMD:= select BUSYBOX_SULOGIN if ADK_RUNTIME_BASE_BUSYBOX -PKG_LIBC_DEPENDS:= !musl - -PKG_FLAVOURS_SYSTEMD:= WITH_PAM WITH_XZ WITH_ZLIB -PKGFD_WITH_PAM:= enable pam support -PKGFS_WITH_PAM:= pam -PKGFB_WITH_PAM:= pam -PKGFD_WITH_XZ:= enable xz support -PKGFS_WITH_XZ:= xz -PKGFB_WITH_XZ:= xz -PKGFD_WITH_ZLIB:= enable zlib support -PKGFS_WITH_ZLIB:= zlib -PKGFB_WITH_ZLIB:= zlib - -DISTFILES:= v$(PKG_VERSION).tar.gz - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,SYSTEMD,systemd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj - -CONFIG_STYLE:= meson -BUILD_STYLE:= meson -INSTALL_STYLE:= meson - -MESON_FLAGS+= -Drootlibdir='/usr/lib' \ - -Dsysvinit-path='' \ - -Dsplit-bin=true \ - -Dsplit-usr=true \ - -Dman=false \ - -Dima=false \ - -Dlibcryptsetup=false \ - -Defi=false \ - -Dgnu-efi=false \ - -Dldconfig=false \ - -Ddefault-dnssec=no \ - -Dtests=false \ - -Dkmod-path=/usr/bin/kmod \ - -Dkexec-path=/usr/sbin/kexec \ - -Dsulogin-path=/sbin/sulogin \ - -Dmount-path=/bin/mount \ - -Dumount-path=/bin/umount \ - -Dacl=false \ - -Daudit=false \ - -Didn=false \ - -Dmode=release \ - -Dnss-systemd=true \ - -Dresolve=false \ - -Dseccomp=false \ - -Dxkbcommon=false \ - -Dbzip2=false \ - -Dlz4=false \ - -Dlibcurl=false \ - -Dgcrypt=false \ - -Dqrencode=false \ - -Dmicrohttpd=false \ - -Dselinux=false \ - -Dhwdb=false \ - -Dportabled=false \ - -Dbinfmt=false \ - -Dvconsole=false \ - -Dquotacheck=false \ - -Dbacklight=false \ - -Drfkill=false \ - -Dmachined=false \ - -Dimportd=false \ - -Dhostnamed=false \ - -Dlocaled=false \ - -Dcoredump=false \ - -Dsmack=false \ - -Dsysusers=false \ - -Dhibernate=false \ - -Dpolkit=true \ - -Dnetworkd=true \ - -Dtimesyncd=true \ - -Dtmpfiles=true \ - -Dnss-systemd=true \ - -Dfirstboot=true \ - -Drandomseed=true \ - -Dlogind=true \ - -Dtimedated=true - - -ifeq ($(ADK_PACKAGE_SYSTEMD_WITH_PAM),y) -MESON_FLAGS+= -Dpam=true -else -MESON_FLAGS+= -Dpam=false -endif - -ifeq ($(ADK_PACKAGE_SYSTEMD_WITH_XZ),y) -MESON_FLAGS+= -Dxz=true -else -MESON_FLAGS+= -Dxz=false -endif - -ifeq ($(ADK_PACKAGE_SYSTEMD_WITH_ZLIB),y) -MESON_FLAGS+= -Dzlib=true -else -MESON_FLAGS+= -Dzlib=false -endif - -systemd-install: - $(INSTALL_DIR) $(IDIR_SYSTEMD)/etc - touch $(IDIR_SYSTEMD)/etc/machine-id - $(CP) $(WRKINST)/etc/* \ - $(IDIR_SYSTEMD)/etc - $(INSTALL_DIR) $(IDIR_SYSTEMD)/lib/systemd - $(CP) $(WRKINST)/lib/systemd/* \ - $(IDIR_SYSTEMD)/lib/systemd - $(INSTALL_DIR) $(IDIR_SYSTEMD)/usr/lib - $(CP) $(WRKINST)/usr/lib/*.so* \ - $(IDIR_SYSTEMD)/usr/lib - $(CP) $(WRKINST)/usr/lib/{systemd,kernel,sysctl.d,tmpfiles.d} \ - $(IDIR_SYSTEMD)/usr/lib - $(INSTALL_DIR) $(IDIR_SYSTEMD)/sbin - $(CP) $(WRKINST)/sbin/* \ - $(IDIR_SYSTEMD)/sbin - $(INSTALL_DIR) $(IDIR_SYSTEMD)/bin - $(CP) $(WRKINST)/bin/* \ - $(IDIR_SYSTEMD)/bin - $(INSTALL_DIR) $(IDIR_SYSTEMD)/usr/bin - $(CP) $(WRKINST)/usr/bin/* \ - $(IDIR_SYSTEMD)/usr/bin - $(INSTALL_DIR) $(IDIR_SYSTEMD)/usr/share - $(CP) $(WRKINST)/usr/share/* \ - $(IDIR_SYSTEMD)/usr/share - $(CP) ./files/*.network \ - $(IDIR_SYSTEMD)/etc/systemd/network - (cd $(IDIR_SYSTEMD)/lib/systemd/system && ln -sf multi-user.target default.target) - $(CP) $(WRKBUILD)/systemd $(IDIR_SYSTEMD)/usr/lib/systemd/ - mv $(IDIR_SYSTEMD)/lib/systemd/libsystemd-shared-249.so $(IDIR_SYSTEMD)/lib - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/systemd/files/systemd.postinst b/package/systemd/files/systemd.postinst deleted file mode 100644 index 76e213117..000000000 --- a/package/systemd/files/systemd.postinst +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -gid=$(get_next_gid) -add_group utmp $gid -gid=$(get_next_gid) -add_group systemd-journal $gid -gid=$(get_next_gid) -add_group systemd-bus-proxy $gid -add_user systemd-bus-proxy $(get_next_uid) $gid / -gid=$(get_next_gid) -add_group systemd-journal-gateway $gid -add_user systemd-journal-gateway $(get_next_uid) $gid / -gid=$(get_next_gid) -add_group systemd-journal-remote $gid -add_user systemd-journal-remote $(get_next_uid) $gid / -gid=$(get_next_gid) -add_group systemd-journal-upload $gid -add_user systemd-journal-upload $(get_next_uid) $gid / -gid=$(get_next_gid) -add_group systemd-network $gid -add_user systemd-network $(get_next_uid) $gid / -gid=$(get_next_gid) -add_group systemd-resolve $gid -add_user systemd-resolve $(get_next_uid) $gid / -gid=$(get_next_gid) -add_group systemd-timesync $gid -add_user systemd-timesync $(get_next_uid) $gid / diff --git a/package/systemd/files/wired.network b/package/systemd/files/wired.network deleted file mode 100644 index 9613cc040..000000000 --- a/package/systemd/files/wired.network +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Name=en* - -[Network] -DHCP=ipv4 diff --git a/package/taglib/Makefile b/package/taglib/Makefile index b79595790..9297caf75 100644 --- a/package/taglib/Makefile +++ b/package/taglib/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= taglib -PKG_VERSION:= 1.9.1 +PKG_VERSION:= 1.13.1 PKG_RELEASE:= 1 -PKG_HASH:= 72d371cd1419a87ae200447a53bff2be219283071e80fd12337928cc967dc71a +PKG_HASH:= c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b PKG_DESCR:= audio meta-data library PKG_SECTION:= libs/audio PKG_DEPENDS:= zlib @@ -31,7 +31,7 @@ do-configure: taglib-install: $(INSTALL_DIR) $(IDIR_TAGLIB)/usr/lib - $(CP) $(WRKINST)/usr/lib/libtag*.so* \ + -$(CP) $(WRKINST)/usr/lib/libtag*.so* \ $(IDIR_TAGLIB)/usr/lib include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/taglib/patches/patch-taglib_pc_cmake b/package/taglib/patches/patch-taglib_pc_cmake deleted file mode 100644 index 2a468ba8c..000000000 --- a/package/taglib/patches/patch-taglib_pc_cmake +++ /dev/null @@ -1,19 +0,0 @@ ---- taglib-1.8.orig/taglib.pc.cmake 2012-09-06 20:03:15.000000000 +0200 -+++ taglib-1.8/taglib.pc.cmake 2013-07-31 11:57:48.000000000 +0200 -@@ -1,11 +1,11 @@ - prefix=${CMAKE_INSTALL_PREFIX} --exec_prefix=${CMAKE_INSTALL_PREFIX} --libdir=${LIB_INSTALL_DIR} --includedir=${INCLUDE_INSTALL_DIR} -+exec_prefix=$prefix -+libdir=$prefix/lib -+includedir=$prefix/include - - Name: TagLib - Description: Audio meta-data library - Requires: - Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION} --Libs: -L${LIB_INSTALL_DIR} -ltag --Cflags: -I${INCLUDE_INSTALL_DIR}/taglib -+Libs: -ltag -+Cflags: diff --git a/package/talloc/Makefile b/package/talloc/Makefile index 865a95b47..a296a7306 100644 --- a/package/talloc/Makefile +++ b/package/talloc/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= talloc -PKG_VERSION:= 2.1.9 +PKG_VERSION:= 2.4.2 PKG_RELEASE:= 1 -PKG_HASH:= f0aad4cb88a3322207c82136ddc07bed48a37c2c21f82962d6c5ccb422711062 +PKG_HASH:= 85ecf9e465e20f98f9950a52e9a411e14320bc555fa257d87697b7e7a9b1d8a6 PKG_DESCR:= memory allocation library PKG_SECTION:= libs/misc -PKG_BUILDDEP:= python2-host python2 +PKG_BUILDDEP:= python3-host python3 PKG_URL:= https://talloc.samba.org/talloc/doc/html/index.html PKG_SITES:= https://www.samba.org/ftp/talloc/ PKG_LIBNAME:= libtalloc @@ -23,6 +23,7 @@ $(eval $(call PKG_template,LIBTALLOC,libtalloc,$(PKG_VERSION)-$(PKG_RELEASE),$(P CONFIG_STYLE:= minimal CONFIGURE_ARGS+= --prefix=/usr \ + --disable-python \ --cross-compile \ --cross-answers=$(WRKSRC)/cache.txt \ --hostcc=gcc diff --git a/package/tar/Makefile b/package/tar/Makefile index 57b9d3ad3..7d1bb84c4 100644 --- a/package/tar/Makefile +++ b/package/tar/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= tar -PKG_VERSION:= 1.29 +PKG_VERSION:= 1.35 PKG_RELEASE:= 1 -PKG_HASH:= 402dcfd0022fd7a1f2c5611f5c61af1cd84910a760a44a688e18ddbff4e9f024 +PKG_HASH:= 4d62ff37342ec7aed748535323930c7cf94acf71c3591882b26a7ea50f3edc16 PKG_DESCR:= archiving application PKG_SECTION:= app/archive PKG_URL:= http://mirrors.kernel.org/gnu/tar/ diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 47cc97584..1bfaaa7b7 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= tcpdump -PKG_VERSION:= 4.9.3 +PKG_VERSION:= 4.99.4 PKG_RELEASE:= 1 -PKG_HASH:= 2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410 +PKG_HASH:= 0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea PKG_DESCR:= tool for network monitoring and data acquisition PKG_SECTION:= net/debug PKG_DEPENDS:= libpcap @@ -39,7 +39,7 @@ XAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" \ INCLS="-I. -I${STAGING_TARGET_DIR}/usr/include" tcpdump-install: - ${INSTALL_DIR} ${IDIR_TCPDUMP}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/tcpdump ${IDIR_TCPDUMP}/usr/sbin + ${INSTALL_DIR} ${IDIR_TCPDUMP}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/tcpdump ${IDIR_TCPDUMP}/usr/bin include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/tcsh/Makefile b/package/tcsh/Makefile index 74e319ffd..b98f6136b 100644 --- a/package/tcsh/Makefile +++ b/package/tcsh/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= tcsh -PKG_VERSION:= 6.19.00 +PKG_VERSION:= 6.24.10 PKG_RELEASE:= 1 -PKG_HASH:= 12e271e0b89e4259d9d6e8d525322e77340e7244cfbd199a591e5f8146285c49 +PKG_HASH:= 13475c0fbeb74139d33ed793bf00ffbbb2ac2dc9fb1d44467a410760aba36664 PKG_DESCR:= alternative csh PKG_SECTION:= base/shells PKG_DEPENDS:= libncurses diff --git a/package/tcsh/patches/patch-Makefile_in b/package/tcsh/patches/patch-Makefile_in index d573b8df2..300c1632b 100644 --- a/package/tcsh/patches/patch-Makefile_in +++ b/package/tcsh/patches/patch-Makefile_in @@ -1,11 +1,11 @@ ---- tcsh-6.19.00.orig/Makefile.in 2014-07-25 00:52:13.000000000 +0200 -+++ tcsh-6.19.00/Makefile.in 2015-11-07 23:08:07.000000000 +0100 -@@ -449,7 +449,7 @@ pure:$(P) ${OBJS} +--- tcsh-6.24.10.orig/Makefile.in 2023-04-14 13:52:38.000000000 +0200 ++++ tcsh-6.24.10/Makefile.in 2024-02-11 09:31:36.700281877 +0100 +@@ -506,7 +506,7 @@ pure:$(P) ${OBJS} + # emxbind tcsh - gethost: gethost.c sh.err.h tc.const.h sh.h - rm -f gethost -- ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} ${CFLAGS} $(srcdir)/gethost.c -+ ${CC_FOR_GETHOST} -o gethost $(srcdir)/gethost.c + gethost.${SUF}: gethost.c sh.err.h tc.const.h sh.h +- ${CC_FOR_GETHOST} ${CF} ${CPPFLAGS} ${CFLAGS} $(srcdir)/gethost.c ++ ${CC_FOR_GETHOST} ${CF} $(srcdir)/gethost.c - tc.defs.c: gethost host.defs - @rm -f $@.tmp + gethost: gethost.${SUF} + rm -f gethost diff --git a/package/tcsh/patches/patch-sh_h b/package/tcsh/patches/patch-sh_h deleted file mode 100644 index 2882aefe9..000000000 --- a/package/tcsh/patches/patch-sh_h +++ /dev/null @@ -1,23 +0,0 @@ ---- tcsh-6.19.00.orig/sh.h 2015-05-10 15:29:28.000000000 +0200 -+++ tcsh-6.19.00/sh.h 2015-11-07 23:06:35.000000000 +0100 -@@ -366,7 +366,7 @@ typedef long tcsh_number_t; - # include <sys/filio.h> - #endif /* (!FIOCLEX && SUNOS4) || (SYSVREL == 4 && !_SEQUENT_ && !SCO && !_SX ) */ - --#if !defined(_MINIX) && !defined(supermax) && !defined(WINNT_NATIVE) && !defined(IRIS4D) -+#if !defined(_MINIX) && !defined(supermax) && !defined(WINNT_NATIVE) && !defined(IRIS4D) && !defined(__FreeBSD__) - # include <sys/file.h> - #endif /* !_MINIX && !supermax && !WINNT_NATIVE && !defined(IRIS4D) */ - -@@ -400,9 +400,11 @@ typedef long tcsh_number_t; - #include <pwd.h> - #include <grp.h> - #endif /* WINNT_NATIVE */ -+#if !defined(BSD) - #ifdef HAVE_SHADOW_H - # include <shadow.h> - #endif /* HAVE_SHADOW_H */ -+#endif - #ifdef HAVE_AUTH_H - # include <auth.h> - #endif /* HAVE_AUTH_H */ diff --git a/package/tcsh/patches/patch-sh_proc_c b/package/tcsh/patches/patch-sh_proc_c deleted file mode 100644 index 9b5e277ba..000000000 --- a/package/tcsh/patches/patch-sh_proc_c +++ /dev/null @@ -1,11 +0,0 @@ ---- tcsh-6.19.00.orig/sh.proc.c 2015-02-22 22:40:14.000000000 +0100 -+++ tcsh-6.19.00/sh.proc.c 2015-11-07 23:06:36.000000000 +0100 -@@ -47,7 +47,7 @@ RCSID("$tcsh: sh.proc.c,v 3.127 2015/02/ - # define HZ 16 - #endif /* aiws */ - --#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) -+#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__GNU__) || defined(__GLIBC__) - # if !defined(__ANDROID__) - # define BSDWAIT - # endif diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile index 933fb95e4..47894b558 100644 --- a/package/tinyproxy/Makefile +++ b/package/tinyproxy/Makefile @@ -4,33 +4,30 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= tinyproxy -PKG_VERSION:= 1.8.4 +PKG_VERSION:= 1.11.0 PKG_RELEASE:= 1 -PKG_HASH:= 1999c88c43e31ff4cb5e8379b76776a65fa3d326eea868cb5f88ef58a8f631de +PKG_HASH:= c1ec81cfc4c551d2c24e0227a5aeeaad8723bd9a39b61cd729e516b82eaa3f32 PKG_DESCR:= lightweight http and https proxy PKG_SECTION:= net/proxy PKG_URL:= https://tinyproxy.github.io -PKG_SITES:= https://github.com/tinyproxy/tinyproxy/archive/ - -DISTFILES:= $(PKG_VERSION).tar.gz +PKG_SITES:= https://github.com/tinyproxy/tinyproxy/releases/download/$(PKG_VERSION)/ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,TINYPROXY,tinyproxy,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -AUTOTOOL_STYLE:= autoreconf -CONFIGURE_ARGS+= --disable-regexcheck +CONFIGURE_ARGS+= --disable-manpage_support CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes tinyproxy-install: - $(INSTALL_DIR) $(IDIR_TINYPROXY)/usr/sbin - $(INSTALL_DIR) $(IDIR_TINYPROXY)/etc + $(INSTALL_DIR) $(IDIR_TINYPROXY)/usr/bin + $(INSTALL_DIR) $(IDIR_TINYPROXY)/etc/tinyproxy $(INSTALL_DIR) $(IDIR_TINYPROXY)/usr/share/tinyproxy $(INSTALL_DATA) ./files/tinyproxy.conf \ - $(IDIR_TINYPROXY)/etc - $(INSTALL_BIN) $(WRKINST)/usr/sbin/tinyproxy \ - $(IDIR_TINYPROXY)/usr/sbin/ + $(IDIR_TINYPROXY)/etc/tinyproxy/ + $(INSTALL_BIN) $(WRKINST)/usr/bin/tinyproxy \ + $(IDIR_TINYPROXY)/usr/bin/ $(INSTALL_DATA) $(WRKINST)/usr/share/tinyproxy/{default,stats,debug}.html \ $(IDIR_TINYPROXY)/usr/share/tinyproxy/ diff --git a/package/tinyproxy/files/tinyproxy.conf b/package/tinyproxy/files/tinyproxy.conf index 798231b12..c9ee8d178 100644 --- a/package/tinyproxy/files/tinyproxy.conf +++ b/package/tinyproxy/files/tinyproxy.conf @@ -137,28 +137,6 @@ PidFile "/var/run/tinyproxy/tinyproxy.pid" MaxClients 100 # -# These settings set the upper and lower limit for the number of -# spare servers which should be available. If the number of spare servers -# falls below MinSpareServers then new ones will be created. If the number -# of servers exceeds MaxSpareServers then the extras will be killed off. -# -MinSpareServers 5 -MaxSpareServers 20 - -# -# Number of servers to start initially. -# -StartServers 10 - -# -# MaxRequestsPerChild is the number of connections a thread will handle -# before it is killed. In practise this should be set to 0, which disables -# thread reaping. If you do notice problems with memory leakage, then set -# this to something like 10000 -# -MaxRequestsPerChild 0 - -# # The following is the authorization controls. If there are any access # control keywords then the default action is to DENY. Otherwise, the # default action is ALLOW. diff --git a/package/tinyproxy/files/tinyproxy.init b/package/tinyproxy/files/tinyproxy.init index e0a8b9a81..9a140db56 100644 --- a/package/tinyproxy/files/tinyproxy.init +++ b/package/tinyproxy/files/tinyproxy.init @@ -13,10 +13,10 @@ autostart) start) mkdir -p /var/run/tinyproxy chown tinyproxy.tinyproxy /var/run/tinyproxy - /usr/sbin/tinyproxy + /usr/bin/tinyproxy ;; stop) - kill $(pgrep -f /usr/sbin/tinyproxy) + kill $(pgrep -f /usr/bin/tinyproxy) ;; restart) sh $0 stop diff --git a/package/tinyproxy/patches/patch-Makefile_am b/package/tinyproxy/patches/patch-Makefile_am deleted file mode 100644 index 443ae2e78..000000000 --- a/package/tinyproxy/patches/patch-Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ ---- tinyproxy-1.8.3.orig/Makefile.am 2011-08-16 14:14:34.000000000 +0200 -+++ tinyproxy-1.8.3/Makefile.am 2014-04-07 08:43:20.000000000 +0200 -@@ -2,7 +2,6 @@ SUBDIRS = \ - src \ - data \ - etc \ -- docs \ - m4macros \ - tests - diff --git a/package/tinyproxy/patches/patch-configure_ac b/package/tinyproxy/patches/patch-configure_ac deleted file mode 100644 index b3fd83dc9..000000000 --- a/package/tinyproxy/patches/patch-configure_ac +++ /dev/null @@ -1,27 +0,0 @@ ---- tinyproxy-1.8.3.orig/configure.ac 2011-08-16 14:14:58.000000000 +0200 -+++ tinyproxy-1.8.3/configure.ac 2014-04-07 08:43:06.000000000 +0200 -@@ -282,24 +282,12 @@ AC_SUBST(CPPFLAGS) - AC_SUBST(LIBS) - AC_SUBST(ADDITIONAL_OBJECTS) - --# Check for asciidoc --AC_PATH_PROG(A2X, a2x, no) --AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno") --if test x"$A2X" = x"no"; then -- AC_MSG_ERROR([Test for asciidoc failed. See the file 'INSTALL' for help.]) --fi -- - AC_CONFIG_FILES([ - Makefile - src/Makefile - data/Makefile - data/templates/Makefile - etc/Makefile --docs/Makefile --docs/man5/Makefile --docs/man5/tinyproxy.conf.txt --docs/man8/Makefile --docs/man8/tinyproxy.txt - m4macros/Makefile - tests/Makefile - tests/scripts/Makefile diff --git a/package/tinyxml2/Makefile b/package/tinyxml2/Makefile new file mode 100644 index 000000000..e1555bcec --- /dev/null +++ b/package/tinyxml2/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:= tinyxml2 +PKG_VERSION:= 10.0.0 +PKG_RELEASE:= 1 +PKG_HASH:= 3bdf15128ba16686e69bce256cc468e76c7b94ff2c7f391cc5ec09e40bff3839 +PKG_DESCR:= small xml library +PKG_SECTION:= libs/misc +PKG_BUILDDEP+= meson-host +PKG_SITES:= https://github.com/leethomason/tinyxml2/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,TINYXML2,tinyxml2,$(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 + +tinyxml2-install: + $(INSTALL_DIR) $(IDIR_TINYXML2)/usr/lib + $(CP) $(WRKINST)/usr/lib/libtinyxml2*.so* \ + $(IDIR_TINYXML2)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/tmux/Makefile b/package/tmux/Makefile index e208b566f..bd8d418f4 100644 --- a/package/tmux/Makefile +++ b/package/tmux/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= tmux -PKG_VERSION:= 2.9 +PKG_VERSION:= 3.2a PKG_RELEASE:= 1 -PKG_HASH:= 34901232f486fd99f3a39e864575e658b5d49f43289ccc6ee57c365f2e2c2980 +PKG_HASH:= 551553a4f82beaa8dadc9256800bcc284d7c000081e47aa6ecbb6ff36eacd05f PKG_DESCR:= terminal multiplexer PKG_SECTION:= sys/utils PKG_BUILDDEP:= libevent ncurses PKG_DEPENDS:= libevent libncurses -PKG_NEEDS:= threads +PKG_NEEDS:= threads locale PKG_URL:= http://tmux.github.io PKG_SITES:= https://github.com/tmux/tmux/releases/download/$(PKG_VERSION)/ @@ -21,6 +21,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,TMUX,tmux,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +AUTOTOOL_STYLE:= autoreconf TARGET_LDFLAGS+= -ltinfo CONFIGURE_ARGS+= --disable-static diff --git a/package/tmux/patches/patch-configure_ac b/package/tmux/patches/patch-configure_ac new file mode 100644 index 000000000..1d70b17ca --- /dev/null +++ b/package/tmux/patches/patch-configure_ac @@ -0,0 +1,22 @@ +--- tmux-3.2a.orig/configure.ac 2021-06-10 10:20:51.000000000 +0200 ++++ tmux-3.2a/configure.ac 2022-03-16 12:00:53.916934376 +0100 +@@ -150,18 +150,10 @@ AC_REPLACE_FUNCS([ \ + strlcpy \ + strndup \ + strsep \ ++ strtonum \ + ]) + AC_FUNC_STRNLEN + +-# Check if strtonum works. +-AC_MSG_CHECKING([for working strtonum]) +-AC_RUN_IFELSE([AC_LANG_PROGRAM( +- [#include <stdlib.h>], +- [return (strtonum("0", 0, 1, NULL) == 0 ? 0 : 1);] +- )], +- [AC_DEFINE(HAVE_STRTONUM) AC_MSG_RESULT(yes)], +- [AC_LIBOBJ(strtonum) AC_MSG_RESULT(no)] +-) + + # Clang sanitizers wrap reallocarray even if it isn't available on the target + # system. When compiled it always returns NULL and crashes the program. To diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile deleted file mode 100644 index 03d3b558e..000000000 --- a/package/tntnet/Makefile +++ /dev/null @@ -1,68 +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:= tntnet -PKG_VERSION:= 2.2.1 -PKG_RELEASE:= 2 -PKG_HASH:= c83170d08ef04c5868051e1c28c74b9562fe71e9e8263828e755ad5bd3547521 -PKG_DESCR:= small c++ application server -PKG_SECTION:= net/http -PKG_DEPENDS:= cxxtools zlib -PKG_BUILDDEP:= cxxtools zlib -PKG_NEEDS:= threads c++ -PKG_URL:= http://www.tntnet.org/ -PKG_SITES:= http://www.tntnet.org/download/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -PKG_CHOICES_TNTNET:= WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL -PKGCD_WITH_LIBRESSL:= use libressl for crypto -PKGCS_WITH_LIBRESSL:= libressl -PKGCB_WITH_LIBRESSL:= libressl -PKGCD_WITH_GNUTLS:= use gnutls for crypto -PKGCS_WITH_GNUTLS:= libgnutls -PKGCB_WITH_GNUTLS:= gnutls -PKGCD_WITHOUT_SSL:= use no ssl - -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,TNTNET,tntnet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -ifeq (${ADK_PACKAGE_TNTNET_WITHOUT_SSL},y) -CONFIGURE_ARGS+= --with-ssl=no -endif -ifeq (${ADK_PACKAGE_TNTNET_WITH_LIBRESSL},y) -CONFIGURE_ARGS+= --with-ssl=openssl -endif -ifeq (${ADK_PACKAGE_TNTNET_WITH_GNUTLS},y) -CONFIGURE_ARGS+= --with-ssl=gnutls -endif - -CONFIGURE_ARGS+= --without-epoll \ - --without-sdk \ - --without-cgi \ - --disable-unittest \ - --disable-locale \ - --without-sendfile -CONFIGURE_ENV+= CXXFLAGS='${TARGET_CXXFLAGS}' \ - ac_cv_path_cxxtools_config=${STAGING_TARGET_DIR}/usr/bin - - -tntnet-install: - ${INSTALL_DIR} ${IDIR_TNTNET}/www - ${INSTALL_DIR} ${IDIR_TNTNET}/etc/tntnet - ${INSTALL_DIR} ${IDIR_TNTNET}/usr/bin - ${INSTALL_DIR} ${IDIR_TNTNET}/usr/lib/tntnet - ${INSTALL_DATA} ./files/tntnet.{xml,properties} \ - ${IDIR_TNTNET}/etc/tntnet - ${INSTALL_DATA} ./files/mime.conf \ - ${IDIR_TNTNET}/etc/tntnet - ${CP} ${WRKINST}/usr/bin/tntnet ${IDIR_TNTNET}/usr/bin - ${CP} ${WRKINST}/usr/lib/tntnet/tntnet.so* \ - ${IDIR_TNTNET}/usr/lib/tntnet - ${CP} ${WRKINST}/usr/lib/libtntnet.so* \ - ${IDIR_TNTNET}/usr/lib - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/tntnet/files/mime.conf b/package/tntnet/files/mime.conf deleted file mode 100644 index bab84a83d..000000000 --- a/package/tntnet/files/mime.conf +++ /dev/null @@ -1,22 +0,0 @@ -DefaultType text/html -AddType text/plain .txt -AddType text/html .html .htm .xhtml -AddType image/png .png -AddType image/gif .gif -AddType image/bmp .bmp -AddType application/x-tar .tgz -AddType image/jpeg .jpeg .jpg -AddType image/tif .tif .tiff -AddType text/css .css -AddType text/plain .asc -AddType text/rtf .rtf -AddType video/mpeg .mpeg .mpg .mpe -AddType application/x-javascript .js -AddType application/msword .doc .dot -AddType application/pdf .pdf -AddType application/postscript .ps .ai .eps -AddType application/vnd.ms-excel .xls .xlb -AddType application/vnd.ms-powerpoint .ppt .pps .pot -AddType application/zip .zip -AddType application/x-gtar .gtar .tgz .taz -AddType application/x-java-archive .jar diff --git a/package/tntnet/files/tntnet.conffiles b/package/tntnet/files/tntnet.conffiles deleted file mode 100644 index def08bf81..000000000 --- a/package/tntnet/files/tntnet.conffiles +++ /dev/null @@ -1,3 +0,0 @@ -/etc/tntnet/tntnet.conf -/etc/tntnet/tntnet.properties -/etc/tntnet/mime.conf diff --git a/package/tntnet/files/tntnet.init b/package/tntnet/files/tntnet.init deleted file mode 100644 index 01bb7a00b..000000000 --- a/package/tntnet/files/tntnet.init +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -#PKG tntnet -#INIT 90 -. /etc/rc.conf - -case $1 in -autostop) ;; -autostart) - test x"${tntnet:-NO}" = x"NO" && exit 0 - test x"$tntnet" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start - exec sh $0 start - ;; -start) - /usr/bin/tntnet /etc/tntnet/tntnet.conf - ;; -stop) - kill $(pgrep -f /usr/bin/tntnet) - ;; -restart) - sh $0 stop - sh $0 start - ;; -*) - echo "usage: $0 {start | stop | restart}" - ;; -esac -exit $? diff --git a/package/tntnet/files/tntnet.postinst b/package/tntnet/files/tntnet.postinst deleted file mode 100644 index 7bdfea5bd..000000000 --- a/package/tntnet/files/tntnet.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf tntnet NO -gid=$(get_next_gid) -add_group tntnet $gid -add_user tntnet $(get_next_uid) $gid /www diff --git a/package/tntnet/files/tntnet.properties b/package/tntnet/files/tntnet.properties deleted file mode 100644 index 3e1006411..000000000 --- a/package/tntnet/files/tntnet.properties +++ /dev/null @@ -1,31 +0,0 @@ -# sample logging-properties for application tntnet -# put this in tntnet.properties and use: -# log_init("tntnet.properties"); -# in your application to initialize logging -# -# define categories with: -# log_define("some.category") -# this defines a static function, so you must put it outside other functions. -# you can define a category per file or a category per namespace. -# -# print logging-messages with: -# log_fatal("some fatal message"); -# log_error("some error message"); -# log_warn("some warn message"); -# log_info("some info message"); -# log_debug("some debug message"); -# -rootLogger=INFO - -# define logger-categories -logger.tntnet=INFO - -file=/var/log/tntnet.log -maxfilesize=1MB -maxbackupindex=10 -flushdelay=100 # delay write in milliseconds -#host=localhost:1234 # send log-messages with udp -#disabled=1 # disable logging -#logprocess=1 # log in separate process -#logprocesuser=someuser # change to user in log process -#logprocesgroup=somegroup # change to group in log process diff --git a/package/tntnet/files/tntnet.xml b/package/tntnet/files/tntnet.xml deleted file mode 100644 index 2d4f160d1..000000000 --- a/package/tntnet/files/tntnet.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<tntnet> - <mappings> - <mapping> - <target>static@tntnet</target> - <url>(.*)/$</url> - <pathinfo>/$1/index.html</pathinfo> - </mapping> - <mapping> - <target>static@tntnet</target> - <url>^/(.*)$</url> - <pathinfo>/$1</pathinfo> - </mapping> - </mappings> - - <listeners> - <listener> - <ip>0.0.0.0</ip> - <port>80</port> - </listener> - </listeners> - - <daemon>1</daemon> - <user>tntnet</user> - <group>tntnet</group> - <maxRequestSize>1048576</maxRequestSize> - <pidFile>/var/run/tntnet.pid</pidFile> - <minThreads>2</minThreads> - <maxThreads>4</maxThreads> - <documentRoot>/www</documentRoot> - <compPath> - <entry>/usr/lib/tntnet</entry> - </compPath> - <logging> - <rootlogger>INFO</rootlogger> - <loggers> - <logger> - <category>tntnet</category> - <level>INFO</level> - </logger> - </loggers> - <!-- <file>tntnet.log</file> --> <!--uncomment if you want to log to a file --> - <!-- <maxfilesize>1MB</maxfilesize> --> - <!-- <maxbackupindex>2</maxbackupindex> --> - <!-- <host>localhost:1234</host> --> <!-- # send log-messages with udp --> - </logging> - - <include>/etc/tntnet/mime.conf</include> -</tntnet> diff --git a/package/tntnet/patches/patch-framework_common_gnutls_cpp b/package/tntnet/patches/patch-framework_common_gnutls_cpp deleted file mode 100644 index 51037f74a..000000000 --- a/package/tntnet/patches/patch-framework_common_gnutls_cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- tntnet-2.2.1.orig/framework/common/gnutls.cpp 2013-12-26 15:08:34.000000000 +0100 -+++ tntnet-2.2.1/framework/common/gnutls.cpp 2014-05-20 06:44:01.000000000 +0200 -@@ -35,6 +35,7 @@ - #include <sys/poll.h> - #include <errno.h> - #include <cxxtools/ioerror.h> -+#include <unistd.h> - - log_define("tntnet.ssl") - diff --git a/package/toolbox/src/Makefile b/package/toolbox/src/Makefile index 50afea707..65009b6ef 100644 --- a/package/toolbox/src/Makefile +++ b/package/toolbox/src/Makefile @@ -57,7 +57,7 @@ SUBDIR+= lsof SUBDIR+= md5 SUBDIR+= mkdir - SUBDIR+= mknod +# SUBDIR+= mknod # does not compile with glibc SUBDIR+= mount SUBDIR+= mv SUBDIR+= netstat diff --git a/package/tor/Makefile b/package/tor/Makefile index bdb73c36d..fc690de3d 100644 --- a/package/tor/Makefile +++ b/package/tor/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= tor -PKG_VERSION:= 0.3.3.6 +PKG_VERSION:= 0.4.8.10 PKG_RELEASE:= 1 -PKG_HASH:= 99bc59f6dbf395894de12f3a83b3251a82dfd93dc7f6d3afcbbd80f6111433b7 +PKG_HASH:= e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86 PKG_DESCR:= anonymous internet communication system PKG_SECTION:= net/proxy PKG_DEPENDS:= libevent zlib libressl @@ -21,7 +21,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,TOR,tor,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf # -DNDEBUG not supported TARGET_CPPFLAGS:= CONFIGURE_ENV+= ac_cv_libevent_normal=yes \ diff --git a/package/tor/patches/patch-src_lib_crypt_ops_crypto_openssl_mgt_c b/package/tor/patches/patch-src_lib_crypt_ops_crypto_openssl_mgt_c new file mode 100644 index 000000000..e15990084 --- /dev/null +++ b/package/tor/patches/patch-src_lib_crypt_ops_crypto_openssl_mgt_c @@ -0,0 +1,14 @@ +--- tor-0.4.8.10.orig/src/lib/crypt_ops/crypto_openssl_mgt.c 2023-12-08 19:49:19.000000000 +0100 ++++ tor-0.4.8.10/src/lib/crypt_ops/crypto_openssl_mgt.c 2024-04-07 11:39:44.453246186 +0200 +@@ -40,6 +40,11 @@ ENABLE_GCC_WARNING("-Wredundant-decls") + + #include <string.h> + ++#ifdef OPENSSL_NO_ENGINE ++/* Android's OpenSSL seems to have removed all of its Engine support. */ ++#define DISABLE_ENGINES ++#endif ++ + #ifndef NEW_THREAD_API + /** A number of preallocated mutexes for use by OpenSSL. */ + static tor_mutex_t **openssl_mutexes_ = NULL; diff --git a/package/tor/patches/patch-src_lib_crypt_ops_crypto_openssl_mgt_h b/package/tor/patches/patch-src_lib_crypt_ops_crypto_openssl_mgt_h new file mode 100644 index 000000000..49f6d2314 --- /dev/null +++ b/package/tor/patches/patch-src_lib_crypt_ops_crypto_openssl_mgt_h @@ -0,0 +1,14 @@ +--- tor-0.4.8.10.orig/src/lib/crypt_ops/crypto_openssl_mgt.h 2023-12-08 19:49:19.000000000 +0100 ++++ tor-0.4.8.10/src/lib/crypt_ops/crypto_openssl_mgt.h 2024-04-07 11:39:44.453246186 +0200 +@@ -49,11 +49,6 @@ + #define OPENSSL_V_SERIES(a,b,c) \ + OPENSSL_VER((a),(b),(c),0,0) + +-#ifdef OPENSSL_NO_ENGINE +-/* Android's OpenSSL seems to have removed all of its Engine support. */ +-#define DISABLE_ENGINES +-#endif +- + #if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,5) + /* OpenSSL as of 1.1.0pre4 has an "new" thread API, which doesn't require + * setting up various callbacks. diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile deleted file mode 100644 index be8a9c09b..000000000 --- a/package/trafshow/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:= trafshow -PKG_VERSION:= 5.2.3 -PKG_RELEASE:= 2 -PKG_HASH:= ea7e22674a66afcc7174779d0f803c1f25b42271973b4f75fab293b8d7db11fc -PKG_DESCR:= traffic analyzing tool -PKG_SECTION:= net/perf -PKG_BUILDDEP:= libpcap ncurses -PKG_DEPENDS:= libpcap libncurses -PKG_NEEDS:= threads -PKG_SITES:= http://distfiles.openadk.org/ -PKG_NOPARALLEL:= 1 - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz - -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,TRAFSHOW,trafshow,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -TARGET_CPPFLAGS+= -DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS -D_GNU_SOURCE -TARGET_LDFLAGS+= -ltinfo - -trafshow-install: - ${INSTALL_DIR} ${IDIR_TRAFSHOW}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/trafshow ${IDIR_TRAFSHOW}/usr/bin/ - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/trafshow/patches/patch-Makefile_in b/package/trafshow/patches/patch-Makefile_in deleted file mode 100644 index f3f681f14..000000000 --- a/package/trafshow/patches/patch-Makefile_in +++ /dev/null @@ -1,54 +0,0 @@ ---- trafshow-5.2.3.orig/Makefile.in 2004-06-15 10:29:14.000000000 +0200 -+++ trafshow-5.2.3/Makefile.in 2011-01-21 23:49:58.988658729 +0100 -@@ -28,21 +28,22 @@ MANDEST = @mandir@ - - PROG = trafshow - CC = @PTHREAD_CC@ --CFLAGS = @CFLAGS@ -Wall -I. @DEFS@ @PTHREAD_CFLAGS@ -+CFLAGS = @CFLAGS@ -Wall @PTHREAD_CFLAGS@ -+CPPFLAGS = -I. @DEFS@ @CPPFLAGS@ - YACC = @YACC@ - YFLAGS = -d -p `echo $@ | sed -e 's/\..*/_/'` - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LFLAGS = - LDFLAGS = @LDFLAGS@ --LIBS = @PTHREAD_LIBS@ @LIBS@ -+LIBS = @PTHREAD_LIBS@ @LIBS@ -pthread - - # Explicitly define compilation rule since SunOS 4's make doesn't like gcc. - # Also, gcc does not remove the .o before forking 'as', which can be a - # problem if you don't own the file but can write to the directory. - .c.o: - @rm -f $@ -- $(CC) $(CFLAGS) -c $*.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c - - CSRC = trafshow.c screen.c colormask.c getkey.c selector.c \ - events.c session.c show_if.c show_stat.c show_dump.c \ -@@ -59,9 +60,11 @@ OBJ = $(CSRC:.c=.o) $(YSRC:.y=.o) $(LSRC - - CLEANFILES = $(PROG) $(OBJ) $(GENSRC) y.tab.h - -+all: $(PROG) -+ - $(PROG): $(OBJ) - @rm -f $@ -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) - - $(OBJ): config.h trafshow.h Makefile - version.o: version.c -@@ -73,9 +76,9 @@ version.c: VERSION Makefile - @echo 'char compiled[] = "$(CC) $(CFLAGS) $(LIBS)";' >> $@ - - install: -- ./install-sh -c -s -m 555 -o bin -g bin $(PROG) $(BINDEST)/$(PROG) -- ./install-sh -c -m 444 -o bin -g bin $(PROG).1 $(MANDEST)/man1/$(PROG).1 -- [ -f /etc/$(PROG) ] || ./install-sh -c -m 444 .trafshow /etc/$(PROG) -+ ./install-sh -c -m 755 $(PROG) $(DESTDIR)$(BINDEST)/$(PROG) -+ ./install-sh -c -m 644 $(PROG).1 $(DESTDIR)$(MANDEST)/man1/$(PROG).1 -+ ./install-sh -c -m 644 .trafshow $(DESTDIR)/etc/$(PROG) - - clean: - rm -f $(CLEANFILES) diff --git a/package/trafshow/patches/patch-domain_resolver_c b/package/trafshow/patches/patch-domain_resolver_c deleted file mode 100644 index dfa619116..000000000 --- a/package/trafshow/patches/patch-domain_resolver_c +++ /dev/null @@ -1,680 +0,0 @@ -$Id$ ---- trafshow-5.2.3.orig/domain_resolver.c 2006-01-08 06:59:23.000000000 +0100 -+++ trafshow-5.2.3/domain_resolver.c 2007-02-04 19:40:27.000000000 +0100 -@@ -28,6 +28,676 @@ - #include <resolv.h> - #endif - -+/* -+ * Copyright (c) 1985, 1993 -+ * The Regents of the University of California. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 4. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+/* -+ * Portions Copyright (c) 1993 by Digital Equipment Corporation. -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies, and that -+ * the name of Digital Equipment Corporation not be used in advertising or -+ * publicity pertaining to distribution of the document or software without -+ * specific, written prior permission. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL -+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT -+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -+ * SOFTWARE. -+ */ -+ -+/* -+ * Portions Copyright (c) 1996-1999 by Internet Software Consortium. -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS -+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE -+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -+ * SOFTWARE. -+ */ -+ -+/* -+ * Copyright (c) 1996,1999 by Internet Software Consortium. -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS -+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE -+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -+ * SOFTWARE. -+ */ -+ -+/* -+ * -+ * DNS helper functions not implemented in uclibc -+ * -+ */ -+ -+#include <ctype.h> -+#include <unistd.h> -+ -+static const char digits[] = "0123456789"; -+ -+/* Forward. */ -+ -+static int special(int); -+static int printable(int); -+static int dn_find(const u_char *, const u_char *, -+ const u_char * const *, -+ const u_char * const *); -+ -+ -+/* -+ * ns_name_ntop(src, dst, dstsiz) -+ * Convert an encoded domain name to printable ascii as per RFC1035. -+ * return: -+ * Number of bytes written to buffer, or -1 (with errno set) -+ * notes: -+ * The root is returned as "." -+ * All other domains are returned in non absolute form -+ */ -+int -+ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { -+ const u_char *cp; -+ char *dn, *eom; -+ u_char c; -+ u_int n; -+ -+ cp = src; -+ dn = dst; -+ eom = dst + dstsiz; -+ -+ while ((n = *cp++) != 0) { -+ if ((n & NS_CMPRSFLGS) != 0) { -+ /* Some kind of compression pointer. */ -+ return (-1); -+ } -+ if (dn != dst) { -+ if (dn >= eom) { -+ return (-1); -+ } -+ *dn++ = '.'; -+ } -+ if (dn + n >= eom) { -+ return (-1); -+ } -+ for ((void)NULL; n > 0; n--) { -+ c = *cp++; -+ if (special(c)) { -+ if (dn + 1 >= eom) { -+ return (-1); -+ } -+ *dn++ = '\\'; -+ *dn++ = (char)c; -+ } else if (!printable(c)) { -+ if (dn + 3 >= eom) { -+ return (-1); -+ } -+ *dn++ = '\\'; -+ *dn++ = digits[c / 100]; -+ *dn++ = digits[(c % 100) / 10]; -+ *dn++ = digits[c % 10]; -+ } else { -+ if (dn >= eom) { -+ return (-1); -+ } -+ *dn++ = (char)c; -+ } -+ } -+ } -+ if (dn == dst) { -+ if (dn >= eom) { -+ return (-1); -+ } -+ *dn++ = '.'; -+ } -+ if (dn >= eom) { -+ return (-1); -+ } -+ *dn++ = '\0'; -+ return (dn - dst); -+} -+ -+/* -+ * ns_name_pton(src, dst, dstsiz) -+ * Convert a ascii string into an encoded domain name as per RFC1035. -+ * return: -+ * -1 if it fails -+ * 1 if string was fully qualified -+ * 0 is string was not fully qualified -+ * notes: -+ * Enforces label and domain length limits. -+ */ -+ -+int -+ns_name_pton(const char *src, u_char *dst, size_t dstsiz) { -+ u_char *label, *bp, *eom; -+ int c, n, escaped; -+ char *cp; -+ -+ escaped = 0; -+ bp = dst; -+ eom = dst + dstsiz; -+ label = bp++; -+ -+ while ((c = *src++) != 0) { -+ if (escaped) { -+ if ((cp = strchr(digits, c)) != NULL) { -+ n = (cp - digits) * 100; -+ if ((c = *src++) == 0 || -+ (cp = strchr(digits, c)) == NULL) { -+ return (-1); -+ } -+ n += (cp - digits) * 10; -+ if ((c = *src++) == 0 || -+ (cp = strchr(digits, c)) == NULL) { -+ return (-1); -+ } -+ n += (cp - digits); -+ if (n > 255) { -+ return (-1); -+ } -+ c = n; -+ } -+ escaped = 0; -+ } else if (c == '\\') { -+ escaped = 1; -+ continue; -+ } else if (c == '.') { -+ c = (bp - label - 1); -+ if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ -+ return (-1); -+ } -+ if (label >= eom) { -+ return (-1); -+ } -+ *label = c; -+ /* Fully qualified ? */ -+ if (*src == '\0') { -+ if (c != 0) { -+ if (bp >= eom) { -+ return (-1); -+ } -+ *bp++ = '\0'; -+ } -+ if ((bp - dst) > MAXCDNAME) { -+ return (-1); -+ } -+ return (1); -+ } -+ if (c == 0 || *src == '.') { -+ return (-1); -+ } -+ label = bp++; -+ continue; -+ } -+ if (bp >= eom) { -+ return (-1); -+ } -+ *bp++ = (u_char)c; -+ } -+ c = (bp - label - 1); -+ if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ -+ return (-1); -+ } -+ if (label >= eom) { -+ return (-1); -+ } -+ *label = c; -+ if (c != 0) { -+ if (bp >= eom) { -+ return (-1); -+ } -+ *bp++ = 0; -+ } -+ if ((bp - dst) > MAXCDNAME) { /* src too big */ -+ return (-1); -+ } -+ return (0); -+} -+ -+/* -+ * ns_name_ntol(src, dst, dstsiz) -+ * Convert a network strings labels into all lowercase. -+ * return: -+ * Number of bytes written to buffer, or -1 (with errno set) -+ * notes: -+ * Enforces label and domain length limits. -+ */ -+ -+int -+ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz) { -+ const u_char *cp; -+ u_char *dn, *eom; -+ u_char c; -+ u_int n; -+ -+ cp = src; -+ dn = dst; -+ eom = dst + dstsiz; -+ -+ while ((n = *cp++) != 0) { -+ if ((n & NS_CMPRSFLGS) != 0) { -+ /* Some kind of compression pointer. */ -+ return (-1); -+ } -+ *dn++ = n; -+ if (dn + n >= eom) { -+ return (-1); -+ } -+ for ((void)NULL; n > 0; n--) { -+ c = *cp++; -+ if (isupper(c)) -+ *dn++ = tolower(c); -+ else -+ *dn++ = c; -+ } -+ } -+ *dn++ = '\0'; -+ return (dn - dst); -+} -+ -+/* -+ * ns_name_unpack(msg, eom, src, dst, dstsiz) -+ * Unpack a domain name from a message, source may be compressed. -+ * return: -+ * -1 if it fails, or consumed octets if it succeeds. -+ */ -+int -+ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src, -+ u_char *dst, size_t dstsiz) -+{ -+ const u_char *srcp, *dstlim; -+ u_char *dstp; -+ int n, len, checked; -+ -+ len = -1; -+ checked = 0; -+ dstp = dst; -+ srcp = src; -+ dstlim = dst + dstsiz; -+ if (srcp < msg || srcp >= eom) { -+ return (-1); -+ } -+ /* Fetch next label in domain name. */ -+ while ((n = *srcp++) != 0) { -+ /* Check for indirection. */ -+ switch (n & NS_CMPRSFLGS) { -+ case 0: -+ /* Limit checks. */ -+ if (dstp + n + 1 >= dstlim || srcp + n >= eom) { -+ return (-1); -+ } -+ checked += n + 1; -+ *dstp++ = n; -+ memcpy(dstp, srcp, n); -+ dstp += n; -+ srcp += n; -+ break; -+ -+ case NS_CMPRSFLGS: -+ if (srcp >= eom) { -+ return (-1); -+ } -+ if (len < 0) -+ len = srcp - src + 1; -+ srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff)); -+ if (srcp < msg || srcp >= eom) { /* Out of range. */ -+ return (-1); -+ } -+ checked += 2; -+ /* -+ * Check for loops in the compressed name; -+ * if we've looked at the whole message, -+ * there must be a loop. -+ */ -+ if (checked >= eom - msg) { -+ return (-1); -+ } -+ break; -+ -+ default: -+ return (-1); /* flag error */ -+ } -+ } -+ *dstp = '\0'; -+ if (len < 0) -+ len = srcp - src; -+ return (len); -+} -+ -+/* -+ * ns_name_pack(src, dst, dstsiz, dnptrs, lastdnptr) -+ * Pack domain name 'domain' into 'comp_dn'. -+ * return: -+ * Size of the compressed name, or -1. -+ * notes: -+ * 'dnptrs' is an array of pointers to previous compressed names. -+ * dnptrs[0] is a pointer to the beginning of the message. The array -+ * ends with NULL. -+ * 'lastdnptr' is a pointer to the end of the array pointed to -+ * by 'dnptrs'. -+ * Side effects: -+ * The list of pointers in dnptrs is updated for labels inserted into -+ * the message as we compress the name. If 'dnptr' is NULL, we don't -+ * try to compress names. If 'lastdnptr' is NULL, we don't update the -+ * list. -+ */ -+int -+ns_name_pack(const u_char *src, u_char *dst, int dstsiz, -+ const u_char **dnptrs, const u_char **lastdnptr) -+{ -+ u_char *dstp; -+ const u_char **cpp, **lpp, *eob, *msg; -+ const u_char *srcp; -+ int n, l, first = 1; -+ -+ srcp = src; -+ dstp = dst; -+ eob = dstp + dstsiz; -+ lpp = cpp = NULL; -+ if (dnptrs != NULL) { -+ if ((msg = *dnptrs++) != NULL) { -+ for (cpp = dnptrs; *cpp != NULL; cpp++) -+ (void)NULL; -+ lpp = cpp; /* end of list to search */ -+ } -+ } else -+ msg = NULL; -+ -+ /* make sure the domain we are about to add is legal */ -+ l = 0; -+ do { -+ n = *srcp; -+ if ((n & NS_CMPRSFLGS) != 0) { -+ return (-1); -+ } -+ l += n + 1; -+ if (l > MAXCDNAME) { -+ return (-1); -+ } -+ srcp += n + 1; -+ } while (n != 0); -+ -+ /* from here on we need to reset compression pointer array on error */ -+ srcp = src; -+ do { -+ /* Look to see if we can use pointers. */ -+ n = *srcp; -+ if (n != 0 && msg != NULL) { -+ l = dn_find(srcp, msg, (const u_char * const *)dnptrs, -+ (const u_char * const *)lpp); -+ if (l >= 0) { -+ if (dstp + 1 >= eob) { -+ goto cleanup; -+ } -+ *dstp++ = (l >> 8) | NS_CMPRSFLGS; -+ *dstp++ = l % 256; -+ return (dstp - dst); -+ } -+ /* Not found, save it. */ -+ if (lastdnptr != NULL && cpp < lastdnptr - 1 && -+ (dstp - msg) < 0x4000 && first) { -+ *cpp++ = dstp; -+ *cpp = NULL; -+ first = 0; -+ } -+ } -+ /* copy label to buffer */ -+ if (n & NS_CMPRSFLGS) { /* Should not happen. */ -+ goto cleanup; -+ } -+ if (dstp + 1 + n >= eob) { -+ goto cleanup; -+ } -+ memcpy(dstp, srcp, n + 1); -+ srcp += n + 1; -+ dstp += n + 1; -+ } while (n != 0); -+ -+ if (dstp > eob) { -+cleanup: -+ if (msg != NULL) -+ *lpp = NULL; -+ return (-1); -+ } -+ return (dstp - dst); -+} -+ -+/* -+ * ns_name_uncompress(msg, eom, src, dst, dstsiz) -+ * Expand compressed domain name to presentation format. -+ * return: -+ * Number of bytes read out of `src', or -1 (with errno set). -+ * note: -+ * Root domain returns as "." not "". -+ */ -+int -+ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src, -+ char *dst, size_t dstsiz) -+{ -+ u_char tmp[NS_MAXCDNAME]; -+ int n; -+ -+ if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1) -+ return (-1); -+ if (ns_name_ntop(tmp, dst, dstsiz) == -1) -+ return (-1); -+ return (n); -+} -+ -+/* -+ * ns_name_compress(src, dst, dstsiz, dnptrs, lastdnptr) -+ * Compress a domain name into wire format, using compression pointers. -+ * return: -+ * Number of bytes consumed in `dst' or -1 (with errno set). -+ * notes: -+ * 'dnptrs' is an array of pointers to previous compressed names. -+ * dnptrs[0] is a pointer to the beginning of the message. -+ * The list ends with NULL. 'lastdnptr' is a pointer to the end of the -+ * array pointed to by 'dnptrs'. Side effect is to update the list of -+ * pointers for labels inserted into the message as we compress the name. -+ * If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr' -+ * is NULL, we don't update the list. -+ */ -+int -+ns_name_compress(const char *src, u_char *dst, size_t dstsiz, -+ const u_char **dnptrs, const u_char **lastdnptr) -+{ -+ u_char tmp[NS_MAXCDNAME]; -+ -+ if (ns_name_pton(src, tmp, sizeof tmp) == -1) -+ return (-1); -+ return (ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr)); -+} -+ -+/* -+ * special(ch) -+ * Thinking in noninternationalized USASCII (per the DNS spec), -+ * is this characted special ("in need of quoting") ? -+ * return: -+ * boolean. -+ */ -+static int -+special(int ch) { -+ switch (ch) { -+ case 0x22: /* '"' */ -+ case 0x2E: /* '.' */ -+ case 0x3B: /* ';' */ -+ case 0x5C: /* '\\' */ -+ /* Special modifiers in zone files. */ -+ case 0x40: /* '@' */ -+ case 0x24: /* '$' */ -+ return (1); -+ default: -+ return (0); -+ } -+} -+ -+/* -+ * printable(ch) -+ * Thinking in noninternationalized USASCII (per the DNS spec), -+ * is this character visible and not a space when printed ? -+ * return: -+ * boolean. -+ */ -+static int -+printable(int ch) { -+ return (ch > 0x20 && ch < 0x7f); -+} -+ -+/* -+ * Thinking in noninternationalized USASCII (per the DNS spec), -+ * convert this character to lower case if it's upper case. -+ */ -+static int -+mklower(int ch) { -+ if (ch >= 0x41 && ch <= 0x5A) -+ return (ch + 0x20); -+ return (ch); -+} -+ -+/* -+ * dn_find(domain, msg, dnptrs, lastdnptr) -+ * Search for the counted-label name in an array of compressed names. -+ * return: -+ * offset from msg if found, or -1. -+ * notes: -+ * dnptrs is the pointer to the first name on the list, -+ * not the pointer to the start of the message. -+ */ -+static int -+dn_find(const u_char *domain, const u_char *msg, -+ const u_char * const *dnptrs, -+ const u_char * const *lastdnptr) -+{ -+ const u_char *dn, *cp, *sp; -+ const u_char * const *cpp; -+ u_int n; -+ -+ for (cpp = dnptrs; cpp < lastdnptr; cpp++) { -+ sp = *cpp; -+ /* -+ * terminate search on: -+ * root label -+ * compression pointer -+ * unusable offset -+ */ -+ while (*sp != 0 && (*sp & NS_CMPRSFLGS) == 0 && -+ (sp - msg) < 0x4000) { -+ dn = domain; -+ cp = sp; -+ while ((n = *cp++) != 0) { -+ /* -+ * check for indirection -+ */ -+ switch (n & NS_CMPRSFLGS) { -+ case 0: /* normal case, n == len */ -+ if (n != *dn++) -+ goto next; -+ for ((void)NULL; n > 0; n--) -+ if (mklower(*dn++) != -+ mklower(*cp++)) -+ goto next; -+ /* Is next root for both ? */ -+ if (*dn == '\0' && *cp == '\0') -+ return (sp - msg); -+ if (*dn) -+ continue; -+ goto next; -+ -+ case NS_CMPRSFLGS: /* indirection */ -+ cp = msg + (((n & 0x3f) << 8) | *cp); -+ break; -+ -+ default: /* illegal type */ -+ return (-1); -+ } -+ } -+ next: -+ sp += *sp + 1; -+ } -+ } -+ return (-1); -+} -+ -+/* -+ * Expand compressed domain name 'comp_dn' to full domain name. -+ * 'msg' is a pointer to the begining of the message, -+ * 'eomorig' points to the first location after the message, -+ * 'exp_dn' is a pointer to a buffer of size 'length' for the result. -+ * Return size of compressed name or -1 if there was an error. -+ */ -+int -+dn_expand(const u_char *msg, const u_char *eom, const u_char *src, -+ char *dst, int dstsiz) -+{ -+ int n = ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz); -+ -+ if (n > 0 && dst[0] == '.') -+ dst[0] = '\0'; -+ return (n); -+} -+ -+/* -+ * Pack domain name 'exp_dn' in presentation form into 'comp_dn'. -+ * Return the size of the compressed name or -1. -+ * 'length' is the size of the array pointed to by 'comp_dn'. -+ */ -+int -+dn_comp(const char *src, u_char *dst, int dstsiz, -+ u_char **dnptrs, u_char **lastdnptr) -+{ -+ return (ns_name_compress(src, dst, (size_t)dstsiz, -+ (const u_char **)dnptrs, -+ (const u_char **)lastdnptr)); -+} -+ -+ - #include "domain_resolver.h" - #include "session.h" - #include "util.h" diff --git a/package/trafshow/patches/patch-session_c b/package/trafshow/patches/patch-session_c deleted file mode 100644 index cee3cb266..000000000 --- a/package/trafshow/patches/patch-session_c +++ /dev/null @@ -1,11 +0,0 @@ ---- trafshow-5.2.3.orig/session.c 2006-01-08 06:58:08.000000000 +0100 -+++ trafshow-5.2.3/session.c 2010-02-05 22:59:54.974334342 +0100 -@@ -40,7 +40,7 @@ - #define ASYNC_MODE FNDELAY - #elif O_ASYNC - #define ASYNC_MODE O_ASYNC --#elif -+#else - #error the fcntl argument to turn ON/OFF non-blocking I/O is unknown - #endif - diff --git a/package/transmission/Makefile b/package/transmission/Makefile index 8fed6d204..3ba43fb1d 100644 --- a/package/transmission/Makefile +++ b/package/transmission/Makefile @@ -4,24 +4,22 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= transmission -PKG_VERSION:= 2.92 +PKG_VERSION:= 4.0.5 PKG_RELEASE:= 1 -PKG_HASH:= 3a8d045c306ad9acb7bf81126939b9594553a388482efa0ec1bfb67b22acd35f +PKG_HASH:= fd68ff114a479200043c30c7e69dba4c1932f7af36ca4c5b5d2edcb5866e6357 PKG_DESCR:= torrent client PKG_SECTION:= app/p2p PKG_DEPENDS:= libressl libevent libcurl -PKG_BUILDDEP:= libressl libevent curl +PKG_BUILDDEP:= cmake-host libressl libevent curl PKG_NEEDS:= threads c++ PKG_URL:= http://www.transmissionbt.com -PKG_SITES:= http://download.transmissionbt.com/files/ +PKG_SITES:= https://github.com/transmission/transmission/releases/download/$(PKG_VERSION)/ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,TRANSMISSION,transmission,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -TARGET_LDFLAGS+= -liconv - -CONFIGURE_ARGS+= --without-gtk +CONFIG_STYLE:= cmake transmission-install: $(INSTALL_DIR) $(IDIR_TRANSMISSION)/usr/share diff --git a/package/trinity/Makefile b/package/trinity/Makefile deleted file mode 100644 index cf12729eb..000000000 --- a/package/trinity/Makefile +++ /dev/null @@ -1,28 +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:= trinity -PKG_VERSION:= 1.6 -PKG_RELEASE:= 1 -PKG_HASH:= e40efa320ddc814943e90be0386b5052ce0bbbc457b3f308fa973669d393a6d9 -PKG_DESCR:= linux system call fuzz tester -PKG_SECTION:= base/tests -PKG_URL:= http://codemonkey.org.uk/projects/trinity/ -PKG_SITES:= http://codemonkey.org.uk/projects/trinity/ - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,TRINITY,trinity,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -XAKE_FLAGS+= CROSS_COMPILE= -CONFIG_STYLE:= minimal -CONFIGURE_PROG:= configure.sh - -trinity-install: - $(INSTALL_DIR) $(IDIR_TRINITY)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/trinity \ - $(IDIR_TRINITY)/usr/bin - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/trinity/patches/patch-Makefile b/package/trinity/patches/patch-Makefile deleted file mode 100644 index aa85e30f1..000000000 --- a/package/trinity/patches/patch-Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- trinity-1.6.orig/Makefile 2015-11-03 18:05:50.000000000 +0100 -+++ trinity-1.6/Makefile 2016-02-25 00:24:11.000000000 +0100 -@@ -1,6 +1,6 @@ - VERSION="1.6" - --INSTALL_PREFIX ?= $(DESTDIR) -+INSTALL_PREFIX ?= $(DESTDIR)/usr - INSTALL_PREFIX ?= $(HOME) - NR_CPUS := $(shell grep ^processor /proc/cpuinfo | /usr/bin/wc -l) - diff --git a/package/trinity/patches/patch-syscalls_prctl_c b/package/trinity/patches/patch-syscalls_prctl_c deleted file mode 100644 index 9adbe22f8..000000000 --- a/package/trinity/patches/patch-syscalls_prctl_c +++ /dev/null @@ -1,11 +0,0 @@ ---- trinity-1.6.orig/syscalls/prctl.c 2015-11-03 18:05:50.000000000 +0100 -+++ trinity-1.6/syscalls/prctl.c 2016-02-25 00:26:56.000000000 +0100 -@@ -34,7 +34,7 @@ static int prctl_opts[] = { - PR_GET_NO_NEW_PRIVS, PR_GET_TID_ADDRESS, PR_SET_THP_DISABLE, PR_GET_THP_DISABLE, - PR_MPX_ENABLE_MANAGEMENT, PR_MPX_DISABLE_MANAGEMENT, - #ifdef __mips__ -- GET_FP_MODE, SET_FP_MODE, -+ PR_GET_FP_MODE, PR_SET_FP_MODE, - #endif - PR_CAP_AMBIENT, - }; diff --git a/package/tvheadend/Makefile b/package/tvheadend/Makefile index 5557d16ec..2d86705e8 100644 --- a/package/tvheadend/Makefile +++ b/package/tvheadend/Makefile @@ -4,7 +4,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= tvheadend -PKG_VERSION:= f46a6c2dc93460d7c2909ebbec42a3ac2557ccb2 +PKG_VERSION:= a9c6db8acbd85297238771b8b4430435b7994928 PKG_GIT:= hash PKG_RELEASE:= 1 PKG_DESCR:= tv streaming server @@ -23,7 +23,12 @@ XAKE_FLAGS+= LDLIBS=-liconv endif CONFIGURE_ARGS+= --disable-bundle \ - --disable-ffmpeg_static + --disable-ffmpeg_static \ + --disable-execinfo \ + --disable-libvpx \ + --disable-libx264 \ + --disable-libx265 \ + --nowerror tvheadend-install: $(INSTALL_DIR) $(IDIR_TVHEADEND)/usr/bin diff --git a/package/tvheadend/patches/patch-configure b/package/tvheadend/patches/patch-configure new file mode 100644 index 000000000..97882365d --- /dev/null +++ b/package/tvheadend/patches/patch-configure @@ -0,0 +1,22 @@ +--- tvheadend-a9c6db8acbd85297238771b8b4430435b7994928.orig/configure 2024-03-03 05:21:25.000000000 +0100 ++++ tvheadend-a9c6db8acbd85297238771b8b4430435b7994928/configure 2024-03-03 05:37:39.643872622 +0100 +@@ -28,8 +28,8 @@ OPTIONS=( + "satip_server:yes" + "satip_client:yes" + "hdhomerun_client:no" +- "hdhomerun_server:yes" +- "hdhomerun_static:yes" ++ "hdhomerun_server:no" ++ "hdhomerun_static:no" + "iptv:yes" + "tsfile:yes" + "dvbscan:yes" +@@ -63,7 +63,7 @@ OPTIONS=( + "pcre2:auto" + "uriparser:auto" + "ccache:auto" +- "tvhcsa:auto" ++ "tvhcsa:no" + "bundle:no" + "pngquant:no" + "kqueue:no" diff --git a/package/tvheadend/patches/patch-configure.orig b/package/tvheadend/patches/patch-configure.orig new file mode 100644 index 000000000..3c8ed25ed --- /dev/null +++ b/package/tvheadend/patches/patch-configure.orig @@ -0,0 +1,11 @@ +--- tvheadend-a9c6db8acbd85297238771b8b4430435b7994928.orig/configure 2024-03-03 05:21:25.000000000 +0100 ++++ tvheadend-a9c6db8acbd85297238771b8b4430435b7994928/configure 2024-03-03 05:35:58.519873994 +0100 +@@ -63,7 +63,7 @@ OPTIONS=( + "pcre2:auto" + "uriparser:auto" + "ccache:auto" +- "tvhcsa:auto" ++ "tvhcsa:no" + "bundle:no" + "pngquant:no" + "kqueue:no" diff --git a/package/twm/Makefile b/package/twm/Makefile index a59d0e20d..7bf5925fa 100644 --- a/package/twm/Makefile +++ b/package/twm/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= a0d3f2a9689594220220d32c3cd674056b91dbf7c6c352efe1ffb72d65c66f76 PKG_DESCR:= simple window manager PKG_SECTION:= x11/apps -PKG_DEPENDS:= xorg-server -PKG_BUILDDEP:= xorg-server +PKG_DEPENDS:= xorg-server libx11 libxext libxt libxmu libice libsm +PKG_BUILDDEP:= xorg-server libX11 libXext libXt libXmu libICE libSM PKG_NEEDS:= c++ PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/ diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile index d838eabf8..a1e7de77b 100644 --- a/package/tzdata/Makefile +++ b/package/tzdata/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= tzdata -PKG_VERSION:= 2019c +PKG_VERSION:= 2021e PKG_RELEASE:= 1 -PKG_HASH:= 79c7806dab09072308da0e3d22c37d3b245015a591891ea147d3b133b60ffc7c f6ebd3668e02d5ed223d3b7b1947561bf2d2da2f4bd1db61efefd9e06c167ed4 +PKG_HASH:= 07ec42b737d0d3c6be9c337f8abb5f00554a0f9cc4fcf01a703d69403b6bb2b1 584666393a5424d13d27ec01183da17703273664742e049d4f62f62dab631775 PKG_DESCR:= timezone data (/usr/share/zoneinfo) PKG_SECTION:= base/apps PKG_URL:= http://www.iana.org/time-zones/ diff --git a/package/tzdata/patches/patch-Makefile b/package/tzdata/patches/patch-Makefile index faf30fcd9..9083a7597 100644 --- a/package/tzdata/patches/patch-Makefile +++ b/package/tzdata/patches/patch-Makefile @@ -1,6 +1,6 @@ ---- w-tzdata-2019c-1.orig/Makefile 2019-07-01 09:06:38.000000000 +0200 -+++ w-tzdata-2019c-1/Makefile 2020-02-04 09:33:12.012662611 +0100 -@@ -365,7 +365,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn +--- w-tzdata-2021e-1.orig/Makefile 2021-09-25 16:47:39.000000000 +0200 ++++ w-tzdata-2021e-1/Makefile 2022-01-09 06:05:17.958089388 +0100 +@@ -370,7 +370,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn # January's first Monday when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. @@ -9,7 +9,7 @@ # Linker flags. Default to $(LFLAGS) for backwards compatibility # to release 2012h and earlier. -@@ -380,7 +380,7 @@ LEAPSECONDS= +@@ -385,7 +385,7 @@ LEAPSECONDS= # The zic command and its arguments. zic= ./zic @@ -18,8 +18,8 @@ # To shrink the size of installed TZif files, # append "-r @N" to omit data before N-seconds-after-the-Epoch. -@@ -579,7 +579,7 @@ SHELL= /bin/sh - all: tzselect yearistype zic zdump libtz.a $(TABDATA) \ +@@ -562,7 +562,7 @@ SHELL= /bin/sh + all: tzselect zic zdump libtz.a $(TABDATA) \ vanguard.zi main.zi rearguard.zi -ALL: all date $(ENCHILADA) @@ -27,7 +27,7 @@ install: all $(DATA) $(REDO) $(MANS) mkdir -p '$(DESTDIR)$(BINDIR)' \ -@@ -646,6 +646,12 @@ zdump: $(TZDOBJS) +@@ -637,6 +637,12 @@ zdump: $(TZDOBJS) zic: $(TZCOBJS) $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) @@ -37,6 +37,6 @@ + $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) asctime.c -o asctime_build.o + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ zic_build.o localtime_build.o asctime_build.o + - yearistype: yearistype.sh - cp yearistype.sh yearistype - chmod +x yearistype + leapseconds: $(LEAP_DEPS) + $(AWK) -v EXPIRES_LINE=$(EXPIRES_LINE) \ + -f leapseconds.awk leap-seconds.list >$@.out diff --git a/package/u-boot-h8300/Makefile b/package/u-boot-h8300/Makefile index e26b4fd59..bfd0824df 100644 --- a/package/u-boot-h8300/Makefile +++ b/package/u-boot-h8300/Makefile @@ -4,6 +4,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot +# last working hash fa0e8426833edc1be3c2ea3acaf248157048a15a PKG_VERSION:= h8300 PKG_GIT:= branch PKG_RELEASE:= 1 @@ -13,7 +14,6 @@ HOST_BUILDDEP:= libressl-host dtc-host PKG_BUILDDEP:= u-boot-h8300-host PKG_SITES:= git://git.pf.osdn.jp/gitroot/y/ys/ysato/uboot.git - PKG_SYSTEM_DEPENDS:= hitachi-edosk2674 include $(ADK_TOPDIR)/mk/host.mk @@ -23,7 +23,6 @@ $(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))) UBOOT:= u-boot.bin -CONFIG:= clearfog_defconfig HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl" diff --git a/package/u-boot-h8300/patches/dtc.patch b/package/u-boot-h8300/patches/dtc.patch new file mode 100644 index 000000000..725c3af2f --- /dev/null +++ b/package/u-boot-h8300/patches/dtc.patch @@ -0,0 +1,11 @@ +diff -Nur u-boot-h8300.orig/scripts/dtc/dtc-lexer.l u-boot-h8300/scripts/dtc/dtc-lexer.l +--- u-boot-h8300.orig/scripts/dtc/dtc-lexer.l 2022-02-11 13:17:30.000000000 +0100 ++++ u-boot-h8300/scripts/dtc/dtc-lexer.l 2022-02-11 13:42:14.302389873 +0100 +@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ diff --git a/package/u-boot-h8300/patches/patch-include_image_h b/package/u-boot-h8300/patches/patch-include_image_h new file mode 100644 index 000000000..e087a033d --- /dev/null +++ b/package/u-boot-h8300/patches/patch-include_image_h @@ -0,0 +1,13 @@ +--- u-boot-h8300.orig/include/image.h 2022-02-11 13:17:30.000000000 +0100 ++++ u-boot-h8300/include/image.h 2022-02-13 01:58:23.457168935 +0100 +@@ -194,9 +194,9 @@ enum { + IH_ARCH_ARM64, /* ARM64 */ + IH_ARCH_ARC, /* Synopsys DesignWare ARC */ + IH_ARCH_X86_64, /* AMD x86_64, Intel and Via */ ++ IH_ARCH_H8300, /* H8/300 */ + IH_ARCH_XTENSA, /* Xtensa */ + IH_ARCH_RISCV, /* RISC-V */ +- IH_ARCH_H8300, /* H8/300 */ + IH_ARCH_COUNT, + }; + diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index f9f2356a2..704465fe9 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -4,19 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot -PKG_VERSION:= 2019.10 +PKG_VERSION:= 2024.04 PKG_RELEASE:= 1 -PKG_HASH:= 8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014 +PKG_HASH:= 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot -HOST_BUILDDEP:= libressl-host dtc-host -PKG_BUILDDEP:= python3-host swig-host u-boot-host +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 PKG_URL:= http://www.denx.de/wiki/U-Boot PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SYSTEM_DEPENDS:= beaglebone-black orange-pi0 raspberry-pi raspberry-pi2 raspberry-pi3 banana-pro solidrun-imx6 solidrun-clearfog raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 phytec-imx6 pcduino-3b +PKG_SYSTEM_DEPENDS:= banana-p2-zero beaglebone-black orange-pi0 raspberry-pi raspberry-pi2 raspberry-pi3 banana-pro solidrun-imx6 solidrun-clearfog raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 rockpi4-plus phytec-imx6 pcduino-3b imgtec-ci20 st-stm32f746g starfive-visionfive2 include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -58,10 +58,18 @@ endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64),y) CONFIG:= rpi_3_defconfig endif +ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y) +CONFIG:= rock-pi-4-rk3399_defconfig +UBOOT:= u-boot.itb +endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) CONFIG:= Bananapro_defconfig UBOOT:= u-boot-sunxi-with-spl.bin endif +ifeq ($(ADK_TARGET_SYSTEM_BANANA_P2_ZERO),y) +CONFIG:= bananapi_m2_p2_zero_defconfig +UBOOT:= u-boot-sunxi-with-spl.bin +endif ifeq ($(ADK_TARGET_SYSTEM_ORANGE_PI0),y) CONFIG:= orangepi_zero_defconfig UBOOT:= u-boot-sunxi-with-spl.bin @@ -70,6 +78,18 @@ ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y) CONFIG:= am335x_evm_defconfig UBOOT:= u-boot.img endif +ifeq ($(ADK_TARGET_SYSTEM_IMGTEC_CI20),y) +CONFIG:= ci20_mmc_defconfig +UBOOT:= u-boot-dtb.img +endif +ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y) +CONFIG:= stm32f746-disco_defconfig +UBOOT:= u-boot-dtb.bin +endif +ifeq ($(ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2),y) +CONFIG:= starfive_visionfive2_defconfig +UBOOT:= u-boot.itb +endif HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl" @@ -78,6 +98,10 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual +ifeq ($(ADK_TARGET_BINFMT_FDPIC),y) +EXTRA_CFLAGS:= -mno-fdpic +endif + host-build: (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ $(HOST_MAKE_FLAGS) sandbox_defconfig ) @@ -93,28 +117,42 @@ do-configure: do-build: (cd $(WRKBUILD) && env \ + PKG_CONFIG="$(STAGING_HOST_DIR)/usr/bin/pkg-config" \ + PKG_CONFIG_LIBDIR="$(STAGING_HOST_DIR)/lib/pkgconfig:$(STAGING_HOST_DIR)/share/pkgconfig" \ + KBUILD_VERBOSE=1 \ + KCFLAGS='$(EXTRA_CFLAGS)' \ PATH='$(HOST_PATH)' \ CROSS_COMPILE='$(TARGET_CROSS)' \ + OPENSBI="$(FW_DIR)/fw_dynamic.bin" \ $(MAKE)) -ifneq ($(OS_FOR_BUILD),Darwin) (cd $(WRKBUILD) && env \ PATH='$(HOST_PATH)' \ CROSS_COMPILE='$(TARGET_CROSS)' \ - $(MAKE) env) -endif + $(MAKE) envtools) 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) ./files/uboot_print_env $(IDIR_U_BOOT)/usr/bin - $(INSTALL_BIN) ./files/uboot_set_env $(IDIR_U_BOOT)/usr/bin + $(INSTALL_BIN) $(WRKBUILD)/tools/env/fw_printenv \ + $(IDIR_U_BOOT)/usr/bin + cd $(IDIR_U_BOOT)/usr/bin && ln -fs fw_printenv fw_setenv +ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y) + $(CP) $(WRKBUILD)/idbloader.img $(FW_DIR) +endif +ifeq ($(ADK_TARGET_SYSTEM_IMGTEC_CI20),y) + $(CP) $(WRKBUILD)/spl/u-boot-spl.bin $(FW_DIR) endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) $(INSTALL_BIN) ./files/boot.script.bpi $(FW_DIR) endif +ifeq ($(ADK_TARGET_SYSTEM_BANANA_P2_ZERO),y) + $(INSTALL_BIN) ./files/boot.script.bpizero $(FW_DIR) +endif +ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y) + $(INSTALL_BIN) ./files/boot.script.rockpi4 $(FW_DIR) +endif ifeq ($(ADK_TARGET_SYSTEM_ORANGE_PI0),y) $(INSTALL_BIN) ./files/boot.script.opi $(FW_DIR) endif @@ -133,6 +171,9 @@ ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y) $(CP) ./files/uEnv.txt.bbb $(FW_DIR)/uEnv.txt $(INSTALL_BIN) $(WRKBUILD)/MLO $(FW_DIR) endif +ifeq ($(ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2),y) + $(CP) $(WRKBUILD)/spl/u-boot-spl.bin.normal.out $(FW_DIR) +endif include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/u-boot/files/boot.script.bpizero b/package/u-boot/files/boot.script.bpizero new file mode 100644 index 000000000..1d7893b49 --- /dev/null +++ b/package/u-boot/files/boot.script.bpizero @@ -0,0 +1,4 @@ +setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait +ext4load mmc 0:1 $fdt_addr_r boot/${fdtfile} +ext4load mmc 0:1 $kernel_addr_r boot/kernel +bootz $kernel_addr_r - $fdt_addr_r diff --git a/package/u-boot/files/boot.script.imx6 b/package/u-boot/files/boot.script.imx6 index 24d1b2a93..0a4ff9fd9 100644 --- a/package/u-boot/files/boot.script.imx6 +++ b/package/u-boot/files/boot.script.imx6 @@ -1,4 +1,4 @@ -setenv bootargs 'console=ttymxc0,115200 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 root=/dev/mmcblk0p1' -ext4load mmc 0:1 0x18000000 boot/${fdtfile} -ext4load mmc 0:1 0x10800000 boot/kernel +setenv bootargs 'console=ttymxc0,115200 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 root=/dev/mmcblk1p1 rootwait' +ext4load mmc 1:1 0x18000000 boot/${fdtfile} +ext4load mmc 1:1 0x10800000 boot/kernel bootz 0x10800000 - 0x18000000 diff --git a/package/u-boot/files/boot.script.rockpi4 b/package/u-boot/files/boot.script.rockpi4 new file mode 100644 index 000000000..c74916170 --- /dev/null +++ b/package/u-boot/files/boot.script.rockpi4 @@ -0,0 +1,4 @@ +setenv bootargs console=tty0 console=ttyS2,115200 root=/dev/mmcblk0p1 rootwait +ext4load mmc 1:1 $kernel_addr_r boot/kernel +ext4load mmc 1:1 $fdt_addr_r boot/rk3399-rock-pi-4b-plus.dtb +booti $kernel_addr_r - $fdt_addr_r diff --git a/package/u-boot/files/fw_env.config b/package/u-boot/files/fw_env.config index 5571d60e0..8fd738b4e 100644 --- a/package/u-boot/files/fw_env.config +++ b/package/u-boot/files/fw_env.config @@ -1 +1 @@ -/mnt/uboot.env 0x0000 0x4000 +/dev/mmcblk1 0x3F8000 0x8000 diff --git a/package/u-boot/files/uboot_print_env b/package/u-boot/files/uboot_print_env deleted file mode 100755 index 7231e1a47..000000000 --- a/package/u-boot/files/uboot_print_env +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -mount -r /dev/mmcblk0p1 /mnt -fw_printenv "$@" -umount /mnt diff --git a/package/u-boot/files/uboot_set_env b/package/u-boot/files/uboot_set_env deleted file mode 100755 index 7b5a33ccc..000000000 --- a/package/u-boot/files/uboot_set_env +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -mount /dev/mmcblk0p1 /mnt -fw_setenv "$@" -umount /mnt diff --git a/package/u-boot/patches/patch-configs_bananapi_m2_p2_zero_defconfig b/package/u-boot/patches/patch-configs_bananapi_m2_p2_zero_defconfig new file mode 100644 index 000000000..c9761d409 --- /dev/null +++ b/package/u-boot/patches/patch-configs_bananapi_m2_p2_zero_defconfig @@ -0,0 +1,18 @@ +--- u-boot-2022.10.orig/configs/bananapi_m2_p2_zero_defconfig 1970-01-01 00:00:00.000000000 +0100 ++++ u-boot-2022.10/configs/bananapi_m2_p2_zero_defconfig 2022-12-25 07:59:45.852731211 +0100 +@@ -0,0 +1,15 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++# CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-bananapi-m2-plus-v1.2" ++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-bananapi-m2-zero" ++CONFIG_SPL=y ++CONFIG_MACH_SUN8I_H3=y ++CONFIG_DRAM_CLK=408 ++CONFIG_MMC0_CD_PIN="" ++CONFIG_MMC_SUNXI_SLOT_EXTRA=2 ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_PREBOOT="" ++# CONFIG_SYS_DEVICE_NULLDEV is not set ++CONFIG_SPL_STACK=0x8000 ++CONFIG_SYS_PBSIZE=1024 ++CONFIG_SUN8I_EMAC=y 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 new file mode 100644 index 000000000..818529353 --- /dev/null +++ b/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000..87e4bd238 --- /dev/null +++ b/package/u-boot/patches/patch-configs_rock-pi-4c-rk3399_defconfig @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000..fc284ad58 --- /dev/null +++ b/package/u-boot/patches/patch-tools_Makefile @@ -0,0 +1,11 @@ +--- 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/u-boot/src/bl31.elf b/package/u-boot/src/bl31.elf Binary files differnew file mode 100644 index 000000000..24cb666c7 --- /dev/null +++ b/package/u-boot/src/bl31.elf diff --git a/package/uacme/Makefile b/package/uacme/Makefile new file mode 100644 index 000000000..6db80991e --- /dev/null +++ b/package/uacme/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:= uacme +PKG_VERSION:= 1.7.4 +PKG_RELEASE:= 1 +PKG_HASH:= 0fd3e35218d575321e70dc3489ec3463d015c56c138e99e5add32ab7e5a48d09 +PKG_DESCR:= acme client written in c +PKG_BUILDDEP:= curl gnutls +PKG_DEPENDS:= libcurl libgnutls +PKG_SECTION:= app/crypto +PKG_SITES:= https://github.com/ndilieto/uacme/archive/refs/tags/ + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,UACME,uacme,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --disable-docs + +uacme-install: + $(INSTALL_DIR) $(IDIR_UACME)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/uacme \ + $(IDIR_UACME)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/uclibc-ng-test/Makefile b/package/uclibc-ng-test/Makefile index 9042bcbc0..44a7e9cde 100644 --- a/package/uclibc-ng-test/Makefile +++ b/package/uclibc-ng-test/Makefile @@ -10,18 +10,22 @@ PKG_DESCR:= embedded c library testsuite PKG_SECTION:= base/tests PKG_KDEPENDS:= inotify-user PKG_URL:= http://www.uclibc-ng.org -PKG_SITES:= git://uclibc-ng.org/git/uclibc-ng-test +PKG_SITES:= https://git.uclibc-ng.org/git/uclibc-ng-test.git PKG_NOPARALLEL:= 1 +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,UCLIBC_NG_TEST,uclibc-ng-test,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual -# disable math tests -XAKE_FLAGS+= NO_MATH=1 +XAKE_FLAGS+= V=1 +ifeq ($(ADK_TARGET_LIB_GLIBC),y) +XAKE_FLAGS+= NO_CRYPT=1 +endif ifeq ($(ADK_TARGET_LIB_MUSL),y) XAKE_FLAGS+= NO_MATH=1 endif @@ -40,11 +44,18 @@ endif ifeq ($(ADK_TARGET_LIBC_WITH_LOCALE),) XAKE_FLAGS+= NO_LOCALE=1 endif +ifeq ($(ADK_TARGET_ARCH_KVX),y) +XAKE_FLAGS+= NO_TLS=1 +endif +ifeq ($(ADK_TARGET_WITH_MMU),) +XAKE_FLAGS+= NO_NPTL=1 +endif uclibc-ng-test-install: ${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/etc echo '00:11:22:33:44:55 teeth' > ${IDIR_UCLIBC_NG_TEST}/etc/ethers ${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/usr/lib ${CP} $(WRKINST)/usr/lib/* ${IDIR_UCLIBC_NG_TEST}/usr/lib/ + -find $(IDIR_UCLIBC_NG_TEST) -name \*.gdb -delete include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index 765878630..c1f2215c4 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -31,6 +31,10 @@ uclibc-ng-install: -$(CP) $(STAGING_TARGET_DIR)/lib/ld*-uClibc*.so* $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) -$(CP) $(STAGING_TARGET_DIR)/lib/libc.so.* $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) -$(CP) $(STAGING_TARGET_DIR)/lib/libuClibc-*.so $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) +ifeq ($(ADK_TARGET_BINFMT_ELF)$(ADK_TARGET_WITH_MMU),y) + $(CP) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/lib/ld*-uClibc*.so* \ + $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) +endif ifeq ($(ADK_TARGET_ARCH_CSKY),y) cd $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) && \ ln -sf ld-uClibc.so.0 ld.so.1 @@ -46,17 +50,15 @@ endif uclibc-ng-dev-install: ${INSTALL_DIR} ${IDIR_UCLIBC_NG_DEV}/usr/lib ${IDIR_UCLIBC_NG_DEV}/$(ADK_TARGET_LIBC_PATH) + ${INSTALL_DIR} ${IDIR_UCLIBC_NG_DEV}/usr/include -${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/crt*.o ${IDIR_UCLIBC_NG_DEV}/usr/lib - ${KERNEL_MAKE_ENV} \ - $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_FILE_VER)-1/linux-$(KERNEL_FILE_VER) \ - $(KERNEL_MAKE_OPTS) \ - INSTALL_HDR_PATH=$(IDIR_UCLIBC_NG_DEV)/usr \ - headers_install + ${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} \ PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \ - DEVEL_PREFIX=/usr \ + DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \ HOSTCC="$(CC_FOR_BUILD)" \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ diff --git a/package/udp-broadcast-relay/Makefile b/package/udp-broadcast-relay/Makefile index adfeafa79..0ce033403 100644 --- a/package/udp-broadcast-relay/Makefile +++ b/package/udp-broadcast-relay/Makefile @@ -4,15 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= udp-broadcast-relay -PKG_VERSION:= 0.3 +PKG_VERSION:= 9a0f13b4b5938bfe0af0d0d4e99dfc127c068e28 PKG_RELEASE:= 1 -PKG_HASH:= 86acb9a359cad1961bdd4be9ae425222c19fd70fc31c730bd2b96629eaba2177 +PKG_GIT:= hash PKG_DESCR:= listens for packets on a specified udp broadcast port PKG_SECTION:= net/misc PKG_URL:= http://www.joachim-breitner.de/udp-broadcast-relay/ -PKG_SITES:= http://www.joachim-breitner.de/udp-broadcast-relay/files/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_SITES:= https://github.com/nomeata/udp-broadcast-relay.git include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/udp-broadcast-relay/patches/patch-main_c b/package/udp-broadcast-relay/patches/patch-main_c deleted file mode 100644 index f57fb0409..000000000 --- a/package/udp-broadcast-relay/patches/patch-main_c +++ /dev/null @@ -1,32 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- udp-broadcast-relay-0.3.orig/main.c 2003-09-28 16:43:32.000000000 +0200 -+++ udp-broadcast-relay-0.3/main.c 2008-10-15 16:04:02.000000000 +0200 -@@ -220,8 +220,8 @@ main(int argc,char **argv) - } - - /* Save the address for later use */ -- bcopy( (struct sockaddr_in *)&reqbuf.ifr_addr, -- &ifs[maxifs].dstaddr, -+ memcpy( &ifs[maxifs].dstaddr, -+ (struct sockaddr_in *)&reqbuf.ifr_addr, - sizeof(struct sockaddr_in) ); - - DPRINT("%s: %i / %s\n", -@@ -349,7 +349,7 @@ main(int argc,char **argv) - DPRINT("From:\t\t%s:%d\n",inet_ntoa(rcv_addr.sin_addr),rcv_addr.sin_port); - - /* copy sender's details into our datagram as the source addr */ -- bcopy(&(rcv_addr.sin_addr.s_addr),(gram+12),4); -+ memcpy((gram+12),&(rcv_addr.sin_addr.s_addr),4); - *(u_short*)(gram+20)=(u_short)rcv_addr.sin_port; - - /* set the length of the packet */ -@@ -362,7 +362,7 @@ main(int argc,char **argv) - if (ifs[x].ifindex == rcv_ifindex) continue; /* no bounces, please */ - - /* Set destination addr ip - port is set already*/ -- bcopy(&(ifs[x].dstaddr.sin_addr.s_addr),(gram+16),4); -+ memcpy((gram+16),&(ifs[x].dstaddr.sin_addr.s_addr),4); - - DPRINT ("Sent to %s:%d on interface %i\n", - inet_ntoa(ifs[x].dstaddr.sin_addr), /* dst ip */ diff --git a/package/urlgrabber/Makefile b/package/urlgrabber/Makefile deleted file mode 100644 index 1b2a32726..000000000 --- a/package/urlgrabber/Makefile +++ /dev/null @@ -1,38 +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:= urlgrabber -PKG_VERSION:= 3.10 -PKG_RELEASE:= 1 -PKG_HASH:= 151474dcba8ad99a98eb1f18873bd888e8bfd68fd71a280991899e932689dc89 -PKG_DESCR:= python module for fetching of files -PKG_SECTION:= dev/python -PKG_BUILDDEP:= pycurl -PKG_DEPENDS:= pycurl -PKG_URL:= http://urlgrabber.baseurl.org/ -PKG_SITES:= http://urlgrabber.baseurl.org/download/ - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,URLGRABBER,urlgrabber,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= manual -BUILD_STYLE:= manual -INSTALL_STYLE:= manual - -include $(ADK_TOPDIR)/mk/python.mk - -do-build: - (cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py build) - (cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr") - -do-install: - $(INSTALL_DIR) $(IDIR_URLGRABBER)/usr/lib/python$(PYTHON_VERSION)/site-packages - $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \ - $(IDIR_URLGRABBER)/usr/lib/python$(PYTHON_VERSION)/site-packages - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/urlgrabber/patches/patch-setup_py b/package/urlgrabber/patches/patch-setup_py deleted file mode 100644 index f33080823..000000000 --- a/package/urlgrabber/patches/patch-setup_py +++ /dev/null @@ -1,24 +0,0 @@ ---- urlgrabber-3.9.1.orig/setup.py 2009-02-23 22:37:16.000000000 +0100 -+++ urlgrabber-3.9.1/setup.py 2013-02-11 13:46:37.000000000 +0100 -@@ -1,16 +1,16 @@ - # urlgrabber distutils setup - import re as _re --import urlgrabber as _urlgrabber -+#import urlgrabber as _urlgrabber - - name = "urlgrabber" - description = "A high-level cross-protocol url-grabber" --long_description = _urlgrabber.__doc__ -+long_description = "A high-level cross-protocol url-grabber" - license = "LGPL" --version = _urlgrabber.__version__ --_authors = _re.split(r',\s+', _urlgrabber.__author__) -+version = "3.9.1" -+_authors = _re.split(r',\s+', 'Michael D. Stenner, Ryan Tomayko') - author = ', '.join([_re.sub(r'\s+<.*', r'', _) for _ in _authors]) - author_email = ', '.join([_re.sub(r'(^.*<)|(>.*$)', r'', _) for _ in _authors]) --url = _urlgrabber.__url__ -+url = "http://linux.duke.edu/projects/urlgrabber/" - - packages = ['urlgrabber'] - package_dir = {'urlgrabber':'urlgrabber'} diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index f69ca613c..7d2510443 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= util-linux -PKG_VERSION:= 2.36 +PKG_VERSION:= 2.39.3 PKG_RELEASE:= 1 -PKG_HASH:= 9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1 +PKG_HASH:= 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f 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/v$(PKG_VERSION)/ +PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.39/ PKG_OPTS:= dev PKG_SUBPKGS:= FDISK AGETTY SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT @@ -151,8 +151,8 @@ mount-install: $(INSTALL_BIN) $(WRKINST)/usr/bin/{u,}mount $(IDIR_MOUNT)/bin mcookie-install: - $(INSTALL_DIR) $(IDIR_MCOOKIE)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/mcookie $(IDIR_MCOOKIE)/usr/bin + $(INSTALL_DIR) $(IDIR_MCOOKIE)/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/mcookie $(IDIR_MCOOKIE)/bin libuuid-install: $(INSTALL_DIR) $(IDIR_LIBUUID)/usr/lib diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile index 936b26546..a18b8574c 100644 --- a/package/v4l-utils/Makefile +++ b/package/v4l-utils/Makefile @@ -4,19 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= v4l-utils -PKG_VERSION:= 1.10.1 +PKG_VERSION:= 1.26.1 PKG_RELEASE:= 1 -PKG_HASH:= 6147ccc29fe7dd3c5c3994d613c4f2a099bac8b44694a96e5cf4d7caca8336c0 +PKG_HASH:= 4a71608c0ef7df2931176989e6d32b445c0bdc1030a2376d929c8ca6e550ec4e PKG_DESCR:= video4linux utilities PKG_SECTION:= mm/video PKG_BUILDDEP:= libjpeg-turbo -PKG_SITES:= http://linuxtv.org/downloads/v4l-utils/ +PKG_SITES:= https://www.linuxtv.org/downloads/v4l-utils/ +PKG_NEEDS:= intl PKG_LIBNAME:= libv4l PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - -PKG_LIBC_DEPENDS:= glibc PKG_SUBPKGS:= V4L_UTILS LIBV4L PKGSC_LIBV4L:= libs/video PKGSD_LIBV4L:= Video4Linux2 libraries @@ -26,8 +24,14 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,V4L_UTILS,v4l-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBV4L,libv4l,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBV4L},${PKGSC_LIBV4L},${PKG_OPTS})) -CONFIGURE_ARGS+= --disable-qv4l2 TARGET_CPPFLAGS+= -DLINUX_I2C_DEV_H +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +MESON_FLAGS+= -Dgconv=disabled + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson v4l-utils-install: $(INSTALL_DIR) $(IDIR_V4L_UTILS)/usr/bin diff --git a/package/v4l-utils/patches/patch-utils_rds_rds-saa6588_c b/package/v4l-utils/patches/patch-utils_rds_rds-saa6588_c deleted file mode 100644 index ddd779080..000000000 --- a/package/v4l-utils/patches/patch-utils_rds_rds-saa6588_c +++ /dev/null @@ -1,15 +0,0 @@ ---- v4l-utils-0.9.3.orig/utils/rds/rds-saa6588.c 2012-05-10 20:10:34.000000000 +0200 -+++ v4l-utils-0.9.3/utils/rds/rds-saa6588.c 2013-07-12 17:53:04.000000000 +0200 -@@ -12,8 +12,12 @@ - #include <errno.h> - #include <sys/ioctl.h> - #include <linux/types.h> -+#ifdef LINUX_I2C_DEV_H -+#include <linux/i2c-dev.h> -+#else - #include <linux/i2c.h> - #include <linux/i2c-dev.h> -+#endif - - int debug; - diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index 6e3f3b4d3..10e7b35fc 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= valgrind -PKG_VERSION:= 3.13.0 +PKG_VERSION:= 3.22.0 PKG_RELEASE:= 1 -PKG_HASH:= d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b +PKG_HASH:= c811db5add2c5f729944caf47c4e7a65dcaabb9461e472b578765dd7bf6d2d4c PKG_DESCR:= memory management debugging tool PKG_SECTION:= app/debug PKG_URL:= http://valgrind.org/ @@ -20,7 +20,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,VALGRIND,valgrind,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf ifeq ($(ADK_TARGET_LIB_MUSL),y) TARGET_CPPFLAGS+= -D__MUSL__ endif @@ -28,12 +27,22 @@ CONFIGURE_ENV+= ac_cv_file__proc_self_fd=yes \ ac_cv_file__proc_self_exe=yes \ ac_cv_file__proc_self_maps=yes +ifeq ($(ADK_TARGET_ARCH_ARM),y) +CONFIGURE_ARGS+= --host=$(patsubst arm-%,armv7-%,$(GNU_TARGET_NAME)) +endif + valgrind-install: $(INSTALL_DIR) $(IDIR_VALGRIND)/usr/bin $(INSTALL_DIR) $(IDIR_VALGRIND)/usr/lib/valgrind + $(INSTALL_DIR) $(IDIR_VALGRIND)/usr/libexec/valgrind $(INSTALL_BIN) $(WRKINST)/usr/bin/valgrind $(IDIR_VALGRIND)/usr/bin/ + $(INSTALL_BIN) $(WRKBUILD)/memcheck/memcheck-*-linux \ + $(IDIR_VALGRIND)/usr/libexec/valgrind + $(CP) $(WRKINST)/usr/libexec/valgrind/default.supp \ + $(IDIR_VALGRIND)/usr/libexec/valgrind + $(CP) $(WRKINST)/usr/libexec/valgrind/*.so \ + $(IDIR_VALGRIND)/usr/libexec/valgrind $(CP) $(WRKINST)/usr/lib/valgrind/* \ $(IDIR_VALGRIND)/usr/lib/valgrind - touch $(IDIR_VALGRIND)/usr/lib/valgrind/default.supp include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/vilistextum/Makefile b/package/vilistextum/Makefile index eaacb135d..400997d23 100644 --- a/package/vilistextum/Makefile +++ b/package/vilistextum/Makefile @@ -17,6 +17,8 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,VILISTEXTUM,vilistextum,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CFLAGS+= -fcommon + vilistextum-install: ${INSTALL_DIR} ${IDIR_VILISTEXTUM}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/vilistextum \ diff --git a/package/vim/Makefile b/package/vim/Makefile index 378e95418..7169cf883 100644 --- a/package/vim/Makefile +++ b/package/vim/Makefile @@ -4,18 +4,19 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= vim -PKG_VERSION:= 8.0 +PKG_VERSION:= 9.1 +PKG_EXTRAVER:= 0041 PKG_RELEASE:= 1 -PKG_HASH:= 08bd0d1dd30ece3cb9905ccd48b82b2f81c861696377508021265177dc153a61 +PKG_HASH:= 1531eb2f9a42e3e5a0c5579e26d9a376bd85f7062701c727af482d8597c59592 PKG_DESCR:= very popular text editor PKG_SECTION:= app/editor PKG_DEPENDS:= libncurses PKG_BUILDDEP:= ncurses PKG_URL:= http://www.vim.org/ -PKG_SITES:= ftp://ftp.vim.org/pub/vim/unix/ +PKG_SITES:= https://github.com/vim/vim/archive/refs/tags/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -WRKDIST= ${WRKDIR}/vim80 +DISTFILES:= v${PKG_VERSION}.${PKG_EXTRAVER}.tar.gz +WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION).$(PKG_EXTRAVER) WRKSRC= ${WRKDIST}/src include ${ADK_TOPDIR}/mk/package.mk @@ -28,6 +29,7 @@ CONFIGURE_ENV+= vim_cv_toupper_broken=no \ vim_cv_stat_ignores_slash=yes \ ac_cv_sizeof_int=4 \ vim_cv_terminfo=yes \ + vim_cv_tgetent=zero \ vim_cv_tty_group=tty \ vim_cv_memmove_handles_overlap=yes \ vim_cv_tty_mode=666 @@ -39,10 +41,7 @@ CONFIGURE_ARGS+= --disable-darwin \ --disable-tclinterp \ --disable-rubyinterp \ --disable-cscope \ - --disable-workshop \ --disable-netbeans \ - --disable-sniff \ - --disable-hangulinput \ --disable-xim \ --disable-fontset \ --disable-gui \ @@ -51,8 +50,7 @@ CONFIGURE_ARGS+= --disable-darwin \ --with-features=small \ --with-compiledby=OpenADK \ --without-x \ - --with-tlib=ncurses \ - --disable-multibyte + --with-tlib=ncurses XAKE_FLAGS+= prefix=/usr \ DESTDIR=${WRKINST} \ STRIP=: @@ -61,9 +59,9 @@ vim-install: ${INSTALL_DIR} ${IDIR_VIM}/usr/bin ${INSTALL_DIR} ${IDIR_VIM}/usr/share/vim ${CP} ${WRKINST}/usr/bin/{ex,vim,view} ${IDIR_VIM}/usr/bin - ${CP} ${WRKINST}/usr/share/vim/vim80/defaults.vim \ + ${CP} ${WRKINST}/usr/share/vim/vim91/defaults.vim \ ${IDIR_VIM}/usr/share/vim/ - ${CP} ${WRKINST}/usr/share/vim/vim80/vimrc_example.vim \ + ${CP} ${WRKINST}/usr/share/vim/vim91/vimrc_example.vim \ ${IDIR_VIM}/usr/share/vim/vimrc include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/vlc/Makefile b/package/vlc/Makefile index a5395b879..ccf59458d 100644 --- a/package/vlc/Makefile +++ b/package/vlc/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= vlc -PKG_VERSION:= 2.2.6 +PKG_VERSION:= 3.0.20 PKG_RELEASE:= 1 -PKG_HASH:= c403d3accd9a400eb2181c958f3e7bc5524fe5738425f4253d42883b425a42a8 +PKG_HASH:= adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5 PKG_DESCR:= popular media player PKG_SECTION:= mm/video PKG_DEPENDS:= libffmpeg xcb-util libgcrypt alsa-lib @@ -16,16 +16,13 @@ PKG_URL:= http://www.videolan.org/vlc/ PKG_SITES:= http://download.videolan.org/pub/videolan/vlc/$(PKG_VERSION)/ PKG_FLAVOURS_VLC:= WITH_BLURAY WITH_MAD WITH_OGG WITH_OPUS WITH_SPEEX WITH_THEORA -PKG_FLAVOURS_VLC+= WITH_VPX WITH_MATROSKA +PKG_FLAVOURS_VLC+= WITH_VPX WITH_X264 PKGFD_WITH_BLURAY:= enable bluray support PKGFB_WITH_BLURAY:= libbluray PKGFS_WITH_BLURAY:= libbluray PKGFD_WITH_MAD:= enable mp3 support PKGFB_WITH_MAD:= libmad PKGFS_WITH_MAD:= libmad -PKGFD_WITH_MATROSKA:= enable matroska support -PKGFB_WITH_MATROSKA:= libmatroska -PKGFS_WITH_MATROSKA:= libmatroska PKGFD_WITH_OGG:= enable ogg support PKGFB_WITH_OGG:= libogg PKGFS_WITH_OGG:= libogg @@ -41,6 +38,9 @@ PKGFS_WITH_THEORA:= libtheora PKGFD_WITH_VPX:= enable vpx support PKGFB_WITH_VPX:= libvpx PKGFS_WITH_VPX:= libvpx +PKGFD_WITH_X264:= enable h264 support +PKGFB_WITH_X264:= libx264 +PKGFS_WITH_X264:= libx264 include $(ADK_TOPDIR)/mk/package.mk @@ -66,7 +66,10 @@ CONFIGURE_ARGS+= --disable-lua \ --enable-libgcrypt \ --disable-optimizations \ --disable-static \ - --disable-avcodec + --disable-swscale \ + --disable-avformat \ + --disable-avcodec \ + --disable-mpg123 ifeq ($(ADK_TARGET_ARCH_ARM_WITH_NEON),) CONFIGURE_ARGS+= --disable-neon @@ -82,11 +85,6 @@ CONFIGURE_ARGS+= --enable-mad else CONFIGURE_ARGS+= --disable-mad endif -ifneq ($(ADK_PACKAGE_VLC_WITH_MATROSKA),) -CONFIGURE_ARGS+= --enable-mkv -else -CONFIGURE_ARGS+= --disable-mkv -endif ifneq ($(ADK_PACKAGE_VLC_WITH_OGG),) CONFIGURE_ARGS+= --enable-ogg else @@ -112,6 +110,11 @@ CONFIGURE_ARGS+= --enable-vpx else CONFIGURE_ARGS+= --disable-vpx endif +ifneq ($(ADK_PACKAGE_VLC_WITH_X264),) +CONFIGURE_ARGS+= --enable-x264 +else +CONFIGURE_ARGS+= --disable-x264 +endif vlc-install: $(INSTALL_DIR) $(IDIR_VLC)/usr/bin diff --git a/package/vlc/patches/patch-Makefile_am b/package/vlc/patches/patch-Makefile_am deleted file mode 100644 index b41062e43..000000000 --- a/package/vlc/patches/patch-Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- vlc-2.2.4.orig/Makefile.am 2015-10-21 19:48:45.000000000 +0200 -+++ vlc-2.2.4/Makefile.am 2016-09-24 20:37:45.255479549 +0200 -@@ -933,7 +933,7 @@ libvlc: libvlccore - cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la - - core: libvlc vlc$(EXEEXT) -- cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT) -+ cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) - - doc: - cd doc && $(MAKE) $(AM_MAKEFLAGS) doc diff --git a/package/vlc/patches/patch-bin_Makefile_am b/package/vlc/patches/patch-bin_Makefile_am deleted file mode 100644 index 5a3ea1bb2..000000000 --- a/package/vlc/patches/patch-bin_Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- vlc-2.2.4.orig/bin/Makefile.am 2015-02-02 20:42:28.000000000 +0100 -+++ vlc-2.2.4/bin/Makefile.am 2016-09-24 20:37:45.251479394 +0200 -@@ -1,7 +1,7 @@ - # Building vlc - # - bin_PROGRAMS = vlc --noinst_PROGRAMS = vlc-static -+noinst_PROGRAMS = - noinst_DATA = - vlclib_PROGRAMS = vlc-cache-gen - EXTRA_PROGRAMS = vlc-wrapper diff --git a/package/vlc/patches/patch-configure_ac b/package/vlc/patches/patch-configure_ac index ff67e1512..ead8c4c7e 100644 --- a/package/vlc/patches/patch-configure_ac +++ b/package/vlc/patches/patch-configure_ac @@ -1,122 +1,11 @@ ---- vlc-2.2.6.orig/configure.ac 2017-05-24 12:40:16.000000000 +0200 -+++ vlc-2.2.6/configure.ac 2017-06-06 22:52:45.841013479 +0200 -@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD - AC_CANONICAL_HOST - AC_PRESERVE_HELP_ORDER - --AM_INIT_AUTOMAKE(tar-ustar color-tests foreign) -+AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects) - AC_CONFIG_HEADERS([config.h]) - - # Disable with "./configure --disable-silent-rules" or "make V=1" -@@ -121,6 +121,7 @@ case "${host_os}" in - ;; - linux*) - SYS=linux -+ AC_CHECK_LIB([rt], [posix_spawnp], [VLC_ADD_LIBS([libvlccore],[-lrt])], [], []) - ;; - bsdi*) - SYS=bsdi -@@ -537,7 +538,7 @@ need_libc=false +--- vlc-3.0.20.orig/configure.ac 2023-10-30 08:25:45.000000000 +0100 ++++ vlc-3.0.20/configure.ac 2024-03-03 07:55:57.955760063 +0100 +@@ -631,7 +631,7 @@ dnl Check for system libs needed + need_libc=false dnl Check for usual libc functions - AC_CHECK_DECLS([nanosleep],,,[#include <time.h>]) --AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap open_memstream openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale]) -+AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap open_memstream openat pread posix_fadvise posix_madvise setlocale strerror_l stricmp strnicmp strptime uselocale]) - AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp]) - AC_CHECK_FUNCS(fdatasync,, - [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) -@@ -867,7 +868,7 @@ dnl - dnl Compiler warnings - dnl - --RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration]) -+RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var]) - RDC_PROG_CC_FLAGS([-pipe]) - AC_LANG_PUSH([C++]) - RDC_PROG_CXX_WFLAGS([all extra sign-compare undef pointer-arith volatile-register-var]) -@@ -2318,7 +2319,7 @@ AC_ARG_ENABLE(avcodec, - AS_IF([test "${enable_avcodec}" != "no"], [ - PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ - PKG_CHECK_EXISTS([libavutil < 55],, [ -- AC_MSG_ERROR([libavutil versions 55 and later are not supported.]) -+ AC_MSG_WARN([libavutil versions 55 and later are not supported.]) - ]) - VLC_SAVE_FLAGS - CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" -@@ -2328,7 +2329,7 @@ AS_IF([test "${enable_avcodec}" != "no"] - VLC_RESTORE_FLAGS - have_avcodec="yes" - ],[ -- AC_MSG_ERROR([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.]) -+ AC_MSG_WARN([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.]) - ]) - ], [ - have_avcodec="no" -@@ -2377,7 +2378,7 @@ AS_IF([test "${have_vaapi}" = "yes" -a " - case "${avfork}" in - ffmpeg) - PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ -- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.]) -+ AC_MSG_WARN([VA API requires FFmpeg libavcodec < 57.10 or libav.]) - ]) - ;; - esac -@@ -2411,7 +2412,7 @@ AS_IF([test "${enable_dxva2}" != "no"], - case "${avfork}" in - ffmpeg) - PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ -- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.]) -+ AC_MSG_WARN([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.]) - ]) - ;; - esac -@@ -2503,7 +2504,7 @@ AS_IF([test "${enable_avformat}" != "no" - ]) - VLC_RESTORE_FLAGS - ],[ -- AC_MSG_ERROR([${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error.]) -+ AC_MSG_WARN([${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error.]) - ]) - ]) - AM_CONDITIONAL([HAVE_AVFORMAT], [test "${enable_avformat}" != "no"]) -@@ -2532,7 +2533,7 @@ then - ]) - VLC_RESTORE_FLAGS - ],[ -- AC_MSG_ERROR([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.]) -+ AC_MSG_WARN([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.]) - ]) - fi - -@@ -3175,7 +3176,7 @@ AS_IF([test "${have_vdpau}" = "yes" -a " - libav) av_vdpau_ver="55.26.0" ;; - ffmpeg) av_vdpau_ver="55.42.100" - PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ -- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.]) -+ AC_MSG_WARN([VDPAU requires FFmpeg libavcodec < 57.10 or libav.]) - ]) - ;; - esac -@@ -4056,16 +4057,17 @@ dnl - AC_ARG_ENABLE(libgcrypt, - [ --disable-libgcrypt gcrypt support (default enabled)]) - AS_IF([test "${enable_libgcrypt}" != "no"], [ -+ AC_PATH_PROG([GCRYPT_CONFIG],[libgcrypt-config],[libgcrypt-config]) - AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [ -- libgcrypt-config --version >/dev/null || \ -+ ${GCRYPT_CONFIG} --version >/dev/null || \ - AC_MSG_ERROR([gcrypt.h present but libgcrypt-config could not be found]) - AC_CHECK_LIB(gcrypt, gcry_control, [ - have_libgcrypt="yes" -- GCRYPT_CFLAGS="`libgcrypt-config --cflags`" -- GCRYPT_LIBS="`libgcrypt-config --libs`" -+ GCRYPT_CFLAGS="`${GCRYPT_CONFIG} --cflags`" -+ GCRYPT_LIBS="`${GCRYPT_CONFIG} --libs`" - ], [ - AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or pass --disable-libgcrypt.]) -- ], [`libgcrypt-config --libs`]) -+ ], [`${GCRYPT_CONFIG} --libs`]) - ], [ - AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or pass --disable-libgcrypt.]) - ], [#include <gcrypt.h>] +-AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getmntent_r getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale]) ++AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getmntent_r getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale strerror_l stricmp strnicmp strptime uselocale]) + AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf]) + AC_REPLACE_FUNCS([gettimeofday]) + AC_CHECK_FUNC(fdatasync,, diff --git a/package/vlc/patches/patch-include_vlc_fixups_h b/package/vlc/patches/patch-include_vlc_fixups_h deleted file mode 100644 index 968f8d8eb..000000000 --- a/package/vlc/patches/patch-include_vlc_fixups_h +++ /dev/null @@ -1,15 +0,0 @@ ---- vlc-2.2.6.orig/include/vlc_fixups.h 2015-04-13 21:54:35.000000000 +0200 -+++ vlc-2.2.6/include/vlc_fixups.h 2017-06-06 22:56:59.837313883 +0200 -@@ -239,8 +239,10 @@ static inline locale_t newlocale(int mas - } - #endif - --#if !defined (HAVE_STATIC_ASSERT) --# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); })) -+#if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert) -+# define STATIC_ASSERT_CONCAT_(a, b) a##b -+# define STATIC_ASSERT_CONCAT(a, b) STATIC_ASSERT_CONCAT_(a, b) -+# define _Static_assert(x, s) extern char STATIC_ASSERT_CONCAT(static_assert_, __LINE__)[sizeof(struct { unsigned:-!(x); })] - # define static_assert _Static_assert - #endif - diff --git a/package/vlc/patches/patch-modules_codec_avcodec_audio_c b/package/vlc/patches/patch-modules_codec_avcodec_audio_c deleted file mode 100644 index 9dfaff716..000000000 --- a/package/vlc/patches/patch-modules_codec_avcodec_audio_c +++ /dev/null @@ -1,11 +0,0 @@ ---- vlc-2.2.4.orig/modules/codec/avcodec/audio.c 2016-01-18 21:49:57.000000000 +0100 -+++ vlc-2.2.4/modules/codec/avcodec/audio.c 2016-09-24 20:35:02.681191261 +0200 -@@ -39,7 +39,7 @@ - #include <libavcodec/avcodec.h> - #include <libavutil/mem.h> - --#include <libavutil/audioconvert.h> -+#include <libavutil/channel_layout.h> - - #include "avcodec.h" - diff --git a/package/vlc/patches/patch-modules_codec_avcodec_encoder_c b/package/vlc/patches/patch-modules_codec_avcodec_encoder_c deleted file mode 100644 index 3766addf8..000000000 --- a/package/vlc/patches/patch-modules_codec_avcodec_encoder_c +++ /dev/null @@ -1,92 +0,0 @@ ---- vlc-2.2.4.orig/modules/codec/avcodec/encoder.c 2015-10-21 19:48:45.000000000 +0200 -+++ vlc-2.2.4/modules/codec/avcodec/encoder.c 2016-09-24 20:35:02.681191261 +0200 -@@ -41,7 +41,7 @@ - #include <vlc_cpu.h> - - #include <libavcodec/avcodec.h> --#include <libavutil/audioconvert.h> -+#include <libavutil/channel_layout.h> - - #include "avcodec.h" - #include "avcommon.h" -@@ -311,7 +311,7 @@ int OpenEncoder( vlc_object_t *p_this ) - else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id, - &psz_namecodec ) ) - { -- if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE ) -+ if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE ) - return VLC_EGENERIC; /* handed chroma output */ - - i_cat = VIDEO_ES; -@@ -555,7 +555,7 @@ int OpenEncoder( vlc_object_t *p_this ) - - if( p_codec->pix_fmts ) - { -- const enum PixelFormat *p = p_codec->pix_fmts; -+ const enum AVPixelFormat *p = p_codec->pix_fmts; - for( ; *p != -1; p++ ) - { - if( *p == p_context->pix_fmt ) break; -@@ -1017,7 +1017,7 @@ errmsg: - } - } - -- p_sys->frame = avcodec_alloc_frame(); -+ p_sys->frame = av_frame_alloc(); - if( !p_sys->frame ) - { - goto error; -@@ -1048,7 +1048,7 @@ static void vlc_av_packet_Release(block_ - { - vlc_av_packet_t *b = (void *) block; - -- av_free_packet(&b->packet); -+ av_packet_unref(&b->packet); - free(b); - } - -@@ -1088,7 +1088,7 @@ static block_t *EncodeVideo( encoder_t * - AVFrame *frame = NULL; - if( likely(p_pict) ) { - frame = p_sys->frame; -- avcodec_get_frame_defaults( frame ); -+ av_frame_unref( frame ); - for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ ) - { - p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels; -@@ -1188,7 +1188,7 @@ static block_t *EncodeVideo( encoder_t * - av_pkt.duration / p_sys->p_context->time_base.den, p_sys->p_context ); - if( unlikely(p_block == NULL) ) - { -- av_free_packet( &av_pkt ); -+ av_packet_unref( &av_pkt ); - return NULL; - } - -@@ -1329,7 +1329,7 @@ static block_t *handle_delay_buffer( enc - //How much we need to copy from new packet - const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes; - -- avcodec_get_frame_defaults( p_sys->frame ); -+ av_frame_unref( p_sys->frame ); - p_sys->frame->format = p_sys->p_context->sample_fmt; - p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay; - -@@ -1451,7 +1451,7 @@ static block_t *EncodeAudio( encoder_t * - while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) || - ( p_sys->b_variable && p_aout_buf->i_nb_samples ) ) - { -- avcodec_get_frame_defaults( p_sys->frame ); -+ av_frame_unref( p_sys->frame ); - if( p_sys->b_variable ) - p_sys->frame->nb_samples = p_aout_buf->i_nb_samples; - else -@@ -1514,7 +1514,7 @@ void CloseEncoder( vlc_object_t *p_this - encoder_t *p_enc = (encoder_t *)p_this; - encoder_sys_t *p_sys = p_enc->p_sys; - -- /*FIXME: we should use avcodec_free_frame, but we don't require so new avcodec that has it*/ -+ /*FIXME: we should use av_frame_free, but we don't require so new avcodec that has it*/ - av_freep( &p_sys->frame ); - - vlc_avcodec_lock(); diff --git a/package/vlc/patches/patch-modules_codec_avcodec_vaapi_c b/package/vlc/patches/patch-modules_codec_avcodec_vaapi_c deleted file mode 100644 index 1fdad6258..000000000 --- a/package/vlc/patches/patch-modules_codec_avcodec_vaapi_c +++ /dev/null @@ -1,11 +0,0 @@ ---- vlc-2.2.4.orig/modules/codec/avcodec/vaapi.c 2015-02-02 20:42:29.000000000 +0100 -+++ vlc-2.2.4/modules/codec/avcodec/vaapi.c 2016-09-24 20:35:02.681191261 +0200 -@@ -595,7 +595,7 @@ static int Create( vlc_va_t *p_va, AVCod - return err; - - /* Only VLD supported */ -- p_va->pix_fmt = PIX_FMT_VAAPI_VLD; -+ p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD; - p_va->setup = Setup; - p_va->get = Get; - p_va->release = Release; diff --git a/package/vlc/patches/patch-modules_codec_avcodec_video_c b/package/vlc/patches/patch-modules_codec_avcodec_video_c deleted file mode 100644 index c9d3fb226..000000000 --- a/package/vlc/patches/patch-modules_codec_avcodec_video_c +++ /dev/null @@ -1,51 +0,0 @@ ---- vlc-2.2.6.orig/modules/codec/avcodec/video.c 2016-09-27 09:56:26.000000000 +0200 -+++ vlc-2.2.6/modules/codec/avcodec/video.c 2017-06-06 22:52:46.745071498 +0200 -@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC - static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * ); - static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * ); - #endif --static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *, -- const enum PixelFormat * ); -+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *, -+ const enum AVPixelFormat * ); - - static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc ) - { -@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo - p_sys->p_codec = p_codec; - p_sys->i_codec_id = i_codec_id; - p_sys->psz_namecodec = psz_namecodec; -- p_sys->p_ff_pic = avcodec_alloc_frame(); -+ p_sys->p_ff_pic = av_frame_alloc(); - p_sys->b_delayed_open = true; - p_sys->p_va = NULL; - vlc_sem_init( &p_sys->sem_mt, 0 ); -@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo - if( ffmpeg_OpenCodec( p_dec ) < 0 ) - { - msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec ); -- avcodec_free_frame( &p_sys->p_ff_pic ); -+ av_frame_free( &p_sys->p_ff_pic ); - vlc_sem_destroy( &p_sys->sem_mt ); - free( p_sys ); - return VLC_EGENERIC; -@@ -847,7 +847,7 @@ void EndVideoDec( decoder_t *p_dec ) - wait_mt( p_sys ); - - if( p_sys->p_ff_pic ) -- avcodec_free_frame( &p_sys->p_ff_pic ); -+ av_frame_free( &p_sys->p_ff_pic ); - - if( p_sys->p_va ) - vlc_va_Delete( p_sys->p_va ); -@@ -1334,8 +1334,8 @@ static void ffmpeg_ReleaseFrameBuf( stru - } - #endif - --static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, -- const enum PixelFormat *pi_fmt ) -+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, -+ const enum AVPixelFormat *pi_fmt ) - { - decoder_t *p_dec = p_context->opaque; - decoder_sys_t *p_sys = p_dec->p_sys; diff --git a/package/vlc/patches/patch-modules_demux_avformat_demux_c b/package/vlc/patches/patch-modules_demux_avformat_demux_c deleted file mode 100644 index ca710b26b..000000000 --- a/package/vlc/patches/patch-modules_demux_avformat_demux_c +++ /dev/null @@ -1,46 +0,0 @@ ---- vlc-2.2.4.orig/modules/demux/avformat/demux.c 2016-01-18 21:49:57.000000000 +0100 -+++ vlc-2.2.4/modules/demux/avformat/demux.c 2016-09-24 20:35:02.681191261 +0200 -@@ -734,14 +734,14 @@ static int Demux( demux_t *p_demux ) - } - if( pkt.stream_index < 0 || pkt.stream_index >= p_sys->i_tk ) - { -- av_free_packet( &pkt ); -+ av_packet_unref( &pkt ); - return 1; - } - const AVStream *p_stream = p_sys->ic->streams[pkt.stream_index]; - if( p_stream->time_base.den <= 0 ) - { - msg_Warn( p_demux, "Invalid time base for the stream %d", pkt.stream_index ); -- av_free_packet( &pkt ); -+ av_packet_unref( &pkt ); - return 1; - } - if( p_stream->codec->codec_id == AV_CODEC_ID_SSA ) -@@ -749,7 +749,7 @@ static int Demux( demux_t *p_demux ) - p_frame = BuildSsaFrame( &pkt, p_sys->i_ssa_order++ ); - if( !p_frame ) - { -- av_free_packet( &pkt ); -+ av_packet_unref( &pkt ); - return 1; - } - } -@@ -757,7 +757,7 @@ static int Demux( demux_t *p_demux ) - { - if( ( p_frame = block_Alloc( pkt.size ) ) == NULL ) - { -- av_free_packet( &pkt ); -+ av_packet_unref( &pkt ); - return 0; - } - memcpy( p_frame->p_buffer, pkt.data, pkt.size ); -@@ -838,7 +838,7 @@ static int Demux( demux_t *p_demux ) - else - block_Release( p_frame ); - -- av_free_packet( &pkt ); -+ av_packet_unref( &pkt ); - return 1; - } - diff --git a/package/vlc/patches/patch-src_posix_error_c b/package/vlc/patches/patch-src_posix_error_c index ef51c996e..413f97f7d 100644 --- a/package/vlc/patches/patch-src_posix_error_c +++ b/package/vlc/patches/patch-src_posix_error_c @@ -1,5 +1,5 @@ ---- vlc-2.2.4.orig/src/posix/error.c 2015-02-02 20:42:32.000000000 +0100 -+++ vlc-2.2.4/src/posix/error.c 2016-09-24 20:34:45.824539253 +0200 +--- vlc-3.0.20.orig/src/posix/error.c 2017-11-24 16:29:18.000000000 +0100 ++++ vlc-3.0.20/src/posix/error.c 2024-03-03 07:55:57.955760063 +0100 @@ -31,6 +31,7 @@ static const char *vlc_strerror_l(int errnum, const char *lname) @@ -8,15 +8,8 @@ int saved_errno = errno; locale_t loc = newlocale(LC_MESSAGES_MASK, lname, (locale_t)0); -@@ -48,9 +49,16 @@ static const char *vlc_strerror_l(int er - errno = saved_errno; - } - -+#if defined(__UCLIBC__) -+ const char *buf = strerror_r(errnum, loc, 100); -+#else +@@ -51,6 +52,9 @@ static const char *vlc_strerror_l(int er const char *buf = strerror_l(errnum, loc); -+#endif freelocale(loc); +#else diff --git a/package/vlc/patches/patch-src_posix_thread_c b/package/vlc/patches/patch-src_posix_thread_c deleted file mode 100644 index 5c636c164..000000000 --- a/package/vlc/patches/patch-src_posix_thread_c +++ /dev/null @@ -1,11 +0,0 @@ ---- vlc-2.2.4.orig/src/posix/thread.c 2015-02-02 20:42:32.000000000 +0100 -+++ vlc-2.2.4/src/posix/thread.c 2016-09-24 20:34:51.776769484 +0200 -@@ -85,7 +85,7 @@ static clockid_t vlc_clock_id; - - static void vlc_clock_setup_once (void) - { --# if (_POSIX_MONOTONIC_CLOCK == 0) -+# if (_POSIX_MONOTONIC_CLOCK == 0) && (_POSIX_CLOCK_SELECTION > 0) - long val = sysconf (_SC_MONOTONIC_CLOCK); - assert (val != 0); - vlc_clock_id = (val < 0) ? CLOCK_REALTIME : CLOCK_MONOTONIC; diff --git a/package/vnstat/Makefile b/package/vnstat/Makefile index cec293741..0ff859b02 100644 --- a/package/vnstat/Makefile +++ b/package/vnstat/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= vnstat -PKG_VERSION:= 1.14 +PKG_VERSION:= 2.12 PKG_RELEASE:= 1 -PKG_HASH:= f8462a47d85d0890493dc9eaeafbc725ae631aa5b103fb7f8af4ddb2314e8386 +PKG_HASH:= b7386b12fc1fc6f47fab31f208b12eda61862e63e229e84e95a6fa80406d2852 PKG_DESCR:= console-based network traffic monitor PKG_SECTION:= net/perf PKG_SITES:= http://humdi.net/vnstat/ @@ -17,12 +17,10 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,VNSTAT,vnstat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIG_STYLE:= manual -INSTALL_STYLE:= manual ALL_TARGET:= vnstat -do-install: +vnstat-install: ${INSTALL_DIR} ${IDIR_VNSTAT}/usr/bin - ${INSTALL_BIN} ${WRKBUILD}/src/vnstat ${IDIR_VNSTAT}/usr/bin/ + ${INSTALL_BIN} ${WRKINST}/usr/bin/vnstat ${IDIR_VNSTAT}/usr/bin/ include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/w3m/Makefile b/package/w3m/Makefile index bc97defc8..8b553b01b 100644 --- a/package/w3m/Makefile +++ b/package/w3m/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= libgc-host libgc ncurses PKG_URL:= http://w3m.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=w3m/} +PKG_NOPARALLEL:= 1 + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/wayland-protocols/Makefile b/package/wayland-protocols/Makefile new file mode 100644 index 000000000..9c1f8ad1d --- /dev/null +++ b/package/wayland-protocols/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:= wayland-protocols +PKG_VERSION:= 1.31 +PKG_RELEASE:= 1 +PKG_HASH:= a07fa722ed87676ec020d867714bc9a2f24c464da73912f39706eeef5219e238 +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_OPTS:= dev + +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))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +MESON_FLAGS+= -Dtests=false + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +wayland-protocols-install: + $(INSTALL_DIR) $(IDIR_WAYLAND_PROTOCOLS)/usr/share/wayland-protocols + $(CP) $(WRKINST)/usr/share/wayland-protocols/* \ + $(IDIR_WAYLAND_PROTOCOLS)/usr/share/wayland-protocols/ + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/wayland-protocols/patches/patch-meson_build b/package/wayland-protocols/patches/patch-meson_build new file mode 100644 index 000000000..ad075be1c --- /dev/null +++ b/package/wayland-protocols/patches/patch-meson_build @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000..ce3da7fb2 --- /dev/null +++ b/package/wayland-protocols/patches/patch-wayland-protocols_pc_in @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000..796af73f6 --- /dev/null +++ b/package/wayland/Makefile @@ -0,0 +1,53 @@ +# 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:= wayland +PKG_VERSION:= 1.22.0 +PKG_RELEASE:= 1 +PKG_HASH:= 1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842 +PKG_DESCR:= wayland +PKG_SECTION:= x11/libs +PKG_BUILDDEP:= wayland-host +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 + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,WAYLAND,wayland,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call PKG_template,WAYLAND,wayland,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +HOST_MESON_FLAGS+= -Ddocumentation=false \ + -Dtests=false \ + -Dscanner=true +MESON_FLAGS+= -Ddocumentation=false \ + -Dtests=false \ + -Dlibraries=true \ + -Dscanner=false + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +HOST_STYLE:= meson +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +hostpost-install: + $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/bin + $(INSTALL_BIN) $(WRKBUILD)/src/wayland-scanner \ + $(STAGING_HOST_DIR)/usr/bin + $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/lib/pkgconfig + $(CP) $(WRKBUILD)/meson-private/wayland-scanner.pc \ + $(STAGING_HOST_DIR)/usr/lib/pkgconfig + + +wayland-install: + $(INSTALL_DIR) $(IDIR_WAYLAND)/usr/lib + $(CP) $(WRKINST)/usr/lib/libwayland*.so* \ + $(IDIR_WAYLAND)/usr/lib + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile index 4009987c2..b6ad084a5 100644 --- a/package/webkitgtk/Makefile +++ b/package/webkitgtk/Makefile @@ -4,18 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= webkitgtk -PKG_VERSION:= 2.18.0 +PKG_VERSION:= 2.34.6 PKG_RELEASE:= 1 -PKG_HASH:= b583e46a3de36a3e80ba33b084ead60512a2046aca01ff61e50e519436e5038d +PKG_HASH:= 6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6 PKG_DESCR:= web browser engine PKG_SECTION:= libs/misc PKG_DEPENDS:= glib icu4c zlib libwebp libgtk3 libsoup PKG_DEPENDS+= libsecret libxt harfbuzz cairo libgcrypt -PKG_DEPENDS+= gst-plugins-base gstreamer libnotify +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+= gst-plugins-base gstreamer cairo enchant -PKG_BUILDDEP+= gnutls libgcrypt +PKG_BUILDDEP+= gstreamer cairo enchant libwebp gst-plugins-base +PKG_BUILDDEP+= gnutls libgcrypt ruby-host PKG_URL:= http://www.webkitgtk.org/ PKG_SITES:= http://webkitgtk.org/releases/ PKG_OPTS:= dev @@ -41,6 +41,14 @@ CMAKE_FLAGS+= -DPORT=GTK \ -DUSE_LIBNOTIFY=OFF \ -DENABLE_JIT=OFF \ -DUSE_LIBHYPHEN=OFF \ + -DUSE_SOUP2=ON \ + -DUSE_WPE_RENDERER=OFF \ + -DENABLE_GAMEPAD=OFF \ + -DUSE_OPENJPEG=OFF \ + -DUSE_WOFF2=OFF \ + -DUSE_SYSTEMD=OFF \ + -DUSE_LCMS=OFF \ + -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ -DENABLE_INTROSPECTION=OFF webkitgtk-install: diff --git a/package/webkitgtk/patches/patch-Source_PlatformGTK_cmake b/package/webkitgtk/patches/patch-Source_PlatformGTK_cmake deleted file mode 100644 index 863e86475..000000000 --- a/package/webkitgtk/patches/patch-Source_PlatformGTK_cmake +++ /dev/null @@ -1,7 +0,0 @@ ---- webkitgtk-2.12.0.orig/Source/PlatformGTK.cmake 2016-03-17 08:51:05.000000000 +0100 -+++ webkitgtk-2.12.0/Source/PlatformGTK.cmake 2016-04-03 10:54:31.244767406 +0200 -@@ -1,4 +1,3 @@ --add_subdirectory(${WEBCORE_DIR}/platform/gtk/po) - - # This allows exposing a 'gir' target which builds all GObject introspection files. - if (ENABLE_INTROSPECTION) diff --git a/package/weechat/Makefile b/package/weechat/Makefile index 5b63816e2..ec397bd73 100644 --- a/package/weechat/Makefile +++ b/package/weechat/Makefile @@ -4,26 +4,29 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= weechat -PKG_VERSION:= 1.1.1 +PKG_VERSION:= 4.2.1 PKG_RELEASE:= 1 -PKG_HASH:= a32f7e57d5e834195bacaffa874419b4a9d17cd42883c80d7ecb9fadbf601349 +PKG_HASH:= 253ddf086f6c845031a2dd294b1552851d6b04cc08a2f9da4aedfb3e2f91bdcd PKG_DESCR:= lightweight irc client PKG_SECTION:= app/chat -PKG_DEPENDS:= libncurses zlib libcurl libgcrypt -PKG_BUILDDEP:= cmake-host ncurses zlib curl libgcrypt +PKG_DEPENDS:= libncurses zlib libcurl libgcrypt libgnutls +PKG_BUILDDEP:= cmake-host ncurses zlib curl libgcrypt gnutls PKG_URL:= http://www.weechat.org/ -PKG_SITES:= http://www.weechat.org/files/src/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_SITES:= https://weechat.org/files/src/ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,WEECHAT,weechat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= cmake -CMAKE_FLAGS+= -DENABLE_GNUTLS=OFF \ - -DENABLE_PERL=OFF \ +CMAKE_FLAGS+= -DENABLE_PERL=OFF \ -DENABLE_PYTHON=OFF \ + -DENABLE_LUA=OFF \ + -DENABLE_RUBY=OFF \ + -DENABLE_PHP=OFF \ + -DENABLE_TCL=OFF \ + -DENABLE_GUILE=OFF \ + -DENABLE_SPELL=OFF \ -DENABLE_NLS=OFF \ -DGCRYPT_LDFLAGS="-L$(STAGING_TARGET_DIR)/usr/lib -ltinfo -lgcrypt" \ -DGCRYPT_CFLAGS="-I$(STAGING_TARGET_DIR)/usr/include" \ diff --git a/package/weston/Makefile b/package/weston/Makefile new file mode 100644 index 000000000..a3d374355 --- /dev/null +++ b/package/weston/Makefile @@ -0,0 +1,60 @@ +# 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:= weston +PKG_VERSION:= 11.0.0 +PKG_RELEASE:= 1 +PKG_HASH:= 5816a9e7bd67d03f268553a7af2f0c3430b409f7606244dada65188478f90800 +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_CFLINE_WESTON:= select ADK_PACKAGE_CAIRO_WITH_PNG@ + +DISTFILES:= $(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 \ + -Dbackend-drm-screencast-vaapi=false \ + -Dbackend-rdp=false \ + -Dcolor-management-lcms=false \ + -Dremoting=false \ + -Dpipewire=false \ + -Ddemo-clients=false + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +weston-install: + $(INSTALL_DIR) $(IDIR_WESTON)/usr/share + $(CP) $(WRKINST)/usr/share/* \ + $(IDIR_WESTON)/usr/share/ + $(INSTALL_DIR) $(IDIR_WESTON)/usr/libexec + $(CP) $(WRKINST)/usr/libexec/* \ + $(IDIR_WESTON)/usr/libexec/ + $(INSTALL_DIR) $(IDIR_WESTON)/usr/lib + $(CP) $(WRKINST)/usr/lib/weston \ + $(IDIR_WESTON)/usr/lib/ + $(CP) $(WRKINST)/usr/lib/libweston-11 \ + $(IDIR_WESTON)/usr/lib/ + $(CP) $(WRKINST)/usr/lib/libweston*so* \ + $(IDIR_WESTON)/usr/lib/ + $(INSTALL_DIR) $(IDIR_WESTON)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/weston \ + $(IDIR_WESTON)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile index 41e73b45b..a3e6e7430 100644 --- a/package/wifidog/Makefile +++ b/package/wifidog/Makefile @@ -19,6 +19,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,WIFIDOG,wifidog,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CFLAGS+= -fcommon CONFIGURE_ENV+= ac_cv_func_memcmp_working=yes \ ac_cv_lib_nsl_main=no \ ac_cv_func_setvbuf_reversed=no diff --git a/package/wolfssl/Makefile b/package/wolfssl/Makefile index 4a390a114..738821f65 100644 --- a/package/wolfssl/Makefile +++ b/package/wolfssl/Makefile @@ -4,21 +4,23 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= wolfssl -PKG_VERSION:= 3.13.0 +PKG_VERSION:= 5.6.6 PKG_RELEASE:= 1 -PKG_HASH:= 196a3256a9044ecb89504ce77850342c82e676e7f2cad77f5584be3516b6060e +PKG_HASH:= 3d2ca672d41c2c2fa667885a80d6fa03c3e91f0f4f72f87aef2bc947e8c87237 PKG_DESCR:= portable embedded ssl library PKG_SECTION:= libs/crypto PKG_URL:= http://www.wolfssl.com -PKG_SITES:= http://distfiles.openadk.org/ +PKG_SITES:= https://github.com/wolfSSL/wolfssl/archive/refs/tags/ PKG_OPTS:= dev -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).zip +DISTFILES:= v$(PKG_VERSION)-stable.tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-stable 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)' diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 1cfafb014..873b6f2d3 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -4,16 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= wpa_supplicant -PKG_VERSION:= 2.5 -PKG_RELEASE:= 1 -PKG_HASH:= cce55bae483b364eae55c35ba567c279be442ed8bab5b80a3c7fb0d057b9b316 +PKG_VERSION:= 2.10 +PKG_RELEASE:= 2 +PKG_HASH:= 20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f PKG_DESCR:= wpa supplicant PKG_SECTION:= net/wifi PKG_DEPENDS:= libnl PKG_BUILDDEP:= libnl PKG_NEEDS:= threads PKG_URL:= http://hostap.epitest.fi/wpa_supplicant/ -PKG_SITES:= http://hostap.epitest.fi/releases/ +PKG_SITES:= http://w1.fi/releases/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -21,7 +21,7 @@ PKG_DFLT_WPA_SUPPLICANT:= y if ADK_TARGET_WITH_WIFI WRKSRC= ${WRKDIST}/${PKG_NAME} -PKG_CHOICES_WPA_SUPPLICANT:= WITH_LIBRESSL WITH_INTERNAL WITH_GNUTLS +PKG_CHOICES_WPA_SUPPLICANT:= WITH_INTERNAL WITH_LIBRESSL WITH_GNUTLS PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl PKGCB_WITH_LIBRESSL:= libressl diff --git a/package/wput/Makefile b/package/wput/Makefile index 12f87d61f..3448d6521 100644 --- a/package/wput/Makefile +++ b/package/wput/Makefile @@ -17,6 +17,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,WPUT,wput,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CFLAGS+= -fcommon CONFIGURE_ARGS+= --disable-g-switch \ --without-ssl diff --git a/package/x11vnc/Makefile b/package/x11vnc/Makefile index 9fad7e631..7105c928e 100644 --- a/package/x11vnc/Makefile +++ b/package/x11vnc/Makefile @@ -4,28 +4,33 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= x11vnc -PKG_VERSION:= 0.9.13 +PKG_VERSION:= 0.9.16 PKG_RELEASE:= 1 -PKG_HASH:= f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b +PKG_HASH:= 885e5b5f5f25eec6f9e4a1e8be3d0ac71a686331ee1cfb442dba391111bd32bd PKG_DESCR:= vnc server for x11 displays PKG_SECTION:= x11/apps -PKG_BUILDDEP:= libX11 libXtst libjpeg-turbo +PKG_DEPENDS:= libvncserver libpng libjpeg-turbo zlib liblzo +PKG_DEPENDS+= libgnutls libxi libxdamage libxtst cairo +PKG_DEPENDS+= libxfixes libxrandr +PKG_BUILDDEP:= libX11 libXtst libjpeg-turbo libvncserver PKG_URL:= http://www.karlrunge.com/x11vnc/ -PKG_SITES:= http://sourceforge.net/projects/libvncserver/files/x11vnc/0.9.13/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_SITES:= https://github.com/LibVNC/x11vnc/archive/refs/tags/ +DISTFILES:= ${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,X11VNC,x11vnc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_LDFLAGS+= -lssl -lcrypto ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) MAKE_FLAGS+= CFLAGS="${TARGET_CFLAGS} -static" \ LIBS="-lxcb -lXau -lXdmcp -ldl -pthread -ljpeg -lz" endif -CONFIGURE_ARGS+= --without-ssl +AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --without-ssl \ + --without-crypto x11vnc-install: $(INSTALL_DIR) $(IDIR_X11VNC)/usr/bin diff --git a/package/x11vnc/patches/patch-src_util_c b/package/x11vnc/patches/patch-src_util_c new file mode 100644 index 000000000..c16d39ae6 --- /dev/null +++ b/package/x11vnc/patches/patch-src_util_c @@ -0,0 +1,12 @@ +--- x11vnc-0.9.16.orig/src/util.c 2019-01-05 14:22:11.000000000 +0100 ++++ x11vnc-0.9.16/src/util.c 2022-12-30 16:45:15.602697333 +0100 +@@ -47,6 +47,9 @@ int hxl = 0; + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD + MUTEX(x11Mutex); + MUTEX(scrollMutex); ++MUTEX(clientMutex); ++MUTEX(inputMutex); ++MUTEX(pointerMutex); + #endif + + int nfix(int i, int n); diff --git a/package/x11vnc/patches/patch-src_util_h b/package/x11vnc/patches/patch-src_util_h new file mode 100644 index 000000000..147534eb2 --- /dev/null +++ b/package/x11vnc/patches/patch-src_util_h @@ -0,0 +1,15 @@ +--- x11vnc-0.9.16.orig/src/util.h 2019-01-05 14:22:11.000000000 +0100 ++++ x11vnc-0.9.16/src/util.h 2022-12-30 16:45:15.598697256 +0100 +@@ -102,9 +102,9 @@ extern struct timeval _mysleep; + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD + extern MUTEX(x11Mutex); + extern MUTEX(scrollMutex); +-MUTEX(clientMutex); +-MUTEX(inputMutex); +-MUTEX(pointerMutex); ++extern MUTEX(clientMutex); ++extern MUTEX(inputMutex); ++extern MUTEX(pointerMutex); + #endif + + #define X_INIT INIT_MUTEX(x11Mutex) diff --git a/package/xawtv/Makefile b/package/xawtv/Makefile index 4c3ba6d31..e459a6f09 100644 --- a/package/xawtv/Makefile +++ b/package/xawtv/Makefile @@ -4,19 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xawtv -PKG_VERSION:= 3.103 +PKG_VERSION:= 47a81c3ca7ac9b4f0989cccb7961dc4bff52364a PKG_RELEASE:= 1 -PKG_HASH:= 2cf3a91b5d59a094bd86e101684a65c0e3d09225c11a787e060fa01bfbc8dd52 +PKG_GIT:= hash PKG_DESCR:= video & webcam application PKG_BUILDDEP:= libXinerama v4l-utils PKG_DEPENDS:= libxinerama libv4l PKG_SECTION:= x11/apps -PKG_SITES:= http://linuxtv.org/downloads/xawtv/ +PKG_SITES:= http://git.linuxtv.org/xawtv3.git PKG_ARCH_DEPENDS:= x86 x86_64 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,XAWTV,xawtv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index 67947e882..d5639997b 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -4,50 +4,41 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xcb-proto -PKG_VERSION:= 1.12 +PKG_VERSION:= 1.16.0 PKG_RELEASE:= 1 -PKG_HASH:= cfa49e65dd390233d560ce4476575e4b76e505a0e0bacdfb5ba6f8d0af53fd59 +PKG_HASH:= a75a1848ad2a89a82d841a51be56ce988ff3c63a8d6bf4383ae3219d8d915119 PKG_DESCR:= xml-xcb protocol descriptions PKG_SECTION:= dev/header -HOST_BUILDDEP:= python2-host -PKG_SITES:= http://xcb.freedesktop.org/dist/ +HOST_BUILDDEP:= python3-host +PKG_SITES:= https://xorg.freedesktop.org/archive/individual/proto/ PKG_OPTS:= dev devonly -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -PKG_SUBPKGS:= XCB_PROTO XCB_PYTHON -PKGSC_XCB_PYTHON:= x11/misc - include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,XCB_PROTO,xcb-proto,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,XCB_PROTO,xcb-proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,XCB_PYTHON,xcb-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_XCB_PYTHON})) -include $(ADK_TOPDIR)/mk/python.mk +include $(ADK_TOPDIR)/mk/python3.mk HOST_STYLE:= auto CONFIGURE_ENV+= PYTHON=$(PYTHON) -# pkg-config variables are not fixed up with sysroot hostpost-install: - $(SED) 's|^\(xcbincludedir=\)|\1$(STAGING_HOST_DIR)|' \ - $(STAGING_HOST_DIR)/usr/lib/pkgconfig/xcb-proto.pc + ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/share/xcb + ${CP} ${WRKBUILD}/src/*.xml ${STAGING_HOST_DIR}/usr/share/xcb post-build: ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/xcb ${CP} ${WRKBUILD}/src/*.xml ${STAGING_TARGET_DIR}/usr/share/xcb - $(SED) 's|^\(xcbincludedir=\)|\1$(STAGING_TARGET_DIR)|' \ - $(WRKBUILD)/xcb-proto.pc -xcb-python-install: +xcb-proto-install: $(INSTALL_DIR) ${STAGING_TARGET_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ ${STAGING_TARGET_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen - ${INSTALL_DIR} ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen + ${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ - ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen + ${IDIR_XCB_PROTO}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xcb-proto/patches/patch-xcb-proto_pc_in b/package/xcb-proto/patches/patch-xcb-proto_pc_in new file mode 100644 index 000000000..3732f4310 --- /dev/null +++ b/package/xcb-proto/patches/patch-xcb-proto_pc_in @@ -0,0 +1,14 @@ +--- 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/xdm/Makefile b/package/xdm/Makefile index b3e6b53c8..70b0fb235 100644 --- a/package/xdm/Makefile +++ b/package/xdm/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xdm -PKG_VERSION:= 1.1.11 +PKG_VERSION:= 1.1.14 PKG_RELEASE:= 1 -PKG_HASH:= 38c544a986143b1f24566c1a0111486b339b92224b927be78714eeeedca12a14 +PKG_HASH:= bcc543c3c120094d58d9cc9837958d4303693c2116ba342ba3dd9440137b4026 PKG_DESCR:= display manager PKG_SECTION:= x11/apps -PKG_BUILDDEP:= pam -PKG_DEPENDS:= xconsole pam xsm +PKG_BUILDDEP:= pam libXaw +PKG_DEPENDS:= xconsole pam xsm libxaw PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= http://www.x.org/releases/individual/app/ @@ -21,6 +21,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,XDM,xdm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --with-random-device=/dev/urandom \ + --with-appdefaultdir=/usr/share/X11/app-defaults \ --with-utmp-file=/dev/null \ --with-wtmp-file=/dev/null diff --git a/package/xenomai/Makefile b/package/xenomai/Makefile deleted file mode 100644 index 5d9b7dfdf..000000000 --- a/package/xenomai/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:= xenomai -PKG_VERSION:= 3.0.6 -PKG_RELEASE:= 1 -PKG_HASH:= 2c0dd3f0e36e4a10f97e0028989bb873e80f4d1ce212ac55fd3b28857c464f94 -PKG_DESCR:= realtime extension -PKG_SECTION:= sys/misc -PKG_URL:= https://xenomai.org/ -PKG_SITES:= https://xenomai.org/downloads/xenomai/stable/ - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 - -PKG_CHOICES_XENOMAI:= WITH_MERCURY -#PKG_CHOICES_XENOMAI:= WITH_MERCURY WITH_COBALT -PKGCD_WITH_MERCURY:= use mercury -#PKGCD_WITH_COBALT:= use cobalt - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,XENOMAI,xenomai,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -XAKE_FLAGS+= SUDO="echo" -CONFIGURE_ARGS+= --includedir=/usr/include/xenomai/ --disable-doc-install - -ifeq (${ADK_PACKAGE_XENOMAI_WITH_MERCURY},y) -CONFIGURE_ARGS+= --with-core=mercury -endif - -ifeq (${ADK_PACKAGE_XENOMAI_WITH_COBALT},y) -CONFIGURE_ARGS+= --with-core=cobalt -endif - -xenomai-install: - $(INSTALL_DIR) $(IDIR_XENOMAI)/usr/bin - $(INSTALL_DIR) $(IDIR_XENOMAI)/usr/sbin - $(INSTALL_DIR) $(IDIR_XENOMAI)/usr/lib - $(CP) $(WRKINST)/usr/bin/* \ - $(IDIR_XENOMAI)/usr/bin - $(CP) $(WRKINST)/usr/sbin/* \ - $(IDIR_XENOMAI)/usr/sbin - $(CP) $(WRKINST)/usr/lib/* \ - $(IDIR_XENOMAI)/usr/lib - - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile index 5931ff84b..bebc4aac4 100644 --- a/package/xf86-input-evdev/Makefile +++ b/package/xf86-input-evdev/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= 1a1b69daf41eac965f1cf0be721ebc340b2860c066147cb483f0e8f0ab7dd6a2 PKG_DESCR:= x11 driver for evdev PKG_SECTION:= x11/drivers -PKG_DEPENDS:= xorg-server libudev -PKG_BUILDDEP:= xorg-server eudev +PKG_DEPENDS:= xorg-server libudev libevdev mtdev +PKG_BUILDDEP:= xorg-server eudev libevdev mtdev PKG_SITES:= http://www.x.org/releases/individual/driver/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile index 6bef7daef..3198dbc53 100644 --- a/package/xf86-input-mouse/Makefile +++ b/package/xf86-input-mouse/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xf86-input-mouse -PKG_VERSION:= 1.9.2 +PKG_VERSION:= 1.9.3 PKG_RELEASE:= 1 -PKG_HASH:= 82bb4b01b26853b180e87ab97510316c741af2bded359c994c0d689386947095 +PKG_HASH:= 71f3aa0a18dfe1ca5cb235ec9210f33571cf5fbbd90ac5b55306a954f67aa5c6 PKG_DESCR:= x11 driver for mouse PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server diff --git a/package/xf86-video-modesetting/Makefile b/package/xf86-video-modesetting/Makefile deleted file mode 100644 index 4cd733739..000000000 --- a/package/xf86-video-modesetting/Makefile +++ /dev/null @@ -1,29 +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:= xf86-video-modesetting -PKG_VERSION:= 0.8.1 -PKG_RELEASE:= 1 -PKG_HASH:= 7cb67bc95e83f195bc5f50b6af0b4ff66b5b9ccd16848613d55d732bc1e5fdb6 -PKG_DESCR:= x11 driver for kms -PKG_SECTION:= x11/drivers -PKG_DEPENDS:= xorg-server libudev -PKG_BUILDDEP:= xorg-server eudev -PKG_NEEDS:= c++ -PKG_SITES:= http://www.x.org/releases/individual/driver/ - -PKG_SYSTEM_DEPENDS:= qemu-x86 qemu-x86_64 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,XF86_VIDEO_MODESETTING,xf86-video-modesetting,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -xf86-video-modesetting-install: - ${INSTALL_DIR} ${IDIR_XF86_VIDEO_MODESETTING}/usr/lib/xorg/modules/drivers - ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/modesetting_*.so \ - ${IDIR_XF86_VIDEO_MODESETTING}/usr/lib/xorg/modules/drivers/ - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 4da664645..e21801f9f 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= xfsprogs -PKG_VERSION:= 5.13.0 +PKG_VERSION:= 6.6.0 PKG_RELEASE:= 1 -PKG_HASH:= 4e142d4babe086adf9016d8c606c805829da08e46389a4433f40346204f90cdb +PKG_HASH:= 50ca2f4676df8fab4cb4c3ef3dd512d5551e6844d40a65a31d5b8e03593d22df PKG_DESCR:= utilities for xfs filesystems PKG_SECTION:= sys/fs -PKG_DEPENDS:= libuuid libblkid libncurses libinih -PKG_BUILDDEP:= e2fsprogs ncurses libinih +PKG_DEPENDS:= libuuid libblkid libncurses libinih liburcu +PKG_BUILDDEP:= e2fsprogs ncurses libinih liburcu PKG_NEEDS:= threads PKG_URL:= http://oss.sgi.com/projects/xfs PKG_SITES:= https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/ @@ -21,7 +21,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,XFSPROGS,xfsprogs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_LDFLAGS+= -lblkid +TARGET_LDFLAGS+= -lblkid -luuid INSTALL_STYLE:= manual CONFIGURE_ARGS+= --enable-gettext=no \ --enable-blkid=yes \ diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index b6ba0d40f..182812e57 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -4,21 +4,23 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xkeyboard-config -PKG_VERSION:= 2.11 +PKG_VERSION:= 2.37 PKG_RELEASE:= 1 -PKG_HASH:= e7125460892c2b5c3a8d843cb18c24b60c46051e925c2888a61fa672a2f76d76 +PKG_HASH:= eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c PKG_DESCR:= keyboard config PKG_SECTION:= x11/misc -PKG_BUILDDEP:= util-macros-host xkbcomp +PKG_BUILDDEP:= util-macros-host xkbcomp meson-host PKG_SITES:= http://www.x.org/releases/individual/data/xkeyboard-config/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,XKEYBOARD_CONFIG,xkeyboard-config,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson xkeyboard-config-install: ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb diff --git a/package/xkeyboard-config/patches/patch-Makefile_am b/package/xkeyboard-config/patches/patch-Makefile_am deleted file mode 100644 index 91f90f91b..000000000 --- a/package/xkeyboard-config/patches/patch-Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ ---- xkeyboard-config-2.11.orig/Makefile.am 2013-10-19 18:02:53.000000000 +0200 -+++ xkeyboard-config-2.11/Makefile.am 2014-03-04 14:43:40.000000000 +0100 -@@ -1,6 +1,6 @@ - AUTOMAKE_OPTIONS = foreign - --SUBDIRS = compat geometry keycodes po rules symbols types docs man -+SUBDIRS = compat geometry keycodes rules symbols types - - pkgconfigdir = $(datadir)/pkgconfig - pkgconfig_DATA = xkeyboard-config.pc diff --git a/package/xkeyboard-config/patches/patch-configure_ac b/package/xkeyboard-config/patches/patch-configure_ac deleted file mode 100644 index 2cb7cc7db..000000000 --- a/package/xkeyboard-config/patches/patch-configure_ac +++ /dev/null @@ -1,13 +0,0 @@ ---- xkeyboard-config-2.11.orig/configure.ac 2014-01-29 21:08:27.000000000 +0100 -+++ xkeyboard-config-2.11/configure.ac 2014-03-04 14:43:26.000000000 +0100 -@@ -63,10 +63,6 @@ AM_CONDITIONAL(USE_COMPAT_RULES, test "x - # **** - # i18n - # **** --AC_PROG_INTLTOOL(0.30) -- --AM_GNU_GETTEXT_VERSION([0.18.1]) --AM_GNU_GETTEXT([external]) - - GETTEXT_PACKAGE=xkeyboard-config - AC_SUBST(GETTEXT_PACKAGE) diff --git a/package/xkeyboard-config/patches/patch-rules_Makefile_am b/package/xkeyboard-config/patches/patch-rules_Makefile_am deleted file mode 100644 index ac07e510b..000000000 --- a/package/xkeyboard-config/patches/patch-rules_Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ ---- xkeyboard-config-2.11.orig/rules/Makefile.am 2013-12-17 23:59:06.000000000 +0100 -+++ xkeyboard-config-2.11/rules/Makefile.am 2014-03-04 14:30:44.000000000 +0100 -@@ -244,4 +244,6 @@ MAINTAINERCLEANFILES = $(srcdir)/evdev.x - rulesdir = $(xkb_base)/rules - xmldir = $(rulesdir) - --@INTLTOOL_XML_NOMERGE_RULE@ -+# remove intltool-merge dependency -+%.xml: %.xml.in -+ cp $< $@ diff --git a/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in b/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in deleted file mode 100644 index beb2b7a9d..000000000 --- a/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in +++ /dev/null @@ -1,855 +0,0 @@ ---- xkeyboard-config-2.11.orig/rules/base.extras.xml.in 2013-12-24 00:48:45.000000000 +0100 -+++ xkeyboard-config-2.11/rules/base.extras.xml.in 2014-03-04 14:31:19.000000000 +0100 -@@ -1,4 +1,4 @@ --<?xml version="1.0" encoding="utf-8"?> -+<?xml version="1.0" encoding="UTF-8"?> - <!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd"> - <xkbConfigRegistry> - <modelList/> -@@ -6,8 +6,8 @@ - <layout> - <configItem> - <name>apl</name> -- <_shortDescription>apl</_shortDescription> -- <_description>APL keyboard symbols</_description> -+ <shortDescription>apl</shortDescription> -+ <description>APL keyboard symbols</description> - <languageList><iso639Id>eng</iso639Id></languageList> - </configItem> - <variantList> -@@ -58,29 +58,29 @@ - <layout> - <configItem> - <name>ca</name> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Canada)</_description> -+ <shortDescription>fr</shortDescription> -+ <description>French (Canada)</description> - <languageList><iso639Id>fra</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>kut</name> -- <_shortDescription>kut</_shortDescription> -- <_description>Kutenai</_description> -+ <shortDescription>kut</shortDescription> -+ <description>Kutenai</description> - </configItem> - </variant> - <variant> - <configItem> - <name>shs</name> -- <_shortDescription>shs</_shortDescription> -- <_description>Secwepemctsin</_description> -+ <shortDescription>shs</shortDescription> -+ <description>Secwepemctsin</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Multilingual (Canada, Sun Type 6/7)</_description> -+ <description>Multilingual (Canada, Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -88,8 +88,8 @@ - <layout> - <configItem> - <name>de</name> -- <_shortDescription>de</_shortDescription> -- <_description>German</_description> -+ <shortDescription>de</shortDescription> -+ <description>German</description> - <languageList> - <iso639Id>ger</iso639Id> - </languageList> -@@ -98,7 +98,7 @@ - <variant> - <configItem> - <name>us</name> -- <_description>German (US keyboard with German letters)</_description> -+ <description>German (US keyboard with German letters)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -107,7 +107,7 @@ - <variant> - <configItem> - <name>hu</name> -- <_description>German (with Hungarian letters and no dead keys)</_description> -+ <description>German (with Hungarian letters and no dead keys)</description> - <languageList> - <iso639Id>ger</iso639Id> - <iso639Id>hun</iso639Id> -@@ -117,7 +117,7 @@ - <variant> - <configItem> - <name>sun_type6</name> -- <_description>German (Sun Type 6/7)</_description> -+ <description>German (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -125,15 +125,15 @@ - <layout> - <configItem> - <name>ir</name> -- <_shortDescription>fa</_shortDescription> -- <_description>Persian</_description> -+ <shortDescription>fa</shortDescription> -+ <description>Persian</description> - <languageList><iso639Id>per</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>ave</name> -- <_description>Avestan</_description> -+ <description>Avestan</description> - <languageList><iso639Id>ave</iso639Id></languageList> - </configItem> - </variant> -@@ -142,21 +142,21 @@ - <layout> - <configItem> - <name>lt</name> -- <_shortDescription>lt</_shortDescription> -- <_description>Lithuanian</_description> -+ <shortDescription>lt</shortDescription> -+ <description>Lithuanian</description> - <languageList><iso639Id>lit</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>us_dvorak</name> -- <_description>Lithuanian (US Dvorak with Lithuanian letters)</_description> -+ <description>Lithuanian (US Dvorak with Lithuanian letters)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Lithuanian (Sun Type 6/7)</_description> -+ <description>Lithuanian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -164,8 +164,8 @@ - <layout> - <configItem> - <name>lv</name> -- <_shortDescription>lv</_shortDescription> -- <_description>Latvian</_description> -+ <shortDescription>lv</shortDescription> -+ <description>Latvian</description> - <languageList> - <iso639Id>lav</iso639Id> - </languageList> -@@ -174,55 +174,55 @@ - <variant> - <configItem> - <name>dvorak</name> -- <_description>Latvian (US Dvorak)</_description> -+ <description>Latvian (US Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ykeydvorak</name> -- <_description>Latvian (US Dvorak, Y variant)</_description> -+ <description>Latvian (US Dvorak, Y variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>minuskeydvorak</name> -- <_description>Latvian (US Dvorak, minus variant)</_description> -+ <description>Latvian (US Dvorak, minus variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorakprogr</name> -- <_description>Latvian (programmer US Dvorak)</_description> -+ <description>Latvian (programmer US Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ykeydvorakprogr</name> -- <_description>Latvian (programmer US Dvorak, Y variant)</_description> -+ <description>Latvian (programmer US Dvorak, Y variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>minuskeydvorakprogr</name> -- <_description>Latvian (programmer US Dvorak, minus variant)</_description> -+ <description>Latvian (programmer US Dvorak, minus variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>colemak</name> -- <_description>Latvian (US Colemak)</_description> -+ <description>Latvian (US Colemak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>apostrophecolemak</name> -- <_description>Latvian (US Colemak, apostrophe variant)</_description> -+ <description>Latvian (US Colemak, apostrophe variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Latvian (Sun Type 6/7)</_description> -+ <description>Latvian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -230,34 +230,34 @@ - <layout> - <configItem> - <name>us</name> -- <_shortDescription>en</_shortDescription> -- <_description>English (US)</_description> -+ <shortDescription>en</shortDescription> -+ <description>English (US)</description> - <languageList><iso639Id>eng</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>intl-unicode</name> -- <_description>English (US, international AltGr Unicode combining)</_description> -+ <description>English (US, international AltGr Unicode combining)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>alt-intl-unicode</name> -- <_description>English (US, international AltGr Unicode combining, alternative)</_description> -+ <description>English (US, international AltGr Unicode combining, alternative)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ats</name> -- <_description>Atsina</_description> -- <!-- No ISO code in ISO639-2, only draft ISO693-3 --> -+ <description>Atsina</description> -+ - </configItem> - </variant> - <variant> - <configItem> - <name>crd</name> -- <_description>Coeur d'Alene Salish</_description> -+ <description>Coeur d'Alene Salish</description> - <languageList><iso639Id>crd</iso639Id></languageList> - </configItem> - </variant> -@@ -274,13 +274,13 @@ - <variant> - <configItem> - <name>sun_type6</name> -- <_description>English (US, Sun Type 6/7)</_description> -+ <description>English (US, Sun Type 6/7)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>norman</name> -- <_description>English (Norman)</_description> -+ <description>English (Norman)</description> - </configItem> - </variant> - </variantList> -@@ -288,27 +288,27 @@ - <layout> - <configItem> - <name>pl</name> -- <_shortDescription>pl</_shortDescription> -- <_description>Polish</_description> -+ <shortDescription>pl</shortDescription> -+ <description>Polish</description> - <languageList><iso639Id>pol</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>intl</name> -- <_description>Polish (international with dead keys)</_description> -+ <description>Polish (international with dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>colemak</name> -- <_description>Polish (Colemak)</_description> -+ <description>Polish (Colemak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Polish (Sun Type 6/7)</_description> -+ <description>Polish (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -316,16 +316,16 @@ - <layout> - <configItem> - <name>ro</name> -- <_shortDescription>ro</_shortDescription> -- <_description>Romanian</_description> -+ <shortDescription>ro</shortDescription> -+ <description>Romanian</description> - <languageList><iso639Id>rum</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>crh_dobruja</name> -- <_shortDescription>crh</_shortDescription> -- <_description>Crimean Tatar (Dobruja Q)</_description> -+ <shortDescription>crh</shortDescription> -+ <description>Crimean Tatar (Dobruja Q)</description> - <languageList> - <iso639Id>crh</iso639Id> - </languageList> -@@ -334,13 +334,13 @@ - <variant> - <configItem> - <name>ergonomic</name> -- <_description>Romanian (ergonomic Touchtype)</_description> -+ <description>Romanian (ergonomic Touchtype)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Romanian (Sun Type 6/7)</_description> -+ <description>Romanian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -348,15 +348,15 @@ - <layout> - <configItem> - <name>rs</name> -- <_shortDescription>sr</_shortDescription> -- <_description>Serbian</_description> -+ <shortDescription>sr</shortDescription> -+ <description>Serbian</description> - <languageList><iso639Id>srp</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>combiningkeys</name> -- <_description>Serbian (combining accents instead of dead keys)</_description> -+ <description>Serbian (combining accents instead of dead keys)</description> - </configItem> - </variant> - </variantList> -@@ -364,8 +364,8 @@ - <layout> - <configItem> - <name>ru</name> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian</_description> -+ <shortDescription>ru</shortDescription> -+ <description>Russian</description> - </configItem> - <variantList> - <variant> -@@ -378,8 +378,8 @@ - <variant> - <configItem> - <name>ruu</name> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (with Ukrainian-Belorussian layout)</_description> -+ <shortDescription>ru</shortDescription> -+ <description>Russian (with Ukrainian-Belorussian layout)</description> - <languageList><iso639Id>rus</iso639Id> - <iso639Id>ukr</iso639Id> - <iso639Id>bel</iso639Id></languageList> -@@ -388,7 +388,7 @@ - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Russian (Sun Type 6/7)</_description> -+ <description>Russian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -396,8 +396,8 @@ - <layout> - <configItem> - <name>am</name> -- <_shortDescription>hy</_shortDescription> -- <_description>Armenian</_description> -+ <shortDescription>hy</shortDescription> -+ <description>Armenian</description> - <languageList> - <iso639Id>hye</iso639Id> - </languageList> -@@ -406,7 +406,7 @@ - <variant> - <configItem> - <name>olpc-phonetic</name> -- <_description>Armenian (OLPC phonetic)</_description> -+ <description>Armenian (OLPC phonetic)</description> - </configItem> - </variant> - </variantList> -@@ -414,15 +414,15 @@ - <layout> - <configItem> - <name>il</name> -- <_shortDescription>he</_shortDescription> -- <_description>Hebrew</_description> -+ <shortDescription>he</shortDescription> -+ <description>Hebrew</description> - <languageList><iso639Id>heb</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>biblicalSIL</name> -- <_description>Hebrew (Biblical, SIL phonetic)</_description> -+ <description>Hebrew (Biblical, SIL phonetic)</description> - <languageList><iso639Id>heb</iso639Id></languageList> - </configItem> - </variant> -@@ -431,14 +431,14 @@ - <layout> - <configItem> - <name>ara</name> -- <_shortDescription>ar</_shortDescription> -- <_description>Arabic</_description> -+ <shortDescription>ar</shortDescription> -+ <description>Arabic</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Arabic (Sun Type 6/7)</_description> -+ <description>Arabic (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -446,14 +446,14 @@ - <layout> - <configItem> - <name>be</name> -- <_shortDescription>be</_shortDescription> -- <_description>Belgian</_description> -+ <shortDescription>be</shortDescription> -+ <description>Belgian</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Belgian (Sun Type 6/7)</_description> -+ <description>Belgian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -461,14 +461,14 @@ - <layout> - <configItem> - <name>br</name> -- <_shortDescription>pt</_shortDescription> -- <_description>Portuguese (Brazil)</_description> -+ <shortDescription>pt</shortDescription> -+ <description>Portuguese (Brazil)</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Portuguese (Brazil, Sun Type 6/7)</_description> -+ <description>Portuguese (Brazil, Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -476,14 +476,14 @@ - <layout> - <configItem> - <name>cz</name> -- <_shortDescription>cs</_shortDescription> -- <_description>Czech</_description> -+ <shortDescription>cs</shortDescription> -+ <description>Czech</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Czech (Sun Type 6/7)</_description> -+ <description>Czech (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -491,14 +491,14 @@ - <layout> - <configItem> - <name>dk</name> -- <_shortDescription>da</_shortDescription> -- <_description>Danish</_description> -+ <shortDescription>da</shortDescription> -+ <description>Danish</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Danish (Sun Type 6/7)</_description> -+ <description>Danish (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -506,14 +506,14 @@ - <layout> - <configItem> - <name>nl</name> -- <_shortDescription>nl</_shortDescription> -- <_description>Dutch</_description> -+ <shortDescription>nl</shortDescription> -+ <description>Dutch</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Dutch (Sun Type 6/7)</_description> -+ <description>Dutch (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -521,14 +521,14 @@ - <layout> - <configItem> - <name>ee</name> -- <_shortDescription>et</_shortDescription> -- <_description>Estonian</_description> -+ <shortDescription>et</shortDescription> -+ <description>Estonian</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Estonian (Sun Type 6/7)</_description> -+ <description>Estonian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -536,14 +536,14 @@ - <layout> - <configItem> - <name>fi</name> -- <_shortDescription>fi</_shortDescription> -- <_description>Finnish</_description> -+ <shortDescription>fi</shortDescription> -+ <description>Finnish</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Finnish (Sun Type 6/7)</_description> -+ <description>Finnish (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -551,14 +551,14 @@ - <layout> - <configItem> - <name>fr</name> -- <_shortDescription>fr</_shortDescription> -- <_description>French</_description> -+ <shortDescription>fr</shortDescription> -+ <description>French</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>French (Sun Type 6/7)</_description> -+ <description>French (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -566,14 +566,14 @@ - <layout> - <configItem> - <name>gr</name> -- <_shortDescription>gr</_shortDescription> -- <_description>Greek</_description> -+ <shortDescription>gr</shortDescription> -+ <description>Greek</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Greek (Sun Type 6/7)</_description> -+ <description>Greek (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -581,14 +581,14 @@ - <layout> - <configItem> - <name>it</name> -- <_shortDescription>it</_shortDescription> -- <_description>Italian</_description> -+ <shortDescription>it</shortDescription> -+ <description>Italian</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Italian (Sun Type 6/7)</_description> -+ <description>Italian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -596,26 +596,26 @@ - <layout> - <configItem> - <name>jp</name> -- <_shortDescription>ja</_shortDescription> -- <_description>Japanese</_description> -+ <shortDescription>ja</shortDescription> -+ <description>Japanese</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Japanese (Sun Type 6)</_description> -+ <description>Japanese (Sun Type 6)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type7</name> -- <_description>Japanese (Sun Type 7 - pc compatible)</_description> -+ <description>Japanese (Sun Type 7 - pc compatible)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type7_suncompat</name> -- <_description>Japanese (Sun Type 7 - sun compatible)</_description> -+ <description>Japanese (Sun Type 7 - sun compatible)</description> - </configItem> - </variant> - </variantList> -@@ -623,14 +623,14 @@ - <layout> - <configItem> - <name>no</name> -- <_shortDescription>no</_shortDescription> -- <_description>Norwegian</_description> -+ <shortDescription>no</shortDescription> -+ <description>Norwegian</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Norwegian (Sun Type 6/7)</_description> -+ <description>Norwegian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -638,14 +638,14 @@ - <layout> - <configItem> - <name>pt</name> -- <_shortDescription>pt</_shortDescription> -- <_description>Portuguese</_description> -+ <shortDescription>pt</shortDescription> -+ <description>Portuguese</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Portuguese (Sun Type 6/7)</_description> -+ <description>Portuguese (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -653,14 +653,14 @@ - <layout> - <configItem> - <name>sk</name> -- <_shortDescription>sk</_shortDescription> -- <_description>Slovak</_description> -+ <shortDescription>sk</shortDescription> -+ <description>Slovak</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Slovak (Sun Type 6/7)</_description> -+ <description>Slovak (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -668,14 +668,14 @@ - <layout> - <configItem> - <name>es</name> -- <_shortDescription>es</_shortDescription> -- <_description>Spanish</_description> -+ <shortDescription>es</shortDescription> -+ <description>Spanish</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Spanish (Sun Type 6/7)</_description> -+ <description>Spanish (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -683,14 +683,14 @@ - <layout> - <configItem> - <name>se</name> -- <_shortDescription>sv</_shortDescription> -- <_description>Swedish</_description> -+ <shortDescription>sv</shortDescription> -+ <description>Swedish</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Swedish (Sun Type 6/7)</_description> -+ <description>Swedish (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -698,20 +698,20 @@ - <layout> - <configItem> - <name>ch</name> -- <_shortDescription>de</_shortDescription> -- <_description>German (Switzerland)</_description> -+ <shortDescription>de</shortDescription> -+ <description>German (Switzerland)</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6_de</name> -- <_description>German (Switzerland, Sun Type 6/7)</_description> -+ <description>German (Switzerland, Sun Type 6/7)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type6_fr</name> -- <_description>French (Switzerland, Sun Type 6/7)</_description> -+ <description>French (Switzerland, Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -719,14 +719,14 @@ - <layout> - <configItem> - <name>tr</name> -- <_shortDescription>tr</_shortDescription> -- <_description>Turkish</_description> -+ <shortDescription>tr</shortDescription> -+ <description>Turkish</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Turkish (Sun Type 6/7)</_description> -+ <description>Turkish (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -734,14 +734,14 @@ - <layout> - <configItem> - <name>ua</name> -- <_shortDescription>uk</_shortDescription> -- <_description>Ukrainian</_description> -+ <shortDescription>uk</shortDescription> -+ <description>Ukrainian</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Ukrainian (Sun Type 6/7)</_description> -+ <description>Ukrainian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -749,14 +749,14 @@ - <layout> - <configItem> - <name>gb</name> -- <_shortDescription>en</_shortDescription> -- <_description>English (UK)</_description> -+ <shortDescription>en</shortDescription> -+ <description>English (UK)</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>English (UK, Sun Type 6/7)</_description> -+ <description>English (UK, Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -764,18 +764,18 @@ - <layout> - <configItem> - <name>kr</name> -- <_shortDescription>ko</_shortDescription> -- <_description>Korean</_description> -+ <shortDescription>ko</shortDescription> -+ <description>Korean</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Korean (Sun Type 6/7)</_description> -+ <description>Korean (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> - </layout> - </layoutList> - <optionList/> --</xkbConfigRegistry> -+</xkbConfigRegistry> -\ No newline at end of file diff --git a/package/xkeyboard-config/patches/patch-rules_base_xml_in b/package/xkeyboard-config/patches/patch-rules_base_xml_in deleted file mode 100644 index 5249ade99..000000000 --- a/package/xkeyboard-config/patches/patch-rules_base_xml_in +++ /dev/null @@ -1,7654 +0,0 @@ ---- xkeyboard-config-2.11.orig/rules/base.xml.in 2014-01-15 02:02:39.000000000 +0100 -+++ xkeyboard-config-2.11/rules/base.xml.in 2014-03-04 14:31:12.000000000 +0100 -@@ -5,627 +5,627 @@ - <model> - <configItem> - <name>pc101</name> -- <_description>Generic 101-key PC</_description> -+ <description>Generic 101-key PC</description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>pc102</name> -- <_description>Generic 102-key (Intl) PC</_description> -+ <description>Generic 102-key (Intl) PC</description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>pc104</name> -- <_description>Generic 104-key PC</_description> -+ <description>Generic 104-key PC</description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>pc105</name> -- <_description>Generic 105-key (Intl) PC</_description> -+ <description>Generic 105-key (Intl) PC</description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dell101</name> -- <_description>Dell 101-key PC</_description> -+ <description>Dell 101-key PC</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>latitude</name> -- <_description>Dell Latitude series laptop</_description> -+ <description>Dell Latitude series laptop</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dellm65</name> -- <_description>Dell Precision M65</_description> -+ <description>Dell Precision M65</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>everex</name> -- <_description>Everex STEPnote</_description> -+ <description>Everex STEPnote</description> - <vendor>Everex</vendor> - </configItem> - </model> - <model> - <configItem> - <name>flexpro</name> -- <_description>Keytronic FlexPro</_description> -+ <description>Keytronic FlexPro</description> - <vendor>Keytronic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoft</name> -- <_description>Microsoft Natural</_description> -+ <description>Microsoft Natural</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>omnikey101</name> -- <_description>Northgate OmniKey 101</_description> -+ <description>Northgate OmniKey 101</description> - <vendor>Northgate</vendor> - </configItem> - </model> - <model> - <configItem> - <name>winbook</name> -- <_description>Winbook Model XP5</_description> -+ <description>Winbook Model XP5</description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>pc98</name> -- <_description>PC-98xx Series</_description> -+ <description>PC-98xx Series</description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>a4techKB21</name> -- <_description>A4Tech KB-21</_description> -+ <description>A4Tech KB-21</description> - <vendor>A4Tech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>a4techKBS8</name> -- <_description>A4Tech KBS-8</_description> -+ <description>A4Tech KBS-8</description> - <vendor>A4Tech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>a4_rfkb23</name> -- <_description>A4Tech Wireless Desktop RFKB-23</_description> -+ <description>A4Tech Wireless Desktop RFKB-23</description> - <vendor>A4Tech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>airkey</name> -- <_description>Acer AirKey V</_description> -+ <description>Acer AirKey V</description> - <vendor>Acer</vendor> - </configItem> - </model> - <model> - <configItem> - <name>azonaRF2300</name> -- <_description>Azona RF2300 wireless Internet Keyboard</_description> -+ <description>Azona RF2300 wireless Internet Keyboard</description> - <vendor>Azona</vendor> - </configItem> - </model> - <model> - <configItem> - <name>scorpius</name> -- <_description>Advance Scorpius KI</_description> -+ <description>Advance Scorpius KI</description> - <vendor>Scorpius</vendor> - </configItem> - </model> - <model> - <configItem> - <name>brother</name> -- <_description>Brother Internet Keyboard</_description> -+ <description>Brother Internet Keyboard</description> - <vendor>Brother</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc5113rf</name> -- <_description>BTC 5113RF Multimedia</_description> -+ <description>BTC 5113RF Multimedia</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc5126t</name> -- <_description>BTC 5126T</_description> -+ <description>BTC 5126T</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc6301urf</name> -- <_description>BTC 6301URF</_description> -+ <description>BTC 6301URF</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc9000</name> -- <_description>BTC 9000</_description> -+ <description>BTC 9000</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc9000a</name> -- <_description>BTC 9000A</_description> -+ <description>BTC 9000A</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc9001ah</name> -- <_description>BTC 9001AH</_description> -+ <description>BTC 9001AH</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc5090</name> -- <_description>BTC 5090</_description> -+ <description>BTC 5090</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc9019u</name> -- <_description>BTC 9019U</_description> -+ <description>BTC 9019U</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc9116u</name> -- <_description>BTC 9116U Mini Wireless Internet and Gaming</_description> -+ <description>BTC 9116U Mini Wireless Internet and Gaming</description> - </configItem> - </model> - <model> - <configItem> - <name>cherryblue</name> -- <_description>Cherry Blue Line CyBo@rd</_description> -+ <description>Cherry Blue Line CyBo@rd</description> - </configItem> - </model> - <model> - <configItem> - <name>cherryblueb</name> -- <_description>Cherry CyMotion Master XPress</_description> -+ <description>Cherry CyMotion Master XPress</description> - <vendor>Cherry</vendor> - </configItem> - </model> - <model> - <configItem> - <name>cherrybluea</name> -- <_description>Cherry Blue Line CyBo@rd (alternate option)</_description> -+ <description>Cherry Blue Line CyBo@rd (alternate option)</description> - <vendor>Cherry</vendor> - </configItem> - </model> - <model> - <configItem> - <name>cherrycyboard</name> -- <_description>Cherry CyBo@rd USB-Hub</_description> -+ <description>Cherry CyBo@rd USB-Hub</description> - <vendor>Cherry</vendor> - </configItem> - </model> - <model> - <configItem> - <name>cherrycmexpert</name> -- <_description>Cherry CyMotion Expert</_description> -+ <description>Cherry CyMotion Expert</description> - <vendor>Cherry</vendor> - </configItem> - </model> - <model> - <configItem> - <name>cherrybunlim</name> -- <_description>Cherry B.UNLIMITED</_description> -+ <description>Cherry B.UNLIMITED</description> - <vendor>Cherry</vendor> - </configItem> - </model> - <model> - <configItem> - <name>chicony</name> -- <_description>Chicony Internet Keyboard</_description> -+ <description>Chicony Internet Keyboard</description> - <vendor>Chicony</vendor> - </configItem> - </model> - <model> - <configItem> - <name>chicony0108</name> -- <_description>Chicony KU-0108</_description> -+ <description>Chicony KU-0108</description> - <vendor>Chicony</vendor> - </configItem> - </model> - <model> - <configItem> - <name>chicony0420</name> -- <_description>Chicony KU-0420</_description> -+ <description>Chicony KU-0420</description> - <vendor>Chicony</vendor> - </configItem> - </model> - <model> - <configItem> - <name>chicony9885</name> -- <_description>Chicony KB-9885</_description> -+ <description>Chicony KB-9885</description> - <vendor>Chicony</vendor> - </configItem> - </model> - <model> - <configItem> - <name>compaqeak8</name> -- <_description>Compaq Easy Access Keyboard</_description> -+ <description>Compaq Easy Access Keyboard</description> - <vendor>Compaq</vendor> - </configItem> - </model> - <model> - <configItem> - <name>compaqik7</name> -- <_description>Compaq Internet Keyboard (7 keys)</_description> -+ <description>Compaq Internet Keyboard (7 keys)</description> - <vendor>Compaq</vendor> - </configItem> - </model> - <model> - <configItem> - <name>compaqik13</name> -- <_description>Compaq Internet Keyboard (13 keys)</_description> -+ <description>Compaq Internet Keyboard (13 keys)</description> - <vendor>Compaq</vendor> - </configItem> - </model> - <model> - <configItem> - <name>compaqik18</name> -- <_description>Compaq Internet Keyboard (18 keys)</_description> -+ <description>Compaq Internet Keyboard (18 keys)</description> - <vendor>Compaq</vendor> - </configItem> - </model> - <model> - <configItem> - <name>cymotionlinux</name> -- <_description>Cherry CyMotion Master Linux</_description> -+ <description>Cherry CyMotion Master Linux</description> - <vendor>Cherry</vendor> - </configItem> - </model> - <model> - <configItem> - <name>armada</name> -- <_description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</_description> -+ <description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</description> - <vendor>Compaq</vendor> - </configItem> - </model> - <model> - <configItem> - <name>presario</name> -- <_description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard</_description> -+ <description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard</description> - <vendor>Compaq</vendor> - </configItem> - </model> - <model> - <configItem> - <name>ipaq</name> -- <_description>Compaq iPaq Keyboard</_description> -+ <description>Compaq iPaq Keyboard</description> - <vendor>Compaq</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dell</name> -- <_description>Dell</_description> -+ <description>Dell</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dellsk8125</name> -- <_description>Dell SK-8125</_description> -+ <description>Dell SK-8125</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dellsk8135</name> -- <_description>Dell SK-8135</_description> -+ <description>Dell SK-8135</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dellusbmm</name> -- <_description>Dell USB Multimedia Keyboard</_description> -+ <description>Dell USB Multimedia Keyboard</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>inspiron</name> -- <_description>Dell Laptop/notebook Inspiron 6xxx/8xxx</_description> -+ <description>Dell Laptop/notebook Inspiron 6xxx/8xxx</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>precision_m</name> -- <_description>Dell Laptop/notebook Precision M series</_description> -+ <description>Dell Laptop/notebook Precision M series</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dexxa</name> -- <_description>Dexxa Wireless Desktop Keyboard</_description> -+ <description>Dexxa Wireless Desktop Keyboard</description> - <vendor>Dexxa</vendor> - </configItem> - </model> - <model> - <configItem> - <name>diamond</name> -- <_description>Diamond 9801 / 9802 series</_description> -+ <description>Diamond 9801 / 9802 series</description> - <vendor>Diamond</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dtk2000</name> -- <_description>DTK2000</_description> -+ <description>DTK2000</description> - </configItem> - </model> - <model> - <configItem> - <name>ennyah_dkb1008</name> -- <_description>Ennyah DKB-1008</_description> -+ <description>Ennyah DKB-1008</description> - <vendor>Ennyah</vendor> - </configItem> - </model> - <model> - <configItem> - <name>fscaa1667g</name> -- <_description>Fujitsu-Siemens Computers AMILO laptop</_description> -+ <description>Fujitsu-Siemens Computers AMILO laptop</description> - <vendor>Fujitsu-Siemens</vendor> - </configItem> - </model> - <model> - <configItem> - <name>genius</name> -- <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910</_description> -+ <description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description> - <vendor>Genius</vendor> - </configItem> - </model> - <model> - <configItem> - <name>geniuscomfy</name> -- <_description>Genius Comfy KB-12e</_description> -+ <description>Genius Comfy KB-12e</description> - <vendor>Genius</vendor> - </configItem> - </model> - <model> - <configItem> - <name>geniuscomfy2</name> -- <_description>Genius Comfy KB-21e-Scroll</_description> -+ <description>Genius Comfy KB-21e-Scroll</description> - <vendor>Genius</vendor> - </configItem> - </model> - <model> - <configItem> - <name>geniuskb19e</name> -- <_description>Genius KB-19e NB</_description> -+ <description>Genius KB-19e NB</description> - <vendor>Genius</vendor> - </configItem> - </model> - <model> - <configItem> - <name>geniuskkb2050hs</name> -- <_description>Genius KKB-2050HS</_description> -+ <description>Genius KKB-2050HS</description> - <vendor>Genius</vendor> - </configItem> - </model> - <model> - <configItem> - <name>gyration</name> -- <_description>Gyration</_description> -+ <description>Gyration</description> - <vendor>Gyration</vendor> - </configItem> - </model> - <model> - <configItem> - <name>htcdream</name> -- <_description>HTC Dream</_description> -+ <description>HTC Dream</description> - <vendor>HTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>kinesis</name> -- <_description>Kinesis</_description> -+ <description>Kinesis</description> - <vendor>Kinesis</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logitech_base</name> -- <_description>Logitech Generic Keyboard</_description> -+ <description>Logitech Generic Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logitech_g15</name> -- <_description>Logitech G15 extra keys via G15daemon</_description> -+ <description>Logitech G15 extra keys via G15daemon</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpi6</name> -- <_description>Hewlett-Packard Internet Keyboard</_description> -+ <description>Hewlett-Packard Internet Keyboard</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hp250x</name> -- <_description>Hewlett-Packard SK-250x Multimedia Keyboard</_description> -+ <description>Hewlett-Packard SK-250x Multimedia Keyboard</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpxe3gc</name> -- <_description>Hewlett-Packard Omnibook XE3 GC</_description> -+ <description>Hewlett-Packard Omnibook XE3 GC</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpxe3gf</name> -- <_description>Hewlett-Packard Omnibook XE3 GF</_description> -+ <description>Hewlett-Packard Omnibook XE3 GF</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpxt1000</name> -- <_description>Hewlett-Packard Omnibook XT1000</_description> -+ <description>Hewlett-Packard Omnibook XT1000</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpdv5</name> -- <_description>Hewlett-Packard Pavilion dv5</_description> -+ <description>Hewlett-Packard Pavilion dv5</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpzt11xx</name> -- <_description>Hewlett-Packard Pavilion ZT11xx</_description> -+ <description>Hewlett-Packard Pavilion ZT11xx</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hp500fa</name> -- <_description>Hewlett-Packard Omnibook 500 FA</_description> -+ <description>Hewlett-Packard Omnibook 500 FA</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hp5xx</name> -- <_description>Hewlett-Packard Omnibook 5xx</_description> -+ <description>Hewlett-Packard Omnibook 5xx</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpnx9020</name> -- <_description>Hewlett-Packard nx9020</_description> -+ <description>Hewlett-Packard nx9020</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hp6000</name> -- <_description>Hewlett-Packard Omnibook 6000/6100</_description> -+ <description>Hewlett-Packard Omnibook 6000/6100</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>honeywell_euroboard</name> -- <_description>Honeywell Euroboard</_description> -+ <description>Honeywell Euroboard</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpmini110</name> -- <_description>Hewlett-Packard Mini 110 Notebook</_description> -+ <description>Hewlett-Packard Mini 110 Notebook</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>rapidaccess</name> -- <_description>IBM Rapid Access</_description> -+ <description>IBM Rapid Access</description> - <vendor>Lenovo (previously IBM)</vendor> - </configItem> - </model> - <model> - <configItem> - <name>rapidaccess2</name> -- <_description>IBM Rapid Access II</_description> -+ <description>IBM Rapid Access II</description> - <vendor>Lenovo (previously IBM)</vendor> - </configItem> - </model> - <model> - <configItem> - <name>thinkpad</name> -- <_description>IBM ThinkPad 560Z/600/600E/A22E</_description> -+ <description>IBM ThinkPad 560Z/600/600E/A22E</description> - <vendor>Lenovo (previously IBM)</vendor> - </configItem> - </model> - <model> - <configItem> - <name>thinkpad60</name> -- <_description>IBM ThinkPad R60/T60/R61/T61</_description> -+ <description>IBM ThinkPad R60/T60/R61/T61</description> - <vendor>Lenovo (previously IBM)</vendor> - </configItem> - </model> - <model> - <configItem> - <name>thinkpadz60</name> -- <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</_description> -+ <description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</description> - <vendor>Lenovo (previously IBM)</vendor> - </configItem> - </model> - <model> - <configItem> - <name>ibm_spacesaver</name> -- <_description>IBM Space Saver</_description> -+ <description>IBM Space Saver</description> - <vendor>Lenovo (previously IBM)</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiaccess</name> -- <_description>Logitech Access Keyboard</_description> -+ <description>Logitech Access Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiclx300</name> -- <_description>Logitech Cordless Desktop LX-300</_description> -+ <description>Logitech Cordless Desktop LX-300</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logii350</name> -- <_description>Logitech Internet 350 Keyboard</_description> -+ <description>Logitech Internet 350 Keyboard</description> - <vendor>Logitech</vendor> - <hwList> <hwId>046d:c313</hwId></hwList> - </configItem> -@@ -633,665 +633,665 @@ - <model> - <configItem> - <name>logimel</name> -- <_description>Logitech Media Elite Keyboard</_description> -+ <description>Logitech Media Elite Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicd</name> -- <_description>Logitech Cordless Desktop</_description> -+ <description>Logitech Cordless Desktop</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicd_it</name> -- <_description>Logitech Cordless Desktop iTouch</_description> -+ <description>Logitech Cordless Desktop iTouch</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicd_nav</name> -- <_description>Logitech Cordless Desktop Navigator</_description> -+ <description>Logitech Cordless Desktop Navigator</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicd_opt</name> -- <_description>Logitech Cordless Desktop Optical</_description> -+ <description>Logitech Cordless Desktop Optical</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicda</name> -- <_description>Logitech Cordless Desktop (alternate option)</_description> -+ <description>Logitech Cordless Desktop (alternate option)</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicdpa2</name> -- <_description>Logitech Cordless Desktop Pro (alternate option 2)</_description> -+ <description>Logitech Cordless Desktop Pro (alternate option 2)</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicfn</name> -- <_description>Logitech Cordless Freedom/Desktop Navigator</_description> -+ <description>Logitech Cordless Freedom/Desktop Navigator</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicdn</name> -- <_description>Logitech Cordless Desktop Navigator</_description> -+ <description>Logitech Cordless Desktop Navigator</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiitc</name> -- <_description>Logitech iTouch Cordless Keyboard (model Y-RB6)</_description> -+ <description>Logitech iTouch Cordless Keyboard (model Y-RB6)</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiik</name> -- <_description>Logitech Internet Keyboard</_description> -+ <description>Logitech Internet Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>itouch</name> -- <_description>Logitech iTouch</_description> -+ <description>Logitech iTouch</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicink</name> -- <_description>Logitech Internet Navigator Keyboard</_description> -+ <description>Logitech Internet Navigator Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiex110</name> -- <_description>Logitech Cordless Desktop EX110</_description> -+ <description>Logitech Cordless Desktop EX110</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiinkse</name> -- <_description>Logitech iTouch Internet Navigator Keyboard SE</_description> -+ <description>Logitech iTouch Internet Navigator Keyboard SE</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiinkseusb</name> -- <_description>Logitech iTouch Internet Navigator Keyboard SE (USB)</_description> -+ <description>Logitech iTouch Internet Navigator Keyboard SE (USB)</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiultrax</name> -- <_description>Logitech Ultra-X Keyboard</_description> -+ <description>Logitech Ultra-X Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiultraxc</name> -- <_description>Logitech Ultra-X Cordless Media Desktop Keyboard</_description> -+ <description>Logitech Ultra-X Cordless Media Desktop Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logidinovo</name> -- <_description>Logitech diNovo Keyboard</_description> -+ <description>Logitech diNovo Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logidinovoedge</name> -- <_description>Logitech diNovo Edge Keyboard</_description> -+ <description>Logitech diNovo Edge Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>mx1998</name> -- <_description>Memorex MX1998</_description> -+ <description>Memorex MX1998</description> - <vendor>Memorex</vendor> - </configItem> - </model> - <model> - <configItem> - <name>mx2500</name> -- <_description>Memorex MX2500 EZ-Access Keyboard</_description> -+ <description>Memorex MX2500 EZ-Access Keyboard</description> - <vendor>Memorex</vendor> - </configItem> - </model> - <model> - <configItem> - <name>mx2750</name> -- <_description>Memorex MX2750</_description> -+ <description>Memorex MX2750</description> - <vendor>Memorex</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoft4000</name> -- <_description>Microsoft Natural Wireless Ergonomic Keyboard 4000</_description> -+ <description>Microsoft Natural Wireless Ergonomic Keyboard 4000</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoft7000</name> -- <_description>Microsoft Natural Wireless Ergonomic Keyboard 7000</_description> -+ <description>Microsoft Natural Wireless Ergonomic Keyboard 7000</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftinet</name> -- <_description>Microsoft Internet Keyboard</_description> -+ <description>Microsoft Internet Keyboard</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftpro</name> -- <_description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</_description> -+ <description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftprousb</name> -- <_description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</_description> -+ <description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftprooem</name> -- <_description>Microsoft Natural Keyboard Pro OEM</_description> -+ <description>Microsoft Natural Keyboard Pro OEM</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>vsonku306</name> -- <_description>ViewSonic KU-306 Internet Keyboard</_description> -+ <description>ViewSonic KU-306 Internet Keyboard</description> - <vendor>ViewSonic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftprose</name> -- <_description>Microsoft Internet Keyboard Pro, Swedish</_description> -+ <description>Microsoft Internet Keyboard Pro, Swedish</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftoffice</name> -- <_description>Microsoft Office Keyboard</_description> -+ <description>Microsoft Office Keyboard</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftmult</name> -- <_description>Microsoft Wireless Multimedia Keyboard 1.0A</_description> -+ <description>Microsoft Wireless Multimedia Keyboard 1.0A</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftelite</name> -- <_description>Microsoft Natural Keyboard Elite</_description> -+ <description>Microsoft Natural Keyboard Elite</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftccurve2k</name> -- <_description>Microsoft Comfort Curve Keyboard 2000</_description> -+ <description>Microsoft Comfort Curve Keyboard 2000</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>oretec</name> -- <_description>Ortek MCK-800 MM/Internet keyboard</_description> -+ <description>Ortek MCK-800 MM/Internet keyboard</description> - <vendor>Ortek</vendor> - </configItem> - </model> - <model> - <configItem> - <name>propeller</name> -- <_description>Propeller Voyager (KTEZ-1000)</_description> -+ <description>Propeller Voyager (KTEZ-1000)</description> - <vendor>KeyTronic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>qtronix</name> -- <_description>QTronix Scorpius 98N+</_description> -+ <description>QTronix Scorpius 98N+</description> - <vendor>QTronix</vendor> - </configItem> - </model> - <model> - <configItem> - <name>samsung4500</name> -- <_description>Samsung SDM 4500P</_description> -+ <description>Samsung SDM 4500P</description> - <vendor>Samsung</vendor> - </configItem> - </model> - <model> - <configItem> - <name>samsung4510</name> -- <_description>Samsung SDM 4510P</_description> -+ <description>Samsung SDM 4510P</description> - <vendor>Samsung</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sanwaskbkg3</name> -- <_description>Sanwa Supply SKB-KG3</_description> -+ <description>Sanwa Supply SKB-KG3</description> - <vendor>Sanwa Supply Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sk1300</name> -- <_description>SK-1300</_description> -+ <description>SK-1300</description> - <vendor>NEC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sk2500</name> -- <_description>SK-2500</_description> -+ <description>SK-2500</description> - <vendor>NEC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sk6200</name> -- <_description>SK-6200</_description> -+ <description>SK-6200</description> - <vendor>NEC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sk7100</name> -- <_description>SK-7100</_description> -+ <description>SK-7100</description> - <vendor>NEC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sp_inet</name> -- <_description>Super Power Multimedia Keyboard</_description> -+ <description>Super Power Multimedia Keyboard</description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sven</name> -- <_description>SVEN Ergonomic 2500</_description> -+ <description>SVEN Ergonomic 2500</description> - <vendor>SVEN</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sven303</name> -- <_description>SVEN Slim 303</_description> -+ <description>SVEN Slim 303</description> - <vendor>SVEN</vendor> - </configItem> - </model> - <model> - <configItem> - <name>symplon</name> -- <_description>Symplon PaceBook (tablet PC)</_description> -+ <description>Symplon PaceBook (tablet PC)</description> - <vendor>Symplon</vendor> - </configItem> - </model> - <model> - <configItem> - <name>toshiba_s3000</name> -- <_description>Toshiba Satellite S3000</_description> -+ <description>Toshiba Satellite S3000</description> - <vendor>Toshiba</vendor> - </configItem> - </model> - <model> - <configItem> - <name>trust</name> -- <_description>Trust Wireless Keyboard Classic</_description> -+ <description>Trust Wireless Keyboard Classic</description> - <vendor>Trust</vendor> - </configItem> - </model> - <model> - <configItem> - <name>trustda</name> -- <_description>Trust Direct Access Keyboard</_description> -+ <description>Trust Direct Access Keyboard</description> - <vendor>Trust</vendor> - </configItem> - </model> - <model> - <configItem> - <name>trust_slimline</name> -- <_description>Trust Slimline</_description> -+ <description>Trust Slimline</description> - <vendor>Trust</vendor> - </configItem> - </model> - <model> - <configItem> - <name>tm2020</name> -- <_description>TypeMatrix EZ-Reach 2020</_description> -+ <description>TypeMatrix EZ-Reach 2020</description> - <vendor>TypeMatrix</vendor> - </configItem> - </model> - <model> - <configItem> - <name>tm2030PS2</name> -- <_description>TypeMatrix EZ-Reach 2030 PS2</_description> -+ <description>TypeMatrix EZ-Reach 2030 PS2</description> - <vendor>TypeMatrix</vendor> - </configItem> - </model> - <model> - <configItem> - <name>tm2030USB</name> -- <_description>TypeMatrix EZ-Reach 2030 USB</_description> -+ <description>TypeMatrix EZ-Reach 2030 USB</description> - <vendor>TypeMatrix</vendor> - </configItem> - </model> - <model> - <configItem> - <name>tm2030USB-102</name> -- <_description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</_description> -+ <description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</description> - <vendor>TypeMatrix</vendor> - </configItem> - </model> - <model> - <configItem> - <name>tm2030USB-106</name> -- <_description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</_description> -+ <description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</description> - <vendor>TypeMatrix</vendor> - </configItem> - </model> - <model> - <configItem> - <name>yahoo</name> -- <_description>Yahoo! Internet Keyboard</_description> -+ <description>Yahoo! Internet Keyboard</description> - <vendor>Yahoo!</vendor> - </configItem> - </model> - <model> - <configItem> - <name>macbook78</name> -- <_description>MacBook/MacBook Pro</_description> -+ <description>MacBook/MacBook Pro</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>macbook79</name> -- <_description>MacBook/MacBook Pro (Intl)</_description> -+ <description>MacBook/MacBook Pro (Intl)</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>macintosh</name> -- <_description>Macintosh</_description> -+ <description>Macintosh</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>macintosh_old</name> -- <_description>Macintosh Old</_description> -+ <description>Macintosh Old</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>macintosh_hhk</name> -- <_description>Happy Hacking Keyboard for Mac</_description> -+ <description>Happy Hacking Keyboard for Mac</description> - <vendor>Fujitsu</vendor> - </configItem> - </model> - <model> - <configItem> - <name>acer_c300</name> -- <_description>Acer C300</_description> -+ <description>Acer C300</description> - <vendor>Acer</vendor> - </configItem> - </model> - <model> - <configItem> - <name>acer_ferrari4k</name> -- <_description>Acer Ferrari 4000</_description> -+ <description>Acer Ferrari 4000</description> - <vendor>Acer</vendor> - </configItem> - </model> - <model> - <configItem> - <name>acer_laptop</name> -- <_description>Acer Laptop</_description> -+ <description>Acer Laptop</description> - <vendor>Acer</vendor> - </configItem> - </model> - <model> - <configItem> - <name>asus_laptop</name> -- <_description>Asus Laptop</_description> -+ <description>Asus Laptop</description> - <vendor>Asus</vendor> - </configItem> - </model> - <model> - <configItem> - <name>apple</name> -- <_description>Apple</_description> -+ <description>Apple</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>apple_laptop</name> -- <_description>Apple Laptop</_description> -+ <description>Apple Laptop</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>applealu_ansi</name> -- <_description>Apple Aluminium Keyboard (ANSI)</_description> -+ <description>Apple Aluminium Keyboard (ANSI)</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>applealu_iso</name> -- <_description>Apple Aluminium Keyboard (ISO)</_description> -+ <description>Apple Aluminium Keyboard (ISO)</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>applealu_jis</name> -- <_description>Apple Aluminium Keyboard (JIS)</_description> -+ <description>Apple Aluminium Keyboard (JIS)</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>silvercrest</name> -- <_description>SILVERCREST Multimedia Wireless Keyboard</_description> -+ <description>SILVERCREST Multimedia Wireless Keyboard</description> - <vendor>Silvercrest</vendor> - </configItem> - </model> - <model> - <configItem> - <name>emachines</name> -- <_description>Laptop/notebook eMachines m68xx</_description> -+ <description>Laptop/notebook eMachines m68xx</description> - <vendor>eMachines</vendor> - </configItem> - </model> - <model> - <configItem> - <name>benqx</name> -- <_description>BenQ X-Touch</_description> -+ <description>BenQ X-Touch</description> - <vendor>BenQ</vendor> - </configItem> - </model> - <model> - <configItem> - <name>benqx730</name> -- <_description>BenQ X-Touch 730</_description> -+ <description>BenQ X-Touch 730</description> - <vendor>BenQ</vendor> - </configItem> - </model> - <model> - <configItem> - <name>benqx800</name> -- <_description>BenQ X-Touch 800</_description> -+ <description>BenQ X-Touch 800</description> - <vendor>BenQ</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hhk</name> -- <_description>Happy Hacking Keyboard</_description> -+ <description>Happy Hacking Keyboard</description> - <vendor>Fujitsu</vendor> - </configItem> - </model> - <model> - <configItem> - <name>classmate</name> -- <_description>Classmate PC</_description> -+ <description>Classmate PC</description> - <vendor>Intel</vendor> - </configItem> - </model> - <model> - <configItem> - <name>olpc</name> -- <_description>OLPC</_description> -+ <description>OLPC</description> - <vendor>OLPC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type7_usb</name> -- <_description>Sun Type 7 USB</_description> -+ <description>Sun Type 7 USB</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type7_euro_usb</name> -- <_description>Sun Type 7 USB (European layout)</_description> -+ <description>Sun Type 7 USB (European layout)</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type7_unix_usb</name> -- <_description>Sun Type 7 USB (Unix layout)</_description> -+ <description>Sun Type 7 USB (Unix layout)</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type7_jp_usb</name> -- <_description>Sun Type 7 USB (Japanese layout) / Japanese 106-key</_description> -+ <description>Sun Type 7 USB (Japanese layout) / Japanese 106-key</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type6_usb</name> -- <_description>Sun Type 6/7 USB</_description> -+ <description>Sun Type 6/7 USB</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type6_euro_usb</name> -- <_description>Sun Type 6/7 USB (European layout)</_description> -+ <description>Sun Type 6/7 USB (European layout)</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type6_unix_usb</name> -- <_description>Sun Type 6 USB (Unix layout)</_description> -+ <description>Sun Type 6 USB (Unix layout)</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type6_jp_usb</name> -- <_description>Sun Type 6 USB (Japanese layout)</_description> -+ <description>Sun Type 6 USB (Japanese layout)</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type6_jp</name> -- <_description>Sun Type 6 (Japanese layout)</_description> -+ <description>Sun Type 6 (Japanese layout)</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>targa_v811</name> -- <_description>Targa Visionary 811</_description> -+ <description>Targa Visionary 811</description> - <vendor>Targa</vendor> - </configItem> - </model> - <model> - <configItem> - <name>unitekkb1925</name> -- <_description>Unitek KB-1925</_description> -+ <description>Unitek KB-1925</description> - <vendor>Unitek Group</vendor> - </configItem> - </model> - <model> - <configItem> - <name>compalfl90</name> -- <_description>FL90</_description> -+ <description>FL90</description> - <vendor>Compal Electronics Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>creativedw7000</name> -- <_description>Creative Desktop Wireless 7000</_description> -+ <description>Creative Desktop Wireless 7000</description> - <vendor>Creative</vendor> - </configItem> - </model> - <model> - <configItem> - <name>htcdream</name> -- <_description>Htc Dream phone</_description> -+ <description>Htc Dream phone</description> - <vendor>htc</vendor> - </configItem> - </model> -@@ -1300,9 +1300,9 @@ - <layout> - <configItem> - <name>us</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (US)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (US)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -1311,9 +1311,9 @@ - <variant> - <configItem> - <name>chr</name> -- <!-- Keyboard indicator for Cherokee layouts --> -- <_shortDescription>chr</_shortDescription> -- <_description>Cherokee</_description> -+ -+ <shortDescription>chr</shortDescription> -+ <description>Cherokee</description> - <languageList> - <iso639Id>chr</iso639Id> - </languageList> -@@ -1322,75 +1322,75 @@ - <variant> - <configItem> - <name>euro</name> -- <_description>English (US, with euro on 5)</_description> -+ <description>English (US, with euro on 5)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>intl</name> -- <_description>English (US, international with dead keys)</_description> -+ <description>English (US, international with dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>alt-intl</name> -- <_description>English (US, alternative international)</_description> -+ <description>English (US, alternative international)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>colemak</name> -- <_description>English (Colemak)</_description> -+ <description>English (Colemak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>English (Dvorak)</_description> -+ <description>English (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak-intl</name> -- <_description>English (Dvorak, international with dead keys)</_description> -+ <description>English (Dvorak, international with dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak-alt-intl</name> -- <_description>English (Dvorak alternative international no dead keys)</_description> -+ <description>English (Dvorak alternative international no dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak-l</name> -- <_description>English (left handed Dvorak)</_description> -+ <description>English (left handed Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak-r</name> -- <_description>English (right handed Dvorak)</_description> -+ <description>English (right handed Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak-classic</name> -- <_description>English (classic Dvorak)</_description> -+ <description>English (classic Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvp</name> -- <_description>English (programmer Dvorak)</_description> -+ <description>English (programmer Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>rus</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (US, phonetic)</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian (US, phonetic)</description> - <languageList> - <iso639Id>rus</iso639Id> - </languageList> -@@ -1399,13 +1399,13 @@ - <variant> - <configItem> - <name>mac</name> -- <_description>English (Macintosh)</_description> -+ <description>English (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>altgr-intl</name> -- <_description>English (international AltGr dead keys)</_description> -+ <description>English (international AltGr dead keys)</description> - <languageList><iso639Id>eng</iso639Id> - <iso639Id>fra</iso639Id> - <iso639Id>ger</iso639Id></languageList> -@@ -1414,13 +1414,13 @@ - <variant> - <configItem> - <name>olpc2</name> -- <_description>English (the divide/multiply keys toggle the layout)</_description> -+ <description>English (the divide/multiply keys toggle the layout)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>hbs</name> -- <_description>Serbo-Croatian (US)</_description> -+ <description>Serbo-Croatian (US)</description> - <languageList><iso639Id>eng</iso639Id> - <iso639Id>bos</iso639Id> - <iso639Id>hbs</iso639Id> -@@ -1431,13 +1431,13 @@ - <variant> - <configItem> - <name>workman</name> -- <_description>English (Workman)</_description> -+ <description>English (Workman)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>workman-intl</name> -- <_description>English (Workman, international with dead keys)</_description> -+ <description>English (Workman, international with dead keys)</description> - </configItem> - </variant> - </variantList> -@@ -1445,17 +1445,17 @@ - <layout> - <configItem> - <name>af</name> -- <!-- Keyboard indicator for Afghani layouts --> -- <_shortDescription>fa</_shortDescription> -- <_description>Afghani</_description> -+ -+ <shortDescription>fa</shortDescription> -+ <description>Afghani</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>ps</name> -- <!-- Keyboard indicator for Pashto layouts --> -- <_shortDescription>ps</_shortDescription> -- <_description>Pashto</_description> -+ -+ <shortDescription>ps</shortDescription> -+ <description>Pashto</description> - <languageList> - <iso639Id>pus</iso639Id> - </languageList> -@@ -1464,9 +1464,9 @@ - <variant> - <configItem> - <name>uz</name> -- <!-- Keyboard indicator for Uzbek layouts --> -- <_shortDescription>uz</_shortDescription> -- <_description>Uzbek (Afghanistan)</_description> -+ -+ <shortDescription>uz</shortDescription> -+ <description>Uzbek (Afghanistan)</description> - <languageList> - <iso639Id>uzb</iso639Id> - </languageList> -@@ -1475,9 +1475,9 @@ - <variant> - <configItem> - <name>olpc-ps</name> -- <!-- Keyboard indicator for Pashto layouts --> -- <_shortDescription>ps</_shortDescription> -- <_description>Pashto (Afghanistan, OLPC)</_description> -+ -+ <shortDescription>ps</shortDescription> -+ <description>Pashto (Afghanistan, OLPC)</description> - <languageList> - <iso639Id>pus</iso639Id> - </languageList> -@@ -1486,17 +1486,17 @@ - <variant> - <configItem> - <name>fa-olpc</name> -- <!-- Keyboard indicator for Persian layouts --> -- <_shortDescription>fa</_shortDescription> -- <_description>Persian (Afghanistan, Dari OLPC)</_description> -+ -+ <shortDescription>fa</shortDescription> -+ <description>Persian (Afghanistan, Dari OLPC)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>uz-olpc</name> -- <!-- Keyboard indicator for Uzbek layouts --> -- <_shortDescription>uz</_shortDescription> -- <_description>Uzbek (Afghanistan, OLPC)</_description> -+ -+ <shortDescription>uz</shortDescription> -+ <description>Uzbek (Afghanistan, OLPC)</description> - <languageList> - <iso639Id>uzb</iso639Id> - </languageList> -@@ -1507,9 +1507,9 @@ - <layout> - <configItem> - <name>ara</name> -- <!-- Keyboard indicator for Arabic layouts --> -- <_shortDescription>ar</_shortDescription> -- <_description>Arabic</_description> -+ -+ <shortDescription>ar</shortDescription> -+ <description>Arabic</description> - <countryList> - <iso3166Id>AE</iso3166Id> - <iso3166Id>BH</iso3166Id> -@@ -1539,37 +1539,37 @@ - <variant> - <configItem> - <name>azerty</name> -- <_description>Arabic (azerty)</_description> -+ <description>Arabic (azerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>azerty_digits</name> -- <_description>Arabic (azerty/digits)</_description> -+ <description>Arabic (azerty/digits)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>digits</name> -- <_description>Arabic (digits)</_description> -+ <description>Arabic (digits)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty</name> -- <_description>Arabic (qwerty)</_description> -+ <description>Arabic (qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty_digits</name> -- <_description>Arabic (qwerty/digits)</_description> -+ <description>Arabic (qwerty/digits)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>buckwalter</name> -- <_description>Arabic (Buckwalter)</_description> -+ <description>Arabic (Buckwalter)</description> - </configItem> - </variant> - </variantList> -@@ -1577,9 +1577,9 @@ - <layout> - <configItem> - <name>al</name> -- <!-- Keyboard indicator for Albanian layouts --> -- <_shortDescription>sq</_shortDescription> -- <_description>Albanian</_description> -+ -+ <shortDescription>sq</shortDescription> -+ <description>Albanian</description> - <languageList> - <iso639Id>alb</iso639Id> - </languageList> -@@ -1589,9 +1589,9 @@ - <layout> - <configItem> - <name>am</name> -- <!-- Keyboard indicator for Armenian layouts --> -- <_shortDescription>hy</_shortDescription> -- <_description>Armenian</_description> -+ -+ <shortDescription>hy</shortDescription> -+ <description>Armenian</description> - <languageList> - <iso639Id>hye</iso639Id> - </languageList> -@@ -1600,31 +1600,31 @@ - <variant> - <configItem> - <name>phonetic</name> -- <_description>Armenian (phonetic)</_description> -+ <description>Armenian (phonetic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>phonetic-alt</name> -- <_description>Armenian (alternative phonetic)</_description> -+ <description>Armenian (alternative phonetic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>eastern</name> -- <_description>Armenian (eastern)</_description> -+ <description>Armenian (eastern)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>western</name> -- <_description>Armenian (western)</_description> -+ <description>Armenian (western)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>eastern-alt</name> -- <_description>Armenian (alternative eastern)</_description> -+ <description>Armenian (alternative eastern)</description> - </configItem> - </variant> - </variantList> -@@ -1632,9 +1632,9 @@ - <layout> - <configItem> - <name>at</name> -- <!-- Keyboard indicator for German layouts --> -- <_shortDescription>de</_shortDescription> -- <_description>German (Austria)</_description> -+ -+ <shortDescription>de</shortDescription> -+ <description>German (Austria)</description> - <languageList> - <iso639Id>ger</iso639Id> - </languageList> -@@ -1643,19 +1643,19 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>German (Austria, eliminate dead keys)</_description> -+ <description>German (Austria, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>German (Austria, Sun dead keys)</_description> -+ <description>German (Austria, Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>German (Austria, Macintosh)</_description> -+ <description>German (Austria, Macintosh)</description> - </configItem> - </variant> - </variantList> -@@ -1663,9 +1663,9 @@ - <layout> - <configItem> - <name>az</name> -- <!-- Keyboard indicator for Azerbaijani layouts --> -- <_shortDescription>az</_shortDescription> -- <_description>Azerbaijani</_description> -+ -+ <shortDescription>az</shortDescription> -+ <description>Azerbaijani</description> - <languageList> - <iso639Id>aze</iso639Id> - </languageList> -@@ -1674,7 +1674,7 @@ - <variant> - <configItem> - <name>cyrillic</name> -- <_description>Azerbaijani (Cyrillic)</_description> -+ <description>Azerbaijani (Cyrillic)</description> - </configItem> - </variant> - </variantList> -@@ -1682,9 +1682,9 @@ - <layout> - <configItem> - <name>by</name> -- <!-- Keyboard indicator for Belarusian layouts --> -- <_shortDescription>by</_shortDescription> -- <_description>Belarusian</_description> -+ -+ <shortDescription>by</shortDescription> -+ <description>Belarusian</description> - <languageList> - <iso639Id>bel</iso639Id> - </languageList> -@@ -1693,13 +1693,13 @@ - <variant> - <configItem> - <name>legacy</name> -- <_description>Belarusian (legacy)</_description> -+ <description>Belarusian (legacy)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latin</name> -- <_description>Belarusian (Latin)</_description> -+ <description>Belarusian (Latin)</description> - </configItem> - </variant> - </variantList> -@@ -1707,9 +1707,9 @@ - <layout> - <configItem> - <name>be</name> -- <!-- Keyboard indicator for Belgian layouts --> -- <_shortDescription>be</_shortDescription> -- <_description>Belgian</_description> -+ -+ <shortDescription>be</shortDescription> -+ <description>Belgian</description> - <languageList><iso639Id>ger</iso639Id> - <iso639Id>nld</iso639Id> - <iso639Id>fra</iso639Id></languageList> -@@ -1718,43 +1718,43 @@ - <variant> - <configItem> - <name>oss</name> -- <_description>Belgian (alternative)</_description> -+ <description>Belgian (alternative)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>oss_latin9</name> -- <_description>Belgian (alternative, Latin-9 only)</_description> -+ <description>Belgian (alternative, Latin-9 only)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>oss_sundeadkeys</name> -- <_description>Belgian (alternative, Sun dead keys)</_description> -+ <description>Belgian (alternative, Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>iso-alternate</name> -- <_description>Belgian (ISO alternate)</_description> -+ <description>Belgian (ISO alternate)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Belgian (eliminate dead keys)</_description> -+ <description>Belgian (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>Belgian (Sun dead keys)</_description> -+ <description>Belgian (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>wang</name> -- <_description>Belgian (Wang model 724 azerty)</_description> -+ <description>Belgian (Wang model 724 azerty)</description> - </configItem> - </variant> - </variantList> -@@ -1762,9 +1762,9 @@ - <layout> - <configItem> - <name>bd</name> -- <!-- Keyboard indicator for Bangla layouts --> -- <_shortDescription>bn</_shortDescription> -- <_description>Bangla</_description> -+ -+ <shortDescription>bn</shortDescription> -+ <description>Bangla</description> - <languageList> - <iso639Id>ben</iso639Id> - </languageList> -@@ -1773,7 +1773,7 @@ - <variant> - <configItem> - <name>probhat</name> -- <_description>Bangla (Probhat)</_description> -+ <description>Bangla (Probhat)</description> - </configItem> - </variant> - </variantList> -@@ -1781,17 +1781,17 @@ - <layout> - <configItem> - <name>in</name> -- <!-- Keyboard indicator for Indian layouts --> -- <_shortDescription>in</_shortDescription> -- <_description>Indian</_description> -+ -+ <shortDescription>in</shortDescription> -+ <description>Indian</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>ben</name> -- <!-- Keyboard indicator for Bangla layouts --> -- <_shortDescription>bn</_shortDescription> -- <_description>Bangla (India)</_description> -+ -+ <shortDescription>bn</shortDescription> -+ <description>Bangla (India)</description> - <languageList> - <iso639Id>ben</iso639Id> - </languageList> -@@ -1800,9 +1800,9 @@ - <variant> - <configItem> - <name>ben_probhat</name> -- <!-- Keyboard indicator for Bangla layouts --> -- <_shortDescription>bn</_shortDescription> -- <_description>Bangla (India, Probhat)</_description> -+ -+ <shortDescription>bn</shortDescription> -+ <description>Bangla (India, Probhat)</description> - <languageList> - <iso639Id>ben</iso639Id> - </languageList> -@@ -1811,28 +1811,28 @@ - <variant> - <configItem> - <name>ben_baishakhi</name> -- <_description>Bangla (India, Baishakhi)</_description> -+ <description>Bangla (India, Baishakhi)</description> - <languageList><iso639Id>ben</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>ben_bornona</name> -- <_description>Bangla (India, Bornona)</_description> -+ <description>Bangla (India, Bornona)</description> - <languageList><iso639Id>ben</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>ben_gitanjali</name> -- <_description>Bangla (India, Uni Gitanjali)</_description> -+ <description>Bangla (India, Uni Gitanjali)</description> - <languageList><iso639Id>ben</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>ben_inscript</name> -- <_description>Bangla (India, Baishakhi Inscript)</_description> -+ <description>Bangla (India, Baishakhi Inscript)</description> - <languageList><iso639Id>ben</iso639Id></languageList> - </configItem> - </variant> -@@ -1846,9 +1846,9 @@ - <variant> - <configItem> - <name>guj</name> -- <!-- Keyboard indicator for Gujarati layouts --> -- <_shortDescription>gu</_shortDescription> -- <_description>Gujarati</_description> -+ -+ <shortDescription>gu</shortDescription> -+ <description>Gujarati</description> - <languageList> - <iso639Id>guj</iso639Id> - </languageList> -@@ -1857,9 +1857,9 @@ - <variant> - <configItem> - <name>guru</name> -- <!-- Keyboard indicator for Punjabi layouts --> -- <_shortDescription>pa</_shortDescription> -- <_description>Punjabi (Gurmukhi)</_description> -+ -+ <shortDescription>pa</shortDescription> -+ <description>Punjabi (Gurmukhi)</description> - <languageList> - <iso639Id>pan</iso639Id> - </languageList> -@@ -1868,9 +1868,9 @@ - <variant> - <configItem> - <name>jhelum</name> -- <!-- Keyboard indicator for Punjabi layouts --> -- <_shortDescription>pa</_shortDescription> -- <_description>Punjabi (Gurmukhi Jhelum)</_description> -+ -+ <shortDescription>pa</shortDescription> -+ <description>Punjabi (Gurmukhi Jhelum)</description> - <languageList> - <iso639Id>pan</iso639Id> - </languageList> -@@ -1879,9 +1879,9 @@ - <variant> - <configItem> - <name>kan</name> -- <!-- Keyboard indicator for Kannada layouts --> -- <_shortDescription>kn</_shortDescription> -- <_description>Kannada</_description> -+ -+ <shortDescription>kn</shortDescription> -+ <description>Kannada</description> - <languageList> - <iso639Id>kan</iso639Id> - </languageList> -@@ -1890,9 +1890,9 @@ - <variant> - <configItem> - <name>kan-kagapa</name> -- <!-- Keyboard indicator for Kannada layouts --> -- <_shortDescription>kn</_shortDescription> -- <_description>Kannada (KaGaPa phonetic)</_description> -+ -+ <shortDescription>kn</shortDescription> -+ <description>Kannada (KaGaPa phonetic)</description> - <languageList> - <iso639Id>kan</iso639Id> - </languageList> -@@ -1901,9 +1901,9 @@ - <variant> - <configItem> - <name>mal</name> -- <!-- Keyboard indicator for Malayalam layouts --> -- <_shortDescription>ml</_shortDescription> -- <_description>Malayalam</_description> -+ -+ <shortDescription>ml</shortDescription> -+ <description>Malayalam</description> - <languageList> - <iso639Id>mal</iso639Id> - </languageList> -@@ -1912,9 +1912,9 @@ - <variant> - <configItem> - <name>mal_lalitha</name> -- <!-- Keyboard indicator for Malayalam layouts --> -- <_shortDescription>ml</_shortDescription> -- <_description>Malayalam (Lalitha)</_description> -+ -+ <shortDescription>ml</shortDescription> -+ <description>Malayalam (Lalitha)</description> - <languageList> - <iso639Id>mal</iso639Id> - </languageList> -@@ -1923,18 +1923,18 @@ - <variant> - <configItem> - <name>mal_enhanced</name> -- <!-- Keyboard indicator for Malayalam layouts --> -- <_shortDescription>ml</_shortDescription> -- <_description>Malayalam (enhanced Inscript with Rupee Sign)</_description> -+ -+ <shortDescription>ml</shortDescription> -+ <description>Malayalam (enhanced Inscript with Rupee Sign)</description> - <languageList><iso639Id>mal</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>ori</name> -- <!-- Keyboard indicator for Oriya layouts --> -- <_shortDescription>or</_shortDescription> -- <_description>Oriya</_description> -+ -+ <shortDescription>or</shortDescription> -+ <description>Oriya</description> - <languageList> - <iso639Id>ori</iso639Id> - </languageList> -@@ -1943,9 +1943,9 @@ - <variant> - <configItem> - <name>tam_unicode</name> -- <!-- Keyboard indicator for Tamil layouts --> -- <_shortDescription>ta</_shortDescription> -- <_description>Tamil (Unicode)</_description> -+ -+ <shortDescription>ta</shortDescription> -+ <description>Tamil (Unicode)</description> - <languageList> - <iso639Id>tam</iso639Id> - </languageList> -@@ -1954,9 +1954,9 @@ - <variant> - <configItem> - <name>tam_keyboard_with_numerals</name> -- <!-- Keyboard indicator for Tamil layouts --> -- <_shortDescription>ta</_shortDescription> -- <_description>Tamil (keyboard with numerals)</_description> -+ -+ <shortDescription>ta</shortDescription> -+ <description>Tamil (keyboard with numerals)</description> - <languageList> - <iso639Id>tam</iso639Id> - </languageList> -@@ -1965,9 +1965,9 @@ - <variant> - <configItem> - <name>tam_TAB</name> -- <!-- Keyboard indicator for Tamil layouts --> -- <_shortDescription>ta</_shortDescription> -- <_description>Tamil (TAB typewriter)</_description> -+ -+ <shortDescription>ta</shortDescription> -+ <description>Tamil (TAB typewriter)</description> - <languageList> - <iso639Id>tam</iso639Id> - </languageList> -@@ -1976,9 +1976,9 @@ - <variant> - <configItem> - <name>tam_TSCII</name> -- <!-- Keyboard indicator for Tamil layouts --> -- <_shortDescription>ta</_shortDescription> -- <_description>Tamil (TSCII typewriter)</_description> -+ -+ <shortDescription>ta</shortDescription> -+ <description>Tamil (TSCII typewriter)</description> - <languageList> - <iso639Id>tam</iso639Id> - </languageList> -@@ -1987,9 +1987,9 @@ - <variant> - <configItem> - <name>tam</name> -- <!-- Keyboard indicator for Tamil layouts --> -- <_shortDescription>ta</_shortDescription> -- <_description>Tamil</_description> -+ -+ <shortDescription>ta</shortDescription> -+ <description>Tamil</description> - <languageList> - <iso639Id>tam</iso639Id> - </languageList> -@@ -1998,9 +1998,9 @@ - <variant> - <configItem> - <name>tel</name> -- <!-- Keyboard indicator for Telugu layouts --> -- <_shortDescription>te</_shortDescription> -- <_description>Telugu</_description> -+ -+ <shortDescription>te</shortDescription> -+ <description>Telugu</description> - <languageList> - <iso639Id>tel</iso639Id> - </languageList> -@@ -2009,9 +2009,9 @@ - <variant> - <configItem> - <name>tel-kagapa</name> -- <!-- Keyboard indicator for Telugu layouts --> -- <_shortDescription>te</_shortDescription> -- <_description>Telugu (KaGaPa phonetic)</_description> -+ -+ <shortDescription>te</shortDescription> -+ <description>Telugu (KaGaPa phonetic)</description> - <languageList> - <iso639Id>tel</iso639Id> - </languageList> -@@ -2020,9 +2020,9 @@ - <variant> - <configItem> - <name>urd-phonetic</name> -- <!-- Keyboard indicator for Urdu layouts --> -- <_shortDescription>ur</_shortDescription> -- <_description>Urdu (phonetic)</_description> -+ -+ <shortDescription>ur</shortDescription> -+ <description>Urdu (phonetic)</description> - <languageList> - <iso639Id>urd</iso639Id> - </languageList> -@@ -2031,9 +2031,9 @@ - <variant> - <configItem> - <name>urd-phonetic3</name> -- <!-- Keyboard indicator for Urdu layouts --> -- <_shortDescription>ur</_shortDescription> -- <_description>Urdu (alternative phonetic)</_description> -+ -+ <shortDescription>ur</shortDescription> -+ <description>Urdu (alternative phonetic)</description> - <languageList> - <iso639Id>urd</iso639Id> - </languageList> -@@ -2042,9 +2042,9 @@ - <variant> - <configItem> - <name>urd-winkeys</name> -- <!-- Keyboard indicator for Urdu layouts --> -- <_shortDescription>ur</_shortDescription> -- <_description>Urdu (WinKeys)</_description> -+ -+ <shortDescription>ur</shortDescription> -+ <description>Urdu (WinKeys)</description> - <languageList> - <iso639Id>urd</iso639Id> - </languageList> -@@ -2053,9 +2053,9 @@ - <variant> - <configItem> - <name>bolnagri</name> -- <!-- Keyboard indicator for Hindi layouts --> -- <_shortDescription>hi</_shortDescription> -- <_description>Hindi (Bolnagri)</_description> -+ -+ <shortDescription>hi</shortDescription> -+ <description>Hindi (Bolnagri)</description> - <languageList> - <iso639Id>hin</iso639Id> - </languageList> -@@ -2064,9 +2064,9 @@ - <variant> - <configItem> - <name>hin-wx</name> -- <!-- Keyboard indicator for Hindi layouts --> -- <_shortDescription>hi</_shortDescription> -- <_description>Hindi (Wx)</_description> -+ -+ <shortDescription>hi</shortDescription> -+ <description>Hindi (Wx)</description> - <languageList> - <iso639Id>hin</iso639Id> - </languageList> -@@ -2075,9 +2075,9 @@ - <variant> - <configItem> - <name>hin-kagapa</name> -- <!-- Keyboard indicator for Hindi layouts --> -- <_shortDescription>hi</_shortDescription> -- <_description>Hindi (KaGaPa phonetic)</_description> -+ -+ <shortDescription>hi</shortDescription> -+ <description>Hindi (KaGaPa phonetic)</description> - <languageList> - <iso639Id>hin</iso639Id> - </languageList> -@@ -2086,9 +2086,9 @@ - <variant> - <configItem> - <name>san-kagapa</name> -- <!-- Keyboard indicator for Sanskrit layouts --> -- <_shortDescription>sa</_shortDescription> -- <_description>Sanskrit (KaGaPa phonetic)</_description> -+ -+ <shortDescription>sa</shortDescription> -+ <description>Sanskrit (KaGaPa phonetic)</description> - <languageList> - <iso639Id>san</iso639Id> - </languageList> -@@ -2097,9 +2097,9 @@ - <variant> - <configItem> - <name>mar-kagapa</name> -- <!-- Keyboard indicator for Marathi layouts --> -- <_shortDescription>mr</_shortDescription> -- <_description>Marathi (KaGaPa phonetic)</_description> -+ -+ <shortDescription>mr</shortDescription> -+ <description>Marathi (KaGaPa phonetic)</description> - <languageList> - <iso639Id>mar</iso639Id> - </languageList> -@@ -2108,9 +2108,9 @@ - <variant> - <configItem> - <name>eng</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (India, with RupeeSign)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (India, with RupeeSign)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -2121,9 +2121,9 @@ - <layout> - <configItem> - <name>ba</name> -- <!-- Keyboard indicator for Bosnian layouts --> -- <_shortDescription>bs</_shortDescription> -- <_description>Bosnian</_description> -+ -+ <shortDescription>bs</shortDescription> -+ <description>Bosnian</description> - <languageList> - <iso639Id>bos</iso639Id> - </languageList> -@@ -2132,25 +2132,25 @@ - <variant> - <configItem> - <name>alternatequotes</name> -- <_description>Bosnian (use guillemets for quotes)</_description> -+ <description>Bosnian (use guillemets for quotes)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>unicode</name> -- <_description>Bosnian (use Bosnian digraphs)</_description> -+ <description>Bosnian (use Bosnian digraphs)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>unicodeus</name> -- <_description>Bosnian (US keyboard with Bosnian digraphs)</_description> -+ <description>Bosnian (US keyboard with Bosnian digraphs)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>us</name> -- <_description>Bosnian (US keyboard with Bosnian letters)</_description> -+ <description>Bosnian (US keyboard with Bosnian letters)</description> - </configItem> - </variant> - </variantList> -@@ -2158,9 +2158,9 @@ - <layout> - <configItem> - <name>br</name> -- <!-- Keyboard indicator for Portuguese layouts --> -- <_shortDescription>pt</_shortDescription> -- <_description>Portuguese (Brazil)</_description> -+ -+ <shortDescription>pt</shortDescription> -+ <description>Portuguese (Brazil)</description> - <languageList> - <iso639Id>por</iso639Id> - </languageList> -@@ -2169,31 +2169,31 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Portuguese (Brazil, eliminate dead keys)</_description> -+ <description>Portuguese (Brazil, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Portuguese (Brazil, Dvorak)</_description> -+ <description>Portuguese (Brazil, Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nativo</name> -- <_description>Portuguese (Brazil, Nativo)</_description> -+ <description>Portuguese (Brazil, Nativo)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nativo-us</name> -- <_description>Portuguese (Brazil, Nativo for US keyboards)</_description> -+ <description>Portuguese (Brazil, Nativo for US keyboards)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nativo-epo</name> -- <_description>Esperanto (Brazil, Nativo)</_description> -+ <description>Esperanto (Brazil, Nativo)</description> - <languageList> - <iso639Id>epo</iso639Id> - </languageList> -@@ -2204,9 +2204,9 @@ - <layout> - <configItem> - <name>bg</name> -- <!-- Keyboard indicator for Bulgarian layouts --> -- <_shortDescription>bg</_shortDescription> -- <_description>Bulgarian</_description> -+ -+ <shortDescription>bg</shortDescription> -+ <description>Bulgarian</description> - <languageList> - <iso639Id>bul</iso639Id> - </languageList> -@@ -2215,13 +2215,13 @@ - <variant> - <configItem> - <name>phonetic</name> -- <_description>Bulgarian (traditional phonetic)</_description> -+ <description>Bulgarian (traditional phonetic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>bas_phonetic</name> -- <_description>Bulgarian (new phonetic)</_description> -+ <description>Bulgarian (new phonetic)</description> - </configItem> - </variant> - </variantList> -@@ -2229,17 +2229,17 @@ - <layout> - <configItem> - <name>ma</name> -- <!-- Keyboard indicator for Arabic layouts --> -- <_shortDescription>ar</_shortDescription> -- <_description>Arabic (Morocco)</_description> -+ -+ <shortDescription>ar</shortDescription> -+ <description>Arabic (Morocco)</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>french</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Morocco)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Morocco)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -2248,9 +2248,9 @@ - <variant> - <configItem> - <name>tifinagh</name> -- <!-- Keyboard indicator for Berber layouts --> -- <_shortDescription>ber</_shortDescription> -- <_description>Berber (Morocco, Tifinagh)</_description> -+ -+ <shortDescription>ber</shortDescription> -+ <description>Berber (Morocco, Tifinagh)</description> - <languageList> - <iso639Id>ber</iso639Id> - </languageList> -@@ -2259,9 +2259,9 @@ - <variant> - <configItem> - <name>tifinagh-alt</name> -- <!-- Keyboard indicator for Berber layouts --> -- <_shortDescription>ber</_shortDescription> -- <_description>Berber (Morocco, Tifinagh alternative)</_description> -+ -+ <shortDescription>ber</shortDescription> -+ <description>Berber (Morocco, Tifinagh alternative)</description> - <languageList> - <iso639Id>ber</iso639Id> - </languageList> -@@ -2270,9 +2270,9 @@ - <variant> - <configItem> - <name>tifinagh-alt-phonetic</name> -- <!-- Keyboard indicator for Berber layouts --> -- <_shortDescription>ber</_shortDescription> -- <_description>Berber (Morocco, Tifinagh alternative phonetic)</_description> -+ -+ <shortDescription>ber</shortDescription> -+ <description>Berber (Morocco, Tifinagh alternative phonetic)</description> - <languageList> - <iso639Id>ber</iso639Id> - </languageList> -@@ -2281,9 +2281,9 @@ - <variant> - <configItem> - <name>tifinagh-extended</name> -- <!-- Keyboard indicator for Berber layouts --> -- <_shortDescription>ber</_shortDescription> -- <_description>Berber (Morocco, Tifinagh extended)</_description> -+ -+ <shortDescription>ber</shortDescription> -+ <description>Berber (Morocco, Tifinagh extended)</description> - <languageList> - <iso639Id>ber</iso639Id> - </languageList> -@@ -2292,9 +2292,9 @@ - <variant> - <configItem> - <name>tifinagh-phonetic</name> -- <!-- Keyboard indicator for Berber layouts --> -- <_shortDescription>ber</_shortDescription> -- <_description>Berber (Morocco, Tifinagh phonetic)</_description> -+ -+ <shortDescription>ber</shortDescription> -+ <description>Berber (Morocco, Tifinagh phonetic)</description> - <languageList> - <iso639Id>ber</iso639Id> - </languageList> -@@ -2303,9 +2303,9 @@ - <variant> - <configItem> - <name>tifinagh-extended-phonetic</name> -- <!-- Keyboard indicator for Berber layouts --> -- <_shortDescription>ber</_shortDescription> -- <_description>Berber (Morocco, Tifinagh extended phonetic)</_description> -+ -+ <shortDescription>ber</shortDescription> -+ <description>Berber (Morocco, Tifinagh extended phonetic)</description> - <languageList> - <iso639Id>ber</iso639Id> - </languageList> -@@ -2316,23 +2316,23 @@ - <layout> - <configItem> - <name>cm</name> -- <!-- Keyboard indicator for Cameroon layouts --> -- <_shortDescription>cm</_shortDescription> -- <_description>English (Cameroon)</_description> -+ -+ <shortDescription>cm</shortDescription> -+ <description>English (Cameroon)</description> - <languageList><iso639Id>eng</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>french</name> -- <_description>French (Cameroon)</_description> -+ <description>French (Cameroon)</description> - <languageList><iso639Id>fra</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty</name> -- <_description>Cameroon Multilingual (qwerty)</_description> -+ <description>Cameroon Multilingual (qwerty)</description> - <languageList> - <iso639Id>eng</iso639Id> - <iso639Id>bas</iso639Id> -@@ -2369,7 +2369,7 @@ - <variant> - <configItem> - <name>azerty</name> -- <_description>Cameroon Multilingual (azerty)</_description> -+ <description>Cameroon Multilingual (azerty)</description> - <languageList> - <iso639Id>fra</iso639Id> - <iso639Id>bas</iso639Id> -@@ -2406,7 +2406,7 @@ - <variant> - <configItem> - <name>dvorak</name> -- <_description>Cameroon Multilingual (Dvorak)</_description> -+ <description>Cameroon Multilingual (Dvorak)</description> - </configItem> - </variant> - </variantList> -@@ -2414,9 +2414,9 @@ - <layout> - <configItem> - <name>mm</name> -- <!-- Keyboard indicator for Burmese layouts --> -- <_shortDescription>my</_shortDescription> -- <_description>Burmese</_description> -+ -+ <shortDescription>my</shortDescription> -+ <description>Burmese</description> - <languageList> - <iso639Id>mya</iso639Id> - </languageList> -@@ -2426,9 +2426,9 @@ - <layout> - <configItem> - <name>ca</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Canada)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Canada)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -2437,43 +2437,43 @@ - <variant> - <configItem> - <name>fr-dvorak</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Canada, Dvorak)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Canada, Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>fr-legacy</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Canada, legacy)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Canada, legacy)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>multix</name> -- <_description>Canadian Multilingual</_description> -+ <description>Canadian Multilingual</description> - </configItem> - </variant> - <variant> - <configItem> - <name>multi</name> -- <_description>Canadian Multilingual (first part)</_description> -+ <description>Canadian Multilingual (first part)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>multi-2gr</name> -- <_description>Canadian Multilingual (second part)</_description> -+ <description>Canadian Multilingual (second part)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ike</name> -- <!-- Keyboard indicator for Inuktikut layouts --> -- <_shortDescription>ike</_shortDescription> -- <_description>Inuktitut</_description> -+ -+ <shortDescription>ike</shortDescription> -+ <description>Inuktitut</description> - <languageList> - <iso639Id>iku</iso639Id> - </languageList> -@@ -2482,9 +2482,9 @@ - <variant> - <configItem> - <name>eng</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (Canada)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (Canada)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -2495,9 +2495,9 @@ - <layout> - <configItem> - <name>cd</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Democratic Republic of the Congo)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Democratic Republic of the Congo)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -2507,9 +2507,9 @@ - <layout> - <configItem> - <name>cn</name> -- <!-- Keyboard indicator for Chinese layouts --> -- <_shortDescription>zh</_shortDescription> -- <_description>Chinese</_description> -+ -+ <shortDescription>zh</shortDescription> -+ <description>Chinese</description> - <languageList> - <iso639Id>chi</iso639Id> - </languageList> -@@ -2518,7 +2518,7 @@ - <variant> - <configItem> - <name>tib</name> -- <_description>Tibetan</_description> -+ <description>Tibetan</description> - <languageList> - <iso639Id>tib</iso639Id> - </languageList> -@@ -2527,7 +2527,7 @@ - <variant> - <configItem> - <name>tib_asciinum</name> -- <_description>Tibetan (with ASCII numerals)</_description> -+ <description>Tibetan (with ASCII numerals)</description> - <languageList> - <iso639Id>tib</iso639Id> - </languageList> -@@ -2536,8 +2536,8 @@ - <variant> - <configItem> - <name>ug</name> -- <_shortDescription>ug</_shortDescription> -- <_description>Uyghur</_description> -+ <shortDescription>ug</shortDescription> -+ <description>Uyghur</description> - <languageList> - <iso639Id>ug</iso639Id> - </languageList> -@@ -2548,9 +2548,9 @@ - <layout> - <configItem> - <name>hr</name> -- <!-- Keyboard indicator for Croatian layouts --> -- <_shortDescription>hr</_shortDescription> -- <_description>Croatian</_description> -+ -+ <shortDescription>hr</shortDescription> -+ <description>Croatian</description> - <languageList> - <iso639Id>hrv</iso639Id> - </languageList> -@@ -2559,25 +2559,25 @@ - <variant> - <configItem> - <name>alternatequotes</name> -- <_description>Croatian (use guillemets for quotes)</_description> -+ <description>Croatian (use guillemets for quotes)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>unicode</name> -- <_description>Croatian (use Croatian digraphs)</_description> -+ <description>Croatian (use Croatian digraphs)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>unicodeus</name> -- <_description>Croatian (US keyboard with Croatian digraphs)</_description> -+ <description>Croatian (US keyboard with Croatian digraphs)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>us</name> -- <_description>Croatian (US keyboard with Croatian letters)</_description> -+ <description>Croatian (US keyboard with Croatian letters)</description> - </configItem> - </variant> - </variantList> -@@ -2585,9 +2585,9 @@ - <layout> - <configItem> - <name>cz</name> -- <!-- Keyboard indicator for Chech layouts --> -- <_shortDescription>cs</_shortDescription> -- <_description>Czech</_description> -+ -+ <shortDescription>cs</shortDescription> -+ <description>Czech</description> - <languageList> - <iso639Id>cze</iso639Id> - </languageList> -@@ -2596,31 +2596,31 @@ - <variant> - <configItem> - <name>bksl</name> -- <_description>Czech (with <\|> key)</_description> -+ <description>Czech (with <\|> key)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty</name> -- <_description>Czech (qwerty)</_description> -+ <description>Czech (qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty_bksl</name> -- <_description>Czech (qwerty, extended Backslash)</_description> -+ <description>Czech (qwerty, extended Backslash)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ucw</name> -- <_description>Czech (UCW layout, accented letters only)</_description> -+ <description>Czech (UCW layout, accented letters only)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak-ucw</name> -- <_description>Czech (US Dvorak with CZ UCW support)</_description> -+ <description>Czech (US Dvorak with CZ UCW support)</description> - </configItem> - </variant> - </variantList> -@@ -2628,9 +2628,9 @@ - <layout> - <configItem> - <name>dk</name> -- <!-- Keyboard indicator for Danish layouts --> -- <_shortDescription>da</_shortDescription> -- <_description>Danish</_description> -+ -+ <shortDescription>da</shortDescription> -+ <description>Danish</description> - <languageList> - <iso639Id>dan</iso639Id> - </languageList> -@@ -2639,25 +2639,25 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Danish (eliminate dead keys)</_description> -+ <description>Danish (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Danish (Macintosh)</_description> -+ <description>Danish (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac_nodeadkeys</name> -- <_description>Danish (Macintosh, eliminate dead keys)</_description> -+ <description>Danish (Macintosh, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Danish (Dvorak)</_description> -+ <description>Danish (Dvorak)</description> - </configItem> - </variant> - </variantList> -@@ -2665,9 +2665,9 @@ - <layout> - <configItem> - <name>nl</name> -- <!-- Keyboard indicator for Dutch layouts --> -- <_shortDescription>nl</_shortDescription> -- <_description>Dutch</_description> -+ -+ <shortDescription>nl</shortDescription> -+ <description>Dutch</description> - <languageList> - <iso639Id>nld</iso639Id> - </languageList> -@@ -2676,19 +2676,19 @@ - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>Dutch (Sun dead keys)</_description> -+ <description>Dutch (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Dutch (Macintosh)</_description> -+ <description>Dutch (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>std</name> -- <_description>Dutch (standard)</_description> -+ <description>Dutch (standard)</description> - </configItem> - </variant> - </variantList> -@@ -2696,9 +2696,9 @@ - <layout> - <configItem> - <name>bt</name> -- <!-- Keyboard indicator for Dzongkha layouts --> -- <_shortDescription>dz</_shortDescription> -- <_description>Dzongkha</_description> -+ -+ <shortDescription>dz</shortDescription> -+ <description>Dzongkha</description> - <languageList> - <iso639Id>dzo</iso639Id> - </languageList> -@@ -2707,9 +2707,9 @@ - <layout> - <configItem> - <name>ee</name> -- <!-- Keyboard indicator for Estonian layouts --> -- <_shortDescription>et</_shortDescription> -- <_description>Estonian</_description> -+ -+ <shortDescription>et</shortDescription> -+ <description>Estonian</description> - <languageList> - <iso639Id>est</iso639Id> - </languageList> -@@ -2718,19 +2718,19 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Estonian (eliminate dead keys)</_description> -+ <description>Estonian (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Estonian (Dvorak)</_description> -+ <description>Estonian (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>us</name> -- <_description>Estonian (US keyboard with Estonian letters)</_description> -+ <description>Estonian (US keyboard with Estonian letters)</description> - </configItem> - </variant> - </variantList> -@@ -2738,9 +2738,9 @@ - <layout> - <configItem> - <name>ir</name> -- <!-- Keyboard indicator for Persian layouts --> -- <_shortDescription>fa</_shortDescription> -- <_description>Persian</_description> -+ -+ <shortDescription>fa</shortDescription> -+ <description>Persian</description> - <languageList> - <iso639Id>per</iso639Id> - </languageList> -@@ -2749,15 +2749,15 @@ - <variant> - <configItem> - <name>pes_keypad</name> -- <_description>Persian (with Persian Keypad)</_description> -+ <description>Persian (with Persian Keypad)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ku</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iran, Latin Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iran, Latin Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2766,9 +2766,9 @@ - <variant> - <configItem> - <name>ku_f</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iran, F)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iran, F)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2777,9 +2777,9 @@ - <variant> - <configItem> - <name>ku_alt</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iran, Latin Alt-Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iran, Latin Alt-Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2788,9 +2788,9 @@ - <variant> - <configItem> - <name>ku_ara</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iran, Arabic-Latin)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iran, Arabic-Latin)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2801,9 +2801,9 @@ - <layout> - <configItem> - <name>iq</name> -- <!-- Keyboard indicator for Iraqi layouts --> -- <_shortDescription>ar</_shortDescription> -- <_description>Iraqi</_description> -+ -+ <shortDescription>ar</shortDescription> -+ <description>Iraqi</description> - <languageList><iso639Id>ara</iso639Id> - <iso639Id>kur</iso639Id></languageList> - </configItem> -@@ -2811,9 +2811,9 @@ - <variant> - <configItem> - <name>ku</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iraq, Latin Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iraq, Latin Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2822,9 +2822,9 @@ - <variant> - <configItem> - <name>ku_f</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iraq, F)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iraq, F)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2833,9 +2833,9 @@ - <variant> - <configItem> - <name>ku_alt</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iraq, Latin Alt-Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iraq, Latin Alt-Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2844,9 +2844,9 @@ - <variant> - <configItem> - <name>ku_ara</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iraq, Arabic-Latin)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iraq, Arabic-Latin)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2857,9 +2857,9 @@ - <layout> - <configItem> - <name>fo</name> -- <!-- Keyboard indicator for Faroese layouts --> -- <_shortDescription>fo</_shortDescription> -- <_description>Faroese</_description> -+ -+ <shortDescription>fo</shortDescription> -+ <description>Faroese</description> - <languageList> - <iso639Id>fao</iso639Id> - </languageList> -@@ -2868,7 +2868,7 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Faroese (eliminate dead keys)</_description> -+ <description>Faroese (eliminate dead keys)</description> - </configItem> - </variant> - </variantList> -@@ -2876,9 +2876,9 @@ - <layout> - <configItem> - <name>fi</name> -- <!-- Keyboard indicator for Finnish layouts --> -- <_shortDescription>fi</_shortDescription> -- <_description>Finnish</_description> -+ -+ <shortDescription>fi</shortDescription> -+ <description>Finnish</description> - <languageList> - <iso639Id>fin</iso639Id> - </languageList> -@@ -2887,26 +2887,26 @@ - <variant> - <configItem> - <name>classic</name> -- <_description>Finnish (classic)</_description> -+ <description>Finnish (classic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Finnish (classic, eliminate dead keys)</_description> -+ <description>Finnish (classic, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>smi</name> -- <_description>Northern Saami (Finland)</_description> -+ <description>Northern Saami (Finland)</description> - <languageList><iso639Id>sme</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Finnish (Macintosh)</_description> -+ <description>Finnish (Macintosh)</description> - </configItem> - </variant> - </variantList> -@@ -2914,9 +2914,9 @@ - <layout> - <configItem> - <name>fr</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -2925,91 +2925,91 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>French (eliminate dead keys)</_description> -+ <description>French (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>French (Sun dead keys)</_description> -+ <description>French (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>oss</name> -- <_description>French (alternative)</_description> -+ <description>French (alternative)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>oss_latin9</name> -- <_description>French (alternative, Latin-9 only)</_description> -+ <description>French (alternative, Latin-9 only)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>oss_nodeadkeys</name> -- <_description>French (alternative, eliminate dead keys)</_description> -+ <description>French (alternative, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>oss_sundeadkeys</name> -- <_description>French (alternative, Sun dead keys)</_description> -+ <description>French (alternative, Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latin9</name> -- <_description>French (legacy, alternative)</_description> -+ <description>French (legacy, alternative)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latin9_nodeadkeys</name> -- <_description>French (legacy, alternative, eliminate dead keys)</_description> -+ <description>French (legacy, alternative, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latin9_sundeadkeys</name> -- <_description>French (legacy, alternative, Sun dead keys)</_description> -+ <description>French (legacy, alternative, Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>bepo</name> -- <_description>French (Bepo, ergonomic, Dvorak way)</_description> -+ <description>French (Bepo, ergonomic, Dvorak way)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>bepo_latin9</name> -- <_description>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</_description> -+ <description>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>French (Dvorak)</_description> -+ <description>French (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>French (Macintosh)</_description> -+ <description>French (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>bre</name> -- <_description>French (Breton)</_description> -+ <description>French (Breton)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>oci</name> -- <_description>Occitan</_description> -+ <description>Occitan</description> - <languageList> - <iso639Id>oci</iso639Id> - </languageList> -@@ -3018,7 +3018,7 @@ - <variant> - <configItem> - <name>geo</name> -- <_description>Georgian (France, AZERTY Tskapo)</_description> -+ <description>Georgian (France, AZERTY Tskapo)</description> - <languageList> - <iso639Id>geo</iso639Id> - </languageList> -@@ -3029,9 +3029,9 @@ - <layout> - <configItem> - <name>gh</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (Ghana)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (Ghana)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -3040,15 +3040,15 @@ - <variant> - <configItem> - <name>generic</name> -- <_description>English (Ghana, multilingual)</_description> -+ <description>English (Ghana, multilingual)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>akan</name> -- <!-- Keyboard indicator for Akan layouts --> -- <_shortDescription>ak</_shortDescription> -- <_description>Akan</_description> -+ -+ <shortDescription>ak</shortDescription> -+ <description>Akan</description> - <languageList> - <iso639Id>aka</iso639Id> - </languageList> -@@ -3057,9 +3057,9 @@ - <variant> - <configItem> - <name>ewe</name> -- <!-- Keyboard indicator for Ewe layouts --> -- <_shortDescription>ee</_shortDescription> -- <_description>Ewe</_description> -+ -+ <shortDescription>ee</shortDescription> -+ <description>Ewe</description> - <languageList> - <iso639Id>ewe</iso639Id> - </languageList> -@@ -3068,9 +3068,9 @@ - <variant> - <configItem> - <name>fula</name> -- <!-- Keyboard indicator for Fula layouts --> -- <_shortDescription>ff</_shortDescription> -- <_description>Fula</_description> -+ -+ <shortDescription>ff</shortDescription> -+ <description>Fula</description> - <languageList> - <iso639Id>ful</iso639Id> - </languageList> -@@ -3079,9 +3079,9 @@ - <variant> - <configItem> - <name>ga</name> -- <!-- Keyboard indicator for Ga layouts --> -- <_shortDescription>gaa</_shortDescription> -- <_description>Ga</_description> -+ -+ <shortDescription>gaa</shortDescription> -+ <description>Ga</description> - <languageList> - <iso639Id>gaa</iso639Id> - </languageList> -@@ -3090,9 +3090,9 @@ - <variant> - <configItem> - <name>hausa</name> -- <!-- Keyboard indicator for Hausa layouts --> -- <_shortDescription>ha</_shortDescription> -- <_description>Hausa</_description> -+ -+ <shortDescription>ha</shortDescription> -+ <description>Hausa</description> - <languageList> - <iso639Id>hau</iso639Id> - </languageList> -@@ -3101,9 +3101,9 @@ - <variant> - <configItem> - <name>avn</name> -- <!-- Keyboard indicator for Avatime layouts --> -- <_shortDescription>avn</_shortDescription> -- <_description>Avatime</_description> -+ -+ <shortDescription>avn</shortDescription> -+ <description>Avatime</description> - <languageList> - <iso639Id>avn</iso639Id> - </languageList> -@@ -3112,7 +3112,7 @@ - <variant> - <configItem> - <name>gillbt</name> -- <_description>English (Ghana, GILLBT)</_description> -+ <description>English (Ghana, GILLBT)</description> - </configItem> - </variant> - </variantList> -@@ -3120,9 +3120,9 @@ - <layout> - <configItem> - <name>gn</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Guinea)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Guinea)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -3132,9 +3132,9 @@ - <layout> - <configItem> - <name>ge</name> -- <!-- Keyboard indicator for Georgian layouts --> -- <_shortDescription>ka</_shortDescription> -- <_description>Georgian</_description> -+ -+ <shortDescription>ka</shortDescription> -+ <description>Georgian</description> - <languageList> - <iso639Id>geo</iso639Id> - </languageList> -@@ -3143,21 +3143,21 @@ - <variant> - <configItem> - <name>ergonomic</name> -- <_description>Georgian (ergonomic)</_description> -+ <description>Georgian (ergonomic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mess</name> -- <_description>Georgian (MESS)</_description> -+ <description>Georgian (MESS)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ru</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (Georgia)</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian (Georgia)</description> - <languageList> - <iso639Id>rus</iso639Id> - </languageList> -@@ -3166,7 +3166,7 @@ - <variant> - <configItem> - <name>os</name> -- <_description>Ossetian (Georgia)</_description> -+ <description>Ossetian (Georgia)</description> - <languageList> - <iso639Id>oss</iso639Id> - </languageList> -@@ -3177,9 +3177,9 @@ - <layout> - <configItem> - <name>de</name> -- <!-- Keyboard indicator for German layouts --> -- <_shortDescription>de</_shortDescription> -- <_description>German</_description> -+ -+ <shortDescription>de</shortDescription> -+ <description>German</description> - <languageList> - <iso639Id>ger</iso639Id> - </languageList> -@@ -3188,75 +3188,75 @@ - <variant> - <configItem> - <name>deadacute</name> -- <_description>German (dead acute)</_description> -+ <description>German (dead acute)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>deadgraveacute</name> -- <_description>German (dead grave acute)</_description> -+ <description>German (dead grave acute)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>German (eliminate dead keys)</_description> -+ <description>German (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>T3</name> -- <_description>German (T3)</_description> -+ <description>German (T3)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ro</name> -- <_description>Romanian (Germany)</_description> -+ <description>Romanian (Germany)</description> - <languageList><iso639Id>rum</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>ro_nodeadkeys</name> -- <_description>Romanian (Germany, eliminate dead keys)</_description> -+ <description>Romanian (Germany, eliminate dead keys)</description> - <languageList><iso639Id>rum</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>German (Dvorak)</_description> -+ <description>German (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>German (Sun dead keys)</_description> -+ <description>German (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>neo</name> -- <_description>German (Neo 2)</_description> -+ <description>German (Neo 2)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>German (Macintosh)</_description> -+ <description>German (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac_nodeadkeys</name> -- <_description>German (Macintosh, eliminate dead keys)</_description> -+ <description>German (Macintosh, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dsb</name> -- <_description>Lower Sorbian</_description> -+ <description>Lower Sorbian</description> - <languageList> - <iso639Id>dsb</iso639Id> - </languageList> -@@ -3265,7 +3265,7 @@ - <variant> - <configItem> - <name>dsb_qwertz</name> -- <_description>Lower Sorbian (qwertz)</_description> -+ <description>Lower Sorbian (qwertz)</description> - <languageList> - <iso639Id>dsb</iso639Id> - </languageList> -@@ -3274,15 +3274,15 @@ - <variant> - <configItem> - <name>qwerty</name> -- <_description>German (qwerty)</_description> -+ <description>German (qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ru</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (Germany, phonetic)</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian (Germany, phonetic)</description> - <languageList> - <iso639Id>rus</iso639Id> - </languageList> -@@ -3291,7 +3291,7 @@ - <variant> - <configItem> - <name>legacy</name> -- <_description>German (legacy)</_description> -+ <description>German (legacy)</description> - </configItem> - </variant> - </variantList> -@@ -3299,9 +3299,9 @@ - <layout> - <configItem> - <name>gr</name> -- <!-- Keyboard indicator for Greek layouts --> -- <_shortDescription>gr</_shortDescription> -- <_description>Greek</_description> -+ -+ <shortDescription>gr</shortDescription> -+ <description>Greek</description> - <languageList> - <iso639Id>gre</iso639Id> - </languageList> -@@ -3310,25 +3310,25 @@ - <variant> - <configItem> - <name>simple</name> -- <_description>Greek (simple)</_description> -+ <description>Greek (simple)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>extended</name> -- <_description>Greek (extended)</_description> -+ <description>Greek (extended)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Greek (eliminate dead keys)</_description> -+ <description>Greek (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>polytonic</name> -- <_description>Greek (polytonic)</_description> -+ <description>Greek (polytonic)</description> - </configItem> - </variant> - </variantList> -@@ -3336,9 +3336,9 @@ - <layout> - <configItem> - <name>hu</name> -- <!-- Keyboard indicator for Hungarian layouts --> -- <_shortDescription>hu</_shortDescription> -- <_description>Hungarian</_description> -+ -+ <shortDescription>hu</shortDescription> -+ <description>Hungarian</description> - <languageList> - <iso639Id>hun</iso639Id> - </languageList> -@@ -3347,115 +3347,115 @@ - <variant> - <configItem> - <name>standard</name> -- <_description>Hungarian (standard)</_description> -+ <description>Hungarian (standard)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Hungarian (eliminate dead keys)</_description> -+ <description>Hungarian (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty</name> -- <_description>Hungarian (qwerty)</_description> -+ <description>Hungarian (qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwertz_comma_dead</name> -- <_description>Hungarian (101/qwertz/comma/dead keys)</_description> -+ <description>Hungarian (101/qwertz/comma/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwertz_comma_nodead</name> -- <_description>Hungarian (101/qwertz/comma/eliminate dead keys)</_description> -+ <description>Hungarian (101/qwertz/comma/eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwertz_dot_dead</name> -- <_description>Hungarian (101/qwertz/dot/dead keys)</_description> -+ <description>Hungarian (101/qwertz/dot/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwertz_dot_nodead</name> -- <_description>Hungarian (101/qwertz/dot/eliminate dead keys)</_description> -+ <description>Hungarian (101/qwertz/dot/eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwerty_comma_dead</name> -- <_description>Hungarian (101/qwerty/comma/dead keys)</_description> -+ <description>Hungarian (101/qwerty/comma/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwerty_comma_nodead</name> -- <_description>Hungarian (101/qwerty/comma/eliminate dead keys)</_description> -+ <description>Hungarian (101/qwerty/comma/eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwerty_dot_dead</name> -- <_description>Hungarian (101/qwerty/dot/dead keys)</_description> -+ <description>Hungarian (101/qwerty/dot/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwerty_dot_nodead</name> -- <_description>Hungarian (101/qwerty/dot/eliminate dead keys)</_description> -+ <description>Hungarian (101/qwerty/dot/eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwertz_comma_dead</name> -- <_description>Hungarian (102/qwertz/comma/dead keys)</_description> -+ <description>Hungarian (102/qwertz/comma/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwertz_comma_nodead</name> -- <_description>Hungarian (102/qwertz/comma/eliminate dead keys)</_description> -+ <description>Hungarian (102/qwertz/comma/eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwertz_dot_dead</name> -- <_description>Hungarian (102/qwertz/dot/dead keys)</_description> -+ <description>Hungarian (102/qwertz/dot/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwertz_dot_nodead</name> -- <_description>Hungarian (102/qwertz/dot/eliminate dead keys)</_description> -+ <description>Hungarian (102/qwertz/dot/eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwerty_comma_dead</name> -- <_description>Hungarian (102/qwerty/comma/dead keys)</_description> -+ <description>Hungarian (102/qwerty/comma/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwerty_comma_nodead</name> -- <_description>Hungarian (102/qwerty/comma/eliminate dead keys)</_description> -+ <description>Hungarian (102/qwerty/comma/eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwerty_dot_dead</name> -- <_description>Hungarian (102/qwerty/dot/dead keys)</_description> -+ <description>Hungarian (102/qwerty/dot/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwerty_dot_nodead</name> -- <_description>Hungarian (102/qwerty/dot/eliminate dead keys)</_description> -+ <description>Hungarian (102/qwerty/dot/eliminate dead keys)</description> - </configItem> - </variant> - </variantList> -@@ -3463,9 +3463,9 @@ - <layout> - <configItem> - <name>is</name> -- <!-- Keyboard indicator for Icelandic layouts --> -- <_shortDescription>is</_shortDescription> -- <_description>Icelandic</_description> -+ -+ <shortDescription>is</shortDescription> -+ <description>Icelandic</description> - <languageList> - <iso639Id>ice</iso639Id> - </languageList> -@@ -3474,25 +3474,25 @@ - <variant> - <configItem> - <name>Sundeadkeys</name> -- <_description>Icelandic (Sun dead keys)</_description> -+ <description>Icelandic (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Icelandic (eliminate dead keys)</_description> -+ <description>Icelandic (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Icelandic (Macintosh)</_description> -+ <description>Icelandic (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Icelandic (Dvorak)</_description> -+ <description>Icelandic (Dvorak)</description> - </configItem> - </variant> - </variantList> -@@ -3500,9 +3500,9 @@ - <layout> - <configItem> - <name>il</name> -- <!-- Keyboard indicator for Hebrew layouts --> -- <_shortDescription>he</_shortDescription> -- <_description>Hebrew</_description> -+ -+ <shortDescription>he</shortDescription> -+ <description>Hebrew</description> - <languageList> - <iso639Id>heb</iso639Id> - </languageList> -@@ -3511,19 +3511,19 @@ - <variant> - <configItem> - <name>lyx</name> -- <_description>Hebrew (lyx)</_description> -+ <description>Hebrew (lyx)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>phonetic</name> -- <_description>Hebrew (phonetic)</_description> -+ <description>Hebrew (phonetic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>biblical</name> -- <_description>Hebrew (Biblical, Tiro)</_description> -+ <description>Hebrew (Biblical, Tiro)</description> - </configItem> - </variant> - </variantList> -@@ -3531,9 +3531,9 @@ - <layout> - <configItem> - <name>it</name> -- <!-- Keyboard indicator for Italian layouts --> -- <_shortDescription>it</_shortDescription> -- <_description>Italian</_description> -+ -+ <shortDescription>it</shortDescription> -+ <description>Italian</description> - <languageList> - <iso639Id>ita</iso639Id> - </languageList> -@@ -3542,25 +3542,25 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Italian (eliminate dead keys)</_description> -+ <description>Italian (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Italian (Macintosh)</_description> -+ <description>Italian (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>us</name> -- <_description>Italian (US keyboard with Italian letters)</_description> -+ <description>Italian (US keyboard with Italian letters)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>geo</name> -- <_description>Georgian (Italy)</_description> -+ <description>Georgian (Italy)</description> - <languageList> - <iso639Id>geo</iso639Id> - </languageList> -@@ -3569,7 +3569,7 @@ - <variant> - <configItem> - <name>ibm</name> -- <_description>Italian (IBM 142)</_description> -+ <description>Italian (IBM 142)</description> - </configItem> - </variant> - </variantList> -@@ -3577,9 +3577,9 @@ - <layout> - <configItem> - <name>jp</name> -- <!-- Keyboard indicator for Japanese layouts --> -- <_shortDescription>ja</_shortDescription> -- <_description>Japanese</_description> -+ -+ <shortDescription>ja</shortDescription> -+ <description>Japanese</description> - <languageList> - <iso639Id>jpn</iso639Id> - </languageList> -@@ -3588,31 +3588,31 @@ - <variant> - <configItem> - <name>kana</name> -- <_description>Japanese (Kana)</_description> -+ <description>Japanese (Kana)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>kana86</name> -- <_description>Japanese (Kana 86)</_description> -+ <description>Japanese (Kana 86)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>OADG109A</name> -- <_description>Japanese (OADG 109A)</_description> -+ <description>Japanese (OADG 109A)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Japanese (Macintosh)</_description> -+ <description>Japanese (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Japanese (Dvorak)</_description> -+ <description>Japanese (Dvorak)</description> - </configItem> - </variant> - </variantList> -@@ -3620,9 +3620,9 @@ - <layout> - <configItem> - <name>kg</name> -- <!-- Keyboard indicator for Kyrgyz layouts --> -- <_shortDescription>ki</_shortDescription> -- <_description>Kyrgyz</_description> -+ -+ <shortDescription>ki</shortDescription> -+ <description>Kyrgyz</description> - <languageList> - <iso639Id>kir</iso639Id> - </languageList> -@@ -3631,7 +3631,7 @@ - <variant> - <configItem> - <name>phonetic</name> -- <_description>Kyrgyz (phonetic)</_description> -+ <description>Kyrgyz (phonetic)</description> - </configItem> - </variant> - </variantList> -@@ -3639,9 +3639,9 @@ - <layout> - <configItem> - <name>kh</name> -- <!-- Keyboard indicator for Khmer layouts --> -- <_shortDescription>km</_shortDescription> -- <_description>Khmer (Cambodia)</_description> -+ -+ <shortDescription>km</shortDescription> -+ <description>Khmer (Cambodia)</description> - <languageList> - <iso639Id>khm</iso639Id> - </languageList> -@@ -3651,9 +3651,9 @@ - <layout> - <configItem> - <name>kz</name> -- <!-- Keyboard indicator for Kazakh layouts --> -- <_shortDescription>kk</_shortDescription> -- <_description>Kazakh</_description> -+ -+ <shortDescription>kk</shortDescription> -+ <description>Kazakh</description> - <languageList> - <iso639Id>kaz</iso639Id> - </languageList> -@@ -3662,9 +3662,9 @@ - <variant> - <configItem> - <name>ruskaz</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (Kazakhstan, with Kazakh)</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian (Kazakhstan, with Kazakh)</description> - <languageList><iso639Id>kaz</iso639Id> - <iso639Id>rus</iso639Id></languageList> - </configItem> -@@ -3672,7 +3672,7 @@ - <variant> - <configItem> - <name>kazrus</name> -- <_description>Kazakh (with Russian)</_description> -+ <description>Kazakh (with Russian)</description> - <languageList><iso639Id>kaz</iso639Id> - <iso639Id>rus</iso639Id></languageList> - </configItem> -@@ -3682,9 +3682,9 @@ - <layout> - <configItem> - <name>la</name> -- <!-- Keyboard indicator for Lao layouts --> -- <_shortDescription>lo</_shortDescription> -- <_description>Lao</_description> -+ -+ <shortDescription>lo</shortDescription> -+ <description>Lao</description> - <languageList> - <iso639Id>lao</iso639Id> - </languageList> -@@ -3693,7 +3693,7 @@ - <variant> - <configItem> - <name>stea</name> -- <_description>Lao (STEA proposed standard layout)</_description> -+ <description>Lao (STEA proposed standard layout)</description> - <languageList><iso639Id>lao</iso639Id> - </languageList> - </configItem> -@@ -3703,9 +3703,9 @@ - <layout> - <configItem> - <name>latam</name> -- <!-- Keyboard indicator for Spanish layouts --> -- <_shortDescription>es</_shortDescription> -- <_description>Spanish (Latin American)</_description> -+ -+ <shortDescription>es</shortDescription> -+ <description>Spanish (Latin American)</description> - <countryList> - <iso3166Id>AR</iso3166Id> - <iso3166Id>BO</iso3166Id> -@@ -3737,19 +3737,19 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Spanish (Latin American, eliminate dead keys)</_description> -+ <description>Spanish (Latin American, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>deadtilde</name> -- <_description>Spanish (Latin American, include dead tilde)</_description> -+ <description>Spanish (Latin American, include dead tilde)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>Spanish (Latin American, Sun dead keys)</_description> -+ <description>Spanish (Latin American, Sun dead keys)</description> - </configItem> - </variant> - </variantList> -@@ -3757,9 +3757,9 @@ - <layout> - <configItem> - <name>lt</name> -- <!-- Keyboard indicator for Lithuanian layouts --> -- <_shortDescription>lt</_shortDescription> -- <_description>Lithuanian</_description> -+ -+ <shortDescription>lt</shortDescription> -+ <description>Lithuanian</description> - <languageList> - <iso639Id>lit</iso639Id> - </languageList> -@@ -3768,31 +3768,31 @@ - <variant> - <configItem> - <name>std</name> -- <_description>Lithuanian (standard)</_description> -+ <description>Lithuanian (standard)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>us</name> -- <_description>Lithuanian (US keyboard with Lithuanian letters)</_description> -+ <description>Lithuanian (US keyboard with Lithuanian letters)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ibm</name> -- <_description>Lithuanian (IBM LST 1205-92)</_description> -+ <description>Lithuanian (IBM LST 1205-92)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>lekp</name> -- <_description>Lithuanian (LEKP)</_description> -+ <description>Lithuanian (LEKP)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>lekpa</name> -- <_description>Lithuanian (LEKPa)</_description> -+ <description>Lithuanian (LEKPa)</description> - </configItem> - </variant> - </variantList> -@@ -3800,9 +3800,9 @@ - <layout> - <configItem> - <name>lv</name> -- <!-- Keyboard indicator for Latvian layouts --> -- <_shortDescription>lv</_shortDescription> -- <_description>Latvian</_description> -+ -+ <shortDescription>lv</shortDescription> -+ <description>Latvian</description> - <languageList> - <iso639Id>lav</iso639Id> - </languageList> -@@ -3811,37 +3811,37 @@ - <variant> - <configItem> - <name>apostrophe</name> -- <_description>Latvian (apostrophe variant)</_description> -+ <description>Latvian (apostrophe variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>tilde</name> -- <_description>Latvian (tilde variant)</_description> -+ <description>Latvian (tilde variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>fkey</name> -- <_description>Latvian (F variant)</_description> -+ <description>Latvian (F variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>modern</name> -- <_description>Latvian (modern)</_description> -+ <description>Latvian (modern)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ergonomic</name> -- <_description>Latvian (ergonomic, ŪGJRMV)</_description> -+ <description>Latvian (ergonomic, ŪGJRMV)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>adapted</name> -- <_description>Latvian (adapted)</_description> -+ <description>Latvian (adapted)</description> - </configItem> - </variant> - </variantList> -@@ -3849,9 +3849,9 @@ - <layout> - <configItem> - <name>mao</name> -- <!-- Keyboard indicator for Maori layouts --> -- <_shortDescription>mi</_shortDescription> -- <_description>Maori</_description> -+ -+ <shortDescription>mi</shortDescription> -+ <description>Maori</description> - <languageList> - <iso639Id>mao</iso639Id> - </languageList> -@@ -3861,9 +3861,9 @@ - <layout> - <configItem> - <name>me</name> -- <!-- Keyboard indicator for Montenegrin layouts --> -- <_shortDescription>sr</_shortDescription> -- <_description>Montenegrin</_description> -+ -+ <shortDescription>sr</shortDescription> -+ <description>Montenegrin</description> - <languageList> - <iso639Id>srp</iso639Id> - </languageList> -@@ -3872,43 +3872,43 @@ - <variant> - <configItem> - <name>cyrillic</name> -- <_description>Montenegrin (Cyrillic)</_description> -+ <description>Montenegrin (Cyrillic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>cyrillicyz</name> -- <_description>Montenegrin (Cyrillic, Z and ZHE swapped)</_description> -+ <description>Montenegrin (Cyrillic, Z and ZHE swapped)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinunicode</name> -- <_description>Montenegrin (Latin Unicode)</_description> -+ <description>Montenegrin (Latin Unicode)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinyz</name> -- <_description>Montenegrin (Latin qwerty)</_description> -+ <description>Montenegrin (Latin qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinunicodeyz</name> -- <_description>Montenegrin (Latin Unicode qwerty)</_description> -+ <description>Montenegrin (Latin Unicode qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>cyrillicalternatequotes</name> -- <_description>Montenegrin (Cyrillic with guillemets)</_description> -+ <description>Montenegrin (Cyrillic with guillemets)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinalternatequotes</name> -- <_description>Montenegrin (Latin with guillemets)</_description> -+ <description>Montenegrin (Latin with guillemets)</description> - </configItem> - </variant> - </variantList> -@@ -3916,9 +3916,9 @@ - <layout> - <configItem> - <name>mk</name> -- <!-- Keyboard indicator for Macedonian layouts --> -- <_shortDescription>mk</_shortDescription> -- <_description>Macedonian</_description> -+ -+ <shortDescription>mk</shortDescription> -+ <description>Macedonian</description> - <languageList> - <iso639Id>mkd</iso639Id> - </languageList> -@@ -3927,7 +3927,7 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Macedonian (eliminate dead keys)</_description> -+ <description>Macedonian (eliminate dead keys)</description> - </configItem> - </variant> - </variantList> -@@ -3935,9 +3935,9 @@ - <layout> - <configItem> - <name>mt</name> -- <!-- Keyboard indicator for Maltese layouts --> -- <_shortDescription>mt</_shortDescription> -- <_description>Maltese</_description> -+ -+ <shortDescription>mt</shortDescription> -+ <description>Maltese</description> - <languageList> - <iso639Id>mlt</iso639Id> - </languageList> -@@ -3946,7 +3946,7 @@ - <variant> - <configItem> - <name>us</name> -- <_description>Maltese (with US layout)</_description> -+ <description>Maltese (with US layout)</description> - </configItem> - </variant> - </variantList> -@@ -3954,9 +3954,9 @@ - <layout> - <configItem> - <name>mn</name> -- <!-- Keyboard indicator for Mongolian layouts --> -- <_shortDescription>mn</_shortDescription> -- <_description>Mongolian</_description> -+ -+ <shortDescription>mn</shortDescription> -+ <description>Mongolian</description> - <languageList> - <iso639Id>mon</iso639Id> - </languageList> -@@ -3966,9 +3966,9 @@ - <layout> - <configItem> - <name>no</name> -- <!-- Keyboard indicator for Norwegian layouts --> -- <_shortDescription>no</_shortDescription> -- <_description>Norwegian</_description> -+ -+ <shortDescription>no</shortDescription> -+ <description>Norwegian</description> - <languageList> - <iso639Id>nor</iso639Id> - <iso639Id>nob</iso639Id> -@@ -3979,19 +3979,19 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Norwegian (eliminate dead keys)</_description> -+ <description>Norwegian (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Norwegian (Dvorak)</_description> -+ <description>Norwegian (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>smi</name> -- <_description>Northern Saami (Norway)</_description> -+ <description>Northern Saami (Norway)</description> - <languageList> - <iso639Id>sme</iso639Id> - </languageList> -@@ -4000,7 +4000,7 @@ - <variant> - <configItem> - <name>smi_nodeadkeys</name> -- <_description>Northern Saami (Norway, eliminate dead keys)</_description> -+ <description>Northern Saami (Norway, eliminate dead keys)</description> - <languageList> - <iso639Id>sme</iso639Id> - </languageList> -@@ -4009,19 +4009,19 @@ - <variant> - <configItem> - <name>mac</name> -- <_description>Norwegian (Macintosh)</_description> -+ <description>Norwegian (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac_nodeadkeys</name> -- <_description>Norwegian (Macintosh, eliminate dead keys)</_description> -+ <description>Norwegian (Macintosh, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>colemak</name> -- <_description>Norwegian (Colemak)</_description> -+ <description>Norwegian (Colemak)</description> - </configItem> - </variant> - </variantList> -@@ -4029,9 +4029,9 @@ - <layout> - <configItem> - <name>pl</name> -- <!-- Keyboard indicator for Polish layouts --> -- <_shortDescription>pl</_shortDescription> -- <_description>Polish</_description> -+ -+ <shortDescription>pl</shortDescription> -+ <description>Polish</description> - <languageList> - <iso639Id>pol</iso639Id> - </languageList> -@@ -4040,37 +4040,37 @@ - <variant> - <configItem> - <name>legacy</name> -- <_description>Polish (legacy)</_description> -+ <description>Polish (legacy)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwertz</name> -- <_description>Polish (qwertz)</_description> -+ <description>Polish (qwertz)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Polish (Dvorak)</_description> -+ <description>Polish (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak_quotes</name> -- <_description>Polish (Dvorak, Polish quotes on quotemark key)</_description> -+ <description>Polish (Dvorak, Polish quotes on quotemark key)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak_altquotes</name> -- <_description>Polish (Dvorak, Polish quotes on key 1)</_description> -+ <description>Polish (Dvorak, Polish quotes on key 1)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>csb</name> -- <_description>Kashubian</_description> -+ <description>Kashubian</description> - <languageList> - <iso639Id>csb</iso639Id> - </languageList> -@@ -4086,9 +4086,9 @@ - <variant> - <configItem> - <name>ru_phonetic_dvorak</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (Poland, phonetic Dvorak)</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian (Poland, phonetic Dvorak)</description> - <languageList> - <iso639Id>rus</iso639Id> - </languageList> -@@ -4097,7 +4097,7 @@ - <variant> - <configItem> - <name>dvp</name> -- <_description>Polish (programmer Dvorak)</_description> -+ <description>Polish (programmer Dvorak)</description> - </configItem> - </variant> - </variantList> -@@ -4105,9 +4105,9 @@ - <layout> - <configItem> - <name>pt</name> -- <!-- Keyboard indicator for Portuguese layouts --> -- <_shortDescription>pt</_shortDescription> -- <_description>Portuguese</_description> -+ -+ <shortDescription>pt</shortDescription> -+ <description>Portuguese</description> - <languageList> - <iso639Id>por</iso639Id> - </languageList> -@@ -4116,49 +4116,49 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Portuguese (eliminate dead keys)</_description> -+ <description>Portuguese (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>Portuguese (Sun dead keys)</_description> -+ <description>Portuguese (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Portuguese (Macintosh)</_description> -+ <description>Portuguese (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac_nodeadkeys</name> -- <_description>Portuguese (Macintosh, eliminate dead keys)</_description> -+ <description>Portuguese (Macintosh, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac_sundeadkeys</name> -- <_description>Portuguese (Macintosh, Sun dead keys)</_description> -+ <description>Portuguese (Macintosh, Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nativo</name> -- <_description>Portuguese (Nativo)</_description> -+ <description>Portuguese (Nativo)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nativo-us</name> -- <_description>Portuguese (Nativo for US keyboards)</_description> -+ <description>Portuguese (Nativo for US keyboards)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nativo-epo</name> -- <_description>Esperanto (Portugal, Nativo)</_description> -+ <description>Esperanto (Portugal, Nativo)</description> - <languageList> - <iso639Id>epo</iso639Id> - </languageList> -@@ -4169,9 +4169,9 @@ - <layout> - <configItem> - <name>ro</name> -- <!-- Keyboard indicator for Romanian layouts --> -- <_shortDescription>ro</_shortDescription> -- <_description>Romanian</_description> -+ -+ <shortDescription>ro</shortDescription> -+ <description>Romanian</description> - <languageList> - <iso639Id>rum</iso639Id> - </languageList> -@@ -4180,25 +4180,25 @@ - <variant> - <configItem> - <name>cedilla</name> -- <_description>Romanian (cedilla)</_description> -+ <description>Romanian (cedilla)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>std</name> -- <_description>Romanian (standard)</_description> -+ <description>Romanian (standard)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>std_cedilla</name> -- <_description>Romanian (standard cedilla)</_description> -+ <description>Romanian (standard cedilla)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>winkeys</name> -- <_description>Romanian (WinKeys)</_description> -+ <description>Romanian (WinKeys)</description> - </configItem> - </variant> - </variantList> -@@ -4206,9 +4206,9 @@ - <layout> - <configItem> - <name>ru</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian</description> - <languageList> - <iso639Id>rus</iso639Id> - </languageList> -@@ -4217,37 +4217,37 @@ - <variant> - <configItem> - <name>phonetic</name> -- <_description>Russian (phonetic)</_description> -+ <description>Russian (phonetic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>phonetic_winkeys</name> -- <_description>Russian (phonetic WinKeys)</_description> -+ <description>Russian (phonetic WinKeys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>typewriter</name> -- <_description>Russian (typewriter)</_description> -+ <description>Russian (typewriter)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>legacy</name> -- <_description>Russian (legacy)</_description> -+ <description>Russian (legacy)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>typewriter-legacy</name> -- <_description>Russian (typewriter, legacy)</_description> -+ <description>Russian (typewriter, legacy)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>tt</name> -- <_description>Tatar</_description> -+ <description>Tatar</description> - <languageList> - <iso639Id>tat</iso639Id> - </languageList> -@@ -4256,7 +4256,7 @@ - <variant> - <configItem> - <name>os_legacy</name> -- <_description>Ossetian (legacy)</_description> -+ <description>Ossetian (legacy)</description> - <languageList> - <iso639Id>oss</iso639Id> - </languageList> -@@ -4265,7 +4265,7 @@ - <variant> - <configItem> - <name>os_winkeys</name> -- <_description>Ossetian (WinKeys)</_description> -+ <description>Ossetian (WinKeys)</description> - <languageList> - <iso639Id>oss</iso639Id> - </languageList> -@@ -4274,7 +4274,7 @@ - <variant> - <configItem> - <name>cv</name> -- <_description>Chuvash</_description> -+ <description>Chuvash</description> - <languageList> - <iso639Id>chv</iso639Id> - </languageList> -@@ -4283,7 +4283,7 @@ - <variant> - <configItem> - <name>cv_latin</name> -- <_description>Chuvash (Latin)</_description> -+ <description>Chuvash (Latin)</description> - <languageList> - <iso639Id>chv</iso639Id> - </languageList> -@@ -4292,7 +4292,7 @@ - <variant> - <configItem> - <name>udm</name> -- <_description>Udmurt</_description> -+ <description>Udmurt</description> - <languageList> - <iso639Id>udm</iso639Id> - </languageList> -@@ -4301,7 +4301,7 @@ - <variant> - <configItem> - <name>kom</name> -- <_description>Komi</_description> -+ <description>Komi</description> - <languageList> - <iso639Id>kom</iso639Id> - </languageList> -@@ -4310,7 +4310,7 @@ - <variant> - <configItem> - <name>sah</name> -- <_description>Yakut</_description> -+ <description>Yakut</description> - <languageList> - <iso639Id>sah</iso639Id> - </languageList> -@@ -4319,7 +4319,7 @@ - <variant> - <configItem> - <name>xal</name> -- <_description>Kalmyk</_description> -+ <description>Kalmyk</description> - <languageList> - <iso639Id>xal</iso639Id> - </languageList> -@@ -4328,19 +4328,19 @@ - <variant> - <configItem> - <name>dos</name> -- <_description>Russian (DOS)</_description> -+ <description>Russian (DOS)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Russian (Macintosh)</_description> -+ <description>Russian (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>srp</name> -- <_description>Serbian (Russia)</_description> -+ <description>Serbian (Russia)</description> - <languageList><iso639Id>rus</iso639Id> - <iso639Id>srp</iso639Id></languageList> - </configItem> -@@ -4348,7 +4348,7 @@ - <variant> - <configItem> - <name>bak</name> -- <_description>Bashkirian</_description> -+ <description>Bashkirian</description> - <languageList> - <iso639Id>bak</iso639Id> - </languageList> -@@ -4357,7 +4357,7 @@ - <variant> - <configItem> - <name>chm</name> -- <_description>Mari</_description> -+ <description>Mari</description> - <languageList> - <iso639Id>chm</iso639Id> - </languageList> -@@ -4368,9 +4368,9 @@ - <layout> - <configItem> - <name>rs</name> -- <!-- Keyboard indicator for Serbian layouts --> -- <_shortDescription>sr</_shortDescription> -- <_description>Serbian</_description> -+ -+ <shortDescription>sr</shortDescription> -+ <description>Serbian</description> - <languageList> - <iso639Id>srp</iso639Id> - </languageList> -@@ -4379,49 +4379,49 @@ - <variant> - <configItem> - <name>yz</name> -- <_description>Serbian (Cyrillic, Z and ZHE swapped)</_description> -+ <description>Serbian (Cyrillic, Z and ZHE swapped)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latin</name> -- <_description>Serbian (Latin)</_description> -+ <description>Serbian (Latin)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinunicode</name> -- <_description>Serbian (Latin Unicode)</_description> -+ <description>Serbian (Latin Unicode)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinyz</name> -- <_description>Serbian (Latin qwerty)</_description> -+ <description>Serbian (Latin qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinunicodeyz</name> -- <_description>Serbian (Latin Unicode qwerty)</_description> -+ <description>Serbian (Latin Unicode qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>alternatequotes</name> -- <_description>Serbian (Cyrillic with guillemets)</_description> -+ <description>Serbian (Cyrillic with guillemets)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinalternatequotes</name> -- <_description>Serbian (Latin with guillemets)</_description> -+ <description>Serbian (Latin with guillemets)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>rue</name> -- <_description>Pannonian Rusyn</_description> -+ <description>Pannonian Rusyn</description> - <languageList> - <iso639Id>rue</iso639Id> - </languageList> -@@ -4432,9 +4432,9 @@ - <layout> - <configItem> - <name>si</name> -- <!-- Keyboard indicator for Slovenian layouts --> -- <_shortDescription>sl</_shortDescription> -- <_description>Slovenian</_description> -+ -+ <shortDescription>sl</shortDescription> -+ <description>Slovenian</description> - <languageList> - <iso639Id>slv</iso639Id> - </languageList> -@@ -4443,13 +4443,13 @@ - <variant> - <configItem> - <name>alternatequotes</name> -- <_description>Slovenian (use guillemets for quotes)</_description> -+ <description>Slovenian (use guillemets for quotes)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>us</name> -- <_description>Slovenian (US keyboard with Slovenian letters)</_description> -+ <description>Slovenian (US keyboard with Slovenian letters)</description> - </configItem> - </variant> - </variantList> -@@ -4457,9 +4457,9 @@ - <layout> - <configItem> - <name>sk</name> -- <!-- Keyboard indicator for Slovak layouts --> -- <_shortDescription>sk</_shortDescription> -- <_description>Slovak</_description> -+ -+ <shortDescription>sk</shortDescription> -+ <description>Slovak</description> - <languageList> - <iso639Id>slo</iso639Id> - </languageList> -@@ -4468,19 +4468,19 @@ - <variant> - <configItem> - <name>bksl</name> -- <_description>Slovak (extended Backslash)</_description> -+ <description>Slovak (extended Backslash)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty</name> -- <_description>Slovak (qwerty)</_description> -+ <description>Slovak (qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty_bksl</name> -- <_description>Slovak (qwerty, extended Backslash)</_description> -+ <description>Slovak (qwerty, extended Backslash)</description> - </configItem> - </variant> - </variantList> -@@ -4488,9 +4488,9 @@ - <layout> - <configItem> - <name>es</name> -- <!-- Keyboard indicator for Spanish layouts --> -- <_shortDescription>es</_shortDescription> -- <_description>Spanish</_description> -+ -+ <shortDescription>es</shortDescription> -+ <description>Spanish</description> - <languageList> - <iso639Id>spa</iso639Id> - </languageList> -@@ -4499,31 +4499,31 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Spanish (eliminate dead keys)</_description> -+ <description>Spanish (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>deadtilde</name> -- <_description>Spanish (include dead tilde)</_description> -+ <description>Spanish (include dead tilde)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>Spanish (Sun dead keys)</_description> -+ <description>Spanish (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Spanish (Dvorak)</_description> -+ <description>Spanish (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ast</name> -- <_description>Asturian (Spain, with bottom-dot H and bottom-dot L)</_description> -+ <description>Asturian (Spain, with bottom-dot H and bottom-dot L)</description> - <languageList> - <iso639Id>ast</iso639Id> - </languageList> -@@ -4532,7 +4532,7 @@ - <variant> - <configItem> - <name>cat</name> -- <_description>Catalan (Spain, with middle-dot L)</_description> -+ <description>Catalan (Spain, with middle-dot L)</description> - <languageList> - <iso639Id>cat</iso639Id> - </languageList> -@@ -4541,7 +4541,7 @@ - <variant> - <configItem> - <name>mac</name> -- <_description>Spanish (Macintosh)</_description> -+ <description>Spanish (Macintosh)</description> - </configItem> - </variant> - </variantList> -@@ -4549,9 +4549,9 @@ - <layout> - <configItem> - <name>se</name> -- <!-- Keyboard indicator for Swedish layouts --> -- <_shortDescription>sv</_shortDescription> -- <_description>Swedish</_description> -+ -+ <shortDescription>sv</shortDescription> -+ <description>Swedish</description> - <languageList> - <iso639Id>swe</iso639Id> - </languageList> -@@ -4560,21 +4560,21 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Swedish (eliminate dead keys)</_description> -+ <description>Swedish (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Swedish (Dvorak)</_description> -+ <description>Swedish (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>rus</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (Sweden, phonetic)</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian (Sweden, phonetic)</description> - <languageList> - <iso639Id>rus</iso639Id> - </languageList> -@@ -4583,9 +4583,9 @@ - <variant> - <configItem> - <name>rus_nodeadkeys</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (Sweden, phonetic, eliminate dead keys)</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian (Sweden, phonetic, eliminate dead keys)</description> - <languageList> - <iso639Id>rus</iso639Id> - </languageList> -@@ -4594,7 +4594,7 @@ - <variant> - <configItem> - <name>smi</name> -- <_description>Northern Saami (Sweden)</_description> -+ <description>Northern Saami (Sweden)</description> - <languageList> - <iso639Id>sme</iso639Id> - </languageList> -@@ -4603,19 +4603,19 @@ - <variant> - <configItem> - <name>mac</name> -- <_description>Swedish (Macintosh)</_description> -+ <description>Swedish (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>svdvorak</name> -- <_description>Swedish (Svdvorak)</_description> -+ <description>Swedish (Svdvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>swl</name> -- <_description>Swedish Sign Language</_description> -+ <description>Swedish Sign Language</description> - <languageList><iso639Id>swl</iso639Id></languageList> - </configItem> - </variant> -@@ -4624,9 +4624,9 @@ - <layout> - <configItem> - <name>ch</name> -- <!-- Keyboard indicator for German layouts --> -- <_shortDescription>de</_shortDescription> -- <_description>German (Switzerland)</_description> -+ -+ <shortDescription>de</shortDescription> -+ <description>German (Switzerland)</description> - <languageList><iso639Id>ger</iso639Id> - <iso639Id>gsw</iso639Id></languageList> - </configItem> -@@ -4634,31 +4634,31 @@ - <variant> - <configItem> - <name>legacy</name> -- <_description>German (Switzerland, legacy)</_description> -+ <description>German (Switzerland, legacy)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>de_nodeadkeys</name> -- <!-- Keyboard indicator for German layouts --> -- <_shortDescription>de</_shortDescription> -- <_description>German (Switzerland, eliminate dead keys)</_description> -+ -+ <shortDescription>de</shortDescription> -+ <description>German (Switzerland, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>de_sundeadkeys</name> -- <!-- Keyboard indicator for German layouts --> -- <_shortDescription>de</_shortDescription> -- <_description>German (Switzerland, Sun dead keys)</_description> -+ -+ <shortDescription>de</shortDescription> -+ <description>German (Switzerland, Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>fr</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Switzerland)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Switzerland)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -4667,9 +4667,9 @@ - <variant> - <configItem> - <name>fr_nodeadkeys</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Switzerland, eliminate dead keys)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Switzerland, eliminate dead keys)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -4678,9 +4678,9 @@ - <variant> - <configItem> - <name>fr_sundeadkeys</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Switzerland, Sun dead keys)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Switzerland, Sun dead keys)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -4689,9 +4689,9 @@ - <variant> - <configItem> - <name>fr_mac</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Switzerland, Macintosh)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Switzerland, Macintosh)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -4700,9 +4700,9 @@ - <variant> - <configItem> - <name>de_mac</name> -- <!-- Keyboard indicator for German layouts --> -- <_shortDescription>de</_shortDescription> -- <_description>German (Switzerland, Macintosh)</_description> -+ -+ <shortDescription>de</shortDescription> -+ <description>German (Switzerland, Macintosh)</description> - </configItem> - </variant> - </variantList> -@@ -4710,9 +4710,9 @@ - <layout> - <configItem> - <name>sy</name> -- <!-- Keyboard indicator for Arabic layouts --> -- <_shortDescription>ar</_shortDescription> -- <_description>Arabic (Syria)</_description> -+ -+ <shortDescription>ar</shortDescription> -+ <description>Arabic (Syria)</description> - <languageList> - <iso639Id>syr</iso639Id> - </languageList> -@@ -4721,25 +4721,25 @@ - <variant> - <configItem> - <name>syc</name> -- <!-- Keyboard indicator for Syriac layouts --> -- <_shortDescription>syc</_shortDescription> -- <_description>Syriac</_description> -+ -+ <shortDescription>syc</shortDescription> -+ <description>Syriac</description> - </configItem> - </variant> - <variant> - <configItem> - <name>syc_phonetic</name> -- <!-- Keyboard indicator for Syriac layouts --> -- <_shortDescription>syc</_shortDescription> -- <_description>Syriac (phonetic)</_description> -+ -+ <shortDescription>syc</shortDescription> -+ <description>Syriac (phonetic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ku</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Syria, Latin Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Syria, Latin Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -4748,9 +4748,9 @@ - <variant> - <configItem> - <name>ku_f</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Syria, F)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Syria, F)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -4759,9 +4759,9 @@ - <variant> - <configItem> - <name>ku_alt</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Syria, Latin Alt-Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Syria, Latin Alt-Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -4772,9 +4772,9 @@ - <layout> - <configItem> - <name>tj</name> -- <!-- Keyboard indicator for Tajik layouts --> -- <_shortDescription>tg</_shortDescription> -- <_description>Tajik</_description> -+ -+ <shortDescription>tg</shortDescription> -+ <description>Tajik</description> - <languageList> - <iso639Id>tgk</iso639Id> - </languageList> -@@ -4783,7 +4783,7 @@ - <variant> - <configItem> - <name>legacy</name> -- <_description>Tajik (legacy)</_description> -+ <description>Tajik (legacy)</description> - </configItem> - </variant> - </variantList> -@@ -4791,9 +4791,9 @@ - <layout> - <configItem> - <name>lk</name> -- <!-- Keyboard indicator for Sinhala layouts --> -- <_shortDescription>si</_shortDescription> -- <_description>Sinhala (phonetic)</_description> -+ -+ <shortDescription>si</shortDescription> -+ <description>Sinhala (phonetic)</description> - <languageList> - <iso639Id>sin</iso639Id> - </languageList> -@@ -4802,9 +4802,9 @@ - <variant> - <configItem> - <name>tam_unicode</name> -- <!-- Keyboard indicator for Tamil layouts --> -- <_shortDescription>ta</_shortDescription> -- <_description>Tamil (Sri Lanka, Unicode)</_description> -+ -+ <shortDescription>ta</shortDescription> -+ <description>Tamil (Sri Lanka, Unicode)</description> - <languageList> - <iso639Id>tam</iso639Id> - </languageList> -@@ -4813,7 +4813,7 @@ - <variant> - <configItem> - <name>tam_TAB</name> -- <_description>Tamil (Sri Lanka, TAB Typewriter)</_description> -+ <description>Tamil (Sri Lanka, TAB Typewriter)</description> - <languageList> - <iso639Id>tam</iso639Id> - </languageList> -@@ -4824,9 +4824,9 @@ - <layout> - <configItem> - <name>th</name> -- <!-- Keyboard indicator for Thai layouts --> -- <_shortDescription>th</_shortDescription> -- <_description>Thai</_description> -+ -+ <shortDescription>th</shortDescription> -+ <description>Thai</description> - <languageList> - <iso639Id>tha</iso639Id> - </languageList> -@@ -4835,13 +4835,13 @@ - <variant> - <configItem> - <name>tis</name> -- <_description>Thai (TIS-820.2538)</_description> -+ <description>Thai (TIS-820.2538)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>pat</name> -- <_description>Thai (Pattachote)</_description> -+ <description>Thai (Pattachote)</description> - </configItem> - </variant> - </variantList> -@@ -4849,9 +4849,9 @@ - <layout> - <configItem> - <name>tr</name> -- <!-- Keyboard indicator for Turkish layouts --> -- <_shortDescription>tr</_shortDescription> -- <_description>Turkish</_description> -+ -+ <shortDescription>tr</shortDescription> -+ <description>Turkish</description> - <languageList> - <iso639Id>tur</iso639Id> - </languageList> -@@ -4860,27 +4860,27 @@ - <variant> - <configItem> - <name>f</name> -- <_description>Turkish (F)</_description> -+ <description>Turkish (F)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>alt</name> -- <_description>Turkish (Alt-Q)</_description> -+ <description>Turkish (Alt-Q)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>Turkish (Sun dead keys)</_description> -+ <description>Turkish (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ku</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Turkey, Latin Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Turkey, Latin Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -4889,9 +4889,9 @@ - <variant> - <configItem> - <name>ku_f</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Turkey, F)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Turkey, F)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -4900,9 +4900,9 @@ - <variant> - <configItem> - <name>ku_alt</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Turkey, Latin Alt-Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Turkey, Latin Alt-Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -4911,15 +4911,15 @@ - <variant> - <configItem> - <name>intl</name> -- <_description>Turkish (international with dead keys)</_description> -+ <description>Turkish (international with dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>crh</name> -- <!-- Keyboard indicator for Crimean Tatar layouts --> -- <_shortDescription>crh</_shortDescription> -- <_description>Crimean Tatar (Turkish Q)</_description> -+ -+ <shortDescription>crh</shortDescription> -+ <description>Crimean Tatar (Turkish Q)</description> - <languageList> - <iso639Id>crh</iso639Id> - </languageList> -@@ -4928,9 +4928,9 @@ - <variant> - <configItem> - <name>crh_f</name> -- <!-- Keyboard indicator for Crimean Tatar layouts --> -- <_shortDescription>crh</_shortDescription> -- <_description>Crimean Tatar (Turkish F)</_description> -+ -+ <shortDescription>crh</shortDescription> -+ <description>Crimean Tatar (Turkish F)</description> - <languageList> - <iso639Id>crh</iso639Id> - </languageList> -@@ -4939,9 +4939,9 @@ - <variant> - <configItem> - <name>crh_alt</name> -- <!-- Keyboard indicator for Crimean Tatar layouts --> -- <_shortDescription>crh</_shortDescription> -- <_description>Crimean Tatar (Turkish Alt-Q)</_description> -+ -+ <shortDescription>crh</shortDescription> -+ <description>Crimean Tatar (Turkish Alt-Q)</description> - <languageList> - <iso639Id>crh</iso639Id> - </languageList> -@@ -4952,9 +4952,9 @@ - <layout> - <configItem> - <name>tw</name> -- <!-- Keyboard indicator for Taiwanese layouts --> -- <_shortDescription>zh</_shortDescription> -- <_description>Taiwanese</_description> -+ -+ <shortDescription>zh</shortDescription> -+ <description>Taiwanese</description> - <languageList> - <iso639Id>fox</iso639Id> - </languageList> -@@ -4963,7 +4963,7 @@ - <variant> - <configItem> - <name>indigenous</name> -- <_description>Taiwanese (indigenous)</_description> -+ <description>Taiwanese (indigenous)</description> - <languageList> - <iso639Id>ami</iso639Id> - <iso639Id>tay</iso639Id> -@@ -4987,9 +4987,9 @@ - <variant> - <configItem> - <name>saisiyat</name> -- <!-- Keyboard indicator for Saisiyat layouts --> -- <_shortDescription>xsy</_shortDescription> -- <_description>Saisiyat (Taiwan)</_description> -+ -+ <shortDescription>xsy</shortDescription> -+ <description>Saisiyat (Taiwan)</description> - <languageList> - <iso639Id>xsy</iso639Id> - </languageList> -@@ -5000,9 +5000,9 @@ - <layout> - <configItem> - <name>ua</name> -- <!-- Keyboard indicator for Ukranian layouts --> -- <_shortDescription>uk</_shortDescription> -- <_description>Ukrainian</_description> -+ -+ <shortDescription>uk</shortDescription> -+ <description>Ukrainian</description> - <languageList> - <iso639Id>ukr</iso639Id> - </languageList> -@@ -5011,43 +5011,43 @@ - <variant> - <configItem> - <name>phonetic</name> -- <_description>Ukrainian (phonetic)</_description> -+ <description>Ukrainian (phonetic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>typewriter</name> -- <_description>Ukrainian (typewriter)</_description> -+ <description>Ukrainian (typewriter)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>winkeys</name> -- <_description>Ukrainian (WinKeys)</_description> -+ <description>Ukrainian (WinKeys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>legacy</name> -- <_description>Ukrainian (legacy)</_description> -+ <description>Ukrainian (legacy)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>rstu</name> -- <_description>Ukrainian (standard RSTU)</_description> -+ <description>Ukrainian (standard RSTU)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>rstu_ru</name> -- <_description>Russian (Ukraine, standard RSTU)</_description> -+ <description>Russian (Ukraine, standard RSTU)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>homophonic</name> -- <_description>Ukrainian (homophonic)</_description> -+ <description>Ukrainian (homophonic)</description> - </configItem> - </variant> - </variantList> -@@ -5055,9 +5055,9 @@ - <layout> - <configItem> - <name>gb</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (UK)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (UK)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -5066,43 +5066,43 @@ - <variant> - <configItem> - <name>extd</name> -- <_description>English (UK, extended WinKeys)</_description> -+ <description>English (UK, extended WinKeys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>intl</name> -- <_description>English (UK, international with dead keys)</_description> -+ <description>English (UK, international with dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>English (UK, Dvorak)</_description> -+ <description>English (UK, Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorakukp</name> -- <_description>English (UK, Dvorak with UK punctuation)</_description> -+ <description>English (UK, Dvorak with UK punctuation)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>English (UK, Macintosh)</_description> -+ <description>English (UK, Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac_intl</name> -- <_description>English (UK, Macintosh international)</_description> -+ <description>English (UK, Macintosh international)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>colemak</name> -- <_description>English (UK, Colemak)</_description> -+ <description>English (UK, Colemak)</description> - </configItem> - </variant> - </variantList> -@@ -5110,9 +5110,9 @@ - <layout> - <configItem> - <name>uz</name> -- <!-- Keyboard indicator for Uzbek layouts --> -- <_shortDescription>uz</_shortDescription> -- <_description>Uzbek</_description> -+ -+ <shortDescription>uz</shortDescription> -+ <description>Uzbek</description> - <languageList> - <iso639Id>uzb</iso639Id> - </languageList> -@@ -5121,7 +5121,7 @@ - <variant> - <configItem> - <name>latin</name> -- <_description>Uzbek (Latin)</_description> -+ <description>Uzbek (Latin)</description> - </configItem> - </variant> - </variantList> -@@ -5129,9 +5129,9 @@ - <layout> - <configItem> - <name>vn</name> -- <!-- Keyboard indicator for Vietnamese layouts --> -- <_shortDescription>vi</_shortDescription> -- <_description>Vietnamese</_description> -+ -+ <shortDescription>vi</shortDescription> -+ <description>Vietnamese</description> - <languageList> - <iso639Id>vie</iso639Id> - </languageList> -@@ -5141,9 +5141,9 @@ - <layout> - <configItem> - <name>kr</name> -- <!-- Keyboard indicator for Korean layouts --> -- <_shortDescription>ko</_shortDescription> -- <_description>Korean</_description> -+ -+ <shortDescription>ko</shortDescription> -+ <description>Korean</description> - <languageList> - <iso639Id>kor</iso639Id> - </languageList> -@@ -5152,7 +5152,7 @@ - <variant> - <configItem> - <name>kr104</name> -- <_description>Korean (101/104 key compatible)</_description> -+ <description>Korean (101/104 key compatible)</description> - </configItem> - </variant> - </variantList> -@@ -5160,9 +5160,9 @@ - <layout> - <configItem> - <name>nec_vndr/jp</name> -- <!-- Keyboard indicator for Japanese layouts --> -- <_shortDescription>ja</_shortDescription> -- <_description>Japanese (PC-98xx Series)</_description> -+ -+ <shortDescription>ja</shortDescription> -+ <description>Japanese (PC-98xx Series)</description> - <countryList> - <iso3166Id>JP</iso3166Id> - </countryList> -@@ -5175,9 +5175,9 @@ - <layout> - <configItem> - <name>ie</name> -- <!-- Keyboard indicator for Irish layouts --> -- <_shortDescription>ie</_shortDescription> -- <_description>Irish</_description> -+ -+ <shortDescription>ie</shortDescription> -+ <description>Irish</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -5186,7 +5186,7 @@ - <variant> - <configItem> - <name>CloGaelach</name> -- <_description>CloGaelach</_description> -+ <description>CloGaelach</description> - <languageList> - <iso639Id>gle</iso639Id> - </languageList> -@@ -5195,13 +5195,13 @@ - <variant> - <configItem> - <name>UnicodeExpert</name> -- <_description>Irish (UnicodeExpert)</_description> -+ <description>Irish (UnicodeExpert)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ogam</name> -- <_description>Ogham</_description> -+ <description>Ogham</description> - <languageList> - <iso639Id>sga</iso639Id> - </languageList> -@@ -5210,7 +5210,7 @@ - <variant> - <configItem> - <name>ogam_is434</name> -- <_description>Ogham (IS434)</_description> -+ <description>Ogham (IS434)</description> - <languageList> - <iso639Id>sga</iso639Id> - </languageList> -@@ -5221,9 +5221,9 @@ - <layout> - <configItem> - <name>pk</name> -- <!-- Keyboard indicator for Urdu layouts --> -- <_shortDescription>ur</_shortDescription> -- <_description>Urdu (Pakistan)</_description> -+ -+ <shortDescription>ur</shortDescription> -+ <description>Urdu (Pakistan)</description> - <languageList> - <iso639Id>urd</iso639Id> - </languageList> -@@ -5232,20 +5232,20 @@ - <variant> - <configItem> - <name>urd-crulp</name> -- <_description>Urdu (Pakistan, CRULP)</_description> -+ <description>Urdu (Pakistan, CRULP)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>urd-nla</name> -- <_description>Urdu (Pakistan, NLA)</_description> -+ <description>Urdu (Pakistan, NLA)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ara</name> -- <_shortDescription>ar</_shortDescription> -- <_description>Arabic (Pakistan)</_description> -+ <shortDescription>ar</shortDescription> -+ <description>Arabic (Pakistan)</description> - <languageList> - <iso639Id>ara</iso639Id> - </languageList> -@@ -5254,9 +5254,9 @@ - <variant> - <configItem> - <name>snd</name> -- <!-- Keyboard indicator for Sindhi layouts --> -- <_shortDescription>sd</_shortDescription> -- <_description>Sindhi</_description> -+ -+ <shortDescription>sd</shortDescription> -+ <description>Sindhi</description> - <languageList> - <iso639Id>snd</iso639Id> - </languageList> -@@ -5267,9 +5267,9 @@ - <layout> - <configItem> - <name>mv</name> -- <!-- Keyboard indicator for Dhivehi layouts --> -- <_shortDescription>dv</_shortDescription> -- <_description>Dhivehi</_description> -+ -+ <shortDescription>dv</shortDescription> -+ <description>Dhivehi</description> - <languageList> - <iso639Id>div</iso639Id> - </languageList> -@@ -5279,9 +5279,9 @@ - <layout> - <configItem> - <name>za</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (South Africa)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (South Africa)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -5290,9 +5290,9 @@ - <layout> - <configItem> - <name>epo</name> -- <!-- Keyboard indicator for Esperanto layouts --> -- <_shortDescription>eo</_shortDescription> -- <_description>Esperanto</_description> -+ -+ <shortDescription>eo</shortDescription> -+ <description>Esperanto</description> - <languageList> - <iso639Id>epo</iso639Id> - </languageList> -@@ -5301,7 +5301,7 @@ - <variant> - <configItem> - <name>legacy</name> -- <_description>Esperanto (displaced semicolon and quote, obsolete)</_description> -+ <description>Esperanto (displaced semicolon and quote, obsolete)</description> - </configItem> - </variant> - </variantList> -@@ -5309,9 +5309,9 @@ - <layout> - <configItem> - <name>np</name> -- <!-- Keyboard indicator for Nepali layouts --> -- <_shortDescription>ne</_shortDescription> -- <_description>Nepali</_description> -+ -+ <shortDescription>ne</shortDescription> -+ <description>Nepali</description> - <languageList> - <iso639Id>nep</iso639Id> - </languageList> -@@ -5320,9 +5320,9 @@ - <layout> - <configItem> - <name>ng</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (Nigeria)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (Nigeria)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -5331,9 +5331,9 @@ - <variant> - <configItem> - <name>igbo</name> -- <!-- Keyboard indicator for Igbo layouts --> -- <_shortDescription>ig</_shortDescription> -- <_description>Igbo</_description> -+ -+ <shortDescription>ig</shortDescription> -+ <description>Igbo</description> - <languageList> - <iso639Id>ibo</iso639Id> - </languageList> -@@ -5342,9 +5342,9 @@ - <variant> - <configItem> - <name>yoruba</name> -- <!-- Keyboard indicator for Yoruba layouts --> -- <_shortDescription>yo</_shortDescription> -- <_description>Yoruba</_description> -+ -+ <shortDescription>yo</shortDescription> -+ <description>Yoruba</description> - <languageList> - <iso639Id>yor</iso639Id> - </languageList> -@@ -5353,9 +5353,9 @@ - <variant> - <configItem> - <name>hausa</name> -- <!-- Keyboard indicator for Hausa layouts --> -- <_shortDescription>ha</_shortDescription> -- <_description>Hausa</_description> -+ -+ <shortDescription>ha</shortDescription> -+ <description>Hausa</description> - <languageList> - <iso639Id>hau</iso639Id> - </languageList> -@@ -5366,9 +5366,9 @@ - <layout> - <configItem> - <name>et</name> -- <!-- Keyboard indicator for Amharic layouts --> -- <_shortDescription>am</_shortDescription> -- <_description>Amharic</_description> -+ -+ <shortDescription>am</shortDescription> -+ <description>Amharic</description> - <languageList> - <iso639Id>amh</iso639Id> - </languageList> -@@ -5378,9 +5378,9 @@ - <layout> - <configItem> - <name>sn</name> -- <!-- Keyboard indicator for Wolof layouts --> -- <_shortDescription>wo</_shortDescription> -- <_description>Wolof</_description> -+ -+ <shortDescription>wo</shortDescription> -+ <description>Wolof</description> - <languageList> - <iso639Id>wol</iso639Id> - </languageList> -@@ -5390,21 +5390,21 @@ - <layout> - <configItem> - <name>brai</name> -- <!-- Keyboard indicator for Braille layouts --> -- <_shortDescription>brl</_shortDescription> -- <_description>Braille</_description> -+ -+ <shortDescription>brl</shortDescription> -+ <description>Braille</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>left_hand</name> -- <_description>Braille (left hand)</_description> -+ <description>Braille (left hand)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>right_hand</name> -- <_description>Braille (right hand)</_description> -+ <description>Braille (right hand)</description> - </configItem> - </variant> - </variantList> -@@ -5412,9 +5412,9 @@ - <layout> - <configItem> - <name>tm</name> -- <!-- Keyboard indicator for Turkmen layouts --> -- <_shortDescription>tk</_shortDescription> -- <_description>Turkmen</_description> -+ -+ <shortDescription>tk</shortDescription> -+ <description>Turkmen</description> - <languageList> - <iso639Id>tuk</iso639Id> - </languageList> -@@ -5423,7 +5423,7 @@ - <variant> - <configItem> - <name>alt</name> -- <_description>Turkmen (Alt-Q)</_description> -+ <description>Turkmen (Alt-Q)</description> - </configItem> - </variant> - </variantList> -@@ -5431,9 +5431,9 @@ - <layout> - <configItem> - <name>ml</name> -- <!-- Keyboard indicator for Bambara layouts --> -- <_shortDescription>bm</_shortDescription> -- <_description>Bambara</_description> -+ -+ <shortDescription>bm</shortDescription> -+ <description>Bambara</description> - <languageList> - <iso639Id>bam</iso639Id> - </languageList> -@@ -5442,9 +5442,9 @@ - <variant> - <configItem> - <name>fr-oss</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Mali, alternative)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Mali, alternative)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -5453,9 +5453,9 @@ - <variant> - <configItem> - <name>us-mac</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (Mali, US Macintosh)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (Mali, US Macintosh)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -5464,9 +5464,9 @@ - <variant> - <configItem> - <name>us-intl</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (Mali, US international)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (Mali, US international)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -5477,9 +5477,9 @@ - <layout> - <configItem> - <name>tz</name> -- <!-- Keyboard indicator for Swahili layouts --> -- <_shortDescription>sw</_shortDescription> -- <_description>Swahili (Tanzania)</_description> -+ -+ <shortDescription>sw</shortDescription> -+ <description>Swahili (Tanzania)</description> - <languageList> - <iso639Id>swa</iso639Id> - </languageList> -@@ -5488,9 +5488,9 @@ - <layout> - <configItem> - <name>ke</name> -- <!-- Keyboard indicator for Swahili layouts --> -- <_shortDescription>sw</_shortDescription> -- <_description>Swahili (Kenya)</_description> -+ -+ <shortDescription>sw</shortDescription> -+ <description>Swahili (Kenya)</description> - <languageList> - <iso639Id>swa</iso639Id> - </languageList> -@@ -5499,9 +5499,9 @@ - <variant> - <configItem> - <name>kik</name> -- <!-- Keyboard indicator for Kikuyu layouts --> -- <_shortDescription>ki</_shortDescription> -- <_description>Kikuyu</_description> -+ -+ <shortDescription>ki</shortDescription> -+ <description>Kikuyu</description> - <languageList> - <iso639Id>kik</iso639Id> - </languageList> -@@ -5512,9 +5512,9 @@ - <layout> - <configItem> - <name>bw</name> -- <!-- Keyboard indicator for Tswana layouts --> -- <_shortDescription>tn</_shortDescription> -- <_description>Tswana</_description> -+ -+ <shortDescription>tn</shortDescription> -+ <description>Tswana</description> - <languageList> - <iso639Id>tsn</iso639Id> - </languageList> -@@ -5523,9 +5523,9 @@ - <layout> - <configItem> - <name>ph</name> -- <!-- Keyboard indicator for Filipino layouts --> -- <_shortDescription>ph</_shortDescription> -- <_description>Filipino</_description> -+ -+ <shortDescription>ph</shortDescription> -+ <description>Filipino</description> - <languageList><iso639Id>eng</iso639Id> - <iso639Id>bik</iso639Id> - <iso639Id>ceb</iso639Id> -@@ -5542,7 +5542,7 @@ - <variant> - <configItem> - <name>qwerty-bay</name> -- <_description>Filipino (QWERTY Baybayin)</_description> -+ <description>Filipino (QWERTY Baybayin)</description> - <languageList><iso639Id>bik</iso639Id> - <iso639Id>ceb</iso639Id> - <iso639Id>fil</iso639Id> -@@ -5558,13 +5558,13 @@ - <variant> - <configItem> - <name>capewell-dvorak</name> -- <_description>Filipino (Capewell-Dvorak Latin)</_description> -+ <description>Filipino (Capewell-Dvorak Latin)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>capewell-dvorak-bay</name> -- <_description>Filipino (Capewell-Dvorak Baybayin)</_description> -+ <description>Filipino (Capewell-Dvorak Baybayin)</description> - <languageList><iso639Id>bik</iso639Id> - <iso639Id>ceb</iso639Id> - <iso639Id>fil</iso639Id> -@@ -5580,13 +5580,13 @@ - <variant> - <configItem> - <name>capewell-qwerf2k6</name> -- <_description>Filipino (Capewell-QWERF 2006 Latin)</_description> -+ <description>Filipino (Capewell-QWERF 2006 Latin)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>capewell-qwerf2k6-bay</name> -- <_description>Filipino (Capewell-QWERF 2006 Baybayin)</_description> -+ <description>Filipino (Capewell-QWERF 2006 Baybayin)</description> - <languageList><iso639Id>bik</iso639Id> - <iso639Id>ceb</iso639Id> - <iso639Id>fil</iso639Id> -@@ -5602,13 +5602,13 @@ - <variant> - <configItem> - <name>colemak</name> -- <_description>Filipino (Colemak Latin)</_description> -+ <description>Filipino (Colemak Latin)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>colemak-bay</name> -- <_description>Filipino (Colemak Baybayin)</_description> -+ <description>Filipino (Colemak Baybayin)</description> - <languageList><iso639Id>bik</iso639Id> - <iso639Id>ceb</iso639Id> - <iso639Id>fil</iso639Id> -@@ -5624,13 +5624,13 @@ - <variant> - <configItem> - <name>dvorak</name> -- <_description>Filipino (Dvorak Latin)</_description> -+ <description>Filipino (Dvorak Latin)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak-bay</name> -- <_description>Filipino (Dvorak Baybayin)</_description> -+ <description>Filipino (Dvorak Baybayin)</description> - <languageList><iso639Id>bik</iso639Id> - <iso639Id>ceb</iso639Id> - <iso639Id>fil</iso639Id> -@@ -5648,16 +5648,16 @@ - <layout> - <configItem> - <name>md</name> -- <_shortDescription>md</_shortDescription> -- <_description>Moldavian</_description> -+ <shortDescription>md</shortDescription> -+ <description>Moldavian</description> - <languageList><iso639Id>rum</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>gag</name> -- <_shortDescription>gag</_shortDescription> -- <_description>Moldavian (Gagauz)</_description> -+ <shortDescription>gag</shortDescription> -+ <description>Moldavian (Gagauz)</description> - <languageList><iso639Id>gag</iso639Id></languageList> - </configItem> - </variant> -@@ -5666,1183 +5666,1142 @@ - </layoutList> - <optionList> - <group allowMultipleSelection="true"> -- <!-- The key combination used to switch between groups --> -+ - <configItem> - <name>grp</name> -- <_description>Switching to another layout</_description> -+ <description>Switching to another layout</description> - </configItem> - <option> - <configItem> - <name>grp:switch</name> -- <_description>Right Alt (while pressed)</_description> -+ <description>Right Alt (while pressed)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lswitch</name> -- <_description>Left Alt (while pressed)</_description> -+ <description>Left Alt (while pressed)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lwin_switch</name> -- <_description>Left Win (while pressed)</_description> -+ <description>Left Win (while pressed)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:rwin_switch</name> -- <_description>Right Win (while pressed)</_description> -+ <description>Right Win (while pressed)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:win_switch</name> -- <_description>Any Win key (while pressed)</_description> -+ <description>Any Win key (while pressed)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:caps_switch</name> -- <_description>Caps Lock (while pressed), Alt+Caps Lock does the original capslock action</_description> -+ <description>Caps Lock (while pressed), Alt+Caps Lock does the original capslock action</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:rctrl_switch</name> -- <_description>Right Ctrl (while pressed)</_description> -+ <description>Right Ctrl (while pressed)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:toggle</name> -- <_description>Right Alt</_description> -+ <description>Right Alt</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lalt_toggle</name> -- <_description>Left Alt</_description> -+ <description>Left Alt</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:caps_toggle</name> -- <_description>Caps Lock</_description> -+ <description>Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:shift_caps_toggle</name> -- <_description>Shift+Caps Lock</_description> -+ <description>Shift+Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:shift_caps_switch</name> -- <_description>Caps Lock (to first layout), Shift+Caps Lock (to last layout)</_description> -+ <description>Caps Lock (to first layout), Shift+Caps Lock (to last layout)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:win_menu_switch</name> -- <_description>Left Win (to first layout), Right Win/Menu (to last layout)</_description> -+ <description>Left Win (to first layout), Right Win/Menu (to last layout)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lctrl_rctrl_switch</name> -- <_description>Left Ctrl (to first layout), Right Ctrl (to last layout)</_description> -+ <description>Left Ctrl (to first layout), Right Ctrl (to last layout)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:alt_caps_toggle</name> -- <_description>Alt+Caps Lock</_description> -+ <description>Alt+Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:shifts_toggle</name> -- <_description>Both Shift keys together</_description> -+ <description>Both Shift keys together</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:alts_toggle</name> -- <_description>Both Alt keys together</_description> -+ <description>Both Alt keys together</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:ctrls_toggle</name> -- <_description>Both Ctrl keys together</_description> -+ <description>Both Ctrl keys together</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:ctrl_shift_toggle</name> -- <_description>Ctrl+Shift</_description> -+ <description>Ctrl+Shift</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lctrl_lshift_toggle</name> -- <_description>Left Ctrl+Left Shift</_description> -+ <description>Left Ctrl+Left Shift</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:rctrl_rshift_toggle</name> -- <_description>Right Ctrl+Right Shift</_description> -+ <description>Right Ctrl+Right Shift</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:ctrl_alt_toggle</name> -- <_description>Alt+Ctrl</_description> -+ <description>Alt+Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:alt_shift_toggle</name> -- <_description>Alt+Shift</_description> -+ <description>Alt+Shift</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lalt_lshift_toggle</name> -- <_description>Left Alt+Left Shift</_description> -+ <description>Left Alt+Left Shift</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:alt_space_toggle</name> -- <_description>Alt+Space</_description> -+ <description>Alt+Space</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:menu_toggle</name> -- <_description>Menu</_description> -+ <description>Menu</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lwin_toggle</name> -- <_description>Left Win</_description> -+ <description>Left Win</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:rwin_toggle</name> -- <_description>Right Win</_description> -+ <description>Right Win</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lshift_toggle</name> -- <_description>Left Shift</_description> -+ <description>Left Shift</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:rshift_toggle</name> -- <_description>Right Shift</_description> -+ <description>Right Shift</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lctrl_toggle</name> -- <_description>Left Ctrl</_description> -+ <description>Left Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:rctrl_toggle</name> -- <_description>Right Ctrl</_description> -+ <description>Right Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:sclk_toggle</name> -- <_description>Scroll Lock</_description> -+ <description>Scroll Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lctrl_lwin_rctrl_menu</name> -- <_description>LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)</_description> -+ <description>LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> -- <!-- The key combination used to choose the 3rd (and 4th, together with Shift) -- level of symbols --> -+ - <configItem> - <name>lv3</name> -- <_description>Key to choose 3rd level</_description> -+ <description>Key to choose 3rd level</description> - </configItem> - <option> - <configItem> - <name>lv3:switch</name> -- <_description>Right Ctrl</_description> -+ <description>Right Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:menu_switch</name> -- <_description>Menu</_description> -+ <description>Menu</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:win_switch</name> -- <_description>Any Win key</_description> -+ <description>Any Win key</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:lwin_switch</name> -- <_description>Left Win</_description> -+ <description>Left Win</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:rwin_switch</name> -- <_description>Right Win</_description> -+ <description>Right Win</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:alt_switch</name> -- <_description>Any Alt key</_description> -+ <description>Any Alt key</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:lalt_switch</name> -- <_description>Left Alt</_description> -+ <description>Left Alt</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:ralt_switch</name> -- <_description>Right Alt</_description> -+ <description>Right Alt</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:ralt_switch_multikey</name> -- <_description>Right Alt, Shift+Right Alt key is Compose</_description> -+ <description>Right Alt, Shift+Right Alt key is Compose</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:ralt_alt</name> -- <_description>Right Alt key never chooses 3rd level</_description> -+ <description>Right Alt key never chooses 3rd level</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:enter_switch</name> -- <_description>Enter on keypad</_description> -+ <description>Enter on keypad</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:caps_switch</name> -- <_description>Caps Lock</_description> -+ <description>Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:bksl_switch</name> -- <_description>Backslash</_description> -+ <description>Backslash</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:lsgt_switch</name> -- <_description><Less/Greater></_description> -+ <description><Less/Greater></description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:caps_switch_latch</name> -- <_description>Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</_description> -+ <description>Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:bksl_switch_latch</name> -- <_description>Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</_description> -+ <description>Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:lsgt_switch_latch</name> -- <_description><Less/Greater> chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</_description> -+ <description><Less/Greater> chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> -- <!-- Tweaking the position of the "Ctrl" key --> -+ - <configItem> - <name>ctrl</name> -- <_description>Ctrl key position</_description> -+ <description>Ctrl key position</description> - </configItem> - <option> - <configItem> - <name>ctrl:nocaps</name> -- <_description>Caps Lock as Ctrl</_description> -+ <description>Caps Lock as Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:lctrl_meta</name> -- <_description>Left Ctrl as Meta</_description> -+ <description>Left Ctrl as Meta</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:swapcaps</name> -- <_description>Swap Ctrl and Caps Lock</_description> -+ <description>Swap Ctrl and Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:ac_ctrl</name> -- <_description>At left of 'A'</_description> -+ <description>At left of 'A'</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:aa_ctrl</name> -- <_description>At bottom left</_description> -+ <description>At bottom left</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:rctrl_ralt</name> -- <_description>Right Ctrl as Right Alt</_description> -+ <description>Right Ctrl as Right Alt</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:menu_rctrl</name> -- <_description>Menu as Right Ctrl</_description> -+ <description>Menu as Right Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:ctrl_ralt</name> -- <_description>Right Alt as Right Ctrl</_description> -+ <description>Right Alt as Right Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:swap_lalt_lctl</name> -- <_description>Swap Left Alt key with Left Ctrl key</_description> -+ <description>Swap Left Alt key with Left Ctrl key</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:swap_lwin_lctl</name> -- <_description>Swap Left Win key with Left Ctrl key</_description> -+ <description>Swap Left Win key with Left Ctrl key</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:swap_lalt_lctl_lwin</name> -- <_description>Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt</_description> -+ <description>Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> -- <!-- Using startard LEDs to indicate the alternative (not first) group(s) --> -+ - <configItem> - <name>grp_led</name> -- <_description>Use keyboard LED to show alternative layout</_description> -+ <description>Use keyboard LED to show alternative layout</description> - </configItem> - <option> - <configItem> - <name>grp_led:num</name> -- <_description>Num Lock</_description> -+ <description>Num Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>grp_led:caps</name> -- <_description>Caps Lock</_description> -+ <description>Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>grp_led:scroll</name> -- <_description>Scroll Lock</_description> -+ <description>Scroll Lock</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="false"> -- <!-- Select a keypad type --> -+ - <configItem> - <name>keypad</name> -- <_description>Layout of numeric keypad</_description> -+ <description>Layout of numeric keypad</description> - </configItem> - <option> - <configItem> - <name>keypad:legacy</name> -- <_description>Legacy</_description> -+ <description>Legacy</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:oss</name> -- <_description>Unicode additions (arrows and math operators)</_description> -+ <description>Unicode additions (arrows and math operators)</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:future</name> -- <_description>Unicode additions (arrows and math operators; math operators on default level)</_description> -+ <description>Unicode additions (arrows and math operators; math operators on default level)</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:legacy_wang</name> -- <_description>Legacy Wang 724</_description> -+ <description>Legacy Wang 724</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:oss_wang</name> -- <_description>Wang 724 keypad with Unicode additions (arrows and math operators)</_description> -+ <description>Wang 724 keypad with Unicode additions (arrows and math operators)</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:future_wang</name> -- <_description>Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)</_description> -+ <description>Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:hex</name> -- <_description>Hexadecimal</_description> -+ <description>Hexadecimal</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:atm</name> -- <_description>ATM/phone-style</_description> -+ <description>ATM/phone-style</description> - </configItem> - </option> - </group> -- <!-- This option should override the KPDL key defined in keypad; I hope it's declared in the right place --> -+ - <group allowMultipleSelection="false"> -- <!-- Select a keypad KPDL variant --> -+ - <configItem> - <name>kpdl</name> -- <_description>Numeric keypad delete key behaviour</_description> -+ <description>Numeric keypad delete key behaviour</description> - </configItem> - <option> - <configItem> -- <!-- Actually, with KP_DECIMAL, as the old keypad(dot) --> -+ - <name>kpdl:dot</name> -- <_description>Legacy key with dot</_description> -+ <description>Legacy key with dot</description> - </configItem> - </option> - <option> - <configItem> - <name>kpdl:comma</name> -- <!-- Actually, with KP_SEPARATOR, as the old keypad(comma) --> -- <_description>Legacy key with comma</_description> -+ -+ <description>Legacy key with comma</description> - </configItem> - </option> - <option> - <configItem> - <name>kpdl:dotoss</name> -- <_description>Four-level key with dot</_description> -+ <description>Four-level key with dot</description> - </configItem> - </option> - <option> - <configItem> - <name>kpdl:dotoss_latin9</name> -- <_description>Four-level key with dot, Latin-9 only</_description> -+ <description>Four-level key with dot, Latin-9 only</description> - </configItem> - </option> - <option> - <configItem> - <name>kpdl:commaoss</name> -- <_description>Four-level key with comma</_description> -+ <description>Four-level key with comma</description> - </configItem> - </option> - <option> - <configItem> - <name>kpdl:momayyezoss</name> -- <_description>Four-level key with momayyez</_description> -+ <description>Four-level key with momayyez</description> - </configItem> - </option> - <option> - <configItem> - <name>kpdl:kposs</name> -- <!-- This assumes the KP_ abstract symbols are actually useful for some apps -- The description needs to be rewritten --> -- <_description>Four-level key with abstract separators</_description> -+ -+ <description>Four-level key with abstract separators</description> - </configItem> - </option> - <option> - <configItem> - <name>kpdl:semi</name> -- <_description>Semicolon on third level</_description> -+ <description>Semicolon on third level</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="false"> -- <!-- Caps Lock tweaks. -- "Internal" capitalization means capitalization using some internal tables. -- Otherwise "as Shift" - means using next group. --> -+ - <configItem> - <name>caps</name> -- <_description>Caps Lock key behavior</_description> -+ <description>Caps Lock key behavior</description> - </configItem> - <option> - <configItem> - <name>caps:internal</name> -- <_description>Caps Lock uses internal capitalization; Shift "pauses" Caps Lock</_description> -+ <description>Caps Lock uses internal capitalization; Shift "pauses" Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:internal_nocancel</name> -- <_description>Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock</_description> -+ <description>Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:shift</name> -- <_description>Caps Lock acts as Shift with locking; Shift "pauses" Caps Lock</_description> -+ <description>Caps Lock acts as Shift with locking; Shift "pauses" Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:shift_nocancel</name> -- <_description>Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock</_description> -+ <description>Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:capslock</name> -- <_description>Caps Lock toggles normal capitalization of alphabetic characters</_description> -+ <description>Caps Lock toggles normal capitalization of alphabetic characters</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:numlock</name> -- <_description>Make Caps Lock an additional Num Lock</_description> -+ <description>Make Caps Lock an additional Num Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:swapescape</name> -- <_description>Swap ESC and Caps Lock</_description> -+ <description>Swap ESC and Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:escape</name> -- <_description>Make Caps Lock an additional ESC</_description> -+ <description>Make Caps Lock an additional ESC</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:backspace</name> -- <_description>Make Caps Lock an additional Backspace</_description> -+ <description>Make Caps Lock an additional Backspace</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:super</name> -- <_description>Make Caps Lock an additional Super</_description> -+ <description>Make Caps Lock an additional Super</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:hyper</name> -- <_description>Make Caps Lock an additional Hyper</_description> -+ <description>Make Caps Lock an additional Hyper</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:shiftlock</name> -- <_description>Caps Lock toggles ShiftLock (affects all keys)</_description> -+ <description>Caps Lock toggles ShiftLock (affects all keys)</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:none</name> -- <_description>Caps Lock is disabled</_description> -+ <description>Caps Lock is disabled</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:ctrl_modifier</name> -- <_description>Make Caps Lock an additional Ctrl</_description> -+ <description>Make Caps Lock an additional Ctrl</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="false"> -- <!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) --> -+ - <configItem> - <name>altwin</name> -- <_description>Alt/Win key behavior</_description> -+ <description>Alt/Win key behavior</description> - </configItem> - <option> - <configItem> - <name>altwin:menu</name> -- <_description>Add the standard behavior to Menu key</_description> -+ <description>Add the standard behavior to Menu key</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:meta_alt</name> -- <_description>Alt and Meta are on Alt keys</_description> -+ <description>Alt and Meta are on Alt keys</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:alt_win</name> -- <_description>Alt is mapped to Win keys (and the usual Alt keys)</_description> -+ <description>Alt is mapped to Win keys (and the usual Alt keys)</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:ctrl_win</name> -- <_description>Ctrl is mapped to Win keys (and the usual Ctrl keys)</_description> -+ <description>Ctrl is mapped to Win keys (and the usual Ctrl keys)</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:ctrl_alt_win</name> -- <_description>Ctrl is mapped to Alt keys, Alt is mapped to Win keys</_description> -+ <description>Ctrl is mapped to Alt keys, Alt is mapped to Win keys</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:meta_win</name> -- <_description>Meta is mapped to Win keys</_description> -+ <description>Meta is mapped to Win keys</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:left_meta_win</name> -- <_description>Meta is mapped to Left Win</_description> -+ <description>Meta is mapped to Left Win</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:hyper_win</name> -- <_description>Hyper is mapped to Win-keys</_description> -+ <description>Hyper is mapped to Win-keys</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:alt_super_win</name> -- <_description>Alt is mapped to Right Win, Super to Menu</_description> -+ <description>Alt is mapped to Right Win, Super to Menu</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:swap_alt_win</name> -- <_description>Alt is swapped with Win</_description> -+ <description>Alt is swapped with Win</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> -- <!-- Tweaking the position of the "Compose" key: mapping to existing PC keys --> -+ - <configItem> - <name>Compose key</name> -- <_description>Position of Compose key</_description> -+ <description>Position of Compose key</description> - </configItem> - <option> - <configItem> - <name>compose:ralt</name> -- <_description>Right Alt</_description> -+ <description>Right Alt</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:lwin</name> -- <_description>Left Win</_description> -+ <description>Left Win</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:lwin-altgr</name> -- <_description>3rd level of Left Win</_description> -+ <description>3rd level of Left Win</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:rwin</name> -- <_description>Right Win</_description> -+ <description>Right Win</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:rwin-altgr</name> -- <_description>3rd level of Right Win</_description> -+ <description>3rd level of Right Win</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:menu</name> -- <_description>Menu</_description> -+ <description>Menu</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:menu-altgr</name> -- <_description>3rd level of Menu</_description> -+ <description>3rd level of Menu</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:lctrl</name> -- <_description>Left Ctrl</_description> -+ <description>Left Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:lctrl-altgr</name> -- <_description>3rd level of Left Ctrl</_description> -+ <description>3rd level of Left Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:rctrl</name> -- <_description>Right Ctrl</_description> -+ <description>Right Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:rctrl-altgr</name> -- <_description>3rd level of Right Ctrl</_description> -+ <description>3rd level of Right Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:caps</name> -- <_description>Caps Lock</_description> -+ <description>Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:caps-altgr</name> -- <_description>3rd level of Caps Lock</_description> -+ <description>3rd level of Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:102</name> -- <_description><Less/Greater></_description> -+ <description><Less/Greater></description> - </configItem> - </option> - <option> - <configItem> - <name>compose:102-altgr</name> -- <_description>3rd level of <Less/Greater></_description> -+ <description>3rd level of <Less/Greater></description> - </configItem> - </option> - <option> - <configItem> - <name>compose:paus</name> -- <_description>Pause</_description> -+ <description>Pause</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:prsc</name> -- <_description>PrtSc</_description> -+ <description>PrtSc</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:sclk</name> -- <_description>Scroll Lock</_description> -+ <description>Scroll Lock</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> - <configItem> - <name>compat</name> -- <_description>Miscellaneous compatibility options</_description> -+ <description>Miscellaneous compatibility options</description> - </configItem> - <option> - <configItem> - <name>numpad:pc</name> -- <_description>Default numeric keypad keys</_description> -+ <description>Default numeric keypad keys</description> - </configItem> - </option> - <option> - <configItem> - <name>numpad:mac</name> -- <_description>Numeric keypad keys always enter digits (as in Mac OS)</_description> -+ <description>Numeric keypad keys always enter digits (as in Mac OS)</description> - </configItem> - </option> - <option> - <configItem> - <name>numpad:microsoft</name> -- <_description>Shift with numeric keypad keys works as in MS Windows</_description> -+ <description>Shift with numeric keypad keys works as in MS Windows</description> - </configItem> - </option> - <option> - <configItem> - <name>numpad:shift3</name> -- <_description>Shift does not cancel Num Lock, chooses 3rd level instead</_description> -+ <description>Shift does not cancel Num Lock, chooses 3rd level instead</description> - </configItem> - </option> - <option> - <configItem> - <name>srvrkeys:none</name> -- <_description>Special keys (Ctrl+Alt+<key>) handled in a server</_description> -+ <description>Special keys (Ctrl+Alt+<key>) handled in a server</description> - </configItem> - </option> - <option> - <configItem> - <name>apple:alupckeys</name> -- <_description>Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)</_description> -+ <description>Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)</description> - </configItem> - </option> - <option> - <configItem> - <name>shift:breaks_caps</name> -- <_description>Shift cancels Caps Lock</_description> -+ <description>Shift cancels Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>misc:typo</name> -- <_description>Enable extra typographic characters</_description> -+ <description>Enable extra typographic characters</description> - </configItem> - </option> - <option> - <configItem> - <name>shift:both_capslock</name> -- <_description>Both Shift keys together toggle Caps Lock</_description> -+ <description>Both Shift keys together toggle Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>shift:both_capslock_cancel</name> -- <_description>Both Shift keys together activate Caps Lock, one Shift key deactivates</_description> -+ <description>Both Shift keys together activate Caps Lock, one Shift key deactivates</description> - </configItem> - </option> - <option> - <configItem> - <name>shift:both_shiftlock</name> -- <_description>Both Shift keys together toggle ShiftLock</_description> -+ <description>Both Shift keys together toggle ShiftLock</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:pointerkeys</name> -- <_description>Shift + NumLock toggles PointerKeys</_description> -+ <description>Shift + NumLock toggles PointerKeys</description> - </configItem> - </option> - <option> - <configItem> - <name>grab:break_actions</name> -- <_description>Allow breaking grabs with keyboard actions (warning: security risk)</_description> -+ <description>Allow breaking grabs with keyboard actions (warning: security risk)</description> - </configItem> - </option> - <option> - <configItem> - <name>grab:debug_actions</name> -- <_description>Allow grab and window tree logging</_description> -+ <description>Allow grab and window tree logging</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> -- <!-- Special shortcuts for the Euro character --> -+ - <configItem> - <name>currencysign</name> -- <_description>Adding currency signs to certain keys</_description> -+ <description>Adding currency signs to certain keys</description> - </configItem> - <option> - <configItem> - <name>eurosign:e</name> -- <_description>Euro on E</_description> -+ <description>Euro on E</description> - </configItem> - </option> - <option> - <configItem> - <name>eurosign:2</name> -- <_description>Euro on 2</_description> -+ <description>Euro on 2</description> - </configItem> - </option> - <option> - <configItem> - <name>eurosign:4</name> -- <_description>Euro on 4</_description> -+ <description>Euro on 4</description> - </configItem> - </option> - <option> - <configItem> - <name>eurosign:5</name> -- <_description>Euro on 5</_description> -+ <description>Euro on 5</description> - </configItem> - </option> - <option> - <configItem> - <name>rupeesign:4</name> -- <_description>Rupee on 4</_description> -+ <description>Rupee on 4</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> - <configItem> - <name>lv5</name> -- <_description>Key to choose 5th level</_description> -+ <description>Key to choose 5th level</description> - </configItem> - <option> - <configItem> - <name>lv5:lsgt_switch_lock</name> -- <_description><Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser</_description> -+ <description><Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser</description> - </configItem> - </option> - <option> - <configItem> - <name>lv5:ralt_switch_lock</name> -- <_description>Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser</_description> -+ <description>Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser</description> - </configItem> - </option> - <option> - <configItem> - <name>lv5:lwin_switch_lock</name> -- <_description>Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser</_description> -+ <description>Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser</description> - </configItem> - </option> - <option> - <configItem> - <name>lv5:rwin_switch_lock</name> -- <_description>Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser</_description> -- </configItem> -- </option> --<!-- -- <option> -- <configItem> -- <name>lv5:lsgt_switch_lock_cancel</name> -- <_description><Less/Greater> chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> -- </configItem> -- </option> -- <option> -- <configItem> -- <name>lv5:ralt_switch_lock_cancel</name> -- <_description>Right Alt chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> -- </configItem> -- </option> -- <option> -- <configItem> -- <name>lv5:lwin_switch_lock_cancel</name> -- <_description>Left Win chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> -- </configItem> -- </option> -- <option> -- <configItem> -- <name>lv5:rwin_switch_lock_cancel</name> -- <_description>Right Win chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> -- </configItem> -- </option> -- <option> -- <configItem> -- <name>lv5:lsgt_switch_lock_cancel</name> -- <_description><Less/Greater> chooses 5th level, acts as onetime lock lock when pressed together with another 5th-level-chooser</_description> -- </configItem> -- </option> -- <option> -- <configItem> -- <name>lv5:ralt_switch_lock_cancel</name> -- <_description>Right Alt chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> -+ <description>Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser</description> - </configItem> - </option> ----> -+ - </group> - <group allowMultipleSelection="false"> -- <!-- Let space output NBSP, NNBSP, ZWNJ, and ZWJ for the desired level --> -+ - <configItem> - <name>nbsp</name> -- <_description>Using space key to input non-breakable space character</_description> -+ <description>Using space key to input non-breakable space character</description> - </configItem> - <option> - <configItem> - <name>nbsp:none</name> -- <_description>Usual space at any level</_description> -+ <description>Usual space at any level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:level2</name> -- <_description>Non-breakable space character at second level</_description> -+ <description>Non-breakable space character at second level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:level3</name> -- <_description>Non-breakable space character at third level</_description> -+ <description>Non-breakable space character at third level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:level3s</name> -- <_description>Non-breakable space character at third level, nothing at fourth level</_description> -+ <description>Non-breakable space character at third level, nothing at fourth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:level3n</name> -- <_description>Non-breakable space character at third level, thin non-breakable space character at fourth level</_description> -+ <description>Non-breakable space character at third level, thin non-breakable space character at fourth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:level4</name> -- <_description>Non-breakable space character at fourth level</_description> -+ <description>Non-breakable space character at fourth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:level4n</name> -- <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description> -+ <description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:level4nl</name> -- <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description> -+ <description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj2</name> -- <_description>Zero-width non-joiner character at second level</_description> -+ <description>Zero-width non-joiner character at second level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj2zwj3</name> -- <_description>Zero-width non-joiner character at second level, zero-width joiner character at third level</_description> -+ <description>Zero-width non-joiner character at second level, zero-width joiner character at third level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj2zwj3nb4</name> -- <_description>Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level</_description> -+ <description>Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj2nb3</name> -- <_description>Zero-width non-joiner character at second level, non-breakable space character at third level</_description> -+ <description>Zero-width non-joiner character at second level, non-breakable space character at third level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj2nb3s</name> -- <_description>Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level</_description> -+ <description>Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj2nb3zwj4</name> -- <_description>Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level</_description> -+ <description>Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj2nb3nnb4</name> -- <_description>Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level</_description> -+ <description>Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj3zwj4</name> -- <_description>Zero-width non-joiner character at third level, zero-width joiner at fourth level</_description> -+ <description>Zero-width non-joiner character at third level, zero-width joiner at fourth level</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> - <configItem> - <name>japan</name> -- <_description>Japanese keyboard options</_description> -+ <description>Japanese keyboard options</description> - </configItem> - <option> - <configItem> - <name>japan:kana_lock</name> -- <_description>Kana Lock key is locking</_description> -+ <description>Kana Lock key is locking</description> - </configItem> - </option> - <option> - <configItem> - <name>japan:nicola_f_bs</name> -- <_description>NICOLA-F style Backspace</_description> -+ <description>NICOLA-F style Backspace</description> - </configItem> - </option> - <option> - <configItem> - <name>japan:hztg_escape</name> -- <_description>Make Zenkaku Hankaku an additional ESC</_description> -+ <description>Make Zenkaku Hankaku an additional ESC</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="false"> - <configItem> - <name>esperanto</name> -- <_description>Adding Esperanto supersigned letters</_description> -+ <description>Adding Esperanto supersigned letters</description> - </configItem> - <option> - <configItem> - <name>esperanto:qwerty</name> -- <_description>To the corresponding key in a Qwerty layout</_description> -+ <description>To the corresponding key in a Qwerty layout</description> - </configItem> - </option> - <option> - <configItem> - <name>esperanto:dvorak</name> -- <_description>To the corresponding key in a Dvorak layout</_description> -+ <description>To the corresponding key in a Dvorak layout</description> - </configItem> - </option> - <option> - <configItem> - <name>esperanto:colemak</name> -- <_description>To the corresponding key in a Colemak layout</_description> -+ <description>To the corresponding key in a Colemak layout</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> - <configItem> - <name>solaris</name> -- <_description>Maintain key compatibility with old Solaris keycodes</_description> -+ <description>Maintain key compatibility with old Solaris keycodes</description> - </configItem> - <option> - <configItem> - <name>solaris:sun_compat</name> -- <_description>Sun Key compatibility</_description> -+ <description>Sun Key compatibility</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> - <configItem> - <name>terminate</name> -- <_description>Key sequence to kill the X server</_description> -+ <description>Key sequence to kill the X server</description> - </configItem> - <option> - <configItem> - <name>terminate:ctrl_alt_bksp</name> -- <_description>Ctrl + Alt + Backspace</_description> -+ <description>Ctrl + Alt + Backspace</description> - </configItem> - </option> - </group> - </optionList> --</xkbConfigRegistry> -+</xkbConfigRegistry> -\ No newline at end of file diff --git a/package/xkeyboard-config/patches/patch-rules_evdev_extras_xml_in b/package/xkeyboard-config/patches/patch-rules_evdev_extras_xml_in deleted file mode 100644 index 185ded7f8..000000000 --- a/package/xkeyboard-config/patches/patch-rules_evdev_extras_xml_in +++ /dev/null @@ -1,855 +0,0 @@ ---- xkeyboard-config-2.11.orig/rules/evdev.extras.xml.in 2013-12-24 00:49:09.000000000 +0100 -+++ xkeyboard-config-2.11/rules/evdev.extras.xml.in 2014-03-04 14:31:30.000000000 +0100 -@@ -1,4 +1,4 @@ --<?xml version="1.0" encoding="utf-8"?> -+<?xml version="1.0" encoding="UTF-8"?> - <!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd"> - <xkbConfigRegistry> - <modelList/> -@@ -6,8 +6,8 @@ - <layout> - <configItem> - <name>apl</name> -- <_shortDescription>apl</_shortDescription> -- <_description>APL keyboard symbols</_description> -+ <shortDescription>apl</shortDescription> -+ <description>APL keyboard symbols</description> - <languageList><iso639Id>eng</iso639Id></languageList> - </configItem> - <variantList> -@@ -58,29 +58,29 @@ - <layout> - <configItem> - <name>ca</name> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Canada)</_description> -+ <shortDescription>fr</shortDescription> -+ <description>French (Canada)</description> - <languageList><iso639Id>fra</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>kut</name> -- <_shortDescription>kut</_shortDescription> -- <_description>Kutenai</_description> -+ <shortDescription>kut</shortDescription> -+ <description>Kutenai</description> - </configItem> - </variant> - <variant> - <configItem> - <name>shs</name> -- <_shortDescription>shs</_shortDescription> -- <_description>Secwepemctsin</_description> -+ <shortDescription>shs</shortDescription> -+ <description>Secwepemctsin</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Multilingual (Canada, Sun Type 6/7)</_description> -+ <description>Multilingual (Canada, Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -88,8 +88,8 @@ - <layout> - <configItem> - <name>de</name> -- <_shortDescription>de</_shortDescription> -- <_description>German</_description> -+ <shortDescription>de</shortDescription> -+ <description>German</description> - <languageList> - <iso639Id>ger</iso639Id> - </languageList> -@@ -98,7 +98,7 @@ - <variant> - <configItem> - <name>us</name> -- <_description>German (US keyboard with German letters)</_description> -+ <description>German (US keyboard with German letters)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -107,7 +107,7 @@ - <variant> - <configItem> - <name>hu</name> -- <_description>German (with Hungarian letters and no dead keys)</_description> -+ <description>German (with Hungarian letters and no dead keys)</description> - <languageList> - <iso639Id>ger</iso639Id> - <iso639Id>hun</iso639Id> -@@ -117,7 +117,7 @@ - <variant> - <configItem> - <name>sun_type6</name> -- <_description>German (Sun Type 6/7)</_description> -+ <description>German (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -125,15 +125,15 @@ - <layout> - <configItem> - <name>ir</name> -- <_shortDescription>fa</_shortDescription> -- <_description>Persian</_description> -+ <shortDescription>fa</shortDescription> -+ <description>Persian</description> - <languageList><iso639Id>per</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>ave</name> -- <_description>Avestan</_description> -+ <description>Avestan</description> - <languageList><iso639Id>ave</iso639Id></languageList> - </configItem> - </variant> -@@ -142,21 +142,21 @@ - <layout> - <configItem> - <name>lt</name> -- <_shortDescription>lt</_shortDescription> -- <_description>Lithuanian</_description> -+ <shortDescription>lt</shortDescription> -+ <description>Lithuanian</description> - <languageList><iso639Id>lit</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>us_dvorak</name> -- <_description>Lithuanian (US Dvorak with Lithuanian letters)</_description> -+ <description>Lithuanian (US Dvorak with Lithuanian letters)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Lithuanian (Sun Type 6/7)</_description> -+ <description>Lithuanian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -164,8 +164,8 @@ - <layout> - <configItem> - <name>lv</name> -- <_shortDescription>lv</_shortDescription> -- <_description>Latvian</_description> -+ <shortDescription>lv</shortDescription> -+ <description>Latvian</description> - <languageList> - <iso639Id>lav</iso639Id> - </languageList> -@@ -174,55 +174,55 @@ - <variant> - <configItem> - <name>dvorak</name> -- <_description>Latvian (US Dvorak)</_description> -+ <description>Latvian (US Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ykeydvorak</name> -- <_description>Latvian (US Dvorak, Y variant)</_description> -+ <description>Latvian (US Dvorak, Y variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>minuskeydvorak</name> -- <_description>Latvian (US Dvorak, minus variant)</_description> -+ <description>Latvian (US Dvorak, minus variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorakprogr</name> -- <_description>Latvian (programmer US Dvorak)</_description> -+ <description>Latvian (programmer US Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ykeydvorakprogr</name> -- <_description>Latvian (programmer US Dvorak, Y variant)</_description> -+ <description>Latvian (programmer US Dvorak, Y variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>minuskeydvorakprogr</name> -- <_description>Latvian (programmer US Dvorak, minus variant)</_description> -+ <description>Latvian (programmer US Dvorak, minus variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>colemak</name> -- <_description>Latvian (US Colemak)</_description> -+ <description>Latvian (US Colemak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>apostrophecolemak</name> -- <_description>Latvian (US Colemak, apostrophe variant)</_description> -+ <description>Latvian (US Colemak, apostrophe variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Latvian (Sun Type 6/7)</_description> -+ <description>Latvian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -230,34 +230,34 @@ - <layout> - <configItem> - <name>us</name> -- <_shortDescription>en</_shortDescription> -- <_description>English (US)</_description> -+ <shortDescription>en</shortDescription> -+ <description>English (US)</description> - <languageList><iso639Id>eng</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>intl-unicode</name> -- <_description>English (US, international AltGr Unicode combining)</_description> -+ <description>English (US, international AltGr Unicode combining)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>alt-intl-unicode</name> -- <_description>English (US, international AltGr Unicode combining, alternative)</_description> -+ <description>English (US, international AltGr Unicode combining, alternative)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ats</name> -- <_description>Atsina</_description> -- <!-- No ISO code in ISO639-2, only draft ISO693-3 --> -+ <description>Atsina</description> -+ - </configItem> - </variant> - <variant> - <configItem> - <name>crd</name> -- <_description>Coeur d'Alene Salish</_description> -+ <description>Coeur d'Alene Salish</description> - <languageList><iso639Id>crd</iso639Id></languageList> - </configItem> - </variant> -@@ -274,13 +274,13 @@ - <variant> - <configItem> - <name>sun_type6</name> -- <_description>English (US, Sun Type 6/7)</_description> -+ <description>English (US, Sun Type 6/7)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>norman</name> -- <_description>English (Norman)</_description> -+ <description>English (Norman)</description> - </configItem> - </variant> - </variantList> -@@ -288,27 +288,27 @@ - <layout> - <configItem> - <name>pl</name> -- <_shortDescription>pl</_shortDescription> -- <_description>Polish</_description> -+ <shortDescription>pl</shortDescription> -+ <description>Polish</description> - <languageList><iso639Id>pol</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>intl</name> -- <_description>Polish (international with dead keys)</_description> -+ <description>Polish (international with dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>colemak</name> -- <_description>Polish (Colemak)</_description> -+ <description>Polish (Colemak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Polish (Sun Type 6/7)</_description> -+ <description>Polish (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -316,16 +316,16 @@ - <layout> - <configItem> - <name>ro</name> -- <_shortDescription>ro</_shortDescription> -- <_description>Romanian</_description> -+ <shortDescription>ro</shortDescription> -+ <description>Romanian</description> - <languageList><iso639Id>rum</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>crh_dobruja</name> -- <_shortDescription>crh</_shortDescription> -- <_description>Crimean Tatar (Dobruja Q)</_description> -+ <shortDescription>crh</shortDescription> -+ <description>Crimean Tatar (Dobruja Q)</description> - <languageList> - <iso639Id>crh</iso639Id> - </languageList> -@@ -334,13 +334,13 @@ - <variant> - <configItem> - <name>ergonomic</name> -- <_description>Romanian (ergonomic Touchtype)</_description> -+ <description>Romanian (ergonomic Touchtype)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Romanian (Sun Type 6/7)</_description> -+ <description>Romanian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -348,15 +348,15 @@ - <layout> - <configItem> - <name>rs</name> -- <_shortDescription>sr</_shortDescription> -- <_description>Serbian</_description> -+ <shortDescription>sr</shortDescription> -+ <description>Serbian</description> - <languageList><iso639Id>srp</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>combiningkeys</name> -- <_description>Serbian (combining accents instead of dead keys)</_description> -+ <description>Serbian (combining accents instead of dead keys)</description> - </configItem> - </variant> - </variantList> -@@ -364,8 +364,8 @@ - <layout> - <configItem> - <name>ru</name> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian</_description> -+ <shortDescription>ru</shortDescription> -+ <description>Russian</description> - </configItem> - <variantList> - <variant> -@@ -378,8 +378,8 @@ - <variant> - <configItem> - <name>ruu</name> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (with Ukrainian-Belorussian layout)</_description> -+ <shortDescription>ru</shortDescription> -+ <description>Russian (with Ukrainian-Belorussian layout)</description> - <languageList><iso639Id>rus</iso639Id> - <iso639Id>ukr</iso639Id> - <iso639Id>bel</iso639Id></languageList> -@@ -388,7 +388,7 @@ - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Russian (Sun Type 6/7)</_description> -+ <description>Russian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -396,8 +396,8 @@ - <layout> - <configItem> - <name>am</name> -- <_shortDescription>hy</_shortDescription> -- <_description>Armenian</_description> -+ <shortDescription>hy</shortDescription> -+ <description>Armenian</description> - <languageList> - <iso639Id>hye</iso639Id> - </languageList> -@@ -406,7 +406,7 @@ - <variant> - <configItem> - <name>olpc-phonetic</name> -- <_description>Armenian (OLPC phonetic)</_description> -+ <description>Armenian (OLPC phonetic)</description> - </configItem> - </variant> - </variantList> -@@ -414,15 +414,15 @@ - <layout> - <configItem> - <name>il</name> -- <_shortDescription>he</_shortDescription> -- <_description>Hebrew</_description> -+ <shortDescription>he</shortDescription> -+ <description>Hebrew</description> - <languageList><iso639Id>heb</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>biblicalSIL</name> -- <_description>Hebrew (Biblical, SIL phonetic)</_description> -+ <description>Hebrew (Biblical, SIL phonetic)</description> - <languageList><iso639Id>heb</iso639Id></languageList> - </configItem> - </variant> -@@ -431,14 +431,14 @@ - <layout> - <configItem> - <name>ara</name> -- <_shortDescription>ar</_shortDescription> -- <_description>Arabic</_description> -+ <shortDescription>ar</shortDescription> -+ <description>Arabic</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Arabic (Sun Type 6/7)</_description> -+ <description>Arabic (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -446,14 +446,14 @@ - <layout> - <configItem> - <name>be</name> -- <_shortDescription>be</_shortDescription> -- <_description>Belgian</_description> -+ <shortDescription>be</shortDescription> -+ <description>Belgian</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Belgian (Sun Type 6/7)</_description> -+ <description>Belgian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -461,14 +461,14 @@ - <layout> - <configItem> - <name>br</name> -- <_shortDescription>pt</_shortDescription> -- <_description>Portuguese (Brazil)</_description> -+ <shortDescription>pt</shortDescription> -+ <description>Portuguese (Brazil)</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Portuguese (Brazil, Sun Type 6/7)</_description> -+ <description>Portuguese (Brazil, Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -476,14 +476,14 @@ - <layout> - <configItem> - <name>cz</name> -- <_shortDescription>cs</_shortDescription> -- <_description>Czech</_description> -+ <shortDescription>cs</shortDescription> -+ <description>Czech</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Czech (Sun Type 6/7)</_description> -+ <description>Czech (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -491,14 +491,14 @@ - <layout> - <configItem> - <name>dk</name> -- <_shortDescription>da</_shortDescription> -- <_description>Danish</_description> -+ <shortDescription>da</shortDescription> -+ <description>Danish</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Danish (Sun Type 6/7)</_description> -+ <description>Danish (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -506,14 +506,14 @@ - <layout> - <configItem> - <name>nl</name> -- <_shortDescription>nl</_shortDescription> -- <_description>Dutch</_description> -+ <shortDescription>nl</shortDescription> -+ <description>Dutch</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Dutch (Sun Type 6/7)</_description> -+ <description>Dutch (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -521,14 +521,14 @@ - <layout> - <configItem> - <name>ee</name> -- <_shortDescription>et</_shortDescription> -- <_description>Estonian</_description> -+ <shortDescription>et</shortDescription> -+ <description>Estonian</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Estonian (Sun Type 6/7)</_description> -+ <description>Estonian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -536,14 +536,14 @@ - <layout> - <configItem> - <name>fi</name> -- <_shortDescription>fi</_shortDescription> -- <_description>Finnish</_description> -+ <shortDescription>fi</shortDescription> -+ <description>Finnish</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Finnish (Sun Type 6/7)</_description> -+ <description>Finnish (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -551,14 +551,14 @@ - <layout> - <configItem> - <name>fr</name> -- <_shortDescription>fr</_shortDescription> -- <_description>French</_description> -+ <shortDescription>fr</shortDescription> -+ <description>French</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>French (Sun Type 6/7)</_description> -+ <description>French (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -566,14 +566,14 @@ - <layout> - <configItem> - <name>gr</name> -- <_shortDescription>gr</_shortDescription> -- <_description>Greek</_description> -+ <shortDescription>gr</shortDescription> -+ <description>Greek</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Greek (Sun Type 6/7)</_description> -+ <description>Greek (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -581,14 +581,14 @@ - <layout> - <configItem> - <name>it</name> -- <_shortDescription>it</_shortDescription> -- <_description>Italian</_description> -+ <shortDescription>it</shortDescription> -+ <description>Italian</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Italian (Sun Type 6/7)</_description> -+ <description>Italian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -596,26 +596,26 @@ - <layout> - <configItem> - <name>jp</name> -- <_shortDescription>ja</_shortDescription> -- <_description>Japanese</_description> -+ <shortDescription>ja</shortDescription> -+ <description>Japanese</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Japanese (Sun Type 6)</_description> -+ <description>Japanese (Sun Type 6)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type7</name> -- <_description>Japanese (Sun Type 7 - pc compatible)</_description> -+ <description>Japanese (Sun Type 7 - pc compatible)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type7_suncompat</name> -- <_description>Japanese (Sun Type 7 - sun compatible)</_description> -+ <description>Japanese (Sun Type 7 - sun compatible)</description> - </configItem> - </variant> - </variantList> -@@ -623,14 +623,14 @@ - <layout> - <configItem> - <name>no</name> -- <_shortDescription>no</_shortDescription> -- <_description>Norwegian</_description> -+ <shortDescription>no</shortDescription> -+ <description>Norwegian</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Norwegian (Sun Type 6/7)</_description> -+ <description>Norwegian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -638,14 +638,14 @@ - <layout> - <configItem> - <name>pt</name> -- <_shortDescription>pt</_shortDescription> -- <_description>Portuguese</_description> -+ <shortDescription>pt</shortDescription> -+ <description>Portuguese</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Portuguese (Sun Type 6/7)</_description> -+ <description>Portuguese (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -653,14 +653,14 @@ - <layout> - <configItem> - <name>sk</name> -- <_shortDescription>sk</_shortDescription> -- <_description>Slovak</_description> -+ <shortDescription>sk</shortDescription> -+ <description>Slovak</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Slovak (Sun Type 6/7)</_description> -+ <description>Slovak (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -668,14 +668,14 @@ - <layout> - <configItem> - <name>es</name> -- <_shortDescription>es</_shortDescription> -- <_description>Spanish</_description> -+ <shortDescription>es</shortDescription> -+ <description>Spanish</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Spanish (Sun Type 6/7)</_description> -+ <description>Spanish (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -683,14 +683,14 @@ - <layout> - <configItem> - <name>se</name> -- <_shortDescription>sv</_shortDescription> -- <_description>Swedish</_description> -+ <shortDescription>sv</shortDescription> -+ <description>Swedish</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Swedish (Sun Type 6/7)</_description> -+ <description>Swedish (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -698,20 +698,20 @@ - <layout> - <configItem> - <name>ch</name> -- <_shortDescription>de</_shortDescription> -- <_description>German (Switzerland)</_description> -+ <shortDescription>de</shortDescription> -+ <description>German (Switzerland)</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6_de</name> -- <_description>German (Switzerland, Sun Type 6/7)</_description> -+ <description>German (Switzerland, Sun Type 6/7)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sun_type6_fr</name> -- <_description>French (Switzerland, Sun Type 6/7)</_description> -+ <description>French (Switzerland, Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -719,14 +719,14 @@ - <layout> - <configItem> - <name>tr</name> -- <_shortDescription>tr</_shortDescription> -- <_description>Turkish</_description> -+ <shortDescription>tr</shortDescription> -+ <description>Turkish</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Turkish (Sun Type 6/7)</_description> -+ <description>Turkish (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -734,14 +734,14 @@ - <layout> - <configItem> - <name>ua</name> -- <_shortDescription>uk</_shortDescription> -- <_description>Ukrainian</_description> -+ <shortDescription>uk</shortDescription> -+ <description>Ukrainian</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Ukrainian (Sun Type 6/7)</_description> -+ <description>Ukrainian (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -749,14 +749,14 @@ - <layout> - <configItem> - <name>gb</name> -- <_shortDescription>en</_shortDescription> -- <_description>English (UK)</_description> -+ <shortDescription>en</shortDescription> -+ <description>English (UK)</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>English (UK, Sun Type 6/7)</_description> -+ <description>English (UK, Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> -@@ -764,18 +764,18 @@ - <layout> - <configItem> - <name>kr</name> -- <_shortDescription>ko</_shortDescription> -- <_description>Korean</_description> -+ <shortDescription>ko</shortDescription> -+ <description>Korean</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>sun_type6</name> -- <_description>Korean (Sun Type 6/7)</_description> -+ <description>Korean (Sun Type 6/7)</description> - </configItem> - </variant> - </variantList> - </layout> - </layoutList> - <optionList/> --</xkbConfigRegistry> -+</xkbConfigRegistry> -\ No newline at end of file diff --git a/package/xkeyboard-config/patches/patch-rules_evdev_xml_in b/package/xkeyboard-config/patches/patch-rules_evdev_xml_in deleted file mode 100644 index 57eb6df34..000000000 --- a/package/xkeyboard-config/patches/patch-rules_evdev_xml_in +++ /dev/null @@ -1,7654 +0,0 @@ ---- xkeyboard-config-2.11.orig/rules/evdev.xml.in 2014-01-15 02:05:04.000000000 +0100 -+++ xkeyboard-config-2.11/rules/evdev.xml.in 2014-03-04 14:30:54.000000000 +0100 -@@ -5,627 +5,627 @@ - <model> - <configItem> - <name>pc101</name> -- <_description>Generic 101-key PC</_description> -+ <description>Generic 101-key PC</description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>pc102</name> -- <_description>Generic 102-key (Intl) PC</_description> -+ <description>Generic 102-key (Intl) PC</description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>pc104</name> -- <_description>Generic 104-key PC</_description> -+ <description>Generic 104-key PC</description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>pc105</name> -- <_description>Generic 105-key (Intl) PC</_description> -+ <description>Generic 105-key (Intl) PC</description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dell101</name> -- <_description>Dell 101-key PC</_description> -+ <description>Dell 101-key PC</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>latitude</name> -- <_description>Dell Latitude series laptop</_description> -+ <description>Dell Latitude series laptop</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dellm65</name> -- <_description>Dell Precision M65</_description> -+ <description>Dell Precision M65</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>everex</name> -- <_description>Everex STEPnote</_description> -+ <description>Everex STEPnote</description> - <vendor>Everex</vendor> - </configItem> - </model> - <model> - <configItem> - <name>flexpro</name> -- <_description>Keytronic FlexPro</_description> -+ <description>Keytronic FlexPro</description> - <vendor>Keytronic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoft</name> -- <_description>Microsoft Natural</_description> -+ <description>Microsoft Natural</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>omnikey101</name> -- <_description>Northgate OmniKey 101</_description> -+ <description>Northgate OmniKey 101</description> - <vendor>Northgate</vendor> - </configItem> - </model> - <model> - <configItem> - <name>winbook</name> -- <_description>Winbook Model XP5</_description> -+ <description>Winbook Model XP5</description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>pc98</name> -- <_description>PC-98xx Series</_description> -+ <description>PC-98xx Series</description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>a4techKB21</name> -- <_description>A4Tech KB-21</_description> -+ <description>A4Tech KB-21</description> - <vendor>A4Tech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>a4techKBS8</name> -- <_description>A4Tech KBS-8</_description> -+ <description>A4Tech KBS-8</description> - <vendor>A4Tech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>a4_rfkb23</name> -- <_description>A4Tech Wireless Desktop RFKB-23</_description> -+ <description>A4Tech Wireless Desktop RFKB-23</description> - <vendor>A4Tech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>airkey</name> -- <_description>Acer AirKey V</_description> -+ <description>Acer AirKey V</description> - <vendor>Acer</vendor> - </configItem> - </model> - <model> - <configItem> - <name>azonaRF2300</name> -- <_description>Azona RF2300 wireless Internet Keyboard</_description> -+ <description>Azona RF2300 wireless Internet Keyboard</description> - <vendor>Azona</vendor> - </configItem> - </model> - <model> - <configItem> - <name>scorpius</name> -- <_description>Advance Scorpius KI</_description> -+ <description>Advance Scorpius KI</description> - <vendor>Scorpius</vendor> - </configItem> - </model> - <model> - <configItem> - <name>brother</name> -- <_description>Brother Internet Keyboard</_description> -+ <description>Brother Internet Keyboard</description> - <vendor>Brother</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc5113rf</name> -- <_description>BTC 5113RF Multimedia</_description> -+ <description>BTC 5113RF Multimedia</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc5126t</name> -- <_description>BTC 5126T</_description> -+ <description>BTC 5126T</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc6301urf</name> -- <_description>BTC 6301URF</_description> -+ <description>BTC 6301URF</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc9000</name> -- <_description>BTC 9000</_description> -+ <description>BTC 9000</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc9000a</name> -- <_description>BTC 9000A</_description> -+ <description>BTC 9000A</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc9001ah</name> -- <_description>BTC 9001AH</_description> -+ <description>BTC 9001AH</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc5090</name> -- <_description>BTC 5090</_description> -+ <description>BTC 5090</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc9019u</name> -- <_description>BTC 9019U</_description> -+ <description>BTC 9019U</description> - <vendor>BTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>btc9116u</name> -- <_description>BTC 9116U Mini Wireless Internet and Gaming</_description> -+ <description>BTC 9116U Mini Wireless Internet and Gaming</description> - </configItem> - </model> - <model> - <configItem> - <name>cherryblue</name> -- <_description>Cherry Blue Line CyBo@rd</_description> -+ <description>Cherry Blue Line CyBo@rd</description> - </configItem> - </model> - <model> - <configItem> - <name>cherryblueb</name> -- <_description>Cherry CyMotion Master XPress</_description> -+ <description>Cherry CyMotion Master XPress</description> - <vendor>Cherry</vendor> - </configItem> - </model> - <model> - <configItem> - <name>cherrybluea</name> -- <_description>Cherry Blue Line CyBo@rd (alternate option)</_description> -+ <description>Cherry Blue Line CyBo@rd (alternate option)</description> - <vendor>Cherry</vendor> - </configItem> - </model> - <model> - <configItem> - <name>cherrycyboard</name> -- <_description>Cherry CyBo@rd USB-Hub</_description> -+ <description>Cherry CyBo@rd USB-Hub</description> - <vendor>Cherry</vendor> - </configItem> - </model> - <model> - <configItem> - <name>cherrycmexpert</name> -- <_description>Cherry CyMotion Expert</_description> -+ <description>Cherry CyMotion Expert</description> - <vendor>Cherry</vendor> - </configItem> - </model> - <model> - <configItem> - <name>cherrybunlim</name> -- <_description>Cherry B.UNLIMITED</_description> -+ <description>Cherry B.UNLIMITED</description> - <vendor>Cherry</vendor> - </configItem> - </model> - <model> - <configItem> - <name>chicony</name> -- <_description>Chicony Internet Keyboard</_description> -+ <description>Chicony Internet Keyboard</description> - <vendor>Chicony</vendor> - </configItem> - </model> - <model> - <configItem> - <name>chicony0108</name> -- <_description>Chicony KU-0108</_description> -+ <description>Chicony KU-0108</description> - <vendor>Chicony</vendor> - </configItem> - </model> - <model> - <configItem> - <name>chicony0420</name> -- <_description>Chicony KU-0420</_description> -+ <description>Chicony KU-0420</description> - <vendor>Chicony</vendor> - </configItem> - </model> - <model> - <configItem> - <name>chicony9885</name> -- <_description>Chicony KB-9885</_description> -+ <description>Chicony KB-9885</description> - <vendor>Chicony</vendor> - </configItem> - </model> - <model> - <configItem> - <name>compaqeak8</name> -- <_description>Compaq Easy Access Keyboard</_description> -+ <description>Compaq Easy Access Keyboard</description> - <vendor>Compaq</vendor> - </configItem> - </model> - <model> - <configItem> - <name>compaqik7</name> -- <_description>Compaq Internet Keyboard (7 keys)</_description> -+ <description>Compaq Internet Keyboard (7 keys)</description> - <vendor>Compaq</vendor> - </configItem> - </model> - <model> - <configItem> - <name>compaqik13</name> -- <_description>Compaq Internet Keyboard (13 keys)</_description> -+ <description>Compaq Internet Keyboard (13 keys)</description> - <vendor>Compaq</vendor> - </configItem> - </model> - <model> - <configItem> - <name>compaqik18</name> -- <_description>Compaq Internet Keyboard (18 keys)</_description> -+ <description>Compaq Internet Keyboard (18 keys)</description> - <vendor>Compaq</vendor> - </configItem> - </model> - <model> - <configItem> - <name>cymotionlinux</name> -- <_description>Cherry CyMotion Master Linux</_description> -+ <description>Cherry CyMotion Master Linux</description> - <vendor>Cherry</vendor> - </configItem> - </model> - <model> - <configItem> - <name>armada</name> -- <_description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</_description> -+ <description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</description> - <vendor>Compaq</vendor> - </configItem> - </model> - <model> - <configItem> - <name>presario</name> -- <_description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard</_description> -+ <description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard</description> - <vendor>Compaq</vendor> - </configItem> - </model> - <model> - <configItem> - <name>ipaq</name> -- <_description>Compaq iPaq Keyboard</_description> -+ <description>Compaq iPaq Keyboard</description> - <vendor>Compaq</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dell</name> -- <_description>Dell</_description> -+ <description>Dell</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dellsk8125</name> -- <_description>Dell SK-8125</_description> -+ <description>Dell SK-8125</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dellsk8135</name> -- <_description>Dell SK-8135</_description> -+ <description>Dell SK-8135</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dellusbmm</name> -- <_description>Dell USB Multimedia Keyboard</_description> -+ <description>Dell USB Multimedia Keyboard</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>inspiron</name> -- <_description>Dell Laptop/notebook Inspiron 6xxx/8xxx</_description> -+ <description>Dell Laptop/notebook Inspiron 6xxx/8xxx</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>precision_m</name> -- <_description>Dell Laptop/notebook Precision M series</_description> -+ <description>Dell Laptop/notebook Precision M series</description> - <vendor>Dell</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dexxa</name> -- <_description>Dexxa Wireless Desktop Keyboard</_description> -+ <description>Dexxa Wireless Desktop Keyboard</description> - <vendor>Dexxa</vendor> - </configItem> - </model> - <model> - <configItem> - <name>diamond</name> -- <_description>Diamond 9801 / 9802 series</_description> -+ <description>Diamond 9801 / 9802 series</description> - <vendor>Diamond</vendor> - </configItem> - </model> - <model> - <configItem> - <name>dtk2000</name> -- <_description>DTK2000</_description> -+ <description>DTK2000</description> - </configItem> - </model> - <model> - <configItem> - <name>ennyah_dkb1008</name> -- <_description>Ennyah DKB-1008</_description> -+ <description>Ennyah DKB-1008</description> - <vendor>Ennyah</vendor> - </configItem> - </model> - <model> - <configItem> - <name>fscaa1667g</name> -- <_description>Fujitsu-Siemens Computers AMILO laptop</_description> -+ <description>Fujitsu-Siemens Computers AMILO laptop</description> - <vendor>Fujitsu-Siemens</vendor> - </configItem> - </model> - <model> - <configItem> - <name>genius</name> -- <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910</_description> -+ <description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description> - <vendor>Genius</vendor> - </configItem> - </model> - <model> - <configItem> - <name>geniuscomfy</name> -- <_description>Genius Comfy KB-12e</_description> -+ <description>Genius Comfy KB-12e</description> - <vendor>Genius</vendor> - </configItem> - </model> - <model> - <configItem> - <name>geniuscomfy2</name> -- <_description>Genius Comfy KB-21e-Scroll</_description> -+ <description>Genius Comfy KB-21e-Scroll</description> - <vendor>Genius</vendor> - </configItem> - </model> - <model> - <configItem> - <name>geniuskb19e</name> -- <_description>Genius KB-19e NB</_description> -+ <description>Genius KB-19e NB</description> - <vendor>Genius</vendor> - </configItem> - </model> - <model> - <configItem> - <name>geniuskkb2050hs</name> -- <_description>Genius KKB-2050HS</_description> -+ <description>Genius KKB-2050HS</description> - <vendor>Genius</vendor> - </configItem> - </model> - <model> - <configItem> - <name>gyration</name> -- <_description>Gyration</_description> -+ <description>Gyration</description> - <vendor>Gyration</vendor> - </configItem> - </model> - <model> - <configItem> - <name>htcdream</name> -- <_description>HTC Dream</_description> -+ <description>HTC Dream</description> - <vendor>HTC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>kinesis</name> -- <_description>Kinesis</_description> -+ <description>Kinesis</description> - <vendor>Kinesis</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logitech_base</name> -- <_description>Logitech Generic Keyboard</_description> -+ <description>Logitech Generic Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logitech_g15</name> -- <_description>Logitech G15 extra keys via G15daemon</_description> -+ <description>Logitech G15 extra keys via G15daemon</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpi6</name> -- <_description>Hewlett-Packard Internet Keyboard</_description> -+ <description>Hewlett-Packard Internet Keyboard</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hp250x</name> -- <_description>Hewlett-Packard SK-250x Multimedia Keyboard</_description> -+ <description>Hewlett-Packard SK-250x Multimedia Keyboard</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpxe3gc</name> -- <_description>Hewlett-Packard Omnibook XE3 GC</_description> -+ <description>Hewlett-Packard Omnibook XE3 GC</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpxe3gf</name> -- <_description>Hewlett-Packard Omnibook XE3 GF</_description> -+ <description>Hewlett-Packard Omnibook XE3 GF</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpxt1000</name> -- <_description>Hewlett-Packard Omnibook XT1000</_description> -+ <description>Hewlett-Packard Omnibook XT1000</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpdv5</name> -- <_description>Hewlett-Packard Pavilion dv5</_description> -+ <description>Hewlett-Packard Pavilion dv5</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpzt11xx</name> -- <_description>Hewlett-Packard Pavilion ZT11xx</_description> -+ <description>Hewlett-Packard Pavilion ZT11xx</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hp500fa</name> -- <_description>Hewlett-Packard Omnibook 500 FA</_description> -+ <description>Hewlett-Packard Omnibook 500 FA</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hp5xx</name> -- <_description>Hewlett-Packard Omnibook 5xx</_description> -+ <description>Hewlett-Packard Omnibook 5xx</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpnx9020</name> -- <_description>Hewlett-Packard nx9020</_description> -+ <description>Hewlett-Packard nx9020</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hp6000</name> -- <_description>Hewlett-Packard Omnibook 6000/6100</_description> -+ <description>Hewlett-Packard Omnibook 6000/6100</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>honeywell_euroboard</name> -- <_description>Honeywell Euroboard</_description> -+ <description>Honeywell Euroboard</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hpmini110</name> -- <_description>Hewlett-Packard Mini 110 Notebook</_description> -+ <description>Hewlett-Packard Mini 110 Notebook</description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>rapidaccess</name> -- <_description>IBM Rapid Access</_description> -+ <description>IBM Rapid Access</description> - <vendor>Lenovo (previously IBM)</vendor> - </configItem> - </model> - <model> - <configItem> - <name>rapidaccess2</name> -- <_description>IBM Rapid Access II</_description> -+ <description>IBM Rapid Access II</description> - <vendor>Lenovo (previously IBM)</vendor> - </configItem> - </model> - <model> - <configItem> - <name>thinkpad</name> -- <_description>IBM ThinkPad 560Z/600/600E/A22E</_description> -+ <description>IBM ThinkPad 560Z/600/600E/A22E</description> - <vendor>Lenovo (previously IBM)</vendor> - </configItem> - </model> - <model> - <configItem> - <name>thinkpad60</name> -- <_description>IBM ThinkPad R60/T60/R61/T61</_description> -+ <description>IBM ThinkPad R60/T60/R61/T61</description> - <vendor>Lenovo (previously IBM)</vendor> - </configItem> - </model> - <model> - <configItem> - <name>thinkpadz60</name> -- <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</_description> -+ <description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</description> - <vendor>Lenovo (previously IBM)</vendor> - </configItem> - </model> - <model> - <configItem> - <name>ibm_spacesaver</name> -- <_description>IBM Space Saver</_description> -+ <description>IBM Space Saver</description> - <vendor>Lenovo (previously IBM)</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiaccess</name> -- <_description>Logitech Access Keyboard</_description> -+ <description>Logitech Access Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiclx300</name> -- <_description>Logitech Cordless Desktop LX-300</_description> -+ <description>Logitech Cordless Desktop LX-300</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logii350</name> -- <_description>Logitech Internet 350 Keyboard</_description> -+ <description>Logitech Internet 350 Keyboard</description> - <vendor>Logitech</vendor> - <hwList> <hwId>046d:c313</hwId></hwList> - </configItem> -@@ -633,665 +633,665 @@ - <model> - <configItem> - <name>logimel</name> -- <_description>Logitech Media Elite Keyboard</_description> -+ <description>Logitech Media Elite Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicd</name> -- <_description>Logitech Cordless Desktop</_description> -+ <description>Logitech Cordless Desktop</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicd_it</name> -- <_description>Logitech Cordless Desktop iTouch</_description> -+ <description>Logitech Cordless Desktop iTouch</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicd_nav</name> -- <_description>Logitech Cordless Desktop Navigator</_description> -+ <description>Logitech Cordless Desktop Navigator</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicd_opt</name> -- <_description>Logitech Cordless Desktop Optical</_description> -+ <description>Logitech Cordless Desktop Optical</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicda</name> -- <_description>Logitech Cordless Desktop (alternate option)</_description> -+ <description>Logitech Cordless Desktop (alternate option)</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicdpa2</name> -- <_description>Logitech Cordless Desktop Pro (alternate option 2)</_description> -+ <description>Logitech Cordless Desktop Pro (alternate option 2)</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicfn</name> -- <_description>Logitech Cordless Freedom/Desktop Navigator</_description> -+ <description>Logitech Cordless Freedom/Desktop Navigator</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicdn</name> -- <_description>Logitech Cordless Desktop Navigator</_description> -+ <description>Logitech Cordless Desktop Navigator</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiitc</name> -- <_description>Logitech iTouch Cordless Keyboard (model Y-RB6)</_description> -+ <description>Logitech iTouch Cordless Keyboard (model Y-RB6)</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiik</name> -- <_description>Logitech Internet Keyboard</_description> -+ <description>Logitech Internet Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>itouch</name> -- <_description>Logitech iTouch</_description> -+ <description>Logitech iTouch</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logicink</name> -- <_description>Logitech Internet Navigator Keyboard</_description> -+ <description>Logitech Internet Navigator Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiex110</name> -- <_description>Logitech Cordless Desktop EX110</_description> -+ <description>Logitech Cordless Desktop EX110</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiinkse</name> -- <_description>Logitech iTouch Internet Navigator Keyboard SE</_description> -+ <description>Logitech iTouch Internet Navigator Keyboard SE</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiinkseusb</name> -- <_description>Logitech iTouch Internet Navigator Keyboard SE (USB)</_description> -+ <description>Logitech iTouch Internet Navigator Keyboard SE (USB)</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiultrax</name> -- <_description>Logitech Ultra-X Keyboard</_description> -+ <description>Logitech Ultra-X Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logiultraxc</name> -- <_description>Logitech Ultra-X Cordless Media Desktop Keyboard</_description> -+ <description>Logitech Ultra-X Cordless Media Desktop Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logidinovo</name> -- <_description>Logitech diNovo Keyboard</_description> -+ <description>Logitech diNovo Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>logidinovoedge</name> -- <_description>Logitech diNovo Edge Keyboard</_description> -+ <description>Logitech diNovo Edge Keyboard</description> - <vendor>Logitech</vendor> - </configItem> - </model> - <model> - <configItem> - <name>mx1998</name> -- <_description>Memorex MX1998</_description> -+ <description>Memorex MX1998</description> - <vendor>Memorex</vendor> - </configItem> - </model> - <model> - <configItem> - <name>mx2500</name> -- <_description>Memorex MX2500 EZ-Access Keyboard</_description> -+ <description>Memorex MX2500 EZ-Access Keyboard</description> - <vendor>Memorex</vendor> - </configItem> - </model> - <model> - <configItem> - <name>mx2750</name> -- <_description>Memorex MX2750</_description> -+ <description>Memorex MX2750</description> - <vendor>Memorex</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoft4000</name> -- <_description>Microsoft Natural Wireless Ergonomic Keyboard 4000</_description> -+ <description>Microsoft Natural Wireless Ergonomic Keyboard 4000</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoft7000</name> -- <_description>Microsoft Natural Wireless Ergonomic Keyboard 7000</_description> -+ <description>Microsoft Natural Wireless Ergonomic Keyboard 7000</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftinet</name> -- <_description>Microsoft Internet Keyboard</_description> -+ <description>Microsoft Internet Keyboard</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftpro</name> -- <_description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</_description> -+ <description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftprousb</name> -- <_description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</_description> -+ <description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftprooem</name> -- <_description>Microsoft Natural Keyboard Pro OEM</_description> -+ <description>Microsoft Natural Keyboard Pro OEM</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>vsonku306</name> -- <_description>ViewSonic KU-306 Internet Keyboard</_description> -+ <description>ViewSonic KU-306 Internet Keyboard</description> - <vendor>ViewSonic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftprose</name> -- <_description>Microsoft Internet Keyboard Pro, Swedish</_description> -+ <description>Microsoft Internet Keyboard Pro, Swedish</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftoffice</name> -- <_description>Microsoft Office Keyboard</_description> -+ <description>Microsoft Office Keyboard</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftmult</name> -- <_description>Microsoft Wireless Multimedia Keyboard 1.0A</_description> -+ <description>Microsoft Wireless Multimedia Keyboard 1.0A</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftelite</name> -- <_description>Microsoft Natural Keyboard Elite</_description> -+ <description>Microsoft Natural Keyboard Elite</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>microsoftccurve2k</name> -- <_description>Microsoft Comfort Curve Keyboard 2000</_description> -+ <description>Microsoft Comfort Curve Keyboard 2000</description> - <vendor>Microsoft Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>oretec</name> -- <_description>Ortek MCK-800 MM/Internet keyboard</_description> -+ <description>Ortek MCK-800 MM/Internet keyboard</description> - <vendor>Ortek</vendor> - </configItem> - </model> - <model> - <configItem> - <name>propeller</name> -- <_description>Propeller Voyager (KTEZ-1000)</_description> -+ <description>Propeller Voyager (KTEZ-1000)</description> - <vendor>KeyTronic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>qtronix</name> -- <_description>QTronix Scorpius 98N+</_description> -+ <description>QTronix Scorpius 98N+</description> - <vendor>QTronix</vendor> - </configItem> - </model> - <model> - <configItem> - <name>samsung4500</name> -- <_description>Samsung SDM 4500P</_description> -+ <description>Samsung SDM 4500P</description> - <vendor>Samsung</vendor> - </configItem> - </model> - <model> - <configItem> - <name>samsung4510</name> -- <_description>Samsung SDM 4510P</_description> -+ <description>Samsung SDM 4510P</description> - <vendor>Samsung</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sanwaskbkg3</name> -- <_description>Sanwa Supply SKB-KG3</_description> -+ <description>Sanwa Supply SKB-KG3</description> - <vendor>Sanwa Supply Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sk1300</name> -- <_description>SK-1300</_description> -+ <description>SK-1300</description> - <vendor>NEC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sk2500</name> -- <_description>SK-2500</_description> -+ <description>SK-2500</description> - <vendor>NEC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sk6200</name> -- <_description>SK-6200</_description> -+ <description>SK-6200</description> - <vendor>NEC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sk7100</name> -- <_description>SK-7100</_description> -+ <description>SK-7100</description> - <vendor>NEC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sp_inet</name> -- <_description>Super Power Multimedia Keyboard</_description> -+ <description>Super Power Multimedia Keyboard</description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sven</name> -- <_description>SVEN Ergonomic 2500</_description> -+ <description>SVEN Ergonomic 2500</description> - <vendor>SVEN</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sven303</name> -- <_description>SVEN Slim 303</_description> -+ <description>SVEN Slim 303</description> - <vendor>SVEN</vendor> - </configItem> - </model> - <model> - <configItem> - <name>symplon</name> -- <_description>Symplon PaceBook (tablet PC)</_description> -+ <description>Symplon PaceBook (tablet PC)</description> - <vendor>Symplon</vendor> - </configItem> - </model> - <model> - <configItem> - <name>toshiba_s3000</name> -- <_description>Toshiba Satellite S3000</_description> -+ <description>Toshiba Satellite S3000</description> - <vendor>Toshiba</vendor> - </configItem> - </model> - <model> - <configItem> - <name>trust</name> -- <_description>Trust Wireless Keyboard Classic</_description> -+ <description>Trust Wireless Keyboard Classic</description> - <vendor>Trust</vendor> - </configItem> - </model> - <model> - <configItem> - <name>trustda</name> -- <_description>Trust Direct Access Keyboard</_description> -+ <description>Trust Direct Access Keyboard</description> - <vendor>Trust</vendor> - </configItem> - </model> - <model> - <configItem> - <name>trust_slimline</name> -- <_description>Trust Slimline</_description> -+ <description>Trust Slimline</description> - <vendor>Trust</vendor> - </configItem> - </model> - <model> - <configItem> - <name>tm2020</name> -- <_description>TypeMatrix EZ-Reach 2020</_description> -+ <description>TypeMatrix EZ-Reach 2020</description> - <vendor>TypeMatrix</vendor> - </configItem> - </model> - <model> - <configItem> - <name>tm2030PS2</name> -- <_description>TypeMatrix EZ-Reach 2030 PS2</_description> -+ <description>TypeMatrix EZ-Reach 2030 PS2</description> - <vendor>TypeMatrix</vendor> - </configItem> - </model> - <model> - <configItem> - <name>tm2030USB</name> -- <_description>TypeMatrix EZ-Reach 2030 USB</_description> -+ <description>TypeMatrix EZ-Reach 2030 USB</description> - <vendor>TypeMatrix</vendor> - </configItem> - </model> - <model> - <configItem> - <name>tm2030USB-102</name> -- <_description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</_description> -+ <description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</description> - <vendor>TypeMatrix</vendor> - </configItem> - </model> - <model> - <configItem> - <name>tm2030USB-106</name> -- <_description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</_description> -+ <description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</description> - <vendor>TypeMatrix</vendor> - </configItem> - </model> - <model> - <configItem> - <name>yahoo</name> -- <_description>Yahoo! Internet Keyboard</_description> -+ <description>Yahoo! Internet Keyboard</description> - <vendor>Yahoo!</vendor> - </configItem> - </model> - <model> - <configItem> - <name>macbook78</name> -- <_description>MacBook/MacBook Pro</_description> -+ <description>MacBook/MacBook Pro</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>macbook79</name> -- <_description>MacBook/MacBook Pro (Intl)</_description> -+ <description>MacBook/MacBook Pro (Intl)</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>macintosh</name> -- <_description>Macintosh</_description> -+ <description>Macintosh</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>macintosh_old</name> -- <_description>Macintosh Old</_description> -+ <description>Macintosh Old</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>macintosh_hhk</name> -- <_description>Happy Hacking Keyboard for Mac</_description> -+ <description>Happy Hacking Keyboard for Mac</description> - <vendor>Fujitsu</vendor> - </configItem> - </model> - <model> - <configItem> - <name>acer_c300</name> -- <_description>Acer C300</_description> -+ <description>Acer C300</description> - <vendor>Acer</vendor> - </configItem> - </model> - <model> - <configItem> - <name>acer_ferrari4k</name> -- <_description>Acer Ferrari 4000</_description> -+ <description>Acer Ferrari 4000</description> - <vendor>Acer</vendor> - </configItem> - </model> - <model> - <configItem> - <name>acer_laptop</name> -- <_description>Acer Laptop</_description> -+ <description>Acer Laptop</description> - <vendor>Acer</vendor> - </configItem> - </model> - <model> - <configItem> - <name>asus_laptop</name> -- <_description>Asus Laptop</_description> -+ <description>Asus Laptop</description> - <vendor>Asus</vendor> - </configItem> - </model> - <model> - <configItem> - <name>apple</name> -- <_description>Apple</_description> -+ <description>Apple</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>apple_laptop</name> -- <_description>Apple Laptop</_description> -+ <description>Apple Laptop</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>applealu_ansi</name> -- <_description>Apple Aluminium Keyboard (ANSI)</_description> -+ <description>Apple Aluminium Keyboard (ANSI)</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>applealu_iso</name> -- <_description>Apple Aluminium Keyboard (ISO)</_description> -+ <description>Apple Aluminium Keyboard (ISO)</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>applealu_jis</name> -- <_description>Apple Aluminium Keyboard (JIS)</_description> -+ <description>Apple Aluminium Keyboard (JIS)</description> - <vendor>Apple</vendor> - </configItem> - </model> - <model> - <configItem> - <name>silvercrest</name> -- <_description>SILVERCREST Multimedia Wireless Keyboard</_description> -+ <description>SILVERCREST Multimedia Wireless Keyboard</description> - <vendor>Silvercrest</vendor> - </configItem> - </model> - <model> - <configItem> - <name>emachines</name> -- <_description>Laptop/notebook eMachines m68xx</_description> -+ <description>Laptop/notebook eMachines m68xx</description> - <vendor>eMachines</vendor> - </configItem> - </model> - <model> - <configItem> - <name>benqx</name> -- <_description>BenQ X-Touch</_description> -+ <description>BenQ X-Touch</description> - <vendor>BenQ</vendor> - </configItem> - </model> - <model> - <configItem> - <name>benqx730</name> -- <_description>BenQ X-Touch 730</_description> -+ <description>BenQ X-Touch 730</description> - <vendor>BenQ</vendor> - </configItem> - </model> - <model> - <configItem> - <name>benqx800</name> -- <_description>BenQ X-Touch 800</_description> -+ <description>BenQ X-Touch 800</description> - <vendor>BenQ</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hhk</name> -- <_description>Happy Hacking Keyboard</_description> -+ <description>Happy Hacking Keyboard</description> - <vendor>Fujitsu</vendor> - </configItem> - </model> - <model> - <configItem> - <name>classmate</name> -- <_description>Classmate PC</_description> -+ <description>Classmate PC</description> - <vendor>Intel</vendor> - </configItem> - </model> - <model> - <configItem> - <name>olpc</name> -- <_description>OLPC</_description> -+ <description>OLPC</description> - <vendor>OLPC</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type7_usb</name> -- <_description>Sun Type 7 USB</_description> -+ <description>Sun Type 7 USB</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type7_euro_usb</name> -- <_description>Sun Type 7 USB (European layout)</_description> -+ <description>Sun Type 7 USB (European layout)</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type7_unix_usb</name> -- <_description>Sun Type 7 USB (Unix layout)</_description> -+ <description>Sun Type 7 USB (Unix layout)</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type7_jp_usb</name> -- <_description>Sun Type 7 USB (Japanese layout) / Japanese 106-key</_description> -+ <description>Sun Type 7 USB (Japanese layout) / Japanese 106-key</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type6_usb</name> -- <_description>Sun Type 6/7 USB</_description> -+ <description>Sun Type 6/7 USB</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type6_euro_usb</name> -- <_description>Sun Type 6/7 USB (European layout)</_description> -+ <description>Sun Type 6/7 USB (European layout)</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type6_unix_usb</name> -- <_description>Sun Type 6 USB (Unix layout)</_description> -+ <description>Sun Type 6 USB (Unix layout)</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type6_jp_usb</name> -- <_description>Sun Type 6 USB (Japanese layout)</_description> -+ <description>Sun Type 6 USB (Japanese layout)</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>sun_type6_jp</name> -- <_description>Sun Type 6 (Japanese layout)</_description> -+ <description>Sun Type 6 (Japanese layout)</description> - <vendor>Sun Microsystems</vendor> - </configItem> - </model> - <model> - <configItem> - <name>targa_v811</name> -- <_description>Targa Visionary 811</_description> -+ <description>Targa Visionary 811</description> - <vendor>Targa</vendor> - </configItem> - </model> - <model> - <configItem> - <name>unitekkb1925</name> -- <_description>Unitek KB-1925</_description> -+ <description>Unitek KB-1925</description> - <vendor>Unitek Group</vendor> - </configItem> - </model> - <model> - <configItem> - <name>compalfl90</name> -- <_description>FL90</_description> -+ <description>FL90</description> - <vendor>Compal Electronics Inc.</vendor> - </configItem> - </model> - <model> - <configItem> - <name>creativedw7000</name> -- <_description>Creative Desktop Wireless 7000</_description> -+ <description>Creative Desktop Wireless 7000</description> - <vendor>Creative</vendor> - </configItem> - </model> - <model> - <configItem> - <name>htcdream</name> -- <_description>Htc Dream phone</_description> -+ <description>Htc Dream phone</description> - <vendor>htc</vendor> - </configItem> - </model> -@@ -1300,9 +1300,9 @@ - <layout> - <configItem> - <name>us</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (US)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (US)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -1311,9 +1311,9 @@ - <variant> - <configItem> - <name>chr</name> -- <!-- Keyboard indicator for Cherokee layouts --> -- <_shortDescription>chr</_shortDescription> -- <_description>Cherokee</_description> -+ -+ <shortDescription>chr</shortDescription> -+ <description>Cherokee</description> - <languageList> - <iso639Id>chr</iso639Id> - </languageList> -@@ -1322,75 +1322,75 @@ - <variant> - <configItem> - <name>euro</name> -- <_description>English (US, with euro on 5)</_description> -+ <description>English (US, with euro on 5)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>intl</name> -- <_description>English (US, international with dead keys)</_description> -+ <description>English (US, international with dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>alt-intl</name> -- <_description>English (US, alternative international)</_description> -+ <description>English (US, alternative international)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>colemak</name> -- <_description>English (Colemak)</_description> -+ <description>English (Colemak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>English (Dvorak)</_description> -+ <description>English (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak-intl</name> -- <_description>English (Dvorak, international with dead keys)</_description> -+ <description>English (Dvorak, international with dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak-alt-intl</name> -- <_description>English (Dvorak alternative international no dead keys)</_description> -+ <description>English (Dvorak alternative international no dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak-l</name> -- <_description>English (left handed Dvorak)</_description> -+ <description>English (left handed Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak-r</name> -- <_description>English (right handed Dvorak)</_description> -+ <description>English (right handed Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak-classic</name> -- <_description>English (classic Dvorak)</_description> -+ <description>English (classic Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvp</name> -- <_description>English (programmer Dvorak)</_description> -+ <description>English (programmer Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>rus</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (US, phonetic)</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian (US, phonetic)</description> - <languageList> - <iso639Id>rus</iso639Id> - </languageList> -@@ -1399,13 +1399,13 @@ - <variant> - <configItem> - <name>mac</name> -- <_description>English (Macintosh)</_description> -+ <description>English (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>altgr-intl</name> -- <_description>English (international AltGr dead keys)</_description> -+ <description>English (international AltGr dead keys)</description> - <languageList><iso639Id>eng</iso639Id> - <iso639Id>fra</iso639Id> - <iso639Id>ger</iso639Id></languageList> -@@ -1414,13 +1414,13 @@ - <variant> - <configItem> - <name>olpc2</name> -- <_description>English (the divide/multiply keys toggle the layout)</_description> -+ <description>English (the divide/multiply keys toggle the layout)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>hbs</name> -- <_description>Serbo-Croatian (US)</_description> -+ <description>Serbo-Croatian (US)</description> - <languageList><iso639Id>eng</iso639Id> - <iso639Id>bos</iso639Id> - <iso639Id>hbs</iso639Id> -@@ -1431,13 +1431,13 @@ - <variant> - <configItem> - <name>workman</name> -- <_description>English (Workman)</_description> -+ <description>English (Workman)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>workman-intl</name> -- <_description>English (Workman, international with dead keys)</_description> -+ <description>English (Workman, international with dead keys)</description> - </configItem> - </variant> - </variantList> -@@ -1445,17 +1445,17 @@ - <layout> - <configItem> - <name>af</name> -- <!-- Keyboard indicator for Afghani layouts --> -- <_shortDescription>fa</_shortDescription> -- <_description>Afghani</_description> -+ -+ <shortDescription>fa</shortDescription> -+ <description>Afghani</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>ps</name> -- <!-- Keyboard indicator for Pashto layouts --> -- <_shortDescription>ps</_shortDescription> -- <_description>Pashto</_description> -+ -+ <shortDescription>ps</shortDescription> -+ <description>Pashto</description> - <languageList> - <iso639Id>pus</iso639Id> - </languageList> -@@ -1464,9 +1464,9 @@ - <variant> - <configItem> - <name>uz</name> -- <!-- Keyboard indicator for Uzbek layouts --> -- <_shortDescription>uz</_shortDescription> -- <_description>Uzbek (Afghanistan)</_description> -+ -+ <shortDescription>uz</shortDescription> -+ <description>Uzbek (Afghanistan)</description> - <languageList> - <iso639Id>uzb</iso639Id> - </languageList> -@@ -1475,9 +1475,9 @@ - <variant> - <configItem> - <name>olpc-ps</name> -- <!-- Keyboard indicator for Pashto layouts --> -- <_shortDescription>ps</_shortDescription> -- <_description>Pashto (Afghanistan, OLPC)</_description> -+ -+ <shortDescription>ps</shortDescription> -+ <description>Pashto (Afghanistan, OLPC)</description> - <languageList> - <iso639Id>pus</iso639Id> - </languageList> -@@ -1486,17 +1486,17 @@ - <variant> - <configItem> - <name>fa-olpc</name> -- <!-- Keyboard indicator for Persian layouts --> -- <_shortDescription>fa</_shortDescription> -- <_description>Persian (Afghanistan, Dari OLPC)</_description> -+ -+ <shortDescription>fa</shortDescription> -+ <description>Persian (Afghanistan, Dari OLPC)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>uz-olpc</name> -- <!-- Keyboard indicator for Uzbek layouts --> -- <_shortDescription>uz</_shortDescription> -- <_description>Uzbek (Afghanistan, OLPC)</_description> -+ -+ <shortDescription>uz</shortDescription> -+ <description>Uzbek (Afghanistan, OLPC)</description> - <languageList> - <iso639Id>uzb</iso639Id> - </languageList> -@@ -1507,9 +1507,9 @@ - <layout> - <configItem> - <name>ara</name> -- <!-- Keyboard indicator for Arabic layouts --> -- <_shortDescription>ar</_shortDescription> -- <_description>Arabic</_description> -+ -+ <shortDescription>ar</shortDescription> -+ <description>Arabic</description> - <countryList> - <iso3166Id>AE</iso3166Id> - <iso3166Id>BH</iso3166Id> -@@ -1539,37 +1539,37 @@ - <variant> - <configItem> - <name>azerty</name> -- <_description>Arabic (azerty)</_description> -+ <description>Arabic (azerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>azerty_digits</name> -- <_description>Arabic (azerty/digits)</_description> -+ <description>Arabic (azerty/digits)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>digits</name> -- <_description>Arabic (digits)</_description> -+ <description>Arabic (digits)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty</name> -- <_description>Arabic (qwerty)</_description> -+ <description>Arabic (qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty_digits</name> -- <_description>Arabic (qwerty/digits)</_description> -+ <description>Arabic (qwerty/digits)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>buckwalter</name> -- <_description>Arabic (Buckwalter)</_description> -+ <description>Arabic (Buckwalter)</description> - </configItem> - </variant> - </variantList> -@@ -1577,9 +1577,9 @@ - <layout> - <configItem> - <name>al</name> -- <!-- Keyboard indicator for Albanian layouts --> -- <_shortDescription>sq</_shortDescription> -- <_description>Albanian</_description> -+ -+ <shortDescription>sq</shortDescription> -+ <description>Albanian</description> - <languageList> - <iso639Id>alb</iso639Id> - </languageList> -@@ -1589,9 +1589,9 @@ - <layout> - <configItem> - <name>am</name> -- <!-- Keyboard indicator for Armenian layouts --> -- <_shortDescription>hy</_shortDescription> -- <_description>Armenian</_description> -+ -+ <shortDescription>hy</shortDescription> -+ <description>Armenian</description> - <languageList> - <iso639Id>hye</iso639Id> - </languageList> -@@ -1600,31 +1600,31 @@ - <variant> - <configItem> - <name>phonetic</name> -- <_description>Armenian (phonetic)</_description> -+ <description>Armenian (phonetic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>phonetic-alt</name> -- <_description>Armenian (alternative phonetic)</_description> -+ <description>Armenian (alternative phonetic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>eastern</name> -- <_description>Armenian (eastern)</_description> -+ <description>Armenian (eastern)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>western</name> -- <_description>Armenian (western)</_description> -+ <description>Armenian (western)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>eastern-alt</name> -- <_description>Armenian (alternative eastern)</_description> -+ <description>Armenian (alternative eastern)</description> - </configItem> - </variant> - </variantList> -@@ -1632,9 +1632,9 @@ - <layout> - <configItem> - <name>at</name> -- <!-- Keyboard indicator for German layouts --> -- <_shortDescription>de</_shortDescription> -- <_description>German (Austria)</_description> -+ -+ <shortDescription>de</shortDescription> -+ <description>German (Austria)</description> - <languageList> - <iso639Id>ger</iso639Id> - </languageList> -@@ -1643,19 +1643,19 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>German (Austria, eliminate dead keys)</_description> -+ <description>German (Austria, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>German (Austria, Sun dead keys)</_description> -+ <description>German (Austria, Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>German (Austria, Macintosh)</_description> -+ <description>German (Austria, Macintosh)</description> - </configItem> - </variant> - </variantList> -@@ -1663,9 +1663,9 @@ - <layout> - <configItem> - <name>az</name> -- <!-- Keyboard indicator for Azerbaijani layouts --> -- <_shortDescription>az</_shortDescription> -- <_description>Azerbaijani</_description> -+ -+ <shortDescription>az</shortDescription> -+ <description>Azerbaijani</description> - <languageList> - <iso639Id>aze</iso639Id> - </languageList> -@@ -1674,7 +1674,7 @@ - <variant> - <configItem> - <name>cyrillic</name> -- <_description>Azerbaijani (Cyrillic)</_description> -+ <description>Azerbaijani (Cyrillic)</description> - </configItem> - </variant> - </variantList> -@@ -1682,9 +1682,9 @@ - <layout> - <configItem> - <name>by</name> -- <!-- Keyboard indicator for Belarusian layouts --> -- <_shortDescription>by</_shortDescription> -- <_description>Belarusian</_description> -+ -+ <shortDescription>by</shortDescription> -+ <description>Belarusian</description> - <languageList> - <iso639Id>bel</iso639Id> - </languageList> -@@ -1693,13 +1693,13 @@ - <variant> - <configItem> - <name>legacy</name> -- <_description>Belarusian (legacy)</_description> -+ <description>Belarusian (legacy)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latin</name> -- <_description>Belarusian (Latin)</_description> -+ <description>Belarusian (Latin)</description> - </configItem> - </variant> - </variantList> -@@ -1707,9 +1707,9 @@ - <layout> - <configItem> - <name>be</name> -- <!-- Keyboard indicator for Belgian layouts --> -- <_shortDescription>be</_shortDescription> -- <_description>Belgian</_description> -+ -+ <shortDescription>be</shortDescription> -+ <description>Belgian</description> - <languageList><iso639Id>ger</iso639Id> - <iso639Id>nld</iso639Id> - <iso639Id>fra</iso639Id></languageList> -@@ -1718,43 +1718,43 @@ - <variant> - <configItem> - <name>oss</name> -- <_description>Belgian (alternative)</_description> -+ <description>Belgian (alternative)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>oss_latin9</name> -- <_description>Belgian (alternative, Latin-9 only)</_description> -+ <description>Belgian (alternative, Latin-9 only)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>oss_sundeadkeys</name> -- <_description>Belgian (alternative, Sun dead keys)</_description> -+ <description>Belgian (alternative, Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>iso-alternate</name> -- <_description>Belgian (ISO alternate)</_description> -+ <description>Belgian (ISO alternate)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Belgian (eliminate dead keys)</_description> -+ <description>Belgian (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>Belgian (Sun dead keys)</_description> -+ <description>Belgian (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>wang</name> -- <_description>Belgian (Wang model 724 azerty)</_description> -+ <description>Belgian (Wang model 724 azerty)</description> - </configItem> - </variant> - </variantList> -@@ -1762,9 +1762,9 @@ - <layout> - <configItem> - <name>bd</name> -- <!-- Keyboard indicator for Bangla layouts --> -- <_shortDescription>bn</_shortDescription> -- <_description>Bangla</_description> -+ -+ <shortDescription>bn</shortDescription> -+ <description>Bangla</description> - <languageList> - <iso639Id>ben</iso639Id> - </languageList> -@@ -1773,7 +1773,7 @@ - <variant> - <configItem> - <name>probhat</name> -- <_description>Bangla (Probhat)</_description> -+ <description>Bangla (Probhat)</description> - </configItem> - </variant> - </variantList> -@@ -1781,17 +1781,17 @@ - <layout> - <configItem> - <name>in</name> -- <!-- Keyboard indicator for Indian layouts --> -- <_shortDescription>in</_shortDescription> -- <_description>Indian</_description> -+ -+ <shortDescription>in</shortDescription> -+ <description>Indian</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>ben</name> -- <!-- Keyboard indicator for Bangla layouts --> -- <_shortDescription>bn</_shortDescription> -- <_description>Bangla (India)</_description> -+ -+ <shortDescription>bn</shortDescription> -+ <description>Bangla (India)</description> - <languageList> - <iso639Id>ben</iso639Id> - </languageList> -@@ -1800,9 +1800,9 @@ - <variant> - <configItem> - <name>ben_probhat</name> -- <!-- Keyboard indicator for Bangla layouts --> -- <_shortDescription>bn</_shortDescription> -- <_description>Bangla (India, Probhat)</_description> -+ -+ <shortDescription>bn</shortDescription> -+ <description>Bangla (India, Probhat)</description> - <languageList> - <iso639Id>ben</iso639Id> - </languageList> -@@ -1811,28 +1811,28 @@ - <variant> - <configItem> - <name>ben_baishakhi</name> -- <_description>Bangla (India, Baishakhi)</_description> -+ <description>Bangla (India, Baishakhi)</description> - <languageList><iso639Id>ben</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>ben_bornona</name> -- <_description>Bangla (India, Bornona)</_description> -+ <description>Bangla (India, Bornona)</description> - <languageList><iso639Id>ben</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>ben_gitanjali</name> -- <_description>Bangla (India, Uni Gitanjali)</_description> -+ <description>Bangla (India, Uni Gitanjali)</description> - <languageList><iso639Id>ben</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>ben_inscript</name> -- <_description>Bangla (India, Baishakhi Inscript)</_description> -+ <description>Bangla (India, Baishakhi Inscript)</description> - <languageList><iso639Id>ben</iso639Id></languageList> - </configItem> - </variant> -@@ -1846,9 +1846,9 @@ - <variant> - <configItem> - <name>guj</name> -- <!-- Keyboard indicator for Gujarati layouts --> -- <_shortDescription>gu</_shortDescription> -- <_description>Gujarati</_description> -+ -+ <shortDescription>gu</shortDescription> -+ <description>Gujarati</description> - <languageList> - <iso639Id>guj</iso639Id> - </languageList> -@@ -1857,9 +1857,9 @@ - <variant> - <configItem> - <name>guru</name> -- <!-- Keyboard indicator for Punjabi layouts --> -- <_shortDescription>pa</_shortDescription> -- <_description>Punjabi (Gurmukhi)</_description> -+ -+ <shortDescription>pa</shortDescription> -+ <description>Punjabi (Gurmukhi)</description> - <languageList> - <iso639Id>pan</iso639Id> - </languageList> -@@ -1868,9 +1868,9 @@ - <variant> - <configItem> - <name>jhelum</name> -- <!-- Keyboard indicator for Punjabi layouts --> -- <_shortDescription>pa</_shortDescription> -- <_description>Punjabi (Gurmukhi Jhelum)</_description> -+ -+ <shortDescription>pa</shortDescription> -+ <description>Punjabi (Gurmukhi Jhelum)</description> - <languageList> - <iso639Id>pan</iso639Id> - </languageList> -@@ -1879,9 +1879,9 @@ - <variant> - <configItem> - <name>kan</name> -- <!-- Keyboard indicator for Kannada layouts --> -- <_shortDescription>kn</_shortDescription> -- <_description>Kannada</_description> -+ -+ <shortDescription>kn</shortDescription> -+ <description>Kannada</description> - <languageList> - <iso639Id>kan</iso639Id> - </languageList> -@@ -1890,9 +1890,9 @@ - <variant> - <configItem> - <name>kan-kagapa</name> -- <!-- Keyboard indicator for Kannada layouts --> -- <_shortDescription>kn</_shortDescription> -- <_description>Kannada (KaGaPa phonetic)</_description> -+ -+ <shortDescription>kn</shortDescription> -+ <description>Kannada (KaGaPa phonetic)</description> - <languageList> - <iso639Id>kan</iso639Id> - </languageList> -@@ -1901,9 +1901,9 @@ - <variant> - <configItem> - <name>mal</name> -- <!-- Keyboard indicator for Malayalam layouts --> -- <_shortDescription>ml</_shortDescription> -- <_description>Malayalam</_description> -+ -+ <shortDescription>ml</shortDescription> -+ <description>Malayalam</description> - <languageList> - <iso639Id>mal</iso639Id> - </languageList> -@@ -1912,9 +1912,9 @@ - <variant> - <configItem> - <name>mal_lalitha</name> -- <!-- Keyboard indicator for Malayalam layouts --> -- <_shortDescription>ml</_shortDescription> -- <_description>Malayalam (Lalitha)</_description> -+ -+ <shortDescription>ml</shortDescription> -+ <description>Malayalam (Lalitha)</description> - <languageList> - <iso639Id>mal</iso639Id> - </languageList> -@@ -1923,18 +1923,18 @@ - <variant> - <configItem> - <name>mal_enhanced</name> -- <!-- Keyboard indicator for Malayalam layouts --> -- <_shortDescription>ml</_shortDescription> -- <_description>Malayalam (enhanced Inscript with Rupee Sign)</_description> -+ -+ <shortDescription>ml</shortDescription> -+ <description>Malayalam (enhanced Inscript with Rupee Sign)</description> - <languageList><iso639Id>mal</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>ori</name> -- <!-- Keyboard indicator for Oriya layouts --> -- <_shortDescription>or</_shortDescription> -- <_description>Oriya</_description> -+ -+ <shortDescription>or</shortDescription> -+ <description>Oriya</description> - <languageList> - <iso639Id>ori</iso639Id> - </languageList> -@@ -1943,9 +1943,9 @@ - <variant> - <configItem> - <name>tam_unicode</name> -- <!-- Keyboard indicator for Tamil layouts --> -- <_shortDescription>ta</_shortDescription> -- <_description>Tamil (Unicode)</_description> -+ -+ <shortDescription>ta</shortDescription> -+ <description>Tamil (Unicode)</description> - <languageList> - <iso639Id>tam</iso639Id> - </languageList> -@@ -1954,9 +1954,9 @@ - <variant> - <configItem> - <name>tam_keyboard_with_numerals</name> -- <!-- Keyboard indicator for Tamil layouts --> -- <_shortDescription>ta</_shortDescription> -- <_description>Tamil (keyboard with numerals)</_description> -+ -+ <shortDescription>ta</shortDescription> -+ <description>Tamil (keyboard with numerals)</description> - <languageList> - <iso639Id>tam</iso639Id> - </languageList> -@@ -1965,9 +1965,9 @@ - <variant> - <configItem> - <name>tam_TAB</name> -- <!-- Keyboard indicator for Tamil layouts --> -- <_shortDescription>ta</_shortDescription> -- <_description>Tamil (TAB typewriter)</_description> -+ -+ <shortDescription>ta</shortDescription> -+ <description>Tamil (TAB typewriter)</description> - <languageList> - <iso639Id>tam</iso639Id> - </languageList> -@@ -1976,9 +1976,9 @@ - <variant> - <configItem> - <name>tam_TSCII</name> -- <!-- Keyboard indicator for Tamil layouts --> -- <_shortDescription>ta</_shortDescription> -- <_description>Tamil (TSCII typewriter)</_description> -+ -+ <shortDescription>ta</shortDescription> -+ <description>Tamil (TSCII typewriter)</description> - <languageList> - <iso639Id>tam</iso639Id> - </languageList> -@@ -1987,9 +1987,9 @@ - <variant> - <configItem> - <name>tam</name> -- <!-- Keyboard indicator for Tamil layouts --> -- <_shortDescription>ta</_shortDescription> -- <_description>Tamil</_description> -+ -+ <shortDescription>ta</shortDescription> -+ <description>Tamil</description> - <languageList> - <iso639Id>tam</iso639Id> - </languageList> -@@ -1998,9 +1998,9 @@ - <variant> - <configItem> - <name>tel</name> -- <!-- Keyboard indicator for Telugu layouts --> -- <_shortDescription>te</_shortDescription> -- <_description>Telugu</_description> -+ -+ <shortDescription>te</shortDescription> -+ <description>Telugu</description> - <languageList> - <iso639Id>tel</iso639Id> - </languageList> -@@ -2009,9 +2009,9 @@ - <variant> - <configItem> - <name>tel-kagapa</name> -- <!-- Keyboard indicator for Telugu layouts --> -- <_shortDescription>te</_shortDescription> -- <_description>Telugu (KaGaPa phonetic)</_description> -+ -+ <shortDescription>te</shortDescription> -+ <description>Telugu (KaGaPa phonetic)</description> - <languageList> - <iso639Id>tel</iso639Id> - </languageList> -@@ -2020,9 +2020,9 @@ - <variant> - <configItem> - <name>urd-phonetic</name> -- <!-- Keyboard indicator for Urdu layouts --> -- <_shortDescription>ur</_shortDescription> -- <_description>Urdu (phonetic)</_description> -+ -+ <shortDescription>ur</shortDescription> -+ <description>Urdu (phonetic)</description> - <languageList> - <iso639Id>urd</iso639Id> - </languageList> -@@ -2031,9 +2031,9 @@ - <variant> - <configItem> - <name>urd-phonetic3</name> -- <!-- Keyboard indicator for Urdu layouts --> -- <_shortDescription>ur</_shortDescription> -- <_description>Urdu (alternative phonetic)</_description> -+ -+ <shortDescription>ur</shortDescription> -+ <description>Urdu (alternative phonetic)</description> - <languageList> - <iso639Id>urd</iso639Id> - </languageList> -@@ -2042,9 +2042,9 @@ - <variant> - <configItem> - <name>urd-winkeys</name> -- <!-- Keyboard indicator for Urdu layouts --> -- <_shortDescription>ur</_shortDescription> -- <_description>Urdu (WinKeys)</_description> -+ -+ <shortDescription>ur</shortDescription> -+ <description>Urdu (WinKeys)</description> - <languageList> - <iso639Id>urd</iso639Id> - </languageList> -@@ -2053,9 +2053,9 @@ - <variant> - <configItem> - <name>bolnagri</name> -- <!-- Keyboard indicator for Hindi layouts --> -- <_shortDescription>hi</_shortDescription> -- <_description>Hindi (Bolnagri)</_description> -+ -+ <shortDescription>hi</shortDescription> -+ <description>Hindi (Bolnagri)</description> - <languageList> - <iso639Id>hin</iso639Id> - </languageList> -@@ -2064,9 +2064,9 @@ - <variant> - <configItem> - <name>hin-wx</name> -- <!-- Keyboard indicator for Hindi layouts --> -- <_shortDescription>hi</_shortDescription> -- <_description>Hindi (Wx)</_description> -+ -+ <shortDescription>hi</shortDescription> -+ <description>Hindi (Wx)</description> - <languageList> - <iso639Id>hin</iso639Id> - </languageList> -@@ -2075,9 +2075,9 @@ - <variant> - <configItem> - <name>hin-kagapa</name> -- <!-- Keyboard indicator for Hindi layouts --> -- <_shortDescription>hi</_shortDescription> -- <_description>Hindi (KaGaPa phonetic)</_description> -+ -+ <shortDescription>hi</shortDescription> -+ <description>Hindi (KaGaPa phonetic)</description> - <languageList> - <iso639Id>hin</iso639Id> - </languageList> -@@ -2086,9 +2086,9 @@ - <variant> - <configItem> - <name>san-kagapa</name> -- <!-- Keyboard indicator for Sanskrit layouts --> -- <_shortDescription>sa</_shortDescription> -- <_description>Sanskrit (KaGaPa phonetic)</_description> -+ -+ <shortDescription>sa</shortDescription> -+ <description>Sanskrit (KaGaPa phonetic)</description> - <languageList> - <iso639Id>san</iso639Id> - </languageList> -@@ -2097,9 +2097,9 @@ - <variant> - <configItem> - <name>mar-kagapa</name> -- <!-- Keyboard indicator for Marathi layouts --> -- <_shortDescription>mr</_shortDescription> -- <_description>Marathi (KaGaPa phonetic)</_description> -+ -+ <shortDescription>mr</shortDescription> -+ <description>Marathi (KaGaPa phonetic)</description> - <languageList> - <iso639Id>mar</iso639Id> - </languageList> -@@ -2108,9 +2108,9 @@ - <variant> - <configItem> - <name>eng</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (India, with RupeeSign)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (India, with RupeeSign)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -2121,9 +2121,9 @@ - <layout> - <configItem> - <name>ba</name> -- <!-- Keyboard indicator for Bosnian layouts --> -- <_shortDescription>bs</_shortDescription> -- <_description>Bosnian</_description> -+ -+ <shortDescription>bs</shortDescription> -+ <description>Bosnian</description> - <languageList> - <iso639Id>bos</iso639Id> - </languageList> -@@ -2132,25 +2132,25 @@ - <variant> - <configItem> - <name>alternatequotes</name> -- <_description>Bosnian (use guillemets for quotes)</_description> -+ <description>Bosnian (use guillemets for quotes)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>unicode</name> -- <_description>Bosnian (use Bosnian digraphs)</_description> -+ <description>Bosnian (use Bosnian digraphs)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>unicodeus</name> -- <_description>Bosnian (US keyboard with Bosnian digraphs)</_description> -+ <description>Bosnian (US keyboard with Bosnian digraphs)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>us</name> -- <_description>Bosnian (US keyboard with Bosnian letters)</_description> -+ <description>Bosnian (US keyboard with Bosnian letters)</description> - </configItem> - </variant> - </variantList> -@@ -2158,9 +2158,9 @@ - <layout> - <configItem> - <name>br</name> -- <!-- Keyboard indicator for Portuguese layouts --> -- <_shortDescription>pt</_shortDescription> -- <_description>Portuguese (Brazil)</_description> -+ -+ <shortDescription>pt</shortDescription> -+ <description>Portuguese (Brazil)</description> - <languageList> - <iso639Id>por</iso639Id> - </languageList> -@@ -2169,31 +2169,31 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Portuguese (Brazil, eliminate dead keys)</_description> -+ <description>Portuguese (Brazil, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Portuguese (Brazil, Dvorak)</_description> -+ <description>Portuguese (Brazil, Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nativo</name> -- <_description>Portuguese (Brazil, Nativo)</_description> -+ <description>Portuguese (Brazil, Nativo)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nativo-us</name> -- <_description>Portuguese (Brazil, Nativo for US keyboards)</_description> -+ <description>Portuguese (Brazil, Nativo for US keyboards)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nativo-epo</name> -- <_description>Esperanto (Brazil, Nativo)</_description> -+ <description>Esperanto (Brazil, Nativo)</description> - <languageList> - <iso639Id>epo</iso639Id> - </languageList> -@@ -2204,9 +2204,9 @@ - <layout> - <configItem> - <name>bg</name> -- <!-- Keyboard indicator for Bulgarian layouts --> -- <_shortDescription>bg</_shortDescription> -- <_description>Bulgarian</_description> -+ -+ <shortDescription>bg</shortDescription> -+ <description>Bulgarian</description> - <languageList> - <iso639Id>bul</iso639Id> - </languageList> -@@ -2215,13 +2215,13 @@ - <variant> - <configItem> - <name>phonetic</name> -- <_description>Bulgarian (traditional phonetic)</_description> -+ <description>Bulgarian (traditional phonetic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>bas_phonetic</name> -- <_description>Bulgarian (new phonetic)</_description> -+ <description>Bulgarian (new phonetic)</description> - </configItem> - </variant> - </variantList> -@@ -2229,17 +2229,17 @@ - <layout> - <configItem> - <name>ma</name> -- <!-- Keyboard indicator for Arabic layouts --> -- <_shortDescription>ar</_shortDescription> -- <_description>Arabic (Morocco)</_description> -+ -+ <shortDescription>ar</shortDescription> -+ <description>Arabic (Morocco)</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>french</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Morocco)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Morocco)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -2248,9 +2248,9 @@ - <variant> - <configItem> - <name>tifinagh</name> -- <!-- Keyboard indicator for Berber layouts --> -- <_shortDescription>ber</_shortDescription> -- <_description>Berber (Morocco, Tifinagh)</_description> -+ -+ <shortDescription>ber</shortDescription> -+ <description>Berber (Morocco, Tifinagh)</description> - <languageList> - <iso639Id>ber</iso639Id> - </languageList> -@@ -2259,9 +2259,9 @@ - <variant> - <configItem> - <name>tifinagh-alt</name> -- <!-- Keyboard indicator for Berber layouts --> -- <_shortDescription>ber</_shortDescription> -- <_description>Berber (Morocco, Tifinagh alternative)</_description> -+ -+ <shortDescription>ber</shortDescription> -+ <description>Berber (Morocco, Tifinagh alternative)</description> - <languageList> - <iso639Id>ber</iso639Id> - </languageList> -@@ -2270,9 +2270,9 @@ - <variant> - <configItem> - <name>tifinagh-alt-phonetic</name> -- <!-- Keyboard indicator for Berber layouts --> -- <_shortDescription>ber</_shortDescription> -- <_description>Berber (Morocco, Tifinagh alternative phonetic)</_description> -+ -+ <shortDescription>ber</shortDescription> -+ <description>Berber (Morocco, Tifinagh alternative phonetic)</description> - <languageList> - <iso639Id>ber</iso639Id> - </languageList> -@@ -2281,9 +2281,9 @@ - <variant> - <configItem> - <name>tifinagh-extended</name> -- <!-- Keyboard indicator for Berber layouts --> -- <_shortDescription>ber</_shortDescription> -- <_description>Berber (Morocco, Tifinagh extended)</_description> -+ -+ <shortDescription>ber</shortDescription> -+ <description>Berber (Morocco, Tifinagh extended)</description> - <languageList> - <iso639Id>ber</iso639Id> - </languageList> -@@ -2292,9 +2292,9 @@ - <variant> - <configItem> - <name>tifinagh-phonetic</name> -- <!-- Keyboard indicator for Berber layouts --> -- <_shortDescription>ber</_shortDescription> -- <_description>Berber (Morocco, Tifinagh phonetic)</_description> -+ -+ <shortDescription>ber</shortDescription> -+ <description>Berber (Morocco, Tifinagh phonetic)</description> - <languageList> - <iso639Id>ber</iso639Id> - </languageList> -@@ -2303,9 +2303,9 @@ - <variant> - <configItem> - <name>tifinagh-extended-phonetic</name> -- <!-- Keyboard indicator for Berber layouts --> -- <_shortDescription>ber</_shortDescription> -- <_description>Berber (Morocco, Tifinagh extended phonetic)</_description> -+ -+ <shortDescription>ber</shortDescription> -+ <description>Berber (Morocco, Tifinagh extended phonetic)</description> - <languageList> - <iso639Id>ber</iso639Id> - </languageList> -@@ -2316,23 +2316,23 @@ - <layout> - <configItem> - <name>cm</name> -- <!-- Keyboard indicator for Cameroon layouts --> -- <_shortDescription>cm</_shortDescription> -- <_description>English (Cameroon)</_description> -+ -+ <shortDescription>cm</shortDescription> -+ <description>English (Cameroon)</description> - <languageList><iso639Id>eng</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>french</name> -- <_description>French (Cameroon)</_description> -+ <description>French (Cameroon)</description> - <languageList><iso639Id>fra</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty</name> -- <_description>Cameroon Multilingual (qwerty)</_description> -+ <description>Cameroon Multilingual (qwerty)</description> - <languageList> - <iso639Id>eng</iso639Id> - <iso639Id>bas</iso639Id> -@@ -2369,7 +2369,7 @@ - <variant> - <configItem> - <name>azerty</name> -- <_description>Cameroon Multilingual (azerty)</_description> -+ <description>Cameroon Multilingual (azerty)</description> - <languageList> - <iso639Id>fra</iso639Id> - <iso639Id>bas</iso639Id> -@@ -2406,7 +2406,7 @@ - <variant> - <configItem> - <name>dvorak</name> -- <_description>Cameroon Multilingual (Dvorak)</_description> -+ <description>Cameroon Multilingual (Dvorak)</description> - </configItem> - </variant> - </variantList> -@@ -2414,9 +2414,9 @@ - <layout> - <configItem> - <name>mm</name> -- <!-- Keyboard indicator for Burmese layouts --> -- <_shortDescription>my</_shortDescription> -- <_description>Burmese</_description> -+ -+ <shortDescription>my</shortDescription> -+ <description>Burmese</description> - <languageList> - <iso639Id>mya</iso639Id> - </languageList> -@@ -2426,9 +2426,9 @@ - <layout> - <configItem> - <name>ca</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Canada)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Canada)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -2437,43 +2437,43 @@ - <variant> - <configItem> - <name>fr-dvorak</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Canada, Dvorak)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Canada, Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>fr-legacy</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Canada, legacy)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Canada, legacy)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>multix</name> -- <_description>Canadian Multilingual</_description> -+ <description>Canadian Multilingual</description> - </configItem> - </variant> - <variant> - <configItem> - <name>multi</name> -- <_description>Canadian Multilingual (first part)</_description> -+ <description>Canadian Multilingual (first part)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>multi-2gr</name> -- <_description>Canadian Multilingual (second part)</_description> -+ <description>Canadian Multilingual (second part)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ike</name> -- <!-- Keyboard indicator for Inuktikut layouts --> -- <_shortDescription>ike</_shortDescription> -- <_description>Inuktitut</_description> -+ -+ <shortDescription>ike</shortDescription> -+ <description>Inuktitut</description> - <languageList> - <iso639Id>iku</iso639Id> - </languageList> -@@ -2482,9 +2482,9 @@ - <variant> - <configItem> - <name>eng</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (Canada)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (Canada)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -2495,9 +2495,9 @@ - <layout> - <configItem> - <name>cd</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Democratic Republic of the Congo)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Democratic Republic of the Congo)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -2507,9 +2507,9 @@ - <layout> - <configItem> - <name>cn</name> -- <!-- Keyboard indicator for Chinese layouts --> -- <_shortDescription>zh</_shortDescription> -- <_description>Chinese</_description> -+ -+ <shortDescription>zh</shortDescription> -+ <description>Chinese</description> - <languageList> - <iso639Id>chi</iso639Id> - </languageList> -@@ -2518,7 +2518,7 @@ - <variant> - <configItem> - <name>tib</name> -- <_description>Tibetan</_description> -+ <description>Tibetan</description> - <languageList> - <iso639Id>tib</iso639Id> - </languageList> -@@ -2527,7 +2527,7 @@ - <variant> - <configItem> - <name>tib_asciinum</name> -- <_description>Tibetan (with ASCII numerals)</_description> -+ <description>Tibetan (with ASCII numerals)</description> - <languageList> - <iso639Id>tib</iso639Id> - </languageList> -@@ -2536,8 +2536,8 @@ - <variant> - <configItem> - <name>ug</name> -- <_shortDescription>ug</_shortDescription> -- <_description>Uyghur</_description> -+ <shortDescription>ug</shortDescription> -+ <description>Uyghur</description> - <languageList> - <iso639Id>ug</iso639Id> - </languageList> -@@ -2548,9 +2548,9 @@ - <layout> - <configItem> - <name>hr</name> -- <!-- Keyboard indicator for Croatian layouts --> -- <_shortDescription>hr</_shortDescription> -- <_description>Croatian</_description> -+ -+ <shortDescription>hr</shortDescription> -+ <description>Croatian</description> - <languageList> - <iso639Id>hrv</iso639Id> - </languageList> -@@ -2559,25 +2559,25 @@ - <variant> - <configItem> - <name>alternatequotes</name> -- <_description>Croatian (use guillemets for quotes)</_description> -+ <description>Croatian (use guillemets for quotes)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>unicode</name> -- <_description>Croatian (use Croatian digraphs)</_description> -+ <description>Croatian (use Croatian digraphs)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>unicodeus</name> -- <_description>Croatian (US keyboard with Croatian digraphs)</_description> -+ <description>Croatian (US keyboard with Croatian digraphs)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>us</name> -- <_description>Croatian (US keyboard with Croatian letters)</_description> -+ <description>Croatian (US keyboard with Croatian letters)</description> - </configItem> - </variant> - </variantList> -@@ -2585,9 +2585,9 @@ - <layout> - <configItem> - <name>cz</name> -- <!-- Keyboard indicator for Chech layouts --> -- <_shortDescription>cs</_shortDescription> -- <_description>Czech</_description> -+ -+ <shortDescription>cs</shortDescription> -+ <description>Czech</description> - <languageList> - <iso639Id>cze</iso639Id> - </languageList> -@@ -2596,31 +2596,31 @@ - <variant> - <configItem> - <name>bksl</name> -- <_description>Czech (with <\|> key)</_description> -+ <description>Czech (with <\|> key)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty</name> -- <_description>Czech (qwerty)</_description> -+ <description>Czech (qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty_bksl</name> -- <_description>Czech (qwerty, extended Backslash)</_description> -+ <description>Czech (qwerty, extended Backslash)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ucw</name> -- <_description>Czech (UCW layout, accented letters only)</_description> -+ <description>Czech (UCW layout, accented letters only)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak-ucw</name> -- <_description>Czech (US Dvorak with CZ UCW support)</_description> -+ <description>Czech (US Dvorak with CZ UCW support)</description> - </configItem> - </variant> - </variantList> -@@ -2628,9 +2628,9 @@ - <layout> - <configItem> - <name>dk</name> -- <!-- Keyboard indicator for Danish layouts --> -- <_shortDescription>da</_shortDescription> -- <_description>Danish</_description> -+ -+ <shortDescription>da</shortDescription> -+ <description>Danish</description> - <languageList> - <iso639Id>dan</iso639Id> - </languageList> -@@ -2639,25 +2639,25 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Danish (eliminate dead keys)</_description> -+ <description>Danish (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Danish (Macintosh)</_description> -+ <description>Danish (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac_nodeadkeys</name> -- <_description>Danish (Macintosh, eliminate dead keys)</_description> -+ <description>Danish (Macintosh, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Danish (Dvorak)</_description> -+ <description>Danish (Dvorak)</description> - </configItem> - </variant> - </variantList> -@@ -2665,9 +2665,9 @@ - <layout> - <configItem> - <name>nl</name> -- <!-- Keyboard indicator for Dutch layouts --> -- <_shortDescription>nl</_shortDescription> -- <_description>Dutch</_description> -+ -+ <shortDescription>nl</shortDescription> -+ <description>Dutch</description> - <languageList> - <iso639Id>nld</iso639Id> - </languageList> -@@ -2676,19 +2676,19 @@ - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>Dutch (Sun dead keys)</_description> -+ <description>Dutch (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Dutch (Macintosh)</_description> -+ <description>Dutch (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>std</name> -- <_description>Dutch (standard)</_description> -+ <description>Dutch (standard)</description> - </configItem> - </variant> - </variantList> -@@ -2696,9 +2696,9 @@ - <layout> - <configItem> - <name>bt</name> -- <!-- Keyboard indicator for Dzongkha layouts --> -- <_shortDescription>dz</_shortDescription> -- <_description>Dzongkha</_description> -+ -+ <shortDescription>dz</shortDescription> -+ <description>Dzongkha</description> - <languageList> - <iso639Id>dzo</iso639Id> - </languageList> -@@ -2707,9 +2707,9 @@ - <layout> - <configItem> - <name>ee</name> -- <!-- Keyboard indicator for Estonian layouts --> -- <_shortDescription>et</_shortDescription> -- <_description>Estonian</_description> -+ -+ <shortDescription>et</shortDescription> -+ <description>Estonian</description> - <languageList> - <iso639Id>est</iso639Id> - </languageList> -@@ -2718,19 +2718,19 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Estonian (eliminate dead keys)</_description> -+ <description>Estonian (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Estonian (Dvorak)</_description> -+ <description>Estonian (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>us</name> -- <_description>Estonian (US keyboard with Estonian letters)</_description> -+ <description>Estonian (US keyboard with Estonian letters)</description> - </configItem> - </variant> - </variantList> -@@ -2738,9 +2738,9 @@ - <layout> - <configItem> - <name>ir</name> -- <!-- Keyboard indicator for Persian layouts --> -- <_shortDescription>fa</_shortDescription> -- <_description>Persian</_description> -+ -+ <shortDescription>fa</shortDescription> -+ <description>Persian</description> - <languageList> - <iso639Id>per</iso639Id> - </languageList> -@@ -2749,15 +2749,15 @@ - <variant> - <configItem> - <name>pes_keypad</name> -- <_description>Persian (with Persian Keypad)</_description> -+ <description>Persian (with Persian Keypad)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ku</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iran, Latin Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iran, Latin Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2766,9 +2766,9 @@ - <variant> - <configItem> - <name>ku_f</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iran, F)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iran, F)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2777,9 +2777,9 @@ - <variant> - <configItem> - <name>ku_alt</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iran, Latin Alt-Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iran, Latin Alt-Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2788,9 +2788,9 @@ - <variant> - <configItem> - <name>ku_ara</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iran, Arabic-Latin)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iran, Arabic-Latin)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2801,9 +2801,9 @@ - <layout> - <configItem> - <name>iq</name> -- <!-- Keyboard indicator for Iraqi layouts --> -- <_shortDescription>ar</_shortDescription> -- <_description>Iraqi</_description> -+ -+ <shortDescription>ar</shortDescription> -+ <description>Iraqi</description> - <languageList><iso639Id>ara</iso639Id> - <iso639Id>kur</iso639Id></languageList> - </configItem> -@@ -2811,9 +2811,9 @@ - <variant> - <configItem> - <name>ku</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iraq, Latin Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iraq, Latin Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2822,9 +2822,9 @@ - <variant> - <configItem> - <name>ku_f</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iraq, F)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iraq, F)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2833,9 +2833,9 @@ - <variant> - <configItem> - <name>ku_alt</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iraq, Latin Alt-Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iraq, Latin Alt-Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2844,9 +2844,9 @@ - <variant> - <configItem> - <name>ku_ara</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Iraq, Arabic-Latin)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Iraq, Arabic-Latin)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -2857,9 +2857,9 @@ - <layout> - <configItem> - <name>fo</name> -- <!-- Keyboard indicator for Faroese layouts --> -- <_shortDescription>fo</_shortDescription> -- <_description>Faroese</_description> -+ -+ <shortDescription>fo</shortDescription> -+ <description>Faroese</description> - <languageList> - <iso639Id>fao</iso639Id> - </languageList> -@@ -2868,7 +2868,7 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Faroese (eliminate dead keys)</_description> -+ <description>Faroese (eliminate dead keys)</description> - </configItem> - </variant> - </variantList> -@@ -2876,9 +2876,9 @@ - <layout> - <configItem> - <name>fi</name> -- <!-- Keyboard indicator for Finnish layouts --> -- <_shortDescription>fi</_shortDescription> -- <_description>Finnish</_description> -+ -+ <shortDescription>fi</shortDescription> -+ <description>Finnish</description> - <languageList> - <iso639Id>fin</iso639Id> - </languageList> -@@ -2887,26 +2887,26 @@ - <variant> - <configItem> - <name>classic</name> -- <_description>Finnish (classic)</_description> -+ <description>Finnish (classic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Finnish (classic, eliminate dead keys)</_description> -+ <description>Finnish (classic, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>smi</name> -- <_description>Northern Saami (Finland)</_description> -+ <description>Northern Saami (Finland)</description> - <languageList><iso639Id>sme</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Finnish (Macintosh)</_description> -+ <description>Finnish (Macintosh)</description> - </configItem> - </variant> - </variantList> -@@ -2914,9 +2914,9 @@ - <layout> - <configItem> - <name>fr</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -2925,91 +2925,91 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>French (eliminate dead keys)</_description> -+ <description>French (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>French (Sun dead keys)</_description> -+ <description>French (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>oss</name> -- <_description>French (alternative)</_description> -+ <description>French (alternative)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>oss_latin9</name> -- <_description>French (alternative, Latin-9 only)</_description> -+ <description>French (alternative, Latin-9 only)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>oss_nodeadkeys</name> -- <_description>French (alternative, eliminate dead keys)</_description> -+ <description>French (alternative, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>oss_sundeadkeys</name> -- <_description>French (alternative, Sun dead keys)</_description> -+ <description>French (alternative, Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latin9</name> -- <_description>French (legacy, alternative)</_description> -+ <description>French (legacy, alternative)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latin9_nodeadkeys</name> -- <_description>French (legacy, alternative, eliminate dead keys)</_description> -+ <description>French (legacy, alternative, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latin9_sundeadkeys</name> -- <_description>French (legacy, alternative, Sun dead keys)</_description> -+ <description>French (legacy, alternative, Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>bepo</name> -- <_description>French (Bepo, ergonomic, Dvorak way)</_description> -+ <description>French (Bepo, ergonomic, Dvorak way)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>bepo_latin9</name> -- <_description>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</_description> -+ <description>French (Bepo, ergonomic, Dvorak way, Latin-9 only)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>French (Dvorak)</_description> -+ <description>French (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>French (Macintosh)</_description> -+ <description>French (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>bre</name> -- <_description>French (Breton)</_description> -+ <description>French (Breton)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>oci</name> -- <_description>Occitan</_description> -+ <description>Occitan</description> - <languageList> - <iso639Id>oci</iso639Id> - </languageList> -@@ -3018,7 +3018,7 @@ - <variant> - <configItem> - <name>geo</name> -- <_description>Georgian (France, AZERTY Tskapo)</_description> -+ <description>Georgian (France, AZERTY Tskapo)</description> - <languageList> - <iso639Id>geo</iso639Id> - </languageList> -@@ -3029,9 +3029,9 @@ - <layout> - <configItem> - <name>gh</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (Ghana)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (Ghana)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -3040,15 +3040,15 @@ - <variant> - <configItem> - <name>generic</name> -- <_description>English (Ghana, multilingual)</_description> -+ <description>English (Ghana, multilingual)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>akan</name> -- <!-- Keyboard indicator for Akan layouts --> -- <_shortDescription>ak</_shortDescription> -- <_description>Akan</_description> -+ -+ <shortDescription>ak</shortDescription> -+ <description>Akan</description> - <languageList> - <iso639Id>aka</iso639Id> - </languageList> -@@ -3057,9 +3057,9 @@ - <variant> - <configItem> - <name>ewe</name> -- <!-- Keyboard indicator for Ewe layouts --> -- <_shortDescription>ee</_shortDescription> -- <_description>Ewe</_description> -+ -+ <shortDescription>ee</shortDescription> -+ <description>Ewe</description> - <languageList> - <iso639Id>ewe</iso639Id> - </languageList> -@@ -3068,9 +3068,9 @@ - <variant> - <configItem> - <name>fula</name> -- <!-- Keyboard indicator for Fula layouts --> -- <_shortDescription>ff</_shortDescription> -- <_description>Fula</_description> -+ -+ <shortDescription>ff</shortDescription> -+ <description>Fula</description> - <languageList> - <iso639Id>ful</iso639Id> - </languageList> -@@ -3079,9 +3079,9 @@ - <variant> - <configItem> - <name>ga</name> -- <!-- Keyboard indicator for Ga layouts --> -- <_shortDescription>gaa</_shortDescription> -- <_description>Ga</_description> -+ -+ <shortDescription>gaa</shortDescription> -+ <description>Ga</description> - <languageList> - <iso639Id>gaa</iso639Id> - </languageList> -@@ -3090,9 +3090,9 @@ - <variant> - <configItem> - <name>hausa</name> -- <!-- Keyboard indicator for Hausa layouts --> -- <_shortDescription>ha</_shortDescription> -- <_description>Hausa</_description> -+ -+ <shortDescription>ha</shortDescription> -+ <description>Hausa</description> - <languageList> - <iso639Id>hau</iso639Id> - </languageList> -@@ -3101,9 +3101,9 @@ - <variant> - <configItem> - <name>avn</name> -- <!-- Keyboard indicator for Avatime layouts --> -- <_shortDescription>avn</_shortDescription> -- <_description>Avatime</_description> -+ -+ <shortDescription>avn</shortDescription> -+ <description>Avatime</description> - <languageList> - <iso639Id>avn</iso639Id> - </languageList> -@@ -3112,7 +3112,7 @@ - <variant> - <configItem> - <name>gillbt</name> -- <_description>English (Ghana, GILLBT)</_description> -+ <description>English (Ghana, GILLBT)</description> - </configItem> - </variant> - </variantList> -@@ -3120,9 +3120,9 @@ - <layout> - <configItem> - <name>gn</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Guinea)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Guinea)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -3132,9 +3132,9 @@ - <layout> - <configItem> - <name>ge</name> -- <!-- Keyboard indicator for Georgian layouts --> -- <_shortDescription>ka</_shortDescription> -- <_description>Georgian</_description> -+ -+ <shortDescription>ka</shortDescription> -+ <description>Georgian</description> - <languageList> - <iso639Id>geo</iso639Id> - </languageList> -@@ -3143,21 +3143,21 @@ - <variant> - <configItem> - <name>ergonomic</name> -- <_description>Georgian (ergonomic)</_description> -+ <description>Georgian (ergonomic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mess</name> -- <_description>Georgian (MESS)</_description> -+ <description>Georgian (MESS)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ru</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (Georgia)</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian (Georgia)</description> - <languageList> - <iso639Id>rus</iso639Id> - </languageList> -@@ -3166,7 +3166,7 @@ - <variant> - <configItem> - <name>os</name> -- <_description>Ossetian (Georgia)</_description> -+ <description>Ossetian (Georgia)</description> - <languageList> - <iso639Id>oss</iso639Id> - </languageList> -@@ -3177,9 +3177,9 @@ - <layout> - <configItem> - <name>de</name> -- <!-- Keyboard indicator for German layouts --> -- <_shortDescription>de</_shortDescription> -- <_description>German</_description> -+ -+ <shortDescription>de</shortDescription> -+ <description>German</description> - <languageList> - <iso639Id>ger</iso639Id> - </languageList> -@@ -3188,75 +3188,75 @@ - <variant> - <configItem> - <name>deadacute</name> -- <_description>German (dead acute)</_description> -+ <description>German (dead acute)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>deadgraveacute</name> -- <_description>German (dead grave acute)</_description> -+ <description>German (dead grave acute)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>German (eliminate dead keys)</_description> -+ <description>German (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>T3</name> -- <_description>German (T3)</_description> -+ <description>German (T3)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ro</name> -- <_description>Romanian (Germany)</_description> -+ <description>Romanian (Germany)</description> - <languageList><iso639Id>rum</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>ro_nodeadkeys</name> -- <_description>Romanian (Germany, eliminate dead keys)</_description> -+ <description>Romanian (Germany, eliminate dead keys)</description> - <languageList><iso639Id>rum</iso639Id></languageList> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>German (Dvorak)</_description> -+ <description>German (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>German (Sun dead keys)</_description> -+ <description>German (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>neo</name> -- <_description>German (Neo 2)</_description> -+ <description>German (Neo 2)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>German (Macintosh)</_description> -+ <description>German (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac_nodeadkeys</name> -- <_description>German (Macintosh, eliminate dead keys)</_description> -+ <description>German (Macintosh, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dsb</name> -- <_description>Lower Sorbian</_description> -+ <description>Lower Sorbian</description> - <languageList> - <iso639Id>dsb</iso639Id> - </languageList> -@@ -3265,7 +3265,7 @@ - <variant> - <configItem> - <name>dsb_qwertz</name> -- <_description>Lower Sorbian (qwertz)</_description> -+ <description>Lower Sorbian (qwertz)</description> - <languageList> - <iso639Id>dsb</iso639Id> - </languageList> -@@ -3274,15 +3274,15 @@ - <variant> - <configItem> - <name>qwerty</name> -- <_description>German (qwerty)</_description> -+ <description>German (qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ru</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (Germany, phonetic)</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian (Germany, phonetic)</description> - <languageList> - <iso639Id>rus</iso639Id> - </languageList> -@@ -3291,7 +3291,7 @@ - <variant> - <configItem> - <name>legacy</name> -- <_description>German (legacy)</_description> -+ <description>German (legacy)</description> - </configItem> - </variant> - </variantList> -@@ -3299,9 +3299,9 @@ - <layout> - <configItem> - <name>gr</name> -- <!-- Keyboard indicator for Greek layouts --> -- <_shortDescription>gr</_shortDescription> -- <_description>Greek</_description> -+ -+ <shortDescription>gr</shortDescription> -+ <description>Greek</description> - <languageList> - <iso639Id>gre</iso639Id> - </languageList> -@@ -3310,25 +3310,25 @@ - <variant> - <configItem> - <name>simple</name> -- <_description>Greek (simple)</_description> -+ <description>Greek (simple)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>extended</name> -- <_description>Greek (extended)</_description> -+ <description>Greek (extended)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Greek (eliminate dead keys)</_description> -+ <description>Greek (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>polytonic</name> -- <_description>Greek (polytonic)</_description> -+ <description>Greek (polytonic)</description> - </configItem> - </variant> - </variantList> -@@ -3336,9 +3336,9 @@ - <layout> - <configItem> - <name>hu</name> -- <!-- Keyboard indicator for Hungarian layouts --> -- <_shortDescription>hu</_shortDescription> -- <_description>Hungarian</_description> -+ -+ <shortDescription>hu</shortDescription> -+ <description>Hungarian</description> - <languageList> - <iso639Id>hun</iso639Id> - </languageList> -@@ -3347,115 +3347,115 @@ - <variant> - <configItem> - <name>standard</name> -- <_description>Hungarian (standard)</_description> -+ <description>Hungarian (standard)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Hungarian (eliminate dead keys)</_description> -+ <description>Hungarian (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty</name> -- <_description>Hungarian (qwerty)</_description> -+ <description>Hungarian (qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwertz_comma_dead</name> -- <_description>Hungarian (101/qwertz/comma/dead keys)</_description> -+ <description>Hungarian (101/qwertz/comma/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwertz_comma_nodead</name> -- <_description>Hungarian (101/qwertz/comma/eliminate dead keys)</_description> -+ <description>Hungarian (101/qwertz/comma/eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwertz_dot_dead</name> -- <_description>Hungarian (101/qwertz/dot/dead keys)</_description> -+ <description>Hungarian (101/qwertz/dot/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwertz_dot_nodead</name> -- <_description>Hungarian (101/qwertz/dot/eliminate dead keys)</_description> -+ <description>Hungarian (101/qwertz/dot/eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwerty_comma_dead</name> -- <_description>Hungarian (101/qwerty/comma/dead keys)</_description> -+ <description>Hungarian (101/qwerty/comma/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwerty_comma_nodead</name> -- <_description>Hungarian (101/qwerty/comma/eliminate dead keys)</_description> -+ <description>Hungarian (101/qwerty/comma/eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwerty_dot_dead</name> -- <_description>Hungarian (101/qwerty/dot/dead keys)</_description> -+ <description>Hungarian (101/qwerty/dot/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>101_qwerty_dot_nodead</name> -- <_description>Hungarian (101/qwerty/dot/eliminate dead keys)</_description> -+ <description>Hungarian (101/qwerty/dot/eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwertz_comma_dead</name> -- <_description>Hungarian (102/qwertz/comma/dead keys)</_description> -+ <description>Hungarian (102/qwertz/comma/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwertz_comma_nodead</name> -- <_description>Hungarian (102/qwertz/comma/eliminate dead keys)</_description> -+ <description>Hungarian (102/qwertz/comma/eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwertz_dot_dead</name> -- <_description>Hungarian (102/qwertz/dot/dead keys)</_description> -+ <description>Hungarian (102/qwertz/dot/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwertz_dot_nodead</name> -- <_description>Hungarian (102/qwertz/dot/eliminate dead keys)</_description> -+ <description>Hungarian (102/qwertz/dot/eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwerty_comma_dead</name> -- <_description>Hungarian (102/qwerty/comma/dead keys)</_description> -+ <description>Hungarian (102/qwerty/comma/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwerty_comma_nodead</name> -- <_description>Hungarian (102/qwerty/comma/eliminate dead keys)</_description> -+ <description>Hungarian (102/qwerty/comma/eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwerty_dot_dead</name> -- <_description>Hungarian (102/qwerty/dot/dead keys)</_description> -+ <description>Hungarian (102/qwerty/dot/dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>102_qwerty_dot_nodead</name> -- <_description>Hungarian (102/qwerty/dot/eliminate dead keys)</_description> -+ <description>Hungarian (102/qwerty/dot/eliminate dead keys)</description> - </configItem> - </variant> - </variantList> -@@ -3463,9 +3463,9 @@ - <layout> - <configItem> - <name>is</name> -- <!-- Keyboard indicator for Icelandic layouts --> -- <_shortDescription>is</_shortDescription> -- <_description>Icelandic</_description> -+ -+ <shortDescription>is</shortDescription> -+ <description>Icelandic</description> - <languageList> - <iso639Id>ice</iso639Id> - </languageList> -@@ -3474,25 +3474,25 @@ - <variant> - <configItem> - <name>Sundeadkeys</name> -- <_description>Icelandic (Sun dead keys)</_description> -+ <description>Icelandic (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Icelandic (eliminate dead keys)</_description> -+ <description>Icelandic (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Icelandic (Macintosh)</_description> -+ <description>Icelandic (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Icelandic (Dvorak)</_description> -+ <description>Icelandic (Dvorak)</description> - </configItem> - </variant> - </variantList> -@@ -3500,9 +3500,9 @@ - <layout> - <configItem> - <name>il</name> -- <!-- Keyboard indicator for Hebrew layouts --> -- <_shortDescription>he</_shortDescription> -- <_description>Hebrew</_description> -+ -+ <shortDescription>he</shortDescription> -+ <description>Hebrew</description> - <languageList> - <iso639Id>heb</iso639Id> - </languageList> -@@ -3511,19 +3511,19 @@ - <variant> - <configItem> - <name>lyx</name> -- <_description>Hebrew (lyx)</_description> -+ <description>Hebrew (lyx)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>phonetic</name> -- <_description>Hebrew (phonetic)</_description> -+ <description>Hebrew (phonetic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>biblical</name> -- <_description>Hebrew (Biblical, Tiro)</_description> -+ <description>Hebrew (Biblical, Tiro)</description> - </configItem> - </variant> - </variantList> -@@ -3531,9 +3531,9 @@ - <layout> - <configItem> - <name>it</name> -- <!-- Keyboard indicator for Italian layouts --> -- <_shortDescription>it</_shortDescription> -- <_description>Italian</_description> -+ -+ <shortDescription>it</shortDescription> -+ <description>Italian</description> - <languageList> - <iso639Id>ita</iso639Id> - </languageList> -@@ -3542,25 +3542,25 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Italian (eliminate dead keys)</_description> -+ <description>Italian (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Italian (Macintosh)</_description> -+ <description>Italian (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>us</name> -- <_description>Italian (US keyboard with Italian letters)</_description> -+ <description>Italian (US keyboard with Italian letters)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>geo</name> -- <_description>Georgian (Italy)</_description> -+ <description>Georgian (Italy)</description> - <languageList> - <iso639Id>geo</iso639Id> - </languageList> -@@ -3569,7 +3569,7 @@ - <variant> - <configItem> - <name>ibm</name> -- <_description>Italian (IBM 142)</_description> -+ <description>Italian (IBM 142)</description> - </configItem> - </variant> - </variantList> -@@ -3577,9 +3577,9 @@ - <layout> - <configItem> - <name>jp</name> -- <!-- Keyboard indicator for Japanese layouts --> -- <_shortDescription>ja</_shortDescription> -- <_description>Japanese</_description> -+ -+ <shortDescription>ja</shortDescription> -+ <description>Japanese</description> - <languageList> - <iso639Id>jpn</iso639Id> - </languageList> -@@ -3588,31 +3588,31 @@ - <variant> - <configItem> - <name>kana</name> -- <_description>Japanese (Kana)</_description> -+ <description>Japanese (Kana)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>kana86</name> -- <_description>Japanese (Kana 86)</_description> -+ <description>Japanese (Kana 86)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>OADG109A</name> -- <_description>Japanese (OADG 109A)</_description> -+ <description>Japanese (OADG 109A)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Japanese (Macintosh)</_description> -+ <description>Japanese (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Japanese (Dvorak)</_description> -+ <description>Japanese (Dvorak)</description> - </configItem> - </variant> - </variantList> -@@ -3620,9 +3620,9 @@ - <layout> - <configItem> - <name>kg</name> -- <!-- Keyboard indicator for Kyrgyz layouts --> -- <_shortDescription>ki</_shortDescription> -- <_description>Kyrgyz</_description> -+ -+ <shortDescription>ki</shortDescription> -+ <description>Kyrgyz</description> - <languageList> - <iso639Id>kir</iso639Id> - </languageList> -@@ -3631,7 +3631,7 @@ - <variant> - <configItem> - <name>phonetic</name> -- <_description>Kyrgyz (phonetic)</_description> -+ <description>Kyrgyz (phonetic)</description> - </configItem> - </variant> - </variantList> -@@ -3639,9 +3639,9 @@ - <layout> - <configItem> - <name>kh</name> -- <!-- Keyboard indicator for Khmer layouts --> -- <_shortDescription>km</_shortDescription> -- <_description>Khmer (Cambodia)</_description> -+ -+ <shortDescription>km</shortDescription> -+ <description>Khmer (Cambodia)</description> - <languageList> - <iso639Id>khm</iso639Id> - </languageList> -@@ -3651,9 +3651,9 @@ - <layout> - <configItem> - <name>kz</name> -- <!-- Keyboard indicator for Kazakh layouts --> -- <_shortDescription>kk</_shortDescription> -- <_description>Kazakh</_description> -+ -+ <shortDescription>kk</shortDescription> -+ <description>Kazakh</description> - <languageList> - <iso639Id>kaz</iso639Id> - </languageList> -@@ -3662,9 +3662,9 @@ - <variant> - <configItem> - <name>ruskaz</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (Kazakhstan, with Kazakh)</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian (Kazakhstan, with Kazakh)</description> - <languageList><iso639Id>kaz</iso639Id> - <iso639Id>rus</iso639Id></languageList> - </configItem> -@@ -3672,7 +3672,7 @@ - <variant> - <configItem> - <name>kazrus</name> -- <_description>Kazakh (with Russian)</_description> -+ <description>Kazakh (with Russian)</description> - <languageList><iso639Id>kaz</iso639Id> - <iso639Id>rus</iso639Id></languageList> - </configItem> -@@ -3682,9 +3682,9 @@ - <layout> - <configItem> - <name>la</name> -- <!-- Keyboard indicator for Lao layouts --> -- <_shortDescription>lo</_shortDescription> -- <_description>Lao</_description> -+ -+ <shortDescription>lo</shortDescription> -+ <description>Lao</description> - <languageList> - <iso639Id>lao</iso639Id> - </languageList> -@@ -3693,7 +3693,7 @@ - <variant> - <configItem> - <name>stea</name> -- <_description>Lao (STEA proposed standard layout)</_description> -+ <description>Lao (STEA proposed standard layout)</description> - <languageList><iso639Id>lao</iso639Id> - </languageList> - </configItem> -@@ -3703,9 +3703,9 @@ - <layout> - <configItem> - <name>latam</name> -- <!-- Keyboard indicator for Spanish layouts --> -- <_shortDescription>es</_shortDescription> -- <_description>Spanish (Latin American)</_description> -+ -+ <shortDescription>es</shortDescription> -+ <description>Spanish (Latin American)</description> - <countryList> - <iso3166Id>AR</iso3166Id> - <iso3166Id>BO</iso3166Id> -@@ -3737,19 +3737,19 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Spanish (Latin American, eliminate dead keys)</_description> -+ <description>Spanish (Latin American, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>deadtilde</name> -- <_description>Spanish (Latin American, include dead tilde)</_description> -+ <description>Spanish (Latin American, include dead tilde)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>Spanish (Latin American, Sun dead keys)</_description> -+ <description>Spanish (Latin American, Sun dead keys)</description> - </configItem> - </variant> - </variantList> -@@ -3757,9 +3757,9 @@ - <layout> - <configItem> - <name>lt</name> -- <!-- Keyboard indicator for Lithuanian layouts --> -- <_shortDescription>lt</_shortDescription> -- <_description>Lithuanian</_description> -+ -+ <shortDescription>lt</shortDescription> -+ <description>Lithuanian</description> - <languageList> - <iso639Id>lit</iso639Id> - </languageList> -@@ -3768,31 +3768,31 @@ - <variant> - <configItem> - <name>std</name> -- <_description>Lithuanian (standard)</_description> -+ <description>Lithuanian (standard)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>us</name> -- <_description>Lithuanian (US keyboard with Lithuanian letters)</_description> -+ <description>Lithuanian (US keyboard with Lithuanian letters)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ibm</name> -- <_description>Lithuanian (IBM LST 1205-92)</_description> -+ <description>Lithuanian (IBM LST 1205-92)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>lekp</name> -- <_description>Lithuanian (LEKP)</_description> -+ <description>Lithuanian (LEKP)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>lekpa</name> -- <_description>Lithuanian (LEKPa)</_description> -+ <description>Lithuanian (LEKPa)</description> - </configItem> - </variant> - </variantList> -@@ -3800,9 +3800,9 @@ - <layout> - <configItem> - <name>lv</name> -- <!-- Keyboard indicator for Latvian layouts --> -- <_shortDescription>lv</_shortDescription> -- <_description>Latvian</_description> -+ -+ <shortDescription>lv</shortDescription> -+ <description>Latvian</description> - <languageList> - <iso639Id>lav</iso639Id> - </languageList> -@@ -3811,37 +3811,37 @@ - <variant> - <configItem> - <name>apostrophe</name> -- <_description>Latvian (apostrophe variant)</_description> -+ <description>Latvian (apostrophe variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>tilde</name> -- <_description>Latvian (tilde variant)</_description> -+ <description>Latvian (tilde variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>fkey</name> -- <_description>Latvian (F variant)</_description> -+ <description>Latvian (F variant)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>modern</name> -- <_description>Latvian (modern)</_description> -+ <description>Latvian (modern)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ergonomic</name> -- <_description>Latvian (ergonomic, ŪGJRMV)</_description> -+ <description>Latvian (ergonomic, ŪGJRMV)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>adapted</name> -- <_description>Latvian (adapted)</_description> -+ <description>Latvian (adapted)</description> - </configItem> - </variant> - </variantList> -@@ -3849,9 +3849,9 @@ - <layout> - <configItem> - <name>mao</name> -- <!-- Keyboard indicator for Maori layouts --> -- <_shortDescription>mi</_shortDescription> -- <_description>Maori</_description> -+ -+ <shortDescription>mi</shortDescription> -+ <description>Maori</description> - <languageList> - <iso639Id>mao</iso639Id> - </languageList> -@@ -3861,9 +3861,9 @@ - <layout> - <configItem> - <name>me</name> -- <!-- Keyboard indicator for Montenegrin layouts --> -- <_shortDescription>sr</_shortDescription> -- <_description>Montenegrin</_description> -+ -+ <shortDescription>sr</shortDescription> -+ <description>Montenegrin</description> - <languageList> - <iso639Id>srp</iso639Id> - </languageList> -@@ -3872,43 +3872,43 @@ - <variant> - <configItem> - <name>cyrillic</name> -- <_description>Montenegrin (Cyrillic)</_description> -+ <description>Montenegrin (Cyrillic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>cyrillicyz</name> -- <_description>Montenegrin (Cyrillic, Z and ZHE swapped)</_description> -+ <description>Montenegrin (Cyrillic, Z and ZHE swapped)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinunicode</name> -- <_description>Montenegrin (Latin Unicode)</_description> -+ <description>Montenegrin (Latin Unicode)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinyz</name> -- <_description>Montenegrin (Latin qwerty)</_description> -+ <description>Montenegrin (Latin qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinunicodeyz</name> -- <_description>Montenegrin (Latin Unicode qwerty)</_description> -+ <description>Montenegrin (Latin Unicode qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>cyrillicalternatequotes</name> -- <_description>Montenegrin (Cyrillic with guillemets)</_description> -+ <description>Montenegrin (Cyrillic with guillemets)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinalternatequotes</name> -- <_description>Montenegrin (Latin with guillemets)</_description> -+ <description>Montenegrin (Latin with guillemets)</description> - </configItem> - </variant> - </variantList> -@@ -3916,9 +3916,9 @@ - <layout> - <configItem> - <name>mk</name> -- <!-- Keyboard indicator for Macedonian layouts --> -- <_shortDescription>mk</_shortDescription> -- <_description>Macedonian</_description> -+ -+ <shortDescription>mk</shortDescription> -+ <description>Macedonian</description> - <languageList> - <iso639Id>mkd</iso639Id> - </languageList> -@@ -3927,7 +3927,7 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Macedonian (eliminate dead keys)</_description> -+ <description>Macedonian (eliminate dead keys)</description> - </configItem> - </variant> - </variantList> -@@ -3935,9 +3935,9 @@ - <layout> - <configItem> - <name>mt</name> -- <!-- Keyboard indicator for Maltese layouts --> -- <_shortDescription>mt</_shortDescription> -- <_description>Maltese</_description> -+ -+ <shortDescription>mt</shortDescription> -+ <description>Maltese</description> - <languageList> - <iso639Id>mlt</iso639Id> - </languageList> -@@ -3946,7 +3946,7 @@ - <variant> - <configItem> - <name>us</name> -- <_description>Maltese (with US layout)</_description> -+ <description>Maltese (with US layout)</description> - </configItem> - </variant> - </variantList> -@@ -3954,9 +3954,9 @@ - <layout> - <configItem> - <name>mn</name> -- <!-- Keyboard indicator for Mongolian layouts --> -- <_shortDescription>mn</_shortDescription> -- <_description>Mongolian</_description> -+ -+ <shortDescription>mn</shortDescription> -+ <description>Mongolian</description> - <languageList> - <iso639Id>mon</iso639Id> - </languageList> -@@ -3966,9 +3966,9 @@ - <layout> - <configItem> - <name>no</name> -- <!-- Keyboard indicator for Norwegian layouts --> -- <_shortDescription>no</_shortDescription> -- <_description>Norwegian</_description> -+ -+ <shortDescription>no</shortDescription> -+ <description>Norwegian</description> - <languageList> - <iso639Id>nor</iso639Id> - <iso639Id>nob</iso639Id> -@@ -3979,19 +3979,19 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Norwegian (eliminate dead keys)</_description> -+ <description>Norwegian (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Norwegian (Dvorak)</_description> -+ <description>Norwegian (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>smi</name> -- <_description>Northern Saami (Norway)</_description> -+ <description>Northern Saami (Norway)</description> - <languageList> - <iso639Id>sme</iso639Id> - </languageList> -@@ -4000,7 +4000,7 @@ - <variant> - <configItem> - <name>smi_nodeadkeys</name> -- <_description>Northern Saami (Norway, eliminate dead keys)</_description> -+ <description>Northern Saami (Norway, eliminate dead keys)</description> - <languageList> - <iso639Id>sme</iso639Id> - </languageList> -@@ -4009,19 +4009,19 @@ - <variant> - <configItem> - <name>mac</name> -- <_description>Norwegian (Macintosh)</_description> -+ <description>Norwegian (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac_nodeadkeys</name> -- <_description>Norwegian (Macintosh, eliminate dead keys)</_description> -+ <description>Norwegian (Macintosh, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>colemak</name> -- <_description>Norwegian (Colemak)</_description> -+ <description>Norwegian (Colemak)</description> - </configItem> - </variant> - </variantList> -@@ -4029,9 +4029,9 @@ - <layout> - <configItem> - <name>pl</name> -- <!-- Keyboard indicator for Polish layouts --> -- <_shortDescription>pl</_shortDescription> -- <_description>Polish</_description> -+ -+ <shortDescription>pl</shortDescription> -+ <description>Polish</description> - <languageList> - <iso639Id>pol</iso639Id> - </languageList> -@@ -4040,37 +4040,37 @@ - <variant> - <configItem> - <name>legacy</name> -- <_description>Polish (legacy)</_description> -+ <description>Polish (legacy)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwertz</name> -- <_description>Polish (qwertz)</_description> -+ <description>Polish (qwertz)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Polish (Dvorak)</_description> -+ <description>Polish (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak_quotes</name> -- <_description>Polish (Dvorak, Polish quotes on quotemark key)</_description> -+ <description>Polish (Dvorak, Polish quotes on quotemark key)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak_altquotes</name> -- <_description>Polish (Dvorak, Polish quotes on key 1)</_description> -+ <description>Polish (Dvorak, Polish quotes on key 1)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>csb</name> -- <_description>Kashubian</_description> -+ <description>Kashubian</description> - <languageList> - <iso639Id>csb</iso639Id> - </languageList> -@@ -4086,9 +4086,9 @@ - <variant> - <configItem> - <name>ru_phonetic_dvorak</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (Poland, phonetic Dvorak)</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian (Poland, phonetic Dvorak)</description> - <languageList> - <iso639Id>rus</iso639Id> - </languageList> -@@ -4097,7 +4097,7 @@ - <variant> - <configItem> - <name>dvp</name> -- <_description>Polish (programmer Dvorak)</_description> -+ <description>Polish (programmer Dvorak)</description> - </configItem> - </variant> - </variantList> -@@ -4105,9 +4105,9 @@ - <layout> - <configItem> - <name>pt</name> -- <!-- Keyboard indicator for Portuguese layouts --> -- <_shortDescription>pt</_shortDescription> -- <_description>Portuguese</_description> -+ -+ <shortDescription>pt</shortDescription> -+ <description>Portuguese</description> - <languageList> - <iso639Id>por</iso639Id> - </languageList> -@@ -4116,49 +4116,49 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Portuguese (eliminate dead keys)</_description> -+ <description>Portuguese (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>Portuguese (Sun dead keys)</_description> -+ <description>Portuguese (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Portuguese (Macintosh)</_description> -+ <description>Portuguese (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac_nodeadkeys</name> -- <_description>Portuguese (Macintosh, eliminate dead keys)</_description> -+ <description>Portuguese (Macintosh, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac_sundeadkeys</name> -- <_description>Portuguese (Macintosh, Sun dead keys)</_description> -+ <description>Portuguese (Macintosh, Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nativo</name> -- <_description>Portuguese (Nativo)</_description> -+ <description>Portuguese (Nativo)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nativo-us</name> -- <_description>Portuguese (Nativo for US keyboards)</_description> -+ <description>Portuguese (Nativo for US keyboards)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>nativo-epo</name> -- <_description>Esperanto (Portugal, Nativo)</_description> -+ <description>Esperanto (Portugal, Nativo)</description> - <languageList> - <iso639Id>epo</iso639Id> - </languageList> -@@ -4169,9 +4169,9 @@ - <layout> - <configItem> - <name>ro</name> -- <!-- Keyboard indicator for Romanian layouts --> -- <_shortDescription>ro</_shortDescription> -- <_description>Romanian</_description> -+ -+ <shortDescription>ro</shortDescription> -+ <description>Romanian</description> - <languageList> - <iso639Id>rum</iso639Id> - </languageList> -@@ -4180,25 +4180,25 @@ - <variant> - <configItem> - <name>cedilla</name> -- <_description>Romanian (cedilla)</_description> -+ <description>Romanian (cedilla)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>std</name> -- <_description>Romanian (standard)</_description> -+ <description>Romanian (standard)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>std_cedilla</name> -- <_description>Romanian (standard cedilla)</_description> -+ <description>Romanian (standard cedilla)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>winkeys</name> -- <_description>Romanian (WinKeys)</_description> -+ <description>Romanian (WinKeys)</description> - </configItem> - </variant> - </variantList> -@@ -4206,9 +4206,9 @@ - <layout> - <configItem> - <name>ru</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian</description> - <languageList> - <iso639Id>rus</iso639Id> - </languageList> -@@ -4217,37 +4217,37 @@ - <variant> - <configItem> - <name>phonetic</name> -- <_description>Russian (phonetic)</_description> -+ <description>Russian (phonetic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>phonetic_winkeys</name> -- <_description>Russian (phonetic WinKeys)</_description> -+ <description>Russian (phonetic WinKeys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>typewriter</name> -- <_description>Russian (typewriter)</_description> -+ <description>Russian (typewriter)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>legacy</name> -- <_description>Russian (legacy)</_description> -+ <description>Russian (legacy)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>typewriter-legacy</name> -- <_description>Russian (typewriter, legacy)</_description> -+ <description>Russian (typewriter, legacy)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>tt</name> -- <_description>Tatar</_description> -+ <description>Tatar</description> - <languageList> - <iso639Id>tat</iso639Id> - </languageList> -@@ -4256,7 +4256,7 @@ - <variant> - <configItem> - <name>os_legacy</name> -- <_description>Ossetian (legacy)</_description> -+ <description>Ossetian (legacy)</description> - <languageList> - <iso639Id>oss</iso639Id> - </languageList> -@@ -4265,7 +4265,7 @@ - <variant> - <configItem> - <name>os_winkeys</name> -- <_description>Ossetian (WinKeys)</_description> -+ <description>Ossetian (WinKeys)</description> - <languageList> - <iso639Id>oss</iso639Id> - </languageList> -@@ -4274,7 +4274,7 @@ - <variant> - <configItem> - <name>cv</name> -- <_description>Chuvash</_description> -+ <description>Chuvash</description> - <languageList> - <iso639Id>chv</iso639Id> - </languageList> -@@ -4283,7 +4283,7 @@ - <variant> - <configItem> - <name>cv_latin</name> -- <_description>Chuvash (Latin)</_description> -+ <description>Chuvash (Latin)</description> - <languageList> - <iso639Id>chv</iso639Id> - </languageList> -@@ -4292,7 +4292,7 @@ - <variant> - <configItem> - <name>udm</name> -- <_description>Udmurt</_description> -+ <description>Udmurt</description> - <languageList> - <iso639Id>udm</iso639Id> - </languageList> -@@ -4301,7 +4301,7 @@ - <variant> - <configItem> - <name>kom</name> -- <_description>Komi</_description> -+ <description>Komi</description> - <languageList> - <iso639Id>kom</iso639Id> - </languageList> -@@ -4310,7 +4310,7 @@ - <variant> - <configItem> - <name>sah</name> -- <_description>Yakut</_description> -+ <description>Yakut</description> - <languageList> - <iso639Id>sah</iso639Id> - </languageList> -@@ -4319,7 +4319,7 @@ - <variant> - <configItem> - <name>xal</name> -- <_description>Kalmyk</_description> -+ <description>Kalmyk</description> - <languageList> - <iso639Id>xal</iso639Id> - </languageList> -@@ -4328,19 +4328,19 @@ - <variant> - <configItem> - <name>dos</name> -- <_description>Russian (DOS)</_description> -+ <description>Russian (DOS)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>Russian (Macintosh)</_description> -+ <description>Russian (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>srp</name> -- <_description>Serbian (Russia)</_description> -+ <description>Serbian (Russia)</description> - <languageList><iso639Id>rus</iso639Id> - <iso639Id>srp</iso639Id></languageList> - </configItem> -@@ -4348,7 +4348,7 @@ - <variant> - <configItem> - <name>bak</name> -- <_description>Bashkirian</_description> -+ <description>Bashkirian</description> - <languageList> - <iso639Id>bak</iso639Id> - </languageList> -@@ -4357,7 +4357,7 @@ - <variant> - <configItem> - <name>chm</name> -- <_description>Mari</_description> -+ <description>Mari</description> - <languageList> - <iso639Id>chm</iso639Id> - </languageList> -@@ -4368,9 +4368,9 @@ - <layout> - <configItem> - <name>rs</name> -- <!-- Keyboard indicator for Serbian layouts --> -- <_shortDescription>sr</_shortDescription> -- <_description>Serbian</_description> -+ -+ <shortDescription>sr</shortDescription> -+ <description>Serbian</description> - <languageList> - <iso639Id>srp</iso639Id> - </languageList> -@@ -4379,49 +4379,49 @@ - <variant> - <configItem> - <name>yz</name> -- <_description>Serbian (Cyrillic, Z and ZHE swapped)</_description> -+ <description>Serbian (Cyrillic, Z and ZHE swapped)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latin</name> -- <_description>Serbian (Latin)</_description> -+ <description>Serbian (Latin)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinunicode</name> -- <_description>Serbian (Latin Unicode)</_description> -+ <description>Serbian (Latin Unicode)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinyz</name> -- <_description>Serbian (Latin qwerty)</_description> -+ <description>Serbian (Latin qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinunicodeyz</name> -- <_description>Serbian (Latin Unicode qwerty)</_description> -+ <description>Serbian (Latin Unicode qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>alternatequotes</name> -- <_description>Serbian (Cyrillic with guillemets)</_description> -+ <description>Serbian (Cyrillic with guillemets)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>latinalternatequotes</name> -- <_description>Serbian (Latin with guillemets)</_description> -+ <description>Serbian (Latin with guillemets)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>rue</name> -- <_description>Pannonian Rusyn</_description> -+ <description>Pannonian Rusyn</description> - <languageList> - <iso639Id>rue</iso639Id> - </languageList> -@@ -4432,9 +4432,9 @@ - <layout> - <configItem> - <name>si</name> -- <!-- Keyboard indicator for Slovenian layouts --> -- <_shortDescription>sl</_shortDescription> -- <_description>Slovenian</_description> -+ -+ <shortDescription>sl</shortDescription> -+ <description>Slovenian</description> - <languageList> - <iso639Id>slv</iso639Id> - </languageList> -@@ -4443,13 +4443,13 @@ - <variant> - <configItem> - <name>alternatequotes</name> -- <_description>Slovenian (use guillemets for quotes)</_description> -+ <description>Slovenian (use guillemets for quotes)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>us</name> -- <_description>Slovenian (US keyboard with Slovenian letters)</_description> -+ <description>Slovenian (US keyboard with Slovenian letters)</description> - </configItem> - </variant> - </variantList> -@@ -4457,9 +4457,9 @@ - <layout> - <configItem> - <name>sk</name> -- <!-- Keyboard indicator for Slovak layouts --> -- <_shortDescription>sk</_shortDescription> -- <_description>Slovak</_description> -+ -+ <shortDescription>sk</shortDescription> -+ <description>Slovak</description> - <languageList> - <iso639Id>slo</iso639Id> - </languageList> -@@ -4468,19 +4468,19 @@ - <variant> - <configItem> - <name>bksl</name> -- <_description>Slovak (extended Backslash)</_description> -+ <description>Slovak (extended Backslash)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty</name> -- <_description>Slovak (qwerty)</_description> -+ <description>Slovak (qwerty)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>qwerty_bksl</name> -- <_description>Slovak (qwerty, extended Backslash)</_description> -+ <description>Slovak (qwerty, extended Backslash)</description> - </configItem> - </variant> - </variantList> -@@ -4488,9 +4488,9 @@ - <layout> - <configItem> - <name>es</name> -- <!-- Keyboard indicator for Spanish layouts --> -- <_shortDescription>es</_shortDescription> -- <_description>Spanish</_description> -+ -+ <shortDescription>es</shortDescription> -+ <description>Spanish</description> - <languageList> - <iso639Id>spa</iso639Id> - </languageList> -@@ -4499,31 +4499,31 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Spanish (eliminate dead keys)</_description> -+ <description>Spanish (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>deadtilde</name> -- <_description>Spanish (include dead tilde)</_description> -+ <description>Spanish (include dead tilde)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>Spanish (Sun dead keys)</_description> -+ <description>Spanish (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Spanish (Dvorak)</_description> -+ <description>Spanish (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ast</name> -- <_description>Asturian (Spain, with bottom-dot H and bottom-dot L)</_description> -+ <description>Asturian (Spain, with bottom-dot H and bottom-dot L)</description> - <languageList> - <iso639Id>ast</iso639Id> - </languageList> -@@ -4532,7 +4532,7 @@ - <variant> - <configItem> - <name>cat</name> -- <_description>Catalan (Spain, with middle-dot L)</_description> -+ <description>Catalan (Spain, with middle-dot L)</description> - <languageList> - <iso639Id>cat</iso639Id> - </languageList> -@@ -4541,7 +4541,7 @@ - <variant> - <configItem> - <name>mac</name> -- <_description>Spanish (Macintosh)</_description> -+ <description>Spanish (Macintosh)</description> - </configItem> - </variant> - </variantList> -@@ -4549,9 +4549,9 @@ - <layout> - <configItem> - <name>se</name> -- <!-- Keyboard indicator for Swedish layouts --> -- <_shortDescription>sv</_shortDescription> -- <_description>Swedish</_description> -+ -+ <shortDescription>sv</shortDescription> -+ <description>Swedish</description> - <languageList> - <iso639Id>swe</iso639Id> - </languageList> -@@ -4560,21 +4560,21 @@ - <variant> - <configItem> - <name>nodeadkeys</name> -- <_description>Swedish (eliminate dead keys)</_description> -+ <description>Swedish (eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>Swedish (Dvorak)</_description> -+ <description>Swedish (Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>rus</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (Sweden, phonetic)</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian (Sweden, phonetic)</description> - <languageList> - <iso639Id>rus</iso639Id> - </languageList> -@@ -4583,9 +4583,9 @@ - <variant> - <configItem> - <name>rus_nodeadkeys</name> -- <!-- Keyboard indicator for Russian layouts --> -- <_shortDescription>ru</_shortDescription> -- <_description>Russian (Sweden, phonetic, eliminate dead keys)</_description> -+ -+ <shortDescription>ru</shortDescription> -+ <description>Russian (Sweden, phonetic, eliminate dead keys)</description> - <languageList> - <iso639Id>rus</iso639Id> - </languageList> -@@ -4594,7 +4594,7 @@ - <variant> - <configItem> - <name>smi</name> -- <_description>Northern Saami (Sweden)</_description> -+ <description>Northern Saami (Sweden)</description> - <languageList> - <iso639Id>sme</iso639Id> - </languageList> -@@ -4603,19 +4603,19 @@ - <variant> - <configItem> - <name>mac</name> -- <_description>Swedish (Macintosh)</_description> -+ <description>Swedish (Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>svdvorak</name> -- <_description>Swedish (Svdvorak)</_description> -+ <description>Swedish (Svdvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>swl</name> -- <_description>Swedish Sign Language</_description> -+ <description>Swedish Sign Language</description> - <languageList><iso639Id>swl</iso639Id></languageList> - </configItem> - </variant> -@@ -4624,9 +4624,9 @@ - <layout> - <configItem> - <name>ch</name> -- <!-- Keyboard indicator for German layouts --> -- <_shortDescription>de</_shortDescription> -- <_description>German (Switzerland)</_description> -+ -+ <shortDescription>de</shortDescription> -+ <description>German (Switzerland)</description> - <languageList><iso639Id>ger</iso639Id> - <iso639Id>gsw</iso639Id></languageList> - </configItem> -@@ -4634,31 +4634,31 @@ - <variant> - <configItem> - <name>legacy</name> -- <_description>German (Switzerland, legacy)</_description> -+ <description>German (Switzerland, legacy)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>de_nodeadkeys</name> -- <!-- Keyboard indicator for German layouts --> -- <_shortDescription>de</_shortDescription> -- <_description>German (Switzerland, eliminate dead keys)</_description> -+ -+ <shortDescription>de</shortDescription> -+ <description>German (Switzerland, eliminate dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>de_sundeadkeys</name> -- <!-- Keyboard indicator for German layouts --> -- <_shortDescription>de</_shortDescription> -- <_description>German (Switzerland, Sun dead keys)</_description> -+ -+ <shortDescription>de</shortDescription> -+ <description>German (Switzerland, Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>fr</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Switzerland)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Switzerland)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -4667,9 +4667,9 @@ - <variant> - <configItem> - <name>fr_nodeadkeys</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Switzerland, eliminate dead keys)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Switzerland, eliminate dead keys)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -4678,9 +4678,9 @@ - <variant> - <configItem> - <name>fr_sundeadkeys</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Switzerland, Sun dead keys)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Switzerland, Sun dead keys)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -4689,9 +4689,9 @@ - <variant> - <configItem> - <name>fr_mac</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Switzerland, Macintosh)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Switzerland, Macintosh)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -4700,9 +4700,9 @@ - <variant> - <configItem> - <name>de_mac</name> -- <!-- Keyboard indicator for German layouts --> -- <_shortDescription>de</_shortDescription> -- <_description>German (Switzerland, Macintosh)</_description> -+ -+ <shortDescription>de</shortDescription> -+ <description>German (Switzerland, Macintosh)</description> - </configItem> - </variant> - </variantList> -@@ -4710,9 +4710,9 @@ - <layout> - <configItem> - <name>sy</name> -- <!-- Keyboard indicator for Arabic layouts --> -- <_shortDescription>ar</_shortDescription> -- <_description>Arabic (Syria)</_description> -+ -+ <shortDescription>ar</shortDescription> -+ <description>Arabic (Syria)</description> - <languageList> - <iso639Id>syr</iso639Id> - </languageList> -@@ -4721,25 +4721,25 @@ - <variant> - <configItem> - <name>syc</name> -- <!-- Keyboard indicator for Syriac layouts --> -- <_shortDescription>syc</_shortDescription> -- <_description>Syriac</_description> -+ -+ <shortDescription>syc</shortDescription> -+ <description>Syriac</description> - </configItem> - </variant> - <variant> - <configItem> - <name>syc_phonetic</name> -- <!-- Keyboard indicator for Syriac layouts --> -- <_shortDescription>syc</_shortDescription> -- <_description>Syriac (phonetic)</_description> -+ -+ <shortDescription>syc</shortDescription> -+ <description>Syriac (phonetic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ku</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Syria, Latin Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Syria, Latin Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -4748,9 +4748,9 @@ - <variant> - <configItem> - <name>ku_f</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Syria, F)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Syria, F)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -4759,9 +4759,9 @@ - <variant> - <configItem> - <name>ku_alt</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Syria, Latin Alt-Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Syria, Latin Alt-Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -4772,9 +4772,9 @@ - <layout> - <configItem> - <name>tj</name> -- <!-- Keyboard indicator for Tajik layouts --> -- <_shortDescription>tg</_shortDescription> -- <_description>Tajik</_description> -+ -+ <shortDescription>tg</shortDescription> -+ <description>Tajik</description> - <languageList> - <iso639Id>tgk</iso639Id> - </languageList> -@@ -4783,7 +4783,7 @@ - <variant> - <configItem> - <name>legacy</name> -- <_description>Tajik (legacy)</_description> -+ <description>Tajik (legacy)</description> - </configItem> - </variant> - </variantList> -@@ -4791,9 +4791,9 @@ - <layout> - <configItem> - <name>lk</name> -- <!-- Keyboard indicator for Sinhala layouts --> -- <_shortDescription>si</_shortDescription> -- <_description>Sinhala (phonetic)</_description> -+ -+ <shortDescription>si</shortDescription> -+ <description>Sinhala (phonetic)</description> - <languageList> - <iso639Id>sin</iso639Id> - </languageList> -@@ -4802,9 +4802,9 @@ - <variant> - <configItem> - <name>tam_unicode</name> -- <!-- Keyboard indicator for Tamil layouts --> -- <_shortDescription>ta</_shortDescription> -- <_description>Tamil (Sri Lanka, Unicode)</_description> -+ -+ <shortDescription>ta</shortDescription> -+ <description>Tamil (Sri Lanka, Unicode)</description> - <languageList> - <iso639Id>tam</iso639Id> - </languageList> -@@ -4813,7 +4813,7 @@ - <variant> - <configItem> - <name>tam_TAB</name> -- <_description>Tamil (Sri Lanka, TAB Typewriter)</_description> -+ <description>Tamil (Sri Lanka, TAB Typewriter)</description> - <languageList> - <iso639Id>tam</iso639Id> - </languageList> -@@ -4824,9 +4824,9 @@ - <layout> - <configItem> - <name>th</name> -- <!-- Keyboard indicator for Thai layouts --> -- <_shortDescription>th</_shortDescription> -- <_description>Thai</_description> -+ -+ <shortDescription>th</shortDescription> -+ <description>Thai</description> - <languageList> - <iso639Id>tha</iso639Id> - </languageList> -@@ -4835,13 +4835,13 @@ - <variant> - <configItem> - <name>tis</name> -- <_description>Thai (TIS-820.2538)</_description> -+ <description>Thai (TIS-820.2538)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>pat</name> -- <_description>Thai (Pattachote)</_description> -+ <description>Thai (Pattachote)</description> - </configItem> - </variant> - </variantList> -@@ -4849,9 +4849,9 @@ - <layout> - <configItem> - <name>tr</name> -- <!-- Keyboard indicator for Turkish layouts --> -- <_shortDescription>tr</_shortDescription> -- <_description>Turkish</_description> -+ -+ <shortDescription>tr</shortDescription> -+ <description>Turkish</description> - <languageList> - <iso639Id>tur</iso639Id> - </languageList> -@@ -4860,27 +4860,27 @@ - <variant> - <configItem> - <name>f</name> -- <_description>Turkish (F)</_description> -+ <description>Turkish (F)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>alt</name> -- <_description>Turkish (Alt-Q)</_description> -+ <description>Turkish (Alt-Q)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>sundeadkeys</name> -- <_description>Turkish (Sun dead keys)</_description> -+ <description>Turkish (Sun dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ku</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Turkey, Latin Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Turkey, Latin Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -4889,9 +4889,9 @@ - <variant> - <configItem> - <name>ku_f</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Turkey, F)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Turkey, F)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -4900,9 +4900,9 @@ - <variant> - <configItem> - <name>ku_alt</name> -- <!-- Keyboard indicator for Kurdish layouts --> -- <_shortDescription>ku</_shortDescription> -- <_description>Kurdish (Turkey, Latin Alt-Q)</_description> -+ -+ <shortDescription>ku</shortDescription> -+ <description>Kurdish (Turkey, Latin Alt-Q)</description> - <languageList> - <iso639Id>kur</iso639Id> - </languageList> -@@ -4911,15 +4911,15 @@ - <variant> - <configItem> - <name>intl</name> -- <_description>Turkish (international with dead keys)</_description> -+ <description>Turkish (international with dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>crh</name> -- <!-- Keyboard indicator for Crimean Tatar layouts --> -- <_shortDescription>crh</_shortDescription> -- <_description>Crimean Tatar (Turkish Q)</_description> -+ -+ <shortDescription>crh</shortDescription> -+ <description>Crimean Tatar (Turkish Q)</description> - <languageList> - <iso639Id>crh</iso639Id> - </languageList> -@@ -4928,9 +4928,9 @@ - <variant> - <configItem> - <name>crh_f</name> -- <!-- Keyboard indicator for Crimean Tatar layouts --> -- <_shortDescription>crh</_shortDescription> -- <_description>Crimean Tatar (Turkish F)</_description> -+ -+ <shortDescription>crh</shortDescription> -+ <description>Crimean Tatar (Turkish F)</description> - <languageList> - <iso639Id>crh</iso639Id> - </languageList> -@@ -4939,9 +4939,9 @@ - <variant> - <configItem> - <name>crh_alt</name> -- <!-- Keyboard indicator for Crimean Tatar layouts --> -- <_shortDescription>crh</_shortDescription> -- <_description>Crimean Tatar (Turkish Alt-Q)</_description> -+ -+ <shortDescription>crh</shortDescription> -+ <description>Crimean Tatar (Turkish Alt-Q)</description> - <languageList> - <iso639Id>crh</iso639Id> - </languageList> -@@ -4952,9 +4952,9 @@ - <layout> - <configItem> - <name>tw</name> -- <!-- Keyboard indicator for Taiwanese layouts --> -- <_shortDescription>zh</_shortDescription> -- <_description>Taiwanese</_description> -+ -+ <shortDescription>zh</shortDescription> -+ <description>Taiwanese</description> - <languageList> - <iso639Id>fox</iso639Id> - </languageList> -@@ -4963,7 +4963,7 @@ - <variant> - <configItem> - <name>indigenous</name> -- <_description>Taiwanese (indigenous)</_description> -+ <description>Taiwanese (indigenous)</description> - <languageList> - <iso639Id>ami</iso639Id> - <iso639Id>tay</iso639Id> -@@ -4987,9 +4987,9 @@ - <variant> - <configItem> - <name>saisiyat</name> -- <!-- Keyboard indicator for Saisiyat layouts --> -- <_shortDescription>xsy</_shortDescription> -- <_description>Saisiyat (Taiwan)</_description> -+ -+ <shortDescription>xsy</shortDescription> -+ <description>Saisiyat (Taiwan)</description> - <languageList> - <iso639Id>xsy</iso639Id> - </languageList> -@@ -5000,9 +5000,9 @@ - <layout> - <configItem> - <name>ua</name> -- <!-- Keyboard indicator for Ukranian layouts --> -- <_shortDescription>uk</_shortDescription> -- <_description>Ukrainian</_description> -+ -+ <shortDescription>uk</shortDescription> -+ <description>Ukrainian</description> - <languageList> - <iso639Id>ukr</iso639Id> - </languageList> -@@ -5011,43 +5011,43 @@ - <variant> - <configItem> - <name>phonetic</name> -- <_description>Ukrainian (phonetic)</_description> -+ <description>Ukrainian (phonetic)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>typewriter</name> -- <_description>Ukrainian (typewriter)</_description> -+ <description>Ukrainian (typewriter)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>winkeys</name> -- <_description>Ukrainian (WinKeys)</_description> -+ <description>Ukrainian (WinKeys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>legacy</name> -- <_description>Ukrainian (legacy)</_description> -+ <description>Ukrainian (legacy)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>rstu</name> -- <_description>Ukrainian (standard RSTU)</_description> -+ <description>Ukrainian (standard RSTU)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>rstu_ru</name> -- <_description>Russian (Ukraine, standard RSTU)</_description> -+ <description>Russian (Ukraine, standard RSTU)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>homophonic</name> -- <_description>Ukrainian (homophonic)</_description> -+ <description>Ukrainian (homophonic)</description> - </configItem> - </variant> - </variantList> -@@ -5055,9 +5055,9 @@ - <layout> - <configItem> - <name>gb</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (UK)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (UK)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -5066,43 +5066,43 @@ - <variant> - <configItem> - <name>extd</name> -- <_description>English (UK, extended WinKeys)</_description> -+ <description>English (UK, extended WinKeys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>intl</name> -- <_description>English (UK, international with dead keys)</_description> -+ <description>English (UK, international with dead keys)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak</name> -- <_description>English (UK, Dvorak)</_description> -+ <description>English (UK, Dvorak)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorakukp</name> -- <_description>English (UK, Dvorak with UK punctuation)</_description> -+ <description>English (UK, Dvorak with UK punctuation)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac</name> -- <_description>English (UK, Macintosh)</_description> -+ <description>English (UK, Macintosh)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>mac_intl</name> -- <_description>English (UK, Macintosh international)</_description> -+ <description>English (UK, Macintosh international)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>colemak</name> -- <_description>English (UK, Colemak)</_description> -+ <description>English (UK, Colemak)</description> - </configItem> - </variant> - </variantList> -@@ -5110,9 +5110,9 @@ - <layout> - <configItem> - <name>uz</name> -- <!-- Keyboard indicator for Uzbek layouts --> -- <_shortDescription>uz</_shortDescription> -- <_description>Uzbek</_description> -+ -+ <shortDescription>uz</shortDescription> -+ <description>Uzbek</description> - <languageList> - <iso639Id>uzb</iso639Id> - </languageList> -@@ -5121,7 +5121,7 @@ - <variant> - <configItem> - <name>latin</name> -- <_description>Uzbek (Latin)</_description> -+ <description>Uzbek (Latin)</description> - </configItem> - </variant> - </variantList> -@@ -5129,9 +5129,9 @@ - <layout> - <configItem> - <name>vn</name> -- <!-- Keyboard indicator for Vietnamese layouts --> -- <_shortDescription>vi</_shortDescription> -- <_description>Vietnamese</_description> -+ -+ <shortDescription>vi</shortDescription> -+ <description>Vietnamese</description> - <languageList> - <iso639Id>vie</iso639Id> - </languageList> -@@ -5141,9 +5141,9 @@ - <layout> - <configItem> - <name>kr</name> -- <!-- Keyboard indicator for Korean layouts --> -- <_shortDescription>ko</_shortDescription> -- <_description>Korean</_description> -+ -+ <shortDescription>ko</shortDescription> -+ <description>Korean</description> - <languageList> - <iso639Id>kor</iso639Id> - </languageList> -@@ -5152,7 +5152,7 @@ - <variant> - <configItem> - <name>kr104</name> -- <_description>Korean (101/104 key compatible)</_description> -+ <description>Korean (101/104 key compatible)</description> - </configItem> - </variant> - </variantList> -@@ -5160,9 +5160,9 @@ - <layout> - <configItem> - <name>nec_vndr/jp</name> -- <!-- Keyboard indicator for Japanese layouts --> -- <_shortDescription>ja</_shortDescription> -- <_description>Japanese (PC-98xx Series)</_description> -+ -+ <shortDescription>ja</shortDescription> -+ <description>Japanese (PC-98xx Series)</description> - <countryList> - <iso3166Id>JP</iso3166Id> - </countryList> -@@ -5175,9 +5175,9 @@ - <layout> - <configItem> - <name>ie</name> -- <!-- Keyboard indicator for Irish layouts --> -- <_shortDescription>ie</_shortDescription> -- <_description>Irish</_description> -+ -+ <shortDescription>ie</shortDescription> -+ <description>Irish</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -5186,7 +5186,7 @@ - <variant> - <configItem> - <name>CloGaelach</name> -- <_description>CloGaelach</_description> -+ <description>CloGaelach</description> - <languageList> - <iso639Id>gle</iso639Id> - </languageList> -@@ -5195,13 +5195,13 @@ - <variant> - <configItem> - <name>UnicodeExpert</name> -- <_description>Irish (UnicodeExpert)</_description> -+ <description>Irish (UnicodeExpert)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ogam</name> -- <_description>Ogham</_description> -+ <description>Ogham</description> - <languageList> - <iso639Id>sga</iso639Id> - </languageList> -@@ -5210,7 +5210,7 @@ - <variant> - <configItem> - <name>ogam_is434</name> -- <_description>Ogham (IS434)</_description> -+ <description>Ogham (IS434)</description> - <languageList> - <iso639Id>sga</iso639Id> - </languageList> -@@ -5221,9 +5221,9 @@ - <layout> - <configItem> - <name>pk</name> -- <!-- Keyboard indicator for Urdu layouts --> -- <_shortDescription>ur</_shortDescription> -- <_description>Urdu (Pakistan)</_description> -+ -+ <shortDescription>ur</shortDescription> -+ <description>Urdu (Pakistan)</description> - <languageList> - <iso639Id>urd</iso639Id> - </languageList> -@@ -5232,20 +5232,20 @@ - <variant> - <configItem> - <name>urd-crulp</name> -- <_description>Urdu (Pakistan, CRULP)</_description> -+ <description>Urdu (Pakistan, CRULP)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>urd-nla</name> -- <_description>Urdu (Pakistan, NLA)</_description> -+ <description>Urdu (Pakistan, NLA)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>ara</name> -- <_shortDescription>ar</_shortDescription> -- <_description>Arabic (Pakistan)</_description> -+ <shortDescription>ar</shortDescription> -+ <description>Arabic (Pakistan)</description> - <languageList> - <iso639Id>ara</iso639Id> - </languageList> -@@ -5254,9 +5254,9 @@ - <variant> - <configItem> - <name>snd</name> -- <!-- Keyboard indicator for Sindhi layouts --> -- <_shortDescription>sd</_shortDescription> -- <_description>Sindhi</_description> -+ -+ <shortDescription>sd</shortDescription> -+ <description>Sindhi</description> - <languageList> - <iso639Id>snd</iso639Id> - </languageList> -@@ -5267,9 +5267,9 @@ - <layout> - <configItem> - <name>mv</name> -- <!-- Keyboard indicator for Dhivehi layouts --> -- <_shortDescription>dv</_shortDescription> -- <_description>Dhivehi</_description> -+ -+ <shortDescription>dv</shortDescription> -+ <description>Dhivehi</description> - <languageList> - <iso639Id>div</iso639Id> - </languageList> -@@ -5279,9 +5279,9 @@ - <layout> - <configItem> - <name>za</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (South Africa)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (South Africa)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -5290,9 +5290,9 @@ - <layout> - <configItem> - <name>epo</name> -- <!-- Keyboard indicator for Esperanto layouts --> -- <_shortDescription>eo</_shortDescription> -- <_description>Esperanto</_description> -+ -+ <shortDescription>eo</shortDescription> -+ <description>Esperanto</description> - <languageList> - <iso639Id>epo</iso639Id> - </languageList> -@@ -5301,7 +5301,7 @@ - <variant> - <configItem> - <name>legacy</name> -- <_description>Esperanto (displaced semicolon and quote, obsolete)</_description> -+ <description>Esperanto (displaced semicolon and quote, obsolete)</description> - </configItem> - </variant> - </variantList> -@@ -5309,9 +5309,9 @@ - <layout> - <configItem> - <name>np</name> -- <!-- Keyboard indicator for Nepali layouts --> -- <_shortDescription>ne</_shortDescription> -- <_description>Nepali</_description> -+ -+ <shortDescription>ne</shortDescription> -+ <description>Nepali</description> - <languageList> - <iso639Id>nep</iso639Id> - </languageList> -@@ -5320,9 +5320,9 @@ - <layout> - <configItem> - <name>ng</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (Nigeria)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (Nigeria)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -5331,9 +5331,9 @@ - <variant> - <configItem> - <name>igbo</name> -- <!-- Keyboard indicator for Igbo layouts --> -- <_shortDescription>ig</_shortDescription> -- <_description>Igbo</_description> -+ -+ <shortDescription>ig</shortDescription> -+ <description>Igbo</description> - <languageList> - <iso639Id>ibo</iso639Id> - </languageList> -@@ -5342,9 +5342,9 @@ - <variant> - <configItem> - <name>yoruba</name> -- <!-- Keyboard indicator for Yoruba layouts --> -- <_shortDescription>yo</_shortDescription> -- <_description>Yoruba</_description> -+ -+ <shortDescription>yo</shortDescription> -+ <description>Yoruba</description> - <languageList> - <iso639Id>yor</iso639Id> - </languageList> -@@ -5353,9 +5353,9 @@ - <variant> - <configItem> - <name>hausa</name> -- <!-- Keyboard indicator for Hausa layouts --> -- <_shortDescription>ha</_shortDescription> -- <_description>Hausa</_description> -+ -+ <shortDescription>ha</shortDescription> -+ <description>Hausa</description> - <languageList> - <iso639Id>hau</iso639Id> - </languageList> -@@ -5366,9 +5366,9 @@ - <layout> - <configItem> - <name>et</name> -- <!-- Keyboard indicator for Amharic layouts --> -- <_shortDescription>am</_shortDescription> -- <_description>Amharic</_description> -+ -+ <shortDescription>am</shortDescription> -+ <description>Amharic</description> - <languageList> - <iso639Id>amh</iso639Id> - </languageList> -@@ -5378,9 +5378,9 @@ - <layout> - <configItem> - <name>sn</name> -- <!-- Keyboard indicator for Wolof layouts --> -- <_shortDescription>wo</_shortDescription> -- <_description>Wolof</_description> -+ -+ <shortDescription>wo</shortDescription> -+ <description>Wolof</description> - <languageList> - <iso639Id>wol</iso639Id> - </languageList> -@@ -5390,21 +5390,21 @@ - <layout> - <configItem> - <name>brai</name> -- <!-- Keyboard indicator for Braille layouts --> -- <_shortDescription>brl</_shortDescription> -- <_description>Braille</_description> -+ -+ <shortDescription>brl</shortDescription> -+ <description>Braille</description> - </configItem> - <variantList> - <variant> - <configItem> - <name>left_hand</name> -- <_description>Braille (left hand)</_description> -+ <description>Braille (left hand)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>right_hand</name> -- <_description>Braille (right hand)</_description> -+ <description>Braille (right hand)</description> - </configItem> - </variant> - </variantList> -@@ -5412,9 +5412,9 @@ - <layout> - <configItem> - <name>tm</name> -- <!-- Keyboard indicator for Turkmen layouts --> -- <_shortDescription>tk</_shortDescription> -- <_description>Turkmen</_description> -+ -+ <shortDescription>tk</shortDescription> -+ <description>Turkmen</description> - <languageList> - <iso639Id>tuk</iso639Id> - </languageList> -@@ -5423,7 +5423,7 @@ - <variant> - <configItem> - <name>alt</name> -- <_description>Turkmen (Alt-Q)</_description> -+ <description>Turkmen (Alt-Q)</description> - </configItem> - </variant> - </variantList> -@@ -5431,9 +5431,9 @@ - <layout> - <configItem> - <name>ml</name> -- <!-- Keyboard indicator for Bambara layouts --> -- <_shortDescription>bm</_shortDescription> -- <_description>Bambara</_description> -+ -+ <shortDescription>bm</shortDescription> -+ <description>Bambara</description> - <languageList> - <iso639Id>bam</iso639Id> - </languageList> -@@ -5442,9 +5442,9 @@ - <variant> - <configItem> - <name>fr-oss</name> -- <!-- Keyboard indicator for French layouts --> -- <_shortDescription>fr</_shortDescription> -- <_description>French (Mali, alternative)</_description> -+ -+ <shortDescription>fr</shortDescription> -+ <description>French (Mali, alternative)</description> - <languageList> - <iso639Id>fra</iso639Id> - </languageList> -@@ -5453,9 +5453,9 @@ - <variant> - <configItem> - <name>us-mac</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (Mali, US Macintosh)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (Mali, US Macintosh)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -5464,9 +5464,9 @@ - <variant> - <configItem> - <name>us-intl</name> -- <!-- Keyboard indicator for English layouts --> -- <_shortDescription>en</_shortDescription> -- <_description>English (Mali, US international)</_description> -+ -+ <shortDescription>en</shortDescription> -+ <description>English (Mali, US international)</description> - <languageList> - <iso639Id>eng</iso639Id> - </languageList> -@@ -5477,9 +5477,9 @@ - <layout> - <configItem> - <name>tz</name> -- <!-- Keyboard indicator for Swahili layouts --> -- <_shortDescription>sw</_shortDescription> -- <_description>Swahili (Tanzania)</_description> -+ -+ <shortDescription>sw</shortDescription> -+ <description>Swahili (Tanzania)</description> - <languageList> - <iso639Id>swa</iso639Id> - </languageList> -@@ -5488,9 +5488,9 @@ - <layout> - <configItem> - <name>ke</name> -- <!-- Keyboard indicator for Swahili layouts --> -- <_shortDescription>sw</_shortDescription> -- <_description>Swahili (Kenya)</_description> -+ -+ <shortDescription>sw</shortDescription> -+ <description>Swahili (Kenya)</description> - <languageList> - <iso639Id>swa</iso639Id> - </languageList> -@@ -5499,9 +5499,9 @@ - <variant> - <configItem> - <name>kik</name> -- <!-- Keyboard indicator for Kikuyu layouts --> -- <_shortDescription>ki</_shortDescription> -- <_description>Kikuyu</_description> -+ -+ <shortDescription>ki</shortDescription> -+ <description>Kikuyu</description> - <languageList> - <iso639Id>kik</iso639Id> - </languageList> -@@ -5512,9 +5512,9 @@ - <layout> - <configItem> - <name>bw</name> -- <!-- Keyboard indicator for Tswana layouts --> -- <_shortDescription>tn</_shortDescription> -- <_description>Tswana</_description> -+ -+ <shortDescription>tn</shortDescription> -+ <description>Tswana</description> - <languageList> - <iso639Id>tsn</iso639Id> - </languageList> -@@ -5523,9 +5523,9 @@ - <layout> - <configItem> - <name>ph</name> -- <!-- Keyboard indicator for Filipino layouts --> -- <_shortDescription>ph</_shortDescription> -- <_description>Filipino</_description> -+ -+ <shortDescription>ph</shortDescription> -+ <description>Filipino</description> - <languageList><iso639Id>eng</iso639Id> - <iso639Id>bik</iso639Id> - <iso639Id>ceb</iso639Id> -@@ -5542,7 +5542,7 @@ - <variant> - <configItem> - <name>qwerty-bay</name> -- <_description>Filipino (QWERTY Baybayin)</_description> -+ <description>Filipino (QWERTY Baybayin)</description> - <languageList><iso639Id>bik</iso639Id> - <iso639Id>ceb</iso639Id> - <iso639Id>fil</iso639Id> -@@ -5558,13 +5558,13 @@ - <variant> - <configItem> - <name>capewell-dvorak</name> -- <_description>Filipino (Capewell-Dvorak Latin)</_description> -+ <description>Filipino (Capewell-Dvorak Latin)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>capewell-dvorak-bay</name> -- <_description>Filipino (Capewell-Dvorak Baybayin)</_description> -+ <description>Filipino (Capewell-Dvorak Baybayin)</description> - <languageList><iso639Id>bik</iso639Id> - <iso639Id>ceb</iso639Id> - <iso639Id>fil</iso639Id> -@@ -5580,13 +5580,13 @@ - <variant> - <configItem> - <name>capewell-qwerf2k6</name> -- <_description>Filipino (Capewell-QWERF 2006 Latin)</_description> -+ <description>Filipino (Capewell-QWERF 2006 Latin)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>capewell-qwerf2k6-bay</name> -- <_description>Filipino (Capewell-QWERF 2006 Baybayin)</_description> -+ <description>Filipino (Capewell-QWERF 2006 Baybayin)</description> - <languageList><iso639Id>bik</iso639Id> - <iso639Id>ceb</iso639Id> - <iso639Id>fil</iso639Id> -@@ -5602,13 +5602,13 @@ - <variant> - <configItem> - <name>colemak</name> -- <_description>Filipino (Colemak Latin)</_description> -+ <description>Filipino (Colemak Latin)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>colemak-bay</name> -- <_description>Filipino (Colemak Baybayin)</_description> -+ <description>Filipino (Colemak Baybayin)</description> - <languageList><iso639Id>bik</iso639Id> - <iso639Id>ceb</iso639Id> - <iso639Id>fil</iso639Id> -@@ -5624,13 +5624,13 @@ - <variant> - <configItem> - <name>dvorak</name> -- <_description>Filipino (Dvorak Latin)</_description> -+ <description>Filipino (Dvorak Latin)</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dvorak-bay</name> -- <_description>Filipino (Dvorak Baybayin)</_description> -+ <description>Filipino (Dvorak Baybayin)</description> - <languageList><iso639Id>bik</iso639Id> - <iso639Id>ceb</iso639Id> - <iso639Id>fil</iso639Id> -@@ -5648,16 +5648,16 @@ - <layout> - <configItem> - <name>md</name> -- <_shortDescription>md</_shortDescription> -- <_description>Moldavian</_description> -+ <shortDescription>md</shortDescription> -+ <description>Moldavian</description> - <languageList><iso639Id>rum</iso639Id></languageList> - </configItem> - <variantList> - <variant> - <configItem> - <name>gag</name> -- <_shortDescription>gag</_shortDescription> -- <_description>Moldavian (Gagauz)</_description> -+ <shortDescription>gag</shortDescription> -+ <description>Moldavian (Gagauz)</description> - <languageList><iso639Id>gag</iso639Id></languageList> - </configItem> - </variant> -@@ -5666,1183 +5666,1142 @@ - </layoutList> - <optionList> - <group allowMultipleSelection="true"> -- <!-- The key combination used to switch between groups --> -+ - <configItem> - <name>grp</name> -- <_description>Switching to another layout</_description> -+ <description>Switching to another layout</description> - </configItem> - <option> - <configItem> - <name>grp:switch</name> -- <_description>Right Alt (while pressed)</_description> -+ <description>Right Alt (while pressed)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lswitch</name> -- <_description>Left Alt (while pressed)</_description> -+ <description>Left Alt (while pressed)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lwin_switch</name> -- <_description>Left Win (while pressed)</_description> -+ <description>Left Win (while pressed)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:rwin_switch</name> -- <_description>Right Win (while pressed)</_description> -+ <description>Right Win (while pressed)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:win_switch</name> -- <_description>Any Win key (while pressed)</_description> -+ <description>Any Win key (while pressed)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:caps_switch</name> -- <_description>Caps Lock (while pressed), Alt+Caps Lock does the original capslock action</_description> -+ <description>Caps Lock (while pressed), Alt+Caps Lock does the original capslock action</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:rctrl_switch</name> -- <_description>Right Ctrl (while pressed)</_description> -+ <description>Right Ctrl (while pressed)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:toggle</name> -- <_description>Right Alt</_description> -+ <description>Right Alt</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lalt_toggle</name> -- <_description>Left Alt</_description> -+ <description>Left Alt</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:caps_toggle</name> -- <_description>Caps Lock</_description> -+ <description>Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:shift_caps_toggle</name> -- <_description>Shift+Caps Lock</_description> -+ <description>Shift+Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:shift_caps_switch</name> -- <_description>Caps Lock (to first layout), Shift+Caps Lock (to last layout)</_description> -+ <description>Caps Lock (to first layout), Shift+Caps Lock (to last layout)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:win_menu_switch</name> -- <_description>Left Win (to first layout), Right Win/Menu (to last layout)</_description> -+ <description>Left Win (to first layout), Right Win/Menu (to last layout)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lctrl_rctrl_switch</name> -- <_description>Left Ctrl (to first layout), Right Ctrl (to last layout)</_description> -+ <description>Left Ctrl (to first layout), Right Ctrl (to last layout)</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:alt_caps_toggle</name> -- <_description>Alt+Caps Lock</_description> -+ <description>Alt+Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:shifts_toggle</name> -- <_description>Both Shift keys together</_description> -+ <description>Both Shift keys together</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:alts_toggle</name> -- <_description>Both Alt keys together</_description> -+ <description>Both Alt keys together</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:ctrls_toggle</name> -- <_description>Both Ctrl keys together</_description> -+ <description>Both Ctrl keys together</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:ctrl_shift_toggle</name> -- <_description>Ctrl+Shift</_description> -+ <description>Ctrl+Shift</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lctrl_lshift_toggle</name> -- <_description>Left Ctrl+Left Shift</_description> -+ <description>Left Ctrl+Left Shift</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:rctrl_rshift_toggle</name> -- <_description>Right Ctrl+Right Shift</_description> -+ <description>Right Ctrl+Right Shift</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:ctrl_alt_toggle</name> -- <_description>Alt+Ctrl</_description> -+ <description>Alt+Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:alt_shift_toggle</name> -- <_description>Alt+Shift</_description> -+ <description>Alt+Shift</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lalt_lshift_toggle</name> -- <_description>Left Alt+Left Shift</_description> -+ <description>Left Alt+Left Shift</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:alt_space_toggle</name> -- <_description>Alt+Space</_description> -+ <description>Alt+Space</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:menu_toggle</name> -- <_description>Menu</_description> -+ <description>Menu</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lwin_toggle</name> -- <_description>Left Win</_description> -+ <description>Left Win</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:rwin_toggle</name> -- <_description>Right Win</_description> -+ <description>Right Win</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lshift_toggle</name> -- <_description>Left Shift</_description> -+ <description>Left Shift</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:rshift_toggle</name> -- <_description>Right Shift</_description> -+ <description>Right Shift</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lctrl_toggle</name> -- <_description>Left Ctrl</_description> -+ <description>Left Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:rctrl_toggle</name> -- <_description>Right Ctrl</_description> -+ <description>Right Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:sclk_toggle</name> -- <_description>Scroll Lock</_description> -+ <description>Scroll Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>grp:lctrl_lwin_rctrl_menu</name> -- <_description>LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)</_description> -+ <description>LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> -- <!-- The key combination used to choose the 3rd (and 4th, together with Shift) -- level of symbols --> -+ - <configItem> - <name>lv3</name> -- <_description>Key to choose 3rd level</_description> -+ <description>Key to choose 3rd level</description> - </configItem> - <option> - <configItem> - <name>lv3:switch</name> -- <_description>Right Ctrl</_description> -+ <description>Right Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:menu_switch</name> -- <_description>Menu</_description> -+ <description>Menu</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:win_switch</name> -- <_description>Any Win key</_description> -+ <description>Any Win key</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:lwin_switch</name> -- <_description>Left Win</_description> -+ <description>Left Win</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:rwin_switch</name> -- <_description>Right Win</_description> -+ <description>Right Win</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:alt_switch</name> -- <_description>Any Alt key</_description> -+ <description>Any Alt key</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:lalt_switch</name> -- <_description>Left Alt</_description> -+ <description>Left Alt</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:ralt_switch</name> -- <_description>Right Alt</_description> -+ <description>Right Alt</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:ralt_switch_multikey</name> -- <_description>Right Alt, Shift+Right Alt key is Compose</_description> -+ <description>Right Alt, Shift+Right Alt key is Compose</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:ralt_alt</name> -- <_description>Right Alt key never chooses 3rd level</_description> -+ <description>Right Alt key never chooses 3rd level</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:enter_switch</name> -- <_description>Enter on keypad</_description> -+ <description>Enter on keypad</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:caps_switch</name> -- <_description>Caps Lock</_description> -+ <description>Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:bksl_switch</name> -- <_description>Backslash</_description> -+ <description>Backslash</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:lsgt_switch</name> -- <_description><Less/Greater></_description> -+ <description><Less/Greater></description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:caps_switch_latch</name> -- <_description>Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</_description> -+ <description>Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:bksl_switch_latch</name> -- <_description>Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</_description> -+ <description>Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</description> - </configItem> - </option> - <option> - <configItem> - <name>lv3:lsgt_switch_latch</name> -- <_description><Less/Greater> chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</_description> -+ <description><Less/Greater> chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> -- <!-- Tweaking the position of the "Ctrl" key --> -+ - <configItem> - <name>ctrl</name> -- <_description>Ctrl key position</_description> -+ <description>Ctrl key position</description> - </configItem> - <option> - <configItem> - <name>ctrl:nocaps</name> -- <_description>Caps Lock as Ctrl</_description> -+ <description>Caps Lock as Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:lctrl_meta</name> -- <_description>Left Ctrl as Meta</_description> -+ <description>Left Ctrl as Meta</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:swapcaps</name> -- <_description>Swap Ctrl and Caps Lock</_description> -+ <description>Swap Ctrl and Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:ac_ctrl</name> -- <_description>At left of 'A'</_description> -+ <description>At left of 'A'</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:aa_ctrl</name> -- <_description>At bottom left</_description> -+ <description>At bottom left</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:rctrl_ralt</name> -- <_description>Right Ctrl as Right Alt</_description> -+ <description>Right Ctrl as Right Alt</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:menu_rctrl</name> -- <_description>Menu as Right Ctrl</_description> -+ <description>Menu as Right Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:ctrl_ralt</name> -- <_description>Right Alt as Right Ctrl</_description> -+ <description>Right Alt as Right Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:swap_lalt_lctl</name> -- <_description>Swap Left Alt key with Left Ctrl key</_description> -+ <description>Swap Left Alt key with Left Ctrl key</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:swap_lwin_lctl</name> -- <_description>Swap Left Win key with Left Ctrl key</_description> -+ <description>Swap Left Win key with Left Ctrl key</description> - </configItem> - </option> - <option> - <configItem> - <name>ctrl:swap_lalt_lctl_lwin</name> -- <_description>Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt</_description> -+ <description>Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> -- <!-- Using startard LEDs to indicate the alternative (not first) group(s) --> -+ - <configItem> - <name>grp_led</name> -- <_description>Use keyboard LED to show alternative layout</_description> -+ <description>Use keyboard LED to show alternative layout</description> - </configItem> - <option> - <configItem> - <name>grp_led:num</name> -- <_description>Num Lock</_description> -+ <description>Num Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>grp_led:caps</name> -- <_description>Caps Lock</_description> -+ <description>Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>grp_led:scroll</name> -- <_description>Scroll Lock</_description> -+ <description>Scroll Lock</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="false"> -- <!-- Select a keypad type --> -+ - <configItem> - <name>keypad</name> -- <_description>Layout of numeric keypad</_description> -+ <description>Layout of numeric keypad</description> - </configItem> - <option> - <configItem> - <name>keypad:legacy</name> -- <_description>Legacy</_description> -+ <description>Legacy</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:oss</name> -- <_description>Unicode additions (arrows and math operators)</_description> -+ <description>Unicode additions (arrows and math operators)</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:future</name> -- <_description>Unicode additions (arrows and math operators; math operators on default level)</_description> -+ <description>Unicode additions (arrows and math operators; math operators on default level)</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:legacy_wang</name> -- <_description>Legacy Wang 724</_description> -+ <description>Legacy Wang 724</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:oss_wang</name> -- <_description>Wang 724 keypad with Unicode additions (arrows and math operators)</_description> -+ <description>Wang 724 keypad with Unicode additions (arrows and math operators)</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:future_wang</name> -- <_description>Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)</_description> -+ <description>Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:hex</name> -- <_description>Hexadecimal</_description> -+ <description>Hexadecimal</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:atm</name> -- <_description>ATM/phone-style</_description> -+ <description>ATM/phone-style</description> - </configItem> - </option> - </group> -- <!-- This option should override the KPDL key defined in keypad; I hope it's declared in the right place --> -+ - <group allowMultipleSelection="false"> -- <!-- Select a keypad KPDL variant --> -+ - <configItem> - <name>kpdl</name> -- <_description>Numeric keypad delete key behaviour</_description> -+ <description>Numeric keypad delete key behaviour</description> - </configItem> - <option> - <configItem> -- <!-- Actually, with KP_DECIMAL, as the old keypad(dot) --> -+ - <name>kpdl:dot</name> -- <_description>Legacy key with dot</_description> -+ <description>Legacy key with dot</description> - </configItem> - </option> - <option> - <configItem> - <name>kpdl:comma</name> -- <!-- Actually, with KP_SEPARATOR, as the old keypad(comma) --> -- <_description>Legacy key with comma</_description> -+ -+ <description>Legacy key with comma</description> - </configItem> - </option> - <option> - <configItem> - <name>kpdl:dotoss</name> -- <_description>Four-level key with dot</_description> -+ <description>Four-level key with dot</description> - </configItem> - </option> - <option> - <configItem> - <name>kpdl:dotoss_latin9</name> -- <_description>Four-level key with dot, Latin-9 only</_description> -+ <description>Four-level key with dot, Latin-9 only</description> - </configItem> - </option> - <option> - <configItem> - <name>kpdl:commaoss</name> -- <_description>Four-level key with comma</_description> -+ <description>Four-level key with comma</description> - </configItem> - </option> - <option> - <configItem> - <name>kpdl:momayyezoss</name> -- <_description>Four-level key with momayyez</_description> -+ <description>Four-level key with momayyez</description> - </configItem> - </option> - <option> - <configItem> - <name>kpdl:kposs</name> -- <!-- This assumes the KP_ abstract symbols are actually useful for some apps -- The description needs to be rewritten --> -- <_description>Four-level key with abstract separators</_description> -+ -+ <description>Four-level key with abstract separators</description> - </configItem> - </option> - <option> - <configItem> - <name>kpdl:semi</name> -- <_description>Semicolon on third level</_description> -+ <description>Semicolon on third level</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="false"> -- <!-- Caps Lock tweaks. -- "Internal" capitalization means capitalization using some internal tables. -- Otherwise "as Shift" - means using next group. --> -+ - <configItem> - <name>caps</name> -- <_description>Caps Lock key behavior</_description> -+ <description>Caps Lock key behavior</description> - </configItem> - <option> - <configItem> - <name>caps:internal</name> -- <_description>Caps Lock uses internal capitalization; Shift "pauses" Caps Lock</_description> -+ <description>Caps Lock uses internal capitalization; Shift "pauses" Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:internal_nocancel</name> -- <_description>Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock</_description> -+ <description>Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:shift</name> -- <_description>Caps Lock acts as Shift with locking; Shift "pauses" Caps Lock</_description> -+ <description>Caps Lock acts as Shift with locking; Shift "pauses" Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:shift_nocancel</name> -- <_description>Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock</_description> -+ <description>Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:capslock</name> -- <_description>Caps Lock toggles normal capitalization of alphabetic characters</_description> -+ <description>Caps Lock toggles normal capitalization of alphabetic characters</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:numlock</name> -- <_description>Make Caps Lock an additional Num Lock</_description> -+ <description>Make Caps Lock an additional Num Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:swapescape</name> -- <_description>Swap ESC and Caps Lock</_description> -+ <description>Swap ESC and Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:escape</name> -- <_description>Make Caps Lock an additional ESC</_description> -+ <description>Make Caps Lock an additional ESC</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:backspace</name> -- <_description>Make Caps Lock an additional Backspace</_description> -+ <description>Make Caps Lock an additional Backspace</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:super</name> -- <_description>Make Caps Lock an additional Super</_description> -+ <description>Make Caps Lock an additional Super</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:hyper</name> -- <_description>Make Caps Lock an additional Hyper</_description> -+ <description>Make Caps Lock an additional Hyper</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:shiftlock</name> -- <_description>Caps Lock toggles ShiftLock (affects all keys)</_description> -+ <description>Caps Lock toggles ShiftLock (affects all keys)</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:none</name> -- <_description>Caps Lock is disabled</_description> -+ <description>Caps Lock is disabled</description> - </configItem> - </option> - <option> - <configItem> - <name>caps:ctrl_modifier</name> -- <_description>Make Caps Lock an additional Ctrl</_description> -+ <description>Make Caps Lock an additional Ctrl</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="false"> -- <!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) --> -+ - <configItem> - <name>altwin</name> -- <_description>Alt/Win key behavior</_description> -+ <description>Alt/Win key behavior</description> - </configItem> - <option> - <configItem> - <name>altwin:menu</name> -- <_description>Add the standard behavior to Menu key</_description> -+ <description>Add the standard behavior to Menu key</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:meta_alt</name> -- <_description>Alt and Meta are on Alt keys</_description> -+ <description>Alt and Meta are on Alt keys</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:alt_win</name> -- <_description>Alt is mapped to Win keys (and the usual Alt keys)</_description> -+ <description>Alt is mapped to Win keys (and the usual Alt keys)</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:ctrl_win</name> -- <_description>Ctrl is mapped to Win keys (and the usual Ctrl keys)</_description> -+ <description>Ctrl is mapped to Win keys (and the usual Ctrl keys)</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:ctrl_alt_win</name> -- <_description>Ctrl is mapped to Alt keys, Alt is mapped to Win keys</_description> -+ <description>Ctrl is mapped to Alt keys, Alt is mapped to Win keys</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:meta_win</name> -- <_description>Meta is mapped to Win keys</_description> -+ <description>Meta is mapped to Win keys</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:left_meta_win</name> -- <_description>Meta is mapped to Left Win</_description> -+ <description>Meta is mapped to Left Win</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:hyper_win</name> -- <_description>Hyper is mapped to Win-keys</_description> -+ <description>Hyper is mapped to Win-keys</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:alt_super_win</name> -- <_description>Alt is mapped to Right Win, Super to Menu</_description> -+ <description>Alt is mapped to Right Win, Super to Menu</description> - </configItem> - </option> - <option> - <configItem> - <name>altwin:swap_alt_win</name> -- <_description>Alt is swapped with Win</_description> -+ <description>Alt is swapped with Win</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> -- <!-- Tweaking the position of the "Compose" key: mapping to existing PC keys --> -+ - <configItem> - <name>Compose key</name> -- <_description>Position of Compose key</_description> -+ <description>Position of Compose key</description> - </configItem> - <option> - <configItem> - <name>compose:ralt</name> -- <_description>Right Alt</_description> -+ <description>Right Alt</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:lwin</name> -- <_description>Left Win</_description> -+ <description>Left Win</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:lwin-altgr</name> -- <_description>3rd level of Left Win</_description> -+ <description>3rd level of Left Win</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:rwin</name> -- <_description>Right Win</_description> -+ <description>Right Win</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:rwin-altgr</name> -- <_description>3rd level of Right Win</_description> -+ <description>3rd level of Right Win</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:menu</name> -- <_description>Menu</_description> -+ <description>Menu</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:menu-altgr</name> -- <_description>3rd level of Menu</_description> -+ <description>3rd level of Menu</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:lctrl</name> -- <_description>Left Ctrl</_description> -+ <description>Left Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:lctrl-altgr</name> -- <_description>3rd level of Left Ctrl</_description> -+ <description>3rd level of Left Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:rctrl</name> -- <_description>Right Ctrl</_description> -+ <description>Right Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:rctrl-altgr</name> -- <_description>3rd level of Right Ctrl</_description> -+ <description>3rd level of Right Ctrl</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:caps</name> -- <_description>Caps Lock</_description> -+ <description>Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:caps-altgr</name> -- <_description>3rd level of Caps Lock</_description> -+ <description>3rd level of Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:102</name> -- <_description><Less/Greater></_description> -+ <description><Less/Greater></description> - </configItem> - </option> - <option> - <configItem> - <name>compose:102-altgr</name> -- <_description>3rd level of <Less/Greater></_description> -+ <description>3rd level of <Less/Greater></description> - </configItem> - </option> - <option> - <configItem> - <name>compose:paus</name> -- <_description>Pause</_description> -+ <description>Pause</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:prsc</name> -- <_description>PrtSc</_description> -+ <description>PrtSc</description> - </configItem> - </option> - <option> - <configItem> - <name>compose:sclk</name> -- <_description>Scroll Lock</_description> -+ <description>Scroll Lock</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> - <configItem> - <name>compat</name> -- <_description>Miscellaneous compatibility options</_description> -+ <description>Miscellaneous compatibility options</description> - </configItem> - <option> - <configItem> - <name>numpad:pc</name> -- <_description>Default numeric keypad keys</_description> -+ <description>Default numeric keypad keys</description> - </configItem> - </option> - <option> - <configItem> - <name>numpad:mac</name> -- <_description>Numeric keypad keys always enter digits (as in Mac OS)</_description> -+ <description>Numeric keypad keys always enter digits (as in Mac OS)</description> - </configItem> - </option> - <option> - <configItem> - <name>numpad:microsoft</name> -- <_description>Shift with numeric keypad keys works as in MS Windows</_description> -+ <description>Shift with numeric keypad keys works as in MS Windows</description> - </configItem> - </option> - <option> - <configItem> - <name>numpad:shift3</name> -- <_description>Shift does not cancel Num Lock, chooses 3rd level instead</_description> -+ <description>Shift does not cancel Num Lock, chooses 3rd level instead</description> - </configItem> - </option> - <option> - <configItem> - <name>srvrkeys:none</name> -- <_description>Special keys (Ctrl+Alt+<key>) handled in a server</_description> -+ <description>Special keys (Ctrl+Alt+<key>) handled in a server</description> - </configItem> - </option> - <option> - <configItem> - <name>apple:alupckeys</name> -- <_description>Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)</_description> -+ <description>Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)</description> - </configItem> - </option> - <option> - <configItem> - <name>shift:breaks_caps</name> -- <_description>Shift cancels Caps Lock</_description> -+ <description>Shift cancels Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>misc:typo</name> -- <_description>Enable extra typographic characters</_description> -+ <description>Enable extra typographic characters</description> - </configItem> - </option> - <option> - <configItem> - <name>shift:both_capslock</name> -- <_description>Both Shift keys together toggle Caps Lock</_description> -+ <description>Both Shift keys together toggle Caps Lock</description> - </configItem> - </option> - <option> - <configItem> - <name>shift:both_capslock_cancel</name> -- <_description>Both Shift keys together activate Caps Lock, one Shift key deactivates</_description> -+ <description>Both Shift keys together activate Caps Lock, one Shift key deactivates</description> - </configItem> - </option> - <option> - <configItem> - <name>shift:both_shiftlock</name> -- <_description>Both Shift keys together toggle ShiftLock</_description> -+ <description>Both Shift keys together toggle ShiftLock</description> - </configItem> - </option> - <option> - <configItem> - <name>keypad:pointerkeys</name> -- <_description>Shift + NumLock toggles PointerKeys</_description> -+ <description>Shift + NumLock toggles PointerKeys</description> - </configItem> - </option> - <option> - <configItem> - <name>grab:break_actions</name> -- <_description>Allow breaking grabs with keyboard actions (warning: security risk)</_description> -+ <description>Allow breaking grabs with keyboard actions (warning: security risk)</description> - </configItem> - </option> - <option> - <configItem> - <name>grab:debug_actions</name> -- <_description>Allow grab and window tree logging</_description> -+ <description>Allow grab and window tree logging</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> -- <!-- Special shortcuts for the Euro character --> -+ - <configItem> - <name>currencysign</name> -- <_description>Adding currency signs to certain keys</_description> -+ <description>Adding currency signs to certain keys</description> - </configItem> - <option> - <configItem> - <name>eurosign:e</name> -- <_description>Euro on E</_description> -+ <description>Euro on E</description> - </configItem> - </option> - <option> - <configItem> - <name>eurosign:2</name> -- <_description>Euro on 2</_description> -+ <description>Euro on 2</description> - </configItem> - </option> - <option> - <configItem> - <name>eurosign:4</name> -- <_description>Euro on 4</_description> -+ <description>Euro on 4</description> - </configItem> - </option> - <option> - <configItem> - <name>eurosign:5</name> -- <_description>Euro on 5</_description> -+ <description>Euro on 5</description> - </configItem> - </option> - <option> - <configItem> - <name>rupeesign:4</name> -- <_description>Rupee on 4</_description> -+ <description>Rupee on 4</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> - <configItem> - <name>lv5</name> -- <_description>Key to choose 5th level</_description> -+ <description>Key to choose 5th level</description> - </configItem> - <option> - <configItem> - <name>lv5:lsgt_switch_lock</name> -- <_description><Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser</_description> -+ <description><Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser</description> - </configItem> - </option> - <option> - <configItem> - <name>lv5:ralt_switch_lock</name> -- <_description>Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser</_description> -+ <description>Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser</description> - </configItem> - </option> - <option> - <configItem> - <name>lv5:lwin_switch_lock</name> -- <_description>Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser</_description> -+ <description>Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser</description> - </configItem> - </option> - <option> - <configItem> - <name>lv5:rwin_switch_lock</name> -- <_description>Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser</_description> -- </configItem> -- </option> --<!-- -- <option> -- <configItem> -- <name>lv5:lsgt_switch_lock_cancel</name> -- <_description><Less/Greater> chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> -- </configItem> -- </option> -- <option> -- <configItem> -- <name>lv5:ralt_switch_lock_cancel</name> -- <_description>Right Alt chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> -- </configItem> -- </option> -- <option> -- <configItem> -- <name>lv5:lwin_switch_lock_cancel</name> -- <_description>Left Win chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> -- </configItem> -- </option> -- <option> -- <configItem> -- <name>lv5:rwin_switch_lock_cancel</name> -- <_description>Right Win chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> -- </configItem> -- </option> -- <option> -- <configItem> -- <name>lv5:lsgt_switch_lock_cancel</name> -- <_description><Less/Greater> chooses 5th level, acts as onetime lock lock when pressed together with another 5th-level-chooser</_description> -- </configItem> -- </option> -- <option> -- <configItem> -- <name>lv5:ralt_switch_lock_cancel</name> -- <_description>Right Alt chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description> -+ <description>Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser</description> - </configItem> - </option> ----> -+ - </group> - <group allowMultipleSelection="false"> -- <!-- Let space output NBSP, NNBSP, ZWNJ, and ZWJ for the desired level --> -+ - <configItem> - <name>nbsp</name> -- <_description>Using space key to input non-breakable space character</_description> -+ <description>Using space key to input non-breakable space character</description> - </configItem> - <option> - <configItem> - <name>nbsp:none</name> -- <_description>Usual space at any level</_description> -+ <description>Usual space at any level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:level2</name> -- <_description>Non-breakable space character at second level</_description> -+ <description>Non-breakable space character at second level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:level3</name> -- <_description>Non-breakable space character at third level</_description> -+ <description>Non-breakable space character at third level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:level3s</name> -- <_description>Non-breakable space character at third level, nothing at fourth level</_description> -+ <description>Non-breakable space character at third level, nothing at fourth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:level3n</name> -- <_description>Non-breakable space character at third level, thin non-breakable space character at fourth level</_description> -+ <description>Non-breakable space character at third level, thin non-breakable space character at fourth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:level4</name> -- <_description>Non-breakable space character at fourth level</_description> -+ <description>Non-breakable space character at fourth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:level4n</name> -- <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description> -+ <description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:level4nl</name> -- <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description> -+ <description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj2</name> -- <_description>Zero-width non-joiner character at second level</_description> -+ <description>Zero-width non-joiner character at second level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj2zwj3</name> -- <_description>Zero-width non-joiner character at second level, zero-width joiner character at third level</_description> -+ <description>Zero-width non-joiner character at second level, zero-width joiner character at third level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj2zwj3nb4</name> -- <_description>Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level</_description> -+ <description>Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj2nb3</name> -- <_description>Zero-width non-joiner character at second level, non-breakable space character at third level</_description> -+ <description>Zero-width non-joiner character at second level, non-breakable space character at third level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj2nb3s</name> -- <_description>Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level</_description> -+ <description>Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj2nb3zwj4</name> -- <_description>Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level</_description> -+ <description>Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj2nb3nnb4</name> -- <_description>Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level</_description> -+ <description>Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level</description> - </configItem> - </option> - <option> - <configItem> - <name>nbsp:zwnj3zwj4</name> -- <_description>Zero-width non-joiner character at third level, zero-width joiner at fourth level</_description> -+ <description>Zero-width non-joiner character at third level, zero-width joiner at fourth level</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> - <configItem> - <name>japan</name> -- <_description>Japanese keyboard options</_description> -+ <description>Japanese keyboard options</description> - </configItem> - <option> - <configItem> - <name>japan:kana_lock</name> -- <_description>Kana Lock key is locking</_description> -+ <description>Kana Lock key is locking</description> - </configItem> - </option> - <option> - <configItem> - <name>japan:nicola_f_bs</name> -- <_description>NICOLA-F style Backspace</_description> -+ <description>NICOLA-F style Backspace</description> - </configItem> - </option> - <option> - <configItem> - <name>japan:hztg_escape</name> -- <_description>Make Zenkaku Hankaku an additional ESC</_description> -+ <description>Make Zenkaku Hankaku an additional ESC</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="false"> - <configItem> - <name>esperanto</name> -- <_description>Adding Esperanto supersigned letters</_description> -+ <description>Adding Esperanto supersigned letters</description> - </configItem> - <option> - <configItem> - <name>esperanto:qwerty</name> -- <_description>To the corresponding key in a Qwerty layout</_description> -+ <description>To the corresponding key in a Qwerty layout</description> - </configItem> - </option> - <option> - <configItem> - <name>esperanto:dvorak</name> -- <_description>To the corresponding key in a Dvorak layout</_description> -+ <description>To the corresponding key in a Dvorak layout</description> - </configItem> - </option> - <option> - <configItem> - <name>esperanto:colemak</name> -- <_description>To the corresponding key in a Colemak layout</_description> -+ <description>To the corresponding key in a Colemak layout</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> - <configItem> - <name>solaris</name> -- <_description>Maintain key compatibility with old Solaris keycodes</_description> -+ <description>Maintain key compatibility with old Solaris keycodes</description> - </configItem> - <option> - <configItem> - <name>solaris:sun_compat</name> -- <_description>Sun Key compatibility</_description> -+ <description>Sun Key compatibility</description> - </configItem> - </option> - </group> - <group allowMultipleSelection="true"> - <configItem> - <name>terminate</name> -- <_description>Key sequence to kill the X server</_description> -+ <description>Key sequence to kill the X server</description> - </configItem> - <option> - <configItem> - <name>terminate:ctrl_alt_bksp</name> -- <_description>Ctrl + Alt + Backspace</_description> -+ <description>Ctrl + Alt + Backspace</description> - </configItem> - </option> - </group> - </optionList> --</xkbConfigRegistry> -+</xkbConfigRegistry> -\ No newline at end of file diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index ff495d1d7..9c6c12ffc 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -4,28 +4,28 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xorg-server -PKG_VERSION:= 1.19.7 +PKG_VERSION:= 21.1.6 PKG_RELEASE:= 1 -PKG_HASH:= 5f6d3da0d1e341f27a7706779a24a5fa7174d5f161b5f8530f103753f0152de7 +PKG_HASH:= 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 PKG_DESCR:= xorg server PKG_SECTION:= x11/drivers -PKG_DEPENDS:= libxfont2 pixman libpciaccess libxkbfile +PKG_DEPENDS:= libxfont2 pixman libpciaccess libxkbfile libxcvt PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext -PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb +PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libdrm PKG_DEPENDS+= libxshmfence libfreetype libfontenc libpciaccess +PKG_DEPENDS+= libepoxy 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_NEEDS:= threads c++ PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/xserver/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC PKG_FLAVOURS_XORG_SERVER:= WITH_KDRIVE @@ -68,7 +68,6 @@ CONFIGURE_ARGS+= --enable-dga \ --disable-xephyr \ --disable-xf86bigfont \ --disable-xf86vidmode \ - --disable-xfake \ --disable-xnest \ --disable-xselinux \ --disable-xcsecurity \ @@ -78,17 +77,17 @@ CONFIGURE_ARGS+= --enable-dga \ --disable-strict-compilation \ --enable-dri \ --enable-dri2 \ - --disable-dri3 \ + --enable-dri3 \ --enable-glx \ - --enable-aiglx \ + --enable-glamor \ --with-xkb-output=/tmp \ - --with-os-vendor="$(ADK_VENDOR)" \ + --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-xfbdev --enable-kdrive-kbd --enable-kdrive-mouse --enable-kdrive-evdev +CONFIGURE_ARGS+= --enable-kdrive --enable-kdrive-kbd --enable-kdrive-mouse --enable-kdrive-evdev else -CONFIGURE_ARGS+= --disable-kdrive --disable-xfbdev +CONFIGURE_ARGS+= --disable-kdrive endif ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) @@ -99,6 +98,7 @@ xorg-server-install: $(INSTALL_DIR) $(IDIR_XORG_SERVER)/etc/X11 $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions + $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/drivers $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/fonts $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia ${CP} ${WRKINST}/usr/lib/xorg/protocol.txt \ @@ -106,10 +106,10 @@ xorg-server-install: ${CP} ${WRKINST}/usr/bin/* $(IDIR_XORG_SERVER)/usr/bin ${CP} ${WRKINST}/usr/lib/xorg/modules/*.so \ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules -ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) + ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/*.so \ + $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/drivers ${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*.so \ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions -endif ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) ${CP} ./files/xorg.conf.lemote-yeelong \ $(IDIR_XORG_SERVER)/etc/X11/xorg.conf diff --git a/package/xorg-server/patches/patch-configure b/package/xorg-server/patches/patch-configure new file mode 100644 index 000000000..378c27c1c --- /dev/null +++ b/package/xorg-server/patches/patch-configure @@ -0,0 +1,11 @@ +--- 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 \" + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE + +-dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` ++dridriverdir=/usr/lib/dri + + prefix_NONE= + exec_prefix_NONE= diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h deleted file mode 100644 index 824744f53..000000000 --- a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h +++ /dev/null @@ -1,69 +0,0 @@ -from alpinelinux - ---- xorg-server-1.18.0.orig/hw/xfree86/common/compiler.h 2015-10-28 19:15:36.000000000 +0100 -+++ xorg-server-1.18.0/hw/xfree86/common/compiler.h 2016-01-08 01:41:49.582326445 +0100 -@@ -525,26 +525,26 @@ xf86WriteMmio32Le(__volatile__ void *bas - #define PORT_SIZE short - #endif - --_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ -+_X_EXPORT volatile unsigned char *ioBase; /* Memory mapped I/O port area */ - - static __inline__ void - outb(unsigned PORT_SIZE port, unsigned char val) - { -- *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; - } - - static __inline__ void - outw(unsigned PORT_SIZE port, unsigned short val) - { -- *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; - } - - static __inline__ void - outl(unsigned PORT_SIZE port, unsigned int val) - { -- *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; - } - -@@ -552,21 +552,21 @@ static __inline__ unsigned int - inb(unsigned PORT_SIZE port) - { - return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } - - static __inline__ unsigned int - inw(unsigned PORT_SIZE port) - { - return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } - - static __inline__ unsigned int - inl(unsigned PORT_SIZE port) - { - return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } - - #if defined(__mips__) -@@ -758,7 +758,7 @@ inl(unsigned short port) - return xf86ReadMmio32Le((void *) ioBase, port); - } - --#elif defined(__arm__) && defined(__linux__) -+#elif defined(__arm__) && defined(__GLIBC__) - - /* for Linux on ARM, we use the LIBC inx/outx routines */ - /* note that the appropriate setup via "ioperm" needs to be done */ diff --git a/package/xorg-server/patches/patch-include_misc_h b/package/xorg-server/patches/patch-include_misc_h new file mode 100644 index 000000000..30cc9a44d --- /dev/null +++ b/package/xorg-server/patches/patch-include_misc_h @@ -0,0 +1,13 @@ +--- xorg-server-21.1.5.orig/include/misc.h 2022-12-14 03:25:18.000000000 +0100 ++++ xorg-server-21.1.5/include/misc.h 2023-01-01 08:13:51.736653806 +0100 +@@ -187,6 +187,10 @@ typedef struct _xReq *xReqPtr; + #endif + #endif + ++#undef bswap_16 ++#undef bswap_32 ++#undef bswap_64 ++ + /** + * Calculate the number of bytes needed to hold bits. + * @param bits The minimum number of bits needed. diff --git a/package/xorgproto/Makefile b/package/xorgproto/Makefile new file mode 100644 index 000000000..264ee8da6 --- /dev/null +++ b/package/xorgproto/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:= xorgproto +PKG_VERSION:= 2021.5 +PKG_RELEASE:= 1 +PKG_DESCR:= xorg extension headers +PKG_SECTION:= dev/header +PKG_HASH:= be6ddd6590881452fdfa170c1c9ff87209a98d36155332cbf2ccbc431add86ff +PKG_SITES:= http://www.x.org/releases/individual/proto/ +PKG_OPTS:= dev devonly + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,XORGPROTO,xorgproto,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,XORGPROTO,xorgproto,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +HOST_STYLE:= auto + +post-install: + $(CP) ${WRKINST}/usr/share/pkgconfig/*.pc \ + ${STAGING_TARGET_DIR}/usr/lib/pkgconfig/ + +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/xsm/Makefile b/package/xsm/Makefile index 177e1e4ff..43b8223ff 100644 --- a/package/xsm/Makefile +++ b/package/xsm/Makefile @@ -20,6 +20,8 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,XSM,xsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ARGS+= --with-appdefaultdir=/usr/share/X11/app-defaults + xsm-install: $(INSTALL_DIR) $(IDIR_XSM)/usr/share/X11 $(CP) $(WRKINST)/usr/share/X11/* \ diff --git a/package/xterm/Makefile b/package/xterm/Makefile index d6cfcd674..4bc96d25d 100644 --- a/package/xterm/Makefile +++ b/package/xterm/Makefile @@ -4,17 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xterm -PKG_VERSION:= 325 +PKG_VERSION:= 377 PKG_RELEASE:= 1 -PKG_HASH:= 3b31b07a0c40427e9330ec3be9d1a748c72808f945953cea9e526e48be315f1b +PKG_HASH:= db108fe7a45d8ed97e604721b58443b473649e61e263631bf8759f8618a990b2 PKG_DESCR:= terminal emulator PKG_SECTION:= x11/apps PKG_DEPENDS:= libxaw libxt libncurses libxft fontconfig libuuid +PKG_DEPENDS+= libxpm libxrender PKG_BUILDDEP:= ncurses libXt libXmu libXaw libXft util-linux libSM PKG_URL:= http://invisible-island.net/xterm/xterm.html -PKG_SITES:= ftp://invisible-island.net/xterm/ +PKG_SITES:= http://invisible-mirror.net/archives/xterm/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tgz include $(ADK_TOPDIR)/mk/package.mk @@ -26,6 +27,7 @@ CONFIGURE_ARGS+= --with-app-defaults=/usr/lib/X11/app-defaults \ --x-libraries="$(STAGING_TARGET_DIR)/usr/lib" \ --with-freetype-cflags="-I$(STAGING_TARGET_DIR)/usr/include/freetype2" \ --disable-regex \ + --disable-wide-chars \ --disable-pty-handshake xterm-install: diff --git a/package/xterm/patches/patch-xterm_io_h b/package/xterm/patches/patch-xterm_io_h deleted file mode 100644 index 286388b66..000000000 --- a/package/xterm/patches/patch-xterm_io_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xterm-325.orig/xterm_io.h 2014-07-25 10:26:56.000000000 +0200 -+++ xterm-325/xterm_io.h 2016-09-09 22:25:42.000000000 +0200 -@@ -71,7 +71,7 @@ - #endif - - #ifdef linux --#define USE_TERMIOS -+#define USE_POSIX_TERMIOS - #endif - - #ifdef __SCO__ diff --git a/package/xwayland/Makefile b/package/xwayland/Makefile new file mode 100644 index 000000000..2e0848cdd --- /dev/null +++ b/package/xwayland/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:= xwayland +PKG_VERSION:= 21.1.3 +PKG_RELEASE:= 1 +PKG_HASH:= ebc2757f39fd4c7db1654fd86591589c211aa20172d43a54f77ae567cedbf8a2 +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+= 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+= libXext libXau freetype libfontenc +PKG_URL:= https://xorg.freedesktop.org/ +PKG_SITES:= https://www.x.org/releases/individual/xserver/ + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XWAYLAND,xwayland,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + + +xwayland-install: + $(INSTALL_DIR) $(IDIR_XWAYLAND)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/Xwayland \ + $(IDIR_XWAYLAND)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/xwayland/patches/patch-hw_xwayland_xwayland-glx_c b/package/xwayland/patches/patch-hw_xwayland_xwayland-glx_c new file mode 100644 index 000000000..57cca337d --- /dev/null +++ b/package/xwayland/patches/patch-hw_xwayland_xwayland-glx_c @@ -0,0 +1,12 @@ +--- xwayland-21.1.3.orig/hw/xwayland/xwayland-glx.c 2021-11-08 11:37:14.863922600 +0100 ++++ xwayland-21.1.3/hw/xwayland/xwayland-glx.c 2021-11-14 05:31:50.673075155 +0100 +@@ -45,6 +45,9 @@ + + #include "xwayland-screen.h" + ++#define EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT 0x333B ++#define EGL_COLOR_COMPONENT_TYPE_EXT 0x3339 ++ + /* Can't get these from <GL/glx.h> since it pulls in client headers */ + #define GLX_RGBA_BIT 0x00000001 + #define GLX_WINDOW_BIT 0x00000001 diff --git a/package/xwayland/patches/patch-include_misc_h b/package/xwayland/patches/patch-include_misc_h new file mode 100644 index 000000000..6707a70ed --- /dev/null +++ b/package/xwayland/patches/patch-include_misc_h @@ -0,0 +1,51 @@ +--- xwayland-21.1.3.orig/include/misc.h 2021-11-08 11:37:14.869922600 +0100 ++++ xwayland-21.1.3/include/misc.h 2021-11-14 05:17:02.367154956 +0100 +@@ -298,34 +298,12 @@ __builtin_constant_p(int x) + } + #endif + +-static inline uint64_t +-bswap_64(uint64_t x) +-{ +- return (((x & 0xFF00000000000000ull) >> 56) | +- ((x & 0x00FF000000000000ull) >> 40) | +- ((x & 0x0000FF0000000000ull) >> 24) | +- ((x & 0x000000FF00000000ull) >> 8) | +- ((x & 0x00000000FF000000ull) << 8) | +- ((x & 0x0000000000FF0000ull) << 24) | +- ((x & 0x000000000000FF00ull) << 40) | +- ((x & 0x00000000000000FFull) << 56)); +-} +- + #define swapll(x) do { \ + if (sizeof(*(x)) != 8) \ + wrong_size(); \ + *(x) = bswap_64(*(x)); \ + } while (0) + +-static inline uint32_t +-bswap_32(uint32_t x) +-{ +- return (((x & 0xFF000000) >> 24) | +- ((x & 0x00FF0000) >> 8) | +- ((x & 0x0000FF00) << 8) | +- ((x & 0x000000FF) << 24)); +-} +- + static inline Bool + checked_int64_add(int64_t *out, int64_t a, int64_t b) + { +@@ -361,13 +339,6 @@ checked_int64_subtract(int64_t *out, int + *(x) = bswap_32(*(x)); \ + } while (0) + +-static inline uint16_t +-bswap_16(uint16_t x) +-{ +- return (((x & 0xFF00) >> 8) | +- ((x & 0x00FF) << 8)); +-} +- + #define swaps(x) do { \ + if (sizeof(*(x)) != 2) \ + wrong_size(); \ diff --git a/package/xz/Makefile b/package/xz/Makefile deleted file mode 100644 index d36211ac6..000000000 --- a/package/xz/Makefile +++ /dev/null @@ -1,42 +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:= xz -PKG_VERSION:= 5.2.5 -PKG_RELEASE:= 1 -PKG_HASH:= f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10 -PKG_DESCR:= compression utility -PKG_SECTION:= app/archive -PKG_DEPENDS:= libxz -PKG_URL:= http://tukaani.org/xz/ -PKG_SITES:= http://tukaani.org/xz/ -PKG_LIBNAME:= libxz -PKG_OPTS:= dev - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz - -PKG_SUBPKGS:= XZ LIBXZ -PKGSD_LIBXZ:= xz compression library -PKGSC_LIBXZ:= libs/comp - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,XZ,xz,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,XZ,xz,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -$(eval $(call PKG_template,LIBXZ,libxz,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_LIBXZ),$(PKGSD_LIBXZ),$(PKGSC_LIBXZ),$(PKG_OPTS))) - -HOST_CONFIGURE_ARGS+= --disable-shared - -xz-install: - $(INSTALL_DIR) $(IDIR_XZ)/usr/bin - $(CP) $(WRKINST)/usr/bin/* $(IDIR_XZ)/usr/bin - -libxz-install: - $(INSTALL_DIR) $(IDIR_LIBXZ)/usr/lib - $(CP) $(WRKINST)/usr/lib/liblzma.so* $(IDIR_LIBXZ)/usr/lib - -include $(ADK_TOPDIR)/mk/host-bottom.mk -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/xz/patches/patch-src_liblzma_liblzma_pc_in b/package/xz/patches/patch-src_liblzma_liblzma_pc_in deleted file mode 100644 index 9481466af..000000000 --- a/package/xz/patches/patch-src_liblzma_liblzma_pc_in +++ /dev/null @@ -1,15 +0,0 @@ ---- xz-5.2.2.orig/src/liblzma/liblzma.pc.in 2015-09-29 12:57:36.000000000 +0200 -+++ xz-5.2.2/src/liblzma/liblzma.pc.in 2016-11-23 16:04:15.407184892 +0100 -@@ -6,9 +6,9 @@ - # - - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+exec_prefix=${prefix} -+libdir=${prefix}/lib -+includedir=${prefix}/include - - Name: liblzma - Description: General purpose data compression library diff --git a/package/yajl/Makefile b/package/yajl/Makefile index f81ccf66b..321d24971 100644 --- a/package/yajl/Makefile +++ b/package/yajl/Makefile @@ -6,16 +6,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= yajl PKG_VERSION:= 2.1.0 PKG_RELEASE:= 1 -PKG_HASH:= 510a13e0be57cd4ba99e60ac806a3635854af51316d3131d3742a90298ccde38 +PKG_HASH:= 3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a PKG_DESCR:= small event-driven json parser PKG_SECTION:= libs/data PKG_BUILDDEP:= cmake-host ruby-host PKG_URL:= http://lloyd.github.com/yajl/ -PKG_SITES:= http://github.com/lloyd/yajl/tarball/$(PKG_VERSION)/ +PKG_SITES:= https://github.com/lloyd/yajl/archive/refs/tags/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -WRKDIST= $(WRKDIR)/lloyd-yajl-66cb08c/ +DISTFILES:= ${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/ympd/Makefile b/package/ympd/Makefile deleted file mode 100644 index 785e26b12..000000000 --- a/package/ympd/Makefile +++ /dev/null @@ -1,29 +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:= ympd -PKG_VERSION:= ec008a4995666d673bd4cb3926fae7f4b6aa3239 -PKG_GIT:= hash -PKG_RELEASE:= 4 -PKG_DESCR:= standalone music player daemon web gui -PKG_SECTION:= net/http -PKG_DEPENDS:= libmpdclient libressl -PKG_BUILDDEP:= cmake-host libmpdclient libressl -PKG_URL:= http://www.ympd.org/ -PKG_SITES:= https://github.com/notandy/ympd.git - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,YMPD,ympd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= cmake -TARGET_CFLAGS+= -std=c99 - -ympd-install: - $(INSTALL_DIR) $(IDIR_YMPD)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/ympd \ - $(IDIR_YMPD)/usr/bin - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ympd/files/ympd.init b/package/ympd/files/ympd.init deleted file mode 100644 index 6dd7af28c..000000000 --- a/package/ympd/files/ympd.init +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -#PKG ympd -#INIT 90 - -. /etc/rc.conf - -case $1 in -autostop) ;; -autostart) - test x"${ympd:-NO}" = x"NO" && exit 0 - test x"$ympd" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start - exec sh $0 start - ;; -start) - ympd -w 80 & - ;; -stop) - kill $(pgrep -f ympd) - ;; -restart) - sh $0 stop - sh $0 start - ;; -*) - echo "Usage: $0 {start | stop | restart}" - exit 1 - ;; -esac -exit $? diff --git a/package/ympd/files/ympd.postinst b/package/ympd/files/ympd.postinst deleted file mode 100644 index abc75c6f7..000000000 --- a/package/ympd/files/ympd.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf ympd NO diff --git a/package/zile/Makefile b/package/zile/Makefile index 78e08f8c6..c4744e7a5 100644 --- a/package/zile/Makefile +++ b/package/zile/Makefile @@ -4,13 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= zile -PKG_VERSION:= 2.4.11 +PKG_VERSION:= 2.6.2 PKG_RELEASE:= 1 -PKG_HASH:= 1fd27bbddc61491b1fbb29a345d0d344734aa9e80cfa07b02892eedf831fa9cc +PKG_HASH:= 77eb7daff3c98bdc88daa1ac040dccca72b81dc32fc3166e079dd7a63e42c741 PKG_DESCR:= tiny emacs clone PKG_SECTION:= app/editor -PKG_DEPENDS:= libgc -PKG_BUILDDEP:= libgc +PKG_DEPENDS:= libgc glib libgee libmount libblkid +PKG_BUILDDEP:= libgc glib libgee +PKG_LIBC_DEPENDS:= glibc PKG_URL:= http://www.gnu.org/software/zile/ PKG_SITES:= ${MASTER_SITE_GNU:=zile/} diff --git a/package/zlib-ng/Makefile b/package/zlib-ng/Makefile new file mode 100644 index 000000000..32fa46452 --- /dev/null +++ b/package/zlib-ng/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:= zlib-ng +PKG_VERSION:= 2.1.6 +PKG_RELEASE:= 1 +PKG_HASH:= a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2 +PKG_DESCR:= implementation of the deflate compression method +PKG_SECTION:= libs/comp +PKG_SITES:= https://github.com/zlib-ng/zlib-ng/archive/refs/tags/ +PKG_NEEDS:= c++ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,ZLIB_NG,zlib-ng,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +CONFIG_STYLE:= cmake + +zlib-ng-install: + $(INSTALL_DIR) $(IDIR_ZLIB_NG)/usr/lib + $(CP) $(WRKINST)/usr/lib/libz-ng*.so* \ + $(IDIR_ZLIB_NG)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 10ba76375..9d7cea2ae 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= zlib -PKG_VERSION:= 1.2.11 -PKG_RELEASE:= 2 -PKG_HASH:= 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 +PKG_VERSION:= 1.3.1 +PKG_RELEASE:= 1 +PKG_HASH:= 38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32 PKG_DESCR:= implementation of the deflate compression method PKG_SECTION:= libs/comp PKG_URL:= http://www.zlib.net/ diff --git a/package/zsh/Makefile b/package/zsh/Makefile index 6b5a3e5b2..076e0f871 100644 --- a/package/zsh/Makefile +++ b/package/zsh/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= zsh -PKG_VERSION:= 5.7.1 +PKG_VERSION:= 5.9 PKG_RELEASE:= 1 -PKG_HASH:= 7260292c2c1d483b2d50febfa5055176bd512b32a8833b116177bf5f01e77ee8 +PKG_HASH:= 9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5 PKG_DESCR:= z shell PKG_SECTION:= base/shells PKG_DEPENDS:= libncurses diff --git a/package/zstd/Makefile b/package/zstd/Makefile new file mode 100644 index 000000000..79ac805b5 --- /dev/null +++ b/package/zstd/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:= zstd +PKG_VERSION:= 1.5.5 +PKG_RELEASE:= 1 +PKG_HASH:= 98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1 +PKG_DESCR:= zstandard compression application +PKG_SECTION:= app/archive +PKG_SITES:= https://github.com/facebook/zstd/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include ${ADK_TOPDIR}/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,ZSTD,zstd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ZSTD,zstd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +HOST_CONFIG_STYLE:= manual +HOST_INSTALL_STYLE:= auto +CONFIG_STYLE:= manual +ALL_TARGET:= default +HOST_ALL_TARGET:= default + +zstd-install: + $(INSTALL_DIR) $(IDIR_ZSTD)/usr/lib + $(CP) $(WRKINST)/usr/lib/libzstd*.so* \ + $(IDIR_ZSTD)/usr/lib + $(INSTALL_DIR) $(IDIR_ZSTD)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/zstd \ + $(IDIR_ZSTD)/usr/bin + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/zstd/patches/patch-lib_Makefile b/package/zstd/patches/patch-lib_Makefile new file mode 100644 index 000000000..22128cbda --- /dev/null +++ b/package/zstd/patches/patch-lib_Makefile @@ -0,0 +1,11 @@ +--- zstd-1.5.5.orig/lib/Makefile 2023-04-04 22:13:52.000000000 +0200 ++++ zstd-1.5.5/lib/Makefile 2024-01-17 18:12:48.257111944 +0100 +@@ -259,7 +259,7 @@ DESTDIR ?= + # directory variables : GNU conventions prefer lowercase + # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html + # support both lower and uppercase (BSD), use uppercase in script +-prefix ?= /usr/local ++prefix ?= /usr + PREFIX ?= $(prefix) + exec_prefix ?= $(PREFIX) + EXEC_PREFIX ?= $(exec_prefix) diff --git a/package/zstd/patches/patch-programs_Makefile b/package/zstd/patches/patch-programs_Makefile new file mode 100644 index 000000000..b8f880ca0 --- /dev/null +++ b/package/zstd/patches/patch-programs_Makefile @@ -0,0 +1,11 @@ +--- zstd-1.5.5.orig/programs/Makefile 2023-04-04 22:13:52.000000000 +0200 ++++ zstd-1.5.5/programs/Makefile 2024-01-17 18:13:11.620566871 +0100 +@@ -380,7 +380,7 @@ DESTDIR ?= + # directory variables : GNU conventions prefer lowercase + # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html + # support both lower and uppercase (BSD), use uppercase in script +-prefix ?= /usr/local ++prefix ?= /usr + PREFIX ?= $(prefix) + exec_prefix ?= $(PREFIX) + bindir ?= $(exec_prefix)/bin |