[arch-commits] Commit in htdig/repos (12 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Mon Oct 21 12:35:19 UTC 2013
Date: Monday, October 21, 2013 @ 14:35:19
Author: andrea
Revision: 197001
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
htdig/repos/extra-i686/CVE-2007-6110.patch
(from rev 197000, htdig/trunk/CVE-2007-6110.patch)
htdig/repos/extra-i686/PKGBUILD
(from rev 197000, htdig/trunk/PKGBUILD)
htdig/repos/extra-i686/gcc4.3.patch
(from rev 197000, htdig/trunk/gcc4.3.patch)
htdig/repos/extra-x86_64/CVE-2007-6110.patch
(from rev 197000, htdig/trunk/CVE-2007-6110.patch)
htdig/repos/extra-x86_64/PKGBUILD
(from rev 197000, htdig/trunk/PKGBUILD)
htdig/repos/extra-x86_64/gcc4.3.patch
(from rev 197000, htdig/trunk/gcc4.3.patch)
Deleted:
htdig/repos/extra-i686/CVE-2007-6110.patch
htdig/repos/extra-i686/PKGBUILD
htdig/repos/extra-i686/gcc4.3.patch
htdig/repos/extra-x86_64/CVE-2007-6110.patch
htdig/repos/extra-x86_64/PKGBUILD
htdig/repos/extra-x86_64/gcc4.3.patch
----------------------------------+
/CVE-2007-6110.patch | 52 ++++++++++++++++++++
/PKGBUILD | 94 +++++++++++++++++++++++++++++++++++++
/gcc4.3.patch | 30 +++++++++++
extra-i686/CVE-2007-6110.patch | 26 ----------
extra-i686/PKGBUILD | 44 -----------------
extra-i686/gcc4.3.patch | 15 -----
extra-x86_64/CVE-2007-6110.patch | 26 ----------
extra-x86_64/PKGBUILD | 44 -----------------
extra-x86_64/gcc4.3.patch | 15 -----
9 files changed, 176 insertions(+), 170 deletions(-)
Deleted: extra-i686/CVE-2007-6110.patch
===================================================================
--- extra-i686/CVE-2007-6110.patch 2013-10-21 12:35:00 UTC (rev 197000)
+++ extra-i686/CVE-2007-6110.patch 2013-10-21 12:35:19 UTC (rev 197001)
@@ -1,26 +0,0 @@
-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;
Copied: htdig/repos/extra-i686/CVE-2007-6110.patch (from rev 197000, htdig/trunk/CVE-2007-6110.patch)
===================================================================
--- extra-i686/CVE-2007-6110.patch (rev 0)
+++ extra-i686/CVE-2007-6110.patch 2013-10-21 12:35:19 UTC (rev 197001)
@@ -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;
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-10-21 12:35:00 UTC (rev 197000)
+++ extra-i686/PKGBUILD 2013-10-21 12:35:19 UTC (rev 197001)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgname=htdig
-pkgver=3.2.0b6
-pkgrel=8
-pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine"
-url="http://www.htdig.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('openssl')
-options=('!libtool' 'emptydirs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
- 'gcc4.3.patch'
- 'CVE-2007-6110.patch')
-md5sums=('8b9b9587a411ac7dd278fa5413428960'
- '2aeda683f95b58efc0978d7fe951de59'
- '0d9099d3b5a32d322a8e0240f85a3578')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -p1 -i "${srcdir}/gcc4.3.patch"
- patch -p1 -i "${srcdir}/CVE-2007-6110.patch"
-
- ./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 "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: htdig/repos/extra-i686/PKGBUILD (from rev 197000, htdig/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-10-21 12:35:19 UTC (rev 197001)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgname=htdig
+pkgver=3.2.0b6
+pkgrel=9
+pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine"
+url="http://www.htdig.org/"
+arch=('i686' 'x86_64')
+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"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./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
+}
Deleted: extra-i686/gcc4.3.patch
===================================================================
--- extra-i686/gcc4.3.patch 2013-10-21 12:35:00 UTC (rev 197000)
+++ extra-i686/gcc4.3.patch 2013-10-21 12:35:19 UTC (rev 197001)
@@ -1,15 +0,0 @@
-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);
Copied: htdig/repos/extra-i686/gcc4.3.patch (from rev 197000, htdig/trunk/gcc4.3.patch)
===================================================================
--- extra-i686/gcc4.3.patch (rev 0)
+++ extra-i686/gcc4.3.patch 2013-10-21 12:35:19 UTC (rev 197001)
@@ -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);
Deleted: extra-x86_64/CVE-2007-6110.patch
===================================================================
--- extra-x86_64/CVE-2007-6110.patch 2013-10-21 12:35:00 UTC (rev 197000)
+++ extra-x86_64/CVE-2007-6110.patch 2013-10-21 12:35:19 UTC (rev 197001)
@@ -1,26 +0,0 @@
-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;
Copied: htdig/repos/extra-x86_64/CVE-2007-6110.patch (from rev 197000, htdig/trunk/CVE-2007-6110.patch)
===================================================================
--- extra-x86_64/CVE-2007-6110.patch (rev 0)
+++ extra-x86_64/CVE-2007-6110.patch 2013-10-21 12:35:19 UTC (rev 197001)
@@ -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;
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-10-21 12:35:00 UTC (rev 197000)
+++ extra-x86_64/PKGBUILD 2013-10-21 12:35:19 UTC (rev 197001)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgname=htdig
-pkgver=3.2.0b6
-pkgrel=8
-pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine"
-url="http://www.htdig.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('openssl')
-options=('!libtool' 'emptydirs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
- 'gcc4.3.patch'
- 'CVE-2007-6110.patch')
-md5sums=('8b9b9587a411ac7dd278fa5413428960'
- '2aeda683f95b58efc0978d7fe951de59'
- '0d9099d3b5a32d322a8e0240f85a3578')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -p1 -i "${srcdir}/gcc4.3.patch"
- patch -p1 -i "${srcdir}/CVE-2007-6110.patch"
-
- ./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 "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: htdig/repos/extra-x86_64/PKGBUILD (from rev 197000, htdig/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-10-21 12:35:19 UTC (rev 197001)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgname=htdig
+pkgver=3.2.0b6
+pkgrel=9
+pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine"
+url="http://www.htdig.org/"
+arch=('i686' 'x86_64')
+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"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./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
+}
Deleted: extra-x86_64/gcc4.3.patch
===================================================================
--- extra-x86_64/gcc4.3.patch 2013-10-21 12:35:00 UTC (rev 197000)
+++ extra-x86_64/gcc4.3.patch 2013-10-21 12:35:19 UTC (rev 197001)
@@ -1,15 +0,0 @@
-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);
Copied: htdig/repos/extra-x86_64/gcc4.3.patch (from rev 197000, htdig/trunk/gcc4.3.patch)
===================================================================
--- extra-x86_64/gcc4.3.patch (rev 0)
+++ extra-x86_64/gcc4.3.patch 2013-10-21 12:35:19 UTC (rev 197001)
@@ -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);
More information about the arch-commits
mailing list