haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

file: bump to 5.34.

Browse Source
This commit is contained in:
fbrosson
2018-07-25 12:03:09 +00:00
parent 5d53e94928
commit d8a6abb33f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys-apps/file/file-5.33.recipe → sys-apps/file/file-5.34.recipe
View File

@@ -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="1c52c8c3d271cd898d5511c36a68059cda94036111ab293f01f83c3525b737c6"
CHECKSUM_SHA256="f15a50dbbfa83fec0bd1161e8e191b092ec832720e30cd14536e044ac623b20a"
PATCHES="file-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"

12
sys-apps/file/patches/file-5.33.patchset → sys-apps/file/patches/file-5.34.patchset
View File

@@ -5,7 +5,7 @@ Subject: Haiku patch
diff --git a/configure.ac b/configure.ac
index 4edd98e..c7151bc 100644
index ab4f6fc..dbff3c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,14 +140,14 @@ else
@@ -26,7 +26,7 @@ index 4edd98e..c7151bc 100644
WARNINGS=
AC_MSG_RESULT(no)
diff --git a/src/der.c b/src/der.c
index 4e22caf..1704092 100644
index d017b63..a550ac0 100644
--- a/src/der.c
+++ b/src/der.c
@@ -219,6 +219,7 @@ static int
@@ -79,10 +79,10 @@ index 4e22caf..1704092 100644
if (strncmp(buf, s, slen) != 0)
return 0;
diff --git a/src/readelf.c b/src/readelf.c
index 3df0836..b0faeb8 100644
index db0b35a..ecd8893 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -925,6 +925,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
@@ -950,6 +950,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
const char *tag;
int is_string;
size_t nval;
@@ -90,13 +90,13 @@ index 3df0836..b0faeb8 100644
if ((*flags & (FLAGS_IS_CORE|FLAGS_DID_CORE_STYLE)) !=
(FLAGS_IS_CORE|FLAGS_DID_CORE_STYLE))
@@ -952,7 +953,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
@@ -977,7 +978,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
*flags |= FLAGS_DID_AUXV;
nval = 0;
- for (size_t off = 0; off + elsize <= descsz; off += elsize) {
+ for (off = 0; off + elsize <= descsz; off += elsize) {
(void)memcpy(xauxv_addr, &nbuf[doff + off], xauxv_sizeof);
memcpy(xauxv_addr, &nbuf[doff + off], xauxv_sizeof);
/* Limit processing to 50 vector entries to prevent DoS */
if (nval++ >= 50) {
--