Adopted the package. Some changes.

4 files changed, 96 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a9d6272a710..f45761ecf8f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,31 @@
 pkgbase = postsrsd-git
 	pkgdesc = Provides the Sender Rewriting Scheme (SRS) via TCP-based lookup tables for Postfix
-	pkgver = 127.39f68b5
-	pkgrel = 2
+	pkgver = 1.11+2.r177.20210713.gafa2ca1
+	pkgrel = 1
+	epoch = 1
 	url = https://github.com/roehling/postsrsd
 	install = postsrsd.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = cmake
+	makedepends = coreutils
+	makedepends = git
 	makedepends = help2man
+	depends = bash
 	depends = glibc
+	depends = openssl
 	provides = postsrsd
 	conflicts = postsrsd
 	backup = etc/postsrsd/postsrsd.conf
+	backup = etc/default/postsrsd
 	source = git+https://github.com/roehling/postsrsd.git
-	sha1sums = SKIP
+	source = sysusers.d-postsrsd.conf
+	source = tmpfiles.d-postsrsd.conf
+	source = postsrsd.install
+	sha256sums = SKIP
+	sha256sums = f3d61362ed64e9ad33427b23b471c028b613b7eedd51dc01a203c8ba1c0e3427
+	sha256sums = 8613b3c1a6eec65d0137d97781c8919a84879c49be137b48f8bd29ee3b96cd08
+	sha256sums = 996ab88e39abbe2ef870c69624be1f404945545b42c7826b36a25aff8abcb62c
 
 pkgname = postsrsd-git
-
diff --git a/PKGBUILD b/PKGBUILD
index db916a38f492..93331ff69315 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,101 @@
-# Maintainers:
+# Maintainer: dreieck
+# Contributors:
 #   Radek Podgorny <radek@podgorny.cz>
 #   Thomas Haider <t.haider@deprecate.de>
 
 pkgname=postsrsd-git
-pkgver=127.39f68b5
-pkgrel=2
+epoch=1
+pkgver=1.11+2.r177.20210713.gafa2ca1
+pkgrel=1
 pkgdesc="Provides the Sender Rewriting Scheme (SRS) via TCP-based lookup tables for Postfix"
 provides=(postsrsd)
 conflicts=(postsrsd)
-arch=(i686 x86_64)
-depends=('glibc')
-makedepends=('cmake' 'help2man')
-backup=('etc/postsrsd/postsrsd.conf')
+arch=(
+  'i686'
+  'x86_64'
+)
+depends=(
+  'bash'
+  'glibc'
+  'openssl'
+)
+makedepends=(
+  'cmake'
+  'coreutils' # for `base64` and `dd`
+  'git'
+  'help2man'
+)
+backup=(
+  'etc/postsrsd/postsrsd.conf'
+  'etc/default/postsrsd'
+)
 url="https://github.com/roehling/postsrsd"
 install=postsrsd.install
 license=(GPL2)
-source=('git+https://github.com/roehling/postsrsd.git')
-sha1sums=('SKIP')
+source=(
+  'git+https://github.com/roehling/postsrsd.git'
+  "sysusers.d-postsrsd.conf"
+  "tmpfiles.d-postsrsd.conf"
+  "${install}"
+)
+sha256sums=(
+  'SKIP'
+  'f3d61362ed64e9ad33427b23b471c028b613b7eedd51dc01a203c8ba1c0e3427'
+  '8613b3c1a6eec65d0137d97781c8919a84879c49be137b48f8bd29ee3b96cd08'
+  '996ab88e39abbe2ef870c69624be1f404945545b42c7826b36a25aff8abcb62c'
+)
+#options=('emptydirs')
 
 pkgver() {
-  cd "$srcdir/postsrsd"
-
-  echo $(git rev-list --count master).$(git rev-parse --short master)
+  cd "${srcdir}/postsrsd"
+  _ver="$(git describe --tags | sed 's|^[vV]||' | sed -E 's|\-g[0-9a-f]+$||' | tr '-' '+')"
+  _rev="$(git rev-list --count HEAD)"
+  _date="$(git log -n 1 --format=tformat:%ci | awk '{print $1}' | tr -d '-')"
+  _hash="$(git rev-parse --short HEAD)"
+  printf '%s\n' "${_ver}.r${_rev}.${_date}.g${_hash}"
 }
 
 build() {
-  cd "$srcdir/postsrsd"
-  ###sed -e 's|${SYSCONF_DIR}/systemd/system|/usr/lib/systemd/system|g' -i postinstall.cmake.in
+  cd "${srcdir}"
+  ###sed -e 's|${SYSCONF_DIR}/systemd/system|/usr/lib/systemd/system|g' -i postsrsd/postinstall.cmake.in
   rm -rf build
   mkdir build
   cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DGENERATE_SRS_SECRET=OFF
+
+  cmake ../postsrsd \
+    -DBUILD_TESTING=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DGENERATE_SRS_SECRET=OFF \
+    -DINIT_FLAVOR=. \
+    -DUSE_APPARMOR=OFF \
+    -DUSE_SELINUX=OFF
+
   make all
 }
 
+check() {
+  cd "${srcdir}/build"
+  make test
+}
+
 package() {
-  cd "$srcdir/postsrsd/build"
-  make DESTDIR="$pkgdir/" install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}/" install
 
-  rm -rf $pkgdir/usr/lib
-  mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin"
+  #rm -rf ${pkgdir}/usr/lib
+  mv -v "${pkgdir}/usr/sbin" "${pkgdir}/usr/bin"
   sed -e 's/^\(RUN_AS=\)nobody/#\1postsrsd/;s/\(\/etc\/postsrsd\)\(\.secret\)/\1\/postsrsd\2/' \
-	  -e 's/^\(# is \).*$/\1localhost\.localdomain/'< postsrsd.default > postsrsd.conf
-  install -D -m644 "postsrsd.conf" "$pkgdir/etc/postsrsd/postsrsd.conf"
-  mkdir -p "$pkgdir/usr/lib/systemd/system"
-  install -D -m644 "postsrsd.systemd" "$pkgdir/usr/lib/systemd/system/postsrsd.service"
+      -e 's/^\(# is \).*$/\1localhost\.localdomain/' < postsrsd.default > postsrsd.conf
+  install -D -v -m644 "postsrsd.conf" "${pkgdir}/etc/postsrsd/postsrsd.conf"
+  install -D -v -m644 "postsrsd.systemd" "${pkgdir}/usr/lib/systemd/system/postsrsd.service"
+  install -D -v -m644 "${srcdir}/sysusers.d-postsrsd.conf" "${pkgdir}/usr/lib/sysusers.d/postsrsd.conf"
+  install -D -v -m644 "${srcdir}/tmpfiles.d-postsrsd.conf" "${pkgdir}/usr/lib/tmpfiles.d/postsrsd.conf"
+
+  for _docfile in README.md README.exim.md README_UPGRADE.md CODE_OF_CONDUCT.md; do
+    install -D -v -m644 "${srcdir}/postsrsd/${_docfile}" "${pkgdir}/usr/share/doc/${_docfile}"
+  done
+  for _exampleexecutable in run_postsrsd_tests.bats ; do
+    install -D -v -m755 "${srcdir}/postsrsd/${_exampleexecutable}" "${pkgdir}/usr/share/doc/${_exampleexecutable}"
+  done
 }
diff --git a/sysusers.d-postsrsd.conf b/sysusers.d-postsrsd.conf
new file mode 100644
index 000000000000..3afeab2b4ab1
--- /dev/null
+++ b/sysusers.d-postsrsd.conf
@@ -0,0 +1,2 @@
+# Type Name     ID             GECOS                 Home directory Shell
+u postsrsd  -:mail    "Postsrsd user" 
diff --git a/tmpfiles.d-postsrsd.conf b/tmpfiles.d-postsrsd.conf
new file mode 100644
index 000000000000..2dde50e139bc
--- /dev/null
+++ b/tmpfiles.d-postsrsd.conf
@@ -0,0 +1,3 @@
+#Type   Path  Mode  User    Group   Age  Argument
+d /etc/postsrsd - postsrsd root - -
+f /etc/postsrsd/postsrsd.secret 0400 postsrsd root - -