[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc7411e791f5e2d6ae807f1dae6f1711fc4c1b1b
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via cc7411e791f5e2d6ae807f1dae6f1711fc4c1b1b (commit) via 32e799902dce517f39cf1131a870bd544923b14f (commit) via 38ace2f3aedf619f6b5b54979ba2823bb77af73e (commit) via f76c78222f8c972dff9282729467b6bd65f4c24a (commit) via 6d3854a89c7070347ded284eadf3da823ebb3d10 (commit) via 859b0382ab8a52f72de86f13165df695672dfde3 (commit) via 9ac40513c3209c45cc5e393ca074572fecadf7f0 (commit) via e405fe9e3aa14116fe58aa0d9affb2bcf554214d (commit) via 008c392e7827a4907c4a6942fe814967c86ddc18 (commit) via 469f20cdf79b4f68dc7969ce6a0b53f2321a01dc (commit) from e2d4f687dcd1e5e240f278d5c99d27fe75cd76bf (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit cc7411e791f5e2d6ae807f1dae6f1711fc4c1b1b Merge: 32e7999 f76c782 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jul 26 21:34:45 2014 +0200
Merge remote-tracking branch 'morlix/bacula' into next
Conflicts: make.sh
commit 32e799902dce517f39cf1131a870bd544923b14f Merge: e2d4f68 38ace2f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jul 26 21:34:06 2014 +0200
Merge remote-tracking branch 'morlix/check_mk' into next
commit 38ace2f3aedf619f6b5b54979ba2823bb77af73e Author: Timo Eissler timo@eissler.pro Date: Fri Jul 25 20:32:00 2014 +0200
check_mk_agent: fixed backup include filename
commit f76c78222f8c972dff9282729467b6bd65f4c24a Author: Timo Eissler timo@eissler.pro Date: Wed Jul 23 17:31:59 2014 +0200
bacula: small fix for init script
commit 6d3854a89c7070347ded284eadf3da823ebb3d10 Author: Timo Eissler timo@eissler.pro Date: Wed Jul 23 06:20:07 2014 +0200
bacula: several fixes
commit 859b0382ab8a52f72de86f13165df695672dfde3 Author: Timo Eissler timo@eissler.pro Date: Fri Jul 18 07:50:24 2014 +0200
bacula: several fixes
commit 9ac40513c3209c45cc5e393ca074572fecadf7f0 Author: Timo Eissler timo@eissler.pro Date: Wed Jul 16 17:58:15 2014 +0200
bacula: new package
commit e405fe9e3aa14116fe58aa0d9affb2bcf554214d Merge: 008c392 469f20c Author: Timo Eissler timo@eissler.pro Date: Tue Jul 15 21:12:51 2014 +0200
Merge branch 'bacula' of github.com:morlix/ipfire-2.x into bacula
Conflicts: make.sh
commit 008c392e7827a4907c4a6942fe814967c86ddc18 Author: Timo Eissler timo@teissler.de Date: Mon Mar 12 15:51:17 2012 +0100
added bacula addon package
commit 469f20cdf79b4f68dc7969ce6a0b53f2321a01dc Author: Timo Eissler timo@teissler.de Date: Mon Mar 12 15:51:17 2012 +0100
added bacula addon package
-----------------------------------------------------------------------
Summary of changes: config/backup/includes/bacula | 1 + .../backup/includes/{check_mk => check_mk_agent} | 0 config/rootfiles/packages/bacula | 62 ++++++++++++++++++++++ lfs/{minicom => bacula} | 21 +++++--- make.sh | 1 + 5 files changed, 77 insertions(+), 8 deletions(-) create mode 100644 config/backup/includes/bacula rename config/backup/includes/{check_mk => check_mk_agent} (100%) create mode 100644 config/rootfiles/packages/bacula copy lfs/{minicom => bacula} (89%)
Difference in files: diff --git a/config/backup/includes/bacula b/config/backup/includes/bacula new file mode 100644 index 0000000..8d5c119 --- /dev/null +++ b/config/backup/includes/bacula @@ -0,0 +1 @@ +/etc/bacula/ diff --git a/config/backup/includes/check_mk b/config/backup/includes/check_mk deleted file mode 100644 index ca71046..0000000 --- a/config/backup/includes/check_mk +++ /dev/null @@ -1 +0,0 @@ -/etc/check_mk/ diff --git a/config/backup/includes/check_mk_agent b/config/backup/includes/check_mk_agent new file mode 100644 index 0000000..ca71046 --- /dev/null +++ b/config/backup/includes/check_mk_agent @@ -0,0 +1 @@ +/etc/check_mk/ diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula new file mode 100644 index 0000000..9084347 --- /dev/null +++ b/config/rootfiles/packages/bacula @@ -0,0 +1,62 @@ +#etc/bacula +#etc/bacula/bacula +#etc/bacula/bacula-ctl-dir +etc/bacula/bacula-ctl-fd +#etc/bacula/bacula-ctl-sd +etc/bacula/bacula-fd.conf +#etc/bacula/bacula_config +#etc/bacula/bconsole +#etc/bacula/bconsole.conf +#etc/bacula/btraceback.dbx +#etc/bacula/btraceback.gdb +#etc/bacula/btraceback.mdb +#etc/bacula/disk-changer +#etc/bacula/dvd-handler +#etc/bacula/mtx-changer +#etc/bacula/mtx-changer.conf +etc/rc.d/init.d/bacula +usr/lib/bpipe-fd.so +usr/lib/libbac-5.2.13.so +#usr/lib/libbac.la +#usr/lib/libbac.so +usr/lib/libbaccfg-5.2.13.so +#usr/lib/libbaccfg.la +#usr/lib/libbaccfg.so +usr/lib/libbacfind-5.2.13.so +#usr/lib/libbacfind.la +#usr/lib/libbacfind.so +usr/lib/libbacpy-5.2.13.so +#usr/lib/libbacpy.la +#usr/lib/libbacpy.so +#usr/sbin/bacula +usr/sbin/bacula-fd +#usr/sbin/bconsole +#usr/sbin/btraceback +#usr/share/doc/bacula +#usr/share/doc/bacula/ChangeLog +#usr/share/doc/bacula/INSTALL +#usr/share/doc/bacula/LICENSE +#usr/share/doc/bacula/README +#usr/share/doc/bacula/ReleaseNotes +#usr/share/doc/bacula/VERIFYING +#usr/share/doc/bacula/technotes +#usr/share/man/man1/bacula-bwxconsole.1.gz +#usr/share/man/man1/bacula-tray-monitor.1.gz +#usr/share/man/man1/bat.1.gz +#usr/share/man/man1/bsmtp.1.gz +#usr/share/man/man8/bacula-dir.8.gz +#usr/share/man/man8/bacula-fd.8.gz +#usr/share/man/man8/bacula-sd.8.gz +#usr/share/man/man8/bacula.8.gz +#usr/share/man/man8/bconsole.8.gz +#usr/share/man/man8/bcopy.8.gz +#usr/share/man/man8/bextract.8.gz +#usr/share/man/man8/bls.8.gz +#usr/share/man/man8/bregex.8.gz +#usr/share/man/man8/bscan.8.gz +#usr/share/man/man8/btape.8.gz +#usr/share/man/man8/btraceback.8.gz +#usr/share/man/man8/bwild.8.gz +#usr/share/man/man8/dbcheck.8.gz +#var/bacula +var/bacula/working diff --git a/lfs/bacula b/lfs/bacula new file mode 100644 index 0000000..0e7d39b --- /dev/null +++ b/lfs/bacula @@ -0,0 +1,91 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 5.2.13 + +THISAPP = bacula-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = bacula +PAK_VER = 2 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 43417bae0c221afb1f30a581c9e0f2fe + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/bacula \ + --with-working-dir=/var/bacula/working \ + --enable-client-only + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + ln -s /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula + rm -f /root/.rnd + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/make.sh b/make.sh index 62ace29..4ca0549 100755 --- a/make.sh +++ b/make.sh @@ -808,6 +808,7 @@ buildipfire() { ipfiremake stunnel ipfiremake sslscan ipfiremake owncloud + ipfiremake bacula }
buildinstaller() {
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org