pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc updated net/sipsak to 0.9.6 (which had been living in ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1302f62f695d
branches:  trunk
changeset: 521399:1302f62f695d
user:      schwarz <schwarz%pkgsrc.org@localhost>
date:      Fri Nov 10 21:32:35 2006 +0000

description:
updated net/sipsak to 0.9.6 (which had been living in wip already for some
time)

diffstat:

 doc/CHANGES-2006            |    3 +-
 doc/TODO                    |    3 +-
 net/sipsak/Makefile         |   25 ++++--
 net/sipsak/PLIST            |    2 +-
 net/sipsak/distinfo         |   10 +-
 net/sipsak/patches/patch-aa |  164 +++++--------------------------------------
 6 files changed, 43 insertions(+), 164 deletions(-)

diffs (259 lines):

diff -r eaa018e1313b -r 1302f62f695d doc/CHANGES-2006
--- a/doc/CHANGES-2006  Fri Nov 10 21:19:43 2006 +0000
+++ b/doc/CHANGES-2006  Fri Nov 10 21:32:35 2006 +0000
@@ -1,4 +1,4 @@
->$NetBSD: CHANGES-2006,v 1.1789 2006/11/10 21:01:28 gdt Exp $
+>$NetBSD: CHANGES-2006,v 1.1790 2006/11/10 21:32:35 schwarz Exp $
 
 Changes to the packages collection and infrastructure in 2006:
 
@@ -5250,3 +5250,4 @@
        Updated editors/lyx-qt to 1.4.3 [reed 2006-11-10]
        Updated mail/gnus to 5.10.8 [perry 2006-11-10]
        Updated geography/geos to 2.2.3 [gdt 2006-11-10]
+       Updated net/sipsak to 0.9.6 [schwarz 2006-11-10]
diff -r eaa018e1313b -r 1302f62f695d doc/TODO
--- a/doc/TODO  Fri Nov 10 21:19:43 2006 +0000
+++ b/doc/TODO  Fri Nov 10 21:32:35 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.5697 2006/11/10 18:29:08 perry Exp $
+$NetBSD: TODO,v 1.5698 2006/11/10 21:32:35 schwarz Exp $
 
 Suggested new packages
 ======================
@@ -1004,7 +1004,6 @@
        o silc-toolkit-1.0.2
        o simh-3.5.0
        o simulavr-0.1.2.2
-       o sipsak-0.9.6
        o sitecopy-0.16.3
        o sitescooper-3.1.2
        o sjeng-11.2
diff -r eaa018e1313b -r 1302f62f695d net/sipsak/Makefile
--- a/net/sipsak/Makefile       Fri Nov 10 21:19:43 2006 +0000
+++ b/net/sipsak/Makefile       Fri Nov 10 21:32:35 2006 +0000
@@ -1,15 +1,20 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/08/11 17:58:33 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.2 2006/11/10 21:32:35 schwarz Exp $
 
-DISTNAME=              sipsak-0.9.1
-CATEGORIES=            net comms
-MASTER_SITES=          http://download.berlios.de/sipsak/
+DISTNAME=      sipsak-0.9.6-1
+PKGNAME=       ${DISTNAME:S/-1//}
+CATEGORIES=    net comms
+MASTER_SITES=  http://download.berlios.de/sipsak/
 
-MAINTAINER=            schwarz%NetBSD.org@localhost
-HOMEPAGE=              http://sipsak.org/
-COMMENT=               Command-line SIP testing utility
+MAINTAINER=    schwarz%NetBSD.org@localhost
+HOMEPAGE=      http://sipsak.org/
+COMMENT=       Sipsak is a command-line SIP testing utility
+
+WRKSRC=                ${WRKDIR}/${DISTNAME:S/-1//}
 
-GNU_CONFIGURE=         yes
+GNU_CONFIGURE= YES
+USE_TOOLS+=    gmake
 
-.include "../../security/openssl/buildlink3.mk"
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
+
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r eaa018e1313b -r 1302f62f695d net/sipsak/PLIST
--- a/net/sipsak/PLIST  Fri Nov 10 21:19:43 2006 +0000
+++ b/net/sipsak/PLIST  Fri Nov 10 21:32:35 2006 +0000
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/08/11 17:58:33 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/11/10 21:32:35 schwarz Exp $
 bin/sipsak
 man/man1/sipsak.1
diff -r eaa018e1313b -r 1302f62f695d net/sipsak/distinfo
--- a/net/sipsak/distinfo       Fri Nov 10 21:19:43 2006 +0000
+++ b/net/sipsak/distinfo       Fri Nov 10 21:32:35 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/08/11 17:58:33 drochner Exp $
+$NetBSD: distinfo,v 1.2 2006/11/10 21:32:35 schwarz Exp $
 
-SHA1 (sipsak-0.9.1.tar.gz) = e4039b51708194d504618b059b41e074f2533f77
-RMD160 (sipsak-0.9.1.tar.gz) = 48d2f49344406cdb874b847d6a7e958a977aaf3b
-Size (sipsak-0.9.1.tar.gz) = 144812 bytes
-SHA1 (patch-aa) = 9c332267bd199920a3e22914997bec77164183aa
+SHA1 (sipsak-0.9.6-1.tar.gz) = 6d2fd2c90ea04be749e48927b3e7fc08c52166b6
+RMD160 (sipsak-0.9.6-1.tar.gz) = d5949e4309bda732b5aee462a4488bb9d850fe5a
+Size (sipsak-0.9.6-1.tar.gz) = 158776 bytes
+SHA1 (patch-aa) = e4df10b6d074acd1f3d925f48849348516533814
diff -r eaa018e1313b -r 1302f62f695d net/sipsak/patches/patch-aa
--- a/net/sipsak/patches/patch-aa       Fri Nov 10 21:19:43 2006 +0000
+++ b/net/sipsak/patches/patch-aa       Fri Nov 10 21:32:35 2006 +0000
@@ -1,148 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/08/11 17:58:33 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2006/11/10 21:32:35 schwarz Exp $
 
---- shoot.c.orig       2005-07-29 01:04:15.000000000 +0200
-+++ shoot.c
-@@ -340,7 +340,7 @@ int recv_message(char *buf, int size) {
- #endif
-       *(buf+ ret) = '\0';
-       if (ret > 0) {
--              if (!inv_trans && (regexec(&proexp, rec, 0, 0, 0) != REG_NOERROR)) {
-+              if (!inv_trans && (regexec(&proexp, rec, 0, 0, 0) != 0)) {
-                       retryAfter = SIP_T1;
-               }
-               /* store the biggest delay if one occured */
-@@ -407,7 +407,7 @@ void handle_3xx(struct sockaddr_in *tadr
-       /* we'll try to handle 301 and 302 here, other 3xx are to complex */
-       regcomp(&redexp, "^SIP/[0-9]\\.[0-9] 30[125] ", 
-                       REG_EXTENDED|REG_NOSUB|REG_ICASE);
--      if (regexec(&redexp, rec, 0, 0, 0) == REG_NOERROR) {
-+      if (regexec(&redexp, rec, 0, 0, 0) == 0) {
-               /* try to find the contact in the redirect */
-               contact = uri_from_contact(rec);
-               if (contact==NULL) {
-@@ -451,7 +451,7 @@ void trace_reply()
- {
-       char *contact;
+--- configure.orig     2006-05-26 18:52:14.000000000 +0200
++++ configure  2006-05-26 18:53:06.000000000 +0200
+@@ -5501,7 +5501,7 @@
+ 
+ 
+ 
+-if test "X$LIBGNUTLS_LIBS" == "X";then
++if test "X$LIBGNUTLS_LIBS" = "X";then
  
--      if (regexec(&tmhexp, rec, 0, 0, 0) == REG_NOERROR) {
-+      if (regexec(&tmhexp, rec, 0, 0, 0) == 0) {
-               /* we received 483 to many hops */
-               printf("%i: ", namebeg);
-               if (verbose > 2) {
-@@ -470,7 +470,7 @@ void trace_reply()
-               set_maxforw(req, namebeg);
-               return;
-       }
--      else if (regexec(&proexp, rec, 0, 0, 0) == REG_NOERROR) {
-+      else if (regexec(&proexp, rec, 0, 0, 0) == 0) {
-               /* we received a provisional response */
-               printf("%i: ", namebeg);
-               if (verbose > 2) {
-@@ -504,7 +504,7 @@ void trace_reply()
-               else {
-                       printf("\twithout Contact header\n");
-               }
--              if (regexec(&okexp, rec, 0, 0, 0) == REG_NOERROR)
-+              if (regexec(&okexp, rec, 0, 0, 0) == 0)
-                       on_success(rec);
-               else
-                       exit_code(1);
-@@ -516,7 +516,7 @@ void handle_default()
- {
-       /* in the normal send and reply case anything other 
-          then 1xx will be treated as final response*/
--      if (regexec(&proexp, rec, 0, 0, 0) == REG_NOERROR) {
-+      if (regexec(&proexp, rec, 0, 0, 0) == 0) {
-               if (verbose > 1) {
-                       printf("%s\n\n", rec);
-                       printf("** reply received ");
-@@ -564,7 +564,7 @@ void handle_default()
-               else if (timing) {
-                       printf("%.3f ms\n", deltaT(&firstsendt, &recvtime));
-               }
--              if (regexec(&okexp, rec, 0, 0, 0) == REG_NOERROR) {
-+              if (regexec(&okexp, rec, 0, 0, 0) == 0) {
-                       on_success(rec);
-               }
-               else {
-@@ -578,7 +578,7 @@ void handle_randtrash()
- {
-       /* in randomzing trash we are expexting 4?? error codes
-          everything else should not be normal */
--      if (regexec(&errexp, rec, 0, 0, 0) == REG_NOERROR) {
-+      if (regexec(&errexp, rec, 0, 0, 0) == 0) {
-               if (verbose > 2)
-                       printf("received:\n%s\n", rec);
-               if (verbose > 1) {
-@@ -620,7 +620,7 @@ void handle_usrloc()
-       char *crlf;
-       char ruri[11+12+20]; //FIXME: username length 20 should be dynamic
+ for ac_header in openssl/md5.h
+ do
+@@ -6083,7 +6083,7 @@
+ 
+       fi
  
--      if (regexec(&proexp, rec, 0, 0, 0) == REG_NOERROR) {
-+      if (regexec(&proexp, rec, 0, 0, 0) == 0) {
-               if (verbose > 2) {
-                       print_message_line(rec);
-                       printf("ignoring provisional response\n\n");
-@@ -638,7 +638,7 @@ void handle_usrloc()
-                       case REG_REP:
-                               /* we have sent a register and look 
-                                  at the response now */
--                              if (regexec(&okexp, rec, 0, 0, 0) == REG_NOERROR) {
-+                              if (regexec(&okexp, rec, 0, 0, 0) == 0) {
-                                       if (verbose > 1) {
-                                               printf ("\tOK\n");
-                                       }
-@@ -748,7 +748,7 @@ void handle_usrloc()
-                                       dontsend=1;
-                                       return;
-                               }
--                              if (regexec(&okexp, rec, 0, 0, 0) == REG_NOERROR) {
-+                              if (regexec(&okexp, rec, 0, 0, 0) == 0) {
-                                       if (verbose > 1) {
-                                               printf("\t200 OK received\n");
-                                       }
-@@ -891,7 +891,7 @@ void handle_usrloc()
-                                       dontsend=1;
-                                       return;
-                               }
--                              if (regexec(&okexp, rec, 0, 0, 0) == REG_NOERROR) {
-+                              if (regexec(&okexp, rec, 0, 0, 0) == 0) {
-                                       if (verbose > 1) {
-                                               printf("  reply received\n\n");
-                                       }
-@@ -986,7 +986,7 @@ void handle_usrloc()
-                                       dontsend=1;
-                                       return;
-                               }
--                              if (regexec(&okexp, rec, 0, 0, 0) == REG_NOERROR) {
-+                              if (regexec(&okexp, rec, 0, 0, 0) == 0) {
-                                       if (verbose > 1) {
-                                               printf("   OK\n\n");
-                                       }
-@@ -1313,7 +1313,7 @@ void shoot(char *buf, int buff_size)
-                               }
-                               /* send ACK for non-provisional reply on INVITE */
-                               if ((STRNCASECMP(req, "INVITE", 6)==0) && 
--                                              (regexec(&replyexp, rec, 0, 0, 0) == REG_NOERROR) && 
-+                                              (regexec(&replyexp, rec, 0, 0, 0) == 0) && 
-                                               (regexec(&proexp, rec, 0, 0, 0) == REG_NOMATCH)) { 
-                                       build_ack(req, rec);
-                                       dontsend = 0;
-@@ -1331,7 +1331,7 @@ void shoot(char *buf, int buff_size)
-                                       dontsend = 1;
-                                       continue;
-                                       }
--                              else if (regexec(&authexp, rec, 0, 0, 0) == REG_NOERROR) {
-+                              else if (regexec(&authexp, rec, 0, 0, 0) == 0) {
-                                       if (!username) {
-                                               printf("%s\nerror: received 401 but cannot "
-                                                       "authentication without a username\n", rec);
-@@ -1346,7 +1346,7 @@ void shoot(char *buf, int buff_size)
-                                       continue;
-                               } /* if auth...*/
-                               /* lets see if received a redirect */
--                              if (redirects == 1 && regexec(&redexp, rec, 0, 0, 0) == REG_NOERROR) {
-+                              if (redirects == 1 && regexec(&redexp, rec, 0, 0, 0) == 0) {
-                                       handle_3xx(&addr);
-                               } /* if redircts... */
-                               else if (trace == 1) {
+-if test "X$SIPSAK_HAVE_ARES" == "X"; then
++if test "X$SIPSAK_HAVE_ARES" = "X"; then
+ 
+       echo "$as_me:$LINENO: checking for ruli.h" >&5
+ echo $ECHO_N "checking for ruli.h... $ECHO_C" >&6



Home | Main Index | Thread Index | Old Index