[Pkg-chromium-commit] [pkg-chromium] 02/02: release 39.0.2171.71-1

Tue Dec 2 01:29:30 UTC 2014

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository pkg-chromium.

commit d98df2addf685d62edbd51b324ffcd84342f4b42
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Mon Dec 1 20:28:44 2014 -0500

    release 39.0.2171.71-1
---
 debian/{chromium-apikeys.conf => apikeys} |  0
 debian/changelog                          | 28 +++++++++++++++++++++++-----
 debian/chromium-apikeys.install           |  1 -
 debian/chromium.install                   |  2 ++
 debian/chromium.links                     |  4 ++--
 debian/control                            | 16 +---------------
 debian/rules                              | 10 +++++++---
 debian/scripts/chromium                   | 11 +++++++----
 8 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/debian/chromium-apikeys.conf b/debian/apikeys
similarity index 100%
rename from debian/chromium-apikeys.conf
rename to debian/apikeys
diff --git a/debian/changelog b/debian/changelog
index b843aa6..77153f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,27 @@
-chromium-browser (38.0.2125.101-4) unstable; urgency=medium
+chromium-browser (39.0.2171.71-1) unstable; urgency=medium
 
-  * Provide information about lack of support for non-sse2 systems.
-  * Include a new package providing Google's API keys (closes: #748867).
-
- -- Michael Gilbert <mgilbert at debian.org>  Sun, 19 Oct 2014 21:12:49 +0000
+  * New upstream stable release:
+    - CVE-2014-3566: SSLv3 support is now disabled by default.
+    - CVE-2014-7899: Address bar spoofing. Credit to Eli Grey.
+    - CVE-2014-7900: Use-after-free in pdfium. Credit to Atte Kettunen.
+    - CVE-2014-7901: Integer overflow in pdfium. Credit to cloudfuzzer.
+    - CVE-2014-7902: Use-after-free in pdfium. Credit to cloudfuzzer.
+    - CVE-2014-7903: Buffer overflow in pdfium. Credit to cloudfuzzer.
+    - CVE-2014-7904: Buffer overflow in Skia. Credit to Atte Kettunen.
+    - CVE-2014-7905: Flaw allowing navigation to intents that do not have the
+      BROWSABLE category. Credit to WangTao(neobyte).
+    - CVE-2014-7906: Use-after-free in pepper plugins. Credit to Chen Zhang.
+    - CVE-2014-0574: Double-free in Flash. Credit to biloulehibou.
+    - CVE-2014-7907: Use-after-free in blink. Credit to Chen Zhang.
+    - CVE-2014-7908: Integer overflow in media. Credit to Christoph Diehl.
+    - CVE-2014-7909: Uninitialized memory read in Skia. Credit to miaubiz.
+  * Display info about upstream ending support for non-sse2 (closes: #769836).
+  * Remove non-free RFCs from the upstream tarball (closes: #771640).
+  * Include a conf file for Google's API keys (closes: #748867).
+  * Handle dangling chromium icon directory (closes: #766420).
+  * Install icons into the correct path (closes: #767697).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Mon, 01 Dec 2014 01:13:44 +0000
 
 chromium-browser (38.0.2125.101-3) unstable; urgency=medium
 
diff --git a/debian/chromium-apikeys.install b/debian/chromium-apikeys.install
deleted file mode 100644
index f6238a5..0000000
--- a/debian/chromium-apikeys.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/chromium-apikeys.conf etc/chromium.d
diff --git a/debian/chromium.install b/debian/chromium.install
index b831f85..ff00e8f 100644
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -15,3 +15,5 @@ debian/initial_bookmarks.html usr/lib/chromium
 debian/chromium.xml usr/share/gnome-control-center/default-apps
 
 debian/chromium.desktop usr/share/applications
+
+debian/apikeys etc/chromium.d
diff --git a/debian/chromium.links b/debian/chromium.links
index fe0fba3..4b06380 100644
--- a/debian/chromium.links
+++ b/debian/chromium.links
@@ -1,2 +1,2 @@
-usr/share/icons/hicolor/32x32/chromium.xpm usr/share/pixmaps/chromium.xpm
-usr/share/icons/hicolor/48x48/chromium.png usr/share/pixmaps/chromium.png
+usr/share/icons/hicolor/32x32/apps/chromium.xpm usr/share/pixmaps/chromium.xpm
+usr/share/icons/hicolor/48x48/apps/chromium.png usr/share/pixmaps/chromium.png
diff --git a/debian/control b/debian/control
index 0325dc6..9d410cd 100644
--- a/debian/control
+++ b/debian/control
@@ -90,9 +90,8 @@ Architecture: i386 amd64
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
+ x11-utils,
  xdg-utils,
-Recommends:
- chromium-apikeys,
 Suggests:
  chromium-l10n,
  chromium-inspector,
@@ -149,19 +148,6 @@ Description: web browser - page inspection support
  This package contains the 'inspector', which enables web developers to inspect
  elements of a web page at runtime (HTML, JavaScript, CSS, etc.).
 
-Package: chromium-apikeys
-Architecture: all
-Depends:
- ${misc:Depends},
- chromium,
-Description: web browser - Google API keys
- Web browser that aims to build a safer, faster, and more stable internet
- browsing experience.
- .
- This package provides keys to Google's API for services like sync and gmail
- and only needs to be installed if you use the "app" interface to those
- services.
-
 Package: chromedriver
 Architecture: i386 amd64
 Depends:
diff --git a/debian/rules b/debian/rules
index f22616a..b3ededa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,6 +98,10 @@ endif
 flotpaths=/usr/share/javascript/jquery/*min.js \
           /usr/share/javascript/jquery-flot/*min.js \
 
+# files to exclude from the upstream tarball
+excluded=native_client/NOTICE \
+	 third_party/libsrtp/srtp/doc/rfc3711.txt \
+
 %:
 	dh $@ --parallel
 
@@ -124,7 +128,7 @@ override_dh_auto_install:
 	for file in $(shell find chrome/app/theme/chromium -name product_logo_[0-9]* -a ! -name *mono*); do \
 	    ext=$$(echo $$file | cut -d\. -f2); \
 	    siz=$$(echo $$file | cut -d_ -f3 | sed s/\.$$ext//); \
-	    dst=debian/chromium/usr/share/icons/hicolor/$$siz\x$$siz; \
+	    dst=debian/chromium/usr/share/icons/hicolor/$$siz\x$$siz/apps; \
 	    mkdir -p $$dst; \
 	    cp $$file $$dst/chromium.$$ext; \
 	    done
@@ -149,5 +153,5 @@ version=$(shell dpkg-parsechangelog --show-field=version | sed s/-.*//)
 tarball=chromium-$(version).tar.xz
 
 get-orig-source:
-	wget $(url)/$(tarball)
-	mv $(tarball) ../chromium-browser_$(version).orig.tar.xz
+	cd .. && wget -c $(url)/$(tarball)
+	mk-origtargz $(shell for f in $(excluded); do echo --exclude-file $$f; done) ../$(tarball)
diff --git a/debian/scripts/chromium b/debian/scripts/chromium
index 4745580..23b774c 100644
--- a/debian/scripts/chromium
+++ b/debian/scripts/chromium
@@ -23,12 +23,15 @@ usage () {
   echo " See 'man chromium' for more details"
 }
 
+nosse2="\
+The hardware on this system lacks support for the sse2 instruction set.
+The upstream chromium project no longer supports this configuration.
+For more information, please read and possibly provide input to their
+bug tracking system at http://crbug.com/348761."
+
 # Check whether this system supports sse2
 if test -z "$(grep sse2 /proc/cpuinfo)"; then
-  echo "The hardware on this system lacks support for the sse2 instruction set."
-  echo "The upstream chromium project no longer supports this configuration."
-  echo "For more information, please read and possibly provide input to their"
-  echo "bug tracking system at http://crbug.com/348761."
+  xmessage "$nosse2"
   exit 1
 fi
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git

