ArchLinux: Update for final R14.0.13.

Add aarch64 and armv7h to architectures.
Add pkgbuilds for several applications.
Add pkgbuild for libkipi library.
Add pkgbuilds for dependencies.
Remove dependence on Python 2.
Remove backported patches.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

4 files changed, 112 insertions, 0 deletions

diff --git a/arch/tde-deps/htdig/.SRCINFO b/arch/tde-deps/htdig/.SRCINFO
new file mode 100644
index 000000000..f4da67b4b
--- /dev/null
+++ b/arch/tde-deps/htdig/.SRCINFO
@@ -0,0 +1,18 @@
+pkgbase = htdig
+	pkgdesc = Scripts and HTML code needed for using ht://Dig as a web search engine
+	pkgver = 3.2.0b6
+	pkgrel = 11
+	url = http://www.htdig.org/
+	arch = i686
+	arch = x86_64
+	license = GPL
+	depends = openssl
+	source = http://downloads.sourceforge.net/htdig/htdig-3.2.0b6.tar.bz2
+	source = gcc4.3.patch
+	source = CVE-2007-6110.patch
+	md5sums = 8b9b9587a411ac7dd278fa5413428960
+	md5sums = 2aeda683f95b58efc0978d7fe951de59
+	md5sums = 0d9099d3b5a32d322a8e0240f85a3578
+
+pkgname = htdig
+
diff --git a/arch/tde-deps/htdig/CVE-2007-6110.patch b/arch/tde-deps/htdig/CVE-2007-6110.patch
new file mode 100644
index 000000000..57b0e3b78
--- /dev/null
+++ b/arch/tde-deps/htdig/CVE-2007-6110.patch
@@ -0,0 +1,26 @@
+Index: htdig-3.2.0b6/htsearch/Display.cc
+===================================================================
+--- htdig-3.2.0b6.orig/htsearch/Display.cc
++++ htdig-3.2.0b6/htsearch/Display.cc
+@@ -137,7 +137,7 @@ Display::display(int pageNumber)
+       // Must temporarily stash the message in a String, since
+       // displaySyntaxError will overwrite the static temp used in form.
+ 
+-      String s(form("No such sort method: `%s'", (const char*)config->Find("sort")));
++      String s("invalid sort method");
+ 
+       displaySyntaxError(s);
+       return;
+Index: htdig-3.2.0b6/libhtdig/ResultFetch.cc
+===================================================================
+--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc
++++ htdig-3.2.0b6/libhtdig/ResultFetch.cc
+@@ -142,7 +142,7 @@ ResultFetch::fetch()
+         // Must temporarily stash the message in a String, since
+         // displaySyntaxError will overwrite the static temp used in form.
+ 
+-        String s(form("No such sort method: `%s'", (const char *) config->Find("sort")));
++        String s("invalid sort method");
+ 
+         displaySyntaxError(s);
+         //return;
diff --git a/arch/tde-deps/htdig/PKGBUILD b/arch/tde-deps/htdig/PKGBUILD
new file mode 100644
index 000000000..1edf3a90f
--- /dev/null
+++ b/arch/tde-deps/htdig/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 260530 2016-03-02 18:25:02Z foutrelis $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=htdig
+pkgver=3.2.0b6
+pkgrel=11.1
+pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine"
+url="http://www.htdig.org/"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+license=('GPL')
+depends=('openssl')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'gcc4.3.patch'
+        'CVE-2007-6110.patch')
+md5sums=('8b9b9587a411ac7dd278fa5413428960'
+         '2aeda683f95b58efc0978d7fe951de59'
+         '0d9099d3b5a32d322a8e0240f85a3578')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  patch -p1 -i "${srcdir}/gcc4.3.patch"
+  patch -p1 -i "${srcdir}/CVE-2007-6110.patch"
+
+  cp -a /usr/share/libtool/build-aux/config.guess .
+  cp -a /usr/share/libtool/build-aux/config.sub .
+  cp -a /usr/share/libtool/build-aux/config.guess ./db/
+  cp -a /usr/share/libtool/build-aux/config.sub ./db/
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  CFLAGS=-Wno-narrowing CXXFLAGS="-Wno-narrowing  -std=c++03" \
+  ./configure --prefix=/usr \
+    --mandir=/usr/share/man \
+    --with-config-dir=/etc/htdig \
+    --with-default-config-file=/etc/htdig/htdig.conf \
+    --with-database-dir=/var/lib/htdig/db \
+    --with-cgi-bin-dir=/usr/bin \
+    --with-common-dir=/usr/share/doc/htdig \
+    --with-search-dir=/usr/share/doc/htdig \
+    --with-image-dir=/usr/share/doc/htdig \
+    --localstatedir=/var/lib/htdig \
+    --with-ssl
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/arch/tde-deps/htdig/gcc4.3.patch b/arch/tde-deps/htdig/gcc4.3.patch
new file mode 100644
index 000000000..58dec1395
--- /dev/null
+++ b/arch/tde-deps/htdig/gcc4.3.patch
@@ -0,0 +1,15 @@
+diff -Naurp htdig-3.2.0b6.orig/htsearch/Collection.h htdig-3.2.0b6/htsearch/Collection.h
+--- htdig-3.2.0b6.orig/htsearch/Collection.h	2004-05-28 06:15:24.000000000 -0700
++++ htdig-3.2.0b6/htsearch/Collection.h	2006-03-22 11:35:40.000000000 -0800
+@@ -36,9 +36,9 @@ public:
+                const char *docExcerpt);
+     ~Collection();
+ 
+-    void Collection::Open();
++    void Open();
+ 
+-    void Collection::Close(); 
++    void Close(); 
+ 
+     char *getWordFile() { return wordFile.get(); }
+     DocumentRef         *getDocumentRef(int id);