update to bacula-11.0.6, same diff robert@
This commit is contained in:
sthen
parent
5e10e6c201
commit
0f3d923105
|
|
@ -1,5 +1,3 @@
|
|||
# $OpenBSD: Makefile,v 1.159 2021/09/10 12:59:05 sthen Exp $
|
||||
|
||||
# XXX building this port while a version is already installed on the
|
||||
# system will lead to unexpected hidden dependencies!!!
|
||||
|
||||
|
|
@ -10,7 +8,7 @@ COMMENT-mysql= Bacula libbaccats support for MySQL
|
|||
COMMENT-pgsql= Bacula libbaccats support for PostgreSQL
|
||||
COMMENT-sqlite3= Bacula libbaccats support for SQLite3
|
||||
|
||||
V= 11.0.5
|
||||
V= 11.0.6
|
||||
DISTNAME= bacula-$V
|
||||
PKGNAME-main= bacula-client-$V
|
||||
PKGNAME-server= bacula-server-$V
|
||||
|
|
@ -19,9 +17,6 @@ PKGNAME-mysql= bacula-mysql-$V
|
|||
PKGNAME-pgsql= bacula-pgsql-$V
|
||||
PKGNAME-sqlite3= bacula-sqlite3-$V
|
||||
|
||||
REVISION-server= 0
|
||||
REVISION-bat= 0
|
||||
|
||||
CATEGORIES= sysutils
|
||||
|
||||
SHARED_LIBS += bac 9.1
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (bacula-11.0.5.tar.gz) = 71s7Z4EEQiAbgNwdR8zvd7XtN4/hKFQG86c0AbboERo=
|
||||
SIZE (bacula-11.0.5.tar.gz) = 5982886
|
||||
SHA256 (bacula-11.0.6.tar.gz) = AZWgi81PV4rkqc4Nkff4ZzHGNNVrgQU0ci1yGyqe7Lc=
|
||||
SIZE (bacula-11.0.6.tar.gz) = 5986763
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
$OpenBSD: patch-Makefile_in,v 1.7 2015/08/15 07:50:02 ajacoutot Exp $
|
||||
|
||||
stop building when an error occurs, rather than just keep on with the
|
||||
next subdir..
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
$OpenBSD: patch-configure,v 1.27 2020/12/15 17:16:27 robert Exp $
|
||||
|
||||
Index: configure
|
||||
--- configure.orig
|
||||
+++ configure
|
||||
@@ -4870,7 +4870,7 @@ $as_echo "no" >&6; }
|
||||
@@ -4891,7 +4891,7 @@ $as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -12,7 +10,7 @@ Index: configure
|
|||
as_fn_error $? "Unable to find C++ compiler" "$LINENO" 5
|
||||
fi
|
||||
|
||||
@@ -16767,7 +16767,7 @@ if test x$use_libtool != xno; then
|
||||
@@ -16867,7 +16867,7 @@ if test x$use_libtool != xno; then
|
||||
LIBTOOL_INSTALL_TARGET="libtool-install"
|
||||
LIBTOOL_UNINSTALL_TARGET="libtool-uninstall"
|
||||
LIBTOOL_CLEAN_TARGET="libtool-clean"
|
||||
|
|
@ -21,7 +19,7 @@ Index: configure
|
|||
FD_PLUGIN_DIR="src/plugins/fd"
|
||||
have_plugins=yes
|
||||
else
|
||||
@@ -22431,7 +22431,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
||||
@@ -22533,7 +22533,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
||||
|
||||
$as_echo "#define HAVE_READLINE 1" >>confdefs.h
|
||||
|
||||
|
|
@ -30,7 +28,7 @@ Index: configure
|
|||
got_readline="yes"
|
||||
|
||||
else
|
||||
@@ -22470,7 +22470,7 @@ $as_echo "#define HAVE_READLINE 1" >>confdefs.h
|
||||
@@ -22572,7 +22572,7 @@ $as_echo "#define HAVE_READLINE 1" >>confdefs.h
|
||||
|
||||
got_readline="yes"
|
||||
CONS_INC="-I${TOP_DIR}/depkgs/readline"
|
||||
|
|
@ -39,7 +37,7 @@ Index: configure
|
|||
CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
|
||||
PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
|
||||
|
||||
@@ -29931,13 +29931,19 @@ if test "${with_lzo+set}" = set; then :
|
||||
@@ -30194,13 +30194,19 @@ if test "${with_lzo+set}" = set; then :
|
||||
;;
|
||||
yes|*)
|
||||
if test -f ${with_lzo}/include/lzo/lzoconf.h; then
|
||||
|
|
@ -60,7 +58,7 @@ Index: configure
|
|||
as_ac_Header=`$as_echo "ac_cv_header_${with_lzo}/lzo/lzoconf.h" | $as_tr_sh`
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "${with_lzo}/lzo/lzoconf.h" "$as_ac_Header" "$ac_includes_default"
|
||||
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
||||
@@ -29957,6 +29963,8 @@ else
|
||||
@@ -30220,6 +30226,8 @@ else
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -69,7 +67,7 @@ Index: configure
|
|||
|
||||
;;
|
||||
esac
|
||||
@@ -31460,6 +31468,7 @@ netbsd)
|
||||
@@ -31723,6 +31731,7 @@ netbsd)
|
||||
DISTVER=`uname -a |awk '{print $3}'`
|
||||
lld="qd"
|
||||
llu="qu"
|
||||
|
|
@ -77,7 +75,7 @@ Index: configure
|
|||
TAPEDRIVE="/dev/nrst0"
|
||||
PSCMD="ps -ax -o pid,command"
|
||||
PTHREAD_LIB="-pthread"
|
||||
@@ -31478,6 +31487,7 @@ openbsd)
|
||||
@@ -31741,6 +31750,7 @@ openbsd)
|
||||
platforms/openbsd/bacula-fd \
|
||||
platforms/openbsd/bacula-sd \
|
||||
platforms/openbsd/bacula-dir"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
$OpenBSD: patch-examples_autochangers_chio-changer-openbsd,v 1.5 2021/08/31 05:56:19 robert Exp $
|
||||
|
||||
Index: examples/autochangers/chio-changer-openbsd
|
||||
--- examples/autochangers/chio-changer-openbsd.orig
|
||||
+++ examples/autochangers/chio-changer-openbsd
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
$OpenBSD: patch-manpages_Makefile_in,v 1.6 2015/08/15 07:50:02 ajacoutot Exp $
|
||||
--- manpages/Makefile.in.orig Thu Aug 13 15:52:24 2015
|
||||
+++ manpages/Makefile.in Fri Aug 14 10:16:41 2015
|
||||
@@ -20,17 +20,9 @@ depend:
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
$OpenBSD: patch-manpages_bat_1,v 1.6 2014/04/19 09:44:11 ajacoutot Exp $
|
||||
--- manpages/bat.1.orig Tue Sep 11 11:26:24 2012
|
||||
+++ manpages/bat.1 Thu Sep 13 08:19:35 2012
|
||||
Index: manpages/bat.1
|
||||
--- manpages/bat.1.orig
|
||||
+++ manpages/bat.1
|
||||
@@ -22,7 +22,7 @@ but it is graphical oriented and more features.
|
||||
bat [\-s] [\-c config_file] [\-d debug_level] [\-t]
|
||||
.TP
|
||||
.B \-c <config>
|
||||
-Specify configuration file. Default is bat.conf.
|
||||
+Specify configuration file. Default is ${SYSCONFDIR}/bat.conf.
|
||||
+Specify configuration file. Default is /etc/bacula/bat.conf.
|
||||
.TP
|
||||
.B \-d <nn>
|
||||
Set debug level to \fInn\fP.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
$OpenBSD: patch-scripts_bacula-ctl-dir_in,v 1.1 2018/02/09 09:31:50 sthen Exp $
|
||||
|
||||
Index: scripts/bacula-ctl-dir.in
|
||||
--- scripts/bacula-ctl-dir.in.orig
|
||||
+++ scripts/bacula-ctl-dir.in
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
$OpenBSD: patch-scripts_bacula-ctl-fd_in,v 1.1 2018/02/09 09:31:50 sthen Exp $
|
||||
|
||||
Index: scripts/bacula-ctl-fd.in
|
||||
--- scripts/bacula-ctl-fd.in.orig
|
||||
+++ scripts/bacula-ctl-fd.in
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
$OpenBSD: patch-scripts_bacula-ctl-sd_in,v 1.1 2018/02/09 09:31:50 sthen Exp $
|
||||
|
||||
Index: scripts/bacula-ctl-sd.in
|
||||
--- scripts/bacula-ctl-sd.in.orig
|
||||
+++ scripts/bacula-ctl-sd.in
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
$OpenBSD: patch-scripts_baculabackupreport_in,v 1.3 2021/03/29 11:36:32 sthen Exp $
|
||||
|
||||
without GNU awk,
|
||||
|
||||
awk: weird printf conversion %"> <r
|
||||
|
|
@ -19,7 +17,7 @@ Index: scripts/baculabackupreport.in
|
|||
db="@db_name@" # Not needed for sqlite
|
||||
dbuser="@db_user@" # Not needed for sqlite
|
||||
-dbbin="/usr/bin/psql"
|
||||
+dbbin="${LOCALBASE}/bin/psql"
|
||||
+dbbin="/usr/local/bin/psql"
|
||||
# dbpass="-p@db_password@" # Uncomment and set db password if one is used. Also not needed for sqlite
|
||||
|
||||
# Formatting variables
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
$OpenBSD: patch-scripts_bat_desktop_in,v 1.5 2020/02/28 23:26:53 sthen Exp $
|
||||
--- scripts/bat.desktop.in.orig Sun Oct 30 13:03:42 2011
|
||||
+++ scripts/bat.desktop.in Mon Nov 14 12:19:03 2011
|
||||
@@ -1,7 +1,7 @@
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
$OpenBSD: patch-src_cats_Makefile_in,v 1.7 2020/12/15 17:16:27 robert Exp $
|
||||
Index: src/cats/Makefile.in
|
||||
--- src/cats/Makefile.in.orig
|
||||
+++ src/cats/Makefile.in
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
$OpenBSD: patch-src_cats_create_postgresql_database_in,v 1.4 2019/02/16 22:49:48 sthen Exp $
|
||||
|
||||
Index: src/cats/create_postgresql_database.in
|
||||
--- src/cats/create_postgresql_database.in.orig
|
||||
+++ src/cats/create_postgresql_database.in
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
$OpenBSD: patch-src_cats_make_catalog_backup_pl_in,v 1.2 2020/12/15 17:16:27 robert Exp $
|
||||
|
||||
psql(1) will fail if the current working directory is not accessible
|
||||
|
||||
Index: src/cats/make_catalog_backup.pl.in
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
$OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.12 2017/02/16 17:16:19 sthen Exp $
|
||||
--- src/dird/bacula-dir.conf.in.orig Tue Feb 7 14:07:45 2017
|
||||
+++ src/dird/bacula-dir.conf.in Wed Feb 8 12:15:33 2017
|
||||
@@ -185,8 +185,8 @@ Client {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
$OpenBSD: patch-src_findlib_Makefile_in,v 1.5 2020/12/15 17:16:27 robert Exp $
|
||||
Index: src/findlib/Makefile.in
|
||||
--- src/findlib/Makefile.in.orig
|
||||
+++ src/findlib/Makefile.in
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
$OpenBSD: patch-src_findlib_fstype_c,v 1.1 2020/12/15 17:16:27 robert Exp $
|
||||
|
||||
Index: src/findlib/fstype.c
|
||||
--- src/findlib/fstype.c.orig
|
||||
+++ src/findlib/fstype.c
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
$OpenBSD: patch-src_lib_Makefile_in,v 1.7 2020/12/15 17:16:27 robert Exp $
|
||||
Index: src/lib/Makefile.in
|
||||
--- src/lib/Makefile.in.orig
|
||||
+++ src/lib/Makefile.in
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
$OpenBSD: patch-src_qt-console_main_cpp,v 1.10 2016/01/19 22:51:09 sthen Exp $
|
||||
--- src/qt-console/main.cpp.orig Fri Jan 15 16:57:18 2016
|
||||
+++ src/qt-console/main.cpp Mon Jan 18 13:07:24 2016
|
||||
Index: src/qt-console/main.cpp
|
||||
--- src/qt-console/main.cpp.orig
|
||||
+++ src/qt-console/main.cpp
|
||||
@@ -49,7 +49,7 @@ extern bool parse_bat_config(CONFIG *config, const cha
|
||||
extern void message_callback(int /* type */, char *msg);
|
||||
|
||||
|
||||
-#define CONFIG_FILE "bat.conf" /* default configuration file */
|
||||
+#define CONFIG_FILE "${SYSCONFDIR}/bat.conf" /* default configuration file */
|
||||
+#define CONFIG_FILE "/etc/bacula/bat.conf" /* default configuration file */
|
||||
|
||||
/* Static variables */
|
||||
static CONFIG *config;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
$OpenBSD: patch-src_qt-console_tray-monitor_tray-monitor_pro_in,v 1.1 2020/12/15 17:16:27 robert Exp $
|
||||
|
||||
Index: src/qt-console/tray-monitor/tray-monitor.pro.in
|
||||
--- src/qt-console/tray-monitor/tray-monitor.pro.in.orig
|
||||
+++ src/qt-console/tray-monitor/tray-monitor.pro.in
|
||||
|
|
@ -8,8 +6,8 @@ Index: src/qt-console/tray-monitor/tray-monitor.pro.in
|
|||
}
|
||||
!cross-win32 {
|
||||
- LIBS += -L../../lib -lbaccfg -lbac -L../../findlib -lbacfind @OPENSSL_LIBS@
|
||||
+ LIBS += -L../../lib -lbaccfg -lbac -L../../findlib -lbacfind @OPENSSL_LIBS@ -L${LOCALBASE}/lib/inotify -linotify -Wl,-rpath,${LOCALBASE}/lib/inotify
|
||||
+ INCLUDEPATH += ${LOCALBASE}/include/inotify
|
||||
+ LIBS += -L../../lib -lbaccfg -lbac -L../../findlib -lbacfind @OPENSSL_LIBS@ -L/usr/local/lib/inotify -linotify -Wl,-rpath,/usr/local/lib/inotify
|
||||
+ INCLUDEPATH += /usr/local/include/inotify
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
$OpenBSD: patch-src_stored_Makefile_in,v 1.8 2020/12/15 17:16:27 robert Exp $
|
||||
|
||||
Index: src/stored/Makefile.in
|
||||
--- src/stored/Makefile.in.orig
|
||||
+++ src/stored/Makefile.in
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
$OpenBSD: patch-src_stored_bacula-sd_conf_in,v 1.10 2017/07/07 16:01:58 sthen Exp $
|
||||
Index: src/stored/bacula-sd.conf.in
|
||||
--- src/stored/bacula-sd.conf.in.orig
|
||||
+++ src/stored/bacula-sd.conf.in
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
$OpenBSD: patch-src_tools_cdp-client_Makefile_in,v 1.1 2020/12/15 17:16:27 robert Exp $
|
||||
|
||||
Index: src/tools/cdp-client/Makefile.in
|
||||
--- src/tools/cdp-client/Makefile.in.orig
|
||||
+++ src/tools/cdp-client/Makefile.in
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
@comment $OpenBSD: PLIST-bat,v 1.18 2020/06/11 14:38:51 sthen Exp $
|
||||
@man man/man1/bat.1
|
||||
@bin sbin/bacula-tray-monitor
|
||||
@bin sbin/bat
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
@comment $OpenBSD: PLIST-main,v 1.28 2020/02/28 23:26:53 sthen Exp $
|
||||
@conflict bacula-server-<5.2.1
|
||||
@pkgpath sysutils/bacula,-client
|
||||
@newgroup _bacula:591
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
@comment $OpenBSD: PLIST-mysql,v 1.6 2020/02/28 23:26:53 sthen Exp $
|
||||
@conflict bacula-server-<7.0.4p2
|
||||
@conflict bacula-pgsql-*
|
||||
@conflict bacula-sqlite3-*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
@comment $OpenBSD: PLIST-pgsql,v 1.6 2020/02/28 23:26:53 sthen Exp $
|
||||
@conflict bacula-server-<7.0.4p2
|
||||
@conflict bacula-mysql-*
|
||||
@conflict bacula-sqlite3-*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
@comment $OpenBSD: PLIST-server,v 1.24 2018/09/04 12:46:21 espie Exp $
|
||||
@conflict bacula-<2.2.7
|
||||
@conflict bacula-client-<5.2.6p2
|
||||
@pkgpath sysutils/bacula,-server,mysql
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
@comment $OpenBSD: PLIST-sqlite3,v 1.5 2020/02/28 23:26:53 sthen Exp $
|
||||
@conflict bacula-server-<7.0.4p2
|
||||
@conflict bacula-pgsql-*
|
||||
@conflict bacula-mysql-*
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
$OpenBSD: README-main,v 1.5 2018/09/04 12:46:21 espie Exp $
|
||||
|
||||
+-----------------------------------------------------------------------
|
||||
| Running ${PKGSTEM} on OpenBSD
|
||||
+-----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
$OpenBSD: README-server,v 1.19 2018/09/04 12:46:21 espie Exp $
|
||||
|
||||
+-----------------------------------------------------------------------
|
||||
| Running ${PKGSTEM} on OpenBSD
|
||||
+-----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
#!/bin/ksh
|
||||
#
|
||||
# $OpenBSD: bacula.rc,v 1.6 2018/01/14 14:42:18 rpe Exp $
|
||||
|
||||
# "meta" script running the following rc.d(8) scripts with the given argument;
|
||||
# note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
#!/bin/ksh
|
||||
#
|
||||
# $OpenBSD: bacula_dir.rc,v 1.3 2018/01/11 19:27:09 rpe Exp $
|
||||
|
||||
daemon="${TRUEPREFIX}/libexec/bacula/bacula-ctl-dir"
|
||||
daemon_flags="start"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
#!/bin/ksh
|
||||
#
|
||||
# $OpenBSD: bacula_fd.rc,v 1.3 2018/01/11 19:27:09 rpe Exp $
|
||||
|
||||
daemon="${TRUEPREFIX}/libexec/bacula/bacula-ctl-fd"
|
||||
daemon_flags="start"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
#!/bin/ksh
|
||||
#
|
||||
# $OpenBSD: bacula_sd.rc,v 1.3 2018/01/11 19:27:09 rpe Exp $
|
||||
|
||||
daemon="${TRUEPREFIX}/libexec/bacula/bacula-ctl-sd"
|
||||
daemon_flags="start"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user