summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-07-16 11:21:21 (GMT)
committer Vincent Sanders <vince@kyllikki.org>2016-07-16 11:21:21 (GMT)
commitad504b590a7a5014f8801281c7d57ff71535359f (patch)
tree47ce78fcaa4236f9fd4fb113a57a87f08f7cb1a8
parentd3ed16b1c909fc4f3d2232f98bedcdbb148e10e2 (diff)
downloaddebian-ad504b590a7a5014f8801281c7d57ff71535359f.tar.gz
debian-ad504b590a7a5014f8801281c7d57ff71535359f.tar.bz2
update to include relevant NMU and prepare for 3.5 release
-rw-r--r--changelog28
-rw-r--r--control6
-rw-r--r--copyright118
-rw-r--r--patches/libpng16-fix.patch24
-rw-r--r--patches/series1
5 files changed, 110 insertions, 67 deletions
diff --git a/changelog b/changelog
index 18aef9a..f200edb 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,28 @@
-netsurf (3.2-3) UNRELEASED; urgency=medium
+netsurf (3.5-1) UNRELEASED; urgency=medium
* Update standards version (no change)
- * Acknowledge NMU, thanks to Peter Michael Green
+ * New upstream release (closes: #803313)
+ * Correct VCS headers (closes: #819882)
- -- Vincent Sanders <vince@debian.org> Sun, 28 Jun 2015 21:56:12 +0100
+ -- Vincent Sanders <vince@debian.org> Sun, 17 Jul 2016 21:56:12 +0100
+
+netsurf (3.2+dfsg-3) unstable; urgency=medium
+
+ * Heap overflow fix Fixes: CVE-2015-7508 (Closes: #810491)
+ * Out of bounds read fix Fixes: CVE-2015-7507
+ * Out of bounds read fix Fixes: CVE-2015-7506
+ * Stack overflow fix Fixes: CVE-2015-7505
+ * Update package copyright to fix lintian warnings
+ * Acknowledge NMU, thanks to Tobias Frost
+
+ -- Vincent Sanders <vince@debian.org> Fri, 15 Jul 2016 13:58:09 +0100
+
+netsurf (3.2+dfsg-2.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix compilation error on s390x, use libpng own types. (Closes: #820612)
+
+ -- Tobias Frost <tobi@debian.org> Sun, 10 Apr 2016 17:36:37 +0200
netsurf (3.2+dfsg-2.2) unstable; urgency=medium
@@ -172,6 +191,5 @@ netsurf (1.0-1) unstable; urgency=low
* Fix for runaway cpu usage on sites with frames.
* Fix for cookie handling.
* Fix scrollbar handling for anchors.
-
- -- Vincent Sanders <vince@debian.org> Sun, 3 Jun 2007 18:14:27 +0100
+ -- Vincent Sanders <vince@debian.org> Sun, 3 Jun 2007 18:14:27 +0100
diff --git a/control b/control
index a525ebe..23ddfcc 100644
--- a/control
+++ b/control
@@ -3,10 +3,10 @@ Section: web
Priority: extra
Maintainer: Vincent Sanders <vince@debian.org>
Build-Depends: debhelper (>= 9~), libcurl3-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, libmozjs185-dev [!s390x], librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm4-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-util0-dev, libssl-dev, gperf
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Homepage: http://www.netsurf-browser.org
-Vcs-Browser: http://source.netsurf-browser.org/
-Vcs-Git: git://git.netsurf-browser.org/netsurf-all.git
+Vcs-Browser: http://source.netsurf-browser.org/packaging/debian.git/
+Vcs-Git: git://git.netsurf-browser.org/packaging/debian.git
Package: netsurf
Architecture: all
diff --git a/copyright b/copyright
index 6d459c1..8789eca 100644
--- a/copyright
+++ b/copyright
@@ -1,44 +1,44 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: NetSurf
Upstream-Contact: NetSurf Developers <netsurf-dev@netsurf-browser.org>
-Source: http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.3.tar.gz
+Source: http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.5.tar.gz
Files: netsurf/*
-Copyright: 2003-2015 John-Mark Bell <jmb@netsurf-browser.org>
- 2003-2011 James Bursa <bursa@users.sourceforge.net>
- 2003 Philip Pemberton <philpem@users.sourceforge.net>
- 2003 Phil Mellor <monkeyson@users.sourceforge.net>
- 2003 Rob Jackson <jacko@xms.ms>
- 2004-2009 Richard Wilson <info@tinct.net>
- 2004-2009 John Tytgat <joty@netsurf-browser.org>
- 2004 Andrew Timmins <atimmins@blueyonder.co.uk>
- 2004 Kevin Bagust <kevin.bagust@ntlworld.com>
- 2005-2009 Adrian Lees <adrianl@users.sourceforge.net>
- 2005,2008-2012 Chris Young <chris@unsatisfactorysoftware.co.uk>
- 2006-2015 Daniel Silverstone <dsilvers@netsurf-browser.org>
- 2006-2015 Rob Kendrick <rjek@netsurf-browser.org>
- 2007-2015 Vincent Sanders <vince@netsurf-browser.org>
- 2008 Adam Blokus <adamblokus@gmail.com>
- 2008 Andrew Sidwell <takkaria@netsurf-browser.org>
- 2008-2012 Fran├žois Revol <mmu_man@users.sourceforge.net>
+Copyright: 2003-2016 John-Mark Bell <jmb@netsurf-browser.org>
+ 2003-2011 James Bursa <bursa@users.sourceforge.net>
+ 2003 Philip Pemberton <philpem@users.sourceforge.net>
+ 2003 Phil Mellor <monkeyson@users.sourceforge.net>
+ 2003 Rob Jackson <jacko@xms.ms>
+ 2004-2009 Richard Wilson <info@tinct.net>
+ 2004-2009 John Tytgat <joty@netsurf-browser.org>
+ 2004 Andrew Timmins <atimmins@blueyonder.co.uk>
+ 2004 Kevin Bagust <kevin.bagust@ntlworld.com>
+ 2005-2009 Adrian Lees <adrianl@users.sourceforge.net>
+ 2005,2008-2012 Chris Young <chris@unsatisfactorysoftware.co.uk>
+ 2006-2016 Daniel Silverstone <dsilvers@netsurf-browser.org>
+ 2006-2016 Rob Kendrick <rjek@netsurf-browser.org>
+ 2007-2016 Vincent Sanders <vince@netsurf-browser.org>
+ 2008 Adam Blokus <adamblokus@gmail.com>
+ 2008 Andrew Sidwell <takkaria@netsurf-browser.org>
+ 2008-2012 Fran├žois Revol <mmu_man@users.sourceforge.net>
2008 James Shaw <js102@zepler.net>
- 2008-2015 Michael Drake <tlsa@netsurf-browser.org>
- 2008-2009 Michael Lester <element3260@gmail.com>
- 2008 Sean Fox <dyntryx@gmail.com>
- 2009 Mark Benjamin <MarkBenjamin@dfgh.net>
- 2009 Paul Blokus <paul_pl@users.sourceforge.net>
- 2009 Rene W. Olsen <ac@rebels.com>
- 2009 Stephen Fellner <sf.amiga@gmail.com>
+ 2008-2016 Michael Drake <tlsa@netsurf-browser.org>
+ 2008-2009 Michael Lester <element3260@gmail.com>
+ 2008 Sean Fox <dyntryx@gmail.com>
+ 2009 Mark Benjamin <MarkBenjamin@dfgh.net>
+ 2009 Paul Blokus <paul_pl@users.sourceforge.net>
+ 2009 Rene W. Olsen <ac@rebels.com>
+ 2009 Stephen Fellner <sf.amiga@gmail.com>
2009 Chris Tarnowski
- 2010-2011 Stephen Fryatt <stevef@netsurf-browser.org>
- 2010 Ole Loots <ole@monochrom.net>
- 2011 Sven Weidauer <sven.weidauer@gmail.com>
- 1997-2009 Sam Lantinga
- 1998-2004 Daniel Stenberg <daniel@haxx.se>
- 2004-2006 Christian Hammond.
- 2004-2005 Andrew Tridgell
- 2006 Stefan Metzmacher
- 2005 Tim Tyler
+ 2010-2011 Stephen Fryatt <stevef@netsurf-browser.org>
+ 2010 Ole Loots <ole@monochrom.net>
+ 2011 Sven Weidauer <sven.weidauer@gmail.com>
+ 1997-2009 Sam Lantinga
+ 1998-2004 Daniel Stenberg <daniel@haxx.se>
+ 2004-2006 Christian Hammond.
+ 2004-2005 Andrew Tridgell
+ 2006 Stefan Metzmacher
+ 2005 Tim Tyler
License: GPL-2 with OpenSSL exception
Files: netsurf/!NetSurf/*
@@ -71,7 +71,7 @@ License: MIT
Files: libhubbub/*
Copyright: 2007-2008 John-Mark Bell <jmb@netsurf-browser.org>
- 2008 Andrew Sidwell <takkaria@netsurf-browser.org>
+ 2008 Andrew Sidwell <takkaria@netsurf-browser.org>
License: MIT
Files: libcss/*
@@ -87,19 +87,19 @@ Copyright: 2007-2015 John-Mark Bell <jmb@netsurf-browser.org>
License: MIT
Files: nsgenbind/*
-Copyright: 2012-2015 Vincent Sanders <vince@netsurf-browser.org>
+Copyright: 2012-2016 Vincent Sanders <vince@netsurf-browser.org>
License: MIT
Files: buildsystem/*
Copyright: 2009-2014 John-Mark Bell <jmb@netsurf-browser.org>
- 2012-2015 Vincent Sanders <vince@netsurf-browser.org>
- 2009-2013 Daniel Silverstone <dsilvers@netsurf-browser.org>
+ 2012-2016 Vincent Sanders <vince@netsurf-browser.org>
+ 2009-2013 Daniel Silverstone <dsilvers@netsurf-browser.org>
License: MIT
Files: libnsfb/*
Copyright: 2009-2015 Vincent Sanders <vince@netsurf-browser.org>
- 2008-2014 Michael Drake <tlsa@netsurf-browser.org>
- 2009-2014 John-Mark Bell <jmb@netsurf-browser.org>
+ 2008-2014 Michael Drake <tlsa@netsurf-browser.org>
+ 2009-2014 John-Mark Bell <jmb@netsurf-browser.org>
License: MIT
Files: libnsutils/*
@@ -133,8 +133,8 @@ Copyright: 2012-2015 Vincent Sanders <vince@netsurf-browser.org>
License: MIT
Files: debian/*
-Copyright: 2009,2011-2015 Vincent Sanders <vince@debian.org>
- 2009 Daniel Silverstone <dsilvers@debian.org>
+Copyright: 2009,2011-2015 Vincent Sanders <vince@debian.org>
+ 2009 Daniel Silverstone <dsilvers@debian.org>
License: GPL-2+
License: GPL-2+
@@ -157,7 +157,7 @@ License: GPL-2+
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ `/usr/share/common-licenses/GPL-2'.
License: GPL-2 with OpenSSL exception
NetSurf is free software; you can redistribute it and/or modify
@@ -166,10 +166,10 @@ License: GPL-2 with OpenSSL exception
.
In addition, as a special exception, permission is granted to link the
code of this release of NetSurf with the OpenSSL project's "OpenSSL"
- library (or with modified versions of it that use the same licence as
+ library (or with modified versions of it that use the same licence as
the "OpenSSL" library), and distribute the linked executables. You must
- obey the GNU General Public License version 2 in all respects for all of
- the code used other than "OpenSSL". If you modify the code, you may
+ obey the GNU General Public License version 2 in all respects for all of
+ the code used other than "OpenSSL". If you modify the code, you may
extend this exception to your version of the code, but you are not
obligated to do so. If you do not wish to do so, delete this exception
statement from your version.
@@ -178,23 +178,23 @@ License: GPL-2 with OpenSSL exception
License, version 2, can be found in /usr/share/common-licenses/GPL-2.
License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a copy
+ Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
.
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
License: Unicode
diff --git a/patches/libpng16-fix.patch b/patches/libpng16-fix.patch
new file mode 100644
index 0000000..4da88ce
--- a/dev/null
+++ b/patches/libpng16-fix.patch
@@ -0,0 +1,24 @@
+Description: use png native types, they are platform dependent.
+ (and also silence some warnings about missing memcpy prototype)
+Author: Tobias Frost <tobi@debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/netsurf/framebuffer/convert_image.c
++++ b/netsurf/framebuffer/convert_image.c
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <png.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ #if PNG_LIBPNG_VER < 10209
+ #define png_set_expand_gray_1_2_4_to_8(png) png_set_gray_1_2_4_to_8(png)
+@@ -219,7 +220,7 @@
+ {
+ int bit_depth, color_type, interlace, intent;
+ double gamma;
+- unsigned long width, height;
++ png_uint_32 width, height;
+
+ /* Read the PNG details */
+ png_get_IHDR(png, info, &width, &height, &bit_depth,
diff --git a/patches/series b/patches/series
index 3ba4a07..c649698 100644
--- a/patches/series
+++ b/patches/series
@@ -1,2 +1,3 @@
set-netsurf-config.patch
change-install-binary-targets
+libpng16-fix.patch