1.8.0

2 files changed, 6 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7dddb14c1f8a..05956057fa64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = i2p
 	pkgdesc = A distributed anonymous network
-	pkgver = 1.7.0
+	pkgver = 1.8.0
 	pkgrel = 1
 	url = https://geti2p.net
 	install = i2p.install
@@ -14,8 +14,8 @@ pkgbase = i2p
 	conflicts = i2p-dev
 	options = !strip
 	backup = opt/i2p/wrapper.config
-	source = https://files.i2p-projekt.de/1.7.0/i2psource_1.7.0.tar.bz2
-	source = https://files.i2p-projekt.de/1.7.0/i2psource_1.7.0.tar.bz2.sig
+	source = https://files.i2p-projekt.de/1.8.0/i2psource_1.8.0.tar.bz2
+	source = https://files.i2p-projekt.de/1.8.0/i2psource_1.8.0.tar.bz2.sig
 	source = i2prouter.service
 	source = i2p.tmpfiles
 	source = wrapper.config
@@ -23,10 +23,8 @@ pkgbase = i2p
 	source = i2prouter.bash
 	source = i2prouter.sh
 	source = chromium-i2p.sh
-	source = speed_up_prng.patch::https://github.com/i2p/i2p.i2p/commit/63f3d88f785172f747e7f049dfc8badecd963e96.patch
-	source = update_firefox_useragent::https://github.com/i2p/i2p.i2p/commit/265f5ee5dfb0fe977ca8114554b7156e2aa0e40a.patch
 	validpgpkeys = 2D3D2D03910C6504C1210C65EE60C0C8EE7256A8
-	sha256sums = aa53591e89eacc3491ab472dc4df998780fb6747eea3b97ecb7a9f81ff2c9a5e
+	sha256sums = 525f2ad3267f130b81296b3dd24102fdcf2adf098d54272da4e1be4abd87df04
 	sha256sums = SKIP
 	sha256sums = 644b771ec7f5db3efab3206bf1f896566cdb00d410a54608fda85bdb4c2ad876
 	sha256sums = fc30dd32f48fe1c93bf36c8297ca48203a1479e4e221ebe62c57cf3c3c0347d3
@@ -35,7 +33,5 @@ pkgbase = i2p
 	sha256sums = 7a19b9f90c8792460fd58e8b8aa435a065e34d29a942479850472510e9d3078a
 	sha256sums = 8d39f080c7a2e49226db3a785f3e18583159ef2f95e1ab467fd9984c4e38c9f5
 	sha256sums = a7076156703e2b949331e450455813432caeb4e5712f1c7b668974eb06a69fb9
-	sha256sums = 55b05dec917d5a55f2a7c3b76c5111d2cdbb3694968049fca5cdb089cb18e390
-	sha256sums = 2ca764b5942fc3beea48596d5e1ec0335f712653e0206a85038009cd4c0b5ec3
 
 pkgname = i2p
diff --git a/PKGBUILD b/PKGBUILD
index fb22a644f600..1ddeeefb454e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 #export LG2=en
 
 pkgname=i2p
-pkgver=1.7.0
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="A distributed anonymous network"
 url="https://geti2p.net"
@@ -30,12 +30,10 @@ source=("${_url}/i2psource_${pkgver}.tar.bz2"{,.sig}
         #"https://download.db-ip.com/free/dbip-country-lite-$(date +%Y-%m).mmdb.gz"
         'i2prouter.service' 'i2p.tmpfiles' 'wrapper.config' 'router.config'
         'i2prouter.bash' 'i2prouter.sh' 'chromium-i2p.sh'
-        speed_up_prng.patch::'https://github.com/i2p/i2p.i2p/commit/63f3d88f785172f747e7f049dfc8badecd963e96.patch'
-        update_firefox_useragent::'https://github.com/i2p/i2p.i2p/commit/265f5ee5dfb0fe977ca8114554b7156e2aa0e40a.patch'
         #upstream.patch::'https://github.com/i2p/i2p.i2p/commit/6c0e18d3.patch'
 )
 
-sha256sums=('aa53591e89eacc3491ab472dc4df998780fb6747eea3b97ecb7a9f81ff2c9a5e'
+sha256sums=('525f2ad3267f130b81296b3dd24102fdcf2adf098d54272da4e1be4abd87df04'
             'SKIP'
             '644b771ec7f5db3efab3206bf1f896566cdb00d410a54608fda85bdb4c2ad876'
             'fc30dd32f48fe1c93bf36c8297ca48203a1479e4e221ebe62c57cf3c3c0347d3'
@@ -44,14 +42,10 @@ sha256sums=('aa53591e89eacc3491ab472dc4df998780fb6747eea3b97ecb7a9f81ff2c9a5e'
             '7a19b9f90c8792460fd58e8b8aa435a065e34d29a942479850472510e9d3078a'
             '8d39f080c7a2e49226db3a785f3e18583159ef2f95e1ab467fd9984c4e38c9f5'
             'a7076156703e2b949331e450455813432caeb4e5712f1c7b668974eb06a69fb9'
-            '55b05dec917d5a55f2a7c3b76c5111d2cdbb3694968049fca5cdb089cb18e390'
-            '2ca764b5942fc3beea48596d5e1ec0335f712653e0206a85038009cd4c0b5ec3'
 )
 
 prepare() {
     cd "$pkgname-$pkgver"
-    patch -Np1 -i ../speed_up_prng.patch
-    patch -Np1 -i ../update_firefox_useragent
     #patch -Np1 -i ../upstream.patch ||true
     #cp -f ../dbip-country-lite-$(date +%Y-%m).mmdb.gz installer/resources/GeoLite2-Country.mmdb.gz
 }