diff options
Diffstat (limited to 'sysutils/amanda-dev-server/patches')
19 files changed, 842 insertions, 0 deletions
diff --git a/sysutils/amanda-dev-server/patches/patch-aa b/sysutils/amanda-dev-server/patches/patch-aa new file mode 100644 index 00000000000..956ee630777 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-aa @@ -0,0 +1,32 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- configure.orig Fri Mar 8 20:28:05 2002 ++++ configure Tue Apr 30 12:56:23 2002 +@@ -4317,6 +4317,7 @@ + test -n "$GETCONF" && break + done + ++if false ;then + for ac_prog in gnuplot + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -4358,6 +4359,8 @@ + + test -n "$GNUPLOT" && break + done ++fi ++GNUPLOT="" + + if test -z "$GNUPLOT"; then + NO_AMPLOT_MODE=true +@@ -9893,8 +9896,10 @@ + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + ++if false; then + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++fi + + # Prevent multiple expansion + diff --git a/sysutils/amanda-dev-server/patches/patch-ab b/sysutils/amanda-dev-server/patches/patch-ab new file mode 100644 index 00000000000..e1e5c5007a4 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ab @@ -0,0 +1,31 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- Makefile.in.orig Fri Mar 8 20:29:29 2002 ++++ Makefile.in Tue Apr 30 13:37:17 2002 +@@ -33,7 +33,7 @@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/doc/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = . +@@ -155,7 +155,7 @@ + ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I) + + @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = client-src +-@WANT_TAPE_TRUE@TAPE_SUBDIRS = tape-src ++#TAPE_SUBDIRS = tape-src + @WANT_SERVER_TRUE@SERVER_SUBDIRS = server-src changer-src + @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = restore-src + @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src +@@ -474,7 +474,7 @@ + uninstall: uninstall-recursive + + install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am + + installcheck: installcheck-recursive + install-strip: diff --git a/sysutils/amanda-dev-server/patches/patch-ac b/sysutils/amanda-dev-server/patches/patch-ac new file mode 100644 index 00000000000..5d2bec0713c --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ac @@ -0,0 +1,19 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- example/amanda.conf.chg-scsi.in.orig Fri Apr 13 19:35:18 2001 ++++ example/amanda.conf.chg-scsi.in Tue Apr 30 13:01:08 2002 +@@ -165,10 +165,10 @@ + # Note that, although the keyword below is infofile, it is only so for + # historic reasons, since now it is supposed to be a directory (unless + # you have selected some database format other than the `text' default) +-infofile "/usr/adm/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY +-logdir "/usr/adm/amanda/@DEFAULT_CONFIG@" # log directory +-indexdir "/usr/adm/amanda/@DEFAULT_CONFIG@/index" # index directory +-#tapelist "/usr/adm/amanda/@DEFAULT_CONFIG@/tapelist" # list of used tapes ++infofile "@localstatedir@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY ++logdir "@localstatedir@/@DEFAULT_CONFIG@" # log directory ++indexdir "@localstatedir@/@DEFAULT_CONFIG@/index" # index directory ++#tapelist "@localstatedir@/@DEFAULT_CONFIG@/tapelist" # list of used tapes + # tapelist is stored, by default, in the directory that contains amanda.conf + + diff --git a/sysutils/amanda-dev-server/patches/patch-ad b/sysutils/amanda-dev-server/patches/patch-ad new file mode 100644 index 00000000000..692a24784d4 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ad @@ -0,0 +1,200 @@ +$NetBSD: patch-ad,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- server-src/Makefile.in.orig Fri Mar 8 20:29:44 2002 ++++ server-src/Makefile.in Tue Apr 30 13:08:50 2002 +@@ -196,10 +196,7 @@ + # need to list libamanda twice here, first to override the system library + # routines, and second to pick up any references in the other libraries. + ### +-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++LDADD = libamserver.$(LIB_EXTENSION) + + + SUFFIXES = .sh .pl +@@ -264,155 +261,98 @@ + amadmin_SOURCES = amadmin.c + amadmin_OBJECTS = amadmin.$(OBJEXT) + amadmin_LDADD = $(LDADD) +-amadmin_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amadmin_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amadmin_LDFLAGS = + amcheck_SOURCES = amcheck.c + amcheck_OBJECTS = amcheck.$(OBJEXT) + amcheck_LDADD = $(LDADD) +-amcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amcheck_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amcheck_LDFLAGS = + amcleanupdisk_SOURCES = amcleanupdisk.c + amcleanupdisk_OBJECTS = amcleanupdisk.$(OBJEXT) + amcleanupdisk_LDADD = $(LDADD) +-amcleanupdisk_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amcleanupdisk_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amcleanupdisk_LDFLAGS = + amflush_SOURCES = amflush.c + amflush_OBJECTS = amflush.$(OBJEXT) + amflush_LDADD = $(LDADD) +-amflush_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amflush_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amflush_LDFLAGS = + am_amgetconf_OBJECTS = getconf.$(OBJEXT) + amgetconf_OBJECTS = $(am_amgetconf_OBJECTS) + amgetconf_LDADD = $(LDADD) +-amgetconf_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amgetconf_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amgetconf_LDFLAGS = + am_amindexd_OBJECTS = amindexd.$(OBJEXT) disk_history.$(OBJEXT) \ + list_dir.$(OBJEXT) + amindexd_OBJECTS = $(am_amindexd_OBJECTS) + amindexd_LDADD = $(LDADD) +-amindexd_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amindexd_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amindexd_LDFLAGS = + amlabel_SOURCES = amlabel.c + amlabel_OBJECTS = amlabel.$(OBJEXT) + amlabel_LDADD = $(LDADD) +-amlabel_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amlabel_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amlabel_LDFLAGS = + amlogroll_SOURCES = amlogroll.c + amlogroll_OBJECTS = amlogroll.$(OBJEXT) + amlogroll_LDADD = $(LDADD) +-amlogroll_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amlogroll_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amlogroll_LDFLAGS = + am_amreport_OBJECTS = reporter.$(OBJEXT) + amreport_OBJECTS = $(am_amreport_OBJECTS) + amreport_LDADD = $(LDADD) +-amreport_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amreport_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amreport_LDFLAGS = + amtape_SOURCES = amtape.c + amtape_OBJECTS = amtape.$(OBJEXT) + amtape_LDADD = $(LDADD) +-amtape_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amtape_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amtape_LDFLAGS = + amtrmidx_SOURCES = amtrmidx.c + amtrmidx_OBJECTS = amtrmidx.$(OBJEXT) + amtrmidx_LDADD = $(LDADD) +-amtrmidx_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amtrmidx_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amtrmidx_LDFLAGS = + amtrmlog_SOURCES = amtrmlog.c + amtrmlog_OBJECTS = amtrmlog.$(OBJEXT) + amtrmlog_LDADD = $(LDADD) +-amtrmlog_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amtrmlog_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amtrmlog_LDFLAGS = + am_conffile_OBJECTS = conffile.test.$(OBJEXT) + conffile_OBJECTS = $(am_conffile_OBJECTS) + conffile_LDADD = $(LDADD) +-conffile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++conffile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + conffile_LDFLAGS = + am_diskfile_OBJECTS = diskfile.test.$(OBJEXT) + diskfile_OBJECTS = $(am_diskfile_OBJECTS) + diskfile_LDADD = $(LDADD) +-diskfile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++diskfile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + diskfile_LDFLAGS = + driver_SOURCES = driver.c + driver_OBJECTS = driver.$(OBJEXT) + driver_LDADD = $(LDADD) +-driver_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++driver_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + driver_LDFLAGS = + dumper_SOURCES = dumper.c + dumper_OBJECTS = dumper.$(OBJEXT) + dumper_LDADD = $(LDADD) +-dumper_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++dumper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + dumper_LDFLAGS = + am_infofile_OBJECTS = infofile.test.$(OBJEXT) + infofile_OBJECTS = $(am_infofile_OBJECTS) + infofile_LDADD = $(LDADD) +-infofile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++infofile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + infofile_LDFLAGS = + planner_SOURCES = planner.c + planner_OBJECTS = planner.$(OBJEXT) + planner_LDADD = $(LDADD) +-planner_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++planner_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + planner_LDFLAGS = + taper_SOURCES = taper.c + taper_OBJECTS = taper.$(OBJEXT) + taper_LDADD = $(LDADD) +-taper_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++taper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + taper_LDFLAGS = + SCRIPTS = $(sbin_SCRIPTS) + +@@ -421,7 +361,7 @@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lamtape -lamanda + depcomp = $(SHELL) $(top_srcdir)/config/depcomp + @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/amadmin.Po $(DEPDIR)/amcheck.Po \ + @AMDEP_TRUE@ $(DEPDIR)/amcleanupdisk.Po $(DEPDIR)/amflush.Po \ diff --git a/sysutils/amanda-dev-server/patches/patch-ae b/sysutils/amanda-dev-server/patches/patch-ae new file mode 100644 index 00000000000..2cd0d267fea --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ae @@ -0,0 +1,62 @@ +$NetBSD: patch-ae,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- changer-src/Makefile.in.orig Fri Mar 8 20:29:46 2002 ++++ changer-src/Makefile.in Tue Apr 30 14:51:57 2002 +@@ -154,7 +154,7 @@ + @WANT_LIBTOOL_TRUE@LIB_EXTENSION = la + @WANT_LIBTOOL_FALSE@LIB_EXTENSION = a + +-@WANT_CHIO_SCSI_TRUE@CHIO_SCSI = chg-scsi-chio ++#CHIO_SCSI = chg-scsi-chio + + @WANT_CHG_SCSI_TRUE@CHG_SCSI = chg-scsi + +@@ -172,10 +172,7 @@ + # need to list libamanda twice here, first to override the system library + # routines, and second to pick up any references in the other libraries. + ### +-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../server-src/libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++LDADD = ../server-src/libamserver.$(LIB_EXTENSION) + + + SUFFIXES = .pl .sh +@@ -194,11 +191,11 @@ + CONFIG_CLEAN_FILES = chg-manual.sh chg-multi.sh chg-mtx.sh chg-chs.sh \ + chg-rth.pl chg-chio.pl chg-zd-mtx.sh + @WANT_CHG_SCSI_FALSE@@WANT_CHIO_SCSI_TRUE@libexec_PROGRAMS = \ +-@WANT_CHG_SCSI_FALSE@@WANT_CHIO_SCSI_TRUE@ chg-scsi-chio$(EXEEXT) ++# chg-scsi-chio$(EXEEXT) + @WANT_CHG_SCSI_FALSE@@WANT_CHIO_SCSI_FALSE@libexec_PROGRAMS = + @WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_TRUE@libexec_PROGRAMS = \ + @WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_TRUE@ chg-scsi$(EXEEXT) \ +-@WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_TRUE@ chg-scsi-chio$(EXEEXT) ++# chg-scsi-chio$(EXEEXT) + @WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_FALSE@libexec_PROGRAMS = \ + @WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_FALSE@ chg-scsi$(EXEEXT) + PROGRAMS = $(libexec_PROGRAMS) +@@ -209,19 +206,13 @@ + scsi-bsd.$(OBJEXT) scsi-cam.$(OBJEXT) sense.$(OBJEXT) + chg_scsi_OBJECTS = $(am_chg_scsi_OBJECTS) + chg_scsi_LDADD = $(LDADD) +-chg_scsi_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../server-src/libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) +-chg_scsi_LDFLAGS = ++chg_scsi_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) ++chg_scsi_LDFLAGS = -lamanda -lamtape + am_chg_scsi_chio_OBJECTS = chg-scsi-chio.$(OBJEXT) scsi-hpux.$(OBJEXT) \ + scsi-chio.$(OBJEXT) + chg_scsi_chio_OBJECTS = $(am_chg_scsi_chio_OBJECTS) + chg_scsi_chio_LDADD = $(LDADD) +-chg_scsi_chio_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../server-src/libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++chg_scsi_chio_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) + chg_scsi_chio_LDFLAGS = + SCRIPTS = $(libexec_SCRIPTS) + diff --git a/sysutils/amanda-dev-server/patches/patch-af b/sysutils/amanda-dev-server/patches/patch-af new file mode 100644 index 00000000000..c37bfd5c37c --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-af @@ -0,0 +1,205 @@ +$NetBSD: patch-af,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- changer-src/scsi-chio.c.orig Thu Jun 17 20:33:19 1999 ++++ changer-src/scsi-chio.c Tue Apr 30 14:33:22 2002 +@@ -59,16 +59,26 @@ + */ + int GetCurrentSlot(int fd, int drive) + { +- struct changer_element_status ces; ++#if defined(OCHIOGSTATUS) ++struct ochanger_element_status_request cesr; ++#else ++struct changer_element_status ces; ++#endif + int slot; + int i, rc; + + get_changer_info(fd); ++#if defined(OCHIOGSTATUS) ++ cesr.cesr_type = CHET_ST; ++ cesr.cesr_data = malloc(changer_info.cp_nslots); + ++ rc = ioctl(fd, CHIOGSTATUS, &cesr); ++#else + ces.ces_type = CHET_ST; + ces.ces_data = malloc(changer_info.cp_nslots); + + rc = ioctl(fd, CHIOGSTATUS, &ces); ++#endif + if (rc) { + dbprintf(("%s: changer status query failed: 0x%x %s\n", + get_pname(), rc,strerror(errno))); +@@ -76,7 +86,11 @@ + } + for (slot = 0; slot < changer_info.cp_nslots; slot++) + { ++#if defined(OCHIOGSTATUS) ++ i = cesr.cesr_data[slot] & CESTATUS_FULL; ++#else + i = ces.ces_data[slot] & CESTATUS_FULL; ++#endif + dbprintf(("\tGetCurrentSlot slot %d = %d\n", slot, i)); + if (!i) + return(slot); +@@ -121,25 +135,41 @@ + */ + int isempty(int fd, int slot) + { ++#if defined(OCHIOGSTATUS) ++struct ochanger_element_status_request cesr; ++#else + struct changer_element_status ces; ++#endif ++ + int i,rc; + int type=CHET_ST; + + get_changer_info(fd); + ++#if defined(OCHIOGSTATUS) ++ cesr.cesr_type = type; ++ cesr.cesr_data = malloc(changer_info.cp_nslots); ++ rc = ioctl(fd, OCHIOGSTATUS, &cesr); ++#else + ces.ces_type = type; + ces.ces_data = malloc(changer_info.cp_nslots); +- + rc = ioctl(fd, CHIOGSTATUS, &ces); ++#endif ++ + if (rc) { + dbprintf(("%s: changer status query failed: 0x%x %s\n", + get_pname(), rc,strerror(errno))); + return -1; + } + ++#if defined(OCHIOGSTATUS) ++ i = cesr.cesr_data[slot] & CESTATUS_FULL; ++ free(cesr.cesr_data); ++#else + i = ces.ces_data[slot] & CESTATUS_FULL; +- + free(ces.ces_data); ++#endif ++ + return !i; + } + +@@ -148,16 +178,27 @@ + */ + int find_empty(int fd, int start, int count) + { ++#if defined(OCHIOGSTATUS) ++struct ochanger_element_status_request cesr; ++#else + struct changer_element_status ces; ++#endif ++ + int i,rc; + int type=CHET_ST; + + get_changer_info(fd); + ++#if defined(OCHIOGSTATUS) ++ cesr.cesr_type = type; ++ cesr.cesr_data = malloc(changer_info.cp_nslots); ++ rc = ioctl(fd, OCHIOGSTATUS, &cesr); ++#else + ces.ces_type = type; + ces.ces_data = malloc(changer_info.cp_nslots); ++ rc = ioctl(fd, CHIOGSTATUS, &ces); ++#endif + +- rc = ioctl(fd,CHIOGSTATUS,&ces); + if (rc) { + dbprintf(("%s: changer status query failed: 0x%x %s\n", + get_pname(), rc, strerror(errno))); +@@ -165,9 +206,17 @@ + } + + i = 0; ++ ++#if defined(OCHIOGSTATUS) ++ while ((i < changer_info.cp_nslots)&&(cesr.cesr_data[i] & CESTATUS_FULL)) ++ i++; ++ free(cesr.cesr_data); ++#else + while ((i < changer_info.cp_nslots)&&(ces.ces_data[i] & CESTATUS_FULL)) + i++; + free(ces.ces_data); ++#endif ++ + return i; + } + +@@ -176,25 +225,41 @@ + */ + int drive_loaded(int fd, int drivenum) + { ++#if defined(OCHIOGSTATUS) ++struct ochanger_element_status_request cesr; ++#else + struct changer_element_status ces; ++#endif ++ + int i,rc; + int type=CHET_DT; + + get_changer_info(fd); + ++#if defined(OCHIOGSTATUS) ++ cesr.cesr_type = type; ++ cesr.cesr_data = malloc(changer_info.cp_ndrives); ++ rc = ioctl(fd, OCHIOGSTATUS, &cesr); ++#else + ces.ces_type = type; + ces.ces_data = malloc(changer_info.cp_ndrives); +- + rc = ioctl(fd, CHIOGSTATUS, &ces); ++#endif ++ + if (rc) { + dbprintf(("%s: drive status query failed: 0x%x %s\n", + get_pname(), rc, strerror(errno))); + return -1; + } + ++#if defined(OCHIOGSTATUS) ++ i = (cesr.cesr_data[drivenum] & CESTATUS_FULL); ++ free(cesr.cesr_data); ++#else + i = (ces.ces_data[drivenum] & CESTATUS_FULL); +- + free(ces.ces_data); ++#endif ++ + return i; + } + +@@ -204,7 +269,12 @@ + */ + int unload(int fd, int drive, int slot) + { ++#if defined(OCHIOGSTATUS) ++struct changer_move_request move; ++#else + struct changer_move move; ++#endif ++ + int rc; + + dbprintf(("unload : fd = %d, drive = %d, slot =%d\n",fd, drive, slot)); +@@ -230,7 +300,12 @@ + */ + int load(int fd, int drive, int slot) + { ++#if defined(OCHIOGSTATUS) ++struct changer_move_request move; ++#else + struct changer_move move; ++#endif ++ + int rc; + + dbprintf(("load : fd = %d, drive = %d, slot =%d\n",fd, drive, slot)); diff --git a/sysutils/amanda-dev-server/patches/patch-ag b/sysutils/amanda-dev-server/patches/patch-ag new file mode 100644 index 00000000000..b5606d24148 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ag @@ -0,0 +1,23 @@ +$NetBSD: patch-ag,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- example/chg-scsi.conf.old Tue Feb 23 16:44:39 1999 ++++ example/chg-scsi.conf Tue Feb 23 16:46:38 1999 +@@ -2,6 +2,8 @@ + number_configs 2 + eject 1 # Tapedrives need an eject command + sleep 5 # Seconds to wait until the tape gets ready ++ # The driver first sleeps for <sleep>/2 seconds, ++ # then pool the drive every seconds. + cleanmax 10 # How many times could a cleaning tape get used + changerdev /dev/sch0 + # +@@ -13,7 +15,8 @@ + startuse 0 # The slots associated with the drive 0 + enduse 9 # + statfile /usr/local/etc/amanda/tape5-slot # The file where the actual slot is stored +-cleancart 20 # the slot where the cleaningcartridge for drive 0 is located ++cleancart -1 # the slot where the cleaningcartridge for drive 0 is ++ # located. -1 means none. + cleanfile /usr/local/etc/amanda/tape0-clean # The file where the cleanings are recorded + usagecount /usr/local/etc/amanda/backup/totaltime + diff --git a/sysutils/amanda-dev-server/patches/patch-ah b/sysutils/amanda-dev-server/patches/patch-ah new file mode 100644 index 00000000000..88fe683240c --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ah @@ -0,0 +1,30 @@ +$NetBSD: patch-ah,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- example/amanda.conf.in.orig Fri Dec 7 20:24:58 2001 ++++ example/amanda.conf.in Tue Apr 30 13:10:50 2002 +@@ -90,8 +90,8 @@ + tpchanger "chg-manual" # the tape-changer glue script + tapedev "@DEFAULT_TAPE_DEVICE@" # the no-rewind tape device to be used + rawtapedev "@DEFAULT_RAW_TAPE_DEVICE@" # the raw device to be used (ftape only) +-changerfile "/usr/adm/amanda/@DEFAULT_CONFIG@/changer" +-changerfile "/usr/adm/amanda/@DEFAULT_CONFIG@/changer-status" ++changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer" ++changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer-status" + changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer.conf" + changerdev "@DEFAULT_CHANGER_DEVICE@" + +@@ -182,10 +182,10 @@ + # Note that, although the keyword below is infofile, it is only so for + # historic reasons, since now it is supposed to be a directory (unless + # you have selected some database format other than the `text' default) +-infofile "/usr/adm/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY +-logdir "/usr/adm/amanda/@DEFAULT_CONFIG@" # log directory +-indexdir "/usr/adm/amanda/@DEFAULT_CONFIG@/index" # index directory +-#tapelist "/usr/adm/amanda/@DEFAULT_CONFIG@/tapelist" # list of used tapes ++infofile "@localstatedir@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY ++logdir "@localstatedir@/@DEFAULT_CONFIG@" # log directory ++indexdir "@localstatedir@/@DEFAULT_CONFIG@/index" # index directory ++#tapelist "@localstatedir@/@DEFAULT_CONFIG@/tapelist" # list of used tapes + # tapelist is stored, by default, in the directory that contains amanda.conf + + diff --git a/sysutils/amanda-dev-server/patches/patch-ai b/sysutils/amanda-dev-server/patches/patch-ai new file mode 100644 index 00000000000..03b7ed6b890 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ai @@ -0,0 +1,34 @@ +$NetBSD: patch-ai,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- restore-src/Makefile.in.orig Fri Mar 8 20:29:48 2002 ++++ restore-src/Makefile.in Tue Apr 30 13:12:24 2002 +@@ -165,9 +165,7 @@ + # need to list libamanda twice here, first to override the system library + # routines, and second to pick up any references in the other libraries. + ### +-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++LDADD = -lamtape -lamanda + + + amidxtaped_SOURCES = amidxtaped.c +@@ -182,16 +180,12 @@ + am_amidxtaped_OBJECTS = amidxtaped.$(OBJEXT) + amidxtaped_OBJECTS = $(am_amidxtaped_OBJECTS) + amidxtaped_LDADD = $(LDADD) +-amidxtaped_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amidxtaped_DEPENDENCIES = + amidxtaped_LDFLAGS = + amrestore_SOURCES = amrestore.c + amrestore_OBJECTS = amrestore.$(OBJEXT) + amrestore_LDADD = $(LDADD) +-amrestore_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amrestore_DEPENDENCIES = + amrestore_LDFLAGS = + + DEFS = @DEFS@ diff --git a/sysutils/amanda-dev-server/patches/patch-aj b/sysutils/amanda-dev-server/patches/patch-aj new file mode 100644 index 00000000000..2be1e2781db --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-aj @@ -0,0 +1,30 @@ +$NetBSD: patch-aj,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- example/Makefile.in.orig Fri Mar 8 20:29:55 2002 ++++ example/Makefile.in Tue Apr 30 13:14:30 2002 +@@ -35,7 +35,7 @@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/examples/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +@@ -265,7 +265,15 @@ + + info-am: + +-install-data-am: ++install-data-am: $(noinst_DATA) $(EXTRA_DIST) ++ @$(NORMAL_INSTALL) ++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) ++ @list='$(noinst_DATA) $(EXTRA_DIST)'; for p in $$list; do \ ++ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ ++ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \ ++ done + + install-exec-am: + diff --git a/sysutils/amanda-dev-server/patches/patch-ak b/sysutils/amanda-dev-server/patches/patch-ak new file mode 100644 index 00000000000..a415d66d622 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- docs/Makefile.in.orig Fri Mar 8 20:29:54 2002 ++++ docs/Makefile.in Tue Apr 30 13:15:40 2002 +@@ -33,7 +33,7 @@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/doc/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. diff --git a/sysutils/amanda-dev-server/patches/patch-al b/sysutils/amanda-dev-server/patches/patch-al new file mode 100644 index 00000000000..92d3368bedf --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-al @@ -0,0 +1,35 @@ +$NetBSD: patch-al,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- man/Makefile.in.orig Fri Mar 8 20:29:52 2002 ++++ man/Makefile.in Tue Apr 30 15:19:08 2002 +@@ -150,20 +150,18 @@ + + transform = s,x,x,; + +-@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8 ++#AMPLOT_MAN_PAGES = amplot.8 + +-COMMON_MAN_PAGES = amanda.8 ++COMMON_MAN_PAGES = amanda.8 amdd.8 ammt.8 + + @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \ + @WANT_SERVER_TRUE@ amcheck.8 \ + @WANT_SERVER_TRUE@ amcheckdb.8 \ + @WANT_SERVER_TRUE@ amcleanup.8 \ +-@WANT_SERVER_TRUE@ amdd.8 \ + @WANT_SERVER_TRUE@ amdump.8 \ + @WANT_SERVER_TRUE@ amflush.8 \ + @WANT_SERVER_TRUE@ amgetconf.8 \ + @WANT_SERVER_TRUE@ amlabel.8 \ +-@WANT_SERVER_TRUE@ ammt.8 \ + @WANT_SERVER_TRUE@ amoverview.8 \ + @WANT_SERVER_TRUE@ amreport.8 \ + @WANT_SERVER_TRUE@ amrmtape.8 \ +@@ -181,7 +179,6 @@ + EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8 + + man_MANS = $(AMPLOT_MAN_PAGES) \ +- $(COMMON_MAN_PAGES) \ + $(SERVER_MAN_PAGES) \ + $(RECOVER_MAN_PAGES) \ + $(RESTORE_MAN_PAGES) diff --git a/sysutils/amanda-dev-server/patches/patch-am b/sysutils/amanda-dev-server/patches/patch-am new file mode 100644 index 00000000000..ea8b64ebe01 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-am @@ -0,0 +1,40 @@ +$NetBSD: patch-am,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- common-src/Makefile.in.orig Tue Apr 30 14:04:39 2002 ++++ common-src/Makefile.in Tue Apr 30 13:55:56 2002 +@@ -563,24 +563,19 @@ + done + check-am: all-am + check: check-am +-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) ++all-am: Makefile genversion.h + + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(libdir) + + install: install-am + install-exec: install-exec-am + install-data: install-data-am + uninstall: uninstall-am + +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++install-am: + + installcheck: installcheck-am + install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: + + clean-generic: +@@ -613,7 +608,7 @@ + + install-data-am: + +-install-exec-am: install-libLTLIBRARIES ++install-exec-am: + + install-info: install-info-am + diff --git a/sysutils/amanda-dev-server/patches/patch-ba b/sysutils/amanda-dev-server/patches/patch-ba new file mode 100644 index 00000000000..9021fb279a4 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ba @@ -0,0 +1,13 @@ +$NetBSD: patch-ba,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- common-src/token.h.orig Sun Feb 10 13:49:54 2002 ++++ common-src/token.h Tue Apr 30 13:35:22 2002 +@@ -43,7 +43,7 @@ + __attribute__ ((format (printf, 2, 3))); + extern char *quote P((char *sep, char *str)); + extern char *rxquote P((char *str)); +-extern char *shquote P((char *str)); ++extern char *am_shquote P((char *str)); + extern int table_lookup P((table_t *table, char *str)); + extern char *table_lookup_r P((table_t *table, int val)); + diff --git a/sysutils/amanda-dev-server/patches/patch-bb b/sysutils/amanda-dev-server/patches/patch-bb new file mode 100644 index 00000000000..24365f1e9b4 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-bb @@ -0,0 +1,13 @@ +$NetBSD: patch-bb,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- common-src/token.c.orig Thu Mar 15 20:30:23 2001 ++++ common-src/token.c Thu Mar 15 20:30:56 2001 +@@ -295,7 +295,7 @@ + } + + /* Quote a string so that it can be safely passed to a shell */ +-char *shquote(str) ++char *am_shquote(str) + char *str; /* the string to quote */ + { + char *pi, *po; diff --git a/sysutils/amanda-dev-server/patches/patch-bc b/sysutils/amanda-dev-server/patches/patch-bc new file mode 100644 index 00000000000..765c259e563 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-bc @@ -0,0 +1,13 @@ +$NetBSD: patch-bc,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- server-src/taper.c.orig Tue Apr 30 13:44:04 2002 ++++ server-src/taper.c Tue Apr 30 13:44:49 2002 +@@ -1484,7 +1484,7 @@ + void detach_buffers(bufp) + char *bufp; + { +- if(munmap((void *)bufp, saved_size)*conf_tapebufs) == -1) { ++ if(munmap((void *)bufp, saved_size) == -1) { + error("detach_buffers: munmap: %s", strerror(errno)); + } + diff --git a/sysutils/amanda-dev-server/patches/patch-bd b/sysutils/amanda-dev-server/patches/patch-bd new file mode 100644 index 00000000000..f111c51d80e --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-bd @@ -0,0 +1,13 @@ +$NetBSD: patch-bd,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- changer-src/chg-scsi-chio.c.orig Tue Apr 30 14:14:29 2002 ++++ changer-src/chg-scsi-chio.c Tue Apr 30 14:14:35 2002 +@@ -639,7 +639,7 @@ + + if(read_conffile(CONFFILE_NAME)) { + fprintf(stderr, "%s: could not find config file \"%s\"", +- changer_dev, conffile); ++ changer_dev, CONFFILE_NAME); + exit(1); + } + diff --git a/sysutils/amanda-dev-server/patches/patch-be b/sysutils/amanda-dev-server/patches/patch-be new file mode 100644 index 00000000000..dc97745a857 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-be @@ -0,0 +1,13 @@ +$NetBSD: patch-be,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- changer-src/scsi-bsd.c.orig Tue Apr 30 19:16:44 2002 ++++ changer-src/scsi-bsd.c Sun Sep 16 20:10:26 2001 +@@ -198,7 +198,7 @@ + { + SCSI_OpenDevice(DeviceFD); + } +- Result = ioctl(DeviceFD, SCIOCCOMMAND, &ds); ++ Result = ioctl(pDev[DeviceFD].fd, SCIOCCOMMAND, &ds); + SCSI_CloseDevice(DeviceFD); + + memcpy(pRequestSense, ds.sense, RequestSenseLength); diff --git a/sysutils/amanda-dev-server/patches/patch-bf b/sysutils/amanda-dev-server/patches/patch-bf new file mode 100644 index 00000000000..2c0ebe063f6 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-bf @@ -0,0 +1,23 @@ +$NetBSD: patch-bf,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- changer-src/scsi-changer-driver.c.orig Sun Feb 10 13:49:51 2002 ++++ changer-src/scsi-changer-driver.c Tue Apr 30 20:02:06 2002 +@@ -331,6 +331,18 @@ + GenericBarCode, + GenericSearch, + GenericSenseHandler}, ++ {"LXB", ++ "Overland LXB", ++ GenericMove, ++ GenericElementStatus, ++ GenericResetStatus, ++ GenericFree, ++ GenericEject, ++ GenericClean, ++ GenericRewind, ++ GenericBarCode, ++ GenericSearch, ++ GenericSenseHandler}, + /* + * And now the tape devices + */ |