cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

archivers/urbackup-client: Update to 2.5.19.0

Browse Source
This commit is contained in:
Neel Chauhan 2022-08-29 10:54:03 -07:00
parent a42c3d274d
commit 736cd81ebb
7 changed files with 24 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archivers/urbackup-client/Makefile
View File

@ -1,6 +1,5 @@
PORTNAME= urbackup-client
DISTVERSION= 2.4.11.0
PORTREVISION= 2
DISTVERSION= 2.5.19.0
CATEGORIES= archivers
MASTER_SITES= https://hndl.urbackup.org/Client/${DISTVERSION:R}/

6
archivers/urbackup-client/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1608009884
SHA256 (urbackup-client-2.4.11.0.tar.gz) = 819dffb2521bf78e43ca0e6b8222aa79478f7a04d27682c36e00665129766fbf
SIZE (urbackup-client-2.4.11.0.tar.gz) = 4691460
TIMESTAMP = 1661794976
SHA256 (urbackup-client-2.5.19.0.tar.gz) = f2a12caa4b4b338f71586069c506663effb79abb07a21ea731c83b229c3aed05
SIZE (urbackup-client-2.5.19.0.tar.gz) = 4978478

16
archivers/urbackup-client/files/patch-Makefile.am
View File

@ -2,13 +2,14 @@ Makefile.am uses ${INSTALL_PROGAM} to install scripts and configuation files,
leading to an error from strip(1). This patch instead uses ${INSTALL} (for scripts)
and ${INSTALL_DATA} (for configuration files).
--- Makefile.am.orig 2018-08-27 01:45:13 UTC
--- Makefile.am.orig 2022-08-29 17:51:29 UTC
+++ Makefile.am
@@ -119,22 +119,22 @@ endif
@@ -198,24 +198,24 @@ endif
$(MKDIR_P) "$(DESTDIR)$(datadir)/urbackup/scripts"
$(MKDIR_P) "$(DESTDIR)$(sysconfdir)/urbackup"
- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/list" "$(DESTDIR)$(datadir)/urbackup/scripts/list"
- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/list_incr" "$(DESTDIR)$(datadir)/urbackup/scripts/list_incr"
- test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf"
- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbdump"
- test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf"
@ -20,22 +21,25 @@ and ${INSTALL_DATA} (for configuration files).
- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/setup-postgresbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-postgresbackup"
- test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf"
- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup"
- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup_incr" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup_incr"
- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/restore-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/restore-mariadbbackup"
- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbprebackup"
- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbpostbackup"
- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/setup-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-mariadbbackup"
+ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/list" "$(DESTDIR)$(datadir)/urbackup/scripts/list"
+ test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf" || $(INSTALL_DATA) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf"
+ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/list_incr" "$(DESTDIR)$(datadir)/urbackup/scripts/list_incr"
+ test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf" || $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf"
+ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbdump"
+ test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf" || $(INSTALL_DATA) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf"
+ test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf" || $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf"
+ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqldump"
+ test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf" || $(INSTALL_DATA) "$(srcdir)/urbackupclient/backup_scripts/postgresbase.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf"
+ test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf" || $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresbase.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf"
+ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresbase" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresbase"
+ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqlprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlprebackup"
+ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqlpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlpostbackup"
+ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/setup-postgresbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-postgresbackup"
+ test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf" || $(INSTALL_DATA) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf"
+ test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf" || $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf"
+ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup"
+ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup_incr" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup_incr"
+ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/restore-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/restore-mariadbbackup"
+ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbprebackup"
+ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbpostbackup"

15
archivers/urbackup-client/files/patch-client_ConfigPath.cpp
View File

@ -2,18 +2,9 @@ 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<const wchar_t*>) that
resolves the error.
--- client/ConfigPath.cpp.orig 2018-08-12 19:17:13 UTC
--- client/ConfigPath.cpp.orig 2022-08-29 17:43:41 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
@@ -208,7 +208,7 @@ void ConfigPath::OnClickNew(wxCommandEvent &evt)
listbox->Append(ed.GetPath() );
SBackupDir ad;
ad.path=ed.GetPath();
@ -21,4 +12,4 @@ resolves the error.
+ ad.name=getDefaultDirname(static_cast<const wchar_t*>(ad.path.wc_str()));
ad.group=0;
ad.id=0;
dirs.push_back(ad);
ad.server_default = 0;

36
archivers/urbackup-client/files/patch-client_stringtools.cpp
View File

@ -2,28 +2,9 @@ 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-12 19:17:45 UTC
--- client/stringtools.cpp.orig 2022-08-29 17:44:01 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:
@@ -826,7 +826,7 @@ void TokenizeMail(const std::string& str, std::vector<
//--------------------------------------------------------------------
/**
*/
@ -32,7 +13,7 @@ resolve the conflict. Analogous changes are also made in client/stringtools.h
{
if( ch>=48 && ch <=57 )
return true;
@@ -848,7 +848,7 @@ bool isletter(char ch)
@@ -849,7 +849,7 @@ bool isletter(char ch)
//--------------------------------------------------------------------
/**
*/
@ -41,7 +22,7 @@ resolve the conflict. Analogous changes are also made in client/stringtools.h
{
if( ch>=48 && ch <=57 )
return true;
@@ -928,7 +928,7 @@ int getNextNumber(const std::string &pSt
@@ -929,7 +929,7 @@ int getNextNumber(const std::string &pStr, int *read)
bool start=false;
for(size_t i=0;i<pStr.size();++i)
{
@ -50,7 +31,7 @@ resolve the conflict. Analogous changes are also made in client/stringtools.h
{
num+=pStr[i];
start=true;
@@ -1445,7 +1445,7 @@ void replaceNonAlphaNumeric(std::string
@@ -1444,7 +1444,7 @@ void replaceNonAlphaNumeric(std::string &str, char rch
{
for(size_t i=0;i<str.size();++i)
{
@ -59,10 +40,3 @@ resolve the conflict. Analogous changes are also made in client/stringtools.h
{
str[i]=rch;
}
@@ -1497,4 +1497,4 @@ std::string EscapeParamString(const std:
}
}
return ret;
-}
\ No newline at end of file
+}

18
archivers/urbackup-client/files/patch-client_stringtools.h
View File

@ -1,18 +0,0 @@
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.cpp
--- client/stringtools.h.orig 2018-08-12 19:18:09 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_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);

2
archivers/urbackup-client/pkg-plist
View File

@ -10,10 +10,12 @@ sbin/urbackupclientbackend
@sample etc/urbackup/postgresqldump.conf.sample
@mode 0700
share/urbackup/scripts/list
share/urbackup/scripts/list_incr
share/urbackup/scripts/mariadbdump
share/urbackup/scripts/mariadbpostbackup
share/urbackup/scripts/mariadbprebackup
share/urbackup/scripts/mariadbxtrabackup
share/urbackup/scripts/mariadbxtrabackup_incr
share/urbackup/scripts/postgresbase
share/urbackup/scripts/postgresqldump
share/urbackup/scripts/postgresqlpostbackup