Pullup ticket 1829 - requested by wiz

security update for flash plugin

Revisions pulled up:
- pkgsrc/multimedia/moz-bin-flash/distinfo		removed
- pkgsrc/multimedia/ns-flash/Makefile			1.14
- pkgsrc/multimedia/ns-flash/distinfo			1.7
- pkgsrc/www/firefox-bin-flash/Makefile.common		1.14, 1.15
- pkgsrc/www/firefox-bin-flash/distinfo			1.6

   Module Name:		pkgsrc
   Committed By:	wiz
   Date:		Sat Sep 16 07:17:52 UTC 2006

   Modified Files:
   	pkgsrc/multimedia/ns-flash: Makefile distinfo
   	pkgsrc/www/firefox-bin-flash: Makefile.common distinfo

   Log Message:
   Update to 7.0.68:

   This release fixes several security vulnerabilities as reported in
   Adobe Vulnerability APSB06-11. Multiple input validation errors
   have been identified that could lead to the potential execution of
   arbitrary code, such as that delivered from a remote location via
   the user's Web browser. Updating is strongly recommended.
---
   Module Name:		pkgsrc
   Committed By:	wiz
   Date:		Sun Sep 17 11:48:23 UTC 2006

   Modified Files:
   	pkgsrc/www/firefox-bin-flash: Makefile.common
   Removed Files:
   	pkgsrc/multimedia/moz-bin-flash: distinfo

   Log Message:
   Share distinfo file between moz-bin-flash and firefox-bin-flash.
   Noted by salo@

5 files changed, 14 insertions, 20 deletions

diff --git a/multimedia/moz-bin-flash/distinfo b/multimedia/moz-bin-flash/distinfo
deleted file mode 100644
index f7b4bfc35f1..00000000000
--- a/multimedia/moz-bin-flash/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/03/29 02:16:43 markd Exp $
-
-SHA1 (flash/7.0r63/install_flash_player_7_linux.tar.gz) = 16504b1439ccf164436bf0a7193e69702437ced4
-RMD160 (flash/7.0r63/install_flash_player_7_linux.tar.gz) = f4b876a413bc6404389acdc3a138b3cca9ef225a
-Size (flash/7.0r63/install_flash_player_7_linux.tar.gz) = 1021258 bytes
diff --git a/multimedia/ns-flash/Makefile b/multimedia/ns-flash/Makefile
index e7b33de20bd..bbe753056c3 100644
--- a/multimedia/ns-flash/Makefile
+++ b/multimedia/ns-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/05/22 22:22:04 jlam Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2006/09/17 18:42:47 salo Exp $
 
 CATEGORIES=		multimedia www
 MASTER_SITES=		http://fpdownload.macromedia.com/get/flashplayer/current/
@@ -17,7 +17,7 @@ WRKNAME=		install_flash_player_7_${DISTUNAME}
 .include "../../mk/bsd.prefs.mk"
 
 .if (${MACHINE_ARCH} == "i386")
-FLASH_VERS=		7.0r63
+FLASH_VERS=		7.0r68
 DEPENDS+=		suse_compat>=6.3:../../emulators/${SUSE_DIR_PREFIX}_compat
 DEPENDS+=		suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
 DISTUNAME=		linux
diff --git a/multimedia/ns-flash/distinfo b/multimedia/ns-flash/distinfo
index ac802dd12d7..65b18f4a0b8 100644
--- a/multimedia/ns-flash/distinfo
+++ b/multimedia/ns-flash/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.6 2006/03/29 02:16:43 markd Exp $
+$NetBSD: distinfo,v 1.6.4.1 2006/09/17 18:42:47 salo Exp $
 
-SHA1 (flash/7.0r63/install_flash_player_7_linux.tar.gz) = 16504b1439ccf164436bf0a7193e69702437ced4
-RMD160 (flash/7.0r63/install_flash_player_7_linux.tar.gz) = f4b876a413bc6404389acdc3a138b3cca9ef225a
-Size (flash/7.0r63/install_flash_player_7_linux.tar.gz) = 1021258 bytes
-SHA1 (flash/7.0r53/flash_player_7_solaris_sparc_r53.tar.gz) = c93a8109c6abb5647548112b177e32571955afb1
-RMD160 (flash/7.0r53/flash_player_7_solaris_sparc_r53.tar.gz) = 22cbcd568b749661c6bc41c0839a358dcd386768
-Size (flash/7.0r53/flash_player_7_solaris_sparc_r53.tar.gz) = 1015384 bytes
+SHA1 (flash/7.0r68/install_flash_player_7_linux.tar.gz) = 5e05b592fd5de85e4f0de3b0789487462070f218
+RMD160 (flash/7.0r68/install_flash_player_7_linux.tar.gz) = 3cfcdd25c821ca6926a412ba21ae6c5745db4012
+Size (flash/7.0r68/install_flash_player_7_linux.tar.gz) = 1021264 bytes
diff --git a/www/firefox-bin-flash/Makefile.common b/www/firefox-bin-flash/Makefile.common
index b6a80693bb3..fc1cd16c4ff 100644
--- a/www/firefox-bin-flash/Makefile.common
+++ b/www/firefox-bin-flash/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2006/05/22 22:22:05 jlam Exp $
+# $NetBSD: Makefile.common,v 1.13.2.1 2006/09/17 18:42:47 salo Exp $
 
 DISTNAME=		install_flash_player_7_${DISTUNAME}
 PKGNAME=		${MOZ_BIN}-flash-${FLASH_VERS:S/r/./}
@@ -16,10 +16,12 @@ DIST_SUBDIR=		flash/${FLASH_VERS}
 
 SUB=			english/${DISTUNAME}/${FLASH_VERS}
 
-FLASH_VERS=		7.0r63
+FLASH_VERS=		7.0r68
 DISTUNAME=		linux
 WRKNAME=		install_flash_player_7_${DISTUNAME}
 
+DISTINFO_FILE=		${.CURDIR}/../../www/firefox-bin-flash/distinfo
+
 LICENSE=		flash-license
 RESTRICTED=             Redistribution not permitted
 NO_SRC_ON_FTP=		${RESTRICTED}
diff --git a/www/firefox-bin-flash/distinfo b/www/firefox-bin-flash/distinfo
index 397a6ac28df..d41ea785cc7 100644
--- a/www/firefox-bin-flash/distinfo
+++ b/www/firefox-bin-flash/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2006/03/29 02:16:44 markd Exp $
+$NetBSD: distinfo,v 1.5.4.1 2006/09/17 18:42:47 salo Exp $
 
-SHA1 (flash/7.0r63/install_flash_player_7_linux.tar.gz) = 16504b1439ccf164436bf0a7193e69702437ced4
-RMD160 (flash/7.0r63/install_flash_player_7_linux.tar.gz) = f4b876a413bc6404389acdc3a138b3cca9ef225a
-Size (flash/7.0r63/install_flash_player_7_linux.tar.gz) = 1021258 bytes
+SHA1 (flash/7.0r68/install_flash_player_7_linux.tar.gz) = 5e05b592fd5de85e4f0de3b0789487462070f218
+RMD160 (flash/7.0r68/install_flash_player_7_linux.tar.gz) = 3cfcdd25c821ca6926a412ba21ae6c5745db4012
+Size (flash/7.0r68/install_flash_player_7_linux.tar.gz) = 1021264 bytes