Attachment 201001 Details for Bug 234740 – fix GSSAPI and NLS-less builds

[patch] fix GSSAPI and NLS-less builds

fetchmail.patch (text/plain), 3.74 KB, created by Matthias Andree on 2019-01-10 21:55:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2019-01-10 21:55:55 UTC

Size: 3.74 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(Revision 489889)
>+++ Makefile	(Arbeitskopie)
>@@ -3,15 +3,13 @@
> 
> PORTNAME=	fetchmail
> PORTVERSION=	6.3.26
>-PORTREVISION=	9
>+PORTREVISION=	10
> CATEGORIES=	mail ipv6
> MASTER_SITES=	SF/${PORTNAME}/branch_6.3/ \
> 		http://mandree.home.pages.de/${PORTNAME}/
> 
>-PATCH_SITES=	https://gitlab.com/fetchmail/fetchmail/commit/:gitlab
>-PATCH_SITES+=   https://src.fedoraproject.org/rpms/fetchmail/raw/master/f/:fedora
>-PATCHFILES=	9b8b634.patch:-p1:gitlab  # SNI fix
>-PATCHFILES+=    fetchmail-6.3.26-ssl-backport.patch:-p1:fedora
>+PATCH_SITES=   https://src.fedoraproject.org/rpms/fetchmail/raw/master/f/:fedora
>+PATCHFILES=    fetchmail-6.3.26-ssl-backport.patch:-p1:fedora
> 
> 
> MAINTAINER=	chalpin@cs.wisc.edu
>@@ -25,7 +23,7 @@
> USERS=		${PORTNAME}
> GROUPS=		${USERS}
> 
>-USES=		cpe gmake python shebangfix tar:xz ssl
>+USES=		autoreconf:build cpe gmake python shebangfix tar:xz ssl
> SHEBANG_FILES=	fetchmailconf.py
> 
> USE_RC_SUBR=	fetchmail
>@@ -80,6 +78,22 @@
> 	@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure
> .endif
> 
>+# This is a workaround for a ports framework bug:
>+# As of r489889 on 2019-01-10, 
>+# USES=autoreconf does not seem to get along with disabling the NLS option,
>+# because this would not install gettext-tools, omitting autopoint,
>+# however the configure.ac requests GETTEXT, so autoreconf will barf.
>+# Pulling in gettext-tools unconditionally (even with NLS off) would 
>+# be excess and confuse users, so is not an option.
>+# Thus we set USES=autoreconf:build and run autoreconf by ourselves,
>+# overriding AUTOPOINT=true.
>+#
>+pre-configure-NLS-on:
>+	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf -f -i)
>+#
>+pre-configure-NLS-off:
>+	(cd ${WRKSRC} && ${SETENV} AUTOPOINT=${TRUE} ${LOCALBASE}/bin/autoreconf -f -i)
>+
> post-build:
> 	@${MAKE_CMD} -C ${WRKSRC} check
> 
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(Revision 489889)
>+++ files/patch-configure	(nicht existent)
>@@ -1,30 +0,0 @@
>---- configure.orig	2013-04-23 14:36:55.000000000 -0700
>-+++ configure	2018-04-21 22:45:30.073773000 -0700
>-@@ -9552,11 +9552,11 @@
>- #ifdef __cplusplus
>- extern "C"
>- #endif
>--char krb5_des_string_to_key ();
>-+char krb5int_des_string_to_key ();
>- int
>- main ()
>- {
>--return krb5_des_string_to_key ();
>-+return krb5int_des_string_to_key ();
>-   ;
>-   return 0;
>- }
>-@@ -9591,11 +9591,11 @@
>- #ifdef __cplusplus
>- extern "C"
>- #endif
>--char krb5_des_string_to_key ();
>-+char krb5int_des_string_to_key ();
>- int
>- main ()
>- {
>--return krb5_des_string_to_key ();
>-+return krb5int_des_string_to_key ();
>-   ;
>-   return 0;
>- }
>Index: files/patch-configure.ac
>===================================================================
>--- files/patch-configure.ac	(nicht existent)
>+++ files/patch-configure.ac	(Arbeitskopie)
>@@ -0,0 +1,24 @@
>+--- configure.ac.orig	2013-04-23 20:51:10 UTC
>++++ configure.ac
>+@@ -19,7 +19,7 @@ AC_CANONICAL_HOST
>+ dnl automake options are in Makefile.am
>+ AC_PREREQ(2.60)
>+ dnl 2.60 required for AC_USE_SYSTEM_EXTENSIONS
>+-AM_INIT_AUTOMAKE([silent-rules -Wall])
>++AM_INIT_AUTOMAKE([silent-rules subdir-objects serial-tests])
>+ AM_SILENT_RULES
>+ 
>+ dnl python is optional
>+@@ -601,10 +601,10 @@ else
>+           AC_MSG_RESULT([found])
>+           ac_krblibs="-lcom_err"
>+            AC_CHECK_LIB(crypto,
>+-             krb5_des_string_to_key,
>++             krb5int_des_string_to_key,
>+              libk5crypto=-lcrypto,
>+                 AC_CHECK_LIB(k5crypto,
>+-                   krb5_des_string_to_key,
>++                   krb5int_des_string_to_key,
>+                    libk5crypto=-lk5crypto,
>+                       AC_MSG_ERROR([Kerberos 5 DES libraries not found]),
>+                    ${LDFLAGS} ${ac_krblibs}),

Flags:

chalpin: maintainer-approval+

Actions: View | Diff

Attachments on bug 234740: 201001