From 39957093ddc8ef576c47dc908a785b3f277a842d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 25 May 2024 11:44:41 -0700 Subject: [PATCH] acl: switch to normal tarballs Avoids having to patch autoconf. Signed-off-by: Rosen Penev --- utils/acl/Makefile | 12 +++++----- .../patches/100-no-gettext_configure.patch | 22 ------------------- .../acl/patches/101-no-gettext_autogen.patch | 9 -------- .../acl/patches/102-no-gettext_Makefile.patch | 11 ---------- 4 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 utils/acl/patches/100-no-gettext_configure.patch delete mode 100644 utils/acl/patches/101-no-gettext_autogen.patch delete mode 100644 utils/acl/patches/102-no-gettext_Makefile.patch diff --git a/utils/acl/Makefile b/utils/acl/Makefile index 0d8f513565..75eb450375 100644 --- a/utils/acl/Makefile +++ b/utils/acl/Makefile @@ -9,19 +9,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acl PKG_VERSION:=2.3.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=@SAVANNAH/acl +PKG_HASH:=97203a72cae99ab89a067fe2210c1cbf052bc492b479eca7d226d9830883b0bd -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://git.savannah.nongnu.org/cgit/acl.git/snapshot -PKG_HASH:=0fc318808c1e91925398cbe41399a33b74dcf788a1c0af4feae8f7a322c6e6fd PKG_MAINTAINER:=Maxim Storchak - PKG_LICENSE:=LGPL-2.1 GPL-2.0 PKG_LICENSE_FILES:=doc/COPYING doc/COPYING.LGPL PKG_CPE_ID:=cpe:/a:acl_project:acl PKG_INSTALL:=1 -PKG_FIXUP:=autoreconf +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/utils/acl/patches/100-no-gettext_configure.patch b/utils/acl/patches/100-no-gettext_configure.patch deleted file mode 100644 index c818b39896..0000000000 --- a/utils/acl/patches/100-no-gettext_configure.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -34,12 +34,6 @@ AC_SYS_LARGEFILE - AM_PROG_AR - LT_INIT - --dnl Minimal version supporting AM_GNU_GETTEXT_REQUIRE_VERSION. --AM_GNU_GETTEXT_VERSION([0.19.6]) --dnl Require at least the following version, but use the latest available one. --AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8]) --AM_GNU_GETTEXT([external]) -- - AC_ARG_ENABLE([debug], - [AS_HELP_STRING([--enable-debug], [Enable extra debugging])]) - AS_IF([test "x$enable_debug" = "xyes"], -@@ -69,6 +63,5 @@ AC_CONFIG_COMMANDS([include/sys], - AC_CONFIG_FILES([ - libacl.pc - Makefile -- po/Makefile.in - ]) - AC_OUTPUT diff --git a/utils/acl/patches/101-no-gettext_autogen.patch b/utils/acl/patches/101-no-gettext_autogen.patch deleted file mode 100644 index a800096813..0000000000 --- a/utils/acl/patches/101-no-gettext_autogen.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/autogen.sh -+++ b/autogen.sh -@@ -1,6 +1,4 @@ - #!/bin/sh -ex --po/update-potfiles --autopoint --force - am_libdir=$(automake --print-libdir) - cp "${am_libdir}/INSTALL" doc/ - exec autoreconf -f -i diff --git a/utils/acl/patches/102-no-gettext_Makefile.patch b/utils/acl/patches/102-no-gettext_Makefile.patch deleted file mode 100644 index 4d562b9728..0000000000 --- a/utils/acl/patches/102-no-gettext_Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -3,8 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - EXTRA_DIST = \ - exports - --SUBDIRS = po -- - AM_CPPFLAGS = \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include \