diff options
| author | joerg <joerg> | 2011-12-05 22:46:12 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2011-12-05 22:46:12 +0000 |
| commit | 5e16484c91202be0daa964d9aab98495438f6b7d (patch) | |
| tree | 54430f023f1c285a3f579735e28ee887f267c3fd /games/quake6 | |
| parent | 1f3c43e22fd1a93a4e8dc506fcb96ea453fa2bfe (diff) | |
| download | pkgsrc-5e16484c91202be0daa964d9aab98495438f6b7d.tar.gz | |
Don't use "false" as variable name.
Diffstat (limited to 'games/quake6')
| -rw-r--r-- | games/quake6/distinfo | 5 | ||||
| -rw-r--r-- | games/quake6/patches/patch-aj | 18 |
2 files changed, 12 insertions, 11 deletions
diff --git a/games/quake6/distinfo b/games/quake6/distinfo index b5c1d086758..39fffb69d80 100644 --- a/games/quake6/distinfo +++ b/games/quake6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2006/01/22 21:27:21 wiz Exp $ +$NetBSD: distinfo,v 1.7 2011/12/05 22:46:12 joerg Exp $ SHA1 (quake-v6-bsd-kame.tar.gz) = 09d58eef39f3d8a6b7b7287c88fc66d4dd3feb0b RMD160 (quake-v6-bsd-kame.tar.gz) = 1844e193b62886c452a65c5c5780f58d19684109 @@ -12,4 +12,5 @@ SHA1 (patch-af) = 3dd7bf9a44a4e087e09e758b53c69406e1468121 SHA1 (patch-ag) = d7821ab0e335b4e35e9721797b1cd5aa1ab8ee45 SHA1 (patch-ah) = cba95c90176666b302288ff4e9dc1d292c512a2b SHA1 (patch-ai) = 0d1864f671a8db635564c4ff734c278d9a3989c9 -SHA1 (patch-aj) = a754b5c78c5e81d4103276332f4a0bb3160770aa +SHA1 (patch-aj) = 42fca68c85c65fa3edaec20638f318f9d914c424 +SHA1 (patch-aj.diff) = 3fe79f648669d43e5610a3ddeb478adaf355b538 diff --git a/games/quake6/patches/patch-aj b/games/quake6/patches/patch-aj index c03b6e8ce9d..6e624149b12 100644 --- a/games/quake6/patches/patch-aj +++ b/games/quake6/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.1 2002/01/10 16:43:29 skrll Exp $ +$NetBSD: patch-aj,v 1.2 2011/12/05 22:46:12 joerg Exp $ ---- uquake/net_udp.c.orig Mon Jan 10 16:59:39 2000 +--- uquake/net_udp.c.orig 2000-01-10 16:59:39.000000000 +0000 +++ uquake/net_udp.c -@@ -32,12 +32,17 @@ +@@ -32,12 +32,17 @@ Foundation, Inc., 59 Temple Place - Suit #include <sys/param.h> #include <sys/ioctl.h> #include <errno.h> @@ -20,7 +20,7 @@ $NetBSD: patch-aj,v 1.1 2002/01/10 16:43:29 skrll Exp $ #if defined(sgi) && defined(sa_family) /* Get rid of problematic SGI #def */ #undef sa_family -@@ -62,6 +67,91 @@ +@@ -62,6 +67,91 @@ static unsigned long myAddr; #include "net_udp.h" //============================================================================= @@ -112,7 +112,7 @@ $NetBSD: patch-aj,v 1.1 2002/01/10 16:43:29 skrll Exp $ int UDP_Init (void) { -@@ -74,9 +164,18 @@ +@@ -74,9 +164,18 @@ int UDP_Init (void) return -1; // determine my name & address @@ -131,7 +131,7 @@ $NetBSD: patch-aj,v 1.1 2002/01/10 16:43:29 skrll Exp $ // if the quake hostname isn't set, set it to the machine name if (Q_strcmp(hostname.string, "UNNAMED") == 0) -@@ -137,25 +236,45 @@ +@@ -137,25 +236,45 @@ void UDP_Listen (qboolean state) int UDP_OpenSocket (int port) { @@ -141,7 +141,7 @@ $NetBSD: patch-aj,v 1.1 2002/01/10 16:43:29 skrll Exp $ int newsocket; - struct sockaddr_in address; qboolean _true = true; -+ const int false = 0; ++ const int wrong = 0; - if ((newsocket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) + snprintf(pbuf, sizeof(pbuf), "%d", port); @@ -166,8 +166,8 @@ $NetBSD: patch-aj,v 1.1 2002/01/10 16:43:29 skrll Exp $ - address.sin_port = htons(port); - if( bind (newsocket, (void *)&address, sizeof(address)) == -1) +#ifdef IPV6_BINDV6ONLY -+ if (setsockopt(newsocket, IPPROTO_IPV6, IPV6_BINDV6ONLY, &false, -+ sizeof(false)) < 0) { ++ if (setsockopt(newsocket, IPPROTO_IPV6, IPV6_BINDV6ONLY, &wrong, ++ sizeof(wrong)) < 0) { + /* I don't care */ + } +#endif |