Date: Thu, 4 May 2023 20:02:45 GMT From: Christian Weisgerber <naddy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9a5c058ddaf5 - main - archivers/gcpio: update to 2.14 Message-ID: <202305042002.344K2jxF099954@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a5c058ddaf5904030403b55cac21a0323827f35 commit 9a5c058ddaf5904030403b55cac21a0323827f35 Author: Christian Weisgerber <naddy@FreeBSD.org> AuthorDate: 2023-05-04 19:59:40 +0000 Commit: Christian Weisgerber <naddy@FreeBSD.org> CommitDate: 2023-05-04 20:02:40 +0000 archivers/gcpio: update to 2.14 User-visible changes: * New option --ignore-dirnlink * The --reproducible option now implies --ignore-dirlink --- archivers/gcpio/Makefile | 3 +-- archivers/gcpio/distinfo | 6 +++--- archivers/gcpio/files/patch-gnu_Makefile.in | 11 ----------- archivers/gcpio/files/patch-src_global.c | 14 -------------- archivers/gcpio/files/patch-src_util.c | 23 ----------------------- archivers/gcpio/pkg-plist | 1 + 6 files changed, 5 insertions(+), 53 deletions(-) diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile index 41ad5bdfbe18..6d3249a0cfdf 100644 --- a/archivers/gcpio/Makefile +++ b/archivers/gcpio/Makefile @@ -1,6 +1,5 @@ PORTNAME= cpio -PORTVERSION= 2.13 -PORTREVISION= 1 +DISTVERSION= 2.14 CATEGORIES= archivers MASTER_SITES= GNU PKGNAMEPREFIX= g diff --git a/archivers/gcpio/distinfo b/archivers/gcpio/distinfo index c4a94b923b29..362356dd84df 100644 --- a/archivers/gcpio/distinfo +++ b/archivers/gcpio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1573685109 -SHA256 (cpio-2.13.tar.bz2) = eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d -SIZE (cpio-2.13.tar.bz2) = 1354559 +TIMESTAMP = 1683229993 +SHA256 (cpio-2.14.tar.bz2) = fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12 +SIZE (cpio-2.14.tar.bz2) = 1521004 diff --git a/archivers/gcpio/files/patch-gnu_Makefile.in b/archivers/gcpio/files/patch-gnu_Makefile.in deleted file mode 100644 index 02d98f9ff507..000000000000 --- a/archivers/gcpio/files/patch-gnu_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gnu/Makefile.in.orig 2019-11-06 07:29:32 UTC -+++ gnu/Makefile.in -@@ -2129,7 +2129,7 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.statu - # avoid installing it. - - all-local: charset.alias ref-add.sed ref-del.sed --install-exec-local: install-exec-localcharset -+install-exec-local: - install-exec-localcharset: all-local - if test $(GLIBC21) = no; then \ - case '$(host_os)' in \ diff --git a/archivers/gcpio/files/patch-src_global.c b/archivers/gcpio/files/patch-src_global.c deleted file mode 100644 index 7875572e6796..000000000000 --- a/archivers/gcpio/files/patch-src_global.c +++ /dev/null @@ -1,14 +0,0 @@ -https://git.savannah.gnu.org/cgit/cpio.git/commit/src/global.c?id=641d3f489cf6238bb916368d4ba0d9325a235afb - ---- src/global.c.orig 2019-11-03 15:07:23 UTC -+++ src/global.c -@@ -184,9 +184,6 @@ unsigned int warn_option = 0; - /* Extract to standard output? */ - bool to_stdout_option = false; - --/* The name this program was run with. */ --char *program_name; -- - /* A pointer to either lstat or stat, depending on whether - dereferencing of symlinks is done for input files. */ - int (*xstat) (); diff --git a/archivers/gcpio/files/patch-src_util.c b/archivers/gcpio/files/patch-src_util.c deleted file mode 100644 index adc10924cfe6..000000000000 --- a/archivers/gcpio/files/patch-src_util.c +++ /dev/null @@ -1,23 +0,0 @@ -https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=df55fb19be545e22d023950263ed5d0756edf81e - ---- src/util.c.orig 2019-11-03 15:07:23 UTC -+++ src/util.c -@@ -1140,8 +1140,16 @@ stat_to_cpio (struct cpio_file_stat *hdr, struct stat - hdr->c_nlink = st->st_nlink; - hdr->c_uid = CPIO_UID (st->st_uid); - hdr->c_gid = CPIO_GID (st->st_gid); -- hdr->c_rdev_maj = major (st->st_rdev); -- hdr->c_rdev_min = minor (st->st_rdev); -+ if (S_ISBLK (st->st_mode) || S_ISCHR (st->st_mode)) -+ { -+ hdr->c_rdev_maj = major (st->st_rdev); -+ hdr->c_rdev_min = minor (st->st_rdev); -+ } -+ else -+ { -+ hdr->c_rdev_maj = 0; -+ hdr->c_rdev_min = 0; -+ } - hdr->c_mtime = st->st_mtime; - hdr->c_filesize = st->st_size; - hdr->c_chksum = 0; diff --git a/archivers/gcpio/pkg-plist b/archivers/gcpio/pkg-plist index 197e3f9dd058..99bec8c584e7 100644 --- a/archivers/gcpio/pkg-plist +++ b/archivers/gcpio/pkg-plist @@ -12,6 +12,7 @@ man/man1/gcpio.1.gz %%NLS%%share/locale/id/LC_MESSAGES/cpio.mo %%NLS%%share/locale/it/LC_MESSAGES/cpio.mo %%NLS%%share/locale/ja/LC_MESSAGES/cpio.mo +%%NLS%%share/locale/ka/LC_MESSAGES/cpio.mo %%NLS%%share/locale/ko/LC_MESSAGES/cpio.mo %%NLS%%share/locale/nl/LC_MESSAGES/cpio.mo %%NLS%%share/locale/pl/LC_MESSAGES/cpio.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305042002.344K2jxF099954>