diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2019-01-11 06:36:28 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2019-01-11 06:36:28 +0000 |
| commit | 56147f1c5dbe7beb08e17051b84f1814d0225741 (patch) | |
| tree | b4ed45e98af4d44b9c305a513e5e6c5839a303e9 /mail/fetchmail/files | |
| parent | www/trafficserver: update 6.2.0 -> 6.2.3, fix build on 12 (diff) | |
Fix GSSAPI-based, and NLS-less, builds.
This was also tested on a live 12.0 amd64 machine,
11.2-arm64 and 11.2-i386 poudriere boxes with base GSSAPI.
PR: 234740
Reported by: Peter Putzer (Bugzilla), Alex V. Petrov (e-mail)
Approved by: Corey Halpin (maintainer)
Notes
Notes:
svn path=/head/; revision=489947
Diffstat (limited to 'mail/fetchmail/files')
| -rw-r--r-- | mail/fetchmail/files/patch-configure | 30 | ||||
| -rw-r--r-- | mail/fetchmail/files/patch-configure.ac | 24 |
2 files changed, 24 insertions, 30 deletions
diff --git a/mail/fetchmail/files/patch-configure b/mail/fetchmail/files/patch-configure deleted file mode 100644 index 16336221ff4e..000000000000 --- a/mail/fetchmail/files/patch-configure +++ /dev/null @@ -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; - } diff --git a/mail/fetchmail/files/patch-configure.ac b/mail/fetchmail/files/patch-configure.ac new file mode 100644 index 000000000000..a84e3216616d --- /dev/null +++ b/mail/fetchmail/files/patch-configure.ac @@ -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}), |