version bump

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 150942a740b986dad140b358a162e4c76783a517..73f729c00b42d8006ce206d4e9d53e6af4e25b4c 100644 (file)
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.168 2005/01/07 17:19:21 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.169 2005/01/12 10:05:46 nakano Exp $
+
+*postgresql-8.0.0_rc5 (11 Jan 2005)
+
+  11 Jan 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/pg_autovacuum.conf-8.0.0_rc5, +files/pg_autovacuum.init-8.0.0_rc5,
+  +files/postgresql-8.0.0_rc5-gentoo.patch, +postgresql-8.0.0_rc5.ebuild:
+  Version bump.
 
 *postgresql-8.0.0_rc4 (07 Jan 2005)
 

diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 5b8ac9998b4fec1a7ce0aa385785e1db422e20ca..71bd828663e77941a332658448a6ca9c10b0ce9d 100644 (file)
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -8,8 +8,10 @@ MD5 f09416694117e0a0cee33645c684ff35 postgresql-7.3.7-r2.ebuild 7954
 MD5 867641bb7281f098bc2aacc094ac1c77 postgresql-7.4.3.ebuild 9766
 MD5 99537073b08406950be7655e973b307d postgresql-7.4.5-r1.ebuild 10089
 MD5 7de4b12d2bbae3e1ab01a33a287972fe postgresql-7.4.5.ebuild 10077
-MD5 9ff5f83b2b2a6952ccdc2c37a19407d6 ChangeLog 30264
+MD5 88b21576705fabe7e57409233acf4953 ChangeLog 30519
+MD5 301b97e21df04325aacea0b46f3a4546 postgresql-8.0.0_rc5.ebuild 7311
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 e0322bcc57ae746ff23f3b523240c4d3 files/postgresql-8.0.0_rc5-gentoo.patch 820
 MD5 cd9e32f5a21def1a4e2d1ac0e042aa47 files/postgresql-7.3.7-gentoo.patch 529
 MD5 e9a2e5278a70bebace44f1ecf38129e6 files/postgresql-7.4.6-gentoo.patch 1160
 MD5 7a45c9a384d0044bc879f4adaaf9179b files/postgresql-8.0.0_rc4-gentoo.patch 820
@@ -40,9 +42,11 @@ MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.6 302
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.3-hppa-testandset.patch 1596
 MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.3-vacuum-delay.patch 8918
 MD5 f07aa6bd7d797c87cd2398060d2c42a0 files/pg_autovacuum.init-8.0.0_rc4 1418
+MD5 b9740012aa630e6c1de0fe73e8cf5891 files/pg_autovacuum.init-8.0.0_rc5 1418
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.5-hppa-testandset.patch 1596
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.6-hppa-testandset.patch 1596
 MD5 7063357891f26882352b342fba321c4b files/digest-postgresql-8.0.0_rc4 232
+MD5 ce9b5b70734cc4b0a03cb6c52833e9bd files/digest-postgresql-8.0.0_rc5 232
 MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r1 223
 MD5 b22b4de6c3cc06beed0ed3e1f8df257f files/digest-postgresql-7.3.7-r2 223
 MD5 8825eddcfe252e724f9e23dd9d8eb4fa files/postgresql-7.3.8-gentoo.patch 529
@@ -51,6 +55,7 @@ MD5 edd1ce8d03bdce473718f1c3036e68cd files/digest-postgresql-7.4.5-r1 290
 MD5 edd1ce8d03bdce473718f1c3036e68cd files/digest-postgresql-7.4.5-r2 290
 MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.5-vacuum-delay.patch 8918
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.0_rc4 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.0_rc5 302
 MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
 MD5 7b8bf110e22829c7040aa1e87afa371c files/postgresql-7.4.3-gentoo.patch 631
 MD5 18249476d920987d48972156c34bec75 files/postgresql-7.4.5-r1-gentoo.patch 1160

diff --git a/dev-db/postgresql/files/digest-postgresql-8.0.0_rc5 b/dev-db/postgresql/files/digest-postgresql-8.0.0_rc5
new file mode 100644 (file)
index 0000000..303f8b1
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-8.0.0_rc5
@@ -0,0 +1,3 @@
+MD5 6b5d5d586915d5336435d99cac1844f1 postgresql-base-8.0.0rc5.tar.bz2 7799328
+MD5 997e7ebf6ec64314cf545191af582173 postgresql-opt-8.0.0rc5.tar.bz2 133479
+MD5 4ef436f8278a2df4e424935dc0850593 postgresql-docs-8.0.0rc5.tar.bz2 2193501

diff --git a/dev-db/postgresql/files/pg_autovacuum.conf-8.0.0_rc5 b/dev-db/postgresql/files/pg_autovacuum.conf-8.0.0_rc5
new file mode 100644 (file)
index 0000000..f342ebf
--- /dev/null
+++ b/dev-db/postgresql/files/pg_autovacuum.conf-8.0.0_rc5
@@ -0,0 +1,14 @@
+# The PostgreSQL user is:
+PGUSER=postgres
+
+# LOG file is:
+PG_AUTOVACUUM_LOG=/var/lib/postgresql/data/pg_autovacuum.log
+
+# See the pg_autovacuum documentation for the details of how these
+# parameters affect pg_autovacuum's aggressiveness.
+
+VACUUM_BASE=1000
+VACUUM_SCALE=2
+
+SLEEP_BASE=300
+SLEEP_SCALE=2

diff --git a/dev-db/postgresql/files/pg_autovacuum.init-8.0.0_rc5 b/dev-db/postgresql/files/pg_autovacuum.init-8.0.0_rc5
new file mode 100644 (file)
index 0000000..1cc0910
--- /dev/null
+++ b/dev-db/postgresql/files/pg_autovacuum.init-8.0.0_rc5
@@ -0,0 +1,51 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-8.0.0_rc5,v 1.1 2005/01/12 10:05:46 nakano Exp $
+
+depend() {
+       need postgresql logger
+}
+
+start() {
+       ebegin "Starting pg_autovacuum"
+       echo ""
+       echo -n "Waiting max. 10 sec. for postgresql to start "
+       CONTINUE=0
+       TOO_LONG=0
+       while [ "$CONTINUE" -eq 0 ] && [ $TOO_LONG -lt 10 ]
+       do
+               psql -U $PGUSER -d template1 -c "SELECT 1" 1> /dev/null 2> /dev/null
+               if [ "$?" -eq 0 ]
+               then
+                       CONTINUE=1
+               else
+                       echo -n "."
+                       TOO_LONG=`expr $TOO_LONG + 1`
+                       sleep 1
+               fi
+       done
+       start-stop-daemon -o --chuid $PGUSER --start --quiet --exec /usr/bin/pg_autovacuum -- -D -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG
+
+       sleep 1
+       pidof /usr/bin/pg_autovacuum > /dev/null
+       if [ $? -eq 0 ]; then
+               eend 0
+       else
+               eerror ""
+               eerror "Please see log file: $PG_AUTOVACUUM_LOG"
+               eerror "You may need to add following lines in /var/lib/postgresql/data/postgresql.conf and restart PostgreSQL."
+               eerror " stats_start_collector = true"
+               eerror " stats_row_level = true"
+
+               eerror "Please read ___DOCDIR___/contrib/README.pg_autovacuum for details."
+               eend 1
+       fi
+}
+
+stop() {
+       ebegin "Stopping pg_autovacuum"
+       start-stop-daemon --stop --quiet --exec /usr/bin/pg_autovacuum
+       result=$?
+       eend $result
+}

diff --git a/dev-db/postgresql/files/postgresql-8.0.0_rc5-gentoo.patch b/dev-db/postgresql/files/postgresql-8.0.0_rc5-gentoo.patch
new file mode 100644 (file)
index 0000000..925b4dd
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-8.0.0_rc5-gentoo.patch
@@ -0,0 +1,18 @@
+diff -Naru postgresql-8.0.0rc5.org/src/bin/initdb/initdb.c postgresql-8.0.0rc5/src/bin/initdb/initdb.c
+--- postgresql-8.0.0rc5.org/src/bin/initdb/initdb.c    2004-11-29 03:05:03.000000000 +0000
++++ postgresql-8.0.0rc5/src/bin/initdb/initdb.c        2004-12-04 18:02:43.757485824 +0000
+@@ -2617,13 +2617,7 @@
+       get_parent_directory(bin_dir);
+       
+       printf(_("\nSuccess. You can now start the database server using:\n\n"
+-                       "    %s%s%s%spostmaster -D %s%s%s\n"
+-                       "or\n"
+-                       "    %s%s%s%spg_ctl -D %s%s%s -l logfile start\n\n"),
+-        QUOTE_PATH, bin_dir, QUOTE_PATH, (strlen(bin_dir) > 0) ? DIR_SEP : "",
+-        QUOTE_PATH, pg_data_native, QUOTE_PATH,
+-        QUOTE_PATH, bin_dir, QUOTE_PATH, (strlen(bin_dir) > 0) ? DIR_SEP : "",
+-        QUOTE_PATH, pg_data_native, QUOTE_PATH);
++                 "/etc/init.d/postgresql start\n\n"));
+ 
+       return 0;
+ }

diff --git a/dev-db/postgresql/postgresql-8.0.0_rc5.ebuild b/dev-db/postgresql/postgresql-8.0.0_rc5.ebuild
new file mode 100644 (file)
index 0000000..359ce14
--- /dev/null
+++ b/dev-db/postgresql/postgresql-8.0.0_rc5.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.0_rc5.ebuild,v 1.1 2005/01/12 10:05:46 nakano Exp $
+
+inherit eutils gnuconfig flag-o-matic
+
+DESCRIPTION="sophisticated Object-Relational DBMS."
+HOMEPAGE="http://www.postgresql.org/"
+#P_HIERPG="hier-Pg7.4-0.5.2"
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+SRC_URI="mirror://postgresql/source/v8.0.0beta/${PN}-base-${MY_PV}.tar.bz2
+       mirror://postgresql/source/v8.0.0beta/${PN}-opt-${MY_PV}.tar.bz2
+       doc? ( mirror://postgresql/source/v8.0.0beta/${PN}-docs-${MY_PV}.tar.bz2 )"
+#      pg-hier? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc"
+
+S=${WORKDIR}/${MY_P}
+DEPEND="virtual/libc
+       sys-devel/autoconf
+       >=sys-libs/ncurses-5.2
+       >=sys-devel/bison-1.875
+       zlib? ( >=sys-libs/zlib-1.1.3 )
+       readline? ( >=sys-libs/readline-4.1 )
+       tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
+       perl? ( >=dev-lang/perl-5.6.1-r2 )
+       python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
+       ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+       xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
+       nls? ( sys-devel/gettext )"
+RDEPEND="virtual/libc
+       app-admin/sudo
+       zlib? ( >=sys-libs/zlib-1.1.3 )
+       tcltk? ( >=dev-lang/tcl-8 )
+       perl? ( >=dev-lang/perl-5.6.1-r2 )
+       python? ( >=dev-lang/python-2.2 )
+       ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+       xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+
+PG_DIR="/var/lib/postgresql"
+MAX_CONNECTIONS=1024
+
+pkg_setup() {
+       if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
+               PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
+               PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
+               if [ ${PG_MAJOR} -lt 8 ] || [ ${PG_MAJOR} -eq 8 -a ${PG_MINOR} -lt 0 ] ; then
+                       eerror "Postgres ${MY_PV} cannot upgrade your existing databases, you must"
+                       eerror "use pg_dump to export your existing databases to a file, and then"
+                       eerror "pg_restore to import them when you have upgraded completely."
+                       eerror "You must remove your entire database directory to continue."
+                       eerror "(database directory = ${PG_DIR})."
+                       exit 1
+               fi
+       fi
+}
+
+src_unpack() {
+       unpack ${A} || die
+       epatch ${FILESDIR}/${P}-gentoo.patch
+}
+
+src_compile() {
+       filter-flags -ffast-math
+
+       local myconf
+       use tcltk && myconf="--with-tcl"
+       use python && myconf="$myconf --with-python"
+       use perl && myconf="$myconf --with-perl"
+       use ssl && myconf="$myconf --with-openssl"
+       use nls && myconf="$myconf --enable-nls"
+       use libg++ && myconf="$myconf --with-CXX"
+       use pam && myconf="$myconf --with-pam"
+       use readline || myconf="$myconf --without-readline"
+       use zlib || myconf="$myconf --without-zlib"
+       use pg-intdatetime && myconf="$myconf --enable-integer-datetimes"
+
+       # these are the only working CFLAGS I could get on ppc, so locking them
+       # down, anything more aggressive fails (i.e. -mcpu or -Ox)
+       # Gerk - Nov 26, 2002
+       use ppc && CFLAGS="-pipe -fsigned-char"
+
+       # Detect mips systems properly
+       gnuconfig_update
+
+       ./configure --prefix=/usr \
+               --mandir=/usr/share/man \
+               --host=${CHOST} \
+               --with-docdir=/usr/share/doc/${PF} \
+               --libdir=/usr/lib \
+               --enable-depend \
+               --with-gnu-ld \
+               --with-maxbackends=${MAX_CONNECTIONS} \
+               $myconf || die
+
+       make || die
+       cd contrib
+       make || die
+       if use xml2; then
+               cd xml2
+               make || die
+       fi
+}
+
+src_install() {
+       if use perl; then
+               mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
+               sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \
+                       ${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile
+               mv ${S}/src/pl/plperl/GNUmakefile ${S}/src/pl/plperl/GNUmakefile_orig
+               sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+                       ${S}/src/pl/plperl/GNUmakefile_orig > ${S}/src/pl/plperl/GNUmakefile
+       fi
+
+       make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
+#      make DESTDIR=${D} install-all-headers || die
+       cd ${S}/contrib
+       make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
+       if use xml2; then
+               cd ${S}/contrib/xml2
+               make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
+       fi
+       cd ${S}
+       if use pg-hier; then
+               dodoc ${WORKDIR}/README-${P_HIERPG}.html || die
+       fi
+       dodoc README HISTORY COPYRIGHT INSTALL
+       dodoc contrib/adddepend/*
+
+       exeinto /usr/bin
+
+       dodir /usr/include/postgresql/pgsql
+       cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
+
+       cd ${S}/doc
+       dodoc FAQ* README.* TODO bug.template
+       if use doc; then
+               cd ${S}/doc
+               docinto FAQ_html || die
+               dodoc src/FAQ/* || die
+               docinto sgml || die
+               dodoc src/sgml/*.{sgml,dsl} || die
+               docinto sgml/ref || die
+               dodoc src/sgml/ref/*.sgml || die
+               docinto TODO.detail || die
+               dodoc TODO.detail/* || die
+       fi
+
+       cd ${S}
+       exeinto /etc/init.d/
+       newexe ${FILESDIR}/postgresql.init-8.0.0 postgresql || die
+       newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
+       dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
+
+       insinto /etc/conf.d/
+       newins ${FILESDIR}/postgresql.conf-8.0.0 postgresql || die
+       newins ${FILESDIR}/pg_autovacuum.conf-${PV} pg_autovacuum || die
+}
+
+pkg_postinst() {
+       einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
+
+       if [ ! -f ${PG_DIR}/data/PG_VERSION ] ; then
+               einfo ""
+               einfo "Execute the following command"
+               einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+               einfo "to setup the initial database environment."
+               einfo ""
+       fi
+
+       einfo ""
+       einfo "Python modules was removed from PostgreSQL package."
+       einfo "If you need it, please run \"emerge dev-db/pygresql\"."
+       einfo ""
+}
+
+pkg_config() {
+       einfo "Creating the data directory ..."
+       mkdir -p ${PG_DIR}/data
+       chown -Rf postgres:postgres ${PG_DIR}
+       chmod 700 ${PG_DIR}/data
+
+       einfo "Initializing the database ..."
+       if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
+               eerror "Postgres ${MY_PV} cannot upgrade your existing databases."
+               eerror "You must remove your entire database directory to continue."
+               eerror "(database directory = ${PG_DIR})."
+               exit 1
+       else
+               local SEM=`sysctl -n kernel.sem | cut -f-3`
+               local SEMMNI=`sysctl -n kernel.sem | cut -f4`
+               local SEMMNI_MIN=`expr \( ${MAX_CONNECTIONS} + 15 \) / 16`
+               local SHMMAX=`sysctl -n kernel.shmmax`
+               local SHMMAX_MIN=134217728 # 128M
+
+               if [ ${SEMMNI} -lt ${SEMMNI_MIN} ]; then
+                       eerror "The current value of SEMMNI is too low"
+                       eerror "for postgresql to run ${MAX_CONNECTIONS} connections"
+                       eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
+                       echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
+               fi
+               sudo -u postgres /usr/bin/initdb --pgdata ${PG_DIR}/data
+
+               if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
+                       echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
+                       ewarn "Restoring the SEMMNI 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 ${SEMMNI_MIN}"
+                       ewarn ""
+                       ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
+                       ewarn ""
+               fi
+
+               if [ ${SHMMAX} -lt ${SHMMAX_MIN} ]; then
+                       eerror "The current value of SHMMAX is too low for postgresql to run."
+                       eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}."
+                       eerror ""
+                       eerror "  kernel.shmmax = ${SHMMAX_MIN}"
+                       eerror ""
+
+               fi
+       fi
+}