Attachment 187940 Details for Bug 223465 – Updated patch

[patch] Updated patch

mod_auth_gssapi-1.6.0.diff (text/plain), 2.29 KB, created by Christian Ullrich on 2017-11-12 13:10:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Ullrich

Created: 2017-11-12 13:10:08 UTC

Size: 2.29 KB

patch

obsolete

>diff --git a/www/mod_auth_gssapi/Makefile b/www/mod_auth_gssapi/Makefile
>index 1ff2d34ed2bb..67ce0f382018 100644
>--- a/www/mod_auth_gssapi/Makefile
>+++ b/www/mod_auth_gssapi/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mod_auth_gssapi
>-PORTVERSION=	1.5.1
>+PORTVERSION=	1.6.0
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
>@@ -12,11 +12,11 @@ COMMENT=	Apache module for authenticating users with GSSAPI
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+USES=		autoreconf libtool ssl gssapi:mit,flags
>+USE_APACHE=	24+
> USE_GITHUB=	yes
> GH_ACCOUNT=	modauthgssapi
> 
>-USE_APACHE=	24+
>-USES=		autoreconf libtool ssl gssapi:mit,flags
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=	KRB5_CONFIG=${KRB5CONFIG}
> CONFIGURE_ARGS+=	OPENSSL_CFLAGS=-I${OPENSSLINC}
>@@ -29,9 +29,6 @@ SUB_FILES=	${APMOD_FILE}
> APMOD_FILE=	240_${PORTNAME}.conf.sample
> PLIST_SUB+=	APMOD_FILE=${APMOD_FILE}
> 
>-IGNORE_SSL=	libressl libressl-devel
>-IGNORE_SSL_REASON=	mod_auth_gssapi currently only supports OpenSSL
>-
> do-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
> 	${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
>diff --git a/www/mod_auth_gssapi/distinfo b/www/mod_auth_gssapi/distinfo
>index 2bb62d49eb0f..f448379a00d3 100644
>--- a/www/mod_auth_gssapi/distinfo
>+++ b/www/mod_auth_gssapi/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1489229901
>-SHA256 (modauthgssapi-mod_auth_gssapi-v1.5.1_GH0.tar.gz) = 138f8ffc2d3310b0879ed627adce34716e32812f4bc58d96317972b6a5ad2329
>-SIZE (modauthgssapi-mod_auth_gssapi-v1.5.1_GH0.tar.gz) = 108187
>+TIMESTAMP = 1509956071
>+SHA256 (modauthgssapi-mod_auth_gssapi-v1.6.0_GH0.tar.gz) = 1d5eb2baea2da2d5e5afcb921648305f9e3ffe48f123e6085ca3d8f8e71342ee
>+SIZE (modauthgssapi-mod_auth_gssapi-v1.6.0_GH0.tar.gz) = 116422
>diff --git a/www/mod_auth_gssapi/files/patch-src_parser.y b/www/mod_auth_gssapi/files/patch-src_parser.y
>new file mode 100644
>index 000000000000..3ef4812f6a1a
>--- /dev/null
>+++ b/www/mod_auth_gssapi/files/patch-src_parser.y
>@@ -0,0 +1,11 @@
>+--- src/parser.y.orig	2017-11-12 12:50:05 UTC
>++++ src/parser.y
>+@@ -46,7 +46,7 @@ static char *b64_enc(const char *val, si
>+ %type <sval> STRING
>+ %type <ival> INT rule rule_start requiredkv
>+ 
>+-%parse-param {const char **keys} {const char **vals} {int *status}
>++%parse-param {const char **keys} {const char **vals} {int *status }
>+ 
>+ %%
>+

Flags:

chris: maintainer-approval+

Actions: View | Diff

Attachments on bug 223465: 187787 | 187788 | 187793 | 187927 | 187940