Pullup ticket #5946 - requested by khorben
devel/libosip: security fix

Revisions pulled up:
- devel/libosip/Makefile                                        1.20
- devel/libosip/distinfo                                        1.16
- devel/libosip/patches/patch-aa                                deleted
- devel/libosip/patches/patch-src_osip2_port__sema.c            1.1
- devel/libosip/patches/patch-src_osipparser2_osip__body.c      1.1

---
   Module Name:	pkgsrc
   Committed By:	khorben
   Date:		Sun Apr 21 16:25:38 UTC 2019

   Modified Files:
   	pkgsrc/devel/libosip: Makefile distinfo
   Added Files:
   	pkgsrc/devel/libosip/patches: patch-src_osip2_port__sema.c
   	    patch-src_osipparser2_osip__body.c
   	    patch-src_osipparser2_osip__message__parse.c
   	    patch-src_osipparser2_osip__message__to__str.c
   	    patch-src_osipparser2_osip__port.c
   Removed Files:
   	pkgsrc/devel/libosip/patches: patch-aa

   Log Message:
   Import security fixes for libosip2

   This adds patches for the following CVE entries:
   - - CVE-2016-10324
   - - CVE-2016-10325
   - - CVE-2016-10326
   - - CVE-2017-7853

   All patches were obtained from Debian and verified to match upstream.

   While there, rename and comment the previous patch.

   Bumps PKGREVISION.

   XXX pull-up


(bsiegert)

$NetBSD: patch-src_osip2_port__sema.c,v 1.1.2.2 2019/04/28 16:14:29 bsiegert Exp $

Fix the calls to semctl to make this package build on NetBSD 1.6

--- src/osip2/port_sema.c.orig	2013-12-18 18:36:46.000000000 +0000
+++ src/osip2/port_sema.c
@@ -305,7 +305,6 @@ osip_sem_trywait (struct osip_sem *_sem)
 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));
 
@@ -318,8 +317,7 @@ osip_sem_init (unsigned int value)
     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);
@@ -331,13 +329,11 @@ osip_sem_init (unsigned int value)
 int
 osip_sem_destroy (struct osip_sem *_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;
 }

$NetBSD: patch-src_osipparser2_osip__body.c,v 1.1.2.2 2019/04/28 16:14:29 bsiegert Exp $

Apply fix for CVE-2016-10326 (from Debian)

--- src/osipparser2/osip_body.c.orig	2013-12-18 18:36:46.000000000 +0000
+++ src/osipparser2/osip_body.c
@@ -417,6 +417,14 @@ osip_body_to_str (const osip_body_t * bo
   }
 
   if ((osip_list_size (body->headers) > 0) || (body->content_type != NULL)) {
+    if (length < tmp_body - ptr + 3) {
+      size_t len;
+
+      len = tmp_body - ptr;
+      length = length + 3 + body->length; /* add body->length, to avoid calling realloc often */
+      ptr = osip_realloc (ptr, length);
+      tmp_body = ptr + len;
+    }
     tmp_body = osip_strn_append (tmp_body, CRLF, 2);
   }
   if (length < tmp_body - ptr + body->length + 4) {