Date: Tue, 29 Dec 2020 00:14:23 +1000 From: Dima Panov <fluffy@FreeBSD.org> To: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r559389 - in head/sysutils: bareos-client bareos-server bareos-server/files bareos-traymonitor Message-ID: <8eddc043-6cfd-4161-a7b1-bb257b031a00@Canary> In-Reply-To: <202012271745.0BRHjs1r026181@repo.freebsd.org> References: <202012271745.0BRHjs1r026181@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--5fe9e840_515f007c_291 Content-Type: multipart/mixed; boundary="5fe9e840_7545e146_291" --5fe9e840_7545e146_291 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Moin=21 Please test in poudriere before commit to avoid pointyhats collection :) Ports fails to package due to some issues: * You should use %%PYTHON=5FEXT=5FSU=46=46IX%% for python shlibs andtest = for more than default python version. * lib/libbareosfastlz.so* installed by -client, why it is present in -ser= ver plist=3F * missed =40dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/j= ob in -client https://people.freebsd.org/=7Efluffy/-patches/sysutils=5Fbareos-server.di= ff -- Dima. (desktop, kde, x11, office, ports-secteam)=40=46reeBSD team (fluffy=40=46reeBSD.org, https://t.me/dima=5Fpanov) > On Monday, Dec 28, 2020 at 3:46 AM, Jose Alonso Cardenas Marquez <acm=40= =46reeBSD.org (mailto:acm=40=46reeBSD.org)> wrote: > Author: acm > Date: Sun Dec 27 17:45:53 2020 > New Revision: 559389 > URL: https://svnweb.freebsd.org/changeset/ports/559389 > > Log: > - Update to 20.0.0 > > ChangeLog at: https://docs.bareos.org/Appendix/ReleaseNotes.html > > Deleted: > head/sysutils/bareos-server/files/patch-core-src-plugins-dird=5Fpython-= dir.cc > head/sysutils/bareos-server/files/patch-core-src-plugins-filed=5Fgfapi-= fd.cc > head/sysutils/bareos-server/files/patch-core-src-plugins-filed=5Fpython= -fd.cc > head/sysutils/bareos-server/files/patch-core-src-plugins-stored=5Fpytho= n-sd.cc > head/sysutils/bareos-server/files/patch-core-src-stored-backends=5Fgfap= i=5Fdevice.h > Modified: > head/sysutils/bareos-client/Makefile > head/sysutils/bareos-server/Makefile > head/sysutils/bareos-server/Makefile.common > head/sysutils/bareos-server/distinfo > head/sysutils/bareos-server/files/patch-core-CMakeLists.txt > head/sysutils/bareos-server/files/patch-core-cmake=5FBareosCheckInclude= s.cmake > head/sysutils/bareos-server/files/patch-core-cmake=5FBareos=46indAllLib= raries.cmake > head/sysutils/bareos-server/files/patch-core-cmake=5FBareosInstallConfi= g=46iles.cmake > head/sysutils/bareos-server/files/patch-core-src-dird-dbcopy=5FCMakeLis= ts.txt > head/sysutils/bareos-server/files/patch-core-src-include=5Fbaconfig.h > head/sysutils/bareos-server/files/patch-core-src-plugins-filed=5FCMakeL= ists.txt > head/sysutils/bareos-server/files/patch-core-src-stored=5FCMakeLists.tx= t > head/sysutils/bareos-server/files/patch-core-src=5FCMakeLists.txt > head/sysutils/bareos-server/pkg-plist > head/sysutils/bareos-server/pkg-plist.client > head/sysutils/bareos-traymonitor/Makefile > head/sysutils/bareos-traymonitor/pkg-plist > > Modified: head/sysutils/bareos-client/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-client/Makefile Sun Dec 27 17:44:25 2020 (r559= 388) > +++ head/sysutils/bareos-client/Makefile Sun Dec 27 17:45:53 2020 (r559= 389) > =40=40 -5,7 +5,7 =40=40 PKGNAMESU=46=46IX=3D -client > > COMMENT=3D Backup archiving recovery open sourced (client) > > -CON=46LICTS=3D bareos18-client-* bareos17-client-* bareos16-client-* > +CON=46LICTS=3D bareos19-client-* bareos18-client-* bareos17-client-* > > WITH=5FCLIENT=5FONLY=3Dyes > USE=5FRC=5FSUBR=3D bareos-fd > > Modified: head/sysutils/bareos-server/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-server/Makefile Sun Dec 27 17:44:25 2020 (r559= 388) > +++ head/sysutils/bareos-server/Makefile Sun Dec 27 17:45:53 2020 (r559= 389) > =40=40 -2,7 +2,7 =40=40 > > PORTNAME=3D bareos > DISTVERSIONPRE=46IX=3D Release/ > -DISTVERSION=3D 19.2.9 > +DISTVERSION=3D 20.0.0 > PORTREVISION=3F=3D 0 > CATEGORIES=3F=3D sysutils > PKGNAMEPRE=46IX=3F=3D =23 > =40=40 -14,7 +14,7 =40=40 COMMENT=3F=3D Backup archiving recovery open = sourced (serv > LICENSE=3D AGPLv3 LGPL3 > LICENSE=5FCOMB=3D multi > > -CON=46LICTS=3F=3D bacula18*-server bacula17*-server-* bareos16-server-= * > +CON=46LICTS=3F=3D bacula19*-server bacula18*-server-* bareos17-server-= * > > LIB=5FDEPENDS+=3D liblzo2.so:archivers/lzo2 =5C > libjansson.so:devel/jansson > =40=40 -205,9 +205,9 =40=40 MP1+=3D bsmtp.1 bregex.1 bwild.1 bareos-tra= y-monitor.1 > MAKE=5FENV+=3D MAN8=3D=22=24=7BMP8=7D=22 MAN1=3D=22=24=7BMP1=7D=22 > > post-patch: > - =40=24=7BREINPLACE=5FCMD=7D '69,72d' =24=7BWRKSRC=7D/CMakeLists.txt > + =40=24=7BREINPLACE=5FCMD=7D '76,79d' =24=7BWRKSRC=7D/CMakeLists.txt > .if =24=7BPKGNAMESU=46=46IX=7D =3D=3D =22-server=22 > - =40=24=7BREINPLACE=5FCMD=7D '24d' =24=7BWRKSRC=7D/core/src/plugins/CM= akeLists.txt > + =40=24=7BREINPLACE=5FCMD=7D '51d' =24=7BWRKSRC=7D/core/src/plugins/CM= akeLists.txt > .endif > > post-extract: > > Modified: head/sysutils/bareos-server/Makefile.common > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-server/Makefile.common Sun Dec 27 17:44:25 202= 0 (r559388) > +++ head/sysutils/bareos-server/Makefile.common Sun Dec 27 17:45:53 202= 0 (r559389) > =40=40 -1,7 +1,7 =40=40 > =23 Created by: Alonso Cardenas <acm=40=46reeBSD.org> > =23 =24=46reeBSD=24 > post-patch: > - =40=24=7BREINPLACE=5FCMD=7D '69,72d' =24=7BWRKSRC=7D/CMakeLists.txt > + =40=24=7BREINPLACE=5FCMD=7D '76,79d' =24=7BWRKSRC=7D/CMakeLists.txt > > post-build: > .if =24=7BPKGNAMEPRE=46IX=7D =3D=3D =22nagios-check=5F=22 > =40=40 -32,6 +32,6 =40=40 do-install: > =24=7BINSTALL=5FSCRIPT=7D =24=7BWRKSRC=7D/core/src/defaultconfigs/tray-= monitor.d/=24=7Bd=7D/*.sample =24=7BSTAGEDIR=7D=24=7BETCDIR=7D/tray-monit= or.d/=24=7Bd=7D/ > .endfor > =24=7BINSTALL=5FPROGRAM=7D =24=7BCON=46IGURE=5FWRKSRC=7D/core/src/qt-tr= ay-monitor/bareos-tray-monitor =24=7BSTAGEDIR=7D=24=7BPRE=46IX=7D/bin > - =24=7BINSTALL=5FDATA=7D =24=7BWRKSRC=7D/core/src/qt-tray-monitor/bare= os-tray-monitor.xpm =24=7BSTAGEDIR=7D=24=7BPRE=46IX=7D/share/pixmaps > + =24=7BINSTALL=5FDATA=7D =24=7BWRKSRC=7D/core/src/images/bareos=5F1.pn= g =24=7BSTAGEDIR=7D=24=7BPRE=46IX=7D/share/pixmaps/bareos-tray-monitor.pn= g > =24=7BINSTALL=5FDATA=7D =24=7BWRKSRC=7D/core/src/qt-tray-monitor/bareos= -tray-monitor.desktop =24=7BSTAGEDIR=7D=24=7BDESKTOPDIR=7D > .endif > > Modified: head/sysutils/bareos-server/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-server/distinfo Sun Dec 27 17:44:25 2020 (r559= 388) > +++ head/sysutils/bareos-server/distinfo Sun Dec 27 17:45:53 2020 (r559= 389) > =40=40 -1,3 +1,3 =40=40 > -TIMESTAMP =3D 1607980168 > -SHA256 (bareos-bareos-Release-19.2.9=5FGH0.tar.gz) =3D ea203d4bdacc8dc= c86164a74f628888ce31cc90858398498137bd25900b8f723 > -SIZE (bareos-bareos-Release-19.2.9=5FGH0.tar.gz) =3D 12886739 > +TIMESTAMP =3D 1608160006 > +SHA256 (bareos-bareos-Release-20.0.0=5FGH0.tar.gz) =3D c66914a19dbd75c= 214f559b55830ab8bf468d02f50fd85694fe190153fd5695d > +SIZE (bareos-bareos-Release-20.0.0=5FGH0.tar.gz) =3D 13325939 > > Modified: head/sysutils/bareos-server/files/patch-core-CMakeLists.txt > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-server/files/patch-core-CMakeLists.txt Sun Dec= 27 17:44:25 2020 (r559388) > +++ head/sysutils/bareos-server/files/patch-core-CMakeLists.txt Sun Dec= 27 17:45:53 2020 (r559389) > =40=40 -1,6 +1,6 =40=40 > ---- core/CMakeLists.txt 2020-01-31 12:45:28.110777000 -0500 > -+++ core/CMakeLists.txt 2020-01-31 12:47:41.413976000 -0500 > -=40=40 -249,7 +249,9 =40=40 > +--- core/CMakeLists.txt 2020-12-16 02:46:16.000000000 -0500 > ++++ core/CMakeLists.txt 2020-12-26 21:28:44.141734000 -0500 > +=40=40 -256,7 +256,9 =40=40 > set(PSCMD =22ps -ax -o pid,command=22) > include=5Fdirectories(/usr/local/include) > link=5Fdirectories(/usr/local/lib) > =40=40 -11,7 +11,7 =40=40 > endif() > > if(=24=7BCMAKE=5FSYSTEM=5FNAME=7D MATCHES =22Darwin=22) > -=40=40 -316,8 +318,11 =40=40 > +=40=40 -323,8 +325,11 =40=40 > add=5Fdefinitions(=22-D=5F=46ILE=5FO=46=46SET=5FBITS=3D64=22) > endif() > > =40=40 -24,7 +24,16 =40=40 > if(developer) > add=5Fdefinitions(=22-DDEVELOPER=3D1=22) > endif() > -=40=40 -746,7 +751,6 =40=40 > +=40=40 -347,7 +352,7 =40=40 > + if(NOT client-only) > + =23 droplet does not build on solaris because of sys/cdefs.h: No such= file or > + =23 directory > +- if(NOT =24=7BCMAKE=5FSYSTEM=5FNAME=7D MATCHES =22SunOS=22) > ++ if(NOT =24=7BCMAKE=5FSYSTEM=5FNAME=7D MATCHES =22SunOS=7C=46reeBSD=22= ) > + if(NOT EXISTS =24=7BCMAKE=5FCURRENT=5FSOURCE=5FDIR=7D/src/droplet/CMa= keLists.txt) > + message( > + =46ATAL=5FERROR > +=40=40 -771,7 +776,6 =40=40 > > add=5Fsubdirectory(scripts) > add=5Fsubdirectory(manpages) > > Modified: head/sysutils/bareos-server/files/patch-core-cmake=5FBareosCh= eckIncludes.cmake > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-server/files/patch-core-cmake=5FBareosCheckInc= ludes.cmake Sun Dec 27 17:44:25 2020 (r559388) > +++ head/sysutils/bareos-server/files/patch-core-cmake=5FBareosCheckInc= ludes.cmake Sun Dec 27 17:45:53 2020 (r559389) > =40=40 -1,32 +1,39 =40=40 > ---- core/cmake/BareosCheckIncludes.cmake 2020-12-11 08:44:43.000000000= -0500 > -+++ core/cmake/BareosCheckIncludes.cmake 2020-12-14 19:30:00.380545000= -0500 > -=40=40 -100,21 +100,21 =40=40 > +--- core/cmake/BareosCheckIncludes.cmake 2020-12-16 02:46:16.000000000= -0500 > ++++ core/cmake/BareosCheckIncludes.cmake 2020-12-23 22:25:00.323963000= -0500 > +=40=40 -60,19 +60,25 =40=40 > + check=5Finclude=5Ffiles(sys/proplist.h HAVE=5FSYS=5FPROPLIST=5FH) > check=5Finclude=5Ffiles(sys/xattr.h HAVE=5FSYS=5FXATTR=5FH) > - check=5Finclude=5Ffiles(api/glfs.h HAVE=5FAPI=5FGL=46S=5FH) > > -+if(cephfs) > - check=5Finclude=5Ffiles(cephfs/libcephfs.h HAVE=5FCEPH=46S=5FLIBCEPH=46= S=5FH) > -+check=5Finclude=5Ffiles(=22sys/stat.h;cephfs/ceph=5Fll=5Fclient.h=22 = HAVE=5FCEPH=5FSTATX) > -+endif() > - > -include(CheckSymbolExists) > -include(CMakePushCheckState) > -cmake=5Fpush=5Fcheck=5Fstate() > -set(CMAKE=5FREQUIRED=5FLIBRARIES cephfs) > -check=5Fsymbol=5Fexists(ceph=5Fstatx =22sys/stat.h;cephfs/libcephfs.h=22= HAVE=5FCEPH=5FSTATX) > -cmake=5Fpop=5Fcheck=5Fstate() > -- > ++if(cephfs) > ++ include(CheckSymbolExists) > ++ include(CMakePushCheckState) > ++ cmake=5Fpush=5Fcheck=5Fstate() > ++ set(CMAKE=5FREQUIRED=5FLIBRARIES cephfs) > ++ check=5Finclude=5Ffiles(=22sys/stat.h;cephfs/ceph=5Fll=5Fclient.h=22= HAVE=5FCEPH=5FSTATX) > ++ cmake=5Fpop=5Fcheck=5Fstate() > ++endif() > + > +-check=5Finclude=5Ffiles(rados/librados.h HAVE=5FRADOS=5FLIBRADOS=5FH)= > +-check=5Finclude=5Ffiles( > +- radosstriper/libradosstriper.h HAVE=5FRADOSSTRIPER=5FLIBRADOSSTRIPER= =5FH > +-) > +if(rados) > - check=5Finclude=5Ffiles(rados/librados.h HAVE=5FRADOS=5FLIBRADOS=5FH)= > - check=5Finclude=5Ffiles(radosstriper/libradosstriper.h > - HAVE=5FRADOSSTRIPER=5FLIBRADOSSTRIPER=5FH) > ++ check=5Finclude=5Ffiles(rados/librados.h HAVE=5FRADOS=5FLIBRADOS=5FH= ) > ++ check=5Finclude=5Ffiles( > ++ radosstriper/libradosstriper.h HAVE=5FRADOSSTRIPER=5FLIBRADOSSTRIPER= =5FH > ++ ) > +endif() > > - =23 CHECK=5FINCLUDE=5F=46ILES(glusterfs/glusterfs.h HAVE=5FGLUSTER=46= S=5FGLUSTER=46S=5FH) > -check=5Finclude=5Ffiles(glusterfs/api/glfs.h HAVE=5FGLUSTER=46S=5FAPI=5F= GL=46S=5FH) > +if(gfapi) > + check=5Finclude=5Ffiles(glusterfs/api/glfs.h HAVE=5FGLUSTER=46S=5FAPI= =5FGL=46S=5FH) > +endif() > > - check=5Finclude=5Ffiles(elasto/data.h HAVE=5FELASTO=5FDATA=5FH) > - check=5Finclude=5Ffiles(elasto/file.h HAVE=5FELASTO=5F=46ILE=5FH) > + check=5Finclude=5Ffiles(sys/prctl.h HAVE=5FSYS=5FPRCTL=5FH) > + > > Modified: head/sysutils/bareos-server/files/patch-core-cmake=5FBareos=46= indAllLibraries.cmake > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-server/files/patch-core-cmake=5FBareos=46indAl= lLibraries.cmake Sun Dec 27 17:44:25 2020 (r559388) > +++ head/sysutils/bareos-server/files/patch-core-cmake=5FBareos=46indAl= lLibraries.cmake Sun Dec 27 17:45:53 2020 (r559389) > =40=40 -1,66 +1,93 =40=40 > ---- core/cmake/Bareos=46indAllLibraries.cmake 2020-01-31 11:21:18.0000= 00000 -0500 > -+++ core/cmake/Bareos=46indAllLibraries.cmake 2020-02-03 00:55:59.0986= 03000 -0500 > -=40=40 -23,20 +23,22 =40=40 > - endif() > +--- core/cmake/Bareos=46indAllLibraries.cmake 2020-12-16 02:46:16.0000= 00000 -0500 > ++++ core/cmake/Bareos=46indAllLibraries.cmake 2020-12-27 00:31:34.7252= 19000 -0500 > +=40=40 -37,46 +37,30 =40=40 > + set(Python3=5F=46OUND 0) > > - if(NOT =24=7BCMAKE=5FSYSTEM=5FNAME=7D MATCHES =22Windows=22) > -- =23 make sure we get python 2 not 3 > -- set( > -- Python=5FADDITIONAL=5FVERSIONS > -- 2.5 > -- 2.6 > -- 2.7 > -- 2.8 > -- 2.9 > -- ) > -- find=5Fpackage(PythonInterp) > -- include(=46indPythonLibs) > -+ if (python) > -+ =23 make sure we get python 2 not 3 > -+ set( > -+ Python=5FADDITIONAL=5FVERSIONS > -+ 3.5 > -+ 3.6 > -+ 3.7 > -+ 3.8 > -+ 2.9 > -+ ) > -+ find=5Fpackage(PythonInterp) > -+ include(=46indPythonLibs) > + else() > +- find=5Fpackage(Python2 COMPONENTS Interpreter Development) > +- find=5Fpackage(Python3 COMPONENTS Interpreter Development) > ++ if(python) > ++ find=5Fpackage(Python3 COMPONENTS Interpreter Development) > > -- if(=24=7BPYTHONLIBS=5F=46OUND=7D) > +- if(=24=7BPython2=5F=46OUND=7D OR =24=7BPython3=5F=46OUND=7D) > - set(HAVE=5FPYTHON 1) > -+ if(=24=7BPYTHONLIBS=5F=46OUND=7D) > +- endif() > ++ if(=24=7BPython3=5F=46OUND=7D) > + set(HAVE=5FPYTHON 1) > + endif() > + > +- if(=24=7BPython2=5F=46OUND=7D) > +- set(PYTHON=5FEXECUTABLE > +- =24=7BPython2=5FEXECUTABLE=7D > +- PARENT=5FSCOPE > +- ) > +- set(Python2=5FEXECUTABLE > +- =24=7BPython2=5FEXECUTABLE=7D > +- PARENT=5FSCOPE > +- ) > +- execute=5Fprocess( > +- COMMAND =24=7BPython2=5FEXECUTABLE=7D > +- =24=7BCMAKE=5FCURRENT=5FSOURCE=5FDIR=7D/cmake/get=5Fpython=5Fcompile= =5Fsettings.py > +- OUTPUT=5F=46ILE =24=7BCMAKE=5FCURRENT=5FBINARY=5FDIR=7D/py2settings.= cmake > +- ) > +- include(=24=7BCMAKE=5FCURRENT=5FBINARY=5FDIR=7D/py2settings.cmake) > ++ if(=24=7BPython3=5F=46OUND=7D) > ++ set(PYTHON=5FEXECUTABLE > ++ =24=7BPython3=5FEXECUTABLE=7D > ++ PARENT=5FSCOPE > ++ ) > ++ set(Python3=5FEXECUTABLE > ++ =24=7BPython3=5FEXECUTABLE=7D > ++ PARENT=5FSCOPE > ++ ) > ++ execute=5Fprocess( > ++ COMMAND =24=7BPython3=5FEXECUTABLE=7D > ++ =24=7BCMAKE=5FCURRENT=5FSOURCE=5FDIR=7D/cmake/get=5Fpython=5Fcompile= =5Fsettings.py > ++ OUTPUT=5F=46ILE =24=7BCMAKE=5FCURRENT=5FBINARY=5FDIR=7D/py3settings.= cmake > ++ ) > ++ include(=24=7BCMAKE=5FCURRENT=5FBINARY=5FDIR=7D/py3settings.cmake) > ++ endif() > endif() > +- > +- if(=24=7BPython3=5F=46OUND=7D) > +- set(PYTHON=5FEXECUTABLE > +- =24=7BPython3=5FEXECUTABLE=7D > +- PARENT=5FSCOPE > +- ) > +- set(Python3=5FEXECUTABLE > +- =24=7BPython3=5FEXECUTABLE=7D > +- PARENT=5FSCOPE > +- ) > +- execute=5Fprocess( > +- COMMAND =24=7BPython3=5FEXECUTABLE=7D > +- =24=7BCMAKE=5FCURRENT=5FSOURCE=5FDIR=7D/cmake/get=5Fpython=5Fcompile= =5Fsettings.py > +- OUTPUT=5F=46ILE =24=7BCMAKE=5FCURRENT=5FBINARY=5FDIR=7D/py3settings.= cmake > +- ) > +- include(=24=7BCMAKE=5FCURRENT=5FBINARY=5FDIR=7D/py3settings.cmake) > +- endif() > + endif() > > - include(=46indPostgreSQL) > -=40=40 -56,13 +58,22 =40=40 > - include(Bareos=46indLibraryAndHeaders) > + if(NOT =24=7BCMAKE=5FSYSTEM=5FNAME=7D MATCHES =22Windows=22) > +=40=40 -154,12 +138,18 =40=40 > + endif() > > - bareosfindlibraryandheaders(=22jansson=22 =22jansson.h=22) > --bareosfindlibraryandheaders(=22rados=22 =22rados/librados.h=22) > --bareosfindlibraryandheaders(=22radosstriper=22 =22radosstriper/librad= osstriper.h=22) > --bareosfindlibraryandheaders(=22cephfs=22 =22cephfs/libcephfs.h=22) > - bareosfindlibraryandheaders(=22pthread=22 =22pthread.h=22) > - bareosfindlibraryandheaders(=22cap=22 =22sys/capability.h=22) > --bareosfindlibraryandheaders(=22gfapi=22 =22glusterfs/api/glfs.h=22) > --bareosfindlibraryandheaders(=22droplet=22 =22droplet.h=22) > -+ > + bareosfindlibraryandheaders(=22jansson=22 =22jansson.h=22 =22=22) > +-bareosfindlibraryandheaders(=22rados=22 =22rados/librados.h=22 =22=22= ) > +-bareosfindlibraryandheaders(=22radosstriper=22 =22radosstriper/librad= osstriper.h=22 =22=22) > +-bareosfindlibraryandheaders(=22cephfs=22 =22cephfs/libcephfs.h=22 =22= =22) > +if(rados) > -+ bareosfindlibraryandheaders(=22rados=22 =22rados/librados.h=22) > -+ bareosfindlibraryandheaders(=22radosstriper=22 =22radosstriper/libra= dosstriper.h=22) > ++ bareosfindlibraryandheaders(=22rados=22 =22rados/librados.h=22 =22=22= ) > ++ bareosfindlibraryandheaders(=22radosstriper=22 =22radosstriper/libra= dosstriper.h=22 =22=22) > +endif() > +if(cephfs) > -+ bareosfindlibraryandheaders(=22cephfs=22 =22cephfs/libcephfs.h=22) > ++ bareosfindlibraryandheaders(=22cephfs=22 =22cephfs/libcephfs.h=22 =22= =22) > +endif() > + bareosfindlibraryandheaders(=22pthread=22 =22pthread.h=22 =22=22) > + bareosfindlibraryandheaders(=22cap=22 =22sys/capability.h=22 =22=22) > +-bareosfindlibraryandheaders(=22gfapi=22 =22glusterfs/api/glfs.h=22 =22= =22) > +if(gfapi) > -+ bareosfindlibraryandheaders(=22gfapi=22 =22glusterfs/api/glfs.h=22) > ++ bareosfindlibraryandheaders(=22gfapi=22 =22glusterfs/api/glfs.h=22 =22= =22) > +endif() > -+if(droplet) > -+ bareosfindlibraryandheaders(=22droplet=22 =22droplet.h=22) > -+endif() > > - bareosfindlibraryandheaders(=22pam=22 =22security/pam=5Fappl.h=22) > + bareosfindlibraryandheaders(=22pam=22 =22security/pam=5Fappl.h=22 =22= =22) > > > Modified: head/sysutils/bareos-server/files/patch-core-cmake=5FBareosIn= stallConfig=46iles.cmake > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-server/files/patch-core-cmake=5FBareosInstallC= onfig=46iles.cmake Sun Dec 27 17:44:25 2020 (r559388) > +++ head/sysutils/bareos-server/files/patch-core-cmake=5FBareosInstallC= onfig=46iles.cmake Sun Dec 27 17:45:53 2020 (r559389) > =40=40 -1,6 +1,6 =40=40 > ---- core/cmake/BareosInstallConfig=46iles.cmake 2020-01-31 11:21:18.00= 0000000 -0500 > -+++ core/cmake/BareosInstallConfig=46iles.cmake 2020-02-03 02:15:35.55= 7127000 -0500 > -=40=40 -60,24 +60,12 =40=40 > +--- core/cmake/BareosInstallConfig=46iles.cmake 2020-12-16 02:46:16.00= 0000000 -0500 > ++++ core/cmake/BareosInstallConfig=46iles.cmake 2020-12-23 22:41:21.83= 2081000 -0500 > +=40=40 -55,20 +55,12 =40=40 > get=5Ffilename=5Fcomponent(resname =24=7Bresdir=7D NAME) > foreach(configfile =24=7Bconfigfiles=7D) > get=5Ffilename=5Fcomponent(fname =24=7Bconfigfile=7D NAME) > =40=40 -10,58 +10,54 =40=40 > - file(RENAME =22=24=7Bconfigfile=7D=22 =22=24=7Bconfigfile=7D.new=22) > - > - message(STATUS =22copy =24=7Bconfigfile=7D.new to =24=7BDESTCON=46DIR= =7D/=24=7Bresname=7D=22) > -- file( > -- INSTALL =22=24=7Bconfigfile=7D.new=22 > -- DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bresname=7D=22 > -- ) > +- file(COPY =22=24=7Bconfigfile=7D.new=22 DESTINATION =22=24=7BDESTCON= =46DIR=7D/=24=7Bresname=7D=22) > - file(RENAME =22=24=7Bconfigfile=7D.new=22 =22=24=7Bconfigfile=7D=22) > - else() > - message( > -- STATUS > -- =22=24=7Bresname=7D/=24=7Bfname=7D as =24=7Bresname=7D/=24=7Bfname=7D= (new installation)=22 > +- STATUS =22=24=7Bresname=7D/=24=7Bfname=7D as =24=7Bresname=7D/=24=7B= fname=7D (new installation)=22 > - ) > - file(COPY =22=24=7Bconfigfile=7D=22 DESTINATION =22=24=7BDESTCON=46DI= R=7D/=24=7Bresname=7D=22) > - endif() > + message(STATUS =22=24=7Bresname=7D/=24=7Bfname=7D as =24=7Bresname=7D= /=24=7Bfname=7D.sample (new installation)=22) > + file(RENAME =22=24=7Bconfigfile=7D=22 =22=24=7Bconfigfile=7D.sample=22= ) > + file( > -+ COPY =22=24=7Bconfigfile=7D.sample=22 > -+ DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bresname=7D=22 > ++ COPY =22=24=7Bconfigfile=7D.sample=22 > ++ DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bresname=7D=22 > + ) > endforeach() > endforeach() > > -=40=40 -114,23 +102,12 =40=40 > +=40=40 -104,23 +96,12 =40=40 > get=5Ffilename=5Fcomponent(dir =24=7Bconfigfile=7D DIRECTORY) > get=5Ffilename=5Fcomponent(fname =24=7Bconfigfile=7D NAME) > > - if(EXISTS =24=7BDESTCON=46DIR=7D/=24=7Bconfigfile=7D) > - message(STATUS =22=24=7Bconfigfile=7D as =24=7Bconfigfile=7D.new (kee= p existing)=22) > - file(RENAME =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D=22 > -- =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D.new=22) > -- file( > -- COPY =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D.new=22 > -- DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bdir=7D=22 > +- =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D.new=22 > - ) > +- file(COPY =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D.new=22= > +- DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bdir=7D=22 > +- ) > - file(RENAME =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D.new=22= > -- =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D=22) > +- =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D=22 > +- ) > - else() > - message(STATUS =22=24=7Bconfigfile=7D as =24=7Bconfigfile=7D=22) > -- file( > -- COPY =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D=22 > -- DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bdir=7D=22 > +- file(COPY =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D=22 > +- DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bdir=7D=22 > - ) > - endif() > + message(STATUS =22=24=7Bconfigfile=7D as =24=7Bconfigfile=7D=22) > + file(RENAME =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D=22 =22= =24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D.sample=22) > + file( > -+ COPY =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D.sample=22 > -+ DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bdir=7D=22 > ++ COPY =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D.sample=22 > ++ DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bdir=7D=22 > + ) > endforeach() > > file( > -=40=40 -140,7 +117,8 =40=40 > +=40=40 -130,7 +111,8 =40=40 > ) > foreach(configfile =24=7Bconfigfiles=7D) > get=5Ffilename=5Fcomponent(dir =24=7Bconfigfile=7D DIRECTORY) > =40=40 -71,21 +67,23 =40=40 > > if(EXISTS =24=7BDESTCON=46DIR=7D/=24=7Bconfigfile=7D) > message(STATUS =22overwriting =24=7Bconfigfile=7D=22) > -=40=40 -148,9 +126,10 =40=40 > +=40=40 -138,9 +120,11 =40=40 > message(STATUS =22=24=7Bconfigfile=7D as =24=7Bconfigfile=7D=22) > endif() > > +- file(COPY =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D=22 > +- DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bdir=7D=22 > +- ) > + file(RENAME =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D=22 =22= =24=7BBackendConfigSrcDir=7D/=24=7Bfsname=7D.conf.sample=22) > - file( > -- COPY =22=24=7BBackendConfigSrcDir=7D/=24=7Bconfigfile=7D=22 > -- DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bdir=7D=22 > -+ COPY =22=24=7BBackendConfigSrcDir=7D/=24=7Bfsname=7D.conf.sample=22 > -+ DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bdir=7D=22 > - ) > ++ file( > ++ COPY =22=24=7BBackendConfigSrcDir=7D/=24=7Bfsname=7D.conf.sample=22 > ++ DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bdir=7D=22 > ++ ) > endforeach() > > -=40=40 -174,22 +153,14 =40=40 > - ) > + endforeach() > +=40=40 -167,20 +151,13 =40=40 > + string(REGEX MATCH =22=5C=5C.in=5C=24=22 IS=5FIN=46ILE =24=7Bconfigfi= le=7D) > if(NOT =22=24=7BIS=5FIN=46ILE=7D=22 STREQUAL =22.in=22) > get=5Ffilename=5Fcomponent(fname =24=7Bconfigfile=7D NAME) > - if(EXISTS =24=7BDESTCON=46DIR=7D/=24=7Bresname=7D/=24=7Bfname=7D) > =40=40 -94,24 +92,21 =40=40 > - =22=24=7Bresname=7D/=24=7Bfname=7D as =24=7Bresname=7D/=24=7Bfname=7D= .new (keep existing)=22 > - ) > - file(RENAME =22=24=7Bconfigfile=7D=22 =22=24=7Bconfigfile=7D.new=22) > -- file( > -- COPY =22=24=7Bconfigfile=7D.new=22 > -- DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bresname=7D=22 > +- file(COPY =22=24=7Bconfigfile=7D.new=22 > +- DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bresname=7D=22 > - ) > - file(RENAME =22=24=7Bconfigfile=7D.new=22 =22=24=7Bconfigfile=7D=22) > - else() > - message(STATUS =22=24=7Bresname=7D/=24=7Bfname=7D as =24=7Bresname=7D= /=24=7Bfname=7D=22) > - file(COPY =22=24=7Bconfigfile=7D=22 DESTINATION =22=24=7BDESTCON=46DI= R=7D/=24=7Bresname=7D=22) > - endif() > -- else() > -+ get=5Ffilename=5Fcomponent(fsname =24=7Bconfigfile=7D NAME=5FWE) > ++ get=5Ffilename=5Fcomponent(fsname =24=7Bconfigfile=7D NAME=5FWE) > + message(STATUS =22=24=7Bresname=7D/=24=7Bfname=7D as =24=7Bresname=7D= /=24=7Bfname=7D=22) > + file(RENAME =22=24=7Bconfigfile=7D=22 =22=24=7Bresdir=7D/=24=7Bfsname= =7D.conf.sample=22) > + file( > -+ COPY =22=24=7Bresdir=7D/=24=7Bfsname=7D.conf.sample=22 > -+ DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bresname=7D=22 > ++ COPY =22=24=7Bresdir=7D/=24=7Bfsname=7D.conf.sample=22 > ++ DESTINATION =22=24=7BDESTCON=46DIR=7D/=24=7Bresname=7D=22 > + ) > -+ else() > + else() > message(STATUS =22skipping .in file =24=7Bconfigfile=7D:=24=7BIS=5FIN=46= ILE=7D=22) > endif() > - endforeach() > > Modified: head/sysutils/bareos-server/files/patch-core-src-dird-dbcopy=5F= CMakeLists.txt > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-server/files/patch-core-src-dird-dbcopy=5FCMak= eLists.txt Sun Dec 27 17:44:25 2020 (r559388) > +++ head/sysutils/bareos-server/files/patch-core-src-dird-dbcopy=5FCMak= eLists.txt Sun Dec 27 17:45:53 2020 (r559389) > =40=40 -1,12 +1,12 =40=40 > ---- core/src/dird/dbcopy/CMakeLists.txt 2020-02-01 12:39:35.841314000 = -0500 > -+++ core/src/dird/dbcopy/CMakeLists.txt 2020-02-01 12:39:55.280473000 = -0500 > -=40=40 -11,6 +11,9 =40=40 > - bareossql > - =24<=24<BOOL:HAVE=5FPAM>:=24=7BPAM=5FLIBRARIES=7D> > - =24=7BLMDB=5FLIBS=7D > -+ =24=7BOPENSSL=5FLIBRARIES=7D > -+ =24=7BPTHREAD=5FLIBRARIES=7D > -+ =24=7BJANSSON=5FLIBRARIES=7D > +--- core/src/dird/dbcopy/CMakeLists.txt 2020-12-16 02:46:16.000000000 = -0500 > ++++ core/src/dird/dbcopy/CMakeLists.txt 2020-12-23 22:44:13.161935000 = -0500 > +=40=40 -33,7 +33,8 =40=40 > ) > + target=5Flink=5Flibraries( > + bareos-dbcopy bareos dird=5Fobjects bareosfind bareoscats bareossql > +- =24<=24<BOOL:HAVE=5FPAM>:=24=7BPAM=5FLIBRARIES=7D> =24=7BLMDB=5FLIBS= =7D > ++ =24<=24<BOOL:HAVE=5FPAM>:=24=7BPAM=5FLIBRARIES=7D> =24=7BLMDB=5FLIBS= =7D > ++ =24=7BOPENSSL=5FLIBRARIES=7D =24=7BPTHREAD=5FLIBRARIES=7D =24=7BJANS= SON=5FLIBRARIES=7D > + ) > > - install(TARGETS > + install(TARGETS bareos-dbcopy DESTINATION =22=24=7Bsbindir=7D=22) > > Modified: head/sysutils/bareos-server/files/patch-core-src-include=5Fba= config.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-server/files/patch-core-src-include=5Fbaconfig= .h Sun Dec 27 17:44:25 2020 (r559388) > +++ head/sysutils/bareos-server/files/patch-core-src-include=5Fbaconfig= .h Sun Dec 27 17:45:53 2020 (r559389) > =40=40 -1,25 +1,25 =40=40 > ---- core/src/include/baconfig.h 2020-02-04 15:53:01.627766000 -0500 > -+++ core/src/include/baconfig.h 2020-02-04 15:53:34.762711000 -0500 > -=40=40 -119,11 +119,11 =40=40 > - =23define N=5F(s) (s) > - =23endif /* N=5F */ > - =23else /* =21ENABLE=5FNLS */ > -+=23include <locale.h> > - =23undef =5F > - =23undef N=5F > - =23undef textdomain > - =23undef bindtextdomain > --=23undef setlocale > +--- core/src/include/baconfig.h 2020-12-16 02:46:16.000000000 -0500 > ++++ core/src/include/baconfig.h 2020-12-23 22:47:40.992698000 -0500 > +=40=40 -103,11 +103,11 =40=40 > + =23 define N=5F(s) (s) > + =23 endif /* N=5F */ > + =23else /* =21ENABLE=5FNLS */ > ++=23 include <locale.h> > + =23 undef =5F > + =23 undef N=5F > + =23 undef textdomain > + =23 undef bindtextdomain > +-=23 undef setlocale > > - =23ifndef =5F > - =23define =5F(s) (s) > -=40=40 -136,9 +136,6 =40=40 > - =23endif > - =23ifndef bindtextdomain > - =23define bindtextdomain(p, d) > --=23endif > --=23ifndef setlocale > --=23define setlocale(p, d) > - =23endif > + =23 ifndef =5F > + =23 define =5F(s) (s) > +=40=40 -120,9 +120,6 =40=40 > + =23 endif > + =23 ifndef bindtextdomain > + =23 define bindtextdomain(p, d) > +-=23 endif > +-=23 ifndef setlocale > +-=23 define setlocale(p, d) > + =23 endif > =23endif /* ENABLE=5FNLS */ > > > Modified: head/sysutils/bareos-server/files/patch-core-src-plugins-file= d=5FCMakeLists.txt > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-server/files/patch-core-src-plugins-filed=5FCM= akeLists.txt Sun Dec 27 17:44:25 2020 (r559388) > +++ head/sysutils/bareos-server/files/patch-core-src-plugins-filed=5FCM= akeLists.txt Sun Dec 27 17:45:53 2020 (r559389) > =40=40 -1,49 +1,13 =40=40 > ---- core/src/plugins/filed/CMakeLists.txt 2020-01-31 11:21:18.00000000= 0 -0500 > -+++ core/src/plugins/filed/CMakeLists.txt 2020-01-31 15:54:40.84148500= 0 -0500 > -=40=40 -100,24 +100,26 =40=40 > - install(TARGETS test-plugin-fd DESTINATION =24=7Bplugindir=7D COMPONE= NT filedaemon) > - endif() > +--- core/src/plugins/filed/CMakeLists.txt 2020-12-16 02:46:16.00000000= 0 -0500 > ++++ core/src/plugins/filed/CMakeLists.txt 2020-12-23 22:56:13.84371400= 0 -0500 > +=40=40 -41,7 +41,9 =40=40 > > --set(PY=46ILES > -- bareos-fd.py.template > -- bareos-fd-local-fileset.py > -- bareos-fd-mock-test.py > -- Bareos=46dPluginBaseclass.py > -- Bareos=46dPluginLocal=46ileset.py > -- Bareos=46dWrapper.py > -- bareos=5Ffd=5Fconsts.py > -- bareos-fd-ldap.py > -- Bareos=46dPluginLDAP.py > -- bareos-fd-ovirt.py > -- Bareos=46dPluginOvirt.py > -- bareos-fd-percona-xtrabackup.py > -- Bareos=46dPluginPerconaXtraBackup.py > --) > -+if(python) > -+ set(PY=46ILES > -+ bareos-fd.py.template > -+ bareos-fd-local-fileset.py > -+ bareos-fd-mock-test.py > -+ Bareos=46dPluginBaseclass.py > -+ Bareos=46dPluginLocal=46ileset.py > -+ Bareos=46dWrapper.py > -+ bareos=5Ffd=5Fconsts.py > -+ bareos-fd-ldap.py > -+ Bareos=46dPluginLDAP.py > -+ bareos-fd-ovirt.py > -+ Bareos=46dPluginOvirt.py > -+ bareos-fd-percona-xtrabackup.py > -+ Bareos=46dPluginPerconaXtraBackup.py > -+ ) > + include=5Fdirectories(=24=7BOPENSSL=5FINCLUDE=5FDIR=7D) > > --install( > -- =46ILES =24=7BPY=46ILES=7D > -- DESTINATION =24=7Bplugindir=7D > -- COMPONENT filedaemon > --) > -+ install( > -+ =46ILES =24=7BPY=46ILES=7D > -+ DESTINATION =24=7Bplugindir=7D > -+ COMPONENT filedaemon > -+ ) > +-add=5Fsubdirectory(python) > ++if(python) > ++ add=5Fsubdirectory(python) > +endif() > + > + add=5Flibrary(bpipe-fd MODULE bpipe/bpipe-fd.cc) > + set=5Ftarget=5Fproperties(bpipe-fd PROPERTIES PRE=46IX =22=22) > > Modified: head/sysutils/bareos-server/files/patch-core-src-stored=5FCMa= keLists.txt > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-server/files/patch-core-src-stored=5FCMakeList= s.txt Sun Dec 27 17:44:25 2020 (r559388) > +++ head/sysutils/bareos-server/files/patch-core-src-stored=5FCMakeList= s.txt Sun Dec 27 17:45:53 2020 (r559389) > =40=40 -1,6 +1,6 =40=40 > ---- core/src/stored/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500= > -+++ core/src/stored/CMakeLists.txt 2020-01-31 16:11:45.064779000 -0500= > -=40=40 -213,23 +213,23 =40=40 > +--- core/src/stored/CMakeLists.txt 2020-12-16 02:46:16.000000000 -0500= > ++++ core/src/stored/CMakeLists.txt 2020-12-23 23:06:49.516519000 -0500= > +=40=40 -226,23 +226,23 =40=40 > list(APPEND BAREOS=5FSD=5FLIBRARIES comctl32) > endif() > > =40=40 -28,12 +28,3 =40=40 > > install(TARGETS bareossd DESTINATION =24=7Blibdir=7D) > > -=40=40 -243,7 +243,7 =40=40 > - install(CODE =22set(SRC=5FDIR =5C=22=24=7BPROJECT=5FSOURCE=5FDIR=7D=5C= =22)=22) > - install(SCRIPT =24=7BPROJECT=5FSOURCE=5FDIR=7D/cmake/install-stored-c= onfigfiles.cmake) > - > --install(DIRECTORY DESTINATION =22../=24=7Barchivedir=7D=22) > -+install(DIRECTORY DESTINATION =22=24=7Barchivedir=7D=22) > - > - if(=24=7BHAVE=5FDYNAMIC=5FSD=5FBACKENDS=7D) > - add=5Fsubdirectory(backends) > > Modified: head/sysutils/bareos-server/files/patch-core-src=5FCMakeLists= .txt > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-server/files/patch-core-src=5FCMakeLists.txt S= un Dec 27 17:44:25 2020 (r559388) > +++ head/sysutils/bareos-server/files/patch-core-src=5FCMakeLists.txt S= un Dec 27 17:45:53 2020 (r559389) > =40=40 -1,6 +1,17 =40=40 > ---- core/src/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500 > -+++ core/src/CMakeLists.txt 2020-02-01 12:33:06.503769000 -0500 > -=40=40 -35,15 +35,18 =40=40 > +--- core/src/CMakeLists.txt 2020-12-16 02:46:16.000000000 -0500 > ++++ core/src/CMakeLists.txt 2020-12-27 00:51:12.356192000 -0500 > +=40=40 -18,7 +18,9 =40=40 > + =23 02110-1301, USA. > + message(=22Entering =24=7BCMAKE=5FCURRENT=5FSOURCE=5FDIR=7D=22) > + > +-add=5Fsubdirectory(filed) > ++if(client-only) > ++ add=5Fsubdirectory(filed) > ++endif() > + > + if(NOT client-only) > + add=5Fsubdirectory(tools) > +=40=40 -43,14 +45,18 =40=40 > add=5Fsubdirectory(tests) > endif() > > =40=40 -8,21 +19,20 =40=40 > -if(=24=7BHAVE=5FLMDB=7D) > - add=5Fsubdirectory(lmdb) > +if(client-only) > -+ add=5Fsubdirectory(console) > -+ if(=24=7BHAVE=5FLMDB=7D) > -+ add=5Fsubdirectory(lmdb) > -+ endif() > -+ add=5Fsubdirectory(lib) > -+ add=5Fsubdirectory(findlib) > -+ add=5Fsubdirectory(filed) > -+ add=5Fsubdirectory(fastlz) > ++ add=5Fsubdirectory(console) > ++ if(=24=7BHAVE=5FLMDB=7D) > ++ add=5Fsubdirectory(lmdb) > ++ endif() > ++ add=5Fsubdirectory(lib) > ++ add=5Fsubdirectory(findlib) > ++ add=5Fsubdirectory(fastlz) > endif() > -add=5Fsubdirectory(lib) > -add=5Fsubdirectory(findlib) > --add=5Fsubdirectory(filed) > + > add=5Fsubdirectory(plugins) > -add=5Fsubdirectory(fastlz) > - > ++ > if(=24=7Btraymonitor=7D) > add=5Fsubdirectory(qt-tray-monitor) > + endif() > > Modified: head/sysutils/bareos-server/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-server/pkg-plist Sun Dec 27 17:44:25 2020 (r55= 9388) > +++ head/sysutils/bareos-server/pkg-plist Sun Dec 27 17:45:53 2020 (r55= 9389) > =40=40 -1,7 +1,6 =40=40 > bin/bregex > bin/bsmtp > bin/bwild > -bin/timelimit > =40sample(,bareos,640) %%ETCDIR%%/bareos-barcodes.sample > =40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/catalog/MyCatalog.conf.s= ample > =40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/client/bareos-fd.conf.sa= mple > =40=40 -20,8 +19,8 =40=40 bin/timelimit > %%CEPH=46S%%=40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCe= phfs.conf.sample > %%G=46API%%=40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupG=46= API.conf.sample > %%RADOS%%=40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupRados= .conf.sample > -=40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/Restore=46iles.conf= .sample > %%CEPH=46S%%=40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreC= ephfs.conf.sample > +=40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/Restore=46iles.conf= .sample > %%G=46API%%=40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreG=46= API.conf.sample > %%RADOS%%=40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreRado= s.conf.sample > =40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.con= f.sample > =40=40 -41,12 +40,14 =40=40 bin/timelimit > =40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/=46ile.conf.samp= le > %%G=46API%%=40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Glust= er.conf.sample > =40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/NULL.conf.sample= > +%%RADOS%%=40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Rados.= conf.sample > =40sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.sample= > =40sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.sample > =40sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/autochanger-0= .conf.sample > =40sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/=46ileStorage.conf= .sample > %%G=46API%%=40sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/Gluster= Storage.conf.sample > =40sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/NULL.conf.sample > +%%RADOS%%=40sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/RadosSto= rage.conf.sample > =40sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/tapedrive-0.conf.s= ample > =40sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-dir.conf.= sample > =40sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-mon.conf.= sample > =40=40 -55,9 +56,9 =40=40 bin/timelimit > %%MTX%%=40sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample > etc/logrotate.d/bareos-dir > lib/bareos/backends/libbareoscats-%%DBTYPE%%.so > +%%CEPH=46S%%lib/bareos/backends/libbareossd-cephfs.so > lib/bareos/backends/libbareossd-fifo.so > lib/bareos/backends/libbareossd-gentape.so > -%%CEPH=46S%%lib/bareos/backends/libbareossd-cephfs.so > %%G=46API%%lib/bareos/backends/libbareossd-gfapi.so > %%RADOS%%lib/bareos/backends/libbareossd-rados.so > lib/bareos/backends/libbareossd-tape.so > =40=40 -67,13 +68,9 =40=40 lib/bareos/backends/libbareossd-tape.so > %%PYTHON%%lib/bareos/plugins/BareosSdWrapper.py > lib/bareos/plugins/autoxflate-sd.so > %%PYTHON%%lib/bareos/plugins/bareos-dir-class-plugin.py > -%%PYTHON%%lib/bareos/plugins/bareos-dir.py.template > %%PYTHON%%lib/bareos/plugins/bareos-sd-class-plugin.py > -%%PYTHON%%lib/bareos/plugins/bareos-sd.py.template > -%%PYTHON%%lib/bareos/plugins/bareos=5Fdir=5Fconsts.py > -%%PYTHON%%lib/bareos/plugins/bareos=5Fsd=5Fconsts.py > -%%PYTHON%%lib/bareos/plugins/python-dir.so > -%%PYTHON%%lib/bareos/plugins/python-sd.so > +%%PYTHON%%lib/bareos/plugins/python3-dir.so > +%%PYTHON%%lib/bareos/plugins/python3-sd.so > %%SCSICRYPTO%%lib/bareos/plugins/scsicrypto-sd.so > %%SCSICRYPTO%%lib/bareos/plugins/scsitapealert-sd.so > lib/bareos/scripts/bareos-ctl-dir > =40=40 -113,15 +110,20 =40=40 lib/bareos/scripts/mtx-changer > lib/bareos/scripts/query.sql > lib/bareos/scripts/update=5Fbareos=5Ftables > lib/libbareoscats.so > -lib/libbareoscats.so.19 > +lib/libbareoscats.so.20 > lib/libbareoscats.so.%%LIB=5FVERSION%% > +lib/libbareosfastlz.so > +lib/libbareosfastlz.so.20 > +lib/libbareosfastlz.so.%%LIB=5FVERSION%% > %%NDMP%%lib/libbareosndmp.so > -%%NDMP%%lib/libbareosndmp.so.19 > +%%NDMP%%lib/libbareosndmp.so.20 > %%NDMP%%lib/libbareosndmp.so.%%LIB=5FVERSION%% > lib/libbareossd.so > lib/libbareossql.so > -lib/libbareossql.so.19 > +lib/libbareossql.so.20 > lib/libbareossql.so.%%LIB=5FVERSION%% > +%%PYTHON%%%%PYTHON=5FSITELIBDIR%%/bareosdir.so > +%%PYTHON%%%%PYTHON=5FSITELIBDIR%%/bareossd.so > man/man1/bareos-tray-monitor.1.gz > man/man1/bregex.1.gz > man/man1/bsmtp.1.gz > =40=40 -154,7 +156,6 =40=40 sbin/btape > sbin/btestls > sbin/bwild > sbin/chio-bareos > -sbin/timelimit > =40dir(,bareos,750) %%ETCDIR%%/bareos-dir.d > =40dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/catalog > =40dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/client > =40=40 -170,15 +171,8 =40=40 sbin/timelimit > =40dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/schedule > =40dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/storage > =40dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/user > -=40dir(,bareos,750) %%ETCDIR%%/bareos-dir-export > =40dir(,bareos,750) %%ETCDIR%%/bareos-dir-export/client > -=40dir(,bareos,750) %%ETCDIR%%/bareos-sd.d > -=40dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/autochanger > -=40dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/device > -=40dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/director > -=40dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/messages > =40dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/ndmp > -=40dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/storage > =40dir(bareos,bareos,) %%BAREOS=5FDIR%% > =40dir(bareos,bareos,) %%BAREOS=5FDIR%%/storage > =40dir(bareos,bareos,) /var/log/bareos > > Modified: head/sysutils/bareos-server/pkg-plist.client > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-server/pkg-plist.client Sun Dec 27 17:44:25 20= 20 (r559388) > +++ head/sysutils/bareos-server/pkg-plist.client Sun Dec 27 17:45:53 20= 20 (r559389) > =40=40 -9,35 +9,37 =40=40 bin/bconsole > =40group bareos > =40sample %%ETCDIR%%/bconsole.d/bconsole.conf.sample > =40group bareos > -lib/libbareos.so > -lib/libbareos.so.19 > -lib/libbareos.so.%%LIB=5FVERSION%% > -lib/libbareosfastlz.so > -lib/libbareosfastlz.so.19 > -lib/libbareosfastlz.so.%%LIB=5FVERSION%% > -lib/libbareosfind.so > -lib/libbareosfind.so.19 > -lib/libbareosfind.so.%%LIB=5FVERSION%% > -%%LMDB%%lib/libbareoslmdb.so > -%%LMDB%%lib/libbareoslmdb.so.19 > -%%LMDB%%lib/libbareoslmdb.so.%%LIB=5FVERSION%% > %%PYTHON%%lib/bareos/plugins/Bareos=46dPluginBaseclass.py > %%PYTHON%%lib/bareos/plugins/Bareos=46dPluginLDAP.py > +%%PYTHON%%lib/bareos/plugins/Bareos=46dPluginLibcloud.py > +%%PYTHON%%lib/bareos/plugins/Bareos=46dPluginLocal=46ilesBaseclass.py > %%PYTHON%%lib/bareos/plugins/Bareos=46dPluginLocal=46ileset.py > %%PYTHON%%lib/bareos/plugins/Bareos=46dPluginOvirt.py > %%PYTHON%%lib/bareos/plugins/Bareos=46dPluginPerconaXtraBackup.py > +%%PYTHON%%lib/bareos/plugins/Bareos=46dPluginPostgres.py > +%%PYTHON%%lib/bareos/plugins/Bareos=46dPluginVMware.py > %%PYTHON%%lib/bareos/plugins/Bareos=46dWrapper.py > +%%PYTHON%%lib/bareos/plugins/BareosLibcloudApi.py > %%PYTHON%%lib/bareos/plugins/bareos-fd-ldap.py > +%%PYTHON%%lib/bareos/plugins/bareos-fd-libcloud.py > %%PYTHON%%lib/bareos/plugins/bareos-fd-local-fileset.py > -%%PYTHON%%lib/bareos/plugins/bareos-fd-mock-test.py > %%PYTHON%%lib/bareos/plugins/bareos-fd-ovirt.py > %%PYTHON%%lib/bareos/plugins/bareos-fd-percona-xtrabackup.py > -%%PYTHON%%lib/bareos/plugins/bareos-fd.py.template > -%%PYTHON%%lib/bareos/plugins/bareos=5Ffd=5Fconsts.py > +%%PYTHON%%lib/bareos/plugins/bareos-fd-postgres.py > +%%PYTHON%%lib/bareos/plugins/bareos-fd-vmware.py > +%%PYTHON%%lib/bareos/plugins/bareos=5Flibcloud=5Fapi/=5F=5Finit=5F=5F.= py > +%%PYTHON%%lib/bareos/plugins/bareos=5Flibcloud=5Fapi/bucket=5Fexplorer= .py > +%%PYTHON%%lib/bareos/plugins/bareos=5Flibcloud=5Fapi/debug.py > +%%PYTHON%%lib/bareos/plugins/bareos=5Flibcloud=5Fapi/get=5Flibcloud=5F= driver.py > +%%PYTHON%%lib/bareos/plugins/bareos=5Flibcloud=5Fapi/mtime.py > +%%PYTHON%%lib/bareos/plugins/bareos=5Flibcloud=5Fapi/process=5Fbase.py= > +%%PYTHON%%lib/bareos/plugins/bareos=5Flibcloud=5Fapi/queue=5Fmessage.p= y > +%%PYTHON%%lib/bareos/plugins/bareos=5Flibcloud=5Fapi/utils.py > +%%PYTHON%%lib/bareos/plugins/bareos=5Flibcloud=5Fapi/worker.py > lib/bareos/plugins/bpipe-fd.so > %%CEPH=46S%%lib/bareos/plugins/cephfs-fd.so > %%G=46API%%lib/bareos/plugins/gfapi-fd.so > -%%PYTHON%%lib/bareos/plugins/python-fd.so > +%%PYTHON%%lib/bareos/plugins/python3-fd.so > %%RADOS%%lib/bareos/plugins/rados-fd.so > lib/bareos/scripts/bareos > lib/bareos/scripts/bareos-config > =40=40 -47,6 +49,19 =40=40 lib/bareos/scripts/bareos-ctl-funcs > lib/bareos/scripts/btraceback.dbx > lib/bareos/scripts/btraceback.gdb > lib/bareos/scripts/btraceback.mdb > +lib/libbareos.so > +lib/libbareos.so.20 > +lib/libbareos.so.%%LIB=5FVERSION%% > +lib/libbareosfastlz.so > +lib/libbareosfastlz.so.20 > +lib/libbareosfastlz.so.%%LIB=5FVERSION%% > +lib/libbareosfind.so > +lib/libbareosfind.so.20 > +lib/libbareosfind.so.%%LIB=5FVERSION%% > +%%LMDB%%lib/libbareoslmdb.so > +%%LMDB%%lib/libbareoslmdb.so.20 > +%%LMDB%%lib/libbareoslmdb.so.%%LIB=5FVERSION%% > +%%PYTHON%%%%PYTHON=5FSITELIBDIR%%/bareosfd.so > man/man1/bconsole.1.gz > man/man8/bareos-fd.8.gz > man/man8/bareos.8.gz > =40=40 -58,6 +73,8 =40=40 sbin/bareos-fd > sbin/bconsole > =40group wheel > sbin/btraceback > +=40group bareos > +=40dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/fileset= > =40group bareos > =40dir(bareos,bareos,) %%BAREOS=5FDIR%% > =40dir(bareos,bareos,) /var/log/bareos > > Modified: head/sysutils/bareos-traymonitor/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-traymonitor/Makefile Sun Dec 27 17:44:25 2020 = (r559388) > +++ head/sysutils/bareos-traymonitor/Makefile Sun Dec 27 17:45:53 2020 = (r559389) > =40=40 -8,7 +8,7 =40=40 COMMENT=3D Backup archiving recovery open sourc= ed (traym > LIB=5FDEPENDS+=3D libqwt5-qt5.so:x11-toolkits/qwt5-qt5 =5C > libbareos.so:sysutils/bareos-client > > -CON=46LICTS=3D bacula*-bat-* bareos16-traymonitor-* > +CON=46LICTS=3D bareos17-traymonitor-* bareos18-traymonitor-* bareos19-= traymonitor-* > > USES=3D desktop-file-utils gettext-runtime pkgconfig qt:5 > USE=5FQT=3D buildtools=5Fbuild qmake=5Fbuild uitools=5Fbuild gui core > > Modified: head/sysutils/bareos-traymonitor/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/bareos-traymonitor/pkg-plist Sun Dec 27 17:44:25 2020= (r559388) > +++ head/sysutils/bareos-traymonitor/pkg-plist Sun Dec 27 17:45:53 2020= (r559389) > =40=40 -4,4 +4,4 =40=40 bin/bareos-tray-monitor > =40sample %%ETCDIR%%/tray-monitor.d/monitor/bareos-mon.conf.sample > =40sample %%ETCDIR%%/tray-monitor.d/storage/StorageDaemon-local.conf.sa= mple > share/applications/bareos-tray-monitor.desktop > -share/pixmaps/bareos-tray-monitor.xpm > +share/pixmaps/bareos-tray-monitor.png --5fe9e840_7545e146_291 Content-Type: application/octet-stream Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="=?utf-8?Q?sysutils=5Fbareos-server.diff?=" SW5kZXg6IHN5c3V0aWxzL2JhcmVvcy1zZXJ2ZXIvcGtnLXBsaXN0Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHN5 c3V0aWxzL2JhcmVvcy1zZXJ2ZXIvcGtnLXBsaXN0CShyZXZpc2lvbiA1NTk0NjQpCisrKyBzeXN1 dGlscy9iYXJlb3Mtc2VydmVyL3BrZy1wbGlzdAkod29ya2luZyBjb3B5KQpAQCAtMTEyLDkgKzEx Miw2IEBACiBsaWIvbGliYmFyZW9zY2F0cy5zbwogbGliL2xpYmJhcmVvc2NhdHMuc28uMjAKIGxp Yi9saWJiYXJlb3NjYXRzLnNvLiUlTElCX1ZFUlNJT04lJQotbGliL2xpYmJhcmVvc2Zhc3Rsei5z bwotbGliL2xpYmJhcmVvc2Zhc3Rsei5zby4yMAotbGliL2xpYmJhcmVvc2Zhc3Rsei5zby4lJUxJ Ql9WRVJTSU9OJSUKICUlTkRNUCUlbGliL2xpYmJhcmVvc25kbXAuc28KICUlTkRNUCUlbGliL2xp YmJhcmVvc25kbXAuc28uMjAKICUlTkRNUCUlbGliL2xpYmJhcmVvc25kbXAuc28uJSVMSUJfVkVS U0lPTiUlCkBAIC0xMjIsOCArMTE5LDggQEAKIGxpYi9saWJiYXJlb3NzcWwuc28KIGxpYi9saWJi YXJlb3NzcWwuc28uMjAKIGxpYi9saWJiYXJlb3NzcWwuc28uJSVMSUJfVkVSU0lPTiUlCi0lJVBZ VEhPTiUlJSVQWVRIT05fU0lURUxJQkRJUiUlL2JhcmVvc2Rpci5zbwotJSVQWVRIT04lJSUlUFlU SE9OX1NJVEVMSUJESVIlJS9iYXJlb3NzZC5zbworJSVQWVRIT04lJSUlUFlUSE9OX1NJVEVMSUJE SVIlJS9iYXJlb3NkaXIlJVBZVEhPTl9FWFRfU1VGRklYJSUuc28KKyUlUFlUSE9OJSUlJVBZVEhP Tl9TSVRFTElCRElSJSUvYmFyZW9zc2QlJVBZVEhPTl9FWFRfU1VGRklYJSUuc28KIG1hbi9tYW4x L2JhcmVvcy10cmF5LW1vbml0b3IuMS5negogbWFuL21hbjEvYnJlZ2V4LjEuZ3oKIG1hbi9tYW4x L2JzbXRwLjEuZ3oKQEAgLTE3Myw2ICsxNzAsOCBAQAogQGRpcigsYmFyZW9zLDc1MCkgJSVFVENE SVIlJS9iYXJlb3MtZGlyLmQvdXNlcgogQGRpcigsYmFyZW9zLDc1MCkgJSVFVENESVIlJS9iYXJl b3MtZGlyLWV4cG9ydC9jbGllbnQKIEBkaXIoLGJhcmVvcyw3NTApICUlRVRDRElSJSUvYmFyZW9z LXNkLmQvbmRtcAorQGNvbW1lbnQgQGRpcihiYXJlb3MsYmFyZW9zLCkgbGliL2JhcmVvcy9zY3Jp cHRzL2RkbC9kcm9wcworQGNvbW1lbnQgQGRpcihiYXJlb3MsYmFyZW9zLCkgbGliL2JhcmVvcy9z Y3JpcHRzL2RkbC9ncmFudHMKIEBkaXIoYmFyZW9zLGJhcmVvcywpICUlQkFSRU9TX0RJUiUlCiBA ZGlyKGJhcmVvcyxiYXJlb3MsKSAlJUJBUkVPU19ESVIlJS9zdG9yYWdlCiBAZGlyKGJhcmVvcyxi YXJlb3MsKSAvdmFyL2xvZy9iYXJlb3MKSW5kZXg6IHN5c3V0aWxzL2JhcmVvcy1zZXJ2ZXIvcGtn LXBsaXN0LmNsaWVudAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzeXN1dGlscy9iYXJlb3Mtc2VydmVyL3BrZy1w bGlzdC5jbGllbnQJKHJldmlzaW9uIDU1OTQ2NCkKKysrIHN5c3V0aWxzL2JhcmVvcy1zZXJ2ZXIv cGtnLXBsaXN0LmNsaWVudAkod29ya2luZyBjb3B5KQpAQCAtNjEsNyArNjEsNyBAQAogJSVMTURC JSVsaWIvbGliYmFyZW9zbG1kYi5zbwogJSVMTURCJSVsaWIvbGliYmFyZW9zbG1kYi5zby4yMAog JSVMTURCJSVsaWIvbGliYmFyZW9zbG1kYi5zby4lJUxJQl9WRVJTSU9OJSUKLSUlUFlUSE9OJSUl JVBZVEhPTl9TSVRFTElCRElSJSUvYmFyZW9zZmQuc28KKyUlUFlUSE9OJSUlJVBZVEhPTl9TSVRF TElCRElSJSUvYmFyZW9zZmQlJVBZVEhPTl9FWFRfU1VGRklYJSUuc28KIG1hbi9tYW4xL2Jjb25z b2xlLjEuZ3oKIG1hbi9tYW44L2JhcmVvcy1mZC44Lmd6CiBtYW4vbWFuOC9iYXJlb3MuOC5negpA QCAtNzUsNiArNzUsNyBAQAogc2Jpbi9idHJhY2ViYWNrCiBAZ3JvdXAgYmFyZW9zCiBAZGlyKCxi YXJlb3MsNzUwKSAlJUVUQ0RJUiUlL3B5dGhvbi1sZGFwLWNvbmYuZC9iYXJlb3MtZGlyLmQvZmls ZXNldAorQGRpcigsYmFyZW9zLDc1MCkgJSVFVENESVIlJS9weXRob24tbGRhcC1jb25mLmQvYmFy ZW9zLWRpci5kL2pvYgogQGdyb3VwIGJhcmVvcwogQGRpcihiYXJlb3MsYmFyZW9zLCkgICUlQkFS RU9TX0RJUiUlCiBAZGlyKGJhcmVvcyxiYXJlb3MsKSAvdmFyL2xvZy9iYXJlb3MK --5fe9e840_7545e146_291-- --5fe9e840_515f007c_291 Content-Type: application/pgp-signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: Canary PGP V3 iQJVBAABCgA/OBxEaW1hIFBhbm92IChGcmVlQlNELk9SRyBDb21taXR0ZXIpIDxm bHVmZnlARnJlZUJTRC5PUkc+BQJf6ehAAAoJEPuLoJ3VOY8ptB8QAKktUkuS/CXT cYOADBB66Ik2jus5h1xfRvanRjK7snKA38oZu8atMihAocVT4mnjNoGj/74ChiGt 6qfidiQqxIR2XuoCJF5rc9V3L7Obp3To99y70sMnCrDczyF6aYnpX4xblgWSrG3S A0RkA5zIOiJCAFGpedlMM7lIUpqUxIAi9wNlL35P6obvcrzgBOfINSf9FKsylfbn xd8h6DDssTkUlNPDTaMrxQiRGns4+B2V6zlJfYDeedpMKsWOP8W514xVhbXwRGaD wqTIV1uRx2hJYqXYpFy6KsRumDeSO3rHj8CMjEVhXQoO3ZUdpY6H0DHCSRvPyHF7 5QWowtlxMHkU69M56vYEplSlS5mm7e5hFN3NbJzC8LA3eNGpRKZrznl52GcS16Kx tanmHq3Py+Le9uEHkaJqwW9Qh4ruqLTC/D32LNoFpt33bfGUUVVfnB1VqZb75GVB +tehbcGjeW7l9g3/Wu9JzD7/60HON3dKFbBX5fuAA/kbuh7QK/zC5nEKn5BUtBtH yo1sbIlG8wKtEo8LaXD7v7o97c9i+MMw2GSpDefhCgEK2h2mG2XBgKQB4hOVapu/ DH7g7ybhDOs25j939JzI1fCPBJyHCa80EXZ2/JX5N8tRq6YeqA3+QkDrc/SPQsXr g4Qj0AiaP8bq2TaOcCdhyEEnCogZlMhH =Ezhx -----END PGP SIGNATURE----- --5fe9e840_515f007c_291--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8eddc043-6cfd-4161-a7b1-bb257b031a00>