View | Details | Raw Unified | Return to bug 227854 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-2 / +9 lines)
Lines 1-7 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	urbackup-client
3
PORTNAME=	urbackup-client
4
DISTVERSION=	2.2.5
4
DISTVERSION=	2.2.6
5
CATEGORIES=	archivers
5
CATEGORIES=	archivers
6
MASTER_SITES=	https://hndl.urbackup.org/Client/${DISTVERSION}/
6
MASTER_SITES=	https://hndl.urbackup.org/Client/${DISTVERSION}/
7
7
Lines 38-44 Link Here
38
.endif
38
.endif
39
39
40
USE_RC_SUBR=	urbackup_client
40
USE_RC_SUBR=	urbackup_client
41
SUB_FILES=	pkg-message
41
SUB_FILES=	pkg-message urbackupclient.conf.sample-daemon
42
42
43
CONFFILES=	mariadbdump.conf \
43
CONFFILES=	mariadbdump.conf \
44
		mariadbxtrabackup.conf \
44
		mariadbxtrabackup.conf \
Lines 58-63 Link Here
58
	${MKDIR} ${STAGEDIR}${PREFIX}/share/urbackup/scripts
58
	${MKDIR} ${STAGEDIR}${PREFIX}/share/urbackup/scripts
59
	${MKDIR} ${STAGEDIR}${PREFIX}/etc/urbackup
59
	${MKDIR} ${STAGEDIR}${PREFIX}/etc/urbackup
60
	${MKDIR} ${STAGEDIR}/var/urbackup/data
60
	${MKDIR} ${STAGEDIR}/var/urbackup/data
61
	${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
61
62
62
	${INSTALL_PROGRAM} ${WRKSRC}/urbackupclientctl \
63
	${INSTALL_PROGRAM} ${WRKSRC}/urbackupclientctl \
63
		${STAGEDIR}${PREFIX}/bin
64
		${STAGEDIR}${PREFIX}/bin
Lines 68-73 Link Here
68
	(cd ${WRKSRC}/urbackupclient/backup_scripts && 	${COPYTREE_BIN} . \
69
	(cd ${WRKSRC}/urbackupclient/backup_scripts && 	${COPYTREE_BIN} . \
69
		${STAGEDIR}${PREFIX}/share/urbackup/scripts "! -name *\.conf")
70
		${STAGEDIR}${PREFIX}/share/urbackup/scripts "! -name *\.conf")
70
71
72
	${INSTALL_DATA} ${WRKDIR}/urbackupclient.conf.sample-daemon \
73
		${STAGEDIR}${PREFIX}/etc/urbackup/urbackupclient.conf.sample
74
75
	${INSTALL_DATA} ${FILESDIR}/urbackupclient.conf-newsyslog \
76
		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/urbackupclient.conf
77
71
.for f in ${CONFFILES}
78
.for f in ${CONFFILES}
72
	${INSTALL_DATA} ${WRKSRC}/urbackupclient/backup_scripts/${f} \
79
	${INSTALL_DATA} ${WRKSRC}/urbackupclient/backup_scripts/${f} \
73
		${STAGEDIR}${PREFIX}/etc/urbackup/${f}.sample
80
		${STAGEDIR}${PREFIX}/etc/urbackup/${f}.sample
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1521902273
1
TIMESTAMP = 1533504834
2
SHA256 (urbackup-client-2.2.5.tar.gz) = 125180db455c6dd626e1facae77bad2f92b5f2570adfa7e4beeb922f39586d2c
2
SHA256 (urbackup-client-2.2.6.tar.gz) = 95d5a8d4e8016c23171f12340a7fc28cd8d275d6c815604f28e978a4256eff6f
3
SIZE (urbackup-client-2.2.5.tar.gz) = 3368914
3
SIZE (urbackup-client-2.2.6.tar.gz) = 3370637
(-)files/patch-client_ConfigPath.cpp (+20 lines)
Line 0 Link Here
1
--- client/ConfigPath.cpp.orig	2018-08-01 02:40:13 UTC
2
+++ client/ConfigPath.cpp
3
@@ -60,7 +60,7 @@ ConfigPath::ConfigPath(wxWindow* parent)
4
 		listbox->Append(dirs[i].path);
5
 		if(dirs[i].name.IsEmpty())
6
 		{
7
-			dirs[i].name=getDefaultDirname(dirs[i].path.wc_str());
8
+			dirs[i].name=getDefaultDirname(static_cast<const wchar_t*>(dirs[i].path.wc_str()));
9
 		}
10
 	}
11
 
12
@@ -93,7 +93,7 @@ void ConfigPath::OnClickNew(wxCommandEve
13
 		listbox->Append(ed.GetPath() );
14
 		SBackupDir ad;
15
 		ad.path=ed.GetPath();
16
-		ad.name=getDefaultDirname(ad.path.wc_str());
17
+		ad.name=getDefaultDirname(static_cast<const wchar_t*>(ad.path.wc_str()));
18
 		ad.group=0;
19
 		ad.id=0;
20
 		dirs.push_back(ad);
(-)files/patch-client_stringtools.cpp (+64 lines)
Line 0 Link Here
1
--- client/stringtools.cpp.orig	2018-03-25 16:25:50 UTC
2
+++ client/stringtools.cpp
3
@@ -486,12 +486,12 @@ std::string nconvert(s32 i){
4
 	ss << i;
5
 	return ss.str();
6
 }
7
-
8
-std::string nconvert(int long i) {
9
-	ostringstream ss;
10
-	ss << i;
11
-	return ss.str();
12
-}
13
+
14
+std::string nconvert(int long i) {
15
+	ostringstream ss;
16
+	ss << i;
17
+	return ss.str();
18
+}
19
 
20
 #if defined(_WIN64) || defined(_LP64)
21
 std::string nconvert(unsigned int i){
22
@@ -825,7 +825,7 @@ void TokenizeMail(std::string& str, std:
23
 //--------------------------------------------------------------------
24
 /**
25
 */
26
-bool isnumber(char ch)
27
+bool isnumber_fbsd(char ch)
28
 {
29
 	if( ch>=48 && ch <=57 )
30
 		return true;
31
@@ -848,7 +848,7 @@ bool isletter(char ch)
32
 //--------------------------------------------------------------------
33
 /**
34
 */
35
-bool isnumber(wchar_t ch)
36
+bool isnumber_fbsd(wchar_t ch)
37
 {
38
 	if( ch>=48 && ch <=57 )
39
 		return true;
40
@@ -928,7 +928,7 @@ int getNextNumber(const std::string &pSt
41
 	bool start=false;
42
 	for(size_t i=0;i<pStr.size();++i)
43
 	{
44
-		if( isnumber(pStr[i] ) )
45
+		if( isnumber_fbsd(pStr[i] ) )
46
 		{
47
 			num+=pStr[i];
48
 			start=true;
49
@@ -1445,7 +1445,7 @@ void replaceNonAlphaNumeric(std::string 
50
 {
51
 	for(size_t i=0;i<str.size();++i)
52
 	{
53
-		if(isletter(str[i])==false && isnumber(str[i])==false)
54
+		if(isletter(str[i])==false && isnumber_fbsd(str[i])==false)
55
 		{
56
 			str[i]=rch;
57
 		}
58
@@ -1497,4 +1497,4 @@ std::string EscapeParamString(const std:
59
 		}
60
 	}
61
 	return ret;
62
-}
63
\ No newline at end of file
64
+}
(-)files/patch-client_stringtools.h (+14 lines)
Line 0 Link Here
1
--- client/stringtools.h.orig	2018-03-25 16:25:57 UTC
2
+++ client/stringtools.h
3
@@ -69,9 +69,9 @@ std::wstring replaceonce(std::wstring to
4
 void Tokenize(std::string& str, std::vector<std::string> &tokens, std::string seps);
5
 void Tokenize(std::wstring& str, std::vector<std::wstring> &tokens, std::wstring seps);
6
 void TokenizeMail(std::string& str, std::vector<std::string> &tokens, std::string seps);
7
-bool isnumber(char ch);
8
+bool isnumber_fbsd(char ch);
9
 bool isletter(char ch);
10
-bool isnumber(wchar_t ch);
11
+bool isnumber_fbsd(wchar_t ch);
12
 bool isletter(wchar_t ch);
13
 void strupper(std::string *pStr);
14
 void strupper(std::wstring *pStr);
(-)files/pkg-message.in (+6 lines)
Lines 9-14 Link Here
9
START MANUALLY:
9
START MANUALLY:
10
service urbackup_client start
10
service urbackup_client start
11
11
12
The client daemon's configuration file is located at:
13
%%PREFIX%%/etc/urbackup/urbackupclient.conf
14
15
Log rotation can be configured at:
16
%%PREFIX%%/etc/newsyslog.conf.d/urbackupclient.conf
17
12
If the GTK2 GUI was built, it can be launched via:
18
If the GTK2 GUI was built, it can be launched via:
13
%%PREFIX%%/bin/urbackupclientctl
19
%%PREFIX%%/bin/urbackupclientctl
14
20
(-)files/urbackup_client.in (-1 / +1 lines)
Lines 25-30 Link Here
25
command=%%PREFIX%%/sbin/urbackupclientbackend
25
command=%%PREFIX%%/sbin/urbackupclientbackend
26
pidfile=/var/run/urbackupclientbackend.pid
26
pidfile=/var/run/urbackupclientbackend.pid
27
27
28
command_args="-d -w $pidfile"
28
command_args="-d -w $pidfile -c %%PREFIX%%/etc/urbackup/urbackupclient.conf"
29
29
30
run_rc_command "$1"
30
run_rc_command "$1"
(-)files/urbackupclient.conf-newsyslog (+2 lines)
Line 0 Link Here
1
# logfilename			[owner:group]	mode	count	size(kb)	when	flags	[/pid_file]				[sig_num]
2
/var/log/urbackupclient.log	root:wheel	644  	10	5120		*	JC	/var/run/urbackupclientbackend.pid
(-)files/urbackupclient.conf.sample-daemon.in (+29 lines)
Line 0 Link Here
1
#
2
# This is parsed as a key=value file
3
#
4
5
#logfile name
6
#If you change the LOGFILE, you should also change the "logfilename" in %%PREFIX%%/etc/newsyslog.conf.d/urbackupclient.conf
7
LOGFILE="/var/log/urbackupclient.log"
8
9
#Either debug,warn,info or error
10
LOGLEVEL=warn
11
12
#Tmp file directory
13
DAEMON_TMPDIR="/tmp"
14
15
# Valid settings:
16
#
17
# "client-confirms": If you have the GUI component the currently active user
18
#                    will need to confirm restores from the web interface.
19
#                    If you have no GUI component this will cause restores
20
#                    from the server web interface to not work
21
# "server-confirms": The server will ask the user starting the restore on 
22
#                    the web interface for confirmation
23
# "disabled":        Restores via web interface are disabled.
24
#                    Restores via urbackupclientctl still work
25
#
26
RESTORE=disabled
27
28
#If true client will not bind to any external network ports (either true or false)
29
INTERNET_ONLY=false
(-)pkg-plist (-1 / +4 lines)
Lines 2-12 Link Here
2
%%GUI%%bin/urbackupclientgui
2
%%GUI%%bin/urbackupclientgui
3
sbin/urbackupclientbackend
3
sbin/urbackupclientbackend
4
@(,,0444) man/man1/urbackupclientbackend.1.gz
4
@(,,0444) man/man1/urbackupclientbackend.1.gz
5
@mode 0700
5
@mode 0600
6
@sample etc/urbackup/mariadbdump.conf.sample
6
@sample etc/urbackup/mariadbdump.conf.sample
7
@sample etc/urbackup/mariadbxtrabackup.conf.sample
7
@sample etc/urbackup/mariadbxtrabackup.conf.sample
8
@sample etc/urbackup/postgresbase.conf.sample
8
@sample etc/urbackup/postgresbase.conf.sample
9
@sample etc/urbackup/postgresqldump.conf.sample
9
@sample etc/urbackup/postgresqldump.conf.sample
10
@mode 0700
10
share/urbackup/scripts/list
11
share/urbackup/scripts/list
11
share/urbackup/scripts/mariadbdump
12
share/urbackup/scripts/mariadbdump
12
share/urbackup/scripts/mariadbpostbackup
13
share/urbackup/scripts/mariadbpostbackup
Lines 20-25 Link Here
20
share/urbackup/scripts/setup-mariadbbackup
21
share/urbackup/scripts/setup-mariadbbackup
21
share/urbackup/scripts/setup-postgresbackup
22
share/urbackup/scripts/setup-postgresbackup
22
@mode 0644
23
@mode 0644
24
@sample etc/urbackup/urbackupclient.conf.sample
25
etc/newsyslog.conf.d/urbackupclient.conf
23
share/urbackup/updates_h.dat
26
share/urbackup/updates_h.dat
24
%%GUI%%share/urbackup/info.txt
27
%%GUI%%share/urbackup/info.txt
25
%%GUI%%share/urbackup/logo1.png
28
%%GUI%%share/urbackup/logo1.png

Return to bug 227854