Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/~git/abslibre

4 files changed, 92 insertions, 25 deletions

diff --git a/pcr/postsrsd/PKGBUILD b/pcr/postsrsd/PKGBUILD
new file mode 100644
index 000000000..d377f36ad
--- /dev/null
+++ b/pcr/postsrsd/PKGBUILD
@@ -0,0 +1,41 @@
+# Based on
+# Maintainer: Thomas Haider <t.haider@deprecate.de>
+
+pkgname=postsrsd
+pkgver=1.1
+pkgrel=1
+pkgdesc="Provides the Sender Rewriting Scheme (SRS) via TCP-based lookup tables for Postfix"
+arch=('i686' 'x86_64')
+depends=('glibc')
+makedepends=('cmake' 'help2man')
+backup=('etc/postsrsd/postsrsd.conf')
+url="https://github.com/roehling/postsrsd"
+install=postsrsd.install
+license=('GPL2')
+source=('https://github.com/roehling/postsrsd/archive/1.1.tar.gz' 'postsrsd.service')
+md5sums=('5cde2c2ae7046347f5e17aef2ea8a4a8'
+         '64f31e8914f5063297371d36f699302d')
+
+prepare() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  mkdir build
+}
+
+build() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DGENERATE_SRS_SECRET=OFF 
+  make all
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}/build"
+  make DESTDIR="$pkgdir/" install
+  
+  rm -rf $pkgdir/usr/lib
+  mv "$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"
+  install -D -m644 "$srcdir/postsrsd.service" "$pkgdir/usr/lib/systemd/system/postsrsd.service"
+}
diff --git a/pcr/postsrsd/postsrsd.install b/pcr/postsrsd/postsrsd.install
new file mode 100644
index 000000000..b8e7f8d5a
--- /dev/null
+++ b/pcr/postsrsd/postsrsd.install
@@ -0,0 +1,15 @@
+post_install() {
+  useradd -r -g mail -d / postsrsd
+  chown -R postsrsd:root etc/postsrsd
+
+  [ -e /etc/postsrsd/postsrsd.secret ] || dd if=/dev/urandom bs=18 count=1 status=none | base64 > /etc/postsrsd/postsrsd.secret
+  chown postsrsd:root /etc/postsrsd/postsrsd.secret
+  chmod 400 /etc/postsrsd/postsrsd.secret
+  cat << _EOF
+Don't forget to set your domainname in /etc/postsrsd/postsrsd.conf
+_EOF
+}
+
+post_remove() {
+	userdel postsrsd
+}
diff --git a/pcr/postsrsd/postsrsd.service b/pcr/postsrsd/postsrsd.service
new file mode 100644
index 000000000..e72f97045
--- /dev/null
+++ b/pcr/postsrsd/postsrsd.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Postfix Sender Rewriting Scheme daemon
+ 
+[Service]
+Type=forking
+RuntimeDirectory=postsrsd
+PIDFile=/run/postsrsd/postsrsd.pid
+Environment=SRS_DOMAIN=localhost.localdomain SRS_FORWARD_PORT=10001 SRS_REVERSE_PORT=10002 SRS_SECRET=/etc/postsrsd/postsrsd.secret \
+    SRS_EXCLUDE_DOMAINS= RUN_AS=postsrsd CHROOT=/run/postsrsd
+EnvironmentFile=/etc/postsrsd/postsrsd.conf
+ExecStart=/usr/bin/postsrsd -D -4 -f${SRS_FORWARD_PORT} -r${SRS_REVERSE_PORT} -d${SRS_DOMAIN} -s${SRS_SECRET} -u${RUN_AS} \
+    -c${CHROOT} -X${SRS_EXCLUDE_DOMAINS} -p/run/postsrsd/postsrsd.pid
+ 
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/python-efl/PKGBUILD b/pcr/python-efl/PKGBUILD
index e67489ad2..afca9af03 100644
--- a/pcr/python-efl/PKGBUILD
+++ b/pcr/python-efl/PKGBUILD
@@ -1,33 +1,29 @@
-# Maintainer (Arch): Doug Newgard <scimmia22 at outlook dot com>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Doug Newgard <scimmia22 at outlook dot com>
+
+pkgname=(python{,2}-efl)
+pkgver=1.10.0
+pkgdesc="Python bindings for the Enlightenment Foundataion Libraries"
+url="http://www.enlightenment.org"
+license=('LGPL3') # Also contains a copy of GPL3, but grep the source files; it's all LGPL
 
-_python=python
-pkgname=$_python-efl
-_pkgname=python-efl
-pkgver=1.8.1
 pkgrel=1
-pkgdesc="$_python bindings for the Enlightenment Foundataion Libraries"
 arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('LGPL3' 'GPL3')
-depends=('elementary' "$_python-dbus")
-provides=("$_python-ecore" "$_python-edje" "$_python-elementary" "$_python-emotion" "$_python-evas" "$_python-e_dbus")
-conflicts=("$_python-ecore" "$_python-edje" "$_python-elementary" "$_python-emotion" "$_python-evas" "$_python-e_dbus")
-source=("http://download.enlightenment.org/rel/bindings/python/$_pkgname-$pkgver.tar.bz2")
-sha1sums=('82b34b9336d517537b2a4032dff9d1e2de8b8dd8')
 
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+makedepends=(elementary python{,2}-dbus)
+source=("http://download.enlightenment.org/rel/bindings/python/$pkgname-$pkgver.tar.bz2")
+sha1sums=('ff94c3796348dd70545b59660d9d1cc67c1cb849')
 
-  $_python setup.py build
+package_python-efl() {
+  depends=(elementary python-dbus)
+  cd "$srcdir/$pkgbase-$pkgver"
+  rm -rf build
+  python setup.py install --root="$pkgdir" --optimize=1
 }
 
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  $_python setup.py install --root="$pkgdir"
-
-# install text files
-  install -Dm644 AUTHORS "$pkgdir/usr/share/doc/$pkgname/AUTHORS"
-  install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
-  install -Dm644 changes.html "$pkgdir/usr/share/doc/$pkgname/changes.html"
+package_python2-efl() {
+  depends=(elementary python2-dbus)
+  cd "$srcdir/$pkgbase-$pkgver"
+  rm -rf build
+  python2 setup.py install --root="$pkgdir" --optimize=1
 }