Update of /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3016/crypto/finkinfo
Modified Files:
postgresql73-ssl.info postgresql74-ssl.info
postgresql80-ssl.info
Log Message:
fix some upgrade issues
Index: postgresql73-ssl.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/postgresql73-ssl.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- postgresql73-ssl.info 12 Apr 2005 11:58:16 -0000 1.17
+++ postgresql73-ssl.info 13 Apr 2005 17:14:44 -0000 1.18
@@ -1,6 +1,6 @@
Package: postgresql73-ssl
Version: 7.3.9
-Revision: 11
+Revision: 12
GCC: 3.3
CustomMirror: <<
asi-JP: ftp://ftp.jp.postgresql.org
@@ -214,18 +214,7 @@
for file in \`cat %p/var/postgresql/\${TUPLE_FILE}\`; do
if [ -e "\${TUPLE_PATH}/\${file}-7.3" ]; then
- for mandir in man1 man7; do
- if [ -e
"%p/share/man/\${mandir}/\${file}.1-7.3" ]; then
-# echo update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-7.3" 73 --slave
"%p/share/man/\${mandir}/\${file}.1" "\${file}.1"
"%p/share/man/\${mandir}/\${file}.1-7.3"
- update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-7.3" 73 --slave
"%p/share/man/\${mandir}/\${file}.1" "\${file}.1"
"%p/share/man/\${mandir}/\${file}.1-7.3"
- elif [ -e
"%p/share/man/\${mandir}/\${file}.7-7.3" ]; then
-# echo update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-7.3" 73 --slave
"%p/share/man/\${mandir}/\${file}.7" "\${file}.7"
"%p/share/man/\${mandir}/\${file}.7-7.3"
- update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-7.3" 73 --slave
"%p/share/man/\${mandir}/\${file}.7" "\${file}.7"
"%p/share/man/\${mandir}/\${file}.7-7.3"
- else
-# echo update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-7.3" 73
- update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-7.3" 73
- fi
- done
+ update-alternatives --install "\${TUPLE_PATH}/\${file}"
"\${file}" "\${TUPLE_PATH}/\${file}-7.3" 73
fi
done
done
@@ -278,107 +267,7 @@
</service>
<<
-PreInstScript: <<
-rm -rf /tmp/postgresql-status
-die () {
- echo "failed" > /tmp/postgresql-status
- echo "failed"
- echo ""
- echo "*** bailing because an error ocurred:"
- echo ""
- echo "$*"
- exit 1
-}
-
-# dump the database for upgrade
-if [ "$1" = "upgrade" ] && [ -d "%p/var/postgresql/data" ]; then
- echo -e "- creating %p/var/tmp if necessary: \c"
- mkdir -p '%p/var/tmp' || die "couldn't create temp directory %p/var/tmp"
- chmod 1777 '%p/var/tmp'
- echo "ok"
- if test `ls -ln %p/var/ | awk '{ print $3 }' | grep -c '^252$'` -ge 1; then
- echo -e "- starting postgresql (just to be sure): \c"
- sudo -u postgres %p/bin/pg_ctl-7.3 start -D %p/var/postgresql/data
>/dev/null 2>&1 || true
- echo "ok"
-
- echo -e "- creating postgres user in database (if needed): \c"
- %p/bin/createuser-7.3 -U postgres -a -d -e -i 2 postgres >/dev/null 2>&1
|| true
- echo "ok"
-
- chown -R postgres %p/var/postgresql
- fi
-
- OLDMAJOR=`cat '%p/var/postgresql/data/PG_VERSION' 2>/dev/null | cut -d. -f1`
- OLDMINOR=`cat '%p/var/postgresql/data/PG_VERSION' 2>/dev/null | cut -d. -f2`
- OLDVERSION="${OLDMAJOR}.${OLDMINOR}"
- CURMAJOR=`echo %v | cut -d. -f1`
- CURMINOR=`echo %v | cut -d. -f2`
- CURVERSION="${OLDMAJOR}.${OLDMINOR}"
- if [ "$OLDVERSION" != "$CURVERSION" ]; then
- cat <<END
-It appears you already have an initialized database.
-
-PostgreSQL changes their on-disk format between major releases
-and we will need to perform a dump and restore of your database
-to upgrade. Backups of your old database will be in the
-%p/var/tmp directory. In the interest of being ultra-paranoid
-both a database dump, and a tarball of your postgresql
-directory will be in there.
-
-YOU WILL NEED TO RE-CREATE YOUR DATABASE USING THE DUMP UPON
-UPGRADE OF THIS PACKAGE!
-
-If you have important data in the database, be sure that you
-also have access to the old (${OLDMAJOR}.${OLDMINOR}.x) postgresql deb files in
-case you need to revert.
-
-END
- read -p 'Should I continue? [Y/n] ' -s -n 1 PG_CONTINUE
- if [ "$PG_CONTINUE" = "y" ] || [ "$PG_CONTINUE" = "Y" ] || [
"$PG_CONTINUE" = "" ]; then
- PG_CONTINUE="Y"
- else
- PG_CONTINUE="N"
- fi
- echo "$PG_CONTINUE"
- echo ""
-
- if [ "$PG_CONTINUE" = "N" ]; then
- echo "*** BAILING OUT ***"
- echo ""
- echo "manual" > "%p/var/tmp/pg_upgradetype"
- exit 0
- fi
-
- echo "automatic" > "%p/var/tmp/pg_upgradetype"
-
- echo -e "- starting postgresql (just to be sure): \c"
- sudo -u postgres %p/bin/pg_ctl-7.3 start -D %p/var/postgresql/data
>/dev/null 2>&1 || true
- echo "ok"
-
- echo -e "- vacuuming tables (to be sure logs have been played out): \c"
- %p/bin/vacuumdb-7.3 -U postgres -a >/dev/null 2>&1 || die "vacuumdb
failed!"
- echo -e "ok"
-
- echo -e "- dumping the database for upgrade: \c"
- sudo -u postgres %p/bin/pg_dumpall-7.3 -c -d >
"%p/var/tmp/pgdb-${OLDVERSION}.pgsql" 2>&1 || die "couldn't dump database"
- echo "pgdb-${OLDVERSION}.pgsql"
-
- echo -e "- stopping postgresql: \c"
- sudo -u postgres %p/bin/pg_ctl-7.3 stop -D %p/var/postgresql/data
>/dev/null 2>&1 || true
- echo "ok"
-
- echo -e "- backing up the %p/var/postgresql directory: \c"
- pushd "%p/var" >/dev/null 2>&1
- sudo -u postgres tar -czf "%p/var/tmp/pgdb-${OLDVERSION}.tar.gz"
postgresql >/dev/null 2>&1 || die "couldn't tar up postgresql directory"
- popd >/dev/null 2>&1
- echo "pgdb-${OLDVERSION}.tar.gz"
-
- echo ""
- fi
-fi
-<<
-
PostInstScript: <<
INSTALL_PHASE="$1"
Index: postgresql74-ssl.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/postgresql74-ssl.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- postgresql74-ssl.info 12 Apr 2005 11:58:16 -0000 1.18
+++ postgresql74-ssl.info 13 Apr 2005 17:14:44 -0000 1.19
@@ -1,6 +1,6 @@
Package: postgresql74-ssl
Version: 7.4.7
-Revision: 11
+Revision: 12
GCC: 3.3
CustomMirror: <<
asi-JP: ftp://ftp.jp.postgresql.org
@@ -238,20 +238,9 @@
TUPLE_PATH=\`echo \$tuple | cut -d: -f1\`
TUPLE_FILE=\`echo \$tuple | cut -d: -f2\`
- for file in \`cat %p/var/postgresql-7.4/\${TUPLE_FILE}\`; do
+ for file in \`cat %p/var/postgresql/\${TUPLE_FILE}\`; do
if [ -e "\${TUPLE_PATH}/\${file}-7.4" ]; then
- for mandir in man1 man7; do
- if [ -e
"%p/share/man/\${mandir}/\${file}.1-7.4" ]; then
-# echo update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-7.4" 74 --slave
"%p/share/man/\${mandir}/\${file}.1" "\${file}.1"
"%p/share/man/\${mandir}/\${file}.1-7.4"
- update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-7.4" 74 --slave
"%p/share/man/\${mandir}/\${file}.1" "\${file}.1"
"%p/share/man/\${mandir}/\${file}.1-7.4"
- elif [ -e
"%p/share/man/\${mandir}/\${file}.7-7.4" ]; then
-# echo update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-7.4" 74 --slave
"%p/share/man/\${mandir}/\${file}.7" "\${file}.7"
"%p/share/man/\${mandir}/\${file}.7-7.4"
- update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-7.4" 74 --slave
"%p/share/man/\${mandir}/\${file}.7" "\${file}.7"
"%p/share/man/\${mandir}/\${file}.7-7.4"
- else
-# echo update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-7.4" 74
- update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-7.4" 74
- fi
- done
+ update-alternatives --install "\${TUPLE_PATH}/\${file}"
"\${file}" "\${TUPLE_PATH}/\${file}-7.4" 74
fi
done
done
@@ -309,107 +298,7 @@
</service>
<<
-PreInstScript: <<
-rm -rf /tmp/postgresql-status
-die () {
- echo "failed" > /tmp/postgresql-status
- echo "failed"
- echo ""
- echo "*** bailing because an error ocurred:"
- echo ""
- echo "$*"
- exit 1
-}
-# dump the database for upgrade
-if [ "$1" = "upgrade" ] && [ -d "%p/var/postgresql-7.4/data" ]; then
- echo -e "- creating %p/var/tmp if necessary: \c"
- mkdir -p '%p/var/tmp' || die "couldn't create temp directory %p/var/tmp"
- chmod 1777 '%p/var/tmp'
- echo "ok"
-
- if test `ls -ln %p/var/ | awk '{ print $3 }' | grep -c '^252$'` -ge 1; then
- echo -e "- starting postgresql (just to be sure): \c"
- sudo -u postgres %p/bin/pg_ctl-7.4 start -D %p/var/postgresql-7.4/data
>/dev/null 2>&1 || true
- echo "ok"
-
- echo -e "- creating postgres user in database (if needed): \c"
- %p/bin/createuser-7.4 -U postgres -a -d -e -i 2 postgres >/dev/null 2>&1
|| true
- echo "ok"
-
- chown -R postgres %p/var/postgresql-7.4
- fi
-
- OLDMAJOR=`cat '%p/var/postgresql-7.4/data/PG_VERSION' 2>/dev/null | cut -d.
-f1`
- OLDMINOR=`cat '%p/var/postgresql-7.4/data/PG_VERSION' 2>/dev/null | cut -d.
-f2`
- OLDVERSION="${OLDMAJOR}.${OLDMINOR}"
- CURMAJOR=`echo %v | cut -d. -f1`
- CURMINOR=`echo %v | cut -d. -f2`
- CURVERSION="${OLDMAJOR}.${OLDMINOR}"
- if [ "$OLDVERSION" != "$CURVERSION" ]; then
- cat <<END
-It appears you already have an initialized database.
-
-PostgreSQL changes their on-disk format between major releases
-and we will need to perform a dump and restore of your database
-to upgrade. Backups of your old database will be in the
-%p/var/tmp directory. In the interest of being ultra-paranoid
-both a database dump, and a tarball of your postgresql
-directory will be in there.
-
-YOU WILL NEED TO RE-CREATE YOUR DATABASE USING THE DUMP UPON
-UPGRADE OF THIS PACKAGE!
-
-If you have important data in the database, be sure that you
-also have access to the old (${OLDMAJOR}.${OLDMINOR}.x) postgresql deb files in
-case you need to revert.
-
-END
- read -p 'Should I continue? [Y/n] ' -s -n 1 PG_CONTINUE
- if [ "$PG_CONTINUE" = "y" ] || [ "$PG_CONTINUE" = "Y" ] || [
"$PG_CONTINUE" = "" ]; then
- PG_CONTINUE="Y"
- else
- PG_CONTINUE="N"
- fi
- echo "$PG_CONTINUE"
- echo ""
-
- if [ "$PG_CONTINUE" = "N" ]; then
- echo "*** BAILING OUT ***"
- echo ""
- echo "manual" > "%p/var/tmp/pg_upgradetype"
- exit 0
- fi
-
- echo "automatic" > "%p/var/tmp/pg_upgradetype"
-
- echo -e "- starting postgresql (just to be sure): \c"
- sudo -u postgres %p/bin/pg_ctl-7.4 start -D %p/var/postgresql-7.4/data
>/dev/null 2>&1 || true
- echo "ok"
-
- echo -e "- vacuuming tables (to be sure logs have been played out): \c"
- %p/bin/vacuumdb-7.4 -U postgres -a >/dev/null 2>&1 || die "vacuumdb
failed!"
- echo -e "ok"
-
- echo -e "- dumping the database for upgrade: \c"
- sudo -u postgres %p/bin/pg_dumpall-7.4 -c -d >
"%p/var/tmp/pgdb-${OLDVERSION}.pgsql" 2>&1 || die "couldn't dump database"
- echo "pgdb-${OLDVERSION}.pgsql"
-
- echo -e "- stopping postgresql: \c"
- sudo -u postgres %p/bin/pg_ctl-7.4 stop -D %p/var/postgresql-7.4/data
>/dev/null 2>&1 || true
- echo "ok"
-
- echo -e "- backing up the %p/var/postgresql-7.4 directory: \c"
- pushd "%p/var" >/dev/null 2>&1
- sudo -u postgres tar -czf "%p/var/tmp/pgdb-${OLDVERSION}.tar.gz"
postgresql >/dev/null 2>&1 || die "couldn't tar up postgresql directory"
- popd >/dev/null 2>&1
- echo "pgdb-${OLDVERSION}.tar.gz"
-
- echo ""
- fi
-fi
-<<
-
PostInstScript: <<
INSTALL_PHASE="$1"
Index: postgresql80-ssl.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/postgresql80-ssl.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postgresql80-ssl.info 12 Apr 2005 11:58:16 -0000 1.1
+++ postgresql80-ssl.info 13 Apr 2005 17:14:45 -0000 1.2
@@ -1,6 +1,6 @@
Package: postgresql80-ssl
Version: 8.0.2
-Revision: 11
+Revision: 12
GCC: 3.3
CustomMirror: <<
asi-JP: ftp://ftp.jp.postgresql.org
@@ -359,20 +359,9 @@
TUPLE_PATH=\`echo \$tuple | cut -d: -f1\`
TUPLE_FILE=\`echo \$tuple | cut -d: -f2\`
- for file in \`cat %p/var/postgresql-8.0/\${TUPLE_FILE}\`; do
+ for file in \`cat %p/var/postgresql/\${TUPLE_FILE}\`; do
if [ -e "\${TUPLE_PATH}/\${file}-8.0" ]; then
- for mandir in man1 man7; do
- if [ -e
"%p/share/man/\${mandir}/\${file}.1-8.0" ]; then
-# echo update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-8.0" 80 --slave
"%p/share/man/\${mandir}/\${file}.1" "\${file}.1"
"%p/share/man/\${mandir}/\${file}.1-8.0"
- update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-8.0" 80 --slave
"%p/share/man/\${mandir}/\${file}.1" "\${file}.1"
"%p/share/man/\${mandir}/\${file}.1-8.0"
- elif [ -e
"%p/share/man/\${mandir}/\${file}.7-8.0" ]; then
-# echo update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-8.0" 80 --slave
"%p/share/man/\${mandir}/\${file}.7" "\${file}.7"
"%p/share/man/\${mandir}/\${file}.7-8.0"
- update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-8.0" 80 --slave
"%p/share/man/\${mandir}/\${file}.7" "\${file}.7"
"%p/share/man/\${mandir}/\${file}.7-8.0"
- else
-# echo update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-8.0" 80
- update-alternatives --install
"\${TUPLE_PATH}/\${file}" "\${file}" "\${TUPLE_PATH}/\${file}-8.0" 80
- fi
- done
+ update-alternatives --install "\${TUPLE_PATH}/\${file}"
"\${file}" "\${TUPLE_PATH}/\${file}-8.0" 80
fi
done
done
@@ -386,7 +375,7 @@
Package: %N-dev
Depends: %N (>= %v-%r), pkgconfig
Conflicts: postgresql-dev, postgresql-ssl-dev, postgresql80-dev, postgresql,
postgresql-ssl
- Replaces: postgresql-dev, postgresql-ssl-dev, postgresql73-dev,
postgresql73-ssl-dev, postgresql74-dev, postgresql74-ssl-dev, postgresql80-dev,
postgresql80-ssl-dev, %N
+ Replaces: postgresql-dev, postgresql-ssl-dev, postgresql73-dev,
postgresql73-ssl-dev, postgresql74-dev, postgresql74-ssl-dev, postgresql80-dev,
postgresql80-ssl-dev, %N, postgresql74-ssl-shlibs
BuildDependsOnly: true
Files: <<
bin/pg_config*
@@ -448,107 +437,7 @@
</service>
<<
-PreInstScript: <<
-rm -rf /tmp/postgresql-status
-die () {
- echo "failed" > /tmp/postgresql-status
- echo "failed"
- echo ""
- echo "*** bailing because an error ocurred:"
- echo ""
- echo "$*"
- exit 1
-}
-# dump the database for upgrade
-if [ "$1" = "upgrade" ] && [ -d "%p/var/postgresql-8.0/data" ]; then
- echo -e "- creating %p/var/tmp if necessary: \c"
- mkdir -p '%p/var/tmp' || die "couldn't create temp directory %p/var/tmp"
- chmod 1777 '%p/var/tmp'
- echo "ok"
-
- if test `ls -ln %p/var/ | awk '{ print $3 }' | grep -c '^252$'` -ge 1; then
- echo -e "- starting postgresql (just to be sure): \c"
- sudo -u postgres %p/bin/pg_ctl-8.0 start -D %p/var/postgresql-8.0/data
>/dev/null 2>&1 || true
- echo "ok"
-
- echo -e "- creating postgres user in database (if needed): \c"
- %p/bin/createuser-8.0 -U postgres -a -d -e -i 2 postgres >/dev/null 2>&1
|| true
- echo "ok"
-
- chown -R postgres %p/var/postgresql-8.0
- fi
-
- OLDMAJOR=`cat '%p/var/postgresql-8.0/data/PG_VERSION' 2>/dev/null | cut -d.
-f1`
- OLDMINOR=`cat '%p/var/postgresql-8.0/data/PG_VERSION' 2>/dev/null | cut -d.
-f2`
- OLDVERSION="${OLDMAJOR}.${OLDMINOR}"
- CURMAJOR=`echo %v | cut -d. -f1`
- CURMINOR=`echo %v | cut -d. -f2`
- CURVERSION="${OLDMAJOR}.${OLDMINOR}"
- if [ "$OLDVERSION" != "$CURVERSION" ]; then
- cat <<END
-It appears you already have an initialized database.
-
-PostgreSQL changes their on-disk format between major releases
-and we will need to perform a dump and restore of your database
-to upgrade. Backups of your old database will be in the
-%p/var/tmp directory. In the interest of being ultra-paranoid
-both a database dump, and a tarball of your postgresql
-directory will be in there.
-
-YOU WILL NEED TO RE-CREATE YOUR DATABASE USING THE DUMP UPON
-UPGRADE OF THIS PACKAGE!
-
-If you have important data in the database, be sure that you
-also have access to the old (${OLDMAJOR}.${OLDMINOR}.x) postgresql deb files in
-case you need to revert.
-
-END
- read -p 'Should I continue? [Y/n] ' -s -n 1 PG_CONTINUE
- if [ "$PG_CONTINUE" = "y" ] || [ "$PG_CONTINUE" = "Y" ] || [
"$PG_CONTINUE" = "" ]; then
- PG_CONTINUE="Y"
- else
- PG_CONTINUE="N"
- fi
- echo "$PG_CONTINUE"
- echo ""
-
- if [ "$PG_CONTINUE" = "N" ]; then
- echo "*** BAILING OUT ***"
- echo ""
- echo "manual" > "%p/var/tmp/pg_upgradetype"
- exit 0
- fi
-
- echo "automatic" > "%p/var/tmp/pg_upgradetype"
-
- echo -e "- starting postgresql (just to be sure): \c"
- sudo -u postgres %p/bin/pg_ctl-8.0 start -D %p/var/postgresql-8.0/data
>/dev/null 2>&1 || true
- echo "ok"
-
- echo -e "- vacuuming tables (to be sure logs have been played out): \c"
- %p/bin/vacuumdb-8.0 -U postgres -a >/dev/null 2>&1 || die "vacuumdb
failed!"
- echo -e "ok"
-
- echo -e "- dumping the database for upgrade: \c"
- sudo -u postgres %p/bin/pg_dumpall-8.0 -c -d >
"%p/var/tmp/pgdb-${OLDVERSION}.pgsql" 2>&1 || die "couldn't dump database"
- echo "pgdb-${OLDVERSION}.pgsql"
-
- echo -e "- stopping postgresql: \c"
- sudo -u postgres %p/bin/pg_ctl-8.0 stop -D %p/var/postgresql-8.0/data
>/dev/null 2>&1 || true
- echo "ok"
-
- echo -e "- backing up the %p/var/postgresql-8.0 directory: \c"
- pushd "%p/var" >/dev/null 2>&1
- sudo -u postgres tar -czf "%p/var/tmp/pgdb-${OLDVERSION}.tar.gz"
postgresql >/dev/null 2>&1 || die "couldn't tar up postgresql directory"
- popd >/dev/null 2>&1
- echo "pgdb-${OLDVERSION}.tar.gz"
-
- echo ""
- fi
-fi
-<<
-
PostInstScript: <<
INSTALL_PHASE="$1"
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
