regen patches

author: Theo Buehler <tb@openbsd.org> 2024-08-02 23:59:19 -0600
committer: Theo Buehler <tb@openbsd.org> 2024-08-02 23:59:19 -0600
commit: 5eb1c40e180de2db1781df890997f15a9affab22 (patch)
tree: 811eea332c4bab314122cb7ec6d4db2344c3637c
parent: 695bdfc4b63939241be6d81116e1f4a567f9a0e7 (diff)
download: portable-5eb1c40e180de2db1781df890997f15a9affab22.tar.gz
portable-5eb1c40e180de2db1781df890997f15a9affab22.tar.bz2
portable-5eb1c40e180de2db1781df890997f15a9affab22.zip
3 files changed, 9 insertions, 9 deletions
diff --git a/patches/crypto_namespace.h.patch b/patches/crypto_namespace.h.patch
index c18f0da..400030f 100644
--- a/patches/crypto_namespace.h.patch
+++ b/patches/crypto_namespace.h.patch
@@ -1,5 +1,5 @@
--- crypto/hidden/crypto_namespace.h.orig       2024-04-09 10:12:22.320737957 +0200
+--- crypto/hidden/crypto_namespace.h.orig       Fri Aug  2 23:52:55 2024
-+++ crypto/hidden/crypto_namespace.h    2024-04-11 09:09:31.163350515 +0200
+++ crypto/hidden/crypto_namespace.h    Fri Aug  2 23:53:17 2024
 @@ -24,6 +24,12 @@
  * external calls use the latter name.
  */
@@ -13,7 +13,7 @@
 #ifdef LIBRESSL_NAMESPACE
 #ifdef LIBRESSL_CRYPTO_NAMESPACE
 #  define LCRYPTO_UNUSED(x)    __attribute__((deprecated))             \
-@@ -43,5 +49,6 @@
+@@ -47,5 +53,6 @@
 # define LCRYPTO_ALIAS1(pre,x)
 # define LCRYPTO_ALIAS(x)      asm("")
 #endif
diff --git a/patches/openssl.c.patch b/patches/openssl.c.patch
index 15afb78..4e0887c 100644
--- a/patches/openssl.c.patch
+++ b/patches/openssl.c.patch
@@ -1,6 +1,6 @@
--- apps/openssl/openssl.c.orig Mon Mar  4 13:39:56 2024
+--- apps/openssl/openssl.c.orig Fri Aug  2 23:52:59 2024
-+++ apps/openssl/openssl.c      Mon Mar  4 13:40:15 2024
+++ apps/openssl/openssl.c      Fri Aug  2 23:53:17 2024
-@@ -348,7 +348,9 @@
+@@ -347,7 +347,9 @@ BIO *bio_err = NULL;
 static void
 openssl_startup(void)
 {
diff --git a/patches/ssl_namespace.h.patch b/patches/ssl_namespace.h.patch
index 758f8dc..eb9c7a2 100644
--- a/patches/ssl_namespace.h.patch
+++ b/patches/ssl_namespace.h.patch
@@ -1,5 +1,5 @@
--- openbsd/src/lib/libssl/hidden/ssl_namespace.h       2023-03-15 11:41:52.481641800 -0600
+--- ssl/hidden/ssl_namespace.h.orig     Fri Aug  2 23:52:55 2024
-+++ ssl/hidden/ssl_namespace.h  2023-03-15 17:28:04.685309300 -0600
+++ ssl/hidden/ssl_namespace.h  Fri Aug  2 23:53:17 2024
 @@ -23,6 +23,11 @@
  * and we alias that to the normal name.
  */
@@ -12,7 +12,7 @@
 #ifdef LIBRESSL_NAMESPACE
 #define LSSL_UNUSED(x)         typeof(x) x __attribute__((deprecated))
 #define LSSL_USED(x)           __attribute__((visibility("hidden")))   \
-@@ -33,5 +38,6 @@
+@@ -37,5 +42,6 @@
 #define LSSL_USED(x)
 #define LSSL_ALIAS(x)          asm("")
 #endif
author	Theo Buehler <tb@openbsd.org>	2024-08-02 23:59:19 -0600
committer	Theo Buehler <tb@openbsd.org>	2024-08-02 23:59:19 -0600
commit	5eb1c40e180de2db1781df890997f15a9affab22 (patch)
tree	811eea332c4bab314122cb7ec6d4db2344c3637c
parent	695bdfc4b63939241be6d81116e1f4a567f9a0e7 (diff)
download	portable-5eb1c40e180de2db1781df890997f15a9affab22.tar.gz portable-5eb1c40e180de2db1781df890997f15a9affab22.tar.bz2 portable-5eb1c40e180de2db1781df890997f15a9affab22.zip

diff --git a/patches/crypto_namespace.h.patch b/patches/crypto_namespace.h.patch index c18f0da..400030f 100644 --- a/patches/crypto_namespace.h.patch +++ b/patches/crypto_namespace.h.patch
@@ -1,5 +1,5 @@
1	--- crypto/hidden/crypto_namespace.h.orig 2024-04-09 10:12:22.320737957 +0200	1	--- crypto/hidden/crypto_namespace.h.orig Fri Aug 2 23:52:55 2024
2	+++ crypto/hidden/crypto_namespace.h 2024-04-11 09:09:31.163350515 +0200	2	+++ crypto/hidden/crypto_namespace.h Fri Aug 2 23:53:17 2024
3	@@ -24,6 +24,12 @@	3	@@ -24,6 +24,12 @@
4	* external calls use the latter name.	4	* external calls use the latter name.
5	*/	5	*/
@@ -13,7 +13,7 @@
13	#ifdef LIBRESSL_NAMESPACE	13	#ifdef LIBRESSL_NAMESPACE
14	#ifdef LIBRESSL_CRYPTO_NAMESPACE	14	#ifdef LIBRESSL_CRYPTO_NAMESPACE
15	# define LCRYPTO_UNUSED(x) __attribute__((deprecated)) \	15	# define LCRYPTO_UNUSED(x) __attribute__((deprecated)) \
16	@@ -43,5 +49,6 @@	16	@@ -47,5 +53,6 @@
17	# define LCRYPTO_ALIAS1(pre,x)	17	# define LCRYPTO_ALIAS1(pre,x)
18	# define LCRYPTO_ALIAS(x) asm("")	18	# define LCRYPTO_ALIAS(x) asm("")
19	#endif	19	#endif


diff --git a/patches/openssl.c.patch b/patches/openssl.c.patch index 15afb78..4e0887c 100644 --- a/patches/openssl.c.patch +++ b/patches/openssl.c.patch
@@ -1,6 +1,6 @@
1	--- apps/openssl/openssl.c.orig Mon Mar 4 13:39:56 2024	1	--- apps/openssl/openssl.c.orig Fri Aug 2 23:52:59 2024
2	+++ apps/openssl/openssl.c Mon Mar 4 13:40:15 2024	2	+++ apps/openssl/openssl.c Fri Aug 2 23:53:17 2024
3	@@ -348,7 +348,9 @@	3	@@ -347,7 +347,9 @@ BIO *bio_err = NULL;
4	static void	4	static void
5	openssl_startup(void)	5	openssl_startup(void)
6	{	6	{


diff --git a/patches/ssl_namespace.h.patch b/patches/ssl_namespace.h.patch index 758f8dc..eb9c7a2 100644 --- a/patches/ssl_namespace.h.patch +++ b/patches/ssl_namespace.h.patch
@@ -1,5 +1,5 @@
1	--- openbsd/src/lib/libssl/hidden/ssl_namespace.h 2023-03-15 11:41:52.481641800 -0600	1	--- ssl/hidden/ssl_namespace.h.orig Fri Aug 2 23:52:55 2024
2	+++ ssl/hidden/ssl_namespace.h 2023-03-15 17:28:04.685309300 -0600	2	+++ ssl/hidden/ssl_namespace.h Fri Aug 2 23:53:17 2024
3	@@ -23,6 +23,11 @@	3	@@ -23,6 +23,11 @@
4	* and we alias that to the normal name.	4	* and we alias that to the normal name.
5	*/	5	*/
@@ -12,7 +12,7 @@
12	#ifdef LIBRESSL_NAMESPACE	12	#ifdef LIBRESSL_NAMESPACE
13	#define LSSL_UNUSED(x) typeof(x) x __attribute__((deprecated))	13	#define LSSL_UNUSED(x) typeof(x) x __attribute__((deprecated))
14	#define LSSL_USED(x) __attribute__((visibility("hidden"))) \	14	#define LSSL_USED(x) __attribute__((visibility("hidden"))) \
15	@@ -33,5 +38,6 @@	15	@@ -37,5 +42,6 @@
16	#define LSSL_USED(x)	16	#define LSSL_USED(x)
17	#define LSSL_ALIAS(x) asm("")	17	#define LSSL_ALIAS(x) asm("")
18	#endif	18	#endif