[arch-commits] Commit in tar/repos (8 files)
Sébastien Luttringer
seblu at archlinux.org
Thu Nov 3 13:11:12 UTC 2016
Date: Thursday, November 3, 2016 @ 13:11:12
Author: seblu
Revision: 279790
db-move: moved tar from [testing] to [core] (i686, x86_64)
Added:
tar/repos/core-i686/01-When-extracting-skip-.-members.patch
(from rev 279789, tar/repos/testing-i686/01-When-extracting-skip-.-members.patch)
tar/repos/core-i686/PKGBUILD
(from rev 279789, tar/repos/testing-i686/PKGBUILD)
tar/repos/core-x86_64/01-When-extracting-skip-.-members.patch
(from rev 279789, tar/repos/testing-x86_64/01-When-extracting-skip-.-members.patch)
tar/repos/core-x86_64/PKGBUILD
(from rev 279789, tar/repos/testing-x86_64/PKGBUILD)
Deleted:
tar/repos/core-i686/PKGBUILD
tar/repos/core-x86_64/PKGBUILD
tar/repos/testing-i686/
tar/repos/testing-x86_64/
-----------------------------------------------------+
/PKGBUILD | 104 ++++++++++++++++++
core-i686/01-When-extracting-skip-.-members.patch | 25 ++++
core-i686/PKGBUILD | 37 ------
core-x86_64/01-When-extracting-skip-.-members.patch | 25 ++++
core-x86_64/PKGBUILD | 37 ------
5 files changed, 154 insertions(+), 74 deletions(-)
Copied: tar/repos/core-i686/01-When-extracting-skip-.-members.patch (from rev 279789, tar/repos/testing-i686/01-When-extracting-skip-.-members.patch)
===================================================================
--- core-i686/01-When-extracting-skip-.-members.patch (rev 0)
+++ core-i686/01-When-extracting-skip-.-members.patch 2016-11-03 13:11:12 UTC (rev 279790)
@@ -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)))
+ {
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2016-11-03 13:10:51 UTC (rev 279789)
+++ core-i686/PKGBUILD 2016-11-03 13:11:12 UTC (rev 279790)
@@ -1,37 +0,0 @@
-# $Id$
-# Mainainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=tar
-pkgver=1.29
-pkgrel=1
-pkgdesc='Utility used to store, backup, and transport files'
-arch=('i686' 'x86_64')
-url='http://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})
-md5sums=('a1802fec550baaeecff6c381629653ef'
- 'SKIP')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --libexecdir=/usr/lib/tar
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: tar/repos/core-i686/PKGBUILD (from rev 279789, tar/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2016-11-03 13:11:12 UTC (rev 279790)
@@ -0,0 +1,52 @@
+# $Id$
+# Mainainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=tar
+pkgver=1.29
+pkgrel=2
+pkgdesc='Utility used to store, backup, and transport files'
+arch=('i686' 'x86_64')
+url='https://www.gnu.org/software/tar/tar.html'
+license=('GPL3')
+groups=('base')
+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')
+
+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
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: tar/repos/core-x86_64/01-When-extracting-skip-.-members.patch (from rev 279789, tar/repos/testing-x86_64/01-When-extracting-skip-.-members.patch)
===================================================================
--- core-x86_64/01-When-extracting-skip-.-members.patch (rev 0)
+++ core-x86_64/01-When-extracting-skip-.-members.patch 2016-11-03 13:11:12 UTC (rev 279790)
@@ -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)))
+ {
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2016-11-03 13:10:51 UTC (rev 279789)
+++ core-x86_64/PKGBUILD 2016-11-03 13:11:12 UTC (rev 279790)
@@ -1,37 +0,0 @@
-# $Id$
-# Mainainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=tar
-pkgver=1.29
-pkgrel=1
-pkgdesc='Utility used to store, backup, and transport files'
-arch=('i686' 'x86_64')
-url='http://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})
-md5sums=('a1802fec550baaeecff6c381629653ef'
- 'SKIP')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --libexecdir=/usr/lib/tar
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: tar/repos/core-x86_64/PKGBUILD (from rev 279789, tar/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2016-11-03 13:11:12 UTC (rev 279790)
@@ -0,0 +1,52 @@
+# $Id$
+# Mainainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=tar
+pkgver=1.29
+pkgrel=2
+pkgdesc='Utility used to store, backup, and transport files'
+arch=('i686' 'x86_64')
+url='https://www.gnu.org/software/tar/tar.html'
+license=('GPL3')
+groups=('base')
+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')
+
+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
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list