Attachment 144702 Details for Bug 189879 – krb5-megapatch

[patch] krb5-megapatch

krb5-megapatch (text/plain), 2.06 KB, created by Cy Schubert on 2014-07-15 19:41:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2014-07-15 19:41:33 UTC

Size: 2.06 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 361324)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=		krb5
> PORTVERSION=		1.12.1
>-PORTREVISION=		3
>+PORTREVISION=		4
> CATEGORIES=		security
> MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
> DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
>@@ -24,11 +24,13 @@
> LATEST_LINK=		${PORTNAME}-19
> KERBEROSV_URL=		http://web.mit.edu/kerberos/
> USE_PERL5=		build
>+USE_PYTHON_BUILD=	2.7
> USE_LDCONFIG=		yes
> USE_CSTD=		gnu99
>-USE_AUTOTOOLS=		libtool
>-USES=		gettext gmake perl5
>-CONFIGURE_ARGS?=	--enable-shared --without-system-verto
>+USE_AUTOTOOLS=		autoconf
>+USES=			gettext gmake libtool perl5 readline
>+GNU_CONFIGURE=		yes
>+CONFIGURE_ARGS?=	--enable-shared --without-system-verto --with-readline
> CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC="${YACC}"
> MAKE_ARGS=		INSTALL="${INSTALL}"
> 
>Index: files/patch-configure.in
>===================================================================
>--- files/patch-configure.in	(revision 0)
>+++ files/patch-configure.in	(working copy)
>@@ -0,0 +1,23 @@
>+--- configure.in.orig	2014-01-15 16:44:15.000000000 -0800
>++++ configure.in	2014-07-15 08:54:27.139642717 -0700
>+@@ -1082,7 +1082,7 @@
>+ AC_CHECK_PROG(PYTHON,python,python)
>+ HAVE_PYTHON=no
>+ if test x"$PYTHON" != x; then
>+-	# k5test.py requires python 2.4 (for the subprocess module).
>++	# k5test.py requires python 2.7 (for the subprocess module).
>+     	vercheck="import sys;sys.exit((sys.hexversion < 0x2040000) and 1 or 0)"
>+ 	if python -c "$vercheck"; then
>+ 		HAVE_PYTHON=yes
>+@@ -1206,9 +1206,8 @@
>+ # default, so it's not a big deal that it isn't very good.  We should
>+ # use python-config instead.
>+ PYTHON_LIB=
>+-AC_CHECK_HEADERS(Python.h python2.3/Python.h python2.5/Python.h)
>+-AC_CHECK_LIB(python2.3,main,[PYTHON_LIB=-lpython2.3],
>+-  AC_CHECK_LIB(python2.5,main,[PYTHON_LIB=-lpython2.5]))
>++AC_CHECK_HEADERS(Python.h python2.7/Python.h)
>++AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])
>+ AC_SUBST(PYTHON_LIB)
>+ 
>+

Actions: View | Diff

Attachments on bug 189879: 142796 | 144702