system/sqlite2: Updated for version 2.8.17_7 + new maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 56 insertions, 11 deletions

diff --git a/system/sqlite2/Makefile.patch b/system/sqlite2/Makefile.patch
new file mode 100644
index 0000000000..f80d057feb
--- /dev/null
+++ b/system/sqlite2/Makefile.patch
@@ -0,0 +1,21 @@
+--- Makefile.in.orig	2014-08-10 08:46:19.947934827 +0700
++++ Makefile.in	2014-08-10 08:46:38.961957767 +0700
+@@ -465,14 +465,14 @@
+ 	mv $(DOC) doc
+ 
+ install:	sqlite libsqlite.la sqlite.h
+-	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib
+-	$(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib
++	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib64
++	$(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib64
+ 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
+ 	$(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin
+ 	$(INSTALL) -d $(DESTDIR)$(prefix)/include
+ 	$(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
+-	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
+-	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
++	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib64/pkgconfig; 
++	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib64/pkgconfig; 
+ 
+ clean:	
+ 	rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.*
diff --git a/system/sqlite2/sqlite2.SlackBuild b/system/sqlite2/sqlite2.SlackBuild
index 27e4766577..11ab40027f 100644
--- a/system/sqlite2/sqlite2.SlackBuild
+++ b/system/sqlite2/sqlite2.SlackBuild
@@ -6,9 +6,28 @@
 # File names in v.2 and v.3 do not overlap, so both packages can safely coexist
 
 # Written by V'yacheslav Stetskevych
+# Now maintained by Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sqlite2
-VERSION=${VERSION:-2.8.17_6}
+VERSION=${VERSION:-2.8.17_7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,20 +72,25 @@ tar xvf $CWD/${SRCNAM}_${SRCVERSION}.orig.tar.gz
 cd $SRCNAM-$SRCVERSION
 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 {} \;
 
 # Apply the debian patchset, which creates the "debian" directory
 zcat $CWD/${SRCNAM}_$SRCVERSION-$PATCHLEVEL.diff.gz | patch -p1
 # Apply individual debian patches
 cat debian/patches/* | patch -p1
 
+if [ "$ARCH" = "x86_64" ]; then
+  patch -p0 < $CWD/Makefile.patch
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --disable-static \
@@ -76,7 +100,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 # Install the manpage
diff --git a/system/sqlite2/sqlite2.info b/system/sqlite2/sqlite2.info
index a419251163..4176372a7d 100644
--- a/system/sqlite2/sqlite2.info
+++ b/system/sqlite2/sqlite2.info
@@ -1,12 +1,12 @@
 PRGNAM="sqlite2"
-VERSION="2.8.17_6"
+VERSION="2.8.17_7"
 HOMEPAGE="http://www.sqlite.org"
 DOWNLOAD="http://ftp.de.debian.org/debian/pool/main/s/sqlite/sqlite_2.8.17.orig.tar.gz \
-          http://ftp.de.debian.org/debian/pool/main/s/sqlite/sqlite_2.8.17-6.diff.gz"
+          http://ftp.de.debian.org/debian/pool/main/s/sqlite/sqlite_2.8.17-7.diff.gz"
 MD5SUM="04f15ed552134b06528b3628be7d7315 \
-        226d2321cd82fe0b1ee6acbf547f1e3e"
+        9d926474caaed0d12f2fb418bdcf1ccf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="V'yacheslav Stetskevych"
-EMAIL="slava18@gmail.com"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"