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

Maintenance update to 7.54.1. The security fix does not affect us.

Browse Source
This commit is contained in:
naddy 2017-06-27 19:16:40 +00:00
parent ce68e425d2
commit 09c9be5d65
4 changed files with 4 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/curl/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.125 2017/04/24 20:33:58 naddy Exp $
# $OpenBSD: Makefile,v 1.126 2017/06/27 19:16:40 naddy Exp $
COMMENT= get files from FTP, Gopher, HTTP or HTTPS servers
VERSION= 7.54.0
VERSION= 7.54.1
DISTNAME= curl-${VERSION}
SHARED_LIBS= curl 25.10 # 8.0
CATEGORIES= net

4
net/curl/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (curl-7.54.0.tar.lzma) = zWqmA58T4LBuCpPhuTdU9twH9ESBK7bDK+dajyjEBwo=
SIZE (curl-7.54.0.tar.lzma) = 2084912
SHA256 (curl-7.54.1.tar.lzma) = K3rzTUkAiH4LTgqfVFuVEf93TQcVGuSXZIUGDT4b224=
SIZE (curl-7.54.1.tar.lzma) = 2101798

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

@ -1,15 +0,0 @@
$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
View File

@ -1,35 +0,0 @@
$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):