summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD32
-rw-r--r--i2pd.service16
-rw-r--r--i2pd.tmpfiles.conf2
4 files changed, 17 insertions, 43 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c1c6cc0147fc..78971725dbd0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri Aug 18 16:02:55 UTC 2017
+# Fri Sep 8 14:19:52 UTC 2017
pkgbase = i2pd
pkgdesc = Simplified C++ implementation of I2P client
pkgver = 2.15.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/PurpleI2P/i2pd
install = i2pd.install
arch = i686
@@ -16,15 +16,11 @@ pkgbase = i2pd
depends = miniupnpc
depends = openssl
depends = zlib
- conflicts = i2pd-git
+ conflicts = $pkgname-git
backup = etc/i2pd/i2pd.conf
backup = etc/i2pd/tunnels.conf
source = https://github.com/PurpleI2P/i2pd/archive/2.15.0.tar.gz
- source = i2pd.service
- source = i2pd.tmpfiles.conf
md5sums = 8d37d0eacc2bf1f4be6d70250f5542d2
- md5sums = 6e9869d619464902e635e520d21a8a56
- md5sums = 384658d2792ef6433d2de70ebc9d40d4
pkgname = i2pd
diff --git a/PKGBUILD b/PKGBUILD
index 2f1f8721cae0..6d005f5a2944 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,20 +6,18 @@
pkgname=i2pd
pkgver=2.15.0
-pkgrel=1
+pkgrel=2
pkgdesc="Simplified C++ implementation of I2P client"
arch=('i686' 'x86_64' 'armv7h')
-url="https://github.com/PurpleI2P/i2pd"
+url="https://github.com/PurpleI2P/$pkgname"
license=('BSD')
depends=('boost-libs' 'miniupnpc' 'openssl' 'zlib')
makedepends=('boost' 'cmake')
-source=(https://github.com/PurpleI2P/${pkgname}/archive/${pkgver}.tar.gz
- i2pd.service
- i2pd.tmpfiles.conf)
-install=i2pd.install
-backup=(etc/i2pd/i2pd.conf
- etc/i2pd/tunnels.conf)
-conflicts=('i2pd-git')
+source=(https://github.com/PurpleI2P/${pkgname}/archive/${pkgver}.tar.gz)
+install=$pkgname.install
+backup=(etc/$pkgname/$pkgname.conf
+ etc/$pkgname/tunnels.conf)
+conflicts=('$pkgname-git')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -27,7 +25,6 @@ build() {
cmake . -DCMAKE_CXX_FLAGS="-w" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_UPNP=ON -DWITH_PCH=OFF \
- -DWITH_AVX=ON \
-DCMAKE_BUILD_TYPE=Release
make
}
@@ -41,15 +38,15 @@ package(){
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 ../contrib/debian/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+ install -Dm0644 ../contrib/debian/$pkgname.tmpfile $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
- install -Dm0644 $srcdir/$pkgname-$pkgver/contrib/i2pd.conf $pkgdir/${_conf_dest}/i2pd.conf
+ install -Dm0644 $srcdir/$pkgname-$pkgver/contrib/$pkgname.conf $pkgdir/${_conf_dest}/$pkgname.conf
install -Dm0644 $srcdir/$pkgname-$pkgver/contrib/tunnels.conf $pkgdir/${_conf_dest}/tunnels.conf
install -Dm0644 $srcdir/$pkgname-$pkgver/contrib/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}/$pkgname.conf $pkgdir/${_home_dest}/$pkgname.conf
ln -s /${_conf_dest}/tunnels.conf $pkgdir/${_home_dest}/tunnels.conf
ln -s /${_conf_dest}/subscriptions.txt $pkgdir/${_home_dest}/subscriptions.txt
@@ -70,10 +67,9 @@ package(){
rm -r $pkgdir/usr/{src,LICENSE}
#man
- install -Dm644 $srcdir/$pkgname-$pkgver/debian/i2pd.1 "$pkgdir/${_share_dest}/man/man1/i2pd.1"
+ install -Dm644 $srcdir/$pkgname-$pkgver/debian/$pkgname.1 "$pkgdir/${_share_dest}/man/man1/$pkgname.1"
chmod -R o= $pkgdir/${_home_dest}
}
-md5sums=('8d37d0eacc2bf1f4be6d70250f5542d2'
- '6e9869d619464902e635e520d21a8a56'
- '384658d2792ef6433d2de70ebc9d40d4')
+
+md5sums=('8d37d0eacc2bf1f4be6d70250f5542d2')
diff --git a/i2pd.service b/i2pd.service
deleted file mode 100644
index 604aa1ca4666..000000000000
--- a/i2pd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=C++ daemon for accessing the I2P network
-After=network.target
-
-[Service]
-Type=forking
-Restart=on-abnormal
-PIDFile=/run/i2pd/i2pd.pid
-User=i2pd
-Group=i2pd
-LimitNOFILE=4096
-PermissionsStartOnly=yes
-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
diff --git a/i2pd.tmpfiles.conf b/i2pd.tmpfiles.conf
deleted file mode 100644
index 43f3f5bd02a4..000000000000
--- a/i2pd.tmpfiles.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d /run/i2pd 0755 i2pd i2pd -
-d /var/log/i2pd 0755 i2pd i2pd -