3 files changed, 33 insertions, 23 deletions
diff --git a/libraries/luasec/luasec.SlackBuild b/libraries/luasec/luasec.SlackBuild
index 603f9506a1..05f705b97a 100644
--- a/libraries/luasec/luasec.SlackBuild
+++ b/libraries/luasec/luasec.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for luasec
 
-# Copyright 2013, Andrew Tkalia <anddt@yandex.ru>, Ukraine, Kyiv
+# Copyright 2013-2014, Andrew Tkalia <anddt@yandex.ua>, Ukraine, Kyiv
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=luasec
-VERSION=${VERSION:-0.4.1}
+HASH=${HASH:-903efaf3b1f090a992963480fa2924dac02f9174}
+VERSION=20140421_$(echo $HASH |cut -c -7)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -47,7 +48,7 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
@@ -59,25 +60,24 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$PRGNAM-$VERSION
+rm -rf $PRGNAM-$HASH
+tar xvf $CWD/$HASH.tar.gz
+cd $PRGNAM-$HASH
 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 {} \;
 
 cd src
-# Getting default cflags from config then append slkcflags to them and passing to make
-_CFLAGS=`cat Makefile |grep ^LNX_CFLAGS |sed "s,LNX_CFLAGS\=,,g"`" "${SLKCFLAGS}
-_DEFS=`cat ../Makefile |grep ^DEFS |sed "s,DEFS\=,,g"`
+  patch < $CWD/makefile.patch
+cd -
+
 make linux \
-  LUAPATH=/usr/share/lua/5.1 \
-  LUACPATH=/usr/lib${LIBDIRSUFFIX}/lua/5.1 \
-  DEFS="$_DEFS" \
-  LNX_CFLAGS=" $_CFLAGS"
+  LUACPATH="/usr/lib${LIBDIRSUFFIX}/lua/5.1" \
+  LIB_PATH=" -L/usr/lib${LIBDIRSUFFIX}" \
+  SLKCFLAGS="${SLKCFLAGS}"
 mkdir -p $PKG/usr/share/lua/5.1
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/lua/5.1
 
@@ -85,7 +85,6 @@ mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/lua/5.1
 make install \
   LUAPATH=$PKG/usr/share/lua/5.1 \
   LUACPATH=$PKG/usr/lib${LIBDIRSUFFIX}/lua/5.1
-cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/libraries/luasec/luasec.info b/libraries/luasec/luasec.info
index 3aa3262d87..0b5c0e3003 100644
--- a/libraries/luasec/luasec.info
+++ b/libraries/luasec/luasec.info
@@ -1,10 +1,10 @@
 PRGNAM="luasec"
-VERSION="0.4.1"
+VERSION="20140421_903efaf"
 HOMEPAGE="https://github.com/brunoos/luasec"
-DOWNLOAD="https://github.com/brunoos/luasec/archive/luasec-0.4.1.tar.gz"
-MD5SUM="f6f92d93fb3310aadf2ede5d3e8dea53"
+DOWNLOAD="https://github.com/brunoos/luasec/archive/903efaf3b1f090a992963480fa2924dac02f9174.tar.gz"
+MD5SUM="37f66746415c701bcb10d92905d07b03"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua"
-MAINTAINER="Andrwe Tkalia"
-EMAIL="anddt@yandex.ru"
+MAINTAINER="Andrew Tkalia"
+EMAIL="anddt@yandex.ua"
diff --git a/libraries/luasec/makefile.patch b/libraries/luasec/makefile.patch
new file mode 100644
index 0000000000..d08c427885
--- /dev/null
+++ b/libraries/luasec/makefile.patch
@@ -0,0 +1,11 @@
+--- Makefile.old	2014-04-21 19:20:17.000000000 +0300
++++ Makefile	2014-05-18 00:02:16.000000000 +0300
+@@ -37,7 +37,7 @@
+ 	$(INSTALL) -m644 https.lua $(LUAPATH)/ssl
+ 
+ linux:
+-	@$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" EXTRA="$(EXTRA)"
++	@$(MAKE) $(CMOD) MYCFLAGS="$(SLKCFLAGS) $(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" EXTRA="$(EXTRA)"
+ 
+ bsd:
+ 	@$(MAKE) $(CMOD) MYCFLAGS="$(BSD_CFLAGS)" MYLDFLAGS="$(BSD_LDFLAGS)" EXTRA="$(EXTRA)"