Date: Monday, February 15, 2021 @ 20:42:09 Author: dbermond Revision: 862150
upgpkg: i2pd 2.36.0-1 Modified: i2pd/trunk/PKGBUILD Deleted: i2pd/trunk/060-i2pd-2.35.0-fix-avx-detection.patch -----------------------------------------+ 060-i2pd-2.35.0-fix-avx-detection.patch | 22 ---------------------- PKGBUILD | 24 +++++++----------------- 2 files changed, 7 insertions(+), 39 deletions(-) Deleted: 060-i2pd-2.35.0-fix-avx-detection.patch =================================================================== --- 060-i2pd-2.35.0-fix-avx-detection.patch 2021-02-15 19:57:22 UTC (rev 862149) +++ 060-i2pd-2.35.0-fix-avx-detection.patch 2021-02-15 20:42:09 UTC (rev 862150) @@ -1,22 +0,0 @@ ---- a/libi2pd/Crypto.cpp -+++ b/libi2pd/Crypto.cpp -@@ -638,7 +638,7 @@ namespace crypto - { - uint64_t buf[256]; - uint64_t hash[12]; // 96 bytes --#if defined(__x86_64__) || defined(__i386__) -+#if (defined(__x86_64__) || defined(__i386__)) && defined(__AVX__) // not all X86 targets supports AVX (like old Pentium, see #1600) - if(i2p::cpu::avx) - { - __asm__ ---- a/libi2pd/Identity.cpp -+++ b/libi2pd/Identity.cpp -@@ -828,7 +828,7 @@ namespace data - XORMetric operator^(const IdentHash& key1, const IdentHash& key2) - { - XORMetric m; --#if defined(__x86_64__) || defined(__i386__) -+#if (defined(__x86_64__) || defined(__i386__)) && defined(__AVX__) // not all X86 targets supports AVX (like old Pentium, see #1600) - if(i2p::cpu::avx) - { - __asm__ Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-02-15 19:57:22 UTC (rev 862149) +++ PKGBUILD 2021-02-15 20:42:09 UTC (rev 862150) @@ -9,8 +9,8 @@ # Contributor: r4sas pkgname=i2pd -pkgver=2.35.0 -pkgrel=4 +pkgver=2.36.0 +pkgrel=1 pkgdesc='A full-featured C++ implementation of the I2P router' arch=('x86_64') url='https://i2pd.website/' @@ -26,16 +26,14 @@ '030-i2pd-do-not-override-config.patch' '040-i2pd-systemd-service-hardening.patch' '050-i2pd-tunnels-d-readme.patch' - '060-i2pd-2.35.0-fix-avx-detection.patch' 'i2pd.sysusers' 'i2pd.tmpfiles') -sha256sums=('d041fd4e7a88ac168e76f66fdab40174ad093cdc13451cdbd0dd1216e5581f8a' +sha256sums=('17b7309cbee41b991cf9480334495c5a049f709beb1b31fbfcb47de19c8462a3' '0064503a9124b764d01db862ba3c2ff97bc5961d41359970df2d6ce9842a5ab5' '452550678ea5702a6492eb58e8d0452b91dc5d0aaa112cf04542df74a3dc0dfc' '45cfc3035c5b5cfc92cfffec1fe7d7efc4fed3229195cdb640ec4a6c405af149' '578ed9767890e970bd93b44e3be85c2595c4149ed65e4cc1c79ea12e2cb6982e' 'cfcb6b07b67aff3e3af12767f4649d88b9320dc71907b6c01b465e5c138cdaa3' - '3434318864ff7adc55ddcb3b6d625642dc443ac7249469011bbbfb598fb99689' '88b2e709228049ba11f37863f87de75ab6cde295104852871384337cfdc906a3' 'fe8cc2ec83cb5b5c2b2ec8cce9a989e0cb6fd347e00b84e03a17b12efd152fac') @@ -45,7 +43,6 @@ patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/030-i2pd-do-not-override-config.patch" patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/040-i2pd-systemd-service-hardening.patch" patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/050-i2pd-tunnels-d-readme.patch" - patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/060-i2pd-2.35.0-fix-avx-detection.patch" } build() { @@ -66,20 +63,15 @@ package() { cd "${pkgname}-${pkgver}" - make -C build DESTDIR="$pkgdir" install # config - install -D -m644 contrib/i2pd.conf -t "${pkgdir}/etc/i2pd" - install -D -m644 contrib/tunnels.conf -t "${pkgdir}/etc/i2pd" + install -D -m644 contrib/{i2pd,tunnels}.conf -t "${pkgdir}/etc/i2pd" install -d -m755 "${pkgdir}/etc/i2pd/tunnels.d" # certificates - local _file - while read -r -d '' _file - do - install -D -m644 "$_file" "${pkgdir}/usr/share/i2pd/certificates/${_file#contrib/certificates/}" - done < <(find contrib/certificates -type f -print0) + install -d -m755 "${pkgdir}/usr/share/i2pd" + cp -dr --no-preserve='ownership' contrib/certificates "${pkgdir}/usr/share/i2pd" # systemd install -D -m644 contrib/i2pd.service -t "${pkgdir}/usr/lib/systemd/system" @@ -87,9 +79,7 @@ install -D -m644 "${srcdir}/i2pd.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/i2pd.conf" # tunnels.d examples - install -D -m644 contrib/tunnels.d/README -t "${pkgdir}/usr/share/doc/i2pd/tunnels.d" - install -D -m644 contrib/tunnels.d/IRC-Ilita.conf -t "${pkgdir}/usr/share/doc/i2pd/tunnels.d" - install -D -m644 contrib/tunnels.d/IRC-Irc2P.conf -t "${pkgdir}/usr/share/doc/i2pd/tunnels.d" + install -D -m644 contrib/tunnels.d/{IRC-{Ilita,Irc2P}.conf,README} -t "${pkgdir}/usr/share/doc/i2pd/tunnels.d" # headers install -D -m644 libi2pd{,_client}/*.h -t "${pkgdir}/usr/include/i2pd"