diff options
Diffstat (limited to 'sdk/recipes/patches/openssl/m68k-unknown-amigaos')
-rw-r--r-- | sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p | 6 | ||||
-rw-r--r-- | sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.include.http_server.h.p | 11 | ||||
-rw-r--r-- | sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p | 26 | ||||
-rw-r--r-- | sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p (renamed from sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c) | 2 | ||||
-rw-r--r-- | sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p | 9 | ||||
-rw-r--r-- | sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p | 32 | ||||
-rw-r--r-- | sdk/recipes/patches/openssl/m68k-unknown-amigaos/include.openssl.e_os2.h.p | 11 | ||||
-rw-r--r-- | sdk/recipes/patches/openssl/m68k-unknown-amigaos/providers.implementations.rands.seeding.build.info.p | 12 |
8 files changed, 55 insertions, 54 deletions
diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p index 947eeca..1e677d2 100644 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p @@ -1,6 +1,6 @@ ---- apps.c 2014-10-15 13:53:39.000000000 +0100 -+++ apps/apps.c 2015-01-05 21:02:13.650018727 +0000 -@@ -2872,10 +2872,11 @@ double app_tminterval(int stop, int user +--- apps/lib/apps.c.orig 2014-10-15 13:53:39.000000000 +0100 ++++ apps/lib/apps.c 2015-01-05 21:02:13.650018727 +0000 +@@ -2797,10 +2797,11 @@ double app_tminterval(int stop, int user struct rusage rus; struct timeval now; static struct timeval tmstart; diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.include.http_server.h.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.include.http_server.h.p new file mode 100644 index 0000000..8d9684e --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.include.http_server.h.p @@ -0,0 +1,11 @@ +--- apps/include/http_server.h.orig 2017-11-21 22:49:00.185608040 +0000 ++++ apps/include/http_server.h 2017-11-21 22:49:21.488219518 +0000 +@@ -27,7 +27,7 @@ + # endif + + # if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \ +- && !defined(OPENSSL_NO_POSIX_IO) ++ && !defined(OPENSSL_NO_POSIX_IO) && !defined(NO_SYSLOG) + # define HTTP_DAEMON + # include <sys/types.h> + # include <sys/wait.h> diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p index 1d506af..93db04c 100644 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p @@ -1,14 +1,14 @@ ---- crypto/bio/b_sock2.c.orig 2017-11-23 12:39:17.912640213 +0000 -+++ crypto/bio/b_sock2.c 2017-11-23 12:41:56.350294762 +0000 -@@ -94,6 +94,7 @@ +--- crypto/bio/bio_sock2.c.orig 2019-02-15 10:07:24.181612545 +0000 ++++ crypto/bio/bio_sock2.c 2019-02-15 10:07:15.637654488 +0000 +@@ -98,6 +98,7 @@ } } +#if defined(TCP_NODELAY) if (options & BIO_SOCK_NODELAY) { - if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)) != 0) { - SYSerr(SYS_F_SETSOCKOPT, get_last_socket_error()); -@@ -101,6 +102,7 @@ + if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, + (const void *)&on, sizeof(on)) != 0) { +@@ -107,6 +108,7 @@ return 0; } } @@ -16,21 +16,19 @@ if (connect(sock, BIO_ADDR_sockaddr(addr), BIO_ADDR_sockaddr_size(addr)) == -1) { ---- crypto/bio/b_sock2.c.orig 2017-11-23 12:43:56.318461652 +0000 -+++ crypto/bio/b_sock2.c 2017-11-23 12:44:36.139861658 +0000 -@@ -193,6 +193,7 @@ +@@ -252,6 +254,7 @@ } } +#if defined(TCP_NODELAY) if (options & BIO_SOCK_NODELAY) { - if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)) != 0) { - SYSerr(SYS_F_SETSOCKOPT, get_last_socket_error()); -@@ -200,6 +201,7 @@ + if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, + (const void *)&on, sizeof(on)) != 0) { +@@ -261,6 +264,7 @@ return 0; } } +#endif - # ifdef IPV6_V6ONLY - if ((options & BIO_SOCK_V6_ONLY) && BIO_ADDR_family(addr) == AF_INET6) { + /* On OpenBSD it is always ipv6 only with ipv6 sockets thus read-only */ + # if defined(IPV6_V6ONLY) && !defined(__OpenBSD__) diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p index 0d5492f..3fa3a53 100644 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p @@ -1,6 +1,6 @@ --- crypto/bn/bn_div.c 2017-01-26 13:22:03.000000000 +0000 +++ crypto/bn/bn_div.c 2017-02-11 16:06:29.437010335 +0000 -@@ -175,6 +175,22 @@ int BN_div(BIGNUM *dv, BIGNUM *rem, cons +@@ -194,6 +194,22 @@ int BN_div(BIGNUM *dv, BIGNUM *rem, cons q; \ }) # define REMAINDER_IS_ALREADY_CALCULATED diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p deleted file mode 100644 index 58b672f..0000000 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p +++ /dev/null @@ -1,9 +0,0 @@ ---- crypto/rand/build.info.orig 2017-11-22 11:36:06.585363219 +0000 -+++ crypto/rand/build.info 2017-11-22 11:36:39.267232034 +0000 -@@ -1,4 +1,4 @@ - LIBS=../../libcrypto - SOURCE[../../libcrypto]=\ -- md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \ -- rand_win.c rand_unix.c rand_vms.c -+ md_rand.c randfile.c rand_lib.c rand_err.c rand_amiga.c \ -+ rand_egd.c rand_win.c rand_unix.c rand_vms.c diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p index 0448499..3407a48 100644 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p @@ -1,21 +1,21 @@ --- crypto/ui/ui_openssl.c.orig 2017-11-23 13:22:15.760078583 +0000 +++ crypto/ui/ui_openssl.c 2017-11-23 13:21:40.534382076 +0000 -@@ -99,6 +99,18 @@ +@@ -103,6 +103,18 @@ + # undef SGTTY + # endif - #endif - -+#if defined(OPENSSL_SYS_AMIGAOS3) -+#undef TERMIOS -+#undef TERMIO -+#undef SGTTY ++# if defined(OPENSSL_SYS_AMIGAOS3) ++# undef TERMIOS ++# undef TERMIO ++# undef SGTTY +struct termios { int foo; }; -+# define TTY_STRUCT struct termios -+# define TTY_FLAGS foo -+# define TTY_get(tty,data) /* tcgetattr(tty,data) */ -1 -+# define TTY_set(tty,data) /* tcsetattr(tty,TCSANOW,data) */ 0 -+# define ECHO 0 -+#endif ++# define TTY_STRUCT struct termios ++# define TTY_FLAGS foo ++# define TTY_get(tty,data) /* tcgetattr(tty,data) */ -1 ++# define TTY_set(tty,data) /* tcsetattr(tty,TCSANOW,data) */ 0 ++# define ECHO 0 ++# endif + - #ifdef TERMIOS - # include <termios.h> - # define TTY_STRUCT struct termios + # ifdef TERMIOS + # include <termios.h> + # define TTY_STRUCT struct termios diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/include.openssl.e_os2.h.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/include.openssl.e_os2.h.p deleted file mode 100644 index 6ea1ec8..0000000 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/include.openssl.e_os2.h.p +++ /dev/null @@ -1,11 +0,0 @@ ---- include/openssl/e_os2.h.orig 2017-11-21 23:09:39.684814614 +0000 -+++ include/openssl/e_os2.h 2017-11-21 23:10:32.501369938 +0000 -@@ -223,6 +223,8 @@ - # define OSSL_SSIZE_MAX SSIZE_MAX - # elif defined(_POSIX_SSIZE_MAX) - # define OSSL_SSIZE_MAX _POSIX_SSIZE_MAX -+# else -+# define OSSL_SSIZE_MAX INT_MAX - # endif - # endif - diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/providers.implementations.rands.seeding.build.info.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/providers.implementations.rands.seeding.build.info.p new file mode 100644 index 0000000..c887eff --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/providers.implementations.rands.seeding.build.info.p @@ -0,0 +1,12 @@ +--- providers/implementations/rands/seeding/build.info.orig 2017-11-21 22:49:00.185608040 +0000 ++++ providers/implementations/rands/seeding/build.info 2017-11-21 22:49:21.488219518 +0000 +@@ -5,6 +5,9 @@ + IF[{- $config{target} =~ /vms/i -}] + $COMMON=$COMMON rand_vms.c + ENDIF ++IF[{- $config{target} =~ /amiga/i -}] ++ $COMMON=$COMMON rand_amiga.c ++ENDIF + + SOURCE[../../../libdefault.a]=$COMMON + |