updated devel/libosip and net/libexosip to 4.1.0 each.diff -r1.17 -r1.18 pkgsrc/devel/libosip/Makefile
(schwarz)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.17 2013/07/14 14:55:16 rodent Exp $ | 1 | # $NetBSD: Makefile,v 1.18 2014/07/12 16:48:26 schwarz Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= libosip2-4.0.0 | 4 | DISTNAME= libosip2-4.1.0 | |
5 | CATEGORIES= devel | 5 | CATEGORIES= devel | |
6 | MASTER_SITES= ${MASTER_SITE_GNU:=osip/} | 6 | MASTER_SITES= ${MASTER_SITE_GNU:=osip/} | |
7 | 7 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://www.gnu.org/software/osip/ | 9 | HOMEPAGE= http://www.gnu.org/software/osip/ | |
10 | COMMENT= Implementation of SIP | 10 | COMMENT= Implementation of SIP | |
11 | LICENSE= gnu-lgpl-v2.1 | 11 | LICENSE= gnu-lgpl-v2.1 | |
12 | 12 | |||
13 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 13 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
14 | 14 | |||
15 | USE_LIBTOOL= yes | 15 | USE_LIBTOOL= yes | |
16 | GNU_CONFIGURE= yes | 16 | GNU_CONFIGURE= yes | |
17 | 17 |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.13 2013/07/14 14:55:16 rodent Exp $ | 1 | $NetBSD: distinfo,v 1.14 2014/07/12 16:48:26 schwarz Exp $ | |
2 | 2 | |||
3 | SHA1 (libosip2-4.0.0.tar.gz) = 8b773ad63079ad5e1dc329f73ee8d05ca74ecde4 | 3 | SHA1 (libosip2-4.1.0.tar.gz) = 61459c9052ca2f5e77a6936c9b369e2b0602c080 | |
4 | RMD160 (libosip2-4.0.0.tar.gz) = 686b9308e3738f11b5a1590457d55c7f6d6fb002 | 4 | RMD160 (libosip2-4.1.0.tar.gz) = 3f86bf7872cd382f331b49f5e03a6ddddd338afa | |
5 | Size (libosip2-4.0.0.tar.gz) = 644958 bytes | 5 | Size (libosip2-4.1.0.tar.gz) = 636382 bytes | |
6 | SHA1 (patch-aa) = 509b67cd5f62baf1ba1a3894a54949ef3e242e81 | 6 | SHA1 (patch-aa) = ba19e1ad149d2e7f0b0b44c38b48b1f5031dc587 |
@@ -1,36 +1,36 @@ | @@ -1,36 +1,36 @@ | |||
1 | $NetBSD: patch-aa,v 1.6 2013/07/14 14:55:16 rodent Exp $ | 1 | $NetBSD: patch-aa,v 1.7 2014/07/12 16:48:26 schwarz Exp $ | |
2 | 2 | |||
3 | --- src/osip2/port_sema.c.orig 2012-11-16 21:24:10.000000000 +0000 | 3 | --- src/osip2/port_sema.c.orig 2013-12-18 19:36:46.000000000 +0100 | |
4 | +++ src/osip2/port_sema.c | 4 | +++ src/osip2/port_sema.c 2014-07-12 18:20:40.000000000 +0200 | |
5 | @@ -302,7 +302,6 @@ osip_sem_trywait (struct osip_sem *_sem) | 5 | @@ -305,7 +305,6 @@ | |
6 | struct osip_sem * | 6 | struct osip_sem * | |
7 | osip_sem_init (unsigned int value) | 7 | osip_sem_init (unsigned int value) | |
8 | { | 8 | { | |
9 | - union semun val; | 9 | - union semun val; | |
10 | int i; | 10 | int i; | |
11 | osip_sem_t *sem = (osip_sem_t *) osip_malloc (sizeof (osip_sem_t)); | 11 | osip_sem_t *sem = (osip_sem_t *) osip_malloc (sizeof (osip_sem_t)); | |
12 | 12 | |||
13 | @@ -315,8 +314,7 @@ osip_sem_init (unsigned int value) | 13 | @@ -318,8 +317,7 @@ | |
14 | osip_free (sem); | 14 | osip_free (sem); | |
15 | return NULL; | 15 | return NULL; | |
16 | } | 16 | } | |
17 | - val.val = (int) value; | 17 | - val.val = (int) value; | |
18 | - i = semctl (sem->semid, 0, SETVAL, val); | 18 | - i = semctl (sem->semid, 0, SETVAL, val); | |
19 | + i = semctl(sem->semid, 0, SETVAL, value); | 19 | + i = semctl(sem->semid, 0, SETVAL, value); | |
20 | if (i != 0) { | 20 | if (i != 0) { | |
21 | perror ("semctl error"); | 21 | perror ("semctl error"); | |
22 | osip_free (sem); | 22 | osip_free (sem); | |
23 | @@ -328,13 +326,11 @@ osip_sem_init (unsigned int value) | 23 | @@ -331,13 +329,11 @@ | |
24 | int | 24 | int | |
25 | osip_sem_destroy (struct osip_sem *_sem) | 25 | osip_sem_destroy (struct osip_sem *_sem) | |
26 | { | 26 | { | |
27 | - union semun val; | 27 | - union semun val; | |
28 | osip_sem_t *sem = (osip_sem_t *) _sem; | 28 | osip_sem_t *sem = (osip_sem_t *) _sem; | |
29 | 29 | |||
30 | if (sem == NULL) | 30 | if (sem == NULL) | |
31 | return OSIP_SUCCESS; | 31 | return OSIP_SUCCESS; | |
32 | - val.val = 0; | 32 | - val.val = 0; | |
33 | - semctl (sem->semid, 0, IPC_RMID, val); | 33 | - semctl (sem->semid, 0, IPC_RMID, val); | |
34 | + semctl(sem->semid, 0, IPC_RMID, 0); | 34 | + semctl(sem->semid, 0, IPC_RMID, 0); | |
35 | osip_free (sem); | 35 | osip_free (sem); | |
36 | return OSIP_SUCCESS; | 36 | return OSIP_SUCCESS; |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: CHANGES-2014,v 1.2551 2014/07/12 15:48:14 wiz Exp $ | 1 | $NetBSD: CHANGES-2014,v 1.2552 2014/07/12 16:48:27 schwarz Exp $ | |
2 | 2 | |||
3 | Changes to the packages collection and infrastructure in 2014: | 3 | Changes to the packages collection and infrastructure in 2014: | |
4 | 4 | |||
5 | Updated games/supertuxkart to 0.8.1 [ryoon 2014-01-01] | 5 | Updated games/supertuxkart to 0.8.1 [ryoon 2014-01-01] | |
6 | Updated devel/libgetopt to 1.4.5 [ryoon 2014-01-01] | 6 | Updated devel/libgetopt to 1.4.5 [ryoon 2014-01-01] | |
7 | Added devel/p5-Data-GUID version 0.048 [ryoon 2014-01-01] | 7 | Added devel/p5-Data-GUID version 0.048 [ryoon 2014-01-01] | |
8 | Added devel/p5-Role-Basic version 0.13 [ryoon 2014-01-01] | 8 | Added devel/p5-Role-Basic version 0.13 [ryoon 2014-01-01] | |
9 | Added devel/p5-Symbol-Global-Name version 0.04 [ryoon 2014-01-01] | 9 | Added devel/p5-Symbol-Global-Name version 0.04 [ryoon 2014-01-01] | |
10 | Added mail/p5-Email-Address-List version 0.01 [ryoon 2014-01-01] | 10 | Added mail/p5-Email-Address-List version 0.01 [ryoon 2014-01-01] | |
11 | Added security/p5-Crypt-X509 version 0.51 [ryoon 2014-01-01] | 11 | Added security/p5-Crypt-X509 version 0.51 [ryoon 2014-01-01] | |
12 | Added time/p5-Date-Extract version 0.04 [ryoon 2014-01-01] | 12 | Added time/p5-Date-Extract version 0.04 [ryoon 2014-01-01] | |
13 | Updated misc/p5-Locale-Maketext-Fuzzy to 0.11 [ryoon 2014-01-01] | 13 | Updated misc/p5-Locale-Maketext-Fuzzy to 0.11 [ryoon 2014-01-01] | |
14 | Updated devel/rt4 to 4.2.1 [ryoon 2014-01-01] | 14 | Updated devel/rt4 to 4.2.1 [ryoon 2014-01-01] | |
@@ -3363,13 +3363,15 @@ Changes to the packages collection and i | @@ -3363,13 +3363,15 @@ Changes to the packages collection and i | |||
3363 | Updated graphics/libpano13 to 2.9.19nb2 [adam 2014-07-10] | 3363 | Updated graphics/libpano13 to 2.9.19nb2 [adam 2014-07-10] | |
3364 | Updated net/miniupnpd to 1.8.20140523 [adam 2014-07-10] | 3364 | Updated net/miniupnpd to 1.8.20140523 [adam 2014-07-10] | |
3365 | Updated textproc/pod2mdoc to 0.0.12 [wiz 2014-07-11] | 3365 | Updated textproc/pod2mdoc to 0.0.12 [wiz 2014-07-11] | |
3366 | Updated net/transmission to 2.84 [wiz 2014-07-11] | 3366 | Updated net/transmission to 2.84 [wiz 2014-07-11] | |
3367 | Updated emulators/qemu to 2.0.0nb4 [gson 2014-07-11] | 3367 | Updated emulators/qemu to 2.0.0nb4 [gson 2014-07-11] | |
3368 | Updated devel/gitolite to 3.6.1 [ryoon 2014-07-12] | 3368 | Updated devel/gitolite to 3.6.1 [ryoon 2014-07-12] | |
3369 | Updated devel/p5-Moose to 2.1210 [wen 2014-07-12] | 3369 | Updated devel/p5-Moose to 2.1210 [wen 2014-07-12] | |
3370 | Updated devel/meld-devel to 3.11.2 [wiz 2014-07-12] | 3370 | Updated devel/meld-devel to 3.11.2 [wiz 2014-07-12] | |
3371 | Updated x11/libXi to 1.7.3 [wiz 2014-07-12] | 3371 | Updated x11/libXi to 1.7.3 [wiz 2014-07-12] | |
3372 | Updated x11/xterm to 308 [wiz 2014-07-12] | 3372 | Updated x11/xterm to 308 [wiz 2014-07-12] | |
3373 | Updated x11/pixman to 0.32.6 [wiz 2014-07-12] | 3373 | Updated x11/pixman to 0.32.6 [wiz 2014-07-12] | |
3374 | Updated security/netpgpverify to 20140712 [agc 2014-07-12] | 3374 | Updated security/netpgpverify to 20140712 [agc 2014-07-12] | |
3375 | Updated misc/calibre to 1.44.0 [wiz 2014-07-12] | 3375 | Updated misc/calibre to 1.44.0 [wiz 2014-07-12] | |
3376 | Updated devel/libosip to 4.1.0 [schwarz 2014-07-12] | |||
3377 | Updated net/libexosip to 4.1.0 [schwarz 2014-07-12] |
@@ -1,25 +1,25 @@ | @@ -1,25 +1,25 @@ | |||
1 | # $NetBSD: Makefile,v 1.2 2014/02/12 23:18:22 tron Exp $ | 1 | # $NetBSD: Makefile,v 1.3 2014/07/12 16:48:26 schwarz Exp $ | |
2 | 2 | |||
3 | DISTNAME= libeXosip2-4.0.0 | 3 | DISTNAME= libeXosip2-4.1.0 | |
4 | PKGREVISION= 1 | |||
5 | CATEGORIES= devel net | 4 | CATEGORIES= devel net | |
6 | MASTER_SITES= http://download.savannah.nongnu.org/releases/exosip/ | 5 | MASTER_SITES= http://download.savannah.nongnu.org/releases/exosip/ | |
7 | 6 | |||
8 | MAINTAINER= schwarz@NetBSD.org | 7 | MAINTAINER= schwarz@NetBSD.org | |
9 | HOMEPAGE= http://savannah.nongnu.org/projects/exosip | 8 | HOMEPAGE= http://savannah.nongnu.org/projects/exosip | |
10 | COMMENT= The Extended Open SIP library | 9 | COMMENT= The Extended Open SIP library | |
11 | LICENSE= gnu-gpl-v2 | 10 | LICENSE= gnu-gpl-v2 | |
12 | 11 | |||
13 | GNU_CONFIGURE= yes | 12 | GNU_CONFIGURE= yes | |
14 | USE_LIBTOOL= yes | 13 | USE_LIBTOOL= yes | |
15 | USE_TOOLS+= pkg-config | 14 | USE_TOOLS+= pkg-config | |
16 | USE_FEATURES+= getopt_long | 15 | USE_FEATURES+= getopt_long | |
17 | 16 | |||
18 | .include "options.mk" | 17 | .include "options.mk" | |
19 | 18 | |||
20 | LIBS.SunOS+= -lsocket -lnsl | 19 | LIBS.SunOS+= -lsocket -lnsl | |
20 | LIBS.Darwin+= -framework CoreServices -framework Security | |||
21 | 21 | |||
22 | .include "../../net/libcares/buildlink3.mk" | 22 | .include "../../net/libcares/buildlink3.mk" | |
23 | .include "../../devel/libosip/buildlink3.mk" | 23 | .include "../../devel/libosip/buildlink3.mk" | |
24 | .include "../../mk/pthread.buildlink3.mk" | 24 | .include "../../mk/pthread.buildlink3.mk" | |
25 | .include "../../mk/bsd.pkg.mk" | 25 | .include "../../mk/bsd.pkg.mk" |
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.1 2013/07/16 02:12:26 rodent Exp $ | 1 | $NetBSD: distinfo,v 1.2 2014/07/12 16:48:26 schwarz Exp $ | |
2 | 2 | |||
3 | SHA1 (libeXosip2-4.0.0.tar.gz) = e5b50c20395db3dd50577af4363ad7a0c2f9de6e | 3 | SHA1 (libeXosip2-4.1.0.tar.gz) = f85e93227f772acac1b3e17b69c6b8a708336ba8 | |
4 | RMD160 (libeXosip2-4.0.0.tar.gz) = 4134a1e15d00938bdf819d4d6ec60583a2ea62da | 4 | RMD160 (libeXosip2-4.1.0.tar.gz) = 816ef497a6ddaf3953a2b6fd490ad8061151fbfe | |
5 | Size (libeXosip2-4.0.0.tar.gz) = 526339 bytes | 5 | Size (libeXosip2-4.1.0.tar.gz) = 530997 bytes | |
6 | SHA1 (patch-aa) = 0f7acee4031a827998bde64b4dc847b0831ea5e3 | 6 | SHA1 (patch-aa) = 9e3482cb6cbe00cc512dca313904f0e671a180df | |
7 | SHA1 (patch-ab) = 929e7949d783a6065bb34c1a622284ad4ad24603 | 7 | SHA1 (patch-ab) = 929e7949d783a6065bb34c1a622284ad4ad24603 |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: patch-aa,v 1.1 2013/07/16 02:12:26 rodent Exp $ | 1 | $NetBSD: patch-aa,v 1.2 2014/07/12 16:48:27 schwarz Exp $ | |
2 | 2 | |||
3 | Defines INADDR_NONE, which is needed on Solaris. | 3 | Defines INADDR_NONE, which is needed on Solaris. | |
4 | 4 | |||
5 | --- src/eXutils.c.orig 2012-11-26 10:04:37.000000000 +0000 | 5 | --- src/eXutils.c.orig 2014-01-06 19:30:21.000000000 +0100 | |
6 | +++ src/eXutils.c | 6 | +++ src/eXutils.c 2014-07-12 18:15:15.000000000 +0200 | |
7 | @@ -542,6 +542,10 @@ _eXosip_guess_ip_for_via (struct eXosip_ | 7 | @@ -509,6 +509,10 @@ | |
8 | 8 | |||
9 | #include <stdio.h> | 9 | #include <stdio.h> | |
10 | 10 | |||
11 | +#ifndef INADDR_NONE | 11 | +#ifndef INADDR_NONE | |
12 | +#define INADDR_NONE ((unsigned long) -1) /* needed on Solaris */ | 12 | +#define INADDR_NONE ((unsigned long) -1) /* needed on Solaris */ | |
13 | +#endif | 13 | +#endif | |
14 | + | 14 | + | |
15 | static int _eXosip_default_gateway_ipv4 (struct eXosip_t *excontext, char *address, int size); | 15 | static int _eXosip_default_gateway_ipv4 (struct eXosip_t *excontext, char *address, int size); | |
16 | 16 | |||
17 | static int _eXosip_default_gateway_ipv6 (struct eXosip_t *excontext, char *address, int size); | 17 | static int _eXosip_default_gateway_ipv6 (struct eXosip_t *excontext, char *address, int size); |