diff options
author | dmcmahill <dmcmahill@pkgsrc.org> | 2009-11-26 00:05:06 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill@pkgsrc.org> | 2009-11-26 00:05:06 +0000 |
commit | b8a0ce692225cdb4f4fa6154cc98103d76671d09 (patch) | |
tree | 60edba1285186af563a65e877ba07a88a0868419 /net/vpnc | |
parent | 32963c2647476ad956a95e73cae7911f7688fda7 (diff) | |
download | pkgsrc-b8a0ce692225cdb4f4fa6154cc98103d76671d09.tar.gz |
fix some printf() format strings on alpha
Diffstat (limited to 'net/vpnc')
-rw-r--r-- | net/vpnc/distinfo | 5 | ||||
-rw-r--r-- | net/vpnc/patches/patch-ag | 26 | ||||
-rw-r--r-- | net/vpnc/patches/patch-ah | 11 |
3 files changed, 34 insertions, 8 deletions
diff --git a/net/vpnc/distinfo b/net/vpnc/distinfo index 9026ee63a93..7e25831f7eb 100644 --- a/net/vpnc/distinfo +++ b/net/vpnc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2009/02/04 21:51:27 drochner Exp $ +$NetBSD: distinfo,v 1.13 2009/11/26 00:05:06 dmcmahill Exp $ SHA1 (vpnc-0.5.3.tar.gz) = 321527194e937371c83b5e7c38e46fca4f109304 RMD160 (vpnc-0.5.3.tar.gz) = 6f3926901e75dc98762f6ef45782930f2fb76a2f @@ -9,4 +9,5 @@ SHA1 (patch-ac) = 702fbfeea42eddbaf109ad42247e074ce7eb0f3b SHA1 (patch-ad) = 7e31f1804541eb4de9924edcc517304487aad0f2 SHA1 (patch-ae) = d831819831a5861550c5924955cc270c58341d9d SHA1 (patch-af) = d41aaab81061db058c4b38013f07815e1e8cf506 -SHA1 (patch-ag) = deb35a38ec71babc909f24bafffee98cfdd17f73 +SHA1 (patch-ag) = 2c1a2b2e93e5f8e0a13d7b92c15088ab66e4aaa3 +SHA1 (patch-ah) = 8180c569137f5d6de89b1a495dcba91dc374e2c2 diff --git a/net/vpnc/patches/patch-ag b/net/vpnc/patches/patch-ag index 88a5e53f1ce..72bfd13d29e 100644 --- a/net/vpnc/patches/patch-ag +++ b/net/vpnc/patches/patch-ag @@ -1,13 +1,27 @@ -$NetBSD: patch-ag,v 1.1 2009/02/04 21:51:27 drochner Exp $ +$NetBSD: patch-ag,v 1.2 2009/11/26 00:05:07 dmcmahill Exp $ ---- tunip.c.orig 2009-02-04 16:07:34.000000000 +0100 -+++ tunip.c -@@ -881,7 +881,7 @@ static void vpnc_main_loop(struct sa_blo - } +--- tunip.c.orig 2008-11-19 20:55:51.000000000 +0000 ++++ tunip.c 2009-11-25 23:23:47.000000000 +0000 +@@ -178,5 +178,5 @@ + } + if (r < (p->ip_hl << 2) + s->ipsec.em->fixed_header_size) { +- syslog(LOG_ALERT, "packet too short. got %d, expected %d", r, (p->ip_hl << 2) + s->ipsec.em->fixed_header_size); ++ syslog(LOG_ALERT, "packet too short. got %ld, expected %ld", (long) r, (long) ((p->ip_hl << 2) + s->ipsec.em->fixed_header_size)); + return -1; + } +@@ -217,6 +217,6 @@ + } + if (r < s->ipsec.em->fixed_header_size) { +- syslog(LOG_ALERT, "packet too short from %s. got %d, expected %d", +- inet_ntoa(s->dst), r, s->ipsec.em->fixed_header_size); ++ syslog(LOG_ALERT, "packet too short from %s. got %ld, expected %ld", ++ inet_ntoa(s->dst), (long) r, (long) (s->ipsec.em->fixed_header_size)); + return -1; + } +@@ -882,5 +882,5 @@ } DEBUG(2,printf("lifetime status: %ld of %u seconds used, %u|%u of %u kbytes used\n", - time(NULL) - s->ipsec.life.start, + (long)(time(NULL) - s->ipsec.life.start), s->ipsec.life.seconds, s->ipsec.life.rx/1024, - s->ipsec.life.tx/1024, diff --git a/net/vpnc/patches/patch-ah b/net/vpnc/patches/patch-ah new file mode 100644 index 00000000000..10fa3d86663 --- /dev/null +++ b/net/vpnc/patches/patch-ah @@ -0,0 +1,11 @@ +$NetBSD: patch-ah,v 1.1 2009/11/26 00:05:07 dmcmahill Exp $ + +--- isakmp-pkt.c.orig 2008-11-19 20:36:12.000000000 +0000 ++++ isakmp-pkt.c 2009-11-25 23:25:00.000000000 +0000 +@@ -821,5 +821,5 @@ + + DEBUG(3, printf("BEGIN_PARSE\n")); +- DEBUG(3, printf("Recieved Packet Len: %d\n", data_len)); ++ DEBUG(3, printf("Recieved Packet Len: %ld\n", (long) data_len)); + fetchn(r->i_cookie, ISAKMP_COOKIE_LENGTH); + hex_dump("i_cookie", r->i_cookie, ISAKMP_COOKIE_LENGTH, NULL); |