- Security update to 12.10

Security: http://www.opera.com/support/kb/view/1030/
Security: http://www.opera.com/support/kb/view/1031/
Security: http://www.opera.com/support/kb/view/1033/
PR:		173426
Approved by:	portmgr (decke)
Feature safe: yes

5 files changed, 56 insertions, 17 deletions

diff --git a/www/opera-linuxplugins/Makefile b/www/opera-linuxplugins/Makefile
index 358648d25e5c..335c1bef97d4 100644
--- a/www/opera-linuxplugins/Makefile
+++ b/www/opera-linuxplugins/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:		opera-linuxplugins
-# Date created:					December 17th 2006
-# Whom:						Arjan van Leeuwen <freebsd-maintainer@opera.com>
-#
+# Created by: Arjan van Leeuwen <freebsd-maintainer@opera.com>
 # $FreeBSD$
-#
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}
@@ -24,8 +20,8 @@ COMMENT=	Linux plugin support for the native Opera browser
 
 RUN_DEPENDS=	${LOCALBASE}/lib/opera/pluginwrapper/operapluginwrapper:${PORTSDIR}/${PKGCATEGORY}/opera
 
-OPERA_VER?=	12.02
-OPERA_BUILD?=	1578
+OPERA_VER?=	12.10
+OPERA_BUILD?=	1652
 MASTER_SITES_VER_PATH=	linux/${OPERA_VER:S/.//}/
 
 USE_XZ=		yes
diff --git a/www/opera-linuxplugins/distinfo b/www/opera-linuxplugins/distinfo
index df80a93a3006..7a64626832cf 100644
--- a/www/opera-linuxplugins/distinfo
+++ b/www/opera-linuxplugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opera-12.02-1578.i386.linux.tar.xz) = 60ccef14673818a8690fe3b76f861d180e2d8d3b87513b1652e6117c6dff3e86
-SIZE (opera-12.02-1578.i386.linux.tar.xz) = 12800028
+SHA256 (opera-12.10-1652.i386.linux.tar.xz) = e7a099b0ca20307e7682fdec4aaec4bd2856cf1d3ae75e1da67b76cfda5fe619
+SIZE (opera-12.10-1652.i386.linux.tar.xz) = 13514036
diff --git a/www/opera/Makefile b/www/opera/Makefile
index c047955985d8..b33468ce72a5 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 BUILD_DEPENDS=	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
 RUN_DEPENDS=	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
-OPERA_VER?=	12.02
-OPERA_BUILD?=	1578
+OPERA_VER?=	12.10
+OPERA_BUILD?=	1652
 MASTER_SITES_VER_PATH=	unix/${OPERA_VER:S/.//}
 
 USE_XZ=		yes
@@ -30,8 +30,6 @@ USE_XORG=	x11 xext sm ice xft xrender
 USE_GNOME=	desktopfileutils
 INSTALLS_ICONS=	yes
 
-FORBIDDEN=	http://www.opera.com/support/kb/view/1030/ http://www.opera.com/support/kb/view/1031/ http://www.opera.com/support/kb/view/1033/
-
 MAN1=		opera.1
 MANCOMPRESSED=	yes
 
@@ -46,6 +44,17 @@ VIDEO_DESC=	support for HTML5 video (requires GStreamer)
 
 .include <bsd.port.options.mk>
 
+.if defined(FETCH_ALL)
+# distfiles for both arch
+.if ${ARCH} == i386
+DISTFILES=	${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.amd64.freebsd${EXTRACT_SUFX} \
+		${DISTNAME}${EXTRACT_SUFX}
+.else
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.i386.freebsd${EXTRACT_SUFX}
+.endif
+.endif
+
 .if ${PORT_OPTIONS:MCUPS}
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
 .endif
@@ -86,4 +95,8 @@ do-install:
 	-${LOCALBASE}/bin/update-desktop-database
 	-${LOCALBASE}/bin/update-mime-database ${LOCALBASE}/share/mime
 
+# target to build distinfo for both arch
+makesum-all:
+	make makesum FETCH_ALL=yes
+
 .include <bsd.port.post.mk>
diff --git a/www/opera/distinfo b/www/opera/distinfo
index 755b964e7d96..6835718a6097 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,4 +1,4 @@
-SHA256 (opera-12.02-1578.amd64.freebsd.tar.xz) = 6bc85670eb84b70b9393e169040626edf83ffd87de42810bb5f79ab01736aa55
-SIZE (opera-12.02-1578.amd64.freebsd.tar.xz) = 12952100
-SHA256 (opera-12.02-1578.i386.freebsd.tar.xz) = b1c11aac2eabdec84b5d8129feb916a0c86454a1ec89b7bce0c5598fc193af91
-SIZE (opera-12.02-1578.i386.freebsd.tar.xz) = 12757132
+SHA256 (opera-12.10-1652.amd64.freebsd.tar.xz) = 4aa37c0ba0285458d2417255ac9fa903176a42a399d04ae18b5e8dd2e10a4ea5
+SIZE (opera-12.10-1652.amd64.freebsd.tar.xz) = 13473892
+SHA256 (opera-12.10-1652.i386.freebsd.tar.xz) = d14b37d74db549573fbdd517df6da0e8b02630c7c1de1aaa7f2e75cbf558ae78
+SIZE (opera-12.10-1652.i386.freebsd.tar.xz) = 13476352
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index c2c0a09ada99..839e366d2611 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -120,6 +120,7 @@ share/mime/packages/opera-extension.xml
 %%DATADIR%%/locale/kk/kk.lng
 %%DATADIR%%/locale/ko/ko.lng
 %%DATADIR%%/locale/lt/lt.lng
+%%DATADIR%%/locale/lv/lv.lng
 %%DATADIR%%/locale/me/me.lng
 %%DATADIR%%/locale/mk/mk.lng
 %%DATADIR%%/locale/ms/ms.lng
@@ -182,6 +183,11 @@ share/mime/packages/opera-extension.xml
 %%DATADIR%%/mathml.dtd
 %%DATADIR%%/package-id.ini
 %%DATADIR%%/pubsuffix.xml
+%%DATADIR%%/region/ar/bookmarks.adr
+%%DATADIR%%/region/ar/search.ini
+%%DATADIR%%/region/ar/standard_speeddial.ini
+%%DATADIR%%/region/au/bookmarks.adr
+%%DATADIR%%/region/au/standard_speeddial.ini
 %%DATADIR%%/region/cis/en/bookmarks.adr
 %%DATADIR%%/region/cis/en/search.ini
 %%DATADIR%%/region/cis/en/standard_speeddial.ini
@@ -193,6 +199,9 @@ share/mime/packages/opera-extension.xml
 %%DATADIR%%/region/cn/en/search.ini
 %%DATADIR%%/region/cn/en/standard_speeddial.ini
 %%DATADIR%%/region/cn/turbosettings.xml
+%%DATADIR%%/region/eg/bookmarks.adr
+%%DATADIR%%/region/eg/search.ini
+%%DATADIR%%/region/eg/standard_speeddial.ini
 %%DATADIR%%/region/gb/bookmarks.adr
 %%DATADIR%%/region/gb/search.ini
 %%DATADIR%%/region/gb/standard_speeddial.ini
@@ -210,6 +219,11 @@ share/mime/packages/opera-extension.xml
 %%DATADIR%%/region/middle_east/bookmarks.adr
 %%DATADIR%%/region/middle_east/search.ini
 %%DATADIR%%/region/middle_east/standard_speeddial.ini
+%%DATADIR%%/region/mx/bookmarks.adr
+%%DATADIR%%/region/mx/search.ini
+%%DATADIR%%/region/mx/standard_speeddial.ini
+%%DATADIR%%/region/my/bookmarks.adr
+%%DATADIR%%/region/my/standard_speeddial.ini
 %%DATADIR%%/region/ng/bookmarks.adr
 %%DATADIR%%/region/ng/standard_speeddial.ini
 %%DATADIR%%/region/ph/bookmarks.adr
@@ -217,6 +231,11 @@ share/mime/packages/opera-extension.xml
 %%DATADIR%%/region/pk/bookmarks.adr
 %%DATADIR%%/region/pk/standard_speeddial.ini
 %%DATADIR%%/region/region.ini
+%%DATADIR%%/region/ru/bookmarks.adr
+%%DATADIR%%/region/ru/search.ini
+%%DATADIR%%/region/ru/standard_speeddial.ini
+%%DATADIR%%/region/se/bookmarks.adr
+%%DATADIR%%/region/se/standard_speeddial.ini
 %%DATADIR%%/region/tw/browser.js
 %%DATADIR%%/region/tw/turbosettings.xml
 %%DATADIR%%/region/ua/ru/bookmarks.adr
@@ -227,6 +246,8 @@ share/mime/packages/opera-extension.xml
 %%DATADIR%%/region/us/standard_speeddial.ini
 %%DATADIR%%/region/vn/bookmarks.adr
 %%DATADIR%%/region/vn/standard_speeddial.ini
+%%DATADIR%%/region/za/bookmarks.adr
+%%DATADIR%%/region/za/standard_speeddial.ini
 %%DATADIR%%/skin/standard_skin.zip
 %%DATADIR%%/skin/unix_skin.zip
 %%DATADIR%%/styles/about.css
@@ -320,25 +341,33 @@ share/mime/packages/opera-extension.xml
 @dirrm %%DATADIR%%/styles/images
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/skin
+@dirrm %%DATADIR%%/region/za
 @dirrm %%DATADIR%%/region/vn
 @dirrm %%DATADIR%%/region/us
 @dirrm %%DATADIR%%/region/ua/ru
 @dirrm %%DATADIR%%/region/ua
 @dirrm %%DATADIR%%/region/tw
+@dirrm %%DATADIR%%/region/se
+@dirrm %%DATADIR%%/region/ru
 @dirrm %%DATADIR%%/region/pk
 @dirrm %%DATADIR%%/region/ph
 @dirrm %%DATADIR%%/region/ng
+@dirrm %%DATADIR%%/region/my
+@dirrm %%DATADIR%%/region/mx
 @dirrm %%DATADIR%%/region/middle_east
 @dirrm %%DATADIR%%/region/latin_america
 @dirrm %%DATADIR%%/region/in
 @dirrm %%DATADIR%%/region/id
 @dirrm %%DATADIR%%/region/hk
 @dirrm %%DATADIR%%/region/gb
+@dirrm %%DATADIR%%/region/eg
 @dirrm %%DATADIR%%/region/cn/en
 @dirrm %%DATADIR%%/region/cn
 @dirrm %%DATADIR%%/region/cis/ru
 @dirrm %%DATADIR%%/region/cis/en
 @dirrm %%DATADIR%%/region/cis
+@dirrm %%DATADIR%%/region/au
+@dirrm %%DATADIR%%/region/ar
 @dirrm %%DATADIR%%/region
 @dirrm %%DATADIR%%/locale/zu
 @dirrm %%DATADIR%%/locale/zh-tw
@@ -368,6 +397,7 @@ share/mime/packages/opera-extension.xml
 @dirrm %%DATADIR%%/locale/ms
 @dirrm %%DATADIR%%/locale/mk
 @dirrm %%DATADIR%%/locale/me
+@dirrm %%DATADIR%%/locale/lv
 @dirrm %%DATADIR%%/locale/lt
 @dirrm %%DATADIR%%/locale/ko
 @dirrm %%DATADIR%%/locale/kk