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

update Bacula to 5.2.2 (mostly bugfixes)

Browse Source 
- Switch default flavour used by the port to pgsql; this is generally the
best-tested backend and gets the most testing. Setup isn't really
much more complicated than the old default in the port (sqlite) and
you don't really want to run into limitations and have to convert
it later. Doesn't affect packages as all flavours are built anyway.

ok ajacoutot@ merdely@ (maintainer)
This commit is contained in:
sthen 2011-12-12 09:15:09 +00:00
parent 7437487788
commit 02d77834f0
6 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sysutils/bacula/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.37 2011/11/27 17:02:25 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.38 2011/12/12 09:15:09 sthen Exp $
COMMENT-main= network backup solution (client)
COMMENT-server= network backup solution (server)
COMMENT-bat= network backup solution (gui-client)
V= 5.2.1
V= 5.2.2
DISTNAME= bacula-$V
FULLPKGNAME-main= bacula-client-$V
FULLPKGPATH-main= ${PKGPATH},-main
@ -13,10 +13,6 @@ FULLPKGNAME-bat= bacula-bat-$V
FULLPKGPATH-bat= ${PKGPATH},-bat
CATEGORIES= sysutils
REVISION-main= 2
REVISION-server= 2
REVISION-bat= 2
SHARED_LIBS += bac 2.0 # 5.2.1
SHARED_LIBS += baccfg 2.0 # 5.2.1
SHARED_LIBS += bacpy 2.0 # 5.2.1
@ -53,7 +49,7 @@ PSEUDO_FLAVORS= no_bat no_server
FLAVORS= pgsql mysql sqlite3
.if !defined(FLAVOR) || empty(FLAVOR)
FLAVOR = sqlite3
FLAVOR = pgsql
.endif
MULTI_PACKAGES= -main -server -bat

10
sysutils/bacula/distinfo
View File

@ -1,5 +1,5 @@
MD5 (bacula-5.2.1.tar.gz) = eT2p+J/F4CS2uV6xajEg5Q==
RMD160 (bacula-5.2.1.tar.gz) = 1HIjdgv8gTJVdfTaCyb38Y3j0kY=
SHA1 (bacula-5.2.1.tar.gz) = FQMN5cW1YwT/9mNNQ0bzNb3Yjwc=
SHA256 (bacula-5.2.1.tar.gz) = gS1r77cRroXwDINKELde//Gbo1+M7GtudcIOxFz3TjA=
SIZE (bacula-5.2.1.tar.gz) = 3992674
MD5 (bacula-5.2.2.tar.gz) = InuI9WrghdqPSII7Ig1Mhw==
RMD160 (bacula-5.2.2.tar.gz) = FDQqzTPQvnoRxxtU0+noJICHs6U=
SHA1 (bacula-5.2.2.tar.gz) = g758FHDB36Srzcz5XVUg+DOa0JY=
SHA256 (bacula-5.2.2.tar.gz) = 2A81Mr2cNT2uAFMrUu+mCgHo3Of/BFpxentC2CDKCVk=
SIZE (bacula-5.2.2.tar.gz) = 4011125

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

@ -1,16 +1,16 @@
$OpenBSD: patch-configure,v 1.8 2011/11/17 23:45:56 ajacoutot Exp $
--- configure.orig Sun Oct 30 13:03:42 2011
+++ configure Mon Nov 14 17:12:31 2011
@@ -4764,7 +4764,7 @@ $as_echo "no" >&6; }
$OpenBSD: patch-configure,v 1.9 2011/12/12 09:15:09 sthen Exp $
--- configure.orig Sat Nov 26 14:08:12 2011
+++ configure Sun Dec 4 11:54:53 2011
@@ -4792,7 +4792,7 @@ $as_echo "no" >&6; }
fi
-if test ! -e $CXX; then
+if test ! -e `which $CXX`; then
as_fn_error "Unable to find C++ compiler" "$LINENO" 5
as_fn_error $? "Unable to find C++ compiler" "$LINENO" 5
fi
@@ -16356,7 +16356,7 @@ if test x$use_libtool != xno; then
@@ -16383,7 +16383,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.8 2011/11/17 23:45:56 ajacoutot Exp $
FD_PLUGIN_DIR="src/plugins/fd"
have_plugins=yes
else
@@ -22038,7 +22038,7 @@ eval as_val=\$$as_ac_Header
@@ -22061,7 +22061,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.8 2011/11/17 23:45:56 ajacoutot Exp $
got_readline="yes"
else
@@ -22078,7 +22078,7 @@ $as_echo "#define HAVE_READLINE 1" >>confdefs.h
@@ -22100,7 +22100,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.8 2011/11/17 23:45:56 ajacoutot Exp $
CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
@@ -29782,13 +29782,13 @@ $as_echo "#define HAVE_XATTR 1" >>confdefs.h
@@ -29764,13 +29764,13 @@ $as_echo "#define HAVE_XATTR 1" >>confdefs.h
fi
PTHREAD_LIB=""
@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.8 2011/11/17 23:45:56 ajacoutot Exp $
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
if ${ac_cv_lib_pthread_pthread_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -54,16 +54,16 @@ $OpenBSD: patch-configure,v 1.8 2011/11/17 23:45:56 ajacoutot Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -29819,7 +29819,7 @@ fi
@@ -29801,7 +29801,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
- PTHREAD_LIB="-lpthread"
+ PTHREAD_LIB="-pthread"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5
@@ -30189,7 +30189,8 @@ openbsd)
@@ -30169,7 +30169,8 @@ openbsd)
DISTVER=`uname -a |awk '{print $3}'`
lld="qd"
llu="qu"
@ -73,7 +73,7 @@ $OpenBSD: patch-configure,v 1.8 2011/11/17 23:45:56 ajacoutot Exp $
PSCMD="ps -ax -o pid,command"
PTHREAD_LIB="-pthread"
CFLAGS="${CFLAGS} -pthread"
@@ -30198,6 +30199,7 @@ openbsd)
@@ -30178,6 +30179,7 @@ openbsd)
platforms/openbsd/bacula-fd \
platforms/openbsd/bacula-sd \
platforms/openbsd/bacula-dir"

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

@ -1,7 +1,7 @@
$OpenBSD: patch-src_qt-console_main_cpp,v 1.5 2011/11/17 23:45:56 ajacoutot Exp $
--- src/qt-console/main.cpp.orig Sun Oct 30 13:03:42 2011
+++ src/qt-console/main.cpp Mon Nov 14 12:19:03 2011
@@ -49,7 +49,7 @@ extern bool parse_bat_config(CONFIG *config, const cha
$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
extern void message_callback(int /* type */, char *msg);

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

@ -1,11 +1,11 @@
$OpenBSD: patch-src_stored_Makefile_in,v 1.1 2011/11/24 09:29:55 ajacoutot Exp $
$OpenBSD: patch-src_stored_Makefile_in,v 1.2 2011/12/12 09:15:09 sthen Exp $
Reorder LDFLAGS (prefer -L.libs over /usr/local/lib) so that bacula can
be rebuilt while already installed.
--- src/stored/Makefile.in.orig Wed Nov 23 16:32:14 2011
+++ src/stored/Makefile.in Wed Nov 23 16:34:53 2011
@@ -93,12 +93,12 @@ all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan
--- src/stored/Makefile.in.orig Sat Nov 26 14:08:12 2011
+++ src/stored/Makefile.in Sun Dec 4 11:52:17 2011
@@ -95,12 +95,12 @@ all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan
bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
@ -20,7 +20,7 @@ be rebuilt while already installed.
-lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
strip $@
@@ -109,7 +109,7 @@ btape.o: btape.c
@@ -111,7 +111,7 @@ btape.o: btape.c
-I$(basedir) $(DINCLUDE) $(CFLAGS) $<
btape: Makefile $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
@ -29,7 +29,7 @@ be rebuilt while already installed.
-lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bls.o: bls.c
@@ -119,7 +119,7 @@ bls.o: bls.c
@@ -121,7 +121,7 @@ bls.o: bls.c
bls: Makefile $(BLSOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@echo "Compiling $<"
@ -38,7 +38,7 @@ be rebuilt while already installed.
-lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bextract.o: bextract.c
@@ -129,7 +129,7 @@ bextract.o: bextract.c
@@ -131,7 +131,7 @@ bextract.o: bextract.c
bextract: Makefile $(BEXTOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@echo "Compiling $<"
@ -47,7 +47,7 @@ be rebuilt while already installed.
-lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bscan.o: bscan.c
@@ -139,7 +139,7 @@ bscan.o: bscan.c
@@ -141,7 +141,7 @@ bscan.o: bscan.c
bscan: Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE)
@ -56,7 +56,7 @@ be rebuilt while already installed.
-lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bcopy.o: bcopy.c
@@ -148,7 +148,7 @@ bcopy.o: bcopy.c
@@ -150,7 +150,7 @@ bcopy.o: bcopy.c
-I$(basedir) $(DINCLUDE) $(CFLAGS) $<
bcopy: Makefile $(COPYOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)

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

@ -1,10 +1,10 @@
$OpenBSD: patch-src_tools_Makefile_in,v 1.1 2011/11/24 09:29:55 ajacoutot Exp $
$OpenBSD: patch-src_tools_Makefile_in,v 1.2 2011/12/12 09:15:09 sthen Exp $
Reorder LDFLAGS (prefer -L.libs over /usr/local/lib) so that bacula can
be rebuilt while already installed.
--- src/tools/Makefile.in.orig Wed Nov 23 16:35:16 2011
+++ src/tools/Makefile.in Wed Nov 23 16:38:38 2011
--- src/tools/Makefile.in.orig Sat Nov 26 14:08:12 2011
+++ src/tools/Makefile.in Sun Dec 4 12:01:18 2011
@@ -58,22 +58,22 @@ all: Makefile $(TOOLS) gigaslam grow
@echo " "
@ -20,7 +20,7 @@ be rebuilt while already installed.
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \
+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) -o $@ dbcheck.o $(DIRCONFOBJS) \
-lbacsql -lbaccats -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-lbaccats -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
fstype: Makefile fstype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm \
@ -29,7 +29,7 @@ be rebuilt while already installed.
drivetype: Makefile drivetype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o -lbacfind -lbac -lm \
+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../findlib $(LDFLAGS)-o $@ drivetype.o -lbacfind -lbac -lm \
+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../findlib $(LDFLAGS) -o $@ drivetype.o -lbacfind -lbac -lm \
$(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
dird_conf.o: ../dird/dird_conf.c
@ -60,21 +60,30 @@ be rebuilt while already installed.
../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bbatch.o
- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \
+ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib $(LDFLAGS) -o $@ bbatch.o \
-lbacsql -lbaccats -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-lbaccats -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o
- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bvfs_test.o \
+ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ bvfs_test.o \
-lbacsql -lbaccats -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
ing_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ing_test.o
- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ ing_test.o \
+ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ ing_test.o \
-lbacsql -lbaccats -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
cats_test.o: cats_test.c
@@ -122,7 +122,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
- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ cats_test.o \
+ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ cats_test.o \
-lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
gigaslam.o: gigaslam.c
@@ -132,7 +132,7 @@ gigaslam: gigaslam.o
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o