Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e6599417b4c55500b12afe0364ce6cd1cdd1d80f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e6599417b4c55500b12afe0364ce6cd1cdd1d80f)
  • Date: Thu, 19 Jun 2008 14:04:20 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

database/postgresql/BUILD | 23 ++++++-----------------
database/postgresql/CONFIGURE | 3 +++
database/postgresql/DETAILS | 11 +++++------
database/postgresql/FINAL | 6 +++---
database/postgresql/HISTORY | 18 +++++++++++-------
database/postgresql/INSTALL | 26 ++++++++++++--------------
database/postgresql/PREPARE | 9 ++++++++-
7 files changed, 48 insertions(+), 48 deletions(-)

New commits:
commit e6599417b4c55500b12afe0364ce6cd1cdd1d80f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

postgresql: another bunch of fixes

diff --git a/database/postgresql/BUILD b/database/postgresql/BUILD
index 8ba6c6a..bcbe2bb 100755
--- a/database/postgresql/BUILD
+++ b/database/postgresql/BUILD
@@ -1,24 +1,13 @@
create_account postgres &&

-# -ffast-math breaks compiling. this brings no side-effects
-CFLAGS=${CFLAGS/-ffast-math/} &&
+OPTS="--with-docdir=$INSTALL_ROOT/usr/share/doc $OPTS"

-./configure --build=$BUILD \
- --prefix=${INSTALL_ROOT}/usr \
- --with-docdir=${INSTALL_ROOT}/usr/share/doc \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --enable-syslog \
- --with-CXX \
- --target=$HOST \
- $OPTS &&
+default_build &&

-make &&
-
-# build cryptographic functions support by default
-cd contrib/pgcrypto &&
-make &&
+if is_depends_enabled $SPELL openssl; then
+ cd contrib/pgcrypto &&
+ make
+fi &&

if is_depends_enabled $SPELL libxml2; then
cd ../xml2 &&
diff --git a/database/postgresql/CONFIGURE b/database/postgresql/CONFIGURE
new file mode 100755
index 0000000..d02ad91
--- /dev/null
+++ b/database/postgresql/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_string PGSQL_DBPATH \
+ "Setup the database location:" \
+ $INSTALL_ROOT/var/lib/postgres/data
diff --git a/database/postgresql/DETAILS b/database/postgresql/DETAILS
index 42d734f..1e0edda 100755
--- a/database/postgresql/DETAILS
+++ b/database/postgresql/DETAILS
@@ -3,11 +3,10 @@

SOURCE_HASH=sha512:bc7575ffce5012a2dd7cd016bceea53010d29714c1e6a89435785a871b91211012a2df286c2b594e79ce5a321bfc7f63c11451286fd746d191c062694b3cd219
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URI=v$VERSION/$SOURCE
-
SOURCE_URL[0]=ftp://ftp9.us.postgresql.org/pub/mirrors/$SPELL/source/$SOURCE_URI
- SOURCE_URL[1]=ftp://ftp10.us.postgresql.org/pub/$SPELL/source/$SOURCE_URI
-
SOURCE_URL[2]=ftp://ftp13.us.postgresql.org/mirror/$SPELL/source/$SOURCE_URI
- SOURCE_URL[3]=ftp://ftp15.us.postgresql.org/$SOURCE_URI
+
SOURCE_URL[0]=ftp://ftp9.us.postgresql.org/pub/mirrors/$SPELL/source/v$VERSION/$SOURCE
+
SOURCE_URL[1]=ftp://ftp10.us.postgresql.org/pub/$SPELL/source/v$VERSION/$SOURCE
+
SOURCE_URL[2]=ftp://ftp13.us.postgresql.org/mirror/$SPELL/source/v$VERSION/$SOURCE
+ SOURCE_URL[3]=ftp://ftp15.us.postgresql.org/v$VERSION/$SOURCE

if [[ $PGSQL_CLUSTER == y ]]; then
CLUSTER_VERSION=1.9.0rc5
@@ -22,7 +21,7 @@ fi
ENTERED=20011113
LICENSE[0]=BSD
KEYWORDS="database"
- SHORT="Sophisticated Object-Relational DBMS"
+ SHORT="sophisticated Object-Relational DBMS"
cat << EOF
PostgreSQL is a sophisticated Object-Relational DBMS, supporting almost
all SQL constructs, including subselects, transactions and user defined
diff --git a/database/postgresql/FINAL b/database/postgresql/FINAL
index e59ab44..6197a80 100755
--- a/database/postgresql/FINAL
+++ b/database/postgresql/FINAL
@@ -1,7 +1,7 @@
-if [[ ! -e /var/lib/postgres/data/postresql.conf ]]; then
+if [[ ! -e $PGSQL_DBPATH/postresql.conf ]]; then
message "${MESSAGE_COLOR}"
message "You need to run initdb and edit postgresql.conf manually."
- message "The PGDATA directory defaults to /var/lib/postgres/data."
- message "Logs are written to /var/log/postgres."
+ message "The PGDATA directory defaults to $PGSQL_DBPATH."
+ message "Logs are written to $INSTALL_ROOT/var/log/postgres by default."
message "${DEFAULT_COLOR}"
fi
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index a2ca187..0cec2a9 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,16 +1,20 @@
2008-06-19 Vlad Glagolev <stealth AT sourcemage.org>
* PREPARE, TRIGGERS, init.d/postgresql.conf: cleaned up
- * DEPENDS: added optional deps: readline, libxml2 (with libxslt),
- cleaned up
- * BUILD: moved creation of account here, added xml2 installation,
added
- useful comment
+ * DEPENDS: added optional deps: readline, libxml2 (with libxslt),
cleaned up
+ * BUILD: moved creation of account here, added xml2 installation, made
+ openssl support _really_ optional, default_build ftw, no -ffast-math
+ anymore, no `--with-syslog' anymore, removed useless flags, left
useful
* PRE_BUILD: removed useless stuff, added correct patching if selected
* DETAILS: added GATHER_DOCS, removed DOCS="", use $SPELL, moved
- pgcluster patch info there, updated pgcluster patch to the latest
version
+ pgcluster patch info there, updated pgcluster patch to the latest
version,
+ fixed short comment, removed useless var
* INSTALL: removed useless spaces, message vars, replaced mkdir with
more proper install, don't chmod -R 0700 if there's already an
- existing db, use default_install, added xml2 installation
- * FINAL: use correct messages instead of plain echo, fixed a path
+ existing db, use default_install, added xml2 installation, made
openssl
+ support _really_ optional, added notes about generating the keys
+ * FINAL: use correct messages instead of plain echo, fixed the paths
+ * CONFIGURE: added selection for database location
+ * PREPARE: added warning about PGCluster patch
* init.d/postgresql: restart() is useless, it's done automatically,
fixed `su' lines (taken from OpenBSD examples), removed useless
options (regarding to `pg_ctl --help')
diff --git a/database/postgresql/INSTALL b/database/postgresql/INSTALL
index a8ea273..2771a33 100755
--- a/database/postgresql/INSTALL
+++ b/database/postgresql/INSTALL
@@ -1,29 +1,27 @@
cd $SOURCE_DIRECTORY &&
default_install &&

-cd contrib/pgcrypto &&
-default_install &&
+if is_depends_enabled $SPELL openssl; then
+ cd contrib/pgcrypto &&
+ default_install
+fi &&

if is_depends_enabled $SPELL libxml2; then
cd ../xml2 &&
default_install
fi &&

-if [[ ! -d /var/lib/postgres/data ]]; then
- install -vm 755 -o postgres -g postgres -d /var/lib/postgres/data
+if [[ ! -d $PGSQL_DBPATH ]]; then
+ install -vm 755 -o postgres -g postgres -d $PGSQL_DBPATH
fi &&

-touch /var/log/postgres &&
-chown postgres:postgres /var/log/postgres &&
+touch $INSTALL_ROOT/var/log/postgres &&
+chown postgres:postgres $INSTALL_ROOT/var/log/postgres &&

-if echo "$OPTS" | grep -q "with-openssl" && ! [[ -e
/var/lib/postgres/data/server.crt ]]; then
+if is_depends_enabled $SPELL openssl && ! [[ ! -e $PGSQL_DBPATH/server.crt
]]; then
message "${MESSAGE_COLOR}"
- message "Please place server key and certificate files"
- message "server.key and server.crt into /var/lib/postgres/data."
- message "See spell apache2, script mksscert.sh, for steps"
- message "to generate server certificate file."
- message "You can use the CA key and certificate generated for"
- message "apache2, located in /etc/httpd/ssl/ca-{key,certificate}.pem,"
- message "to sign the certificate for PostgreSQL."
+ message "Please place server key and certificate files server.key "
+ message "and server.crt into $PGSQL_DBPATH/var/lib/postgres/data. See more
about"
+ message "it at http://www.postgresql.org/docs/8.3/static/ssl-tcp.html";
message "${DEFAULT_COLOR}"
fi
diff --git a/database/postgresql/PREPARE b/database/postgresql/PREPARE
index d13b666..721679d 100755
--- a/database/postgresql/PREPARE
+++ b/database/postgresql/PREPARE
@@ -1 +1,8 @@
-config_query PGSQL_CLUSTER "Do you want to apply the PGCluster patch?" n
+config_query PGSQL_CLUSTER "Do you want to apply the PGCluster patch?" n &&
+
+if [[ $PGSQL_CLUSTER == y ]]; then
+ message "${PROBLEM_COLOR}"
+ message "Keep in mind that PGCluster patch and current"
+ message "PostgreSQL version aren't always in sync."
+ message "${DEFAULT_COLOR}"
+fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e6599417b4c55500b12afe0364ce6cd1cdd1d80f), Vlad Glagolev, 06/19/2008

Archive powered by MHonArc 2.6.24.

Top of Page