Attachment 195921 Details for Bug 227854 – Update to 2.2.6; Add default config; Add log rotation

[patch] Update to 2.2.6; Add default config; Add log rotation

urbackup-client-2.2.6.diff (text/plain), 9.82 KB, created by freebsd on 2018-08-05 22:18:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: freebsd

Created: 2018-08-05 22:18:49 UTC

Size: 9.82 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 476475)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	urbackup-client
>-DISTVERSION=	2.2.5
>+DISTVERSION=	2.2.6
> CATEGORIES=	archivers
> MASTER_SITES=	https://hndl.urbackup.org/Client/${DISTVERSION}/
> 
>@@ -38,7 +38,7 @@
> .endif
> 
> USE_RC_SUBR=	urbackup_client
>-SUB_FILES=	pkg-message
>+SUB_FILES=	pkg-message urbackupclient.conf.sample-daemon
> 
> CONFFILES=	mariadbdump.conf \
> 		mariadbxtrabackup.conf \
>@@ -58,6 +58,7 @@
> 	${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
>@@ -68,6 +69,12 @@
> 	(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
>Index: distinfo
>===================================================================
>--- distinfo	(revision 476475)
>+++ distinfo	(working copy)
>@@ -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: files/patch-client_ConfigPath.cpp
>===================================================================
>--- files/patch-client_ConfigPath.cpp	(nonexistent)
>+++ files/patch-client_ConfigPath.cpp	(working copy)
>@@ -0,0 +1,20 @@
>+--- client/ConfigPath.cpp.orig	2018-08-01 02:40:13 UTC
>++++ client/ConfigPath.cpp
>+@@ -60,7 +60,7 @@ ConfigPath::ConfigPath(wxWindow* parent)
>+ 		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<const wchar_t*>(dirs[i].path.wc_str()));
>+ 		}
>+ 	}
>+ 
>+@@ -93,7 +93,7 @@ void ConfigPath::OnClickNew(wxCommandEve
>+ 		listbox->Append(ed.GetPath() );
>+ 		SBackupDir ad;
>+ 		ad.path=ed.GetPath();
>+-		ad.name=getDefaultDirname(ad.path.wc_str());
>++		ad.name=getDefaultDirname(static_cast<const wchar_t*>(ad.path.wc_str()));
>+ 		ad.group=0;
>+ 		ad.id=0;
>+ 		dirs.push_back(ad);
>Index: files/patch-client_stringtools.cpp
>===================================================================
>--- files/patch-client_stringtools.cpp	(nonexistent)
>+++ files/patch-client_stringtools.cpp	(working copy)
>@@ -0,0 +1,64 @@
>+--- client/stringtools.cpp.orig	2018-03-25 16:25:50 UTC
>++++ client/stringtools.cpp
>+@@ -486,12 +486,12 @@ std::string nconvert(s32 i){
>+ 	ss << i;
>+ 	return ss.str();
>+ }
>+-
>+-std::string nconvert(int long i) {
>+-	ostringstream ss;
>+-	ss << i;
>+-	return ss.str();
>+-}
>++
>++std::string nconvert(int long i) {
>++	ostringstream ss;
>++	ss << i;
>++	return ss.str();
>++}
>+ 
>+ #if defined(_WIN64) || defined(_LP64)
>+ std::string nconvert(unsigned int i){
>+@@ -825,7 +825,7 @@ void TokenizeMail(std::string& str, std:
>+ //--------------------------------------------------------------------
>+ /**
>+ */
>+-bool isnumber(char ch)
>++bool isnumber_fbsd(char ch)
>+ {
>+ 	if( ch>=48 && ch <=57 )
>+ 		return true;
>+@@ -848,7 +848,7 @@ bool isletter(char ch)
>+ //--------------------------------------------------------------------
>+ /**
>+ */
>+-bool isnumber(wchar_t ch)
>++bool isnumber_fbsd(wchar_t ch)
>+ {
>+ 	if( ch>=48 && ch <=57 )
>+ 		return true;
>+@@ -928,7 +928,7 @@ int getNextNumber(const std::string &pSt
>+ 	bool start=false;
>+ 	for(size_t i=0;i<pStr.size();++i)
>+ 	{
>+-		if( isnumber(pStr[i] ) )
>++		if( isnumber_fbsd(pStr[i] ) )
>+ 		{
>+ 			num+=pStr[i];
>+ 			start=true;
>+@@ -1445,7 +1445,7 @@ void replaceNonAlphaNumeric(std::string 
>+ {
>+ 	for(size_t i=0;i<str.size();++i)
>+ 	{
>+-		if(isletter(str[i])==false && isnumber(str[i])==false)
>++		if(isletter(str[i])==false && isnumber_fbsd(str[i])==false)
>+ 		{
>+ 			str[i]=rch;
>+ 		}
>+@@ -1497,4 +1497,4 @@ std::string EscapeParamString(const std:
>+ 		}
>+ 	}
>+ 	return ret;
>+-}
>+\ No newline at end of file
>++}
>Index: files/patch-client_stringtools.h
>===================================================================
>--- files/patch-client_stringtools.h	(nonexistent)
>+++ files/patch-client_stringtools.h	(working copy)
>@@ -0,0 +1,14 @@
>+--- client/stringtools.h.orig	2018-03-25 16:25:57 UTC
>++++ client/stringtools.h
>+@@ -69,9 +69,9 @@ std::wstring replaceonce(std::wstring to
>+ void Tokenize(std::string& str, std::vector<std::string> &tokens, std::string seps);
>+ void Tokenize(std::wstring& str, std::vector<std::wstring> &tokens, std::wstring seps);
>+ void TokenizeMail(std::string& str, std::vector<std::string> &tokens, std::string seps);
>+-bool isnumber(char ch);
>++bool isnumber_fbsd(char ch);
>+ bool isletter(char ch);
>+-bool isnumber(wchar_t ch);
>++bool isnumber_fbsd(wchar_t ch);
>+ bool isletter(wchar_t ch);
>+ void strupper(std::string *pStr);
>+ void strupper(std::wstring *pStr);
>
>Property changes on: 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: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 476475)
>+++ files/pkg-message.in	(working copy)
>@@ -9,6 +9,12 @@
> 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
> 
>Index: files/urbackup_client.in
>===================================================================
>--- files/urbackup_client.in	(revision 476475)
>+++ files/urbackup_client.in	(working copy)
>@@ -25,6 +25,6 @@
> 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: files/urbackupclient.conf-newsyslog
>===================================================================
>--- files/urbackupclient.conf-newsyslog	(nonexistent)
>+++ files/urbackupclient.conf-newsyslog	(working copy)
>@@ -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: files/urbackupclient.conf-newsyslog
>___________________________________________________________________
>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: files/urbackupclient.conf.sample-daemon.in
>===================================================================
>--- files/urbackupclient.conf.sample-daemon.in	(nonexistent)
>+++ files/urbackupclient.conf.sample-daemon.in	(working copy)
>@@ -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: files/urbackupclient.conf.sample-daemon.in
>___________________________________________________________________
>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: pkg-plist
>===================================================================
>--- pkg-plist	(revision 476475)
>+++ pkg-plist	(working copy)
>@@ -2,11 +2,12 @@
> %%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
>@@ -20,6 +21,8 @@
> 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

Flags:

freebsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 227854: 192912 | 192917 | 195921 | 196020