[arch-commits] Commit in htdig/trunk (CVE-2007-6110.patch PKGBUILD quoting.patch)
Andrea Scarpino
andrea at archlinux.org
Mon May 2 07:10:01 UTC 2011
Date: Monday, May 2, 2011 @ 03:10:01
Author: andrea
Revision: 122102
upgpkg: htdig 3.2.0b6-7
rebuild of old package; rename patch; add the database dir to package; add SSL support
Added:
htdig/trunk/CVE-2007-6110.patch
Modified:
htdig/trunk/PKGBUILD (contents, properties)
Deleted:
htdig/trunk/quoting.patch
---------------------+
CVE-2007-6110.patch | 26 ++++++++++++++++++++++++++
PKGBUILD | 50 ++++++++++++++++++++++++++++----------------------
quoting.patch | 26 --------------------------
3 files changed, 54 insertions(+), 48 deletions(-)
Added: CVE-2007-6110.patch
===================================================================
--- CVE-2007-6110.patch (rev 0)
+++ CVE-2007-6110.patch 2011-05-02 07:10:01 UTC (rev 122102)
@@ -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;
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-05-02 06:42:59 UTC (rev 122101)
+++ PKGBUILD 2011-05-02 07:10:01 UTC (rev 122102)
@@ -1,39 +1,45 @@
-# $Id: $
+# $Id$
# Maintainer: Andrea Scarpino <andrea at archlinux.org>
# Contributor: Giovanni Scafora <giovanni at archlinux.org>
pkgname=htdig
pkgver=3.2.0b6
-pkgrel=6
-pkgdesc="A complete world wide web indexing and searching system for a domain or intranet."
-url="http://www.htdig.org"
+pkgrel=7
+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=('gcc-libs' 'zlib' 'bash')
-options=('!libtool' '!emptydirs')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
- gcc4.3.patch
- quoting.patch)
+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}
+ cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ${srcdir}/gcc4.3.patch
- patch -p1 -i ${srcdir}/quoting.patch || return 1
+ 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
- make || return 1
- make DESTDIR=${pkgdir} install
+ --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
+}
+
Property changes on: htdig/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
+ Id
Deleted: quoting.patch
===================================================================
--- quoting.patch 2011-05-02 06:42:59 UTC (rev 122101)
+++ quoting.patch 2011-05-02 07:10:01 UTC (rev 122102)
@@ -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;
More information about the arch-commits
mailing list