6 files changed, 86 insertions, 76 deletions
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 052c8bd23..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "libre/systemd"]
-	path = libre/systemd
-	url = ssh://gparabola/srv/git/packages/systemd.git
diff --git a/pcr/pypolicyd-spf/PKGBUILD b/pcr/pypolicyd-spf/PKGBUILD
new file mode 100644
index 000000000..045f27304
--- /dev/null
+++ b/pcr/pypolicyd-spf/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
+# Maintainer (AUR:python-postfix-policyd-spf): Hao Zhang <theivorytower@gmail.com>
+# Maintainer (AUR:python2-postfix-policyd-spf): Filip S. Adamsen <fsa@fsadev.com>
+# Contributor (AUR): Samed Beyribey <ras0ir@eventualis.org>
+
+pkgname=pypolicyd-spf
+pkgver=2.0.1
+pkgdesc="A Postfix policy engine for Sender Policy Framework (SPF) checking"
+url="https://launchpad.net/$pkgname/"
+license=('GPL')
+source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('d93d14bb41bccd076ee05535822cbb80'
+         'SKIP')
+validpgpkeys=(E7729BFFBE85400FEEEE23B178D7DEFB9AD59AF1) # Donald Scott Kitterman
+
+pkgrel=1
+arch=('any')
+makedepends=('python-setuptools')
+depends=('postfix' 'python-pyspf')
+optdepends=('python-authres: RFC 7001 Authentication-Results header support')
+
+replaces=('python-postfix-policyd-spf' 'python2-postfix-policyd-spf') # AUR names
+conflicts=('python-postfix-policyd-spf' 'python2-postfix-policyd-spf') # AUR names
+
+backup=(etc/python-policyd-spf/policyd-spf.conf)
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  python setup.py install --root="$pkgdir/" --optimize=1
+  install -m644 policyd-spf.conf.commented "$pkgdir"/etc/python-policyd-spf
+}
diff --git a/pcr/python-py3dns/PKGBUILD b/pcr/python-py3dns/PKGBUILD
new file mode 100644
index 000000000..0d3b88ba5
--- /dev/null
+++ b/pcr/python-py3dns/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
+# Maintainer (AUR): Sebastien Leduc <sebastien@sleduc.fr>
+# Contributor (AUR): Samed Beyribey <ras0ir AT eventualis DOT org>
+
+_pkgname=py3dns
+pkgname=python-$_pkgname
+pkgver=3.1.1
+pkgrel=1
+pkgdesc="A lightweight DNS client library for Python 3"
+arch=('any')
+url="https://launchpad.net/py3dns"
+license=('custom:PSF')
+makedepends=('python-setuptools')
+depends=('python')
+source=("https://launchpad.net/${_pkgname}/trunk/${pkgver}/+download/${_pkgname}-${pkgver}.tar.gz"{,.asc})
+md5sums=('d86f2d7d70ddc187e53c7abc78a3179c'
+         'SKIP')
+validpgpkeys=(E7729BFFBE85400FEEEE23B178D7DEFB9AD59AF1) # Donald Scott Kitterman
+
+replaces=(python-pydns) # AUR name
+conflicts=(python-pydns) # AUR name
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  python setup.py install --root="$pkgdir/" --optimize=1
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/pcr/python-pyspf/PKGBUILD b/pcr/python-pyspf/PKGBUILD
new file mode 100644
index 000000000..9a256215d
--- /dev/null
+++ b/pcr/python-pyspf/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
+# Maintainer (AUR): Rich Li <rich@dranek.com>
+# Contributor (AUR): Samed Beyribey <ras0ir@eventualis.org>
+
+_pkgname=pyspf
+pkgname=python-$_pkgname
+_basever=2.0.12
+_patchver=t
+_pkgver=${_basever}${_patchver}
+pkgver=${_basever}.${_patchver}
+pkgdesc="Python implementation of the Sender Policy Framework (SPF) protocol"
+url="https://pypi.python.org/pypi/pyspf"
+license=('PSF')
+source=("https://pypi.python.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$_pkgver.tar.gz")
+md5sums=('c83143ad79074bf8c80235748a8a698f')
+
+pkgrel=1
+arch=('any')
+depends=('python-py3dns')
+makedepends=('python-setuptools')
+optdepends=('python-authres: Return RFC 5451 Authentication Results headers')
+
+package() {
+  cd "$srcdir/$_pkgname-${_basever}"
+
+  python setup.py install --root="$pkgdir" --optimize=1
+}
diff --git a/pcr/python2-postfix-policyd-spf/PKGBUILD b/pcr/python2-postfix-policyd-spf/PKGBUILD
deleted file mode 100644
index 0de525d1a..000000000
--- a/pcr/python2-postfix-policyd-spf/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Thomas Haider <t.haider@deprecate.de>
-# Contributer: Rich Li <rich@dranek.com>
-# Contributer: Filip S. Adamsen <fsa [at] fsadev [dot] com>
-# Contributor: Samed Beyribey <ras0ir@eventualis.org>
-pkgname=python2-postfix-policyd-spf
-_pypkgname=pypolicyd-spf
-pkgver=1.3.1
-pkgrel=1
-pkgdesc="Python2 Postfix Sender Policy Framework (SPF) filter"
-arch=('any')
-url="http://www.openspf.org/Software"
-license=('Apache')
-depends=('python2-pyspf' 'python2' 'python2-ipaddr')
-optdepends=('python2-authres: support Authentication-Results headers')
-conflicts=('python-postfix-policyd-spf')
-options=(!emptydirs)
-backup=(etc/python-policyd-spf/policyd-spf.conf)
-source=(http://launchpad.net/pypolicyd-spf/1.3/$pkgver/+download/$_pypkgname-$pkgver.tar.gz)
-sha256sums=('5b575638e3d30db5583ed4e3c0902b9a6d90ba7e126a9d37b9bffe2e6b201808')
- 
-build() {
-  cd "$srcdir/$_pypkgname-$pkgver"
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir/$_pypkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-  install -m644 -D policyd-spf.conf.commented $pkgdir/etc/python-policyd-spf
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/python2-pyspf/PKGBUILD b/pcr/python2-pyspf/PKGBUILD
deleted file mode 100644
index 6ee566f51..000000000
--- a/pcr/python2-pyspf/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Rich Li <rich@dranek.com>
-# Contributor: Filip S. Adamsen <fsa [at] fsadev [dot] com>
-# Contributor: Samed Beyribey <ras0ir AT eventualis DOT org>
-pkgname=python2-pyspf
-_pkgname=pyspf
-pkgver=2.0.9
-pkgrel=1
-pkgdesc="Python 2 implementation of Sender Policy Framework (SPF)"
-arch=('any')
-url="http://bmsi.com/python/milter.html"
-license=('Python')
-depends=('python2-pydns' 'python2' 'python2-ipaddr')
-checkdepends=('python2-yaml' 'python2-authres')
-optdepends=('python2-authres: support Authentication-Results headers')
-#conflicts=('python-pyspf')
-options=(!emptydirs)
-source=(https://pypi.python.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz)
-md5sums=('055b36fd9469ea77713cf064727a9c18')
-sha1sums=('a239e8e26a67320a022559f72f7748d3c0575000')
-sha256sums=('e4828f785c935d5d24dcab1e8abe13b57de965219c8e821222e763a27fd423e0')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  python2 setup.py build
-}
-
-# While 2.0.8 passed tests, 2.0.9 fails six tests
-#check() {
-#  # Note that python2-authres, which is normally optional, is required for the tests to finish successfully
-#  cd "$srcdir/$_pkgname-$pkgver/test"
-#  # Use the SPF from this package, not the system-installed version
-#  sed -i -e "s|import spf|sys.path.append('..')\nimport spf|" testspf.py
-#  python2 testspf.py
-#}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir" --optimize=1
-}
-
-# vim:set ts=2 sw=2 et: