From nobody Mon Aug 29 17:54:05 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MGdNY4v1Qz4bb3H; Mon, 29 Aug 2022 17:54:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MGdNY4Ppcz3TVb; Mon, 29 Aug 2022 17:54:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661795645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V4hwFzdf5PEUf71BtVAsJUneTKBm3dBPyHvEj+imQ3Q=; b=BIBRxl21sqKJyV1/aqL+7FbZt/7wRA54kipy2pXU1DrOF01GVS2bPzY6IIDcIsIwnLgei/ 30hQa+0bVEo7g8xm4FM1KfAQV9MB1ggoD5JuMRtueDUX8I3+xnWkIODLHju9CBwPbmR02m GfHXdNeEptK2fmCfljb4o/uEjl8axDZp2aOgEuUoaBm1t9CYM/ZH99tyvfT6aE98Fe2Fz3 pODUSZYqrZxvMyR6Ha9JYnYvuT+nk6vZfqnLfQob62KMdmTPkxbLswAUiRhDVRBwBLIKcI W2GxutgZNTGkkEDP6A2WHM29HffnGlbZqJnPJJtjt9Wjh2CExn8lpOSCPCrMZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MGdNY3TMCzWXg; Mon, 29 Aug 2022 17:54:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27THs5tq075916; Mon, 29 Aug 2022 17:54:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27THs5dX075915; Mon, 29 Aug 2022 17:54:05 GMT (envelope-from git) Date: Mon, 29 Aug 2022 17:54:05 GMT Message-Id: <202208291754.27THs5dX075915@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 736cd81ebb89 - main - archivers/urbackup-client: Update to 2.5.19.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 736cd81ebb89e13431a642a799ad7a7e7392d699 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661795645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V4hwFzdf5PEUf71BtVAsJUneTKBm3dBPyHvEj+imQ3Q=; b=yUm212bz7BGrb3fbFqaiw3fZhweoL+PqeUog9IyKfCLbMbeKpBVA+kWkZF5ETQ2T62uWjz Tg5/pHTho2zqpg438dWguR5l/Rnc4VoXY5AM9FlPRWckIZ859kQcnK7U0VuxcEyFoMGxKm B5kKDyMe9irg1qCXMujuWQWdwkf7W+aoQeRaWkQ3OkzvoQh2ilpaOI89qgfmN9jCUVQQDU oLFDbuHVt7dXVQIUHCnhn/okfOTWnT6en2CUa/ae2AQIHCpLqZu9AgLlBsKMc/ak1dzEaW 3K3HKPyCbOb7+rb8wS/0jp0ZzcRNX6br3s8gZQgzDysxM8F3gj+6XnCfIdM0Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661795645; a=rsa-sha256; cv=none; b=E87lTtDHzzJWFrJ4ur96dXTGiAzp82p/Ykocx5j/SBuSPnVy/7WAMD3EPl//bhu3dtZiZX 096BzxbrW6mMI/UivQ7SOZ30gTl5rSpnA1wG7loWNoGKrX6kepc2afMwf86uaWtAEr1d2s bY1i9NHqubbICE8ZgeyrL6l6jw+ZOWGHiqlZRt/dyA8zTzUlBvSUvjZCBdVKTy/30Ew1Oi eDb8aMMevWagslSm4VLfqTQwQzippEdZKzPDKCPdkOHbzYwREz08qXZJTK+OI0+clG1fmX xBcKRNXgF3ursrXxj55Kft13LpULUK5Ibc+uDQ6xEAb1FE1abTRqe1NPa1zZ9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=736cd81ebb89e13431a642a799ad7a7e7392d699 commit 736cd81ebb89e13431a642a799ad7a7e7392d699 Author: Neel Chauhan AuthorDate: 2022-08-29 17:54:03 +0000 Commit: Neel Chauhan CommitDate: 2022-08-29 17:54:03 +0000 archivers/urbackup-client: Update to 2.5.19.0 --- archivers/urbackup-client/Makefile | 3 +- archivers/urbackup-client/distinfo | 6 ++-- archivers/urbackup-client/files/patch-Makefile.am | 16 ++++++---- .../files/patch-client_ConfigPath.cpp | 15 ++------- .../files/patch-client_stringtools.cpp | 36 +++------------------- .../files/patch-client_stringtools.h | 18 ----------- archivers/urbackup-client/pkg-plist | 2 ++ 7 files changed, 24 insertions(+), 72 deletions(-) diff --git a/archivers/urbackup-client/Makefile b/archivers/urbackup-client/Makefile index db8146812e3c..c065ecaa4930 100644 --- a/archivers/urbackup-client/Makefile +++ b/archivers/urbackup-client/Makefile @@ -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}/ diff --git a/archivers/urbackup-client/distinfo b/archivers/urbackup-client/distinfo index 8f5e7104938f..a68e38cc7f37 100644 --- a/archivers/urbackup-client/distinfo +++ b/archivers/urbackup-client/distinfo @@ -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 diff --git a/archivers/urbackup-client/files/patch-Makefile.am b/archivers/urbackup-client/files/patch-Makefile.am index 7737c5758c79..3f26c5dfff5c 100644 --- a/archivers/urbackup-client/files/patch-Makefile.am +++ b/archivers/urbackup-client/files/patch-Makefile.am @@ -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" diff --git a/archivers/urbackup-client/files/patch-client_ConfigPath.cpp b/archivers/urbackup-client/files/patch-client_ConfigPath.cpp index 93e7f9551e1c..da84f652039e 100644 --- a/archivers/urbackup-client/files/patch-client_ConfigPath.cpp +++ b/archivers/urbackup-client/files/patch-client_ConfigPath.cpp @@ -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) 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(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(ad.path.wc_str())); ad.group=0; ad.id=0; - dirs.push_back(ad); + ad.server_default = 0; diff --git a/archivers/urbackup-client/files/patch-client_stringtools.cpp b/archivers/urbackup-client/files/patch-client_stringtools.cpp index 6a5cd19571b7..a6b0655d5455 100644 --- a/archivers/urbackup-client/files/patch-client_stringtools.cpp +++ b/archivers/urbackup-client/files/patch-client_stringtools.cpp @@ -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 &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); diff --git a/archivers/urbackup-client/pkg-plist b/archivers/urbackup-client/pkg-plist index f51aaacbd609..dd3fc9242e0f 100644 --- a/archivers/urbackup-client/pkg-plist +++ b/archivers/urbackup-client/pkg-plist @@ -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