cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to bacula-5.2.13.

Browse Source 
ok sthen@
This commit is contained in:
ajacoutot 2013-04-12 10:39:04 +00:00
parent 82b248f142
commit ee32ff12e2
8 changed files with 56 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sysutils/bacula/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.57 2013/03/21 15:04:18 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.58 2013/04/12 10:39:04 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT-main= network backup solution (client)
COMMENT-server= network backup solution (server)
COMMENT-bat= network backup solution (gui-client)
V= 5.2.12
V= 5.2.13
DISTNAME= bacula-$V
FULLPKGNAME-main= bacula-client-$V
FULLPKGPATH-main= ${PKGPATH},-main
@ -15,10 +15,6 @@ FULLPKGNAME-bat= bacula-bat-$V
FULLPKGPATH-bat= ${PKGPATH},-bat
CATEGORIES= sysutils
REVISION-server= 2
REVISION-main= 0
REVISION-bat= 0
# XXX build fails if a previous version is installed
SHARED_LIBS += bac 4.0
SHARED_LIBS += baccfg 4.0
@ -40,6 +36,8 @@ WANTLIB += c pthread crypto ssl z m stdc++
# http://bacula.org/en/dev-manual/main/main/Bacula_Copyright_Trademark_.html
PERMIT_PACKAGE_CDROM= Yes
MODULES= devel/gettext
BACULACONF= /etc/bacula
BACULASTATE= /var/bacula
SUBST_VARS= BACULACONF BACULASTATE TRUEPREFIX
@ -111,7 +109,8 @@ CONFIGURE_ENV+= ac_cv_func_${ac_func}=no
.include <bsd.port.arch.mk>
WANTLIB-server += ${WANTLIB} bac baccfg bacfind bacpy lzo2
LIB_DEPENDS-server= sysutils/bacula,-main
LIB_DEPENDS-server= ${LIB_DEPENDS} \
sysutils/bacula,-main
.if !${BUILD_PACKAGES:M-server}
CONFIGURE_ARGS+= --enable-client-only \
@ -158,13 +157,16 @@ ERRORS+= "Fatal: choose one of pgsql or mysql or sqlite3"
.endif # server
WANTLIB-main += ${WANTLIB} lzo2 ncurses readline
LIB_DEPENDS-main= archivers/lzo2
LIB_DEPENDS-main= ${LIB_DEPENDS} \
archivers/lzo2
WANTLIB-bat += ${WANTLIB}
WANTLIB-bat += ICE QtCore QtGui SM X11 Xext Xi Xinerama Xrender bac
WANTLIB-bat += baccfg bacfind expat fontconfig freetype xcb
RUN_DEPENDS-bat= devel/desktop-file-utils
LIB_DEPENDS-bat= x11/qt4 \
WANTLIB-bat += baccfg bacfind expat fontconfig freetype xcb pthread-stubs
RUN_DEPENDS-bat= ${RUN_DEPENDS} \
devel/desktop-file-utils
LIB_DEPENDS-bat= ${LIB_DEPENDS} \
x11/qt4 \
sysutils/bacula,-main
.if !${BUILD_PACKAGES:M-bat}

4
sysutils/bacula/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (bacula-5.2.12.tar.gz) = NgQ1Y04oiBs/7bDcGQG5yb4Ylc4eOclzcmKyX0RROIc=
SIZE (bacula-5.2.12.tar.gz) = 4147847
SHA256 (bacula-5.2.13.tar.gz) = pL7UWL8AGIm9Br8xZxtdmQgFWh0egRP9dQrk0yZgetg=
SIZE (bacula-5.2.13.tar.gz) = 4243395

8
sysutils/bacula/patches/patch-Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-Makefile_in,v 1.3 2012/09/14 08:14:31 ajacoutot Exp $
$OpenBSD: patch-Makefile_in,v 1.4 2013/04/12 10:39:04 ajacoutot Exp $
stop building when an error occurs, rather than just keep on with the
next subdir..
--- Makefile.in.orig Tue Sep 11 11:26:24 2012
+++ Makefile.in Thu Sep 13 08:19:35 2012
--- Makefile.in.orig Tue Feb 19 20:21:35 2013
+++ Makefile.in Fri Apr 12 07:02:31 2013
@@ -42,18 +42,18 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
#-------------------------------------------------------------------------
@ -27,7 +27,7 @@ next subdir..
do (cd $$I; echo "==>Entering directory `pwd`"; \
$(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \
echo ""; echo ""; exit 1;)); \
@@ -100,12 +100,6 @@ installdirs:
@@ -107,12 +107,6 @@ installdirs:
-if test ! -d $(DESTDIR)$(working_dir) ; then \
$(MKDIR) $(DESTDIR)$(working_dir); \
chmod 770 $(DESTDIR)$(working_dir); \

18
sysutils/bacula/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.13 2012/09/14 08:14:31 ajacoutot Exp $
--- configure.orig Thu Jun 28 15:52:03 2012
+++ configure Thu Jul 5 18:18:02 2012
@@ -4804,7 +4804,7 @@ $as_echo "no" >&6; }
$OpenBSD: patch-configure,v 1.14 2013/04/12 10:39:04 ajacoutot Exp $
--- configure.orig Tue Feb 19 20:21:35 2013
+++ configure Fri Apr 12 07:02:31 2013
@@ -4806,7 +4806,7 @@ $as_echo "no" >&6; }
fi
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.13 2012/09/14 08:14:31 ajacoutot Exp $
as_fn_error $? "Unable to find C++ compiler" "$LINENO" 5
fi
@@ -16714,7 +16714,7 @@ if test x$use_libtool != xno; then
@@ -16716,7 +16716,7 @@ if test x$use_libtool != xno; then
LIBTOOL_INSTALL_TARGET="libtool-install"
LIBTOOL_UNINSTALL_TARGET="libtool-uninstall"
LIBTOOL_CLEAN_TARGET="libtool-clean"
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.13 2012/09/14 08:14:31 ajacoutot Exp $
FD_PLUGIN_DIR="src/plugins/fd"
have_plugins=yes
else
@@ -22392,7 +22392,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
@@ -22422,7 +22422,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
$as_echo "#define HAVE_READLINE 1" >>confdefs.h
@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.13 2012/09/14 08:14:31 ajacoutot Exp $
got_readline="yes"
else
@@ -22431,7 +22431,7 @@ $as_echo "#define HAVE_READLINE 1" >>confdefs.h
@@ -22461,7 +22461,7 @@ $as_echo "#define HAVE_READLINE 1" >>confdefs.h
got_readline="yes"
CONS_INC="-I${TOP_DIR}/depkgs/readline"
@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.13 2012/09/14 08:14:31 ajacoutot Exp $
CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
@@ -30720,6 +30720,7 @@ netbsd)
@@ -30760,6 +30760,7 @@ netbsd)
DISTVER=`uname -a |awk '{print $3}'`
lld="qd"
llu="qu"
@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.13 2012/09/14 08:14:31 ajacoutot Exp $
TAPEDRIVE="/dev/nrst0"
PSCMD="ps -ax -o pid,command"
PTHREAD_LIB="-pthread"
@@ -30738,6 +30739,7 @@ openbsd)
@@ -30778,6 +30779,7 @@ openbsd)
platforms/openbsd/bacula-fd \
platforms/openbsd/bacula-sd \
platforms/openbsd/bacula-dir"

74
sysutils/bacula/patches/patch-examples_autochangers_chio-changer-openbsd
View File

@ -1,74 +0,0 @@
$OpenBSD: patch-examples_autochangers_chio-changer-openbsd,v 1.3 2013/03/03 12:53:21 ajacoutot Exp $
http://bugs.bacula.org/view.php?id=1937
http://bugs.bacula.org/view.php?id=1984
--- examples/autochangers/chio-changer-openbsd.orig Thu Sep 13 10:51:19 2012
+++ examples/autochangers/chio-changer-openbsd Sun Mar 3 13:51:01 2013
@@ -23,11 +23,11 @@
# the chio exit code or a 0. If the script exits with a non-zero
# exit code, Bacula will assume the request failed.
-CHIO=/bin/chio
-
# time (in seconds) for the unit to settle after (un)loading a tape
SLEEP=1
+CHIO=/bin/chio
+
usage() {
echo "usage: ${0##*/} ctl-device command [slot archive-device drive-index]"
}
@@ -85,7 +85,6 @@ case ${cmd} in
[ ${rtn} -eq 0 ] && sleep ${SLEEP}
exit ${rtn}
;;
-
load)
${CHIO} -f ${ctl} move slot $((${slot} - 1)) drive ${drive}
rtn=$?
@@ -95,20 +94,35 @@ case ${cmd} in
list)
${CHIO} -f ${ctl} status -v slot | \
sed -ne 's/^slot *\([0-9]*:\).*FULL.*voltag.*<\(.*\):.*/\1\2/p' | \
- awk -F: '{print $1 + 1 ":" $2 }'
+ awk -F: '{ print $1 + 1 ":" $2 }'
exit $?
;;
-
listall)
- echo "The listall command is not implemented on OpenBSD."
- exit 1
- ;;
+ # XXX only one drive is queried
+ _list=$(${0} ${1} list)
+ _loaded_s=$(${0} ${1} loaded ${slot} ${device} ${drive})
+ _loaded_t=$(${CHIO} -f ${ctl} status -v | grep "drive ${drive}" | awk '{ print $NF }' | sed -e 's,<,,' -e 's,:.*,,')
+ [ -n "${_list}" -a -n "${_loaded_s}" -a -n "${_loaded_t}" ] || exit 1
+
+ (for i in ${_list}; do
+ echo "S:${i}" | sed 's/\(.*\):/\1:F:/'
+ done
+ echo S:${_loaded_s}:E
+ if [ "${_loaded_s}" -ne 0 ]; then
+ echo D:${drive}:F:${_loaded_s}:${_loaded_t}
+ else
+ echo D:${drive}:E
+ fi) | sort
+ ;;
loaded)
- local _slot=`${CHIO} -f ${ctl} status -v | egrep '^slot.*<ACCESS> voltag: <:[0-9]>$' | awk '{ print $2 }' | awk -F: '{ print $1 + 1 }'`
- [ -z "${_slot}" ] && _slot=0
- echo ${_slot}
- exit $?
+ # XXX output the first empty slot if the drive is loaded
+ _slot=$(${CHIO} -f ${ctl} status -v | egrep '^slot.*<ACCESS> voltag: <:[0-9]>$' | awk '{ print $2 }' | awk -F: '{ print $1 + 1 }')
+ rtn=$?
+ _loaded=$(${CHIO} -f ${ctl} status -v | egrep "^drive ${drive}: <ACCESS,FULL> voltag: <.*:[0-9]>")
+ [ -z "${_slot}" -o -z "${_loaded}" ] && _slot=0
+ echo ${_slot} | awk '{ print $1 }'
+ exit ${rtn}
;;
slots)
${CHIO} -f ${ctl} params | awk "/slots/{print \$2}"

24
sysutils/bacula/patches/patch-src_qt-console_main_cpp
View File

@ -1,7 +1,23 @@
$OpenBSD: patch-src_qt-console_main_cpp,v 1.6 2011/12/12 09:15:09 sthen Exp $
--- src/qt-console/main.cpp.orig Sat Nov 26 14:08:12 2011
+++ src/qt-console/main.cpp Sun Dec 4 11:52:17 2011
@@ -58,7 +58,7 @@ extern bool parse_bat_config(CONFIG *config, const cha
$OpenBSD: patch-src_qt-console_main_cpp,v 1.7 2013/04/12 10:39:04 ajacoutot Exp $
--- src/qt-console/main.cpp.orig Tue Feb 19 20:21:35 2013
+++ src/qt-console/main.cpp Fri Apr 12 07:06:32 2013
@@ -37,15 +37,6 @@
#include <QApplication>
#include <QTranslator>
-/*
- * We need Qt version 4.8.4 or later to be able to comple correctly
- */
-#if QT_VERSION < 0x040804
-#error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-#error "You need Qt version 4.8.4 or later to build Bat"
-#error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-#endif
-
MainWin *mainWin;
QApplication *app;
@@ -58,7 +49,7 @@ extern bool parse_bat_config(CONFIG *config, const cha
extern void message_callback(int /* type */, char *msg);

14
sysutils/bacula/patches/patch-src_tools_Makefile_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_tools_Makefile_in,v 1.3 2012/09/14 08:14:31 ajacoutot Exp $
$OpenBSD: patch-src_tools_Makefile_in,v 1.4 2013/04/12 10:39:04 ajacoutot Exp $
Reorder LDFLAGS (prefer -L.libs over /usr/local/lib) so that bacula can
be rebuilt while already installed.
--- src/tools/Makefile.in.orig Tue Sep 11 11:26:24 2012
+++ src/tools/Makefile.in Thu Sep 13 08:19:35 2012
@@ -58,22 +58,22 @@ all: Makefile $(TOOLS) gigaslam grow
--- src/tools/Makefile.in.orig Tue Feb 19 20:21:35 2013
+++ src/tools/Makefile.in Fri Apr 12 07:02:31 2013
@@ -56,22 +56,22 @@ all: Makefile $(TOOLS) gigaslam grow
@echo " "
bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@ -33,7 +33,7 @@ be rebuilt while already installed.
$(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
dird_conf.o: ../dird/dird_conf.c
@@ -90,34 +90,34 @@ inc_conf.o: ../dird/inc_conf.c
@@ -92,34 +92,34 @@ timelimit: timelimit.o
testfind: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(FINDOBJS)
@ -75,7 +75,7 @@ be rebuilt while already installed.
-lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
cats_test.o: cats_test.c
@@ -125,7 +125,7 @@ cats_test.o: cats_test.c
@@ -127,7 +127,7 @@ cats_test.o: cats_test.c
$(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
cats_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) cats_test.o
@ -84,7 +84,7 @@ be rebuilt while already installed.
-lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
gigaslam.o: gigaslam.c
@@ -135,7 +135,7 @@ gigaslam: gigaslam.o
@@ -137,7 +137,7 @@ gigaslam: gigaslam.o
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o
grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)

3
sysutils/bacula/pkg/PLIST-bat
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-bat,v 1.11 2012/09/14 08:14:31 ajacoutot Exp $
@comment $OpenBSD: PLIST-bat,v 1.12 2013/04/12 10:39:04 ajacoutot Exp $
@man man/man1/bat.1
@bin sbin/bat
@mode 750
@ -19,7 +19,6 @@ share/doc/bacula/media.html
share/doc/bacula/restore.html
share/doc/bacula/status.png
share/doc/bacula/storage.html
share/examples/bacula/
@mode 644
share/examples/bacula/bat.conf
@mode 640