From 2ba28fbd842c7ae98bb39cab57008085ffdf7486 Mon Sep 17 00:00:00 2001 From: recht Date: Fri, 2 Apr 2004 18:09:56 +0000 Subject: downgrade libsoup to the latest *stable* release: libsoup-1.99.28 needed by gtkhtml3 ok'd by jmmv@ --- net/libsoup/Makefile | 8 +++---- net/libsoup/PLIST | 52 +++++++++++++++++++------------------------- net/libsoup/buildlink3.mk | 4 ++-- net/libsoup/distinfo | 7 +++--- net/libsoup/patches/patch-aa | 12 ++++++++++ 5 files changed, 44 insertions(+), 39 deletions(-) create mode 100644 net/libsoup/patches/patch-aa (limited to 'net/libsoup') diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile index cc1cf3368ba..258c17b01ce 100644 --- a/net/libsoup/Makefile +++ b/net/libsoup/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2004/04/01 18:32:03 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2004/04/02 18:09:56 recht Exp $ # -DISTNAME= libsoup-2.1.8 +DISTNAME= libsoup-1.99.28 CATEGORIES= net gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsoup/2.1/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsoup/1.99/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= recht@NetBSD.org @@ -14,7 +14,7 @@ USE_BUILDLINK3= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= soup-2.2.pc.in +PKGCONFIG_OVERRIDE+= soup-2.0.pc.in CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html diff --git a/net/libsoup/PLIST b/net/libsoup/PLIST index 3d3bfc9d637..7e5fcba378c 100644 --- a/net/libsoup/PLIST +++ b/net/libsoup/PLIST @@ -1,30 +1,22 @@ -@comment $NetBSD: PLIST,v 1.2 2004/04/01 18:32:03 jmmv Exp $ -include/libsoup-2.2/libsoup/soup-address.h -include/libsoup-2.2/libsoup/soup-connection.h -include/libsoup-2.2/libsoup/soup-headers.h -include/libsoup-2.2/libsoup/soup-message-filter.h -include/libsoup-2.2/libsoup/soup-message-queue.h -include/libsoup-2.2/libsoup/soup-message.h -include/libsoup-2.2/libsoup/soup-method.h -include/libsoup-2.2/libsoup/soup-misc.h -include/libsoup-2.2/libsoup/soup-server-auth.h -include/libsoup-2.2/libsoup/soup-server-message.h -include/libsoup-2.2/libsoup/soup-server.h -include/libsoup-2.2/libsoup/soup-session-async.h -include/libsoup-2.2/libsoup/soup-session-sync.h -include/libsoup-2.2/libsoup/soup-session.h -include/libsoup-2.2/libsoup/soup-soap-message.h -include/libsoup-2.2/libsoup/soup-soap-response.h -include/libsoup-2.2/libsoup/soup-socket.h -include/libsoup-2.2/libsoup/soup-status.h -include/libsoup-2.2/libsoup/soup-types.h -include/libsoup-2.2/libsoup/soup-uri.h -include/libsoup-2.2/libsoup/soup.h -lib/libsoup-2.2.a -lib/libsoup-2.2.la -lib/libsoup-2.2.so -lib/libsoup-2.2.so.3 -lib/libsoup-2.2.so.3.0 -lib/pkgconfig/libsoup-2.2.pc -@dirrm include/libsoup-2.2/libsoup -@dirrm include/libsoup-2.2 +@comment $NetBSD: PLIST,v 1.3 2004/04/02 18:09:56 recht Exp $ +include/soup-2.0/libsoup/soup-address.h +include/soup-2.0/libsoup/soup-context.h +include/soup-2.0/libsoup/soup-error.h +include/soup-2.0/libsoup/soup-headers.h +include/soup-2.0/libsoup/soup-message.h +include/soup-2.0/libsoup/soup-method.h +include/soup-2.0/libsoup/soup-misc.h +include/soup-2.0/libsoup/soup-ntlm.h +include/soup-2.0/libsoup/soup-server-auth.h +include/soup-2.0/libsoup/soup-server.h +include/soup-2.0/libsoup/soup-socket.h +include/soup-2.0/libsoup/soup-uri.h +include/soup-2.0/libsoup/soup.h +lib/libsoup-2.0.a +lib/libsoup-2.0.la +lib/libsoup-2.0.so +lib/libsoup-2.0.so.0 +lib/libsoup-2.0.so.0.0 +lib/pkgconfig/soup-2.0.pc +@dirrm include/soup-2.0/libsoup +@dirrm include/soup-2.0 diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk index a61248c8351..127a1db66fe 100644 --- a/net/libsoup/buildlink3.mk +++ b/net/libsoup/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/04/01 18:32:03 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/04/02 18:09:56 recht Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBSOUP_BUILDLINK3_MK:= ${LIBSOUP_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsoup} BUILDLINK_PACKAGES+= libsoup .if !empty(LIBSOUP_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.libsoup+= libsoup>=2.1.8 +BUILDLINK_DEPENDS.libsoup+= libsoup>=1.99.28 BUILDLINK_PKGSRCDIR.libsoup?= ../../net/libsoup .endif # LIBSOUP_BUILDLINK3_MK diff --git a/net/libsoup/distinfo b/net/libsoup/distinfo index 3400ec48a6d..84eb07ba235 100644 --- a/net/libsoup/distinfo +++ b/net/libsoup/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.2 2004/04/01 18:32:03 jmmv Exp $ +$NetBSD: distinfo,v 1.3 2004/04/02 18:09:56 recht Exp $ -SHA1 (libsoup-2.1.8.tar.bz2) = d5f6c2672cf7d187df892bdf1b8022d496ded7cb -Size (libsoup-2.1.8.tar.bz2) = 336798 bytes +SHA1 (libsoup-1.99.28.tar.bz2) = bd2af804dae4ade4e4a79163e0f9e808bafa64f1 +Size (libsoup-1.99.28.tar.bz2) = 233412 bytes +SHA1 (patch-aa) = 616147211ad655dfae60fa8f0a62291d8a15be9c diff --git a/net/libsoup/patches/patch-aa b/net/libsoup/patches/patch-aa new file mode 100644 index 00000000000..5814dd4698b --- /dev/null +++ b/net/libsoup/patches/patch-aa @@ -0,0 +1,12 @@ +$NetBSD: patch-aa,v 1.3 2004/04/02 18:09:56 recht Exp $ + +--- libsoup/soup-gnutls.c.orig 2004-04-02 18:25:12.000000000 +0200 ++++ libsoup/soup-gnutls.c +@@ -77,7 +77,6 @@ verify_certificate (gnutls_session sessi + + if (status & GNUTLS_CERT_INVALID || + status & GNUTLS_CERT_NOT_TRUSTED || +- status & GNUTLS_CERT_CORRUPTED || + status & GNUTLS_CERT_REVOKED) + { + g_warning ("The certificate is not trusted."); -- cgit v1.2.3