Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'bareos-16.2'
  • Loading branch information
pstorz committed Jan 26, 2017
2 parents d8d1bba + 96a28a3 commit 7588e50
Show file tree
Hide file tree
Showing 18 changed files with 126 additions and 46 deletions.
2 changes: 1 addition & 1 deletion autoconf/bareos/os.m4
Expand Up @@ -342,7 +342,7 @@ if test "x$OBS_DISTRIBUTION" != "x"
then
echo "obsdistname set to $OBS_DISTRIBUTION"
else
if test -e /.build.log; then
if test -f /.build.log; then
OBS_PROJECT=`grep 'Building bareos for project' /.build.log | cut -d' ' -f10 | sed "s#'##g"`
OBS_DISTRIBUTION=`grep 'Building bareos for project' /.build.log | cut -d' ' -f12 | sed "s#'##g"`
OBS_ARCH=`grep 'Building bareos for project' /.build.log | cut -d' ' -f14 | sed "s#'##g"`
Expand Down
4 changes: 2 additions & 2 deletions autoconf/configure.in
Expand Up @@ -947,7 +947,7 @@ AC_ARG_WITH(python,
PYTHON_LIBS=
if test "$withval" != "no"; then
if test "$withval" = "yes"; then
if test -e /usr/bin/python-config ; then
if test -f /usr/bin/python-config ; then
PYTHON_INC=`/usr/bin/python-config --includes`
PYTHON_LIBS=`/usr/bin/python-config --libs`
else
Expand Down Expand Up @@ -980,7 +980,7 @@ AC_ARG_WITH(python,
fi
fi
else
if test -e $withval/bin/python-config ; then
if test -f $withval/bin/python-config ; then
PYTHON_INC=`$withval/bin/python-config --includes`
PYTHON_LIBS=`$withval/bin/python-config --libs`
elif test -f $withval/Python.h; then
Expand Down
20 changes: 4 additions & 16 deletions configure
Expand Up @@ -965,7 +965,6 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
Expand Down Expand Up @@ -1154,7 +1153,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
Expand Down Expand Up @@ -1407,15 +1405,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;

-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;

-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
Expand Down Expand Up @@ -1553,7 +1542,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir
libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
Expand Down Expand Up @@ -1706,7 +1695,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
Expand Down Expand Up @@ -18047,7 +18035,7 @@ if test "x$OBS_DISTRIBUTION" != "x"
then
echo "obsdistname set to $OBS_DISTRIBUTION"
else
if test -e /.build.log; then
if test -f /.build.log; then
OBS_PROJECT=`grep 'Building bareos for project' /.build.log | cut -d' ' -f10 | sed "s#'##g"`
OBS_DISTRIBUTION=`grep 'Building bareos for project' /.build.log | cut -d' ' -f12 | sed "s#'##g"`
OBS_ARCH=`grep 'Building bareos for project' /.build.log | cut -d' ' -f14 | sed "s#'##g"`
Expand Down Expand Up @@ -23752,7 +23740,7 @@ if test "${with_python+set}" = set; then :
PYTHON_LIBS=
if test "$withval" != "no"; then
if test "$withval" = "yes"; then
if test -e /usr/bin/python-config ; then
if test -f /usr/bin/python-config ; then
PYTHON_INC=`/usr/bin/python-config --includes`
PYTHON_LIBS=`/usr/bin/python-config --libs`
else
Expand Down Expand Up @@ -23786,7 +23774,7 @@ $as_echo "no" >&6; }
fi
fi
else
if test -e $withval/bin/python-config ; then
if test -f $withval/bin/python-config ; then
PYTHON_INC=`$withval/bin/python-config --includes`
PYTHON_LIBS=`$withval/bin/python-config --libs`
elif test -f $withval/Python.h; then
Expand Down
1 change: 1 addition & 0 deletions debian/univention-bareos.install.in
Expand Up @@ -10,6 +10,7 @@
/etc/univention/templates/scripts/etc/bareos/bareos-dir.d/pool/Differential.conf
/etc/univention/templates/scripts/etc/bareos/bareos-dir.d/pool/Full.conf
/etc/univention/templates/scripts/etc/bareos/bareos-dir.d/pool/Incremental.conf
/etc/univention/templates/scripts/etc/bareos/bareos-dir.d/webui-profiles.conf
/usr/lib/univention-directory-listener/system/univention-bareos.py
/usr/lib/univention-install/62univention-bareos.inst
/usr/lib/univention-uninstall/63univention-bareos.uinst
Expand Down
2 changes: 1 addition & 1 deletion debian/univention-bareos.preinst
@@ -1,7 +1,7 @@
#!/bin/sh

if [ "$1" = "install" ]; then
test -e /usr/lib/univention-install/63univention-bareos-uninstall.uinst && rm /usr/lib/univention-install/63univention-bareos-uninstall.uinst
test -f /usr/lib/univention-install/63univention-bareos-uninstall.uinst && rm /usr/lib/univention-install/63univention-bareos-uninstall.uinst
fi

# dh_installdeb will replace this with shell code automatically
Expand Down
3 changes: 3 additions & 0 deletions debian/univention-bareos.univention-config-registry
Expand Up @@ -31,6 +31,9 @@ File: etc/bareos/bareos-dir.d/pool/Incremental.conf
Variables: bareos/max_incr_volume_bytes
Variables: bareos/max_incr_volumes

Type: file
File: etc/bareos/bareos-dir.d/webui-profiles.conf

Type: file
File: etc/bareos/bareos-sd.d/device/FileStorage.conf
Variables: bareos/filestorage
Expand Down
5 changes: 3 additions & 2 deletions platforms/univention/AppCenter/LICENSE_AGREEMENT.in
Expand Up @@ -5,7 +5,7 @@
<td>Copyright (C) 2000-2012 Free Software Foundation Europe e.V.</td>
</tr>
<tr>
<td>Copyright (C) 2013-2015 Bareos GmbH &amp; Co. KG</td>
<td>Copyright (C) 2013-2017 Bareos GmbH &amp; Co. KG</td>
</tr>
</table>

Expand All @@ -26,6 +26,7 @@
along with this program. If not, see http://www.gnu.org/licenses/
</p>
<p>
See full license text at https://github.com/bareos/bareos/blob/master/LICENSE
Some parts of the code are licensed under other permissive licenses.
See the <a href="https://github.com/bareos/bareos/blob/master/LICENSE">full license text</a>.
</p>

5 changes: 4 additions & 1 deletion platforms/univention/Makefile.in
Expand Up @@ -16,7 +16,10 @@ all:
# remove autoconf template files
find ../../conffiles/ -name "*.in" -exec rm {} \;
@$(MKDIR) ../../AppCenter/
$(INSTALL_DATA) AppCenter/univention-bareos.ini ../../AppCenter/
# Univention advices not to include the ini file any longer,
# to prevent to new settings added by Univention gets overwritten.
# Instead the settings should be done manually on the AppCenter Management interface.
#$(INSTALL_DATA) AppCenter/univention-bareos.ini ../../AppCenter/
$(INSTALL_DATA) AppCenter/LICENSE_AGREEMENT ../../AppCenter/
$(INSTALL_DATA) AppCenter/README ../../AppCenter/
$(INSTALL_DATA) AppCenter/README_DE ../../AppCenter/
Expand Down
@@ -0,0 +1,21 @@
@%@UCRWARNING=# @%@

#
# bareos-webui profile resource.
# Deprecated, only used when updating from bareos-15.2.
# Fresh installation of bareos >= 16.2 will use
# /etc/bareos/bareos-dir.d/profile/webui-admin.conf (profile name: webui-admin).
#
Profile {
Name = webui
CommandACL = !.bvfs_clear_cache, !.exit, !.sql, !configure, !create, !delete, !purge, !prune, !sqlquery, !umount, !unmount, *all*
Job ACL = *all*
Schedule ACL = *all*
Catalog ACL = *all*
Pool ACL = *all*
Storage ACL = *all*
Client ACL = *all*
FileSet ACL = *all*
Where ACL = *all*
}

4 changes: 2 additions & 2 deletions platforms/univention/job-generic.template
Expand Up @@ -8,7 +8,7 @@ Job {
Name = "Backup-${client_name}"
Client = "${client_name}-fd"
JobDefs = "DefaultJob"
FileSet = "LinuxAll"
Schedule = "WeeklyCycle"
#FileSet = "LinuxAll"
#Schedule = "WeeklyCycle"
Enabled = "${enable}"
}
2 changes: 1 addition & 1 deletion platforms/win32/mingw-debugsrc-devel.spec
@@ -1,7 +1,7 @@
#
# spec file for package mingw-debugsrc-devel
#
# Copyright (c) 2014-2016 Bareos GmbH & Co. KG
# Copyright (c) 2014-2017 Bareos GmbH & Co. KG
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
Expand Down
4 changes: 2 additions & 2 deletions platforms/win32/winbareos.nsi
@@ -1,7 +1,7 @@
;
; BAREOS - Backup Archiving REcovery Open Sourced
;
; Copyright (C) 2012-2016 Bareos GmbH & Co. KG
; Copyright (C) 2012-2017 Bareos GmbH & Co. KG
;
; This program is Free Software; you can redistribute it and/or
; modify it under the terms of version three of the GNU Affero General Public
Expand Down Expand Up @@ -185,7 +185,7 @@ FunctionEnd

!define MUI_FINISHPAGE_RUN
#!define MUI_FINISHPAGE_RUN_NOTCHECKED
!define MUI_FINISHPAGE_RUN_TEXT "open Bareos websites"
!define MUI_FINISHPAGE_RUN_TEXT "Open Bareos websites"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
!insertmacro MUI_PAGE_FINISH

Expand Down
2 changes: 1 addition & 1 deletion scripts/git-info.sh
Expand Up @@ -25,7 +25,7 @@ git_branch_info()
TRACKING_BRANCH=`git config branch.$LOCAL_BRANCH.merge`
TRACKING_REMOTE=`git config branch.$LOCAL_BRANCH.remote`
# remove credentials from url
REMOTE_URL=`git config remote.$TRACKING_REMOTE.url | sed -r "s|(http[s]://).*@|\1|"`
REMOTE_URL=`git config remote.$TRACKING_REMOTE.url | sed "s|\(http[s]://\).*@|\1|"`

printf "remote_url=$REMOTE_URL\n"
# OBS return always "master" therefore disabled
Expand Down

0 comments on commit 7588e50

Please sign in to comment.