From 8c9261b2348253b0be4f1fb2c1e3c9141a45696b Mon Sep 17 00:00:00 2001
From: Andrew Tkalia
Date: Mon, 28 Apr 2014 23:17:35 +0700
Subject: network/prosody: Updated for version 0.9.4.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/prosody/doinst.sh          | 10 +++++++---
 network/prosody/prosody.SlackBuild | 24 ++++++++++++------------
 network/prosody/prosody.info       |  8 ++++----
 3 files changed, 23 insertions(+), 19 deletions(-)

(limited to 'network/prosody')

diff --git a/network/prosody/doinst.sh b/network/prosody/doinst.sh
index 4cac92dbfa..330cafc8a7 100644
--- a/network/prosody/doinst.sh
+++ b/network/prosody/doinst.sh
@@ -8,9 +8,13 @@ config() {
   fi
 }
 
-config etc/prosody/migrator.cfg.lua.new
 config etc/prosody/prosody.cfg.lua.new
+config etc/prosody/migrator.cfg.lua.new
+config etc/prosody/certs/openssl.cnf.new
 config etc/prosody/certs/localhost.key.new
-config etc/prosody/certs/localhost.cert.new
+config etc/prosody/certs/example.com.key.new
+config etc/prosody/certs/example.com.crt.new
 config etc/prosody/certs/Makefile.new
-config etc/prosody/certs/openssl.cnf.new
+config etc/prosody/certs/localhost.cnf.new
+config etc/prosody/certs/example.com.cnf.new
+config etc/prosody/certs/localhost.crt.new
diff --git a/network/prosody/prosody.SlackBuild b/network/prosody/prosody.SlackBuild
index e37515c8f2..fad92e6637 100644
--- a/network/prosody/prosody.SlackBuild
+++ b/network/prosody/prosody.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=prosody
-VERSION=${VERSION:-0.8.2}
+VERSION=${VERSION:-0.9.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,10 +62,8 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  #SLKCFLAGS="-O2 -fPIC"
-  #LIBDIRSUFFIX="64"
-  echo "Your arch is not supported yet. I am sorry"
-  exit 1
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -82,10 +80,14 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix path on x86_64
+sed -i "s|/lib/|/lib${LIBDIRSUFFIX}/|" Makefile
+sed -i "s|/lib/|/lib${LIBDIRSUFFIX}/|" tools/migration/Makefile
 
 ./configure \
   --ostype=linux \
@@ -117,9 +119,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS INSTALL COPYING DEPENDS README HACKERS TODO doc/*.* \
-  tools/{ejabberd2prosody.lua,erlparse.lua,xep227toprosody.lua,ejabberdsql2prosody.lua} \
+cp -a AUTHORS INSTALL COPYING DEPENDS README HACKERS TODO doc/*.* tools/*.lua \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/prosody/prosody.info b/network/prosody/prosody.info
index 757758eb90..24bc3fd0da 100644
--- a/network/prosody/prosody.info
+++ b/network/prosody/prosody.info
@@ -1,9 +1,9 @@
 PRGNAM="prosody"
-VERSION="0.8.2"
+VERSION="0.9.4"
 HOMEPAGE="http://prosody.im/"
-DOWNLOAD="http://distfiles.macports.org/prosody/prosody-0.8.2.tar.gz"
-MD5SUM="6e907bf0d0acf24f1011083020ba6ffb"
-DOWNLOAD_x86_64="UNSUPPORTED"
+DOWNLOAD="https://prosody.im/downloads/source/prosody-0.9.4.tar.gz"
+MD5SUM="94f9a613c834c276352ac5b142fb72e0"
+DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua luasocket luaexpat lua-filesystem"
 MAINTAINER="Andrew Tkalia"
-- 
cgit v1.2.3