Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package postgresql-common.
Version 164 has a fix for the init script, as well as a few tweaks to
really support jessie in our "supported-versions" script. The debdiff
below has detailed comments about the changes.
unblock postgresql-common/164
diff -Nru postgresql-common-163/debian/changelog postgresql-common-164/debian/changelog
--- postgresql-common-163/debian/changelog 2014-10-26 12:05:03.000000000 +0100
+++ postgresql-common-164/debian/changelog 2014-12-17 20:00:07.000000000 +0100
@@ -1,3 +1,18 @@
+postgresql-common (164) unstable; urgency=medium
+
+ * Init script: Always create /var/run/postgresql on start.
+ (Closes: #772824)
+ * Debconf translation updates, thanks!
+ + pt by Ricardo Silva. (Closes: #767399)
+ * t/100_upgrade_scripts.t: Incompatible with eatmydata, remove from
+ LD_PRELOAD when detected.
+ * t/170_extensions.t: Catch warning with chkpass on 9.5.
+ * debian/supported-versions: Support jessie in backports and
+ apt.postgresql.org, with 9.4 as default.
+ * pgdg/apt.postgresql.org.sh: Support jessie.
+
+ -- Christoph Berg <myon@debian.org> Wed, 17 Dec 2014 20:00:04 +0100
+
postgresql-common (163) unstable; urgency=medium
[ Martin Pitt ]
The next two hunks introduce a function create_socket_directory to fix
#772824:
diff -Nru postgresql-common-163/debian/init.d-functions postgresql-common-164/debian/init.d-functions
--- postgresql-common-163/debian/init.d-functions 2014-07-26 18:48:05.000000000 +0200
+++ postgresql-common-164/debian/init.d-functions 2014-12-13 21:14:28.000000000 +0100
@@ -51,17 +51,19 @@
return $status
}
-# start all clusters of version $1
-# output according to Debian Policy for init scripts
-start() {
- # create socket directory
+# create /var/run/postgresql
+create_socket_directory() {
if [ -d /var/run/postgresql ]; then
chmod 2775 /var/run/postgresql
else
install -d -m 2775 -o postgres -g postgres /var/run/postgresql
[ -x /sbin/restorecon ] && restorecon -R /var/run/postgresql || true
fi
+}
+# start all clusters of version $1
+# output according to Debian Policy for init scripts
+start() {
do_ctl_all start "$1" "Starting PostgreSQL $1 database server"
}
diff -Nru postgresql-common-163/debian/postgresql-common.postgresql.init postgresql-common-164/debian/postgresql-common.postgresql.init
--- postgresql-common-163/debian/postgresql-common.postgresql.init 2013-04-26 10:43:40.000000000 +0200
+++ postgresql-common-164/debian/postgresql-common.postgresql.init 2014-12-13 21:14:28.000000000 +0100
@@ -28,6 +28,9 @@
case "$1" in
start|stop|restart|reload)
+ if [ "$1" = "start" ]; then
+ create_socket_directory
+ fi
if [ -z "`pg_lsclusters -h`" ]; then
log_warning_msg 'No PostgreSQL clusters exist; see "man pg_createcluster"'
exit 0
i18n updated, contents omitted:
diff -Nru postgresql-common-163/debian/po/pt.po postgresql-common-164/debian/po/pt.po
--- postgresql-common-163/debian/po/pt.po 2014-05-20 11:52:01.000000000 +0200
+++ postgresql-common-164/debian/po/pt.po 2014-11-08 16:51:50.000000000 +0100
Set 9.4 as default, and recognize jessie as Debian version:
(The second and third hunks only concern the pgdg packages on
apt.postgresql.org, so are a no-op on Debian.)
diff -Nru postgresql-common-163/debian/supported-versions postgresql-common-164/debian/supported-versions
--- postgresql-common-163/debian/supported-versions 2014-10-26 12:03:02.000000000 +0100
+++ postgresql-common-164/debian/supported-versions 2014-12-17 19:58:16.000000000 +0100
@@ -47,7 +47,7 @@
. /usr/share/postgresql-common/pgcommon.sh
fi
-DEFAULT="9.3"
+DEFAULT="9.4"
# functions
@@ -134,8 +134,11 @@
7|7.*) # Wheezy
/bin/echo -e "9.1"
;;
+ 8|8.*) # Jessie
+ /bin/echo -e "9.4"
+ ;;
testing | unstable)
- /bin/echo -e "9.3"
+ /bin/echo -e "9.4"
;;
*)
echo "supported-versions: WARNING: Unknown Debian release: $1" >&2
@@ -146,11 +149,11 @@
pgdg() {
case $1 in
- testing | unstable | 14.10)
+ testing | unstable)
/bin/echo -e "8.4\n9.0\n9.1\n9.2\n9.3\n9.4" # 9.4 default
;;
*)
- /bin/echo -e "8.4\n9.0\n9.1\n9.2\n9.4\n9.3" # 9.3 default
+ /bin/echo -e "8.4\n9.0\n9.1\n9.2\n9.3\n9.4" # 9.4 default
;;
esac
}
diff -Nru postgresql-common-163/pgdg/apt.postgresql.org.sh postgresql-common-164/pgdg/apt.postgresql.org.sh
--- postgresql-common-163/pgdg/apt.postgresql.org.sh 2014-01-29 16:15:54.000000000 +0100
+++ postgresql-common-164/pgdg/apt.postgresql.org.sh 2014-12-13 21:14:28.000000000 +0100
@@ -40,7 +40,7 @@
case $CODENAME in
# known distributions
- sid|wheezy|squeeze|lenny|etch) ;;
+ sid|jessie|wheezy|squeeze|lenny|etch) ;;
precise|lucid) ;;
*) # unknown distribution, verify on the web
DISTURL="http://apt.postgresql.org/pub/repos/apt/dists/";
... plus two testsuite updates:
diff -Nru postgresql-common-163/t/100_upgrade_scripts.t postgresql-common-164/t/100_upgrade_scripts.t
--- postgresql-common-163/t/100_upgrade_scripts.t 2014-10-08 17:44:44.000000000 +0200
+++ postgresql-common-164/t/100_upgrade_scripts.t 2014-12-14 23:36:13.000000000 +0100
@@ -10,6 +10,13 @@
use Test::More tests => 29;
use PgCommon;
+# get_cluster_databases here and indirectly in run-upgrade-scripts is
+# incompatible with eatmydata, remove it from the environment
+if ($ENV{LD_PRELOAD} and $ENV{LD_PRELOAD} =~ /eatmydata/) {
+ $ENV{LD_PRELOAD} = join (' ', grep { $_ !~ /eatmydata/ }
+ split (/\s+/, $ENV{LD_PRELOAD}));
+}
+
my $shellaction = '#!/bin/sh
S=`basename $0`
SQL="INSERT INTO log VALUES (\'$S $1 $2 $3\')"
diff -Nru postgresql-common-163/t/170_extensions.t postgresql-common-164/t/170_extensions.t
--- postgresql-common-163/t/170_extensions.t 2014-10-08 17:44:44.000000000 +0200
+++ postgresql-common-164/t/170_extensions.t 2014-11-18 10:17:52.000000000 +0100
@@ -38,6 +38,12 @@
# EXFAIL: hstore in 9.1 throws a warning about obsolete => operator
like_program_out 'postgres', "psql -qc 'CREATE EXTENSION \"$extname\"'", 0,
qr/=>/, "extension $extname installs (with warning)";
+ } elsif ($extname eq 'chkpass' && $v eq '9.5') {
+ # chkpass is slightly broken, see
+ # http://www.postgresql.org/message-id/20141117162116.GA3565@msg.df7cb.de
+ like_program_out 'postgres', "psql -qc 'CREATE EXTENSION \"$extname\"'", 0,
+ qr/WARNING: type input function chkpass_in should not be volatile/,
+ "extension $extname installs (with warning)";
} else {
is_program_out 'postgres', "psql -qc 'CREATE EXTENSION \"$extname\"'", 0, '',
"extension $extname installs without error";
Thanks,
Christoph
--
cb@df7cb.de | http://www.df7cb.de/
Attachment:
signature.asc
Description: Digital signature