ports/93605: [PATCH] Update www/opera to version 8.52
Arjan van Leeuwen
avleeuwen at piwebs.com
Mon Feb 20 21:00:16 UTC 2006
>Number: 93605
>Category: ports
>Synopsis: [PATCH] Update www/opera to version 8.52
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Feb 20 21:00:08 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Arjan van Leeuwen
>Release: FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD 6.0-RELEASE #13: Sun Nov 6 14:50:54 CET 2005
root at winston.piwebs.com:/usr/obj/usr/src/sys/WINSTON
>Description:
This patch updates www/opera to version 8.52 (20060201).
This version fixes some security vulnerabilities, see
Changelog: http://www.opera.com/docs/changelogs/freebsd/852/
>How-To-Repeat:
>Fix:
--- opera.diff begins here ---
diff -urN /usr/ports/www/opera/Makefile opera/Makefile
--- /usr/ports/www/opera/Makefile Tue Nov 22 22:58:49 2005
+++ opera/Makefile Mon Feb 20 21:39:35 2006
@@ -8,29 +8,29 @@
PORTNAME= opera
PORTVERSION= ${OPERA_VER}.${OPERA_DATE}
CATEGORIES= www ipv6
-MASTER_SITES= http://ftp.scarlet.be/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
- ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
- http://www.mehok.uni-miskolc.hu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
- ftp://ftp.heanet.ie/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
- http://opera.nsc.no/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
- http://ftp.task.gda.pl/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
- ftp://ftp.idilis.ro/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
- http://www.fastmirrors.org/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
- http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
- ftp://mirror.switch.ch/mirror/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
- ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
- http://ftp.ankara.edu.tr/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
- ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/&,} \
- ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/
+MASTER_SITES= http://ftp.scarlet.be/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+ ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+ http://www.mehok.uni-miskolc.hu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+ ftp://ftp.heanet.ie/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+ http://opera.nsc.no/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+ http://ftp.task.gda.pl/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+ ftp://ftp.idilis.ro/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+ http://www.fastmirrors.org/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+ http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+ ftp://mirror.switch.ch/mirror/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+ ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+ http://ftp.ankara.edu.tr/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/&,} \
+ ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/
DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386.freebsd-en
MAINTAINER= avleeuwen at piwebs.com
COMMENT= A blazingly fast, full-featured, standards-compliant browser
-OPERA_VER= 8.51
+OPERA_VER= 8.52
OPERA_MINVER= #
OPERA_REL= final
-OPERA_DATE= 20051114
+OPERA_DATE= 20060201
DATADIR= ${PREFIX}/share/${PORTNAME}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}
diff -urN /usr/ports/www/opera/distinfo opera/distinfo
--- /usr/ports/www/opera/distinfo Tue Nov 22 22:58:49 2005
+++ opera/distinfo Mon Feb 20 21:39:56 2006
@@ -1,3 +1,3 @@
-MD5 (opera-8.51-20051114.1-static-qt.i386.freebsd-en.tar.bz2) = 28fb74b43b24f0a29b3e4a9ddb79d9b6
-SHA256 (opera-8.51-20051114.1-static-qt.i386.freebsd-en.tar.bz2) = 0631248764d5bb039bc9d1b6d098adb6f6ad1e991ac7a82863201f755145ff30
-SIZE (opera-8.51-20051114.1-static-qt.i386.freebsd-en.tar.bz2) = 5572512
+MD5 (opera-8.52-20060201.1-static-qt.i386.freebsd-en.tar.bz2) = 849b062ce281e22aceb20572ac0eaaab
+SHA256 (opera-8.52-20060201.1-static-qt.i386.freebsd-en.tar.bz2) = 8dc131852362175d93b89ba01ee32c3301abe91d81af2d70a9545f5a38b8086e
+SIZE (opera-8.52-20060201.1-static-qt.i386.freebsd-en.tar.bz2) = 5576830
diff -urN /usr/ports/www/opera/files/patch-install.sh opera/files/patch-install.sh
--- /usr/ports/www/opera/files/patch-install.sh Fri Jan 27 12:07:08 2006
+++ opera/files/patch-install.sh Mon Feb 20 21:54:42 2006
@@ -1,5 +1,5 @@
---- install.sh.orig Mon Nov 14 14:51:18 2005
-+++ install.sh Wed Jan 25 18:59:13 2006
+--- install.sh.orig Wed Feb 1 15:26:54 2006
++++ install.sh Mon Feb 20 21:54:32 2006
@@ -381,7 +381,7 @@
mvv='' # SunOS mv (no -v verbose option)
;;
@@ -9,7 +9,7 @@
cpf='-f'
if test "$verbose" -gt '1'
then
-@@ -757,7 +757,7 @@
+@@ -771,7 +771,7 @@
debug_msg 0 "in generate_wrapper()"
case "${machine}:${os}" in
@@ -18,7 +18,7 @@
wrapper_ibmjava="
IBMJava2-142/jre \\
IBMJava2-141/jre \\
-@@ -796,10 +796,19 @@
+@@ -810,6 +810,12 @@
wrapper_contain="#!/bin/sh
@@ -31,14 +31,7 @@
# Location of the Opera binaries
OPERA_BINARYDIR=${str_localdirexec}
export OPERA_BINARYDIR
-
-+# Make sure the compat libraries are found
-+test -d %%LOCALBASE%%/lib/compat/ && LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:%%LOCALBASE%%/lib/compat/\"
-+
- # Parse commandline parameters
- toset=
- for arg
-@@ -844,6 +853,9 @@
+@@ -865,6 +871,9 @@
OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
export OPERA_LD_PRELOAD
@@ -48,7 +41,7 @@
# Native Java enviroment
if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
-@@ -867,65 +879,12 @@
+@@ -888,69 +897,13 @@
if test ! \"\${OPERA_JAVA_DIR}\"; then
@@ -61,10 +54,14 @@
+ PREFIXES=\"%%LOCALBASE%%\"
for SUNJAVA in \\
+- java-1.5.0-sun-1.5.0.06 \\
+- java-1.5.0-sun-1.5.0.06/jre \\
- java-1.5.0-sun-1.5.0.05 \\
- java-1.5.0-sun-1.5.0.05/jre \\
- java-1.5.0-sun-1.5.0.04 \\
- java-1.5.0-sun-1.5.0.04/jre \\
+- jre1.5.0_06 \\
+- jdk1.5.0_06/jre \\
- jre1.5.0_05 \\
- jdk1.5.0_05/jre \\
- jre1.5.0_04 \\
@@ -114,10 +111,11 @@
- java \\
+ jdk1.3.1/jre \\
+ jdk1.4.2/jre \\
++ jdk1.5.0/jre \\
; do
for PREFIX in \${PREFIXES}; do
if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
-@@ -976,11 +935,8 @@
+@@ -1001,11 +954,8 @@
# Acrobat Reader
for BINDIR in \\
@@ -131,7 +129,7 @@
; do
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
done
-@@ -991,12 +947,13 @@
+@@ -1016,12 +966,13 @@
LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\"
export LD_LIBRARY_PATH
@@ -146,8 +144,17 @@
+ if test -f \"\${LIBASPELL_DIR}/libaspell.so.16\"; then
LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
fi
- done
-@@ -1086,7 +1043,7 @@
+ done"
+@@ -1031,7 +982,7 @@
+ wrapper_contain="${wrapper_contain}
+
+ # Make sure the compat libraries are found
+-test -d /usr/local/lib/compat/ && LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:/usr/local/lib/compat/\"
++test -d %%LOCALBASE%%/lib/compat/ && LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:%%LOCALBASE%%/lib/compat/\"
+ "
+ ;;
+ esac
+@@ -1123,7 +1074,7 @@
chop "${OPERADESTDIR}" "str_localdirshare"
chop "${OPERADESTDIR}" "str_localdirplugin"
@@ -156,12 +163,16 @@
# Executable
debug_msg 1 "Executable"
-@@ -1300,49 +1257,13 @@
+@@ -1338,50 +1289,8 @@
if test -z "${OPERADESTDIR}"
then
- # System wide configuration files
-- config_dir='/usr/local/etc'
+- case "${os}" in
+- FreeBSD|OpenBSD|NetBSD) config_dir='/usr/local/etc'
+- *) config_dir="/etc";;
+- esac
+-
- if can_write_to "$config_dir"
- then
- echo
@@ -186,8 +197,8 @@
- fi
-
# Shorcuts and Icons
- bool_icons=1 # install icons by default
-
+- bool_icons=1 # install icons by default
+-
- if test "${flag_mode}" = "--force" -o "${flag_mode}" = "--prefix="
- then
- echo
@@ -195,18 +206,16 @@
- con_firm "Do you want to (try to) install them in default locations" || bool_icons=0
- fi
-
- if test "${bool_icons}" -ne 0
- then
-- icons
- gnome
- kde 3
-- kde 2
-- kde1
-- mandrake
- fi
-
+- if test "${bool_icons}" -ne 0
+- then
+- xdg
+- fi
+-
++ xdg
fi # OPERADESTDIR
-@@ -1487,48 +1408,43 @@
+
+ # Add uninstallation here
+@@ -1586,48 +1495,43 @@
# This function searches for common gnome icon paths.
debug_msg 1 "in gnome()"
@@ -278,7 +287,7 @@
elif test -d /usr/share/gnome/
then
-@@ -1576,9 +1492,9 @@
+@@ -1675,9 +1579,9 @@
# This function searches for common kde2 and kde 3 icon paths.
debug_msg 1 "in kde()"
@@ -290,7 +299,7 @@
if test -d "$DIR_HI" -a -w "$DIR_HI"
then
if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps
-@@ -1592,7 +1508,7 @@
+@@ -1691,7 +1595,7 @@
fi
fi
@@ -299,7 +308,7 @@
if test -d $DIR_LO -a -w $DIR_LO
then
if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps
-@@ -1606,15 +1522,15 @@
+@@ -1705,15 +1609,15 @@
fi
fi
@@ -321,3 +330,39 @@
fi
fi
fi
+@@ -1782,34 +1686,9 @@
+ }
+
+ xdg()
+-{ # http://standards.freedesktop.org
+- if update-desktop-database --help >/dev/null 2>&1; then
+-
+- for ICON_DIR in ${XDG_DATA_DIRS}/icons/hicolor /usr/share/pixmaps/hicolor; do test -d ${ICON_DIR} && break; done
+-
+- if test ! -d ${ICON_DIR}; then echo "Could not find icon installation directory, icons not installed." >&2
+- elif test ! -w ${ICON_DIR}; then echo "Directory \"${ICON_DIR}\" not writable by user \"${USER}\", icons not installed." >&2
+- else
+- test -d ${ICON_DIR}/48x48/apps && test -w ${ICON_DIR}/48x48/apps && cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera.png
+- test -d ${ICON_DIR}/32x32/apps && test -w ${ICON_DIR}/32x32/apps && cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera.png
+- test -d ${ICON_DIR}/22x22/apps && test -w ${ICON_DIR}/22x22/apps && cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera.png
+- fi
+-
+- for SHORTCUT_DIR in ${XDG_DATA_HOME}/applications /usr/local/share/applications /usr/share/applications; do test -d ${SHORTCUT_DIR} && break; done
+-
+- if test ! -d ${SHORTCUT_DIR}; then echo "Could not find shortcut installation directory, desktop entry not installed." >&2; return
+- elif test ! -w ${SHORTCUT_DIR}; then echo "Directory \"${SHORTCUT_DIR}\" not writable by user \"${USER}\", desktop entry not installed." >&2; return
+- fi
+- generate_desktop ${SHORTCUT_DIR} xdg
+- update-desktop-database
+- else
+- icons
++{
+ gnome
+ kde 3
+- kde 2
+- kde1
+- mandrake
+- fi
+ }
+
+ # These are the only variables the needs to be changed
--- opera.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list