2 files changed, 27 insertions, 83 deletions
diff --git a/pcr/cjdns-git/PKGBUILD b/pcr/cjdns-git/PKGBUILD
index 260326501..319196d3d 100644
--- a/pcr/cjdns-git/PKGBUILD
+++ b/pcr/cjdns-git/PKGBUILD
@@ -1,77 +1,42 @@
-# Maintainer (Arch): Prurigro
-# Contributor (Arch): Prurigro
+# Contributor (Arch): Kevin MacMartin <prurigro@gmail.com>
+# Contributor (Arch): openfbt
 # Contributor (Arch): Werecat
 # Contributor (Arch): Xyne
+# Maintainer        : Omar Vega Ramos <ovruni@gnu.org.pe>
 
 _pkgname=cjdns
-pkgname=${_pkgname}-git
-pkgver=0.3.1473
+pkgname=$_pkgname-git
+pkgver=0.3.3328
 pkgrel=1
-pkgdesc="A routing engine designed for security, scalability, speed and ease of use."
-url="https://github.com/cjdelisle/${_pkgname}"
+pkgdesc='A routing engine designed for security, scalability, speed and ease of use'
+url='https://github.com/cjdelisle/cjdns'
 license=('GPL3')
-makedepends=('git' 'cmake' 'python2')
-optdepends=('python2: required by the python cjdnsadmin utilities')
-arch=('i686' 'x86_64' 'armv6h' 'armv7h')
-install=${pkgname}.install
-backup=("etc/default/${_pkgname}")
-
-source=("git://github.com/cjdelisle/${_pkgname}.git#branch=master")
-sha256sums=('SKIP')
+arch=('i686' 'x86_64')
+options=('!distcc' '!strip' '!buildflags')
+depends=('glibc')
+makedepends=('git' 'nodejs' 'python2')
+optdepends=(
+  'cjdnsify: allows you to run some programs bound to your cjdns address'
+  'libnacl: speed up the build process by skipping the need to compile cnacl'
+  'cjdns-git-sysvinit: support for sysvinit (rc.d)'
+)
+source=("git+$url#branch=crashey")
+sha512sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/${_pkgname}"
-    git describe --always | sed 's|-|.|g;s|[^\.]*\.||;s|\.[^\.]*$||'
-}
-
-prepare() {
-    cd "${srcdir}/${_pkgname}"
-
-    ## Clean previous builds and resync
-    ./clean
-
-    mkdir build
-
-    ## Set occurances of python to python2 due to a naming conflict between Debian and Archlinux
-    find "${srcdir}/${_pkgname}"/contrib/python \
-         -type f \
-         -exec sed -i 's@/usr/bin/python\s*$@/usr/bin/python2@;s@/usr/bin/env\ python@/usr/bin/env\ python2@' {} \+
+  cd $_pkgname
+  git describe --always | sed 's|-|.|g;s|[^\.]*\.||;s|\.[^\.]*$||'
 }
 
 build() {
-    cd "${srcdir}"/${_pkgname}
-
-    ##  Disable Arch's generic makepkg optimizations (set via /etc/makepkg.conf) in favour of those specified by cjdns
-    unset MAKEFLAGS
-#    unset CFLAGS
-#    unset CPPFLAGS
-
-    ##  Build using the ./do script
-    export NO_DEBUG=1
-    cd build
-    cmake ..
-    make
-}
-
-## Package creation helper functions
-_package_cjdns() {
-    install -D -m755 "${srcdir}"/${_pkgname}/build/admin/angel/cjdroute2 "${pkgdir}"/usr/bin/cjdroute
-    install -D -m755 "${srcdir}"/${_pkgname}/build/admin/angel/${_pkgname} "${pkgdir}"/usr/bin/${_pkgname}
-    install -D -m644 "${srcdir}"/${_pkgname}/contrib/systemd/${_pkgname}.service "${pkgdir}"/usr/lib/systemd/system/${_pkgname}.service
-    install -D -m755 "${srcdir}"/${_pkgname}/contrib/bash/i_am_stupid.sh "${pkgdir}"/usr/bin/cjdns-recoverconfig
-}
-_package_pyutils() {
-    install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/cjdnsadmin.py "${pkgdir}"/usr/lib/$(python2-config --libs | grep -o -E python2.*)/cjdnsadmin/cjdnsadmin.py
-    install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/bencode.py "${pkgdir}"/usr/lib/$(python2-config --libs | grep -o -E python2.*)/cjdnsadmin/bencode.py
-    install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/__init__.py "${pkgdir}"/usr/lib/$(python2-config --libs | grep -o -E python2.*)/cjdnsadmin/__init__.py
-    install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/cjdnslog "${pkgdir}"/usr/bin/cjdns-log
-    install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/dumptable "${pkgdir}"/usr/bin/cjdns-dumptable
-    install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/findnodes "${pkgdir}"/usr/bin/cjdns-findnodes
-    install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/pingAll.py "${pkgdir}"/usr/bin/cjdns-pingAll
+  cd $_pkgname
+  bash 'do'
 }
 
-## Package creation function: comment out a helper function to remove its associated functionality
 package() {
-    _package_cjdns ## Core binaries (cjdns and cjdroute), a systemd service file and a config recovery script written in bash
-    _package_pyutils ## Miscellaneous python2-based cjdns admin port utility scripts and libraries
+  cd $_pkgname
+  install -Dm755 'cjdroute' "$pkgdir/usr/bin/cjdroute"
+  install -Dm755 'contrib/sh/run-cjdroute.sh' "$pkgdir/usr/bin/run-cjdroute"
+  install -Dm644 "contrib/systemd/$_pkgname.service" "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
+  install -Dm644 'doc/man/cjdroute.conf.5' "$pkgdir/usr/share/man/man5/cjdroute.conf.5"
 }
diff --git a/pcr/cjdns-git/cjdns-git.install b/pcr/cjdns-git/cjdns-git.install
deleted file mode 100644
index 5e9e1a64c..000000000
--- a/pcr/cjdns-git/cjdns-git.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-    if [ $(ps -A | ps -A | grep -cE "systemd$") = 1 ]; then
-        systemctl --system daemon-reload
-    fi
-
-    if [ -z $(type -P python2) ]; then
-        echo "You don't currently have python2 installed. It isn't required to use cjdns, but some scripts have been included in the package that won't function without"
-    fi
-
-    echo "By default, the cjdns configuration file is expected to be located @ /etc/cjdroute.conf"
-}
-
-post_upgrade() {
-    if [ $(ps -A | ps -A | grep -cE "systemd$") = 1 ]; then
-        systemctl --system daemon-reload
-    fi
-
-    if [ $(grep -c cjdns /etc/passwd) = 1 ]; then
-        echo "The user 'cjdns' has been detected on your system but is no longer required by this package; if it was installed by a previous version of this package, it can now be safely deleted."
-    fi
-}