trackballs update for sarge
Hi again,
I just uploaded trackballs 1.0.0-10 to unstable, which fixes bug
#302454, a severity:important and minor security issue, so I'd like to
get this into sarge. An interdiff between revisions -9 and -10 is attached.
diff -u trackballs-1.0.0/config.guess trackballs-1.0.0/config.guess
--- trackballs-1.0.0/config.guess
+++ trackballs-1.0.0/config.guess
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2004-11-12'
+timestamp='2005-03-24'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -804,6 +804,9 @@
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit 0 ;;
+ amd64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit 0 ;;
@@ -1197,6 +1200,9 @@
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
@@ -1413,7 +1419,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- ftp://ftp.gnu.org/pub/gnu/config/
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff -u trackballs-1.0.0/config.sub trackballs-1.0.0/config.sub
--- trackballs-1.0.0/config.sub
+++ trackballs-1.0.0/config.sub
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2004-11-30'
+timestamp='2005-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -237,7 +237,7 @@
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | mcore \
+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -310,7 +310,7 @@
| ip2k-* | iq2000-* \
| m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
diff -u trackballs-1.0.0/share/icons/Makefile.in trackballs-1.0.0/share/icons/Makefile.in
--- trackballs-1.0.0/share/icons/Makefile.in
+++ trackballs-1.0.0/share/icons/Makefile.in
@@ -195,8 +195,8 @@
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-install-pkgdataDATA:
- ./installIcons $(bindir) ${DESTDIR}
+#install-pkgdataDATA:
+# ./installIcons $(bindir) ${DESTDIR}
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -u trackballs-1.0.0/share/icons/trackballs.desktop trackballs-1.0.0/share/icons/trackballs.desktop
--- trackballs-1.0.0/share/icons/trackballs.desktop
+++ trackballs-1.0.0/share/icons/trackballs.desktop
@@ -9,14 +8,0 @@
-Exec=/usr/local/bin/trackballs
-Exec=/usr/games/trackballs
-Exec=/usr/games/trackballs
-Exec=/usr/games/trackballs
-Exec=/usr/games/trackballs
-Exec=/usr/games/trackballs
-Exec=/usr/games/trackballs
-Exec=/usr/games/trackballs
-Exec=/usr/games/trackballs
-Exec=/usr/games/trackballs
-Exec=/usr/games/trackballs
-Exec=/usr/games/trackballs
-Exec=/usr/games/trackballs
-Exec=/usr/games/trackballs
diff -u trackballs-1.0.0/debian/changelog trackballs-1.0.0/debian/changelog
--- trackballs-1.0.0/debian/changelog
+++ trackballs-1.0.0/debian/changelog
@@ -1,3 +1,11 @@
+trackballs (1.0.0-10) unstable; urgency=low
+
+ * Backport symlink checking code from upstream CVS (Closes: #302454)
+ * Don't bother running the script to install a GNOME .desktop file
+ since it doesn't work anyway
+
+ -- Ari Pollak <ari@debian.org> Sun, 8 May 2005 18:49:27 -0400
+
trackballs (1.0.0-9) unstable; urgency=low
* Somehow I uploaded -8 without the fix. Really do that this time.
only in patch2:
unchanged:
--- trackballs-1.0.0.orig/src/general.cc
+++ trackballs-1.0.0/src/general.cc
@@ -25,6 +25,8 @@
#include "font.h"
#include "glHelp.h"
#include "SDL/SDL_image.h"
+#include <sys/types.h>
+#include <sys/stat.h>
using namespace std;
@@ -58,3 +60,10 @@
if(fp) { fclose(fp); return 1; }
return 0;
}
+
+int pathIsLink(char *path) {
+ struct stat m;
+ if(lstat(path,&m)) return 0;
+ if(S_ISLNK(m.st_mode)) return 1;
+ return 0;
+}
only in patch2:
unchanged:
--- trackballs-1.0.0.orig/src/settings.cc
+++ trackballs-1.0.0/src/settings.cc
@@ -140,9 +140,17 @@
int version=4;
snprintf(str,sizeof(str)-1,"%s/.trackballs",getenv("HOME"));
+ if(pathIsLink(str)) {
+ fprintf(stderr,"Error, %s is a symbolic link. Cannot save settings\n",str);
+ return;
+ }
mkdir(str,S_IXUSR|S_IRUSR|S_IWUSR|S_IXGRP|S_IRGRP|S_IWGRP);
snprintf(str,sizeof(str)-1,"%s/.trackballs/settings",getenv("HOME"));
+ if(pathIsLink(str)) {
+ fprintf(stderr,"Error, %s is a symbolic link. Cannot save settings\n",str);
+ return;
+ }
/* TODO. Save all settings here */
FILE *fp = fopen(str,"wb");
only in patch2:
unchanged:
--- trackballs-1.0.0.orig/src/general.h
+++ trackballs-1.0.0/src/general.h
@@ -81,6 +81,7 @@
double frandom();
int fileExists(char *);
+int pathIsLink(char *path); /** Checks if the given path points to a link */
/*** Globals ***/
extern SDL_Surface *screen;
Reply to: