changed debian/source/format to native
This commit is contained in:
openKylinBot
parent
03d23364a5
commit
1a82c4df53
|
|
@ -1,66 +0,0 @@
|
|||
From: Martin Pitt <mpitt@debian.org>
|
||||
Date: Sat, 14 May 2022 02:43:37 +0800
|
||||
Subject: Use version specific installation directories so that several major
|
||||
versions can be installed in parallel.
|
||||
|
||||
Forwarded: No, Debian specific packaging with postgresql-common
|
||||
* Install lib files into /usr/lib/postgresql/<version>/lib/
|
||||
* Install server related header files into /usr/include/postgresql/<version>/server/
|
||||
* Disable PostgreSQL's automagic path mangling and fix libdir for pg_config,
|
||||
so that pg_config in /usr/bin and /usr/lib/postgresql/<version>/bin behave
|
||||
identically.
|
||||
|
||||
Bug-Debian: http://bugs.debian.org/462037
|
||||
---
|
||||
src/Makefile.global.in | 4 ++--
|
||||
src/bin/pg_config/pg_config.c | 8 +++-----
|
||||
2 files changed, 5 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
|
||||
index 1d60560..a037ac5 100644
|
||||
--- a/src/Makefile.global.in
|
||||
+++ b/src/Makefile.global.in
|
||||
@@ -120,7 +120,7 @@ libdir := @libdir@
|
||||
pkglibdir = $(libdir)
|
||||
ifeq "$(findstring pgsql, $(pkglibdir))" ""
|
||||
ifeq "$(findstring postgres, $(pkglibdir))" ""
|
||||
-override pkglibdir := $(pkglibdir)/postgresql
|
||||
+override pkglibdir := /usr/lib/postgresql/@PG_MAJORVERSION@/lib
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -168,7 +168,7 @@ endif # PGXS
|
||||
|
||||
# These derived path variables aren't separately configurable.
|
||||
|
||||
-includedir_server = $(pkgincludedir)/server
|
||||
+includedir_server = $(pkgincludedir)/@PG_MAJORVERSION@/server
|
||||
includedir_internal = $(pkgincludedir)/internal
|
||||
pgxsdir = $(pkglibdir)/pgxs
|
||||
bitcodedir = $(pkglibdir)/bitcode
|
||||
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
|
||||
index 5279e7f..b613869 100644
|
||||
--- a/src/bin/pg_config/pg_config.c
|
||||
+++ b/src/bin/pg_config/pg_config.c
|
||||
@@ -27,6 +27,8 @@
|
||||
#include "port.h"
|
||||
#include "common/config_info.h"
|
||||
|
||||
+#include "../port/pg_config_paths.h"
|
||||
+
|
||||
static const char *progname;
|
||||
|
||||
/*
|
||||
@@ -148,11 +150,7 @@ main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
- if (find_my_exec(argv[0], my_exec_path) < 0)
|
||||
- {
|
||||
- fprintf(stderr, _("%s: could not find own program executable\n"), progname);
|
||||
- exit(1);
|
||||
- }
|
||||
+ snprintf(my_exec_path, sizeof(my_exec_path), "%s/%s", PGBINDIR, progname);
|
||||
|
||||
configdata = get_configdata(my_exec_path, &configdata_len);
|
||||
/* no arguments -> print everything */
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From: Martin Pitt <mpitt@debian.org>
|
||||
Date: Sat, 14 May 2022 02:43:37 +0800
|
||||
Subject: Put server Unix sockets into /var/run/postgresql/ by default
|
||||
|
||||
Forwarded: No, Debian specific configuration with postgresql-common
|
||||
Using /tmp for sockets allows everyone to spoof a PostgreSQL server. Thus use
|
||||
/var/run/postgresql/ for "system" clusters which run as 'postgres' (user
|
||||
clusters will still use /tmp). Since system cluster are by far the common case,
|
||||
set it as default.
|
||||
---
|
||||
src/include/pg_config_manual.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
|
||||
index 743401c..6b23e7b 100644
|
||||
--- a/src/include/pg_config_manual.h
|
||||
+++ b/src/include/pg_config_manual.h
|
||||
@@ -179,7 +179,7 @@
|
||||
* here's where to twiddle it. You can also override this at runtime
|
||||
* with the postmaster's -k switch.
|
||||
*/
|
||||
-#define DEFAULT_PGSOCKET_DIR "/tmp"
|
||||
+#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"
|
||||
|
||||
/*
|
||||
* This is the default event source for Windows event log.
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
From: Martin Pitt <mpitt@debian.org>
|
||||
Date: Sat, 14 May 2022 02:43:37 +0800
|
||||
Subject: Update tutorial README for required build dependencies.
|
||||
|
||||
Forwarded: No, Debian specific
|
||||
---
|
||||
src/tutorial/README | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/tutorial/README b/src/tutorial/README
|
||||
index b137cdf..be070c5 100644
|
||||
--- a/src/tutorial/README
|
||||
+++ b/src/tutorial/README
|
||||
@@ -6,8 +6,7 @@ tutorial
|
||||
This directory contains SQL tutorial scripts. To look at them, first do a
|
||||
% make
|
||||
to compile all the scripts and C files for the user-defined functions
|
||||
-and types. (make needs to be GNU make --- it may be named something
|
||||
-different on your system, often 'gmake')
|
||||
+and types. This requires a postgresql-server-dev-* package to be installed.
|
||||
|
||||
Then, run psql with the -s (single-step) flag:
|
||||
% psql -s
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From: Martin Pitt <mpitt@debian.org>
|
||||
Date: Sat, 14 May 2022 02:43:37 +0800
|
||||
Subject: Update pg_service.conf example to tell the Debian specific file
|
||||
location.
|
||||
|
||||
Forwarded: No, Debian specific
|
||||
---
|
||||
src/interfaces/libpq/pg_service.conf.sample | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/interfaces/libpq/pg_service.conf.sample b/src/interfaces/libpq/pg_service.conf.sample
|
||||
index 5a1c083..7ef2ebd 100644
|
||||
--- a/src/interfaces/libpq/pg_service.conf.sample
|
||||
+++ b/src/interfaces/libpq/pg_service.conf.sample
|
||||
@@ -8,8 +8,8 @@
|
||||
# to look up such parameters. A sample configuration for postgres is
|
||||
# included in this file. Lines beginning with '#' are comments.
|
||||
#
|
||||
-# Copy this to your sysconf directory (typically /usr/local/pgsql/etc) and
|
||||
-# rename it pg_service.conf.
|
||||
+# Copy this to /etc/postgresql-common/ (or select its location with the
|
||||
+# PGSYSCONFDIR environment variable) and rename it pg_service.conf.
|
||||
#
|
||||
#
|
||||
#[postgres]
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
From: Martin Pitt <mpitt@debian.org>
|
||||
Date: Sat, 14 May 2022 02:43:37 +0800
|
||||
Subject: Use Debian alternatives for external tools instead of hardcoded
|
||||
programs
|
||||
|
||||
Forwarded: No, Debian specific
|
||||
---
|
||||
src/bin/psql/settings.h | 4 ++--
|
||||
src/include/fe_utils/print.h | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h
|
||||
index 5be5091..e4e876a 100644
|
||||
--- a/src/bin/psql/settings.h
|
||||
+++ b/src/bin/psql/settings.h
|
||||
@@ -20,8 +20,8 @@
|
||||
#define DEFAULT_EDITOR "notepad.exe"
|
||||
/* no DEFAULT_EDITOR_LINENUMBER_ARG for Notepad */
|
||||
#else
|
||||
-#define DEFAULT_EDITOR "vi"
|
||||
-#define DEFAULT_EDITOR_LINENUMBER_ARG "+"
|
||||
+#define DEFAULT_EDITOR "sensible-editor"
|
||||
+/*#define DEFAULT_EDITOR_LINENUMBER_ARG "+"*/
|
||||
#endif
|
||||
|
||||
#define DEFAULT_PROMPT1 "%/%R%# "
|
||||
diff --git a/src/include/fe_utils/print.h b/src/include/fe_utils/print.h
|
||||
index f138d96..2356a8e 100644
|
||||
--- a/src/include/fe_utils/print.h
|
||||
+++ b/src/include/fe_utils/print.h
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
/* This is not a particularly great place for this ... */
|
||||
#ifndef __CYGWIN__
|
||||
-#define DEFAULT_PAGER "more"
|
||||
+#define DEFAULT_PAGER "pager"
|
||||
#else
|
||||
#define DEFAULT_PAGER "less"
|
||||
#endif
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
From: Christoph Berg <myon@debian.org>
|
||||
Date: Sat, 14 May 2022 02:43:37 +0800
|
||||
Subject: Document Debian location of release notes files.
|
||||
|
||||
Forwarded: No, Debian specific
|
||||
---
|
||||
HISTORY | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/HISTORY b/HISTORY
|
||||
index 18d7b1b..c21a79d 100644
|
||||
--- a/HISTORY
|
||||
+++ b/HISTORY
|
||||
@@ -3,3 +3,6 @@ https://www.postgresql.org/docs/current/static/release.html
|
||||
|
||||
Distribution file sets include release notes for their version and preceding
|
||||
versions. Visit the file doc/src/sgml/html/release.html in an HTML browser.
|
||||
+
|
||||
+On Debian systems, the release notes are contained in the postgresql-doc-*
|
||||
+packages, located in /usr/share/doc/postgresql-doc-*/html/release.html.
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From: Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>
|
||||
Date: Sat, 14 May 2022 02:43:37 +0800
|
||||
Subject: filter-debug-prefix-map
|
||||
|
||||
To make the PostgreSQL server packages build reproducibly, we need to remove
|
||||
the build path from -fdebug-prefix-map and -ffile-prefix-map in CFLAGS.
|
||||
|
||||
* The actual server build still uses the original CFLAGS so the build path is
|
||||
correctly mapped in the object files.
|
||||
* The information printed by the pg_config binary and the system view is
|
||||
filtered in src/common/Makefile.
|
||||
* The build paths stored in Makefile.global are filtered in debian/rules.
|
||||
(abs_top_builddir, abs_top_srcdir, configure_args, CFLAGS)
|
||||
* To make PGXS module builds reproducible, pg_buildext copies the environment
|
||||
CFLAGS to COPT where Makefile.global picks them up, using the prefix maps
|
||||
from dpkg-buildflags.
|
||||
---
|
||||
src/common/Makefile | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/common/Makefile b/src/common/Makefile
|
||||
index 2f22b9b..01cc2e0 100644
|
||||
--- a/src/common/Makefile
|
||||
+++ b/src/common/Makefile
|
||||
@@ -31,10 +31,11 @@ include $(top_builddir)/src/Makefile.global
|
||||
# don't include subdirectory-path-dependent -I and -L switches
|
||||
STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
|
||||
STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
|
||||
-override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
|
||||
+# filter build path variation from -fdebug-prefix-map and -ffile-prefix-map
|
||||
+override CPPFLAGS += -DVAL_CONFIGURE="\"$(filter-out -fdebug-prefix-map=% -ffile-prefix-map=%,$(configure_args))\""
|
||||
override CPPFLAGS += -DVAL_CC="\"$(CC)\""
|
||||
override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
|
||||
-override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
|
||||
+override CPPFLAGS += -DVAL_CFLAGS="\"$(filter-out -fdebug-prefix-map=% -ffile-prefix-map=%,$(CFLAGS))\""
|
||||
override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
|
||||
override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
|
||||
override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
From: Christoph Berg <myon@debian.org>
|
||||
Date: Sat, 14 May 2022 02:43:37 +0800
|
||||
Subject: Debian-specific cluster startup message from initdb
|
||||
|
||||
Forwarded: No, Debian specific
|
||||
---
|
||||
src/bin/initdb/initdb.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
|
||||
index acf6108..ff852f5 100644
|
||||
--- a/src/bin/initdb/initdb.c
|
||||
+++ b/src/bin/initdb/initdb.c
|
||||
@@ -3363,7 +3363,7 @@ main(int argc, char *argv[])
|
||||
|
||||
printf(_("\nSuccess. You can now start the database server using:\n\n"
|
||||
" %s\n\n"),
|
||||
- start_db_cmd->data);
|
||||
+ getenv("CLUSTER_START_COMMAND") ? getenv("CLUSTER_START_COMMAND") : start_db_cmd->data);
|
||||
|
||||
destroyPQExpBuffer(start_db_cmd);
|
||||
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
From: Christoph Berg <myon@debian.org>
|
||||
Date: Sat, 14 May 2022 02:43:37 +0800
|
||||
Subject: Move libpgport/libpgcommon/libpgfeutils from libdir to pkglibdir
|
||||
|
||||
This allows client applications to link to version-specific libraries.
|
||||
Used by pg-checksums.
|
||||
Forwarded: No, (somewhat) Debian specific
|
||||
---
|
||||
src/Makefile.global.in | 4 ++--
|
||||
src/common/Makefile | 10 +++++-----
|
||||
src/fe_utils/Makefile | 6 +++---
|
||||
src/port/Makefile | 10 +++++-----
|
||||
4 files changed, 15 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
|
||||
index a037ac5..17f46f1 100644
|
||||
--- a/src/Makefile.global.in
|
||||
+++ b/src/Makefile.global.in
|
||||
@@ -562,8 +562,8 @@ libpq = -L$(libpq_builddir) -lpq
|
||||
# on client link lines, since that also appears in $(LIBS).
|
||||
# libpq_pgport_shlib is the same idea, but for use in client shared libraries.
|
||||
ifdef PGXS
|
||||
-libpq_pgport = -L$(libdir) -lpgcommon -lpgport $(libpq)
|
||||
-libpq_pgport_shlib = -L$(libdir) -lpgcommon_shlib -lpgport_shlib $(libpq)
|
||||
+libpq_pgport = -L$(pkglibdir) -lpgcommon -lpgport $(libpq)
|
||||
+libpq_pgport_shlib = -L$(pkglibdir) -lpgcommon_shlib -lpgport_shlib $(libpq)
|
||||
else
|
||||
libpq_pgport = -L$(top_builddir)/src/common -lpgcommon -L$(top_builddir)/src/port -lpgport $(libpq)
|
||||
libpq_pgport_shlib = -L$(top_builddir)/src/common -lpgcommon_shlib -L$(top_builddir)/src/port -lpgport_shlib $(libpq)
|
||||
diff --git a/src/common/Makefile b/src/common/Makefile
|
||||
index 01cc2e0..62ace8c 100644
|
||||
--- a/src/common/Makefile
|
||||
+++ b/src/common/Makefile
|
||||
@@ -79,15 +79,15 @@ distprep: kwlist_d.h
|
||||
|
||||
# libpgcommon is needed by some contrib
|
||||
install: all installdirs
|
||||
- $(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(libdir)/libpgcommon.a'
|
||||
- $(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(libdir)/libpgcommon_shlib.a'
|
||||
+ $(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
|
||||
+ $(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a'
|
||||
|
||||
installdirs:
|
||||
- $(MKDIR_P) '$(DESTDIR)$(libdir)'
|
||||
+ $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
|
||||
|
||||
uninstall:
|
||||
- rm -f '$(DESTDIR)$(libdir)/libpgcommon.a'
|
||||
- rm -f '$(DESTDIR)$(libdir)/libpgcommon_shlib.a'
|
||||
+ rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
|
||||
+ rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a'
|
||||
|
||||
libpgcommon.a: $(OBJS_FRONTEND)
|
||||
rm -f $@
|
||||
diff --git a/src/fe_utils/Makefile b/src/fe_utils/Makefile
|
||||
index 7d73800..5dd2360 100644
|
||||
--- 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
|
||||
diff --git a/src/port/Makefile b/src/port/Makefile
|
||||
index b9492b7..9f0d1e7 100644
|
||||
--- a/src/port/Makefile
|
||||
+++ b/src/port/Makefile
|
||||
@@ -50,15 +50,15 @@ all: libpgport.a libpgport_shlib.a libpgport_srv.a
|
||||
|
||||
# libpgport is needed by some contrib
|
||||
install: all installdirs
|
||||
- $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
|
||||
- $(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(libdir)/libpgport_shlib.a'
|
||||
+ $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(pkglibdir)/libpgport.a'
|
||||
+ $(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a'
|
||||
|
||||
installdirs:
|
||||
- $(MKDIR_P) '$(DESTDIR)$(libdir)'
|
||||
+ $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
|
||||
|
||||
uninstall:
|
||||
- rm -f '$(DESTDIR)$(libdir)/libpgport.a'
|
||||
- rm -f '$(DESTDIR)$(libdir)/libpgport_shlib.a'
|
||||
+ rm -f '$(DESTDIR)$(pkglibdir)/libpgport.a'
|
||||
+ rm -f '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a'
|
||||
|
||||
libpgport.a: $(OBJS)
|
||||
rm -f $@
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
50-per-version-dirs.patch
|
||||
51-default-sockets-in-var.patch
|
||||
52-tutorial-README.patch
|
||||
53-pg_service.conf_directory_doc.patch
|
||||
54-debian-alternatives-for-external-tools.patch
|
||||
70-history
|
||||
filter-debug-prefix-map
|
||||
libpgport-pkglibdir
|
||||
initdb-startup-message
|
||||
|
|
@ -1 +1 @@
|
|||
3.0 (quilt)
|
||||
3.0 (native)
|
||||
|
|
|
|||
Loading…
Reference in New Issue