-When a new major version of PostgreSQL is released, it is necessary to
-dump and reload the database. The old software must be used for the dump,
-and the new software for the reload.
-
-
This was a major problem for Red Hat and Debian, because a dump and reload was
-not required by every upgrade and by the time the need for a dump is
-realised, the old software might have been deleted. Debian had certain rather
-unreliable procedures to save the old software and use it to do a dump, but
-these procedures often went wrong. Red Hat's installation environment is so
-rigid that it is not practicable for the Red Hat packages to attempt an
-automatic upgrade. Debian offered a debconf choice for
-whether to attempt automatic upgrading; if it failed or was not allowed, a
-manual upgrade had to be done, either from a pre-existing dump or by
-manual invocation of the postgresql-dump script.
-
-
There was once an upstream program called pg_upgrade which could be
-used for in-place upgrading. This does not currently work and does not seem to
-be a high priority with upstream developers.
-
-
It is possible to run different versions of PostgreSQL simultaneously, and
-indeed to run the same version on separate database clusters simultaneously.
-To do so, each postmaster must listen on a different port, so each client
-must specify the correct port. By having two separate
-versions of the PostgreSQL packages installed simultaneously, it is
-simple to do database upgrades by dumping from the old version and
-uploading to the new. The PostgreSQL client wrapper is designed to
-permit this.
-
-
General Architecture idea
-
-
The Debian packaging has been changed to create a new package for each major
-version. The criterion for creating a new package is that initdb is required
-when upgrading from the previous version. Thus, there are now source packages
-postgresql-8.1 and postgresql-8.3 (and similarly for
-all the binary packages).
-
-
The legacy postgresql and the other existing binary package names have
-become dummy packages depending on one of the versioned equivalents. Their only
-purpose is now to ensure a smooth upgrade and to register the existing database
-cluster to the new architecture. These packages will be removed from the
-archive as soon as the next Debian release after Sarge (Etch) is released.
-
-
Each versioned package installs into
-/usr/lib/postgresql/version. In order to allow users
-easily to select the right version and cluster when working, the
-postgresql-common package provides the pg_wrapper program,
-which reads the per-user and system wide configuration file and forks the
-correct executable with the correct library versions according to those
-preferences. /usr/bin provides executables soft-linked to
-pg_wrapper.
-
-
This architecture also allows separate database clusters to be maintained
-for the use of different groups of users; these clusters need not all be of the
-same major version. This allows much greater flexibility for those people
-who need to make application software changes consequent on a PostgreSQL
-upgrade.
-
-
Detailed structure
-
-
Configuration hierarchy
-
-
-
/etc/postgresql-common/user_clusters
maps users
-against clusters and default databases
-
-
$HOME/.postgresqlrc
per-user preferences for
-default version/cluster and database; overrides
-/etc/postgresql-common/user_clusters
-
-
-
/etc/postgresql/version/clustername
-
Cluster-specific configuration files:
-
-
postgresql.conf, pg_hba.conf, pg_ident.conf
-
optionally start.conf: startup mode of the
- cluster: auto (start/stop in init script),
- manual (do not start/stop in init script, but manual
- control with pg_ctlcluster is possible), disabled
- (pg_ctlcluster is not allowed).
-
optionally pg_ctl.conf: options to be passed to pg_ctl.
-
optionally a symbolic link log which points to
- the postmaster log file. Defaults to
- /var/log/postgresql/postgresql-version-cluster.conf.
- Explicitly setting log_directory and/or
- log_filename in postgresql.conf
- overrides this.
-
-
-
-
-
-
-
Per-version files and programs
-
-
-
/usr/lib/postgresql/version
version specific program and data files
-
/usr/share/postgresql/version
-
/usr/share/doc/postgresql/postgresql-doc-version
-
-
-
Common programs
-
-
/usr/share/postgresql-common/pg_wrapper
environment chooser and program selector
-
/usr/bin/program
symbolic links to pg_wrapper, for all client programs
-
/usr/bin/pg_lsclusters
list all available clusters with their status and configuration
-
/usr/bin/pg_createcluster
wrapper for initdb, sets up the necessary configuration structure
-
/usr/bin/pg_ctlcluster
wrapper for pg_ctl, control the cluster postmaster server
-
/usr/bin/pg_upgradecluster
Upgrade a cluster to a newer major version.
-
/usr/bin/pg_dropcluster
remove a cluster and its configuration
-
-
-
psql
-
-
We have abandoned the old non-standard error abort if a connection database
-is not specified; psql is not expected to be run directly and all
-connection parameters should be provided by pg_wrapper as specified above. In
-addition, if no explicit default database is specified in
-user_clusters, the default database will correspond to the user
-name, thus reintroducing the default upstream behaviour.
-
-
/etc/init.d/postgresql
-
-
This script now handles the postmaster server processes for each version and
-all their clusters. However, most of the actual work is done by the new
-pg_ctlcluster program.
-
-
pg_upgradecluster
-
-
This new program replaces postgresql-dump (a Debian specific program).
-
-
It is used to migrate a cluster from one major version to another.
-
-
Usage: pg_upgradecluster [-vnewversion]
-version name [data_dir]
-
-
-vversion specifies the version to upgrade to; defaults
-to the newest available version.
-
-
-
diff -Nru postgresql-common-173+ppa1/cleanpg postgresql-common-190~ubuntu16.04.1/cleanpg
--- postgresql-common-173+ppa1/cleanpg 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/cleanpg 2018-01-12 14:08:46.000000000 +0000
@@ -18,5 +18,5 @@
[ `id -u` = 0 ] || SUDO=sudo
$SUDO /etc/init.d/postgresql stop
-$SUDO killall pg_autovacuum postmaster postgres
+$SUDO killall pg_autovacuum postgres
$SUDO rm -rf /etc/postgresql /var/lib/postgresql/ /var/log/postgresql/* /tmp/postgresql-testsuite/ /var/run/postgresql/*
diff -Nru postgresql-common-173+ppa1/createcluster.conf postgresql-common-190~ubuntu16.04.1/createcluster.conf
--- postgresql-common-173+ppa1/createcluster.conf 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/createcluster.conf 2018-01-12 14:08:46.000000000 +0000
@@ -13,8 +13,8 @@
#data_directory = '/var/lib/postgresql/%v/%c'
# Default directory for transaction logs
-# Unset by default, i.e. pg_xlog remains in the data directory.
-#xlogdir = '/var/lib/postgresql/xlog/%v/%c/pg_xlog'
+# Unset by default, i.e. transaction logs remain in the data directory.
+#waldir = '/var/lib/postgresql/wal/%v/%c/pg_wal'
# Options to pass to initdb.
#initdb_options = ''
@@ -25,8 +25,17 @@
# ssl-cert package, unless configured otherwise here)
ssl = on
+# Show cluster name in process title
+cluster_name = '%v/%c'
+
# Put stats_temp_directory on tmpfs
stats_temp_directory = '/var/run/postgresql/%v-%c.pg_stat_tmp'
# Add prefix to log lines
-log_line_prefix = '%%t [%%p-%%l] %%q%%u@%%d '
+log_line_prefix = '%%m [%%p] %%q%%u@%%d '
+
+# Add "include_dir" in postgresql.conf
+add_include_dir = 'conf.d'
+
+# Directory for additional createcluster config
+include_dir '/etc/postgresql-common/createcluster.d'
diff -Nru postgresql-common-173+ppa1/debian/changelog postgresql-common-190~ubuntu16.04.1/debian/changelog
--- postgresql-common-173+ppa1/debian/changelog 2017-01-13 00:33:22.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/changelog 2019-03-14 23:34:37.000000000 +0000
@@ -1,8 +1,322 @@
-postgresql-common (173+ppa1) xenial; urgency=medium
+postgresql-common (190~ubuntu16.04.1) xenial; urgency=medium
- * Add 9.6 to 16.04's supported-versions.
+ * Backport to xenial:
+ - Add 10 to 16.04's supported-versions.
- -- Colin Watson Fri, 13 Jan 2017 00:33:21 +0000
+ -- Colin Watson Thu, 14 Mar 2019 23:34:37 +0000
+
+postgresql-common (190) unstable; urgency=medium
+
+ * Move packaging repository to salsa.debian.org
+ * pg_lsclusters: Add --help.
+ * pg_virtualenv: Error out if no server packages are installed.
+ * postgresql-common recommends e2fsprogs, we are using chattr in
+ pg_createcluster. (Closes: #887251)
+ * PgCommon.pm: Fix include directives parser, spotted by ironhalik, thanks!
+ * postgresql@.service: Set Timeoutstart=0, which is the same as infinity,
+ but works on older systemd versions as well.
+ * Rewrite architecture.html as README.md.
+ * t/006_next_free_port.t: Drop -q argument from netcat, nmap-ncat.rpm
+ doesn't have it.
+ * t/032_ssl_key_permissions.t: Adjust for 9.4 in oldstable which still has
+ the old permissions check.
+
+ -- Christoph Berg Thu, 08 Feb 2018 13:26:44 +0100
+
+postgresql-common (189) unstable; urgency=medium
+
+ [ Chris Lamb ]
+ * Update README.Debian for postgresql-10. (Closes: #876438)
+
+ [ Christoph Berg ]
+ * dh_make_pgxs: Use PostgreSQL license as default, fix extension name.
+ * Modernize README.Debian's version numbers and SSL instructions.
+ * postgresql@.service: Ignore startup failure, recovery might take
+ arbitrarily long to finish. The actual service status still correctly
+ reflects if the postmaster process is running.
+ https://www.postgresql.org/message-id/20171111205316.u56lkmkakdmcx6zm%40msg.df7cb.de
+ * supported-versions: Version 10 on Ubuntu 18.04 (bionic). (Closes: #881501)
+ * debian/maintscripts-functions: bump update-alternatives priority of
+ version 1x to 1x0.
+ * Unsupport 9.2 on apt.postgresql.org.
+ * t/140_pg_config.t: Also test /usr/bin/pg_config.libpq-dev, and check
+ MKDIR_P and abs_top_build/srcdir in Makefile.global.
+
+ -- Christoph Berg Thu, 14 Dec 2017 21:13:24 +0100
+
+postgresql-common (188) unstable; urgency=medium
+
+ * pg_ctlcluster, pg_createcluster, pg_upgradecluster: Use lchown instead
+ of chown to mitigate privilege escalation via symlinks. (CVE-2017-8806.
+ Related to CVE-2017-12172 in PostgreSQL; extends our earlier fix for
+ CVE-2016-1255.)
+ * dh_make_pgxs: Add options to set package name and version.
+ * pg_lsclusters: Raise error when called on a specific cluster that does not
+ exist. This was the behavior before the "accept dead postgresql.conf
+ symlinks" change, but not coded explicitly.
+
+ -- Christoph Berg Wed, 08 Nov 2017 16:03:19 +0100
+
+postgresql-common (187) unstable; urgency=medium
+
+ * Consistently call psql -X. (Closes: #877920)
+ * Update pt translation, thanks Ricardo Silva! (Closes: #872430)
+ * pg_virtualenv: Drop "BUG" message that really just means that
+ pg_createcluster threw an error.
+ * pg_createcluster: Drop new cluster if --start was requested and starting
+ fails.
+ * pg_createcluster: If not running as postgres or root, don't attempt to
+ install config and data parent directories with owner postgres.
+ * pg_lsclusters, postgresql-generator, get_version_clusters, cluster_info,
+ read_conf_file: Accept dead postgresql.conf symlinks, filesystem might not
+ be mounted yet.
+ * pg_virtualenv: Fix version comparison when determining newest PG major.
+ * pg_updatedicts, postgresql-common.postinst: Create tsearch dictionaries on
+ first install and set umask for correct permissions. (Closes: #868232)
+ Thanks to Christian Ehrhardt for the analysis!
+ * Demote postgresql-common hunspell/myspell triggers to noawait.
+
+ -- Christoph Berg Sun, 22 Oct 2017 20:44:38 +0200
+
+postgresql-common (186) unstable; urgency=medium
+
+ * Team upload.
+ * Bump default apt.postgresql.org version to 10.
+ * t/020_create_sql_remove.t: Support 8.x xlog filenames.
+ * Update ca translation, thanks Innocent De Marchi! (Closes: #876472)
+ * PgCommon.pm: Use BSD ps syntax in check_pidfile_running.
+
+ -- Christoph Berg Thu, 05 Oct 2017 16:04:18 +0200
+
+postgresql-common (185) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Christoph Berg ]
+ * Revert "Error out if a recovery.conf file is found in /etc/postgresql".
+ It caused too many false positives for setups where a recovery.conf
+ template is located in the etc directory. (Closes: #868367)
+ * Bump default PostgreSQL version to 10.
+
+ [ Marco Nenciarini ]
+ * supported-versions: correctly detect version 10 when using 'installed'.
+
+ -- Christoph Berg Thu, 21 Sep 2017 12:07:30 +0200
+
+postgresql-common (184) unstable; urgency=high
+
+ * debian/maintscripts-functions: Use deb-systemd-invoke instead of
+ invoke-rc.d to stop "postgresql@$ver-*"; jessie's invoke-rc.d does not
+ support service patterns.
+
+ -- Christoph Berg Tue, 11 Jul 2017 20:19:21 +0200
+
+postgresql-common (183) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Nishanth Aravamudan ]
+ * debian/supported-versions: add Ubuntu 17.10. (Closes: #862420)
+
+ [ Bernd Helmle ]
+ * postgresql-common.spec: Fix installation path of manpages.
+
+ [ Alex Badics ]
+ * pg_ctlcluster: Use pg_ctl.conf during stop too.
+
+ [ Christoph Berg ]
+ * PgCommon.pm: Sort get_versions and get_version_clusters output.
+ * PgCommon.pm: Revert to old quote_conf_value behavior, the new regexp was
+ too liberal. The new input behavior is retained, though.
+ * pg_ctlcluster: Error out if a recovery.conf file is found in
+ /etc/postgresql to catch a common mistake. (Closes: #853868)
+ * pg_upgradecluster: Allow configuring the maintenance database.
+ (Closes: #851874)
+ * pg_upgradecluster: Pass config directory to pg_upgrade instead of
+ symlinking the config files. This breaks using "-m upgrade" for upgrades
+ *to* versions before 9.2; upgrades from older versions are unaffected.
+ * pg_upgradecluster, pg_renamecluster: Use default pg_ctl timeout when
+ stopping cluster.
+ * pg_dropcluster: Remove custom xlog directory. (Closes: #830789)
+ * pg_createcluster, pg_ctlcluster: cd / to prevent warnings from PostgreSQL
+ tools. (Closes: #834264)
+ * pg_wrapper: Don't fail if no local cluster exists on port 5432.
+ Code cleanup. (Closes: #777623)
+ * pg_lsclusters: --start-conf shows start.conf information.
+ * createcluster.conf: Add add_include_dir='conf.d' for drop-in PostgreSQL
+ config snippets in /etc/postgresql/version/cluster/conf.d/ and
+ include_dir='/etc/postgresql-common/createcluster.d' for pg_createcluster
+ config snippets.
+ * t/051_inconsistent_encoding_upgrade.t: Remove, only relevant for <= 8.2.
+ * logrotate config: Ship as static conffile again and remove ucf handling.
+ * pg_conftool: Fix operation when no cluster exists yet.
+ * pg_conftool: --boolean normalizes boolean variable in output; use this in
+ debian/maintscripts-functions.
+ * debian/maintscripts-functions: Unconditionally call invoke-rc.d, and drop
+ path names from program invocations (Standards-Version 4.0.0).
+ * debian/maintscripts-functions: Use 'invoke-rc.d "postgresql@$ver-*" stop'
+ to prevent upgrading/removing server packages from stopping other major
+ version clusters when running systemd. (Closes: #809811)
+ * debian/maintscripts-functions: Avoid update-alternatives failing if the
+ user removed /usr/share/man. (Closes: #866729)
+ * t/TestLib.pm: Vacuum tests left behind when postmaster and pg_autovacuum
+ were removed. Update test counts in *.t.
+ * B-D on debhelper (>= 10.1) | dh-systemd (>= 1.19) to pick up
+ dh_systemd_start.
+
+ -- Christoph Berg Wed, 05 Jul 2017 16:15:48 +0200
+
+postgresql-common (182) experimental; urgency=medium
+
+ * Team upload.
+ * pg_buildext: Resurrect the previously deprecated "srcdir" mode to allow
+ building packages from a subdirectory, and make "loop" support it as well.
+ * t/001_packages.t: PostgreSQL 10 doesn't have a separate contrib package.
+ * t/020_create_sql_remove.t: Use CREATE EXTENSION, createlang is being
+ removed.
+ * t/120_pg_upgradecluster_scripts.t: Don't try to rename
+ pg_upgradecluster.d, fails on overlayfs.
+ * pg_lsclusters, t: pg_log directory name changed in 10.
+ * pg_lsclusters: Allow listing one version or one cluster only.
+ * pg_lsclusters: Support JSON output, suggest libjson-perl for that.
+ * pg_createcluster, createcluster.conf: Update for --waldir rename.
+ * pg_createcluster: Do not suppress initdb output, and use pg_lsclusters to
+ show created cluster info.
+ * pg_ctlcluster: Suppress "Redirecting to systemctl message".
+ * pg_upgradecluster: Deprecate min_parallel_relation_size and
+ sql_inheritance in 10.
+ * Symlink /usr/bin/pg_receivewal to pg_wrapper.
+ * PgCommon.pm: Include postgresql.conf in cluster_info and remove variables
+ directly copied from config; adjust callers.
+ * PgCommon.pm: Allow more characters in unquoted config values.
+ Spotted by Fabien Coelho, merci!
+ * postgresql-server-dev-all: dh_make_pgxs: Template mechanism for new
+ Debian packages based on PGXS Makefiles.
+
+ -- Christoph Berg Thu, 11 May 2017 14:01:59 +0200
+
+postgresql-common (181) unstable; urgency=medium
+
+ * debian/postgresql-common.config: Fix deprecation warning debconf message
+ to use a numerical comparison on the version number.
+ * pg_buildext: Fix to use a numerical comparison on the version number.
+ * pg_buildext.pod: Drop outdated PG_VIRTUALENV_UNSHARE=-n documentation.
+ * pgdg/apt.postgresql.org.sh: Add known distributions.
+ * Updated Danish debconf translation by Joe Dalton, thanks!
+ (Closes: #856787)
+
+ -- Christoph Berg Sat, 15 Apr 2017 18:56:38 +0200
+
+postgresql-common (180) unstable; urgency=medium
+
+ * supported-versions: Retire 9.1 on apt.postgresql.org.
+
+ -- Christoph Berg Thu, 09 Feb 2017 15:30:23 +0100
+
+postgresql-common (179) unstable; urgency=medium
+
+ * Catch all pg_ctl output by redirecting it to /var/log/postgresql.
+ (Closes: #830485)
+ * Dump locale environment variables if setlocale fails.
+ (Closes: #848869)
+ * Set default log_line_prefix to '%m [%p] %q%u@%d ' to match upstream
+ moving to '%m [%p] ' in PostgreSQL 10.
+ * Support include_dir in read_conf_file. Patch by Andreas Dewes, thanks!
+ * Support adding include directives to the new postgresql.conf from
+ createcluster.conf; harness directives with an "add_" prefix, e.g.
+ "add_include_dir".
+ * Import new apt.postgresql.org key.
+ * Support 9.6 for jessie-backports.
+
+ -- Christoph Berg Tue, 24 Jan 2017 23:03:12 +0100
+
+postgresql-common (178) unstable; urgency=medium
+
+ [ Christoph Berg ]
+ * pg_buildext: Don't ask pg_virtualenv for a new network namespace by
+ default.
+ * postgresql-all: New meta package depending on all server packages in all
+ supported versions. Intended to be used for installing test dependencies.
+ * pg_upgradecluster: Properly upgrade databases with non-login role owners.
+ (Closes: #614374, #838812)
+ * pg_upgradecluster, pg_renamecluster: Update cluster_name.
+ * Rebuild upgrades libreadline to 7 in unstable. (Closes: #845356)
+ * Replace most occurrences of "postmaster" by "postgres". Notable leftover
+ is the postmaster.1.gz leader of the manpages alternatives group.
+ * pg_ctlcluster, t/020_create_sql_remove.t: Protect against symlink in
+ /var/log/postgresql/ allowing the creation of arbitrary files elsewhere.
+ Discovered by Dawid Golunski, thanks! (CVE-2016-1255)
+
+ [ Martin Pitt ]
+ * debian/supported-versions: Add Ubuntu 17.04, drop EOLed releases.
+ * t/TestLib.pm, check_clean(): Quiesce stderr of netstat, which shows a "Not
+ all processes could be identified" warning in unprivileged containers.
+
+ -- Christoph Berg Tue, 20 Dec 2016 17:11:15 +0100
+
+postgresql-common (177) unstable; urgency=medium
+
+ [ Martin Pitt ]
+ * Replace hardcoded Recommends: libreadline6 with a build-time detection of
+ the current ABI.
+
+ [ Christoph Berg ]
+ * Team upload.
+ * Mark 9.6 as stable for apt.postgresql.org.
+
+ -- Christoph Berg Wed, 28 Sep 2016 11:55:12 +0200
+
+postgresql-common (176) unstable; urgency=medium
+
+ * Team upload.
+ * Bump default PostgreSQL server version to 9.6.
+ * Use C.UTF-8 instead of C when the initial main cluster is created and no
+ locale is configured explicitly as system default. (Closes: #790507)
+ * Support "NN" major version numbers, next version will be PostgreSQL 10.
+ * debian/postgresql-common.templates: Properly mark not-to-be-translated
+ shell code-only chunk as such using flag:translate. Thanks to Rhonda for
+ the pointer! (See: #820756, #832282)
+ * testsuite: Run with umask 077 only by default.
+ * t/025_logging.t: Fix tests when grep thinks syslog is a binary file.
+ * t/031_errors_disk_full.t: Raise tmpfs size to account for larger cluster
+ footprint observed on ppc64el.
+ * t/032_ssl_key_permissions.t: Skip tests on 9.0 and earlier.
+ * pg_createcluster, t/025_logging.t: Skip logging_collector for 8.2.
+ * Ship /etc/postgresql-common/supported_versions even in non-backport
+ packages. (Closes: #808353)
+ * pg_createcluster: Error out if provided log file is a directory.
+ (Closes: #791556)
+ * pg_upgradecluster: Set dynamic_shared_memory_type from the new
+ postgresql.conf instead of defaulting to mmap. (Closes: #823209)
+ * pg_upgradecluster: Use data checksums in the new cluster if the old uses
+ them. (Closes: #830228)
+
+ -- Christoph Berg Fri, 23 Sep 2016 12:32:16 +0200
+
+postgresql-common (175) unstable; urgency=medium
+
+ * pg_createcluster, createcluster.conf: Set cluster_name on 9.5+.
+ * pg_buildext: Don't set any CFLAGS by default.
+ * start.conf: Update documentation/comments to recommend running
+ systemctl daemon-reload.
+
+ -- Christoph Berg Thu, 23 Jun 2016 12:26:27 +0200
+
+postgresql-common (174) unstable; urgency=medium
+
+ [ Christoph Berg ]
+ * postgresql-common: Enforce strict version dependency on
+ postgresql-client-common to avoid API mismatch bugs in PgCommon.pm.
+ * maintscripts-functions: Save pg_dump on catversion bumps as well.
+ * Updated ja translation by Takuma Yamada, thanks! (Closes: #820756)
+ * Remove not-to-be-translated shell code-only chunk from
+ debian/po/templates.pot. (debconf-updatepo --skip-pot to the rescue!)
+ (Closes: #821445)
+
+ [ Martin Pitt ]
+ * debian/supported-versions: Add Ubuntu 16.10.
+
+ -- Christoph Berg Wed, 11 May 2016 15:04:25 +0200
postgresql-common (173) unstable; urgency=medium
diff -Nru postgresql-common-173+ppa1/debian/clean postgresql-common-190~ubuntu16.04.1/debian/clean
--- postgresql-common-173+ppa1/debian/clean 1970-01-01 00:00:00.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/clean 2018-01-12 14:08:46.000000000 +0000
@@ -0,0 +1 @@
+tags
diff -Nru postgresql-common-173+ppa1/debian/control postgresql-common-190~ubuntu16.04.1/debian/control
--- postgresql-common-173+ppa1/debian/control 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/control 2018-01-31 12:17:35.000000000 +0000
@@ -2,28 +2,42 @@
Section: database
Priority: optional
Maintainer: Debian PostgreSQL Maintainers
-Uploaders: Martin Pitt , Christoph Berg , Peter Eisentraut
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-postgresql/postgresql-common.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-postgresql/postgresql-common.git
-Build-Depends: debhelper (>= 9),
- dh-systemd (>= 1.19) | sysvinit (<< 2.88dsf-42),
- lsb-release
+Uploaders:
+ Martin Pitt ,
+ Christoph Berg ,
+ Peter Eisentraut ,
+Standards-Version: 4.1.2
+Vcs-Git: https://salsa.debian.org/postgresql/postgresql-common.git
+Vcs-Browser: https://salsa.debian.org/postgresql/postgresql-common
+Build-Depends:
+ debhelper (>= 9),
+ debhelper (>= 10.1) | dh-systemd (>= 1.19),
+ libreadline-dev,
+ lsb-release,
Package: postgresql-common
Architecture: all
Multi-Arch: foreign
-Conflicts: postgresql-7.4, postgresql-8.0
-Depends: postgresql-client-common (>= ${source:Version}),
- procps,
+Conflicts:
+ postgresql-7.4,
+ postgresql-8.0,
+Depends:
adduser,
debconf (>= 0.5.00) | debconf-2.0,
lsb-base (>= 3.0-3),
+ postgresql-client-common (= ${source:Version}),
+ procps,
ssl-cert (>= 1.0.11),
ucf,
- ${misc:Depends}
-Recommends: logrotate
-Breaks: postgresql-9.1 (<< 9.1.1-3~), systemd (<< 204)
+ ${misc:Depends},
+Recommends:
+ e2fsprogs,
+ logrotate,
+Suggests:
+ libjson-perl,
+Breaks:
+ postgresql-9.1 (<< 9.1.1-3~),
+ systemd (<< 204),
Description: PostgreSQL database-cluster manager
The postgresql-common package provides a structure under which
multiple versions of PostgreSQL may be installed and/or multiple
@@ -43,9 +57,13 @@
Package: postgresql-client-common
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, ${pgdg:Depends},
- netbase
-Recommends: lsb-release, libreadline6
+Depends:
+ netbase,
+ ${misc:Depends},
+ ${pgdg:Depends},
+Recommends:
+ lsb-release,
+ ${readline:Recommends},
Description: manager for multiple PostgreSQL client versions
The postgresql-client-common package provides a structure under which
multiple versions of PostgreSQL client programs may be installed at
@@ -63,13 +81,14 @@
Package: postgresql-server-dev-all
Architecture: all
-Depends: ${misc:Depends},
- postgresql-common (>= 117~),
+Depends:
+ dctrl-tools,
iproute2 | net-tools,
lsb-release,
- dctrl-tools,
make,
- ${server-dev-all-depends}
+ postgresql-common (>= 117~),
+ ${misc:Depends},
+ ${server-dev-all-depends},
Description: extension build tool for multiple PostgreSQL versions
The postgresql-server-dev-all package provides the pg_buildext script for
simplifying packaging of a PostgreSQL extension supporting multiple major
@@ -84,8 +103,11 @@
Package: postgresql
Architecture: all
-Depends: postgresql-${default-version}, ${misc:Depends}
-Suggests: postgresql-doc
+Depends:
+ postgresql-${default-version},
+ ${misc:Depends},
+Suggests:
+ postgresql-doc,
Description: object-relational SQL database (supported version)
This metapackage always depends on the currently supported PostgreSQL
database server version.
@@ -101,7 +123,9 @@
Package: postgresql-client
Architecture: all
Multi-Arch: foreign
-Depends: postgresql-client-${default-version}, ${misc:Depends}
+Depends:
+ postgresql-client-${default-version},
+ ${misc:Depends},
Description: front-end programs for PostgreSQL (supported version)
This metapackage always depends on the currently supported database
client package for PostgreSQL.
@@ -118,7 +142,9 @@
Architecture: all
Multi-Arch: foreign
Section: doc
-Depends: postgresql-doc-${default-version}, ${misc:Depends}
+Depends:
+ postgresql-doc-${default-version},
+ ${misc:Depends},
Description: documentation for the PostgreSQL database management system
This metapackage always depends on the currently supported PostgreSQL
database documentation package.
@@ -133,13 +159,37 @@
Package: postgresql-contrib
Architecture: all
-Depends: postgresql-contrib-${default-version}, ${misc:Depends}
+Depends:
+ postgresql-contrib-${default-version},
+ ${misc:Depends},
Description: additional facilities for PostgreSQL (supported version)
This metapackage always depends on the currently supported PostgreSQL
database contrib package.
.
PostgreSQL is a fully featured object-relational database management
system. It supports a large part of the SQL standard and is designed
+ to be extensible by users in many aspects. Some of the features are:
+ ACID transactions, foreign keys, views, sequences, subqueries,
+ triggers, user-defined types and functions, outer joins, multiversion
+ concurrency control. Graphical user interfaces and bindings for many
+ programming languages are available as well.
+
+Package: postgresql-all
+Architecture: all
+Depends:
+ libecpg-dev,
+ libpq-dev,
+ postgresql-server-dev-all,
+ ${postgresql-all-depends},
+ ${misc:Depends},
+Description: metapackage depending on all PostgreSQL server packages
+ This metapackage depends on all PostgreSQL server packages, in all
+ supported versions (excluding documentation and debug symbols). It
+ exists to facilitate depending on the server packages in test
+ environments.
+ .
+ PostgreSQL is a fully featured object-relational database management
+ system. It supports a large part of the SQL standard and is designed
to be extensible by users in many aspects. Some of the features are:
ACID transactions, foreign keys, views, sequences, subqueries,
triggers, user-defined types and functions, outer joins, multiversion
diff -Nru postgresql-common-173+ppa1/debian/init.d-functions postgresql-common-190~ubuntu16.04.1/debian/init.d-functions
--- postgresql-common-173+ppa1/debian/init.d-functions 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/init.d-functions 2018-01-12 14:08:46.000000000 +0000
@@ -16,7 +16,7 @@
[ "$2" ] || { echo "Error: invalid version '$2'" >&2; exit 1; }
[ -d "/etc/postgresql/$2" ] || return 0
[ "$(ls /etc/postgresql/$2)" ] || return 0
- [ -x "$PGBINROOT$2/bin/postmaster" ] || return 0
+ [ -x "$PGBINROOT$2/bin/postgres" ] || return 0
status=0
log_daemon_msg "$3"
diff -Nru postgresql-common-173+ppa1/debian/logrotate.template postgresql-common-190~ubuntu16.04.1/debian/logrotate.template
--- postgresql-common-173+ppa1/debian/logrotate.template 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/logrotate.template 1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-/var/log/postgresql/*.log {
- weekly
- rotate 10
- copytruncate
- delaycompress
- compress
- notifempty
- missingok
- su root root
-}
diff -Nru postgresql-common-173+ppa1/debian/maintscripts-functions postgresql-common-190~ubuntu16.04.1/debian/maintscripts-functions
--- postgresql-common-173+ppa1/debian/maintscripts-functions 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/maintscripts-functions 2018-01-12 14:08:46.000000000 +0000
@@ -28,14 +28,22 @@
fi
fi
+ # user might have removed the directories, allow u-a to succeed
+ mkdir -p /usr/share/man/man1 /usr/share/man/man3 /usr/share/man/man7
section=$(echo "$2" | sed -e 's/.*\.\(.*\)\..*/man\1/')
+ case $1 in
+ [89]*) priority=$(echo "$1" | tr -cd 0-9) ;;
+ *) priority="${1}0" ;;
+ esac
update-alternatives --install /usr/share/man/$section/$2 \
$2 /usr/share/postgresql/$1/man/$section/$2 \
- $(echo "$1" | tr -cd 0-9) $SLAVES
+ $priority $SLAVES
}
# arguments: version master
_unlink_manpages() {
+ # user might have removed the directories, allow u-a to succeed
+ mkdir -p /usr/share/man/man1 /usr/share/man/man3 /usr/share/man/man7
section=$(echo "$2" | sed -e 's/.*\.\(.*\)\..*/man\1/')
update-alternatives --remove $2 /usr/share/postgresql/$1/man/$section/$2
}
@@ -54,6 +62,7 @@
set_system_locale() {
loc_vars="LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION LC_ALL"
unset $loc_vars
+ LANG="C.UTF-8" # fallback locale if nothing is configured explicitly
for v in $loc_vars; do
unset val
val=`pam_getenv -l $v` || true
@@ -73,11 +82,11 @@
if [ ! -d "/etc/postgresql/$VERSION" ] || [ -z "$(ls /etc/postgresql/$VERSION)" ] || \
[ -z "$(ls /etc/postgresql/$VERSION/*/postgresql.conf 2>/dev/null)" ]; then
# skip creating the main cluster when this is not the first install, or
- # when explicitely disabled ($create is 1/0/"")
- create=$(perl -I/usr/share/postgresql-common -mPgCommon -e 'print PgCommon::config_bool(PgCommon::get_conf_value 0, 0, "createcluster.conf", "create_main_cluster")')
- if [ -z "$2" ] && [ "$create" != "0" ]; then
+ # when explicitly disabled ($create is on/off/"")
+ create=$(pg_conftool /etc/postgresql-common/createcluster.conf show -bs create_main_cluster || :)
+ if [ -z "$2" ] && [ "$create" != "off" ]; then
set_system_locale
- /usr/bin/pg_createcluster -u postgres $VERSION main ||
+ pg_createcluster -u postgres $VERSION main ||
echo "Error: could not create default cluster. Please create it manually with
pg_createcluster $VERSION main --start
@@ -94,27 +103,19 @@
# done with debconf
db_stop
- if [ -x /etc/init.d/postgresql ] && [ ! -x /etc/init.d/postgresql-$VERSION ]; then
- # reload systemd to let the generator pick up the new unit
- if [ -d /run/systemd/system ]; then
- systemctl daemon-reload
- fi
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d postgresql start $VERSION || exit $?
- else
- /etc/init.d/postgresql start $VERSION || exit $?
- fi
+ # reload systemd to let the generator pick up the new unit
+ if [ -d /run/systemd/system ]; then
+ systemctl daemon-reload
fi
+ invoke-rc.d postgresql start $VERSION # systemd: argument ignored, starts all versions
}
stop_version() {
- if [ -x /etc/init.d/postgresql ] && [ ! -x /etc/init.d/postgresql-$1 ]; then
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d postgresql stop $1 || exit $?
- else
- /etc/init.d/postgresql stop $1 || exit $?
- fi
-
+ if [ -d /run/systemd/system ]; then
+ # cannot use invoke-rc.d here because jessie's version doesn't like patterns
+ deb-systemd-invoke stop "postgresql@$1-*"
+ else
+ invoke-rc.d postgresql stop $1
fi
}
@@ -190,7 +191,7 @@
(
cd "$VARTMPDIR"
mkdir bin lib # lib needs to exists, but we do not copy files there
- for f in pg_ctl pg_resetxlog postgres; do
+ for f in pg_ctl pg_dump pg_resetwal postgres; do
cp -a /usr/lib/postgresql/$MAJOR_VER/bin/$f bin
done
)
@@ -245,7 +246,7 @@
# start debconf if we are in the server's postinst (can't run from a function)
if [ "${DPKG_MAINTSCRIPT_NAME:-}" = "postinst" ] && [ "$1" = "configure" ]; then
case $DPKG_MAINTSCRIPT_PACKAGE in
- postgresql-?.?|postgresql-?.??)
+ postgresql-[89].?|postgresql-[1-9]?)
. /usr/share/debconf/confmodule
;;
esac
diff -Nru postgresql-common-173+ppa1/debian/po/ca.po postgresql-common-190~ubuntu16.04.1/debian/po/ca.po
--- postgresql-common-173+ppa1/debian/po/ca.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/ca.po 2018-01-12 14:08:46.000000000 +0000
@@ -2,22 +2,21 @@
# Copyright (C) 2006 Software in the Public Interest, SPI Inc.
# This file is distributed under the same license as the postgresql-common
# package.
-# Innocent De Marchi , 2011.
+# Innocent De Marchi , 2011, 2017.
#
msgid ""
msgstr ""
-"Project-Id-Version: postgresql-common 114\n"
+"Project-Id-Version: postgresql-common 184\n"
"Report-Msgid-Bugs-To: postgresql-common@packages.debian.org\n"
"POT-Creation-Date: 2016-03-05 11:47+0100\n"
-"PO-Revision-Date: 2011-06-01 18:32+0100\n"
+"PO-Revision-Date: 2017-09-07 18:59+0200\n"
"Last-Translator: Innocent De Marchi \n"
"Language-Team: Catalan \n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Catalan\n"
-"X-Poedit-Country: SPAIN\n"
+"X-Generator: Poedit 2.0.3\n"
#. Type: error
#. Description
@@ -37,7 +36,7 @@
"La versió de «PostgreSQL» ${old} és obsoleta, però el paquet del client o "
"del servidor encara estan instal·lats. Heu d'instal·lar les darreres "
"versions dels paquets (postgresql-${latest} i postgresql-client-${latest}) i "
-"actualitzar els clusters de la versió ${oldversion} amb l'ordre "
+"actualitzar els clústers de la versió ${oldversion} amb l'ordre "
"«pg_upgradecluster» (consulteu la pàgina del manual)."
#. Type: error
@@ -51,9 +50,9 @@
"details)."
msgstr ""
"Tingueu en present que la instal lació de postgresql-${latest} generarà "
-"automàticament un «cluster» pre-determinat ${latest}/main. Heu d'eliminar el "
-"«cluster» ${latest} existent («pg_dropcluster --stop ${latest}) si desitjau "
-"actualitzar el «cluster» ${old}/main, consulteu la pàgina de manual per "
+"automàticament un clúster pre-determinat ${latest}/main. Heu d'eliminar el "
+"clúster ${latest} existent («pg_dropcluster --stop ${latest}) si desitjau "
+"actualitzar el clúster ${old}/main, consulteu la pàgina de manual per "
"conèixer els detalls."
#. Type: error
@@ -66,7 +65,7 @@
msgstr ""
"Ja no se dona suport als paquets antics de client i servidor. Haureu "
"d'eliminar els paquets postgresql-${old} i postgresql-client-${old} després "
-"d'actualitzar els «clusters» que tingui."
+"d'actualitzar els clústers que tingui."
#. Type: error
#. Description
@@ -80,7 +79,7 @@
#. Description
#: ../postgresql-common.templates:2001
msgid "Enable SSL by default in new PostgreSQL clusters?"
-msgstr ""
+msgstr "Permet SSL de forma predeterminada en clústers PostgreSQL nous?"
#. Type: boolean
#. Description
@@ -90,6 +89,9 @@
"However, if the database is solely accessed using TCP connections on "
"localhost, SSL can be turned off without introducing security issues."
msgstr ""
+"PostgreSQL admet connexions SSL encriptades. És una opció adequada. "
+"Tanmateix, si l'accés a la base de dades es fa només amb connexions TCP amb "
+"el servidor local, desactivar SSL no afecta a la seguretat."
#. Type: boolean
#. Description
@@ -100,18 +102,23 @@
"created during package install, or by using the pg_createcluster command. It "
"does not reconfigure existing clusters."
msgstr ""
+"Les connexions de sòcol de domini UNIX (anomenades «locals» al fitxer "
+"«pg_hba.conf») no es veuen afectades per aquesta configuració. Aquesta "
+"configuració afecta els clústers PostgreSQL nous generats en al instal·lació "
+"del paquet o mitjançant l'ordre «pg_createcluster». No configura els "
+"clústers existents."
#. Type: boolean
#. Description
#: ../postgresql-common.templates:2001
msgid "If unsure, enable SSL."
-msgstr ""
+msgstr "En cas de dubte, activau SSL."
#. Type: note
#. Description
#: ../postgresql-common.templates:3001
msgid "PostgreSQL ${version} catalog version changed"
-msgstr ""
+msgstr "S'ha canviat la versió del catàleg de PostgreSQL ${version}"
#. Type: note
#. Description
@@ -123,6 +130,11 @@
"not be able to use this cluster until it was upgraded to the new catalog "
"version."
msgstr ""
+"El clúster ${cluster} de PostgreSQL ${version} es va generar amb la versió "
+"${db_catversion} dels catàleg, però el paquet postgresql-${version} "
+"instal·lat actualment fa servir la versió ${new_catversion} del catàleg. No "
+"podreu fer servir aquest clúster fins que no s'hagi actualitzat a la nova "
+"versió del catàleg."
#. Type: note
#. Description
@@ -131,14 +143,5 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
+"El subconjunt de binaris necessari de la versió anterior es va desar a "
+"${vartmpdir}. Per actualitzar el clúster, executeu aquestes ordres:"
diff -Nru postgresql-common-173+ppa1/debian/po/cs.po postgresql-common-190~ubuntu16.04.1/debian/po/cs.po
--- postgresql-common-173+ppa1/debian/po/cs.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/cs.po 2018-01-12 14:08:46.000000000 +0000
@@ -126,14 +126,3 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/da.po postgresql-common-190~ubuntu16.04.1/debian/po/da.po
--- postgresql-common-173+ppa1/debian/po/da.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/da.po 2018-01-12 14:08:46.000000000 +0000
@@ -1,14 +1,14 @@
# Danish translation postgresql-common.
-# Copyright (C) 2014 THE PACKAGE'S COPYRIGHT HOLDER.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER.
# This file is distributed under the same license as the postgresql-common package.
-# Joe Hansen (joedalton2@yahoo.dk), 2011, 2014.
+# Joe Hansen (joedalton2@yahoo.dk), 2011, 2014, 2017.
#
msgid ""
msgstr ""
"Project-Id-Version: postgresql-common\n"
"Report-Msgid-Bugs-To: postgresql-common@packages.debian.org\n"
"POT-Creation-Date: 2016-03-05 11:47+0100\n"
-"PO-Revision-Date: 2014-07-06 19:25+0200\n"
+"PO-Revision-Date: 2017-03-04 19:25+0200\n"
"Last-Translator: Joe Hansen \n"
"Language-Team: Danish \n"
"Language: da\n"
@@ -114,7 +114,7 @@
#. Description
#: ../postgresql-common.templates:3001
msgid "PostgreSQL ${version} catalog version changed"
-msgstr ""
+msgstr "PostgreSQL ${version}-katalogversion ændrede sig"
#. Type: note
#. Description
@@ -126,6 +126,10 @@
"not be able to use this cluster until it was upgraded to the new catalog "
"version."
msgstr ""
+"PostgreSQL-klyngen ${version} ${cluster} blev oprettet med katalogversion "
+"${db_catversion}, men den i øjeblikket installeret pakke postgresql-${version} "
+"bruger katalogversion ${new_catversion}. Du vil ikke være i stand til "
+"at bruge denne klynge indtil den er opgraderet til den nye katalogversion."
#. Type: note
#. Description
@@ -134,14 +138,6 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
+"Det nødvendige undersæt af binære filer fra den gamle version blev "
+"gemt i ${vartmpdir}. For at opgradere klyngen, så kør disse kommandoer:"
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/de.po postgresql-common-190~ubuntu16.04.1/debian/po/de.po
--- postgresql-common-173+ppa1/debian/po/de.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/de.po 2018-01-12 14:08:46.000000000 +0000
@@ -144,14 +144,3 @@
msgstr ""
"Die notwendigen Programmdateien der alten Version wurden in ${vartmpdir} "
"gesichert. Benutzen Sie folgende Kommandos um den Cluster zu aktualisieren:"
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/es.po postgresql-common-190~ubuntu16.04.1/debian/po/es.po
--- postgresql-common-173+ppa1/debian/po/es.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/es.po 2018-01-12 14:08:46.000000000 +0000
@@ -174,14 +174,3 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/eu.po postgresql-common-190~ubuntu16.04.1/debian/po/eu.po
--- postgresql-common-173+ppa1/debian/po/eu.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/eu.po 2018-01-12 14:08:46.000000000 +0000
@@ -129,14 +129,3 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/fi.po postgresql-common-190~ubuntu16.04.1/debian/po/fi.po
--- postgresql-common-173+ppa1/debian/po/fi.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/fi.po 2018-01-12 14:08:46.000000000 +0000
@@ -124,14 +124,3 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/fr.po postgresql-common-190~ubuntu16.04.1/debian/po/fr.po
--- postgresql-common-173+ppa1/debian/po/fr.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/fr.po 2018-01-12 14:08:46.000000000 +0000
@@ -150,14 +150,3 @@
"L'ensemble des exécutables nécessaires de l'ancienne version ont été "
"sauvegardés dans ${vartmpdir}. Pour mettre à jour la grappe, veuillez "
"exécuter ces commandes :"
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/gl.po postgresql-common-190~ubuntu16.04.1/debian/po/gl.po
--- postgresql-common-173+ppa1/debian/po/gl.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/gl.po 2018-01-12 14:08:46.000000000 +0000
@@ -127,14 +127,3 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/it.po postgresql-common-190~ubuntu16.04.1/debian/po/it.po
--- postgresql-common-173+ppa1/debian/po/it.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/it.po 2018-01-12 14:08:46.000000000 +0000
@@ -134,14 +134,3 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/ja.po postgresql-common-190~ubuntu16.04.1/debian/po/ja.po
--- postgresql-common-173+ppa1/debian/po/ja.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/ja.po 2018-01-12 14:08:46.000000000 +0000
@@ -8,7 +8,7 @@
"Project-Id-Version: postgresql-common 155\n"
"Report-Msgid-Bugs-To: postgresql-common@packages.debian.org\n"
"POT-Creation-Date: 2016-03-05 11:47+0100\n"
-"PO-Revision-Date: 2016-02-22 11:32+0900\n"
+"PO-Revision-Date: 2016-04-07 11:35+0900\n"
"Last-Translator: Takuma Yamada \n"
"Language-Team: Japanese \n"
"Language: ja\n"
@@ -101,10 +101,10 @@
"created during package install, or by using the pg_createcluster command. It "
"does not reconfigure existing clusters."
msgstr ""
-"UNIX ドメインソケット接続 (pg_hba.conf 中で「local」と呼ばれる) は、この設定"
-"の影響を受けません。この設定は、パッケージのインストールや pg_createcluster "
-"コマンドの使用で作成される新しい PostgreSQL クラスタに関するものです。これ"
-"は、既存のクラスタを再設定しません。"
+"UNIX ドメインソケット接続 (pg_hba.conf 中で \"local\" と呼ばれる) は、この設"
+"定の影響を受けません。この設定は、パッケージのインストールや "
+"pg_createcluster コマンドの使用で作成される新しい PostgreSQL クラスタに関する"
+"ものです。これは、既存のクラスタを再設定しません。"
#. Type: boolean
#. Description
@@ -143,14 +143,3 @@
msgstr ""
"古いバージョンからのバイナリの必要なサブセットは、${vartmpdir} に保存されてい"
"ました。クラスタをアップグレードするには、次のコマンドを実行します。"
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/nl.po postgresql-common-190~ubuntu16.04.1/debian/po/nl.po
--- postgresql-common-173+ppa1/debian/po/nl.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/nl.po 2018-01-12 14:08:46.000000000 +0000
@@ -148,14 +148,3 @@
"Van de oude versie werd een subset binaire bestanden die u daarvoor nog "
"nodig heeft, opgeslagen in ${vartmpdir}. Voer de volgende commando's uit om "
"de cluster op te waarderen:"
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/pt_BR.po postgresql-common-190~ubuntu16.04.1/debian/po/pt_BR.po
--- postgresql-common-173+ppa1/debian/po/pt_BR.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/pt_BR.po 2018-01-12 14:08:46.000000000 +0000
@@ -131,14 +131,3 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/pt.po postgresql-common-190~ubuntu16.04.1/debian/po/pt.po
--- postgresql-common-173+ppa1/debian/po/pt.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/pt.po 2018-01-12 14:08:46.000000000 +0000
@@ -1,14 +1,14 @@
# Portuguese translation of postgresql-common debconf messages.
# This file is distributed under the same license as the postgresql-common package.
-# Ricardo Silva , 2006.
+# Ricardo Silva , 2006,2017.
#
#
msgid ""
msgstr ""
-"Project-Id-Version: postgresql-common 163\n"
+"Project-Id-Version: postgresql-common 184\n"
"Report-Msgid-Bugs-To: postgresql-common@packages.debian.org\n"
"POT-Creation-Date: 2016-03-05 11:47+0100\n"
-"PO-Revision-Date: 2014-10-28 10:32-0000\n"
+"PO-Revision-Date: 2017-08-17 11:35-0000\n"
"Last-Translator: Ricardo Silva \n"
"Language-Team: Portuguese \n"
"Language: pt\n"
@@ -117,7 +117,7 @@
#. Description
#: ../postgresql-common.templates:3001
msgid "PostgreSQL ${version} catalog version changed"
-msgstr ""
+msgstr "A versão do catálogo mudou no PostgreSQL {version}"
#. Type: note
#. Description
@@ -129,6 +129,10 @@
"not be able to use this cluster until it was upgraded to the new catalog "
"version."
msgstr ""
+"O cluster PostgreSQL ${version} ${cluster} foi criado usando o catálogo na "
+"versão ${db_catversion}, mas o pacote que está a ser instalado postgresql-${version} "
+"usa a versão de catálogo ${new_catversion}. Não será possível usar este "
+"cluster até que seja actualizado para a nova versão de catálogo."
#. Type: note
#. Description
@@ -137,14 +141,5 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
+"O subconjunto de binários da versão antiga foi guardado em "
+"${vartmpdir}. Para actualizar o cluster, execute os seguintes comandos:"
diff -Nru postgresql-common-173+ppa1/debian/po/ro.po postgresql-common-190~ubuntu16.04.1/debian/po/ro.po
--- postgresql-common-173+ppa1/debian/po/ro.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/ro.po 2018-01-12 14:08:46.000000000 +0000
@@ -131,14 +131,3 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/ru.po postgresql-common-190~ubuntu16.04.1/debian/po/ru.po
--- postgresql-common-173+ppa1/debian/po/ru.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/ru.po 2018-01-12 14:08:46.000000000 +0000
@@ -146,14 +146,3 @@
msgstr ""
"Необходимый набор двоичных файлов из старой версии был сохранён в "
"${vartmpdir}. Для обновления кластера выполните следующие команды:"
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/sv.po postgresql-common-190~ubuntu16.04.1/debian/po/sv.po
--- postgresql-common-173+ppa1/debian/po/sv.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/sv.po 2018-01-12 14:08:46.000000000 +0000
@@ -128,14 +128,3 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/templates.pot postgresql-common-190~ubuntu16.04.1/debian/po/templates.pot
--- postgresql-common-173+ppa1/debian/po/templates.pot 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/templates.pot 2018-01-12 14:08:46.000000000 +0000
@@ -115,14 +115,3 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/tr.po postgresql-common-190~ubuntu16.04.1/debian/po/tr.po
--- postgresql-common-173+ppa1/debian/po/tr.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/tr.po 2018-01-12 14:08:46.000000000 +0000
@@ -140,14 +140,3 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/po/vi.po postgresql-common-190~ubuntu16.04.1/debian/po/vi.po
--- postgresql-common-173+ppa1/debian/po/vi.po 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/po/vi.po 2018-01-12 14:08:46.000000000 +0000
@@ -129,14 +129,3 @@
"The necessary subset of binaries from the old version was saved in "
"${vartmpdir}. To upgrade the cluster, execute these commands:"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../postgresql-common.templates:3001
-msgid ""
-" pg_renamecluster ${version} ${cluster} ${cluster}.old\n"
-" pg_upgradecluster ${version} ${cluster}.old --rename ${cluster} \\\n"
-" -m upgrade --old-bindir=${vartmpdir}/bin\n"
-" pg_dropcluster ${version} ${cluster}.old\n"
-" rm -rf ${vartmpdir}"
-msgstr ""
diff -Nru postgresql-common-173+ppa1/debian/postgresql-client-common.install postgresql-common-190~ubuntu16.04.1/debian/postgresql-client-common.install
--- postgresql-common-173+ppa1/debian/postgresql-client-common.install 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-client-common.install 2018-01-12 14:08:46.000000000 +0000
@@ -1,6 +1,6 @@
-user_clusters etc/postgresql-common
-debian/supported-versions usr/share/postgresql-common
-debian/maintscripts-functions usr/share/postgresql-common
-pgcommon.sh usr/share/postgresql-common
PgCommon.pm usr/share/perl5
+debian/maintscripts-functions usr/share/postgresql-common
+debian/supported-versions usr/share/postgresql-common
pg_wrapper usr/share/postgresql-common
+pgcommon.sh usr/share/postgresql-common
+user_clusters etc/postgresql-common
diff -Nru postgresql-common-173+ppa1/debian/postgresql-client-common.links postgresql-common-190~ubuntu16.04.1/debian/postgresql-client-common.links
--- postgresql-common-173+ppa1/debian/postgresql-client-common.links 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-client-common.links 2018-01-12 14:08:46.000000000 +0000
@@ -1,3 +1,4 @@
+usr/share/man/man1/pg_wrapper.1.gz usr/share/man/man7/postgresql-common.7.gz
usr/share/postgresql-common/pg_wrapper usr/bin/clusterdb
usr/share/postgresql-common/pg_wrapper usr/bin/createdb
usr/share/postgresql-common/pg_wrapper usr/bin/createlang
@@ -5,16 +6,16 @@
usr/share/postgresql-common/pg_wrapper usr/bin/dropdb
usr/share/postgresql-common/pg_wrapper usr/bin/droplang
usr/share/postgresql-common/pg_wrapper usr/bin/dropuser
+usr/share/postgresql-common/pg_wrapper usr/bin/pg_basebackup
usr/share/postgresql-common/pg_wrapper usr/bin/pg_dump
usr/share/postgresql-common/pg_wrapper usr/bin/pg_dumpall
-usr/share/postgresql-common/pg_wrapper usr/bin/pg_basebackup
usr/share/postgresql-common/pg_wrapper usr/bin/pg_isready
-usr/share/postgresql-common/pg_wrapper usr/bin/pg_restore
+usr/share/postgresql-common/pg_wrapper usr/bin/pg_receivewal
usr/share/postgresql-common/pg_wrapper usr/bin/pg_receivexlog
usr/share/postgresql-common/pg_wrapper usr/bin/pg_recvlogical
+usr/share/postgresql-common/pg_wrapper usr/bin/pg_restore
+usr/share/postgresql-common/pg_wrapper usr/bin/pgbench
usr/share/postgresql-common/pg_wrapper usr/bin/psql
usr/share/postgresql-common/pg_wrapper usr/bin/reindexdb
usr/share/postgresql-common/pg_wrapper usr/bin/vacuumdb
usr/share/postgresql-common/pg_wrapper usr/bin/vacuumlo
-usr/share/postgresql-common/pg_wrapper usr/bin/pgbench
-/usr/share/man/man1/pg_wrapper.1.gz /usr/share/man/man7/postgresql-common.7.gz
diff -Nru postgresql-common-173+ppa1/debian/postgresql-client-common.lintian-overrides postgresql-common-190~ubuntu16.04.1/debian/postgresql-client-common.lintian-overrides
--- postgresql-common-173+ppa1/debian/postgresql-client-common.lintian-overrides 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-client-common.lintian-overrides 2018-01-12 14:08:46.000000000 +0000
@@ -10,6 +10,7 @@
postgresql-client-common: binary-without-manpage usr/bin/pg_dump
postgresql-client-common: binary-without-manpage usr/bin/pg_dumpall
postgresql-client-common: binary-without-manpage usr/bin/pg_isready
+postgresql-client-common: binary-without-manpage usr/bin/pg_receivewal
postgresql-client-common: binary-without-manpage usr/bin/pg_receivexlog
postgresql-client-common: binary-without-manpage usr/bin/pg_recvlogical
postgresql-client-common: binary-without-manpage usr/bin/pg_restore
diff -Nru postgresql-common-173+ppa1/debian/postgresql-client-common.manpages postgresql-common-190~ubuntu16.04.1/debian/postgresql-client-common.manpages
--- postgresql-common-173+ppa1/debian/postgresql-client-common.manpages 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-client-common.manpages 2018-01-12 14:08:46.000000000 +0000
@@ -1,2 +1,2 @@
-pg_wrapper.1
*.5
+pg_wrapper.1
diff -Nru postgresql-common-173+ppa1/debian/postgresql-common.config postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.config
--- postgresql-common-173+ppa1/debian/postgresql-common.config 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.config 2018-01-12 14:08:46.000000000 +0000
@@ -33,8 +33,8 @@
if [ "$RET" != "true" ]; then
for v in $AVAILABLE; do
unset sup
- for s in $SUPPORTED; do
- if [ "$v" = "$s" ] || [[ "$v" > "$LATEST" ]]; then
+ for s in $SUPPORTED; do
+ if dpkg --compare-versions "$v" ge "$s"; then
sup=1
break
fi
diff -Nru postgresql-common-173+ppa1/debian/postgresql-common.dirs postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.dirs
--- postgresql-common-173+ppa1/debian/postgresql-common.dirs 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.dirs 2018-01-12 14:08:46.000000000 +0000
@@ -1,4 +1,4 @@
/etc/postgresql
-/var/log/postgresql
-/var/lib/postgresql
/etc/postgresql-common/pg_upgradecluster.d
+/var/lib/postgresql
+/var/log/postgresql
diff -Nru postgresql-common-173+ppa1/debian/postgresql-common.docs postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.docs
--- postgresql-common-173+ppa1/debian/postgresql-common.docs 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.docs 2018-01-29 14:14:22.000000000 +0000
@@ -1,4 +1,4 @@
-architecture.html
+README.md
debian/README.Devel
doc/dependencies.png
systemd/README.systemd
diff -Nru postgresql-common-173+ppa1/debian/postgresql-common.install postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.install
--- postgresql-common-173+ppa1/debian/postgresql-common.install 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.install 2018-01-12 14:08:46.000000000 +0000
@@ -1,20 +1,19 @@
+createcluster.conf usr/share/postgresql-common
debian/01autoremove-postgresql etc/apt/apt.conf.d
debian/init.d-functions usr/share/postgresql-common
-debian/logrotate.template usr/share/postgresql-common
-pg_lsclusters usr/bin
+pg_checksystem usr/share/postgresql-common
+pg_config usr/bin
+pg_conftool usr/bin
pg_createcluster usr/bin
-pg_dropcluster usr/bin
pg_ctlcluster usr/bin
+pg_dropcluster usr/bin
+pg_lsclusters usr/bin
pg_renamecluster usr/bin
-pg_upgradecluster usr/bin
pg_updatedicts usr/sbin
-pg_config usr/bin
-pg_conftool usr/bin
+pg_upgradecluster usr/bin
pg_virtualenv usr/bin
-upgrade-scripts/* usr/share/postgresql-common/upgrade-scripts
-run-upgrade-scripts usr/share/postgresql-common
-pg_checksystem usr/share/postgresql-common
pgdg usr/share/postgresql-common
-testsuite usr/share/postgresql-common
+run-upgrade-scripts usr/share/postgresql-common
t/* usr/share/postgresql-common/t
-createcluster.conf usr/share/postgresql-common
+testsuite usr/share/postgresql-common
+upgrade-scripts/* usr/share/postgresql-common/upgrade-scripts
diff -Nru postgresql-common-173+ppa1/debian/postgresql-common.logrotate postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.logrotate
--- postgresql-common-173+ppa1/debian/postgresql-common.logrotate 1970-01-01 00:00:00.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.logrotate 2018-01-12 14:08:46.000000000 +0000
@@ -0,0 +1,10 @@
+/var/log/postgresql/*.log {
+ weekly
+ rotate 10
+ copytruncate
+ delaycompress
+ compress
+ notifempty
+ missingok
+ su root root
+}
diff -Nru postgresql-common-173+ppa1/debian/postgresql-common.postinst postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.postinst
--- postgresql-common-173+ppa1/debian/postgresql-common.postinst 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.postinst 2018-01-12 14:08:46.000000000 +0000
@@ -26,28 +26,6 @@
rm -f $CCTMP
}
-setup_logrotate ()
-{
- [ "$DPKG_MAINTSCRIPT_PACKAGE" ] || return 0
- LRVERSION=$(dpkg-query -f '${Version}' --show logrotate 2> /dev/null) || return
- [ "$LRVERSION" ] || return 0
- LRTEMPLATE="/usr/share/postgresql-common/logrotate.template"
- LRCONFIG="/etc/logrotate.d/postgresql-common"
- if dpkg --compare-versions "$LRVERSION" ge 3.8; then
- LRCONFSRC=$LRTEMPLATE
- else
- LRCONFSRC=`mktemp --tmpdir postgresql-common.XXXXXX`
- trap "rm -f $LRCONFSRC" 0 2 3 15
- sed -e '/ su /d' $LRTEMPLATE > $LRCONFSRC
- chmod 644 $LRCONFSRC
- fi
- ucf --debconf-ok $LRCONFSRC $LRCONFIG
- ucfr postgresql-common $LRCONFIG
- if [ $LRCONFSRC != $LRTEMPLATE ]; then
- rm -f $LRCONFSRC
- fi
-}
-
if [ "$1" = configure ]; then
[ "$DPKG_MAINTSCRIPT_PACKAGE" ] && quiet="--quiet" # RedHat doesn't have this
# Make sure the administrative user exists
@@ -115,11 +93,6 @@
fi
fi
- # clean /usr/share/postgresql/*/tsearch_data/system_* stuff
- if dpkg --compare-versions "$2" lt-nl 105; then
- find /usr/share/postgresql/*/tsearch_data -type l \( -name 'system_*.dict' -o -name 'system_*.affix' \) -exec rm '{}' \; && pg_updatedicts || true
- fi
-
if [ "$2" ]; then
/usr/share/postgresql-common/run-upgrade-scripts "$2" || true
fi
@@ -129,16 +102,20 @@
# Create createcluster.conf from debconf
setup_createclusterconf
- # Create logrotate config
- setup_logrotate
+ # Forget about ucf logrotate config handling
+ if dpkg --compare-versions "$2" lt 183~; then
+ LRCONFIG="/etc/logrotate.d/postgresql-common"
+ ucf --purge $LRCONFIG
+ ucfr --purge postgresql-common $LRCONFIG
+ fi
- if dpkg --compare-versions "$2" lt 94; then
- pg_updatedicts || true
+ # Create tsearch dictionaries on first install
+ if [ -z "$2" ]; then
+ pg_updatedicts
fi
fi
if [ "$1" = triggered ]; then
- setup_logrotate
pg_updatedicts || true
db_stop
exit 0 # skip daemon restart below
diff -Nru postgresql-common-173+ppa1/debian/postgresql-common.postrm postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.postrm
--- postgresql-common-173+ppa1/debian/postgresql-common.postrm 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.postrm 2018-01-12 14:08:46.000000000 +0000
@@ -18,17 +18,14 @@
rm -rf /var/cache/postgresql
# unregister and remove files maintained by ucf
- LRCONFIG="/etc/logrotate.d/postgresql-common"
CCCONFIG="/etc/postgresql-common/createcluster.conf"
if which ucf >/dev/null; then
- ucf --purge $LRCONFIG
ucf --purge $CCCONFIG
fi
if which ucfr >/dev/null; then
- ucfr --purge postgresql-common $LRCONFIG
ucfr --purge postgresql-common $CCCONFIG
fi
- rm -f $LRCONFIG $LRCONFIG.ucf-* $CCCONFIG $CCCONFIG.ucf-*
+ rm -f $CCCONFIG $CCCONFIG.ucf-*
fi
#DEBHELPER#
diff -Nru postgresql-common-173+ppa1/debian/postgresql-common.templates postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.templates
--- postgresql-common-173+ppa1/debian/postgresql-common.templates 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.templates 2018-01-12 14:08:46.000000000 +0000
@@ -33,8 +33,11 @@
.
If unsure, enable SSL.
+# The last paragraph of this note does not appear in PO files.
+# It contains shell commands and should not be translated.
Template: postgresql-common/catversion-bump
Type: note
+#flag:translate:1,2,3
_Description: PostgreSQL ${version} catalog version changed
The PostgreSQL cluster ${version} ${cluster} was created using catalog
version ${db_catversion}, but the currently being installed package
diff -Nru postgresql-common-173+ppa1/debian/postgresql-common.triggers postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.triggers
--- postgresql-common-173+ppa1/debian/postgresql-common.triggers 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-common.triggers 2018-01-12 14:08:46.000000000 +0000
@@ -1,4 +1,5 @@
-interest /usr/share/myspell/dicts
-interest /usr/share/hunspell
-interest /usr/share/postgresql
-interest /usr/sbin/logrotate
+# trigger pg_updatedicts on installation of new myspell/hunspell dictionaries
+interest-noawait /usr/share/myspell/dicts
+interest-noawait /usr/share/hunspell
+# also trigger on installation of new server versions so pg_updatedicts can update the symlinks
+interest-noawait /usr/share/postgresql
diff -Nru postgresql-common-173+ppa1/debian/postgresql-server-dev-all.install postgresql-common-190~ubuntu16.04.1/debian/postgresql-server-dev-all.install
--- postgresql-common-173+ppa1/debian/postgresql-server-dev-all.install 2016-01-04 23:11:29.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-server-dev-all.install 2018-01-12 14:08:46.000000000 +0000
@@ -1,2 +1,4 @@
-pgxs_debian_control.mk /usr/share/postgresql-common/
pg_buildext /usr/bin
+pgxs_debian_control.mk /usr/share/postgresql-common/
+dh_make_pgxs/dh_make_pgxs /usr/bin
+dh_make_pgxs/debian /usr/share/postgresql-common/dh_make_pgxs
diff -Nru postgresql-common-173+ppa1/debian/postgresql-server-dev-all.manpages postgresql-common-190~ubuntu16.04.1/debian/postgresql-server-dev-all.manpages
--- postgresql-common-173+ppa1/debian/postgresql-server-dev-all.manpages 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/postgresql-server-dev-all.manpages 2018-01-12 14:08:46.000000000 +0000
@@ -1 +1,2 @@
+dh_make_pgxs/dh_make_pgxs.1
pg_buildext.1
diff -Nru postgresql-common-173+ppa1/debian/README.Debian postgresql-common-190~ubuntu16.04.1/debian/README.Debian
--- postgresql-common-173+ppa1/debian/README.Debian 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/README.Debian 2018-01-12 14:08:46.000000000 +0000
@@ -1,13 +1,14 @@
PostgreSQL for Debian
=====================
-PostgreSQL is the successor to Postgres95, which in turn succeeded POSTGRES.
-PostgreSQL is a relational database with object-oriented extensions. It
-implements the greater part of SQL-92 and is intended to implement it in full;
-in addition it supports its own extended facilities.
+PostgreSQL is a fully featured object-relational database management system. It
+supports a large part of the SQL standard and is designed to be extensible by
+users in many aspects. Its features include ACID transactions, foreign keys,
+views, sequences, subqueries, triggers, outer joins, multiversion concurrency
+control, and user-defined types and functions.
-Since the on-disk data format of all major PostgreSQL versions (like 9.1,
-9.4, etc.) is incompatible to each other, Debian's PostgreSQL packaging
+Since the on-disk data format of all major PostgreSQL versions (like 9.6,
+10, etc.) is incompatible to each other, Debian's PostgreSQL packaging
architecture is designed to maintain clusters of different major versions in
parallel.
@@ -26,7 +27,7 @@
a database user and a database for the Unix user 'joe':
1. Install a database server with the major version of your choice
- ('postgresql-X.Y', e. g. 'postgresql-9.1'). Preferably the latest
+ ('postgresql-XY', e. g. 'postgresql-10'). Preferably the latest
version, which you can get by installing the metapackage
'postgresql'. This will automatically create a default cluster
'main' with the database superuser 'postgres'.
@@ -44,7 +45,7 @@
Unix login:
$ createuser -DRS joe
-
+
For details about the options, see createuser(1).
4. Create a database "joework" which is owned by "joe":
@@ -59,7 +60,6 @@
$ psql joework
-
Cluster management
------------------
For managing clusters, the following commands are provided (each with its own
@@ -79,7 +79,7 @@
this case you cannot expect *any* of above pg_* tools to work, since
they use different configuration settings (SSL, data directories,
etc.) and file locations (e. g.
-/etc/postgresql/9.1/main/postgresql.conf). If in doubt, then do *not*
+/etc/postgresql/10/main/postgresql.conf). If in doubt, then do *not*
use initdb, but only pg_createcluster. Since merely installing
postgresql-X.Y will already set up a default cluster which is ready to
work, most people do not need to bother about initdb or
@@ -92,9 +92,9 @@
created (by any major version) will run on the default port 5432, and
each new cluster will use the next higher free one.
-E. g. if you first install "postgresql-9.1" on a clean system, the
-default 9.1/main cluster will run on port 5432. If you then create
-another 9.1 cluster, or install the "postgresql-9.4" package, that new
+E. g. if you first install "postgresql-10" on a clean system, the
+default 10/main cluster will run on port 5432. If you then create
+another 10 cluster, or install the "postgresql-11" package, that new
one will run on 5433.
Please use "pg_lsclusters" for displaying the cluster <-> port
@@ -110,18 +110,18 @@
Due to this default cluster, an immediate attempt to upgrade an
earlier 'main' cluster to a new version will fail and you need to
remove the newer default cluster first. E. g., if you have
-postgresql-9.1 installed and want to upgrade to 9.4, you first install
-postgresql-9.4:
+postgresql-9.6 installed and want to upgrade to 10, you first install
+postgresql-10:
- apt-get install postgresql-9.4
+ apt-get install postgresql-10
-Then drop the default 9.4 cluster that was just created:
+Then drop the default 10 cluster that was just created:
- pg_dropcluster 9.4 main --stop
+ pg_dropcluster 10 main --stop
-And then upgrade the 9.1 cluster to the latest installed version (e. g. 9.4):
+And then upgrade the 9.6 cluster to the latest installed version (e. g. 10):
- pg_upgradecluster 9.1 main
+ pg_upgradecluster 9.6 main
SSL
---
@@ -130,17 +130,12 @@
untrusted network between a database server and a client and these exchange
security sensitive data like passwords or confidential database contents.
-postgresql-common makes use of the 'snakeoil' SSL certificate that is
-generated by the ssl-cert package, so that SSL works out of the box.
-When a cluster is created with pg_createcluster, SSL support will
-automatically be enabled in that cluster, and symlinks "server.key"
-and "server.crt" are created in the data directory which point to the
-snakeoil certificate in /etc/ssl; therefore all clusters use the same
-certificate by default. Of course you can replace these symlinks by
-cluster-specific certificates.
+When a cluster is created with pg_createcluster, SSL support will automatically
+be enabled. postgresql-common makes use of the 'snakeoil' SSL certificate that
+is generated by the ssl-cert package, so that SSL works out of the box
+(ssl_cert_file, ssl_key_file). In addition, if /etc/postgresql-common/root.crt
+exists, it will be used as CA certificate file (ssl_ca_file).
-In addition, if /etc/postgresql-common/root.crt exists, a symbolic
-link "root.crt" will be created in the data directory.
/etc/postgresql-common/root.crt is a dummy file by default, so that
client-side authentication is not performed. To enable it, you should
add some root certificates to it. A reasonable choice is to just
@@ -148,7 +143,7 @@
case, client certificates need to be signed by the snakeoil
certificate, which might be desirable in many cases. See
- /usr/share/doc/postgresql-doc-9.1/html/ssl-tcp.html
+ /usr/share/doc/postgresql-doc-10/html/ssl-tcp.html
for details (in package postgresql-doc).
diff -Nru postgresql-common-173+ppa1/debian/rules postgresql-common-190~ubuntu16.04.1/debian/rules
--- postgresql-common-173+ppa1/debian/rules 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/rules 2018-01-29 12:17:05.000000000 +0000
@@ -5,16 +5,16 @@
FLAVOR := debian-backports
else ifneq ($(findstring pgdg,$(VERSION)),)
FLAVOR := pgdg
+ # for apt.postgresql.org builds, pull in the repository key package
+ PGDG_DEPENDS := pgdg-keyring
else
FLAVOR := default
endif
SUPPORTED_VERSIONS := $(shell PG_SUPPORTED_VERSIONS="$(FLAVOR)" debian/supported-versions)
DEFAULT_VER := $(lastword $(SUPPORTED_VERSIONS))
+LIBREADLINE := $(shell dpkg-query -W --showformat '$${Status} $${Package}\n' 'libreadline[0-9]'| sed -n '/ installed / {s/^.* //; p}'|sort -ru | head -n1)
-# use dh_systemd_* only on recent dists that have dh-systemd (>= 1.19)
-ifneq ($(wildcard /usr/bin/dh_systemd_start),)
WITH_SYSTEMD=--with systemd
-endif
%:
dh $@ $(WITH_SYSTEMD)
@@ -27,9 +27,7 @@
dh_install
$(MAKE) -C systemd install DESTDIR=$(CURDIR)/debian/postgresql-common
install -m 644 -D debian/postgresql-common.sysctl debian/postgresql-common/etc/sysctl.d/30-postgresql-shm.conf
-ifneq ($(FLAVOR),default)
/bin/echo -e "# See /usr/share/postgresql-common/supported-versions for documentation of this file\n$(FLAVOR)" > debian/postgresql-client-common/etc/postgresql-common/supported_versions
-endif
override_dh_installinit:
dh_installinit --name=postgresql -u'defaults 19 21' -r
@@ -39,12 +37,10 @@
# the versionless metapackages need to have version numbers which match
# the server version, not the p-common version
- dh_gencontrol -ppostgresql -ppostgresql-client -ppostgresql-doc -ppostgresql-contrib -- \
- -Vdefault-version="$(DEFAULT_VER)" -v'$(DEFAULT_VER)+$${source:Version}'
+ dh_gencontrol -ppostgresql -ppostgresql-client -ppostgresql-doc -ppostgresql-contrib -ppostgresql-all -- \
+ -Vdefault-version="$(DEFAULT_VER)" -v'$(DEFAULT_VER)+$${source:Version}' \
+ -Vpostgresql-all-depends="$(foreach v,$(SUPPORTED_VERSIONS),postgresql-contrib-$v,postgresql-plperl-$v,postgresql-plpython-$v,postgresql-plpython3-$v,postgresql-pltcl-$v,)"
-ifeq ($(FLAVOR),pgdg)
- # for apt.postgresql.org builds, pull in the repository key package
- dh_gencontrol -ppostgresql-client-common -- -Vpgdg:Depends="pgdg-keyring"
-endif
+ dh_gencontrol -ppostgresql-client-common -- -Vpgdg:Depends="$(PGDG_DEPENDS)" -Vreadline:Recommends=$(LIBREADLINE)
dh_gencontrol --remaining-packages
diff -Nru postgresql-common-173+ppa1/debian/source/lintian-overrides postgresql-common-190~ubuntu16.04.1/debian/source/lintian-overrides
--- postgresql-common-173+ppa1/debian/source/lintian-overrides 2015-05-06 21:25:15.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/source/lintian-overrides 2018-02-08 12:26:44.000000000 +0000
@@ -1,3 +1,3 @@
-# don't bother us about NMUs when uploading using the company address:
-postgresql-common source: changelog-should-mention-nmu
-postgresql-common source: source-nmu-has-incorrect-version-number
+# don't bug people uploading from @work
+source: changelog-should-mention-nmu
+source: source-nmu-has-incorrect-version-number
diff -Nru postgresql-common-173+ppa1/debian/supported-versions postgresql-common-190~ubuntu16.04.1/debian/supported-versions
--- postgresql-common-173+ppa1/debian/supported-versions 2017-01-13 00:32:56.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/debian/supported-versions 2019-03-14 23:34:25.000000000 +0000
@@ -33,11 +33,11 @@
# ubuntu [release]: use Ubuntu defaults
# pgdg [release]: use defaults for apt.postgresql.org
# installed: consider all installed versions supported (determined by
-# postgresql-server-dev-X.Y packages)
-# X.Y: consider this version supported
+# postgresql-server-dev-X packages)
+# X: consider this version supported
#
# (C) 2005-2016 Martin Pitt
-# (C) 2012-2016 Christoph Berg
+# (C) 2012-2017 Christoph Berg
set -eu
@@ -49,7 +49,7 @@
. /usr/share/postgresql-common/pgcommon.sh
fi
-DEFAULT="9.5"
+DEFAULT="10"
# functions
@@ -79,87 +79,58 @@
ubuntu() {
case "$1" in
- 12.04)
- /bin/echo -e "9.1"
- ;;
- 14.04)
- /bin/echo -e "9.3"
- ;;
- 14.10|15.04|15.10)
- /bin/echo -e "9.4"
- ;;
- 16.04)
- /bin/echo -e "9.5\n9.6"
- ;;
+ 12.04) /bin/echo -e "9.1" ;;
+ 14.04) /bin/echo -e "9.3" ;;
+ 16.04) /bin/echo -e "9.5\n10" ;;
+ 16.10) /bin/echo -e "9.5" ;;
+ 17.04|17.10) /bin/echo -e "9.6" ;;
+ 18.04) /bin/echo -e "10" ;;
*)
echo "supported-versions: WARNING: Unknown Ubuntu release: $1" >&2
- /bin/echo -e "$DEFAULT"
- ;;
+ /bin/echo -e "$DEFAULT" ;;
esac
}
debian() {
case "$1" in
- 5.0*) # Lenny
- /bin/echo -e "8.3"
- ;;
- 6.0*) # Squeeze
- /bin/echo -e "8.4"
- ;;
- 7|7.*) # Wheezy
- /bin/echo -e "9.1"
- ;;
- 8|8.*) # Jessie
- /bin/echo -e "9.4"
- ;;
+ 5.0*) /bin/echo -e "8.3" ;; # Lenny
+ 6.0*) /bin/echo -e "8.4" ;; # Squeeze
+ 7|7.*) /bin/echo -e "9.1" ;; # Wheezy
+ 8|8.*) /bin/echo -e "9.4" ;; # Jessie
+ 9|9.*) /bin/echo -e "9.6" ;; # Stretch
+ 10|10.*) /bin/echo -e "10" ;; # Buster
testing | unstable)
- /bin/echo -e "$DEFAULT"
- ;;
+ /bin/echo -e "$DEFAULT" ;;
*)
echo "supported-versions: WARNING: Unknown Debian release: $1" >&2
- /bin/echo -e "$DEFAULT"
- ;;
+ /bin/echo -e "$DEFAULT" ;;
esac
}
debian_backports() {
case "$1" in
- 5.0*) # Lenny
- /bin/echo -e "8.3"
- ;;
- 6.0*) # Squeeze
- /bin/echo -e "8.4\n9.1"
- ;;
- 7|7.*) # Wheezy
- /bin/echo -e "9.1\n9.4"
- ;;
- 8|8.*) # Jessie
- /bin/echo -e "9.4"
- ;;
+ 5.0*) /bin/echo -e "8.3" ;; # Lenny
+ 6.0*) /bin/echo -e "8.4\n9.1" ;; # Squeeze
+ 7|7.*) /bin/echo -e "9.1\n9.4" ;; # Wheezy
+ 8|8.*) /bin/echo -e "9.4\n9.6" ;; # Jessie
+ 9|9.*) /bin/echo -e "9.6" ;; # Stretch
+ 10|10.*) /bin/echo -e "10" ;; # Buster
testing | unstable)
- /bin/echo -e "$DEFAULT"
- ;;
+ /bin/echo -e "$DEFAULT" ;;
*)
echo "supported-versions: WARNING: Unknown Debian release: $1" >&2
- /bin/echo -e "$DEFAULT"
- ;;
+ /bin/echo -e "$DEFAULT" ;;
esac
}
pgdg() {
- case $1 in
- testing | unstable)
- /bin/echo -e "9.1\n9.2\n9.3\n9.4\n9.5" # 9.5 default
- ;;
- *)
- /bin/echo -e "9.1\n9.2\n9.3\n9.4\n9.5" # 9.5 default
- ;;
- esac
+ /bin/echo -e "9.3\n9.4\n9.5\n9.6\n10"
}
installed() {
- dpkg -l 'postgresql-server-dev-[1-9].*' | \
- sed -ne 's/^ii *postgresql-server-dev-\([^ ]*\).*/\1/p'
+ dpkg -l 'postgresql-server-dev-[1-9]*' | \
+ sed -ne 's/^ii *postgresql-server-dev-\([^ ]*\).*/\1/p' | \
+ sort -V
}
# main
diff -Nru postgresql-common-173+ppa1/dh_make_pgxs/debian/compat postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/compat
--- postgresql-common-173+ppa1/dh_make_pgxs/debian/compat 1970-01-01 00:00:00.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/compat 2018-01-12 14:08:46.000000000 +0000
@@ -0,0 +1 @@
+@COMPAT@
diff -Nru postgresql-common-173+ppa1/dh_make_pgxs/debian/control.in postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/control.in
--- postgresql-common-173+ppa1/dh_make_pgxs/debian/control.in 1970-01-01 00:00:00.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/control.in 2018-01-12 14:08:46.000000000 +0000
@@ -0,0 +1,15 @@
+Source: @SOURCE@
+Section: database
+Priority: optional
+Maintainer: Debian PostgreSQL Maintainers
+Uploaders: @MAINTAINER_NAME@ <@DEBEMAIL@>
+Build-Depends: debhelper (>= @COMPAT@), postgresql-server-dev-all (>= 153~)
+Standards-Version: @STANDARDS_VERSION@
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-postgresql/@SOURCE@.git/
+Vcs-Git: https://anonscm.debian.org/git/pkg-postgresql/@SOURCE@.git
+
+Package: postgresql-PGVERSION-@EXTNAME@
+Architecture: any
+Depends: postgresql-PGVERSION, ${misc:Depends}, ${shlibs:Depends}
+Description: FIXME PostgreSQL extension @SOURCE@
+ FIXME long description here
diff -Nru postgresql-common-173+ppa1/dh_make_pgxs/debian/copyright postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/copyright
--- postgresql-common-173+ppa1/dh_make_pgxs/debian/copyright 1970-01-01 00:00:00.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/copyright 2018-01-12 14:08:46.000000000 +0000
@@ -0,0 +1,24 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: @NAME@
+#Source: @URL@
+
+Files: *
+Copyright: Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ Portions Copyright (c) 1994, The Regents of the University of California
+License: PostgreSQL
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose, without fee, and without a written agreement
+ is hereby granted, provided that the above copyright notice and this
+ paragraph and the following two paragraphs appear in all copies.
+ .
+ IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
+ LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
+ DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ .
+ THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
+ ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
+ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
diff -Nru postgresql-common-173+ppa1/dh_make_pgxs/debian/pgversions postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/pgversions
--- postgresql-common-173+ppa1/dh_make_pgxs/debian/pgversions 1970-01-01 00:00:00.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/pgversions 2018-01-12 14:08:46.000000000 +0000
@@ -0,0 +1 @@
+all
diff -Nru postgresql-common-173+ppa1/dh_make_pgxs/debian/rules postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/rules
--- postgresql-common-173+ppa1/dh_make_pgxs/debian/rules 1970-01-01 00:00:00.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/rules 2018-01-12 14:08:46.000000000 +0000
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+
+include /usr/share/postgresql-common/pgxs_debian_control.mk
+
+override_dh_auto_build:
+ +pg_buildext build build-%v
+
+override_dh_auto_test:
+ # nothing to do here, see debian/tests/* instead
+
+override_dh_auto_install:
+ +pg_buildext install build-%v postgresql-%v-@EXTNAME@
+
+override_dh_installdocs:
+ dh_installdocs --all README.*
+
+override_dh_auto_clean:
+ +pg_buildext clean build-%v
+
+%:
+ dh $@
diff -Nru postgresql-common-173+ppa1/dh_make_pgxs/debian/source/format postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/source/format
--- postgresql-common-173+ppa1/dh_make_pgxs/debian/source/format 1970-01-01 00:00:00.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/source/format 2018-01-12 14:08:46.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru postgresql-common-173+ppa1/dh_make_pgxs/debian/tests/control postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/tests/control
--- postgresql-common-173+ppa1/dh_make_pgxs/debian/tests/control 1970-01-01 00:00:00.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/tests/control 2018-01-12 14:08:46.000000000 +0000
@@ -0,0 +1,3 @@
+Depends: @, postgresql-server-dev-all
+Tests: installcheck
+Restrictions: allow-stderr
diff -Nru postgresql-common-173+ppa1/dh_make_pgxs/debian/tests/installcheck postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/tests/installcheck
--- postgresql-common-173+ppa1/dh_make_pgxs/debian/tests/installcheck 1970-01-01 00:00:00.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/debian/tests/installcheck 2018-01-12 14:08:46.000000000 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+pg_buildext installcheck
diff -Nru postgresql-common-173+ppa1/dh_make_pgxs/dh_make_pgxs postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/dh_make_pgxs
--- postgresql-common-173+ppa1/dh_make_pgxs/dh_make_pgxs 1970-01-01 00:00:00.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/dh_make_pgxs 2018-01-12 14:08:46.000000000 +0000
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# (C) 2015-2017 Christoph Berg
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+set -eu
+
+# basic variables
+
+template_dir="/usr/share/postgresql-common/dh_make_pgxs/debian"
+DIRECTORY="$(basename $PWD)"
+NAME="${DIRECTORY%-*}" # Upstream name
+VERSION="${DIRECTORY##*-}"
+
+# options
+
+while getopts "fn:v:" opt ; do
+ case $opt in
+ f) FORCE=yes ;;
+ n) NAME="$OPTARG" ;;
+ v) VERSION="$OPTARG" ;;
+ *) exit 5 ;;
+ esac
+done
+shift $((OPTIND - 1)) # shift away args
+
+# more variables
+
+SOURCE="${NAME//_/-}" # Debian name
+EXTNAME="$(echo $SOURCE | sed -e 's/^\(postgresql\|pgsql\|pg\)-//')" # binary package name suffix
+COMPAT="$(apt-cache show debhelper | sed -n 's/Version: \([0-9]*\)\..*/\1/p' | head -n1)"
+STANDARDS_VERSION="$(apt-cache show debian-policy | sed -n 's/Version: \(.*\)\..*/\1/p' | head -n1)"
+USERNAME=${LOGNAME:-${USER:-root}}
+MAINTAINER_NAME=$(getent passwd $USERNAME | cut -d : -f 5 | sed -e 's/,.*//')
+: ${DEBEMAIL:=$USERNAME@localhost}
+
+echo "Upstream: $NAME ($VERSION)"
+echo "Debian: $SOURCE ($VERSION-1)"
+echo "Binaries: postgresql-PGVERSION-$EXTNAME ($VERSION-1)"
+echo "Uploader: $MAINTAINER_NAME <$DEBEMAIL>"
+echo
+if [ -t 0 ]; then
+ echo -n "Press Enter to continue, ^C to abort "
+ read
+fi
+
+# install files
+
+install_dir ()
+{
+ local directory="debian/$1"
+ #[ -z "$directory" ] && return
+ [ -d "$directory" ] && return
+ echo "Creating $directory/"
+ mkdir "$directory"
+}
+
+install_template ()
+{
+ local template="$1"
+
+ if [ "${FORCE:-}" ] || ! [ -e debian/$template ]; then
+ echo "Installing debian/$template"
+ sed -e "s/@COMPAT@/$COMPAT/g" \
+ -e "s/@EXTNAME@/$EXTNAME/g" \
+ -e "s/@NAME@/$NAME/g" \
+ -e "s/@STANDARDS_VERSION@/$STANDARDS_VERSION/g" \
+ -e "s/@SOURCE@/$SOURCE/g" \
+ -e "s/@MAINTAINER_NAME@/$MAINTAINER_NAME/g" \
+ -e "s/@DEBEMAIL@/$DEBEMAIL/g" \
+ "$template_dir/$template" > "debian/$template"
+ if [ -x $template_dir/$template ]; then
+ chmod +x "debian/$template"
+ fi
+ else
+ echo "Keeping existing debian/$template"
+ fi
+}
+
+mkdir -p debian
+
+for template in $(find $template_dir -mindepth 1 | sort); do
+ case $template in
+ *.swp|*~) continue ;; # skip vim stuff
+ esac
+ basename=${template##$template_dir/}
+ if [ -d $template ]; then
+ install_dir "$basename"
+ else
+ install_template "$basename"
+ fi
+done
+
+echo "Updating debian/control from debian/control.in"
+pg_buildext updatecontrol
+
+if [ "${FORCE:-}" ] || ! [ -e debian/changelog ]; then
+ rm -f debian/changelog
+ echo "Creating debian/changelog"
+ dch --create --package "$SOURCE" --newversion "$VERSION-1"
+else
+ echo "Keeping existing debian/changelog"
+fi
diff -Nru postgresql-common-173+ppa1/dh_make_pgxs/dh_make_pgxs.pod postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/dh_make_pgxs.pod
--- postgresql-common-173+ppa1/dh_make_pgxs/dh_make_pgxs.pod 1970-01-01 00:00:00.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/dh_make_pgxs/dh_make_pgxs.pod 2018-01-12 14:08:46.000000000 +0000
@@ -0,0 +1,39 @@
+=head1 NAME
+
+dh_make_pgxs - Create a new Debian source package for a PGXS PostgreSQL extension
+
+=head1 SYNOPSIS
+
+B [B<-f>] [B<-n> I] [B<-v> I]
+
+=head1 DESCRIPTION
+
+B creates a F directory tree for PostgreSQL extension
+packages using the PGXS build system. The B tool is used for the
+build process.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-f>
+
+Overwrite existing files.
+
+=item B<-n> I
+
+Package name to use. Default is to extract it from the current directory's name.
+
+=item B<-v> I
+
+Package version to use. Default is to extract it from the current directory's name.
+
+=back
+
+=head1 SEE ALSO
+
+dh_make(1), pg_buildext(1).
+
+=head1 AUTHOR
+
+Christoph Berg Lmyon@debian.orgE>
diff -Nru postgresql-common-173+ppa1/.gitlab-ci.yml postgresql-common-190~ubuntu16.04.1/.gitlab-ci.yml
--- postgresql-common-173+ppa1/.gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/.gitlab-ci.yml 2018-01-31 12:29:59.000000000 +0000
@@ -0,0 +1,39 @@
+unstable:
+ image: debian:unstable
+ script:
+ - apt-get update
+ - apt-get install -y build-essential fakeroot
+ - apt-get build-dep -y .
+ - dpkg-buildpackage -uc -us -rfakeroot
+ - ( set -x; for deb in ../*.deb; do dpkg-deb --info $deb; dpkg-deb --contents $deb; done )
+ - ( set -x; dpkg --force-confmiss --force-confnew -i ../*.deb || { apt-get install -fy; dpkg --force-confmiss --force-confnew -i ../*.deb; } )
+ - ./cleanpg
+ - dpkg -l postgresql\* | cat
+ - pg_lsclusters
+ - SKIP_IPV6=1 ./testsuite -v "$(debian/supported-versions)" -i -M
+
+jessie:
+ tags:
+ - jessie
+ script:
+ - sudo apt-get update
+ - sudo apt-get install -y build-essential fakeroot debhelper libreadline-dev lsb-release dh-systemd
+ - dpkg-buildpackage -uc -us -rfakeroot
+ - ( set -x; for deb in ../*.deb; do dpkg-deb --info $deb; dpkg-deb --contents $deb; done )
+ - ( set -x; sudo dpkg --force-confmiss --force-confnew -i ../*.deb || { sudo apt-get install -fy; sudo dpkg --force-confmiss --force-confnew -i ../*.deb; } )
+ - dpkg -l postgresql\* | cat
+ - pg_lsclusters
+ - sudo ./testsuite -v "$(debian/supported-versions)" -i
+
+centos7:
+ tags:
+ - centos7
+ script:
+ - sudo yum install -y rpm-build
+ - rm -rf $HOME/rpmbuild
+ - make rpmremove
+ - make rpmbuild
+ - rpm -ql pgdg-centos10 > /dev/null || sudo yum install -y https://download.postgresql.org/pub/repos/yum/10/redhat/rhel-7-x86_64/pgdg-centos10-10-2.noarch.rpm
+ - make rpminstall
+ - pg_lsclusters
+ - sudo ./testsuite -v "$(debian/supported-versions)" -i
diff -Nru postgresql-common-173+ppa1/Makefile postgresql-common-190~ubuntu16.04.1/Makefile
--- postgresql-common-173+ppa1/Makefile 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/Makefile 2018-01-31 12:29:59.000000000 +0000
@@ -8,7 +8,8 @@
pg_upgradecluster.1 \
pg_wrapper.1
POD1PROGS_POD = pg_buildext.1 \
- pg_virtualenv.1
+ pg_virtualenv.1 \
+ dh_make_pgxs/dh_make_pgxs.1
POD8PROGS = pg_updatedicts.8
all: man
@@ -25,4 +26,26 @@
$(POD2MAN) --quotes=none --section 8 $< $@
clean:
- rm -f *.1 *.8
+ rm -f *.1 *.8 dh_make_pgxs/*.1
+
+# rpm
+
+DPKG_VERSION=$(shell sed -ne '1s/.*(//; 1s/).*//p' debian/changelog)
+RPMDIR=$(HOME)/rpmbuild
+TARBALL=$(RPMDIR)/SOURCES/postgresql-common_$(DPKG_VERSION).tar.xz
+
+rpmbuild: $(TARBALL)
+ rpmbuild --define='version $(DPKG_VERSION)' -ba rpm/postgresql-common.spec
+
+$(TARBALL):
+ mkdir -p $(dir $(TARBALL))
+ git archive --prefix=postgresql-common-$(DPKG_VERSION)/ HEAD | xz > $(TARBALL)
+
+rpminstall:
+ sudo rpm --upgrade --replacefiles --replacepkgs -v $(RPMDIR)/RPMS/noarch/*-$(DPKG_VERSION)-*.rpm
+
+rpmremove:
+ -sudo rpm -e postgresql-common postgresql-client-common postgresql-server-dev-all
+
+rpmclean:
+ rm -rf $(TARBALL) $(RPMDIR)/BUILD
diff -Nru postgresql-common-173+ppa1/pg_buildext postgresql-common-190~ubuntu16.04.1/pg_buildext
--- postgresql-common-173+ppa1/pg_buildext 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/pg_buildext 2018-01-12 14:08:46.000000000 +0000
@@ -4,7 +4,7 @@
# versions
#
# (C) 2010 Dimitri Fontaine
-# (C) 2011-2014 Christoph Berg
+# (C) 2011-2017 Christoph Berg
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,12 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-set -e
+set -eu
+
+die() {
+ echo "$(basename $0): error: $*" >&2
+ exit 1
+}
VENVARGS=""
while getopts "c:i:o:s" opt ; do
@@ -29,23 +34,19 @@
# shift away args
shift $(($OPTIND - 1))
+[ "${1:-}" ] || die "no action given"
action="$1"
-if [ -d "$2" ] && [ "$3" ]; then # compat mode: $2 is source directory
- srcdir="$2"
+if [ -d "${2:-}" ] && [ "${3:-}" ]; then # optional: $2 is source directory
+ srcdir="${2:-}"
shift
else
srcdir="$PWD"
fi
-target="$2"
-opt="$3"
-
-die() {
- echo "`basename $0`: error: $*" >&2
- exit 1
-}
+target="${2:-}"
+opt="${3:-}"
prepare_env() {
- version=$1
+ local version=$1
vtarget=`echo $target | sed -e "s:%v:$version:g"`
pgc="/usr/lib/postgresql/$version/bin/pg_config"
[ -e "$pgc" ] || die "$pgc does not exist"
@@ -53,31 +54,33 @@
configure() {
prepare_env $1
- confopts=`echo $opt | sed -e "s:%v:$version:g"`
+ confopts=`echo $opt | sed -e "s:%v:$1:g"`
mkdir -p $vtarget
( echo "calling configure in $vtarget" &&
- cd $vtarget && $srcdir/configure $confopts DESTDIR="$srcdir/debian/$package" PG_CONFIG="$pgc" VPATH="$srcdir" )
+ cd $vtarget && $srcdir/configure $confopts PG_CONFIG="$pgc" VPATH="$srcdir" )
}
build() {
prepare_env $1
- cflags="`$pgc --cflags` `echo $opt | sed -e "s:%v:$version:g"`"
+ if [ "$opt" ]; then
+ cflags="$(echo $opt | sed -e "s:%v:$1:g")"
+ fi
mkdir -p $vtarget
# if a Makefile was created by configure, use it, else the top level Makefile
[ -f $vtarget/Makefile ] || makefile="-f $srcdir/Makefile"
- make -C $vtarget $makefile CFLAGS="$cflags" DESTDIR="$srcdir/debian/$package" PG_CONFIG="$pgc" VPATH="$srcdir" srcdir="$srcdir" USE_PGXS=1
+ make -C $vtarget ${makefile:-} ${cflags:+CFLAGS="$cflags"} PG_CONFIG="$pgc" VPATH="$srcdir" srcdir="$srcdir" USE_PGXS=1
}
install() {
prepare_env $1
- package=`echo $opt | sed -e "s:%v:$version:g"`
+ package=`echo $opt | sed -e "s:%v:$1:g"`
mkdir -p $vtarget
# if a Makefile was created by configure, use it, else the top level Makefile
[ -f $vtarget/Makefile ] || makefile="-f $srcdir/Makefile"
- make -C $vtarget $makefile install DESTDIR="$srcdir/debian/$package" PG_CONFIG="$pgc" VPATH="$srcdir" srcdir="$srcdir" USE_PGXS=1
+ make -C $vtarget ${makefile:-} install DESTDIR="$PWD/debian/$package" PG_CONFIG="$pgc" VPATH="$srcdir" srcdir="$srcdir" USE_PGXS=1
}
clean() {
@@ -85,31 +88,27 @@
# if a Makefile was created by configure, use it, else the top level Makefile
[ -f $vtarget/Makefile ] || makefile="-f $srcdir/Makefile"
- [ -d $vtarget ] && make -C $vtarget clean $makefile DESTDIR="$srcdir/debian/$package" PG_CONFIG="$pgc" VPATH="$srcdir" srcdir="$srcdir" USE_PGXS=1
+ [ -d $vtarget ] && make -C $vtarget clean ${makefile:-} PG_CONFIG="$pgc" VPATH="$srcdir" srcdir="$srcdir" USE_PGXS=1
rm -rf $vtarget
}
loop() {
echo "### $1 ###"
prepare_env $1
- package=$(echo $target | sed -e "s:%v:$version:g")
+ package=$(echo $target | sed -e "s:%v:$1:g")
echo "# $1: make clean"
- make clean DESTDIR="$PWD/debian/$package" PG_CONFIG="$pgc" USE_PGXS=1
+ make -C "$srcdir" clean PG_CONFIG="$pgc" USE_PGXS=1
echo "# $1: make"
- make CFLAGS="$cflags" DESTDIR="$PWD/debian/$package" PG_CONFIG="$pgc" USE_PGXS=1
+ make -C "$srcdir" PG_CONFIG="$pgc" USE_PGXS=1
echo "# $1: make install"
- make install DESTDIR="$PWD/debian/$package" PG_CONFIG="$pgc" USE_PGXS=1
+ make -C "$srcdir" install DESTDIR="$PWD/debian/$package" PG_CONFIG="$pgc" USE_PGXS=1
echo "### done $1 ###"
}
installcheck() {
prepare_env $1
- if [ "${PG_VIRTUALENV_UNSHARE-unset}" = "unset" ] && [ $(id -u) = 0 ]; then
- export PG_VIRTUALENV_UNSHARE="-n" # request new network namespace by default
- fi
-
# ask pg_virtualenv to create a non-system cluster
if [ "${NONROOT-unset}" = "unset" ]; then
export NONROOT=1
@@ -119,7 +118,7 @@
# if a Makefile was created by configure, use it, else the top level Makefile
[ -f $vtarget/Makefile ] || makefile="-f $srcdir/Makefile"
if ! pg_virtualenv $VENVARGS -v $1 \
- make -C $vtarget $makefile installcheck \
+ make -C $vtarget ${makefile:-} installcheck \
PG_CONFIG="$pgc" VPATH="$srcdir" srcdir="$srcdir" USE_PGXS=1; then
if [ -r $vtarget/regression.diffs ]; then
echo "**** $vtarget/regression.diffs ****"
@@ -144,12 +143,13 @@
die "/usr/share/postgresql-common/supported-versions not found"
[ -e debian/pgversions ] || die "debian/pgversions not found"
supported_versions=$(/usr/share/postgresql-common/supported-versions)
+ local version
while read version; do
case $version in
all) echo "$supported_versions" ;;
[1-9]*+)
for sup_version in $supported_versions; do
- if expr $(echo "$version" | tr -d +) '<=' $sup_version > /dev/null; then echo "$sup_version"; fi
+ if dpkg --compare-versions "${version%+}" le "$sup_version"; then echo "$sup_version"; fi
done ;;
[1-9]*)
for sup_version in $supported_versions; do
@@ -213,6 +213,7 @@
checkcontrol)
gencontrol
+ need_update=
if ! diff -u debian/control $tmpcontrol; then
if [ "${PG_UPDATECONTROL:-no}" != "no" ] || head -1 debian/changelog | egrep -q -- '-backports|-pgdg|-pgapt'; then
echo "Notice: Updating debian/control from debian/control.in."
@@ -248,7 +249,7 @@
;;
configure|build|install|clean|loop)
- [ "$target" ] || die "syntax: pg_buildext $action [...]"
+ [ "$target" ] || die "syntax: pg_buildext $action [] []"
echo "### $action $v ###"
$action $v
;;
@@ -259,7 +260,7 @@
;;
*)
- die "unsupported $action"
+ die "unsupported action '$action'"
;;
esac
done
diff -Nru postgresql-common-173+ppa1/pg_buildext.pod postgresql-common-190~ubuntu16.04.1/pg_buildext.pod
--- postgresql-common-173+ppa1/pg_buildext.pod 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/pg_buildext.pod 2018-01-12 14:08:46.000000000 +0000
@@ -4,7 +4,7 @@
=head1 SYNOPSIS
-B [I] I [I]
+B [I] I [I] [I]
=head1 DESCRIPTION
@@ -82,27 +82,27 @@
Update C from C, and C
from C if the latter exists.
-=item B I [I]
+=item B [I] I [I]
For every supported version, call B<../configure> from the I
directory. (Most PostgreSQL extensions do not have a configure script.)
-=item B I [I]
+=item B [I] I [I]
Build the extension in the I directory.
-=item B I I
+=item B [I] I I
Invoke B from the I directory.
The third parameter specifies the package name to use. Most packages
use B. Make will be
called with DESTDIR="$(CURDIR)/debian/I".
-=item B I
+=item B [I] I
Clean the build directory.
-=item B I
+=item B [I] I
As a variant to calling B and B separately for VPATH builds,
loop over the supported PostgreSQL versions in the top source directory. This
@@ -110,7 +110,7 @@
B, it should be placed were installation happens in debian/rules,
rather than where build would normally be called.
-=item B [I]
+=item B [I] [I]
Use B to run the extension regression tests.
This is meant to be run from C using B. If
@@ -226,16 +226,15 @@
=back
-=head1 ENVIRONMENT
+=head1 SOURCE DIRECTORY
-B sets B for the installcheck actions by
-default to request a new network namespace, enabling several instances running
-in parallel to share port 5432. Override by setting to a different value.
+If the package source code is not in the top level directory (i.e. the directory
+which has C as subdirectory), use the I argument. Example:
-=head1 COMPATIBILITY
+ override_dh_auto_build:
+ +pg_buildext build $(CURDIR)/postgresql-module build-%v
-Earlier B versions required a "source dir" argument after the
-action. This is now deprecated, but still accepted (and ignored).
+=head1 COMPATIBILITY
B was introduced in postgresql-server-dev-all (>= 141~).
diff -Nru postgresql-common-173+ppa1/PgCommon.pm postgresql-common-190~ubuntu16.04.1/PgCommon.pm
--- postgresql-common-173+ppa1/PgCommon.pm 2016-03-29 08:53:13.000000000 +0000
+++ postgresql-common-190~ubuntu16.04.1/PgCommon.pm 2018-02-02 08:51:46.000000000 +0000
@@ -1,7 +1,7 @@
# Common functions for the postgresql-common framework
#
# (C) 2008-2009 Martin Pitt
-# (C) 2012-2014 Christoph Berg
+# (C) 2012-2017 Christoph Berg
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -27,8 +27,8 @@
get_cluster_start_conf set_cluster_start_conf set_cluster_pg_ctl_conf
get_program_path cluster_info get_versions get_newest_version version_exists
get_version_clusters next_free_port cluster_exists install_file
- change_ugid config_bool get_db_encoding get_db_locales get_cluster_locales
- get_cluster_databases read_cluster_conf_file read_pg_hba read_pidfile/;
+ change_ugid config_bool get_db_encoding get_db_locales get_cluster_locales get_cluster_controldata
+ get_cluster_databases read_cluster_conf_file read_pg_hba read_pidfile valid_hba_method/;
our @EXPORT_OK = qw/$confroot $binroot $rpm quote_conf_value read_conf_file get_conf_value
set_conf_value set_conffile_value disable_conffile_value disable_conf_value
replace_conf_value cluster_data_directory get_file_device
@@ -101,8 +101,9 @@
# Returns: quoted string
sub quote_conf_value ($) {
my $value = shift;
- return $value if ($value =~ /^-?[\w.]+$/);
- $value =~ s/'/''/g;
+ return $value if ($value =~ /^-?[\d.]+$/); # integer or float
+ return $value if ($value =~ /^\w+$/); # plain word
+ $value =~ s/'/''/g; # else quote it
return "'$value'";
}
@@ -114,52 +115,66 @@
# Arguments:
# Returns: hash (empty if file does not exist)
sub read_conf_file {
+ my ($config_path) = @_;
my %conf;
local (*F);
- return %conf unless -e $_[0];
+ sub get_absolute_path {
+ my ($path, $parent_path) = @_;
+ return $path if ($path =~ m!^/!); # path is absolute
+ # else strip filename component from parent path
+ $parent_path =~ s!/[^/]*$!!;
+ return "$parent_path/$path";
+ }
- if (open F, $_[0]) {
+ if (open F, $config_path) {
while () {
if (/^\s*(?:#.*)?$/) {
next;
- } elsif (/^\s*include(?:_if_exists)?\s+'([^']+)'\s*$/i) {
- my ($k, $v, $path, %include_conf);
- $path = $1;
- unless (substr($path, 0, 1) eq '/') {
- my @p = split '/', $_[0];
- my $dirname = join '/', @p[0..($#p-1)];
- $path = "$dirname/$path";
- }
-
- # read included file and merge into %conf
- %include_conf = read_conf_file($path);
- while ( ($k, $v) = each(%include_conf) ) {
- $conf{$k} = $v;
- }
-
+ } elsif(/^\s*include_dir\s*=?\s*'([^']+)'\s*(?:#.*)?$/i) {
+ # read included configuration directory and merge into %conf
+ # files in the directory will be read in ascending order
+ my $path = $1;
+ my $absolute_path = get_absolute_path($path, $config_path);
+ next unless -e $absolute_path && -d $absolute_path;
+ my $dir;
+ opendir($dir, $absolute_path) or next;
+ foreach my $filename (sort readdir($dir) ) {
+ next if ($filename =~ m/^\./ or not $filename =~/\.conf$/ );
+ my %include_conf = read_conf_file("$absolute_path/$filename");
+ while ( my ($k, $v) = each(%include_conf) ) {
+ $conf{$k} = $v;
+ }
+ }
+ closedir($dir);
+ } elsif (/^\s*include(?:_if_exists)?\s*=?\s*'([^']+)'\s*(?:#.*)?$/i) {
+ # read included file and merge into %conf
+ my $path = $1;
+ my $absolute_path = get_absolute_path($path, $config_path);
+ my %include_conf = read_conf_file($absolute_path);
+ while ( my ($k, $v) = each(%include_conf) ) {
+ $conf{$k} = $v;
+ }
} elsif (/^\s*([a-zA-Z0-9_.-]+)\s*(?:=|\s)\s*'((?:[^']|''|(?:(?<=\\)'))*)'\s*(?:#.*)?$/i) {
# string value
my $v = $2;
my $k = $1;
- $k = lc $k if $_[0] =~ /\.conf$/;
+ $k = lc $k if $config_path =~ /\.conf$/;
$v =~ s/\\(.)/$1/g;
$v =~ s/''/'/g;
$conf{$k} = $v;
- } elsif (/^\s*([a-zA-Z0-9_.-]+)\s*(?:=|\s)\s*(-?[\w.]+)\s*(?:#.*)?$/i) {
+ } elsif (m{^\s*([a-zA-Z0-9_.-]+)\s*(?:=|\s)\s*(-?[[:alnum:]][[:alnum:]._:/-]*)\s*(?:\#.*)?$}i) {
# simple value
my $v = $2;
- my $k = $1;
- $k = lc $k if $_[0] =~ /\.conf$/;
+ my $k = $1;
+ $k = lc $k if $config_path =~ /\.conf$/;
$conf{$k} = $v;
} else {
chomp;
- error "Invalid line $. in $_[0]: »$_«";
+ error "invalid line $. in $config_path: $_";
}
}
close F;
- } else {
- error "could not read $_[0]: $!";
}
return %conf;
@@ -360,7 +375,7 @@
return get_conf_value($_[0], $_[1], 'postgresql.conf', 'port');
}
-# Set the port of a particular cluster.
+# Set the port of a particular cluster.
# Arguments:
sub set_cluster_port {
set_conf_value $_[0], $_[1], 'postgresql.conf', 'port', $_[2];
@@ -417,7 +432,7 @@
return $socketdir;
}
-# Set the socket directory of a particular cluster.
+# Set the socket directory of a particular cluster.
# Arguments:
sub set_cluster_socketdir {
set_conf_value $_[0], $_[1], 'postgresql.conf',
@@ -435,7 +450,7 @@
return '';
}
-# Check whether a postmaster server is running at the specified port.
+# Check whether a postgres server is running at the specified port.
# Arguments:
sub cluster_port_running {
die "port_running: invalid port $_[2]" if $_[2] !~ /\d+/;
@@ -453,8 +468,6 @@
# Arguments:
# Returns: auto | manual | disabled
sub get_cluster_start_conf {
- # start.conf setting
- my $start = 'auto';
my $start_conf = "$confroot/$_[0]/$_[1]/start.conf";
if (-e $start_conf) {
open F, $start_conf or error "Could not open $start_conf: $!";
@@ -463,16 +476,13 @@
s/^\s*//;
s/\s*$//;
next unless $_;
- $start = $_;
- last;
+ close F;
+ return $1 if (/^(auto|manual|disabled)/);
+ error "Invalid mode in $start_conf, must be one of auto, manual, disabled";
}
close F;
-
- error 'Invalid mode in start.conf' unless $start eq 'auto' ||
- $start eq 'manual' || $start eq 'disabled';
}
-
- return $start;
+ return 'auto'; # default
}
# Change start.conf setting.
@@ -481,7 +491,7 @@
sub set_cluster_start_conf {
my ($v, $c, $val) = @_;
- error "Invalid mode: '$val'" unless $val eq 'auto' ||
+ error "Invalid mode: '$val'" unless $val eq 'auto' ||
$val eq 'manual' || $val eq 'disabled';
my $perms = 0644;
@@ -505,12 +515,11 @@
close F;
} else {
$text = "# Automatic startup configuration
-# auto: automatically start/stop the cluster in the init script
-# manual: do not start/stop in init scripts, but allow manual startup with
-# pg_ctlcluster
-# disabled: do not allow manual startup with pg_ctlcluster (this can be easily
-# circumvented and is only meant to be a small protection for
-# accidents).
+# auto: automatically start the cluster
+# manual: manual startup with pg_ctlcluster/postgresql@.service only
+# disabled: refuse to start cluster
+# See pg_createcluster(1) for details. When running from systemd,
+# invoke 'systemctl daemon-reload' after editing this file.
$val
";
@@ -561,11 +570,11 @@
}
}
-# Check whether a pid file is present and belongs to a running postmaster.
+# Check whether a pid file is present and belongs to a running postgres.
# Returns undef if it cannot be determined
# Arguments:
sub check_pidfile_running {
- # postmaster does not clean up the PID file when it stops, and it is
+ # postgres does not clean up the PID file when it stops, and it is
# not world readable, so only its absence is a definitive result; if it
# is present, we need to read it and check the PID, which will only
# work as root
@@ -574,13 +583,13 @@
my $pid = read_pidfile $_[0];
if (defined $pid) {
prepare_exec;
- my $res = open PS, '-|', '/bin/ps', '-o', 'comm', 'h', 'p', $pid;
+ my $res = open PS, '-|', '/bin/ps', '-o', 'comm=', '-p', $pid;
restore_exec;
if ($res) {
my $process = ;
chomp $process if defined $process;
close PS;
- if (defined $process and ($process eq 'postmaster' or $process eq 'postgres')) {
+ if (defined $process and ($process eq 'postgres')) {
return 1;
} else {
return 0;
@@ -595,22 +604,22 @@
# Return a hash with information about a specific cluster (which needs to exist).
# Arguments:
# Returns: information hash (keys: pgdata, port, running, logfile [unless it
-# has a custom one], configdir, owneruid, ownergid, socketdir,
-# statstempdir)
+# has a custom one], configdir, owneruid, ownergid, waldir, socketdir,
+# config->postgresql.conf)
sub cluster_info {
my ($v, $c) = @_;
error 'cluster_info must be called with arguments' unless ($v and $c);
my %result;
$result{'configdir'} = "$confroot/$v/$c";
- error 'cluster_info called on non-existing cluster $v $c' unless (-e "$result{configdir}/postgresql.conf");
$result{'configuid'} = (stat "$result{configdir}/postgresql.conf")[4];
my %postgresql_conf = read_cluster_conf_file $v, $c, 'postgresql.conf';
+ $result{'config'} = \%postgresql_conf;
$result{'pgdata'} = cluster_data_directory $v, $c, \%postgresql_conf;
+ return %result unless (keys %postgresql_conf);
$result{'port'} = $postgresql_conf{'port'} || $defaultport;
$result{'socketdir'} = get_cluster_socketdir $v, $c;
- $result{'statstempdir'} = $postgresql_conf{'stats_temp_directory'};
# if we can determine the running status with the pid file, prefer that
if ($postgresql_conf{'external_pid_file'} &&
@@ -625,9 +634,13 @@
}
if ($result{'pgdata'}) {
- ($result{'owneruid'}, $result{'ownergid'}) =
+ ($result{'owneruid'}, $result{'ownergid'}) =
(stat $result{'pgdata'})[4,5];
- $result{'recovery'} = -e "$result{'pgdata'}/recovery.conf";
+ $result{'recovery'} = 1 if (-e "$result{'pgdata'}/recovery.conf");
+ my $waldirname = $v >= 10 ? 'pg_wal' : 'pg_xlog';
+ if (-l "$result{pgdata}/$waldirname") { # custom wal directory
+ ($result{waldir}) = readlink("$result{pgdata}/$waldirname") =~ /(.*)/; # untaint
+ }
}
$result{'start'} = get_cluster_start_conf $v, $c;
@@ -638,18 +651,11 @@
} else {
$result{'logfile'} = "/var/log/postgresql/postgresql-$v-$c.log";
}
- $result{logging_collector} = $postgresql_conf{logging_collector};
- $result{log_destination} = $postgresql_conf{log_destination};
- $result{log_directory} = $postgresql_conf{log_directory};
- $result{log_filename} = $postgresql_conf{log_filename};
-
- # autovacuum defaults to on since 8.3
- $result{'avac_enable'} = config_bool $postgresql_conf{'autovacuum'} || ($v >= '8.3');
return %result;
}
-# Return an array of all available PostgreSQL versions
+# Return an array of all available psql versions
sub get_versions {
my @versions = ();
my $dir = $binroot;
@@ -660,19 +666,19 @@
next if $entry eq '.' || $entry eq '..';
my $pfx = '';
#redhat# $pfx = "pgsql-";
- ($entry) = $entry =~ /^$pfx(\d+\.\d+)$/; # untaint
+ ($entry) = $entry =~ /^$pfx(\d+\.?\d+)$/; # untaint
push @versions, $entry if get_program_path ('psql', $entry);
}
closedir D;
}
- return @versions;
+ return sort { $a <=> $b } @versions;
}
# Return the newest available version
sub get_newest_version {
- my $newest = 0;
- map { $newest = $_ if $newest < $_ } get_versions;
- return $newest;
+ my @versions = get_versions;
+ return undef unless (@versions);
+ return $versions[-1];
}
# Check whether a version exists
@@ -690,13 +696,14 @@
while (defined ($entry = readdir D)) {
next if $entry eq '.' || $entry eq '..';
($entry) = $entry =~ /^(.*)$/; # untaint
- if (-r $vdir.$entry.'/postgresql.conf') {
+ my $conf = "$vdir$entry/postgresql.conf";
+ if (-e $conf or -l $conf) { # existing file, or dead symlink
push @clusters, $entry;
}
}
closedir D;
}
- return @clusters;
+ return sort @clusters;
}
# Check if a cluster exists.
@@ -766,14 +773,16 @@
my $homemapfile = $home . '/.postgresqlrc';
if (open MAP, $homemapfile) {
while (