Updated libosip to 3.5.0

4 files changed, 41 insertions, 41 deletions

diff --git a/devel/libosip/Makefile b/devel/libosip/Makefile
index 9ff24fd6cda..f53fa488921 100644
--- a/devel/libosip/Makefile
+++ b/devel/libosip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2009/04/19 20:02:49 schwarz Exp $
+# $NetBSD: Makefile,v 1.14 2011/02/19 17:02:57 schwarz Exp $
 #
 
-DISTNAME=	libosip2-3.3.0
+DISTNAME=	libosip2-3.5.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=osip/}
 
diff --git a/devel/libosip/buildlink3.mk b/devel/libosip/buildlink3.mk
index cdf123298aa..784eaba1807 100644
--- a/devel/libosip/buildlink3.mk
+++ b/devel/libosip/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:21 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2011/02/19 17:02:57 schwarz Exp $
 
 BUILDLINK_TREE+=	libosip2
 
 .if !defined(LIBOSIP2_BUILDLINK3_MK)
 LIBOSIP2_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libosip2+=	libosip2>=2.2.0
-BUILDLINK_ABI_DEPENDS.libosip2+=	libosip2>=3.2.0
+BUILDLINK_API_DEPENDS.libosip2+=	libosip2>=3.5.0
+BUILDLINK_ABI_DEPENDS.libosip2+=	libosip2>=3.5.0
 BUILDLINK_PKGSRCDIR.libosip2?=	../../devel/libosip
 .endif # LIBOSIP2_BUILDLINK3_MK
 
diff --git a/devel/libosip/distinfo b/devel/libosip/distinfo
index 5dc6ced0728..e7e3b6f63b9 100644
--- a/devel/libosip/distinfo
+++ b/devel/libosip/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2009/04/19 20:02:49 schwarz Exp $
+$NetBSD: distinfo,v 1.11 2011/02/19 17:02:57 schwarz Exp $
 
-SHA1 (libosip2-3.3.0.tar.gz) = 61b7e8a71ef060c20e1e3ba0d36f7e829047383f
-RMD160 (libosip2-3.3.0.tar.gz) = 735d0d05eb95d31095cdefd2ba1fb9c09296f700
-Size (libosip2-3.3.0.tar.gz) = 632331 bytes
-SHA1 (patch-aa) = 22dd0d593348fbe563257536c10901bfde2d6f66
+SHA1 (libosip2-3.5.0.tar.gz) = 245b572c6ede70f9cddf853b597e2088be28813a
+RMD160 (libosip2-3.5.0.tar.gz) = 7c0193a1a25aa5b12352e7ad858bfe77ec8f8296
+Size (libosip2-3.5.0.tar.gz) = 597632 bytes
+SHA1 (patch-aa) = c0b9121aa56ccf2e0fb78e943ceffbc4109ba4b0
diff --git a/devel/libosip/patches/patch-aa b/devel/libosip/patches/patch-aa
index b514577243e..ee4a7a818f5 100644
--- a/devel/libosip/patches/patch-aa
+++ b/devel/libosip/patches/patch-aa
@@ -1,37 +1,37 @@
-$NetBSD: patch-aa,v 1.4 2008/11/11 22:02:42 schwarz Exp $
+$NetBSD: patch-aa,v 1.5 2011/02/19 17:02:57 schwarz Exp $
 
---- src/osip2/port_sema.c.orig	2008-11-10 22:22:41.000000000 +0100
-+++ src/osip2/port_sema.c	2008-11-10 22:24:06.000000000 +0100
-@@ -236,7 +236,6 @@
- struct osip_sem *
- osip_sem_init (unsigned int value)
+--- src/osip2/port_sema.c.orig	2011-01-28 23:06:14.000000000 +0100
++++ src/osip2/port_sema.c	2011-01-28 23:08:19.000000000 +0100
+@@ -281,7 +281,6 @@
+ 
+ struct osip_sem *osip_sem_init(unsigned int value)
  {
--  union semun val;
-   int i;
-   osip_sem_t *sem = (osip_sem_t *) osip_malloc (sizeof (osip_sem_t));
+-	union semun val;
+ 	int i;
+ 	osip_sem_t *sem = (osip_sem_t *) osip_malloc(sizeof(osip_sem_t));
+ 
+@@ -294,8 +293,7 @@
+ 		osip_free(sem);
+ 		return NULL;
+ 	}
+-	val.val = (int) value;
+-	i = semctl(sem->semid, 0, SETVAL, val);
++	i = semctl(sem->semid, 0, SETVAL, value);
+ 	if (i != 0) {
+ 		perror("semctl error");
+ 		osip_free(sem);
+@@ -306,13 +304,11 @@
  
-@@ -250,8 +249,7 @@
-       osip_free (sem);
-       return NULL;
-     }
--  val.val = (int) value;
--  i = semctl (sem->semid, 0, SETVAL, val);
-+  i = semctl (sem->semid, 0, SETVAL, value);
-   if (i != 0)
-     {
-       perror ("semctl error");
-@@ -264,13 +262,11 @@
- int
- osip_sem_destroy (struct osip_sem *_sem)
+ int osip_sem_destroy(struct osip_sem *_sem)
  {
--  union semun val;
-   osip_sem_t *sem = (osip_sem_t *) _sem;
+-	union semun val;
+ 	osip_sem_t *sem = (osip_sem_t *) _sem;
  
-   if (sem == NULL)
-     return OSIP_SUCCESS;
--  val.val = 0;
--  semctl (sem->semid, 0, IPC_RMID, val);
-+  semctl (sem->semid, 0, IPC_RMID, 0);
-   osip_free (sem);
-   return OSIP_SUCCESS;
+ 	if (sem == NULL)
+ 		return OSIP_SUCCESS;
+-	val.val = 0;
+-	semctl(sem->semid, 0, IPC_RMID, val);
++	semctl(sem->semid, 0, IPC_RMID, 0);
+ 	osip_free(sem);
+ 	return OSIP_SUCCESS;
  }