uodated

3 files changed, 24 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8575214f5425..ec9df30aee0a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sun Dec 27 12:34:12 UTC 2015
 pkgbase = i2pd-git
 	pkgdesc = Simplified C++ implementation of I2P client
-	pkgver = 2020.da8a6a4
+	pkgver = 2126.196d7e8
 	pkgrel = 1
 	url = https://github.com/PurpleI2P/i2pd
 	install = i2pd.install
@@ -11,14 +13,16 @@ pkgbase = i2pd-git
 	makedepends = boost
 	makedepends = cmake
 	depends = boost-libs
+	depends = libupnp
 	depends = openssl
+	depends = zlib
 	backup = var/lib/i2pd/i2p.conf
 	source = i2pd::git+https://github.com/PurpleI2P/i2pd.git
 	source = i2pd.service
 	source = i2p.conf
 	source = i2pd.tmpfiles.conf
 	md5sums = SKIP
-	md5sums = c37b5470c959e826be8eb40c8f1ece93
+	md5sums = 7125bfdcbb5050c5fbf7531861dc82fa
 	md5sums = b145e41e22806bd4ca4f4064ec4721a2
 	md5sums = 862be388708f2b1bd5f727715ec7508d
 
diff --git a/PKGBUILD b/PKGBUILD
index 9b7788c5b09a..be2279ce806c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,36 @@
 #Maintainer: M0Rf30
 
 pkgname=i2pd-git
-pkgver=2020.da8a6a4
+pkgver=2126.196d7e8
 pkgrel=1
 pkgdesc="Simplified C++ implementation of I2P client"
 arch=('i686' 'x86_64')
 url="https://github.com/PurpleI2P/i2pd"
 license=('GPL2')
-depends=('boost-libs' 'openssl')
+depends=('boost-libs' 'libupnp' 'openssl' 'zlib')
 makedepends=('git' 'boost' 'cmake')
 source=('i2pd::git+https://github.com/PurpleI2P/i2pd.git'
 	i2pd.service
 	i2p.conf
 	i2pd.tmpfiles.conf)
 install=i2pd.install
-backup=var/lib/i2pd/i2p.conf
+backup=(var/lib/i2pd/i2p.conf)
 
 build() {
-  cd i2pd
-  make CXXFLAGS="$CXXFLAGS"
+  cd i2pd/build
+  mkdir tmp
+  cd tmp
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DWITH_BINARY=ON -DWITH_LIBRARY=ON -DWITH_UPNP=ON ..
+  make
 }
 
 package(){
-  cd i2pd
-  install -Dm755 i2p $pkgdir/usr/bin/i2p
+  cd i2pd/build/tmp
+  make DESTDIR=$pkgdir install  
+
+
   install -Dm0644 $srcdir/i2pd.service $pkgdir/usr/lib/systemd/system/i2pd.service
-  install -Dm0644 ../i2p.conf $pkgdir/var/lib/i2pd/i2p.conf
+  install -Dm0644 $srcdir/i2p.conf $pkgdir/var/lib/i2pd/i2p.conf
   install -Dm0644 $srcdir/i2pd.tmpfiles.conf $pkgdir/usr/lib/tmpfiles.d/i2pd.conf
 }
 
@@ -38,3 +43,7 @@ md5sums=('SKIP'
          'c37b5470c959e826be8eb40c8f1ece93'
          'b145e41e22806bd4ca4f4064ec4721a2'
          '862be388708f2b1bd5f727715ec7508d')
+md5sums=('SKIP'
+         '7125bfdcbb5050c5fbf7531861dc82fa'
+         'b145e41e22806bd4ca4f4064ec4721a2'
+         '862be388708f2b1bd5f727715ec7508d')
diff --git a/i2pd.service b/i2pd.service
index 8de42e2f3c42..871311fe5ee3 100644
--- a/i2pd.service
+++ b/i2pd.service
@@ -6,7 +6,7 @@ After=network.target
 User=i2p
 Group=i2p
 Type=forking
-ExecStart=/usr/bin/i2p --conf=/var/lib/i2pd/i2p.conf --service=1 --daemon=1
+ExecStart=/usr/bin/i2pd --conf=/var/lib/i2pd/i2p.conf --service=1 --daemon=1
 ExecReload=/usr/bin/kill -HUP $MAINPID
 PIDFile=/run/i2pd.pid
 KillSignal=SIGINT