some bug work

9 files changed, 28 insertions, 52 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 4b5f35b..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,8 +0,0 @@
-Notes for argyll as packaged in Debian:
----------------------------------------
-
-* Four binaries with a very generic name (average, refine, targen and
-  verify) have been renamed to argyll-* in order to prevent naming
-  collisions.
-
- -- Roland Mas <lolando@debian.org>, Thu, 19 Feb 2009 20:34:17 +0100
diff --git a/debian/README.Spyder2 b/debian/README.Spyder2
deleted file mode 100644
index 1922b5e..0000000
--- a/debian/README.Spyder2
+++ /dev/null
@@ -1,36 +0,0 @@
-Note for users of the ColorVision Spyder2:
-------------------------------------------
-
-The Spyder2 device doesn't work "out of the box" because it needs
-firmware to be loaded into it.  That firmware is proprietary and
-cannot be distributed within Debian, but Argyll provides a tool to
-extract that firmware from the driver CD provided with the device.
-
-If you're only using your Spyder2 on one computer, then all you need
-to do is run the "spyd2en -S l" utility (as root) while the driver CD
-is mounted.  spyd2en looks for the CD in a few typical mount points
-(/media/ColorVision, /mnt/cdrom, /media/cdrom, /cdrom).  If your CD is
-mounted somewhere else, just add the location of the "setup.exe" file,
-for instance "spyd2en -S l /mnt/tmp/setup/setup.exe".  In both cases,
-the firmware will be extracted and stored into
-/usr/share/color/spyd2PLD.bin, where the other utilities will be able
-to look for it when needed.  You're done!
-
-If you use the Spyder2 on several computers, and don't want to carry
-the CD and perform the same operation on all, you might like to
-generate a Debian package containing the firmware on one computer, and
-install that package on the others.  A source package is provided in
-/usr/share/doc/argyll/examples/spyder2.tar.gz.  Here's the procedure
-for the first computer:
-
-- first, extract the firmware with spyd2en (as above);
-- then, apt-get install debhelper fakeroot build-essential;
-- uncompress the spyder2.tar.gz archive somewhere;
-  you'll get a argyll-firmware-spyder2 directory;
-- in that directory, run "fakeroot debian/rules binary clean";
-- you should get a .deb in the parent directory.
-
-You can then copy that .deb file to other computers and install it
-with "dpkg -i argyll-firmware-spyder2_1.1_all.deb".  You're done!
-
- -- Roland Mas <lolando@debian.org>, Thu, 05 Aug 2010 15:44:23 +0200
diff --git a/debian/argyll-doc.docs b/debian/argyll-doc.docs
index aba2a6e..031ab94 100644
--- a/debian/argyll-doc.docs
+++ b/debian/argyll-doc.docs
@@ -1,3 +1,2 @@
 doc/* 
 Readme.txt
-debian/README.Debian
diff --git a/debian/changelog b/debian/changelog
index 4f95acd..6cecbcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ argyll (1.6.3-1) unstable; urgency=medium
   * debian/control:
     - Set myself as maintainer.
     - Update Build-Depends:
-      + Remove autoconf and automake | automaken
+      + Remove automake | automaken
     - For previously not existing Vcs
       + Create a new git repository on alioth.
       + Add the fields Vcs-Browser and Vcs-Git.
@@ -33,8 +33,11 @@ argyll (1.6.3-1) unstable; urgency=medium
     - Move to debian/man/*.1.
   * debian/man/*
     - Rewrite the help2man generated man pages (Closes: #670857)
+  * debian/patches/
+    - New 110_dispwin_segfault.patch to prevent segfault by
+      wrong parameter (Closes: #700253)
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sun, 07 Sep 2014 14:50:46 +0200
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sun, 14 Sep 2014 09:34:04 +0200
 
 argyll (1.5.1-8) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index d9e8a86..876ada9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,6 @@ Priority: extra
 Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Standards-Version: 3.9.5
 Build-Depends:
-# autoconf,
-# automake | automaken,
  debhelper (>= 9),
  dh-autoreconf,
  jam,
@@ -19,7 +17,6 @@ Build-Depends:
  libxrandr-dev,
  libxss-dev,
  libxxf86vm-dev,
-# libyajl-dev,
  x11proto-scrnsaver-dev,
  x11proto-xf86vidmode-dev
 Homepage: http://www.argyllcms.com/
diff --git a/debian/copyright b/debian/copyright
index 37ee3d6..5f3cf52 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -126,7 +126,7 @@ Files: tiff/contrib/ras/*
 Copyright: 1990      Sun Microsystems, Inc.
 License: Expat
 
-Files: tiff/libtiff/mkg2states.h
+Files: tiff/libtiff/mkg3states.c
        tiff/libtiff/tif_fax3.*
 Copyright: 1991-1997 Sam Leffler
            1991-1997 Silicon Graphics, Inc.
diff --git a/debian/patches/110_dispwin_segfault.patch b/debian/patches/110_dispwin_segfault.patch
new file mode 100644
index 0000000..e08e924
--- /dev/null
+++ b/debian/patches/110_dispwin_segfault.patch
@@ -0,0 +1,20 @@
+Description: Add check for NULL pointer
+Author: Jörg Frings-Fürst <debian@jff-webhsoting.net>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700253
+Forwarded: Yes, to ML
+Reviewed-by: 
+Last-Update: 2014-09-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/spectro/dispwin.c
+===================================================================
+--- trunk.orig/spectro/dispwin.c	2014-09-10 16:05:36.633175564 +0200
++++ trunk/spectro/dispwin.c	2014-09-10 16:06:16.781967935 +0200
+@@ -5493,6 +5493,7 @@
+ 
+ 			/* Display number */
+ 			else if (argv[fa][1] == 'd') {
++				if(na == NULL)  usage("-d parameter missing");
+ 				if (strncmp(na,"web",3) == 0
+ 				 || strncmp(na,"WEB",3) == 0) {
+ 					webdisp = 8080;
diff --git a/debian/patches/series b/debian/patches/series
index 17d3b70..53ef377 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+110_dispwin_segfault.patch
 100_spelling.patch
 15_jam.patch
 #10_spectro_inst.patch
diff --git a/debian/rules b/debian/rules
index 92d1baa..44c77d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # hardening
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,--no-undefined