diff options
author | Eduardo Chappa <chappa@washington.edu> | 2020-02-09 22:46:32 -0700 |
---|---|---|
committer | Eduardo Chappa <chappa@washington.edu> | 2020-02-09 22:46:32 -0700 |
commit | 8781af1dfc9fdc1fbc08b281cc418bee8dde604d (patch) | |
tree | c252c33b49b9d1d9f2d4b783095e5b2adac863da | |
parent | 58e78a3c43f352b3ac1e2e133c0b41930e38cedb (diff) | |
download | alpine-8781af1dfc9fdc1fbc08b281cc418bee8dde604d.tar.xz |
* Creation of port wxp to build Alpine in Windows XP. At the time
of this writing, the port w32 is the same as the port wxp, but it
is intended to target other 32 bit operating systems.
-rw-r--r-- | alpine/DLL/README | 6 | ||||
-rw-r--r--[-rwxr-xr-x] | alpine/DLL/w32/libcrypto-41.dll (renamed from alpine/libcrypto-41.dll) | bin | 1384064 -> 1384064 bytes | |||
-rw-r--r--[-rwxr-xr-x] | alpine/DLL/w32/libssl-43.dll (renamed from alpine/libssl-43.dll) | bin | 294525 -> 294525 bytes | |||
-rw-r--r--[-rwxr-xr-x] | alpine/DLL/w32/libtls-15.dll (renamed from alpine/libtls-15.dll) | bin | 69245 -> 69245 bytes | |||
-rw-r--r-- | alpine/DLL/wnt/libcrypto-45.dll (renamed from alpine/libcrypto-45.dll) | bin | 1657500 -> 1657500 bytes | |||
-rw-r--r-- | alpine/DLL/wnt/libssl-47.dll (renamed from alpine/libssl-47.dll) | bin | 333468 -> 333468 bytes | |||
-rw-r--r-- | alpine/DLL/wnt/libtls-19.dll (renamed from alpine/libtls-19.dll) | bin | 78492 -> 78492 bytes | |||
-rw-r--r-- | alpine/DLL/wxp/libcrypto-41.dll | bin | 0 -> 1384064 bytes | |||
-rw-r--r-- | alpine/DLL/wxp/libssl-43.dll | bin | 0 -> 294525 bytes | |||
-rw-r--r-- | alpine/DLL/wxp/libtls-15.dll | bin | 0 -> 69245 bytes | |||
-rw-r--r-- | alpine/alpine.c | 2 | ||||
-rw-r--r-- | alpine/confscroll.c | 2 | ||||
-rwxr-xr-x | build.bat | 29 | ||||
-rw-r--r-- | imap/src/osdep/nt/ssl_nt.c | 6 | ||||
-rw-r--r-- | include/config.wnt.h | 15 | ||||
-rw-r--r-- | libressl/x86/README | 6 | ||||
-rw-r--r--[-rwxr-xr-x] | libressl/x86/w32/libcrypto-41.lib (renamed from libressl/x86/libcrypto-41.lib) | bin | 784894 -> 784894 bytes | |||
-rw-r--r--[-rwxr-xr-x] | libressl/x86/w32/libssl-43.lib (renamed from libressl/x86/libssl-43.lib) | bin | 62960 -> 62960 bytes | |||
-rw-r--r--[-rwxr-xr-x] | libressl/x86/w32/libtls-15.lib (renamed from libressl/x86/libtls-15.lib) | bin | 20746 -> 20746 bytes | |||
-rw-r--r-- | libressl/x86/wnt/libcrypto-45.lib (renamed from libressl/x86/libcrypto-45.lib) | bin | 838006 -> 838006 bytes | |||
-rw-r--r-- | libressl/x86/wnt/libssl-47.lib (renamed from libressl/x86/libssl-47.lib) | bin | 75200 -> 75200 bytes | |||
-rw-r--r-- | libressl/x86/wnt/libtls-19.lib (renamed from libressl/x86/libtls-19.lib) | bin | 23172 -> 23172 bytes | |||
-rw-r--r-- | libressl/x86/wxp/libcrypto-41.lib | bin | 0 -> 784894 bytes | |||
-rw-r--r-- | libressl/x86/wxp/libssl-43.lib | bin | 0 -> 62960 bytes | |||
-rw-r--r-- | libressl/x86/wxp/libtls-15.lib | bin | 0 -> 20746 bytes | |||
-rw-r--r-- | pith/conf.c | 10 | ||||
-rw-r--r-- | pith/conf.h | 4 | ||||
-rw-r--r-- | pith/conftype.h | 2 | ||||
-rw-r--r-- | pith/pine.hlp | 2 |
29 files changed, 60 insertions, 24 deletions
diff --git a/alpine/DLL/README b/alpine/DLL/README new file mode 100644 index 0000000..2bde1fa --- /dev/null +++ b/alpine/DLL/README @@ -0,0 +1,6 @@ +This directory is populated by the build.bat script. + +* wxp comes from libressl, and can run 32 bits version in Alpine. +* w32 is equal to wxp, but it is intended to be different from it, + and useful for other 32 bits operating systems +* wnt was compiled with cygwin 64 bits. diff --git a/alpine/libcrypto-41.dll b/alpine/DLL/w32/libcrypto-41.dll Binary files differindex 7c7f328..7c7f328 100755..100644 --- a/alpine/libcrypto-41.dll +++ b/alpine/DLL/w32/libcrypto-41.dll diff --git a/alpine/libssl-43.dll b/alpine/DLL/w32/libssl-43.dll Binary files differindex 369fe40..369fe40 100755..100644 --- a/alpine/libssl-43.dll +++ b/alpine/DLL/w32/libssl-43.dll diff --git a/alpine/libtls-15.dll b/alpine/DLL/w32/libtls-15.dll Binary files differindex 3dd9450..3dd9450 100755..100644 --- a/alpine/libtls-15.dll +++ b/alpine/DLL/w32/libtls-15.dll diff --git a/alpine/libcrypto-45.dll b/alpine/DLL/wnt/libcrypto-45.dll Binary files differindex b644579..b644579 100644 --- a/alpine/libcrypto-45.dll +++ b/alpine/DLL/wnt/libcrypto-45.dll diff --git a/alpine/libssl-47.dll b/alpine/DLL/wnt/libssl-47.dll Binary files differindex 6aad166..6aad166 100644 --- a/alpine/libssl-47.dll +++ b/alpine/DLL/wnt/libssl-47.dll diff --git a/alpine/libtls-19.dll b/alpine/DLL/wnt/libtls-19.dll Binary files differindex bbbb6c3..bbbb6c3 100644 --- a/alpine/libtls-19.dll +++ b/alpine/DLL/wnt/libtls-19.dll diff --git a/alpine/DLL/wxp/libcrypto-41.dll b/alpine/DLL/wxp/libcrypto-41.dll Binary files differnew file mode 100644 index 0000000..7c7f328 --- /dev/null +++ b/alpine/DLL/wxp/libcrypto-41.dll diff --git a/alpine/DLL/wxp/libssl-43.dll b/alpine/DLL/wxp/libssl-43.dll Binary files differnew file mode 100644 index 0000000..369fe40 --- /dev/null +++ b/alpine/DLL/wxp/libssl-43.dll diff --git a/alpine/DLL/wxp/libtls-15.dll b/alpine/DLL/wxp/libtls-15.dll Binary files differnew file mode 100644 index 0000000..3dd9450 --- /dev/null +++ b/alpine/DLL/wxp/libtls-15.dll diff --git a/alpine/alpine.c b/alpine/alpine.c index 25ea280..9881478 100644 --- a/alpine/alpine.c +++ b/alpine/alpine.c @@ -471,7 +471,7 @@ main(int argc, char **argv) init_vars(pine_state, process_init_cmds); -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) set_system_certs_path(pine_state); set_system_certs_container(pine_state); #endif diff --git a/alpine/confscroll.c b/alpine/confscroll.c index 78f4a92..85e364d 100644 --- a/alpine/confscroll.c +++ b/alpine/confscroll.c @@ -5773,7 +5773,7 @@ fix_side_effects(struct pine *ps, struct variable *var, int revert) #ifdef DF_ENCRYPTION_RANGE var == &ps->vars[V_ENCRYPTION_RANGE] || #endif -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(ENABLE_WINDOWS_LIBRESSL_CERTS) var == &ps->vars[V_SSLCAPATH] || var == &ps->vars[V_SSLCAFILE] || #endif @@ -11,8 +11,15 @@ rem http://www.apache.org/licenses/LICENSE-2.0 rem rem ======================================================================== +rem These are the default values, which we might override below +rem by setting them to older versions +set CRYPTO_VERSION=45 +set SSL_VERSION=47 +set TLS_VERSION=19 + if "%1"=="" goto blank if "%1"=="wnt" goto wnt +if "%1"=="wxp" goto wxp if "%1"=="w32" goto w32 if "%1"=="w2k" goto w2k if "%1"=="clean" goto clean @@ -24,22 +31,27 @@ echo Must specify build command! echo usage: BUILD cmd echo where "cmd" is one of either: echo wnt -- Windows -echo w32 -- Windows 32 bits (e.g. XP) +echo w32 -- Windows 32 bits (not Windows XP) +echo wxp -- Windows XP echo w2k -- Windows with Win2k Kerb echo clean -- to remove obj, lib, and exe files from source goto fini -:w32 +:wxp set CRYPTO_VERSION=41 set SSL_VERSION=43 set TLS_VERSION=15 set BIT=32 -set windows32build=-DW32BITSBUILD +set windows32build=-DWXPBUILD -D__MINGW_USE_VC2005_COMPAT +goto wntbuild + +:w32 +rem this port uses the default values for libcrypto and friends. +set BIT=32 +set windows32build=-DW32BITSBUILD -D__MINGW_USE_VC2005_COMPAT goto wntbuild :wnt -set CRYPTO_VERSION=45 -set SSL_VERSION=47 -set TLS_VERSION=19 +rem this port uses the default values for libcrypto and friends. set BIT=64 set windows32build= :wntbuild @@ -164,6 +176,11 @@ rem del garbageout.txt if not exist mailutil mkdir mailutil copy /Y "%ALPINE_IMAP%"\src\mailutil\* mailutil\ > garbageout.txt del garbageout.txt +if defined ALPINE_LIBRESSL del /Q libressl\x86\lib*.lib +if defined ALPINE_LIBRESSL del /Q alpine\lib*.dll +if defined ALPINE_LIBRESSL copy /Y libressl\x86\"%1%"\* libressl\x86\ > garbageout.txt +if defined ALPINE_LIBRESSL copy /Y alpine\DLL\"%1%"\* alpine\ > garbageout.txt +if defined ALPINE_LIBRESSL del garbageout.txt goto build :build diff --git a/imap/src/osdep/nt/ssl_nt.c b/imap/src/osdep/nt/ssl_nt.c index 7169576..39368f0 100644 --- a/imap/src/osdep/nt/ssl_nt.c +++ b/imap/src/osdep/nt/ssl_nt.c @@ -23,8 +23,8 @@ * http://www.apache.org/licenses/LICENSE-2.0 * */ -#if !defined(ENABLE_WINDOWS_LIBRESSL) || !defined(W32BITSBUILD) -#include "ssl_win.c" -#else +#if defined(ENABLE_WINDOWS_LIBRESSL) && (defined(W32BITSBUILD) || defined(WXPBUILD)) #include "ssl_libressl.c" +#else +#include "ssl_win.c" #endif diff --git a/include/config.wnt.h b/include/config.wnt.h index a906b6f..f086793 100644 --- a/include/config.wnt.h +++ b/include/config.wnt.h @@ -559,12 +559,19 @@ #define DF_CA_CONTAINER "CAContainer" #endif /* ENABLE_WINDOWS_LIBRESSL */ -#if !defined(ENABLE_WINDOWS_LIBRESSL) || !defined(W32BITSBUILD) -#undef DF_ENCRYPTION_RANGE -#else +#if defined(ENABLE_WINDOWS_LIBRESSL) && (defined(W32BITSBUILD) || defined(WXPBUILD)) +#define WINDOWS_LIBRESSL_CERTS +#if defined(W32BITSBUILD) +#define DEFAULT_SSLCAPATH "certs" +#define DEFAULT_SSLCAFILE "erts\\cert.pem" +#endif /* W32BITSBUILD */ +#if defined(WXPBUILD) #define DEFAULT_SSLCAPATH "C:\\libressl\\ssl\\certs" #define DEFAULT_SSLCAFILE "C:\\libressl\\ssl\\certs\\cert.pem" -#endif +#endif /* WXPBUILD */ +#else +#undef DF_ENCRYPTION_RANGE +#endif /* defined(ENABLE_WINDOWS_LIBRESSL) && (defined(W32BITSBUILD) || defined(WXPBUILD)) */ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ /* #define TIME_WITH_SYS_TIME */ diff --git a/libressl/x86/README b/libressl/x86/README new file mode 100644 index 0000000..2bde1fa --- /dev/null +++ b/libressl/x86/README @@ -0,0 +1,6 @@ +This directory is populated by the build.bat script. + +* wxp comes from libressl, and can run 32 bits version in Alpine. +* w32 is equal to wxp, but it is intended to be different from it, + and useful for other 32 bits operating systems +* wnt was compiled with cygwin 64 bits. diff --git a/libressl/x86/libcrypto-41.lib b/libressl/x86/w32/libcrypto-41.lib Binary files differindex b85bfdf..b85bfdf 100755..100644 --- a/libressl/x86/libcrypto-41.lib +++ b/libressl/x86/w32/libcrypto-41.lib diff --git a/libressl/x86/libssl-43.lib b/libressl/x86/w32/libssl-43.lib Binary files differindex e1c673b..e1c673b 100755..100644 --- a/libressl/x86/libssl-43.lib +++ b/libressl/x86/w32/libssl-43.lib diff --git a/libressl/x86/libtls-15.lib b/libressl/x86/w32/libtls-15.lib Binary files differindex 216745d..216745d 100755..100644 --- a/libressl/x86/libtls-15.lib +++ b/libressl/x86/w32/libtls-15.lib diff --git a/libressl/x86/libcrypto-45.lib b/libressl/x86/wnt/libcrypto-45.lib Binary files differindex 2dce3de..2dce3de 100644 --- a/libressl/x86/libcrypto-45.lib +++ b/libressl/x86/wnt/libcrypto-45.lib diff --git a/libressl/x86/libssl-47.lib b/libressl/x86/wnt/libssl-47.lib Binary files differindex 495816b..495816b 100644 --- a/libressl/x86/libssl-47.lib +++ b/libressl/x86/wnt/libssl-47.lib diff --git a/libressl/x86/libtls-19.lib b/libressl/x86/wnt/libtls-19.lib Binary files differindex 074b947..074b947 100644 --- a/libressl/x86/libtls-19.lib +++ b/libressl/x86/wnt/libtls-19.lib diff --git a/libressl/x86/wxp/libcrypto-41.lib b/libressl/x86/wxp/libcrypto-41.lib Binary files differnew file mode 100644 index 0000000..b85bfdf --- /dev/null +++ b/libressl/x86/wxp/libcrypto-41.lib diff --git a/libressl/x86/wxp/libssl-43.lib b/libressl/x86/wxp/libssl-43.lib Binary files differnew file mode 100644 index 0000000..e1c673b --- /dev/null +++ b/libressl/x86/wxp/libssl-43.lib diff --git a/libressl/x86/wxp/libtls-15.lib b/libressl/x86/wxp/libtls-15.lib Binary files differnew file mode 100644 index 0000000..216745d --- /dev/null +++ b/libressl/x86/wxp/libtls-15.lib diff --git a/pith/conf.c b/pith/conf.c index c39a19e..dedeb1b 100644 --- a/pith/conf.c +++ b/pith/conf.c @@ -377,7 +377,7 @@ CONF_TXT_T cf_text_mailcap_path[] = "Sets the search path for the mailcap config CONF_TXT_T cf_text_mimetype_path[] = "Sets the search path for the mimetypes configuration file.\n# NOTE: colon delimited under UNIX, semi-colon delimited under DOS/Windows/OS2."; -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) CONF_TXT_T cf_text_system_certs_path[] = "Sets the path for the system ssl certificates issued by a trusted\n# certificate authority. Note that this could be a list of paths, if the same\n# pinerc is used in different systems. Alpine always chooses the first one that\n# it finds. Value must be an absolute path."; CONF_TXT_T cf_text_system_certs_file[] = "Sets the path for the system ssl file container of certificates issued by a\n# certificate authority. Note that this could be a list of container files,\n# if the same pinerc is used in different systems. Alpine always chooses the,\n# first one that it finds. Value must be an absolute path."; @@ -667,7 +667,7 @@ static struct variable variables[] = { NULL, cf_text_mailcap_path}, {"mimetype-search-path", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, NULL, cf_text_mimetype_path}, -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) {"system-certs-path", 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, "System CACerts Dir", cf_text_system_certs_path}, {"system-certs-file", 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, @@ -2388,7 +2388,7 @@ init_vars(struct pine *ps, void (*cmds_f) (struct pine *, char **)) set_current_val(&vars[V_DOWNLOAD_CMD_PREFIX], TRUE, TRUE); set_current_val(&vars[V_MAILCAP_PATH], TRUE, TRUE); set_current_val(&vars[V_MIMETYPE_PATH], TRUE, TRUE); -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) set_current_val(&vars[V_SSLCAPATH], TRUE, TRUE); set_current_val(&vars[V_SSLCAFILE], TRUE, TRUE); #endif @@ -7076,7 +7076,7 @@ feature_gets_an_x(struct pine *ps, struct variable *var, FEATURE_S *feature, test_old_growth_bits(ps, feature->id))))); } -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) void set_system_certs_path(struct pine *ps) { @@ -7967,7 +7967,7 @@ config_help(int var, int feature) return(h_config_mailcap_path); case V_MIMETYPE_PATH : return(h_config_mimetype_path); -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) case V_SSLCAPATH : return(h_config_system_certs_path); case V_SSLCAFILE : diff --git a/pith/conf.h b/pith/conf.h index ac6f0a8..1ed1f90 100644 --- a/pith/conf.h +++ b/pith/conf.h @@ -133,7 +133,7 @@ #define VAR_COLOR_STYLE vars[V_COLOR_STYLE].current_val.p #define GLO_COLOR_STYLE vars[V_COLOR_STYLE].global_val.p #endif -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) #define VAR_SSLCAPATH vars[V_SSLCAPATH].current_val.l #define GLO_SSLCAPATH vars[V_SSLCAPATH].global_val.l #define VAR_SSLCAFILE vars[V_SSLCAFILE].current_val.l @@ -922,7 +922,7 @@ char **get_supported_options(void); unsigned reset_startup_rule(MAILSTREAM *); void free_pinerc_lines(PINERC_LINE **); void panic1(char *, char *); -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) void set_system_certs_path(struct pine *); void set_system_certs_container(struct pine *); #endif diff --git a/pith/conftype.h b/pith/conftype.h index 029b81b..ca31618 100644 --- a/pith/conftype.h +++ b/pith/conftype.h @@ -125,7 +125,7 @@ typedef enum { V_PERSONAL_NAME = 0 , V_DOWNLOAD_CMD_PREFIX , V_MAILCAP_PATH , V_MIMETYPE_PATH -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) , V_SSLCAPATH , V_SSLCAFILE #endif diff --git a/pith/pine.hlp b/pith/pine.hlp index 2a73d94..fa22dd9 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 404 2020-02-06 15:41:28 +Alpine Commit 407 2020-02-09 22:46:28 ============= h_news ================= <HTML> <HEAD> |