Attachment 190807 Details for Bug 220325 – Patch updated against databases/postgresql10-server

[patch] Patch updated against databases/postgresql10-server

postgresql.diff (text/plain), 3.17 KB, created by Christian Ullrich on 2018-02-19 15:43:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Ullrich

Created: 2018-02-19 15:43:58 UTC

Size: 3.17 KB

patch

obsolete

>diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile
>index 2f0d2b79f882..f6e50f5344e7 100644
>--- a/databases/postgresql10-server/Makefile
>+++ b/databases/postgresql10-server/Makefile
>@@ -106,18 +106,41 @@ OPTIONS_DEFAULT+=	XML TZDATA INTDATE
> .endif
> 
> .if !defined(SLAVE_ONLY)
>-OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG
>+OPTIONS_DEFINE+=	NLS PAM OPTIMIZED_CFLAGS DEBUG
> . if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3
>+  # Select optional Kerberos, optional GSSAPI
>+  OPTIONS_DEFINE+=	GSSAPI
>   OPTIONS_RADIO= KRB5
>-  OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5
>+  OPTIONS_RADIO_KRB5= BASE_KRB5 MIT_KRB5 HEIMDAL_KRB5
>+  BASE_KRB5_USES=	gssapi:base
>+  MIT_KRB5_USES=	gssapi:mit
>+  HEIMDAL_KRB5_USES=	gssapi:heimdal,flags
>+  BASE_KRB5_CONFIGURE_ON=	--with-krb5
>+  MIT_KRB5_CONFIGURE_ON=	--with-krb5
>+  HEIMDAL_KRB5_CONFIGURE_ON=	--with-krb5
>+  GSSAPI_CONFIGURE_WITH=	gssapi
>+.else
>+  # Select Kerberos for optional GSSAPI
>+  OPTIONS_RADIO+=	GSSAPI
>+  OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE GSSAPI_MIT GSSAPI_HEIMDAL
>+  GSSAPI_BASE_USES=	gssapi:base
>+  GSSAPI_MIT_USES=	gssapi:mit
>+  GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
>+  GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi
>+  GSSAPI_MIT_CONFIGURE_ON=	--with-gssapi
>+  GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi
> . endif
> 
> KRB5_DESC=	Build with kerberos provider support
> NLS_DESC=	Use internationalized messages
> PAM_DESC=	Build with PAM Support
>-MIT_KRB5_DESC=	Build with MIT kerberos support
>-HEIMDAL_KRB5_DESC=	Builds with Heimdal kerberos
>+BASE_KRB5_DESC=	Build with Heimdal Kerberos from base
>+MIT_KRB5_DESC=	Build with MIT Kerberos support
>+HEIMDAL_KRB5_DESC=	Build with Heimdal Kerberos
> GSSAPI_DESC=	Build with GSSAPI support
>+GSSAPI_BASE_DESC=	Build with GSSAPI from base
>+GSSAPI_MIT_DESC=	Build with GSSAPI from MIT Kerberos
>+GSSAPI_HEIMDAL_DESC=	BUild with GSSAPI from Heimdal Kerberos
> OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
> 
> OPTIONS_DEFINE+=	SSL
>@@ -184,36 +207,6 @@ LDFLAGS+=-lelf
> INSTALL_TARGET=install
> .  endif
> 
>-.if ${PORT_OPTIONS:MGSSAPI}
>-CONFIGURE_ARGS+=--with-gssapi
>-.if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5)
>-# Kerberos libraries will pull the proper GSSAPI library
>-# via linker dependencies, but otherwise we must specify
>-# it explicitely: ld --as-needed is used for compilation,
>-# so configure's -lgssapi_krb5 won't go.
>-LDFLAGS+=	-lgssapi
>-LDFLAGS_SL+=	-lgssapi
>-.endif
>-.else
>-CONFIGURE_ARGS+=--without-gssapi
>-.endif
>-
>-.  if ${PORT_OPTIONS:MMIT_KRB5}
>-.   if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config))
>-IGNORE=	requires that you remove heimdal\'s /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB
>-.   else
>-CONFIGURE_ARGS+=--with-krb5
>-# Allow defining a home built MIT Kerberos by setting KRB5_HOME
>-.    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
>-LIB_DEPENDS+=	libkrb5.so.3:security/krb5
>-.    endif
>-.   endif
>-.  endif
>-
>-.  if ${PORT_OPTIONS:MHEIMDAL_KRB5}
>-CONFIGURE_ARGS+=--with-krb5
>-.  endif
>-
> .endif # !SLAVE_ONLY
> 
> # For testing files in FILESDIR

Flags:

chris: maintainer-approval?

Actions: View | Diff

Attachments on bug 220325: 185529 | 190807