[arch-commits] Commit in file/trunk (2 files)
Date: Friday, January 24, 2020 @ 16:14:54
Author: seblu
Revision: 373878
upgpkg: file 5.38-3
Fix FS#65256
Added:
file/trunk/0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch
Modified:
file/trunk/PKGBUILD
-+
0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch | 30
++
PKGBUILD|8 +-
2 files changed, 35 insertions(+), 3 deletions(-)
Added: 0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch
===
--- 0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch
(rev 0)
+++ 0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch
2020-01-24 16:14:54 UTC (rev 373878)
@@ -0,0 +1,30 @@
+From 84221b0370a8b49e0fa2dbd88c89fb6e87ec95bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?=
+Date: Fri, 24 Jan 2020 17:07:11 +0100
+Subject: [PATCH] Revert "Don't depend on the execute bit to determine pie
+ executable or shared object."
+
+This reverts commit d653309de04ed10fdeda79f2c6ca7a7e96e122f1.
+---
+ magic/Magdir/elf | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/magic/Magdir/elf b/magic/Magdir/elf
+index b5a2e00b..a35b615d 100644
+--- a/magic/Magdir/elf
b/magic/Magdir/elf
+@@ -50,8 +50,9 @@
+ !:mimeapplication/x-object
+ >16 leshort 2 executable,
+ !:mimeapplication/x-executable
+->16 leshort 3 shared object,
+-!:mimeapplication/x-sharedlib
++>16 leshort 3 ${x?pie executable:shared object},
++
++!:mimeapplication/x-${x?pie-executable:sharedlib}
+ >16 leshort 4 core file,
+ !:mimeapplication/x-coredump
+ # OS-specific
+--
+2.25.0
+
Modified: PKGBUILD
===
--- PKGBUILD2020-01-24 10:03:45 UTC (rev 373877)
+++ PKGBUILD2020-01-24 16:14:54 UTC (rev 373878)
@@ -4,7 +4,7 @@
pkgname=file
pkgver=5.38
-pkgrel=2
+pkgrel=3
pkgdesc='File type identification utility'
arch=('x86_64')
license=('custom')
@@ -13,11 +13,13 @@
depends=('glibc' 'zlib' 'xz' 'bzip2' 'libseccomp' 'libseccomp.so')
provides=('libmagic.so')
source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc}
-file-5.38-seccomp-tcgets.patch)
+file-5.38-seccomp-tcgets.patch
+0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch)
validpgpkeys=('BE04995BA8F90ED0C0C176C471112AB16CB33B3A') # Christos Zoulas
sha256sums=('593c2ffc2ab349c5aea0f55fedfe4d681737b6b62376a9b3ad1e77b2cc19fa34'
'SKIP'
-'da6197e89ca53bd4f0d9009fa3a18c6fdb66dc07eb92e6bd77207eadb4548cfe')
+'da6197e89ca53bd4f0d9009fa3a18c6fdb66dc07eb92e6bd77207eadb4548cfe'
+'5636b444d147d6598c3defd0ce0a9b28056f2f64b09ef7f032337ed0308b8490')
prepare() {
cd $pkgname-$pkgver
[arch-commits] Commit in file/trunk (2 files)
Date: Thursday, November 28, 2019 @ 01:27:31
Author: seblu
Revision: 369857
upgpkg: file 5.37-5
- fix FS#64622
Added:
file/trunk/d3132f65594e8ad27b74643786a786cd3e60c715.patch
Modified:
file/trunk/PKGBUILD
+
PKGBUILD | 24 +++-
d3132f65594e8ad27b74643786a786cd3e60c715.patch | 27 +++
2 files changed, 40 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-11-27 23:17:22 UTC (rev 369856)
+++ PKGBUILD2019-11-28 01:27:31 UTC (rev 369857)
@@ -4,7 +4,7 @@
pkgname=file
pkgver=5.37
-pkgrel=4
+pkgrel=5
pkgdesc='File type identification utility'
arch=('x86_64')
license=('custom')
@@ -11,22 +11,24 @@
groups=('base-devel')
url='https://www.darwinsys.com/file/'
depends=('glibc' 'zlib')
-source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc})
+source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc}
+ d3132f65594e8ad27b74643786a786cd3e60c715.patch)
validpgpkeys=('BE04995BA8F90ED0C0C176C471112AB16CB33B3A') # Christos Zoulas
-md5sums=('80c29aca745466c6c24d11f059329075'
- 'SKIP')
+sha256sums=('e9c13967f7dd339a3c241b7710ba093560b9a33013491318e88e6b8b57bae07f'
+'SKIP'
+'2ef553d3d4c68fe3e3850bc6151e66ce5714d774536deb9b8401425e73214ea7')
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
+ local src
+ for src in "${source[@]}"; do
+src="${src%%::*}"
+src="${src##*/}"
+[[ $src = *.patch ]] || continue
+msg2 "Applying patch $src..."
+patch -Np1 < "../$src"
done
- :
}
build() {
Added: d3132f65594e8ad27b74643786a786cd3e60c715.patch
===
--- d3132f65594e8ad27b74643786a786cd3e60c715.patch
(rev 0)
+++ d3132f65594e8ad27b74643786a786cd3e60c715.patch 2019-11-28 01:27:31 UTC
(rev 369857)
@@ -0,0 +1,27 @@
+From d3132f65594e8ad27b74643786a786cd3e60c715 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas
+Date: Tue, 8 Oct 2019 20:25:13 +
+Subject: [PATCH] PR/112: connesc: move mime magic higher so that it always
+ takes effect.
+
+---
+ magic/Magdir/compress | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/magic/Magdir/compress b/magic/Magdir/compress
+index 600d216b7..c700b5a45 100644
+--- a/magic/Magdir/compress
b/magic/Magdir/compress
+@@ -58,11 +58,11 @@
+ >>>13 string 09 \b, version 9
+ # other gzipped binary like gzipped tar, VirtualBox extension package,...
+ >>10 default x gzip compressed data
++!:mimeapplication/gzip
+ >>>0 use gzip-info
+ # size of the original (uncompressed) input data modulo 2^32
+ >>>-4 ulelong x \b, original size modulo 2^32 %u
+ # gzipped TAR or VirtualBox extension package
+-!:mimeapplication/gzip
+ #!:mime application/x-compressed-tar
+ #!:mime application/x-virtualbox-vbox-extpack
+ # https://www.w3.org/TR/SVG/mimereg.html
[arch-commits] Commit in file/trunk (2 files)
Date: Saturday, December 13, 2014 @ 01:01:35
Author: seblu
Revision: 227575
upgpkg: file 5.21-3
- fix FS#43082
Added:
file/trunk/02-ignore-exit-code-from-uncompress.patch
Modified:
file/trunk/PKGBUILD
---+
02-ignore-exit-code-from-uncompress.patch | 34
PKGBUILD | 10 +---
2 files changed, 41 insertions(+), 3 deletions(-)
Added: 02-ignore-exit-code-from-uncompress.patch
===
--- 02-ignore-exit-code-from-uncompress.patch (rev 0)
+++ 02-ignore-exit-code-from-uncompress.patch 2014-12-13 00:01:35 UTC (rev
227575)
@@ -0,0 +1,34 @@
+From 05463f7b3d4588a656089e20ab53a5b81b875341 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas chris...@zoulas.com
+Date: Fri, 12 Dec 2014 16:33:01 +
+Subject: [PATCH] PR/405: Ignore exit code from uncompress programs because
+ some (validly) exit with non-zero code when they get SIGPIPE.
+
+---
+ src/compress.c | 13 +
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/src/compress.c b/src/compress.c
+index bf93839..30be569 100644
+--- a/src/compress.c
b/src/compress.c
+@@ -512,11 +512,16 @@ uncompressbuf(struct magic_set *ms, int fd, size_t
method,
+ strerror(errno));
+ #endif
+ n = NODATA;
+- } else if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
++ } else if (!WIFEXITED(status)) {
+ #ifdef DEBUG
+- (void)fprintf(stderr, Child status (0x%x)\n, status);
++ (void)fprintf(stderr, Child not exited (0x%x)\n,
++ status);
++#endif
++ } else if (WEXITSTATUS(status) != 0) {
++#ifdef DEBUG
++ (void)fprintf(stderr, Child exited (0x%d)\n,
++ WEXITSTATUS(status));
+ #endif
+- n = NODATA;
+ }
+
+ (void) close(fdin[0]);
Modified: PKGBUILD
===
--- PKGBUILD2014-12-12 23:47:17 UTC (rev 227574)
+++ PKGBUILD2014-12-13 00:01:35 UTC (rev 227575)
@@ -5,7 +5,7 @@
pkgname=file
pkgver=5.21
-pkgrel=2
+pkgrel=3
pkgdesc='File type identification utility'
arch=('i686' 'x86_64')
license=('custom')
@@ -13,13 +13,17 @@
url='http://www.darwinsys.com/file/'
depends=('glibc' 'zlib')
source=(ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz;
-'01-fix-broken-xz.patch')
+'01-fix-broken-xz.patch'
+'02-ignore-exit-code-from-uncompress.patch')
md5sums=('549fe96e09041eabece9de2bb28ef923'
- '62c8d81023e1705d8826d79d0a8fdaae')
+ '62c8d81023e1705d8826d79d0a8fdaae'
+ '39e9867b888bf6e2c1664d3c44712f3b')
prepare() {
# https://bugs.archlinux.org/task/43078
patch -p1 -d $pkgname-$pkgver '01-fix-broken-xz.patch'
+ # https://bugs.archlinux.org/task/43082
+ patch -p1 -d $pkgname-$pkgver '02-ignore-exit-code-from-uncompress.patch'
}
build() {
