paths fixed and removed deprecated logfile option in systemd service

3 files changed, 43 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc2450ab7905..6f5d5645a72a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 # Generated by mksrcinfo v8
-# Fri Dec 23 15:45:12 UTC 2016
+# Mon Feb  6 21:33:00 UTC 2017
 pkgbase = i2pd-git
 	pkgdesc = Simplified C++ implementation of I2P client
-	pkgver = 2.11.0.r14.gfc08d15a
+	pkgver = 2.11.0.r209.g040585bf
 	pkgrel = 1
 	url = https://github.com/PurpleI2P/i2pd
 	install = i2pd.install
 	arch = i686
 	arch = x86_64
+	arch = armv7h
 	license = BSD
 	makedepends = boost
 	depends = boost-libs
@@ -22,7 +23,7 @@ pkgbase = i2pd-git
 	source = i2pd.service
 	source = i2pd.tmpfiles.conf
 	md5sums = SKIP
-	md5sums = 382cce43a405c67de55b71e9e2e3a0eb
+	md5sums = 6e9869d619464902e635e520d21a8a56
 	md5sums = 384658d2792ef6433d2de70ebc9d40d4
 
 pkgname = i2pd-git
diff --git a/PKGBUILD b/PKGBUILD
index e780902aaeb1..4e7b44ac2b6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgname=i2pd-git
 _pkgname=i2pd
-pkgver=2.11.0.r14.gfc08d15a
+pkgver=2.11.0.r209.g040585bf
 pkgrel=1
 pkgdesc="Simplified C++ implementation of I2P client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv7h')
 url="https://github.com/PurpleI2P/i2pd"
 license=('BSD')
 depends=('boost-libs' 'miniupnpc' 'openssl' 'zlib' 'websocketpp')
@@ -21,9 +21,9 @@ backup=(etc/i2pd/i2pd.conf
 conflicts=('i2pd')
 
 build() {
-  cd $srcdir/i2pd
+  cd $srcdir/${_pkgname}
   cd build
-  cmake . -Wno-dev \
+  cmake . -DCMAKE_CXX_FLAGS="-w" \
 	  -DCMAKE_INSTALL_PREFIX=/usr \
 	  -DWITH_UPNP=1 -DWITH_PCH=1 \
 	  -DCMAKE_BUILD_TYPE=Release
@@ -31,56 +31,55 @@ build() {
 }
 
 package(){
-  _conf_dest=etc/${pkgname}
-  _home_dest=var/lib/${pkgname}
-  _share_dest=usr/share
+        _conf_dest=etc/${_pkgname}
+        _home_dest=var/lib/${_pkgname}
+        _share_dest=usr/share
 
-cd $srcdir/i2pd
+	cd $srcdir/${_pkgname}
 
-cd build
-make DESTDIR=$pkgdir install
-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
+	cd build
+	make DESTDIR=$pkgdir install
+  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/$pkgname-$pkgver/docs/i2pd.conf $pkgdir/${_conf_dest}/i2pd.conf
-install -Dm0644 $srcdir/$pkgname-$pkgver/docs/tunnels.conf $pkgdir/${_conf_dest}/tunnels.conf
-install -Dm0644 $srcdir/$pkgname-$pkgver/docs/subscriptions.txt $pkgdir/${_conf_dest}/subscriptions.txt
+  install -Dm0644 $srcdir/${_pkgname}-$pkgver/docs/i2pd.conf $pkgdir/${_conf_dest}/i2pd.conf
+  install -Dm0644 $srcdir/${_pkgname}-$pkgver/docs/tunnels.conf $pkgdir/${_conf_dest}/tunnels.conf
+  install -Dm0644 $srcdir/${_pkgname}-$pkgver/docs/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.conf $pkgdir/${_home_dest}/tunnels.conf
-ln -s /${_conf_dest}/subscriptions.txt $pkgdir/${_home_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.conf $pkgdir/${_home_dest}/tunnels.conf
+  ln -s /${_conf_dest}/subscriptions.txt $pkgdir/${_home_dest}/subscriptions.txt
 
-cd $srcdir/$pkgname-$pkgver/contrib
-_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
+  cd $srcdir/${_pkgname}/contrib
+  _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/$pkgname-$pkgver/LICENSE "$pkgdir/${_share_dest}/licenses/${_pkgname}/LICENSE"
+  # license
+  install -Dm644 $srcdir/${_pkgname}/LICENSE "$pkgdir/${_share_dest}/licenses/${_pkgname}/LICENSE"
 
-# docs
-_dest="$pkgdir/${_share_dest}/doc/${_pkgname}"
-install -Dm644 $srcdir/$pkgname-$pkgver/README.md "${_dest}/README.md"
-install -Dm644 $srcdir/$pkgname-$pkgver/docs/configuration.md "${_dest}/configuration.md"
-install -Dm644 $srcdir/$pkgname-$pkgver/docs/family.md "${_dest}/family.md"
-install -Dm644 $srcdir/$pkgname-$pkgver/docs/config_opts_after_2.3.0.md "${_dest}/config_opts_after_2.3.0.md"
+  # docs
+  _dest="$pkgdir/${_share_dest}/doc/${_pkgname}"
+  install -Dm644 $srcdir/${_pkgname}/README.md "${_dest}/README.md"
+  install -Dm644 $srcdir/${_pkgname}/docs/configuration.md "${_dest}/configuration.md"
+  install -Dm644 $srcdir/${_pkgname}/docs/family.md "${_dest}/family.md"
+  install -Dm644 $srcdir/${_pkgname}/docs/config_opts_after_2.3.0.md "${_dest}/config_opts_after_2.3.0.md"
 
-# remove src folder
-rm -r "$pkgdir/usr/src"
+  # remove src folder and LICENSE
+  rm -r $pkgdir/usr/{src,LICENSE}
 
-#man
-install -Dm644 $srcdir/$pkgname-$pkgver/debian/i2pd.1 "$pkgdir/${_share_dest}/man/man1/i2pd.1"
+  #man
+  install -Dm644 $srcdir/${_pkgname}/debian/i2pd.1 "$pkgdir/${_share_dest}/man/man1/i2pd.1"
 
-chmod -R o= $pkgdir/${_home_dest}
+  chmod -R o= $pkgdir/${_home_dest}
 }
-
 pkgver() {
   cd i2pd
   echo $(git describe --tags --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
 }
 
 md5sums=('SKIP'
-         '382cce43a405c67de55b71e9e2e3a0eb'
+         '6e9869d619464902e635e520d21a8a56'
          '384658d2792ef6433d2de70ebc9d40d4')
diff --git a/i2pd.service b/i2pd.service
index 0a51b4ef20a8..604aa1ca4666 100644
--- a/i2pd.service
+++ b/i2pd.service
@@ -10,7 +10,7 @@ User=i2pd
 Group=i2pd
 LimitNOFILE=4096
 PermissionsStartOnly=yes
-ExecStart=/usr/bin/i2pd --daemon --service --pidfile=/run/i2pd/i2pd.pid --log=file --logfile=/var/log/i2pd/i2pd.log --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf
+ExecStart=/usr/bin/i2pd --daemon --service --pidfile=/run/i2pd/i2pd.pid --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf
 
 [Install]
 WantedBy=multi-user.target