diff options
| -rw-r--r-- | net/libsoup24/Makefile | 5 | ||||
| -rw-r--r-- | net/libsoup24/PLIST | 12 | ||||
| -rw-r--r-- | net/libsoup24/distinfo | 9 | ||||
| -rw-r--r-- | net/libsoup24/patches/patch-aa | 22 |
4 files changed, 12 insertions, 36 deletions
diff --git a/net/libsoup24/Makefile b/net/libsoup24/Makefile index f5142fed807..0ace43a3a80 100644 --- a/net/libsoup24/Makefile +++ b/net/libsoup24/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2011/07/29 10:27:29 drochner Exp $ +# $NetBSD: Makefile,v 1.34 2011/09/12 18:04:51 drochner Exp $ -DISTNAME= libsoup-2.34.2 +DISTNAME= libsoup-2.34.3 PKGNAME= ${DISTNAME:S/libsoup/libsoup24/} -PKGREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsoup/2.34/} EXTRACT_SUFX= .tar.bz2 diff --git a/net/libsoup24/PLIST b/net/libsoup24/PLIST index 5d8d2241f86..0cd75083e16 100644 --- a/net/libsoup24/PLIST +++ b/net/libsoup24/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2011/06/10 09:33:53 drochner Exp $ +@comment $NetBSD: PLIST,v 1.14 2011/09/12 18:04:51 drochner Exp $ include/libsoup-2.4/libsoup/soup-address.h include/libsoup-2.4/libsoup/soup-auth-domain-basic.h include/libsoup-2.4/libsoup/soup-auth-domain-digest.h @@ -56,11 +56,15 @@ share/gtk-doc/html/libsoup-2.4/SoupAuthDomain.html share/gtk-doc/html/libsoup-2.4/SoupAuthDomainBasic.html share/gtk-doc/html/libsoup-2.4/SoupAuthDomainDigest.html share/gtk-doc/html/libsoup-2.4/SoupContentSniffer.html +share/gtk-doc/html/libsoup-2.4/SoupCookie.html share/gtk-doc/html/libsoup-2.4/SoupCookieJar.html share/gtk-doc/html/libsoup-2.4/SoupCookieJarSqlite.html share/gtk-doc/html/libsoup-2.4/SoupCookieJarText.html share/gtk-doc/html/libsoup-2.4/SoupLogger.html share/gtk-doc/html/libsoup-2.4/SoupMessage.html +share/gtk-doc/html/libsoup-2.4/SoupMessageBody.html +share/gtk-doc/html/libsoup-2.4/SoupMessageHeaders.html +share/gtk-doc/html/libsoup-2.4/SoupMultipart.html share/gtk-doc/html/libsoup-2.4/SoupProxyURIResolver.html share/gtk-doc/html/libsoup-2.4/SoupServer.html share/gtk-doc/html/libsoup-2.4/SoupSession.html @@ -68,6 +72,7 @@ share/gtk-doc/html/libsoup-2.4/SoupSessionAsync.html share/gtk-doc/html/libsoup-2.4/SoupSessionFeature.html share/gtk-doc/html/libsoup-2.4/SoupSessionSync.html share/gtk-doc/html/libsoup-2.4/SoupSocket.html +share/gtk-doc/html/libsoup-2.4/SoupURI.html share/gtk-doc/html/libsoup-2.4/annotation-glossary.html share/gtk-doc/html/libsoup-2.4/ch01.html share/gtk-doc/html/libsoup-2.4/ch02.html @@ -83,11 +88,6 @@ share/gtk-doc/html/libsoup-2.4/left.png share/gtk-doc/html/libsoup-2.4/libsoup-2.4-GValue-Support.html share/gtk-doc/html/libsoup-2.4/libsoup-2.4-HTML-Form-Support.html share/gtk-doc/html/libsoup-2.4/libsoup-2.4-Soup-Miscellaneous-Utilities.html -share/gtk-doc/html/libsoup-2.4/libsoup-2.4-SoupCookie.html -share/gtk-doc/html/libsoup-2.4/libsoup-2.4-SoupMessageBody.html -share/gtk-doc/html/libsoup-2.4/libsoup-2.4-SoupMessageHeaders.html -share/gtk-doc/html/libsoup-2.4/libsoup-2.4-SoupMultipart.html -share/gtk-doc/html/libsoup-2.4/libsoup-2.4-SoupURI.html share/gtk-doc/html/libsoup-2.4/libsoup-2.4-XMLRPC-Support.html share/gtk-doc/html/libsoup-2.4/libsoup-2.4-soup-gnome-features.html share/gtk-doc/html/libsoup-2.4/libsoup-2.4-soup-method.html diff --git a/net/libsoup24/distinfo b/net/libsoup24/distinfo index 940c7898956..8b4056031f9 100644 --- a/net/libsoup24/distinfo +++ b/net/libsoup24/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.23 2011/07/29 10:27:29 drochner Exp $ +$NetBSD: distinfo,v 1.24 2011/09/12 18:04:51 drochner Exp $ -SHA1 (libsoup-2.34.2.tar.bz2) = 1812b3c78778b37d55ea2904b9763b6dd8266a1c -RMD160 (libsoup-2.34.2.tar.bz2) = a3a94ca9dd6a49a3ee15efda6cf8e4ba96a66338 -Size (libsoup-2.34.2.tar.bz2) = 683331 bytes -SHA1 (patch-aa) = 02d26d3f70954f1bb2d2014aab84a58d5ce14469 +SHA1 (libsoup-2.34.3.tar.bz2) = ea2354aa01f52ce3c9e40175c4d5ec9f9d46c039 +RMD160 (libsoup-2.34.3.tar.bz2) = 14df1e875c91e7be163ceadd801d043e82e80e03 +Size (libsoup-2.34.3.tar.bz2) = 697132 bytes diff --git a/net/libsoup24/patches/patch-aa b/net/libsoup24/patches/patch-aa deleted file mode 100644 index 7fbd7230647..00000000000 --- a/net/libsoup24/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2011/07/29 10:27:29 drochner Exp $ - -CVE-2011-2524 - ---- libsoup/soup-server.c.orig 2011-04-07 13:29:03.000000000 +0000 -+++ libsoup/soup-server.c -@@ -779,6 +779,15 @@ got_headers (SoupMessage *req, SoupClien - - uri = soup_message_get_uri (req); - decoded_path = soup_uri_decode (uri->path); -+ -+ if (strstr (decoded_path, "/../") || -+ g_str_has_suffix (decoded_path, "/..")) { -+ /* Introducing new ".." segments is not allowed */ -+ g_free (decoded_path); -+ soup_message_set_status (req, SOUP_STATUS_BAD_REQUEST); -+ return; -+ } -+ - soup_uri_set_path (uri, decoded_path); - g_free (decoded_path); - } |