diff options
author | joerg <joerg@pkgsrc.org> | 2016-04-03 20:24:27 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2016-04-03 20:24:27 +0000 |
commit | 6194f3bdb308c58c05dbd7d4791d577196bfc925 (patch) | |
tree | 73ac91cdfe6a94c06dfc6b1506b095915adaeb7a | |
parent | c4eac3acd298b0185beb9817e31e959394e135b9 (diff) | |
download | pkgsrc-6194f3bdb308c58c05dbd7d4791d577196bfc925.tar.gz |
Don't remove SSLv2 support.
XXX Kill whole package after pkgsrc-2016Q1 for various issues like using
XXX K&R code and not being 64bit safe
-rw-r--r-- | www/screws/distinfo | 6 | ||||
-rw-r--r-- | www/screws/patches/patch-src_Server_Config.c | 14 | ||||
-rw-r--r-- | www/screws/patches/patch-src_Server_IO__buffer.c | 13 | ||||
-rw-r--r-- | www/screws/patches/patch-src_Server_Ssl.c | 14 | ||||
-rw-r--r-- | www/screws/patches/patch-src_Server_Ssl.h | 12 |
5 files changed, 58 insertions, 1 deletions
diff --git a/www/screws/distinfo b/www/screws/distinfo index 7b9121e75e0..9ab50d34809 100644 --- a/www/screws/distinfo +++ b/www/screws/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2015/11/04 02:47:38 agc Exp $ +$NetBSD: distinfo,v 1.18 2016/04/03 20:24:27 joerg Exp $ SHA1 (screws-0.56.tar.gz) = 3335e7e7116561499ee7164831c31df4ecebe403 RMD160 (screws-0.56.tar.gz) = 5d7f1af67a42cd5726f0d4708713bb13c4c8fe21 @@ -15,3 +15,7 @@ SHA1 (patch-ah) = 90ba05b735295caa1ce6974ac5d7c1d35799c49f SHA1 (patch-ai) = 76c15330b3f3ba3c9d7442d98ea461e6b89ce33d SHA1 (patch-aj) = f2b4c3d70c309a5221fea0d6ff008a597c9f8411 SHA1 (patch-ak) = fde982c23af9f6c1d724276f8e8f5dd19b0faebe +SHA1 (patch-src_Server_Config.c) = 385339a7ac651b139963b3dba1a81dde26d407ff +SHA1 (patch-src_Server_IO__buffer.c) = c695f7dfaa2f000ab191edc339c1c02b95641a42 +SHA1 (patch-src_Server_Ssl.c) = a782d93fef0ac57c05876b3567f15321c7797207 +SHA1 (patch-src_Server_Ssl.h) = 2dd870425c5642303fd5a34231b3c1cd72795a24 diff --git a/www/screws/patches/patch-src_Server_Config.c b/www/screws/patches/patch-src_Server_Config.c new file mode 100644 index 00000000000..ba697f4235f --- /dev/null +++ b/www/screws/patches/patch-src_Server_Config.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Server_Config.c,v 1.1 2016/04/03 20:24:27 joerg Exp $ + +--- src/Server/Config.c.orig 2016-04-03 16:01:12.152955846 +0000 ++++ src/Server/Config.c +@@ -648,9 +648,6 @@ conf_parse_key(line,buf,key) + case K_ENC: + sscanf(buf,"%*s %s",b[0]); + if ( conf_check_args(b,1) ) return ERROR_PREVIOUS; +- if (!strcmp(b[0],"ssl2")) +- Svr.enc=ENC_SSL2; +- else + if (!strcmp(b[0],"ssl3")) + Svr.enc=ENC_SSL3; + else diff --git a/www/screws/patches/patch-src_Server_IO__buffer.c b/www/screws/patches/patch-src_Server_IO__buffer.c new file mode 100644 index 00000000000..251b981f9b5 --- /dev/null +++ b/www/screws/patches/patch-src_Server_IO__buffer.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_Server_IO__buffer.c,v 1.1 2016/04/03 20:24:27 joerg Exp $ + +--- src/Server/IO_buffer.c.orig 2016-04-03 16:02:03.907973300 +0000 ++++ src/Server/IO_buffer.c +@@ -7,6 +7,8 @@ + #define NEWBUFFER 1 + #define BLOCKING 1 + ++bool screws_send(int s,int b, char *i); ++ + void + IO_buffer(n,s,out) + int n; diff --git a/www/screws/patches/patch-src_Server_Ssl.c b/www/screws/patches/patch-src_Server_Ssl.c new file mode 100644 index 00000000000..3cbeba90bbd --- /dev/null +++ b/www/screws/patches/patch-src_Server_Ssl.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Server_Ssl.c,v 1.1 2016/04/03 20:24:27 joerg Exp $ + +--- src/Server/Ssl.c.orig 2016-04-03 16:00:51.049640130 +0000 ++++ src/Server/Ssl.c +@@ -82,9 +82,6 @@ SslInit(n,ctx) + + switch(Svr.enc) + { +- case ENC_SSL2: +- sm=SSLv2_server_method(); +- break; + case ENC_SSL3: + sm=SSLv3_server_method(); + break; diff --git a/www/screws/patches/patch-src_Server_Ssl.h b/www/screws/patches/patch-src_Server_Ssl.h new file mode 100644 index 00000000000..e58d70cda29 --- /dev/null +++ b/www/screws/patches/patch-src_Server_Ssl.h @@ -0,0 +1,12 @@ +$NetBSD: patch-src_Server_Ssl.h,v 1.1 2016/04/03 20:24:27 joerg Exp $ + +--- src/Server/Ssl.h.orig 2016-04-03 16:01:03.871663755 +0000 ++++ src/Server/Ssl.h +@@ -9,7 +9,6 @@ + #endif + + enum { +- ENC_SSL2, + ENC_SSL3, + ENC_SSL23, + ENC_TLS |