From d0f46323d0f4ec5766c1977efb46a2ae8cc77a30 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Fri, 28 Oct 2016 21:48:48 +0000 Subject: [PATCH] file: bump to 5.29, drop libtool file, touch patchset. (#842) In patchset: Keep -Wformat=2 in configure.ac's WARNINGS definition. --- .../{file-5.28.recipe => file-5.29.recipe} | 6 +++- ...{file-5.28.patchset => file-5.29.patchset} | 28 +++++++++---------- 2 files changed, 19 insertions(+), 15 deletions(-) rename sys-apps/file/{file-5.28.recipe => file-5.29.recipe} (94%) rename sys-apps/file/patches/{file-5.28.patchset => file-5.29.patchset} (79%) diff --git a/sys-apps/file/file-5.28.recipe b/sys-apps/file/file-5.29.recipe similarity index 94% rename from sys-apps/file/file-5.28.recipe rename to sys-apps/file/file-5.29.recipe index 8336e3170..c26e17505 100644 --- a/sys-apps/file/file-5.28.recipe +++ b/sys-apps/file/file-5.29.recipe @@ -10,7 +10,7 @@ COPYRIGHT="1986-1999 Ian F. Darwin LICENSE="BSD (2-clause)" REVISION="1" SOURCE_URI="ftp://ftp.astron.com/pub/file/file-$portVersion.tar.gz" -CHECKSUM_SHA256="0ecb5e146b8655d1fa84159a847ee619fc102575205a0ff9c6cc60fc5ee2e012" +CHECKSUM_SHA256="ea661277cd39bf8f063d3a83ee875432cc3680494169f952787e002bdd3884c0" PATCHES="file-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -74,6 +74,10 @@ BUILD() INSTALL() { make install + + # remove libtool file + rm -f $libDir/libmagic.la + prepareInstalledDevelLib libmagic fixPkgconfig diff --git a/sys-apps/file/patches/file-5.28.patchset b/sys-apps/file/patches/file-5.29.patchset similarity index 79% rename from sys-apps/file/patches/file-5.28.patchset rename to sys-apps/file/patches/file-5.29.patchset index c69a797ad..dc07596a7 100644 --- a/sys-apps/file/patches/file-5.28.patchset +++ b/sys-apps/file/patches/file-5.29.patchset @@ -5,7 +5,7 @@ Subject: Haiku patch diff --git a/configure.ac b/configure.ac -index 9c38b69..572a1dc 100644 +index da2fbbf..0e6d9c4 100644 --- a/configure.ac +++ b/configure.ac @@ -135,14 +135,14 @@ else @@ -13,7 +13,7 @@ index 9c38b69..572a1dc 100644 -Wmissing-declarations -Wredundant-decls -Wnested-externs \ -Wsign-compare -Wreturn-type -Wswitch -Wshadow \ - -Wcast-qual -Wwrite-strings -Wextra -Wunused-parameter -Wformat=2" -+ -Wcast-qual -Wwrite-strings" ++ -Wcast-qual -Wwrite-strings -Wformat=2" fi], [ if test "$GCC" = yes; then AC_MSG_RESULT(yes) @@ -21,23 +21,23 @@ index 9c38b69..572a1dc 100644 -Wmissing-declarations -Wredundant-decls -Wnested-externs \ -Wsign-compare -Wreturn-type -Wswitch -Wshadow \ - -Wcast-qual -Wwrite-strings -Wextra -Wunused-parameter -Wformat=2" -+ -Wcast-qual -Wwrite-strings" ++ -Wcast-qual -Wwrite-strings -Wformat=2" else WARNINGS= AC_MSG_RESULT(no) diff --git a/src/der.c b/src/der.c -index f36606b..5bf4af7 100644 +index 8ae638f..c9ae6f7 100644 --- a/src/der.c +++ b/src/der.c -@@ -199,6 +199,7 @@ static int +@@ -201,6 +201,7 @@ static int der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len) { - const uint8_t *d = q; + const uint8_t *d = CAST(const uint8_t *, q); + uint32_t i; switch (tag) { case DER_TAG_PRINTABLE_STRING: case DER_TAG_UTF8_STRING: -@@ -209,7 +210,7 @@ der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len) +@@ -211,7 +212,7 @@ der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len) break; } @@ -46,9 +46,9 @@ index f36606b..5bf4af7 100644 uint32_t z = i << 1; if (z < blen - 2) snprintf(buf + z, blen - z, "%.2x", d[i]); -@@ -222,12 +223,13 @@ der_offs(struct magic_set *ms, struct magic *m, size_t nbytes) +@@ -224,12 +225,13 @@ der_offs(struct magic_set *ms, struct magic *m, size_t nbytes) { - const uint8_t *b = CAST(const void *, ms->search.s); + const uint8_t *b = RCAST(const uint8_t *, ms->search.s); size_t offs = 0, len = ms->search.s_len ? ms->search.s_len : nbytes; + uint32_t tlen; @@ -61,7 +61,7 @@ index f36606b..5bf4af7 100644 if (tlen == DER_BAD) return -1; DPRINTF(("%s2: %d %zu %u\n", __func__, ms->offset, offs, tlen)); -@@ -256,6 +258,7 @@ der_cmp(struct magic_set *ms, struct magic *m) +@@ -258,6 +260,7 @@ der_cmp(struct magic_set *ms, struct magic *m) size_t offs = 0, len = ms->search.s_len; uint32_t tag, tlen; char buf[128]; @@ -69,7 +69,7 @@ index f36606b..5bf4af7 100644 tag = gettag(b, &offs, len); if (tag == DER_BAD) -@@ -269,7 +272,7 @@ der_cmp(struct magic_set *ms, struct magic *m) +@@ -271,7 +274,7 @@ der_cmp(struct magic_set *ms, struct magic *m) if ((ms->flags & MAGIC_DEBUG) != 0) fprintf(stderr, "%s: tag %p got=%s exp=%s\n", __func__, b, buf, s); @@ -79,10 +79,10 @@ index f36606b..5bf4af7 100644 if (strncmp(buf, s, slen) != 0) return 0; diff --git a/src/readelf.c b/src/readelf.c -index 39598f7..84a5196 100644 +index 90dae39..1e2f4db 100644 --- a/src/readelf.c +++ b/src/readelf.c -@@ -909,6 +909,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, +@@ -923,6 +923,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, const char *tag; int is_string; size_t nval; @@ -90,7 +90,7 @@ index 39598f7..84a5196 100644 if (type != NT_AUXV || (*flags & FLAGS_IS_CORE) == 0) return 0; -@@ -916,7 +917,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, +@@ -930,7 +931,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, *flags |= FLAGS_DID_AUXV; nval = 0;