Browse code

missing patches openssl

Hanno Böck authored on 07/09/2015 11:24:39
Showing 2 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,30 @@
1
+https://bugs.gentoo.org/554338
2
+https://rt.openssl.org/Ticket/Display.html?id=3934&user=guest&pass=guest
3
+
4
+From 7c2e97f8bbae517496fdc11f475b4ae54b2534f5 Mon Sep 17 00:00:00 2001
5
+From: Mike Frysinger <vapier@gentoo.org>
6
+Date: Fri, 10 Jul 2015 01:50:52 -0400
7
+Subject: [PATCH] test: use _DEFAULT_SOURCE with newer glibc versions
8
+
9
+The _BSD_SOURCE macro is replaced by the _DEFAULT_SOURCE macro.  Using
10
+just the former with newer versions leads to a build time warning, so
11
+make sure to use the new macro too.
12
+---
13
+ ssl/ssltest.c | 1 +
14
+ 1 file changed, 1 insertion(+)
15
+
16
+diff --git a/ssl/ssltest.c b/ssl/ssltest.c
17
+index 26cf96c..b36f667 100644
18
+--- a/ssl/ssltest.c
19
+@@ -141,6 +141,7 @@
20
+  */
21
+ 
22
+ /* Or gethostname won't be declared properly on Linux and GNU platforms. */
23
++#define _DEFAULT_SOURCE 1
24
+ #define _BSD_SOURCE 1
25
+ 
26
+ #include <assert.h>
27
+-- 
28
+2.4.4
29
+
0 30
new file mode 100644
... ...
@@ -0,0 +1,309 @@
1
+https://rt.openssl.org/Ticket/Display.html?id=2084&user=guest&pass=guest
2
+https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest
3
+
4
+--- openssl-1.0.2d/crypto/Makefile
5
+@@ -85,11 +85,11 @@
6
+ 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
7
+ 
8
+ subdirs:
9
+-	@target=all; $(RECURSIVE_MAKE)
10
++	+@target=all; $(RECURSIVE_MAKE)
11
+ 
12
+ files:
13
+ 	$(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
14
+-	@target=files; $(RECURSIVE_MAKE)
15
++	+@target=files; $(RECURSIVE_MAKE)
16
+ 
17
+ links:
18
+ 	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
19
+@@ -100,7 +100,7 @@
20
+ # lib: $(LIB): are splitted to avoid end-less loop
21
+ lib:	$(LIB)
22
+ 	@touch lib
23
+-$(LIB):	$(LIBOBJ)
24
++$(LIB):	$(LIBOBJ) | subdirs
25
+ 	$(AR) $(LIB) $(LIBOBJ)
26
+ 	test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
27
+ 	$(RANLIB) $(LIB) || echo Never mind.
28
+@@ -111,7 +111,7 @@
29
+ 	fi
30
+ 
31
+ libs:
32
+-	@target=lib; $(RECURSIVE_MAKE)
33
++	+@target=lib; $(RECURSIVE_MAKE)
34
+ 
35
+ install:
36
+ 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
37
+@@ -120,7 +120,7 @@
38
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
39
+ 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
40
+ 	done;
41
+-	@target=install; $(RECURSIVE_MAKE)
42
++	+@target=install; $(RECURSIVE_MAKE)
43
+ 
44
+ lint:
45
+ 	@target=lint; $(RECURSIVE_MAKE)
46
+--- openssl-1.0.2d/engines/Makefile
47
+@@ -72,7 +72,7 @@
48
+ 
49
+ all:	lib subdirs
50
+ 
51
+-lib:	$(LIBOBJ)
52
++lib:	$(LIBOBJ) | subdirs
53
+ 	@if [ -n "$(SHARED_LIBS)" ]; then \
54
+ 		set -e; \
55
+ 		for l in $(LIBNAMES); do \
56
+@@ -89,7 +89,7 @@
57
+ 
58
+ subdirs:
59
+ 	echo $(EDIRS)
60
+-	@target=all; $(RECURSIVE_MAKE)
61
++	+@target=all; $(RECURSIVE_MAKE)
62
+ 
63
+ files:
64
+ 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
65
+@@ -128,7 +128,7 @@
66
+ 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
67
+ 		done; \
68
+ 	fi
69
+-	@target=install; $(RECURSIVE_MAKE)
70
++	+@target=install; $(RECURSIVE_MAKE)
71
+ 
72
+ tags:
73
+ 	ctags $(SRC)
74
+--- openssl-1.0.2d/Makefile.org
75
+@@ -274,17 +274,17 @@
76
+ build_libs: build_crypto build_ssl build_engines
77
+ 
78
+ build_crypto:
79
+-	@dir=crypto; target=all; $(BUILD_ONE_CMD)
80
++	+@dir=crypto; target=all; $(BUILD_ONE_CMD)
81
+ build_ssl: build_crypto
82
+-	@dir=ssl; target=all; $(BUILD_ONE_CMD)
83
++	+@dir=ssl; target=all; $(BUILD_ONE_CMD)
84
+ build_engines: build_crypto
85
+-	@dir=engines; target=all; $(BUILD_ONE_CMD)
86
++	+@dir=engines; target=all; $(BUILD_ONE_CMD)
87
+ build_apps: build_libs
88
+-	@dir=apps; target=all; $(BUILD_ONE_CMD)
89
++	+@dir=apps; target=all; $(BUILD_ONE_CMD)
90
+ build_tests: build_libs
91
+-	@dir=test; target=all; $(BUILD_ONE_CMD)
92
++	+@dir=test; target=all; $(BUILD_ONE_CMD)
93
+ build_tools: build_libs
94
+-	@dir=tools; target=all; $(BUILD_ONE_CMD)
95
++	+@dir=tools; target=all; $(BUILD_ONE_CMD)
96
+ 
97
+ all_testapps: build_libs build_testapps
98
+ build_testapps:
99
+@@ -555,7 +555,7 @@
100
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
101
+ 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
102
+ 	done;
103
+-	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
104
++	+@set -e; target=install; $(RECURSIVE_BUILD_CMD)
105
+ 	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
106
+ 	do \
107
+ 		if [ -f "$$i" ]; then \
108
+--- openssl-1.0.2d/Makefile.shared
109
+@@ -105,6 +105,7 @@
110
+     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
111
+     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
112
+     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
113
++    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
114
+     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
115
+     $${SHAREDCMD} $${SHAREDFLAGS} \
116
+ 	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
117
+@@ -122,6 +123,7 @@
118
+ 			done; \
119
+ 		fi; \
120
+ 		if [ -n "$$SHLIB_SOVER" ]; then \
121
++			[ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
122
+ 			( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
123
+ 			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
124
+ 		fi; \
125
+--- openssl-1.0.2d/test/Makefile
126
+@@ -133,7 +133,7 @@
127
+ tags:
128
+ 	ctags $(SRC)
129
+ 
130
+-tests:	exe apps $(TESTS)
131
++tests:	exe $(TESTS)
132
+ 
133
+ apps:
134
+ 	@(cd ..; $(MAKE) DIRS=apps all)
135
+@@ -402,121 +402,121 @@
136
+ 		link_app.$${shlib_target}
137
+ 
138
+ $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
139
+-	@target=$(RSATEST); $(BUILD_CMD)
140
++	+@target=$(RSATEST); $(BUILD_CMD)
141
+ 
142
+ $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
143
+-	@target=$(BNTEST); $(BUILD_CMD)
144
++	+@target=$(BNTEST); $(BUILD_CMD)
145
+ 
146
+ $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
147
+-	@target=$(ECTEST); $(BUILD_CMD)
148
++	+@target=$(ECTEST); $(BUILD_CMD)
149
+ 
150
+ $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
151
+-	@target=$(EXPTEST); $(BUILD_CMD)
152
++	+@target=$(EXPTEST); $(BUILD_CMD)
153
+ 
154
+ $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
155
+-	@target=$(IDEATEST); $(BUILD_CMD)
156
++	+@target=$(IDEATEST); $(BUILD_CMD)
157
+ 
158
+ $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
159
+-	@target=$(MD2TEST); $(BUILD_CMD)
160
++	+@target=$(MD2TEST); $(BUILD_CMD)
161
+ 
162
+ $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
163
+-	@target=$(SHATEST); $(BUILD_CMD)
164
++	+@target=$(SHATEST); $(BUILD_CMD)
165
+ 
166
+ $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
167
+-	@target=$(SHA1TEST); $(BUILD_CMD)
168
++	+@target=$(SHA1TEST); $(BUILD_CMD)
169
+ 
170
+ $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
171
+-	@target=$(SHA256TEST); $(BUILD_CMD)
172
++	+@target=$(SHA256TEST); $(BUILD_CMD)
173
+ 
174
+ $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
175
+-	@target=$(SHA512TEST); $(BUILD_CMD)
176
++	+@target=$(SHA512TEST); $(BUILD_CMD)
177
+ 
178
+ $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
179
+-	@target=$(RMDTEST); $(BUILD_CMD)
180
++	+@target=$(RMDTEST); $(BUILD_CMD)
181
+ 
182
+ $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
183
+-	@target=$(MDC2TEST); $(BUILD_CMD)
184
++	+@target=$(MDC2TEST); $(BUILD_CMD)
185
+ 
186
+ $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
187
+-	@target=$(MD4TEST); $(BUILD_CMD)
188
++	+@target=$(MD4TEST); $(BUILD_CMD)
189
+ 
190
+ $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
191
+-	@target=$(MD5TEST); $(BUILD_CMD)
192
++	+@target=$(MD5TEST); $(BUILD_CMD)
193
+ 
194
+ $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
195
+-	@target=$(HMACTEST); $(BUILD_CMD)
196
++	+@target=$(HMACTEST); $(BUILD_CMD)
197
+ 
198
+ $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
199
+-	@target=$(WPTEST); $(BUILD_CMD)
200
++	+@target=$(WPTEST); $(BUILD_CMD)
201
+ 
202
+ $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
203
+-	@target=$(RC2TEST); $(BUILD_CMD)
204
++	+@target=$(RC2TEST); $(BUILD_CMD)
205
+ 
206
+ $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
207
+-	@target=$(BFTEST); $(BUILD_CMD)
208
++	+@target=$(BFTEST); $(BUILD_CMD)
209
+ 
210
+ $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
211
+-	@target=$(CASTTEST); $(BUILD_CMD)
212
++	+@target=$(CASTTEST); $(BUILD_CMD)
213
+ 
214
+ $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
215
+-	@target=$(RC4TEST); $(BUILD_CMD)
216
++	+@target=$(RC4TEST); $(BUILD_CMD)
217
+ 
218
+ $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
219
+-	@target=$(RC5TEST); $(BUILD_CMD)
220
++	+@target=$(RC5TEST); $(BUILD_CMD)
221
+ 
222
+ $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
223
+-	@target=$(DESTEST); $(BUILD_CMD)
224
++	+@target=$(DESTEST); $(BUILD_CMD)
225
+ 
226
+ $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
227
+-	@target=$(RANDTEST); $(BUILD_CMD)
228
++	+@target=$(RANDTEST); $(BUILD_CMD)
229
+ 
230
+ $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
231
+-	@target=$(DHTEST); $(BUILD_CMD)
232
++	+@target=$(DHTEST); $(BUILD_CMD)
233
+ 
234
+ $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
235
+-	@target=$(DSATEST); $(BUILD_CMD)
236
++	+@target=$(DSATEST); $(BUILD_CMD)
237
+ 
238
+ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
239
+-	@target=$(METHTEST); $(BUILD_CMD)
240
++	+@target=$(METHTEST); $(BUILD_CMD)
241
+ 
242
+ $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
243
+-	@target=$(SSLTEST); $(FIPS_BUILD_CMD)
244
++	+@target=$(SSLTEST); $(FIPS_BUILD_CMD)
245
+ 
246
+ $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
247
+-	@target=$(ENGINETEST); $(BUILD_CMD)
248
++	+@target=$(ENGINETEST); $(BUILD_CMD)
249
+ 
250
+ $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
251
+-	@target=$(EVPTEST); $(BUILD_CMD)
252
++	+@target=$(EVPTEST); $(BUILD_CMD)
253
+ 
254
+ $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
255
+-	@target=$(EVPEXTRATEST); $(BUILD_CMD)
256
++	+@target=$(EVPEXTRATEST); $(BUILD_CMD)
257
+ 
258
+ $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
259
+-	@target=$(ECDSATEST); $(BUILD_CMD)
260
++	+@target=$(ECDSATEST); $(BUILD_CMD)
261
+ 
262
+ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
263
+-	@target=$(ECDHTEST); $(BUILD_CMD)
264
++	+@target=$(ECDHTEST); $(BUILD_CMD)
265
+ 
266
+ $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
267
+-	@target=$(IGETEST); $(BUILD_CMD)
268
++	+@target=$(IGETEST); $(BUILD_CMD)
269
+ 
270
+ $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
271
+-	@target=$(JPAKETEST); $(BUILD_CMD)
272
++	+@target=$(JPAKETEST); $(BUILD_CMD)
273
+ 
274
+ $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
275
+-	@target=$(ASN1TEST); $(BUILD_CMD)
276
++	+@target=$(ASN1TEST); $(BUILD_CMD)
277
+ 
278
+ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
279
+-	@target=$(SRPTEST); $(BUILD_CMD)
280
++	+@target=$(SRPTEST); $(BUILD_CMD)
281
+ 
282
+ $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
283
+-	@target=$(V3NAMETEST); $(BUILD_CMD)
284
++	+@target=$(V3NAMETEST); $(BUILD_CMD)
285
+ 
286
+ $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
287
+-	@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
288
++	+@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
289
+ 
290
+ $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
291
+-	@target=$(CONSTTIMETEST) $(BUILD_CMD)
292
++	+@target=$(CONSTTIMETEST) $(BUILD_CMD)
293
+ 
294
+ #$(AESTEST).o: $(AESTEST).c
295
+ #	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
296
+@@ -529,7 +529,7 @@
297
+ #	fi
298
+ 
299
+ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
300
+-	@target=dummytest; $(BUILD_CMD)
301
++	+@target=dummytest; $(BUILD_CMD)
302
+ 
303
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
304
+