diff options
Diffstat (limited to 'dev-db/postgresql-server/files/postgresql-8.3-server.patch')
| -rw-r--r-- | dev-db/postgresql-server/files/postgresql-8.3-server.patch | 225 |
1 files changed, 0 insertions, 225 deletions
diff --git a/dev-db/postgresql-server/files/postgresql-8.3-server.patch b/dev-db/postgresql-server/files/postgresql-8.3-server.patch deleted file mode 100644 index ffa4d23f50ee..000000000000 --- a/dev-db/postgresql-server/files/postgresql-8.3-server.patch +++ /dev/null @@ -1,225 +0,0 @@ -diff -Naur postgresql-8.3.3.orig/contrib/adminpack/Makefile postgresql-8.3.3/contrib/adminpack/Makefile ---- postgresql-8.3.3.orig/contrib/adminpack/Makefile 2008-06-14 12:56:41.000000000 +0200 -+++ postgresql-8.3.3/contrib/adminpack/Makefile 2008-06-14 12:57:12.000000000 +0200 -@@ -1,7 +1,7 @@ - # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $ - - MODULE_big = adminpack --PG_CPPFLAGS = -I$(libpq_srcdir) -+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/ - DATA_built = adminpack.sql - DATA = uninstall_adminpack.sql - OBJS = adminpack.o -diff -Naur postgresql-8.3.3.orig/contrib/Makefile postgresql-8.3.3/contrib/Makefile ---- postgresql-8.3.3.orig/contrib/Makefile 2008-06-14 12:56:41.000000000 +0200 -+++ postgresql-8.3.3/contrib/Makefile 2008-06-14 12:57:12.000000000 +0200 -@@ -20,22 +20,19 @@ - isn \ - lo \ - ltree \ -- oid2name \ - pageinspect \ - pg_buffercache \ - pg_freespacemap \ - pg_standby \ - pg_trgm \ -- pgbench \ - pgcrypto \ - pgrowlocks \ - pgstattuple \ - seg \ - spi \ - tablefunc \ -- test_parser \ - tsearch2 \ -- vacuumlo -+ test_parser - - ifeq ($(with_openssl),yes) - WANTED_DIRS += sslinfo -diff -Naur postgresql-8.3.3.orig/contrib/uuid-ossp/Makefile postgresql-8.3.3/contrib/uuid-ossp/Makefile ---- postgresql-8.3.3.orig/contrib/uuid-ossp/Makefile 2008-06-14 12:56:41.000000000 +0200 -+++ postgresql-8.3.3/contrib/uuid-ossp/Makefile 2008-06-14 12:57:12.000000000 +0200 -@@ -1,11 +1,13 @@ - # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $ - -+PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H" -+ - MODULE_big = uuid-ossp - OBJS = uuid-ossp.o - DATA_built = uuid-ossp.sql - DATA = uninstall_uuid-ossp.sql - --SHLIB_LINK += $(OSSP_UUID_LIBS) -+SHLIB_LINK += -lossp-uuid - - ifdef USE_PGXS - PG_CONFIG = pg_config -diff -Naur postgresql-8.3.3.orig/contrib/xml2/Makefile postgresql-8.3.3/contrib/xml2/Makefile ---- postgresql-8.3.3.orig/contrib/xml2/Makefile 2008-06-14 12:56:41.000000000 +0200 -+++ postgresql-8.3.3/contrib/xml2/Makefile 2008-06-14 13:21:32.000000000 +0200 -@@ -4,7 +4,8 @@ - - OBJS = $(if $(filter -lxslt, $(LIBS)), xpath.o xslt_proc.o, xpath.o) - --SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS)) -+PG_CPPFLAGS = $(shell xml2-config --cflags) -+SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs) - - DATA_built = pgxml.sql - DATA = uninstall_pgxml.sql -diff -Naur postgresql-8.3.3.orig/GNUmakefile.in postgresql-8.3.3/GNUmakefile.in ---- postgresql-8.3.3.orig/GNUmakefile.in 2008-06-14 12:56:41.000000000 +0200 -+++ postgresql-8.3.3/GNUmakefile.in 2008-06-14 12:57:12.000000000 +0200 -@@ -11,19 +11,16 @@ - all: - $(MAKE) -C doc all - $(MAKE) -C src all -- $(MAKE) -C config all - @echo "All of PostgreSQL successfully made. Ready to install." - - install: - $(MAKE) -C doc $@ - $(MAKE) -C src $@ -- $(MAKE) -C config $@ - @echo "PostgreSQL installation complete." - - installdirs uninstall: - $(MAKE) -C doc $@ - $(MAKE) -C src $@ -- $(MAKE) -C config $@ - - distprep: - $(MAKE) -C doc $@ -diff -Naur postgresql-8.3.3.orig/src/bin/initdb/Makefile postgresql-8.3.3/src/bin/initdb/Makefile ---- postgresql-8.3.3.orig/src/bin/initdb/Makefile 2008-06-14 12:56:40.000000000 +0200 -+++ postgresql-8.3.3/src/bin/initdb/Makefile 2008-06-14 12:57:12.000000000 +0200 -@@ -14,7 +14,7 @@ - top_builddir = ../../.. - include $(top_builddir)/src/Makefile.global - --override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS) -+override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq $(CPPFLAGS) - - OBJS= initdb.o encnames.o pqsignal.o $(WIN32RES) - -diff -Naur postgresql-8.3.3.orig/src/bin/Makefile postgresql-8.3.3/src/bin/Makefile ---- postgresql-8.3.3.orig/src/bin/Makefile 2008-06-14 12:56:40.000000000 +0200 -+++ postgresql-8.3.3/src/bin/Makefile 2008-06-14 12:57:12.000000000 +0200 -@@ -13,8 +13,8 @@ - top_builddir = ../.. - include $(top_builddir)/src/Makefile.global - --DIRS = initdb ipcclean pg_ctl pg_dump \ -- psql scripts pg_config pg_controldata pg_resetxlog -+DIRS = initdb ipcclean pg_ctl \ -+ pg_controldata pg_resetxlog - ifeq ($(PORTNAME), win32) - DIRS+=pgevent - endif -diff -Naur postgresql-8.3.3.orig/src/include/pg_config_manual.h postgresql-8.3.3/src/include/pg_config_manual.h ---- postgresql-8.3.3.orig/src/include/pg_config_manual.h 2008-06-14 12:56:41.000000000 +0200 -+++ postgresql-8.3.3/src/include/pg_config_manual.h 2008-06-14 12:57:12.000000000 +0200 -@@ -184,7 +184,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" - - /* - * The random() function is expected to yield values between 0 and -diff -Naur postgresql-8.3.3.orig/src/Makefile postgresql-8.3.3/src/Makefile ---- postgresql-8.3.3.orig/src/Makefile 2008-06-14 12:56:40.000000000 +0200 -+++ postgresql-8.3.3/src/Makefile 2008-06-14 12:57:12.000000000 +0200 -@@ -19,14 +19,11 @@ - $(MAKE) -C backend $@ - $(MAKE) -C backend/utils/mb/conversion_procs $@ - $(MAKE) -C backend/snowball $@ -- $(MAKE) -C include $@ -- $(MAKE) -C interfaces $@ - $(MAKE) -C bin $@ - $(MAKE) -C pl $@ -- $(MAKE) -C makefiles $@ - $(MAKE) -C test/regress $@ - --install: install-local -+install: - - install-local: installdirs-local - $(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global' -diff -Naur postgresql-8.3.3.orig/src/Makefile.global.in postgresql-8.3.3/src/Makefile.global.in ---- postgresql-8.3.3.orig/src/Makefile.global.in 2008-06-14 12:56:41.000000000 +0200 -+++ postgresql-8.3.3/src/Makefile.global.in 2008-06-14 12:57:12.000000000 +0200 -@@ -373,10 +373,8 @@ - - - submake-libpq: -- $(MAKE) -C $(libpq_builddir) all - - submake-libpgport: -- $(MAKE) -C $(top_builddir)/src/port all - - .PHONY: submake-libpq submake-libpgport - -@@ -419,6 +417,8 @@ - LDFLAGS += $(PROFILE) - endif - -+CFLAGS += -I${top_srcdir}/src/include -+ - - ########################################################################## - # -diff -Naur postgresql-8.3.3.orig/src/port/Makefile postgresql-8.3.3/src/port/Makefile ---- postgresql-8.3.3.orig/src/port/Makefile 2008-06-14 12:56:40.000000000 +0200 -+++ postgresql-8.3.3/src/port/Makefile 2008-06-14 12:57:12.000000000 +0200 -@@ -35,11 +35,10 @@ - # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND - OBJS_SRV = $(OBJS:%.o=%_srv.o) - --all: libpgport.a libpgport_srv.a -+all: libpgport_srv.a - - # libpgport is needed by some contrib --install: all installdirs -- $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a' -+install: - - installdirs: - $(mkinstalldirs) '$(DESTDIR)$(libdir)' -diff -Naur postgresql-8.3.3.orig/src/test/regress/GNUmakefile postgresql-8.3.3/src/test/regress/GNUmakefile ---- postgresql-8.3.3.orig/src/test/regress/GNUmakefile 2008-06-14 12:56:40.000000000 +0200 -+++ postgresql-8.3.3/src/test/regress/GNUmakefile 2008-06-14 12:57:12.000000000 +0200 -@@ -141,7 +141,7 @@ - ## - - check: all -- ./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir=$(abs_srcdir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF) -+ ./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir=$(abs_srcdir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF) --psqldir=/usr/lib/postgresql-${SLOT}/bin/ - - installcheck: all - ./pg_regress --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule --srcdir=$(abs_srcdir) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) -diff -Naur postgresql-8.3.3.orig/src/test/regress/pg_regress.c postgresql-8.3.3/src/test/regress/pg_regress.c ---- postgresql-8.3.3.orig/src/test/regress/pg_regress.c 2008-06-14 12:56:40.000000000 +0200 -+++ postgresql-8.3.3/src/test/regress/pg_regress.c 2008-06-14 12:57:12.000000000 +0200 -@@ -781,9 +781,6 @@ - sprintf(tmp, "%s/install/%s", temp_install, datadir); - datadir = tmp; - -- /* psql will be installed into temp-install bindir */ -- psqldir = bindir; -- - /* - * Set up shared library paths to include the temp install. - * -@@ -2069,7 +2066,7 @@ - */ - snprintf(buf, sizeof(buf), - SYSTEMQUOTE "\"%s/psql\" -X postgres <%s 2>%s" SYSTEMQUOTE, -- bindir, DEVNULL, DEVNULL); -+ psqldir, DEVNULL, DEVNULL); - for (i = 0; i < 60; i++) - { - /* Done if psql succeeds */ -diff -Naur postgresql-8.3.3.orig/src/test/regress/pg_regress.c.orig postgresql-8.3.3/src/test/regress/pg_regress.c.orig |