* [ptxdist] [PATCH 1/4] apache2: added fix-to-enable-compilation-against-OpenSSL1
@ 2015-02-10 15:52 Oliver Graute
2015-02-10 15:52 ` [ptxdist] [PATCH 2/4] added --with-ssl and --enabled-ssl option Oliver Graute
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Oliver Graute @ 2015-02-10 15:52 UTC (permalink / raw)
To: ptxdist; +Cc: OGR
From: OGR <oliver.graute@neuhaus.de>
This patch enable compilation against openssl-1.0.1k
This patch add the module mod_ssl.so
Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
...ix-to-enable-compilation-against-OpenSSL1.patch | 42 ++++++++++++++++++++
patches/httpd-2.0.64/series | 1 +
2 files changed, 43 insertions(+)
create mode 100644 patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL1.patch
diff --git a/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL1.patch b/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL1.patch
new file mode 100644
index 0000000..3841f64
--- /dev/null
+++ b/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL1.patch
@@ -0,0 +1,42 @@
+diff -rupN AI/modules/ssl/ssl_engine_init.c AJ/modules/ssl/ssl_engine_init.c
+--- AI/modules/ssl/ssl_engine_init.c 2010-09-28 17:59:13.000000000 +0200
++++ AJ/modules/ssl/ssl_engine_init.c 2015-02-09 09:46:29.026472658 +0100
+@@ -535,7 +535,7 @@ static void ssl_init_ctx_verify(server_r
+ ssl_die();
+ }
+
+- SSL_CTX_set_client_CA_list(ctx, (STACK *)ca_list);
++ SSL_CTX_set_client_CA_list(ctx, (STACK_OF(X509_NAME) *)ca_list);
+ }
+
+ /*
+diff -rupN AI/modules/ssl/ssl_util_ssl.c AJ/modules/ssl/ssl_util_ssl.c
+--- AI/modules/ssl/ssl_util_ssl.c 2015-02-09 10:07:36.419935328 +0100
++++ AJ/modules/ssl/ssl_util_ssl.c 2015-02-09 10:10:04.183924609 +0100
+@@ -291,7 +291,7 @@ BOOL SSL_X509_isSGC(X509 *cert)
+ #ifdef HAVE_SSL_X509V3_EXT_d2i
+ X509_EXTENSION *ext;
+ int ext_nid;
+- STACK *sk;
++ STACK_OF(SSL_CIPHER) *sk;
+ BOOL is_sgc;
+ int idx;
+ int i;
+@@ -300,7 +300,7 @@ BOOL SSL_X509_isSGC(X509 *cert)
+ idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);
+ if (idx >= 0) {
+ ext = X509_get_ext(cert, idx);
+- if ((sk = (STACK *)X509V3_EXT_d2i(ext)) != NULL) {
++ if ((sk = X509V3_EXT_d2i(ext)) != NULL) {
+ for (i = 0; i < sk_num(sk); i++) {
+ ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i));
+ if (ext_nid == NID_ms_sgc || ext_nid == NID_ns_sgc) {
+@@ -466,7 +466,7 @@ int SSL_CTX_use_certificate_chain(
+ X509 *x509;
+ unsigned long err;
+ int n;
+- STACK *extra_certs;
++ STACK_OF(X509) *extra_certs;
+
+ if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
+ return -1;
diff --git a/patches/httpd-2.0.64/series b/patches/httpd-2.0.64/series
index ff12a99..075604c 100644
--- a/patches/httpd-2.0.64/series
+++ b/patches/httpd-2.0.64/series
@@ -4,4 +4,5 @@
0002-HACK-srclib-pcre-Makefile-fallback-to-dftables-from-.patch
0003-HACK-support-apxs-don-t-execute-httpd.patch
0004-HACK-support-apxs-don-t-try-to-modify-the-config-fil.patch
+0005-fix-to-enable-compilation-against-OpenSSL1.patch
# 160b9c105b4f55538cd0ce5c82eda8fd - git-ptx-patches magic
--
1.7.9.5
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread* [ptxdist] [PATCH 2/4] added --with-ssl and --enabled-ssl option 2015-02-10 15:52 [ptxdist] [PATCH 1/4] apache2: added fix-to-enable-compilation-against-OpenSSL1 Oliver Graute @ 2015-02-10 15:52 ` Oliver Graute 2015-02-10 16:28 ` Marc Kleine-Budde 2015-02-10 15:52 ` [ptxdist] [PATCH 3/4] copy mod_ssl.so to right dir Oliver Graute ` (2 subsequent siblings) 3 siblings, 1 reply; 7+ messages in thread From: Oliver Graute @ 2015-02-10 15:52 UTC (permalink / raw) To: ptxdist; +Cc: OGR From: OGR <oliver.graute@neuhaus.de> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de> --- rules/apache2.make | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rules/apache2.make b/rules/apache2.make index 98b628e..5739271 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -39,7 +39,9 @@ APACHE2_CONF_OPT := \ --includedir=/usr/include/apache2 \ --enable-so \ --with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \ - --with-apr-util=$(PTXDIST_SYSROOT_CROSS)/bin/apu-config + --with-apr-util=$(PTXDIST_SYSROOT_CROSS)/bin/apu-config \ + --with-ssl=$(PTXDIST_SYSROOT_TARGET)/usr/lib/ssl \ + --enable-ssl=shared ifdef PTXCONF_APACHE2_MPM_PREFORK APACHE2_CONF_OPT += --with-mpm=prefork -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [ptxdist] [PATCH 2/4] added --with-ssl and --enabled-ssl option 2015-02-10 15:52 ` [ptxdist] [PATCH 2/4] added --with-ssl and --enabled-ssl option Oliver Graute @ 2015-02-10 16:28 ` Marc Kleine-Budde 0 siblings, 0 replies; 7+ messages in thread From: Marc Kleine-Budde @ 2015-02-10 16:28 UTC (permalink / raw) To: ptxdist; +Cc: OGR [-- Attachment #1.1: Type: text/plain, Size: 1130 bytes --] On 02/10/2015 04:52 PM, Oliver Graute wrote: > From: OGR <oliver.graute@neuhaus.de> > > > Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de> > --- > rules/apache2.make | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/rules/apache2.make b/rules/apache2.make > index 98b628e..5739271 100644 > --- a/rules/apache2.make > +++ b/rules/apache2.make > @@ -39,7 +39,9 @@ APACHE2_CONF_OPT := \ > --includedir=/usr/include/apache2 \ > --enable-so \ > --with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \ > - --with-apr-util=$(PTXDIST_SYSROOT_CROSS)/bin/apu-config > + --with-apr-util=$(PTXDIST_SYSROOT_CROSS)/bin/apu-config \ > + --with-ssl=$(PTXDIST_SYSROOT_TARGET)/usr/lib/ssl \ > + --enable-ssl=shared This indention looks a bit weird, doesn't it. Please indent with one Tab. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] [-- Attachment #2: Type: text/plain, Size: 48 bytes --] -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [PATCH 3/4] copy mod_ssl.so to right dir 2015-02-10 15:52 [ptxdist] [PATCH 1/4] apache2: added fix-to-enable-compilation-against-OpenSSL1 Oliver Graute 2015-02-10 15:52 ` [ptxdist] [PATCH 2/4] added --with-ssl and --enabled-ssl option Oliver Graute @ 2015-02-10 15:52 ` Oliver Graute 2015-02-10 15:52 ` Oliver Graute 2015-02-10 15:52 ` [ptxdist] [PATCH 4/4] renamed patch file Oliver Graute 3 siblings, 0 replies; 7+ messages in thread From: Oliver Graute @ 2015-02-10 15:52 UTC (permalink / raw) To: ptxdist; +Cc: OGR From: OGR <oliver.graute@neuhaus.de> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de> --- rules/apache2.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/apache2.make b/rules/apache2.make index 5739271..29ffb54 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -131,6 +131,8 @@ endif $(PTXCONF_APACHE2_SERVERROOT)/conf/magic) @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/etc/mime.types, \ $(PTXCONF_APACHE2_SERVERROOT)/conf/mime.types) + @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_ssl.so, \ + $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_ssl.so) endif -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [PATCH 3/4] copy mod_ssl.so to right dir 2015-02-10 15:52 [ptxdist] [PATCH 1/4] apache2: added fix-to-enable-compilation-against-OpenSSL1 Oliver Graute 2015-02-10 15:52 ` [ptxdist] [PATCH 2/4] added --with-ssl and --enabled-ssl option Oliver Graute 2015-02-10 15:52 ` [ptxdist] [PATCH 3/4] copy mod_ssl.so to right dir Oliver Graute @ 2015-02-10 15:52 ` Oliver Graute 2015-02-10 15:52 ` [ptxdist] [PATCH 4/4] renamed patch file Oliver Graute 3 siblings, 0 replies; 7+ messages in thread From: Oliver Graute @ 2015-02-10 15:52 UTC (permalink / raw) To: ptxdist; +Cc: OGR From: OGR <oliver.graute@neuhaus.de> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de> --- rules/apache2.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/apache2.make b/rules/apache2.make index 5739271..29ffb54 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -131,6 +131,8 @@ endif $(PTXCONF_APACHE2_SERVERROOT)/conf/magic) @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/etc/mime.types, \ $(PTXCONF_APACHE2_SERVERROOT)/conf/mime.types) + @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_ssl.so, \ + $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_ssl.so) endif -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [PATCH 4/4] renamed patch file 2015-02-10 15:52 [ptxdist] [PATCH 1/4] apache2: added fix-to-enable-compilation-against-OpenSSL1 Oliver Graute ` (2 preceding siblings ...) 2015-02-10 15:52 ` Oliver Graute @ 2015-02-10 15:52 ` Oliver Graute 2015-02-10 16:27 ` Marc Kleine-Budde 3 siblings, 1 reply; 7+ messages in thread From: Oliver Graute @ 2015-02-10 15:52 UTC (permalink / raw) To: ptxdist; +Cc: Oliver Graute Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de> --- ...-enable-compilation-against-OpenSSL-1.0.1.patch | 42 ++++++++++++++++++++ ...ix-to-enable-compilation-against-OpenSSL1.patch | 42 -------------------- patches/httpd-2.0.64/series | 2 +- 3 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL-1.0.1.patch delete mode 100644 patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL1.patch diff --git a/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL-1.0.1.patch b/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL-1.0.1.patch new file mode 100644 index 0000000..3841f64 --- /dev/null +++ b/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL-1.0.1.patch @@ -0,0 +1,42 @@ +diff -rupN AI/modules/ssl/ssl_engine_init.c AJ/modules/ssl/ssl_engine_init.c +--- AI/modules/ssl/ssl_engine_init.c 2010-09-28 17:59:13.000000000 +0200 ++++ AJ/modules/ssl/ssl_engine_init.c 2015-02-09 09:46:29.026472658 +0100 +@@ -535,7 +535,7 @@ static void ssl_init_ctx_verify(server_r + ssl_die(); + } + +- SSL_CTX_set_client_CA_list(ctx, (STACK *)ca_list); ++ SSL_CTX_set_client_CA_list(ctx, (STACK_OF(X509_NAME) *)ca_list); + } + + /* +diff -rupN AI/modules/ssl/ssl_util_ssl.c AJ/modules/ssl/ssl_util_ssl.c +--- AI/modules/ssl/ssl_util_ssl.c 2015-02-09 10:07:36.419935328 +0100 ++++ AJ/modules/ssl/ssl_util_ssl.c 2015-02-09 10:10:04.183924609 +0100 +@@ -291,7 +291,7 @@ BOOL SSL_X509_isSGC(X509 *cert) + #ifdef HAVE_SSL_X509V3_EXT_d2i + X509_EXTENSION *ext; + int ext_nid; +- STACK *sk; ++ STACK_OF(SSL_CIPHER) *sk; + BOOL is_sgc; + int idx; + int i; +@@ -300,7 +300,7 @@ BOOL SSL_X509_isSGC(X509 *cert) + idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1); + if (idx >= 0) { + ext = X509_get_ext(cert, idx); +- if ((sk = (STACK *)X509V3_EXT_d2i(ext)) != NULL) { ++ if ((sk = X509V3_EXT_d2i(ext)) != NULL) { + for (i = 0; i < sk_num(sk); i++) { + ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i)); + if (ext_nid == NID_ms_sgc || ext_nid == NID_ns_sgc) { +@@ -466,7 +466,7 @@ int SSL_CTX_use_certificate_chain( + X509 *x509; + unsigned long err; + int n; +- STACK *extra_certs; ++ STACK_OF(X509) *extra_certs; + + if ((bio = BIO_new(BIO_s_file_internal())) == NULL) + return -1; diff --git a/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL1.patch b/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL1.patch deleted file mode 100644 index 3841f64..0000000 --- a/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL1.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -rupN AI/modules/ssl/ssl_engine_init.c AJ/modules/ssl/ssl_engine_init.c ---- AI/modules/ssl/ssl_engine_init.c 2010-09-28 17:59:13.000000000 +0200 -+++ AJ/modules/ssl/ssl_engine_init.c 2015-02-09 09:46:29.026472658 +0100 -@@ -535,7 +535,7 @@ static void ssl_init_ctx_verify(server_r - ssl_die(); - } - -- SSL_CTX_set_client_CA_list(ctx, (STACK *)ca_list); -+ SSL_CTX_set_client_CA_list(ctx, (STACK_OF(X509_NAME) *)ca_list); - } - - /* -diff -rupN AI/modules/ssl/ssl_util_ssl.c AJ/modules/ssl/ssl_util_ssl.c ---- AI/modules/ssl/ssl_util_ssl.c 2015-02-09 10:07:36.419935328 +0100 -+++ AJ/modules/ssl/ssl_util_ssl.c 2015-02-09 10:10:04.183924609 +0100 -@@ -291,7 +291,7 @@ BOOL SSL_X509_isSGC(X509 *cert) - #ifdef HAVE_SSL_X509V3_EXT_d2i - X509_EXTENSION *ext; - int ext_nid; -- STACK *sk; -+ STACK_OF(SSL_CIPHER) *sk; - BOOL is_sgc; - int idx; - int i; -@@ -300,7 +300,7 @@ BOOL SSL_X509_isSGC(X509 *cert) - idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1); - if (idx >= 0) { - ext = X509_get_ext(cert, idx); -- if ((sk = (STACK *)X509V3_EXT_d2i(ext)) != NULL) { -+ if ((sk = X509V3_EXT_d2i(ext)) != NULL) { - for (i = 0; i < sk_num(sk); i++) { - ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i)); - if (ext_nid == NID_ms_sgc || ext_nid == NID_ns_sgc) { -@@ -466,7 +466,7 @@ int SSL_CTX_use_certificate_chain( - X509 *x509; - unsigned long err; - int n; -- STACK *extra_certs; -+ STACK_OF(X509) *extra_certs; - - if ((bio = BIO_new(BIO_s_file_internal())) == NULL) - return -1; diff --git a/patches/httpd-2.0.64/series b/patches/httpd-2.0.64/series index 075604c..3def16d 100644 --- a/patches/httpd-2.0.64/series +++ b/patches/httpd-2.0.64/series @@ -4,5 +4,5 @@ 0002-HACK-srclib-pcre-Makefile-fallback-to-dftables-from-.patch 0003-HACK-support-apxs-don-t-execute-httpd.patch 0004-HACK-support-apxs-don-t-try-to-modify-the-config-fil.patch -0005-fix-to-enable-compilation-against-OpenSSL1.patch +0005-fix-to-enable-compilation-against-OpenSSL-1.0.1.patch # 160b9c105b4f55538cd0ce5c82eda8fd - git-ptx-patches magic -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [ptxdist] [PATCH 4/4] renamed patch file 2015-02-10 15:52 ` [ptxdist] [PATCH 4/4] renamed patch file Oliver Graute @ 2015-02-10 16:27 ` Marc Kleine-Budde 0 siblings, 0 replies; 7+ messages in thread From: Marc Kleine-Budde @ 2015-02-10 16:27 UTC (permalink / raw) To: ptxdist; +Cc: Oliver Graute [-- Attachment #1.1: Type: text/plain, Size: 727 bytes --] On 02/10/2015 04:52 PM, Oliver Graute wrote: > > Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de> > --- > ...-enable-compilation-against-OpenSSL-1.0.1.patch | 42 ++++++++++++++++++++ > ...ix-to-enable-compilation-against-OpenSSL1.patch | 42 -------------------- > patches/httpd-2.0.64/series | 2 +- > 3 files changed, 43 insertions(+), 43 deletions(-) This patch should be suqahed into 1. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] [-- Attachment #2: Type: text/plain, Size: 48 bytes --] -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-02-10 16:28 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2015-02-10 15:52 [ptxdist] [PATCH 1/4] apache2: added fix-to-enable-compilation-against-OpenSSL1 Oliver Graute 2015-02-10 15:52 ` [ptxdist] [PATCH 2/4] added --with-ssl and --enabled-ssl option Oliver Graute 2015-02-10 16:28 ` Marc Kleine-Budde 2015-02-10 15:52 ` [ptxdist] [PATCH 3/4] copy mod_ssl.so to right dir Oliver Graute 2015-02-10 15:52 ` Oliver Graute 2015-02-10 15:52 ` [ptxdist] [PATCH 4/4] renamed patch file Oliver Graute 2015-02-10 16:27 ` Marc Kleine-Budde
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox