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.

4 files changed, 75 insertions, 97 deletions

diff --git a/sysutils/amanda-client/patches/patch-ab b/sysutils/amanda-client/patches/patch-ab
index feb3b2e837c..af550f9f6a0 100644
--- a/sysutils/amanda-client/patches/patch-ab
+++ b/sysutils/amanda-client/patches/patch-ab
@@ -1,88 +1,86 @@
-$NetBSD: patch-ab,v 1.4 2001/01/16 21:59:30 cjones Exp $
+$NetBSD: patch-ab,v 1.5 2001/06/26 03:14:11 christos Exp $
 
---- client-src/Makefile.in~	Sat Nov 25 07:01:56 2000
-+++ client-src/Makefile.in	Mon Jan 15 16:42:12 2001
-@@ -171,8 +171,7 @@
+--- client-src/Makefile.in.orig	Tue Apr  3 15:55:44 2001
++++ client-src/Makefile.in	Mon Jun 25 22:05:53 2001
+@@ -174,7 +174,7 @@
+ # routines, and second to pick up any references in the other libraries.
+ ###
  
- libamclient_a_SOURCES = $(libamclient_la_SOURCES)
- 
--LDADD = libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
+-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) 	libamclient.$(LIB_EXTENSION) 	../common-src/libamanda.$(LIB_EXTENSION)
 +LDADD = libamclient.$(LIB_EXTENSION) -lamanda
  
  
  SUFFIXES = .sh .pl
-@@ -230,63 +229,53 @@
+@@ -228,62 +228,52 @@
+ 
+ getfsent_OBJECTS =  getfsent.test.$(OBJEXT)
+ getfsent_LDADD = $(LDADD)
+-getfsent_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++getfsent_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+ getfsent_LDFLAGS = 
  amandad_SOURCES = amandad.c
  amandad_OBJECTS =  amandad.$(OBJEXT)
  amandad_LDADD = $(LDADD)
--amandad_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
+-amandad_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
 +amandad_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
  amandad_LDFLAGS = 
  calcsize_SOURCES = calcsize.c
  calcsize_OBJECTS =  calcsize.$(OBJEXT)
  calcsize_LDADD = $(LDADD)
--calcsize_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
+-calcsize_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
 +calcsize_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
  calcsize_LDFLAGS = 
- am_getfsent_OBJECTS =  getfsent.test.$(OBJEXT)
- getfsent_OBJECTS =  $(am_getfsent_OBJECTS)
- getfsent_LDADD = $(LDADD)
--getfsent_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+getfsent_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
- getfsent_LDFLAGS = 
  killpgrp_SOURCES = killpgrp.c
  killpgrp_OBJECTS =  killpgrp.$(OBJEXT)
  killpgrp_LDADD = $(LDADD)
--killpgrp_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+killpgrp_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
+-killpgrp_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++killpgrp_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  killpgrp_LDFLAGS = 
  rundump_SOURCES = rundump.c
  rundump_OBJECTS =  rundump.$(OBJEXT)
  rundump_LDADD = $(LDADD)
--rundump_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+rundump_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
+-rundump_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  rundump_LDFLAGS = 
  runtar_SOURCES = runtar.c
  runtar_OBJECTS =  runtar.$(OBJEXT)
  runtar_LDADD = $(LDADD)
--runtar_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+runtar_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
+-runtar_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++runtar_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  runtar_LDFLAGS = 
  selfcheck_SOURCES = selfcheck.c
  selfcheck_OBJECTS =  selfcheck.$(OBJEXT)
  selfcheck_LDADD = $(LDADD)
--selfcheck_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+selfcheck_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
+-selfcheck_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++selfcheck_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  selfcheck_LDFLAGS = 
- am_sendbackup_OBJECTS =  sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \
+ sendbackup_OBJECTS =  sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \
  sendbackup-gnutar.$(OBJEXT)
- sendbackup_OBJECTS =  $(am_sendbackup_OBJECTS)
  sendbackup_LDADD = $(LDADD)
--sendbackup_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+sendbackup_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
+-sendbackup_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++sendbackup_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  sendbackup_LDFLAGS = 
  sendsize_SOURCES = sendsize.c
  sendsize_OBJECTS =  sendsize.$(OBJEXT)
  sendsize_LDADD = $(LDADD)
--sendsize_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+sendsize_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
+-sendsize_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++sendsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  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 =  libamclient.$(LIB_EXTENSION)
+-versionsuffix_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  versionsuffix_LDFLAGS = 
  SCRIPTS =  $(libexec_SCRIPTS) $(sbin_SCRIPTS)
  
diff --git a/sysutils/amanda-client/patches/patch-ac b/sysutils/amanda-client/patches/patch-ac
index 715427aaf76..c5740498e6d 100644
--- a/sysutils/amanda-client/patches/patch-ac
+++ b/sysutils/amanda-client/patches/patch-ac
@@ -1,27 +1,17 @@
-$NetBSD: patch-ac,v 1.4 2001/01/16 21:59:30 cjones Exp $
+$NetBSD: patch-ac,v 1.5 2001/06/26 03:14:11 christos Exp $
 
---- Makefile.in.orig	Sat Nov 25 07:01:53 2000
-+++ Makefile.in	Mon Jan 15 16:52:37 2001
-@@ -162,20 +162,15 @@
+--- Makefile.in.orig	Tue Apr  3 15:55:47 2001
++++ Makefile.in	Mon Jun 25 22:16:50 2001
+@@ -157,10 +157,10 @@
+ @WANT_RECOVER_TRUE@RECOVER_SUBDIRS =  recover-src
+ @WANT_AMPLOT_TRUE@PLOT_SUBDIRS =  amplot
  # order is significant, don't change it arbitrarily
- SUBDIRS = \
- 	config \
--	common-src \
- 	$(CLIENT_SUBDIRS) \
- 	$(TAPE_SUBDIRS) \
- 	$(SERVER_SUBDIRS) \
- 	$(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
++SUBDIRS =  	config 		$(CLIENT_SUBDIRS) 	$(TAPE_SUBDIRS) 	$(SERVER_SUBDIRS) 	$(RESTORE_SUBDIRS) 	$(RECOVER_SUBDIRS) man
  
  
--pkgdata_DATA = \
--	COPYRIGHT			\
--	COPYRIGHT-APACHE		\
--	COPYRIGHT-REGEX
+-pkgdata_DATA =  	COPYRIGHT				COPYRIGHT-APACHE			COPYRIGHT-REGEX
 +pkgdata_DATA =
  
  
- EXTRA_DIST = $(SNAPSHOT_STAMP) \
+ EXTRA_DIST = $(SNAPSHOT_STAMP) 	$(pkgdata_DATA)				contrib/README				contrib/dbbackup.README			contrib/dbbackup.ksh			contrib/dbbackup.sql			contrib/dbbackup.tcl			contrib/set_prod_link.pl		contrib/sst/Makefile			contrib/sst/README			contrib/sst/README.Amanda		contrib/sst/sst.c			contrib/sst/sst.conf			contrib/sst/sst_def.h			contrib/sst/sstest.c			patches/regex-3.6alpha.patch		patches/samba-largefs.patch		patches/tar-1.12.patch			regex-src/COPYRIGHT			regex-src/Makefile 			regex-src/README			regex-src/WHATSNEW 			regex-src/cclass.h			regex-src/cname.h			regex-src/debug.c			regex-src/engine.c			regex-src/main.c			regex-src/mkh				regex-src/regcomp.c			regex-src/regerror.c			regex-src/regex.3			regex-src/regex.7			regex-src/regex2.h			regex-src/regexec.c			regex-src/regfree.c			regex-src/split.c			regex-src/tests				regex-src/utils.h			regex-src/fake/limits.h			regex-src/fake/memmove.c		regex-src/fake/stdlib.h
diff --git a/sysutils/amanda-client/patches/patch-ad b/sysutils/amanda-client/patches/patch-ad
index b47a4196eb3..74d45935cef 100644
--- a/sysutils/amanda-client/patches/patch-ad
+++ b/sysutils/amanda-client/patches/patch-ad
@@ -1,15 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2001/01/16 21:59:30 cjones Exp $
+$NetBSD: patch-ad,v 1.5 2001/06/26 03:14:11 christos Exp $
 
---- man/Makefile.in.orig	Sat Nov 25 07:02:01 2000
-+++ man/Makefile.in	Mon Jan 15 16:59:05 2001
-@@ -176,9 +176,7 @@
+--- man/Makefile.in.orig	Tue Apr  3 15:55:45 2001
++++ man/Makefile.in	Mon Jun 25 22:09:13 2001
+@@ -159,7 +159,7 @@
  # not autoconf-generated:
  EXTRA_DIST = amplot.8 amrestore.8 amtape.8
  
--man_MANS = $(AMPLOT_MAN_PAGES) \
--	   $(COMMON_MAN_PAGES) \
--	   $(SERVER_MAN_PAGES) \
-+man_MANS = $(SERVER_MAN_PAGES) \
- 	   $(RECOVER_MAN_PAGES) \
- 	   $(RESTORE_MAN_PAGES)
+-man_MANS = $(AMPLOT_MAN_PAGES) 	   $(COMMON_MAN_PAGES) 	   $(SERVER_MAN_PAGES) 	   $(RECOVER_MAN_PAGES) 	   $(RESTORE_MAN_PAGES)
++man_MANS = $(SERVER_MAN_PAGES) 	   $(RECOVER_MAN_PAGES) 	   $(RESTORE_MAN_PAGES)
  
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = ../config/config.h
diff --git a/sysutils/amanda-client/patches/patch-ae b/sysutils/amanda-client/patches/patch-ae
index 8265f067b76..72660900711 100644
--- a/sysutils/amanda-client/patches/patch-ae
+++ b/sysutils/amanda-client/patches/patch-ae
@@ -1,32 +1,24 @@
-$NetBSD: patch-ae,v 1.5 2001/05/29 18:04:30 jlam Exp $
+$NetBSD: patch-ae,v 1.6 2001/06/26 03:14:11 christos Exp $
 
---- recover-src/Makefile.in.orig	Sat Nov 25 09:02:00 2000
-+++ recover-src/Makefile.in	Tue May 29 12:32:35 2001
-@@ -158,7 +158,7 @@
+--- recover-src/Makefile.in.orig	Tue Apr  3 15:55:45 2001
++++ recover-src/Makefile.in	Mon Jun 25 22:23:26 2001
+@@ -159,7 +159,7 @@
+ # routines, and second to pick up any references in the other libraries.
+ ###
  
- LDADD = @LEXLIB@ \
- 	../client-src/libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+	-lamanda -lreadline -ltermcap
+-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) 	@LEXLIB@ 	../client-src/libamclient.$(LIB_EXTENSION) 	../common-src/libamanda.$(LIB_EXTENSION)
++LDADD =  	@LEXLIB@ 	../client-src/libamclient.$(LIB_EXTENSION) 	-lamanda
  
  
- amrecover_SOURCES = amrecover.c					\
-@@ -179,7 +179,7 @@
- 
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../config
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ -DHAVE_LIBREADLINE
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- am_amrecover_OBJECTS =  amrecover.$(OBJEXT) display_commands.$(OBJEXT) \
-@@ -187,8 +187,7 @@
+ amrecover_SOURCES = amrecover.c								display_commands.c		extract_list.c				help.c				set_commands.c				uparse.y			uscan.l
+@@ -183,9 +183,7 @@
+ extract_list.$(OBJEXT) help.$(OBJEXT) set_commands.$(OBJEXT) \
  uparse.$(OBJEXT) uscan.$(OBJEXT)
- amrecover_OBJECTS =  $(am_amrecover_OBJECTS)
  amrecover_LDADD = $(LDADD)
--amrecover_DEPENDENCIES =  ../client-src/libamclient.$(LIB_EXTENSION) \
+-amrecover_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-../client-src/libamclient.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+amrecover_DEPENDENCIES =  ../client-src/libamclient.$(LIB_EXTENSION)
++amrecover_DEPENDENCIES =  ../client-src/libamclient.$(LIB_EXTENSION) 
  amrecover_LDFLAGS = 
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LEXLIB = @LEXLIB@