Index: head/archivers/urbackup-client/Makefile =================================================================== --- head/archivers/urbackup-client/Makefile (revision 478638) +++ head/archivers/urbackup-client/Makefile (revision 478639) @@ -1,122 +1,74 @@ # $FreeBSD$ PORTNAME= urbackup-client DISTVERSION= 2.2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers MASTER_SITES= https://hndl.urbackup.org/Client/${DISTVERSION}/ MAINTAINER= freebsd@coombscloud.com COMMENT= Client component of the UrBackup backup system LICENSE= AGPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcryptopp.so:security/cryptopp -USES= dos2unix gettext localbase pkgconfig +USES= autoreconf dos2unix gettext localbase pkgconfig USE_RC_SUBR= urbackup_client USERS= urbackup GROUPS= urbackup GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-clientupdate CXXFLAGS+= `pkgconf --cflags-only-other libcryptopp` SUB_FILES= pkg-message urbackupclient.conf.sample-daemon WRKSRC= ${WRKDIR}/${DISTNAME}.0 OPTIONS_DEFINE= GUI OPTIONS_SUB= yes GUI_DESC= GTK2 Tray Icon GUI_USE= WX=3.0+ GUI_CONFIGURE_ON= --with-wx-config=${WX_CONFIG} GUI_CONFIGURE_OFF= --enable-headless 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 - post-patch: @(cd ${WRKSRC} && ${REINPLACE_CMD} -E -e 's|[[:<:]]byte[[:>:]]|CryptoPP::byte|g' \ cryptoplugin/AESDecryption.cpp \ cryptoplugin/AESEncryption.cpp \ cryptoplugin/AESGCMDecryption.cpp \ cryptoplugin/AESGCMEncryption.cpp \ cryptoplugin/CryptoFactory.cpp \ cryptoplugin/ECDHKeyExchange.cpp \ cryptoplugin/ZlibCompression.cpp \ cryptoplugin/ZlibDecompression.cpp \ md5.h \ ) -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") - +post-stage: ${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 +.for f in ${CONFFILES} + ${MV} ${STAGEDIR}${PREFIX}/etc/urbackup/${f} ${STAGEDIR}${PREFIX}/etc/urbackup/${f}.sample .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 + ${RM} ${STAGEDIR}/var/urbackup/version.txt + ${RM} ${STAGEDIR}${PREFIX}/share/urbackup/urbackup_ecdsa409k1.pub .include Index: head/archivers/urbackup-client/files/patch-Makefile.am =================================================================== --- head/archivers/urbackup-client/files/patch-Makefile.am (nonexistent) +++ head/archivers/urbackup-client/files/patch-Makefile.am (revision 478639) @@ -0,0 +1,45 @@ +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 +@@ -119,22 +119,22 @@ endif + $(MKDIR_P) "$(DESTDIR)$(datadir)/urbackup/scripts" + $(MKDIR_P) "$(DESTDIR)$(sysconfdir)/urbackup" + +- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/list" "$(DESTDIR)$(datadir)/urbackup/scripts/list" +- 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" +- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqldump" +- test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresbase.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf" +- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresbase" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresbase" +- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqlprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlprebackup" +- $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqlpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlpostbackup" +- $(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/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/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" ++ $(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" ++ $(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" ++ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup" ++ $(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" ++ $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/setup-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-mariadbbackup" + + for script in "$(DESTDIR)$(datadir)/urbackup/scripts/"*; do sed "s|SYSCONFDIR|$(sysconfdir)/urbackup|g" "$$script" > "$$script.r"; mv "$$script.r" "$$script"; done + chmod 700 "$(DESTDIR)$(datadir)/urbackup/scripts/"* Property changes on: head/archivers/urbackup-client/files/patch-Makefile.am ___________________________________________________________________ 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/patch-client_ConfigPath.cpp =================================================================== --- head/archivers/urbackup-client/files/patch-client_ConfigPath.cpp (revision 478638) +++ head/archivers/urbackup-client/files/patch-client_ConfigPath.cpp (revision 478639) @@ -1,24 +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 +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 @@ +--- client/ConfigPath.cpp.orig 2018-08-12 19:17: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(dirs[i].path.wc_str())); } } -@@ -93,7 +93,7 @@ +@@ -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(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 ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -ON \ No newline at end of property +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/patch-client_stringtools.cpp =================================================================== --- head/archivers/urbackup-client/files/patch-client_stringtools.cpp (revision 478638) +++ head/archivers/urbackup-client/files/patch-client_stringtools.cpp (revision 478639) @@ -1,49 +1,68 @@ 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 @@ +--- client/stringtools.cpp.orig 2018-08-12 19:17:45 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_local(char ch) { if( ch>=48 && ch <=57 ) return true; -@@ -848,7 +848,7 @@ +@@ -848,7 +848,7 @@ bool isletter(char ch) //-------------------------------------------------------------------- /** */ -bool isnumber(wchar_t ch) +bool isnumber_local(wchar_t ch) { if( ch>=48 && ch <=57 ) return true; -@@ -928,7 +928,7 @@ +@@ -928,7 +928,7 @@ int getNextNumber(const std::string &pSt 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); Index: head/archivers/urbackup-client/pkg-plist =================================================================== --- head/archivers/urbackup-client/pkg-plist (revision 478638) +++ head/archivers/urbackup-client/pkg-plist (revision 478639) @@ -1,53 +1,53 @@ bin/urbackupclientctl %%GUI%%bin/urbackupclientgui sbin/urbackupclientbackend @(,,0444) man/man1/urbackupclientbackend.1.gz @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/info.txt %%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 +%%GUI%%share/urbackup/logo1.png @dir(,,0700) /var/urbackup/data @dir(urbackup,urbackup,0755) /var/urbackup @mode 555