[arch-commits] Commit in file/repos (8 files)
Date: Thursday, July 16, 2015 @ 01:35:43
Author: seblu
Revision: 242262
db-move: moved file from [testing] to [core] (i686, x86_64)
Added:
file/repos/core-i686/PKGBUILD
(from rev 242261, file/repos/testing-i686/PKGBUILD)
file/repos/core-x86_64/PKGBUILD
(from rev 242261, file/repos/testing-x86_64/PKGBUILD)
Deleted:
file/repos/core-i686/001-fix-bug-with-long-options.patch
file/repos/core-i686/PKGBUILD
file/repos/core-x86_64/001-fix-bug-with-long-options.patch
file/repos/core-x86_64/PKGBUILD
file/repos/testing-i686/
file/repos/testing-x86_64/
-+
/PKGBUILD | 80
core-i686/001-fix-bug-with-long-options.patch | 109 --
core-i686/PKGBUILD | 42
core-x86_64/001-fix-bug-with-long-options.patch | 109 --
core-x86_64/PKGBUILD| 42
5 files changed, 80 insertions(+), 302 deletions(-)
Deleted: core-i686/001-fix-bug-with-long-options.patch
===
--- core-i686/001-fix-bug-with-long-options.patch 2015-07-15 22:31:11 UTC
(rev 242261)
+++ core-i686/001-fix-bug-with-long-options.patch 2015-07-15 23:35:43 UTC
(rev 242262)
@@ -1,109 +0,0 @@
-From 21f9d5f0e0340ada998f7f9d316368c7167a4afa Mon Sep 17 00:00:00 2001
-From: Christos Zoulas chris...@zoulas.com
-Date: Thu, 11 Jun 2015 12:52:32 +
-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_EXTENSIONS3
-+#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
[arch-commits] Commit in file/repos (8 files)
Date: Monday, June 22, 2015 @ 22:07:16
Author: seblu
Revision: 241183
db-move: moved file from [testing] to [core] (i686, x86_64)
Added:
file/repos/core-i686/001-fix-bug-with-long-options.patch
(from rev 241182,
file/repos/testing-i686/001-fix-bug-with-long-options.patch)
file/repos/core-i686/PKGBUILD
(from rev 241182, file/repos/testing-i686/PKGBUILD)
file/repos/core-x86_64/001-fix-bug-with-long-options.patch
(from rev 241182,
file/repos/testing-x86_64/001-fix-bug-with-long-options.patch)
file/repos/core-x86_64/PKGBUILD
(from rev 241182, file/repos/testing-x86_64/PKGBUILD)
Deleted:
file/repos/core-i686/PKGBUILD
file/repos/core-x86_64/PKGBUILD
file/repos/testing-i686/
file/repos/testing-x86_64/
-+
/PKGBUILD | 84
core-i686/001-fix-bug-with-long-options.patch | 109 ++
core-i686/PKGBUILD | 43
core-x86_64/001-fix-bug-with-long-options.patch | 109 ++
core-x86_64/PKGBUILD| 43
5 files changed, 302 insertions(+), 86 deletions(-)
Copied: file/repos/core-i686/001-fix-bug-with-long-options.patch (from rev
241182, file/repos/testing-i686/001-fix-bug-with-long-options.patch)
===
--- core-i686/001-fix-bug-with-long-options.patch
(rev 0)
+++ core-i686/001-fix-bug-with-long-options.patch 2015-06-22 20:07:16 UTC
(rev 241183)
@@ -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 +
+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_EXTENSIONS3
++#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
[arch-commits] Commit in file/repos (8 files)
Date: Saturday, December 13, 2014 @ 01:03:27
Author: seblu
Revision: 227577
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
file/repos/testing-i686/01-fix-broken-xz.patch
(from rev 227576, file/trunk/01-fix-broken-xz.patch)
file/repos/testing-i686/02-ignore-exit-code-from-uncompress.patch
(from rev 227576, file/trunk/02-ignore-exit-code-from-uncompress.patch)
file/repos/testing-i686/PKGBUILD
(from rev 227576, file/trunk/PKGBUILD)
file/repos/testing-x86_64/01-fix-broken-xz.patch
(from rev 227576, file/trunk/01-fix-broken-xz.patch)
file/repos/testing-x86_64/02-ignore-exit-code-from-uncompress.patch
(from rev 227576, file/trunk/02-ignore-exit-code-from-uncompress.patch)
file/repos/testing-x86_64/PKGBUILD
(from rev 227576, file/trunk/PKGBUILD)
Deleted:
file/repos/testing-i686/01-fix-broken-xz.patch
file/repos/testing-x86_64/01-fix-broken-xz.patch
--+
/01-fix-broken-xz.patch | 88 +
testing-i686/01-fix-broken-xz.patch | 44 --
testing-i686/02-ignore-exit-code-from-uncompress.patch | 34 +
testing-i686/PKGBUILD| 42 ++
testing-x86_64/01-fix-broken-xz.patch| 44 --
testing-x86_64/02-ignore-exit-code-from-uncompress.patch | 34 +
testing-x86_64/PKGBUILD | 42 ++
7 files changed, 240 insertions(+), 88 deletions(-)
Deleted: testing-i686/01-fix-broken-xz.patch
===
--- testing-i686/01-fix-broken-xz.patch 2014-12-13 00:01:51 UTC (rev 227576)
+++ testing-i686/01-fix-broken-xz.patch 2014-12-13 00:03:27 UTC (rev 227577)
@@ -1,44 +0,0 @@
-From abc95cd644418cc5205a8ad07d864f0851ac49df Mon Sep 17 00:00:00 2001
-From: Christos Zoulas chris...@zoulas.com
-Date: Thu, 11 Dec 2014 11:47:08 +
-Subject: [PATCH] PR/405: file -bizL git-2.1.3.tar.xz broke because the xz
- decompressor dies with SIGPIPE when we stop reading from it early. ignore
- SIGPIPE
-
- src/compress.c | 6 +-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/compress.c b/src/compress.c
-index fa9e07a..bf93839 100644
a/src/compress.c
-+++ b/src/compress.c
-@@ -45,6 +45,7 @@ FILE_RCSID(@(#)$File: compress.c,v 1.74 2014/10/26 20:23:30
christos Exp $)
- #endif
- #include string.h
- #include errno.h
-+#include signal.h
- #if !defined(__MINGW32__) !defined(WIN32)
- #include sys/ioctl.h
- #endif
-@@ -103,10 +104,12 @@ file_zmagic(struct magic_set *ms, int fd, const char
*name,
- size_t i, nsz;
- int rv = 0;
- int mime = ms-flags MAGIC_MIME;
-+ sig_t osigpipe;
-
- if ((ms-flags MAGIC_COMPRESS) == 0)
- return 0;
-
-+ osigpipe = signal(SIGPIPE, SIG_IGN);
- for (i = 0; i ncompr; i++) {
- if (nbytes compr[i].maglen)
- continue;
-@@ -133,6 +136,7 @@ file_zmagic(struct magic_set *ms, int fd, const char *name,
- }
- }
- error:
-+ (void)signal(SIGPIPE, osigpipe);
- free(newbuf);
- ms-flags |= MAGIC_COMPRESS;
- return rv;
Copied: file/repos/testing-i686/01-fix-broken-xz.patch (from rev 227576,
file/trunk/01-fix-broken-xz.patch)
===
--- testing-i686/01-fix-broken-xz.patch (rev 0)
+++ testing-i686/01-fix-broken-xz.patch 2014-12-13 00:03:27 UTC (rev 227577)
@@ -0,0 +1,44 @@
+From abc95cd644418cc5205a8ad07d864f0851ac49df Mon Sep 17 00:00:00 2001
+From: Christos Zoulas chris...@zoulas.com
+Date: Thu, 11 Dec 2014 11:47:08 +
+Subject: [PATCH] PR/405: file -bizL git-2.1.3.tar.xz broke because the xz
+ decompressor dies with SIGPIPE when we stop reading from it early. ignore
+ SIGPIPE
+
+---
+ src/compress.c | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/compress.c b/src/compress.c
+index fa9e07a..bf93839 100644
+--- a/src/compress.c
b/src/compress.c
+@@ -45,6 +45,7 @@ FILE_RCSID(@(#)$File: compress.c,v 1.74 2014/10/26 20:23:30
christos Exp $)
+ #endif
+ #include string.h
+ #include errno.h
++#include signal.h
+ #if !defined(__MINGW32__) !defined(WIN32)
+ #include sys/ioctl.h
+ #endif
+@@ -103,10 +104,12 @@ file_zmagic(struct magic_set *ms, int fd, const char
*name,
+ size_t i, nsz;
+ int rv = 0;
+ int mime = ms-flags MAGIC_MIME;
++ sig_t osigpipe;
+
+ if ((ms-flags MAGIC_COMPRESS) == 0)
+ return 0;
+
++ osigpipe = signal(SIGPIPE, SIG_IGN);
+ for (i = 0; i ncompr; i++) {
+ if (nbytes compr[i].maglen)
+ continue;
+@@ -133,6 +136,7 @@ file_zmagic(struct magic_set *ms, int fd, const char *name,
+ }
+ }
+ error:
++ (void)signal(SIGPIPE, osigpipe);
+ free(newbuf);
+ ms-flags |=
[arch-commits] Commit in file/repos (8 files)
Date: Wednesday, November 12, 2014 @ 20:58:19
Author: seblu
Revision: 226143
db-move: moved file from [testing] to [core] (i686, x86_64)
Added:
file/repos/core-i686/01-cve-2014-3710.patch
(from rev 226142, file/repos/testing-i686/01-cve-2014-3710.patch)
file/repos/core-i686/PKGBUILD
(from rev 226142, file/repos/testing-i686/PKGBUILD)
file/repos/core-x86_64/01-cve-2014-3710.patch
(from rev 226142, file/repos/testing-x86_64/01-cve-2014-3710.patch)
file/repos/core-x86_64/PKGBUILD
(from rev 226142, file/repos/testing-x86_64/PKGBUILD)
Deleted:
file/repos/core-i686/PKGBUILD
file/repos/core-x86_64/PKGBUILD
file/repos/testing-i686/
file/repos/testing-x86_64/
+
/PKGBUILD | 76 +++
core-i686/01-cve-2014-3710.patch | 18
core-i686/PKGBUILD | 29 -
core-x86_64/01-cve-2014-3710.patch | 18
core-x86_64/PKGBUILD | 29 -
5 files changed, 112 insertions(+), 58 deletions(-)
Copied: file/repos/core-i686/01-cve-2014-3710.patch (from rev 226142,
file/repos/testing-i686/01-cve-2014-3710.patch)
===
--- core-i686/01-cve-2014-3710.patch(rev 0)
+++ core-i686/01-cve-2014-3710.patch2014-11-12 19:58:19 UTC (rev 226143)
@@ -0,0 +1,18 @@
+diff --git a/src/readelf.c b/src/readelf.c
+index 08f81f5..9ebdebd 100644
+--- a/src/readelf.c
b/src/readelf.c
+@@ -477,6 +477,13 @@ donote(struct magic_set *ms, void *vbuf, size_t offset,
size_t size,
+ uint32_t namesz, descsz;
+ unsigned char *nbuf = CAST(unsigned char *, vbuf);
+
++ if (xnh_sizeof + offset size) {
++ /*
++ * We're out of note headers.
++ */
++ return xnh_sizeof + offset;
++ }
++
+ (void)memcpy(xnh_addr, nbuf[offset], xnh_sizeof);
+ offset += xnh_sizeof;
+
Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD 2014-11-12 19:56:24 UTC (rev 226142)
+++ core-i686/PKGBUILD 2014-11-12 19:58:19 UTC (rev 226143)
@@ -1,29 +0,0 @@
-# $Id$
-# Mainainer: Sébastien Luttringer se...@archlinux.org
-# Contributor: Allan McRae al...@archlinux.org
-# Contributor: Andreas Radke andy...@archlinux.org
-
-pkgname=file
-pkgver=5.20
-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=('5d5e13eb3e0e13839da869a31790faf2')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --datadir=/usr/share/file
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR=$pkgdir install
- install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
- rmdir $pkgdir/usr/share/man/man5
-}
Copied: file/repos/core-i686/PKGBUILD (from rev 226142,
file/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2014-11-12 19:58:19 UTC (rev 226143)
@@ -0,0 +1,38 @@
+# $Id$
+# Mainainer: Sébastien Luttringer se...@archlinux.org
+# Contributor: Allan McRae al...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+
+pkgname=file
+pkgver=5.20
+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;
+ '01-cve-2014-3710.patch')
+md5sums=('5d5e13eb3e0e13839da869a31790faf2'
+ 'dde0002f513f44c4ef6c2152f0ece4ed')
+
+prepare() {
+ # https://bugs.archlinux.org/task/42759
+ patch -p1 -d $pkgname-$pkgver '01-cve-2014-3710.patch'
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --datadir=/usr/share/file
+ make
+}
+
+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/core-x86_64/01-cve-2014-3710.patch (from rev 226142,
file/repos/testing-x86_64/01-cve-2014-3710.patch)
===
--- core-x86_64/01-cve-2014-3710.patch (rev 0)
+++ core-x86_64/01-cve-2014-3710.patch 2014-11-12 19:58:19 UTC (rev 226143)
@@ -0,0 +1,18 @@
+diff --git a/src/readelf.c b/src/readelf.c
+index 08f81f5..9ebdebd 100644
+--- a/src/readelf.c
b/src/readelf.c
+@@ -477,6 +477,13 @@ donote(struct magic_set *ms, void *vbuf, size_t offset,
size_t size,
+ uint32_t namesz, descsz;
+ unsigned char *nbuf = CAST(unsigned char *,
[arch-commits] Commit in file/repos (8 files)
Date: Saturday, April 12, 2014 @ 01:33:00
Author: seblu
Revision: 210213
db-move: moved file from [testing] to [core] (i686, x86_64)
Added:
file/repos/core-i686/PKGBUILD
(from rev 210212, file/repos/testing-i686/PKGBUILD)
file/repos/core-x86_64/PKGBUILD
(from rev 210212, file/repos/testing-x86_64/PKGBUILD)
Deleted:
file/repos/core-i686/PKGBUILD
file/repos/core-i686/file-5.17-off-by-one.patch
file/repos/core-x86_64/PKGBUILD
file/repos/core-x86_64/file-5.17-off-by-one.patch
file/repos/testing-i686/
file/repos/testing-x86_64/
+
/PKGBUILD | 58 +++
core-i686/PKGBUILD | 37 ---
core-i686/file-5.17-off-by-one.patch | 25 -
core-x86_64/PKGBUILD | 37 ---
core-x86_64/file-5.17-off-by-one.patch | 25 -
5 files changed, 58 insertions(+), 124 deletions(-)
Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD 2014-04-11 22:01:40 UTC (rev 210212)
+++ core-i686/PKGBUILD 2014-04-11 23:33:00 UTC (rev 210213)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae al...@archlinux.org
-# Contributor: Andreas Radke andy...@archlinux.org
-
-pkgname=file
-pkgver=5.17
-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
-file-5.17-off-by-one.patch)
-md5sums=('e19c47e069ced7b01ccb4db402cc01d3'
- 'f36a87784f1db2e415ce09badb38fbe8')
-
-prepare() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # https://github.com/file/file/commit/70c65d2e1841
- patch -p1 -i $srcdir/file-5.17-off-by-one.patch
-}
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --datadir=/usr/share/file
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
Copied: file/repos/core-i686/PKGBUILD (from rev 210212,
file/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2014-04-11 23:33:00 UTC (rev 210213)
@@ -0,0 +1,29 @@
+# $Id$
+# Mainainer: Sébastien Luttringer se...@archlinux.org
+# Contributor: Allan McRae al...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+
+pkgname=file
+pkgver=5.18
+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=('d420d8f2990cd344673acfbf8d76ff5a')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --datadir=/usr/share/file
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+ install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+ rmdir $pkgdir/usr/share/man/man5
+}
Deleted: core-i686/file-5.17-off-by-one.patch
===
--- core-i686/file-5.17-off-by-one.patch2014-04-11 22:01:40 UTC (rev
210212)
+++ core-i686/file-5.17-off-by-one.patch2014-04-11 23:33:00 UTC (rev
210213)
@@ -1,25 +0,0 @@
-From 70c65d2e1841491f59168db1f905e8b14083fb1c Mon Sep 17 00:00:00 2001
-From: Christos Zoulas chris...@zoulas.com
-Date: Tue, 4 Mar 2014 17:42:19 +
-Subject: [PATCH] off by one in out of bounds calculations (Jan Kaluza)
-
- src/softmagic.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/softmagic.c b/src/softmagic.c
-index 170de95..5ed3998 100644
a/src/softmagic.c
-+++ b/src/softmagic.c
-@@ -72,7 +72,7 @@ private int mcopy(struct magic_set *, union VALUETYPE *,
int, int,
- private void cvt_32(union VALUETYPE *, const struct magic *);
- private void cvt_64(union VALUETYPE *, const struct magic *);
-
--#define OFFSET_OOB(n, o, i) ((n) (o) || (i) = ((n) - (o)))
-+#define OFFSET_OOB(n, o, i) ((n) (o) || (i) ((n) - (o)))
- /*
- * softmagic - lookup one file in parsed, in-memory copy of database
- * Passed the name and FILE * of one file to be typed.
---
-1.8.5.5
-
Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2014-04-11 22:01:40 UTC (rev 210212)
+++ core-x86_64/PKGBUILD2014-04-11 23:33:00 UTC (rev 210213)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae al...@archlinux.org
-# Contributor: Andreas Radke andy...@archlinux.org
-
-pkgname=file
-pkgver=5.17
-pkgrel=2
-pkgdesc=File type identification utility
-arch=('i686' 'x86_64')
-license=('custom')
