-Update to 7.54u2 (7.54.20050131), this is mostly security fixes release.

Security:
		- Solved data URL issue described in Secunia Advisory SA13818,
		  http://secunia.com/advisories/13818/
		- Additional fixes for frame injection issue reported in
		  Secunia Advisory SA13253,
		  http://secunia.com/advisories/13253/

	Miscellaneous:
		- Improvements to handling of the must-revalidate directive.
		- Solved stability issue in Japanese version.

	UNIX specific:
		- Added extra warning dialog when opening .sh, .desktop or
		  executables directly from Web or from transfer manager with
		  kfmclient exec. Addresses issue reported in Secunia Advisory
		  SA13447, http://secunia.com/advisories/13447/
		- Fixed crash when importing e-mail.

	http://www.opera.com/linux/changelogs/754u2/

- Few other small cleans up.
- Let's see if Realplayer plugins will work for anyone. It's not tested, but
  added support. I am not going to be surpised if the support is limited as
  common in the Linux world.
This commit is contained in:
Jeremy Messenger 2005-02-05 00:02:27 +00:00
parent 924f7558f2
commit ed1faaa680
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=128053
10 changed files with 110 additions and 82 deletions

View file

@ -7,18 +7,17 @@
PORTNAME= opera PORTNAME= opera
PORTVERSION= ${OPERA_VER}.${OPERA_DATE} PORTVERSION= ${OPERA_VER}.${OPERA_DATE}
PORTREVISION= 1
CATEGORIES= www linux CATEGORIES= www linux
MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/&,} ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/&,}
PKGNAMEPREFIX= linux- PKGNAMEPREFIX= linux-
DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
@ -31,18 +30,18 @@ RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XF
RESTRICTED= "not redistributable; commercial software" RESTRICTED= "not redistributable; commercial software"
PREFIX?= ${X11BASE}
USE_BZIP2= yes USE_BZIP2= yes
WANT_GNOME= yes WANT_GNOME= yes
PREFIX?= ${X11BASE}
USE_REINPLACE= yes
WITH_LINUX= yes WITH_LINUX= yes
USE_REINPLACE= yes
ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS= i386
NO_BUILD= yes NO_BUILD= yes
NO_FILTER_SHLIBS=yes NO_FILTER_SHLIBS=yes
OPERA_VER= 7.54 OPERA_VER= 7.54
OPERA_DATE= 20041210 OPERA_DATE= 20050131
DATADIR= ${PREFIX}/share/${UNIQUENAME} DATADIR= ${PREFIX}/share/${UNIQUENAME}
DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME}

View file

@ -1,2 +1,2 @@
MD5 (opera-7.54-20041210.1-static-qt.i386-en.tar.bz2) = fcf99a5dd13ef6fbb7494992a05bd0ea MD5 (opera-7.54-20050131.1-static-qt.i386-en.tar.bz2) = afc1819c0377da89174ba2a47924b867
SIZE (opera-7.54-20041210.1-static-qt.i386-en.tar.bz2) = 4880472 SIZE (opera-7.54-20050131.1-static-qt.i386-en.tar.bz2) = 4863686

View file

@ -1,6 +1,6 @@
--- ini/pluginpath.ini.orig Tue Dec 14 16:11:16 2004 --- ini/pluginpath.ini.orig Fri Feb 4 17:45:25 2005
+++ ini/pluginpath.ini Tue Dec 14 16:13:05 2004 +++ ini/pluginpath.ini Fri Feb 4 17:45:53 2005
@@ -1,44 +1,16 @@ @@ -1,44 +1,26 @@
-Opera Preferences version 2.0 -Opera Preferences version 2.0
-; Do not edit this file while Opera is running -; Do not edit this file while Opera is running
-; This file is stored in UTF-8 encoding -; This file is stored in UTF-8 encoding
@ -53,11 +53,21 @@
+$HOME/.linux-opera/plugins=1 +$HOME/.linux-opera/plugins=1
+%%PREFIX%%/share/linux-opera/plugins=1 +%%PREFIX%%/share/linux-opera/plugins=1
+ +
+; Adobe Acrobat
+%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
+
+; Flash player
+%%LOCALBASE%%/lib/linux-flashplugin6=1 +%%LOCALBASE%%/lib/linux-flashplugin6=1
+%%LOCALBASE%%/lib/linux-flashplugin7=1 +%%LOCALBASE%%/lib/linux-flashplugin7=1
+%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
+%%LOCALBASE%%/Acrobat4/Browsers/intellinux=1
+ +
+%%LOCALBASE%%/lib/RealPlayer8/Plugins=1 +; Realplayer
+%%LOCALBASE%%/lib/RealPlayer=1
+%%LOCALBASE%%/lib/RealPlayer/plugins=1
+
+; Netscape Plug-in Paths
+$HOME/.netscape/plugins=1 +$HOME/.netscape/plugins=1
+%%LOCALBASE%%/lib/netscape-linux/plugins=1 +%%LOCALBASE%%/lib/netscape-linux/plugins=1
+
+; Since Mozilla supports NS plugins, there might
+; be some in the Mozilla plugin directory.
+%%LOCALBASE%%/lib/linux-mozilla/plugins=1

View file

@ -1,5 +1,5 @@
--- install.sh.orig Fri Dec 10 06:49:32 2004 --- install.sh.orig Fri Feb 4 17:20:39 2005
+++ install.sh Tue Dec 14 17:26:29 2004 +++ install.sh Fri Feb 4 17:38:04 2005
@@ -761,10 +761,9 @@ @@ -761,10 +761,9 @@
case "${machine}:${os}" in case "${machine}:${os}" in
i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
@ -45,7 +45,7 @@
if test -f \"\${INIJAVA}/libjava.so\"; then OPERA_JAVA_DIR=\"\${INIJAVA}\"; fi if test -f \"\${INIJAVA}/libjava.so\"; then OPERA_JAVA_DIR=\"\${INIJAVA}\"; fi
fi fi
fi fi
@@ -873,47 +876,16 @@ @@ -873,52 +876,16 @@
if test ! \"\${OPERA_JAVA_DIR}\"; then if test ! \"\${OPERA_JAVA_DIR}\"; then
@ -58,6 +58,10 @@
+ PREFIXES=\"%%LOCALBASE%%\" + PREFIXES=\"%%LOCALBASE%%\"
for SUNJAVA in \\ for SUNJAVA in \\
- jre1.5.0_01 \\
- jdk1.5.0_01/jre \\
- j2re1.4.2_06 \\
- j2sdk1.4.2_06/jre \\
- j2re1.4.2_04 \\ - j2re1.4.2_04 \\
- j2sdk1.4.2_04/jre \\ - j2sdk1.4.2_04/jre \\
- j2re1.4.2_03 \\ - j2re1.4.2_03 \\
@ -79,6 +83,7 @@
- j2se/1.4/jre \\ - j2se/1.4/jre \\
- j2se/1.3/jre \\ - j2se/1.3/jre \\
- j2se/jre \\ - j2se/jre \\
- jre1.3.1_15 \\
- jre1.3.1_02 \\ - jre1.3.1_02 \\
- jre1.3.1_01 \\ - jre1.3.1_01 \\
- j2re1.3.1 \\ - j2re1.3.1 \\
@ -101,7 +106,7 @@
; do ; do
for PREFIX in \${PREFIXES}; 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 if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
@@ -962,11 +934,8 @@ @@ -967,11 +934,8 @@
# Acrobat Reader # Acrobat Reader
for BINDIR in \\ for BINDIR in \\
@ -115,7 +120,7 @@
; do ; do
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
done done
@@ -1004,7 +973,7 @@ @@ -1009,7 +973,7 @@
}; };
// Opera package classes get all permissions // Opera package classes get all permissions
@ -124,7 +129,7 @@
permission java.security.AllPermission; permission java.security.AllPermission;
}; };
@@ -1076,7 +1045,7 @@ @@ -1077,7 +1041,7 @@
chop "${OPERADESTDIR}" "str_localdirshare" chop "${OPERADESTDIR}" "str_localdirshare"
chop "${OPERADESTDIR}" "str_localdirplugin" chop "${OPERADESTDIR}" "str_localdirplugin"
@ -133,7 +138,7 @@
# Executable # Executable
debug_msg 1 "Executable" debug_msg 1 "Executable"
@@ -1111,7 +1080,7 @@ @@ -1112,7 +1076,7 @@
#cp $cpv $cpf wrapper.sh $wrapper_dir/opera #cp $cpv $cpf wrapper.sh $wrapper_dir/opera
generate_wrapper generate_wrapper
@ -142,7 +147,7 @@
# Documentation # Documentation
debug_msg 1 "Documentation" debug_msg 1 "Documentation"
@@ -1210,27 +1179,6 @@ @@ -1214,27 +1178,6 @@
mkdir $mkdirv $mkdirp $plugin_dir/ mkdir $mkdirv $mkdirp $plugin_dir/
chmod $chmodv 755 $plugin_dir chmod $chmodv 755 $plugin_dir
@ -170,7 +175,7 @@
if test -f plugins/operamotifwrapper-3 if test -f plugins/operamotifwrapper-3
then then
cp $cpv $cpf plugins/operamotifwrapper-3 $plugin_dir/ cp $cpv $cpf plugins/operamotifwrapper-3 $plugin_dir/
@@ -1238,13 +1186,6 @@ @@ -1242,13 +1185,6 @@
plugin_support='yes' plugin_support='yes'
fi fi
@ -184,7 +189,7 @@
if test -f plugins/libnpp.so if test -f plugins/libnpp.so
then then
cp $cpv $cpf plugins/libnpp.so $plugin_dir/ cp $cpv $cpf plugins/libnpp.so $plugin_dir/
@@ -1282,8 +1223,9 @@ @@ -1286,8 +1222,9 @@
if test -z "${OPERADESTDIR}"; then if test -z "${OPERADESTDIR}"; then
# System wide configuration files # System wide configuration files
@ -195,7 +200,7 @@
echo echo
echo "System wide configuration files:" echo "System wide configuration files:"
echo " $config_dir/opera6rc" echo " $config_dir/opera6rc"
@@ -1295,6 +1237,7 @@ @@ -1299,6 +1236,7 @@
cp $cpv $cpf config/opera6rc $config_dir cp $cpv $cpf config/opera6rc $config_dir
cp $cpv $cpf config/opera6rc.fixed $config_dir cp $cpv $cpf config/opera6rc.fixed $config_dir
fi fi
@ -203,7 +208,7 @@
else else
echo echo
echo "User \"${USERNAME}\" does not have write access to $config_dir" echo "User \"${USERNAME}\" does not have write access to $config_dir"
@@ -1305,12 +1248,12 @@ @@ -1309,12 +1247,12 @@
fi fi
# Shorcuts and Icons # Shorcuts and Icons
@ -220,7 +225,7 @@
fi # OPERADESTDIR fi # OPERADESTDIR
@@ -1355,13 +1298,13 @@ @@ -1359,13 +1297,13 @@
{ {
# arg1 = location # arg1 = location
@ -238,7 +243,7 @@
Terminal=0 Terminal=0
Type=Application' Type=Application'
@@ -1439,74 +1382,39 @@ @@ -1443,74 +1381,39 @@
debug_msg 1 "in gnome()" debug_msg 1 "in gnome()"
@ -341,7 +346,7 @@
} }
kde() kde()
@@ -1515,39 +1423,31 @@ @@ -1519,39 +1422,31 @@
debug_msg 1 "in kde()" debug_msg 1 "in kde()"

View file

@ -1,5 +1,5 @@
## ##
Changelog for 7.54 Final: http://www.opera.com/linux/changelogs/754/ Changelog for 7.54u2 Final: http://www.opera.com/linux/changelogs/754u2/
The name of the the binary, data directory, personal "~/.opera" directory, The name of the the binary, data directory, personal "~/.opera" directory,
etc., have been renamed from "opera" to "linux-opera." This means that etc., have been renamed from "opera" to "linux-opera." This means that
@ -14,9 +14,9 @@ the first time.
*** IMPORTANT: users with custom search.ini *** *** IMPORTANT: users with custom search.ini ***
If you have a custom search.ini and you've used opera 7.51 or an earlier If you have a custom search.ini and you've used opera 7.51 or an earlier
version before this upgrade, edit ~/.opera/search.ini _before_ running the version before this upgrade, edit ~/.linux-opera/search.ini _before_ running
upgraded Opera for the first time, and change the file version to 4. It should the upgraded Opera for the first time, and change the file version to 4. It
look like this: should look like this:
[Version] [Version]
File Version=4 File Version=4

View file

@ -7,18 +7,17 @@
PORTNAME= opera PORTNAME= opera
PORTVERSION= ${OPERA_VER}.${OPERA_DATE} PORTVERSION= ${OPERA_VER}.${OPERA_DATE}
PORTREVISION= 1
CATEGORIES= www linux CATEGORIES= www linux
MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \ http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/&,} ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}u2/final/en/i386/static/&,}
PKGNAMEPREFIX= linux- PKGNAMEPREFIX= linux-
DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
@ -31,18 +30,18 @@ RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XF
RESTRICTED= "not redistributable; commercial software" RESTRICTED= "not redistributable; commercial software"
PREFIX?= ${X11BASE}
USE_BZIP2= yes USE_BZIP2= yes
WANT_GNOME= yes WANT_GNOME= yes
PREFIX?= ${X11BASE}
USE_REINPLACE= yes
WITH_LINUX= yes WITH_LINUX= yes
USE_REINPLACE= yes
ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS= i386
NO_BUILD= yes NO_BUILD= yes
NO_FILTER_SHLIBS=yes NO_FILTER_SHLIBS=yes
OPERA_VER= 7.54 OPERA_VER= 7.54
OPERA_DATE= 20041210 OPERA_DATE= 20050131
DATADIR= ${PREFIX}/share/${UNIQUENAME} DATADIR= ${PREFIX}/share/${UNIQUENAME}
DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME}

View file

@ -1,2 +1,2 @@
MD5 (opera-7.54-20041210.1-static-qt.i386-en.tar.bz2) = fcf99a5dd13ef6fbb7494992a05bd0ea MD5 (opera-7.54-20050131.1-static-qt.i386-en.tar.bz2) = afc1819c0377da89174ba2a47924b867
SIZE (opera-7.54-20041210.1-static-qt.i386-en.tar.bz2) = 4880472 SIZE (opera-7.54-20050131.1-static-qt.i386-en.tar.bz2) = 4863686

View file

@ -1,6 +1,6 @@
--- ini/pluginpath.ini.orig Tue Dec 14 16:11:16 2004 --- ini/pluginpath.ini.orig Fri Feb 4 17:45:25 2005
+++ ini/pluginpath.ini Tue Dec 14 16:13:05 2004 +++ ini/pluginpath.ini Fri Feb 4 17:45:53 2005
@@ -1,44 +1,16 @@ @@ -1,44 +1,26 @@
-Opera Preferences version 2.0 -Opera Preferences version 2.0
-; Do not edit this file while Opera is running -; Do not edit this file while Opera is running
-; This file is stored in UTF-8 encoding -; This file is stored in UTF-8 encoding
@ -53,11 +53,21 @@
+$HOME/.linux-opera/plugins=1 +$HOME/.linux-opera/plugins=1
+%%PREFIX%%/share/linux-opera/plugins=1 +%%PREFIX%%/share/linux-opera/plugins=1
+ +
+; Adobe Acrobat
+%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
+
+; Flash player
+%%LOCALBASE%%/lib/linux-flashplugin6=1 +%%LOCALBASE%%/lib/linux-flashplugin6=1
+%%LOCALBASE%%/lib/linux-flashplugin7=1 +%%LOCALBASE%%/lib/linux-flashplugin7=1
+%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
+%%LOCALBASE%%/Acrobat4/Browsers/intellinux=1
+ +
+%%LOCALBASE%%/lib/RealPlayer8/Plugins=1 +; Realplayer
+%%LOCALBASE%%/lib/RealPlayer=1
+%%LOCALBASE%%/lib/RealPlayer/plugins=1
+
+; Netscape Plug-in Paths
+$HOME/.netscape/plugins=1 +$HOME/.netscape/plugins=1
+%%LOCALBASE%%/lib/netscape-linux/plugins=1 +%%LOCALBASE%%/lib/netscape-linux/plugins=1
+
+; Since Mozilla supports NS plugins, there might
+; be some in the Mozilla plugin directory.
+%%LOCALBASE%%/lib/linux-mozilla/plugins=1

View file

@ -1,5 +1,5 @@
--- install.sh.orig Fri Dec 10 06:49:32 2004 --- install.sh.orig Fri Feb 4 17:20:39 2005
+++ install.sh Tue Dec 14 17:26:29 2004 +++ install.sh Fri Feb 4 17:38:04 2005
@@ -761,10 +761,9 @@ @@ -761,10 +761,9 @@
case "${machine}:${os}" in case "${machine}:${os}" in
i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
@ -45,7 +45,7 @@
if test -f \"\${INIJAVA}/libjava.so\"; then OPERA_JAVA_DIR=\"\${INIJAVA}\"; fi if test -f \"\${INIJAVA}/libjava.so\"; then OPERA_JAVA_DIR=\"\${INIJAVA}\"; fi
fi fi
fi fi
@@ -873,47 +876,16 @@ @@ -873,52 +876,16 @@
if test ! \"\${OPERA_JAVA_DIR}\"; then if test ! \"\${OPERA_JAVA_DIR}\"; then
@ -58,6 +58,10 @@
+ PREFIXES=\"%%LOCALBASE%%\" + PREFIXES=\"%%LOCALBASE%%\"
for SUNJAVA in \\ for SUNJAVA in \\
- jre1.5.0_01 \\
- jdk1.5.0_01/jre \\
- j2re1.4.2_06 \\
- j2sdk1.4.2_06/jre \\
- j2re1.4.2_04 \\ - j2re1.4.2_04 \\
- j2sdk1.4.2_04/jre \\ - j2sdk1.4.2_04/jre \\
- j2re1.4.2_03 \\ - j2re1.4.2_03 \\
@ -79,6 +83,7 @@
- j2se/1.4/jre \\ - j2se/1.4/jre \\
- j2se/1.3/jre \\ - j2se/1.3/jre \\
- j2se/jre \\ - j2se/jre \\
- jre1.3.1_15 \\
- jre1.3.1_02 \\ - jre1.3.1_02 \\
- jre1.3.1_01 \\ - jre1.3.1_01 \\
- j2re1.3.1 \\ - j2re1.3.1 \\
@ -101,7 +106,7 @@
; do ; do
for PREFIX in \${PREFIXES}; 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 if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
@@ -962,11 +934,8 @@ @@ -967,11 +934,8 @@
# Acrobat Reader # Acrobat Reader
for BINDIR in \\ for BINDIR in \\
@ -115,7 +120,7 @@
; do ; do
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
done done
@@ -1004,7 +973,7 @@ @@ -1009,7 +973,7 @@
}; };
// Opera package classes get all permissions // Opera package classes get all permissions
@ -124,7 +129,7 @@
permission java.security.AllPermission; permission java.security.AllPermission;
}; };
@@ -1076,7 +1045,7 @@ @@ -1077,7 +1041,7 @@
chop "${OPERADESTDIR}" "str_localdirshare" chop "${OPERADESTDIR}" "str_localdirshare"
chop "${OPERADESTDIR}" "str_localdirplugin" chop "${OPERADESTDIR}" "str_localdirplugin"
@ -133,7 +138,7 @@
# Executable # Executable
debug_msg 1 "Executable" debug_msg 1 "Executable"
@@ -1111,7 +1080,7 @@ @@ -1112,7 +1076,7 @@
#cp $cpv $cpf wrapper.sh $wrapper_dir/opera #cp $cpv $cpf wrapper.sh $wrapper_dir/opera
generate_wrapper generate_wrapper
@ -142,7 +147,7 @@
# Documentation # Documentation
debug_msg 1 "Documentation" debug_msg 1 "Documentation"
@@ -1210,27 +1179,6 @@ @@ -1214,27 +1178,6 @@
mkdir $mkdirv $mkdirp $plugin_dir/ mkdir $mkdirv $mkdirp $plugin_dir/
chmod $chmodv 755 $plugin_dir chmod $chmodv 755 $plugin_dir
@ -170,7 +175,7 @@
if test -f plugins/operamotifwrapper-3 if test -f plugins/operamotifwrapper-3
then then
cp $cpv $cpf plugins/operamotifwrapper-3 $plugin_dir/ cp $cpv $cpf plugins/operamotifwrapper-3 $plugin_dir/
@@ -1238,13 +1186,6 @@ @@ -1242,13 +1185,6 @@
plugin_support='yes' plugin_support='yes'
fi fi
@ -184,7 +189,7 @@
if test -f plugins/libnpp.so if test -f plugins/libnpp.so
then then
cp $cpv $cpf plugins/libnpp.so $plugin_dir/ cp $cpv $cpf plugins/libnpp.so $plugin_dir/
@@ -1282,8 +1223,9 @@ @@ -1286,8 +1222,9 @@
if test -z "${OPERADESTDIR}"; then if test -z "${OPERADESTDIR}"; then
# System wide configuration files # System wide configuration files
@ -195,7 +200,7 @@
echo echo
echo "System wide configuration files:" echo "System wide configuration files:"
echo " $config_dir/opera6rc" echo " $config_dir/opera6rc"
@@ -1295,6 +1237,7 @@ @@ -1299,6 +1236,7 @@
cp $cpv $cpf config/opera6rc $config_dir cp $cpv $cpf config/opera6rc $config_dir
cp $cpv $cpf config/opera6rc.fixed $config_dir cp $cpv $cpf config/opera6rc.fixed $config_dir
fi fi
@ -203,7 +208,7 @@
else else
echo echo
echo "User \"${USERNAME}\" does not have write access to $config_dir" echo "User \"${USERNAME}\" does not have write access to $config_dir"
@@ -1305,12 +1248,12 @@ @@ -1309,12 +1247,12 @@
fi fi
# Shorcuts and Icons # Shorcuts and Icons
@ -220,7 +225,7 @@
fi # OPERADESTDIR fi # OPERADESTDIR
@@ -1355,13 +1298,13 @@ @@ -1359,13 +1297,13 @@
{ {
# arg1 = location # arg1 = location
@ -238,7 +243,7 @@
Terminal=0 Terminal=0
Type=Application' Type=Application'
@@ -1439,74 +1382,39 @@ @@ -1443,74 +1381,39 @@
debug_msg 1 "in gnome()" debug_msg 1 "in gnome()"
@ -341,7 +346,7 @@
} }
kde() kde()
@@ -1515,39 +1423,31 @@ @@ -1519,39 +1422,31 @@
debug_msg 1 "in kde()" debug_msg 1 "in kde()"

View file

@ -1,5 +1,5 @@
## ##
Changelog for 7.54 Final: http://www.opera.com/linux/changelogs/754/ Changelog for 7.54u2 Final: http://www.opera.com/linux/changelogs/754u2/
The name of the the binary, data directory, personal "~/.opera" directory, The name of the the binary, data directory, personal "~/.opera" directory,
etc., have been renamed from "opera" to "linux-opera." This means that etc., have been renamed from "opera" to "linux-opera." This means that
@ -14,9 +14,9 @@ the first time.
*** IMPORTANT: users with custom search.ini *** *** IMPORTANT: users with custom search.ini ***
If you have a custom search.ini and you've used opera 7.51 or an earlier If you have a custom search.ini and you've used opera 7.51 or an earlier
version before this upgrade, edit ~/.opera/search.ini _before_ running the version before this upgrade, edit ~/.linux-opera/search.ini _before_ running
upgraded Opera for the first time, and change the file version to 4. It should the upgraded Opera for the first time, and change the file version to 4. It
look like this: should look like this:
[Version] [Version]
File Version=4 File Version=4