libraries/sqlite: Updated for version 3.5.7

4 files changed, 29 insertions, 20 deletions

diff --git a/libraries/sqlite/README b/libraries/sqlite/README
index 8743abfb83..1afefd18ee 100644
--- a/libraries/sqlite/README
+++ b/libraries/sqlite/README
@@ -4,4 +4,3 @@ zero-configuration SQL database engine.
 The SQLite distribution comes with a standalone command-line access program 
 (sqlite) that can be used to administer an SQLite database and which serves 
 as an example of how to use the SQLite library.
-
diff --git a/libraries/sqlite/slack-desc b/libraries/sqlite/slack-desc
index f6419e415c..a208eab982 100644
--- a/libraries/sqlite/slack-desc
+++ b/libraries/sqlite/slack-desc
@@ -1,3 +1,11 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler-------------------------------------------------------|
 sqlite: SQLite (simple, self contained database engine)
 sqlite:
 sqlite: SQLite is a small C library that implements a self-contained,
diff --git a/libraries/sqlite/sqlite.SlackBuild b/libraries/sqlite/sqlite.SlackBuild
index a879f4c545..837b0063b9 100644
--- a/libraries/sqlite/sqlite.SlackBuild
+++ b/libraries/sqlite/sqlite.SlackBuild
@@ -24,16 +24,12 @@
 
 # Modified by the SlackBuilds.org project
 
-if [ "$(id -u)" != "0" ]; then
-    echo "This script must be run as root!"
-    exit 1
-fi
-
 PRGNAM=sqlite
-VERSION=3.3.14
+VERSION=3.5.7
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -45,14 +41,20 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root.root .
-chmod -R u+rw,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -60,14 +62,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --enable-threadsafe \
-  || exit 1
+  --enable-threadsafe 
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
@@ -78,9 +79,10 @@ gzip -9 $PKG/usr/man/man1/sqlite3.1
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README VERSION doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/CVS
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
-# Add a COPYING file. Content taken from: http://www.sqlite.org/copyright.html
+# Add a COPYING file -- http://www.sqlite.org/copyright.html
 cat $CWD/COPYING > $PKG/usr/doc/$PRGNAM-$VERSION/COPYING
 
 mkdir -p $PKG/install
diff --git a/libraries/sqlite/sqlite.info b/libraries/sqlite/sqlite.info
index 4bccaf4945..bad564271b 100644
--- a/libraries/sqlite/sqlite.info
+++ b/libraries/sqlite/sqlite.info
@@ -1,8 +1,8 @@
 PRGNAM="sqlite"
-VERSION="3.3.14"
+VERSION="3.5.7"
 HOMEPAGE="http://www.sqlite.org"
-DOWNLOAD="http://www.sqlite.org/sqlite-3.3.14.tar.gz"
-MD5SUM="e1a4428a5cb17f28164731b72f06130a"
+DOWNLOAD="http://www.sqlite.org/sqlite-3.5.7.tar.gz"
+MD5SUM="8e4b8c7192c045a4a68c9f4d5cfab8a8"
 MAINTAINER="Martin Lefebvre"
 EMAIL="dadexter@gmail.com"
 APPROVED="rworkman"