resolve bug #349

9 files changed, 35 insertions, 423 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 19525e5cbb94..ccce3d786f9e 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.2 2002/02/03 07:31:59 azarah Exp $
+
+*mozilla-0.9.7-r2 (3 Feb 2002)
+
+  3 Feb 2002; M.Schlemmer <azarah@gentoo.org> mozilla-0.9.7-r2.ebuild :
+
+  Add ${FILESDIR}/mozilla-0.9.7-post.patch to fix a bug in the current version
+  of mozilla not posting forms in all cases.  Resolves bug #349.
 
 *mozilla-0.9.7-r1 (1 Feb 2002)
 
diff --git a/net-www/mozilla/files/digest-mozilla-0.9.6-r2 b/net-www/mozilla/files/digest-mozilla-0.9.6-r2
deleted file mode 100644
index 9f4b7750a4c8..000000000000
--- a/net-www/mozilla/files/digest-mozilla-0.9.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b1f02fe3f01c700147237de92ef11000 mozilla-source-0.9.6.tar.bz2 27021140
diff --git a/net-www/mozilla/files/digest-mozilla-0.9.6-r3 b/net-www/mozilla/files/digest-mozilla-0.9.6-r3
deleted file mode 100644
index 9f4b7750a4c8..000000000000
--- a/net-www/mozilla/files/digest-mozilla-0.9.6-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b1f02fe3f01c700147237de92ef11000 mozilla-source-0.9.6.tar.bz2 27021140
diff --git a/net-www/mozilla/files/digest-mozilla-0.9.7 b/net-www/mozilla/files/digest-mozilla-0.9.7-r2
index b9c8d0104dc2..b9c8d0104dc2 100644
--- a/net-www/mozilla/files/digest-mozilla-0.9.7
+++ b/net-www/mozilla/files/digest-mozilla-0.9.7-r2
diff --git a/net-www/mozilla/files/mozilla-0.9.7-post.patch b/net-www/mozilla/files/mozilla-0.9.7-post.patch
new file mode 100644
index 000000000000..d8bb2e55c4a8
--- /dev/null
+++ b/net-www/mozilla/files/mozilla-0.9.7-post.patch
@@ -0,0 +1,10 @@
+--- mozilla/content/html/content/src/nsFormSubmitter.cpp 18 Dec 2001 19:27:21 -0000  1.12.2.1
++++ mozilla/content/html/content/src/nsFormSubmitter.cpp 21 Dec 2001 20:19:47 -0000
+@@ -1074,7 +1074,6 @@
+               }
+               nsMemory::Free(readbuffer);
+               NS_RELEASE(contentFile);
+-              if (NS_FAILED(rv)) break;
+               // Print CRLF after file
+               wantbytes = PL_strlen(CRLF);
+               rv = outStream->Write(CRLF, wantbytes, &gotbytes);
diff --git a/net-www/mozilla/mozilla-0.9.6-r2.ebuild b/net-www/mozilla/mozilla-0.9.6-r2.ebuild
deleted file mode 100644
index 0fbdf38c4ac2..000000000000
--- a/net-www/mozilla/mozilla-0.9.6-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /space/gentoo/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.6.ebuild,v 1.4 2001/11/23 04:45:07 azarah Exp
-
-S=${WORKDIR}/mozilla
-DESCRIPTION="The Mozilla web browser"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla${PV}/src/${PN}-source-${PV}.tar.bz2"
-HOMEPAGE="http://www.mozilla.org"
-
-PROVIDE="virtual/x11-web-browser"
-
-RDEPEND=">=gnome-base/ORBit-0.5.10-r1
-	>=dev-libs/glib-1.2.10
-	>=x11-libs/gtk+-1.2.10-r4
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.9
-	app-arch/zip
-	app-arch/unzip
-	mozqt? ( x11-libs/qt-x11 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/perl"
-
-
-# needed by src_compile() and src_install()
-export MOZILLA_OFFICIAL=1
-export BUILD_OFFICIAL=1	
-
-src_compile() {
-
-	chown -R root.root *
-
-	local myconf
-	# NOTE: mozqt seems a bit unstable with 0.9.6 -- azarah
-	if [ "`use mozqt`" ] ; then
-		myconf="--with-qt --enable-toolkit=qt --without-gtk"
-	else
-		myconf="--with-gtk --enable-toolkit=gtk"
-	fi
-
-	if [ -z "$DEBUG" ] ; then
-		myconf="${myconf} --enable-strip-libs"
-	fi
-
-
-	# NB!!:  Due to the fact that the non default modules do not always
-	#        compile properly, using them is considered unsupported, and
-	#        is just here for completeness.  Please do not use if you 
-	#        do not know what you are doing!
-	#
-	# The defaults are (as of 0.9.6, according to configure (line ~9787)):
-	#     cookie wallet content-packs xml-rpc xmlextras help transformiix venkman
-	# Non-defaults are:
-	#     irc xmlterm inspector access-builtin ctl
-	local myext="default"
-	if [ "`use mozirc`" ] ; then
-		myext="${myext},irc"
-	fi
-	if [ "`use mozxmlterm`" ] ; then
-		myext="${myext},xmlterm"
-	fi
-	if [ "`use mozinspector`" ] ; then
-		myext="${myext},inspector"
-	fi
-	if [ "`use mozaccess-builtin`" ] ; then
-		myext="${myext},access-builtin"
-	fi
-	if [ "`use mozctl`" ] ; then
-		myext="${myext},ctl"
-	fi
-	
-	
-	export BUILD_MODULES=all
-
-	# Crashes on start when compiled with -fomit-frame-pointer
-	CFLAGS="${CFLAGS/-fomit-frame-pointer}"
-	CXXFLAGS="${CXXFLAGS/-fomit-frame-pointer}"
-
-	./configure  --host=${CHOST}					\
-		     --prefix=/usr/lib/mozilla 				\
-		     --disable-tests		 			\
-		     --disable-debug					\
-		     --disable-dtd-debug				\
-		     --disable-pedantic					\
-		     --enable-xsl					\
-		     --enable-crypto					\
-		     --enable-detect-webshell-leaks			\
-		     --with-java-supplement				\
-		     --with-extensions="${myext}"			\
-		     --enable-optimize=-O3				\
-		     --with-default-mozilla-five-home=/usr/lib/mozilla	\
-		     ${myconf} || die
-
-	make depend || die
-	make || die
-}
-
-src_install() {
-
-	dodir /usr/lib/mozilla/include
-	cd ${S}/dist/include
-	cp -LfR * ${D}/usr/lib/mozilla/include
-
-	cd ${S}/xpinstall/packager
-	make || die
-	dodir /usr/lib
-
-	tar xzf ${S}/dist/mozilla-`uname -m`-pc-linux-gnu.tar.gz 	\
-	    -C ${D}/usr/lib
-
-	exeinto /usr/bin
-	doexe ${FILESDIR}/mozilla
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dodoc LEGAL LICENSE README/mozilla/README*
-
-	# Take care of non root execution
-	# (seems the problem is that not all files are readible by the user)
-	chmod -R g+r,o+r ${D}/usr/lib/mozilla
-
-        # Install icon and .desktop for menu entry
-	if [ "`use gnome`" ] ; then
-		insinto /usr/share/pixmaps
-		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
-		insinto /usr/lib/mozilla/icons
-		doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
-		doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
-		insinto /usr/share/gnome/apps/Internet
-		doins ${S}/build/package/rpm/SOURCES/mozilla.desktop
-        fi
-
-	# Fix to get it removed at unmerge
-	touch ${D}/usr/lib/mozilla/component.reg
-}
-
-pkg_postinst () {
-
-	# Take care of component registration
-	export MOZILLA_FIVE_HOME="/usr/lib/mozilla"
-
-	# Needed to update the run time bindings for REGXPCOM 
-	# (do not remove next line!)
-	env-update
-	# Register components, setup Chrome .rdf files and fix file permissions
-	/usr/lib/mozilla/regxpcom
-	chmod g+r,o+r /usr/lib/mozilla/component.reg
-	/usr/lib/mozilla/regchrome
-	find /usr/lib/mozilla -type d -perm 0700 -exec chmod 755 {} \; || :
-
-    
-	echo
-	echo "*****************************************************************"
-	echo "* NB:  Please unmerge old versions prior to 0.9.5 as the header *"
-	echo "* layout in /usr/lib/mozilla/include have changed and will      *"
-	echo "* result in compile errors when compiling programs that need    *"
-	echo "* mozilla headers and libs (galeon, nautilus, ...)              *"
-	echo "*****************************************************************"
-	echo
-}
-
diff --git a/net-www/mozilla/mozilla-0.9.6-r3.ebuild b/net-www/mozilla/mozilla-0.9.6-r3.ebuild
deleted file mode 100644
index 41582a957772..000000000000
--- a/net-www/mozilla/mozilla-0.9.6-r3.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.6-r3.ebuild,v 1.2 2001/12/09 20:54:17 azarah Exp $
-
-S=${WORKDIR}/mozilla
-DESCRIPTION="The Mozilla Web Browser"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla${PV}/src/${PN}-source-${PV}.tar.bz2"
-HOMEPAGE="http://www.mozilla.org"
-
-PROVIDE="virtual/x11-web-browser"
-
-RDEPEND=">=gnome-base/ORBit-0.5.10-r1
-	>=dev-libs/glib-1.2.10
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.9
-	app-arch/zip
-	app-arch/unzip
-	gtk?   ( x11-libs/gtk+ )
-	mozqt? ( x11-libs/qt-x11 )
-	java?  ( dev-lang/jdk )"
-
-DEPEND="${RDEPEND}
-	virtual/x11
-	sys-devel/perl"
-
-
-# needed by src_compile() and src_install()
-export MOZILLA_OFFICIAL=1
-export BUILD_OFFICIAL=1
-
-# make sure the nss module gets build (for NSS support)
-[ "`use ssl`" ] && export MOZ_PSM=1
-
-# do we build java support for the NSS stuff ?
-# NOTE: this is broken for the moment.
-#[ "`use java`" ] && export NS_USE_JDK=1 && export JAVA_HOME=/opt/java
-
-src_compile() {
-
-	chown -R root.root *
-
-	local myconf
-	# NOTE: mozqt seems a bit unstable with 0.9.6 -- azarah
-	if [ "`use mozqt`" ] ; then
-		myconf="--enable-toolkit-qt --enable-default-toolkit=qt"
-		myconf="${myconf} --disable-toolkit-gtk --disable-toolkit-xlib"
-	elif [ "`use gtk`" ] ; then
-		myconf="--enable-toolkit-gtk --enable-default-toolkit=gtk"
-		myconf="${myconf} --disable-toolkit-qt --disable-toolkit-xlib"
-	else
-		myconf="--enable-toolkit-xlib --enable-default-toolkit=xlib"
-		myconf="${myconf} --disable-toolkit-qt --disable-toolkit-gtk"
-	fi
-
-	if [ -z "`use ldap`" ] ; then
-		myconf="${myconf} --disable-ldap"
-	fi
-
-	if [ -z "$DEBUG" ] ; then
-		myconf="${myconf} --enable-strip-libs --disable-debug"
-		myconf="${myconf} --disable-dtd-debug"
-	fi
-
-
-	# NB!!:  Due to the fact that the non default extensions do not always
-	#        compile properly, using them is considered unsupported, and
-	#        is just here for completeness.  Please do not use if you 
-	#        do not know what you are doing!
-	#
-	# The defaults are (as of 0.9.6, according to configure (line ~9787)):
-	#     cookie wallet content-packs xml-rpc xmlextras help transformiix venkman
-	# Non-defaults are:
-	#     irc xmlterm inspector access-builtin ctl
-	local myext="default"
-	if [ "`use mozirc`" ] ; then
-		myext="${myext},irc"
-	fi
-	if [ "`use mozxmlterm`" ] ; then
-		myext="${myext},xmlterm"
-	fi
-	if [ "`use mozinspector`" ] ; then
-		myext="${myext},inspector"
-	fi
-	if [ "`use mozaccess-builtin`" ] ; then
-		myext="${myext},access-builtin"
-	fi
-	if [ "`use mozctl`" ] ; then
-		myext="${myext},ctl"
-	fi
-	
-	
-	export BUILD_MODULES=all
-	export BUILD_OPT=1
-
-	# Crashes on start when compiled with -fomit-frame-pointer
-	CFLAGS="${CFLAGS/-fomit-frame-pointer}"
-	CXXFLAGS="${CXXFLAGS/-fomit-frame-pointer}"
-
-	./configure  --host=${CHOST}					\
-		     --prefix=/usr/lib/mozilla 				\
-		     --disable-tests		 			\
-		     --disable-pedantic					\
-		     --enable-mathml					\
-		     --enable-svg					\
-		     --enable-xsl					\
-		     --enable-crypto					\
-		     --enable-detect-webshell-leaks			\
-		     --enable-xinerama					\
-		     --with-java-supplement				\
-		     --with-extensions="${myext}"			\
-		     --enable-optimize=-O3				\
-		     --enable-xterm-updates				\
-		     --with-default-mozilla-five-home=/usr/lib/mozilla	\
-		     ${myconf} || die
-
-#	make depend || die
-	make || die
-
-	# Build the NSS/SSL support
-	if [ "`use ssl`" ] ; then
-		cd ${S}/security/coreconf
-		
-		# Fix #include problem
-		cp headers.mk headers.mk.orig
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-
-		make || die
-
-		cd ${S}/security/nss
-		
-		make moz_import || die
-		make || die
-		cd ${S}
-	fi
-}
-
-src_install() {
-
-	# Copy the include and idl files
-	dodir /usr/lib/mozilla/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/lib/mozilla/include
-	cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl
-	dosym /usr/lib/mozilla/include /usr/include/mozilla
-
-	# Build the Release Tarball
-	cd ${S}/xpinstall/packager
-	make || die
-	dodir /usr/lib
-
-	tar xzf ${S}/dist/mozilla-`uname -m`-pc-linux-gnu.tar.gz 	\
-		-C ${D}/usr/lib
-
-	# Install the development tools in /usr
-	dodir /usr/bin
-	mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
-
-	# Install the NSS/SSL libs, headers and tools
-	if [ "`use ssl`" ] ; then
-		# Install the headers ('make install' do not work for headers ...)
-		insinto /usr/lib/mozilla/include/nss
-		doins ${S}/dist/public/seccmd/*.h
-		doins ${S}/dist/public/security/*.h
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/mozilla
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	cd ${S}
-	exeinto /usr/bin
-	doexe ${FILESDIR}/mozilla
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dodoc LEGAL LICENSE README/mozilla/README*
-
-	# Fix icons to look the same everywhere
-	insinto /usr/lib/mozilla/icons
-	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
-	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
-
-        # Install icon and .desktop for menu entry
-	if [ "`use gnome`" ] ; then
-		insinto /usr/share/pixmaps
-		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
-
-		# Fix comment of menu entry
-		cd ${S}/build/package/rpm/SOURCES
-		cp mozilla.desktop mozilla.desktop.orig
-		sed -e 's:Comment=Mozilla:Comment=Mozilla Web Browser:'	\
-			mozilla.desktop.orig >mozilla.desktop
-		cd ${S}
-		insinto /usr/share/gnome/apps/Internet
-		doins ${S}/build/package/rpm/SOURCES/mozilla.desktop
-        fi
-
-	# Take care of non root execution
-	# (seems the problem is that not all files are readible by the user)
-	chmod -R g+r,o+r ${D}/usr/lib/mozilla
-
-	# Fix to get it removed at unmerge
-	touch ${D}/usr/lib/mozilla/component.reg
-}
-
-pkg_postinst() {
-
-        # Make symlink for Java plugin (do not do in src_install(), else it only
-	# gets installed every second time)
-	if [ "`use java`" ] && [ ! -L /usr/lib/mozilla/plugins/javaplugin_oji.so ]
-	then
-		if [ -e /opt/java/jre/plugin/i386/mozilla/javaplugin_oji.so ]
-		then
-			ln -sf /opt/java/jre/plugin/i386/mozilla/javaplugin_oji.so \
-				/usr/lib/mozilla/plugins/javaplugin_oji.so
-		fi
-	fi
-
-	# Take care of component registration
-	export MOZILLA_FIVE_HOME="/usr/lib/mozilla"
-
-	# Needed to update the run time bindings for REGXPCOM 
-	# (do not remove next line!)
-	env-update
-	# Register components, setup Chrome .rdf files and fix file permissions
-	umask 022
-	/usr/lib/mozilla/regxpcom
-	chmod g+r,o+r /usr/lib/mozilla/component.reg
-	/usr/lib/mozilla/regchrome
-	find /usr/lib/mozilla -type d -perm 0700 -exec chmod 755 {} \; || :
-
-    
-	echo
-	echo "*****************************************************************"
-	echo "* NB:  Please unmerge old versions prior to 0.9.5 as the header *"
-	echo "* layout in /usr/lib/mozilla/include have changed and will      *"
-	echo "* result in compile errors when compiling programs that need    *"
-	echo "* mozilla headers and libs (galeon, nautilus, ...)              *"
-	echo "*****************************************************************"
-	echo
-}
diff --git a/net-www/mozilla/mozilla-0.9.6-r4.ebuild b/net-www/mozilla/mozilla-0.9.6-r4.ebuild
index ebbf8bee364b..5de87ef2e763 100644
--- a/net-www/mozilla/mozilla-0.9.6-r4.ebuild
+++ b/net-www/mozilla/mozilla-0.9.6-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Desktop Team <desktop@gentoo.org>
 # Author: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.6-r4.ebuild,v 1.4 2002/01/23 20:06:16 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.6-r4.ebuild,v 1.5 2002/02/03 07:31:59 azarah Exp $
 
 S=${WORKDIR}/mozilla
 DESCRIPTION="The Mozilla Web Browser"
@@ -18,9 +18,9 @@ RDEPEND=">=gnome-base/ORBit-0.5.10-r1
 	app-arch/zip
 	app-arch/unzip
 	x11-libs/gtk+"
+	java?  ( virtual/jdk )"
 #	gtk?   ( x11-libs/gtk+ )
 #	mozqt? ( x11-libs/qt )
-	java?  ( virtual/jdk )"
 
 DEPEND="${RDEPEND}
 	virtual/x11
diff --git a/net-www/mozilla/mozilla-0.9.7.ebuild b/net-www/mozilla/mozilla-0.9.7-r2.ebuild
index 477826535fcc..bb0166056290 100644
--- a/net-www/mozilla/mozilla-0.9.7.ebuild
+++ b/net-www/mozilla/mozilla-0.9.7-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.7.ebuild,v 1.3 2002/01/30 18:08:27 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.7-r2.ebuild,v 1.1 2002/02/03 07:31:59 azarah Exp $
 
 S=${WORKDIR}/mozilla
 DESCRIPTION="The Mozilla Web Browser"
@@ -17,8 +17,7 @@ RDEPEND=">=gnome-base/ORBit-0.5.10-r1
 	app-arch/zip
 	app-arch/unzip
 	x11-libs/gtk+
-	java?  ( virtual/jdk )
-	"
+	java?  ( virtual/jdk )"
 #	gtk?   ( x11-libs/gtk+ )
 #	mozqt? ( x11-libs/qt )"
 
@@ -35,8 +34,21 @@ export BUILD_OFFICIAL=1
 [ "`use ssl`" ] && export MOZ_PSM=1
 
 # do we build java support for the NSS stuff ?
+# NOTE: this is broken for the moment
 #[ "`use java`" ] && export NS_USE_JDK=1
 
+
+src_unpack() {
+
+	unpack ${A}
+
+	# This is ONLY for Mozilla version 0.9.7
+	# and fixes a bug where Mozilla did not always wanted to
+	# post forms in certain cases.
+	cd ${S}
+	patch -p1 < ${FILESDIR}/mozilla-${PV}-post.patch || die
+}
+
 src_compile() {
 
 	chown -R root.root *