updated

author: M0Rf30 2016-01-18 12:01:26 +0100
committer: M0Rf30 2016-01-18 12:01:26 +0100
commit: 63fc3e81f3cdfb259e5025fdd6e2b597249b65ee (patch)
tree: 7bc9a0867b899d57f1d33889e74740c61c2bf0d3
parent: b44ea252e848a1c9554d2c7fdb9284fc5ade3453 (diff)
download: aur-63fc3e81f3cdfb259e5025fdd6e2b597249b65ee.tar.gz
5 files changed, 67 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f2d4d5ffe8b7..e87c49b53b13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 # Generated by mksrcinfo v8
-# Tue Dec 29 12:51:42 UTC 2015
+# Mon Jan 18 11:01:17 UTC 2016
 pkgbase = i2pd-git
 	pkgdesc = Simplified C++ implementation of I2P client
-	pkgver = 2135.2cc3dfc
+	pkgver = 2171.870e84a
 	pkgrel = 1
 	url = https://github.com/PurpleI2P/i2pd
 	install = i2pd.install
 	arch = i686
 	arch = x86_64
-	license = GPL2
+	license = BSD
 	makedepends = git
 	makedepends = boost
 	makedepends = cmake
@@ -16,15 +16,15 @@ pkgbase = i2pd-git
 	depends = miniupnpc
 	depends = openssl
 	depends = zlib
-	backup = var/lib/i2pd/i2p.conf
+	conflicts = i2pd
+	backup = var/lib/i2pd/i2pd.conf
+	backup = var/lib/i2pd/tunnels.cfg
 	source = i2pd::git+https://github.com/PurpleI2P/i2pd.git
 	source = i2pd.service
-	source = i2p.conf
 	source = i2pd.tmpfiles.conf
 	md5sums = SKIP
-	md5sums = 7125bfdcbb5050c5fbf7531861dc82fa
-	md5sums = b145e41e22806bd4ca4f4064ec4721a2
-	md5sums = 862be388708f2b1bd5f727715ec7508d
+	md5sums = 44a284eaa8719db82e68bd5a2df7e306
+	md5sums = acda29e5b46a0c9fade734a6a467b381
 
 pkgname = i2pd-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 5394c9692088..117e541e4cb6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,60 @@
-#Maintainer: M0Rf30
+#Maintainer: Unknown
 
 pkgname=i2pd-git
-pkgver=2135.2cc3dfc
+_pkgname=i2pd
+pkgver=2171.870e84a
 pkgrel=1
 pkgdesc="Simplified C++ implementation of I2P client"
 arch=('i686' 'x86_64')
 url="https://github.com/PurpleI2P/i2pd"
-license=('GPL2')
+license=('BSD')
 depends=('boost-libs' 'miniupnpc' '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/i2pd.conf
+        var/lib/i2pd/tunnels.cfg)
+conflicts=('i2pd')
 
 build() {
-  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 ..
+  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
 }
 
 package(){
-  cd i2pd/build/tmp
-  make DESTDIR=$pkgdir install  
+  cd build.tmp
+  make DESTDIR=$pkgdir install
 
+  rm -r $pkgdir/usr/src  
+  rm $pkgdir/usr/LICENSE  
+  rm $pkgdir/usr/lib/libi2pd.a  
 
   install -Dm0644 $srcdir/i2pd.service $pkgdir/usr/lib/systemd/system/i2pd.service
-  install -Dm0644 $srcdir/i2p.conf $pkgdir/var/lib/i2pd/i2p.conf
   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
+
+  cd $srcdir/i2pd/contrib
+  _dest="$pkgdir/var/lib/${_pkgname}"
+  find ./certificates -type d -exec install -d {} ${_dest}/{} \;
+  find ./certificates -type f -exec install -Dm644 {} ${_dest}/{} \;
+
+  # license
+  install -Dm644 $srcdir/i2pd/LICENSE "$pkgdir/usr/share/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"
+
+  #man
+  install -Dm644 $srcdir/i2pd/debian/i2pd.1 "$pkgdir/usr/share/man/man1/i2pd.1"
+
+  chmod -R o= $pkgdir/var/lib/i2pd
 }
 
 pkgver() {
@@ -40,6 +63,5 @@ pkgver() {
 }
 
 md5sums=('SKIP'
-         '7125bfdcbb5050c5fbf7531861dc82fa'
-         'b145e41e22806bd4ca4f4064ec4721a2'
-         '862be388708f2b1bd5f727715ec7508d')
+         '44a284eaa8719db82e68bd5a2df7e306'
+         'acda29e5b46a0c9fade734a6a467b381')
diff --git a/i2pd.install b/i2pd.install
index 2ad255f33188..d6c47ac98234 100644
--- a/i2pd.install
+++ b/i2pd.install
@@ -1,20 +1,25 @@
-home=/var/lib/i2pd
-pidfile=/run/i2pd.pid
+USER=i2p
+HOME=/var/lib/i2pd
+
 post_install() {
-  groupadd -g 44 i2p &>/dev/null
-  useradd -u 44 -g i2p -d ${home} -s /bin/nologin i2p &> /dev/null
-  chown i2p:i2p -R ${home} ${pidfile} &> /dev/null
-  chmod 700 ${home} &> /dev/null
-  systemd-tmpfiles --create i2pd.conf
+    getent passwd ${USER} &>/dev/null || {
+        echo -n ">>> Creating ${USER} user... "
+        useradd --system --user-group --home ${HOME} ${USER}
+        echo "done"
+    }
+    post_upgrade
 }
 
 post_upgrade() {
-  getent group i2p &>/dev/null || groupadd -g 44 i2p &>/dev/null
-  getent passwd i2p &>/dev/null || useradd -u 44 -g i2p -d ${home} -s /bin/nologin i2p &> /dev/null
-  chown i2p:i2p -R ${home} ${pidfile} &> /dev/null
+    systemd-tmpfiles --create i2pd.conf
+    chown -R ${USER}:${USER} ${HOME}
+    chmod -R o-rwx ${HOME}
 }
 
 pre_remove() {
-  getent passwd i2p &>/dev/null && userdel i2p &> /dev/null
-  getent group i2p &>/dev/null && groupdel i2p &> /dev/null
+    getent passwd ${USER} &>/dev/null && {
+        echo -n ">>> Removing ${USER} user... "
+        userdel ${USER}
+        echo "done"
+    }
 }
diff --git a/i2pd.service b/i2pd.service
index 871311fe5ee3..d731a5cdb44a 100644
--- a/i2pd.service
+++ b/i2pd.service
@@ -6,9 +6,11 @@ After=network.target
 User=i2p
 Group=i2p
 Type=forking
-ExecStart=/usr/bin/i2pd --conf=/var/lib/i2pd/i2p.conf --service=1 --daemon=1
+ExecStart=/usr/bin/i2pd --conf=/var/lib/i2pd/i2pd.conf --pidfile=/run/i2pd/i2pd.pid --service=1 --daemon=1
 ExecReload=/usr/bin/kill -HUP $MAINPID
-PIDFile=/run/i2pd.pid
+PIDFile=/run/i2pd/i2pd.pid
+### Uncomment, if auto restart needed
+#Restart=on-failure
 KillSignal=SIGINT
 LimitNOFILE=8192
 PrivateDevices=yes
diff --git a/i2pd.tmpfiles.conf b/i2pd.tmpfiles.conf
index 922f7ce43509..cbd9f6480db2 100644
--- a/i2pd.tmpfiles.conf
+++ b/i2pd.tmpfiles.conf
@@ -1,2 +1,2 @@
-f /run/i2pd.pid 0775 i2p i2p -
+d /run/i2pd 0755 i2p i2p -
author	M0Rf30	2016-01-18 12:01:26 +0100
committer	M0Rf30	2016-01-18 12:01:26 +0100
commit	63fc3e81f3cdfb259e5025fdd6e2b597249b65ee (patch)
tree	7bc9a0867b899d57f1d33889e74740c61c2bf0d3
parent	b44ea252e848a1c9554d2c7fdb9284fc5ade3453 (diff)
download	aur-63fc3e81f3cdfb259e5025fdd6e2b597249b65ee.tar.gz