On Tue, Apr 03, 2007 at 07:24:16AM -0400, [EMAIL PROTECTED] wrote:
> I updated the diff to go against what's now in-tree.
>
> http://openbsd.rutgers.edu/radmind-1.8.0.diff
You're still missing SHA256 in distinfo. Here's what the 'makesum'
target gives me:
SHA256 (radmind-1.8.0.tar.gz) =
a1da20c93a4e157b02e1ca487c9db158f33796b24c4fe79affdffa6b410b5701
I'm also still getting the following on the 'update-plist' target:
===> Updating plist for radmind-1.8.0
Bogus element outside of every prefix: /var/radmind
Bogus element outside of every prefix: /var/radmind/cert
Bogus element outside of every prefix: /var/radmind/client
Bogus element outside of every prefix: /var/radmind/postapply
Bogus element outside of every prefix: /var/radmind/preapply
I'd either add a post-install target to remove them (as you create
them in the PLIST anyway) or patch radmind's Makefile (lines
297..300) to simply avoid creating them in the first place.
Otherwise, looks good. Updated patch attached and available via
HTTP:
http://www.lfod.us/files/ports/radmind.diff
--
o--------------------------{ Will Maier }--------------------------o
| web:.......http://www.lfod.us/ | [EMAIL PROTECTED] |
*------------------[ BSD Unix: Live Free or Die ]------------------*
diff -Naur -x CVS ../radmind/Makefile ./Makefile
--- ../radmind/Makefile Sun Apr 1 02:08:39 2007
+++ ./Makefile Tue Apr 3 06:52:00 2007
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2007/04/01 07:08:39 steven Exp $
+# $OpenBSD: Makefile,v 1.7 2005/03/26 16:36:26 alek Exp $
COMMENT= "remote administration software"
-DISTNAME= radmind-1.5.0
+DISTNAME= radmind-1.8.0
CATEGORIES= sysutils
HOMEPAGE= http://rsug.itd.umich.edu/software/radmind/
@@ -14,15 +14,16 @@
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c crypto ssl
+WANTLIB= c crypto ssl z
-MASTER_SITES= http://rsug.itd.umich.edu/software/radmind/files/
-EXTRACT_SUFX= .tgz
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=radmind/}
+NO_REGRESS= Yes
+CONFIGURE_ARGS= --disable-profiled
+
USE_LIBTOOL= Yes
LIBTOOL_FLAGS= --tag=disable-shared
-CONFIGURE_STYLE=gnu dest
-CONFIGURE_ARGS+=--with-radminddir='$${${DESTDIRNAME}}/var/radmind'
+CONFIGURE_STYLE=gnu
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/libsnet
.include <bsd.port.mk>
diff -Naur -x CVS ../radmind/distinfo ./distinfo
--- ../radmind/distinfo Sat Mar 26 10:36:26 2005
+++ ./distinfo Tue Apr 3 06:52:20 2007
@@ -1,4 +1,5 @@
-MD5 (radmind-1.5.0.tgz) = c636f5c27cec2aeb4d0031a14d91aff5
-RMD160 (radmind-1.5.0.tgz) = 7b685e357c45e40bb238c68482abe467d8073030
-SHA1 (radmind-1.5.0.tgz) = ee685126ba38afa34649f1d15bc2dfaa5d0e6294
-SIZE (radmind-1.5.0.tgz) = 341574
+MD5 (radmind-1.8.0.tar.gz) = 90073597cb7a04c42da759a9d0628229
+RMD160 (radmind-1.8.0.tar.gz) = e6e8f0ac067b6c96a7a397d0fd3b540cc707bd2b
+SHA1 (radmind-1.8.0.tar.gz) = 2d775ee01ac47ad47f6129b6282bb533600c7df7
+SHA256 (radmind-1.8.0.tar.gz) =
a1da20c93a4e157b02e1ca487c9db158f33796b24c4fe79affdffa6b410b5701
+SIZE (radmind-1.8.0.tar.gz) = 387738
diff -Naur -x CVS ../radmind/patches/patch-Makefile_in
./patches/patch-Makefile_in
--- ../radmind/patches/patch-Makefile_in Sun Apr 1 02:08:39 2007
+++ ./patches/patch-Makefile_in Tue Apr 3 06:59:26 2007
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2007/04/01 07:08:39 steven Exp $
---- Makefile.in.orig Mon Jan 24 20:24:11 2005
-+++ Makefile.in Sun Apr 1 08:18:32 2007
+$OpenBSD: patch-Makefile_in,v 1.3 2005/03/26 16:36:26 alek Exp $
+--- Makefile.in.orig Tue Feb 27 09:20:08 2007
++++ Makefile.in Tue Apr 3 06:59:17 2007
@@ -11,6 +11,7 @@ [EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -9,36 +9,45 @@
# For server
[EMAIL PROTECTED]@
-@@ -82,7 +83,7 @@ TWHICH_OBJ= version.o twhich.o argcargv.o transcri
- hardlink.o cksum.o base64.o pathcmp.o radstat.o applefile.o \
- list.o
+@@ -88,7 +89,7 @@ TWHICH_OBJ= version.o twhich.o argca
+ LSORT_OBJ= version.o lsort.o pathcmp.o code.o argcargv.o
+
-all : ${TARGETS}
+all : ${TARGETS} rash
version.o : version.c
${CC} ${CFLAGS} \
-@@ -223,6 +224,7 @@ rash : FRC
- -e '[EMAIL PROTECTED]@[EMAIL PROTECTED]' \
+@@ -252,6 +253,7 @@ rash : FRC
-e '[EMAIL PROTECTED]@[EMAIL PROTECTED]' \
- -e '[EMAIL PROTECTED]@[EMAIL PROTECTED]' \
+ -e '[EMAIL PROTECTED]@[EMAIL PROTECTED]' \
+ -e '[EMAIL PROTECTED]@$(shell cat VERSION)@g' \
+ -e '[EMAIL PROTECTED]@[EMAIL PROTECTED]' \
${srcdir}/ra.sh > tmp/ra.sh;
man : FRC
-@@ -240,7 +242,7 @@ man : FRC
+@@ -269,7 +271,7 @@ man : FRC
${srcdir}/man/$$i > tmp/man/$$i; \
done
-install : all man rash
+install : ${TARGETS} man
- -mkdir -p ${exec_prefix}
- -mkdir -p ${SBINDIR}
- ${INSTALL} -m 0755 -c radmind ${SBINDIR}/
-@@ -267,6 +269,7 @@ install : all man rash
- -mkdir -p ${PREAPPLYDIR}
- -mkdir -p ${POSTAPPLYDIR}
- -mkdir -p ${CERTDIR}
+ -mkdir -p ${DESTDIR}/${exec_prefix}
+ -mkdir -p ${DESTDIR}/${SBINDIR}
+ ${INSTALL} -m 0755 -c radmind ${DESTDIR}/${SBINDIR}/
+@@ -292,10 +294,12 @@ install : all man rash
+ for i in ${MAN8TARGETS}; do \
+ ${INSTALL} -m 0644 -c tmp/man/$$i ${DESTDIR}/${MANDIR}/man8/; \
+ done
+- -mkdir -p ${DESTDIR}/${RADMINDDIR}/client
+- -mkdir -p ${DESTDIR}/${PREAPPLYDIR}
+- -mkdir -p ${DESTDIR}/${POSTAPPLYDIR}
+- -mkdir -p ${DESTDIR}/${CERTDIR}
++ # PLIST handles these.
++ #-mkdir -p ${DESTDIR}/${RADMINDDIR}/client
++ #-mkdir -p ${DESTDIR}/${PREAPPLYDIR}
++ #-mkdir -p ${DESTDIR}/${POSTAPPLYDIR}
++ #-mkdir -p ${DESTDIR}/${CERTDIR}
+ rm -rf tmp/
PKGNAME=RadmindTools-${VERSION}
diff -Naur -x CVS ../radmind/patches/patch-command_c ./patches/patch-command_c
--- ../radmind/patches/patch-command_c Sun Apr 1 02:08:39 2007
+++ ./patches/patch-command_c Tue Apr 3 06:52:00 2007
@@ -1,7 +1,7 @@
-$OpenBSD: patch-command_c,v 1.3 2007/04/01 07:08:39 steven Exp $
---- command.c.orig Thu Feb 10 19:17:57 2005
-+++ command.c Sun Apr 1 08:18:32 2007
-@@ -636,7 +636,7 @@ f_stat( SNET *sn, int ac, char *av[] )
+$OpenBSD: patch-command_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
+--- command.c.orig Fri Mar 9 13:36:28 2007
++++ command.c Sun Mar 18 12:15:14 2007
+@@ -662,7 +662,7 @@ f_stat( SNET *sn, int ac, char *av[] )
/* if allowable, check for transcript in the special file directory */
@@ -10,7 +10,7 @@
/* store value of av[ 2 ], because argcargv will be called
* from special_t(), and that will blow away the current values
-@@ -745,7 +745,7 @@ f_stor( SNET *sn, int ac, char *av[] )
+@@ -771,7 +771,7 @@ f_stor( SNET *sn, int ac, char *av[] )
snet_writef( sn, "%d Path too long\r\n", 540 );
return( 1 );
}
@@ -19,7 +19,7 @@
/* make the directory for the files of this xscript to live in. */
if ( mkdir( xscriptdir, 0777 ) < 0 ) {
-@@ -1141,7 +1141,7 @@ command_k( char *path_config )
+@@ -1244,7 +1244,7 @@ command_k( char *path_config )
}
if (( p = strrchr( av[ 1 ], '/' )) == NULL ) {
@@ -28,7 +28,7 @@
} else {
*p = '\0';
if ( snprintf( special_dir, MAXPATHLEN, "special/%s", av[ 1 ] )
-@@ -1159,14 +1159,14 @@ command_k( char *path_config )
+@@ -1262,14 +1262,14 @@ command_k( char *path_config )
"config file: line %d: command file too long\n", linenum );
continue;
}
@@ -45,7 +45,7 @@
return( 0 );
}
if ( wildcard( av[ 0 ], remote_host, 0 )) {
-@@ -1175,14 +1175,14 @@ command_k( char *path_config )
+@@ -1278,14 +1278,14 @@ command_k( char *path_config )
"config file: line %d: command file too long\n", linenum );
continue;
}
@@ -62,7 +62,7 @@
return( 0 );
}
if ( wildcard( av[ 0 ], remote_addr, 1 )) {
-@@ -1191,14 +1191,14 @@ command_k( char *path_config )
+@@ -1294,14 +1294,14 @@ command_k( char *path_config )
"config file: line %d: command file too long\n", linenum );
continue;
}
diff -Naur -x CVS ../radmind/patches/patch-connect_c ./patches/patch-connect_c
--- ../radmind/patches/patch-connect_c Wed Dec 31 18:00:00 1969
+++ ./patches/patch-connect_c Tue Apr 3 06:52:00 2007
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- connect.c.orig Sun Mar 18 12:25:54 2007
++++ connect.c Sun Mar 18 12:26:33 2007
+@@ -177,7 +177,7 @@ get_capabilities( SNET *sn )
+ return( NULL );
+ }
+ if ( verbose ) printf( "<<< %s\n", line );
+- strcpy( temp, line+4 );
++ (void)strlcpy( temp, line+4, sizeof(temp) );
+ if (( ac = argcargv( temp, &av )) != 0 ) {
+ if ( strncasecmp( "CAPAbilities", av[0], MIN( 12, strlen( av[0] )))
== 0 ) {
+ capa = malloc( sizeof(char *)*ac );
diff -Naur -x CVS ../radmind/patches/patch-fsdiff_c ./patches/patch-fsdiff_c
--- ../radmind/patches/patch-fsdiff_c Sun Apr 1 02:08:39 2007
+++ ./patches/patch-fsdiff_c Tue Apr 3 06:52:00 2007
@@ -1,18 +1,12 @@
-$OpenBSD: patch-fsdiff_c,v 1.3 2007/04/01 07:08:39 steven Exp $
---- fsdiff.c.orig Thu Jan 20 23:17:25 2005
-+++ fsdiff.c Sun Apr 1 08:18:32 2007
-@@ -59,13 +59,7 @@ fs_walk( char *path, int start, int finish )
- }
+$OpenBSD: patch-fsdiff_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
+--- fsdiff.c.orig Sat May 6 18:13:18 2006
++++ fsdiff.c Sun Mar 18 12:19:21 2007
+@@ -111,7 +111,7 @@ fs_walk( char *path, struct stat *st, ch
+ char type0;
+ struct applefileinfo afinfo0;
- if ( ischild( tran->t_pinfo.pi_name, path )) {
-- /*
-- * XXX
-- * This strcpy() is not itself dangerous, because pi_name
-- * is a MAXPATHLEN-sized buffer. However, it does not appear
-- * that copies into pi_name are carefully checked.
-- */
- strcpy( temp, tran->t_pinfo.pi_name );
+ (void)strlcpy( temp, tran->t_pinfo.pi_name, sizeof( temp ) );
- fs_walk( temp, start, finish );
- } else {
- return;
+ switch ( radstat( temp, &st0, &type0, &afinfo0 )) {
+ case 0:
+ break;
diff -Naur -x CVS ../radmind/patches/patch-hardlink_c ./patches/patch-hardlink_c
--- ../radmind/patches/patch-hardlink_c Sun Apr 1 02:08:39 2007
+++ ./patches/patch-hardlink_c Tue Apr 3 06:52:00 2007
@@ -1,7 +1,7 @@
-$OpenBSD: patch-hardlink_c,v 1.2 2007/04/01 07:08:39 steven Exp $
---- hardlink.c.orig Wed May 21 00:23:11 2003
-+++ hardlink.c Sun Apr 1 08:18:32 2007
-@@ -79,6 +79,7 @@ d_insert( struct devlist **dev_head, struct pathinfo *
+$OpenBSD: patch-hardlink_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
+--- hardlink.c.orig 2003-05-20 18:23:11.000000000 -0400
++++ hardlink.c 2004-06-12 23:03:23.000000000 -0400
+@@ -79,6 +79,7 @@ d_insert( struct devlist **dev_head, str
i_insert( struct devlist *dev_head, struct pathinfo *pinfo )
{
struct inolist *new, **cur;
@@ -9,7 +9,7 @@
for ( cur = &dev_head->d_ilist; *cur != NULL; cur = &(*cur)->i_next ) {
if ( pinfo->pi_stat.st_ino <= (*cur)->i_ino ) {
-@@ -96,13 +97,14 @@ i_insert( struct devlist *dev_head, struct pathinfo *p
+@@ -96,13 +97,14 @@ i_insert( struct devlist *dev_head, stru
exit( 2 );
}
diff -Naur -x CVS ../radmind/patches/patch-ktcheck_c ./patches/patch-ktcheck_c
--- ../radmind/patches/patch-ktcheck_c Sun Apr 1 02:08:39 2007
+++ ./patches/patch-ktcheck_c Tue Apr 3 06:52:00 2007
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ktcheck_c,v 1.2 2007/04/01 07:08:39 steven Exp $
---- ktcheck.c.orig Thu Feb 10 19:22:52 2005
-+++ ktcheck.c Sun Apr 1 08:18:32 2007
-@@ -95,7 +95,7 @@ getstat( SNET *sn, char *description, char *stats )
+$OpenBSD: patch-ktcheck_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
+--- ktcheck.c.orig Thu Feb 22 10:35:37 2007
++++ ktcheck.c Sun Mar 18 12:15:14 2007
+@@ -270,7 +270,7 @@ getstat( SNET *sn, char *description, ch
fprintf( stderr, "%s: line too long\n", line );
return( -1 );
}
@@ -10,7 +10,7 @@
if ( verbose ) printf( "<<< %s\n", stats );
-@@ -253,7 +253,7 @@ check( SNET *sn, char *type, char *file )
+@@ -421,7 +421,7 @@ check( SNET *sn, char *type, char *file
fprintf( stderr, "%s: too long\n", type );
return( 2 );
}
@@ -19,7 +19,7 @@
file = base_kfile;
-@@ -262,7 +262,7 @@ check( SNET *sn, char *type, char *file )
+@@ -430,7 +430,7 @@ check( SNET *sn, char *type, char *file
fprintf( stderr, "%s: path too long\n", base_kfile );
return( 2 );
}
@@ -28,7 +28,7 @@
}
if ( getstat( sn, (char *)&pathdesc, stats ) != 0 ) {
-@@ -505,7 +505,7 @@ main( int argc, char **argv )
+@@ -698,7 +698,7 @@ main( int argc, char **argv )
p++;
*p = (char)'\0';
}
diff -Naur -x CVS ../radmind/patches/patch-lapply_c ./patches/patch-lapply_c
--- ../radmind/patches/patch-lapply_c Sun Apr 1 02:08:39 2007
+++ ./patches/patch-lapply_c Tue Apr 3 06:52:00 2007
@@ -1,7 +1,7 @@
-$OpenBSD: patch-lapply_c,v 1.3 2007/04/01 07:08:39 steven Exp $
---- lapply.c.orig Thu Dec 16 22:51:34 2004
-+++ lapply.c Sun Apr 1 08:18:32 2007
-@@ -75,7 +75,7 @@ create_node( char *path, char *tline )
+$OpenBSD: patch-lapply_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
+--- lapply.c.orig Thu Dec 28 11:34:54 2006
++++ lapply.c Sun Mar 18 12:15:14 2007
+@@ -83,7 +83,7 @@ create_node( char *path, char *tline )
new_node = (struct node *) malloc( sizeof( struct node ));
new_node->path = strdup( path );
if ( tline != NULL ) {
@@ -10,7 +10,7 @@
new_node->doline = 1;
} else {
new_node->doline = 0;
-@@ -126,7 +126,7 @@ do_line( char *tline, int present, struct stat *st, SN
+@@ -127,7 +127,7 @@ do_line( char *tline, int present, struc
fprintf( stderr, "line %d: too long\n", linenum );
return( 1 );
}
@@ -19,7 +19,7 @@
/* DOWNLOAD */
if ( *command == '+' ) {
-@@ -135,7 +135,7 @@ do_line( char *tline, int present, struct stat *st, SN
+@@ -136,7 +136,7 @@ do_line( char *tline, int present, struc
linenum, *targv[ 0 ] );
return( 1 );
}
@@ -28,7 +28,7 @@
if ( special ) {
if ( snprintf( pathdesc, MAXPATHLEN * 2, "SPECIAL %s",
-@@ -415,7 +415,7 @@ main( int argc, char **argv )
+@@ -462,7 +462,7 @@ main( int argc, char **argv )
fprintf( stderr, "line %d: too long\n", linenum );
goto error2;
}
@@ -37,7 +37,7 @@
tac = acav_parse( acav, targvline, &targv );
-@@ -425,7 +425,7 @@ main( int argc, char **argv )
+@@ -472,7 +472,7 @@ main( int argc, char **argv )
}
if ( tac == 1 ) {
@@ -46,7 +46,7 @@
len = strlen( transcript );
if ( transcript[ len - 1 ] != ':' ) {
fprintf( stderr, "%s: line %d: invalid transcript name\n",
-@@ -467,7 +467,7 @@ main( int argc, char **argv )
+@@ -514,7 +514,7 @@ main( int argc, char **argv )
fprintf( stderr, "line %d: too long\n", linenum );
return( 1 );
}
@@ -55,7 +55,7 @@
/* Check transcript order */
if ( prepath != 0 ) {
-@@ -482,7 +482,7 @@ main( int argc, char **argv )
+@@ -529,7 +529,7 @@ main( int argc, char **argv )
transcript, linenum );
goto error2;
}
diff -Naur -x CVS ../radmind/patches/patch-lcksum_c ./patches/patch-lcksum_c
--- ../radmind/patches/patch-lcksum_c Tue Jan 25 18:33:30 2005
+++ ./patches/patch-lcksum_c Tue Apr 3 06:52:00 2007
@@ -1,7 +1,7 @@
$OpenBSD: patch-lcksum_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
---- lcksum.c.orig Thu Jan 6 16:44:25 2005
-+++ lcksum.c Thu Jan 20 12:59:55 2005
-@@ -228,13 +228,13 @@ main( int argc, char **argv )
+--- lcksum.c.orig Tue Aug 1 16:13:38 2006
++++ lcksum.c Sun Mar 18 12:15:14 2007
+@@ -176,13 +176,13 @@ do_lcksum( char *tpath )
fprintf( stderr, "%s: path too long\n", tpath );
exit( 2 );
}
@@ -17,7 +17,7 @@
}
if ( get_root( radmind_path, cwd, file_root, tran_root, tran_name ) != 0
) {
exit( 2 );
-@@ -337,7 +337,7 @@ main( int argc, char **argv )
+@@ -293,7 +293,7 @@ do_lcksum( char *tpath )
exitval = 1;
goto done;
}
@@ -26,16 +26,16 @@
/* check to see if file against prefix */
if ( prefix != NULL ) {
-@@ -395,7 +395,7 @@ main( int argc, char **argv )
+@@ -330,7 +330,7 @@ do_lcksum( char *tpath )
exitval = 1;
goto done;
}
- strcpy( prepath, path );
+ (void)strlcpy( prepath, path, sizeof( prepath ) );
- /*
- * Since this tool is run on the server, all files can be treated
-@@ -479,7 +479,7 @@ main( int argc, char **argv )
+ if ((( *targv[ 0 ] != 'f' ) && ( *targv[ 0 ] != 'a' )) || ( remove )) {
+ if ( updatetran ) {
+@@ -443,7 +443,7 @@ do_lcksum( char *tpath )
fprintf( ufs, "%s %-37s %4s %5s %5s %9ld "
"%7" PRIofft "d %s\n",
targv[ 0 ], targv[ 1 ], targv[ 2 ], targv[ 3 ],
diff -Naur -x CVS ../radmind/patches/patch-libsnet_Makefile_in
./patches/patch-libsnet_Makefile_in
--- ../radmind/patches/patch-libsnet_Makefile_in Sun Apr 1 02:08:39 2007
+++ ./patches/patch-libsnet_Makefile_in Tue Apr 3 06:52:00 2007
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libsnet_Makefile_in,v 1.2 2007/04/01 07:08:39 steven Exp $
---- libsnet/Makefile.in.orig Wed Mar 31 17:54:40 2004
-+++ libsnet/Makefile.in Sun Apr 1 08:24:30 2007
-@@ -14,13 +14,12 @@ LOBJ = snet.lo
+$OpenBSD: patch-libsnet_Makefile_in,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
+--- libsnet/Makefile.in.orig Sat Jun 26 12:30:45 2004
++++ libsnet/Makefile.in Sat Jun 26 12:34:54 2004
+@@ -14,7 +14,7 @@ LOBJ = snet.lo
INCPATH= @CPPFLAGS@ -I.
DEFS=
OPTOPTS= @OPTOPTS@
@@ -10,48 +10,12 @@
PROFILED= @PROFILED@
CC= @CC@
- INSTALL= @INSTALL@
- AWK= @AWK@
--LIBTOOL= ./libtool --quiet
- TAGSFILE= tags
+@@ -50,7 +50,7 @@ all: libsnet.la
- VERSION= `date +%Y%m%d`
-@@ -33,7 +32,7 @@ DISTDIR= ../libsnet-${VERSION}
- $(LIBTOOL) --mode=compile \
- $(CC) -c $(CFLAGS) $<
- @if test x_$(PROFILED) = x_true ; then echo "building profiled $@" ; \
-- ( mkdir -p profiled; cd profiled ; ../$(LIBTOOL) --mode=compile \
-+ ( mkdir -p profiled; cd profiled ; $(LIBTOOL) --mode=compile \
- $(CC) -c $(CFLAGS) -p -I.. -I$(srcdir) `if [ -f $< ]; then echo $<; \
- else echo ../$<; fi` >/dev/null 2>&1 ) ; fi
-
-@@ -41,7 +40,7 @@ DISTDIR= ../libsnet-${VERSION}
- $(LIBTOOL) --mode=compile \
- $(CC) -c $(CFLAGS) $<
- @if test x_$(PROFILED) = x_true ; then echo "building profiled $@" ; \
-- ( mkdir -p profiled; cd profiled ; ../$(LIBTOOL) --mode=compile \
-+ ( mkdir -p profiled; cd profiled ; $(LIBTOOL) --mode=compile \
- $(CC) -c $(CFLAGS) -p -I.. -I$(srcdir) `if [ -f $< ]; then echo $<; \
- else echo ../$<; fi` >/dev/null 2>&1 ) ; fi
-
-@@ -50,9 +49,9 @@ all: libsnet.la
-
libsnet.la: $(OBJ) $(LOBJ)
$(LIBTOOL) --mode=link \
- $(CC) -o libsnet.la $(LOBJ) -rpath $(libdir) -version-info 0:0:0
+ $(CC) -o libsnet.la $(LOBJ) -version-info 0:0:0
@if test x_$(PROFILED) = x_true ; then echo "building profiled $@" ; \
-- ( cd profiled ; ../$(LIBTOOL) --mode=link \
-+ ( cd profiled ; $(LIBTOOL) --mode=link \
+ ( cd profiled ; ../$(LIBTOOL) --mode=link \
$(CC) -o libsnet_p.la $(LOBJ) -rpath $(libdir) \
- -version-info 0:0:0 >/dev/null 2>&1 ) ; fi
-
-@@ -66,7 +65,7 @@ install: all
- $(INSTALL) -c -m 644 libsnet.la $(libdir)/libsnet.la
- @if test x_$(PROFILED) = x_true ; then \
- echo "installing profiled libraries" ; \
-- ( cd profiled ; ../$(LIBTOOL) --mode=install \
-+ ( cd profiled ; $(LIBTOOL) --mode=install \
- $(INSTALL) -c -m 644 libsnet_p.la \
- $(libdir)/libsnet_p.la >/dev/null 2>&1 ) ; fi
-
diff -Naur -x CVS ../radmind/patches/patch-libsnet_snet_c
./patches/patch-libsnet_snet_c
--- ../radmind/patches/patch-libsnet_snet_c Sat Jun 26 14:00:48 2004
+++ ./patches/patch-libsnet_snet_c Tue Apr 3 06:52:00 2007
@@ -1,7 +1,7 @@
$OpenBSD: patch-libsnet_snet_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
---- libsnet/snet.c.orig 2004-06-16 15:43:18.000000000 -0400
-+++ libsnet/snet.c 2004-06-16 15:54:07.000000000 -0400
-@@ -217,8 +217,11 @@ modifier:
+--- libsnet/snet.c.orig Mon Feb 19 16:10:13 2007
++++ libsnet/snet.c Sun Mar 18 12:15:14 2007
+@@ -274,8 +274,11 @@ modifier:
p = va_arg( vl, char * );
len = strlen( p );
SNET_WBUFGROW( len );
diff -Naur -x CVS ../radmind/patches/patch-lmerge_c ./patches/patch-lmerge_c
--- ../radmind/patches/patch-lmerge_c Tue Jan 25 18:33:30 2005
+++ ./patches/patch-lmerge_c Tue Apr 3 06:52:00 2007
@@ -1,7 +1,7 @@
$OpenBSD: patch-lmerge_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
---- lmerge.c.orig Thu Jan 20 13:05:15 2005
-+++ lmerge.c Thu Jan 20 13:07:16 2005
-@@ -47,7 +47,7 @@ create_node( char *path )
+--- lmerge.c.orig Tue Feb 7 12:22:17 2006
++++ lmerge.c Sun Mar 18 12:15:14 2007
+@@ -48,7 +48,7 @@ create_node( char *path )
fprintf( stderr, "%s: path too long\n", path );
return( NULL );
}
@@ -10,7 +10,7 @@
return( new_node );
}
-@@ -143,7 +143,7 @@ getline:
+@@ -144,7 +144,7 @@ getline:
tran->t_tran_name, tran->t_linenum, d_path );
return( 1 );
}
@@ -19,7 +19,7 @@
/* Check transcript order */
if ( tran->t_prepath != 0 ) {
-@@ -158,7 +158,7 @@ getline:
+@@ -161,7 +161,7 @@ getline:
tran->t_tran_name, tran->t_linenum, tran->t_filepath );
return( 1 );
}
@@ -28,7 +28,7 @@
return( 0 );
-@@ -310,17 +310,17 @@ main( int argc, char **argv )
+@@ -316,17 +316,17 @@ main( int argc, char **argv )
fprintf( stderr, "%s: path too long\n", trans[ 1 ]->t_file_root );
exit( 2 );
}
@@ -49,7 +49,7 @@
} else {
/* Create tran if missing */
if (( ofd = open( argv[ argc - 1 ], O_WRONLY | O_CREAT, 0666 ) ) < 0 ) {
-@@ -338,7 +338,7 @@ main( int argc, char **argv )
+@@ -344,7 +344,7 @@ main( int argc, char **argv )
fprintf( stderr, "%s: path too long\n", argv[ argc - 1 ] );
exit( 2 );
}
@@ -58,7 +58,7 @@
} else {
if ( snprintf( temp, MAXPATHLEN, "%s/%s", cwd, argv[ argc - 1 ] )
> MAXPATHLEN - 1 ) {
-@@ -346,7 +346,7 @@ main( int argc, char **argv )
+@@ -352,7 +352,7 @@ main( int argc, char **argv )
argv[ argc - 1 ] );
exit( 2 );
}
diff -Naur -x CVS ../radmind/patches/patch-lsize_c ./patches/patch-lsize_c
--- ../radmind/patches/patch-lsize_c Wed Dec 31 18:00:00 1969
+++ ./patches/patch-lsize_c Tue Apr 3 06:52:00 2007
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- lsize.c.orig Mon Mar 26 12:59:06 2007
++++ lsize.c Mon Mar 26 12:59:55 2007
+@@ -223,11 +223,11 @@ main( int ac, char *av[] )
+ fprintf( stderr, "%s: path too long\n", path );
+ exit( 2 );
+ }
+- strcpy( kdir, path );
++ (void)strlcpy( kdir, path, sizeof(kdir) );
+
+ if (( p = strrchr( kdir, '/' )) == NULL ) {
+ /* use working directory */
+- strcpy( kdir, "./" );
++ (void)strlcpy( kdir, "./", sizeof(kdir) );
+ } else {
+ p++;
+ *p = (char)'\0';
diff -Naur -x CVS ../radmind/patches/patch-progress_c ./patches/patch-progress_c
--- ../radmind/patches/patch-progress_c Sun Apr 1 02:08:39 2007
+++ ./patches/patch-progress_c Tue Apr 3 06:52:00 2007
@@ -1,6 +1,6 @@
-$OpenBSD: patch-progress_c,v 1.2 2007/04/01 07:08:39 steven Exp $
---- progress.c.orig Fri Oct 1 17:20:04 2004
-+++ progress.c Sun Apr 1 08:18:32 2007
+$OpenBSD: patch-progress_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
+--- progress.c.orig Thu Jan 20 13:07:27 2005
++++ progress.c Thu Jan 20 13:08:00 2005
@@ -39,7 +39,7 @@ loadsetsize( FILE *tran )
while ( fgets( tline, LINE_MAX, tran ) != NULL ) {
@@ -19,7 +19,7 @@
/* skip empty lines and transcript marker lines */
if (( tac = argcargv( tline, &targv )) <= 1 ) {
continue;
-@@ -113,7 +113,7 @@ lcksum_loadsetsize( FILE *tran, char *prefix )
+@@ -113,7 +113,7 @@ lcksum_loadsetsize( FILE *tran, char *pr
while ( fgets( tline, LINE_MAX, tran ) != NULL ) {
linenum++;
diff -Naur -x CVS ../radmind/patches/patch-ra_sh ./patches/patch-ra_sh
--- ../radmind/patches/patch-ra_sh Sat Mar 26 10:36:26 2005
+++ ./patches/patch-ra_sh Tue Apr 3 06:52:00 2007
@@ -1,16 +1,16 @@
$OpenBSD: patch-ra_sh,v 1.1 2005/03/26 16:36:26 alek Exp $
---- ra.sh.orig Thu Feb 10 13:17:57 2005
-+++ ra.sh Wed Mar 9 11:44:29 2005
-@@ -23,7 +23,7 @@
- SERVER="_RADMIND_HOST"
- TLSLEVEL="_RADMIND_AUTHLEVEL"
+--- ra.sh.orig Tue Feb 27 10:20:09 2007
++++ ra.sh Sun Mar 18 12:20:00 2007
+@@ -29,7 +29,7 @@ TLSLEVEL="_RADMIND_AUTHLEVEL"
EDITOR=${EDITOR:-vi}
+ USER=${SUDO_USER:-$USER}
+ TMPDIR="${TMPDIR:=/tmp}"
-DEFAULTS="/etc/defaults/radmind"
+DEFAULTS="SYSCONFDIR/defaults/radmind"
FSDIFFROOT="."
FLAG="_RADMIND_DIR/client/.RadmindRunning"
CHECKEDOUT="_RADMIND_DIR/client/.CheckedOut"
-@@ -51,9 +51,9 @@ FTMP="${TMPDIR}/fsdiff.out"
+@@ -57,9 +57,9 @@ FTMP="${RASHTMP}/fsdiff.out"
# different systems use different default dirs
if [ ! -f "${DEFAULTS}" ]; then
diff -Naur -x CVS ../radmind/patches/patch-repo_c ./patches/patch-repo_c
--- ../radmind/patches/patch-repo_c Wed Dec 31 18:00:00 1969
+++ ./patches/patch-repo_c Tue Apr 3 06:52:00 2007
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- repo.c.orig Mon Mar 26 13:01:07 2007
++++ repo.c Mon Mar 26 13:03:15 2007
+@@ -168,7 +168,7 @@ main( int argc, char *argv[] )
+ fprintf( stderr, "%s: too long\n", argv[ optind ] );
+ exit( 2 );
+ }
+- strcpy( repodata, argv[ optind ] );
++ (void)strlcpy( repodata, argv[ optind ], sizeof(repodata) );
+
+ /* Skip first token in message */
+ i = 1;
+@@ -178,8 +178,8 @@ main( int argc, char *argv[] )
+ fprintf( stderr, "%s %s: too long\n", repodata, argv[ i ] );
+ exit( 2 );
+ }
+- strcat( repodata, " " );
+- strcat( repodata, argv[ i ] );
++ (void)strlcat( repodata, " ", sizeof(repodata) );
++ (void)strlcat( repodata, argv[ i ], sizeof(repodata) );
+ }
+ }
+
diff -Naur -x CVS ../radmind/patches/patch-root_c ./patches/patch-root_c
--- ../radmind/patches/patch-root_c Sun Apr 1 02:08:39 2007
+++ ./patches/patch-root_c Tue Apr 3 06:52:00 2007
@@ -1,7 +1,7 @@
-$OpenBSD: patch-root_c,v 1.3 2007/04/01 07:08:39 steven Exp $
---- root.c.orig Fri Jan 14 15:53:27 2005
-+++ root.c Sun Apr 1 08:18:32 2007
-@@ -33,7 +33,7 @@ get_root( char *radmind_path, char *path, char *file_r
+$OpenBSD: patch-root_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
+--- root.c.orig Fri Jan 20 16:27:27 2006
++++ root.c Sun Mar 18 12:15:14 2007
+@@ -35,7 +35,7 @@ get_root( char *radmind_path, char *path
fprintf( stderr, "%s: path too long\n", p );
return( -1 );
}
@@ -10,7 +10,7 @@
if ( snprintf( test_path, MAXPATHLEN, "%s/tmp/transcript",
radmind_real_path ) > MAXPATHLEN - 1 ) {
-@@ -81,8 +81,8 @@ get_root( char *radmind_path, char *path, char *file_r
+@@ -83,8 +83,8 @@ get_root( char *radmind_path, char *path
return( -1 );
}
} else {
diff -Naur -x CVS ../radmind/patches/patch-stor_c ./patches/patch-stor_c
--- ../radmind/patches/patch-stor_c Sun Apr 1 02:08:39 2007
+++ ./patches/patch-stor_c Tue Apr 3 06:52:01 2007
@@ -1,7 +1,7 @@
-$OpenBSD: patch-stor_c,v 1.3 2007/04/01 07:08:39 steven Exp $
---- stor.c.orig Fri Oct 1 17:20:05 2004
-+++ stor.c Sun Apr 1 08:18:32 2007
-@@ -464,11 +464,13 @@ n_stor_applefile( SNET *sn, char *pathdesc, char *path
+$OpenBSD: patch-stor_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
+--- stor.c.orig Sat May 6 18:07:45 2006
++++ stor.c Sun Mar 18 12:21:33 2007
+@@ -482,11 +482,13 @@ n_stor_applefile( SNET *sn, char *pathde
struct timeval tv;
struct applefileinfo afinfo;
off_t size;
@@ -10,9 +10,9 @@
/* Setup fake apple file info */
/* Finder Info */
memset( &afinfo, 0, sizeof( afinfo ));
-- sprintf( afinfo.ai.ai_data + FI_CREATOR_OFFSET, "%s", "RDMD" );
+- sprintf( (char *)(afinfo.ai.ai_data + FI_CREATOR_OFFSET), "%s", "RDMD" );
+ len = sizeof( afinfo.ai.ai_data );
-+ (void)snprintf( afinfo.ai.ai_data + FI_CREATOR_OFFSET, len -
FI_CREATOR_OFFSET, "%s", "RDMD" );
++ (void)snprintf( (char *)(afinfo.ai.ai_data + FI_CREATOR_OFFSET), len -
FI_CREATOR_OFFSET, "%s", "RDMD" );
afinfo.as_ents[AS_FIE].ae_id = ASEID_FINFO;
afinfo.as_ents[AS_FIE].ae_offset = AS_HEADERLEN +
( 3 * sizeof( struct as_entry )); /* 62 */
diff -Naur -x CVS ../radmind/patches/patch-transcript_c
./patches/patch-transcript_c
--- ../radmind/patches/patch-transcript_c Sun Apr 1 02:08:39 2007
+++ ./patches/patch-transcript_c Tue Apr 3 06:52:01 2007
@@ -1,7 +1,7 @@
-$OpenBSD: patch-transcript_c,v 1.3 2007/04/01 07:08:39 steven Exp $
---- transcript.c.orig Thu Jan 20 23:44:35 2005
-+++ transcript.c Sun Apr 1 08:18:32 2007
-@@ -105,7 +105,7 @@ transcript_parse( struct transcript *tran )
+$OpenBSD: patch-transcript_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
+--- transcript.c.orig Thu Feb 22 10:33:35 2007
++++ transcript.c Sun Mar 18 12:23:03 2007
+@@ -106,7 +106,7 @@ transcript_parse( struct transcript *tra
exit( 2 );
}
@@ -10,7 +10,7 @@
/* reading and parsing the line */
switch( *argv[ 0 ] ) {
-@@ -175,7 +175,7 @@ transcript_parse( struct transcript *tran )
+@@ -176,7 +176,7 @@ transcript_parse( struct transcript *tra
tran->t_fullname, tran->t_linenum );
exit( 2 );
}
@@ -19,7 +19,7 @@
break;
case 'a': /* hfs applefile */
-@@ -197,7 +197,7 @@ transcript_parse( struct transcript *tran )
+@@ -198,7 +198,7 @@ transcript_parse( struct transcript *tra
exit( 2 );
}
}
@@ -28,14 +28,16 @@
break;
default:
-@@ -615,17 +615,17 @@ transcript( char *path )
- }
- }
-
+@@ -629,7 +629,7 @@ transcript( char *path, struct stat *st,
+ * exhausted, to consume any remaining transcripts.
+ */
+ if ( path != NULL ) {
- strcpy( pi.pi_name, path );
+ (void)strlcpy( pi.pi_name, path, sizeof( pi.pi_name ) );
-
- /* if it's multiply referenced, check if it's a hardlink */
+ pi.pi_stat = *st;
+ pi.pi_type = *type;
+ pi.pi_afinfo = *afinfo;
+@@ -638,11 +638,11 @@ transcript( char *path, struct stat *st,
if ( !S_ISDIR( pi.pi_stat.st_mode ) && ( pi.pi_stat.st_nlink > 1 ) &&
(( linkpath = hardlink( &pi )) != NULL )) {
pi.pi_type = 'h';
@@ -49,7 +51,7 @@
}
/* By default, go into directories */
-@@ -636,7 +636,7 @@ transcript( char *path )
+@@ -653,7 +653,7 @@ transcript( char *path, struct stat *st,
}
/* initialize cksum field. */
@@ -58,8 +60,8 @@
}
for (;;) {
-@@ -685,9 +685,9 @@ t_new( int type, char *fullname, char *shortname, char
- } else {
+@@ -706,9 +706,9 @@ t_new( int type, char *fullname, char *s
+ case T_SPECIAL :
new->t_eof = 0;
new->t_linenum = 0;
- strcpy( new->t_shortname, shortname );
@@ -71,7 +73,7 @@
if (( new->t_in = fopen( fullname, "r" )) == NULL ) {
perror( fullname );
exit( 2 );
-@@ -752,7 +752,7 @@ transcript_init( char *kfile, int location )
+@@ -782,7 +782,7 @@ transcript_init( char *kfile, int locati
"special path too long: %s%s\n", kdir, special );
exit( 2 );
}
diff -Naur -x CVS ../radmind/pkg/PLIST ./pkg/PLIST
--- ../radmind/pkg/PLIST Tue Jan 25 18:33:30 2005
+++ ./pkg/PLIST Tue Apr 3 06:52:01 2007
@@ -6,7 +6,9 @@
bin/lcreate
bin/lfdiff
bin/lmerge
+bin/lsort
bin/ra.sh
+bin/repo
bin/twhich
@man man/man1/fsdiff.1
@man man/man1/ktcheck.1
@@ -15,8 +17,16 @@
@man man/man1/lcreate.1
@man man/man1/lfdiff.1
@man man/man1/lmerge.1
[EMAIL PROTECTED] man/man1/lsort.1
[EMAIL PROTECTED] man/man1/rash.1
[EMAIL PROTECTED] man/man1/repo.1
@man man/man1/twhich.1
@man man/man5/applefile.5
@man man/man8/radmind.8
sbin/radmind
[EMAIL PROTECTED] /var/radmind/
[EMAIL PROTECTED] /var/radmind/cert/
[EMAIL PROTECTED] /var/radmind/client/
[EMAIL PROTECTED] /var/radmind/postapply/
[EMAIL PROTECTED] /var/radmind/preapply/
@extraunexec rm -fr /var/radmind
