Date: Fri, 20 Jul 2001 02:35:10 +0200 (CEST) From: Christian Weisgerber <naddy@mips.inka.de> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/29092: update sysutils/sdd to 1.31 Message-ID: <200107200035.f6K0ZAa32387@kemoauc.mips.inka.de>
next in thread | raw e-mail | index | archive | help
>Number: 29092 >Category: ports >Synopsis: update sysutils/sdd to 1.31 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jul 19 18:40:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Christian Weisgerber >Release: FreeBSD 5.0-CURRENT alpha >Organization: >Environment: System: FreeBSD kemoauc.mips.inka.de 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Thu Jul 12 23:53:44 CEST 2001 naddy@kemoauc.mips.inka.de:/home/obj/usr/src/sys/KEMOAUC alpha >Description: - maintenance update of sysutils/sdd port to version 1.31 - sync port with archivers/star - switch to sensible patch names >How-To-Repeat: >Fix: diff -uNr /usr/ports/sysutils/sdd/Makefile sdd/Makefile --- /usr/ports/sysutils/sdd/Makefile Sun Apr 30 20:36:53 2000 +++ sdd/Makefile Fri Jul 20 00:17:59 2001 @@ -6,7 +6,7 @@ # PORTNAME= sdd -PORTVERSION= 1.22 +PORTVERSION= 1.31 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/sdd/ @@ -18,14 +18,14 @@ .include <bsd.port.pre.mk> -.if ${ARCH} != i386 || ${CC} != cc -do-configure: - @${CP} -f ${WRKSRC}/RULES/i386-freebsd-cc.rul \ - ${WRKSRC}/RULES/${ARCH}-freebsd-${CC}.rul +.if ${MACHINE_ARCH} != "i386" || ${CC} != "cc" +post-extract: + @${LN} -sf i386-freebsd-cc.rul \ + ${WRKSRC}/RULES/${MACHINE_ARCH}-freebsd-${CC}.rul .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sdd/OBJ/${ARCH}-freebsd-${CC}/sdd \ + ${INSTALL_PROGRAM} ${WRKSRC}/sdd/OBJ/${MACHINE_ARCH}-freebsd-${CC}/sdd \ ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/sdd/sdd.1 ${PREFIX}/man/man1 diff -uNr /usr/ports/sysutils/sdd/distinfo sdd/distinfo --- /usr/ports/sysutils/sdd/distinfo Wed Jun 9 02:51:10 1999 +++ sdd/distinfo Fri Jul 20 00:15:24 2001 @@ -1 +1 @@ -MD5 (sdd-1.22.tar.gz) = 2046babedb375af6bc4ce11ba2db8b0a +MD5 (sdd-1.31.tar.gz) = 430783f281d22e408c74ce1cb472a059 diff -uNr /usr/ports/sysutils/sdd/files/patch-RULES_i386-openbsd-cc.rul sdd/files/patch-RULES_i386-openbsd-cc.rul --- /usr/ports/sysutils/sdd/files/patch-RULES_i386-openbsd-cc.rul Thu Jan 1 01:00:00 1970 +++ sdd/files/patch-RULES_i386-openbsd-cc.rul Fri Jul 20 02:11:47 2001 @@ -0,0 +1,42 @@ + +$FreeBSD$ + +--- RULES/i386-openbsd-cc.rul.orig Sun Aug 29 16:09:56 1999 ++++ RULES/i386-openbsd-cc.rul Fri Jul 20 00:51:13 2001 +@@ -24,7 +24,7 @@ + ########################################################################### + + CPPFLAGS= $(CPPOPTS) $(CPPOPTX) +-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX) ++CFLAGS+= $(COPTS) $(CWARNOPTS) $(COPTX) + + CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS) + COPTS= +@@ -47,7 +47,7 @@ + + LIBS_PATH= -L$(OLIBSDIR) + +-LDFLAGS= $(LDOPTS) $(LDOPTX) ++LDFLAGS+= $(LDOPTS) $(LDOPTX) + LDLIBS= $(LIBS) $(LIBX) + + #LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH) +@@ -57,14 +57,14 @@ + + FLOAT_OPTIONS= + +-CC= @echo " ==> COMPILING \"$@\""; gcc +-LDCC= @echo " ==> LINKING \"$@\""; gcc +-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc ++CC= @echo " ==> COMPILING \"$@\""; ${CCOM} ++LDCC= @echo " ==> LINKING \"$@\""; ${CCOM} ++DYNLD= @echo " ==> LINKING dynamic library \"$@\""; ${CCOM} + RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib + ARFLAGS= cr + LORDER= lorder + TSORT= tsort + + RMDEP= : +-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M ++MKDEP= @echo " ==> MAKE DEPENDENCIES \"$@\""; $(RMDEP); ${CCOM} -M + MKDEP_OUT= diff -uNr /usr/ports/sysutils/sdd/files/patch-aa sdd/files/patch-aa --- /usr/ports/sysutils/sdd/files/patch-aa Wed Jun 9 02:51:12 1999 +++ sdd/files/patch-aa Thu Jan 1 01:00:00 1970 @@ -1,39 +0,0 @@ ---- RULES/i386-freebsd-cc.rul.orig Sun Apr 27 01:46:00 1997 -+++ RULES/i386-freebsd-cc.rul Thu May 6 02:12:08 1999 -@@ -24,7 +24,7 @@ - ########################################################################### - - CPPFLAGS= $(CPPOPTS) $(CPPOPTX) --CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX) -+CFLAGS+= $(COPTS) $(CWARNOPTS) $(COPTX) - - CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS) - COPTS= -@@ -47,7 +47,7 @@ - - LIBS_PATH= -L$(OLIBSDIR) - --LDFLAGS= $(LDOPTS) $(LDOPTX) -+LDFLAGS+= $(LDOPTS) $(LDOPTX) - LDLIBS= $(LIBS) $(LIBX) - - #LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH) -@@ -57,14 +57,14 @@ - - FLOAT_OPTIONS= - --CC= @echo " ==> COMPILING \"$@\""; gcc --LDCC= @echo " ==> LINKING \"$@\""; gcc --DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc -+CC= @echo " ==> COMPILING \"$@\""; ${CCOM} -+LDCC= @echo " ==> LINKING \"$@\""; ${CCOM} -+DYNLD= @echo " ==> LINKING dynamic library \"$@\""; ${CCOM} - RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib - ARFLAGS= cr - LORDER= lorder - TSORT= tsort - - RMDEP= : --MKDEP= @echo " ==> MAKE DEPENDENCIES \"$@\""; $(RMDEP); gcc -M -+MKDEP= @echo " ==> MAKE DEPENDENCIES \"$@\""; $(RMDEP); ${CCOM} -M - MKDEP_OUT= diff -uNr /usr/ports/sysutils/sdd/files/patch-ab sdd/files/patch-ab --- /usr/ports/sysutils/sdd/files/patch-ab Wed Jun 9 02:51:12 1999 +++ sdd/files/patch-ab Thu Jan 1 01:00:00 1970 @@ -1,27 +0,0 @@ ---- sdd/sdd.c.orig Wed May 5 17:54:07 1999 -+++ sdd/sdd.c Wed May 5 17:56:34 1999 -@@ -1378,11 +1378,13 @@ - usage(ex) - int ex; - { -- error("\ -+ FILE *fp = ex ? stderr : stdout; -+ -+ fprintf(fp, "\ - Usage: sdd [option=value] [-flag]\n\ - Options:\n\ - "); -- error ("\ -+ fprintf(fp, "\ - if=name Read input from name instead of stdin\n\ - of=name Write output to name instead of stdout\n\ - -inull Do not read input from file (use null char's)\n\ -@@ -1396,7 +1398,7 @@ - seek=#,skip=# Seek/skip # bytes on input/output before starting\n\ - ivseek=#,ovseek=# Seek # bytes on input/output volumes before starting\n\ - "); -- error("\ -+ fprintf(fp, "\ - -notrunc Do not trunctate existing output file\n\ - -pg Print a dot on each write to indicate progress\n\ - -noerror Do not stop on error\n\ diff -uNr /usr/ports/sysutils/sdd/files/patch-ac sdd/files/patch-ac --- /usr/ports/sysutils/sdd/files/patch-ac Mon Sep 20 03:51:41 1999 +++ sdd/files/patch-ac Thu Jan 1 01:00:00 1970 @@ -1,20 +0,0 @@ ---- include/standard.h.orig Sun Sep 19 19:12:55 1999 -+++ include/standard.h Sun Sep 19 19:14:12 1999 -@@ -23,6 +23,8 @@ - #ifndef _STANDARD_H - #define _STANDARD_H - -+#include <sys/types.h> -+ - #ifdef M68000 - # ifndef tos - # define JOS 1 -@@ -182,7 +184,7 @@ - extern int wait_chld __PR((int)); - extern int geterrno __PR((void)); - extern void raisecond __PR((const char *, long)); --extern int snprintf __PR((char *, unsigned, const char *, ...)); -+extern int snprintf __PR((char *, size_t, const char *, ...)); - /*extern int sprintf __PR((char *, const char *, ...)); ist woanders falsch deklariert !!!*/ - extern char *strcatl __PR((char *, ...)); - extern int streql __PR((const char *, const char *)); diff -uNr /usr/ports/sysutils/sdd/files/patch-conf_configure sdd/files/patch-conf_configure --- /usr/ports/sysutils/sdd/files/patch-conf_configure Thu Jan 1 01:00:00 1970 +++ sdd/files/patch-conf_configure Fri Jul 20 02:12:19 2001 @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- conf/configure.orig Sun Jul 8 13:38:41 2001 ++++ conf/configure Fri Jul 20 00:51:13 2001 +@@ -6590,7 +6590,7 @@ + fi + done + +-for ac_func in setreuid setresuid seteuid setuid ++for ac_func in seteuid setuid + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 + echo "configure:6597: checking for $ac_func" >&5 diff -uNr /usr/ports/sysutils/sdd/files/patch-sdd_sdd.1 sdd/files/patch-sdd_sdd.1 --- /usr/ports/sysutils/sdd/files/patch-sdd_sdd.1 Thu Jan 1 01:00:00 1970 +++ sdd/files/patch-sdd_sdd.1 Fri Jul 20 02:12:42 2001 @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- sdd/sdd.1.orig Tue Jul 17 14:21:13 2001 ++++ sdd/sdd.1 Fri Jul 20 00:51:14 2001 +@@ -346,7 +346,7 @@ + This is done by using the + rcmd(3) interface to get a connection to a rmt(1) server. + .PP +-.B Star ++.B Sdd + resets its effective uid back to the real user id immediately after setting up + the remote connection to the rmt server and before opening any other file. + .SH BUGS diff -uNr /usr/ports/sysutils/sdd/files/patch-sdd_sdd.c sdd/files/patch-sdd_sdd.c --- /usr/ports/sysutils/sdd/files/patch-sdd_sdd.c Thu Jan 1 01:00:00 1970 +++ sdd/files/patch-sdd_sdd.c Fri Jul 20 02:12:42 2001 @@ -0,0 +1,41 @@ + +$FreeBSD$ + +--- sdd/sdd.c.orig Tue Jul 17 14:22:28 2001 ++++ sdd/sdd.c Fri Jul 20 00:51:14 2001 +@@ -1542,11 +1542,13 @@ + usage(ex) + int ex; + { +- error("\ ++ FILE *fp = ex ? stderr : stdout; ++ ++ fprintf(fp, "\ + Usage: sdd [option=value] [-flag]\n\ + Options:\n\ + "); +- error ("\ ++ fprintf(fp, "\ + if=name Read input from name instead of stdin\n\ + of=name Write output to name instead of stdout\n\ + -inull Do not read input from file (use null char's)\n\ +@@ -1560,7 +1562,7 @@ + seek=#,skip=# Seek/skip # bytes on input/output before starting\n\ + ivseek=#,ovseek=# Seek # bytes on input/output volumes before starting\n\ + "); +- error("\ ++ fprintf(fp, "\ + -notrunc Do not trunctate existing output file\n\ + -pg Print a dot on each write to indicate progress\n\ + -noerror Do not stop on error\n\ +@@ -1571,8 +1573,8 @@ + -fill Fill each record with zeros up to obs\n\ + -swab,-block,-unblock,-lcase,-ucase,-ascii,-ebcdic,-ibm\n\ + "); +- error("\t-help\t\t print this online help\n"); +- error("\t-version\t print version number\n"); ++ fprintf(fp, "\t-help\t\t print this online help\n"); ++ fprintf(fp, "\t-version\t print version number\n"); + exit(ex); + } + diff -uNr /usr/ports/sysutils/sdd/pkg-descr sdd/pkg-descr --- /usr/ports/sysutils/sdd/pkg-descr Wed Jun 9 02:51:11 1999 +++ sdd/pkg-descr Fri Jul 20 00:15:59 2001 @@ -4,7 +4,9 @@ to the output block size (obs). - sdd does not share the design bugs of dd that cause fragments to be read from a pipe and filled up to input block size. -- Statistics are much better readable as from 'dd'. +- Statistics are much better readable than from 'dd'. +- rmt support for if= & of= +- Output file is sync'd before doing statistic report. - Timing available, -time option will print transfer speed - Timing & Statistics available at any time with SIGQUIT (^\) - Can seek on input and output @@ -14,6 +16,3 @@ input block size - Debug printing - Progress printing - -Author: Joerg Schilling <schilling@fokus.gmd.de> -Please mail bugs and suggestions to him. diff -uNr /usr/ports/sysutils/sdd/pkg-plist sdd/pkg-plist --- /usr/ports/sysutils/sdd/pkg-plist Wed Jun 9 02:51:12 1999 +++ sdd/pkg-plist Fri Jul 20 00:16:29 2001 @@ -1 +1,2 @@ +@comment $FreeBSD$ bin/sdd >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200107200035.f6K0ZAa32387>