diff options
| author | richard <richard> | 2013-10-12 04:51:05 +0000 |
|---|---|---|
| committer | richard <richard> | 2013-10-12 04:51:05 +0000 |
| commit | 2acf9890544d1ee9e454fff87baae5848c3a3001 (patch) | |
| tree | f6b16b568a528444833df467a7c9d5df65a151a8 /databases/postgresql93 | |
| parent | af3736c8008d2c768ad445a3d2a3da87bc952c7e (diff) | |
| download | pkgsrc-2acf9890544d1ee9e454fff87baae5848c3a3001.tar.gz | |
improve postgresql93 builtin kerberos support
Diffstat (limited to 'databases/postgresql93')
| -rw-r--r-- | databases/postgresql93/distinfo | 4 | ||||
| -rw-r--r-- | databases/postgresql93/options.mk | 12 | ||||
| -rw-r--r-- | databases/postgresql93/patches/patch-configure | 13 |
3 files changed, 25 insertions, 4 deletions
diff --git a/databases/postgresql93/distinfo b/databases/postgresql93/distinfo index 9b0cfc4d52e..2a9934fb98d 100644 --- a/databases/postgresql93/distinfo +++ b/databases/postgresql93/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.2 2013/10/04 18:23:40 joerg Exp $ +$NetBSD: distinfo,v 1.3 2013/10/12 04:51:05 richard Exp $ SHA1 (postgresql-9.3.0.tar.bz2) = 63a7b8788cd18247d7af5fd4a320abebb0535a44 RMD160 (postgresql-9.3.0.tar.bz2) = 7600730f7a1e2f547db231c2699131b5a2148cfa Size (postgresql-9.3.0.tar.bz2) = 16871327 bytes SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5 -SHA1 (patch-configure) = cc93f6db4cd6c34708804b4ae3550525af46bdef +SHA1 (patch-configure) = 3de7635fe18532a05a619941fecad7bcda6c51b9 SHA1 (patch-contrib_dblink_Makefile) = 11620938ce93109311df90df675b1ad6f0c15212 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921 SHA1 (patch-src_Makefile.global.in) = 53e29e000d7fb71e2625aacd32324e9d7001b5b2 diff --git a/databases/postgresql93/options.mk b/databases/postgresql93/options.mk index 7ffe0e900ed..c83b7458ec5 100644 --- a/databases/postgresql93/options.mk +++ b/databases/postgresql93/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2013/09/10 15:32:32 adam Exp $ +# $NetBSD: options.mk,v 1.2 2013/10/12 04:51:05 richard Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql93 PKG_SUPPORTED_OPTIONS= bonjour gssapi kerberos ldap pam xml dtrace @@ -29,6 +29,16 @@ CONFIGURE_ARGS+= --with-gssapi .if !empty(PKG_OPTIONS:Mkerberos) . include "../../mk/krb5.buildlink3.mk" CONFIGURE_ARGS+= --with-krb5 + +CHECK_BUILTIN.${KRB5_TYPE}:= yes +.include "../../security/${KRB5_TYPE}/builtin.mk" +CHECK_BUILTIN.${KRB5_TYPE}:= no + +. if !empty(USE_BUILTIN.${KRB5_TYPE}:M[yY][eE][sS]) && \ + exists(${SH_KRB5_CONFIG}) +CFLAGS_KRB5!= ${SH_KRB5_CONFIG} --cflags +CPPFLAGS+= ${CFLAGS_KRB5} +. endif .endif ### diff --git a/databases/postgresql93/patches/patch-configure b/databases/postgresql93/patches/patch-configure index 9a6a07a3ca0..5408d0e0c61 100644 --- a/databases/postgresql93/patches/patch-configure +++ b/databases/postgresql93/patches/patch-configure @@ -1,4 +1,6 @@ -$NetBSD: patch-configure,v 1.1 2013/09/10 15:32:32 adam Exp $ +$NetBSD: patch-configure,v 1.2 2013/10/12 04:51:05 richard Exp $ + +Finally, native solaris uses -lgss for gssapi on mit-krb5. --- configure.orig 2013-09-02 20:53:17.000000000 +0000 +++ configure @@ -21,3 +23,12 @@ $NetBSD: patch-configure,v 1.1 2013/09/10 15:32:32 adam Exp $ fi if test -z "$perl_embed_ldflags" ; then { $as_echo "$as_me:$LINENO: result: no" >&5 +@@ -8898,7 +8897,7 @@ return gss_init_sec_context (); + return 0; + } + _ACEOF +-for ac_lib in '' gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'; do ++for ac_lib in '' gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto' 'gss -lkrb5 lcrypto'; do + if test -z "$ac_lib"; then + ac_res="none required" + else |