From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 15 Jul 2026 12:02:18 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wjwRW-004067-1Q for lore@lore.pengutronix.de; Wed, 15 Jul 2026 12:02:18 +0200 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wjwRQ-0006a1-Te; Wed, 15 Jul 2026 12:02:12 +0200 Received: from mx1.white.stw.pengutronix.de ([185.203.200.13]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wjwR8-0005i4-B5 for ptxdist@pengutronix.de; Wed, 15 Jul 2026 12:01:55 +0200 Received: from drehscheibe.grey.stw.pengutronix.de (drehscheibe.grey.stw.pengutronix.de [IPv6:2a0a:edc0:0:c01:1d::a2]) (Authenticated sender: relay-from-drehscheibe.grey.stw.pengutronix.de) by mx1.white.stw.pengutronix.de (Postfix) with ESMTPSA id 4A337202232; Wed, 15 Jul 2026 12:01:49 +0200 (CEST) Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wjwR3-001uo5-0d; Wed, 15 Jul 2026 12:01:49 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1wjwR3-00000005GXS-0bB2; Wed, 15 Jul 2026 12:01:49 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 15 Jul 2026 12:01:49 +0200 Message-ID: <20260715100149.1255207-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260707160409.1290571-1-christian.melki@t2data.com> References: <20260707160409.1290571-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.6 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [APPLIED] acl: Version bump. 2.3.2 -> 2.4.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 80119c7d861479b6807e19ba28ffa6628781317c. Michael [sent from post-receive hook] On Wed, 15 Jul 2026 12:01:49 +0200, Christian Melki wrote: > xattr support has been added, but still some minor adjustments needed. > https://git.savannah.nongnu.org/cgit/acl.git/log/?h=v2.3.2 > > * Rework from the old patch. Keep some checks and let it add error_context.h > > Signed-off-by: Christian Melki > Message-Id: <20260707160409.1290571-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/acl-2.3.2/0001-Switch-to-sys-xattr.h.patch b/patches/acl-2.4.0/0001-Switch-to-sys-xattr.h.patch > similarity index 59% > rename from patches/acl-2.3.2/0001-Switch-to-sys-xattr.h.patch > rename to patches/acl-2.4.0/0001-Switch-to-sys-xattr.h.patch > index d62be0ec09e2..10bb3b766104 100644 > --- a/patches/acl-2.3.2/0001-Switch-to-sys-xattr.h.patch > +++ b/patches/acl-2.4.0/0001-Switch-to-sys-xattr.h.patch > @@ -7,47 +7,32 @@ that libacl uses have been provided by libc. > This commit switches the code to use libc and leave libxattr > behind. > --- > - configure.ac | 4 ++-- > - libacl/Makemodule.am | 4 ++-- > + configure.ac | 5 +++-- > libacl/error_context.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ > - libacl/perm_copy_fd.c | 7 +------ > - libacl/perm_copy_file.c | 7 +------ > - 5 files changed, 59 insertions(+), 16 deletions(-) > + libacl/perm_copy_fd.c | 2 +- > + libacl/perm_copy_file.c | 2 +- > + 4 files changed, 58 insertions(+), 4 deletions(-) > create mode 100644 libacl/error_context.h > > diff --git a/configure.ac b/configure.ac > -index 96fd96a424c5..21694dabefe5 100644 > +index c1a46982833c..0f7f42514a16 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -53,8 +53,8 @@ AS_IF([test $# -ne 3 -o ${#1} -gt 1 -o ${#2} -gt 1 -o ${#3} -gt 2], > +@@ -83,8 +83,9 @@ AS_IF([test $# -ne 3 -o ${#1} -gt 1 -o ${#2} -gt 1 -o ${#3} -gt 2], > LT_REVISION=$(printf "%d%d%02d" "$1" "$2" "$3") > AC_SUBST(LT_REVISION) > > -AC_PACKAGE_NEED_ATTR_ERROR_H > --AC_PACKAGE_NEED_GETXATTR_LIBATTR > -+AC_CHECK_HEADERS([sys/xattr.h],, > -+ [AC_MSG_ERROR([sys/xattr.h header not found])]) > - > +- > ++AC_CHECK_HEADERS([sys/xattr.h],, > ++ [AC_MSG_ERROR([sys/xattr.h header not found])]) > ++ > AC_CONFIG_COMMANDS([include/acl], > [dnl > -diff --git a/libacl/Makemodule.am b/libacl/Makemodule.am > -index 604f829ac7ce..700581eee84f 100644 > ---- a/libacl/Makemodule.am > -+++ b/libacl/Makemodule.am > -@@ -76,8 +76,8 @@ libacl_la_DEPENDENCIES = exports libmisc.la > - libacl_la_SOURCES = $(CFILES) $(HFILES) > - ## Since libacl translates its error messages, we have to link libintl. > - ## See the AM_GNU_GETTEXT documentation for details. > --libacl_la_LIBADD = -lattr libmisc.la $(LTLIBINTL) > -+libacl_la_LIBADD = libmisc.la $(LTLIBINTL) > - libacl_la_CFLAGS = $(AM_CFLAGS) -include $(srcdir)/libacl/perm_copy.h > --libacl_la_LDFLAGS = \ > -+libacl_la_LDFLAGS = -no-undefined \ > - -Wl,--version-script,$(top_srcdir)/exports \ > - -version-info $(LTVERSION) > + rm -rf include/acl > diff --git a/libacl/error_context.h b/libacl/error_context.h > new file mode 100644 > -index 000000000000..fa383f4cb5db > +index 000000000000..65f00e7c0832 > --- /dev/null > +++ b/libacl/error_context.h > @@ -0,0 +1,53 @@ > @@ -105,56 +90,28 @@ index 000000000000..fa383f4cb5db > + > +#endif /* __ERROR_CONTEXT_T */ > diff --git a/libacl/perm_copy_fd.c b/libacl/perm_copy_fd.c > -index 701bed2532e4..aa4630b798ea 100644 > +index 34187f4181b7..671f4d9f7ea9 100644 > --- a/libacl/perm_copy_fd.c > +++ b/libacl/perm_copy_fd.c > -@@ -16,9 +16,8 @@ > - License along with this library; if not, see . > - */ > - > --#if defined (HAVE_CONFIG_H) > - #include "config.h" > --#endif > -+ > - #if defined(HAVE_LIBACL_LIBACL_H) > - # include "libacl.h" > - #endif > -@@ -38,11 +37,7 @@ > - #endif > +@@ -27,7 +27,7 @@ > + #include "fchmodat_compat.h" > > #define ERROR_CONTEXT_MACROS > --#ifdef HAVE_ATTR_ERROR_CONTEXT_H > -#include > --#else > - #include "error_context.h" > --#endif > ++#include "error_context.h" > > - #if !defined(ENOTSUP) > - # define ENOTSUP (-1) > + /* Set the access control list of path to the permissions defined by mode. */ > + static int > diff --git a/libacl/perm_copy_file.c b/libacl/perm_copy_file.c > -index ba59d3647952..1af6a6a7e0f2 100644 > +index 507ccb0c1037..7b41b97b5c11 100644 > --- a/libacl/perm_copy_file.c > +++ b/libacl/perm_copy_file.c > -@@ -16,9 +16,8 @@ > - License along with this library; if not, see . > - */ > - > --#if defined (HAVE_CONFIG_H) > - #include "config.h" > --#endif > -+ > - #if defined(HAVE_LIBACL_LIBACL_H) > - # include "libacl.h" > - #endif > -@@ -38,11 +37,7 @@ > - #endif > +@@ -25,7 +25,7 @@ > + #include "libacl.h" > > #define ERROR_CONTEXT_MACROS > --#ifdef HAVE_ATTR_ERROR_CONTEXT_H > -#include > --#else > - #include "error_context.h" > --#endif > ++#include "error_context.h" > > - #if !defined(ENOTSUP) > - # define ENOTSUP (-1) > + /* Set the access control list of path to the permissions defined by mode. */ > + static int > diff --git a/patches/acl-2.3.2/autogen.sh b/patches/acl-2.4.0/autogen.sh > similarity index 100% > rename from patches/acl-2.3.2/autogen.sh > rename to patches/acl-2.4.0/autogen.sh > diff --git a/patches/acl-2.3.2/series b/patches/acl-2.4.0/series > similarity index 100% > rename from patches/acl-2.3.2/series > rename to patches/acl-2.4.0/series > diff --git a/rules/acl.make b/rules/acl.make > index cd2e5e81c36e..e614682cc815 100644 > --- a/rules/acl.make > +++ b/rules/acl.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_ACL) += acl > # > # Paths and names > # > -ACL_VERSION := 2.3.2 > -ACL_SHA256 := 5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c > +ACL_VERSION := 2.4.0 > +ACL_SHA256 := 73c853c3d44e1f693e5a96a986f1bd19d3d0dac2c7d453e796177774bc4e5f6a > ACL := acl-$(ACL_VERSION) > ACL_SUFFIX := tar.gz > ACL_URL := http://download.savannah.gnu.org/releases/acl/$(ACL).$(ACL_SUFFIX)