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

Update to libsoup-2.32.0.

Browse Source 
ok jasper@
This commit is contained in:
ajacoutot 2010-09-30 07:45:36 +00:00
parent 5b8b037a8f
commit 9bbff6e482
4 changed files with 13 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devel/libsoup/Makefile
View File

@ -1,16 +1,14 @@
# $OpenBSD: Makefile,v 1.44 2010/09/01 11:02:26 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.45 2010/09/30 07:45:36 ajacoutot Exp $
COMMENT-main = SOAP implementation in C
COMMENT-gnome = GNOME specific libsoup parts
GNOME_PROJECT = libsoup
GNOME_VERSION = 2.30.2
GNOME_VERSION = 2.32.0
PKGNAME-main = ${DISTNAME}
PKGNAME-gnome = ${GNOME_PROJECT}-gnome-${GNOME_VERSION}
REVISION-main = 0
SHARED_LIBS += soup-2.4 2.2 # .4.0
SHARED_LIBS += soup-gnome-2.4 1.1 # .4.0
API_VERSION = 2.4
@ -31,7 +29,7 @@ LIB_DEPENDS = gio-2.0,glib-2.0,gmodule-2.0,gobject-2.0,gthread-2.0:glib2->=2.22
gnutls.>=12::security/gnutls \
xml2.>=7::textproc/libxml
WANTLIB-gnome = ${WANTLIB-main} ORBit-2 dbus-1 dbus-glib-1 sqlite3 eggdbus-1
WANTLIB-gnome = ${WANTLIB-main} ORBit-2 dbus-1 sqlite3
LIB_DEPENDS-gnome = ${LIB_DEPENDS-main} \
soup-2.4::${BUILD_PKGPATH},-main \
@ -44,9 +42,10 @@ MODULES = devel/gettext \
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--disable-gtk-doc \
--disable-introspection \
--enable-ssl \
--disable-more-warnings \
--disable-gtk-doc
--disable-more-warnings
# checking Apache version... 1.3.29 (Unix) (ignoring)
# But this prevents needing apache2 for certain regress tests.
CONFIGURE_ARGS+= --with-apache-httpd="/usr/sbin/httpd"

10
devel/libsoup/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libsoup-2.30.2.tar.bz2) = 8ztiBj52qbHVUDNjo+1qhA==
RMD160 (libsoup-2.30.2.tar.bz2) = 5xQofZPPENB3W/y0hna0pMSHv/M=
SHA1 (libsoup-2.30.2.tar.bz2) = vzzi77VFL3l1igWwENIb2qG6mFw=
SHA256 (libsoup-2.30.2.tar.bz2) = eMy86E/Mx0pJ+4Fo7rQJpkKailhU8ZcmHUEIuLsQa/Y=
SIZE (libsoup-2.30.2.tar.bz2) = 644337
MD5 (libsoup-2.32.0.tar.bz2) = xx0WNYZvzTdWmoWpoelZDQ==
RMD160 (libsoup-2.32.0.tar.bz2) = dt43lgDiIQ07paX8jRH1b60HC2M=
SHA1 (libsoup-2.32.0.tar.bz2) = e1fnym3jKTd4HALzQFL6I+Gb140=
SHA256 (libsoup-2.32.0.tar.bz2) = CM8u0jVxd7l2OZSgLPT+6rQbrGG3clLX7oCQ4zcsnMk=
SIZE (libsoup-2.32.0.tar.bz2) = 649555

24
devel/libsoup/patches/patch-libsoup_soup-gnutls_c
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-libsoup_soup-gnutls_c,v 1.1 2010/09/01 11:02:26 ajacoutot Exp $
Upstream 01a43ad9824fba77384534c6d588e0e0d653986e
Due to bug 581342 we want to only negotiate SSL 3.0. Previously we
were telling gnutls to not do TLS1.0 or TLS1.1, but that means with
newer versions of gnutls that support TLS1.2 it would try to negotiate
that instead and generally fail. Fix that by disabling TLS1.2 too
(which works fine even with gnutls versions that don't support TLS1.2
yet).
https://bugzilla.gnome.org/show_bug.cgi?id=622857
--- libsoup/soup-gnutls.c.orig Tue Jun 22 17:43:58 2010
+++ libsoup/soup-gnutls.c Wed Sep 1 12:40:59 2010
@@ -477,7 +477,7 @@ soup_ssl_wrap_iochannel (GIOChannel *sock, gboolean no
goto THROW_CREATE_ERROR;
/* See http://bugzilla.gnome.org/show_bug.cgi?id=581342 */
- if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0)
+ if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.2:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0)
goto THROW_CREATE_ERROR;
if (gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE,

3
devel/libsoup/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.8 2010/04/26 21:28:22 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.9 2010/09/30 07:45:36 ajacoutot Exp $
@pkgpath devel/libsoup
@pkgpath devel/libsoup,ssl
%%SHARED%%
@ -66,6 +66,7 @@ share/gtk-doc/html/libsoup-${API_VERSION}/SoupSessionAsync.html
share/gtk-doc/html/libsoup-${API_VERSION}/SoupSessionFeature.html
share/gtk-doc/html/libsoup-${API_VERSION}/SoupSessionSync.html
share/gtk-doc/html/libsoup-${API_VERSION}/SoupSocket.html
share/gtk-doc/html/libsoup-${API_VERSION}/annotation-glossary.html
share/gtk-doc/html/libsoup-${API_VERSION}/ch01.html
share/gtk-doc/html/libsoup-${API_VERSION}/ch02.html
share/gtk-doc/html/libsoup-${API_VERSION}/ch03.html