diff options
| author | Jose V Beneyto <sepen@crux.nu> | 2013-08-23 11:42:29 +0200 |
|---|---|---|
| committer | Jose V Beneyto <sepen@crux.nu> | 2013-08-23 11:45:36 +0200 |
| commit | 9fcbc4258031461af6ff9bebf00a904f89d1e207 (patch) | |
| tree | 36f5ec426225e967ccd895cd7921d4212eca214a /chromium | |
| parent | 9866a4cf7af1af26395cb31af896076c839b6261 (diff) | |
| download | opt-9fcbc4258031461af6ff9bebf00a904f89d1e207.tar.gz opt-9fcbc4258031461af6ff9bebf00a904f89d1e207.tar.xz | |
[notify] chromium: updated to 29.0.1547.57
This update includes 25 security fixes:
http://googlechromereleases.blogspot.com/2013/08/stable-channel-update.html
Diffstat (limited to 'chromium')
| -rw-r--r-- | chromium/.footprint | 3 | ||||
| -rw-r--r-- | chromium/.md5sum | 2 | ||||
| -rw-r--r-- | chromium/Pkgfile | 8 | ||||
| -rw-r--r-- | chromium/nss-3.15.diff | 29 |
4 files changed, 5 insertions, 37 deletions
diff --git a/chromium/.footprint b/chromium/.footprint index 7e2007b3c..33e47b33a 100644 --- a/chromium/.footprint +++ b/chromium/.footprint @@ -89,6 +89,8 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentSelected.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentSelectedEnd.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/sessionStorage.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/settingsListRemove.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/settingsListRemove_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinner.gif -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinnerActive.gif -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinnerActiveSelected.gif @@ -159,6 +161,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/resourcesPanel.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/revisionHistory.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/scriptsPanel.css +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/showhint.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/sidebarPane.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/spectrum.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/splitView.css diff --git a/chromium/.md5sum b/chromium/.md5sum index 3d549c8a0..328fc2338 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,3 +1,3 @@ -38b5af2677211b696b807d3971560995 chromium-28.0.1500.95.tar.xz +3bc95940a7793fab81ad4b199a64c4bc chromium-29.0.1547.57.tar.xz 64968626706b07721983ac59fb3babbf chromium.sh 406827ad7d1fe469828cb76a4e19d67e nss-3.15.diff diff --git a/chromium/Pkgfile b/chromium/Pkgfile index ddb4b4a32..0ab0f4101 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -5,7 +5,7 @@ # Depends on: dbus-glib gtk libevent nss xorg-libxscrnsaver xorg-libxtst libgcrypt xorg-libxdamage yasm xorg-libxt gperf speech-dispatcher name=chromium -version=28.0.1500.95 +version=29.0.1547.57 release=1 source=(http://commondatastorage.googleapis.com/chromium-browser-official/$name-$version.tar.xz \ $name.sh nss-3.15.diff) @@ -17,12 +17,6 @@ build() { sed -e 's|<<(libspeechd_h_prefix)libspeechd.h>|<speech-dispatcher/libspeechd.h>|' \ -i build/linux/system.gyp - # fix for nss >= 3.15 - patch -p1 -i $SRC/nss-3.15.diff - - find third_party/WebKit/Source ui/base/ime \ - -type f -exec sed -e 's|<glib/.*\.h>|<glib.h>|g' -i {} \; - export CFLAGS="$CFLAGS $(pkg-config --cflags nspr)" export LDFLAGS="$LDFLAGS $(pkg-config --libs nspr)" diff --git a/chromium/nss-3.15.diff b/chromium/nss-3.15.diff deleted file mode 100644 index 84534f1aa..000000000 --- a/chromium/nss-3.15.diff +++ /dev/null @@ -1,29 +0,0 @@ -Index: net/third_party/nss/ssl/bodge/secitem_array.c -diff --git a/net/third_party/nss/ssl/bodge/secitem_array.c b/net/third_party/nss/ssl/bodge/secitem_array.c -index ac80da8e4770106c4b50cc4e4c205c4183d2ad69..62e590742194012b49f17d72b0cdf383c135416a 100644 ---- a/net/third_party/nss/ssl/bodge/secitem_array.c -+++ b/net/third_party/nss/ssl/bodge/secitem_array.c -@@ -6,6 +6,7 @@ - * Support routines for SECItemArray data structure. - */ - -+#include "nssutil.h" - #include "seccomon.h" - #include "secitem.h" - #include "secerr.h" -@@ -13,10 +14,15 @@ - - typedef struct SECItemArrayStr SECItemArray; - -+#define NSSUTIL_VERSION_NUM \ -+ (NSSUTIL_VMAJOR * 10000 + NSSUTIL_VMINOR * 100 + NSSUTIL_VPATCH) -+#if NSSUTIL_VERSION_NUM < 31500 -+// Added in NSS 3.15. - struct SECItemArrayStr { - SECItem *items; - unsigned int len; - }; -+#endif - - SECItemArray * - SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len) |