cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 7.54.0. Includes fix for

Browse Source 
CVE-2017-7468: TLS session resumption client cert bypass (again)
This commit is contained in:
naddy 2017-04-24 20:33:58 +00:00
parent dcc82b1dab
commit 9268ccac35
5 changed files with 58 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/curl/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.124 2017/02/24 21:08:28 naddy Exp $
# $OpenBSD: Makefile,v 1.125 2017/04/24 20:33:58 naddy Exp $
COMMENT= get files from FTP, Gopher, HTTP or HTTPS servers
VERSION= 7.53.1
VERSION= 7.54.0
DISTNAME= curl-${VERSION}
SHARED_LIBS= curl 25.9 # 8.0
SHARED_LIBS= curl 25.10 # 8.0
CATEGORIES= net
HOMEPAGE= https://curl.haxx.se/

4
net/curl/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (curl-7.53.1.tar.lzma) = SxJP9ZhPK1N3kKj1Db89RNqJ5X0FBbpWcShTWiQm9eI=
SIZE (curl-7.53.1.tar.lzma) = 2076935
SHA256 (curl-7.54.0.tar.lzma) = zWqmA58T4LBuCpPhuTdU9twH9ESBK7bDK+dajyjEBwo=
SIZE (curl-7.54.0.tar.lzma) = 2084912

15
net/curl/patches/patch-docs_cmdline-opts_Makefile_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-docs_cmdline-opts_Makefile_in,v 1.1 2017/04/24 20:33:58 naddy Exp $
https://github.com/curl/curl/commit/3e5cef09d72cf5007b253aacf3a28b5b28fdb5bc
--- docs/cmdline-opts/Makefile.in.orig Tue Apr 18 13:42:46 2017
+++ docs/cmdline-opts/Makefile.in Mon Apr 24 20:20:12 2017
@@ -353,7 +353,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
-MANPAGE = $(top_builddir)/docs/curl.1
+MANPAGE = $(abs_top_builddir)/docs/curl.1
DPAGES = abstract-unix-socket.d anyauth.d append.d basic.d cacert.d capath.d cert.d \
cert-status.d cert-type.d ciphers.d compressed.d config.d \
connect-timeout.d connect-to.d continue-at.d cookie.d cookie-jar.d \

35
net/curl/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,35 @@
$OpenBSD: patch-src_Makefile_in,v 1.8 2017/04/24 20:33:58 naddy Exp $
https://github.com/curl/curl/commit/3e5cef09d72cf5007b253aacf3a28b5b28fdb5bc
--- src/Makefile.in.orig Tue Apr 18 13:42:47 2017
+++ src/Makefile.in Mon Apr 24 20:19:37 2017
@@ -2030,23 +2030,21 @@ uninstall-am: uninstall-binPROGRAMS
# Here are the stuff to create a built-in manual
@USE_MANUAL_TRUE@$(MANPAGE):
-@USE_MANUAL_TRUE@ cd $(top_builddir)/docs && $(MAKE) curl.1
+@USE_MANUAL_TRUE@ cd $(top_builddir)/docs && $(MAKE)
# This generates the tool_hugehelp.c file in both uncompressed and
-# compressed formats. $(MANPAGE) must be the first dependency so it
-# can be referenced with $< which points to the correct location in
-# the VPATH.
+# compressed formats.
@HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@$(HUGE): $(MANPAGE) $(README) $(MKHELP)
@HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ echo '#include "tool_setup.h"' > $(HUGE)
@HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ echo '#ifndef HAVE_LIBZ' >> $(HUGE)
-@HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ $(NROFF) $< | $(PERL) $(MKHELP) $(README) >> $(HUGE)
+@HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE)
@HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ echo '#else' >> $(HUGE)
-@HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ $(NROFF) $< | $(PERL) $(MKHELP) -c $(README) >> $(HUGE)
+@HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> $(HUGE)
@HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ echo '#endif /* HAVE_LIBZ */' >> $(HUGE)
# This generates the tool_hugehelp.c file uncompressed only
@HAVE_LIBZ_FALSE@@USE_MANUAL_TRUE@$(HUGE): $(MANPAGE) $(README) mkhelp.pl
@HAVE_LIBZ_FALSE@@USE_MANUAL_TRUE@ echo '#include "tool_setup.h"' > $(HUGE)
-@HAVE_LIBZ_FALSE@@USE_MANUAL_TRUE@ $(NROFF) $< | $(PERL) $(MKHELP) $(README) >> $(HUGE)
+@HAVE_LIBZ_FALSE@@USE_MANUAL_TRUE@ $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE)
# built-in manual has been disabled, make a blank file
@USE_MANUAL_FALSE@$(HUGE):

4
net/curl/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.42 2017/02/24 21:08:28 naddy Exp $
@comment $OpenBSD: PLIST,v 1.43 2017/04/24 20:33:58 naddy Exp $
@bin bin/curl
bin/curl-config
include/curl/
@ -10,6 +10,7 @@ include/curl/easy.h
include/curl/mprintf.h
include/curl/multi.h
include/curl/stdcheaders.h
include/curl/system.h
include/curl/typecheck-gcc.h
lib/libcurl.a
lib/libcurl.la
@ -294,6 +295,7 @@ lib/pkgconfig/libcurl.pc
@man man/man3/CURLOPT_STREAM_DEPENDS.3
@man man/man3/CURLOPT_STREAM_DEPENDS_E.3
@man man/man3/CURLOPT_STREAM_WEIGHT.3
@man man/man3/CURLOPT_SUPPRESS_CONNECT_HEADERS.3
@man man/man3/CURLOPT_TCP_FASTOPEN.3
@man man/man3/CURLOPT_TCP_KEEPALIVE.3
@man man/man3/CURLOPT_TCP_KEEPIDLE.3