From owner-svn-ports-head@freebsd.org Mon Nov 20 17:10:29 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1CA2BDF1250; Mon, 20 Nov 2017 17:10:29 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EAB6E65101; Mon, 20 Nov 2017 17:10:28 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAKHASRH067221; Mon, 20 Nov 2017 17:10:28 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAKHARE1067216; Mon, 20 Nov 2017 17:10:27 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201711201710.vAKHARE1067216@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 20 Nov 2017 17:10:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454573 - in head/devel/libsoup: . files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/devel/libsoup: . files X-SVN-Commit-Revision: 454573 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Nov 2017 17:10:29 -0000 Author: madpilot Date: Mon Nov 20 17:10:27 2017 New Revision: 454573 URL: https://svnweb.freebsd.org/changeset/ports/454573 Log: Fix build and paackaging. - Imported upstream patch [1] - While here regenerated patches. Approved by: portmgr fixit blanket Obtained from: https://github.com/GNOME/libsoup/commit/589c2761265f6bf3b8b59b788d48c9b9c461f7de#diff-c63b04cf5692b7697906c1ec308622ae Added: head/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c (contents, props changed) Modified: head/devel/libsoup/Makefile head/devel/libsoup/files/patch-libsoup_Makefile.in head/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c Modified: head/devel/libsoup/Makefile ============================================================================== --- head/devel/libsoup/Makefile Mon Nov 20 15:40:31 2017 (r454572) +++ head/devel/libsoup/Makefile Mon Nov 20 17:10:27 2017 (r454573) @@ -32,7 +32,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -LIBVERSION= 1.7.0 +LIBVERSION= 1.8.0 PLIST_SUB= VERSION="2.4" LIBVERSION=${LIBVERSION} .if defined(SOUP_SLAVE) Modified: head/devel/libsoup/files/patch-libsoup_Makefile.in ============================================================================== --- head/devel/libsoup/files/patch-libsoup_Makefile.in Mon Nov 20 15:40:31 2017 (r454572) +++ head/devel/libsoup/files/patch-libsoup_Makefile.in Mon Nov 20 17:10:27 2017 (r454573) @@ -1,16 +1,16 @@ ---- libsoup/Makefile.in.orig 2014-03-10 13:11:37.184605224 +0000 -+++ libsoup/Makefile.in 2014-03-10 13:13:20.683597512 +0000 -@@ -176,7 +176,7 @@ - $(AM_CFLAGS) $(CFLAGS) $(libsoup_2_4_la_LDFLAGS) $(LDFLAGS) -o \ - $@ +--- libsoup/Makefile.in.orig 2016-04-26 12:36:13 UTC ++++ libsoup/Makefile.in +@@ -290,7 +290,7 @@ libsoup_2_4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(libsoup_2_4_la_CFLAGS) $(CFLAGS) $(libsoup_2_4_la_LDFLAGS) \ + $(LDFLAGS) -o $@ @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_DEPENDENCIES = \ -@BUILD_LIBSOUP_GNOME_TRUE@ libsoup-2.4.la $(am__DEPENDENCIES_1) +@BUILD_LIBSOUP_GNOME_TRUE@ $(am__DEPENDENCIES_1) am__libsoup_gnome_2_4_la_SOURCES_DIST = soup-cookie-jar-sqlite.c \ soup-gnome-features.c soup-proxy-resolver-gnome.h \ soup-proxy-resolver-gnome.c soup-password-manager-gnome.h \ -@@ -629,7 +629,7 @@ - @BUILD_LIBSOUP_GNOME_TRUE@ -export-symbols $(srcdir)/libsoup-gnome-2.4.sym +@@ -788,7 +788,7 @@ TLD_DATA_FILE = $(top_srcdir)/data/effective_tld_names + @BUILD_LIBSOUP_GNOME_TRUE@ -export-dynamic @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_LIBADD = \ -@BUILD_LIBSOUP_GNOME_TRUE@ libsoup-2.4.la \ @@ -18,7 +18,7 @@ @BUILD_LIBSOUP_GNOME_TRUE@ $(GLIB_LIBS) @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_SOURCES = \ -@@ -682,7 +682,7 @@ +@@ -848,7 +848,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=. @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@ --include-uninstalled=$(builddir)/Soup-2.4.gir @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS) Added: head/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c Mon Nov 20 17:10:27 2017 (r454573) @@ -0,0 +1,10 @@ +--- libsoup/soup-auth-negotiate.c.orig 2016-03-14 16:19:35 UTC ++++ libsoup/soup-auth-negotiate.c +@@ -14,7 +14,6 @@ + + #ifdef LIBSOUP_HAVE_GSSAPI + #include +-#include + #endif /* LIBSOUP_HAVE_GSSAPI */ + + #include "soup-auth-negotiate.h" Modified: head/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c ============================================================================== --- head/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c Mon Nov 20 15:40:31 2017 (r454572) +++ head/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c Mon Nov 20 17:10:27 2017 (r454573) @@ -4,15 +4,9 @@ Date: Thu, 3 Aug 2017 09:56:43 -0400 Subject: Fix chunked decoding buffer overrun (CVE-2017-2885) https://bugzilla.gnome.org/show_bug.cgi?id=785774 ---- - libsoup/soup-filter-input-stream.c | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/libsoup/soup-filter-input-stream.c b/libsoup/soup-filter-input-stream.c -index cde4d12..2c30bf9 100644 ---- libsoup/soup-filter-input-stream.c +--- libsoup/soup-filter-input-stream.c.orig 2016-02-05 15:05:33 UTC +++ libsoup/soup-filter-input-stream.c -@@ -198,7 +198,7 @@ soup_filter_input_stream_read_until (SoupFilterInputStream *fstream, +@@ -201,7 +201,7 @@ soup_filter_input_stream_read_until (SoupFilterInputSt GCancellable *cancellable, GError **error) { @@ -21,7 +15,7 @@ index cde4d12..2c30bf9 100644 guint8 *p, *buf, *end; gboolean eof = FALSE; GError *my_error = NULL; -@@ -251,10 +251,11 @@ soup_filter_input_stream_read_until (SoupFilterInputStream *fstream, +@@ -254,10 +254,11 @@ soup_filter_input_stream_read_until (SoupFilterInputSt } else buf = fstream->priv->buf->data; @@ -37,7 +31,7 @@ index cde4d12..2c30bf9 100644 for (p = buf; p <= end; p++) { if (*p == *(guint8*)boundary && !memcmp (p, boundary, boundary_length)) { -@@ -268,10 +269,9 @@ soup_filter_input_stream_read_until (SoupFilterInputStream *fstream, +@@ -271,10 +272,9 @@ soup_filter_input_stream_read_until (SoupFilterInputSt if (!*got_boundary && fstream->priv->buf->len < length && !eof) goto fill_buffer; @@ -53,6 +47,3 @@ index cde4d12..2c30bf9 100644 + read_length = p - buf; + return read_from_buf (fstream, buffer, read_length); } --- -cgit v0.12 -