Add patch to build against berkdb 5 (bug #321299).

Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64

4 files changed, 29 insertions, 10 deletions

diff --git a/mail-mta/sendmail/ChangeLog b/mail-mta/sendmail/ChangeLog
index 45c1d1a26128..b84a22d37191 100644
--- a/mail-mta/sendmail/ChangeLog
+++ b/mail-mta/sendmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/sendmail
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.91 2010/02/01 19:54:56 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.92 2011/01/10 13:47:12 flameeyes Exp $
+
+  10 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org> sendmail-8.14.4.ebuild,
+  +files/sendmail-8.14.4+db-5.0.patch:
+  Add patch to build against berkdb 5 (bug #321299).
 
   01 Feb 2010; Markus Meier <maekke@gentoo.org> sendmail-8.14.4.ebuild:
   amd64 stable, bug #299120
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 1dceda97b21c..eeb3fb31b48b 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX libmilter-sharedlib.patch 2843 RMD160 fc25843bb7d9dd0f7ebddb87fd9e80839438b277 SHA1 ab100120cb86fe362cbd9fefefde8e54c3716bad SHA256 3a753b0881fe622814b471ee5f9037905c7cc3ed08ef74908464ab5307e59d5a
 AUX mailer.conf 1306 RMD160 7f752b3b88208eda71f96de6621e050a684b8fdb SHA1 a2704751d866367f969554841af8f637766db528 SHA256 f07e22401ff9fae449bfb093dfc608b6f8e71af1c7c3790d89a71af9a1411a44
 AUX sendmail 701 RMD160 991eb44041ac33d04693a838b7e976a7cca14e61 SHA1 ac6991b5d77b428ba58b6a3a4aa8ba0834ffbfaa SHA256 c95de55fbd5334ec54f17efe69a33c242a9ba28cd76f11cc3c7ff8418cf49acb
+AUX sendmail-8.14.4+db-5.0.patch 432 RMD160 8d93900ed4638f17f268666af0894baa735838f8 SHA1 ed66734cba8be964e6544c7acafba14835b55e70 SHA256 8de05f83c7d6fd287e965666f7b4c502fb0e00dc872a0c83ff48b0a83735f9a6
 AUX sendmail-build-system.patch 13019 RMD160 06819e163471c90f336162e9a6fbf11ecf3f1ea1 SHA1 d2b8ac723a63854fb4149111e5c8ead01bf65328 SHA256 90c8c20517dc253839094c439c23f42ee0472a1094635b6ab1ef12a223ddb50b
 AUX sendmail-delivered_hdr.patch 341 RMD160 a190574a57c643233c0d23e8b69dbf3cd3943f41 SHA1 17d034625524438dc98a2a7a14a7bfe2fb047420 SHA256 bfe354d1047c66ea857e56cb374f583eb779c8f4ccc92ea766e916ec358cd77c
 AUX sendmail-procmail.mc 357 RMD160 e912a3d2f91fc60e0856e1a537b9a9851788172f SHA1 536e5b842ef280f2abd86ee0f8f5987a885350b7 SHA256 8da4cc39758ff1668d7bf7c3713914cb44ef8d084ab822629316ee3caae90856
@@ -19,13 +20,13 @@ EBUILD sendmail-8.14.1.ebuild 6780 RMD160 059a1ae2638fbafedf602bcabe6bc03958609e
 EBUILD sendmail-8.14.2.ebuild 6780 RMD160 f13212d00222dd806029dcd0528baf84bc758df2 SHA1 53d43462e2c6559d4e758fff8bc8e641a2f87d31 SHA256 8d31f2c0431b10d571c0cba90beeff7d3083f5c462147752c9fade3e2c5087a5
 EBUILD sendmail-8.14.3-r1.ebuild 7506 RMD160 4e831f1cf6bbdd22642b8edd28f61dd5f2b7d224 SHA1 3eb176a66a60bc8864f38b9cf985d1c145a1fb1b SHA256 d9f2c449056055a54636c9abbee58a55746c92d36c1e80c742112e7b72983e5d
 EBUILD sendmail-8.14.3-r2.ebuild 7558 RMD160 71553a98f389260d52851182acc6d8ad03e14efd SHA1 f5927077560aedb1dae45cee0f9f05f79c3fc83d SHA256 4c9dca40d549b9c0457d1e2a4bcc66c7314983be6645d9782b504d8d968e1d6d
-EBUILD sendmail-8.14.4.ebuild 7544 RMD160 b2b453d64cacf229927fab632e8f1c952915b6f5 SHA1 68d65e5db10937a66fa8f541c7ad768e3c6f8924 SHA256 c4ec771f8f320512d987efc247f206ea0fc18a91ad2771a579f82f63b23768a7
-MISC ChangeLog 20219 RMD160 a018c50e725d75b236a822ae05889f9560ab41c4 SHA1 794993d6859757c4988674b33f5ca6d4c4e720ff SHA256 8026b5ab845c5e647be43eb7cc5435ab9b7f11bbef1e63cdcc01238fdcaa45c2
+EBUILD sendmail-8.14.4.ebuild 7587 RMD160 550cd2202337ca86a970455f6e2e7730947ef3a9 SHA1 ab3494b72b9dc5fe8a611189f641eaedf45e9419 SHA256 588ed88fa7ec536704d26cc45e714f4e5893cd5844ac8ecc768268a5c5a418aa
+MISC ChangeLog 20395 RMD160 661664267fe666e3a2f045ad9f6e2c190fb0e583 SHA1 bdf4ebda970d894a30f30fd6e3ec5eb2163223b6 SHA256 24a4db584d370becabe6d6821308b0eed0707352ac767ba14bcb20511124d9e4
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAktnMWYACgkQkKaRLQcq0GIxbQCfSpLm/6Vkqa520U8dfUiNN1cE
-ZUwAn13/M/X1sfqckhfYn/7xWOvBpDAA
-=GYk0
+iEYEARECAAYFAk0rDckACgkQAiZjviIA2XhWHACgiiLfTy6s5CFzUEhliX+lEZlm
+eIoAoJcmqUBSe68q2gfsaWCI2Tw394HG
+=W1PU
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/sendmail/files/sendmail-8.14.4+db-5.0.patch b/mail-mta/sendmail/files/sendmail-8.14.4+db-5.0.patch
new file mode 100644
index 000000000000..99ecbe081674
--- /dev/null
+++ b/mail-mta/sendmail/files/sendmail-8.14.4+db-5.0.patch
@@ -0,0 +1,13 @@
+Index: sendmail-8.14.4/include/sm/bdb.h
+===================================================================
+--- sendmail-8.14.4.orig/include/sm/bdb.h
++++ sendmail-8.14.4/include/sm/bdb.h
+@@ -19,7 +19,7 @@
+ #  define DB_VERSION_MAJOR 1
+ # endif /* ! DB_VERSION_MAJOR */
+ 
+-# if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
++# if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
+ 
+ #  define DBTXN	NULL ,
+ 
diff --git a/mail-mta/sendmail/sendmail-8.14.4.ebuild b/mail-mta/sendmail/sendmail-8.14.4.ebuild
index 0b4303a8fda1..0adc055e9297 100644
--- a/mail-mta/sendmail/sendmail-8.14.4.ebuild
+++ b/mail-mta/sendmail/sendmail-8.14.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.4.ebuild,v 1.6 2010/02/01 19:54:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.4.ebuild,v 1.7 2011/01/10 13:47:12 flameeyes Exp $
 
 EAPI="2"
 
@@ -49,6 +49,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/sendmail-build-system.patch
 	epatch "${FILESDIR}"/sendmail-delivered_hdr.patch
 	epatch "${FILESDIR}"/libmilter-sharedlib.patch
+	epatch "${FILESDIR}"/${P}+db-5.0.patch
 
 	local confCC="$(tc-getCC)"
 	local confCCOPTS="${CFLAGS}"