Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/archivers/star archivers/star: Update to 1.6.1nb8
details: https://anonhg.NetBSD.org/pkgsrc/rev/b825e4272ca3
branches: trunk
changeset: 433619:b825e4272ca3
user: micha <micha%pkgsrc.org@localhost>
date: Fri Jun 05 17:04:31 2020 +0000
description:
archivers/star: Update to 1.6.1nb8
- Remove pkgsrc patches (merged upstream)
- Move OS specific helper code to devel/smake/Makefile.common
Changes from AN-2020-05-25:
- libmdgest: Added a "defined(_M_ARM)" check for MSVC byte order
definitions (byte_order.h).
Thanks to "Excalibur" for reporting.
- star: SmartOS supports aclutils.h as published include file (what we
intented to include in Schillix-ON as well, since it is needed for
libsec) and aclutils.h includes ctype.h. We thus need to
#include <ctype.h> before star.h in acl_unix.c
The problem occurred because we did already have a aclutils.h related
autoconf test, even though Schillix-ON does not yet ship aclutils.h
Thanks to Michael Bäuerle from pkgsrc for reporting.
- star: The subst command (since 2018) malloc()s the space for a copy
of the old string in case that the string Is too long for the static
storage. It did however still use the static buffer instead of a
pointer to the allocated space. We now use the allocated space if
needed.
- star: The subst command for pax now supports the \1, \2, ... escapes
for \(...\) selections in the from pattern, like it is used by sed(1).
Thanks to Kristyna Streitova for reminding on this.
- star: A new unit test for this new feature has been added, using the
example from the SUSE bug-report for the above substitute command.
- star: A new subst option -pax-s has been added that supports sed(1)
like substitutions. The old option -s continues to support change(1)
like substititions.
NOTE: Both pax -s and star -pax-s silently fall back to change(1)-like
substitutions in case that a target platform does not support "regex"
in libc.
diffstat:
archivers/star/Makefile | 39 ++------------------------
archivers/star/PLIST | 3 +-
archivers/star/distinfo | 12 +++----
archivers/star/patches/patch-star_acl__unix.c | 20 -------------
archivers/star/patches/patch-star_star.h | 30 --------------------
5 files changed, 10 insertions(+), 94 deletions(-)
diffs (154 lines):
diff -r bf4f81d549f6 -r b825e4272ca3 archivers/star/Makefile
--- a/archivers/star/Makefile Fri Jun 05 16:48:16 2020 +0000
+++ b/archivers/star/Makefile Fri Jun 05 17:04:31 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2020/05/14 13:27:53 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2020/06/05 17:04:31 micha Exp $
-DISTNAME= schily-2020-05-11
+DISTNAME= schily-2020-05-25
PKGNAME= star-1.6.1
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=schilytools/}
EXTRACT_SUFX= .tar.bz2
@@ -16,26 +16,6 @@
.include "../../mk/bsd.prefs.mk"
-# tbl(1) of NetBSD 9 cannot be used and cripples the man pages, but man(1)
-# from mandoc uses a builtin tbl that is good enough.
-# This check should catch all supported OS that needs processed tables for
-# man pages and have a tbl that can be used to do that.
-.if ${OPSYS} == "AIX" || \
- ${OPSYS} == "Cygwin" || \
- ${OPSYS} == "Darwin" || \
- ${OPSYS} == "DragonFly" || \
- ${OPSYS} == "Haiku" || \
- ${OPSYS} == "HPUX" || \
- ${OPSYS} == "IRIX" || \
- ${OPSYS} == "Linux" || \
- ${OPSYS} == "Minix" || \
- ${OPSYS} == "MirBSD" || \
- ${OPSYS} == "OSF1" || \
- ${OPSYS} == "QNX" || \
- ${OPSYS} == "SunOS"
-USE_TOOLS+= tbl
-.endif
-
TOOL_DEPENDS+= smake-[0-9]*:../../devel/smake
SMAKE= MAKEFLAGS= smake
MAKE_FLAGS+= DESTDIR=${DESTDIR} INS_BASE=${PREFIX} DEFMANBASE=. MANDIR=${PKGMANDIR}
@@ -68,19 +48,6 @@
SUBST_SED.install= -e 's,PKGNAME_NOREV,${PKGNAME_NOREV},'
SUBST_SED.install+= -e 's,STAR_CONF,${STAR_CONF:Q},'
-# Man pages with documentation of file formats should go to section 4 on
-# SysV based systems. All supported systems that are treated by schilytools
-# with "MANSTYLE= sysv" in the RULES/os-${OPSYS}.def" files must be caught
-# by this check (IRIX and OSF/1 are treated with BSD style by schilytools).
-PLIST_VARS+= bsd sysv
-.if ${OPSYS} == "AIX" || \
- ${OPSYS} == "HPUX" || \
- ${OPSYS} == "SunOS"
-PLIST.sysv= yes
-.else
-PLIST.bsd= yes
-.endif
-
# Shared platform specific code for schilytools (provided by smake package)
.include "../../devel/smake/Makefile.common"
diff -r bf4f81d549f6 -r b825e4272ca3 archivers/star/PLIST
--- a/archivers/star/PLIST Fri Jun 05 16:48:16 2020 +0000
+++ b/archivers/star/PLIST Fri Jun 05 17:04:31 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/05/14 11:36:34 micha Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/06/05 17:04:31 micha Exp $
bin/gnutar
bin/scpio
bin/spax
@@ -66,6 +66,7 @@
share/doc/star/testscripts/not_a_tar_file3
share/doc/star/testscripts/old-file.tar
share/doc/star/testscripts/pax-big-10g.tar.bz2
+share/doc/star/testscripts/pax-rename.tar.gz
share/doc/star/testscripts/quicktest.filelist
share/doc/star/testscripts/remove.tar
share/doc/star/testscripts/tartest-quicktest.out
diff -r bf4f81d549f6 -r b825e4272ca3 archivers/star/distinfo
--- a/archivers/star/distinfo Fri Jun 05 16:48:16 2020 +0000
+++ b/archivers/star/distinfo Fri Jun 05 17:04:31 2020 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.22 2020/05/13 08:21:49 micha Exp $
+$NetBSD: distinfo,v 1.23 2020/06/05 17:04:31 micha Exp $
-SHA1 (schily-2020-05-11.tar.bz2) = 1992e23344880fb58443c5b89b24fded4039f7a7
-RMD160 (schily-2020-05-11.tar.bz2) = bdf3ac0349f00095d7e17f1b14a07f6dcb94a0e2
-SHA512 (schily-2020-05-11.tar.bz2) = a12f0a3caa14c35af150afb4354fbe7c5b1d6ad301d24efbed6f0ec7c38919fe2bf863a117d46107178d11f60b9dd93f72f173c722e2e129d86d348b01fc56ee
-Size (schily-2020-05-11.tar.bz2) = 4783976 bytes
-SHA1 (patch-star_acl__unix.c) = 15d8fbf73af6646e19b0488cf3c0226f7b854332
-SHA1 (patch-star_star.h) = 6ced8f4c2aac4fbcee4ea452e5d207e7b4bad064
+SHA1 (schily-2020-05-25.tar.bz2) = ba4f353ab3c3ecded4c417e8601f6986717508a9
+RMD160 (schily-2020-05-25.tar.bz2) = 56f9a9812f26ff80699bb1e5ed299e24a724ff18
+SHA512 (schily-2020-05-25.tar.bz2) = 73079c7c9c724911af10e641dfd82fb900c434c59a1d30fa34ac69f7f3e31dfe050cf718621574ce54cf5eb7189f32a5894fe070115c7eabc13c65e00b010b3b
+Size (schily-2020-05-25.tar.bz2) = 4794851 bytes
diff -r bf4f81d549f6 -r b825e4272ca3 archivers/star/patches/patch-star_acl__unix.c
--- a/archivers/star/patches/patch-star_acl__unix.c Fri Jun 05 16:48:16 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-star_acl__unix.c,v 1.1 2020/05/13 08:21:49 micha Exp $
-
-Fix for error below on SmartOS (patch proposed by upstream).
-
-In file included from acl_unix.c:81:
-/usr/include/iso/ctype_iso.h:94:12:
- error: expected identifier or '(' before 'int'
- 94 | extern int isdigit(int);
- | ^~~~~~~
-
---- star/acl_unix.c.orig 2020-05-12 16:31:51.262856675 +0000
-+++ star/acl_unix.c
-@@ -78,6 +78,7 @@ static UConst char sccsid[] =
-
- #include <schily/stdio.h>
- #include <schily/errno.h>
-+#include <schily/ctype.h>
- #include "star.h"
- #include "props.h"
- #include "table.h"
diff -r bf4f81d549f6 -r b825e4272ca3 archivers/star/patches/patch-star_star.h
--- a/archivers/star/patches/patch-star_star.h Fri Jun 05 16:48:16 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-star_star.h,v 1.1 2020/05/13 08:21:49 micha Exp $
-
-Fix for warning below on NetBSD (patch proposed by upstream).
-
-| ==> COMPILING "OBJ/x86_64-netbsd-gcc/acl_unix.o"
-| In file included from acl_unix.c:82:0:
-| star.h:850:0: warning: "toupper" redefined
-| #define toupper(c) (isupper(c) ? (c) : (c) - ('a' - 'A'))
-|
-| In file included from /usr/include/ctype.h:97:0,
-| from ../include/schily/ctype.h:33,
-| from acl_unix.c:81:
-| /usr/include/sys/ctype_inline.h:60:0: note: this is the location of the previous definition
-| #define toupper(c) ((int)((_toupper_tab_ + 1)[(c)]))
-
---- star/star.h.orig 2020-05-13 08:04:00.370176996 +0000
-+++ star/star.h
-@@ -841,6 +841,12 @@ typedef struct {
- #ifdef isdigit
- #undef isdigit /* Needed for HP-UX */
- #endif
-+#ifdef isoctal
-+#undef isoctal /* Needed if aclutils.h is present */
-+#endif
-+#ifdef toupper
-+#undef toupper /* Needed if aclutils.h is present */
-+#endif
- #define isdigit(c) ((c) >= '0' && (c) <= '9')
- #define isoctal(c) ((c) >= '0' && (c) <= '7')
- #ifdef isupper
Home |
Main Index |
Thread Index |
Old Index