[arch-commits] Commit in file/trunk (001-fix-bug-with-long-options.patch PKGBUILD)
Sébastien Luttringer
seblu at archlinux.org
Thu Jun 18 01:18:45 UTC 2015
Date: Thursday, June 18, 2015 @ 03:18:45
Author: seblu
Revision: 241005
upgpkg: file 5.23-2
- fix invalid option parsing in 5.23 release
Added:
file/trunk/001-fix-bug-with-long-options.patch
Modified:
file/trunk/PKGBUILD
-------------------------------------+
001-fix-bug-with-long-options.patch | 109 ++++++++++++++++++++++++++++++++++
PKGBUILD | 17 ++---
2 files changed, 117 insertions(+), 9 deletions(-)
Added: 001-fix-bug-with-long-options.patch
===================================================================
--- 001-fix-bug-with-long-options.patch (rev 0)
+++ 001-fix-bug-with-long-options.patch 2015-06-18 01:18:45 UTC (rev 241005)
@@ -0,0 +1,109 @@
+From 21f9d5f0e0340ada998f7f9d316368c7167a4afa Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos at zoulas.com>
+Date: Thu, 11 Jun 2015 12:52:32 +0000
+Subject: [PATCH] Fix bug with long options and explicitly number them to avoid
+ this in the future.
+
+---
+ src/file.c | 45 +++++++++++++++++++++++----------------------
+ src/file_opts.h | 10 +++++-----
+ 2 files changed, 28 insertions(+), 27 deletions(-)
+
+diff --git a/src/file.c b/src/file.c
+index f60dde0..c700f66 100644
+--- a/src/file.c
++++ b/src/file.c
+@@ -89,10 +89,15 @@ private int /* Global command-line options */
+
+ private const char *separator = ":"; /* Default field separator */
+ private const struct option long_options[] = {
++#define OPT_HELP 1
++#define OPT_APPLE 2
++#define OPT_EXTENSIONS 3
++#define OPT_MIME_TYPE 4
++#define OPT_MIME_ENCODING 5
+ #define OPT(shortname, longname, opt, doc) \
+ {longname, opt, NULL, shortname},
+-#define OPT_LONGONLY(longname, opt, doc) \
+- {longname, opt, NULL, 0},
++#define OPT_LONGONLY(longname, opt, doc, id) \
++ {longname, opt, NULL, id},
+ #include "file_opts.h"
+ #undef OPT
+ #undef OPT_LONGONLY
+@@ -182,24 +187,20 @@ main(int argc, char *argv[])
+ while ((c = getopt_long(argc, argv, OPTSTRING, long_options,
+ &longindex)) != -1)
+ switch (c) {
+- case 0 :
+- switch (longindex) {
+- case 0:
+- help();
+- break;
+- case 10:
+- flags |= MAGIC_APPLE;
+- break;
+- case 11:
+- flags |= MAGIC_EXTENSION;
+- break;
+- case 12:
+- flags |= MAGIC_MIME_TYPE;
+- break;
+- case 13:
+- flags |= MAGIC_MIME_ENCODING;
+- break;
+- }
++ case OPT_HELP:
++ help();
++ break;
++ case OPT_APPLE:
++ flags |= MAGIC_APPLE;
++ break;
++ case OPT_EXTENSIONS:
++ flags |= MAGIC_EXTENSION;
++ break;
++ case OPT_MIME_TYPE:
++ flags |= MAGIC_MIME_TYPE;
++ break;
++ case OPT_MIME_ENCODING:
++ flags |= MAGIC_MIME_ENCODING;
+ break;
+ case '0':
+ nulsep = 1;
+@@ -595,7 +596,7 @@ help(void)
+ #define OPT(shortname, longname, opt, doc) \
+ fprintf(stdout, " -%c, --" longname, shortname), \
+ docprint(doc);
+-#define OPT_LONGONLY(longname, opt, doc) \
++#define OPT_LONGONLY(longname, opt, doc, id) \
+ fprintf(stdout, " --" longname), \
+ docprint(doc);
+ #include "file_opts.h"
+diff --git a/src/file_opts.h b/src/file_opts.h
+index 036505f..2e30d06 100644
+--- a/src/file_opts.h
++++ b/src/file_opts.h
+@@ -12,7 +12,7 @@
+ * switch statement!
+ */
+
+-OPT_LONGONLY("help", 0, " display this help and exit\n")
++OPT_LONGONLY("help", 0, " display this help and exit\n", OPT_HELP)
+ OPT('v', "version", 0, " output version information and exit\n")
+ OPT('m', "magic-file", 1, " LIST use LIST as a colon-separated list of magic\n"
+ " number files\n")
+@@ -29,10 +29,10 @@ OPT('f', "files-from", 1, " FILE read the filenames to be examined from FIL
+ OPT('F', "separator", 1, " STRING use string as separator instead of `:'\n")
+ OPT('i', "mime", 0, " output MIME type strings (--mime-type and\n"
+ " --mime-encoding)\n")
+-OPT_LONGONLY("apple", 0, " output the Apple CREATOR/TYPE\n")
+-OPT_LONGONLY("extension", 0, " output a slash-separated list of extnsions\n")
+-OPT_LONGONLY("mime-type", 0, " output the MIME type\n")
+-OPT_LONGONLY("mime-encoding", 0, " output the MIME encoding\n")
++OPT_LONGONLY("apple", 0, " output the Apple CREATOR/TYPE\n", OPT_APPLE)
++OPT_LONGONLY("extension", 0, " output a slash-separated list of extensions\n", OPT_EXTENSIONS)
++OPT_LONGONLY("mime-type", 0, " output the MIME type\n", OPT_MIME_TYPE)
++OPT_LONGONLY("mime-encoding", 0, " output the MIME encoding\n", OPT_MIME_ENCODING)
+ OPT('k', "keep-going", 0, " don't stop at the first match\n")
+ OPT('l', "list", 0, " list magic strength\n")
+ #ifdef S_IFLNK
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-06-17 23:02:58 UTC (rev 241004)
+++ PKGBUILD 2015-06-18 01:18:45 UTC (rev 241005)
@@ -5,7 +5,7 @@
pkgname=file
pkgver=5.23
-pkgrel=1
+pkgrel=2
pkgdesc='File type identification utility'
arch=('i686' 'x86_64')
license=('custom')
@@ -12,15 +12,14 @@
groups=('base' 'base-devel')
url='http://www.darwinsys.com/file/'
depends=('glibc' 'zlib')
-source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('61db35209ce71a6d576392ce6e1d2f80')
+source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"
+ '001-fix-bug-with-long-options.patch')
+md5sums=('61db35209ce71a6d576392ce6e1d2f80'
+ '4138dd409ad6d67ee35a61cf3c71b0fe')
-#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'
-#}
+prepare() {
+ patch -p1 -d $pkgname-$pkgver < '001-fix-bug-with-long-options.patch'
+}
build() {
cd $pkgname-$pkgver
More information about the arch-commits
mailing list