Fix db4.7 patch, #283596

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

3 files changed, 30 insertions, 99 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index b8a3db5f36f0..cf19aafe0f6b 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.144 2009/09/07 09:51:43 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.145 2009/09/18 12:50:14 dertobi123 Exp $
+
+  18 Sep 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  files/cyrus-imapd-2.3.14-fix-db-rpath.patch:
+  Fix db4.7 patch, #283596
 
   07 Sep 2009; <chainsaw@gentoo.org> cyrus-imapd-2.3.14-r3.ebuild:
   Marked stable on AMD64 as requested by Tobias Scherbaum
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 7d66140c3ab8..2573cdb54686 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cyrus-imapd-2.2-libwrap.patch 390 RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 SHA1 0075421585a73f2673e3daff9a4c140d9cc5046e SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e
 AUX cyrus-imapd-2.3.14-add-db47-support.patch 805 RMD160 18acd706ecdb14e8dc8713e1b66140fa13c65927 SHA1 e0008e89c924edb0f66587f2a312a06385a9a335 SHA256 09b275e21999355fea14ee173c9360658c02854b492c532b4bc58d301c387132
 AUX cyrus-imapd-2.3.14-bug283596-2.patch 2888 RMD160 668bb8caa2768fab0670818267d447d8dfd2ca74 SHA1 13dabf135e80283cf7fc0b59dc7978cdef097105 SHA256 bf231f56605b3d9da4ef591765a097d2cad558dc06b466e8df856934a32797ff
-AUX cyrus-imapd-2.3.14-fix-db-rpath.patch 3212 RMD160 f594023539f679df4f3eecbce20a65a73c460798 SHA1 bace3014a88b0d2b2daad2b3c7580196f9db953b SHA256 74b4cef7ecc2fe58bc448b88f0ed8e138c77a8870aa64bddca66a5ce96680486
+AUX cyrus-imapd-2.3.14-fix-db-rpath.patch 1287 RMD160 bc4e98cfdd2c0be3091e728569540a7e1f17abc8 SHA1 97fcfbc3d7724f0ca1b9e3621a7609e53c631e6f SHA256 4443953d6042e8b521f59b62776d53c99f639f1c589f4b63d0ed94bbb5104a80
 AUX cyrus-imapd-parallel.patch 256 RMD160 fa7c53c847c4af9a7c218943be46b136b69f911c SHA1 8f4a7cbf91652354681e81e5c31f53728273a1c9 SHA256 adc6d031f2e9f547b192b36685d7873fdb5c5cb690e951b173fdcd55163cc68c
 AUX cyrus-imapd-strip.patch 527 RMD160 83dda22c91798715c7790c3964705b60edeab904 SHA1 624635c7a3dd17e0d3ed84c2c7b07fe042d54cc0 SHA256 4edf438766a291c18847efbcf0596e5c7fc848a1c04b851b20074a195c1b2f18
 AUX cyrus.conf 1354 RMD160 b2d6f470b7097036a5c64bc59f147f78fdbc16d5 SHA1 efc4d14807391be53018a81c4f4277cd8d6ce5f8 SHA256 23189674bb5c2f021f35027cfe22cfe56e022ce5e03da67f5c4913473bec1292
@@ -29,12 +26,5 @@ AUX kolab/2.3.14/timsieved_starttls-sendcaps.patch 849 RMD160 88fd0aff780cd21f61
 DIST cyrus-imapd-2.3.14.tar.gz 2348808 RMD160 03fd8bdef669786f58ddf8b3fa0e0a57b2ee6b69 SHA1 cf046e2399b5ae84c654c6ab04eb047341d93002 SHA256 fd840403c1f25adda8f003ea59169e2c87210c4e60ca47c498bda7060ed097a0
 EBUILD cyrus-imapd-2.3.14-r3.ebuild 8160 RMD160 5d6a751182603aef1198c887c085e305ecbda82b SHA1 3e542bc140e3d88694031f70d8a4316d1cad96f6 SHA256 875fbea87a7e7501c0011a54fdf1958b23c7541377f80572823e168b31e9b911
 EBUILD cyrus-imapd-2.3.14.ebuild 7396 RMD160 aa8db8f452f048e9db056062e524f6afcc09059b SHA1 20f2d7ef78caf7a883473780d07049b089d6bdf6 SHA256 088d29ea46912afc31bf06f213fcdd8fb585423e45e64b42f3d0ef697337c12f
-MISC ChangeLog 28723 RMD160 d69cf6c6ad4bc4b4d175d4b4ecd6e71d3bef232a SHA1 8640bd3fd722fef2f002fecf1c520e13e6f2e9ff SHA256 73cc9a1e55ceba71363f0e945c151d3c9c7a954acae63f950f73ca32a67e7910
+MISC ChangeLog 28856 RMD160 6cd6d4cf4ce0cc1737c734e8a01bb46c8591c252 SHA1 db2934cac9ab6c2dd31515682b0f5d938fda3781 SHA256 621e2bd563afbc12a4fa6710c5b2089e17dfd1d16c6228a31e0cdb53da6a3653
 MISC metadata.xml 450 RMD160 43d7242bfdfcd5c328805bf7912fd07b20999ddc SHA1 53cb62e89c804226d5392cdeef9c45a8bdeaf99c SHA256 b8a9c9faf2353b9f33814cf9f12fa6183ab18449699d58104260109cef3c8470
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqk138ACgkQp5vW4rUFj5o7iwCfXqut+v8VFHL6pdXx1/xqtr/6
-n+kAn30Qc5fhm/cZ7BOhSCZpkSX+WaDs
-=MuDh
------END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-fix-db-rpath.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-fix-db-rpath.patch
index b4ebbc68f07c..9b74a8db2516 100644
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-fix-db-rpath.patch
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-fix-db-rpath.patch
@@ -1,66 +1,27 @@
-diff -u -r cyrus-imapd-2.3.14-old/cmulocal/berkdb.m4 cyrus-imapd-2.3.14/cmulocal/berkdb.m4
---- cyrus-imapd-2.3.14-old/cmulocal/berkdb.m4	2009-07-09 17:12:12.000000000 +0000
-+++ cyrus-imapd-2.3.14/cmulocal/berkdb.m4	2009-07-09 16:54:53.000000000 +0000
-@@ -139,40 +139,6 @@
- 	  if test "X$RPATH" = "X"; then
- 		RPATH=""
- 	  fi
--	  case "${host}" in
--	    *-*-linux*)
--	      if test "X$RPATH" = "X"; then
--	        RPATH="-Wl,-rpath,${DB_LIB_DIR}"
--	      else 
--		RPATH="${RPATH}:${DB_LIB_DIR}"
--	      fi
--	      ;;
--	    *-*-hpux*)
--	      if test "X$RPATH" = "X"; then
--	        RPATH="-Wl,+b${DB_LIB_DIR}"
--	      else 
--		RPATH="${RPATH}:${DB_LIB_DIR}"
--	      fi
--	      ;;
--	    *-*-irix*)
--	      if test "X$RPATH" = "X"; then
--	        RPATH="-Wl,-rpath,${DB_LIB_DIR}"
--	      else 
--		RPATH="${RPATH}:${DB_LIB_DIR}"
--	      fi
--	      ;;
--	    *-*-solaris2*)
--	      if test "$ac_cv_prog_gcc" = yes; then
--		if test "X$RPATH" = "X"; then
--		  RPATH="-Wl,-R${DB_LIB_DIR}"
--		else 
--		  RPATH="${RPATH}:${DB_LIB_DIR}"
--		fi
--	      else
--	        RPATH="${RPATH} -R${DB_LIB_DIR}"
--	      fi
--	      ;;
--	  esac
- 	  AC_SUBST(RPATH)
- 	fi
- 	])
-@@ -205,12 +171,6 @@
- [
- 	BDB_SAVE_LDFLAGS=$LDFLAGS
- 
--	if test -d $with_bdb_lib; then
--	    CMU_ADD_LIBPATH_TO($with_bdb_lib, LDFLAGS)
--	    CMU_ADD_LIBPATH_TO($with_bdb_lib, BDB_LIBADD)
--	else
--	    BDB_LIBADD=""
--	fi
+--- cyrus-imapd-2.3.14.old/cmulocal/cyrus.m4	2003-10-08 22:35:24.000000000 +0200
++++ cyrus-imapd-2.3.14/cmulocal/cyrus.m4	2009-09-18 04:32:41.000000000 +0200
+@@ -11,35 +11,12 @@
+ dnl (so the runpath for shared libraries is set).
+ AC_DEFUN([CMU_ADD_LIBPATH], [
+   # this is CMU ADD LIBPATH
+-  if test "$andrew_runpath_switch" = "none" ; then
+-	LDFLAGS="-L$1 ${LDFLAGS}"
+-  else
+-	LDFLAGS="-L$1 $andrew_runpath_switch$1 ${LDFLAGS}"
+-  fi
++	LDFLAGS="-L$1 ${LDFLAGS}"
+ ])
  
- 	saved_LIBS=$LIBS
-         for dbname in ${with_bdb} db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-diff -u -r cyrus-imapd-2.3.14-old/cmulocal/cyrus.m4 cyrus-imapd-2.3.14/cmulocal/cyrus.m4
---- cyrus-imapd-2.3.14-old/cmulocal/cyrus.m4	2003-10-08 20:35:24.000000000 +0000
-+++ cyrus-imapd-2.3.14/cmulocal/cyrus.m4	2009-07-09 16:54:53.000000000 +0000
-@@ -28,18 +28,3 @@
- 	$2="-L$1 ${$2} $andrew_runpath_switch$1"
-   fi
+ dnl add -L(1st arg), and possibly (runpath switch)(1st arg), to (2nd arg)
+ dnl (so the runpath for shared libraries is set).
+ AC_DEFUN([CMU_ADD_LIBPATH_TO], [
+   # this is CMU ADD LIBPATH TO
+-  if test "$andrew_runpath_switch" = "none" ; then
+-	$2="-L$1 ${$2}"
+-  else
+-	$2="-L$1 ${$2} $andrew_runpath_switch$1"
+-  fi
++	$2="-L$1 ${$2}"
  ])
 -
 -dnl runpath initialization
@@ -77,27 +38,3 @@ diff -u -r cyrus-imapd-2.3.14-old/cmulocal/cyrus.m4 cyrus-imapd-2.3.14/cmulocal/
 -    ])
 -  LDFLAGS="${SAVE_LDFLAGS}"
 -  ])])
-diff -u -r cyrus-imapd-2.3.14-old/configure.in cyrus-imapd-2.3.14/configure.in
---- cyrus-imapd-2.3.14-old/configure.in	2008-10-08 23:28:58.000000000 +0000
-+++ cyrus-imapd-2.3.14/configure.in	2009-07-09 17:18:49.000000000 +0000
-@@ -118,9 +118,6 @@
- CMU_C___ATTRIBUTE__
- CMU_C_FPIC
- 
--dnl check for -R, etc. switch
--CMU_GUESS_RUNPATH_SWITCH
--
- AC_CHECK_HEADERS(unistd.h sys/select.h sys/param.h stdarg.h)
- AC_REPLACE_FUNCS(memmove strcasecmp ftruncate strerror)
- AC_CHECK_FUNCS(strlcat strlcpy getgrouplist)
-@@ -205,10 +202,6 @@
-     supply the --with-bdb-libdir or --with-bdb-incdir configure options.])
-   fi
- 
--  if test "$with_bdb_lib" != "none"; then
--    CMU_ADD_LIBPATH($with_bdb_lib)
--  fi
--
-   BDB_INC=${BDB_INCADD}
-   BDB_LIB=${BDB_LIBADD}
-   AC_SUBST(BDB_INC)