diff options
| -rw-r--r-- | .SRCINFO | 22 | ||||
| -rw-r--r-- | PKGBUILD | 71 | ||||
| -rw-r--r-- | i2pd.install | 29 | ||||
| -rw-r--r-- | i2pd.service | 6 | ||||
| -rw-r--r-- | i2pd.tmpfiles.conf | 2 |
5 files changed, 78 insertions, 52 deletions
@@ -1,29 +1,29 @@ # Generated by mksrcinfo v8 -# Tue Dec 29 12:49:48 UTC 2015 +# Mon Jan 18 10:59:06 UTC 2016 pkgbase = i2pd pkgdesc = Simplified C++ implementation of I2P client - pkgver = 2.2.0 - pkgrel = 2 + pkgver = 2.3.0 + pkgrel = 1 url = https://github.com/PurpleI2P/i2pd install = i2pd.install arch = i686 arch = x86_64 - license = GPL2 + license = BSD makedepends = boost makedepends = cmake depends = boost-libs depends = miniupnpc depends = openssl depends = zlib - conflicts = i2pd-git - source = https://github.com/PurpleI2P/i2pd/archive/2.2.0.tar.gz + conflicts = i2pd + backup = var/lib/i2pd/i2pd.conf + backup = var/lib/i2pd/tunnels.cfg + source = https://github.com/PurpleI2P/i2pd/archive/2.3.0.tar.gz source = i2pd.service - source = i2p.conf source = i2pd.tmpfiles.conf - md5sums = 62aa474f0039ab1791c3b0958ba87adc - md5sums = 7125bfdcbb5050c5fbf7531861dc82fa - md5sums = b145e41e22806bd4ca4f4064ec4721a2 - md5sums = 862be388708f2b1bd5f727715ec7508d + md5sums = 1368bdc2b8fbf5ef6fa92c00accadeb0 + md5sums = 20e3e171eb26697ff8fc7511f5c7473f + md5sums = acda29e5b46a0c9fade734a6a467b381 pkgname = i2pd @@ -1,42 +1,61 @@ -# Maintainer: M0Rf30 +#Maintainer: Unknown pkgname=i2pd -pkgver=2.2.0 -pkgrel=2 +pkgver=2.3.0 +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=(boost cmake) -conflicts=(i2pd-git) -install=i2pd.install +makedepends=('boost' 'cmake') source=(https://github.com/PurpleI2P/${pkgname}/archive/${pkgver}.tar.gz - i2pd.service - i2p.conf + i2pd.service i2pd.tmpfiles.conf) +install=i2pd.install +backup=(var/lib/i2pd/i2pd.conf + var/lib/i2pd/tunnels.cfg) +conflicts=('i2pd') build() { - cd $srcdir/$pkgname-$pkgver - cd build - mkdir tmp - cd tmp - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DWITH_BINARY=ON -DWITH_LIBRARY=ON -DWITH_UPNP=ON .. - make + mkdir -p build.tmp + cd build.tmp + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DWITH_LIBRARY=OFF -DWITH_UPNP=ON ../$pkgname-$pkgver/build + make } -package() { - cd $srcdir/$pkgname-$pkgver - cd build/tmp - make DESTDIR=$pkgdir install +package(){ + 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/i2pd.tmpfiles.conf $pkgdir/usr/lib/tmpfiles.d/i2pd.conf + install -Dm0644 $srcdir/$pkgname-$pkgver/debian/i2pd.conf $pkgdir/var/lib/i2pd/i2pd.conf + install -Dm0644 $srcdir/$pkgname-$pkgver/debian/tunnels.conf $pkgdir/var/lib/i2pd/tunnels.cfg + install -Dm0644 $srcdir/$pkgname-$pkgver/debian/subscriptions.txt $pkgdir/var/lib/i2pd/subscriptions.txt + + cd $srcdir/$pkgname-$pkgver/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/$pkgname-$pkgver/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # docs + install -Dm644 $srcdir/$pkgname-$pkgver/README.md "$pkgdir/usr/share/doc/$pkgname/README.md" + install -Dm644 $srcdir/$pkgname-$pkgver/docs/configuration.md "$pkgdir/usr/share/doc/$pkgname/configuration.md" + #man + install -Dm644 $srcdir/$pkgname-$pkgver/debian/i2pd.1 "$pkgdir/usr/share/man/man1/i2pd.1" - 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 + chmod -R o= $pkgdir/var/lib/i2pd } -md5sums=('62aa474f0039ab1791c3b0958ba87adc' - '7125bfdcbb5050c5fbf7531861dc82fa' - 'b145e41e22806bd4ca4f4064ec4721a2' - '862be388708f2b1bd5f727715ec7508d') +md5sums=('1368bdc2b8fbf5ef6fa92c00accadeb0' + '20e3e171eb26697ff8fc7511f5c7473f' + 'acda29e5b46a0c9fade734a6a467b381') diff --git a/i2pd.install b/i2pd.install index 2ad255f33188..ec8e914ff755 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..4102338266ae 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 +PIDFile=/run/i2pd/i2pd.pid +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 +### 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 - |