[arch-commits] Commit in tar/trunk (01-When-extracting-skip-.-members.patch PKGBUILD)

2017-12-17 Thread Sébastien Luttringer via arch-commits
Date: Sunday, December 17, 2017 @ 16:05:29
  Author: seblu
Revision: 313254

upgpkg: tar 1.30-1

Modified:
  tar/trunk/PKGBUILD
Deleted:
  tar/trunk/01-When-extracting-skip-.-members.patch

-+
 01-When-extracting-skip-.-members.patch |   25 -
 PKGBUILD|   12 +---
 2 files changed, 5 insertions(+), 32 deletions(-)

Deleted: 01-When-extracting-skip-.-members.patch
===
--- 01-When-extracting-skip-.-members.patch 2017-12-17 13:56:53 UTC (rev 
313253)
+++ 01-When-extracting-skip-.-members.patch 2017-12-17 16:05:29 UTC (rev 
313254)
@@ -1,25 +0,0 @@
-diff --git a/src/extract.c b/src/extract.c
-index f982433..7904148 100644
 a/src/extract.c
-+++ b/src/extract.c
-@@ -1629,12 +1629,20 @@ extract_archive (void)
- {
-   char typeflag;
-   tar_extractor_t fun;
-+  bool skip_dotdot_name;
- 
-   fatal_exit_hook = extract_finish;
- 
-   set_next_block_after (current_header);
- 
-+  skip_dotdot_name = (!absolute_names_option
-+&& contains_dot_dot (current_stat_info.orig_file_name));
-+  if (skip_dotdot_name)
-+ERROR ((0, 0, _("%s: Member name contains '..'"),
-+  quotearg_colon (current_stat_info.orig_file_name)));
-+
-   if (!current_stat_info.file_name[0]
-+  || skip_dotdot_name
-   || (interactive_option
- && !confirm ("extract", current_stat_info.file_name)))
- {

Modified: PKGBUILD
===
--- PKGBUILD2017-12-17 13:56:53 UTC (rev 313253)
+++ PKGBUILD2017-12-17 16:05:29 UTC (rev 313254)
@@ -4,8 +4,8 @@
 # Contributor: Andreas Radke 
 
 pkgname=tar
-pkgver=1.29
-pkgrel=2
+pkgver=1.30
+pkgrel=1
 pkgdesc='Utility used to store, backup, and transport files'
 arch=('x86_64')
 url='https://www.gnu.org/software/tar/'
@@ -14,11 +14,9 @@
 depends=('glibc' 'acl' 'attr')
 options=('!emptydirs')
 validpgpkeys=('325F650C4C2B6AD58807327A3602B07F55D0C732') # Sergey Poznyakoff
-source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
-'01-When-extracting-skip-.-members.patch')
-md5sums=('a1802fec550baaeecff6c381629653ef'
- 'SKIP'
- '21f9b5b3642b5476bd972189c33d06ca')
+source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+md5sums=('2d01c6cd1387be98f57a0ec4e6e35826'
+ 'SKIP')
 
 prepare() {
   cd $pkgname-$pkgver


[arch-commits] Commit in tar/trunk (01-When-extracting-skip-.-members.patch PKGBUILD)

2016-11-02 Thread Sébastien Luttringer
Date: Wednesday, November 2, 2016 @ 19:50:31
  Author: seblu
Revision: 279775

Work on FS#51563

Added:
  tar/trunk/01-When-extracting-skip-.-members.patch
Modified:
  tar/trunk/PKGBUILD

-+
 01-When-extracting-skip-.-members.patch |   25 +
 PKGBUILD|   23 +++
 2 files changed, 44 insertions(+), 4 deletions(-)

Added: 01-When-extracting-skip-.-members.patch
===
--- 01-When-extracting-skip-.-members.patch (rev 0)
+++ 01-When-extracting-skip-.-members.patch 2016-11-02 19:50:31 UTC (rev 
279775)
@@ -0,0 +1,25 @@
+diff --git a/src/extract.c b/src/extract.c
+index f982433..7904148 100644
+--- a/src/extract.c
 b/src/extract.c
+@@ -1629,12 +1629,20 @@ extract_archive (void)
+ {
+   char typeflag;
+   tar_extractor_t fun;
++  bool skip_dotdot_name;
+ 
+   fatal_exit_hook = extract_finish;
+ 
+   set_next_block_after (current_header);
+ 
++  skip_dotdot_name = (!absolute_names_option
++&& contains_dot_dot (current_stat_info.orig_file_name));
++  if (skip_dotdot_name)
++ERROR ((0, 0, _("%s: Member name contains '..'"),
++  quotearg_colon (current_stat_info.orig_file_name)));
++
+   if (!current_stat_info.file_name[0]
++  || skip_dotdot_name
+   || (interactive_option
+ && !confirm ("extract", current_stat_info.file_name)))
+ {

Modified: PKGBUILD
===
--- PKGBUILD2016-11-02 19:37:47 UTC (rev 279774)
+++ PKGBUILD2016-11-02 19:50:31 UTC (rev 279775)
@@ -5,19 +5,34 @@
 
 pkgname=tar
 pkgver=1.29
-pkgrel=1
+pkgrel=2
 pkgdesc='Utility used to store, backup, and transport files'
 arch=('i686' 'x86_64')
-url='http://www.gnu.org/software/tar/tar.html'
+url='https://www.gnu.org/software/tar/tar.html'
 license=('GPL3')
 groups=('base')
 depends=('glibc' 'acl' 'attr')
 options=('!emptydirs')
 validpgpkeys=('325F650C4C2B6AD58807327A3602B07F55D0C732') # Sergey Poznyakoff
-source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
+'01-When-extracting-skip-.-members.patch')
 md5sums=('a1802fec550baaeecff6c381629653ef'
- 'SKIP')
+ 'SKIP'
+ '21f9b5b3642b5476bd972189c33d06ca')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # apply patch from the source array (should be a pacman feature)
+  local filename
+  for filename in "${source[@]}"; do
+if [[ "$filename" =~ \.patch$ ]]; then
+  msg2 "Applying patch $filename"
+  patch -p1 -N -i "$srcdir/$filename"
+fi
+  done
+  :
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --libexecdir=/usr/lib/tar