Pullup ticket 496 - requested by Matthias Scheler

security update for mozilla-bin

Revisions pulled up:
- pkgsrc/www/mozilla-bin/Makefile		1.23-1.24
- pkgsrc/www/mozilla-bin/distinfo		1.15
- pkgsrc/www/mozilla-bin/Makefile.common	1.26-1.27

   Module Name:		pkgsrc
   Committed By:	wiz
   Date:		Mon Apr 18 14:27:12 UTC 2005

   Modified Files:
   	pkgsrc/www/mozilla-bin: Makefile.common

   Log Message:
   Do not append -gtk2 to PKGNAME when MOZ_GTK2 is set.
---
   Module Name:		pkgsrc
   Committed By:	wiz
   Date:		Sat Apr 23 10:37:36 UTC 2005

   Modified Files:
   	pkgsrc/www/mozilla-bin: Makefile Makefile.common

   Log Message:
   Update to 1.7.7nb1:
   make sure lib/mozilla-linux/plugins exists, even for binary packages.
   Should fix moz-bin-* packages in bulk builds.

   XXX: binary package still doesn't install quite a number of (empty)
   directories that do get created with 'make install'.
---
   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Thu May 12 13:39:31 UTC 2005

   Modified Files:
   	pkgsrc/www/mozilla-bin: Makefile distinfo

   Log Message:
   Update "mozilla-bin" package to version 1.7.8. The following security
   issuses were fixed in this release:

   MFSA 2005-44 Privilege escalation via non-DOM property overrides
   MFSA 2005-43 "Wrapped" javascript: urls bypass security checks
   MFSA 2005-42 Code execution via javascript: IconURL

   Support for Solaris SPARC and x86 is not available due to lack of a
   precompiled binary at this point of time.

3 files changed, 10 insertions, 15 deletions

diff --git a/www/mozilla-bin/Makefile b/www/mozilla-bin/Makefile
index faf3ba577e1..0985e777933 100644
--- a/www/mozilla-bin/Makefile
+++ b/www/mozilla-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20.2.2 2005/04/16 13:48:59 salo Exp $
+# $NetBSD: Makefile,v 1.20.2.3 2005/05/12 14:44:19 salo Exp $
 
 MOZILLA=	mozilla
-MOZ_VER=	1.7.7
+MOZ_VER=	1.7.8
 
 COMMENT=	Full featured gecko-based browser (binary pkg)
 
diff --git a/www/mozilla-bin/Makefile.common b/www/mozilla-bin/Makefile.common
index dade66696e8..e3c8499c00f 100644
--- a/www/mozilla-bin/Makefile.common
+++ b/www/mozilla-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24.2.1 2005/04/16 13:48:59 salo Exp $
+# $NetBSD: Makefile.common,v 1.24.2.2 2005/05/12 14:44:19 salo Exp $
 
 DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
 PKGNAME=		${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER}
@@ -47,13 +47,6 @@ MASTER_SITES+=		${_site_}contrib/
 .  endfor
 .endif
 
-# suffix gtk2 builds with -gtk2
-.if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES"
-MOZ_EXTRA?=	-gtk2
-.else
-MOZ_EXTRA?=	# empty
-.endif
-
 MOZILLA_LIB=	${PREFIX}/lib/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM}
 
 FILES_SUBST+=	MOZILLA=${MOZILLA}
@@ -81,7 +74,7 @@ _COMPAT16_LIBSTDCXX=	YES
 .    endif
 .  endif
 
-# gtk2 builds.
+# GTK2 builds.
 .  if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES"
 .    if ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "netbsd"
 DEPENDS+=	gtk2+>=2.4:../../x11/gtk2
@@ -166,6 +159,7 @@ post-install:
 	@cd ${MOZILLA_LIB} && \
 		${LN} -s ${PREFIX}/emul/netbsd16/usr/lib/libstdc++.so* .
 .endif
+	@${INSTALL_DATA_DIR} ${PREFIX}/lib/mozilla-linux/plugins
 	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
 	@${ECHO} bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM} >> ${PLIST_SRC}
 	@${FIND} ${MOZILLA_LIB} \( -type f -o -type l \) -print		\
@@ -174,5 +168,6 @@ post-install:
 	@${FIND} ${MOZILLA_LIB} -type d -print				\
 		| ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"	\
 		>> ${PLIST_SRC}
+	@${ECHO} @exec ${MKDIR} %D/lib/mozilla-linux/plugins >> ${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/mozilla-bin/distinfo b/www/mozilla-bin/distinfo
index e14bb743418..3400045ce98 100644
--- a/www/mozilla-bin/distinfo
+++ b/www/mozilla-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12.2.2 2005/04/16 13:48:59 salo Exp $
+$NetBSD: distinfo,v 1.12.2.3 2005/05/12 14:44:19 salo Exp $
 
-SHA1 (mozilla-i686-pc-linux-gnu-1.7.7.tar.gz) = 24124a9473a9c8e1f36ddd10b606bdf5f9160d3b
-RMD160 (mozilla-i686-pc-linux-gnu-1.7.7.tar.gz) = 0b49ff7b1cb21b9f346bb09e5d46d97d4048ab22
-Size (mozilla-i686-pc-linux-gnu-1.7.7.tar.gz) = 13888040 bytes
+SHA1 (mozilla-i686-pc-linux-gnu-1.7.8.tar.gz) = 3ec87f33d6488b9f44ebe0edf0dd43604b3a678c
+RMD160 (mozilla-i686-pc-linux-gnu-1.7.8.tar.gz) = f2eb8587395f56cd0d497f9d9f2eaecd28e6b112
+Size (mozilla-i686-pc-linux-gnu-1.7.8.tar.gz) = 13890638 bytes