diff options
| author | kleink <kleink@pkgsrc.org> | 2000-11-16 08:17:50 +0000 |
|---|---|---|
| committer | kleink <kleink@pkgsrc.org> | 2000-11-16 08:17:50 +0000 |
| commit | 6c368abf8fb1fb1d83a5b1d1a3af1be4b0d717b9 (patch) | |
| tree | 00cbc1b74a6f3059859de4e66c50174cd0c4abf9 | |
| parent | 18a63152a72df56d454e6f0005ceb1de95511db0 (diff) | |
| download | pkgsrc-6c368abf8fb1fb1d83a5b1d1a3af1be4b0d717b9.tar.gz | |
Make this work for Solaris' ufsdump -S, which writes the estimate to stdout;
derived from amanda-current sources.
| -rw-r--r-- | sysutils/amanda-client/files/patch-sum | 4 | ||||
| -rw-r--r-- | sysutils/amanda-client/patches/patch-af | 43 |
2 files changed, 42 insertions, 5 deletions
diff --git a/sysutils/amanda-client/files/patch-sum b/sysutils/amanda-client/files/patch-sum index 74fe127b56c..2f67aaeb11c 100644 --- a/sysutils/amanda-client/files/patch-sum +++ b/sysutils/amanda-client/files/patch-sum @@ -1,9 +1,9 @@ -$NetBSD: patch-sum,v 1.4 2000/03/06 21:14:51 groo Exp $ +$NetBSD: patch-sum,v 1.5 2000/11/16 08:17:50 kleink Exp $ MD5 (patch-aa) = 6b367d0b59e5ef883734a896edbb2623 MD5 (patch-ab) = 488f351bda45b411c260bd3d8ee7f6f9 MD5 (patch-ac) = 3168a2b696288eaf9feb148eb5fb7831 MD5 (patch-ad) = fa20c139b28094d4b7a848f16ffcb9e3 MD5 (patch-ae) = 1178c5d7cd28a8230df4bffe33dd99a7 -MD5 (patch-af) = 9115d1218ee47e59b7dc68dd09fef71f +MD5 (patch-af) = 56d3e8cabf9c91f66144dc459267affe MD5 (patch-ag) = dc79d66683986442e288cb93b779f1ab diff --git a/sysutils/amanda-client/patches/patch-af b/sysutils/amanda-client/patches/patch-af index 900f56ff4b7..274df3963d2 100644 --- a/sysutils/amanda-client/patches/patch-af +++ b/sysutils/amanda-client/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.1 1999/09/06 18:03:43 bad Exp $ +$NetBSD: patch-af,v 1.2 2000/11/16 08:17:50 kleink Exp $ --- client-src/sendsize.c.orig Wed Nov 18 02:07:20 1998 -+++ client-src/sendsize.c Fri Sep 3 19:53:30 1999 ++++ client-src/sendsize.c Thu Nov 16 09:12:57 2000 @@ -574,7 +574,7 @@ {"Total bytes listed: [0-9][0-9]*", 1}, /* Samba client */ #endif @@ -11,7 +11,25 @@ $NetBSD: patch-af,v 1.1 1999/09/06 18:03:43 bad Exp $ # ifdef SAMBA_CLIENT /* On DU 4.0, dump -E prints a line that matches an output line of smbclient. So, even if both are enabled by configure, dump -@@ -689,7 +689,7 @@ +@@ -593,7 +593,7 @@ + char *disk; + int level; + { +- int pipefd[2], nullfd, killctl[2]; ++ int pipefd[2], nullfd, stdoutfd, killctl[2]; + pid_t dumppid; + long size; + FILE *dumpout; +@@ -614,7 +614,7 @@ + cmd = vstralloc(libexecdir, "/rundump", versionsuffix(), NULL); + rundump_cmd = stralloc(cmd); + +- nullfd = open("/dev/null", O_RDWR); ++ stdoutfd = nullfd = open("/dev/null", O_RDWR); + pipefd[0] = pipefd[1] = killctl[0] = killctl[1] = -1; + pipe(pipefd); + +@@ -689,13 +689,17 @@ # else /* } { */ dumpkeys = vstralloc(level_str, # ifdef HAVE_DUMP_ESTIMATE /* { */ @@ -20,3 +38,22 @@ $NetBSD: patch-af,v 1.1 1999/09/06 18:03:43 bad Exp $ # endif /* } */ # ifdef HAVE_HONOR_NODUMP /* { */ "h", + # endif /* } */ + "s", "f", NULL); + ++# ifdef HAVE_DUMP_ESTIMATE ++ stdoutfd = pipefd[1]; ++# endif ++ + # ifdef HAVE_HONOR_NODUMP /* { */ + dbprintf(("%s: running \"%s%s %s 0 1048576 - %s\"\n", + get_pname(), cmd, name, dumpkeys, device)); +@@ -758,7 +762,7 @@ + } + + dup2(nullfd, 0); +- dup2(nullfd, 1); ++ dup2(stdoutfd, 1); + dup2(pipefd[1], 2); + aclose(pipefd[0]); + if (killctl[0] != -1) |