diff options
-rw-r--r-- | .SRCINFO | 39 | ||||
-rw-r--r-- | 0001-uintptr_t.patch | 16 | ||||
-rw-r--r-- | 0002-ClientService-sig.sedpatch | 16 | ||||
-rw-r--r-- | 0003-client-version.sedpatch | 66 | ||||
-rw-r--r-- | PKGBUILD | 101 | ||||
-rw-r--r-- | cryptopp-bytes.patch | 16 | ||||
-rw-r--r-- | md5-bytes.patch | 25 |
7 files changed, 200 insertions, 79 deletions
@@ -1,6 +1,6 @@ pkgbase = urbackup2-client-no-gui pkgdesc = Client/Server network backup for Windows Workgroups and Linux, headless client - pkgver = 2.4.11 + pkgver = 2.5.25 pkgrel = 1 url = https://www.urbackup.org/ arch = i686 @@ -17,11 +17,15 @@ pkgbase = urbackup2-client-no-gui makedepends = make depends = crypto++ depends = zlib + depends = bash + depends = openssl + depends = device-mapper + depends = zstd conflicts = urbackup-client conflicts = urbackup-client-no-gui conflicts = urbackup2-client conflicts = urbackup2-client-no-gui - source = https://hndl.urbackup.org/Client/2.4.11/urbackup-client-2.4.11.tar.gz + source = https://hndl.urbackup.org/Client/2.5.25/urbackup-client-2.5.25.tar.gz source = btrfs_create_filesystem_snapshot source = btrfs_remove_filesystem_snapshot source = dattobd_create_filesystem_snapshot @@ -29,9 +33,10 @@ pkgbase = urbackup2-client-no-gui source = lvm_create_filesystem_snapshot source = lvm_remove_filesystem_snapshot source = defaults_client - source = cryptopp-bytes.patch - source = md5-bytes.patch - md5sums = fb00f65b2c7a12463e82a64c3f690ae1 + source = 0001-uintptr_t.patch + source = 0002-ClientService-sig.sedpatch + source = 0003-client-version.sedpatch + md5sums = 660887f3a7ae43d8259a73194baf2b07 md5sums = fcdef7852b3d847c5c2468a619e7fba9 md5sums = b5f82ed45105f9929e9b98eee8b288fc md5sums = 5a3c106ff05e9939902272c936b653eb @@ -39,9 +44,10 @@ pkgbase = urbackup2-client-no-gui md5sums = e17da398a0d4074a3aae23c46d93db0b md5sums = b8972631f9633b24b711bc831c972d42 md5sums = b3442a7228cbb9ce56da85ba219ad925 - md5sums = 135f5736be2c1c55ea9a858613a3e71c - md5sums = 4976ee476c8f0730e97d3f36bd90508a - sha256sums = 819dffb2521bf78e43ca0e6b8222aa79478f7a04d27682c36e00665129766fbf + md5sums = beb7f4062a60ddae07d4090e7b38c0e4 + md5sums = e02f751bfba1999240be3822acf8252b + md5sums = cc6bc607ab6d61adb0e8d946bc74342b + sha256sums = 100e10e1d952757f2f542695fcd77c05f849a32f0dfa5335cbfbeb8b70938c38 sha256sums = 18b5eceb73086b86d904f80e9270df121d06d7c683f93c5449a82e7deb38e0ee sha256sums = 334d9eb67a642d96e04874fd27c1b57d578c35b4cdc768d50db7ac2436f0927c sha256sums = 869e6244efbf6e370938e2e5c94a16c0130f583815ddbd34802578656989048b @@ -49,8 +55,19 @@ pkgbase = urbackup2-client-no-gui sha256sums = d5b462879e7c80139688c9d20ce1b1fe553386df9459def5e1d093d3a13d71fb sha256sums = 0ffb3bbbf5faf939564681d24786767a4706132f2f081b7a870ecc718a8e9413 sha256sums = d77fa6ad67141ae5cb4c3c6953783ce54aaaa3c1f2fe5bb28cd20948ddda12c4 - sha256sums = 7bd6f9ea3710d5172a2279b7667ca64ed738b73fd707f13336d615f6e7426eda - sha256sums = 5d093d1d74cbcdfddce40901015db7353ab7a06e4110244eeac8578a3adf00e8 + sha256sums = 9d6389ed971b8ef13ebdc327e47a2e9e2988b6fe0bffab5191e29b5f507941d4 + sha256sums = 7ce91c4df9ba36ff7f057cad098aae097d2cd09c1e449772638699b411a42bde + sha256sums = 20dd313729e3fd386a566c789137a8ae49b26a80702bd04363e2694a6c6cf6fa + sha512sums = ff52d871af884baccaebcb5dcbdb83c2118bce2a9fe8b89b531ac2f86f948760d07b0b4f718003c05b965c9e06de2fcadaf88db3808e593093f133405bb37d7c + sha512sums = 416fb8f5f3687a3c369cc2b199d4c8b4170494f0a119566a91ac6a0c2f202dc5049804c10508b66ba657011b39be5ddd055091cd531a665b4398899f404086ca + sha512sums = 860021ce5b8d92ff58e8286991162c7bab45493c3b9c87577a43764f6b416397448bb99b8fcb850c4c5853927cb0a8637792b75ff53ee7ee257da3f5d29ae3a7 + sha512sums = fde5912b589a495dc03a26d174d7673ff746eed34d6b1ed64758b2dc2ec2ec53e02e6a28b04734a7112f16687b31d25123e99dbc69e9dcab48773675382ec582 + sha512sums = a8b58bba1b8b0a6b70395f9fe4277eeee60a0ba534f4eddb999d719915c76b76facb54172e03b7b29b9f725a4d720e9b676b05e5081f7528570956e903fe59bd + sha512sums = a2d4ba03ae15582d2cd74ff68c38ff0f90d75a6eb5c241f9a022b0652fa2dc9b184439f6bda9a9538645925f739503ee7b3fc7bb232589583cdeb6dc27d74e5c + sha512sums = 9bdfefccdd9d6e37a77975324a7c417f3de2aa59e6da0bfde3c318b8c6f3d7f4629f3a41eebee548b9c572b8ed39640434cc08bd020d25362fddffc4426438de + sha512sums = 238c286d451474a8721292f7e98b4f13600cb430c16a27ceb9551cc83705b8268a3f1202785fb5b61523f372b4e7e804fd20b7db62677621983d79a271aa106b + sha512sums = 99d8d11d1a9b4f85f464fb30f17f0d4775e6852deceedc1e82ae49a37d62241b8502002bef0b459f3dd2d1b40903961ffb7351295bd487db3218bc5428f19001 + sha512sums = 6512cb8fd87ce7bb6254572d4065f622dcc3494eb95ea52d7cb6efc2689a9bb2091e9cf58946c1840d7aafde9ae49e3648d13bc972dfeb92a288775172a09e0d + sha512sums = c78e0b57fe7b1a38a7c4cfb62be40fc276c2524faa341611efb182d6e004b5d3e75f4fd710cbf6cf4e92049348e8c43d2b0f44a5d9ee3f6e21ee83e73b0dda59 pkgname = urbackup2-client-no-gui - diff --git a/0001-uintptr_t.patch b/0001-uintptr_t.patch new file mode 100644 index 000000000000..bf8669359a51 --- /dev/null +++ b/0001-uintptr_t.patch @@ -0,0 +1,16 @@ +diff -pNaru5 a/blockalign_src/crc.cpp b/blockalign_src/crc.cpp +--- a/blockalign_src/crc.cpp 2022-08-21 04:45:31.000000000 -0400 ++++ b/blockalign_src/crc.cpp 2023-12-30 15:30:07.153693741 -0500 +@@ -116,10 +116,12 @@ + // uintptr_t and ptrdiff_t + #if (__cplusplus < 201103L) && (!defined(_MSC_VER) || (_MSC_VER >= 1700)) + # include <stdint.h> + #elif defined(_MSC_VER) && (_MSC_VER < 1700) + # include <stddef.h> ++#else ++# include <cstdint> + #endif + + #if CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE + #include <smmintrin.h> + #endif diff --git a/0002-ClientService-sig.sedpatch b/0002-ClientService-sig.sedpatch new file mode 100644 index 000000000000..d348ba640da7 --- /dev/null +++ b/0002-ClientService-sig.sedpatch @@ -0,0 +1,16 @@ +diff -pNaru5 a/urbackupclient/ClientService.cpp b/urbackupclient/ClientService.cpp +--- a/urbackupclient/ClientService.cpp 2023-09-24 18:26:50.000000000 -0400 ++++ b/urbackupclient/ClientService.cpp 2023-12-30 15:52:23.104287195 -0500 +@@ -611,11 +611,11 @@ bool ClientConnector::Run(IRunOtherCallb + { + #if defined(__APPLE__) + // ./UrBackup\ Client.app/Contents/MacOS/sbin/../share/urbackup/urbackup_ecdsa409k1.pub + std::string pubkey = ExtractFilePath(Server->getServerWorkingDir()) + "/share/urbackup/urbackup_ecdsa409k1.pub"; + #else +- std::string pubkey = UPDATE_SIGNATURE_PREFIX "@OLDSIG@"; ++ std::string pubkey = UPDATE_SIGNATURE_PREFIX "@NEWSIG@"; + #endif + if (crypto_fak->verifyFile(pubkey, + UPDATE_FILE_PREFIX "UrBackupUpdate_untested.dat", UPDATE_FILE_PREFIX "UrBackupUpdate.sig2")) + { + std::auto_ptr<IFile> updatefile(Server->openFile(UPDATE_FILE_PREFIX "UrBackupUpdate_untested.dat")); diff --git a/0003-client-version.sedpatch b/0003-client-version.sedpatch new file mode 100644 index 000000000000..a5c9d403271a --- /dev/null +++ b/0003-client-version.sedpatch @@ -0,0 +1,66 @@ +diff -pNaru5 a/client/Info.cpp b/client/Info.cpp +--- a/client/Info.cpp 2023-05-04 16:32:49.000000000 -0400 ++++ b/client/Info.cpp 2023-12-30 15:58:22.801759308 -0500 +@@ -35,11 +35,11 @@ Info::Info(wxWindow* parent) : GUIInfo(p + { + std::string inf= getFile(g_res_path + "info.txt"); + m_textCtrl14->SetValue(ConvertToUnicode(inf)); + Show(true); + +- std::string n_version = getFile(g_res_path+"@OLDVER@"); ++ std::string n_version = getFile(g_res_path+"@NEWVER@"); + std::string c_version = getFile(g_res_path+"curr_version.txt"); + if (n_version.empty())n_version = "0"; + if (c_version.empty())c_version = "0"; + + if (atoi(n_version.c_str()) > atoi(c_version.c_str())) +diff -pNaru5 a/client/main.cpp b/client/main.cpp +--- a/client/main.cpp 2023-05-04 16:32:49.000000000 -0400 ++++ b/client/main.cpp 2023-12-30 15:58:22.801759308 -0500 +@@ -626,11 +626,11 @@ void MyTimer::Notify() + + long ct=wxGetLocalTime(); + + if(ct-lastversioncheck>600 && !displayed_update_info) + { +- std::string n_version=getFile("@OLDVER@"); ++ std::string n_version=getFile("@NEWVER@"); + std::string c_version=getFile("curr_version.txt"); + if(n_version.empty())n_version="0"; + if(c_version.empty())c_version="0"; + + if( atoi(n_version.c_str())>atoi(c_version.c_str())) +diff -pNaru5 a/urbackupclient/ClientServiceCMD.cpp b/urbackupclient/ClientServiceCMD.cpp +--- a/urbackupclient/ClientServiceCMD.cpp 2023-02-25 18:47:01.000000000 -0500 ++++ b/urbackupclient/ClientServiceCMD.cpp 2023-12-30 15:58:22.801759308 -0500 +@@ -2595,11 +2595,11 @@ void ClientConnector::CMD_VERSION_UPDATE + return; + } + #endif + + #if defined(_WIN32) || defined(URB_WITH_CLIENTUPDATE) +- std::string version_1=getFile(VERSION_FILE_PREFIX "@OLDVER@"); ++ std::string version_1=getFile(VERSION_FILE_PREFIX "@NEWVER@"); + std::string version_2=getFile(VERSION_FILE_PREFIX "curr_version.txt"); + if(version_1.empty() ) version_1="0"; + if(version_2.empty() ) version_2="0"; + + if(versionNeedsUpdate(version_1, server_version) +diff -pNaru5 a/urbackupclient/ClientService.cpp b/urbackupclient/ClientService.cpp +--- a/urbackupclient/ClientService.cpp 2023-09-24 18:26:50.000000000 -0400 ++++ b/urbackupclient/ClientService.cpp 2023-12-30 15:58:22.801759308 -0500 +@@ -639,12 +639,12 @@ bool ClientConnector::Run(IRunOtherCallb + { + update_silent(); + } + else + { +- Server->deleteFile(UPDATE_FILE_PREFIX "@OLDVER@"); +- moveFile(UPDATE_FILE_PREFIX "version_new.txt", UPDATE_FILE_PREFIX "@OLDVER@"); ++ Server->deleteFile(UPDATE_FILE_PREFIX "@NEWVER@"); ++ moveFile(UPDATE_FILE_PREFIX "version_new.txt", UPDATE_FILE_PREFIX "@NEWVER@"); + } + } + else + { + updatefile.reset(); @@ -1,18 +1,18 @@ # Maintainer: Chris Severance aur.severach AatT spamgourmet.com +# Contributor: Nissar Chababy <funilrys at outlook dot com> # Contributor: K0n24d <konrad AT knauber DOT net> set -u pkgname='urbackup2-client-no-gui' -pkgver='2.4.11' +pkgver=2.5.25 pkgrel='1' pkgdesc='Client/Server network backup for Windows Workgroups and Linux, headless client' arch=('i686' 'x86_64' 'armv5' 'armv6h' 'armv6' 'armv7h' 'armv7' 'aarch64') url='https://www.urbackup.org/' -license=('GPL') -depends=('crypto++' 'zlib') +license=("GPL") +depends=('crypto++' 'zlib' 'bash' 'openssl' 'device-mapper' 'zstd') makedepends=('gcc-libs' 'gcc' 'make') conflicts=(urbackup{,2}-{client,client-no-gui}) #,server}) -_patches=('cryptopp-bytes.patch' 'md5-bytes.patch') _verwatch=("${url}/download.html" '//hndl\.urbackup\.org/Client/[0-9\.]\+/urbackup-client-\([0-9\.]\+\)\.tar\.gz' 'l') _scripts=( 'btrfs_create_filesystem_snapshot' @@ -23,9 +23,16 @@ _scripts=( 'lvm_remove_filesystem_snapshot' ) _srcdir="urbackup-client-${pkgver}.0" -source=("https://hndl.urbackup.org/Client/${pkgver}/urbackup-client-${pkgver}.tar.gz") -source+=("${_scripts[@]}" 'defaults_client' "${_patches[@]}") -md5sums=('fb00f65b2c7a12463e82a64c3f690ae1' +source=( + "https://hndl.urbackup.org/Client/${pkgver}/urbackup-client-${pkgver}.tar.gz" + "${_scripts[@]}" + 'defaults_client' + #'0000-md5-bytes.patch' + '0001-uintptr_t.patch' + '0002-ClientService-sig.sedpatch' + '0003-client-version.sedpatch' +) +md5sums=('660887f3a7ae43d8259a73194baf2b07' 'fcdef7852b3d847c5c2468a619e7fba9' 'b5f82ed45105f9929e9b98eee8b288fc' '5a3c106ff05e9939902272c936b653eb' @@ -33,9 +40,10 @@ md5sums=('fb00f65b2c7a12463e82a64c3f690ae1' 'e17da398a0d4074a3aae23c46d93db0b' 'b8972631f9633b24b711bc831c972d42' 'b3442a7228cbb9ce56da85ba219ad925' - '135f5736be2c1c55ea9a858613a3e71c' - '4976ee476c8f0730e97d3f36bd90508a') -sha256sums=('819dffb2521bf78e43ca0e6b8222aa79478f7a04d27682c36e00665129766fbf' + 'beb7f4062a60ddae07d4090e7b38c0e4' + 'e02f751bfba1999240be3822acf8252b' + 'cc6bc607ab6d61adb0e8d946bc74342b') +sha256sums=('100e10e1d952757f2f542695fcd77c05f849a32f0dfa5335cbfbeb8b70938c38' '18b5eceb73086b86d904f80e9270df121d06d7c683f93c5449a82e7deb38e0ee' '334d9eb67a642d96e04874fd27c1b57d578c35b4cdc768d50db7ac2436f0927c' '869e6244efbf6e370938e2e5c94a16c0130f583815ddbd34802578656989048b' @@ -43,8 +51,20 @@ sha256sums=('819dffb2521bf78e43ca0e6b8222aa79478f7a04d27682c36e00665129766fbf' 'd5b462879e7c80139688c9d20ce1b1fe553386df9459def5e1d093d3a13d71fb' '0ffb3bbbf5faf939564681d24786767a4706132f2f081b7a870ecc718a8e9413' 'd77fa6ad67141ae5cb4c3c6953783ce54aaaa3c1f2fe5bb28cd20948ddda12c4' - '7bd6f9ea3710d5172a2279b7667ca64ed738b73fd707f13336d615f6e7426eda' - '5d093d1d74cbcdfddce40901015db7353ab7a06e4110244eeac8578a3adf00e8') + '9d6389ed971b8ef13ebdc327e47a2e9e2988b6fe0bffab5191e29b5f507941d4' + '7ce91c4df9ba36ff7f057cad098aae097d2cd09c1e449772638699b411a42bde' + '20dd313729e3fd386a566c789137a8ae49b26a80702bd04363e2694a6c6cf6fa') +sha512sums=('ff52d871af884baccaebcb5dcbdb83c2118bce2a9fe8b89b531ac2f86f948760d07b0b4f718003c05b965c9e06de2fcadaf88db3808e593093f133405bb37d7c' + '416fb8f5f3687a3c369cc2b199d4c8b4170494f0a119566a91ac6a0c2f202dc5049804c10508b66ba657011b39be5ddd055091cd531a665b4398899f404086ca' + '860021ce5b8d92ff58e8286991162c7bab45493c3b9c87577a43764f6b416397448bb99b8fcb850c4c5853927cb0a8637792b75ff53ee7ee257da3f5d29ae3a7' + 'fde5912b589a495dc03a26d174d7673ff746eed34d6b1ed64758b2dc2ec2ec53e02e6a28b04734a7112f16687b31d25123e99dbc69e9dcab48773675382ec582' + 'a8b58bba1b8b0a6b70395f9fe4277eeee60a0ba534f4eddb999d719915c76b76facb54172e03b7b29b9f725a4d720e9b676b05e5081f7528570956e903fe59bd' + 'a2d4ba03ae15582d2cd74ff68c38ff0f90d75a6eb5c241f9a022b0652fa2dc9b184439f6bda9a9538645925f739503ee7b3fc7bb232589583cdeb6dc27d74e5c' + '9bdfefccdd9d6e37a77975324a7c417f3de2aa59e6da0bfde3c318b8c6f3d7f4629f3a41eebee548b9c572b8ed39640434cc08bd020d25362fddffc4426438de' + '238c286d451474a8721292f7e98b4f13600cb430c16a27ceb9551cc83705b8268a3f1202785fb5b61523f372b4e7e804fd20b7db62677621983d79a271aa106b' + '99d8d11d1a9b4f85f464fb30f17f0d4775e6852deceedc1e82ae49a37d62241b8502002bef0b459f3dd2d1b40903961ffb7351295bd487db3218bc5428f19001' + '6512cb8fd87ce7bb6254572d4065f622dcc3494eb95ea52d7cb6efc2689a9bb2091e9cf58946c1840d7aafde9ae49e3648d13bc972dfeb92a288775172a09e0d' + 'c78e0b57fe7b1a38a7c4cfb62be40fc276c2524faa341611efb182d6e004b5d3e75f4fd710cbf6cf4e92049348e8c43d2b0f44a5d9ee3f6e21ee83e73b0dda59') # These allow server and client to be installed on the same machine _oldsig='urbackup_ecdsa409k1.pub' @@ -56,30 +76,57 @@ prepare() { set -u cd "${_srcdir}" - # patch -d 'cryptoplugin' -p0 -i "${srcdir}/cryptopp-bytes.patch" - patch -p0 -i "${srcdir}/md5-bytes.patch" + local _fa + readarray -t _fa < <(grep --include '*.c*' --include '*.h*' --include '*.dat' --include '*.txt' --include '*.m4' -lre $'\r' .) + sed -e 's:\r$::g' -i "${_fa[@]}" + #grep -lr $'\r' .; false + local _seds=( + -e "s:@OLDSIG@:${_oldsig}:g" + -e "s:@NEWSIG@:${_newsig}:g" + -e "s:@OLDVER@:${_oldver}:g" + -e "s:@NEWVER@:${_newver}:g" + ) + local _f + for _f in "${source[@]}"; do + if [[ "${_f}" = *.patch ]]; then + set +u; msg2 "patch ${_f}"; set -u + patch -Nup1 -i "${srcdir}/${_f}" + elif [[ "${_f}" = *.sedpatch ]]; then + set +u; msg2 "sed patch ${_f}"; set -u + patch -Nup1 -i <(sed -E "${_seds[@]}" "${srcdir}/${_f}") + fi + done + #cd '..'; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; cd "${_srcdir}"; false + # diff -pNaru5 'a' 'b' > '0000-new.patch' + + #sed -e "s:\"${_oldsig}\":\"${_newsig}\":g" -i 'urbackupclient/ClientService.cpp' + #sed -e "s:\"${_oldver}\":\"${_newver}\":g" -i 'client/main.cpp' 'client/Info.cpp' 'urbackupclient/ClientServiceCMD.cpp' 'urbackupclient/ClientService.cpp' - sed -e "s:\"${_oldsig}\":\"${_newsig}\":g" -i 'urbackupclient/ClientService.cpp' - sed -e "s:\"${_oldver}\":\"${_newver}\":g" -i 'client/main.cpp' 'client/Info.cpp' 'urbackupclient/ClientServiceCMD.cpp' 'urbackupclient/ClientService.cpp' + #sed -e 's:byte digest:unsigned char digest:g' -i 'md5.h' - sed -e 's:byte digest:unsigned char digest:g' -i 'md5.h' + #sed -E -e 's/std::auto_ptr/std::unique_ptr/g' -i $(grep --include '*.c*' --include '*.h*' -lre 'std::auto_ptr') set +u } build() { set -u cd "${_srcdir}" - local _makeopts=() - if [ -z "${MAKEFLAGS:-}" ] || [ "${MAKEFLAGS//-j/}" = "${MAKEFLAGS}" ]; then - local _nproc="$(nproc)"; _nproc=$((_nproc>8?8:_nproc)) - _makeopts=(-j "${_nproc}") - fi if [ ! -s 'Makefile' ]; then - #CFLAGS='-march=native -O2 -pipe -fstack-protector-strong' \\ - #CXXFLAGS="${CFLAGS} -ansi" \\ - ./configure --prefix='/usr' --sbindir='/usr/bin' --localstatedir='/var' --sysconfdir='/etc' --enable-headless + CFLAGS="${CFLAGS/-march=x86-64/-march=native}" + CXXFLAGS="${CXXFLAGS/-march=x86-64/-march=native}" + CXXFLAGS+=' -ansi -std=gnu++11' + #CPPFLAGS+=' -DNDEBUG' + local _conf=( + --prefix='/usr' + --sbindir='/usr/bin' + --localstatedir='/var' + --sysconfdir='/etc' + --enable-headless + --enable-embedded-cryptopp + ) + ./configure "${_conf[@]}" fi - nice make -s "${_makeopts[@]}" + nice make -s set +u } @@ -89,7 +136,7 @@ package() { make -s -j1 DESTDIR="${pkgdir}" install - install -Dpm644 'urbackupclientbackend-debian.service' "${pkgdir}/usr/lib/systemd/system/urbackupclientbackend.service" + install -Dpm644 <(sed -e 's:/usr/local/sbin/:/usr/bin/:g' 'urbackupclientbackend-debian.service') "${pkgdir}/usr/lib/systemd/system/urbackupclientbackend.service" install -Dpm644 'docs/urbackupclientbackend.1' -t "${pkgdir}/usr/share/man/man1/" cd "${srcdir}" diff --git a/cryptopp-bytes.patch b/cryptopp-bytes.patch deleted file mode 100644 index d34e1553313f..000000000000 --- a/cryptopp-bytes.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git cryptopp_inc.h cryptopp_inc.h -index 1295d7c..51ab406 100644 ---- cryptopp_inc.h -+++ cryptopp_inc.h -@@ -44,4 +44,9 @@ - #include CRYPTOPP_INCLUDE_ECCRYPTO - #include CRYPTOPP_INCLUDE_OIDS - #include CRYPTOPP_INCLUDE_DSA --#endif -\ No newline at end of file -+#endif -+#if (CRYPTOPP_VERSION >= 600) && (__cplusplus >= 201103L) -+ using byte = CryptoPP::byte; -+#else -+ typedef unsigned char byte; -+#endif diff --git a/md5-bytes.patch b/md5-bytes.patch deleted file mode 100644 index d4b88fe7dfed..000000000000 --- a/md5-bytes.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git md5.h md5.h -index d8b96df..86103da 100644 ---- md5.h -+++ md5.h -@@ -124,6 +124,13 @@ private: - #include CRYPTOPP_INCLUDE_MD5 - #endif - -+#if (CRYPTOPP_VERSION >= 600) && (__cplusplus >= 201103L) -+ using byte = CryptoPP::byte; -+#else -+ typedef unsigned char byte; -+#endif -+ -+ - class MD5 { - - public: -@@ -151,4 +158,4 @@ private: - - #endif //DO_NOT_USE_CRYPTOPP_MD5 - --#endif //MD5_H -\ No newline at end of file -+#endif //MD5_H |