summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-11 09:21:39 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-11 09:21:39 +0000
commitdbadc36ea01db75d66aef2013db27d1974881dba (patch)
treecb894e60995f9cac7d6a47681be4f8c2a39e08d2
parentMerging upstream version 10.4. (diff)
downloadpostgresql-10-dbadc36ea01db75d66aef2013db27d1974881dba.zip
postgresql-10-dbadc36ea01db75d66aef2013db27d1974881dba.tar.xz
Merging debian version 10.4-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog15
-rw-r--r--debian/control1
-rw-r--r--debian/libpq-dev.install3
-rw-r--r--debian/patches/libpgport-pkglibdir57
-rw-r--r--debian/patches/series1
-rw-r--r--debian/postgresql-10.NEWS18
-rw-r--r--debian/postgresql-server-dev-10.install1
7 files changed, 92 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 172f2a6..72e6885 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+postgresql-10 (10.4-1) unstable; urgency=medium
+
+ * New upstream version.
+ + Remove public execute privilege from contrib/adminpack's
+ pg_logfile_rotate() function. (CVE-2018-1115)
+
+ + Fix incorrect volatility and parallel-safety markings on a few built-in
+ functions.
+
+ * Move libpgport.a, libpgcommon.a, and libpgfeutils.a from libdir to
+ pkglibdir.
+ * Revert "B-D on python3-distutils | python3-dev (<< 3.6.4~rc1-2)".
+
+ -- Christoph Berg <christoph.berg@credativ.de> Tue, 08 May 2018 16:02:19 +0200
+
postgresql-10 (10.3-2~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 8271583..de26019 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,6 @@ Build-Depends:
pkg-config,
python-dev,
python3-dev,
- python3-distutils | python3-dev (<< 3.6.4~rc1-2),
tcl8.6-dev | tcl8.5-dev,
uuid-dev,
xsltproc,
diff --git a/debian/libpq-dev.install b/debian/libpq-dev.install
index 0fa3da1..734cb6f 100644
--- a/debian/libpq-dev.install
+++ b/debian/libpq-dev.install
@@ -4,9 +4,6 @@ usr/include/postgresql/libpq-fe.h
usr/include/postgresql/libpq/libpq-fs.h
usr/include/postgresql/pg_config*.h
usr/include/postgresql/postgres_ext.h
-usr/lib/*/libpgcommon.a
-usr/lib/*/libpgfeutils.a
-usr/lib/*/libpgport.a
usr/lib/*/libpq.a
usr/lib/*/libpq.so
usr/lib/*/pkgconfig/libpq.pc
diff --git a/debian/patches/libpgport-pkglibdir b/debian/patches/libpgport-pkglibdir
new file mode 100644
index 0000000..eaf9361
--- /dev/null
+++ b/debian/patches/libpgport-pkglibdir
@@ -0,0 +1,57 @@
+--- a/src/common/Makefile
++++ b/src/common/Makefile
+@@ -59,13 +59,13 @@ all: libpgcommon.a libpgcommon_srv.a
+
+ # libpgcommon is needed by some contrib
+ install: all installdirs
+- $(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(libdir)/libpgcommon.a'
++ $(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
+
+ installdirs:
+- $(MKDIR_P) '$(DESTDIR)$(libdir)'
++ $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+
+ uninstall:
+- rm -f '$(DESTDIR)$(libdir)/libpgcommon.a'
++ rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
+
+ libpgcommon.a: $(OBJS_FRONTEND)
+ rm -f $@
+--- a/src/fe_utils/Makefile
++++ b/src/fe_utils/Makefile
+@@ -35,13 +35,13 @@ distprep: psqlscan.c
+
+ # libpgfeutils could be useful to contrib, so install it
+ install: all installdirs
+- $(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(libdir)/libpgfeutils.a'
++ $(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(pkglibdir)/libpgfeutils.a'
+
+ installdirs:
+- $(MKDIR_P) '$(DESTDIR)$(libdir)'
++ $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+
+ uninstall:
+- rm -f '$(DESTDIR)$(libdir)/libpgfeutils.a'
++ rm -f '$(DESTDIR)$(pkglibdir)/libpgfeutils.a'
+
+ clean distclean:
+ rm -f libpgfeutils.a $(OBJS) lex.backup
+--- a/src/port/Makefile
++++ b/src/port/Makefile
+@@ -46,13 +46,13 @@ all: libpgport.a libpgport_srv.a
+
+ # libpgport is needed by some contrib
+ install: all installdirs
+- $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
++ $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(pkglibdir)/libpgport.a'
+
+ installdirs:
+- $(MKDIR_P) '$(DESTDIR)$(libdir)'
++ $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+
+ uninstall:
+- rm -f '$(DESTDIR)$(libdir)/libpgport.a'
++ rm -f '$(DESTDIR)$(pkglibdir)/libpgport.a'
+
+ libpgport.a: $(OBJS)
+ rm -f $@
diff --git a/debian/patches/series b/debian/patches/series
index a689bbb..7a33364 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
70-history
filter-debug-prefix-map
reproducible-bki
+libpgport-pkglibdir
diff --git a/debian/postgresql-10.NEWS b/debian/postgresql-10.NEWS
index bf9aa00..6bb7c55 100644
--- a/debian/postgresql-10.NEWS
+++ b/debian/postgresql-10.NEWS
@@ -1,3 +1,21 @@
+postgresql-10 (10.4-1) unstable; urgency=medium
+
+ If you are using the "adminpack" extension, perform "ALTER EXTENSION
+ adminpack UPDATE" in each database in which adminpack is installed.
+ (CVE-2018-1115)
+
+ Some functions were incorrectly not marked as VOLATILE or PARALLEL UNSAFE. If
+ you are using any of these functions, consult the release notes for
+ instructions.
+
+ query_to_xml cursor_to_xml cursor_to_xmlschema query_to_xmlschema
+ query_to_xml_and_xmlschema brin_summarize_new_values brin_summarize_range
+ brin_desummarize_range gin_clean_pending_list cursor_to_xml
+ cursor_to_xmlschema ts_rewrite ts_stat
+ binary_upgrade_create_empty_extension pg_import_system_collations
+
+ -- Christoph Berg <christoph.berg@credativ.de> Tue, 08 May 2018 16:02:19 +0200
+
postgresql-10 (10.3-1) unstable; urgency=medium
If you run an installation where the users are mutually trusting or if you
diff --git a/debian/postgresql-server-dev-10.install b/debian/postgresql-server-dev-10.install
index ca1ddb7..d22da44 100644
--- a/debian/postgresql-server-dev-10.install
+++ b/debian/postgresql-server-dev-10.install
@@ -1,4 +1,5 @@
usr/include/postgresql/*/server
usr/lib/postgresql/*/bin/pg_config
+usr/lib/postgresql/*/lib/libpg*.a
usr/lib/postgresql/*/lib/pgxs/*
usr/share/locale/*/LC_MESSAGES/pg_config-*.mo