diff options
| author | richard <richard> | 2016-02-01 17:10:38 +0000 |
|---|---|---|
| committer | richard <richard> | 2016-02-01 17:10:38 +0000 |
| commit | 5b2a639851df3f4341f10b5927dd9d657d502d44 (patch) | |
| tree | 8ff980fdc00dee633bdf5144769b78bb17629590 | |
| parent | bac362eee8d838b47eb530923d01c0ff78b663e9 (diff) | |
| download | pkgsrc-5b2a639851df3f4341f10b5927dd9d657d502d44.tar.gz | |
Recent versions of Illumos implement flock() so add an additional guard
for SOLARIS.
| -rw-r--r-- | comms/libopensync/distinfo | 3 | ||||
| -rw-r--r-- | comms/libopensync/patches/patch-opensync_opensync__group.c | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/comms/libopensync/distinfo b/comms/libopensync/distinfo index 4e7c6bcb981..5374fdfd305 100644 --- a/comms/libopensync/distinfo +++ b/comms/libopensync/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2015/11/03 01:34:54 agc Exp $ +$NetBSD: distinfo,v 1.9 2016/02/01 17:10:38 richard Exp $ SHA1 (libopensync-0.22.tar.bz2) = 47860a8c6621aa89fbff2af2517787747af7cc30 RMD160 (libopensync-0.22.tar.bz2) = a1e9715d037a7c474b80d609e6c96a24cbb6692f @@ -10,4 +10,5 @@ SHA1 (patch-ac) = f6a8c12e9344a7f68439b06f8797bfa30106d0e3 SHA1 (patch-ad) = d2a199b04788512378dbd5024b34d367da6add5d SHA1 (patch-ae) = 39b5cf27a5b1722f5d8550b97deb1a8763a4ace1 SHA1 (patch-af) = 07666352a1cd68ae00b10fc5eefeb8001673abe7 +SHA1 (patch-opensync_opensync__group.c) = da6cb5ae9a2c8067126f9cec3d27bf4d8c0b56df SHA1 (patch-opensync_opensync_time.c) = cb6cf27e1ba3fcd6a0cb139759d4da7306817e10 diff --git a/comms/libopensync/patches/patch-opensync_opensync__group.c b/comms/libopensync/patches/patch-opensync_opensync__group.c new file mode 100644 index 00000000000..02cf97cbbdc --- /dev/null +++ b/comms/libopensync/patches/patch-opensync_opensync__group.c @@ -0,0 +1,19 @@ +$NetBSD: patch-opensync_opensync__group.c,v 1.1 2016/02/01 17:10:38 richard Exp $ +Recent versions of Illumos implement flock() + +--- opensync/opensync_group.c.orig 2007-03-27 11:49:18.000000000 +0000 ++++ opensync/opensync_group.c +@@ -26,10 +26,10 @@ + extern int errno; + + /* +- * On Solaris no flock function exists, +- * we must implenet it here ++ * On Solaris if no flock function exists, ++ * we must implement it here + */ +-#ifdef SOLARIS ++#if defined(SOLARIS) && !defined(LOCK_EX) + + #define LOCK_SH 1 + #define LOCK_EX 2 |