Added warning and fix for running postgresql and initdb on hppa. Added hppa to KEYWORDS.

3 files changed, 47 insertions, 14 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 6af2f0adb216..749f7caffd3d 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.60 2003/07/31 03:14:22 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.61 2003/08/06 12:21:57 gmsoft Exp $
 
 *postgresql-7.3.4 (31 Jul 2003)
 
+  06 Aug 2003; Guy Martin <gmsoft@gentoo.org> postgresql-7.3.4.ebuild :
+  Added warning and fix for running postgresql and initdb on hppa.
+  Added hppa to KEYWORDS.
+
   31 Jul 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.4.ebuild,
   files/postgresql.init-7.3.4:
   Version bumped and modified init script.
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index e14a35cfb0ec..531e65174997 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,18 +1,19 @@
-MD5 b74ddef00a98e9d3a9ca05f73def5222 postgresql-7.3.ebuild 5542
-MD5 81d6711326226ed25d35a9723fd83edf postgresql-7.3.3.ebuild 5958
+MD5 5f4bbc09ce4e6c9175b08efd7407a6e8 ChangeLog 9944
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 2e752de9634e2a5cd5d9f159434d8a89 postgresql-7.3.2.ebuild 5949
-MD5 8cb023189b367d9ee8e151e96fd2f5a5 ChangeLog 9778
-MD5 b7456f58fd7fcc709bdc877bef755eb4 postgresql-7.3.4.ebuild 6028
-MD5 bc6938c5fbc47a864dddb0c885f0a6dd files/pgsql 613
-MD5 b0b26f2f466f14fcab3085e2ce726413 files/postgresql.init-7.3.4 1138
-MD5 26e2c8e4978d59f58bf13e94bbdc446b files/postgres 851
+MD5 81d6711326226ed25d35a9723fd83edf postgresql-7.3.3.ebuild 5958
+MD5 0bd389b656eb2978c65f1940d71c4a3f postgresql-7.3.4.ebuild 7264
+MD5 b74ddef00a98e9d3a9ca05f73def5222 postgresql-7.3.ebuild 5542
+MD5 ed9c20d88bfaf8e24e28a79309a17a52 files/digest-postgresql-7.3 68
 MD5 7506f28d74e703211fb53ebd246b5791 files/digest-postgresql-7.3.2 70
 MD5 b140ea7a1bde8bbe8d14c34d7b2bf243 files/digest-postgresql-7.3.3 70
 MD5 c85aa6c2eb4a2fea8869eaccb5b4a6dc files/digest-postgresql-7.3.4 70
-MD5 ed9c20d88bfaf8e24e28a79309a17a52 files/digest-postgresql-7.3 68
-MD5 a9021afba518a106483188ea60dadc7c files/postmaster-wrapper 445
+MD5 bc6938c5fbc47a864dddb0c885f0a6dd files/pgsql 613
+MD5 26e2c8e4978d59f58bf13e94bbdc446b files/postgres 851
+MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql 375
 MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
 MD5 4e148f930c09bddec23d157f9c446020 files/postgresql.init 937
-MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql 375
+MD5 b0b26f2f466f14fcab3085e2ce726413 files/postgresql.init-7.3.4 1138
+MD5 a9021afba518a106483188ea60dadc7c files/postmaster-wrapper 445
 MD5 c6a4bb3c0ed81f48ad1d6b675c32842e files/7.3/postgresql 678
 MD5 c6a4bb3c0ed81f48ad1d6b675c32842e files/7.3.2/postgresql 678
diff --git a/dev-db/postgresql/postgresql-7.3.4.ebuild b/dev-db/postgresql/postgresql-7.3.4.ebuild
index aed08af578c8..689af5fa4372 100644
--- a/dev-db/postgresql/postgresql-7.3.4.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.4.ebuild,v 1.1 2003/07/31 03:14:22 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.4.ebuild,v 1.2 2003/08/06 12:21:57 gmsoft Exp $
 
 DESCRIPTION="sophisticated Object-Relational DBMS"
 SRC_URI="ftp://ftp.postgresql.org/pub/source/v${PV}/${P}.tar.gz
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 hppa"
 IUSE="ssl nls java python tcltk perl libg++ pam readline zlib"
 
 filter-flags -ffast-math 
@@ -153,7 +153,7 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	einfo "Creating data directory ..."
+	einfo "Creating the prout data directory ..."
 	mkdir -p ${PG_DIR}/data
 	chown -Rf postgres.postgres ${PG_DIR}
 	chmod 700 ${PG_DIR}/data
@@ -172,7 +172,35 @@ pkg_config() {
 			einfo "Read the documentation to check how to upgrade to version ${PV}."
 		fi
 	else
+		# On hppa, postgresql need way more than the default sem index and shmmax
+		if [ "${ARCH}" = "hppa" ]; then
+			SEM_IDX_MIN=1024
+			SHMMAX_MIN=100000000
+			SEM_IDX=`sysctl kernel.sem | awk '{ print $6 }'`
+			if [ $SEM_IDX -lt ${SEM_IDX_MIN} ]; then
+				eerror "The last value of /proc/sys/kernel/sem is too low for postgresql to run"
+				eerror "Temporary setting this value to ${SEM_IDX_MIN} while creating the initial database."
+				cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX}/\t${SEM_IDX_MIN}/" > /proc/sys/kernel/sem
+			fi
+		fi
 		sudo -u postgres /usr/bin/initdb --pgdata ${PG_DIR}/data
+
+		if [ "${ARCH}" = "hppa" ]; then
+			if [ ! `sysctl kernel.sem | awk '{ print $6 }'` -eq ${SEM_IDX} ] ; then
+				cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX_MIN}/\t${SEM_IDX}/" > /proc/sys/kernel/sem
+				ewarn "Restoring the sem idx value to the previous value"
+				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
+				ewarn "and set it to at least ${SEM_IDX_MIN}"
+			fi
+
+			if [ `sysctl kernel.shmmax | awk '{ print $3 }'` -lt ${SHMMAX_MIN} ]; then
+				eerror "The current value of /proc/sys/kernel/shmmax is too low"
+				eerror "for postgresql to run. Please edit /etc/sysctl.conf and set"
+				eerror "this value to at least ${SHMMAX_MIN}."
+
+			fi
+		fi
+
 		einfo "If you are upgrading from a pre-7.3 version of PostgreSQL, please read"
 		einfo "the README.adddepend file for information on how to properly migrate"
 		einfo "all serial columns, unique keys and foreign keys to this version."