Merge Official Source

Signed-off-by: Tianling Shen <[email protected]>

devel/unifdef/Makefile

@@ -0,0 +1,49 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=unifdef
+PKG_VERSION:=2.12
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://dotat.at/prog/$(PKG_NAME)
+PKG_HASH:=fba564a24db7b97ebe9329713ac970627b902e5e9e8b14e19e024eb6e278d10b
+
+PKG_MAINTAINER:=Daniel Golle <[email protected]>
+PKG_LICENSE:=BSD-2-clause
+
+PKG_HOST_ONLY:=1
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
+define Package/unifdef
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=selectively remove C preprocessor conditionals
+  URL:=https://dotat.at/prog/unifdef
+  BUILDONLY:=1
+endef
+
+define Package/unifdef/description
+ The unifdef utility selectively processes conditional C preprocessor #if and
+ #ifdef directives. It removes from a file both the directives and the
+ additional text that they delimit, while otherwise leaving the file alone.
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/unifdef $(1)/bin
+endef
+
+define Host/Uninstall
+	$(RM) $(1)/bin/unifdef
+endef
+
+define Package/unifdef/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/unifdef $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,unifdef))
+$(eval $(call HostBuild))

lang/vala/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vala
-PKG_VERSION:=0.56.14
-PKG_RELEASE:=3
+PKG_VERSION:=0.56.17
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNOME/vala/$(basename $(PKG_VERSION))
-PKG_HASH:=9382c268ca9bdc02aaedc8152a9818bf3935273041f629c56de410e360a3f557
+PKG_HASH:=26100c4e4ef0049c619275f140d97cf565883d00c7543c82bcce5a426934ed6a
 
 PKG_MAINTAINER:=W. Michael Petullo <[email protected]>
 PKG_LICENSE:=LGPL-2.1-or-later
@@ -47,5 +47,8 @@ HOST_CONFIGURE_ARGS += \
 	--disable-valadoc \
 	--without-cgraph
 
+HOST_CONFIGURE_VARS += \
+	GI_GIRDIR=/dev/null
+
 $(eval $(call HostBuild))
 $(eval $(call BuildPackage,vala))

libs/libdbi-drivers/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdbi-drivers
 PKG_VERSION:=0.9.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/libdbi-drivers

libs/libdbi-drivers/patches/010-gcc14.patch

@@ -0,0 +1,49 @@
+Patch-Source-1: https://sourceforge.net/p/libdbi-drivers/bugs/27/attachment/libdbi-drivers-sys-wait.patch
+Patch-Source-2: https://sourceforge.net/p/libdbi-drivers/bugs/28/attachment/libdbi-drivers-c99.patch
+--
+--- a/tests/cgreen/src/unit.c
++++ b/tests/cgreen/src/unit.c
+@@ -9,6 +9,7 @@
+ #include <stdarg.h>
+ #include <unistd.h>
+ #include <signal.h>
++#include <sys/wait.h>
+
+ enum {test_function, test_suite};
+
+--- a/tests/cgreen/src/constraint.c
++++ b/tests/cgreen/src/constraint.c
+@@ -22,8 +22,7 @@ static double unbox_double(intptr_t box)
+ static double as_double(intptr_t box);
+
+ static int compare_using_matcher(Constraint *constraint, intptr_t actual);
+-static void test_with_matcher(Constraint *constraint, const char *function, const char* matcher_name, intptr_t actual, const char *test_file, int test_line, TestReporter *reporter);
+-
++static void test_with_matcher(Constraint *constraint, const char *function, intptr_t matcher_function, const char *test_file, int test_line, TestReporter *reporter);
+
+ void destroy_constraint(void *abstract) {
+     Constraint *constraint = (Constraint *)abstract;
+@@ -164,11 +163,11 @@ static void test_want_double(Constraint
+ }
+
+ static int compare_using_matcher(Constraint *constraint, intptr_t actual) {
+-	int (*matches)(const void*) = constraint->expected;
+-    return matches(actual);
++	int (*matches)(const void*) = (int (*)(const void*)) constraint->expected;
++    return matches((const void *)actual);
+ }
+
+-static void test_with_matcher(Constraint *constraint, const char *function, const char* matcher_name, intptr_t matcher_function, const char *test_file, int test_line, TestReporter *reporter) {
++static void test_with_matcher(Constraint *constraint, const char *function, intptr_t matcher_function, const char *test_file, int test_line, TestReporter *reporter) {
+     (*reporter->assert_true)(
+             reporter,
+             test_file,
+@@ -176,7 +175,7 @@ static void test_with_matcher(Constraint
+             (*constraint->compare)(constraint, matcher_function),
+             "Wanted parameter [%s] to match [%s] in function [%s]",
+             constraint->parameter,
+-            matcher_name,
++            constraint->name,
+             function);
+ }
+

libs/libesmtp/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libesmtp
 PKG_VERSION:=1.1.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_MAINTAINER:=Othmar Truniger <[email protected]>
 PKG_LICENSE:=LGPL-2.0-or-later
@@ -28,7 +28,7 @@ define Package/libesmtp
   CATEGORY:=Libraries
   TITLE:=A Library for Posting Electronic Mail
   URL:=https://libesmtp.github.io/
-  DEPENDS:=+libpthread +libopenssl
+  DEPENDS:=+libopenssl
 endef
 
 define Build/InstallDev

libs/libesmtp/patches/010-gcc14.patch

@@ -0,0 +1,27 @@
+--- a/smtp-api.c
++++ b/smtp-api.c
+@@ -22,6 +22,10 @@
+
+ #include <config.h>
+
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
++
+ #include <stdarg.h>
+ #include <string.h>
+ #include <stdlib.h>
+--- a/smtp-tls.c
++++ b/smtp-tls.c
+@@ -47,6 +47,11 @@
+
+ /* This stuff doesn't belong here */
+ /* vvvvvvvvvvv */
++
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>

libs/libgudev/Makefile

@@ -16,6 +16,7 @@ PKG_BUILD_DEPENDS:=glib2/host
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/meson.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/libgudev
   SECTION:=libs

libs/libmanette/Makefile

@@ -0,0 +1,55 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libmanette
+PKG_VERSION:=0.2.9
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/$(basename $(PKG_VERSION))
+PKG_HASH:=29366be5452f60a74c65fc64ffe2d74eddd4e6e6824c2cefa567a43bd92b688f
+
+PKG_MAINTAINER:=Daniel Golle <[email protected]>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/meson.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/libmanette
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=The simple GObject game controller library.
+  URL:=https://gitlab.gnome.org/GNOME/libmanette
+  DEPENDS:=+glib2 +libgudev
+endef
+
+define Package/libmanette/description
+ libmanette offers painless access to game controllers, from any programming
+ language and with little dependencies.
+endef
+
+MESON_ARGS += \
+	-Ddemos=true \
+	-Dbuild-tests=true \
+	-Dinstall-tests=true \
+	-Ddoc=false \
+	-Dintrospection=false \
+	-Dvapi=false \
+	-Dgudev=enabled
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/libmanette
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libmanette/*.h $(1)/usr/include/libmanette
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so*} $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig
+endef
+
+define Package/libmanette/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,libmanette))

multimedia/lcdgrilo/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lcdgrilo
-PKG_VERSION:=0.0.12
+PKG_VERSION:=0.0.13
 PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.flyn.org/projects/lcdgrilo
-PKG_HASH:=2e5028fff7a90b1a3688c466f048e978a52d9a4da20a382546d5e5bd42e2fc6a
+PKG_HASH:=844ecd404986f1a998bd0992341a329913ab981a1fd94172537ca9aa25769b15
 
 PKG_MAINTAINER:=W. Michael Petullo <[email protected]>
 PKG_LICENSE:=GPL-2.0-or-later

net/dmapd/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dmapd
-PKG_VERSION:=0.0.95
+PKG_VERSION:=0.0.96
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=W. Michael Petullo <[email protected]>
@@ -18,7 +18,7 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.flyn.org/projects/dmapd
-PKG_HASH:=c2c387518ee012e2f2613770c1e7e7eeb5e58fb4605ed645f1db2aced1585a52
+PKG_HASH:=09990f7e76f62245c42472c4d31ee65003666632fda87c4ce07d5321a32716d6
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1

net/haproxy/Makefile

@@ -10,12 +10,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=haproxy
-PKG_VERSION:=3.0.5
+PKG_VERSION:=3.0.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.haproxy.org/download/3.0/src
-PKG_HASH:=ae38221e85aeba038a725efbef5bfe5e76671ba7959e5eb74c39fd079e5d002e
+PKG_HASH:=cf1bf58b5bc79c48db7b01667596ffd98343adb29a41096f075f00a8f90a7335
 
 PKG_MAINTAINER:=Thomas Heil <[email protected]>, \
 		Christian Lachner <[email protected]>

net/haproxy/get-latest-patches.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 CLONEURL=https://git.haproxy.org/git/haproxy-3.0.git
-BASE_TAG=v3.0.5
+BASE_TAG=v3.0.6
 TMP_REPODIR=tmprepo
 PATCHESDIR=patches
 

net/knxd/Makefile

@@ -11,12 +11,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=knxd
-PKG_VERSION:=0.14.66
+PKG_VERSION:=0.14.67
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/knxd/knxd/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=aec3887a69a07a764fedf48f295e39887255f69a3c6e05987bbf0b9bcde6c7a1
+PKG_HASH:=1d6290e576b079d9e751b63bd8fe9c627820d2b6a04ec811ff0b5fcc2c688abf
 
 PKG_MAINTAINER:=Othmar Truniger <[email protected]>
 PKG_LICENSE:=GPL-2.0-or-later

net/knxd/patches/0100-version.patch

@@ -7,4 +7,4 @@
 -test -d .git || exit
 -# git describe --tags
 -git log --format=format:%D | perl -ne 'next unless s#.*tag: ##; s#,.*##; next if m#/#; print; exit;'
-+echo -n "0.14.66"
++echo -n "0.14.67"

net/mdnsresponder/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mDNSResponder
 PKG_VERSION:=2200.100.94.0.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=$(PKG_NAME)-$(PKG_VERSION)

net/mdnsresponder/patches/0015-Add-missing-limits.h.patch

@@ -0,0 +1,21 @@
+From 9fc45a2cf3b78573a568abf538a6e6f4bd30b2d7 Mon Sep 17 00:00:00 2001
+From: Alex Kiernan <[email protected]>
+Date: Wed, 27 Sep 2023 11:45:26 +0100
+Subject: [PATCH] Add missing limits.h
+
+Upstream-Status: Pending
+Signed-off-by: Alex Kiernan <[email protected]>
+---
+ mDNSShared/PlatformCommon.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/mDNSShared/PlatformCommon.c
++++ b/mDNSShared/PlatformCommon.c
+@@ -32,6 +32,7 @@
+ #include <time.h>
+ #include <sys/time.h>           // Needed for #include <sys/time.h>().
+ #include <assert.h>
++#include <limits.h>
+
+
+ #include "mDNSEmbeddedAPI.h"    // Defines the interface provided to the client layer above

net/modemmanager/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=modemmanager
 PKG_VERSION:=1.22.0
-PKG_RELEASE:=19
+PKG_RELEASE:=20
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git

net/modemmanager/files/etc/init.d/modemmanager

@@ -25,6 +25,7 @@ start_service() {
 	procd_set_param command /usr/sbin/ModemManager-wrapper
 	procd_append_param command --log-level="$LOG_LEVEL"
 	[ "$LOG_LEVEL" = "DEBUG" ] && procd_append_param command --debug
+	[ "$LOG_LEVEL" = "DEBUG" ] && procd_append_param command --log-file "/var/log/mm.log"
 	procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
 	procd_set_param pidfile "${MODEMMANAGER_PID_FILE}"
 	procd_close_instance