pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/dungeon Honor LDFLAGS; should fix the Linux buil...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d89f0c3add80
branches: trunk
changeset: 604103:d89f0c3add80
user: dholland <dholland%pkgsrc.org@localhost>
date: Wed May 23 05:38:41 2012 +0000
description:
Honor LDFLAGS; should fix the Linux build. While here, patch out some
apparently unreachable insecure-temporary-files code.
diffstat:
games/dungeon/distinfo | 4 ++-
games/dungeon/patches/patch-dungeon-gdt_Makefile | 15 +++++++++++++
games/dungeon/patches/patch-glkterm_gtfref_c | 27 ++++++++++++++++++++++++
3 files changed, 45 insertions(+), 1 deletions(-)
diffs (65 lines):
diff -r e100c3d0fb01 -r d89f0c3add80 games/dungeon/distinfo
--- a/games/dungeon/distinfo Wed May 23 05:22:37 2012 +0000
+++ b/games/dungeon/distinfo Wed May 23 05:38:41 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2010/12/25 09:59:25 obache Exp $
+$NetBSD: distinfo,v 1.5 2012/05/23 05:38:41 dholland Exp $
SHA1 (dungeon-gdt-glk.tar.gz) = ec148735ae713566c9511057473fbd899d673a6a
RMD160 (dungeon-gdt-glk.tar.gz) = aed6e4a42c03be0a9bce2248dcab3370e1b1fbde
@@ -9,3 +9,5 @@
SHA1 (patch-aa) = 172cc658c3ec2f188448659708e2047d01e426e0
SHA1 (patch-ab) = 05ddacb4213b23e2cbee576d7ac5074700b6a895
SHA1 (patch-ac) = a44574841a5c344de484053daea0394845534ef8
+SHA1 (patch-dungeon-gdt_Makefile) = 4c70ed563b652d0c0aa2335e201af9e0c1678d8e
+SHA1 (patch-glkterm_gtfref_c) = b9fd31e554710475f65d00bf0c6ab1f541fa2d21
diff -r e100c3d0fb01 -r d89f0c3add80 games/dungeon/patches/patch-dungeon-gdt_Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/dungeon/patches/patch-dungeon-gdt_Makefile Wed May 23 05:38:41 2012 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-dungeon-gdt_Makefile,v 1.1 2012/05/23 05:38:41 dholland Exp $
+
+Honor pkgsrc's LDFLAGS.
+
+--- dungeon-gdt/Makefile~ 2009-11-25 19:44:23.000000000 +0000
++++ dungeon-gdt/Makefile
+@@ -45,7 +45,7 @@ OBJS += glkstart.o
+ CFLAGS += -DPATH_DUNDAT=\"${DATADIR}/\" -DUSE_OS_RANDOM $(GDT_FLAG)
+
+ dungeon: $(OBJS)
+- $(CC) $(CFLAGS) -o dungeon $(OBJS) $(LIBS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o dungeon $(OBJS) $(LIBS)
+
+ clean:
+ rm -f *~ *.o dungeon
diff -r e100c3d0fb01 -r d89f0c3add80 games/dungeon/patches/patch-glkterm_gtfref_c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/dungeon/patches/patch-glkterm_gtfref_c Wed May 23 05:38:41 2012 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-glkterm_gtfref_c,v 1.1 2012/05/23 05:38:41 dholland Exp $
+
+Patch out insecure temporary file code that appears to be unreachable.
+
+--- glkterm/gtfref.c~ 2008-03-16 01:07:17.000000000 +0000
++++ glkterm/gtfref.c
+@@ -99,7 +99,8 @@ frefid_t glk_fileref_create_temp(glui32
+ {
+ char *filename;
+ fileref_t *fref;
+-
++
++#if 0 /* insecure */
+ /* This is a pretty good way to do this on Unix systems. On Macs,
+ it's pretty bad, but this library won't be used on the Mac
+ -- I hope. I have no idea about the DOS/Windows world. */
+@@ -113,6 +114,10 @@ frefid_t glk_fileref_create_temp(glui32
+ }
+
+ return fref;
++#else
++ gli_strict_warning("fileref_create_temp: operation not allowed.");
++ return NULL;
++#endif
+ }
+
+ frefid_t glk_fileref_create_from_fileref(glui32 usage, frefid_t oldfref,
Home |
Main Index |
Thread Index |
Old Index