Prepare for 2.4.2p2

This is a bug fix release.
Improve debugging support, fix some fd leaks and add barcode reader support.
For more details, refer to the Changelog.

3 files changed, 28 insertions, 41 deletions

diff --git a/sysutils/amanda-common/patches/patch-aa b/sysutils/amanda-common/patches/patch-aa
index 6421986add1..f4f596fe002 100644
--- a/sysutils/amanda-common/patches/patch-aa
+++ b/sysutils/amanda-common/patches/patch-aa
@@ -1,16 +1,19 @@
-$NetBSD: patch-aa,v 1.5 2001/01/16 21:59:31 cjones Exp $
+$NetBSD: patch-aa,v 1.6 2001/06/26 03:14:12 christos Exp $
 
---- client-src/Makefile.in.orig	Sat Nov 25 07:01:56 2000
-+++ client-src/Makefile.in	Thu Jan 11 12:40:19 2001
-@@ -284,9 +284,8 @@
+--- client-src/Makefile.in.orig	Mon Jun 25 21:44:46 2001
++++ client-src/Makefile.in	Mon Jun 25 22:29:03 2001
+@@ -281,11 +281,10 @@
  sendsize_LDFLAGS = 
  versionsuffix_SOURCES = versionsuffix.c
  versionsuffix_OBJECTS =  versionsuffix.$(OBJEXT)
 -versionsuffix_LDADD = $(LDADD)
--versionsuffix_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
+-versionsuffix_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
 +versionsuffix_LDADD = ../common-src/libamanda.$(LIB_EXTENSION)
 +versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION)
  versionsuffix_LDFLAGS = 
- SCRIPTS =  $(libexec_SCRIPTS) $(sbin_SCRIPTS)
+-SCRIPTS =  $(libexec_SCRIPTS) $(sbin_SCRIPTS)
++SCRIPTS =  $(libexec_S:RIPTS) $(sbin_SCRIPTS)
  
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/sysutils/amanda-common/patches/patch-ab b/sysutils/amanda-common/patches/patch-ab
index 9e5fd5be425..922dee6dd84 100644
--- a/sysutils/amanda-common/patches/patch-ab
+++ b/sysutils/amanda-common/patches/patch-ab
@@ -1,38 +1,22 @@
-$NetBSD: patch-ab,v 1.4 2001/01/16 21:59:31 cjones Exp $
+$NetBSD: patch-ab,v 1.5 2001/06/26 03:14:12 christos Exp $
 
---- Makefile.in.orig	Sat Nov 25 07:01:53 2000
-+++ Makefile.in	Fri Jan 12 11:20:53 2001
-@@ -154,11 +154,11 @@
+--- Makefile.in.orig	Tue Apr  3 15:55:47 2001
++++ Makefile.in	Mon Jun 25 21:50:51 2001
+@@ -151,11 +151,11 @@
  ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I)
  
- @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = @WANT_CLIENT_TRUE@client-src
--@WANT_TAPE_TRUE@TAPE_SUBDIRS = @WANT_TAPE_TRUE@tape-src
+ @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = client-src
+-@WANT_TAPE_TRUE@TAPE_SUBDIRS = tape-src
 +TAPE_SUBDIRS = tape-src
- @WANT_SERVER_TRUE@SERVER_SUBDIRS = @WANT_SERVER_TRUE@server-src changer-src
- @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = @WANT_RESTORE_TRUE@ restore-src
- @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = @WANT_RECOVER_TRUE@ recover-src
--@WANT_AMPLOT_TRUE@PLOT_SUBDIRS = @WANT_AMPLOT_TRUE@ amplot
-+#PLOT_SUBDIRS = amplot
+ @WANT_SERVER_TRUE@SERVER_SUBDIRS = server-src changer-src
+ @WANT_RESTORE_TRUE@RESTORE_SUBDIRS =  restore-src
+ @WANT_RECOVER_TRUE@RECOVER_SUBDIRS =  recover-src
+-@WANT_AMPLOT_TRUE@PLOT_SUBDIRS =  amplot
++# PLOT_SUBDIRS =  amplot
  # order is significant, don't change it arbitrarily
- SUBDIRS = \
- 	config \
-@@ -169,13 +169,10 @@
- 	$(RESTORE_SUBDIRS) \
- 	$(RECOVER_SUBDIRS) \
- 	$(PLOT_SUBDIRS) \
--	man docs example
-+	man
+ SUBDIRS =  	config 	common-src 	$(CLIENT_SUBDIRS) 	$(TAPE_SUBDIRS) 	$(SERVER_SUBDIRS) 	$(RESTORE_SUBDIRS) 	$(RECOVER_SUBDIRS) 	$(PLOT_SUBDIRS) 	man docs example
  
- 
--pkgdata_DATA = \
--	COPYRIGHT			\
--	COPYRIGHT-APACHE		\
--	COPYRIGHT-REGEX
-+pkgdata_DATA =
- 
- 
- EXTRA_DIST = $(SNAPSHOT_STAMP) \
-@@ -443,11 +440,11 @@
+@@ -381,11 +381,11 @@
  install-exec-am:
  install-exec: install-exec-recursive
  
diff --git a/sysutils/amanda-common/patches/patch-ac b/sysutils/amanda-common/patches/patch-ac
index 15d50cbaf8e..5d3a9d89c08 100644
--- a/sysutils/amanda-common/patches/patch-ac
+++ b/sysutils/amanda-common/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.4 2001/01/16 21:59:32 cjones Exp $
+$NetBSD: patch-ac,v 1.5 2001/06/26 03:14:12 christos Exp $
 
---- man/Makefile.in.orig	Thu Jan 11 14:35:21 2001
-+++ man/Makefile.in	Thu Jan 11 14:35:42 2001
-@@ -149,7 +149,7 @@
+--- man/Makefile.in.orig	Tue Apr  3 15:55:45 2001
++++ man/Makefile.in	Mon Jun 25 21:52:30 2001
+@@ -146,7 +146,7 @@
  
  transform = s,x,x,;
  
--@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = @WANT_AMPLOT_TRUE@amplot.8
+-@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8
 +#AMPLOT_MAN_PAGES = amplot.8
  
  COMMON_MAN_PAGES = amanda.8