diff options
Diffstat (limited to 'misc/amanda32-server/files')
10 files changed, 91 insertions, 319 deletions
diff --git a/misc/amanda32-server/files/patch-amandad-src::Makefile.in b/misc/amanda32-server/files/patch-amandad-src::Makefile.in index 9a80b4b90f95..0e3a9389165b 100644 --- a/misc/amanda32-server/files/patch-amandad-src::Makefile.in +++ b/misc/amanda32-server/files/patch-amandad-src::Makefile.in @@ -1,12 +1,11 @@ ---- 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 @@ +--- amandad-src/Makefile.in.orig 2010-10-16 18:41:37.735202558 +0900 ++++ amandad-src/Makefile.in 2010-10-16 18:42:00.351165593 +0900 +@@ -1171,7 +1171,7 @@ 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) + libamandad_la_LIBADD = ../common-src/libamanda.la diff --git a/misc/amanda32-server/files/patch-changer-src::chg-glue.pl b/misc/amanda32-server/files/patch-changer-src::chg-glue.pl deleted file mode 100644 index 20467d2116fd..000000000000 --- a/misc/amanda32-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/amanda32-server/files/patch-common-src::Makefile.in b/misc/amanda32-server/files/patch-common-src::Makefile.in index 9da99a06935e..16be032af49a 100644 --- a/misc/amanda32-server/files/patch-common-src::Makefile.in +++ b/misc/amanda32-server/files/patch-common-src::Makefile.in @@ -1,49 +1,11 @@ ---- 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) +--- common-src/Makefile.in.orig 2010-10-16 18:21:52.890010063 +0900 ++++ common-src/Makefile.in 2010-10-16 18:22:26.842453745 +0900 +@@ -1346,7 +1346,7 @@ + INCLUDES = -I$(top_srcdir)/gnulib + AM_CFLAGS = $(AMANDA_WARNING_CFLAGS) + AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) +-amlib_LTLIBRARIES = libamanda.la ++@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamanda.la + LINT = $(AMLINT) + LINTFLAGS = $(AMLINTFLAGS) + libamanda_la_SOURCES = alloc.c amfeatures.c amflock.c ipc-binary.c \ diff --git a/misc/amanda32-server/files/patch-common-src::glib-util.c b/misc/amanda32-server/files/patch-common-src::glib-util.c deleted file mode 100644 index c7450c7835eb..000000000000 --- a/misc/amanda32-server/files/patch-common-src::glib-util.c +++ /dev/null @@ -1,51 +0,0 @@ - ---- common-src/glib-util.c.orig 2010-05-20 13:19:58.000000000 -0400 -+++ common-src/glib-util.c 2010-05-20 13:24:40.000000000 -0400 -@@ -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 { - - diff --git a/misc/amanda32-server/files/patch-ndmp-src::Makefile.in b/misc/amanda32-server/files/patch-ndmp-src::Makefile.in new file mode 100644 index 000000000000..2dd3f4b9f32d --- /dev/null +++ b/misc/amanda32-server/files/patch-ndmp-src::Makefile.in @@ -0,0 +1,15 @@ +--- ndmp-src/Makefile.in.orig 2010-10-16 18:45:40.253086014 +0900 ++++ ndmp-src/Makefile.in 2010-10-16 18:46:36.949487552 +0900 +@@ -1289,9 +1289,9 @@ + # Divide the library up into the library side and down (libndmlib.la), + # and the full set of rules, agents, and so on required to build ndmjob + # (libndmjob.la). +-amlib_LTLIBRARIES = \ +- libndmlib.la \ +- libndmjob.la ++@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = \ ++@WANT_CLIENT_TRUE@ libndmlib.la \ ++@WANT_CLIENT_TRUE@ libndmjob.la + + libndmjla = \ + ndma_comm_job.c \ diff --git a/misc/amanda32-server/files/patch-perl::Makefile.in b/misc/amanda32-server/files/patch-perl::Makefile.in index b32626c1144e..a2bed44a04be 100644 --- a/misc/amanda32-server/files/patch-perl::Makefile.in +++ b/misc/amanda32-server/files/patch-perl::Makefile.in @@ -1,195 +1,39 @@ ---- 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) +--- perl/Makefile.in.orig 2010-10-07 03:58:28.000000000 +0900 ++++ perl/Makefile.in 2010-10-16 21:16:31.327136585 +0900 +@@ -1541,13 +1541,15 @@ + # PACKAGE: Amanda::Script_App + + # PACKAGE: Amanda::Script ++@WANT_CLIENT_TRUE@am__append_xfer = Amanda/Xfer.pm ++@WANT_CLIENT_TRUE@am__append_const = Amanda/Constants.pm + Amanda_DATA = Amanda/Archive.pm Amanda/Process.pm $(am__append_4) \ + Amanda/Feature.pm $(am__append_6) Amanda/ClientService.pm \ +- $(am__append_7) Amanda/Xfer.pm $(am__append_10) \ ++ $(am__append_7) $(am__append_xfer) $(am__append_10) \ + $(am__append_13) Amanda/BigIntCompat.pm Amanda/Debug.pm \ + Amanda/Config.pm Amanda/Util.pm Amanda/Header.pm \ + Amanda/Tests.pm Amanda/MainLoop.pm Amanda/Paths.pm \ +- Amanda/Constants.pm Amanda/Script_App.pm $(am__append_16) \ ++ $(am__append_const) Amanda/Script_App.pm $(am__append_16) \ + $(am__append_17) Amanda/Script.pm # 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 +@@ -1670,12 +1672,12 @@ + @WANT_SERVER_TRUE@Amanda_DB_DATA = Amanda/DB/Catalog.pm + + # PACKAGE: Amanda::Xfer +-libXferdir = $(amperldir)/auto/Amanda/Xfer +-libXfer_LTLIBRARIES = libXfer.la +-libXfer_la_SOURCES = Amanda/Xfer.c $(AMGLUE_SWG) +-libXfer_la_LDFLAGS = $(PERL_EXT_LDFLAGS) +-libXfer_la_LIBADD = amglue/libamglue.la \ +- $(top_builddir)/xfer-src/libamxfer.la ++@WANT_CLIENT_TRUE@libXferdir = $(amperldir)/auto/Amanda/Xfer ++@WANT_CLIENT_TRUE@libXfer_LTLIBRARIES = libXfer.la ++@WANT_CLIENT_TRUE@libXfer_la_SOURCES = Amanda/Xfer.c $(AMGLUE_SWG) ++@WANT_CLIENT_TRUE@libXfer_la_LDFLAGS = $(PERL_EXT_LDFLAGS) ++@WANT_CLIENT_TRUE@libXfer_la_LIBADD = amglue/libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/xfer-src/libamxfer.la + + + # PACKAGE: Amanda::NDMP diff --git a/misc/amanda32-server/files/patch-perl::amglue::Makefile.in b/misc/amanda32-server/files/patch-perl::amglue::Makefile.in new file mode 100644 index 000000000000..96d2bc290602 --- /dev/null +++ b/misc/amanda32-server/files/patch-perl::amglue::Makefile.in @@ -0,0 +1,10 @@ +--- perl/amglue/Makefile.in 2010-10-16 19:29:45.554806332 +0900 ++++ perl/amglue/Makefile.in.orig 2010-10-07 03:58:28.000000000 +0900 +@@ -1212,6 +1212,7 @@ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ ++@WANT_CLIENT_FALSE@ list2=; \ + 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)"; \ diff --git a/misc/amanda32-server/files/patch-server-src::amcleanup.pl b/misc/amanda32-server/files/patch-server-src::amcleanup.pl deleted file mode 100644 index fbd45ccbea63..000000000000 --- a/misc/amanda32-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/amanda32-server/files/patch-xfer-src::Makefile.in b/misc/amanda32-server/files/patch-xfer-src::Makefile.in new file mode 100644 index 000000000000..e9c3e7838a30 --- /dev/null +++ b/misc/amanda32-server/files/patch-xfer-src::Makefile.in @@ -0,0 +1,11 @@ +--- xfer-src/Makefile.in.orig 2010-10-16 14:38:56.304820189 +0900 ++++ xfer-src/Makefile.in 2010-10-16 14:40:42.063983713 +0900 +@@ -1176,7 +1176,7 @@ + + AM_CFLAGS = $(AMANDA_WARNING_CFLAGS) + AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) +-amlib_LTLIBRARIES = libamxfer.la ++@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamxfer.la + LINT = $(AMLINT) + LINTFLAGS = $(AMLINTFLAGS) + libamxfer_la_SOURCES = \ diff --git a/misc/amanda32-server/files/pkg-message.in b/misc/amanda32-server/files/pkg-message.in new file mode 100644 index 000000000000..95ecbc36ae0f --- /dev/null +++ b/misc/amanda32-server/files/pkg-message.in @@ -0,0 +1,3 @@ +Please install these ports (they are only on-demand runtime dependencies): + - %%PORTSDIR%%/misc/mtx if you want chg-robot changer. + - %%PORTSDIR%%/security/aespipe if you want amcrypt(8). |