- outdated.

Changed files:
    amanda-DESTDIR.patch -> 1.2
    amanda-glibc21.patch -> 1.2
    amanda-glibc22.patch -> 1.2

diff --git a/amanda-DESTDIR.patch b/amanda-DESTDIR.patch
deleted file mode 100644 (file)
index ede803d..0000000
--- a/amanda-DESTDIR.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nru amanda-2.4.1p1/amplot/Makefile.am amanda-2.4.1p1.new/amplot/Makefile.am
---- amanda-2.4.1p1/amplot/Makefile.am  Mon Nov 29 22:15:02 1999
-+++ amanda-2.4.1p1.new/amplot/Makefile.am      Mon Nov 29 22:16:10 1999
-@@ -15,8 +15,7 @@
- amplotdir =           $(libexecdir)
- amplot_DATA =         @BUILD_AMPLOT_LIBEXEC@
- 
--EXTRA_DATA =          amplot.awk              amplot.g
--EXTRA_DIST =          $(EXTRA_DATA)
-+EXTRA_DIST =          amplot.awk              amplot.g
- 
- CLEANFILES = amplot.gp.new
- DISTCLEANFILES = amplot.gp
-@@ -30,7 +29,7 @@
- install-exec-hook:
-       @list="$(sbin_SCRIPTS)"; \
-       for p in $$list; do \
--              pa=$(sbindir)/`echo $$p|sed '$(transform)'`; \
-+              pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
-               echo chown $(BINARY_OWNER) $$pa; \
-               chown $(BINARY_OWNER) $$pa; \
-               echo chgrp $(SETUID_GROUP) $$pa; \
-@@ -40,7 +39,7 @@
- install-data-hook:
-       @list="$(amplot_DATA)"; \
-       for p in $$list; do \
--              pa=$(libexecdir)/$$p; \
-+              pa=$(DESTDIR)$(libexecdir)/$$p; \
-               echo chown $(BINARY_OWNER) $$pa; \
-               chown $(BINARY_OWNER) $$pa; \
-               echo chgrp $(SETUID_GROUP) $$pa; \

diff --git a/amanda-glibc21.patch b/amanda-glibc21.patch
deleted file mode 100644 (file)
index 3d2048d..0000000
--- a/amanda-glibc21.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- amanda-2.4.1p1/common-src/statfs.c.tim     Tue Jan 11 11:00:11 2000
-+++ amanda-2.4.1p1/common-src/statfs.c Tue Jan 11 11:01:59 2000
-@@ -54,7 +54,7 @@
- ** System V.4 (STATFS_SVR4)
- */
- #  include <sys/statvfs.h>
--#  define STATFS_TYP          "SVR4 (Irix-5, Solaris-2)"
-+#  define STATFS_TYP          "SVR4 (Irix-5, Solaris-2, Linux glibc 2.1)"
- #  define STATFS_STRUCT       struct statvfs
- #  define STATFS_TOTAL(buf)   (buf).f_blocks
- #  define STATFS_AVAIL(buf)   (buf).f_bavail
-@@ -62,7 +62,7 @@
- #  define STATFS_FILES(buf)   (buf).f_files
- #  define STATFS_FAVAIL(buf)  (buf).f_favail
- #  define STATFS_FFREE(buf)   (buf).f_ffree
--#  define STATFS_SCALE(buf)   (buf).f_frsize
-+#  define STATFS_SCALE(buf)   ((buf).f_frsize?(buf).f_frsize:(buf).f_bsize)
- #  define STATFS(path, buffer)        statvfs(path, &buffer)
- # else
- #  if HAVE_SYS_VFS_H
-@@ -89,7 +89,7 @@
- ** System V.3 (STATFS_SVR3)
- */
- #    include <sys/statfs.h>
--#    define STATFS_TYP                "SVR3 (Irix-3, Irix-4, Irix-6)"
-+#    define STATFS_TYP                "SVR3 (Irix-3, Irix-4)"
- #    define STATFS_STRUCT     struct statfs
- #    define STATFS_TOTAL(buf) (buf).f_blocks
- #    define STATFS_AVAIL(buf) (buf).f_bfree

diff --git a/amanda-glibc22.patch b/amanda-glibc22.patch
deleted file mode 100644 (file)
index 7474fe3..0000000
--- a/amanda-glibc22.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- amanda-2.4.1p1/common-src/debug.c.tim2     Tue Jan 11 11:02:43 2000
-+++ amanda-2.4.1p1/common-src/debug.c  Tue Jan 11 11:04:36 2000
-@@ -42,7 +42,8 @@
-   static FILE *db_file = NULL;
- #else
-   int db_fd = 2;
--  static FILE *db_file = stderr;
-+      /* stderr cannot be assumed to be constant */
-+  static FILE *db_file = NULL;
- #endif
- 
- #ifndef DEBUG_DIR
-@@ -56,7 +57,10 @@
- {
-     va_list argp;
- 
--    if(db_fd == -1) return;
-+    if(db_fd == NULL) {
-+                      if (db_fd == -1) return;
-+                      if (db_fd == 2) db_file = stderr;
-+              }
- 
-     arglist_start(argp, format);
-     vfprintf(db_file, format, argp);