Date: Thursday, June 18, 2015 @ 03:19:10 Author: seblu Revision: 241006
archrelease: copy trunk to testing-i686, testing-x86_64 Added: file/repos/testing-i686/001-fix-bug-with-long-options.patch (from rev 241005, file/trunk/001-fix-bug-with-long-options.patch) file/repos/testing-i686/PKGBUILD (from rev 241005, file/trunk/PKGBUILD) file/repos/testing-x86_64/001-fix-bug-with-long-options.patch (from rev 241005, file/trunk/001-fix-bug-with-long-options.patch) file/repos/testing-x86_64/PKGBUILD (from rev 241005, file/trunk/PKGBUILD) Deleted: file/repos/testing-i686/PKGBUILD file/repos/testing-x86_64/PKGBUILD ----------------------------------------------------+ /PKGBUILD | 84 ++++++++++++++ testing-i686/001-fix-bug-with-long-options.patch | 109 +++++++++++++++++++ testing-i686/PKGBUILD | 43 ------- testing-x86_64/001-fix-bug-with-long-options.patch | 109 +++++++++++++++++++ testing-x86_64/PKGBUILD | 43 ------- 5 files changed, 302 insertions(+), 86 deletions(-) Copied: file/repos/testing-i686/001-fix-bug-with-long-options.patch (from rev 241005, file/trunk/001-fix-bug-with-long-options.patch) =================================================================== --- testing-i686/001-fix-bug-with-long-options.patch (rev 0) +++ testing-i686/001-fix-bug-with-long-options.patch 2015-06-18 01:19:10 UTC (rev 241006) @@ -0,0 +1,109 @@ +From 21f9d5f0e0340ada998f7f9d316368c7167a4afa Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <chris...@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 Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2015-06-18 01:18:45 UTC (rev 241005) +++ testing-i686/PKGBUILD 2015-06-18 01:19:10 UTC (rev 241006) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer <se...@archlinux.org> -# Contributor: Allan McRae <al...@archlinux.org> -# Contributor: Andreas Radke <andy...@archlinux.org> - -pkgname=file -pkgver=5.23 -pkgrel=1 -pkgdesc='File type identification utility' -arch=('i686' 'x86_64') -license=('custom') -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') - -#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() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --datadir=/usr/share/file - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - rmdir "$pkgdir/usr/share/man/man5" -} - -# vim:set ts=2 sw=2 et: Copied: file/repos/testing-i686/PKGBUILD (from rev 241005, file/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2015-06-18 01:19:10 UTC (rev 241006) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <se...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: Andreas Radke <andy...@archlinux.org> + +pkgname=file +pkgver=5.23 +pkgrel=2 +pkgdesc='File type identification utility' +arch=('i686' 'x86_64') +license=('custom') +groups=('base' 'base-devel') +url='http://www.darwinsys.com/file/' +depends=('glibc' 'zlib') +source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz" + '001-fix-bug-with-long-options.patch') +md5sums=('61db35209ce71a6d576392ce6e1d2f80' + '4138dd409ad6d67ee35a61cf3c71b0fe') + +prepare() { + patch -p1 -d $pkgname-$pkgver < '001-fix-bug-with-long-options.patch' +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --datadir=/usr/share/file + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + rmdir "$pkgdir/usr/share/man/man5" +} + +# vim:set ts=2 sw=2 et: Copied: file/repos/testing-x86_64/001-fix-bug-with-long-options.patch (from rev 241005, file/trunk/001-fix-bug-with-long-options.patch) =================================================================== --- testing-x86_64/001-fix-bug-with-long-options.patch (rev 0) +++ testing-x86_64/001-fix-bug-with-long-options.patch 2015-06-18 01:19:10 UTC (rev 241006) @@ -0,0 +1,109 @@ +From 21f9d5f0e0340ada998f7f9d316368c7167a4afa Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <chris...@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 Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2015-06-18 01:18:45 UTC (rev 241005) +++ testing-x86_64/PKGBUILD 2015-06-18 01:19:10 UTC (rev 241006) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer <se...@archlinux.org> -# Contributor: Allan McRae <al...@archlinux.org> -# Contributor: Andreas Radke <andy...@archlinux.org> - -pkgname=file -pkgver=5.23 -pkgrel=1 -pkgdesc='File type identification utility' -arch=('i686' 'x86_64') -license=('custom') -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') - -#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() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --datadir=/usr/share/file - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - rmdir "$pkgdir/usr/share/man/man5" -} - -# vim:set ts=2 sw=2 et: Copied: file/repos/testing-x86_64/PKGBUILD (from rev 241005, file/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2015-06-18 01:19:10 UTC (rev 241006) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <se...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: Andreas Radke <andy...@archlinux.org> + +pkgname=file +pkgver=5.23 +pkgrel=2 +pkgdesc='File type identification utility' +arch=('i686' 'x86_64') +license=('custom') +groups=('base' 'base-devel') +url='http://www.darwinsys.com/file/' +depends=('glibc' 'zlib') +source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz" + '001-fix-bug-with-long-options.patch') +md5sums=('61db35209ce71a6d576392ce6e1d2f80' + '4138dd409ad6d67ee35a61cf3c71b0fe') + +prepare() { + patch -p1 -d $pkgname-$pkgver < '001-fix-bug-with-long-options.patch' +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --datadir=/usr/share/file + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + rmdir "$pkgdir/usr/share/man/man5" +} + +# vim:set ts=2 sw=2 et: