diff options
| author | bsiegert <bsiegert> | 2016-04-15 07:33:22 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert> | 2016-04-15 07:33:22 +0000 |
| commit | fedd076363d9f1fae551cf336a7cbd4bc1179ad3 (patch) | |
| tree | eef757e7efb61a8b83152c075215b347ab1bfdcf | |
| parent | a3b84595f640bb067f53a637543335afd9d06b91 (diff) | |
| download | pkgsrc-fedd076363d9f1fae551cf336a7cbd4bc1179ad3.tar.gz | |
Pullup ticket #4959 - requested by hauke
sysutils/radmind: bugfix
Revisions pulled up:
- sysutils/radmind/Makefile 1.37
- sysutils/radmind/distinfo 1.21
- sysutils/radmind/patches/patch-command.c 1.2
---
Module Name: pkgsrc
Committed By: hauke
Date: Thu Apr 14 11:17:31 UTC 2016
Modified Files:
pkgsrc/sysutils/radmind: Makefile distinfo
pkgsrc/sysutils/radmind/patches: patch-command.c
Log Message:
Fix setting custom permission bits, user and group information from
a special transcript. Late fallout from Radmind bug #221.
| -rw-r--r-- | sysutils/radmind/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/radmind/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/radmind/patches/patch-command.c | 12 |
3 files changed, 13 insertions, 7 deletions
diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile index b44ed891a02..44eeb48fb38 100644 --- a/sysutils/radmind/Makefile +++ b/sysutils/radmind/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2016/03/05 11:29:31 jperkin Exp $ +# $NetBSD: Makefile,v 1.36.2.1 2016/04/15 07:33:22 bsiegert Exp $ # DISTNAME= radmind-1.14.1 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=radmind/} diff --git a/sysutils/radmind/distinfo b/sysutils/radmind/distinfo index b99d583f661..f4643607c13 100644 --- a/sysutils/radmind/distinfo +++ b/sysutils/radmind/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.20 2015/11/04 01:32:28 agc Exp $ +$NetBSD: distinfo,v 1.20.4.1 2016/04/15 07:33:22 bsiegert Exp $ SHA1 (radmind-1.14.1.tar.gz) = 26f37f1c002384a9c609e688d6cee2fa15b6d0d2 RMD160 (radmind-1.14.1.tar.gz) = 6b925083ef9dce2de21ebb0ffef287b1ffe9173d SHA512 (radmind-1.14.1.tar.gz) = bccf9681a6899be3b500065237dd1e04cd83ffb6f9be0e355412e7b0c556325f7d13435cec65a8a5e156e4411da915744f01a615472f6361d52c4d54d8be20eb Size (radmind-1.14.1.tar.gz) = 403553 bytes SHA1 (patch-Makefile.in) = 3602966fb8f7c5118fa378a6646b81dbf0d69ab7 -SHA1 (patch-command.c) = f274826aa830263b84202a55c05bf87e44c0b9c1 +SHA1 (patch-command.c) = 26e93be15a5a1113b8f75eb6eaf1d77892947bc7 SHA1 (patch-command.h) = c050593ab68538e99bd79030e50e803d17027cdb SHA1 (patch-config.h.in) = a5e157b47fb28d33e2a28fecc9367ff410c6fda5 SHA1 (patch-configure) = ecf336c9b77b1622a0190a67c268012cedd074b5 diff --git a/sysutils/radmind/patches/patch-command.c b/sysutils/radmind/patches/patch-command.c index 91eab777b3a..c6843285d12 100644 --- a/sysutils/radmind/patches/patch-command.c +++ b/sysutils/radmind/patches/patch-command.c @@ -1,4 +1,6 @@ -$NetBSD: patch-command.c,v 1.1 2014/01/08 11:54:04 hauke Exp $ +$NetBSD: patch-command.c,v 1.1.20.1 2016/04/15 07:33:22 bsiegert Exp $ + +Fix for Radmind bug #221, accomodating for 64 bit time_t --- command.c.orig 2010-12-13 03:42:49.000000000 +0000 +++ command.c @@ -43,12 +45,16 @@ $NetBSD: patch-command.c,v 1.1 2014/01/08 11:54:04 hauke Exp $ "f", enc_file, DEFAULT_MODE, DEFAULT_UID, DEFAULT_GID, st.st_mtime, st.st_size, cksum_b64 ); -@@ -690,7 +690,7 @@ f_stat( SNET *sn, int ac, char *av[] ) +@@ -690,7 +690,11 @@ f_stat( SNET *sn, int ac, char *av[] ) return( 0 ); } } - snet_writef( sn, "%s %s %s %s %s %d %" PRIofft "d %s\r\n", -+ snet_writef( sn, RADMIND_STAT_FMT, ++ /* ++ * Cannot use RADMIND_STAT_FMT shorthand here, since custom ++ * permission, user and group information are strings. ++ */ ++ snet_writef( sn, "%s %s %s %s %s %" PRItimet "d %" PRIofft "d %s\r\n", av[ 0 ], enc_file, av[ 2 ], av[ 3 ], av[ 4 ], st.st_mtime, st.st_size, cksum_b64 ); |