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

USE_LIBTOOL, regen patches

Browse Source
This commit is contained in:
steven 2007-04-01 07:08:39 +00:00
parent 9294c00b21
commit acf2447876
12 changed files with 100 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/radmind/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2005/03/26 16:36:26 alek Exp $
# $OpenBSD: Makefile,v 1.8 2007/04/01 07:08:39 steven Exp $
COMMENT= "remote administration software"
@ -19,6 +19,8 @@ WANTLIB= c crypto ssl
MASTER_SITES= http://rsug.itd.umich.edu/software/radmind/files/
EXTRACT_SUFX= .tgz
USE_LIBTOOL= Yes
LIBTOOL_FLAGS= --tag=disable-shared
CONFIGURE_STYLE=gnu dest
CONFIGURE_ARGS+=--with-radminddir='$${${DESTDIRNAME}}/var/radmind'
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/libsnet

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

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.3 2005/03/26 16:36:26 alek Exp $
$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 Sat Mar 26 16:59:09 2005
+++ Makefile.in Sun Apr 1 08:18:32 2007
@@ -11,6 +11,7 @@ exec_prefix=@exec_prefix@
MANDIR=@mandir@
BINDIR=@bindir@
@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2005/03/26 16:36:26 alek Exp $
# For server
RADMINDDIR=@radminddir@
@@ -82,7 +83,7 @@ TWHICH_OBJ= version.o twhich.o argca
@@ -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

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

@ -1,7 +1,7 @@
$OpenBSD: patch-command_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
--- command.c.orig Tue Dec 14 10:59:27 2004
+++ command.c Thu Jan 20 12:59:08 2005
@@ -635,7 +635,7 @@ f_stat( SNET *sn, int ac, char *av[] )
$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[] )
/* if allowable, check for transcript in the special file directory */
@ -10,7 +10,7 @@ $OpenBSD: patch-command_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
/* store value of av[ 2 ], because argcargv will be called
* from special_t(), and that will blow away the current values
@@ -727,7 +727,7 @@ f_stor( SNET *sn, int ac, char *av[] )
@@ -745,7 +745,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.2 2005/01/26 00:33:30 pvalchev Exp $
/* make the directory for the files of this xscript to live in. */
if ( mkdir( xscriptdir, 0777 ) < 0 ) {
@@ -1123,7 +1123,7 @@ command_k( char *path_config )
@@ -1141,7 +1141,7 @@ command_k( char *path_config )
}
if (( p = strrchr( av[ 1 ], '/' )) == NULL ) {
@ -28,7 +28,7 @@ $OpenBSD: patch-command_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
} else {
*p = '\0';
if ( snprintf( special_dir, MAXPATHLEN, "special/%s", av[ 1 ] )
@@ -1141,14 +1141,14 @@ command_k( char *path_config )
@@ -1159,14 +1159,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.2 2005/01/26 00:33:30 pvalchev Exp $
return( 0 );
}
if ( wildcard( av[ 0 ], remote_host, 0 )) {
@@ -1157,14 +1157,14 @@ command_k( char *path_config )
@@ -1175,14 +1175,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.2 2005/01/26 00:33:30 pvalchev Exp $
return( 0 );
}
if ( wildcard( av[ 0 ], remote_addr, 1 )) {
@@ -1173,14 +1173,14 @@ command_k( char *path_config )
@@ -1191,14 +1191,14 @@ command_k( char *path_config )
"config file: line %d: command file too long\n", linenum );
continue;
}

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

@ -1,7 +1,7 @@
$OpenBSD: patch-fsdiff_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
--- fsdiff.c.orig Tue Sep 28 10:39:14 2004
+++ fsdiff.c Thu Jan 13 08:42:34 2005
@@ -59,13 +59,7 @@ fs_walk( char *path, int start, int fini
$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 )
}
if ( ischild( tran->t_pinfo.pi_name, path )) {

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

@ -1,7 +1,7 @@
$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
$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 *
i_insert( struct devlist *dev_head, struct pathinfo *pinfo )
{
struct inolist *new, **cur;
@ -9,7 +9,7 @@ $OpenBSD: patch-hardlink_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
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, stru
@@ -96,13 +97,14 @@ i_insert( struct devlist *dev_head, struct pathinfo *p
exit( 2 );
}

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

@ -1,7 +1,7 @@
$OpenBSD: patch-ktcheck_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
--- ktcheck.c.orig Thu Jan 20 13:09:09 2005
+++ ktcheck.c Thu Jan 20 13:05:02 2005
@@ -95,7 +95,7 @@ getstat( SNET *sn, char *description, ch
$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 )
fprintf( stderr, "%s: line too long\n", line );
return( -1 );
}
@ -10,7 +10,7 @@ $OpenBSD: patch-ktcheck_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
if ( verbose ) printf( "<<< %s\n", stats );
@@ -253,7 +253,7 @@ check( SNET *sn, char *type, char *file
@@ -253,7 +253,7 @@ check( SNET *sn, char *type, char *file )
fprintf( stderr, "%s: too long\n", type );
return( 2 );
}
@ -19,7 +19,7 @@ $OpenBSD: patch-ktcheck_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
file = base_kfile;
@@ -262,7 +262,7 @@ check( SNET *sn, char *type, char *file
@@ -262,7 +262,7 @@ check( SNET *sn, char *type, char *file )
fprintf( stderr, "%s: path too long\n", base_kfile );
return( 2 );
}

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

@ -1,6 +1,6 @@
$OpenBSD: patch-lapply_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
--- lapply.c.orig Thu Dec 16 16:50:35 2004
+++ lapply.c Thu Jan 20 12:57:27 2005
$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 )
new_node = (struct node *) malloc( sizeof( struct node ));
new_node->path = strdup( path );
@ -10,7 +10,7 @@ $OpenBSD: patch-lapply_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
new_node->doline = 1;
} else {
new_node->doline = 0;
@@ -126,7 +126,7 @@ do_line( char *tline, int present, struc
@@ -126,7 +126,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.2 2005/01/26 00:33:30 pvalchev Exp $
/* DOWNLOAD */
if ( *command == '+' ) {
@@ -135,7 +135,7 @@ do_line( char *tline, int present, struc
@@ -135,7 +135,7 @@ do_line( char *tline, int present, struct stat *st, SN
linenum, *targv[ 0 ] );
return( 1 );
}

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

@ -1,7 +1,7 @@
$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
$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
INCPATH= @CPPFLAGS@ -I.
DEFS=
OPTOPTS= @OPTOPTS@
@ -10,12 +10,48 @@ $OpenBSD: patch-libsnet_Makefile_in,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
PROFILED= @PROFILED@
CC= @CC@
@@ -50,7 +50,7 @@ all: libsnet.la
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
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-progress_c
View File

@ -1,6 +1,6 @@
$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
$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
@@ -39,7 +39,7 @@ loadsetsize( FILE *tran )
while ( fgets( tline, LINE_MAX, tran ) != NULL ) {
@ -19,7 +19,7 @@ $OpenBSD: patch-progress_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
/* skip empty lines and transcript marker lines */
if (( tac = argcargv( tline, &targv )) <= 1 ) {
continue;
@@ -113,7 +113,7 @@ lcksum_loadsetsize( FILE *tran, char *pr
@@ -113,7 +113,7 @@ lcksum_loadsetsize( FILE *tran, char *prefix )
while ( fgets( tline, LINE_MAX, tran ) != NULL ) {
linenum++;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-root_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
--- root.c.orig Thu Jan 6 16:31:49 2005
+++ root.c Thu Jan 20 12:57:28 2005
@@ -33,7 +33,7 @@ get_root( char *radmind_path, char *path
$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
fprintf( stderr, "%s: path too long\n", p );
return( -1 );
}
@ -10,7 +10,7 @@ $OpenBSD: patch-root_c,v 1.2 2005/01/26 00:33:30 pvalchev 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
@@ -81,8 +81,8 @@ get_root( char *radmind_path, char *path, char *file_r
return( -1 );
}
} else {

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

@ -1,7 +1,7 @@
$OpenBSD: patch-stor_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
--- stor.c.orig Thu Sep 23 13:46:22 2004
+++ stor.c Thu Jan 13 08:42:35 2005
@@ -464,11 +464,13 @@ n_stor_applefile( SNET *sn, char *pathde
$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
struct timeval tv;
struct applefileinfo afinfo;
off_t size;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-transcript_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
--- transcript.c.orig Thu Jan 6 08:37:55 2005
+++ transcript.c Thu Jan 20 13:02:32 2005
@@ -99,7 +99,7 @@ transcript_parse( struct transcript *tra
$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 )
exit( 2 );
}
@ -10,7 +10,7 @@ $OpenBSD: patch-transcript_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
/* reading and parsing the line */
switch( *argv[ 0 ] ) {
@@ -169,7 +169,7 @@ transcript_parse( struct transcript *tra
@@ -175,7 +175,7 @@ transcript_parse( struct transcript *tran )
tran->t_fullname, tran->t_linenum );
exit( 2 );
}
@ -19,7 +19,7 @@ $OpenBSD: patch-transcript_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
break;
case 'a': /* hfs applefile */
@@ -191,7 +191,7 @@ transcript_parse( struct transcript *tra
@@ -197,7 +197,7 @@ transcript_parse( struct transcript *tran )
exit( 2 );
}
}
@ -28,7 +28,7 @@ $OpenBSD: patch-transcript_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
break;
default:
@@ -598,17 +598,17 @@ transcript( char *path )
@@ -615,17 +615,17 @@ transcript( char *path )
}
}
@ -49,7 +49,7 @@ $OpenBSD: patch-transcript_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
}
/* By default, go into directories */
@@ -619,7 +619,7 @@ transcript( char *path )
@@ -636,7 +636,7 @@ transcript( char *path )
}
/* initialize cksum field. */
@ -58,7 +58,7 @@ $OpenBSD: patch-transcript_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
}
for (;;) {
@@ -668,9 +668,9 @@ t_new( int type, char *fullname, char *s
@@ -685,9 +685,9 @@ t_new( int type, char *fullname, char *shortname, char
} else {
new->t_eof = 0;
new->t_linenum = 0;
@ -71,7 +71,7 @@ $OpenBSD: patch-transcript_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
if (( new->t_in = fopen( fullname, "r" )) == NULL ) {
perror( fullname );
exit( 2 );
@@ -735,7 +735,7 @@ transcript_init( char *kfile, int locati
@@ -752,7 +752,7 @@ transcript_init( char *kfile, int location )
"special path too long: %s%s\n", kdir, special );
exit( 2 );
}