Fri Mar 27 18:57:43 2015 UTC ()
Patches to fix compilation on SunOS. From Richard PALO in private mail.
(bsiegert)
diff -r1.21 -r1.22 pkgsrc/sysutils/file/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/file/patches/patch-src_compress.c
diff -r0 -r1.1 pkgsrc/sysutils/file/patches/patch-src_fsmagic.c
--- pkgsrc/sysutils/file/distinfo 2015/03/22 09:48:51 1.21
+++ pkgsrc/sysutils/file/distinfo 2015/03/27 18:57:43 1.22
| @@ -1,6 +1,8 @@ | | | @@ -1,6 +1,8 @@ |
1 | $NetBSD: distinfo,v 1.21 2015/03/22 09:48:51 bsiegert Exp $ | | 1 | $NetBSD: distinfo,v 1.22 2015/03/27 18:57:43 bsiegert Exp $ |
2 | | | 2 | |
3 | SHA1 (file-5.22.tar.gz) = 20fa06592291555f2b478ea2fb70b53e9e8d1f7c | | 3 | SHA1 (file-5.22.tar.gz) = 20fa06592291555f2b478ea2fb70b53e9e8d1f7c |
4 | RMD160 (file-5.22.tar.gz) = 73b5e5c128a6ecb2b870590728cc9013fe0c9dbb | | 4 | RMD160 (file-5.22.tar.gz) = 73b5e5c128a6ecb2b870590728cc9013fe0c9dbb |
5 | Size (file-5.22.tar.gz) = 732556 bytes | | 5 | Size (file-5.22.tar.gz) = 732556 bytes |
6 | SHA1 (patch-aa) = d3aa3667e3d28ac1268b83de2de372ba083705fc | | 6 | SHA1 (patch-aa) = d3aa3667e3d28ac1268b83de2de372ba083705fc |
| | | 7 | SHA1 (patch-src_compress.c) = 63407a3103bb1e77a5c8f1a5e859eb884ad55b3a |
| | | 8 | SHA1 (patch-src_fsmagic.c) = ee770cf37dfdfbc5a7c123d2691312610b76e76e |
$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];
$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*/
}