Received: by mail.netbsd.org (Postfix, from userid 605) id 3CFBB84F46; Sat, 13 Jan 2024 19:30:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6A90584F09 for ; Sat, 13 Jan 2024 19:30:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id NXZPp8lYOrPZ for ; Sat, 13 Jan 2024 19:30:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 5CABF84CF9 for ; Sat, 13 Jan 2024 19:30:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 548C7FA42; Sat, 13 Jan 2024 19:30:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_170517424888970" MIME-Version: 1.0 Date: Sat, 13 Jan 2024 19:30:48 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/sysutils/attr To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20240113193048.548C7FA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_170517424888970 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Jan 13 19:30:48 UTC 2024 Modified Files: pkgsrc/sysutils/attr: Makefile PLIST distinfo Added Files: pkgsrc/sysutils/attr/patches: patch-configure.ac patch-libattr_Makemodule.am patch-tools_Makemodule.am patch-tools_attr.c Removed Files: pkgsrc/sysutils/attr/patches: patch-aa patch-ab Log Message: attr: update to 2.5.1. Changes not documented. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/attr/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/attr/PLIST cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/attr/distinfo cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/attr/patches/patch-aa \ pkgsrc/sysutils/attr/patches/patch-ab cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/attr/patches/patch-configure.ac \ pkgsrc/sysutils/attr/patches/patch-libattr_Makemodule.am \ pkgsrc/sysutils/attr/patches/patch-tools_Makemodule.am \ pkgsrc/sysutils/attr/patches/patch-tools_attr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_170517424888970 Content-Disposition: inline Content-Length: 8846 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/attr/Makefile diff -u pkgsrc/sysutils/attr/Makefile:1.8 pkgsrc/sysutils/attr/Makefile:1.9 --- pkgsrc/sysutils/attr/Makefile:1.8 Sun Apr 30 05:23:52 2023 +++ pkgsrc/sysutils/attr/Makefile Sat Jan 13 19:30:47 2024 @@ -1,45 +1,29 @@ -# $NetBSD: Makefile,v 1.8 2023/04/30 05:23:52 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2024/01/13 19:30:47 wiz Exp $ -ATTR_VERS= 2.4.47 -PKGNAME= attr-${ATTR_VERS} -DISTNAME= attr-${ATTR_VERS}.src -PKGREVISION= 1 +DISTNAME= attr-2.5.1 CATEGORIES= sysutils MASTER_SITES= https://download.savannah.gnu.org/releases/attr/ +EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://savannah.nongnu.org/projects/attr COMMENT= Commands for Manipulating Filesystem Extended Attributes LICENSE= gnu-gpl-v2 -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= yes -USE_TOOLS+= gmake msgfmt perl:test +USE_TOOLS+= autoconf automake autopoint autoreconf gmake msgfmt USE_LIBTOOL= yes -BUILD_TARGET= default -INSTALL_SH_OVERRIDE= no -# 114 commands (34 passed, 80 failed) -TEST_TARGET= tests -REPLACE_PERL+= test/run -REPLACE_PERL+= test/sort-getfattr-output - -LDFLAGS.Darwin+= -lintl -LDFLAGS.NetBSD+= -lintl - -SUBST_CLASSES.Darwin+= rmldarg -SUBST_CLASSES.SunOS+= rmldarg -SUBST_STAGE.rmldarg= pre-configure -SUBST_FILES.rmldarg= libattr/Makefile -SUBST_SED.rmldarg= -e '/version-script/d' - -pre-install: - cd ${WRKSRC}/libattr && env ${MAKE_ENV} \ - ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} \ - -f ${MAKE_FILE} install-lib install-dev - cd ${WRKSRC}/include && env ${MAKE_ENV} \ - ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} \ - -f ${MAKE_FILE} install-dev +PKGCONFIG_OVERRIDE+= libattr.pc.in +INSTALLATION_DIRS+= share/examples/attr + +CONF_FILES+= share/examples/attr/xattr.conf ${PKG_SYSCONFDIR}/xattr.conf + +pre-configure: + cd ${WRKSRC} && autoreconf -fiv + +post-install: + ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/xattr.conf ${DESTDIR}${PREFIX}/share/examples/attr .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/attr/PLIST diff -u pkgsrc/sysutils/attr/PLIST:1.2 pkgsrc/sysutils/attr/PLIST:1.3 --- pkgsrc/sysutils/attr/PLIST:1.2 Sun Aug 21 21:09:27 2016 +++ pkgsrc/sysutils/attr/PLIST Sat Jan 13 19:30:47 2024 @@ -1,23 +1,34 @@ -@comment $NetBSD: PLIST,v 1.2 2016/08/21 21:09:27 markd Exp $ +@comment $NetBSD: PLIST,v 1.3 2024/01/13 19:30:47 wiz Exp $ bin/attr bin/getfattr bin/setfattr include/attr/attributes.h include/attr/error_context.h include/attr/libattr.h -include/attr/xattr.h lib/libattr.la +lib/pkgconfig/libattr.pc man/man1/attr.1 man/man1/getfattr.1 man/man1/setfattr.1 -man/man5/attr.5 -share/doc/attr/CHANGES.gz +man/man3/attr_get.3 +man/man3/attr_getf.3 +man/man3/attr_list.3 +man/man3/attr_listf.3 +man/man3/attr_multi.3 +man/man3/attr_multif.3 +man/man3/attr_remove.3 +man/man3/attr_removef.3 +man/man3/attr_set.3 +man/man3/attr_setf.3 +share/doc/attr/CHANGES share/doc/attr/COPYING share/doc/attr/COPYING.LGPL share/doc/attr/PORTING -share/doc/attr/README +share/examples/attr/xattr.conf share/locale/cs/LC_MESSAGES/attr.mo share/locale/de/LC_MESSAGES/attr.mo +share/locale/en@boldquot/LC_MESSAGES/attr.mo +share/locale/en@quot/LC_MESSAGES/attr.mo share/locale/es/LC_MESSAGES/attr.mo share/locale/fr/LC_MESSAGES/attr.mo share/locale/gl/LC_MESSAGES/attr.mo Index: pkgsrc/sysutils/attr/distinfo diff -u pkgsrc/sysutils/attr/distinfo:1.4 pkgsrc/sysutils/attr/distinfo:1.5 --- pkgsrc/sysutils/attr/distinfo:1.4 Tue Oct 26 11:19:20 2021 +++ pkgsrc/sysutils/attr/distinfo Sat Jan 13 19:30:47 2024 @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.4 2021/10/26 11:19:20 nia Exp $ +$NetBSD: distinfo,v 1.5 2024/01/13 19:30:47 wiz Exp $ -BLAKE2s (attr-2.4.47.src.tar.gz) = ab7941ee54d5cdef91d4dc7ae1763494a2d2372e6412677d4e5cddd40570bf96 -SHA512 (attr-2.4.47.src.tar.gz) = 2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831 -Size (attr-2.4.47.src.tar.gz) = 343692 bytes -SHA1 (patch-aa) = 82dc4a892b3d87f9cba9e4542f502ccf5ce7f59c -SHA1 (patch-ab) = 72ce83dfd9b15ff2a3bd81d27d436b6d8d324342 +BLAKE2s (attr-2.5.1.tar.xz) = 52fb843466e2b96ad92b8f77fadb8da7cc65b838ca76380e8cb6a954769cb983 +SHA512 (attr-2.5.1.tar.xz) = 9e5555260189bb6ef2440c76700ebb813ff70582eb63d446823874977307d13dfa3a347dfae619f8866943dfa4b24ccf67dadd7e3ea2637239fdb219be5d2932 +Size (attr-2.5.1.tar.xz) = 318188 bytes +SHA1 (patch-configure.ac) = 89c966ac640fb6ddaa4e5e4e1e936fe64a9c47ed +SHA1 (patch-libattr_Makemodule.am) = 052a7ef5e67ce3202742cf079bd0f54f452af810 +SHA1 (patch-tools_Makemodule.am) = 225f45f023acdbbf3980808f6524951ce1bfd2b0 +SHA1 (patch-tools_attr.c) = 477e5f77394a4debb8ba5923fea29ea29c1cf4d4 Added files: Index: pkgsrc/sysutils/attr/patches/patch-configure.ac diff -u /dev/null pkgsrc/sysutils/attr/patches/patch-configure.ac:1.1 --- /dev/null Sat Jan 13 19:30:48 2024 +++ pkgsrc/sysutils/attr/patches/patch-configure.ac Sat Jan 13 19:30:47 2024 @@ -0,0 +1,25 @@ +$NetBSD: patch-configure.ac,v 1.1 2024/01/13 19:30:47 wiz Exp $ + +https://git.savannah.nongnu.org/cgit/attr.git/diff/?h=7b3423dcbf6775539124c52a59e8bc76e33596f6 + +--- configure.ac.orig 2021-03-16 06:47:55.000000000 +0000 ++++ configure.ac +@@ -23,6 +23,7 @@ AC_PREFIX_DEFAULT(/usr) + AM_INIT_AUTOMAKE([-Wall foreign 1.11 dist-xz subdir-objects]) + AM_SILENT_RULES([yes]) + ++AC_CANONICAL_HOST + AC_PROG_CC + AM_PROG_CC_C_O + AC_USE_SYSTEM_EXTENSIONS +@@ -53,6 +54,10 @@ fi + LT_REVISION=$(printf "%d%d%02d" "$1" "$2" "$3") + AC_SUBST(LT_REVISION) + ++AS_CASE([$host_os], ++ [linux*], [os_linux=yes]) ++AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) ++ + AC_CONFIG_COMMANDS([include/attr], + [dnl + rm -rf include/attr Index: pkgsrc/sysutils/attr/patches/patch-libattr_Makemodule.am diff -u /dev/null pkgsrc/sysutils/attr/patches/patch-libattr_Makemodule.am:1.1 --- /dev/null Sat Jan 13 19:30:48 2024 +++ pkgsrc/sysutils/attr/patches/patch-libattr_Makemodule.am Sat Jan 13 19:30:47 2024 @@ -0,0 +1,40 @@ +$NetBSD: patch-libattr_Makemodule.am,v 1.1 2024/01/13 19:30:47 wiz Exp $ + +https://git.savannah.nongnu.org/cgit/attr.git/diff/?h=7b3423dcbf6775539124c52a59e8bc76e33596f6 + +--- libattr/Makemodule.am.orig 2017-09-15 13:10:38.000000000 +0000 ++++ libattr/Makemodule.am +@@ -8,19 +8,30 @@ LT_CURRENT = 2 + LT_AGE = 1 + LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + +-libattr_la_DEPENDENCIES = exports libattr/libattr.lds ++libattr_la_DEPENDENCIES = \ ++ exports ++if OS_LINUX ++libattr_la_DEPENDENCIES += \ ++ libattr/libattr.lds ++endif + libattr_la_SOURCES = \ + libattr/attr_copy_action.c \ + libattr/attr_copy_check.c \ + libattr/attr_copy_fd.c \ + libattr/attr_copy_file.c \ + libattr/libattr.c \ +- libattr/syscalls.c \ + libattr/libattr.h ++if OS_LINUX ++libattr_la_SOURCES += \ ++ libattr/syscalls.c ++endif + libattr_la_CFLAGS = -include libattr/libattr.h + libattr_la_LDFLAGS = \ + -Wl,--version-script,$(top_srcdir)/exports \ +- -Wl,$(top_srcdir)/libattr/libattr.lds \ + -version-info $(LTVERSION) ++if OS_LINUX ++libattr_la_LDFLAGS += \ ++ -Wl,$(top_srcdir)/libattr/libattr.lds ++endif + + EXTRA_DIST += libattr/libattr.lds Index: pkgsrc/sysutils/attr/patches/patch-tools_Makemodule.am diff -u /dev/null pkgsrc/sysutils/attr/patches/patch-tools_Makemodule.am:1.1 --- /dev/null Sat Jan 13 19:30:48 2024 +++ pkgsrc/sysutils/attr/patches/patch-tools_Makemodule.am Sat Jan 13 19:30:48 2024 @@ -0,0 +1,22 @@ +$NetBSD: patch-tools_Makemodule.am,v 1.1 2024/01/13 19:30:48 wiz Exp $ + +https://savannah.nongnu.org/bugs/index.php?65159 + +--- tools/Makemodule.am.orig 2024-01-13 19:19:07.705687493 +0000 ++++ tools/Makemodule.am +@@ -2,12 +2,12 @@ tools_ldadd = $(LDADD) libattr.la libmis + + bin_PROGRAMS += attr + attr_SOURCES = tools/attr.c +-attr_LDADD = $(tools_ldadd) ++attr_LDADD = $(tools_ldadd) $(INTLLIBS) + + bin_PROGRAMS += getfattr + getfattr_SOURCES = tools/getfattr.c +-getfattr_LDADD = $(tools_ldadd) ++getfattr_LDADD = $(tools_ldadd) $(INTLLIBS) + + bin_PROGRAMS += setfattr + setfattr_SOURCES = tools/setfattr.c +-setfattr_LDADD = $(tools_ldadd) ++setfattr_LDADD = $(tools_ldadd) $(INTLLIBS) Index: pkgsrc/sysutils/attr/patches/patch-tools_attr.c diff -u /dev/null pkgsrc/sysutils/attr/patches/patch-tools_attr.c:1.1 --- /dev/null Sat Jan 13 19:30:48 2024 +++ pkgsrc/sysutils/attr/patches/patch-tools_attr.c Sat Jan 13 19:30:48 2024 @@ -0,0 +1,15 @@ +$NetBSD: patch-tools_attr.c,v 1.1 2024/01/13 19:30:48 wiz Exp $ + +Add missing header for basename() +https://savannah.nongnu.org/bugs/index.php?63920 + +--- tools/attr.c.orig 2019-08-12 08:39:01.000000000 +0000 ++++ tools/attr.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include + --_----------=_170517424888970--