| 1 | diff -u -r ../alpine-2.20/configure.ac ./configure.ac |
| 2 | --- ../alpine-2.20/configure.ac 2015-01-18 01:38:08.893495949 -0500 |
| 3 | +++ ./configure.ac 2016-04-10 19:16:26.371168685 -0400 |
| 4 | @@ -809,6 +809,13 @@ |
| 5 | alpine_SSLINCLUDE="/usr/include/openssl" |
| 6 | alpine_SSLLIB="/usr/lib" |
| 7 | ;; |
| 8 | + *-*-*-android*) |
| 9 | + alpine_SSLDIR="@TERMUX_PREFIX@/etc/tls" |
| 10 | + alpine_SSLCERTS="$alpine_SSLDIR/certs" |
| 11 | + alpine_SSLKEYS="$alpine_SSLDIR/private" |
| 12 | + alpine_SSLINCLUDE="/data/data/com.termux/files/usr/include/openssl" |
| 13 | + alpine_SSLLIB="/data/data/com.termux/files/usr/lib" |
| 14 | + ;; |
| 15 | *-*-dragonfly*) |
| 16 | alpine_SSLDIR="/etc/openssl" |
| 17 | alpine_SSLCERTS="$alpine_SSLDIR/certs" |
| 18 | @@ -1059,12 +1048,11 @@ |
| 19 | dnl build from c-client. Most of this will go away when c-client |
| 20 | dnl adopts configure |
| 21 | case "$host" in |
| 22 | - *-linux-gnu*|*-k*bsd*-gnu*|*-gnu*) |
| 23 | + *-linux-*|*-k*bsd*-gnu*|*-gnu*) |
| 24 | alpine_path_delim="/" |
| 25 | alpine_mode_readonly="(0600)" |
| 26 | if test -f /etc/fedora-release ; then |
| 27 | systype="LFD" |
| 28 | - alpine_PAM="yes" |
| 29 | if test -d /etc/pki/tls ; then |
| 30 | alpine_c_client_target="lfd" |
| 31 | else |
| 32 | @@ -1073,10 +1061,8 @@ |
| 33 | elif test -f /etc/mandrake-release ; then |
| 34 | systype="LMD" |
| 35 | alpine_c_client_target="lmd" |
| 36 | - alpine_PAM="yes" |
| 37 | elif test -f /etc/redhat-release -o -f /etc/redhat_version ; then |
| 38 | systype="LRH" |
| 39 | - alpine_PAM="yes" |
| 40 | if test -d /etc/pki/tls ; then |
| 41 | alpine_c_client_target="lr5" |
| 42 | else |
| 43 | @@ -1089,18 +1075,16 @@ |
| 44 | else |
| 45 | systype="DEB" |
| 46 | alpine_c_client_target="ldb" |
| 47 | - alpine_PAM="yes" |
| 48 | + alpine_PAM="no" |
| 49 | fi |
| 50 | elif test -f /etc/SuSE-release ; then |
| 51 | systype="LSU" |
| 52 | alpine_c_client_target="lsu" |
| 53 | - alpine_PAM="yes" |
| 54 | else |
| 55 | systype="LNX" |
| 56 | AC_CHECK_LIB(pam, pam_start, |
| 57 | [ |
| 58 | alpine_c_client_target="lnp" |
| 59 | - alpine_PAM="yes" |
| 60 | ], |
| 61 | [ |
| 62 | if test -f /etc/shadow ; then |
| 63 | @@ -1130,12 +1114,10 @@ |
| 64 | [ |
| 65 | AC_CHECK_HEADER([security/pam_appl.h], |
| 66 | [ |
| 67 | - alpine_PAM="yes" |
| 68 | alpine_c_client_target="oxs" |
| 69 | ], |
| 70 | [ AC_CHECK_HEADER([pam/pam_appl.h], |
| 71 | [ |
| 72 | - alpine_PAM="yes" |
| 73 | alpine_c_client_target="oxp" |
| 74 | ], |
| 75 | [ |
| 76 | @@ -1351,36 +1333,7 @@ |
| 77 | fi |
| 78 | |
| 79 | dnl Check Openssl/LibreSSL version first |
| 80 | -if test "x$alpine_SSLTYPE" != "xnone" ; then |
| 81 | - AC_MSG_CHECKING([Openssl library version >= 1.0.1c]) |
| 82 | - AC_RUN_IFELSE( |
| 83 | - [AC_LANG_SOURCE([[ |
| 84 | -#include <stdio.h> |
| 85 | -#include <stdlib.h> |
| 86 | -#if HAVE_STDINT_H |
| 87 | -#include <stdint.h> |
| 88 | -#endif /* HAVE_STDINT_H */ |
| 89 | -#include <openssl/ssl.h> |
| 90 | -int main(void) { |
| 91 | - |
| 92 | - if (OPENSSL_VERSION_NUMBER >= 0x1000003f) |
| 93 | - exit(0); |
| 94 | - |
| 95 | - exit(2); |
| 96 | -} |
| 97 | - ]])], |
| 98 | - [ AC_MSG_RESULT(yes) ], |
| 99 | - [ alpine_SSLTYPE="none" ]) |
| 100 | - |
| 101 | - if test "x$alpine_SSLTYPE" = "xnone" ; then |
| 102 | - AC_MSG_ERROR(Install openssl version >= 1.0.1c) |
| 103 | - exit 1 |
| 104 | - fi |
| 105 | - AC_SEARCH_LIBS(TLSv1_2_client_method,ssl, |
| 106 | - [ alpine_c_client_cflags="$alpine_c_client_cflags -DTLSV1_2" |
| 107 | AC_DEFINE([SSL_SUPPORTS_TLSV1_2], [1], [SSL Supports TLSV1.2]) |
| 108 | - ]) |
| 109 | -fi |
| 110 | |
| 111 | dnl Crypto support is needed |
| 112 | if test "x$alpine_SSLTYPE" != "xnone" ; then |
| 113 | @@ -1488,7 +1441,7 @@ |
| 114 | alpine_pam_none_reason="library files not found" |
| 115 | ]) |
| 116 | if test -n "$alpine_pam_none_reason" ; then |
| 117 | - AC_MSG_ERROR(No PAM support: $alpine_pam_none_reason) |
| 118 | + alpine_PAM="non" |
| 119 | fi |
| 120 | fi |
| 121 | |