Login
Log in using an SSO provider:
Fedora Account System
Red Hat Associate
Red Hat Customer
Login using a Red Hat Bugzilla account
Forgot Password
Create an Account
Red Hat Bugzilla – Attachment 1274757 Details for
Bug 1446335
ocaml-ssl-0.5.4 is available
Home
New
Search
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh92 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
[?]
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
[patch] Bump to 0.5.3 and remove patches (#1446335)
0001-Bump-to-0.5.3-and-remove-patches-1446335.patch (text/plain), 15.02 KB, created by
Lucas Bickel
on 2017-04-27 18:43:26 UTC
(
hide
)
Description:
[patch] Bump to 0.5.3 and remove patches (#1446335)
Filename:
MIME Type:
Creator:
Lucas Bickel
Created:
2017-04-27 18:43:26 UTC
Size:
15.02 KB
patch
obsolete
>From 0423c55d4b59fb7ee7bca22e288845fa94781bda Mon Sep 17 00:00:00 2001 >From: Lucas Bickel <hairmare@rabe.ch> >Date: Thu, 27 Apr 2017 20:30:58 +0200 >Subject: [PATCH] Bump to 0.5.3 and remove patches (#1446335) > >--- > 0001-Stalkd-example.patch | 140 --------------------- > 0002-Remove-duplicate-declaration-of-write.patch | 35 ------ > 0003-Bump-version-number.patch | 22 ---- > 0004-Remove-ansi-flag.patch | 38 ------ > ...Use-accessor-functions-for-X509_STORE_CTX.patch | 59 --------- > ...hange-CLIBS-order-to-allow-static-linking.patch | 56 --------- > ocaml-ssl.spec | 26 ++-- > 7 files changed, 7 insertions(+), 369 deletions(-) > delete mode 100644 0001-Stalkd-example.patch > delete mode 100644 0002-Remove-duplicate-declaration-of-write.patch > delete mode 100644 0003-Bump-version-number.patch > delete mode 100644 0004-Remove-ansi-flag.patch > delete mode 100644 0005-Use-accessor-functions-for-X509_STORE_CTX.patch > delete mode 100644 0006-Change-CLIBS-order-to-allow-static-linking.patch > >diff --git a/0001-Stalkd-example.patch b/0001-Stalkd-example.patch >deleted file mode 100644 >index 63ecac3..0000000 >--- a/0001-Stalkd-example.patch >+++ /dev/null >@@ -1,140 +0,0 @@ >-From 9bbbda1c5015cc2a8ddaeae4fdc4a19f24448a9e Mon Sep 17 00:00:00 2001 >-From: Samuel Mimram <smimram@gmail.com> >-Date: Mon, 23 Nov 2015 09:24:20 +0100 >-Subject: [PATCH 1/6] Stalkd example. >- >-Use bytes and reindent. >---- >- examples/stalkd.ml | 100 ++++++++++++++++++++++++++--------------------------- >- 1 file changed, 49 insertions(+), 51 deletions(-) >- >-diff --git a/examples/stalkd.ml b/examples/stalkd.ml >-index 234d2cb..21084d2 100644 >---- a/examples/stalkd.ml >-+++ b/examples/stalkd.ml >-@@ -25,8 +25,6 @@ >- * @author Samuel Mimram >- *) >- >--(* $Id$ *) >-- >- let certfile = ref "cert.pem" >- let privkey = ref "privkey.pem" >- let port = ref 9876 >-@@ -39,8 +37,8 @@ let establish_threaded_server server_handler sockaddr nbconn = >- log "establishing server"; >- let domain = >- begin match sockaddr with >-- | Unix.ADDR_UNIX _ -> Unix.PF_UNIX >-- | Unix.ADDR_INET (_, _) -> Unix.PF_INET >-+ | Unix.ADDR_UNIX _ -> Unix.PF_UNIX >-+ | Unix.ADDR_INET (_, _) -> Unix.PF_INET >- end >- in >- let sock = Unix.socket domain Unix.SOCK_STREAM 0 in >-@@ -51,55 +49,55 @@ let establish_threaded_server server_handler sockaddr nbconn = >- in >- let inet_addr = inet_addr_of_sockaddr caller in >- let ip = Unix.string_of_inet_addr inet_addr in >-- log (Printf.sprintf "openning connection for [%s]" ip); >-- server_handler inet_addr s; >-- Ssl.shutdown s >-+ log (Printf.sprintf "openning connection for [%s]" ip); >-+ server_handler inet_addr s; >-+ Ssl.shutdown s >- in >- let ctx = Ssl.create_context Ssl.SSLv23 Ssl.Server_context in >-- if !password <> "" then >-- Ssl.set_password_callback ctx (fun _ -> !password); >-- Ssl.use_certificate ctx !certfile !privkey; >-- Unix.setsockopt sock Unix.SO_REUSEADDR true; >-- Unix.bind sock sockaddr; >-- Unix.listen sock nbconn; >-- let ssl_sock = Ssl.embed_socket sock ctx in >-- while true do >-- log "listening for connections"; >-- let (s, caller) = Unix.accept sock in >-- let ssl_s = Ssl.embed_socket s ctx in >-- Ssl.accept ssl_s; >-- ignore (Thread.create handle_connexion (ssl_s, caller)); >-- done >-+ if !password <> "" then >-+ Ssl.set_password_callback ctx (fun _ -> !password); >-+ Ssl.use_certificate ctx !certfile !privkey; >-+ Unix.setsockopt sock Unix.SO_REUSEADDR true; >-+ Unix.bind sock sockaddr; >-+ Unix.listen sock nbconn; >-+ (* let ssl_sock = Ssl.embed_socket sock ctx in *) >-+ while true do >-+ log "listening for connections"; >-+ let (s, caller) = Unix.accept sock in >-+ let ssl_s = Ssl.embed_socket s ctx in >-+ Ssl.accept ssl_s; >-+ ignore (Thread.create handle_connexion (ssl_s, caller)); >-+ done >- >--let _ = >-+let () = >- let bufsize = 1024 in >-- let buf = String.create bufsize in >-+ let buf = Bytes.create bufsize in >- let connected_clients = ref [] in >-- Ssl_threads.init (); >-- Ssl.init (); >-- establish_threaded_server >-- (fun addr ssl -> >-- connected_clients := (addr, ssl) :: !connected_clients; >-- log "accepted a new connection"; >-- let loop = ref true in >-- while !loop >-- do >-- let l = Ssl.read ssl buf 0 bufsize in >-- let m = String.sub buf 0 l in >-- let msg = String.sub m 0 ((String.length m) - 1) in >-- log (Printf.sprintf "revceived '%s'" msg); >-- if msg = "exit" then >-- ( >-- log "A client has quit"; >-- connected_clients := List.filter (fun (_, s) -> s != ssl) !connected_clients; >-- Ssl.shutdown ssl; >-- loop := false >-- ) >-- else >-- List.iter >-- (fun (_, s) -> >-- ignore (Ssl.output_string s m) >-- ) !connected_clients >-- done >-- ) >-- (Unix.ADDR_INET(Unix.inet_addr_any, !port)) 100 >-+ Ssl_threads.init (); >-+ Ssl.init (); >-+ establish_threaded_server >-+ (fun addr ssl -> >-+ connected_clients := (addr, ssl) :: !connected_clients; >-+ log "accepted a new connection"; >-+ let loop = ref true in >-+ while !loop >-+ do >-+ let l = Ssl.read ssl buf 0 bufsize in >-+ let m = Bytes.sub buf 0 l in >-+ let msg = Bytes.sub m 0 ((Bytes.length m) - 1) in >-+ log (Printf.sprintf "revceived '%s'" msg); >-+ if msg = "exit" then >-+ ( >-+ log "A client has quit"; >-+ connected_clients := List.filter (fun (_, s) -> s != ssl) !connected_clients; >-+ Ssl.shutdown ssl; >-+ loop := false >-+ ) >-+ else >-+ List.iter >-+ (fun (_, s) -> >-+ ignore (Ssl.output_string s m) >-+ ) !connected_clients >-+ done >-+ ) >-+ (Unix.ADDR_INET(Unix.inet_addr_any, !port)) 100 >--- >-2.9.3 >- >diff --git a/0002-Remove-duplicate-declaration-of-write.patch b/0002-Remove-duplicate-declaration-of-write.patch >deleted file mode 100644 >index 3e778f4..0000000 >--- a/0002-Remove-duplicate-declaration-of-write.patch >+++ /dev/null >@@ -1,35 +0,0 @@ >-From a726db8e1a66d6374eead53dbbb30a0f779cc410 Mon Sep 17 00:00:00 2001 >-From: Samuel Mimram <smimram@gmail.com> >-Date: Wed, 25 May 2016 10:31:33 +0200 >-Subject: [PATCH 2/6] Remove duplicate declaration of write. >- >---- >- src/ssl.mli | 5 +---- >- 1 file changed, 1 insertion(+), 4 deletions(-) >- >-diff --git a/src/ssl.mli b/src/ssl.mli >-index 4f67dd2..5776328 100644 >---- a/src/ssl.mli >-+++ b/src/ssl.mli >-@@ -395,9 +395,6 @@ val file_descr_of_socket : socket -> Unix.file_descr >- (** [read sock buf off len] receives data from a connected SSL socket. *) >- val read : socket -> Bytes.t -> int -> int -> int >- >--(** [write sock buf off len] sends data over a connected SSL socket. *) >--val write : socket -> Bytes.t -> int -> int -> int >-- >- (** [read_into_bigarray sock ba off len] receives data from a connected SSL socket. >- This function releases the runtime while the read takes place. *) >- val read_into_bigarray : socket -> bigarray -> int -> int -> int >-@@ -409,7 +406,7 @@ val read_into_bigarray : socket -> bigarray -> int -> int -> int >- val read_into_bigarray_blocking : socket -> bigarray -> int -> int -> int >- >- (** [write sock buf off len] sends data over a connected SSL socket. *) >--val write : socket -> string -> int -> int -> int >-+val write : socket -> Bytes.t -> int -> int -> int >- >- (** [write_bigarray sock ba off len] sends data over a connected SSL socket. >- This function releases the runtime while the read takes place. >--- >-2.9.3 >- >diff --git a/0003-Bump-version-number.patch b/0003-Bump-version-number.patch >deleted file mode 100644 >index a6738c3..0000000 >--- a/0003-Bump-version-number.patch >+++ /dev/null >@@ -1,22 +0,0 @@ >-From f94658b844464945bfeef4396fc2461943b8b964 Mon Sep 17 00:00:00 2001 >-From: Samuel Mimram <smimram@gmail.com> >-Date: Thu, 28 Jul 2016 10:27:30 +0200 >-Subject: [PATCH 3/6] Bump version number. >- >---- >- configure.ac | 2 +- >- 1 file changed, 1 insertion(+), 1 deletion(-) >- >-diff --git a/configure.ac b/configure.ac >-index 853e9a0..9613001 100644 >---- a/configure.ac >-+++ b/configure.ac >-@@ -1,4 +1,4 @@ >--AC_INIT([ocaml-ssl],[0.5.2],[savonet-users@lists.sourceforge.net]) >-+AC_INIT([ocaml-ssl],[0.5.3],[savonet-users@lists.sourceforge.net]) >- >- VERSION=$PACKAGE_VERSION >- AC_MSG_RESULT([configuring $PACKAGE_STRING]) >--- >-2.9.3 >- >diff --git a/0004-Remove-ansi-flag.patch b/0004-Remove-ansi-flag.patch >deleted file mode 100644 >index 39bd4bd..0000000 >--- a/0004-Remove-ansi-flag.patch >+++ /dev/null >@@ -1,38 +0,0 @@ >-From ceec769a0d56a7d5d78440168d4bd78e5af51d9d Mon Sep 17 00:00:00 2001 >-From: Samuel Mimram <smimram@gmail.com> >-Date: Thu, 28 Jul 2016 10:28:01 +0200 >-Subject: [PATCH 4/6] Remove -ansi flag. >- >---- >- CHANGES | 4 ++++ >- src/Makefile.in | 2 +- >- 2 files changed, 5 insertions(+), 1 deletion(-) >- >-diff --git a/CHANGES b/CHANGES >-index 7b619af..7fa5ec1 100644 >---- a/CHANGES >-+++ b/CHANGES >-@@ -1,3 +1,7 @@ >-+0.5.3 (unreleased) >-+===== >-+* Remove -ansi flag to be compatible with OCaml 4.04 (thanks Mark Shinwell). >-+ >- 0.5.2 (2015-11-23) >- ===== >- * Add OPENSSL_NO_SSL3 preprocessor flag to disable SSLv3 (thanks Jérémie >-diff --git a/src/Makefile.in b/src/Makefile.in >-index c32ce26..c0edfc6 100644 >---- a/src/Makefile.in >-+++ b/src/Makefile.in >-@@ -30,7 +30,7 @@ else >- export CLIBS = crypto ssl >- endif >- export CC = @CC@ >--export CFLAGS = @CFLAGS@ -ansi -DCAML_NAME_SPACE -Wall >-+export CFLAGS = @CFLAGS@ -DCAML_NAME_SPACE -Wall >- export CLIBFLAGS = @LDFLAGS@ >- export CPPFLAGS = @CPPFLAGS@ >- export NO_CUSTOM = yes >--- >-2.9.3 >- >diff --git a/0005-Use-accessor-functions-for-X509_STORE_CTX.patch b/0005-Use-accessor-functions-for-X509_STORE_CTX.patch >deleted file mode 100644 >index 64776a2..0000000 >--- a/0005-Use-accessor-functions-for-X509_STORE_CTX.patch >+++ /dev/null >@@ -1,59 +0,0 @@ >-From e49b6a741ac7a86057acb7bdef609e67491b292e Mon Sep 17 00:00:00 2001 >-From: Samuel Mimram <smimram@gmail.com> >-Date: Thu, 28 Jul 2016 12:34:31 +0200 >-Subject: [PATCH 5/6] Use accessor functions for X509_STORE_CTX. >- >---- >- CHANGES | 1 + >- src/ssl_stubs.c | 9 +++++---- >- 2 files changed, 6 insertions(+), 4 deletions(-) >- >-diff --git a/CHANGES b/CHANGES >-index 7fa5ec1..87bd915 100644 >---- a/CHANGES >-+++ b/CHANGES >-@@ -1,6 +1,7 @@ >- 0.5.3 (unreleased) >- ===== >- * Remove -ansi flag to be compatible with OCaml 4.04 (thanks Mark Shinwell). >-+* Use accessor functions for X509_STORE_CTX. >- >- 0.5.2 (2015-11-23) >- ===== >-diff --git a/src/ssl_stubs.c b/src/ssl_stubs.c >-index 1b175fa..e131527 100644 >---- a/src/ssl_stubs.c >-+++ b/src/ssl_stubs.c >-@@ -656,7 +656,7 @@ CAMLprim value ocaml_ssl_get_cipher_name(value vcipher) >- >- CAMLprim value ocaml_ssl_get_cipher_version(value vcipher) >- { >-- char *version; >-+ const char *version; >- SSL_CIPHER *cipher = (SSL_CIPHER*)vcipher; >- >- caml_enter_blocking_section(); >-@@ -1228,9 +1228,9 @@ static int client_verify_callback(int ok, X509_STORE_CTX *ctx) >- int depth, error; >- char *xs; >- >-- depth = ctx->error_depth; >-- error = ctx->error; >-- xs = (char *)X509_STORE_CTX_get_current_cert(ctx); >-+ depth = X509_STORE_CTX_get_error_depth(ctx); >-+ error = X509_STORE_CTX_get_error(ctx); >-+ xs = (char*)X509_STORE_CTX_get_current_cert(ctx); >- >- subject = issuer = NULL; >- >-@@ -1339,6 +1339,7 @@ return_time: >- >- return ok; >- } >-+ >- static DH *load_dh_param(const char *dhfile) >- { >- DH *ret=NULL; >--- >-2.9.3 >- >diff --git a/0006-Change-CLIBS-order-to-allow-static-linking.patch b/0006-Change-CLIBS-order-to-allow-static-linking.patch >deleted file mode 100644 >index 20388c0..0000000 >--- a/0006-Change-CLIBS-order-to-allow-static-linking.patch >+++ /dev/null >@@ -1,56 +0,0 @@ >-From 19de50eae439507f75d4491e4b8608ee3ac4caf3 Mon Sep 17 00:00:00 2001 >-From: Samuel Mimram <smimram@gmail.com> >-Date: Thu, 3 Nov 2016 16:58:03 +0100 >-Subject: [PATCH 6/6] Change CLIBS order to allow static linking >- >-Fixes #27. >---- >- CHANGES | 1 + >- src/Makefile.in | 4 ++-- >- src/ssl_stubs.c | 2 -- >- 3 files changed, 3 insertions(+), 4 deletions(-) >- >-diff --git a/CHANGES b/CHANGES >-index 87bd915..9f1ef84 100644 >---- a/CHANGES >-+++ b/CHANGES >-@@ -2,6 +2,7 @@ >- ===== >- * Remove -ansi flag to be compatible with OCaml 4.04 (thanks Mark Shinwell). >- * Use accessor functions for X509_STORE_CTX. >-+* Change CLIBS order to allow static linking. >- >- 0.5.2 (2015-11-23) >- ===== >-diff --git a/src/Makefile.in b/src/Makefile.in >-index c0edfc6..843885e 100644 >---- a/src/Makefile.in >-+++ b/src/Makefile.in >-@@ -25,9 +25,9 @@ export LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.cmx *$(shell oca >- export OCAMLLDFLAGS = >- export OCAMLDOCFLAGS = -stars >- ifeq (1, $(shell uname -s | grep -c "MINGW")) >-- export CLIBS = crypto ssl ws2_32 gdi32 crypt32 >-+ export CLIBS = ssl crypto ws2_32 gdi32 crypt32 >- else >-- export CLIBS = crypto ssl >-+ export CLIBS = ssl crypto >- endif >- export CC = @CC@ >- export CFLAGS = @CFLAGS@ -DCAML_NAME_SPACE -Wall >-diff --git a/src/ssl_stubs.c b/src/ssl_stubs.c >-index e131527..fa4cbbf 100644 >---- a/src/ssl_stubs.c >-+++ b/src/ssl_stubs.c >-@@ -24,8 +24,6 @@ >- * @author Samuel Mimram >- */ >- >--/* $Id$ */ >-- >- /* >- * WARNING: because of thread callbacks, all ssl functions should be in >- * blocking sections. >--- >-2.9.3 >- >diff --git a/ocaml-ssl.spec b/ocaml-ssl.spec >index c29f8f9..5520c3c 100644 >--- a/ocaml-ssl.spec >+++ b/ocaml-ssl.spec >@@ -1,22 +1,13 @@ > %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) > > Name: ocaml-ssl >-Version: 0.5.2 >-Release: 5%{?dist} >+Version: 0.5.3 >+Release: 1%{?dist} > Summary: SSL bindings for OCaml > License: LGPLv2+ with exceptions > > URL: https://github.com/savonet/ocaml-ssl >-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz >- >-# All upstream patches since 0.5.2 release. >-# In particular these fix compilation with new openssl. >-Patch1: 0001-Stalkd-example.patch >-Patch2: 0002-Remove-duplicate-declaration-of-write.patch >-Patch3: 0003-Bump-version-number.patch >-Patch4: 0004-Remove-ansi-flag.patch >-Patch5: 0005-Use-accessor-functions-for-X509_STORE_CTX.patch >-Patch6: 0006-Change-CLIBS-order-to-allow-static-linking.patch >+Source0: https://github.com/savonet/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz > > BuildRequires: ocaml >= 3.12.1-3 > BuildRequires: ocaml-findlib-devel >@@ -45,13 +36,6 @@ developing applications that use %{name}. > %prep > %setup -q > >-%patch1 -p1 >-%patch2 -p1 >-%patch3 -p1 >-%patch4 -p1 >-%patch5 -p1 >-%patch6 -p1 >- > > %build > autoconf >@@ -99,6 +83,10 @@ cp examples/*.ml $RPM_BUILD_ROOT%{_docdir}/%{name}-devel/examples > > > %changelog >+* Thu Apr 27 2017 Lucas Bickel <hairmare@rabe.ch> - 0.5.3-1 >+- Update to 0.5.3 (#1446335) >+- Change upstream location to GitHub >+ > * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-5 > - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild > >-- >2.11.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1446335
:
1274733
|
1274755
| 1274757 |
1333476