diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-09-01 21:38:59 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-09-01 21:38:59 +0000 |
commit | beced671bdcb6ffe50e652d814ac803ba36386d8 (patch) | |
tree | 88eb9dbb4fc80b7d159c64e16db129bdd9b80aed /misc/amanda26-server/files | |
parent | Add the current SUSv4/Open Group Base Specifications Issue 7. (diff) |
Remove non staged ports without pending PR from m*
Notes
Notes:
svn path=/head/; revision=366962
Diffstat (limited to 'misc/amanda26-server/files')
20 files changed, 0 insertions, 655 deletions
diff --git a/misc/amanda26-server/files/extra-patch-application-src::amzfs-sendrecv.pl b/misc/amanda26-server/files/extra-patch-application-src::amzfs-sendrecv.pl deleted file mode 100644 index 0a19153747d9..000000000000 --- a/misc/amanda26-server/files/extra-patch-application-src::amzfs-sendrecv.pl +++ /dev/null @@ -1,52 +0,0 @@ ---- application-src/amzfs-sendrecv.pl.orig 2009-01-22 02:35:38.000000000 +0100 -+++ application-src/amzfs-sendrecv.pl 2009-01-31 10:37:59.495534563 +0100 -@@ -235,13 +235,48 @@ - } elsif (defined $errmsg) { - $self->print_to_server_and_die($action, $errmsg, $Amanda::Script_App::ERROR); - } else { -- $self->print_to_server_and_die($action, "cannot estimate snapshot '$self->{snapshot}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR); -+ $self->print_to_server_and_die($action, "cannot estimate snapshot '$self->{snapshot}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR); - } - } -+ if ($level == 0) { -+ my $compratio = $self->get_compratio(); -+ $msg *= int $compratio; -+ } - - return $msg; - } - -+sub get_compratio -+{ -+ my $self = shift; -+ my $action = shift; -+ -+ my $cmd; -+ $cmd = "$self->{pfexec_cmd} $self->{zfs_path} get -Hp -o value compressratio $self->{filesystem}\@$self->{snapshot}"; -+ debug "running (get-compression): $cmd"; -+ my($wtr, $rdr, $err, $pid); -+ $err = Symbol::gensym; -+ $pid = open3($wtr, $rdr, $err, $cmd); -+ close $wtr; -+ my ($msg) = <$rdr>; -+ my ($errmsg) = <$err>; -+ waitpid $pid, 0; -+ close $rdr; -+ close $err; -+ if ($? != 0) { -+ if (defined $msg && defined $errmsg) { -+ $self->print_to_server_and_die($action, "$msg, $errmsg", $Amanda::Script_App::ERROR); -+ } elsif (defined $msg) { -+ $self->print_to_server_and_die($action, $msg, $Amanda::Script_App::ERROR); -+ } elsif (defined $errmsg) { -+ $self->print_to_server_and_die($action, $errmsg, $Amanda::Script_App::ERROR); -+ } else { -+ $self->print_to_server_and_die($action, "cannot read compression ratio '$self->{snapshot}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR); -+ } -+ } -+ return $msg -+} -+ - sub command_index_from_output { - } - diff --git a/misc/amanda26-server/files/extra-patch-sendbackup-dump.c b/misc/amanda26-server/files/extra-patch-sendbackup-dump.c deleted file mode 100644 index 3a232d1a8f25..000000000000 --- a/misc/amanda26-server/files/extra-patch-sendbackup-dump.c +++ /dev/null @@ -1,23 +0,0 @@ ---- client-src/sendbackup-dump.c.orig 2008-12-13 04:18:11.000000000 +0900 -+++ client-src/sendbackup-dump.c 2009-01-27 07:30:40.000000000 +0900 -@@ -35,6 +35,10 @@ - #include "clock.h" - #include "version.h" - -+#ifdef __FreeBSD__ -+#include <sys/param.h> -+#endif -+ - #define LEAF_AND_DIRS "sed -e \'\ns/^leaf[ \t]*[0-9]*[ \t]*\\.//\nt\n/^dir[ \t]/ {\ns/^dir[ \t]*[0-9]*[ \t]*\\.//\ns%$%/%\nt\n}\nd\n\'" - - static amregex_t re_table[] = { -@@ -310,6 +314,9 @@ - cmdX, config, - "vxdump", - dumpkeys, -+#ifdef __FreeBSD__ -+ "64", -+#endif - "1048576", - "-", - device, diff --git a/misc/amanda26-server/files/patch-ad b/misc/amanda26-server/files/patch-ad deleted file mode 100644 index 3fff9c551c52..000000000000 --- a/misc/amanda26-server/files/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ ---- client-src/calcsize.c.orig 2008-01-18 09:31:16.000000000 +0900 -+++ client-src/calcsize.c 2008-08-30 20:11:59.000000000 +0900 -@@ -160,7 +160,11 @@ - dump_total += (ST_BLOCKS(finfo) + (off_t)1) / (off_t)2 + (off_t)1; - gtar_total += ROUND(4,(ST_BLOCKS(finfo) + (off_t)1)); - } -+#ifdef GNUTAR -+ g_printf(" GNUTAR dump\n"); -+#else - g_printf(" gtar dump\n"); -+#endif - g_printf("total %-9lu %-9lu\n",gtar_total,dump_total); - return 0; - #else diff --git a/misc/amanda26-server/files/patch-amandad-src__Makefile.in b/misc/amanda26-server/files/patch-amandad-src__Makefile.in deleted file mode 100644 index 9a80b4b90f95..000000000000 --- a/misc/amanda26-server/files/patch-amandad-src__Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- amandad-src/Makefile.in.orig 2009-01-27 13:43:16.000000000 +0900 -+++ amandad-src/Makefile.in 2009-01-27 13:44:02.000000000 +0900 -@@ -776,7 +776,8 @@ - AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) - LINT = $(AMLINT) - LINTFLAGS = $(AMLINTFLAGS) --amlib_LTLIBRARIES = libamandad.la -+@WANT_SERVER_TRUE@amlib_LTLIBRARIES = -+@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamandad.la - LIB_EXTENSION = la - libamandad_la_SOURCES = amandad_util.c - libamandad_la_LDFLAGS = -release $(VERSION) diff --git a/misc/amanda26-server/files/patch-amar-src__Makefile.in b/misc/amanda26-server/files/patch-amar-src__Makefile.in deleted file mode 100644 index c7941f44904e..000000000000 --- a/misc/amanda26-server/files/patch-amar-src__Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- amar-src/Makefile.in.orig 2009-01-27 14:01:04.000000000 +0900 -+++ amar-src/Makefile.in 2009-01-27 14:01:36.000000000 +0900 -@@ -856,7 +856,8 @@ - AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) - LINT = @AMLINT@ - LINTFLAGS = @AMLINTFLAGS@ --amlib_LTLIBRARIES = libamar.la -+@WANT_SERVER_TRUE@amlib_LTLIBRARIES = -+@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamar.la - libamar_la_SOURCES = amar.c - libamar_la_LDFLAGS = -release $(VERSION) - libamar_la_LIBADD = ../common-src/libamanda.la diff --git a/misc/amanda26-server/files/patch-changer-src__chg-glue.pl b/misc/amanda26-server/files/patch-changer-src__chg-glue.pl deleted file mode 100644 index 20467d2116fd..000000000000 --- a/misc/amanda26-server/files/patch-changer-src__chg-glue.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- changer-src/chg-glue.pl.orig 2009-01-28 15:06:00.000000000 +0900 -+++ changer-src/chg-glue.pl 2009-01-28 15:06:22.000000000 +0900 -@@ -206,6 +206,7 @@ - finish(); - return; - } -+ chomp($command); - - if (($slot) = ($command =~ /^-slot (.*)$/)) { - do_slot($slot); diff --git a/misc/amanda26-server/files/patch-common-src__Makefile.in b/misc/amanda26-server/files/patch-common-src__Makefile.in deleted file mode 100644 index 9da99a06935e..000000000000 --- a/misc/amanda26-server/files/patch-common-src__Makefile.in +++ /dev/null @@ -1,49 +0,0 @@ ---- common-src/Makefile.in.orig 2009-11-06 05:11:37.000000000 +0900 -+++ common-src/Makefile.in 2009-12-14 10:29:52.479439079 +0900 -@@ -1091,6 +1091,7 @@ - - sbin_SCRIPTS_PERL = \ - $(sbin_CHECK_PERL) -+@WANT_SERVER_TRUE@sbin_SCRIPTS_PERL = - - amlibexec_CHECK_PERL = - amlibexec_SCRIPTS_PERL = \ -@@ -1101,6 +1102,7 @@ - amaespipe \ - amcrypt-ossl \ - amcrypt-ossl-asym -+@WANT_SERVER_TRUE@sbin_SCRIPTS_SHELL = - - amlibexec_SCRIPTS_SHELL = - SCRIPTS_INCLUDE = \ -@@ -1155,18 +1157,18 @@ - versuff.c: $(top_builddir)/config.status $(srcdir)/versuff.c.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - install-amlibLTLIBRARIES: $(amlib_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- test -z "$(amlibdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibdir)" -- @list='$(amlib_LTLIBRARIES)'; test -n "$(amlibdir)" || list=; \ -- list2=; for p in $$list; do \ -- if test -f $$p; then \ -- list2="$$list2 $$p"; \ -- else :; fi; \ -- done; \ -- test -z "$$list2" || { \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(amlibdir)'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(amlibdir)"; \ -- } -+@WANT_CLIENT_TRUE@ @$(NORMAL_INSTALL) -+@WANT_CLIENT_TRUE@ test -z "$(amlibdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibdir)" -+@WANT_CLIENT_TRUE@ @list='$(amlib_LTLIBRARIES)'; test -n "$(amlibdir)" || list=; \ -+@WANT_CLIENT_TRUE@ list2=; for p in $$list; do \ -+@WANT_CLIENT_TRUE@ if test -f $$p; then \ -+@WANT_CLIENT_TRUE@ list2="$$list2 $$p"; \ -+@WANT_CLIENT_TRUE@ else :; fi; \ -+@WANT_CLIENT_TRUE@ done; \ -+@WANT_CLIENT_TRUE@ test -z "$$list2" || { \ -+@WANT_CLIENT_TRUE@ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(amlibdir)'"; \ -+@WANT_CLIENT_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(amlibdir)"; \ -+@WANT_CLIENT_TRUE@ } - - uninstall-amlibLTLIBRARIES: - @$(NORMAL_UNINSTALL) diff --git a/misc/amanda26-server/files/patch-common-src__glib-util.c b/misc/amanda26-server/files/patch-common-src__glib-util.c deleted file mode 100644 index eb92dddcfc54..000000000000 --- a/misc/amanda26-server/files/patch-common-src__glib-util.c +++ /dev/null @@ -1,91 +0,0 @@ ---- common-src/glib-util.c.orig 2008-12-01 21:17:19.000000000 +0000 -+++ common-src/glib-util.c 2013-02-07 15:54:40.000000000 +0000 -@@ -38,26 +38,15 @@ - if (did_glib_init) return; - did_glib_init = TRUE; - -- /* Initialize glib's type system */ -- g_type_init(); -- - /* set up libcurl (this must happen before threading - * is initialized) */ - #ifdef HAVE_LIBCURL - # ifdef G_THREADS_ENABLED -- g_assert(!g_thread_supported()); -+ g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */ - # endif - g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0); - #endif - -- /* And set up glib's threads */ --#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE) -- if (g_thread_supported()) { -- return; -- } -- g_thread_init(NULL); --#endif -- - /* do a version check */ - #if GLIB_CHECK_VERSION(2,6,0) - { -@@ -71,6 +60,17 @@ - } - } - #endif -+ -+ /* Initialize glib's type system. On glib >= 2.24, this will initialize -+ * threads, so it must be done after curl is initialized. */ -+ g_type_init(); -+ -+ /* And set up glib's threads */ -+#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE) -+ if (!g_thread_supported()) -+ g_thread_init(NULL); -+#endif -+ - } - - typedef enum { -@@ -107,38 +107,19 @@ - return to; - } - --void g_list_free_full(GList * list) { -- GList * cur = list; -- -- while (cur != NULL) { -- gpointer data = cur->data; -- amfree(data); -- cur = g_list_next(cur); -- } -- -- g_list_free(list); --} -- --void g_slist_free_full(GSList * list) { -+#if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 28)) -+void _slist_free_full(GSList * list, GDestroyNotify free_fn) { - GSList * cur = list; - - while (cur != NULL) { - gpointer data = cur->data; -- amfree(data); -+ free_fn(data); - cur = g_slist_next(cur); - } - - g_slist_free(list); - } -- --void g_queue_free_full(GQueue * queue) { -- while (!g_queue_is_empty(queue)) { -- gpointer data; -- data = g_queue_pop_head(queue); -- amfree(data); -- } -- g_queue_free(queue); --} -+#endif - - void g_ptr_array_free_full(GPtrArray * array) { - size_t i; diff --git a/misc/amanda26-server/files/patch-common-src_conffile.c b/misc/amanda26-server/files/patch-common-src_conffile.c deleted file mode 100644 index 1503c7f5c67e..000000000000 --- a/misc/amanda26-server/files/patch-common-src_conffile.c +++ /dev/null @@ -1,29 +0,0 @@ ---- common-src/conffile.c.orig 2011-06-25 22:48:30.000000000 +0200 -+++ common-src/conffile.c 2011-06-25 22:58:42.000000000 +0200 -@@ -4151,7 +4151,7 @@ - amfree(config_name); - amfree(config_dir); - -- g_slist_free_full(seen_filenames); -+ _slist_free_full(seen_filenames, g_free); - seen_filenames = NULL; - - config_client = FALSE; -@@ -5655,7 +5655,7 @@ - break; - - case CONFTYPE_PP_SCRIPTLIST: -- g_slist_free_full(val->v.pp_scriptlist); -+ _slist_free_full(val->v.pp_scriptlist, g_free); - break; - - case CONFTYPE_APPLICATION: -@@ -6771,7 +6771,7 @@ - void - config_clear_errors(void) - { -- g_slist_free_full(cfgerr_errors); -+ _slist_free_full(cfgerr_errors, g_free); - - cfgerr_errors = NULL; - cfgerr_level = CFGERR_OK; diff --git a/misc/amanda26-server/files/patch-common-src_glib-util.h b/misc/amanda26-server/files/patch-common-src_glib-util.h deleted file mode 100644 index 913e150674ee..000000000000 --- a/misc/amanda26-server/files/patch-common-src_glib-util.h +++ /dev/null @@ -1,22 +0,0 @@ ---- common-src/glib-util.h.orig 2008-12-01 21:17:19.000000000 +0000 -+++ common-src/glib-util.h 2013-02-07 15:54:27.000000000 +0000 -@@ -62,11 +62,16 @@ - * Returns its second (reset) argument.*/ - GValue* g_value_unset_copy(const GValue* from, GValue * to); - -+/* This function is available in glib-2.28.0 and higher; for lower versions -+ * we build our own version with a different name */ -+#if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 28)) -+void _slist_free_full(GSList * list, GDestroyNotify free_fn); -+#else -+#define _slist_free_full(list, free_fn) g_slist_free_full((list), (free_fn)) -+#endif -+ - /* These functions all take a GLib container, and call free() on all the - * pointers in the container before free()ing the container itself. */ --void g_list_free_full(GList * list); --void g_slist_free_full(GSList * list); --void g_queue_free_full(GQueue * queue); - void g_ptr_array_free_full(GPtrArray * array); - - /* g_value_compare() does what you expect. It returns TRUE if and diff --git a/misc/amanda26-server/files/patch-man__Makefile.in b/misc/amanda26-server/files/patch-man__Makefile.in deleted file mode 100644 index daeea0759ce8..000000000000 --- a/misc/amanda26-server/files/patch-man__Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- man/Makefile.in.orig 2009-01-22 22:51:25.000000000 +0900 -+++ man/Makefile.in 2009-01-27 07:27:10.000000000 +0900 -@@ -640,6 +640,7 @@ - amanda-auth.7 \ - amarchiver.8 \ - script-email.8 -+@WANT_SERVER_TRUE@COMMON_MAN_PAGES = - - CLIENT_MAN_PAGES = \ - amanda-applications.7 \ diff --git a/misc/amanda26-server/files/patch-perl__Amanda__Process.pm b/misc/amanda26-server/files/patch-perl__Amanda__Process.pm deleted file mode 100644 index 806659b3f979..000000000000 --- a/misc/amanda26-server/files/patch-perl__Amanda__Process.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- perl/Amanda/Process.pm.orig 2009-01-28 13:57:55.000000000 +0900 -+++ perl/Amanda/Process.pm 2009-01-28 13:58:19.000000000 +0900 -@@ -155,7 +155,7 @@ - $self->{ppid} = (); - my $ps_argument = $Amanda::Constants::PS_ARGUMENT; - if ($ps_argument eq "CYGWIN") { -- open(PSTABLE, "-|", "ps -ef") || die("ps -ef: $!"); -+ open(PSTABLE, "-|", "ps -f") || die("ps -f: $!"); - my $psline = <PSTABLE>; #header line - while($psline = <PSTABLE>) { - chomp $psline; diff --git a/misc/amanda26-server/files/patch-perl__Makefile.in b/misc/amanda26-server/files/patch-perl__Makefile.in deleted file mode 100644 index b32626c1144e..000000000000 --- a/misc/amanda26-server/files/patch-perl__Makefile.in +++ /dev/null @@ -1,195 +0,0 @@ ---- perl/Makefile.in.orig 2009-01-22 22:51:25.000000000 +0900 -+++ perl/Makefile.in 2009-01-27 16:15:23.000000000 +0900 -@@ -316,9 +316,9 @@ - $(libApplication_la_LDFLAGS) $(LDFLAGS) -o $@ - @WANT_CLIENT_TRUE@am_libApplication_la_rpath = -rpath \ - @WANT_CLIENT_TRUE@ $(libApplicationdir) --libArchive_la_DEPENDENCIES = libamglue.la \ -- $(top_builddir)/amar-src/libamar.la \ -- $(top_builddir)/common-src/libamanda.la -+@WANT_CLIENT_TRUE@libArchive_la_DEPENDENCIES = libamglue.la \ -+@WANT_CLIENT_TRUE@ $(top_builddir)/amar-src/libamar.la \ -+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - am_libArchive_la_OBJECTS = Archive.lo $(am__objects_1) - libArchive_la_OBJECTS = $(am_libArchive_la_OBJECTS) - libArchive_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -@@ -337,15 +337,15 @@ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libCmdline_la_LDFLAGS) $(LDFLAGS) -o $@ - @WANT_SERVER_TRUE@am_libCmdline_la_rpath = -rpath $(libCmdlinedir) --libConfig_la_DEPENDENCIES = libamglue.la \ -- $(top_builddir)/common-src/libamanda.la -+@WANT_CLIENT_TRUE@libConfig_la_DEPENDENCIES = libamglue.la \ -+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - am_libConfig_la_OBJECTS = Config.lo $(am__objects_1) - libConfig_la_OBJECTS = $(am_libConfig_la_OBJECTS) - libConfig_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libConfig_la_LDFLAGS) $(LDFLAGS) -o $@ --libDebug_la_DEPENDENCIES = libamglue.la \ -- $(top_builddir)/common-src/libamanda.la -+@WANT_CLIENT_TRUE@libDebug_la_DEPENDENCIES = libamglue.la \ -+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - am_libDebug_la_OBJECTS = Debug.lo $(am__objects_1) - libDebug_la_OBJECTS = $(am_libDebug_la_OBJECTS) - libDebug_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -@@ -376,8 +376,8 @@ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libLogfile_la_LDFLAGS) $(LDFLAGS) -o $@ - @WANT_SERVER_TRUE@am_libLogfile_la_rpath = -rpath $(libLogfiledir) --libMainLoop_la_DEPENDENCIES = libamglue.la \ -- $(top_builddir)/common-src/libamanda.la -+@WANT_CLIENT_TRUE@libMainLoop_la_DEPENDENCIES = libamglue.la \ -+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - am_libMainLoop_la_OBJECTS = MainLoop.lo $(am__objects_1) - libMainLoop_la_OBJECTS = $(am_libMainLoop_la_OBJECTS) - libMainLoop_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -@@ -396,23 +396,23 @@ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libTapelist_la_LDFLAGS) $(LDFLAGS) -o $@ - @WANT_SERVER_TRUE@am_libTapelist_la_rpath = -rpath $(libTapelistdir) --libTests_la_DEPENDENCIES = libamglue.la \ -- $(top_builddir)/common-src/libamanda.la -+@WANT_CLIENT_TRUE@libTests_la_DEPENDENCIES = libamglue.la \ -+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - am_libTests_la_OBJECTS = Tests.lo $(am__objects_1) - libTests_la_OBJECTS = $(am_libTests_la_OBJECTS) - libTests_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libTests_la_LDFLAGS) $(LDFLAGS) -o $@ --libTypes_la_DEPENDENCIES = libamglue.la \ -- $(top_builddir)/common-src/libamanda.la -+@WANT_CLIENT_TRUE@libTypes_la_DEPENDENCIES = libamglue.la \ -+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - am_libTypes_la_OBJECTS = Types.lo $(am__objects_1) - libTypes_la_OBJECTS = $(am_libTypes_la_OBJECTS) - libTypes_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libTypes_la_LDFLAGS) $(LDFLAGS) -o $@ --libUtil_la_DEPENDENCIES = libamglue.la \ -- $(top_builddir)/common-src/libamanda.la --am_libUtil_la_OBJECTS = Util.lo $(am__objects_1) -+@WANT_CLIENT_TRUE@libUtil_la_DEPENDENCIES = libamglue.la \ -+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la -+@WANT_CLIENT_TRUE@am_libUtil_la_OBJECTS = Util.lo $(am__objects_1) - libUtil_la_OBJECTS = $(am_libUtil_la_OBJECTS) - libUtil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -984,7 +984,8 @@ - $(am__append_2) $(am__append_3) $(am__append_4) - - # (amplot has a conditional, but doesn't have any header files) --amlib_LTLIBRARIES = libamglue.la -+@WANT_SERVER_TRUE@amlib_LTLIBRARIES = -+@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamglue.la - libamglue_la_SOURCES = \ - amglue/ghashtable.c \ - amglue/bigint.c \ -@@ -1042,10 +1043,11 @@ - Amanda/Types.pm Amanda/Tests.pm Amanda/MainLoop.pm \ - Amanda/Paths.pm Amanda/Constants.pm Amanda/Script_App.pm \ - $(am__append_8) Amanda/Script.pm -+@WANT_SERVER_TRUE@Amanda_DATA = $(am__append_5) - - # PACKAGE: Amanda::Archive --libArchivedir = $(amperldir)/auto/Amanda/Archive --libArchive_LTLIBRARIES = libArchive.la -+@WANT_CLIENT_TRUE@libArchivedir = $(amperldir)/auto/Amanda/Archive -+@WANT_CLIENT_TRUE@libArchive_LTLIBRARIES = libArchive.la - libArchive_la_SOURCES = Amanda/Archive.c $(AMGLUE_SWG) - libArchive_la_LDFLAGS = $(PERL_EXT_LDFLAGS) - libArchive_la_LIBADD = libamglue.la \ -@@ -1118,57 +1120,57 @@ - - - # PACKAGE: Amanda::Debug --libDebugdir = $(amperldir)/auto/Amanda/Debug --libDebug_LTLIBRARIES = libDebug.la --libDebug_la_SOURCES = Amanda/Debug.c $(AMGLUE_SWG) --libDebug_la_LDFLAGS = $(PERL_EXT_LDFLAGS) --libDebug_la_LIBADD = libamglue.la \ -- $(top_builddir)/common-src/libamanda.la -+@WANT_CLIENT_TRUE@libDebugdir = $(amperldir)/auto/Amanda/Debug -+@WANT_CLIENT_TRUE@libDebug_LTLIBRARIES = libDebug.la -+@WANT_CLIENT_TRUE@libDebug_la_SOURCES = Amanda/Debug.c $(AMGLUE_SWG) -+@WANT_CLIENT_TRUE@libDebug_la_LDFLAGS = $(PERL_EXT_LDFLAGS) -+@WANT_CLIENT_TRUE@libDebug_la_LIBADD = libamglue.la \ -+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - - - # PACKAGE: Amanda::Config --libConfigdir = $(amperldir)/auto/Amanda/Config --libConfig_LTLIBRARIES = libConfig.la --libConfig_la_SOURCES = Amanda/Config.c $(AMGLUE_SWG) --libConfig_la_LDFLAGS = $(PERL_EXT_LDFLAGS) --libConfig_la_LIBADD = libamglue.la \ -- $(top_builddir)/common-src/libamanda.la -+@WANT_CLIENT_TRUE@libConfigdir = $(amperldir)/auto/Amanda/Config -+@WANT_CLIENT_TRUE@libConfig_LTLIBRARIES = libConfig.la -+@WANT_CLIENT_TRUE@libConfig_la_SOURCES = Amanda/Config.c $(AMGLUE_SWG) -+@WANT_CLIENT_TRUE@libConfig_la_LDFLAGS = $(PERL_EXT_LDFLAGS) -+@WANT_CLIENT_TRUE@libConfig_la_LIBADD = libamglue.la \ -+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - - - # PACKAGE: Amanda::Util --libUtildir = $(amperldir)/auto/Amanda/Util --libUtil_LTLIBRARIES = libUtil.la --libUtil_la_SOURCES = Amanda/Util.c $(AMGLUE_SWG) --libUtil_la_LDFLAGS = $(PERL_EXT_LDFLAGS) --libUtil_la_LIBADD = libamglue.la \ -- $(top_builddir)/common-src/libamanda.la -+@WANT_CLIENT_TRUE@libUtildir = $(amperldir)/auto/Amanda/Util -+@WANT_CLIENT_TRUE@libUtil_LTLIBRARIES = libUtil.la -+@WANT_CLIENT_TRUE@libUtil_la_SOURCES = Amanda/Util.c $(AMGLUE_SWG) -+@WANT_CLIENT_TRUE@libUtil_la_LDFLAGS = $(PERL_EXT_LDFLAGS) -+@WANT_CLIENT_TRUE@libUtil_la_LIBADD = libamglue.la \ -+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - - - # PACKAGE: Amanda::Types --libTypesdir = $(amperldir)/auto/Amanda/Types --libTypes_LTLIBRARIES = libTypes.la --libTypes_la_SOURCES = Amanda/Types.c $(AMGLUE_SWG) --libTypes_la_LDFLAGS = $(PERL_EXT_LDFLAGS) --libTypes_la_LIBADD = libamglue.la \ -- $(top_builddir)/common-src/libamanda.la -+@WANT_CLIENT_TRUE@libTypesdir = $(amperldir)/auto/Amanda/Types -+@WANT_CLIENT_TRUE@libTypes_LTLIBRARIES = libTypes.la -+@WANT_CLIENT_TRUE@libTypes_la_SOURCES = Amanda/Types.c $(AMGLUE_SWG) -+@WANT_CLIENT_TRUE@libTypes_la_LDFLAGS = $(PERL_EXT_LDFLAGS) -+@WANT_CLIENT_TRUE@libTypes_la_LIBADD = libamglue.la \ -+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - - - # PACKAGE: Amanda::Tests --libTestsdir = $(amperldir)/auto/Amanda/Tests --libTests_LTLIBRARIES = libTests.la --libTests_la_SOURCES = Amanda/Tests.c $(AMGLUE_SWG) --libTests_la_LDFLAGS = $(PERL_EXT_LDFLAGS) --libTests_la_LIBADD = libamglue.la \ -- $(top_builddir)/common-src/libamanda.la -+@WANT_CLIENT_TRUE@libTestsdir = $(amperldir)/auto/Amanda/Tests -+@WANT_CLIENT_TRUE@libTests_LTLIBRARIES = libTests.la -+@WANT_CLIENT_TRUE@libTests_la_SOURCES = Amanda/Tests.c $(AMGLUE_SWG) -+@WANT_CLIENT_TRUE@libTests_la_LDFLAGS = $(PERL_EXT_LDFLAGS) -+@WANT_CLIENT_TRUE@libTests_la_LIBADD = libamglue.la \ -+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - - - # PACKAGE: Amanda::MainLoop --libMainLoopdir = $(amperldir)/auto/Amanda/MainLoop --libMainLoop_LTLIBRARIES = libMainLoop.la --libMainLoop_la_SOURCES = Amanda/MainLoop.c $(AMGLUE_SWG) --libMainLoop_la_LDFLAGS = $(PERL_EXT_LDFLAGS) --libMainLoop_la_LIBADD = libamglue.la \ -- $(top_builddir)/common-src/libamanda.la -+@WANT_CLIENT_TRUE@libMainLoopdir = $(amperldir)/auto/Amanda/MainLoop -+@WANT_CLIENT_TRUE@libMainLoop_LTLIBRARIES = libMainLoop.la -+@WANT_CLIENT_TRUE@libMainLoop_la_SOURCES = Amanda/MainLoop.c $(AMGLUE_SWG) -+@WANT_CLIENT_TRUE@libMainLoop_la_LDFLAGS = $(PERL_EXT_LDFLAGS) -+@WANT_CLIENT_TRUE@libMainLoop_la_LIBADD = libamglue.la \ -+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - - - # PACKAGE: Amanda::Application diff --git a/misc/amanda26-server/files/patch-server-src__amcleanup.pl b/misc/amanda26-server/files/patch-server-src__amcleanup.pl deleted file mode 100644 index fbd45ccbea63..000000000000 --- a/misc/amanda26-server/files/patch-server-src__amcleanup.pl +++ /dev/null @@ -1,11 +0,0 @@ ---- server-src/amcleanup.pl.orig 2009-01-28 13:57:21.000000000 +0900 -+++ server-src/amcleanup.pl 2009-01-28 13:57:33.000000000 +0900 -@@ -94,7 +94,7 @@ - } elsif (!$process_alive) { - #check amdump/amflush process - foreach my $pname ("amdump", "amflush") { -- my $pid = `ps -ef|grep -w ${pname}|grep -w ${config_name}| grep -v grep | awk '{print \$2}'`; -+ my $pid = `ps -f|grep -w ${pname}|grep -w ${config_name}| grep -v grep | awk '{print \$2}'`; - chomp $pid; - if ($pid ne "") { - $Amanda_process->set_master($pname, $pid); diff --git a/misc/amanda26-server/files/patch-server-src_amadmin.c b/misc/amanda26-server/files/patch-server-src_amadmin.c deleted file mode 100644 index 613ac2cfd2c0..000000000000 --- a/misc/amanda26-server/files/patch-server-src_amadmin.c +++ /dev/null @@ -1,20 +0,0 @@ ---- server-src/amadmin.c.orig 2011-06-25 22:52:23.000000000 +0200 -+++ server-src/amadmin.c 2011-06-25 22:53:50.000000000 +0200 -@@ -1414,7 +1414,7 @@ - amfree(dumpstr); - dumpfile_free_data(&file); - } -- g_slist_free_full(file_list); -+ _slist_free_full(file_list, g_free); - break; - - case HOLDING_DELETE: -@@ -1432,7 +1432,7 @@ - error(_("Could not delete '%s'"), (char *)li->data); - } - } -- g_slist_free_full(file_list); -+ _slist_free_full(file_list, g_free); - break; - } - } diff --git a/misc/amanda26-server/files/patch-server-src_amflush.c b/misc/amanda26-server/files/patch-server-src_amflush.c deleted file mode 100644 index b8f9ca13788f..000000000000 --- a/misc/amanda26-server/files/patch-server-src_amflush.c +++ /dev/null @@ -1,41 +0,0 @@ ---- server-src/amflush.c.orig 2011-06-25 22:52:32.000000000 +0200 -+++ server-src/amflush.c 2011-06-25 22:54:16.000000000 +0200 -@@ -241,7 +241,7 @@ - stralloc((char *)datestamp->data), - g_compare_strings); - } -- g_slist_free_full(all_datestamps); -+ _slist_free_full(all_datestamps, g_free); - } - else { - /* otherwise, in batch mode, use all datestamps */ -@@ -390,9 +390,9 @@ - } - } - -- g_slist_free_full(datestamp_list); -+ _slist_free_full(datestamp_list, g_free); - datestamp_list = NULL; -- g_slist_free_full(holding_list); -+ _slist_free_full(holding_list, g_free); - holding_list = NULL; - - if(redirect) { /* rename errfile */ -@@ -583,7 +583,7 @@ - } - chupper = (char)toupper(ch); - if (chupper < 'A' || chupper > max_char) { -- g_slist_free_full(r_datestamp_list); -+ _slist_free_full(r_datestamp_list, g_free); - r_datestamp_list = NULL; - break; - } -@@ -591,7 +591,7 @@ - stralloc(datestamps[chupper - 'A'])); - } while ((ch = *a++) != '\0'); - if (r_datestamp_list && ch == '\0') { -- g_slist_free_full(datestamp_list); -+ _slist_free_full(datestamp_list, g_free); - datestamp_list = r_datestamp_list; - break; - } diff --git a/misc/amanda26-server/files/patch-server-src_cmdline.c b/misc/amanda26-server/files/patch-server-src_cmdline.c deleted file mode 100644 index d1d17a15b9bb..000000000000 --- a/misc/amanda26-server/files/patch-server-src_cmdline.c +++ /dev/null @@ -1,11 +0,0 @@ ---- server-src/cmdline.c.orig 2011-06-25 22:50:58.000000000 +0200 -+++ server-src/cmdline.c 2011-06-25 22:51:17.000000000 +0200 -@@ -255,7 +255,7 @@ - dumpfile_free_data(&file); - } - -- g_slist_free_full(holding_files); -+ _slist_free_full(holding_files, g_free); - - return matching_files; - } diff --git a/misc/amanda26-server/files/patch-server-src_find.c b/misc/amanda26-server/files/patch-server-src_find.c deleted file mode 100644 index 621c9d02549d..000000000000 --- a/misc/amanda26-server/files/patch-server-src_find.c +++ /dev/null @@ -1,11 +0,0 @@ ---- server-src/find.c.orig 2011-06-25 22:52:09.000000000 +0200 -+++ server-src/find.c 2011-06-25 22:53:37.000000000 +0200 -@@ -257,7 +257,7 @@ - dumpfile_free_data(&file); - } - -- g_slist_free_full(holding_file_list); -+ _slist_free_full(holding_file_list, g_free); - } - - static char * diff --git a/misc/amanda26-server/files/patch-server-src_holding.c b/misc/amanda26-server/files/patch-server-src_holding.c deleted file mode 100644 index 84f4061e790e..000000000000 --- a/misc/amanda26-server/files/patch-server-src_holding.c +++ /dev/null @@ -1,20 +0,0 @@ ---- server-src/holding.c.orig 2011-06-25 22:51:58.000000000 +0200 -+++ server-src/holding.c 2011-06-25 22:53:27.000000000 +0200 -@@ -565,7 +565,7 @@ - dumpfile_free_data(&file); - } - -- if (file_list) g_slist_free_full(file_list); -+ if (file_list) _slist_free_full(file_list, g_free); - - return result_list; - } -@@ -591,7 +591,7 @@ - dumpfile_free_data(&dfile); - } - -- g_slist_free_full(all_files); -+ _slist_free_full(all_files, g_free); - - return datestamps; - } diff --git a/misc/amanda26-server/files/patch-server-src_planner.c b/misc/amanda26-server/files/patch-server-src_planner.c deleted file mode 100644 index 0fbd3ced557b..000000000000 --- a/misc/amanda26-server/files/patch-server-src_planner.c +++ /dev/null @@ -1,11 +0,0 @@ ---- server-src/planner.c.orig 2011-06-25 22:52:39.000000000 +0200 -+++ server-src/planner.c 2011-06-25 22:54:23.000000000 +0200 -@@ -431,7 +431,7 @@ - amfree(qhname); - dumpfile_free_data(&file); - } -- g_slist_free_full(holding_list); -+ _slist_free_full(holding_list, g_free); - holding_list = NULL; - } - g_fprintf(stderr, _("ENDFLUSH\n")); |