tags 621376 patch thanks Hi, the attached patch seems to work. Some more testing before an upload would be nice though. :)
Sven
--
And I don't know much, but I do know this:
With a golden heart comes a rebel fist.
[ Streetlight Manifesto - Here's To Life ]
diff -Nru squidguard-1.4/debian/changelog squidguard-1.4/debian/changelog
--- squidguard-1.4/debian/changelog 2011-05-29 20:55:56.000000000 +0200
+++ squidguard-1.4/debian/changelog 2011-05-30 10:26:48.000000000 +0200
@@ -1,3 +1,11 @@
+squidguard (1.4-4) unstable; urgency=low
+
+ * Build-Depend on the generic libdb-dev instead of libdb4.8-dev.
+ * Add 08_DB_VERSION_MAJOR.patch to use the API for BDB 4.x for
+ BDB >= 4 aswell. (Closes: #621376)
+
+ -- Sven Hoexter <hoex...@debian.org> Mon, 30 May 2011 10:26:48 +0200
+
squidguard (1.4-3) unstable; urgency=low
* samples:
diff -Nru squidguard-1.4/debian/control squidguard-1.4/debian/control
--- squidguard-1.4/debian/control 2011-05-29 20:55:14.000000000 +0200
+++ squidguard-1.4/debian/control 2011-05-30 10:16:36.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Joachim Wiedorn <ad_deb...@joonet.de>
Build-Depends: debhelper (>= 7.0.50~),
- libldap2-dev | libldap-dev, libdb4.8-dev,
+ libldap2-dev | libldap-dev, libdb-dev,
perl, bison, flex
Standards-Version: 3.9.2
Vcs-Git: git://anonscm.debian.org/collab-maint/squidguard.git
diff -Nru squidguard-1.4/debian/patches/08_db_version_major.patch squidguard-1.4/debian/patches/08_db_version_major.patch
--- squidguard-1.4/debian/patches/08_db_version_major.patch 1970-01-01 01:00:00.000000000 +0100
+++ squidguard-1.4/debian/patches/08_db_version_major.patch 2011-05-30 10:23:33.000000000 +0200
@@ -0,0 +1,11 @@
+--- a/src/sgDb.c
++++ b/src/sgDb.c
+@@ -114,7 +114,7 @@ void sgDbInit(Db, file)
+ }
+ }
+ #endif
+-#if DB_VERSION_MAJOR == 4
++#if DB_VERSION_MAJOR >= 4
+ if(globalUpdate || createdb || (dbfile != NULL && stat(dbfile,&st))){
+ flag = DB_CREATE;
+ if(createdb)
diff -Nru squidguard-1.4/debian/patches/series squidguard-1.4/debian/patches/series
--- squidguard-1.4/debian/patches/series 2011-05-29 10:30:27.000000000 +0200
+++ squidguard-1.4/debian/patches/series 2011-05-30 10:50:42.000000000 +0200
@@ -5,3 +5,4 @@
05_distclean-more-files.patch
06_move-setuserinfo-to-sg-y.patch
07_update-samples-to-utf8.patch
+08_db_version_major.patch
squidguard_1.4-4.debian.tar.gz
Description: Binary data
Format: 3.0 (quilt) Source: squidguard Binary: squidguard, squidguard-doc Architecture: any Version: 1.4-4 Maintainer: Joachim Wiedorn <ad_deb...@joonet.de> Homepage: http://www.squidguard.org Standards-Version: 3.9.2 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/squidguard.git Vcs-Git: git://anonscm.debian.org/collab-maint/squidguard.git Build-Depends: debhelper (>= 7.0.50~), libldap2-dev | libldap-dev, libdb-dev, perl, bison, flex Checksums-Sha1: 0508ccb7db5c656b9952eacbcff2c956c01677d3 1968492 squidguard_1.4.orig.tar.gz bf98c97088e2caca09cc52796a5f8094fc7af262 26188 squidguard_1.4-4.debian.tar.gz Checksums-Sha256: 0711ce60b8e2bbba107b980fed446a88df35e1584b39f079c0cae54a172c5141 1968492 squidguard_1.4.orig.tar.gz 759ed4eb086f97de443e2a29ed1932d305d987eb861e5b9a1eb0995c13562d90 26188 squidguard_1.4-4.debian.tar.gz Files: de834150998c1386c30feae196f16b06 1968492 squidguard_1.4.orig.tar.gz a7480876022341571f2352b17db1ca3c 26188 squidguard_1.4-4.debian.tar.gz
