Attachment 118903 Details for Bug 161330 – postgresql-server-8.4.9.patch

[patch] postgresql-server-8.4.9.patch

postgresql-server-8.4.9.patch (text/plain), 7.31 KB, created by Martin Matuska on 2011-10-06 12:40:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2011-10-06 12:40:03 UTC

Size: 7.31 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/databases/postgresql84-server/Makefile,v
>retrieving revision 1.231
>diff -u -r1.231 Makefile
>--- Makefile	25 Sep 2011 19:40:10 -0000	1.231
>+++ Makefile	6 Oct 2011 11:36:34 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME?=	postgresql
>-DISTVERSION?=	8.4.8
>-PORTREVISION?=	1
>+DISTVERSION?=	8.4.9
> CATEGORIES?=	databases
> MASTER_SITES=	${MASTER_SITE_PGSQL}
> MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
>@@ -73,16 +72,6 @@
> CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
> .endif
> 
>-# Cannot check this with standard OPTION due to a catch-22.
>-# USE_OPENSSL must precede bsd.port.pre.mk, but then we don't know
>-# what OPTIONS are set.
>-#
>-# If you *don't* want SSL, set WITHOUT_SSL=YES when making
>-.if !defined(WITHOUT_SSL)
>-USE_OPENSSL=	yes
>-CONFIGURE_ARGS+=--with-openssl
>-.endif
>-
> .if !defined(SLAVE_ONLY)
> OPTIONS+=	PAM "Build with PAM support (server only)" off
> OPTIONS+=	LDAP "Build with LDAP authentication support" off
>@@ -100,9 +89,15 @@
> # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
> # (requires dump/restore if modified.)
> OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" on
>+OPTIONS+=	SSL "Build with OpenSSL support" on
> .endif # !SLAVE_ONLY
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
>+
>+.if !defined(WITHOUT_SSL)
>+USE_OPENSSL=	yes
>+CONFIGURE_ARGS+=--with-openssl
>+.endif
> 
> .if !defined(SLAVE_ONLY)
> .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
>@@ -113,7 +108,11 @@
> LIB_DEPENDS+=	icudata.48:${PORTSDIR}/devel/icu
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
> .  endif
>+.endif # !SLAVE_ONLY
> 
>+.include <bsd.port.pre.mk>
>+
>+.if !defined(SLAVE_ONLY)
> PATCH_DIST_STRIP=-p1
> 
> .  if defined(WITH_PAM)
>@@ -288,11 +287,11 @@
> .  endif
> 
> .  if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
>-SUB_FILES+=     pkg-install${PKGNAMESUFFIX}
>-SUB_LIST=	PG_GROUP=$(PG_GROUP) \
>-		PG_USER=$(PG_USER) \
>-		PG_UID=$(PG_UID)
>-PLIST_SUB+=	PG_USER=$(PG_USER)
>+SUB_FILES+=	pkg-install${PKGNAMESUFFIX}
>+SUB_LIST=	PG_GROUP=$(PG_GROUP} \
>+		PG_USER=${PG_USER} \
>+		PG_UID=${PG_UID}
>+PLIST_SUB+=	PG_USER=${PG_USER}
> PKGINSTALL=	${WRKDIR}/pkg-install${PKGNAMESUFFIX}
> .  endif
> 
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/databases/postgresql84-server/distinfo,v
>retrieving revision 1.81
>diff -u -r1.81 distinfo
>--- distinfo	18 Apr 2011 23:34:26 -0000	1.81
>+++ distinfo	6 Oct 2011 11:36:34 -0000
>@@ -1,4 +1,4 @@
>-SHA256 (postgresql/postgresql-8.4.8.tar.bz2) = 3e90ef2a86a9f4831e21ff4a574fbfb8e1b8c097af637c93ec43c64c684a0938
>-SIZE (postgresql/postgresql-8.4.8.tar.bz2) = 14136376
>+SHA256 (postgresql/postgresql-8.4.9.tar.bz2) = 1d58cb8d0cb8ae8f61042b2d5aa54135a2d2a0f324d06593870e1242b0e8c38a
>+SIZE (postgresql/postgresql-8.4.9.tar.bz2) = 14275979
> SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e
> SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321
>Index: pkg-plist-client
>===================================================================
>RCS file: /home/pcvs/ports/databases/postgresql84-server/pkg-plist-client,v
>retrieving revision 1.20
>diff -u -r1.20 pkg-plist-client
>--- pkg-plist-client	18 Apr 2011 23:34:26 -0000	1.20
>+++ pkg-plist-client	6 Oct 2011 11:36:34 -0000
>@@ -598,6 +598,12 @@
> %%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-8.4.mo
> %%GETTEXT%%share/locale/ko/LC_MESSAGES/psql-8.4.mo
> %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-8.4.mo
>+%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpg-8.4.mo
>+%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpglib6-8.4.mo
>+%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq5-8.4.mo
>+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config-8.4.mo
>+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_dump-8.4.mo
>+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pgscripts-8.4.mo
> %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-8.4.mo
> %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-8.4.mo
> %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq5-8.4.mo
>Index: pkg-plist-server
>===================================================================
>RCS file: /home/pcvs/ports/databases/postgresql84-server/pkg-plist-server,v
>retrieving revision 1.33
>diff -u -r1.33 pkg-plist-server
>--- pkg-plist-server	15 Aug 2011 14:52:30 -0000	1.33
>+++ pkg-plist-server	6 Oct 2011 11:36:34 -0000
>@@ -81,6 +81,12 @@
> %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog-8.4.mo
> %%GETTEXT%%share/locale/ko/LC_MESSAGES/plpgsql-8.4.mo
> %%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres-8.4.mo
>+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb-8.4.mo
>+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata-8.4.mo
>+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_ctl-8.4.mo
>+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_resetxlog-8.4.mo
>+%%GETTEXT%%share/locale/pl/LC_MESSAGES/plpgsql-8.4.mo
>+%%GETTEXT%%share/locale/pl/LC_MESSAGES/postgres-8.4.mo
> %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-8.4.mo
> %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-8.4.mo
> %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-8.4.mo
>@@ -149,6 +155,7 @@
> %%TZDATA%%share/postgresql/timezone/Africa/Khartoum
> %%TZDATA%%share/postgresql/timezone/Africa/Kigali
> %%TZDATA%%share/postgresql/timezone/Africa/Kinshasa
>+%%TZDATA%%share/postgresql/timezone/Africa/Juba
> %%TZDATA%%share/postgresql/timezone/Africa/Lagos
> %%TZDATA%%share/postgresql/timezone/Africa/Libreville
> %%TZDATA%%share/postgresql/timezone/Africa/Lome
>@@ -259,10 +266,12 @@
> %%TZDATA%%share/postgresql/timezone/America/Kentucky/Louisville
> %%TZDATA%%share/postgresql/timezone/America/Kentucky/Monticello
> %%TZDATA%%share/postgresql/timezone/America/Knox_IN
>+%%TZDATA%%share/postgresql/timezone/America/Kralendijk
> %%TZDATA%%share/postgresql/timezone/America/La_Paz
> %%TZDATA%%share/postgresql/timezone/America/Lima
> %%TZDATA%%share/postgresql/timezone/America/Los_Angeles
> %%TZDATA%%share/postgresql/timezone/America/Louisville
>+%%TZDATA%%share/postgresql/timezone/America/Lower_Princes
> %%TZDATA%%share/postgresql/timezone/America/Maceio
> %%TZDATA%%share/postgresql/timezone/America/Managua
> %%TZDATA%%share/postgresql/timezone/America/Manaus
>Index: files/patch-src-plperl-plperl
>===================================================================
>RCS file: files/patch-src-plperl-plperl
>diff -N files/patch-src-plperl-plperl
>--- files/patch-src-plperl-plperl	14 Aug 2011 01:32:13 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,28 +0,0 @@
>-Obtained from:	http://archives.postgresql.org/pgsql-hackers/2011-04/msg01283.php
>-Reference:	http://search.cpan.org/~jesse/perl-5.14.0/pod/perldelta.pod#GvCV()_and_GvGP()_are_no_longer_lvalues
>-
>---- src/pl/plperl/plperl.c.orig	2011-04-15 11:15:53.000000000 +0800
>-+++ src/pl/plperl/plperl.c	2011-05-19 20:39:34.126713700 +0800
>-@@ -700,7 +700,7 @@
>- 		if (!isGV_with_GP(sv) || !GvCV(sv))
>- 			continue;
>- 		SvREFCNT_dec(GvCV(sv)); /* free the CV */
>--		GvCV(sv) = NULL;		/* prevent call via GV */
>-+		GvCV_set(sv, NULL);		/* prevent call via GV */
>- 	}
>- 	hv_clear(stash);
>- 
>---- src/pl/plperl/plperl.h.orig	2011-04-15 11:15:53.000000000 +0800
>-+++ src/pl/plperl/plperl.h	2011-05-19 20:39:34.127713548 +0800
>-@@ -43,6 +43,11 @@
>- #undef bool
>- #endif
>- 
>-+/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */
>-+#ifndef GvCV_set
>-+#define GvCV_set(gv, cv)		(GvCV(gv) = cv)
>-+#endif
>-+
>- /* routines from spi_internal.c */
>- int			spi_DEBUG(void);
>- int			spi_LOG(void);

Actions: View | Diff

Attachments on bug 161330: 118903