diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2015-03-27 18:57:43 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2015-03-27 18:57:43 +0000 |
| commit | dc5bf0f4ce7eec04de79020a76d9982beea935db (patch) | |
| tree | 66300bf584d77ce8d9c7ab34c724ec35559495af /sysutils/file | |
| parent | bf68f92002ac4176d7dfa6ebdbbbcb2bf67cfc77 (diff) | |
| download | pkgsrc-dc5bf0f4ce7eec04de79020a76d9982beea935db.tar.gz | |
Patches to fix compilation on SunOS. From Richard PALO in private mail.
Diffstat (limited to 'sysutils/file')
| -rw-r--r-- | sysutils/file/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/file/patches/patch-src_compress.c | 15 | ||||
| -rw-r--r-- | sysutils/file/patches/patch-src_fsmagic.c | 14 |
3 files changed, 32 insertions, 1 deletions
diff --git a/sysutils/file/distinfo b/sysutils/file/distinfo index 781aa8a6aa4..e42ad1c5702 100644 --- a/sysutils/file/distinfo +++ b/sysutils/file/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.21 2015/03/22 09:48:51 bsiegert Exp $ +$NetBSD: distinfo,v 1.22 2015/03/27 18:57:43 bsiegert Exp $ SHA1 (file-5.22.tar.gz) = 20fa06592291555f2b478ea2fb70b53e9e8d1f7c RMD160 (file-5.22.tar.gz) = 73b5e5c128a6ecb2b870590728cc9013fe0c9dbb Size (file-5.22.tar.gz) = 732556 bytes SHA1 (patch-aa) = d3aa3667e3d28ac1268b83de2de372ba083705fc +SHA1 (patch-src_compress.c) = 63407a3103bb1e77a5c8f1a5e859eb884ad55b3a +SHA1 (patch-src_fsmagic.c) = ee770cf37dfdfbc5a7c123d2691312610b76e76e diff --git a/sysutils/file/patches/patch-src_compress.c b/sysutils/file/patches/patch-src_compress.c new file mode 100644 index 00000000000..f4e84c389c4 --- /dev/null +++ b/sysutils/file/patches/patch-src_compress.c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_compress.c,v 1.1 2015/03/27 18:57:43 bsiegert Exp $ +sig_t is not defined by default on SunOS + +--- src/compress.c.orig 2014-12-16 16:07:12.000000000 +0000 ++++ src/compress.c +@@ -59,6 +59,9 @@ FILE_RCSID("@(#)$File: compress.c,v 1.77 + #define BUILTIN_DECOMPRESS + #include <zlib.h> + #endif ++#ifdef __sun ++typedef void (*sig_t)(int); ++#endif + + private const struct { + const char magic[8]; diff --git a/sysutils/file/patches/patch-src_fsmagic.c b/sysutils/file/patches/patch-src_fsmagic.c new file mode 100644 index 00000000000..56fd4cc4b06 --- /dev/null +++ b/sysutils/file/patches/patch-src_fsmagic.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_fsmagic.c,v 1.1 2015/03/27 18:57:43 bsiegert Exp $ +Explicitly convert mode_t to unsigned int for formatted output + +--- src/fsmagic.c.orig 2014-12-04 15:56:46.000000000 +0000 ++++ src/fsmagic.c +@@ -394,7 +394,7 @@ file_fsmagic(struct magic_set *ms, const + break; + + default: +- file_error(ms, 0, "invalid mode 0%o", sb->st_mode); ++ file_error(ms, 0, "invalid mode 0%o", (unsigned int)sb->st_mode); + return -1; + /*NOTREACHED*/ + } |