Merge pull request #3932 from lazka/tar-1.35

tar: Update to 1.35
msys2 · Sep 20, 2023 · eb74d0f · eb74d0f
2 parents c736206 + d4a1b01
commit eb74d0f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/tar/PKGBUILD b/tar/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=tar
-pkgver=1.34
-pkgrel=3
+pkgver=1.35
+pkgrel=1
 pkgdesc="Utility used to store, backup, and transport files"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/tar/tar.html"
@@ -12,16 +12,22 @@ depends=('libiconv' 'libintl' 'sh')
 makedepends=('libiconv-devel' 'gettext-devel' 'autotools' 'gcc')
 options=('!emptydirs')
 source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
-        tar-1.33-textmount.patch)
-sha256sums=('63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28'
+        tar-1.33-textmount.patch
+        tar-LDADD.patch::https://git.savannah.gnu.org/cgit/tar.git/patch/?id=8632df398b2f548465ebe68b8f494c0d6f8d913d
+        tar-LDADD-tests.patch::https://git.savannah.gnu.org/cgit/tar.git/patch/?id=71530f72d21d9af00b5688948111666f62f5ec4b)
+sha256sums=('4d62ff37342ec7aed748535323930c7cf94acf71c3591882b26a7ea50f3edc16'
             'SKIP'
-            '0f25281eeef9d52184ec2dc6aad718c307710bf185ad2f771a52ea5c6c3b8aae')
+            'eb43f400cdf1317aac2937cce8eb4f47c7da3b41a6d5b10369cf9cbf9f33e244'
+            'c0efaccada3126f95f6137579400ee2244cf22ab9b859b31825cc801ed0b2708'
+            '04212f61aee6216f3b6aa60809420eb8afe1d09bd98ff5babee859819bd45a90')
 validpgpkeys=('325F650C4C2B6AD58807327A3602B07F55D0C732') # Sergey Poznyakoff
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  patch -p1 -i ${srcdir}/tar-1.33-textmount.patch
+  patch -p2 -i ${srcdir}/tar-1.33-textmount.patch
+  patch -p1 -i ${srcdir}/tar-LDADD.patch
+  patch -p1 -i ${srcdir}/tar-LDADD-tests.patch
 
   autoreconf -fi
 }

diff --git a/tar/tar-1.33-textmount.patch b/tar/tar-1.33-textmount.patch
@@ -1,5 +1,5 @@
---- tar-1.33-orig/lib/rmt.h
-+++ tar-1.33/lib/rmt.h
+--- origsrc/tar-1.33/lib/rmt.h
++++ src/tar-1.33/lib/rmt.h
 @@ -62,7 +62,7 @@ extern bool force_local_option;
  #define rmtcreat(dev_name, mode, command) \
     (_remdev (dev_name) \
@@ -9,9 +9,9 @@
 
  #define rmtlstat(dev_name, muffer) \
    (_remdev (dev_name) ? (errno = EOPNOTSUPP), -1 : lstat (dev_name, buffer))
---- tar-1.33-orig/rmt/rmt.c
-+++ tar-1.33/rmt/rmt.c
-@@ -338,7 +338,7 @@ open_device (char *str)
+--- origsrc/tar-1.33/rmt/rmt.c
++++ src/tar-1.33/rmt/rmt.c
+@@ -336,7 +336,7 @@ open_device (char *str)
        if (device_fd >= 0)
  	close (device_fd);
 
@@ -20,17 +20,17 @@
        if (device_fd < 0)
  	rmt_error (errno);
        else
---- tar-1.33-orig/src/buffer.c
-+++ tar-1.33/src/buffer.c
-@@ -766,6 +766,7 @@ _open_archive (enum access_mode wanted_a
+--- origsrc/tar-1.33/src/buffer.c
++++ src/tar-1.33/src/buffer.c
+@@ -770,6 +770,7 @@ _open_archive (enum access_mode wanted_a
              enum compress_type type;
 
              archive = STDIN_FILENO;
 +            freopen (NULL, "rb", stdin);
              type = check_compressed_archive (&shortfile);
              if (type != ct_tar && type != ct_none)
                FATAL_ERROR ((0, 0,
-@@ -778,12 +779,19 @@ _open_archive (enum access_mode wanted_a
+@@ -782,12 +783,19 @@ _open_archive (enum access_mode wanted_a
 
          case ACCESS_WRITE:
            archive = STDOUT_FILENO;
@@ -50,7 +50,7 @@
            write_archive_to_stdout = true;
            record_end = record_start; /* set up for 1st record = # 0 */
            if (!index_file_name)
-@@ -1182,7 +1190,7 @@ init_volume_number (void)
+@@ -1162,7 +1170,7 @@ init_volume_number (void)
  void
  closeout_volume_number (void)
  {
@@ -59,8 +59,8 @@
 
    if (file)
      {
---- tar-1.33-orig/src/incremen.c
-+++ tar-1.33/src/incremen.c
+--- origsrc/tar-1.33/src/incremen.c
++++ src/tar-1.33/src/incremen.c
 @@ -1333,7 +1333,7 @@ read_directory_file (void)
    int fd;
    char *buf = NULL;
@@ -79,9 +79,9 @@
    if (! listed_incremental_stream)
      {
        open_error (listed_incremental_option);
---- tar-1.33-orig/src/system.c
-+++ tar-1.33/src/system.c
-@@ -366,7 +366,8 @@ sys_child_open_for_compress (void)
+--- origsrc/tar-1.33/src/system.c
++++ src/tar-1.33/src/system.c
+@@ -386,7 +386,8 @@ sys_child_open_for_compress (void)
  	 compressor.  */
        if (strcmp (archive_name_array[0], "-"))
  	{
@@ -91,7 +91,7 @@
  	  if (archive < 0)
  	    {
  	      int saved_errno = errno;
-@@ -407,7 +408,11 @@ sys_child_open_for_compress (void)
+@@ -427,7 +428,11 @@ sys_child_open_for_compress (void)
    xclose (child_pipe[PWRITE]);
 
    if (strcmp (archive_name_array[0], "-") == 0)