--- a/MozillaFirefox/MozillaFirefox.changes	Fri May 20 07:05:50 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Tue Jun 14 11:58:26 2011 +0200
@@ -1,7 +1,23 @@
 -------------------------------------------------------------------
-Fri Apr 15 07:17:03 UTC 2011 - wr@rosenauer.org
-
-- security update to 3.6.17
+Tue Jun 14 09:54:04 UTC 2011 - wr@rosenauer.org
+
+- security update to 3.6.18 (bnc#)
+- speedier find-external-requires.sh
+
+-------------------------------------------------------------------
+Thu Apr 21 10:18:09 UTC 2011 - wr@rosenauer.org
+
+- security update to 3.6.17 (bnc#689281)
+  * MFSA 2011-12/ CVE-2011-0069 CVE-2011-0070 CVE-2011-0072
+    CVE-2011-0074 CVE-2011-0075 CVE-2011-0077 CVE-2011-0078
+    CVE-2011-0080 CVE-2011-0081
+    Miscellaneous memory safety hazards
+  * MFSA 2011-13/CVE-2011-0065/CVE-2011-0066/CVE-2011-0073
+    Multiple dangling pointer vulnerabilities
+  * MFSA 2011-14/CVE-2011-0067 (bmo#527935)
+    Information stealing via form history
+  * MFSA 2011-18/CVE-2011-1202 (bmo#640339)
+    XSLT generate-id() function heap address leak
 
 -------------------------------------------------------------------
 Fri Mar 25 13:33:17 UTC 2011 - lnussel@suse.de

--- a/MozillaFirefox/MozillaFirefox.spec	Fri May 20 07:05:50 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Jun 14 11:58:26 2011 +0200
@@ -24,7 +24,7 @@
 Name:           MozillaFirefox
 %define xulrunner mozilla-xulrunner192
 BuildRequires:  autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip
-BuildRequires:  %{xulrunner}-devel = 1.9.2.17
+BuildRequires:  %{xulrunner}-devel = 1.9.2.18
 %if %suse_version > 1020
 BuildRequires:  fdupes
 %endif
@@ -34,13 +34,13 @@
 BuildRequires:  wireless-tools
 %endif
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
-Version:        %mainver.17
+Version:        %mainver.18
 Release:        1
 Provides:       web_browser
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       firefox = %{version}
-%define         releasedate 2011042000
+%define         releasedate 2011061300
 Summary:        Mozilla Firefox Web Browser
 Url:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers

--- a/MozillaFirefox/find-external-requires.sh	Fri May 20 07:05:50 2011 +0200
+++ b/MozillaFirefox/find-external-requires.sh	Tue Jun 14 11:58:26 2011 +0200
@@ -1,23 +1,9 @@
 #!/bin/sh
-
 # Finds requirements provided outside of the current file set
 
-filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
-
-provides=`echo "$filelist" | /usr/lib/rpm/find-provides`
-
-{
-for f in $filelist ; do
-	echo $f | /usr/lib/rpm/find-requires | while read req ; do
-		found=0
-		for p in $provides ; do
-			if [ "$req" = "$p" ]; then
-				found=1
-			fi
-		done
-		if [ "$found" = "0" ]; then
-			echo $req
-		fi
-	done
-done
-} | sort -u
+filelist=$( sed "s/[]['\"*?{}]/\\\\\&/g" )
+provides=$( echo "$filelist" | /usr/lib/rpm/find-provides )
+echo "$filelist" \
+    | /usr/lib/rpm/find-requires \
+    | grep -F -v "$provides" \
+    | sort -u

--- a/mozilla-xulrunner192/create-tar.sh	Fri May 20 07:05:50 2011 +0200
+++ b/mozilla-xulrunner192/create-tar.sh	Tue Jun 14 11:58:26 2011 +0200
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-RELEASE_TAG="FIREFOX_3_6_17_RELEASE"
-VERSION="1.9.2.17"
+RELEASE_TAG="FIREFOX_3_6_18_RELEASE"
+VERSION="1.9.2.18"
 
 # mozilla
 hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla

--- a/mozilla-xulrunner192/find-external-requires.sh	Fri May 20 07:05:50 2011 +0200
+++ b/mozilla-xulrunner192/find-external-requires.sh	Tue Jun 14 11:58:26 2011 +0200
@@ -1,23 +1,9 @@
 #!/bin/sh
-
 # Finds requirements provided outside of the current file set
 
-filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
-
-provides=`echo "$filelist" | /usr/lib/rpm/find-provides`
-
-{
-for f in $filelist ; do
-	echo $f | /usr/lib/rpm/find-requires | while read req ; do
-		found=0
-		for p in $provides ; do
-			if [ "$req" = "$p" ]; then
-				found=1
-			fi
-		done
-		if [ "$found" = "0" ]; then
-			echo $req
-		fi
-	done
-done
-} | sort -u
+filelist=$( sed "s/[]['\"*?{}]/\\\\\&/g" )
+provides=$( echo "$filelist" | /usr/lib/rpm/find-provides )
+echo "$filelist" \
+    | /usr/lib/rpm/find-requires \
+    | grep -F -v "$provides" \
+    | sort -u

--- a/mozilla-xulrunner192/mozilla-xulrunner192.changes	Fri May 20 07:05:50 2011 +0200
+++ b/mozilla-xulrunner192/mozilla-xulrunner192.changes	Tue Jun 14 11:58:26 2011 +0200
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 14 09:36:29 UTC 2011 - wr@rosenauer.org
+
+- security update to 1.9.2.18 (bnc#)
+- speedier find-external-requires.sh
+
 -------------------------------------------------------------------
 Wed May 11 09:44:20 UTC 2011 - cgiboudeaux@gmx.com
 

--- a/mozilla-xulrunner192/mozilla-xulrunner192.spec	Fri May 20 07:05:50 2011 +0200
+++ b/mozilla-xulrunner192/mozilla-xulrunner192.spec	Tue Jun 14 11:58:26 2011 +0200
@@ -39,12 +39,12 @@
 BuildRequires:  wireless-tools
 %endif
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
-Version:        1.9.2.17
+Version:        1.9.2.18
 Release:        1
-%define         releasedate 2011042000
-%define         version_internal 1.9.2.17
+%define         releasedate 2011061300
+%define         version_internal 1.9.2.18
 %define         apiversion 1.9.2
-%define         uaweight 192170
+%define         uaweight 192180
 Summary:        Mozilla Runtime Environment 1.9.2
 Url:            http://www.mozilla.org
 Group:          Productivity/Other