From 1797ca6ea5f5467482d74ae5d4dac9eec3846040 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 13:22:24 +0800
Subject: [PATCH] update 2023-09-11 13:22:24

---
 haproxy/Makefile                      |  4 +-
 haproxy/get-latest-patches.sh         |  2 +-
 ucl/Makefile                          | 70 +++++++++++++++++----------
 ucl/patches/001-autoconf-compat.patch | 11 +++++
 4 files changed, 58 insertions(+), 29 deletions(-)
 create mode 100644 ucl/patches/001-autoconf-compat.patch

diff --git a/haproxy/Makefile b/haproxy/Makefile
index f790564ba..9f57f746b 100644
--- a/haproxy/Makefile
+++ b/haproxy/Makefile
@@ -10,12 +10,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=haproxy
-PKG_VERSION:=2.8.2
+PKG_VERSION:=2.8.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.haproxy.org/download/2.8/src
-PKG_HASH:=698d6906d170946a869769964e57816ba3da3adf61ff75e89972b137f4658db0
+PKG_HASH:=9ecc6ffe67a977d1ed279107bbdab790d73ae2a626bc38eee23fa1f6786a759e
 
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>, \
 		Christian Lachner <gladiac@gmail.com>
diff --git a/haproxy/get-latest-patches.sh b/haproxy/get-latest-patches.sh
index b7d1748e9..8f4d9e0af 100755
--- a/haproxy/get-latest-patches.sh
+++ b/haproxy/get-latest-patches.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 CLONEURL=https://git.haproxy.org/git/haproxy-2.8.git
-BASE_TAG=v2.8.2
+BASE_TAG=v2.8.3
 TMP_REPODIR=tmprepo
 PATCHESDIR=patches
 
diff --git a/ucl/Makefile b/ucl/Makefile
index 40abf4c73..97fc23cbb 100644
--- a/ucl/Makefile
+++ b/ucl/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 OpenWrt.org
+# Copyright (C) 2019-2020 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,44 +8,62 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ucl
 PKG_VERSION:=1.03
+PKG_RELEASE:=3
+
+PKG_MAINTAINER:=Xingwang Liao <kuoruan@gmail.com>
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/ucl/download/$(PKG_SOURCE)
+PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/ucl/download
 PKG_HASH:=b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348
 
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+HOST_FIXUP:=autoreconf
+HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
 
-HOSTCC :=gcc
-HOST_CFLAGS +=-std=gnu89
+HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
 
-define Host/Prepare
-	$(Host/Prepare/Default)
-	mkdir -p $(STAGING_DIR_HOST)/include/ucl
+HOST_CFLAGS += -std=gnu89
+TARGET_CFLAGS += -std=gnu89
+
+CONFIGURE_ARGS += \
+	--enable-static \
+	--enable-shared \
+	--disable-asm
+
+define Package/libucl
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Portable lossless data compression library
+  URL:=http://www.oberhumer.com/opensource/ucl/
 endef
 
-define Host/Configure
-	(cd $(HOST_BUILD_DIR); \
-	CC="$(HOSTCC)" \
-	CFLAGS="$(HOST_CFLAGS)" \
-	./configure --prefix=$(STAGING_DIR_HOST) \
-	);
-	$(call Host/Configure/Default)
+define Package/libucl/description
+UCL is a portable lossless data compression library written in ANSI C. UCL
+implements a number of compression algorithms that achieve an excellent
+compression ratio while allowing *very* fast decompression. Decompression
+requires no additional memory.
 endef
 
-define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR)
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/ucl
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/ucl/ucl{,conf}.h $(1)/usr/include/ucl/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libucl.{a,so*} $(1)/usr/lib/
 endef
 
-define Host/Install
-	$(MAKE) -C $(HOST_BUILD_DIR) install
+define Package/libucl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libucl.so.* $(1)/usr/lib/
 endef
 
-define Host/Clean
-	$(MAKE) -C $(HOST_BUILD_DIR) uninstall
-	rm -rf $(HOST_BUILD_DIR)
-	rm -rf $(STAGING_DIR_HOST)/include/ucl
-endef
-
-$(eval $(call HostBuild))
\ No newline at end of file
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,libucl))
diff --git a/ucl/patches/001-autoconf-compat.patch b/ucl/patches/001-autoconf-compat.patch
new file mode 100644
index 000000000..7dda83d8e
--- /dev/null
+++ b/ucl/patches/001-autoconf-compat.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,7 +48,7 @@ AC_CANONICAL_TARGET
+ AM_MAINTAINER_MODE
+ 
+ if test -z "$ac_abs_top_srcdir"; then
+-    _AC_SRCPATHS(.)
++    _AC_SRCDIRS(.)
+ fi
+ if test -r .Conf.settings1; then
+     . ./.Conf.settings1