Fix undefined and broken loop. Fix obviously broken format string.

Bump revision.

5 files changed, 44 insertions, 6 deletions

diff --git a/comms/birda/Makefile b/comms/birda/Makefile
index b71b9a11410..156ddeee26b 100644
--- a/comms/birda/Makefile
+++ b/comms/birda/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2012/10/03 11:24:39 asau Exp $
+# $NetBSD: Makefile,v 1.24 2013/10/10 00:02:17 joerg Exp $
 #
 
 DISTNAME=	birda-1.3
+PKGREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.augustsson.net/pub/netbsd/
 
diff --git a/comms/birda/distinfo b/comms/birda/distinfo
index 22bd4c5ac22..e8356d0ae88 100644
--- a/comms/birda/distinfo
+++ b/comms/birda/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.19 2012/02/16 16:40:34 hans Exp $
+$NetBSD: distinfo,v 1.20 2013/10/10 00:02:17 joerg Exp $
 
 SHA1 (birda-1.3.tar.gz) = c72a2e05153f82e9e27e5cf36970a49ae122dbfe
 RMD160 (birda-1.3.tar.gz) = b53823b22db733a65cea515eadca59aa1024c96a
 Size (birda-1.3.tar.gz) = 57848 bytes
 SHA1 (patch-aa) = 5dc29878d541f354d5ed4b0cc910ca6d57d498fe
 SHA1 (patch-src-iassrv.c) = 538b6af337d278e1d435109b1651a97223979dc6
-SHA1 (patch-src_sendobex.c) = d04e130a295dfb18a01aec8679df3fd70c0a09eb
+SHA1 (patch-src_mkobexcard.c) = f13fa7cc68f3e92bd42dc28d55a871d25d5bac06
+SHA1 (patch-src_options.c) = ce216c493384917a25fbcf359849c5fa078f4d2a
+SHA1 (patch-src_sendobex.c) = 14c628ce7b04bc1a9490d77582d3ac231016adf3
diff --git a/comms/birda/patches/patch-src_mkobexcard.c b/comms/birda/patches/patch-src_mkobexcard.c
new file mode 100644
index 00000000000..823dd929bf6
--- /dev/null
+++ b/comms/birda/patches/patch-src_mkobexcard.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_mkobexcard.c,v 1.1 2013/10/10 00:02:17 joerg Exp $
+
+--- src/mkobexcard.c.orig	2013-10-09 23:07:15.000000000 +0000
++++ src/mkobexcard.c
+@@ -142,7 +142,7 @@ int main(int argc, char** argv)
+ 	  addStr(company);
+ 	  addChar('\n');
+ 	  if (name[0] == '\0')
+-	      snprintf(name, MAXNAME+1, company);
++	      snprintf(name, MAXNAME+1, "%s", company);
+       }
+       if (title) {
+ 	  addStr("TITLE:");
diff --git a/comms/birda/patches/patch-src_options.c b/comms/birda/patches/patch-src_options.c
new file mode 100644
index 00000000000..c92ad204fe6
--- /dev/null
+++ b/comms/birda/patches/patch-src_options.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_options.c,v 1.1 2013/10/10 00:02:17 joerg Exp $
+
+--- src/options.c.orig	2013-10-09 23:05:27.000000000 +0000
++++ src/options.c
+@@ -223,7 +223,7 @@ static void showDiscovered(int addr, int
+ 
+   if(charset==CHARSET_UNICODE) {
+     /* Strip the high byte */
+-    for(i=0;2*i<len;i+=2) namebuf[i++]=name[2*i];
++    for(i=0;2*i<len;++i) namebuf[i]=name[2*i];
+     namebuf[i]=0;
+   } else {
+     memcpy(namebuf,name,len);
diff --git a/comms/birda/patches/patch-src_sendobex.c b/comms/birda/patches/patch-src_sendobex.c
index 7ad4b601df5..27c96b669f8 100644
--- a/comms/birda/patches/patch-src_sendobex.c
+++ b/comms/birda/patches/patch-src_sendobex.c
@@ -1,7 +1,16 @@
-$NetBSD: patch-src_sendobex.c,v 1.1 2012/02/16 16:40:34 hans Exp $
+$NetBSD: patch-src_sendobex.c,v 1.2 2013/10/10 00:02:17 joerg Exp $
 
---- src/sendobex.c.orig	2005-11-14 08:57:16.000000000 +0100
-+++ src/sendobex.c	2012-01-25 16:30:35.349985033 +0100
+--- src/sendobex.c.orig	2005-11-14 07:57:16.000000000 +0000
++++ src/sendobex.c
+@@ -302,7 +302,7 @@ static int in_bind_ne(short port, int ty
+   if (sd < 0)
+     switch (sd) {
+     case SYSCALL_ERROR:
+-      fprintf(stderr, "in_bind_ne: bind", "port = %d, type = %s\n", 
++      fprintf(stderr, "in_bind_ne: bind port = %d, type = %s\n", 
+ 	      port, socket_type_name(type));
+       /* NOTREACHED */
+     case RESOLVER_ERROR:
 @@ -327,7 +327,11 @@ void createOBEXSender(int port)
      //struct sockaddr addr;
      //socklen_t len;