summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2003-09-26 12:40:27 +0000
committerwiz <wiz@pkgsrc.org>2003-09-26 12:40:27 +0000
commitc6d79f3569349385584977a6136d5ee825d26280 (patch)
treed0f98298403f22fcdf502a04cb65931b7a36b27b
parentc113d26055ae1bed572ec6f31cdb38e3d31cb9f7 (diff)
downloadpkgsrc-c6d79f3569349385584977a6136d5ee825d26280.tar.gz
Add a security patch and a compilation patch from the Debian package.
Bump PKGREVISION.
-rw-r--r--games/marbles/Makefile4
-rw-r--r--games/marbles/distinfo4
-rw-r--r--games/marbles/patches/patch-ap23
-rw-r--r--games/marbles/patches/patch-ar13
4 files changed, 41 insertions, 3 deletions
diff --git a/games/marbles/Makefile b/games/marbles/Makefile
index 6df205ea409..0d6541c1ec5 100644
--- a/games/marbles/Makefile
+++ b/games/marbles/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/26 21:41:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/09/26 12:40:27 wiz Exp $
#
DISTNAME= marbles-1.0.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lgames/}
diff --git a/games/marbles/distinfo b/games/marbles/distinfo
index 14d952eb063..a3f8df9fd91 100644
--- a/games/marbles/distinfo
+++ b/games/marbles/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/05 23:01:06 hubertf Exp $
+$NetBSD: distinfo,v 1.2 2003/09/26 12:40:27 wiz Exp $
SHA1 (marbles-1.0.2.tar.gz) = ede46e2df12e0919fec3cf8b56abe39ee070118e
Size (marbles-1.0.2.tar.gz) = 798715 bytes
SHA1 (patch-aa) = 2ea7fc1f424c49a03292f67c119b787961b89457
+SHA1 (patch-ap) = 57f6efd2d25be1f0604f2487ea05a5bfd4296d34
+SHA1 (patch-ar) = b453e75a29848a470275d06bc97e9fe09a12e1b8
diff --git a/games/marbles/patches/patch-ap b/games/marbles/patches/patch-ap
new file mode 100644
index 00000000000..a953bbb0229
--- /dev/null
+++ b/games/marbles/patches/patch-ap
@@ -0,0 +1,23 @@
+$NetBSD: patch-ap,v 1.1 2003/09/26 12:40:27 wiz Exp $
+
+--- src/cfg.c.orig Wed Mar 6 21:46:43 2002
++++ src/cfg.c
+@@ -40,9 +40,16 @@ Cfg cfg;
+ void C_StPth()
+ {
+ #ifdef _WIN32
+- sprintf( c_pth, "%s/lgames", (getenv( "HOME" )?getenv( "HOME" ):".") );
++ snprintf( c_pth, sizeof( c_pth ) - 1, "%s/lgames", (getenv( "HOME" )?getenv( "HOME" ):".") );
+ #else
+- sprintf( c_pth, "%s/.lgames", getenv( "HOME" ) );
++ if ( getenv( "HOME" ) )
++ {
++ snprintf( c_pth, sizeof( c_pth ) - 1, "%s/.lgames", getenv( "HOME" ) );
++ }
++ else
++ {
++ strcpy( c_pth, ".lgames" );
++ }
+ #endif
+ /* create .lgames directory if not found */
+ if ( opendir( c_pth ) == 0 ) {
diff --git a/games/marbles/patches/patch-ar b/games/marbles/patches/patch-ar
new file mode 100644
index 00000000000..338c1e473fe
--- /dev/null
+++ b/games/marbles/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2003/09/26 12:40:27 wiz Exp $
+
+--- src/profile.c.orig Wed Jan 30 18:57:23 2002
++++ src/profile.c
+@@ -75,7 +75,7 @@ int Prf_Ld()
+ #ifdef ASCII
+ F_GetE(f, str, F_VAL); str[strlen(str) - 1] = 0;
+ if (strncmp(str,"ascii",5)) {
+- printf("\nWARNING: trying to load raw binary data in ascii; cannot read profiles\n", prf_pth);
++ printf("\nWARNING: trying to load raw binary data in ascii; cannot read profiles\n");
+ Prf_Crt("Michael");
+ not_f = 1;
+ }