[Midnightbsd-cvs] mports [24325] trunk/devel/libsoup: libsoup 2.54.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Sep 13 16:34:40 EDT 2018
Revision: 24325
http://svnweb.midnightbsd.org/mports/?rev=24325
Author: laffer1
Date: 2018-09-13 16:34:39 -0400 (Thu, 13 Sep 2018)
Log Message:
-----------
libsoup 2.54.1
Modified Paths:
--------------
trunk/devel/libsoup/Makefile
trunk/devel/libsoup/distinfo
trunk/devel/libsoup/files/patch-libsoup_Makefile.in
Added Paths:
-----------
trunk/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c
trunk/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c
Modified: trunk/devel/libsoup/Makefile
===================================================================
--- trunk/devel/libsoup/Makefile 2018-09-13 19:48:36 UTC (rev 24324)
+++ trunk/devel/libsoup/Makefile 2018-09-13 20:34:39 UTC (rev 24325)
@@ -1,8 +1,8 @@
# $MidnightBSD$
PORTNAME= libsoup
-PORTVERSION= 2.52.2
-PORTREVISION?= 0
+PORTVERSION= 2.54.1
+PORTREVISION= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,10 +17,11 @@
RUN_DEPENDS= glib-networking>=2.29.18:net/glib-networking
USES= tar:xz
+PORTSCOUT= limitw:1,even
.if !defined(REFERENCE_PORT)
-USES+= gettext gmake libtool pathfix pkgconfig \
+USES+= gettext gmake gnome libtool pathfix pkgconfig \
python:3:build tar:xz
USE_GNOME= glib20 intlhack introspection:build \
libxml2 referencehack
@@ -33,12 +34,12 @@
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)
-USE_SQLITE= yes
-LIB_DEPENDS+= libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+USES+= sqlite
+LIB_DEPENDS+= libsoup-2.4.so:devel/libsoup
CONFIGURE_ARGS+=--with-gnome
.else
CONFIGURE_ARGS+=--without-gnome
@@ -47,8 +48,10 @@
post-patch:
@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|env python|env ${PYTHON_VERSION}|g' \
+ @${REINPLACE_CMD} -e 's|env python|env ${PYTHON_VERSION}|g' \
${WRKSRC}/libsoup/tld-parser.py
+ @${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
+ ${WRKSRC}/configure
.if defined(SOUP_SLAVE)
do-install:
Modified: trunk/devel/libsoup/distinfo
===================================================================
--- trunk/devel/libsoup/distinfo 2018-09-13 19:48:36 UTC (rev 24324)
+++ trunk/devel/libsoup/distinfo 2018-09-13 20:34:39 UTC (rev 24325)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513446935
-SHA256 (gnome2/libsoup-2.52.2.tar.xz) = db55628b5c7d952945bb71b236469057c8dfb8dea0c271513579c6273c2093dc
-SIZE (gnome2/libsoup-2.52.2.tar.xz) = 1764308
+TIMESTAMP = 1508503209
+SHA256 (gnome2/libsoup-2.54.1.tar.xz) = 47b42c232034734d66e5f093025843a5d8cc4b2357c011085a2fd04ef02dd633
+SIZE (gnome2/libsoup-2.54.1.tar.xz) = 1793108
Modified: trunk/devel/libsoup/files/patch-libsoup_Makefile.in
===================================================================
--- trunk/devel/libsoup/files/patch-libsoup_Makefile.in 2018-09-13 19:48:36 UTC (rev 24324)
+++ trunk/devel/libsoup/files/patch-libsoup_Makefile.in 2018-09-13 20:34:39 UTC (rev 24325)
@@ -1,8 +1,8 @@
---- 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 at libsoup_gnome_2_4_la_DEPENDENCIES = \
- at BUILD_LIBSOUP_GNOME_TRUE@ libsoup-2.4.la $(am__DEPENDENCIES_1)
+ at BUILD_LIBSOUP_GNOME_TRUE@ $(am__DEPENDENCIES_1)
@@ -9,8 +9,8 @@
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 at libsoup_gnome_2_4_la_LIBADD = \
- at BUILD_LIBSOUP_GNOME_TRUE@ libsoup-2.4.la \
@@ -18,7 +18,7 @@
@BUILD_LIBSOUP_GNOME_TRUE@ $(GLIB_LIBS)
@BUILD_LIBSOUP_GNOME_TRUE at 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 at SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
Added: trunk/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c
===================================================================
--- trunk/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c (rev 0)
+++ trunk/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c 2018-09-13 20:34:39 UTC (rev 24325)
@@ -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 <gssapi/gssapi.h>
+-#include <gssapi/gssapi_krb5.h>
+ #endif /* LIBSOUP_HAVE_GSSAPI */
+
+ #include "soup-auth-negotiate.h"
Property changes on: trunk/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c
===================================================================
--- trunk/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c (rev 0)
+++ trunk/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c 2018-09-13 20:34:39 UTC (rev 24325)
@@ -0,0 +1,49 @@
+From 03c91c76daf70ee227f38304c5e45a155f45073d Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw at gnome.org>
+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.orig 2016-02-05 15:05:33 UTC
++++ libsoup/soup-filter-input-stream.c
+@@ -201,7 +201,7 @@ soup_filter_input_stream_read_until (SoupFilterInputSt
+ GCancellable *cancellable,
+ GError **error)
+ {
+- gssize nread;
++ gssize nread, read_length;
+ guint8 *p, *buf, *end;
+ gboolean eof = FALSE;
+ GError *my_error = NULL;
+@@ -254,10 +254,11 @@ soup_filter_input_stream_read_until (SoupFilterInputSt
+ } else
+ buf = fstream->priv->buf->data;
+
+- /* Scan for the boundary */
+- end = buf + fstream->priv->buf->len;
+- if (!eof)
+- end -= boundary_length;
++ /* Scan for the boundary within the range we can possibly return. */
++ if (include_boundary)
++ end = buf + MIN (fstream->priv->buf->len, length) - boundary_length;
++ else
++ end = buf + MIN (fstream->priv->buf->len - boundary_length, length);
+ for (p = buf; p <= end; p++) {
+ if (*p == *(guint8*)boundary &&
+ !memcmp (p, boundary, boundary_length)) {
+@@ -271,10 +272,9 @@ soup_filter_input_stream_read_until (SoupFilterInputSt
+ if (!*got_boundary && fstream->priv->buf->len < length && !eof)
+ goto fill_buffer;
+
+- /* Return everything up to 'p' (which is either just after the boundary if
+- * include_boundary is TRUE, just before the boundary if include_boundary is
+- * FALSE, @boundary_len - 1 bytes before the end of the buffer, or end-of-
+- * file).
+- */
+- return read_from_buf (fstream, buffer, p - buf);
++ if (eof && !*got_boundary)
++ read_length = MIN (fstream->priv->buf->len, length);
++ else
++ read_length = p - buf;
++ return read_from_buf (fstream, buffer, read_length);
+ }
Property changes on: trunk/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list