updated

2 files changed, 41 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dff4279864ba..83b75c7f5dbb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Feb 10 13:40:52 UTC 2016
+# Wed Mar  9 13:22:59 UTC 2016
 pkgbase = i2pd-git
 	pkgdesc = Simplified C++ implementation of I2P client
-	pkgver = 2321.72b3c10
+	pkgver = 2443.b486483
 	pkgrel = 1
 	url = https://github.com/PurpleI2P/i2pd
 	install = i2pd.install
@@ -11,15 +11,13 @@ pkgbase = i2pd-git
 	license = BSD
 	makedepends = git
 	makedepends = boost
-	makedepends = cmake
 	depends = boost-libs
-	depends = miniupnpc
 	depends = openssl
 	depends = zlib
 	conflicts = i2pd
-	backup = var/lib/i2pd/i2pd.conf
-	backup = var/lib/i2pd/tunnels.cfg
-	source = i2pd::git+https://github.com/PurpleI2P/i2pd.git
+	backup = etc/i2pd/i2pd.conf
+	backup = etc/i2pd/tunnels.cfg
+	source = i2pd::git+https://github.com/PurpleI2P/i2pd.git#branch=master
 	source = i2pd.service
 	source = i2pd.tmpfiles.conf
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 8e81c7d8712c..04988ff98bf5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,65 +1,73 @@
-#Maintainer: Unknown
+#Maintainer: M0Rf30
+#Contributor: kurych
 
 pkgname=i2pd-git
 _pkgname=i2pd
-pkgver=2321.72b3c10
+pkgver=2443.b486483
 pkgrel=1
 pkgdesc="Simplified C++ implementation of I2P client"
 arch=('i686' 'x86_64')
 url="https://github.com/PurpleI2P/i2pd"
 license=('BSD')
-depends=('boost-libs' 'miniupnpc' 'openssl' 'zlib')
-makedepends=('git' 'boost' 'cmake')
-source=('i2pd::git+https://github.com/PurpleI2P/i2pd.git'
-	i2pd.service
-	i2pd.tmpfiles.conf)
+depends=('boost-libs' 'openssl' 'zlib')
+makedepends=('git' 'boost')
+source=('i2pd::git+https://github.com/PurpleI2P/i2pd.git#branch=master'
+        i2pd.service
+        i2pd.tmpfiles.conf)
 install=i2pd.install
-backup=(var/lib/i2pd/i2pd.conf
-        var/lib/i2pd/tunnels.cfg)
+backup=(etc/i2pd/i2pd.conf etc/i2pd/tunnels.cfg)
 conflicts=('i2pd')
 
 build() {
-  mkdir -p build.tmp
-  cd build.tmp
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DWITH_LIBRARY=OFF -DWITH_UPNP=ON ../${_pkgname}/build
-  make
+  cd $srcdir/i2pd
+  CXXFLAGS="-Wall -O2 -fstack-protector-strong" USE_UPNP=1 make
 }
 
 package(){
-  cd build.tmp
-  make DESTDIR=$pkgdir install
+        _bin_dest=usr/bin
+        _conf_dest=etc/${_pkgname}
+        _home_dest=var/lib/${_pkgname}
+        _share_dest=usr/share
 
-  rm -r $pkgdir/usr/src  
-  rm $pkgdir/usr/LICENSE  
-  rm $pkgdir/usr/lib/libi2pd.a  
+  install -Dm755 $srcdir/i2pd/i2pd "$pkgdir/${_bin_dest}/i2pd"
 
   install -Dm0644 $srcdir/i2pd.service $pkgdir/usr/lib/systemd/system/i2pd.service
   install -Dm0644 $srcdir/i2pd.tmpfiles.conf $pkgdir/usr/lib/tmpfiles.d/i2pd.conf
-  install -Dm0644 $srcdir/i2pd/debian/i2pd.conf $pkgdir/var/lib/i2pd/i2pd.conf
-  install -Dm0644 $srcdir/i2pd/debian/tunnels.conf $pkgdir/var/lib/i2pd/tunnels.cfg
-  install -Dm0644 $srcdir/i2pd/debian/subscriptions.txt $pkgdir/var/lib/i2pd/subscriptions.txt
+
+  install -Dm0644 $srcdir/i2pd/debian/i2pd.conf $pkgdir/${_conf_dest}/i2pd.conf
+  install -Dm0644 $srcdir/i2pd/debian/tunnels.conf $pkgdir/${_conf_dest}/tunnels.cfg
+  install -Dm0644 $srcdir/i2pd/debian/subscriptions.txt $pkgdir/${_conf_dest}/subscriptions.txt
+
+  install -d -m0750 $pkgdir/${_home_dest}
+  ln -s /${_conf_dest}/i2pd.conf $pkgdir/${_home_dest}/i2pd.conf
+  ln -s /${_conf_dest}/tunnels.cfg $pkgdir/${_home_dest}/tunnels.cfg
+  ln -s /${_conf_dest}/subscriptions.txt $pkgdir/${_home_dest}/subscriptions.txt
 
   cd $srcdir/i2pd/contrib
-  _dest="$pkgdir/var/lib/${_pkgname}"
+  _dest="$pkgdir/${_share_dest}/${_pkgname}"
   find ./certificates -type d -exec install -d {} ${_dest}/{} \;
   find ./certificates -type f -exec install -Dm644 {} ${_dest}/{} \;
+  ln -s /${_share_dest}/${_pkgname}/certificates $pkgdir/${_home_dest}/certificates
 
   # license
-  install -Dm644 $srcdir/i2pd/LICENSE "$pkgdir/usr/share/licenses/${_pkgname}/LICENSE"
+  install -Dm644 $srcdir/i2pd/LICENSE "$pkgdir/${_share_dest}/licenses/${_pkgname}/LICENSE"
 
   # docs
-  install -Dm644 $srcdir/i2pd/README.md "$pkgdir/usr/share/doc/${_pkgname}/README.md"
-  install -Dm644 $srcdir/i2pd/docs/configuration.md "$pkgdir/usr/share/doc/${_pkgname}/configuration.md"
+  _dest="$pkgdir/${_share_dest}/doc/${_pkgname}"
+  install -Dm644 $srcdir/i2pd/README.md "${_dest}/README.md"
+  install -Dm644 $srcdir/i2pd/docs/configuration.md "${_dest}/configuration.md"
+  install -Dm644 $srcdir/i2pd/docs/family.md "${_dest}/family.md"
+  install -Dm644 $srcdir/i2pd/docs/config_opts_after_2.3.0.md "${_dest}/config_opts_after_2.3.0.md"
 
   #man
-  install -Dm644 $srcdir/i2pd/debian/i2pd.1 "$pkgdir/usr/share/man/man1/i2pd.1"
+  install -Dm644 $srcdir/i2pd/debian/i2pd.1 "$pkgdir/${_share_dest}/man/man1/i2pd.1"
 
-  chmod -R o= $pkgdir/var/lib/i2pd
+  chmod -R o= $pkgdir/${_home_dest}
 }
 
 pkgver() {
   cd i2pd
-  echo $(git rev-list --count openssl).$(git rev-parse --short openssl)
+  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
 md5sums=('SKIP'