From 0c0a38c7593bb622490470d146764190c9f07df2 Mon Sep 17 00:00:00 2001 From: obache Date: Sat, 25 Aug 2007 02:49:12 +0000 Subject: [PATCH] Update libosip to 3.0.3. This version contains the fix addressed in PR 35825. libosip2 (3.0.3) * initial support for rtems. libosip2 (3.0.2) * initial support for ucos. * fix to ignore broken optionnal header when parsing. libosip2 (3.0.1) * add Windows CE support with Visual Studio 2005 (WM5.0,PocketPC 2003/2005, Smartphone) * Fix memory leaks (not likely to happen). * Fix buffer overrun in url. * Modification of the Application Binary Interface (ABI) to decrease number of allocations. Changes: osip_message_t/osip_dialog_t/sdp_message_t/osip_fifo_t * save route headers in the same order (CALLER or CALLER) in dialogs. libosip2 (2.2.3) * fix 64-bit (amd64) issue with hash. * remove SDP negotiation (much better to do it in your applications) --- devel/libosip/Makefile | 4 ++-- devel/libosip/PLIST | 4 +--- devel/libosip/buildlink3.mk | 4 ++-- devel/libosip/distinfo | 10 +++++----- devel/libosip/patches/patch-aa | 12 ++++++------ 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/devel/libosip/Makefile b/devel/libosip/Makefile index 5c4a6b83b8a2..43908f5bf3a9 100644 --- a/devel/libosip/Makefile +++ b/devel/libosip/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2006/03/04 21:29:17 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2007/08/25 02:49:12 obache Exp $ # -DISTNAME= libosip2-2.2.2 +DISTNAME= libosip2-3.0.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=osip/} diff --git a/devel/libosip/PLIST b/devel/libosip/PLIST index c6062f354608..fd3cff788d10 100644 --- a/devel/libosip/PLIST +++ b/devel/libosip/PLIST @@ -1,10 +1,9 @@ -@comment $NetBSD: PLIST,v 1.4 2005/08/11 18:16:13 drochner Exp $ +@comment $NetBSD: PLIST,v 1.5 2007/08/25 02:49:12 obache Exp $ include/osip2/osip.h include/osip2/osip_condv.h include/osip2/osip_dialog.h include/osip2/osip_fifo.h include/osip2/osip_mt.h -include/osip2/osip_negotiation.h include/osip2/osip_time.h include/osipparser2/headers/osip_accept.h include/osipparser2/headers/osip_accept_encoding.h @@ -41,7 +40,6 @@ include/osipparser2/osip_md5.h include/osipparser2/osip_message.h include/osipparser2/osip_parser.h include/osipparser2/osip_port.h -include/osipparser2/osip_rfc3264.h include/osipparser2/osip_uri.h include/osipparser2/sdp_message.h lib/libosip2.la diff --git a/devel/libosip/buildlink3.mk b/devel/libosip/buildlink3.mk index c66306216c27..87204bced926 100644 --- a/devel/libosip/buildlink3.mk +++ b/devel/libosip/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2007/08/25 02:49:12 obache Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBOSIP2_BUILDLINK3_MK:= ${LIBOSIP2_BUILDLINK3_MK}+ @@ -13,7 +13,7 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libosip2 .if !empty(LIBOSIP2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libosip2+= libosip2>=2.2.0 -BUILDLINK_ABI_DEPENDS.libosip2+= libosip2>=2.2.0 +BUILDLINK_ABI_DEPENDS.libosip2+= libosip2>=3.0.1 BUILDLINK_PKGSRCDIR.libosip2?= ../../devel/libosip .endif # LIBOSIP2_BUILDLINK3_MK diff --git a/devel/libosip/distinfo b/devel/libosip/distinfo index eda6311ac1ef..83591bbe18f2 100644 --- a/devel/libosip/distinfo +++ b/devel/libosip/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2006/01/29 22:29:01 schwarz Exp $ +$NetBSD: distinfo,v 1.7 2007/08/25 02:49:12 obache Exp $ -SHA1 (libosip2-2.2.2.tar.gz) = 493d0ff3ba07056a8833a798cd6f9018841e3e91 -RMD160 (libosip2-2.2.2.tar.gz) = 49aaba3bb0f1483dca02dc5b6103f42e239c2527 -Size (libosip2-2.2.2.tar.gz) = 664050 bytes -SHA1 (patch-aa) = 52f6ebb06bdb093c9abd0dced52444b1230948b0 +SHA1 (libosip2-3.0.3.tar.gz) = 6b3c6f0a8548dbaf9f0112ca1c20f52cc8c0042d +RMD160 (libosip2-3.0.3.tar.gz) = 01dc57f3113b21d8a177c685ad03a9586c80cf06 +Size (libosip2-3.0.3.tar.gz) = 654764 bytes +SHA1 (patch-aa) = f86b43e253983209bf0c8f04bfe984bbf5d6790e diff --git a/devel/libosip/patches/patch-aa b/devel/libosip/patches/patch-aa index 6cf04e4b4bcf..f47f54a9f2ea 100644 --- a/devel/libosip/patches/patch-aa +++ b/devel/libosip/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2006/01/29 22:29:01 schwarz Exp $ +$NetBSD: patch-aa,v 1.3 2007/08/25 02:49:13 obache Exp $ ---- src/osip2/port_sema.c.orig Sat Jan 28 19:57:17 2006 -+++ src/osip2/port_sema.c Sat Jan 28 19:58:11 2006 -@@ -147,7 +147,6 @@ +--- src/osip2/port_sema.c.orig 2007-06-05 10:17:50.000000000 +0000 ++++ src/osip2/port_sema.c +@@ -236,7 +236,6 @@ osip_sem_trywait (struct osip_sem *_sem) struct osip_sem * osip_sem_init (unsigned int value) { @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.2 2006/01/29 22:29:01 schwarz Exp $ int i; osip_sem_t *sem = (osip_sem_t *) osip_malloc (sizeof (osip_sem_t)); -@@ -161,8 +160,7 @@ +@@ -250,8 +249,7 @@ osip_sem_init (unsigned int value) osip_free (sem); return NULL; } @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 2006/01/29 22:29:01 schwarz Exp $ if (i != 0) { perror ("semctl error"); -@@ -175,13 +173,11 @@ +@@ -264,13 +262,11 @@ osip_sem_init (unsigned int value) int osip_sem_destroy (struct osip_sem *_sem) {