Fixing for USE=kerberos, thanks to Jeroen Roovers for the patch. fixes #288895

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

6 files changed, 88 insertions, 6 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index cbbbd8d1c572..3af4629c2a93 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/postgresql-base
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.29 2009/10/13 15:18:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.30 2009/10/22 19:19:49 patrick Exp $
+
+  22 Oct 2009; Patrick Lauer <patrick@gentoo.org>
+  postgresql-base-7.4.26.ebuild, +files/postgresql-7.4-com_err.patch:
+  Fixing for USE=kerberos, thanks to Jeroen Roovers for the patch. fixes
+  #288895
 
   13 Oct 2009; Jeroen Roovers <jer@gentoo.org> postgresql-base-8.4.1.ebuild:
   Stable for HPPA (bug #285475).
diff --git a/dev-db/postgresql-base/files/postgresql-7.4-com_err.patch b/dev-db/postgresql-base/files/postgresql-7.4-com_err.patch
new file mode 100644
index 000000000000..d77c1ce5c9f5
--- /dev/null
+++ b/dev-db/postgresql-base/files/postgresql-7.4-com_err.patch
@@ -0,0 +1,35 @@
+--- postgresql-7.4.26.orig/configure.in	2009-10-13 17:52:02.629889931 +0200
++++ postgresql-7.4.26/configure.in	2009-10-13 18:02:40.776550323 +0200
+@@ -777,7 +777,7 @@
+ 
+ if test "$with_krb5" = yes ; then
+   AC_CHECK_HEADER(krb5.h, [], [AC_MSG_ERROR([header file <krb5.h> is required for Kerberos 5])])
+-  AC_CHECK_HEADER(com_err.h, [], [AC_MSG_ERROR([header file <com_err.h> is required for Kerberos 5])])
++  AC_CHECK_HEADER(et/com_err.h, [], [AC_MSG_ERROR([header file <et/com_err.h> is required for Kerberos 5])])
+ fi
+ 
+ if test "$with_openssl" = yes ; then
+diff -ur postgresql-7.4.26.orig/src/backend/libpq/auth.c postgresql-7.4.26/src/backend/libpq/auth.c
+--- postgresql-7.4.26.orig/src/backend/libpq/auth.c	2003-12-20 19:25:02.000000000 +0100
++++ postgresql-7.4.26/src/backend/libpq/auth.c	2009-10-13 18:15:14.693467302 +0200
+@@ -150,7 +150,7 @@
+  */
+ 
+ #include <krb5.h>
+-#include <com_err.h>
++#include <et/com_err.h>
+ 
+ /*
+  * pg_an_to_ln -- return the local name corresponding to an authentication
+diff -ur postgresql-7.4.26.orig/src/interfaces/libpq/fe-auth.c postgresql-7.4.26/src/interfaces/libpq/fe-auth.c
+--- postgresql-7.4.26.orig/src/interfaces/libpq/fe-auth.c	2007-07-23 20:10:13.000000000 +0200
++++ postgresql-7.4.26/src/interfaces/libpq/fe-auth.c	2009-10-13 18:15:14.685467676 +0200
+@@ -243,7 +243,7 @@
+  */
+ 
+ #include <krb5.h>
+-#include <com_err.h>
++#include <et/com_err.h>
+ 
+ /*
+  * pg_an_to_ln -- return the local name corresponding to an authentication
diff --git a/dev-db/postgresql-base/postgresql-base-7.4.26.ebuild b/dev-db/postgresql-base/postgresql-base-7.4.26.ebuild
index 69111afcd889..a13e7a6a32a3 100644
--- a/dev-db/postgresql-base/postgresql-base-7.4.26.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-7.4.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-7.4.26.ebuild,v 1.2 2009/10/11 09:05:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-7.4.26.ebuild,v 1.3 2009/10/22 19:19:49 patrick Exp $
 
 EAPI="1"
 
@@ -54,7 +54,8 @@ src_unpack() {
 
 	epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch" \
 		"${FILESDIR}/postgresql-${SLOT}-hppa.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-base.patch"
+		"${FILESDIR}/postgresql-${SLOT}-base.patch" \
+		"${FILESDIR}/postgresql-${SLOT}-com_err.patch"
 
 	# to avoid collision - it only should be installed by server
 	rm "${S}/src/backend/nls.mk"
diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index b6d8d09929fa..52fe1ba0c17c 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/postgresql-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.29 2009/10/14 04:42:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.30 2009/10/22 19:20:13 patrick Exp $
+
+  22 Oct 2009; Patrick Lauer <patrick@gentoo.org>
+  postgresql-server-7.4.26.ebuild, +files/postgresql-7.4-com_err.patch:
+  Fixing for USE=kerberos, thanks to Jeroen Roovers for the patch. fixes
+  #288895
 
   14 Oct 2009; Jeroen Roovers <jer@gentoo.org>
   postgresql-server-7.4.26.ebuild:
diff --git a/dev-db/postgresql-server/files/postgresql-7.4-com_err.patch b/dev-db/postgresql-server/files/postgresql-7.4-com_err.patch
new file mode 100644
index 000000000000..d77c1ce5c9f5
--- /dev/null
+++ b/dev-db/postgresql-server/files/postgresql-7.4-com_err.patch
@@ -0,0 +1,35 @@
+--- postgresql-7.4.26.orig/configure.in	2009-10-13 17:52:02.629889931 +0200
++++ postgresql-7.4.26/configure.in	2009-10-13 18:02:40.776550323 +0200
+@@ -777,7 +777,7 @@
+ 
+ if test "$with_krb5" = yes ; then
+   AC_CHECK_HEADER(krb5.h, [], [AC_MSG_ERROR([header file <krb5.h> is required for Kerberos 5])])
+-  AC_CHECK_HEADER(com_err.h, [], [AC_MSG_ERROR([header file <com_err.h> is required for Kerberos 5])])
++  AC_CHECK_HEADER(et/com_err.h, [], [AC_MSG_ERROR([header file <et/com_err.h> is required for Kerberos 5])])
+ fi
+ 
+ if test "$with_openssl" = yes ; then
+diff -ur postgresql-7.4.26.orig/src/backend/libpq/auth.c postgresql-7.4.26/src/backend/libpq/auth.c
+--- postgresql-7.4.26.orig/src/backend/libpq/auth.c	2003-12-20 19:25:02.000000000 +0100
++++ postgresql-7.4.26/src/backend/libpq/auth.c	2009-10-13 18:15:14.693467302 +0200
+@@ -150,7 +150,7 @@
+  */
+ 
+ #include <krb5.h>
+-#include <com_err.h>
++#include <et/com_err.h>
+ 
+ /*
+  * pg_an_to_ln -- return the local name corresponding to an authentication
+diff -ur postgresql-7.4.26.orig/src/interfaces/libpq/fe-auth.c postgresql-7.4.26/src/interfaces/libpq/fe-auth.c
+--- postgresql-7.4.26.orig/src/interfaces/libpq/fe-auth.c	2007-07-23 20:10:13.000000000 +0200
++++ postgresql-7.4.26/src/interfaces/libpq/fe-auth.c	2009-10-13 18:15:14.685467676 +0200
+@@ -243,7 +243,7 @@
+  */
+ 
+ #include <krb5.h>
+-#include <com_err.h>
++#include <et/com_err.h>
+ 
+ /*
+  * pg_an_to_ln -- return the local name corresponding to an authentication
diff --git a/dev-db/postgresql-server/postgresql-server-7.4.26.ebuild b/dev-db/postgresql-server/postgresql-server-7.4.26.ebuild
index db7725dae019..7606f6a9a83f 100644
--- a/dev-db/postgresql-server/postgresql-server-7.4.26.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-7.4.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-7.4.26.ebuild,v 1.3 2009/10/14 04:42:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-7.4.26.ebuild,v 1.4 2009/10/22 19:20:13 patrick Exp $
 
 EAPI="1"
 
@@ -52,7 +52,8 @@ src_unpack() {
 	epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch" \
 		"${FILESDIR}/postgresql-${SLOT}-vacuum-delay.patch" \
 		"${FILESDIR}/postgresql-${SLOT}-server.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-hppa.patch"
+		"${FILESDIR}/postgresql-${SLOT}-hppa.patch" \
+		"${FILESDIR}/postgresql-${SLOT}-com_err.patch"
 
 	if hasq test ${FEATURES}; then
 		epatch "${FILESDIR}/postgresql-${SLOT}-regress.patch"