diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2013-08-04 22:05:02 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2013-08-04 22:05:02 -0600 |
| commit | 68e60cfaa434ab6fa738949cca151b2d28252025 (patch) | |
| tree | c1c3576af7b76b0d7db488c6ea58b8f2868f060a | |
| parent | 82ec113957d8297ed08c51c20cbc4b0a6f623d4e (diff) | |
| download | alpine-68e60cfaa434ab6fa738949cca151b2d28252025.tar.xz | |
* Set minimum version of Openssl to 1.0.1c.
| -rw-r--r-- | autom4te.cache/output.0 | 8 | ||||
| -rw-r--r-- | autom4te.cache/output.1 | 8 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | pith/pine.hlp | 3 |
5 files changed, 17 insertions, 16 deletions
diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 index 5cb20f71..b3b62386 100644 --- a/autom4te.cache/output.0 +++ b/autom4te.cache/output.0 @@ -16419,8 +16419,8 @@ if test "$ac_res" != no; then : LIBS="$LIBS -lssl" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0" >&5 -$as_echo_n "checking Openssl library version >= 1.0... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5 +$as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; } if test "$cross_compiling" = yes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5 @@ -16435,7 +16435,7 @@ else #include <openssl/ssl.h> int main(void) { - if (OPENSSL_VERSION_NUMBER >= 0x1000105fL) + if (OPENSSL_VERSION_NUMBER >= 0x1000003f) exit(0); exit(2); @@ -16449,7 +16449,7 @@ $as_echo "yes" >&6; } else - as_fn_error $? "Install openssl version >= 1.0.1e" "$LINENO" 5 + as_fn_error $? "Install openssl version >= 1.0.1c" "$LINENO" 5 exit 1 fi diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1 index 5cb20f71..b3b62386 100644 --- a/autom4te.cache/output.1 +++ b/autom4te.cache/output.1 @@ -16419,8 +16419,8 @@ if test "$ac_res" != no; then : LIBS="$LIBS -lssl" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0" >&5 -$as_echo_n "checking Openssl library version >= 1.0... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5 +$as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; } if test "$cross_compiling" = yes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5 @@ -16435,7 +16435,7 @@ else #include <openssl/ssl.h> int main(void) { - if (OPENSSL_VERSION_NUMBER >= 0x1000105fL) + if (OPENSSL_VERSION_NUMBER >= 0x1000003f) exit(0); exit(2); @@ -16449,7 +16449,7 @@ $as_echo "yes" >&6; } else - as_fn_error $? "Install openssl version >= 1.0.1e" "$LINENO" 5 + as_fn_error $? "Install openssl version >= 1.0.1c" "$LINENO" 5 exit 1 fi @@ -16419,8 +16419,8 @@ if test "$ac_res" != no; then : LIBS="$LIBS -lssl" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0" >&5 -$as_echo_n "checking Openssl library version >= 1.0... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5 +$as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; } if test "$cross_compiling" = yes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5 @@ -16435,7 +16435,7 @@ else #include <openssl/ssl.h> int main(void) { - if (OPENSSL_VERSION_NUMBER >= 0x1000105fL) + if (OPENSSL_VERSION_NUMBER >= 0x1000003f) exit(0); exit(2); @@ -16449,7 +16449,7 @@ $as_echo "yes" >&6; } else - as_fn_error $? "Install openssl version >= 1.0.1e" "$LINENO" 5 + as_fn_error $? "Install openssl version >= 1.0.1c" "$LINENO" 5 exit 1 fi diff --git a/configure.ac b/configure.ac index 42ec7b41..dbfdcc37 100644 --- a/configure.ac +++ b/configure.ac @@ -1030,14 +1030,14 @@ if test "x$alpine_SSLTYPE" != "xnone" ; then [ LIBS="$LIBS -lssl" - AC_MSG_CHECKING([Openssl library version >= 1.0]) + AC_MSG_CHECKING([Openssl library version >= 1.0.0c]) AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include <stdio.h> #include <openssl/ssl.h> int main(void) { - if (OPENSSL_VERSION_NUMBER >= 0x1000105fL) + if (OPENSSL_VERSION_NUMBER >= 0x1000003f) exit(0); exit(2); @@ -1047,7 +1047,7 @@ int main(void) { AC_MSG_RESULT(yes) ], [ - AC_MSG_ERROR(Install openssl version >= 1.0.1e) + AC_MSG_ERROR(Install openssl version >= 1.0.1c) exit 1 ], [ diff --git a/pith/pine.hlp b/pith/pine.hlp index 6afda948..31e42784 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 21 2013-07-23 22:22:31 +Alpine Commit 22 2013-08-04 22:04:58 ============= h_news ================= <HTML> <HEAD> @@ -179,6 +179,7 @@ Additions include: <P> <UL> + <LI> Alpine requires version 1.0.1c of Openssl to build. <LI> Increase encryption of S/MIME encrypted messages. <LI> Pico: Improvements in justification of paragraphs: lines that begin with a quote string, followed by a space were considered individual paragraphs, |