cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update firefox35 port to 3.5.12, fixing a whole bunch of MFSA (2010-49->63)

Browse Source
This commit is contained in:
landry 2010-09-12 17:55:30 +00:00
parent 24191c1358
commit 5f8a1719d1
9 changed files with 38 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/firefox35/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.41 2010/08/30 23:50:44 fgsch Exp $
# $OpenBSD: Makefile,v 1.42 2010/09/12 17:56:29 landry Exp $
COMMENT = Mozilla web browser
MOZILLA_VERSION = 3.5.11
MOZILLA_VERSION = 3.5.12
MOZILLA_BRANCH = 1.9.1
MOZILLA_PROJECT = firefox35
MOZILLA_CODENAME = browser
@ -13,7 +13,6 @@ SO_VERSION = 24.0
MOZILLA_LIBS = browsercomps browserdirprovider imgicon mozjs \
xpcom xul nullplugin unixprintplugin
REVISION = 0
CATEGORIES = www
FLAVORS = debug

10
www/firefox35/distinfo
View File

@ -1,5 +1,5 @@
MD5 (firefox-3.5.11.source.tar.bz2) = vhtgfT9hDWwHMihZtl7UlA==
RMD160 (firefox-3.5.11.source.tar.bz2) = PadXb25A/Ul+fukRZPp9e81EXPk=
SHA1 (firefox-3.5.11.source.tar.bz2) = qCODf97FvjP7sI8P69waWoG1V6M=
SHA256 (firefox-3.5.11.source.tar.bz2) = ArXA6c1aRnKM4ri1yTv5zgdnWS4/ecG+9ONji2Zncy0=
SIZE (firefox-3.5.11.source.tar.bz2) = 47516322
MD5 (firefox-3.5.12.source.tar.bz2) = vR4n7ySUlU3ZIN7ekWXp2w==
RMD160 (firefox-3.5.12.source.tar.bz2) = ZKg9VKdLIMMaQOxHT+bXjBAqt3I=
SHA1 (firefox-3.5.12.source.tar.bz2) = cmQIQ1VYlCzGSLhCAdBCJCNIEio=
SHA256 (firefox-3.5.12.source.tar.bz2) = d2yhcRmlJvPZqPJN4OBPkgV+adyBznuDctkhTFFrh58=
SIZE (firefox-3.5.12.source.tar.bz2) = 47490363

10
www/firefox35/patches/patch-media_liboggz_include_oggz_oggz_off_t_generated_h
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-media_liboggz_include_oggz_oggz_off_t_generated_h,v 1.2 2009/09/10 22:18:59 martynas 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
$OpenBSD: patch-media_liboggz_include_oggz_oggz_off_t_generated_h,v 1.3 2010/09/12 17:56:29 landry Exp $
--- media/liboggz/include/oggz/oggz_off_t_generated.h.orig Tue Aug 24 19:15:12 2010
+++ media/liboggz/include/oggz/oggz_off_t_generated.h Wed Sep 8 23:10:31 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;

8
www/firefox35/patches/patch-toolkit_library_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.1 2010/08/02 16:05:37 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
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.2 2010/09/12 17:56:29 landry Exp $
--- toolkit/library/Makefile.in.orig Tue Aug 24 19:15:21 2010
+++ toolkit/library/Makefile.in Wed Sep 8 22:51:00 2010
@@ -283,6 +283,9 @@ ifdef MOZ_ENABLE_QT
EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
endif

18
www/mozilla-firefox/Makefile
View File

@ -1,20 +1,19 @@
# $OpenBSD: Makefile,v 1.147 2010/09/06 12:59:50 eric Exp $
# $OpenBSD: Makefile,v 1.148 2010/09/12 17:55:30 landry Exp $
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,11 +36,10 @@ NO_REGRESS = Yes
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
# --with-system-png=${LOCALBASE}
# no system png : apng support not bundled in
# --enable-system-sqlite
# no system sqlite : requires SECURE_DELETE
MOZILLA_DATADIRS = chrome components defaults dictionaries extensions \
greprefs icons modules plugins res searchplugins
@ -49,10 +47,6 @@ MOZILLA_DATADIRS = chrome components defaults dictionaries extensions \
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}
${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/mozilla-firefox.1 \

10
www/mozilla-firefox/distinfo
View File

@ -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

10
www/mozilla-firefox/patches/patch-media_liboggz_include_oggz_oggz_off_t_generated_h
View File

@ -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
$OpenBSD: patch-media_liboggz_include_oggz_oggz_off_t_generated_h,v 1.2 2010/09/12 17:55:30 landry Exp $
--- 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;

8
www/mozilla-firefox/patches/patch-toolkit_library_Makefile_in
View File

@ -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
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.2 2010/09/12 17:55:30 landry Exp $
--- 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

3
www/mozilla-firefox/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.29 2010/07/09 15:43:54 landry Exp $
@comment $OpenBSD: PLIST,v 1.30 2010/09/12 17:55:30 landry Exp $
@conflict firefox3-*
@conflict mozilla-firebird-*
@pkgpath www/firefox3
@ -265,6 +265,7 @@ ${MOZILLA_PROJECT}/icons/
${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/