Fri Apr 15 07:33:22 2016 UTC ()
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.


(bsiegert)
diff -r1.36 -r1.36.2.1 pkgsrc/sysutils/radmind/Makefile
diff -r1.20 -r1.20.4.1 pkgsrc/sysutils/radmind/distinfo
diff -r1.1 -r1.1.20.1 pkgsrc/sysutils/radmind/patches/patch-command.c
cvs diff -r1.36 -r1.36.2.1 pkgsrc/sysutils/radmind/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/radmind/Makefile 2016/03/05 11:29:31 1.36
+++ pkgsrc/sysutils/radmind/Makefile 2016/04/15 07:33:22 1.36.2.1
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.36 2016/03/05 11:29:31 jperkin Exp $ 1# $NetBSD: Makefile,v 1.36.2.1 2016/04/15 07:33:22 bsiegert Exp $
2# 2#
3 3
4DISTNAME= radmind-1.14.1 4DISTNAME= radmind-1.14.1
5PKGREVISION= 5 5PKGREVISION= 6
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=radmind/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=radmind/}
8 8
9MAINTAINER= hauke@NetBSD.org 9MAINTAINER= hauke@NetBSD.org
10HOMEPAGE= http://rsug.itd.umich.edu/software/radmind/ 10HOMEPAGE= http://rsug.itd.umich.edu/software/radmind/
11COMMENT= Remote file administration and integrity tool 11COMMENT= Remote file administration and integrity tool
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 15CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
16CONFIGURE_ARGS+= --with-radminddir=${RADMINDDIR} 16CONFIGURE_ARGS+= --with-radminddir=${RADMINDDIR}
17CONFIGURE_ENV+= diffpath=${TOOLS_DIFF:Q} 17CONFIGURE_ENV+= diffpath=${TOOLS_DIFF:Q}
18# XXX configure script checks for path to echo, which pkgsrc does not 18# XXX configure script checks for path to echo, which pkgsrc does not
cvs diff -r1.20 -r1.20.4.1 pkgsrc/sysutils/radmind/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/radmind/distinfo 2015/11/04 01:32:28 1.20
+++ pkgsrc/sysutils/radmind/distinfo 2016/04/15 07:33:22 1.20.4.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.20 2015/11/04 01:32:28 agc Exp $ 1$NetBSD: distinfo,v 1.20.4.1 2016/04/15 07:33:22 bsiegert Exp $
2 2
3SHA1 (radmind-1.14.1.tar.gz) = 26f37f1c002384a9c609e688d6cee2fa15b6d0d2 3SHA1 (radmind-1.14.1.tar.gz) = 26f37f1c002384a9c609e688d6cee2fa15b6d0d2
4RMD160 (radmind-1.14.1.tar.gz) = 6b925083ef9dce2de21ebb0ffef287b1ffe9173d 4RMD160 (radmind-1.14.1.tar.gz) = 6b925083ef9dce2de21ebb0ffef287b1ffe9173d
5SHA512 (radmind-1.14.1.tar.gz) = bccf9681a6899be3b500065237dd1e04cd83ffb6f9be0e355412e7b0c556325f7d13435cec65a8a5e156e4411da915744f01a615472f6361d52c4d54d8be20eb 5SHA512 (radmind-1.14.1.tar.gz) = bccf9681a6899be3b500065237dd1e04cd83ffb6f9be0e355412e7b0c556325f7d13435cec65a8a5e156e4411da915744f01a615472f6361d52c4d54d8be20eb
6Size (radmind-1.14.1.tar.gz) = 403553 bytes 6Size (radmind-1.14.1.tar.gz) = 403553 bytes
7SHA1 (patch-Makefile.in) = 3602966fb8f7c5118fa378a6646b81dbf0d69ab7 7SHA1 (patch-Makefile.in) = 3602966fb8f7c5118fa378a6646b81dbf0d69ab7
8SHA1 (patch-command.c) = f274826aa830263b84202a55c05bf87e44c0b9c1 8SHA1 (patch-command.c) = 26e93be15a5a1113b8f75eb6eaf1d77892947bc7
9SHA1 (patch-command.h) = c050593ab68538e99bd79030e50e803d17027cdb 9SHA1 (patch-command.h) = c050593ab68538e99bd79030e50e803d17027cdb
10SHA1 (patch-config.h.in) = a5e157b47fb28d33e2a28fecc9367ff410c6fda5 10SHA1 (patch-config.h.in) = a5e157b47fb28d33e2a28fecc9367ff410c6fda5
11SHA1 (patch-configure) = ecf336c9b77b1622a0190a67c268012cedd074b5 11SHA1 (patch-configure) = ecf336c9b77b1622a0190a67c268012cedd074b5
12SHA1 (patch-configure.ac) = 1d009458df88fba1a25425306a46cad7d2b51737 12SHA1 (patch-configure.ac) = 1d009458df88fba1a25425306a46cad7d2b51737
13SHA1 (patch-ktcheck.c) = 1dff9d5d0a169b2f544f66fc79a42d22f8a5f54d 13SHA1 (patch-ktcheck.c) = 1dff9d5d0a169b2f544f66fc79a42d22f8a5f54d
14SHA1 (patch-largefile.h) = 574e908d716d50aab84fccdd699c8b03c56b6e05 14SHA1 (patch-largefile.h) = 574e908d716d50aab84fccdd699c8b03c56b6e05
15SHA1 (patch-lcksum.c) = 2d8a8285eb70988a32b41f77d4683ef5ca127883 15SHA1 (patch-lcksum.c) = 2d8a8285eb70988a32b41f77d4683ef5ca127883
16SHA1 (patch-libsnet_snet.c) = 2268af5ada0b8e1c212dbd258b1a1632f2ff7613 16SHA1 (patch-libsnet_snet.c) = 2268af5ada0b8e1c212dbd258b1a1632f2ff7613
17SHA1 (patch-ra.sh) = 7bdaec355d9fbe98f0cb7e8f49d928f4c2dfd823 17SHA1 (patch-ra.sh) = 7bdaec355d9fbe98f0cb7e8f49d928f4c2dfd823
18SHA1 (patch-retr.c) = 69cdf4260583313f0a9f95dfe5597ee03897a313 18SHA1 (patch-retr.c) = 69cdf4260583313f0a9f95dfe5597ee03897a313
19SHA1 (patch-transcript.c) = b309079b7a272547f4c8843b925dd29479cc7e1d 19SHA1 (patch-transcript.c) = b309079b7a272547f4c8843b925dd29479cc7e1d
20SHA1 (patch-update.c) = e27b377378aae6d51cdbb3b9e9f04e5dd33ee211 20SHA1 (patch-update.c) = e27b377378aae6d51cdbb3b9e9f04e5dd33ee211
cvs diff -r1.1 -r1.1.20.1 pkgsrc/sysutils/radmind/patches/patch-command.c (expand / switch to unified diff)

--- pkgsrc/sysutils/radmind/patches/patch-command.c 2014/01/08 11:54:04 1.1
+++ pkgsrc/sysutils/radmind/patches/patch-command.c 2016/04/15 07:33:22 1.1.20.1
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-command.c,v 1.1 2014/01/08 11:54:04 hauke Exp $ 1$NetBSD: patch-command.c,v 1.1.20.1 2016/04/15 07:33:22 bsiegert Exp $
 2
 3Fix for Radmind bug #221, accomodating for 64 bit time_t
2 4
3--- command.c.orig 2010-12-13 03:42:49.000000000 +0000 5--- command.c.orig 2010-12-13 03:42:49.000000000 +0000
4+++ command.c 6+++ command.c
5@@ -624,11 +624,11 @@ f_stat( SNET *sn, int ac, char *av[] ) 7@@ -624,11 +624,11 @@ f_stat( SNET *sn, int ac, char *av[] )
6 switch ( key ) { 8 switch ( key ) {
7 case K_COMMAND: 9 case K_COMMAND:
8 if ( ac == 2 ) { 10 if ( ac == 2 ) {
9- snet_writef( sn, "%s %s %o %d %d %d %" PRIofft "d %s\r\n", 11- snet_writef( sn, "%s %s %o %d %d %d %" PRIofft "d %s\r\n",
10+ snet_writef( sn, RADMIND_STAT_FMT, 12+ snet_writef( sn, RADMIND_STAT_FMT,
11 "f", "command", DEFAULT_MODE, DEFAULT_UID, DEFAULT_GID, 13 "f", "command", DEFAULT_MODE, DEFAULT_UID, DEFAULT_GID,
12 st.st_mtime, st.st_size, cksum_b64 ); 14 st.st_mtime, st.st_size, cksum_b64 );
13 } else { 15 } else {
14- snet_writef( sn, "%s %s %o %d %d %d %" PRIofft "d %s\r\n", 16- snet_writef( sn, "%s %s %o %d %d %d %" PRIofft "d %s\r\n",
@@ -33,22 +35,26 @@ $NetBSD: patch-command.c,v 1.1 2014/01/0 @@ -33,22 +35,26 @@ $NetBSD: patch-command.c,v 1.1 2014/01/0
33+ snet_writef( sn, RADMIND_STAT_FMT, 35+ snet_writef( sn, RADMIND_STAT_FMT,
34 "f", av[ 2 ],  36 "f", av[ 2 ],
35 DEFAULT_MODE, DEFAULT_UID, DEFAULT_GID, 37 DEFAULT_MODE, DEFAULT_UID, DEFAULT_GID,
36 st.st_mtime, st.st_size, cksum_b64 ); 38 st.st_mtime, st.st_size, cksum_b64 );
37@@ -682,7 +682,7 @@ f_stat( SNET *sn, int ac, char *av[] ) 39@@ -682,7 +682,7 @@ f_stat( SNET *sn, int ac, char *av[] )
38 if (( av = special_t( path, enc_file )) == NULL ) { 40 if (( av = special_t( path, enc_file )) == NULL ) {
39 if (( av = special_t( "transcript/special.T", enc_file )) 41 if (( av = special_t( "transcript/special.T", enc_file ))
40 == NULL ) { 42 == NULL ) {
41- snet_writef( sn, "%s %s %o %d %d %d %" PRIofft "d %s\r\n", 43- snet_writef( sn, "%s %s %o %d %d %d %" PRIofft "d %s\r\n",
42+ snet_writef( sn, RADMIND_STAT_FMT, 44+ snet_writef( sn, RADMIND_STAT_FMT,
43 "f", enc_file,  45 "f", enc_file,
44 DEFAULT_MODE, DEFAULT_UID, DEFAULT_GID,  46 DEFAULT_MODE, DEFAULT_UID, DEFAULT_GID,
45 st.st_mtime, st.st_size, cksum_b64 ); 47 st.st_mtime, st.st_size, cksum_b64 );
46@@ -690,7 +690,7 @@ f_stat( SNET *sn, int ac, char *av[] ) 48@@ -690,7 +690,11 @@ f_stat( SNET *sn, int ac, char *av[] )
47 return( 0 ); 49 return( 0 );
48 } 50 }
49 } 51 }
50- snet_writef( sn, "%s %s %s %s %s %d %" PRIofft "d %s\r\n", 52- snet_writef( sn, "%s %s %s %s %s %d %" PRIofft "d %s\r\n",
51+ snet_writef( sn, RADMIND_STAT_FMT, 53+ /*
 54+ * Cannot use RADMIND_STAT_FMT shorthand here, since custom
 55+ * permission, user and group information are strings.
 56+ */
 57+ snet_writef( sn, "%s %s %s %s %s %" PRItimet "d %" PRIofft "d %s\r\n",
52 av[ 0 ], enc_file, 58 av[ 0 ], enc_file,
53 av[ 2 ], av[ 3 ], av[ 4 ], 59 av[ 2 ], av[ 3 ], av[ 4 ],
54 st.st_mtime, st.st_size, cksum_b64 ); 60 st.st_mtime, st.st_size, cksum_b64 );