Gentoo Archives: gentoo-commits

From: Quentin Retornaz <gentoo@××××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-libs/libressl/files/
Date: Sun, 01 May 2022 00:19:37
Message-Id: 1651364258.eefe807a0f692c62161d6acefc3957bdacba0f22.quentin@gentoo
1 commit: eefe807a0f692c62161d6acefc3957bdacba0f22
2 Author: orbea <orbea <AT> riseup <DOT> net>
3 AuthorDate: Fri Apr 29 23:40:26 2022 +0000
4 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
5 CommitDate: Sun May 1 00:17:38 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=eefe807a
7
8 dev-libs/libressl: Remove old patches
9
10 Signed-off-by: orbea <orbea <AT> riseup.net>
11 Closes: https://github.com/gentoo/libressl/pull/399
12 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
13
14 .../libressl/files/libressl-2.9.2-non-glibc.patch | 32 -------------
15 dev-libs/libressl/files/libressl-3.2.2-build.patch | 56 ----------------------
16 dev-libs/libressl/files/libressl-3.4.0-x509.patch | 51 --------------------
17 3 files changed, 139 deletions(-)
18
19 diff --git a/dev-libs/libressl/files/libressl-2.9.2-non-glibc.patch b/dev-libs/libressl/files/libressl-2.9.2-non-glibc.patch
20 deleted file mode 100644
21 index b00316d..0000000
22 --- a/dev-libs/libressl/files/libressl-2.9.2-non-glibc.patch
23 +++ /dev/null
24 @@ -1,32 +0,0 @@
25 -From a9f0b2143c3154da34b8798127263f6f11f61bd5 Mon Sep 17 00:00:00 2001
26 -From: Ishimoto Shinobu <47295761+protonesso@××××××××××××××××××××.com>
27 -Date: Tue, 21 May 2019 22:41:05 +0900
28 -Subject: [PATCH] avoid glibc
29 -
30 -cause problems on musl systems
31 -
32 -Upstream-Status: Backport
33 -[https://github.com/libressl-portable/portable/pull/529]
34 -Signed-off-by: Stefan Strogin <steils@g.o>
35 ----
36 - crypto/compat/getprogname_linux.c | 4 +---
37 - 1 file changed, 1 insertion(+), 3 deletions(-)
38 -
39 -diff --git a/crypto/compat/getprogname_linux.c b/crypto/compat/getprogname_linux.c
40 -index 2c89743..4e7e31f 100644
41 ---- a/crypto/compat/getprogname_linux.c
42 -+++ b/crypto/compat/getprogname_linux.c
43 -@@ -26,9 +26,7 @@ getprogname(void)
44 - #if defined(__ANDROID_API__) && __ANDROID_API__ < 21
45 - extern const char *__progname;
46 - return __progname;
47 --#elif defined(__GLIBC__)
48 -- return program_invocation_short_name;
49 - #else
50 --#error "Cannot emulate getprogname"
51 -+ return program_invocation_short_name;
52 - #endif
53 - }
54 ---
55 -2.21.0
56 -
57
58 diff --git a/dev-libs/libressl/files/libressl-3.2.2-build.patch b/dev-libs/libressl/files/libressl-3.2.2-build.patch
59 deleted file mode 100644
60 index 586e7a7..0000000
61 --- a/dev-libs/libressl/files/libressl-3.2.2-build.patch
62 +++ /dev/null
63 @@ -1,56 +0,0 @@
64 -From 9abd36e3af5876f67c633f27496ad5660ab7fe24 Mon Sep 17 00:00:00 2001
65 -From: Brent Cook <busterb@×××××.com>
66 -Date: Sun, 18 Oct 2020 22:14:03 -0500
67 -Subject: [PATCH] modify nc build to link libcompat objects directly
68 -
69 -Rather than assuming the static version of libcrypto exists for pulling in the compatibility functions, link the compat objects directly. This modifies the object file generation script a bit to handle the empty-case properly as well.
70 ----
71 - apps/nc/Makefile.am | 8 ++++++--
72 - crypto/Makefile.am | 4 ++--
73 - 2 files changed, 8 insertions(+), 4 deletions(-)
74 -
75 -diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am
76 -index d678f1eda..58b5c0118 100644
77 ---- a/apps/nc/Makefile.am
78 -+++ b/apps/nc/Makefile.am
79 -@@ -1,5 +1,7 @@
80 - include $(top_srcdir)/Makefile.am.common
81 -
82 -+-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
83 -+
84 - if BUILD_NC
85 -
86 - if ENABLE_NC
87 -@@ -12,11 +14,13 @@ endif
88 - EXTRA_DIST = nc.1
89 - EXTRA_DIST += CMakeLists.txt
90 -
91 --nc_LDFLAGS = $(abs_top_builddir)/crypto/.libs/libcrypto.a
92 --
93 - nc_LDADD = $(abs_top_builddir)/tls/libtls.la
94 - nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
95 -
96 -+nc_LDADD += $(libcrypto_la_objects)
97 -+nc_LDADD += $(libcompat_la_objects)
98 -+nc_LDADD += $(libcompatnoopt_la_objects)
99 -+
100 - AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat
101 -
102 - nc_SOURCES = atomicio.c
103 -diff --git a/crypto/Makefile.am b/crypto/Makefile.am
104 -index 97a84e1a7..e32ca96c3 100644
105 ---- a/crypto/Makefile.am
106 -+++ b/crypto/Makefile.am
107 -@@ -99,10 +99,10 @@ libcrypto_la_objects.mk: Makefile
108 - | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \
109 - > libcrypto_la_objects.mk
110 - @echo "libcompat_la_objects= $(libcompat_la_OBJECTS)" \
111 -- | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \
112 -+ | sed 's/compat\// $$\(abs_top_builddir\)\/crypto\/&/g' \
113 - >> libcrypto_la_objects.mk
114 - @echo "libcompatnoopt_la_objects= $(libcompatnoopt_la_OBJECTS)" \
115 -- | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \
116 -+ | sed 's/compat\// $$\(abs_top_builddir\)\/crypto\/&/g' \
117 - >> libcrypto_la_objects.mk
118 -
119 - libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym
120
121 diff --git a/dev-libs/libressl/files/libressl-3.4.0-x509.patch b/dev-libs/libressl/files/libressl-3.4.0-x509.patch
122 deleted file mode 100644
123 index c7d83e0..0000000
124 --- a/dev-libs/libressl/files/libressl-3.4.0-x509.patch
125 +++ /dev/null
126 @@ -1,51 +0,0 @@
127 -diff --git a/crypto/x509/x509_constraints.c b/crypto/x509/x509_constraints.c
128 -index fade58c..9ad5d4b 100644
129 ---- a/crypto/x509/x509_constraints.c
130 -+++ b/crypto/x509/x509_constraints.c
131 -@@ -339,16 +339,16 @@ x509_constraints_parse_mailbox(uint8_t *candidate, size_t len,
132 - if (c == '.')
133 - goto bad;
134 - }
135 -- if (wi > DOMAIN_PART_MAX_LEN)
136 -- goto bad;
137 - if (accept) {
138 -+ if (wi > DOMAIN_PART_MAX_LEN)
139 -+ goto bad;
140 - working[wi++] = c;
141 - accept = 0;
142 - continue;
143 - }
144 - if (candidate_local != NULL) {
145 - /* We are looking for the domain part */
146 -- if (wi > DOMAIN_PART_MAX_LEN)
147 -+ if (wi >= DOMAIN_PART_MAX_LEN)
148 - goto bad;
149 - working[wi++] = c;
150 - if (i == len - 1) {
151 -@@ -363,7 +363,7 @@ x509_constraints_parse_mailbox(uint8_t *candidate, size_t len,
152 - continue;
153 - }
154 - /* We are looking for the local part */
155 -- if (wi > LOCAL_PART_MAX_LEN)
156 -+ if (wi >= LOCAL_PART_MAX_LEN)
157 - break;
158 -
159 - if (quoted) {
160 -@@ -383,6 +383,8 @@ x509_constraints_parse_mailbox(uint8_t *candidate, size_t len,
161 - */
162 - if (c == 9)
163 - goto bad;
164 -+ if (wi >= LOCAL_PART_MAX_LEN)
165 -+ goto bad;
166 - working[wi++] = c;
167 - continue; /* all's good inside our quoted string */
168 - }
169 -@@ -412,6 +414,8 @@ x509_constraints_parse_mailbox(uint8_t *candidate, size_t len,
170 - }
171 - if (!local_part_ok(c))
172 - goto bad;
173 -+ if (wi >= LOCAL_PART_MAX_LEN)
174 -+ goto bad;
175 - working[wi++] = c;
176 - }
177 - if (candidate_local == NULL || candidate_domain == NULL)