Index: head/archivers/urbackup-client/Makefile =================================================================== --- head/archivers/urbackup-client/Makefile (revision 476716) +++ head/archivers/urbackup-client/Makefile (revision 476717) @@ -1,106 +1,113 @@ # $FreeBSD$ PORTNAME= urbackup-client -DISTVERSION= 2.2.5 +DISTVERSION= 2.2.6 CATEGORIES= archivers MASTER_SITES= https://hndl.urbackup.org/Client/${DISTVERSION}/ MAINTAINER= freebsd@coombscloud.com COMMENT= Client component of the UrBackup backup system LICENSE= AGPLv3 WRKSRC= ${WRKDIR}/${DISTNAME}.0 OPTIONS_DEFINE= GUI GUI_DESC= GTK2 Tray Icon OPTIONS_SUB= yes LIB_DEPENDS+= libcryptopp.so:security/cryptopp GUI_LIB_DEPENDS+= libwx_baseu-3.0.so:x11-toolkits/wxgtk30 USERS= urbackup GROUPS= urbackup -USES= gettext +USES= gettext dos2unix GNU_CONFIGURE= YES CPPFLAGS+= -I${PREFIX}/include LDFLAGS+= -L${PREFIX}/lib CONFIGURE_ARGS= --disable-clientupdate .include .if ${PORT_OPTIONS:MGUI} USE_WX= 3.0+ CONFIGURE_ARGS+= --with-wx-config=${WX_CONFIG} .else CONFIGURE_ARGS+= --enable-headless .endif USE_RC_SUBR= urbackup_client -SUB_FILES= pkg-message +SUB_FILES= pkg-message urbackupclient.conf.sample-daemon CONFFILES= mariadbdump.conf \ mariadbxtrabackup.conf \ mariadbdump.conf \ postgresbase.conf \ postgresqldump.conf XPMFILES= backup-bad.xpm \ backup-no-recent.xpm \ backup-ok.xpm \ backup-progress.xpm \ backup-indexing.xpm \ backup-no-server.xpm \ backup-progress-pause.xpm do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/urbackup/scripts ${MKDIR} ${STAGEDIR}${PREFIX}/etc/urbackup ${MKDIR} ${STAGEDIR}/var/urbackup/data + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${INSTALL_PROGRAM} ${WRKSRC}/urbackupclientctl \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/urbackupclientbackend \ ${STAGEDIR}${PREFIX}/sbin (cd ${WRKSRC}/urbackupclient/backup_scripts && ${COPYTREE_BIN} . \ ${STAGEDIR}${PREFIX}/share/urbackup/scripts "! -name *\.conf") + + ${INSTALL_DATA} ${WRKDIR}/urbackupclient.conf.sample-daemon \ + ${STAGEDIR}${PREFIX}/etc/urbackup/urbackupclient.conf.sample + + ${INSTALL_DATA} ${FILESDIR}/urbackupclient.conf-newsyslog \ + ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/urbackupclient.conf .for f in ${CONFFILES} ${INSTALL_DATA} ${WRKSRC}/urbackupclient/backup_scripts/${f} \ ${STAGEDIR}${PREFIX}/etc/urbackup/${f}.sample .endfor ${INSTALL_DATA} ${WRKSRC}/client/data/updates_h.dat \ ${STAGEDIR}${PREFIX}/share/urbackup ${INSTALL_MAN} ${WRKSRC}/docs/urbackupclientbackend.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 do-install-GUI-on: ${INSTALL_PROGRAM} ${WRKSRC}/urbackupclientgui \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/client/data/logo1.png \ ${STAGEDIR}${PREFIX}/share/urbackup ${INSTALL_DATA} ${WRKSRC}/client/info.txt \ ${STAGEDIR}${PREFIX}/share/urbackup .for f in ${XPMFILES} ${INSTALL_DATA} ${WRKSRC}/client/data/${f} \ ${STAGEDIR}${PREFIX}/share/urbackup .endfor .for f in it pl pt_BR sk zh_TW zh_CN de es fr ru uk da nl fa cs ${MKDIR} ${STAGEDIR}${PREFIX}/share/urbackup/lang/${f} .endfor .for f in it pl pt_BR sk zh_TW zh_CN de es fr ru uk da nl fa cs ${INSTALL_DATA} ${WRKSRC}/client/data/lang/${f}/urbackup.mo \ ${STAGEDIR}${PREFIX}/share/urbackup/lang/${f} .endfor .include Index: head/archivers/urbackup-client/distinfo =================================================================== --- head/archivers/urbackup-client/distinfo (revision 476716) +++ head/archivers/urbackup-client/distinfo (revision 476717) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521902273 -SHA256 (urbackup-client-2.2.5.tar.gz) = 125180db455c6dd626e1facae77bad2f92b5f2570adfa7e4beeb922f39586d2c -SIZE (urbackup-client-2.2.5.tar.gz) = 3368914 +TIMESTAMP = 1533504834 +SHA256 (urbackup-client-2.2.6.tar.gz) = 95d5a8d4e8016c23171f12340a7fc28cd8d275d6c815604f28e978a4256eff6f +SIZE (urbackup-client-2.2.6.tar.gz) = 3370637 Index: head/archivers/urbackup-client/files/patch-client_ConfigPath.cpp =================================================================== --- head/archivers/urbackup-client/files/patch-client_ConfigPath.cpp (nonexistent) +++ head/archivers/urbackup-client/files/patch-client_ConfigPath.cpp (revision 476717) @@ -0,0 +1,24 @@ +Build fails on FreeBSD due to a casting error from the wxString Class when using +wx30-gtk2-3.0.4_1. This patch adds a cast (static_cast) that +resolves the error. + +--- client/ConfigPath.cpp.orig 2018-08-09 00:18:20.807732000 +0000 ++++ client/ConfigPath.cpp 2018-08-09 00:19:21.531197000 +0000 +@@ -60,7 +60,7 @@ + listbox->Append(dirs[i].path); + if(dirs[i].name.IsEmpty()) + { +- dirs[i].name=getDefaultDirname(dirs[i].path.wc_str()); ++ dirs[i].name=getDefaultDirname(static_cast(dirs[i].path.wc_str())); + } + } + +@@ -93,7 +93,7 @@ + listbox->Append(ed.GetPath() ); + SBackupDir ad; + ad.path=ed.GetPath(); +- ad.name=getDefaultDirname(ad.path.wc_str()); ++ ad.name=getDefaultDirname(static_cast(ad.path.wc_str())); + ad.group=0; + ad.id=0; + dirs.push_back(ad); Property changes on: head/archivers/urbackup-client/files/patch-client_ConfigPath.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property Index: head/archivers/urbackup-client/files/patch-client_stringtools.cpp =================================================================== --- head/archivers/urbackup-client/files/patch-client_stringtools.cpp (nonexistent) +++ head/archivers/urbackup-client/files/patch-client_stringtools.cpp (revision 476717) @@ -0,0 +1,49 @@ +Build fails on FreeBSD due to urbackup's local definitions of isnumber() +conflicting with a library function. This patch renames the port's definition to +resolve the conflict. Analogous changes are also made in client/stringtools.h + +--- client/stringtools.cpp.orig 2018-08-09 00:15:57.062820000 +0000 ++++ client/stringtools.cpp 2018-08-09 00:16:38.573398000 +0000 +@@ -825,7 +825,7 @@ + //-------------------------------------------------------------------- + /** + */ +-bool isnumber(char ch) ++bool isnumber_local(char ch) + { + if( ch>=48 && ch <=57 ) + return true; +@@ -848,7 +848,7 @@ + //-------------------------------------------------------------------- + /** + */ +-bool isnumber(wchar_t ch) ++bool isnumber_local(wchar_t ch) + { + if( ch>=48 && ch <=57 ) + return true; +@@ -928,7 +928,7 @@ + bool start=false; + for(size_t i=0;i &tokens, std::string seps); + void Tokenize(std::wstring& str, std::vector &tokens, std::wstring seps); + void TokenizeMail(std::string& str, std::vector &tokens, std::string seps); +-bool isnumber(char ch); ++bool isnumber_local(char ch); + bool isletter(char ch); +-bool isnumber(wchar_t ch); ++bool isnumber_local(wchar_t ch); + bool isletter(wchar_t ch); + void strupper(std::string *pStr); + void strupper(std::wstring *pStr); Property changes on: head/archivers/urbackup-client/files/patch-client_stringtools.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/urbackup-client/files/pkg-message.in =================================================================== --- head/archivers/urbackup-client/files/pkg-message.in (revision 476716) +++ head/archivers/urbackup-client/files/pkg-message.in (revision 476717) @@ -1,25 +1,31 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * archivers/urbackup-client includes an RC script: %%PREFIX%%/etc/rc.d/urbackup_client TO START URBACKUP CLIENT ON BOOT: sysrc urbackup_client_enable=YES START MANUALLY: service urbackup_client start +The client daemon's configuration file is located at: +%%PREFIX%%/etc/urbackup/urbackupclient.conf + +Log rotation can be configured at: +%%PREFIX%%/etc/newsyslog.conf.d/urbackupclient.conf + If the GTK2 GUI was built, it can be launched via: %%PREFIX%%/bin/urbackupclientctl NOTE: For client configuration or to view logs, the GTK2 GUI needs to have one of the following in its PATH: - kdesu (e.g., %%PREFIX%%/lib/kde4/libexec/) (port: x11/kde-runtime) - gksu (e.g., %%PREFIX%%/bin/) (port: sysutils/gksu) The client can also be configured via the UrBackup Server, or %%PREFIX%%/bin/urbackupclientctl * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Index: head/archivers/urbackup-client/files/urbackup_client.in =================================================================== --- head/archivers/urbackup-client/files/urbackup_client.in (revision 476716) +++ head/archivers/urbackup-client/files/urbackup_client.in (revision 476717) @@ -1,30 +1,30 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: urbackup_client # REQUIRE: LOGIN # KEYWORD: shutdown # # Add these lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # urbackup_client_enable (bool): Set to NO by default. # Set it to YES to enable the UrBackup Client Backend. . /etc/rc.subr name=urbackup_client desc="UrBackup Client Backend" rcvar=urbackup_client_enable load_rc_config $name : ${urbackup_client_enable:=NO} command=%%PREFIX%%/sbin/urbackupclientbackend pidfile=/var/run/urbackupclientbackend.pid -command_args="-d -w $pidfile" +command_args="-d -w $pidfile -c %%PREFIX%%/etc/urbackup/urbackupclient.conf" run_rc_command "$1" Index: head/archivers/urbackup-client/files/urbackupclient.conf-newsyslog =================================================================== --- head/archivers/urbackup-client/files/urbackupclient.conf-newsyslog (nonexistent) +++ head/archivers/urbackup-client/files/urbackupclient.conf-newsyslog (revision 476717) @@ -0,0 +1,2 @@ +# logfilename [owner:group] mode count size(kb) when flags [/pid_file] [sig_num] +/var/log/urbackupclient.log root:wheel 644 10 5120 * JC /var/run/urbackupclientbackend.pid Property changes on: head/archivers/urbackup-client/files/urbackupclient.conf-newsyslog ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/urbackup-client/files/urbackupclient.conf.sample-daemon.in =================================================================== --- head/archivers/urbackup-client/files/urbackupclient.conf.sample-daemon.in (nonexistent) +++ head/archivers/urbackup-client/files/urbackupclient.conf.sample-daemon.in (revision 476717) @@ -0,0 +1,29 @@ +# +# This is parsed as a key=value file +# + +#logfile name +#If you change the LOGFILE, you should also change the "logfilename" in %%PREFIX%%/etc/newsyslog.conf.d/urbackupclient.conf +LOGFILE="/var/log/urbackupclient.log" + +#Either debug,warn,info or error +LOGLEVEL=warn + +#Tmp file directory +DAEMON_TMPDIR="/tmp" + +# Valid settings: +# +# "client-confirms": If you have the GUI component the currently active user +# will need to confirm restores from the web interface. +# If you have no GUI component this will cause restores +# from the server web interface to not work +# "server-confirms": The server will ask the user starting the restore on +# the web interface for confirmation +# "disabled": Restores via web interface are disabled. +# Restores via urbackupclientctl still work +# +RESTORE=disabled + +#If true client will not bind to any external network ports (either true or false) +INTERNET_ONLY=false Property changes on: head/archivers/urbackup-client/files/urbackupclient.conf.sample-daemon.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/urbackup-client/pkg-plist =================================================================== --- head/archivers/urbackup-client/pkg-plist (revision 476716) +++ head/archivers/urbackup-client/pkg-plist (revision 476717) @@ -1,50 +1,53 @@ bin/urbackupclientctl %%GUI%%bin/urbackupclientgui sbin/urbackupclientbackend @(,,0444) man/man1/urbackupclientbackend.1.gz -@mode 0700 +@mode 0600 @sample etc/urbackup/mariadbdump.conf.sample @sample etc/urbackup/mariadbxtrabackup.conf.sample @sample etc/urbackup/postgresbase.conf.sample @sample etc/urbackup/postgresqldump.conf.sample +@mode 0700 share/urbackup/scripts/list share/urbackup/scripts/mariadbdump share/urbackup/scripts/mariadbpostbackup share/urbackup/scripts/mariadbprebackup share/urbackup/scripts/mariadbxtrabackup share/urbackup/scripts/postgresbase share/urbackup/scripts/postgresqldump share/urbackup/scripts/postgresqlpostbackup share/urbackup/scripts/postgresqlprebackup share/urbackup/scripts/restore-mariadbbackup share/urbackup/scripts/setup-mariadbbackup share/urbackup/scripts/setup-postgresbackup @mode 0644 +@sample etc/urbackup/urbackupclient.conf.sample +etc/newsyslog.conf.d/urbackupclient.conf share/urbackup/updates_h.dat %%GUI%%share/urbackup/info.txt %%GUI%%share/urbackup/logo1.png %%GUI%%share/urbackup/backup-bad.xpm %%GUI%%share/urbackup/backup-indexing.xpm %%GUI%%share/urbackup/backup-no-recent.xpm %%GUI%%share/urbackup/backup-no-server.xpm %%GUI%%share/urbackup/backup-ok.xpm %%GUI%%share/urbackup/backup-progress-pause.xpm %%GUI%%share/urbackup/backup-progress.xpm %%GUI%%share/urbackup/lang/cs/urbackup.mo %%GUI%%share/urbackup/lang/da/urbackup.mo %%GUI%%share/urbackup/lang/de/urbackup.mo %%GUI%%share/urbackup/lang/es/urbackup.mo %%GUI%%share/urbackup/lang/fa/urbackup.mo %%GUI%%share/urbackup/lang/fr/urbackup.mo %%GUI%%share/urbackup/lang/it/urbackup.mo %%GUI%%share/urbackup/lang/nl/urbackup.mo %%GUI%%share/urbackup/lang/pl/urbackup.mo %%GUI%%share/urbackup/lang/pt_BR/urbackup.mo %%GUI%%share/urbackup/lang/ru/urbackup.mo %%GUI%%share/urbackup/lang/sk/urbackup.mo %%GUI%%share/urbackup/lang/uk/urbackup.mo %%GUI%%share/urbackup/lang/zh_CN/urbackup.mo %%GUI%%share/urbackup/lang/zh_TW/urbackup.mo @dir(,,0700) /var/urbackup/data @dir(urbackup,urbackup,0755) /var/urbackup @mode 555