[arch-commits] Commit in postfix/trunk (PKGBUILD buildfix_db6.diff)

[Andreas Radke]

    Date: Wednesday, August 7, 2013 @ 20:29:18
  Author: andyrtr
Revision: 192211

upgpkg: postfix 2.10.1-2

db rebuild - requires testing

Added:
  postfix/trunk/buildfix_db6.diff
Modified:
  postfix/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   10 ++++++++--
 buildfix_db6.diff |   11 +++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-07 18:08:44 UTC (rev 192210)
+++ PKGBUILD	2013-08-07 18:29:18 UTC (rev 192211)
@@ -5,7 +5,7 @@
 
 pkgname=postfix
 pkgver=2.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')
@@ -14,9 +14,12 @@
          'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb')
 backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig}
+        'buildfix_db6.diff'
         'aliases.patch'
         'service')
-sha1sums=('3e236cf95a7439750e92d9ef5cd510c00e603eb2' 'SKIP'
+sha1sums=('3e236cf95a7439750e92d9ef5cd510c00e603eb2'
+          'SKIP'
+          '50663b218f59d5c16d523c8949dc4e736fb7da37'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
           '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6')
 
@@ -28,6 +31,9 @@
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
+	# fix build with Berkeley DB 6.x - let's pray db format hasn't changed
+	patch -Np1 -i $srcdir/buildfix_db6.diff
+
 	make makefiles DEBUG='' CCARGS=' \
 		-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \
 		-DHAS_LDAP \

Added: buildfix_db6.diff
===================================================================
--- buildfix_db6.diff	                        (rev 0)
+++ buildfix_db6.diff	2013-08-07 18:29:18 UTC (rev 192211)
@@ -0,0 +1,11 @@
+--- postfix-2.10.1/src/util/dict_db.c	2013-08-07 20:21:59.935379313 +0200
++++ postfix-2.10.1/src/util/dict_db.c.new	2013-08-07 20:24:10.172473653 +0200
+@@ -693,7 +693,7 @@
+ 	msg_fatal("set DB cache size %d: %m", dict_db_cache_size);
+     if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0)
+ 	msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
+-#if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
++#if DB_VERSION_MAJOR == 6 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
+     if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
+ 	FREE_RETURN(dict_surrogate(class, path, open_flags, dict_flags,
+ 				   "open database %s: %m", db_path));