aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/bareos-server/files/patch-src-stored-Makefile.in83
-rw-r--r--sysutils/bareos-server/files/patch-src-stored_Makefile.in73
2 files changed, 73 insertions, 83 deletions
diff --git a/sysutils/bareos-server/files/patch-src-stored-Makefile.in b/sysutils/bareos-server/files/patch-src-stored-Makefile.in
index b57961a14e8a..59938bea2720 100644
--- a/sysutils/bareos-server/files/patch-src-stored-Makefile.in
+++ b/sysutils/bareos-server/files/patch-src-stored-Makefile.in
@@ -1,10 +1,73 @@
---- src/stored/Makefile.in 2015-07-25 16:28:12.065608000 -0500
-+++ src/stored/Makefile.in 2015-07-25 16:28:34.672920000 -0500
-@@ -243,7 +243,6 @@
- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bscan $(DESTDIR)$(sbindir)/bscan
- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape
- @srcconf=bareos-sd.conf; \
-- $(MKDIR) ${DESTDIR}${confdir}/bareos-sd.d/; \
- if test -f ${DESTDIR}${confdir}/$$srcconf; then \
- destconf=$$srcconf.new; \
- echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
+--- src/stored/Makefile.in 2016-10-16 10:14:36.000000000 -0500
++++ src/stored/Makefile.in 2016-11-09 15:54:32.944172000 -0500
+@@ -93,6 +93,7 @@
+ INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include
+
+ JANSSON_CPPFLAGS = @JANSSON_INC@
++JANSSON_LDFLAGS = @JANSSON_LIBS@
+
+ DEBUG = @DEBUG@
+ GETTEXT_LIBS = @LIBINTL@
+@@ -170,7 +171,7 @@
+ @echo "Linking $@ ..."
+ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(SDOBJS) \
+ $(NDMP_LIBS) -lbareossd -lbareoscfg -lbareos -lm $(DLIB) $(LIBS) $(WRAPLIBS) \
+- $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
++ $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ${JANSSON_LDFLAGS}
+
+ static-bareos-sd: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SDOBJS) \
+ ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+@@ -192,7 +193,7 @@
+ @echo "Linking $@ ..."
+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(TAPEOBJS) \
+ -lbareossd -lbareoscfg -lbareos $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) \
+- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
++ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
+
+ bls: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) \
+ ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+@@ -201,7 +202,7 @@
+ @echo "Linking $@ ..."
+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
+ -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \
+- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
++ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
+
+ bextract: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BEXTOBJS) \
+ ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+@@ -210,7 +211,7 @@
+ @echo "Linking $@ ..."
+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) \
+ -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) $(BEXTRACT_LIBS) \
+- $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
++ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
+
+ bscan: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SCNOBJS) \
+ ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+@@ -220,13 +221,13 @@
+ @echo "Linking $@ ..."
+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
+ -lbareossql -lbareoscats $(DB_LIBS) -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) \
+- $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
++ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ${JANSSON_LDFLAGS}
+
+ bcopy: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(COPYOBJS) \
+ ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+ @echo "Linking $@ ..."
+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(COPYOBJS) \
+- -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
++ -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
+
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
+ cd $(topdir) \
+@@ -259,8 +260,8 @@
+ destconf="$$RESDIR/$$RES.new"; \
+ echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
+ else \
+- destconf="$$RESDIR/$$RES"; \
+- echo " $$RESTYPE/$$RES as \"$$destconf\""; \
++ destconf="$$RESDIR/$$RES.sample"; \
++ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
+ fi; \
+ ${INSTALL_CONFIG} "$$f" "$$destconf"; \
+ if test "x${sd_group}" != "x"; then \
diff --git a/sysutils/bareos-server/files/patch-src-stored_Makefile.in b/sysutils/bareos-server/files/patch-src-stored_Makefile.in
deleted file mode 100644
index 59938bea2720..000000000000
--- a/sysutils/bareos-server/files/patch-src-stored_Makefile.in
+++ /dev/null
@@ -1,73 +0,0 @@
---- src/stored/Makefile.in 2016-10-16 10:14:36.000000000 -0500
-+++ src/stored/Makefile.in 2016-11-09 15:54:32.944172000 -0500
-@@ -93,6 +93,7 @@
- INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include
-
- JANSSON_CPPFLAGS = @JANSSON_INC@
-+JANSSON_LDFLAGS = @JANSSON_LIBS@
-
- DEBUG = @DEBUG@
- GETTEXT_LIBS = @LIBINTL@
-@@ -170,7 +171,7 @@
- @echo "Linking $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(SDOBJS) \
- $(NDMP_LIBS) -lbareossd -lbareoscfg -lbareos -lm $(DLIB) $(LIBS) $(WRAPLIBS) \
-- $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+ $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ${JANSSON_LDFLAGS}
-
- static-bareos-sd: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SDOBJS) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
-@@ -192,7 +193,7 @@
- @echo "Linking $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(TAPEOBJS) \
- -lbareossd -lbareoscfg -lbareos $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) \
-- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
-
- bls: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) \
- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
-@@ -201,7 +202,7 @@
- @echo "Linking $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
- -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \
-- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
-
- bextract: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BEXTOBJS) \
- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
-@@ -210,7 +211,7 @@
- @echo "Linking $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) \
- -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) $(BEXTRACT_LIBS) \
-- $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
-
- bscan: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SCNOBJS) \
- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
-@@ -220,13 +221,13 @@
- @echo "Linking $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
- -lbareossql -lbareoscats $(DB_LIBS) -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) \
-- $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ${JANSSON_LDFLAGS}
-
- bcopy: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(COPYOBJS) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
- @echo "Linking $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(COPYOBJS) \
-- -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+ -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
-
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- cd $(topdir) \
-@@ -259,8 +260,8 @@
- destconf="$$RESDIR/$$RES.new"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
- else \
-- destconf="$$RESDIR/$$RES"; \
-- echo " $$RESTYPE/$$RES as \"$$destconf\""; \
-+ destconf="$$RESDIR/$$RES.sample"; \
-+ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
- fi; \
- ${INSTALL_CONFIG} "$$f" "$$destconf"; \
- if test "x${sd_group}" != "x"; then \
generated by cgit (git 2.34.1) at 2024-11-29 20:54:32 +0800