2.0.2

2 files changed, 29 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 507250a8ccfe..066d7a0c02a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = postsrsd
 	pkgdesc = Provides the Sender Rewriting Scheme (SRS) via TCP-based lookup tables for Postfix
-	pkgver = 1.12
-	pkgrel = 2
+	pkgver = 2.0.2
+	pkgrel = 1
 	url = https://github.com/roehling/postsrsd
 	install = postsrsd.install
 	arch = i686
@@ -11,12 +11,14 @@ pkgbase = postsrsd
 	makedepends = cmake
 	makedepends = help2man
 	depends = glibc
+	backup = etc/postsrsd/postsrsd.conf
+	backup = etc/postsrsd/postsrsd.secret
 	backup = etc/postsrsd/postsrsd
-	source = postsrsd-1.12.tar.gz::https://github.com/roehling/postsrsd/archive/1.12.tar.gz
+	source = postsrsd-2.0.2.tar.gz::https://github.com/roehling/postsrsd/archive/2.0.2.tar.gz
 	source = postsrsd.install
 	source = sysusers.d-postsrsd.conf
 	source = tmpfiles.d-postsrsd.conf
-	md5sums = 59bb2b7b4719973666fe7ccc001651a0
+	md5sums = 47c93ba758aee373675fa228c5febeda
 	md5sums = 4b12fbf341433767850a571128199bad
 	md5sums = cee1be46359eb9b6a44d1fac3cbc718b
 	md5sums = bb1644c030c69054a9d083a6f1245d50
diff --git a/PKGBUILD b/PKGBUILD
index 442265e2de23..3a20f1703b97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,51 @@
 pkgname=postsrsd
-pkgver=1.12
-pkgrel=2
+pkgver=2.0.2
+pkgrel=1
 pkgdesc="Provides the Sender Rewriting Scheme (SRS) via TCP-based lookup tables for Postfix"
 arch=('i686' 'x86_64' 'armv7h')
 depends=('glibc')
 makedepends=('cmake' 'help2man')
-backup=('etc/postsrsd/postsrsd')
-url="https://github.com/roehling/postsrsd"
-install=postsrsd.install
+backup=("etc/$pkgname/$pkgname.conf" "etc/$pkgname/$pkgname.secret" "etc/$pkgname/$pkgname")    #last entry is legacy from version 1
+url="https://github.com/roehling/$pkgname"
+install=$pkgname.install
 license=(GPL2)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/roehling/postsrsd/archive/${pkgver}.tar.gz"
-        "${pkgname}.install" "sysusers.d-postsrsd.conf" "tmpfiles.d-postsrsd.conf")
-md5sums=('59bb2b7b4719973666fe7ccc001651a0'
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/roehling/$pkgname/archive/${pkgver}.tar.gz"
+        "${pkgname}.install" "sysusers.d-$pkgname.conf" "tmpfiles.d-$pkgname.conf")
+md5sums=('47c93ba758aee373675fa228c5febeda'
          '4b12fbf341433767850a571128199bad'
          'cee1be46359eb9b6a44d1fac3cbc718b'
          'bb1644c030c69054a9d083a6f1245d50')
 
 check() {
-  cd "$srcdir/postsrsd-$pkgver/build"
+  cd "$srcdir/$pkgname-$pkgver/build"
   make test
 }
 
 build() {
-  cd "$srcdir/postsrsd-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   [[ -d build ]] && rm -rf build
   mkdir build
   cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DGENERATE_SRS_SECRET=OFF -DCONFIG_DIR=/etc/postsrsd -DINIT_FLAVOR=systemd
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DGENERATE_SRS_SECRET=OFF -DCONFIG_DIR=/etc/$pkgname -DINIT_FLAVOR=systemd
   make all
 }
 
 package() {
-  cd "$srcdir/postsrsd-$pkgver/build"
+  cd "$srcdir/$pkgname-$pkgver/build"
   make DESTDIR="$pkgdir/" install
+  mkdir -p "$pkgdir/var/spool/postfix/srs"
+  chown postsrsd:root "$pkgdir/var/spool/postfix/srs"
 
+  # dont use sbin anymore
   mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin"
-  sed -i -e 's/^\(RUN_AS=\)nobody/#\1postsrsd/;s/\(\/etc\/postsrsd\)\(\.secret\)/\1\/postsrsd\2/' \
-      -e 's/^\(# is \).*$/\1localhost\.localdomain/' \
-      "$pkgdir/etc/postsrsd/postsrsd"
-  mkdir -p "$pkgdir/usr/lib/systemd/system"
-  install -Dm644 "$srcdir/sysusers.d-postsrsd.conf" "$pkgdir/usr/lib/sysusers.d/postsrsd.conf"
-  install -Dm644 "$srcdir/tmpfiles.d-postsrsd.conf" "$pkgdir/usr/lib/tmpfiles.d/postsrsd.conf"
 
-  # fix systemd unit location
-  mkdir -p "$pkgdir"/usr/lib/systemd/system/
-  mv "$pkgdir"/etc/systemd/system/postsrsd.service "$pkgdir"/usr/lib/systemd/system/
+  # install configs
+  install -Dm644 "$srcdir/sysusers.d-$pkgname.conf" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+  install -Dm644 "$srcdir/tmpfiles.d-$pkgname.conf" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+  install -Dm644 "$srcdir/$pkgname-$pkgver/build/$pkgname.conf" "$pkgdir/etc/$pkgname/$pkgname.conf"
 
+  # patch config
+  sed -i "s#/etc/$pkgname.conf#/etc/$pkgname/$pkgname.conf#g" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  sed -i "s#sbin#bin#g" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  sed -i "s#/etc/$pkgname.secret#/etc/$pkgname/$pkgname.secret#g" "$pkgdir/etc/$pkgname/$pkgname.conf"
 }