cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update radmind to 1.9.0

Browse Source 
from William Yodlowsky (MAINTAINER)
This commit is contained in:
jasper 2007-09-04 20:52:13 +00:00
parent 8cb163deaf
commit 2114697ef0
24 changed files with 273 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sysutils/radmind/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2007/04/01 07:08:39 steven Exp $
# $OpenBSD: Makefile,v 1.9 2007/09/04 20:52:13 jasper Exp $
COMMENT= "remote administration software"
COMMENT= remote administration software
DISTNAME= radmind-1.5.0
DISTNAME= radmind-1.9.0
CATEGORIES= sysutils
HOMEPAGE= http://rsug.itd.umich.edu/software/radmind/
@ -14,15 +14,16 @@ PERMIT_PACKAGE_CDROM= Yes
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>

10
sysutils/radmind/distinfo
View File

@ -1,5 +1,5 @@
MD5 (radmind-1.5.0.tgz) = xjb1wnzsKutNADGhTZGv9Q==
RMD160 (radmind-1.5.0.tgz) = e2heNXxF5AuyOMaEgqvkZ9gHMDA=
SHA1 (radmind-1.5.0.tgz) = 7mhRJro4r6NGSfHRW8Lfql0OYpQ=
SHA256 (radmind-1.5.0.tgz) = jKyVozh0dM1j2hRSkfqmUXy6wc2k1JYVNKWmL0amjsw=
SIZE (radmind-1.5.0.tgz) = 341574
MD5 (radmind-1.9.0.tar.gz) = PY61h5txVA7y5dyumj/1TQ==
RMD160 (radmind-1.9.0.tar.gz) = Fkj1tCP+h+E5avfTskAhkQZxhkw=
SHA1 (radmind-1.9.0.tar.gz) = VjJH5vnnlaPY8IaKomG6GKSiTVo=
SHA256 (radmind-1.9.0.tar.gz) = oQcL29J2L4sfjpyDGYQTk5zEJZT0SiFdqRfVq9HLuME=
SIZE (radmind-1.9.0.tar.gz) = 389258

36
sysutils/radmind/patches/patch-Makefile_in
View File

@ -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.5 2007/09/04 20:52:13 jasper Exp $
--- Makefile.in.orig Mon Jun 18 17:02:05 2007
+++ Makefile.in Wed Jul 18 09:43:02 2007
@@ -11,6 +11,7 @@ exec_prefix=@exec_prefix@
MANDIR=@mandir@
BINDIR=@bindir@
@ -9,36 +9,36 @@ $OpenBSD: patch-Makefile_in,v 1.4 2007/04/01 07:08:39 steven Exp $
# For server
RADMINDDIR=@radminddir@
@@ -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
@@ -89,7 +90,7 @@ TWHICH_OBJ= version.o twhich.o argcargv.o transcri
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 's@_RADMIND_DIR@${RADMINDDIR}@g' \
-e 's@_RADMIND_MAIL_DOMAIN@${RADMIND_MAIL_DOMAIN}@g' \
-e 's@_RADMIND_VERSION@${VERSION}@g' \
@@ -254,6 +255,7 @@ rash : FRC
-e 's@_RADMIND_COMMANDFILE@${COMMANDFILE}@g' \
-e 's@_RADMIND_VERSION@$(shell cat VERSION)@g' \
-e 's@_RADMIND_ECHO_PATH@${ECHO}@g' \
+ -e 's@SYSCONFDIR@${SYSCONFDIR}@g' \
${srcdir}/ra.sh > tmp/ra.sh;
man : FRC
@@ -240,7 +242,7 @@ man : FRC
@@ -271,7 +273,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}/
@@ -298,6 +300,7 @@ install : all man rash
-mkdir -p ${DESTDIR}/${PREAPPLYDIR}
-mkdir -p ${DESTDIR}/${POSTAPPLYDIR}
-mkdir -p ${DESTDIR}/${CERTDIR}
+ rm -rf tmp/
PKGNAME=RadmindTools-${VERSION}

18
sysutils/radmind/patches/patch-command_c
View File

@ -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.4 2007/09/04 20:52:13 jasper 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 @@ $OpenBSD: patch-command_c,v 1.3 2007/04/01 07:08:39 steven Exp $
/* 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 @@ $OpenBSD: patch-command_c,v 1.3 2007/04/01 07:08:39 steven Exp $
/* 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 @@ $OpenBSD: patch-command_c,v 1.3 2007/04/01 07:08:39 steven Exp $
} 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 @@ $OpenBSD: patch-command_c,v 1.3 2007/04/01 07:08:39 steven Exp $
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 @@ $OpenBSD: patch-command_c,v 1.3 2007/04/01 07:08:39 steven Exp $
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;
}

12
sysutils/radmind/patches/patch-connect_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-connect_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
--- connect.c.orig Wed Jul 18 09:50:13 2007
+++ connect.c Wed Jul 18 09:50:40 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 );

24
sysutils/radmind/patches/patch-fsdiff_c
View File

@ -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.4 2007/09/04 20:52:13 jasper Exp $
--- fsdiff.c.orig Sat May 6 18:13:18 2006
+++ fsdiff.c Wed Jul 18 09:41:16 2007
@@ -111,7 +111,7 @@ fs_walk( char *path, struct stat *st, char *type, stru
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;

6
sysutils/radmind/patches/patch-hardlink_c
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-hardlink_c,v 1.3 2007/09/04 20:52:13 jasper Exp $
--- hardlink.c.orig Tue May 20 18:23:11 2003
+++ hardlink.c Wed Jul 18 09:41:16 2007
@@ -79,6 +79,7 @@ d_insert( struct devlist **dev_head, struct pathinfo *
i_insert( struct devlist *dev_head, struct pathinfo *pinfo )
{

23
sysutils/radmind/patches/patch-ktcheck_c
View File

@ -1,7 +1,16 @@
$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.3 2007/09/04 20:52:13 jasper Exp $
--- ktcheck.c.orig Mon Jun 18 15:25:46 2007
+++ ktcheck.c Wed Jul 18 10:32:55 2007
@@ -238,7 +238,7 @@ clean_client_dir( void )
* can't pass in kdir, since it has a trailing slash.
* bounds checking done when creating kdir in main().
*/
- strcpy( dir, kdir );
+ (void)strlcpy( dir, kdir, sizeof( dir ) );
if (( p = strrchr( dir, '/' )) != NULL ) {
*p = '\0';
}
@@ -282,7 +282,7 @@ getstat( SNET *sn, char *description, char *stats )
fprintf( stderr, "%s: line too long\n", line );
return( -1 );
}
@ -10,7 +19,7 @@ $OpenBSD: patch-ktcheck_c,v 1.2 2007/04/01 07:08:39 steven Exp $
if ( verbose ) printf( "<<< %s\n", stats );
@@ -253,7 +253,7 @@ check( SNET *sn, char *type, char *file )
@@ -433,7 +433,7 @@ check( SNET *sn, char *type, char *file )
fprintf( stderr, "%s: too long\n", type );
return( 2 );
}
@ -19,7 +28,7 @@ $OpenBSD: patch-ktcheck_c,v 1.2 2007/04/01 07:08:39 steven Exp $
file = base_kfile;
@@ -262,7 +262,7 @@ check( SNET *sn, char *type, char *file )
@@ -442,7 +442,7 @@ check( SNET *sn, char *type, char *file )
fprintf( stderr, "%s: path too long\n", base_kfile );
return( 2 );
}
@ -28,7 +37,7 @@ $OpenBSD: patch-ktcheck_c,v 1.2 2007/04/01 07:08:39 steven Exp $
}
if ( getstat( sn, (char *)&pathdesc, stats ) != 0 ) {
@@ -505,7 +505,7 @@ main( int argc, char **argv )
@@ -705,7 +705,7 @@ main( int argc, char **argv )
p++;
*p = (char)'\0';
}

20
sysutils/radmind/patches/patch-lapply_c
View File

@ -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.4 2007/09/04 20:52:13 jasper Exp $
--- lapply.c.orig Mon Jun 18 15:25:46 2007
+++ lapply.c Wed Jul 18 09:41:16 2007
@@ -84,7 +84,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 @@ $OpenBSD: patch-lapply_c,v 1.3 2007/04/01 07:08:39 steven Exp $
new_node->doline = 1;
} else {
new_node->doline = 0;
@@ -126,7 +126,7 @@ do_line( char *tline, int present, struct stat *st, SN
@@ -128,7 +128,7 @@ do_line( char *tline, int present, struct stat *st, SN
fprintf( stderr, "line %d: too long\n", linenum );
return( 1 );
}
@ -19,7 +19,7 @@ $OpenBSD: patch-lapply_c,v 1.3 2007/04/01 07:08:39 steven Exp $
/* DOWNLOAD */
if ( *command == '+' ) {
@@ -135,7 +135,7 @@ do_line( char *tline, int present, struct stat *st, SN
@@ -137,7 +137,7 @@ do_line( char *tline, int present, struct stat *st, SN
linenum, *targv[ 0 ] );
return( 1 );
}
@ -28,7 +28,7 @@ $OpenBSD: patch-lapply_c,v 1.3 2007/04/01 07:08:39 steven Exp $
if ( special ) {
if ( snprintf( pathdesc, MAXPATHLEN * 2, "SPECIAL %s",
@@ -415,7 +415,7 @@ main( int argc, char **argv )
@@ -463,7 +463,7 @@ main( int argc, char **argv )
fprintf( stderr, "line %d: too long\n", linenum );
goto error2;
}
@ -37,7 +37,7 @@ $OpenBSD: patch-lapply_c,v 1.3 2007/04/01 07:08:39 steven Exp $
tac = acav_parse( acav, targvline, &targv );
@@ -425,7 +425,7 @@ main( int argc, char **argv )
@@ -473,7 +473,7 @@ main( int argc, char **argv )
}
if ( tac == 1 ) {
@ -46,7 +46,7 @@ $OpenBSD: patch-lapply_c,v 1.3 2007/04/01 07:08:39 steven Exp $
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 )
@@ -515,7 +515,7 @@ main( int argc, char **argv )
fprintf( stderr, "line %d: too long\n", linenum );
return( 1 );
}
@ -55,7 +55,7 @@ $OpenBSD: patch-lapply_c,v 1.3 2007/04/01 07:08:39 steven Exp $
/* Check transcript order */
if ( prepath != 0 ) {
@@ -482,7 +482,7 @@ main( int argc, char **argv )
@@ -530,7 +530,7 @@ main( int argc, char **argv )
transcript, linenum );
goto error2;
}

18
sysutils/radmind/patches/patch-lcksum_c
View File

@ -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 )
$OpenBSD: patch-lcksum_c,v 1.3 2007/09/04 20:52:13 jasper Exp $
--- 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 @@ $OpenBSD: patch-lcksum_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
}
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 @@ $OpenBSD: patch-lcksum_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
/* 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 ],

48
sysutils/radmind/patches/patch-libsnet_Makefile_in
View File

@ -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.3 2007/09/04 20:52:13 jasper 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 @@ $OpenBSD: patch-libsnet_Makefile_in,v 1.2 2007/04/01 07:08:39 steven Exp $
PROFILED= @PROFILED@
CC= @CC@
INSTALL= @INSTALL@
AWK= @AWK@
-LIBTOOL= ./libtool --quiet
TAGSFILE= tags
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
@@ -50,7 +50,7 @@ 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

8
sysutils/radmind/patches/patch-libsnet_snet_c
View File

@ -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:
$OpenBSD: patch-libsnet_snet_c,v 1.2 2007/09/04 20:52:13 jasper Exp $
--- 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 );

18
sysutils/radmind/patches/patch-lmerge_c
View File

@ -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 )
$OpenBSD: patch-lmerge_c,v 1.2 2007/09/04 20:52:13 jasper Exp $
--- 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 @@ $OpenBSD: patch-lmerge_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
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 @@ $OpenBSD: patch-lmerge_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
/* 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 @@ $OpenBSD: patch-lmerge_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
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 @@ $OpenBSD: patch-lmerge_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
} 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 @@ $OpenBSD: patch-lmerge_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
} 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 );
}

17
sysutils/radmind/patches/patch-lsize_c Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-lsize_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
--- lsize.c.orig Wed Jul 18 09:50:46 2007
+++ lsize.c Wed Jul 18 09:51:15 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';

16
sysutils/radmind/patches/patch-patch-connect_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-patch-connect_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
--- patch-connect_c.orig Wed Jul 18 09:47:33 2007
+++ patch-connect_c Wed Jul 18 09:47:34 2007
@@ -0,0 +1,12 @@
+$OpenBSD: patch-patch-connect_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
+--- connect.c.orig Fri Jul 13 20:58:35 2007
++++ connect.c Fri Jul 13 20:57:13 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 );

21
sysutils/radmind/patches/patch-patch-lsize_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-patch-lsize_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
--- patch-lsize_c.orig Wed Jul 18 09:47:42 2007
+++ patch-lsize_c Wed Jul 18 09:47:42 2007
@@ -0,0 +1,17 @@
+$OpenBSD: patch-patch-lsize_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
+--- lsize.c.orig Fri Jul 13 20:58:48 2007
++++ lsize.c Fri Jul 13 20:59:22 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';

27
sysutils/radmind/patches/patch-patch-repo_c Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-patch-repo_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
--- patch-repo_c.orig Wed Jul 18 09:47:51 2007
+++ patch-repo_c Wed Jul 18 09:47:51 2007
@@ -0,0 +1,23 @@
+$OpenBSD: patch-patch-repo_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
+--- repo.c.orig Fri Jul 13 21:04:06 2007
++++ repo.c Fri Jul 13 21:04:08 2007
+@@ -169,7 +169,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;
+@@ -179,8 +179,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 ) );
+ }
+ }
+

6
sysutils/radmind/patches/patch-progress_c
View File

@ -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.3 2007/09/04 20:52:13 jasper Exp $
--- progress.c.orig Fri Oct 1 11:20:04 2004
+++ progress.c Wed Jul 18 09:41:16 2007
@@ -39,7 +39,7 @@ loadsetsize( FILE *tran )
while ( fgets( tline, LINE_MAX, tran ) != NULL ) {

14
sysutils/radmind/patches/patch-ra_sh
View File

@ -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"
$OpenBSD: patch-ra_sh,v 1.2 2007/09/04 20:52:13 jasper Exp $
--- ra.sh.orig Mon Jun 18 17:01:07 2007
+++ ra.sh Wed Jul 18 09:41:17 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"
@@ -58,9 +58,9 @@ FTMP="${RASHTMP}/fsdiff.out"
# different systems use different default dirs
if [ ! -f "${DEFAULTS}" ]; then

23
sysutils/radmind/patches/patch-repo_c Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-repo_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
--- repo.c.orig Wed Jul 18 09:51:21 2007
+++ repo.c Wed Jul 18 09:52:10 2007
@@ -169,7 +169,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;
@@ -179,8 +179,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 ) );
}
}

10
sysutils/radmind/patches/patch-root_c
View File

@ -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.4 2007/09/04 20:52:13 jasper Exp $
--- root.c.orig Fri Jan 20 16:27:27 2006
+++ root.c Wed Jul 18 09:41:17 2007
@@ -35,7 +35,7 @@ get_root( char *radmind_path, char *path, char *file_r
fprintf( stderr, "%s: path too long\n", p );
return( -1 );
}
@ -10,7 +10,7 @@ $OpenBSD: patch-root_c,v 1.3 2007/04/01 07:08:39 steven Exp $
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, char *file_r
return( -1 );
}
} else {

12
sysutils/radmind/patches/patch-stor_c
View File

@ -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.4 2007/09/04 20:52:13 jasper Exp $
--- stor.c.orig Sat May 6 18:07:45 2006
+++ stor.c Wed Jul 18 09:41:17 2007
@@ -482,11 +482,13 @@ n_stor_applefile( SNET *sn, char *pathdesc, char *path
struct timeval tv;
struct applefileinfo afinfo;
off_t size;
@ -10,9 +10,9 @@ $OpenBSD: patch-stor_c,v 1.3 2007/04/01 07:08:39 steven Exp $
/* 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 */

34
sysutils/radmind/patches/patch-transcript_c
View File

@ -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.4 2007/09/04 20:52:13 jasper Exp $
--- transcript.c.orig Thu May 31 17:26:47 2007
+++ transcript.c Wed Jul 18 09:41:17 2007
@@ -108,7 +108,7 @@ transcript_parse( struct transcript *tran )
exit( 2 );
}
@ -10,7 +10,7 @@ $OpenBSD: patch-transcript_c,v 1.3 2007/04/01 07:08:39 steven Exp $
/* reading and parsing the line */
switch( *argv[ 0 ] ) {
@@ -175,7 +175,7 @@ transcript_parse( struct transcript *tran )
@@ -178,7 +178,7 @@ transcript_parse( struct transcript *tran )
tran->t_fullname, tran->t_linenum );
exit( 2 );
}
@ -19,7 +19,7 @@ $OpenBSD: patch-transcript_c,v 1.3 2007/04/01 07:08:39 steven Exp $
break;
case 'a': /* hfs applefile */
@@ -197,7 +197,7 @@ transcript_parse( struct transcript *tran )
@@ -200,7 +200,7 @@ transcript_parse( struct transcript *tran )
exit( 2 );
}
}
@ -28,14 +28,16 @@ $OpenBSD: patch-transcript_c,v 1.3 2007/04/01 07:08:39 steven Exp $
break;
default:
@@ -615,17 +615,17 @@ transcript( char *path )
}
}
@@ -631,7 +631,7 @@ transcript( char *path, struct stat *st, char *type, s
* 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;
@@ -640,11 +640,11 @@ transcript( char *path, struct stat *st, char *type, s
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 @@ $OpenBSD: patch-transcript_c,v 1.3 2007/04/01 07:08:39 steven Exp $
}
/* By default, go into directories */
@@ -636,7 +636,7 @@ transcript( char *path )
@@ -655,7 +655,7 @@ transcript( char *path, struct stat *st, char *type, s
}
/* initialize cksum field. */
@ -58,8 +60,8 @@ $OpenBSD: patch-transcript_c,v 1.3 2007/04/01 07:08:39 steven Exp $
}
for (;;) {
@@ -685,9 +685,9 @@ t_new( int type, char *fullname, char *shortname, char
} else {
@@ -708,9 +708,9 @@ t_new( int type, char *fullname, char *shortname, char
case T_SPECIAL :
new->t_eof = 0;
new->t_linenum = 0;
- strcpy( new->t_shortname, shortname );
@ -71,7 +73,7 @@ $OpenBSD: patch-transcript_c,v 1.3 2007/04/01 07:08:39 steven Exp $
if (( new->t_in = fopen( fullname, "r" )) == NULL ) {
perror( fullname );
exit( 2 );
@@ -752,7 +752,7 @@ transcript_init( char *kfile, int location )
@@ -844,7 +844,7 @@ transcript_init( char *kfile, int location )
"special path too long: %s%s\n", kdir, special );
exit( 2 );
}

12
sysutils/radmind/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2005/01/26 00:33:30 pvalchev Exp $
@comment $OpenBSD: PLIST,v 1.4 2007/09/04 20:52:13 jasper Exp $
bin/fsdiff
bin/ktcheck
bin/lapply
@ -6,7 +6,9 @@ bin/lcksum
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 @@ bin/twhich
@man man/man1/lcreate.1
@man man/man1/lfdiff.1
@man man/man1/lmerge.1
@man man/man1/lsort.1
@man man/man1/rash.1
@man man/man1/repo.1
@man man/man1/twhich.1
@man man/man5/applefile.5
@man man/man8/radmind.8
sbin/radmind
@sample /var/radmind/
@sample /var/radmind/cert/
@sample /var/radmind/client/
@sample /var/radmind/postapply/
@sample /var/radmind/preapply/
@extraunexec rm -fr /var/radmind