plan9: update patches

libressl · Apr 29, 2019 · a1e979f · a1e979f
1 parent 3160fe9
commit a1e979f
Show file tree

Hide file tree

Showing 4 changed files with 232 additions and 130 deletions.
diff --git a/plan9/apps.patch b/plan9/apps.patch
@@ -1,6 +1,6 @@
-diff -upr -X mkfile apps/openssl/apps.c apps.plan9/openssl/apps.c
---- apps/openssl/apps.c	2019-03-18 01:33:08.000000000 +0900
-+++ apps.plan9/openssl/apps.c	2019-03-14 01:27:34.000000000 +0900
+diff -uprN -X mkfile apps.orig/openssl/apps.c apps/openssl/apps.c
+--- apps.orig/openssl/apps.c	2019-03-18 01:33:08.000000000 +0900
++++ apps/openssl/apps.c	2019-04-29 12:55:15.000000000 +0900
 @@ -146,6 +146,7 @@
  #include <openssl/x509v3.h>
 
@@ -9,9 +9,9 @@ diff -upr -X mkfile apps/openssl/apps.c apps.plan9/openssl/apps.c
 
  typedef struct {
  	const char *name;
-diff -upr -X mkfile apps/openssl/ciphers.c apps.plan9/openssl/ciphers.c
---- apps/openssl/ciphers.c	2018-07-03 23:22:47.000000000 +0900
-+++ apps.plan9/openssl/ciphers.c	2019-03-14 01:27:34.000000000 +0900
+diff -uprN -X mkfile apps.orig/openssl/ciphers.c apps/openssl/ciphers.c
+--- apps.orig/openssl/ciphers.c	2018-07-03 23:22:47.000000000 +0900
++++ apps/openssl/ciphers.c	2019-04-29 12:55:15.000000000 +0900
 @@ -49,14 +49,18 @@ struct option ciphers_options[] = {
  		.name = "v",
  		.desc = "Provide cipher listing",
@@ -33,9 +33,9 @@ diff -upr -X mkfile apps/openssl/ciphers.c apps.plan9/openssl/ciphers.c
  		.value = 2,
  	},
  	{ NULL },
-diff -upr -X mkfile apps/openssl/dhparam.c apps.plan9/openssl/dhparam.c
---- apps/openssl/dhparam.c	2018-07-03 23:22:47.000000000 +0900
-+++ apps.plan9/openssl/dhparam.c	2019-03-17 15:44:04.000000000 +0900
+diff -uprN -X mkfile apps.orig/openssl/dhparam.c apps/openssl/dhparam.c
+--- apps.orig/openssl/dhparam.c	2018-07-03 23:22:47.000000000 +0900
++++ apps/openssl/dhparam.c	2019-04-29 12:55:15.000000000 +0900
 @@ -150,14 +150,18 @@ struct option dhparam_options[] = {
  		.desc = "Generate DH parameters with a generator value of 2 "
  		    "(default)",
@@ -57,9 +57,9 @@ diff -upr -X mkfile apps/openssl/dhparam.c apps.plan9/openssl/dhparam.c
  		.value = 5,
  	},
  	{
-diff -upr -X mkfile apps/openssl/enc.c apps.plan9/openssl/enc.c
---- apps/openssl/enc.c	2019-03-18 01:33:08.000000000 +0900
-+++ apps.plan9/openssl/enc.c	2019-03-14 01:27:34.000000000 +0900
+diff -uprN -X mkfile apps.orig/openssl/enc.c apps/openssl/enc.c
+--- apps.orig/openssl/enc.c	2019-04-29 12:49:58.000000000 +0900
++++ apps/openssl/enc.c	2019-04-29 12:55:15.000000000 +0900
 @@ -153,7 +153,9 @@ static struct option enc_options[] = {
  		.name = "d",
  		.desc = "Decrypt the input data",
@@ -114,9 +114,9 @@ diff -upr -X mkfile apps/openssl/enc.c apps.plan9/openssl/enc.c
  		.value = 1,
  	},
  	{
-diff -upr -X mkfile apps/openssl/s_time.c apps.plan9/openssl/s_time.c
---- apps/openssl/s_time.c	2019-02-16 22:08:41.000000000 +0900
-+++ apps.plan9/openssl/s_time.c	2019-03-14 01:27:34.000000000 +0900
+diff -uprN -X mkfile apps.orig/openssl/s_time.c apps/openssl/s_time.c
+--- apps.orig/openssl/s_time.c	2019-02-16 22:08:41.000000000 +0900
++++ apps/openssl/s_time.c	2019-04-29 12:55:15.000000000 +0900
 @@ -175,7 +175,9 @@ struct option s_time_options[] = {
  		.name = "new",
  		.desc = "Use a new session ID for each connection",
@@ -139,9 +139,9 @@ diff -upr -X mkfile apps/openssl/s_time.c apps.plan9/openssl/s_time.c
  		.value = 2,
  	},
  	{
-diff -upr -X mkfile apps/openssl/x509.c apps.plan9/openssl/x509.c
---- apps/openssl/x509.c	2019-02-16 22:08:41.000000000 +0900
-+++ apps.plan9/openssl/x509.c	2019-03-14 01:27:34.000000000 +0900
+diff -uprN -X mkfile apps.orig/openssl/x509.c apps/openssl/x509.c
+--- apps.orig/openssl/x509.c	2019-02-16 22:08:41.000000000 +0900
++++ apps/openssl/x509.c	2019-04-29 12:55:15.000000000 +0900
 @@ -65,6 +65,7 @@
  #include "apps.h"