On Thu, Sep 09, 2010 at 09:20:02AM +0200, Landry Breuil wrote:
> On Wed, Sep 08, 2010 at 11:30:27PM +0200, Landry Breuil wrote:
> > hi,
> >
> > here are the usual mozilla bugfix/security updates, fixing a bunch of
> > "usual" MFSA..
> > https://www.mozilla.org/security/known-vulnerabilities/firefox36.html#firefox3.6.9
> >
> > diffs currently building on my amd64 box, please test (as i know you use
> > 'em),
> > esp. on non-mainstream archs.
> >
> > Landry
>
> New diff for ffx 3.6.9, the upstream (morons!) now enforce sqlite3 to
> be built with SQLITE_SECURE_DELETE, so it fails with our current sqlite
> port, as pointed out by Dave Del Debbio.
>
> References for more bikeshedding :
> https://bugzilla.mozilla.org/show_bug.cgi?id=445164
> https://bugzilla.mozilla.org/show_bug.cgi?id=546162
> https://bugs.launchpad.net/ubuntu/+source/sqlite3/+bug/457791
> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555955
> http://bugs.gentoo.org/show_bug.cgi?id=304913
>
> https://developer.mozilla.org/en/Storage/Performance might be
> interesting for the ones that complain that firefox* is too slow with
> their gigantic profile history.
>
> Now two options :
> - fallback to internal sqlite (bah!)
> - build systemwide sqlite with this option (bah!)
>
> Opinions on that ?
> New diffs fallbacks to internal sqlite, as it seems the more
> 'reasonable' option.
And new diff that actually adds libsqlite3 to SHARED_LIBS + PLIST so
that firefox hopefully runs. Bah.
New diff for xulrunner incoming.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.147
diff -u -r1.147 Makefile
--- Makefile 6 Sep 2010 12:59:50 -0000 1.147
+++ Makefile 9 Sep 2010 12:02:26 -0000
@@ -3,18 +3,17 @@
COMMENT = Mozilla web browser
# Don't forget to bump www/firefox-i18n after updates.
-MOZILLA_VERSION = 3.6.8
+MOZILLA_VERSION = 3.6.9
MOZILLA_BRANCH = 1.9.2
MOZILLA_PROJECT = mozilla-firefox
MOZILLA_CODENAME = browser
-SO_VERSION = 22.0
+SO_VERSION = 22.1
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
MOZILLA_LIBS = browsercomps browserdirprovider imgicon mozjs \
- xpcom xul nullplugin unixprintplugin
+ sqlite3 xpcom xul nullplugin unixprintplugin
-REVISION = 1
CATEGORIES = www
# mozilla public license
@@ -37,9 +36,9 @@
CONFIGURE_STYLE = autoconf no-autoheader
CONFIGURE_ARGS += --enable-official-branding
-CONFIGURE_ARGS += --enable-system-sqlite
-LIB_DEPENDS += :sqlite3->=3.6.16:databases/sqlite3
-WANTLIB += sqlite3.>=13.3
+# CONFIGURE_ARGS += --enable-system-sqlite
+# LIB_DEPENDS += :sqlite3->=3.6.16:databases/sqlite3
+# WANTLIB += sqlite3.>=13.3
# --with-system-png=${LOCALBASE}
# no system png : apng support not bundled in
@@ -48,10 +47,6 @@
MOZILLA_AUTOCONF_DIRS += js/src
MOZILLA_SUBST_FILES += config/autoconf.mk.in
-
-# remove file that confuses make update-patches
-pre-patch:
- rm ${WRKSRC}/toolkit/mozapps/extensions/test/unit/*.orig
post-install:
${INSTALL_DATA} ${FILESDIR}/browserconfig.properties ${MOB}/LICENSE
${MOB}/blocklist.xml ${MOZ}
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/distinfo,v
retrieving revision 1.57
diff -u -r1.57 distinfo
--- distinfo 25 Jul 2010 21:18:34 -0000 1.57
+++ distinfo 9 Sep 2010 12:02:26 -0000
@@ -1,5 +1,5 @@
-MD5 (firefox-3.6.8.source.tar.bz2) = DuXxT9i+B1E9FhMQJ+vLYQ==
-RMD160 (firefox-3.6.8.source.tar.bz2) = FOJFxkPUGh2iX+TbwV1q5Gahnls=
-SHA1 (firefox-3.6.8.source.tar.bz2) = STblQ/bHSSxZVMvVsw3dprION5c=
-SHA256 (firefox-3.6.8.source.tar.bz2) =
/GCcxqDdqiqevYUR7DmuSkBOEQehLgeyM+KvylHZoQ4=
-SIZE (firefox-3.6.8.source.tar.bz2) = 51238976
+MD5 (firefox-3.6.9.source.tar.bz2) = EA7K/WxsUGK8A7svtlH8Fw==
+RMD160 (firefox-3.6.9.source.tar.bz2) = UwsdZMwCugQzw6OdHJfFadrQkO8=
+SHA1 (firefox-3.6.9.source.tar.bz2) = JCkVTI1Qu17u+AIztW+ybc9yfqM=
+SHA256 (firefox-3.6.9.source.tar.bz2) =
n38J4tBkpYNdcZzLWacNLTKhhg9ny5zIjEtpNmhYBQM=
+SIZE (firefox-3.6.9.source.tar.bz2) = 51240588
Index: patches/patch-media_liboggz_include_oggz_oggz_off_t_generated_h
===================================================================
RCS file:
/cvs/ports/www/mozilla-firefox/patches/patch-media_liboggz_include_oggz_oggz_off_t_generated_h,v
retrieving revision 1.1
diff -u -r1.1 patch-media_liboggz_include_oggz_oggz_off_t_generated_h
--- patches/patch-media_liboggz_include_oggz_oggz_off_t_generated_h 26 Apr
2010 19:55:58 -0000 1.1
+++ patches/patch-media_liboggz_include_oggz_oggz_off_t_generated_h 9 Sep
2010 12:02:26 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-media_liboggz_include_oggz_oggz_off_t_generated_h,v 1.1
2010/04/26 19:55:58 landry Exp $
---- media/liboggz/include/oggz/oggz_off_t_generated.h.orig Mon Aug 24
18:52:50 2009
-+++ media/liboggz/include/oggz/oggz_off_t_generated.h Thu Sep 10 23:38:17 2009
+--- media/liboggz/include/oggz/oggz_off_t_generated.h.orig Tue Aug 24
23:32:05 2010
++++ media/liboggz/include/oggz/oggz_off_t_generated.h Wed Sep 8 22:37:45 2010
@@ -59,7 +59,7 @@
#include <sys/types.h>
--#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
-+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) ||
defined(__OpenBSD__)
+-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX)
++#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) ||
defined(__OpenBSD__) || defined (_AIX)
typedef off_t oggz_off_t;
#else
typedef loff_t oggz_off_t;
Index: patches/patch-toolkit_library_Makefile_in
===================================================================
RCS file:
/cvs/ports/www/mozilla-firefox/patches/patch-toolkit_library_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-toolkit_library_Makefile_in
--- patches/patch-toolkit_library_Makefile_in 26 Apr 2010 19:55:58 -0000
1.1
+++ patches/patch-toolkit_library_Makefile_in 9 Sep 2010 12:02:26 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.1 2010/04/26 19:55:58 landry
Exp $
---- toolkit/library/Makefile.in.orig Tue Mar 16 10:57:18 2010
-+++ toolkit/library/Makefile.in Sat Mar 27 01:54:28 2010
-@@ -282,6 +282,9 @@ ifdef MOZ_ENABLE_QT
+--- toolkit/library/Makefile.in.orig Tue Aug 24 23:32:11 2010
++++ toolkit/library/Makefile.in Wed Sep 8 22:36:49 2010
+@@ -288,6 +288,9 @@ ifdef MOZ_ENABLE_QT
EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
endif
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/pkg/PLIST,v
retrieving revision 1.29
diff -u -r1.29 PLIST
--- pkg/PLIST 9 Jul 2010 15:43:54 -0000 1.29
+++ pkg/PLIST 9 Sep 2010 12:02:26 -0000
@@ -265,6 +265,7 @@
${MOZILLA_PROJECT}/icons/document.png
${MOZILLA_PROJECT}/icons/mozicon128.png
@lib ${MOZILLA_PROJECT}/libmozjs.so.${LIBmozjs_VERSION}
+...@lib ${MOZILLA_PROJECT}/libsqlite3.so.${LIBsqlite3_VERSION}
@lib ${MOZILLA_PROJECT}/libxpcom.so.${LIBxpcom_VERSION}
@lib ${MOZILLA_PROJECT}/libxul.so.${LIBxul_VERSION}
${MOZILLA_PROJECT}/modules/
