5.2.2
This commit is contained in:
Tom "spot" Callaway
parent
8e931ae7e3
commit
16d9a36e02
2
.gitignore
vendored
2
.gitignore
vendored
@ -2,3 +2,5 @@ bacula-5.0.2.tar.gz
|
|||||||
bacula-docs-5.0.2.tar.bz2
|
bacula-docs-5.0.2.tar.bz2
|
||||||
bacula-5.0.3.tar.gz
|
bacula-5.0.3.tar.gz
|
||||||
bacula-docs-5.0.3.tar.bz2
|
bacula-docs-5.0.3.tar.bz2
|
||||||
|
/bacula-5.2.2.tar.gz
|
||||||
|
/bacula-docs-5.2.2.tar.bz2
|
||||||
|
|||||||
12
bacula-5.2.1-bat-pamd.patch
Normal file
12
bacula-5.2.1-bat-pamd.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
--- bacula-5.2.1/scripts/bat.pamd.orig 2007-07-11 18:42:33.000000000 +0200
|
||||||
|
+++ bacula-5.2.1/scripts/bat.pamd 2007-07-11 18:42:57.000000000 +0200
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
#%PAM-1.0
|
||||||
|
auth sufficient pam_rootok.so
|
||||||
|
auth sufficient pam_timestamp.so
|
||||||
|
-auth required pam_stack.so service=system-auth
|
||||||
|
+auth include system-auth
|
||||||
|
session optional pam_xauth.so
|
||||||
|
session optional pam_timestamp.so
|
||||||
|
account required pam_permit.so
|
||||||
|
|
||||||
196
bacula-5.2.2-dsolink.patch
Normal file
196
bacula-5.2.2-dsolink.patch
Normal file
@ -0,0 +1,196 @@
|
|||||||
|
diff -up bacula-5.2.2/src/console/Makefile.in.dsolink bacula-5.2.2/src/console/Makefile.in
|
||||||
|
--- bacula-5.2.2/src/console/Makefile.in.dsolink 2011-11-26 09:08:12.000000000 -0500
|
||||||
|
+++ bacula-5.2.2/src/console/Makefile.in 2011-11-29 16:32:39.897821119 -0500
|
||||||
|
@@ -48,7 +48,7 @@ all: Makefile bconsole @STATIC_CONS@
|
||||||
|
|
||||||
|
bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
|
||||||
|
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
|
||||||
|
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
|
||||||
|
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) \
|
||||||
|
$(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
|
||||||
|
diff -up bacula-5.2.2/src/dird/Makefile.in.dsolink bacula-5.2.2/src/dird/Makefile.in
|
||||||
|
--- bacula-5.2.2/src/dird/Makefile.in.dsolink 2011-11-26 09:08:12.000000000 -0500
|
||||||
|
+++ bacula-5.2.2/src/dird/Makefile.in 2011-11-29 16:32:39.898821107 -0500
|
||||||
|
@@ -69,7 +69,7 @@ bacula-dir: Makefile $(SVROBJS) ../lib/l
|
||||||
|
../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
|
||||||
|
@echo "Linking $@ ..."
|
||||||
|
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
|
||||||
|
- -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
|
||||||
|
+ -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm -lz $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
|
||||||
|
$(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
|
||||||
|
|
||||||
|
static-bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
|
||||||
|
diff -up bacula-5.2.2/src/qt-console/bat.pro.in.dsolink bacula-5.2.2/src/qt-console/bat.pro.in
|
||||||
|
--- bacula-5.2.2/src/qt-console/bat.pro.in.dsolink 2011-11-26 09:08:12.000000000 -0500
|
||||||
|
+++ bacula-5.2.2/src/qt-console/bat.pro.in 2011-11-29 16:32:39.899821095 -0500
|
||||||
|
@@ -19,7 +19,7 @@ TEMPLATE = app
|
||||||
|
TARGET = bat
|
||||||
|
DEPENDPATH += .
|
||||||
|
INCLUDEPATH += .. . ./console ./restore ./select
|
||||||
|
-LIBS += -L../lib -lbaccfg -lbac -L../findlib -lbacfind @OPENSSL_LIBS@
|
||||||
|
+LIBS += -L../lib -lbaccfg -lbac -L../findlib -lbacfind -ldl -lz @OPENSSL_LIBS@
|
||||||
|
LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
|
||||||
|
LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
|
||||||
|
QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
|
||||||
|
diff -up bacula-5.2.2/src/stored/Makefile.in.dsolink bacula-5.2.2/src/stored/Makefile.in
|
||||||
|
--- bacula-5.2.2/src/stored/Makefile.in.dsolink 2011-11-26 09:08:12.000000000 -0500
|
||||||
|
+++ bacula-5.2.2/src/stored/Makefile.in 2011-11-29 16:32:39.899821095 -0500
|
||||||
|
@@ -96,7 +96,7 @@ all: Makefile bacula-sd @STATIC_SD@ bls
|
||||||
|
bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||||||
|
@echo "Linking $@ ..."
|
||||||
|
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(ZLIBS) \
|
||||||
|
- -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
|
||||||
|
+ -lbacpy -lbaccfg -lbac -lm -lz $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
|
||||||
|
$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
|
||||||
|
|
||||||
|
static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||||||
|
@@ -112,7 +112,7 @@ btape.o: btape.c
|
||||||
|
|
||||||
|
btape: Makefile $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
|
||||||
|
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(TAPEOBJS) \
|
||||||
|
- -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ -lbaccfg -lbac $(DLIB) -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
bls.o: bls.c
|
||||||
|
@echo "Compiling $<"
|
||||||
|
@@ -122,7 +122,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 $<"
|
||||||
|
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
|
||||||
|
- -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ -lbacfind -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
bextract.o: bextract.c
|
||||||
|
@echo "Compiling $<"
|
||||||
|
@@ -132,7 +132,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 $<"
|
||||||
|
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZOLIBS) \
|
||||||
|
- -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ -lbacfind -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
bscan.o: bscan.c
|
||||||
|
@echo "Compiling $<"
|
||||||
|
@@ -142,7 +142,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)
|
||||||
|
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
|
||||||
|
- -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
bcopy.o: bcopy.c
|
||||||
|
@echo "Compiling $<"
|
||||||
|
@@ -151,7 +151,7 @@ bcopy.o: bcopy.c
|
||||||
|
|
||||||
|
bcopy: Makefile $(COPYOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||||||
|
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \
|
||||||
|
- -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
|
||||||
|
cd $(topdir) \
|
||||||
|
diff -up bacula-5.2.2/src/tools/Makefile.in.dsolink bacula-5.2.2/src/tools/Makefile.in
|
||||||
|
--- bacula-5.2.2/src/tools/Makefile.in.dsolink 2011-11-26 09:08:12.000000000 -0500
|
||||||
|
+++ bacula-5.2.2/src/tools/Makefile.in 2011-11-29 16:34:56.795171642 -0500
|
||||||
|
@@ -58,22 +58,22 @@ all: Makefile $(TOOLS) gigaslam grow
|
||||||
|
@echo " "
|
||||||
|
|
||||||
|
bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||||||
|
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm -lz $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
bregtest: Makefile bregtest.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||||||
|
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o -lbac -lm -lz $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
|
||||||
|
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS)
|
||||||
|
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \
|
||||||
|
- -lbaccats -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ -lbaccats -lbacsql -lbaccfg -lbac -lm -lz $(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 \
|
||||||
|
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm -lz \
|
||||||
|
$(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
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) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o -lbacfind -lbac -lm -lz \
|
||||||
|
$(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
dird_conf.o: ../dird/dird_conf.c
|
||||||
|
@@ -88,34 +88,34 @@ inc_conf.o: ../dird/inc_conf.c
|
||||||
|
testfind: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
|
||||||
|
../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(FINDOBJS)
|
||||||
|
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -o $@ $(FINDOBJS) -L. -L../lib -L../findlib \
|
||||||
|
- $(DLIB) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ $(DLIB) -lbacfind -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
testls: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) testls.o
|
||||||
|
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ testls.o \
|
||||||
|
- $(DLIB) -lbacfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ $(DLIB) -lbacfind -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
bregex: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bregex.o
|
||||||
|
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bregex.o \
|
||||||
|
- $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ $(DLIB) -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
bwild: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o
|
||||||
|
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \
|
||||||
|
- $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ $(DLIB) -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
|
||||||
|
../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bbatch.o
|
||||||
|
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \
|
||||||
|
- -lbaccats -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ -lbaccats -lbacsql -lbac -lm -lz $(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 \
|
||||||
|
- -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ -lbaccats -lbacsql -lbacfind -lbac -lm -lz $(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 \
|
||||||
|
- -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ -lbaccats -lbacsql -lbacfind -lbac -lm -lz $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
cats_test.o: cats_test.c
|
||||||
|
echo "Compiling $<"
|
||||||
|
@@ -123,7 +123,7 @@ cats_test.o: cats_test.c
|
||||||
|
|
||||||
|
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 \
|
||||||
|
- -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ -lbaccats -lbacsql -lbacfind -lbac -lm -lz $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
gigaslam.o: gigaslam.c
|
||||||
|
$(CXX) $(CFLAGS) -c $<
|
||||||
|
@@ -132,7 +132,7 @@ gigaslam: gigaslam.o
|
||||||
|
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o
|
||||||
|
|
||||||
|
grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||||||
|
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o -lbac -lm -lz $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
|
||||||
|
cd $(topdir) \
|
||||||
|
diff -up bacula-5.2.2/src/tray-monitor/Makefile.in.dsolink bacula-5.2.2/src/tray-monitor/Makefile.in
|
||||||
|
--- bacula-5.2.2/src/tray-monitor/Makefile.in.dsolink 2011-11-26 09:08:12.000000000 -0500
|
||||||
|
+++ bacula-5.2.2/src/tray-monitor/Makefile.in 2011-11-29 16:32:39.902821059 -0500
|
||||||
|
@@ -45,7 +45,7 @@ all: Makefile bacula-tray-monitor
|
||||||
|
|
||||||
|
bacula-tray-monitor: Makefile $(MONITOROBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||||||
|
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(MONITOR_LDFLAGS) -L../lib -o $@ \
|
||||||
|
- $(MONITOROBJS) $(DLIB) -lbaccfg -lbac -lm $(LIBS) $(OPENSSL_LIBS)
|
||||||
|
+ $(MONITOROBJS) $(DLIB) -lbaccfg -lbac -lm -lz $(LIBS) $(OPENSSL_LIBS)
|
||||||
|
|
||||||
|
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
|
||||||
|
cd $(topdir) \
|
||||||
12
bacula-5.2.2-qt-console-optflags.patch
Normal file
12
bacula-5.2.2-qt-console-optflags.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up bacula-5.2.2/src/qt-console/bat.pro.in.optflags bacula-5.2.2/src/qt-console/bat.pro.in
|
||||||
|
--- bacula-5.2.2/src/qt-console/bat.pro.in.optflags 2011-11-29 16:44:53.459899389 -0500
|
||||||
|
+++ bacula-5.2.2/src/qt-console/bat.pro.in 2011-11-29 16:48:46.749029323 -0500
|
||||||
|
@@ -6,7 +6,7 @@
|
||||||
|
#
|
||||||
|
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
|
#
|
||||||
|
-CONFIG += qt debug @QWT@
|
||||||
|
+CONFIG += qt release @QWT@
|
||||||
|
|
||||||
|
bins.path = /$(DESTDIR)@sbindir@
|
||||||
|
bins.files = bat
|
||||||
1049
bacula.spec
1049
bacula.spec
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user