Non-maintainer commit: add new 10.3 version that has fetchable sources. Remove unfetc...
authorTomas Chvatal <scarabeus@gentoo.org>
Fri, 2 Sep 2011 15:11:07 +0000 (15:11 +0000)
committerTomas Chvatal <scarabeus@gentoo.org>
Fri, 2 Sep 2011 15:11:07 +0000 (15:11 +0000)
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
RepoMan-Options: --force

www-plugins/adobe-flash/ChangeLog
www-plugins/adobe-flash/Manifest
www-plugins/adobe-flash/adobe-flash-10.3.181.34.ebuild [deleted file]
www-plugins/adobe-flash/adobe-flash-10.3.183.5.ebuild [deleted file]
www-plugins/adobe-flash/adobe-flash-10.3.183.7.ebuild [moved from www-plugins/adobe-flash/adobe-flash-10.3.181.26.ebuild with 98% similarity]

index 9f1ae26988c3919171631a75a678c83416c23046..7c55db808f2e6f8c49c223b4a2be14ace4a11da6 100644 (file)
@@ -1,6 +1,15 @@
 # ChangeLog for www-plugins/adobe-flash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.102 2011/08/31 16:09:54 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.103 2011/09/02 15:11:07 scarabeus Exp $
+
+*adobe-flash-10.3.183.7 (02 Sep 2011)
+
+  02 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -adobe-flash-10.3.181.26.ebuild, -adobe-flash-10.3.181.34.ebuild,
+  -adobe-flash-10.3.183.5.ebuild, +adobe-flash-10.3.183.7.ebuild:
+  Non-maintainer commit: add new 10.3 version that has fetchable sources.
+  Remove unfetchable versions. Also this release fixes security issues in older
+  10.3.
 
   31 Aug 2011; Jim Ramsay <lack@gentoo.org>
   adobe-flash-11.0.1.60_beta201108082.ebuild:
index a3a7683ef89625b35d65208787a66e33a2029312..9ff1db0476d0205f2c81ebf82e7b6d9c2477ab6d 100644 (file)
@@ -1,37 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX flashplugin-lahf-fix.c 1038 RMD160 8b4550179b919f82acb67813eff33462bebeeb74 SHA1 628b3d672416d386134f79dbcedba333bd5558a9 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d
 AUX memcpy-to-memmove.sh 1418 RMD160 322005bfe0717630b945eb71ae4aa808a1d14d5e SHA1 72ee58862db06ee235055123137604619273819f SHA256 08a7203d19ca0d1ecbfaf6c46d915a28e2de81da97e42ef3c56e3d370c380096
 AUX mms.cfg 4420 RMD160 b73a91462e1db48fb40983e896cb06b3deb2a51e SHA1 3e56ecb32b938f46eea17a924fa0b006c66a3e6e SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a
-DIST flash-plugin-10.3.181.26-release.i386.rpm 5446759 RMD160 d4a4c0672121930224f774a5e74b9b456d957667 SHA1 16b8e846d425412e05e13d4327b9753ce9af4eb0 SHA256 9357f1f2b5f065548dc82ec705a3eeb946f796b37a18e102d64bc191225f99db
-DIST flash-plugin-10.3.181.34-release.i386.rpm 5446695 RMD160 9d2db378ab8c673aadc38c21108c9ec9730650e6 SHA1 171af4caf86c0d51777d2b99aa4530ec92f61b49 SHA256 db074cb7b38dbc59e1d25f267a45d52dd09ccd85031cc0d01cd77b1420036a2a
-DIST flash-plugin-10.3.183.5-release.i386.rpm 5449527 RMD160 1cd43da1b33686f69d69e2b7ef0e3883c5706961 SHA1 d3607dc100bef1303d4a72cb43a5109973989d3d SHA256 d9398af622e3b62c315e70ea566cb570fbcb2b9792a23de566b860100e650a46
+DIST flash-plugin-10.3.183.7-release.i386.rpm 5450066 RMD160 914484cb463eae2c0fb81237be77a695bd36e1b1 SHA1 7ad5f80e8d2a94773645948d54d5350c4745f9c4 SHA256 5cc902ceb437dcf81402f749f5e3ed0bed66cf68358699c7a9de256ee28f5789
 DIST flashplayer11_b1_install_lin_32_071311.tar.gz 6747871 RMD160 cbfe3943445f5e7b8c5e9288ecdb17c10af0c8d9 SHA1 d3f4417ad8c83afc3089aa6ff8b6c7706a0ef34b SHA256 1ccd71b27ffafc4ffa8cb4e494b972fe73378406a08e5a066d58c5a521fdfeff
 DIST flashplayer11_b1_install_lin_64_071311.tar.gz 7044701 RMD160 ed5d26c0c2f9387ed6ea3d9fdd37aa3c020a608b SHA1 8b7deb398e5e57cf2b8dcd1e498e8da07a8548ed SHA256 46dc0573bdfedc73edf2296be33fb9bfbb6e3238b54438f5b2d91d8ffe82b635
 DIST flashplayer11_b2_install_lin_32_080811.tar.gz 6757665 RMD160 850f80802b9176ae75208b6b28330c849d610ed0 SHA1 b117ff27111281b58cf4b32efca1505e0ef2ecf9 SHA256 e9780187a1fd0b21a7cac5f0859020b87f9f2355c7810af60dde6436c386f7be
 DIST flashplayer11_b2_install_lin_64_080811.tar.gz 7047824 RMD160 0d92ab6fff1f6b2fdcc57ecede70a3d79337a34b SHA1 fd02c7512a4d56c896ee9213ca09fd484aa325c0 SHA256 5b2d8c3744031adad49121c959f2e899cbca2e91592c6773b1ba61d0ff2bafd1
-EBUILD adobe-flash-10.3.181.26.ebuild 3825 RMD160 5e797d57f8aa6da50ba80b551a9c3e13dd247ff0 SHA1 4ea3cc63adb2649a06c3decdf3b704fbfb087d04 SHA256 ac5c70c2df94bb74924d5f751f17e12eb66ce8618bec91f20226abfcbf9c47e9
-EBUILD adobe-flash-10.3.181.34.ebuild 3825 RMD160 b2a012f5cdc18c3017b280b998e9425578f406e8 SHA1 ded6046f326fbac83aebce4de547d86887dba979 SHA256 a417161c61930d0d27c7745cc48f3690cb74c50cbba976991ae50f899db3c671
-EBUILD adobe-flash-10.3.183.5.ebuild 3825 RMD160 02c4926d4fb7c95e9c8bd02033565c9e11228170 SHA1 18c8d58b70e77d0b55cb3bec93b4d386056662cf SHA256 f21ad9ff2707ab5441d1a3c9c9350b18b4d7eaeaa668cc4092a792d30326ad4f
+EBUILD adobe-flash-10.3.183.7.ebuild 3829 RMD160 2ded4b2755a57d0d7e9feebd177b61d7da786ba2 SHA1 176c90a878cba6094756ad07672549602de59f26 SHA256 d81ba600d8b37cb637c086cf12c65ae35e61eb3aad44d606ba6f67013524b4f0
 EBUILD adobe-flash-11.0.1.60_beta201107131-r1.ebuild 7272 RMD160 d6745bf78e6b178d157a13cb96dece4e33925d0e SHA1 6ff2fb41f522ec95365f72aea8600cc3344c7111 SHA256 92d0326b85bdbde12715e3b71a22301c460724d04a9347d5158a526cf8f00bdc
 EBUILD adobe-flash-11.0.1.60_beta201108082.ebuild 7346 RMD160 2b48a9e6569d9ec4928ca2386abc2612f7aafa59 SHA1 7a24d8aeb3dfc3ff61bb28c4681efb7e3684b7a0 SHA256 1887e412fd65fa72c68faf0ba013c7861e6cafa0e10ecfcce736032d78d109d4
-MISC ChangeLog 37075 RMD160 ac02dd933555b80dc0fbaffca67f53cea78becbf SHA1 16d6bc54907507a762ef7dd13fb135c3cbe5c9c6 SHA256 cba18b3cbd52784b5e56b07c929f61099104691797bd6634decd0c15f43afbf8
+MISC ChangeLog 37471 RMD160 57dec6d76cb2891369c8362c86f44b36ad1f4032 SHA1 e385e37cbb0c738317dccb3a21d728e172cee425 SHA256 ef5f0b52fde05f50333289bb09e711cc341f2deb7f862787182c2fc676c0e263
 MISC metadata.xml 1010 RMD160 73dd5ebd0ca15f10489748d441e8f5ad11f86a64 SHA1 83a453fe0b10a603237755eae9b4ff8ee47d438a SHA256 36e47f0f087760202d4ad961f9ec3fbf0bd2dc075f1b34d7d8950b2960409016
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOXlzoAAoJEA8o5SF9Rr6qwzsQAIC304S0hgKj/T2h8zRATb8q
-WUGK1q0/LczJTSsjzKf14nIMiu7q4Cy9iGGdLff11PqIJ0I/QquKkYZDixt+F0ay
-lbeN4SsZwlRvXNMUEXdUWheCXXW+fPyuJ/pG8oz6eKSOShZTs5WgNIejL4Fx1CtV
-gXJN14bMAVpXqE5R7shFiaLNja+eV2MQ1Gj73SnG37dPE8wpXl4J7yb0bj4vLYRd
-adYBnROTloHpqujPBKmjXifEsWuJo+SbDpTJ1pklaMDWkIqUzGSIVI5w6U6e3z6h
-6cavhRxwc3TNvveizWanBKS9L+kfSZlJSkucZCiGgryE5btZ6M1Nd3Tvn5O1XbtY
-LNdgr/fkaZSClLhr2BKdaPuGiTJ4xpOd0RbEx1D2wBWVCv4KidTo637rEs7AW3BS
-Ia6BQevY5kY7i0P27563TNtrza4oqiTyUL/LDo0cBto0cv4KsCh8a9dF+x2P9iWM
-JFrbE1mgBAZOTE0HkTvysd1m+B0fj3ZelLykbsPlGjbj+xhNduq+3rKb5oJX7Sc3
-PYl6Baz8B+19BAO/i7MhHVn7KQ6lheAgIksoubzA4wdGIMTzgDTCuKPqwCE3OBxF
-qCfbAuinCimAn0JkrdSDz5VUPQE3OpuRn2p3vxVHkFUATMJvaXCW3j9qbStuVp3Y
-K6I9H/KbrT2Hbbs8oaUw
-=i8gm
+iEYEARECAAYFAk5g8hkACgkQHB6c3gNBRYf3pACeMX852Sr5zmTIH79+sD5LqibX
+giUAnR9D22BZZOIGCriPJp0caC/5em4o
+=8HlR
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.181.34.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.181.34.ebuild
deleted file mode 100644 (file)
index 4d73e56..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.181.34.ebuild,v 1.5 2011/08/11 14:31:46 lack Exp $
-
-EAPI=4
-inherit nsplugins rpm multilib toolchain-funcs
-
-MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-${PV}-release.i386.rpm"
-
-DESCRIPTION="Adobe Flash Player"
-SRC_URI="${MY_32B_URI}"
-HOMEPAGE="http://www.adobe.com/flashplayer"
-IUSE="vdpau kde"
-SLOT="0"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="AdobeFlash-10.3"
-RESTRICT="strip mirror"
-
-S="${WORKDIR}"
-
-NATIVE_DEPS="x11-libs/gtk+:2
-       media-libs/fontconfig
-       dev-libs/nss
-       net-misc/curl
-       vdpau? ( x11-libs/libvdpau )
-       kde? ( kde-base/kcmshell )
-       >=sys-libs/glibc-2.4"
-
-EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
-       >=app-emulation/emul-linux-x86-gtklibs-20100409-r1
-       app-emulation/emul-linux-x86-soundlibs"
-
-DEPEND="amd64? ( www-plugins/nspluginwrapper )"
-RDEPEND="x86? ( $NATIVE_DEPS )
-       amd64? ( $EMUL_DEPS )
-       || ( media-fonts/liberation-fonts media-fonts/corefonts )
-       ${DEPEND}"
-
-# Where should this all go? (Bug #328639)
-INSTALL_BASE="opt/Adobe/flash-player"
-INSTALL_BASE32="${INSTALL_BASE}32"
-
-# Ignore QA warnings in these closed-source binaries, since we can't fix them:
-QA_PREBUILT="opt/* usr/lib*/kde4/*"
-
-src_install() {
-       if use amd64; then
-               local oldabi="${ABI}"
-               ABI="x86"
-               BASE=${INSTALL_BASE32}
-       else
-               BASE=${INSTALL_BASE}
-       fi
-
-       # The plugin itself
-       exeinto /${BASE}/plugin
-       doexe usr/lib/flash-plugin/libflashplayer.so
-       doexe usr/lib/flash-plugin/homecleanup
-       inst_plugin /${BASE}/plugin/libflashplayer.so
-
-       # The optional KDE4 KCM plugin
-       if use kde && ! use amd64; then
-               exeinto /usr/$(get_libdir)/kde4/
-               doexe usr/$(get_libdir)/kde4/kcm_adobe_flash_player.so
-               insinto /usr/share/kde4/services
-               doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
-       else
-               # No KDE applet, so allow the GTK utility to show up in KDE:
-               sed -i usr/share/applications/flash-player-properties.desktop \
-                       -e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
-       fi
-
-       # The userland 'properties' standalone app:
-       exeinto /${BASE}/bin
-       doexe usr/bin/flash-player-properties
-       for icon in $(find usr/share/icons/ -name '*.png'); do
-               insinto /$(dirname $icon)
-               doins $icon
-       done
-       elog "Done with icons."
-       insinto usr/share/applications
-       sed -i usr/share/applications/flash-player-properties.desktop \
-               -e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed"
-       doins usr/share/applications/flash-player-properties.desktop
-
-       dodoc "usr/lib/flash-plugin/README"
-       dodoc "usr/share/doc/flash-plugin-${PV}/readme.txt"
-
-       if use amd64; then
-               ABI="${oldabi}"
-       fi
-
-       # The magic config file!
-       insinto "/etc/adobe"
-       doins "${FILESDIR}/mms.cfg"
-}
-
-pkg_postinst() {
-       if use amd64; then
-               elog "Adobe has no stable 64-bit native version at this time."
-               #elog "The beta"
-               #elog "64-bit native release (codenamed \"square\") is installed as part"
-               #elog "of the unstable testing version of this package:"
-               #elog "  ${CATEGORY}/${P}_p...."
-               elog
-               if has_version 'www-plugins/nspluginwrapper'; then
-                       elog "nspluginwrapper detected: Installing plugin wrapper"
-                       local oldabi="${ABI}"
-                       ABI="x86"
-                       local FLASH_SOURCE="${ROOT}/${INSTALL_BASE32}/plugin/libflashplayer.so"
-                       nspluginwrapper -i "${FLASH_SOURCE}"
-                       ABI="${oldabi}"
-                       elog
-               else
-                       elog "To use the 32-bit flash player in a native 64-bit firefox,"
-                       elog "you must install www-plugins/nspluginwrapper."
-                       elog
-               fi
-       fi
-
-       ewarn "Flash player is closed-source, with a long history of security"
-       ewarn "issues.  Please consider only running flash applets you know to"
-       ewarn "be safe.  The 'flashblock' extension may help for mozilla users:"
-       ewarn "  https://addons.mozilla.org/en-US/firefox/addon/433"
-}
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.183.5.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.183.5.ebuild
deleted file mode 100644 (file)
index a80a4b7..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.5.ebuild,v 1.4 2011/08/12 11:13:32 tomka Exp $
-
-EAPI=4
-inherit nsplugins rpm multilib toolchain-funcs
-
-MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-${PV}-release.i386.rpm"
-
-DESCRIPTION="Adobe Flash Player"
-SRC_URI="${MY_32B_URI}"
-HOMEPAGE="http://www.adobe.com/flashplayer"
-IUSE="vdpau kde"
-SLOT="0"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="AdobeFlash-10.3"
-RESTRICT="strip mirror"
-
-S="${WORKDIR}"
-
-NATIVE_DEPS="x11-libs/gtk+:2
-       media-libs/fontconfig
-       dev-libs/nss
-       net-misc/curl
-       vdpau? ( x11-libs/libvdpau )
-       kde? ( kde-base/kcmshell )
-       >=sys-libs/glibc-2.4"
-
-EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
-       >=app-emulation/emul-linux-x86-gtklibs-20100409-r1
-       app-emulation/emul-linux-x86-soundlibs"
-
-DEPEND="amd64? ( www-plugins/nspluginwrapper )"
-RDEPEND="x86? ( $NATIVE_DEPS )
-       amd64? ( $EMUL_DEPS )
-       || ( media-fonts/liberation-fonts media-fonts/corefonts )
-       ${DEPEND}"
-
-# Where should this all go? (Bug #328639)
-INSTALL_BASE="opt/Adobe/flash-player"
-INSTALL_BASE32="${INSTALL_BASE}32"
-
-# Ignore QA warnings in these closed-source binaries, since we can't fix them:
-QA_PREBUILT="opt/* usr/lib*/kde4/*"
-
-src_install() {
-       if use amd64; then
-               local oldabi="${ABI}"
-               ABI="x86"
-               BASE=${INSTALL_BASE32}
-       else
-               BASE=${INSTALL_BASE}
-       fi
-
-       # The plugin itself
-       exeinto /${BASE}/plugin
-       doexe usr/lib/flash-plugin/libflashplayer.so
-       doexe usr/lib/flash-plugin/homecleanup
-       inst_plugin /${BASE}/plugin/libflashplayer.so
-
-       # The optional KDE4 KCM plugin
-       if use kde && ! use amd64; then
-               exeinto /usr/$(get_libdir)/kde4/
-               doexe usr/$(get_libdir)/kde4/kcm_adobe_flash_player.so
-               insinto /usr/share/kde4/services
-               doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
-       else
-               # No KDE applet, so allow the GTK utility to show up in KDE:
-               sed -i usr/share/applications/flash-player-properties.desktop \
-                       -e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
-       fi
-
-       # The userland 'properties' standalone app:
-       exeinto /${BASE}/bin
-       doexe usr/bin/flash-player-properties
-       for icon in $(find usr/share/icons/ -name '*.png'); do
-               insinto /$(dirname $icon)
-               doins $icon
-       done
-       elog "Done with icons."
-       insinto usr/share/applications
-       sed -i usr/share/applications/flash-player-properties.desktop \
-               -e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed"
-       doins usr/share/applications/flash-player-properties.desktop
-
-       dodoc "usr/lib/flash-plugin/README"
-       dodoc "usr/share/doc/flash-plugin-${PV}/readme.txt"
-
-       if use amd64; then
-               ABI="${oldabi}"
-       fi
-
-       # The magic config file!
-       insinto "/etc/adobe"
-       doins "${FILESDIR}/mms.cfg"
-}
-
-pkg_postinst() {
-       if use amd64; then
-               elog "Adobe has no stable 64-bit native version at this time."
-               #elog "The beta"
-               #elog "64-bit native release (codenamed \"square\") is installed as part"
-               #elog "of the unstable testing version of this package:"
-               #elog "  ${CATEGORY}/${P}_p...."
-               elog
-               if has_version 'www-plugins/nspluginwrapper'; then
-                       elog "nspluginwrapper detected: Installing plugin wrapper"
-                       local oldabi="${ABI}"
-                       ABI="x86"
-                       local FLASH_SOURCE="${ROOT}/${INSTALL_BASE32}/plugin/libflashplayer.so"
-                       nspluginwrapper -i "${FLASH_SOURCE}"
-                       ABI="${oldabi}"
-                       elog
-               else
-                       elog "To use the 32-bit flash player in a native 64-bit firefox,"
-                       elog "you must install www-plugins/nspluginwrapper."
-                       elog
-               fi
-       fi
-
-       ewarn "Flash player is closed-source, with a long history of security"
-       ewarn "issues.  Please consider only running flash applets you know to"
-       ewarn "be safe.  The 'flashblock' extension may help for mozilla users:"
-       ewarn "  https://addons.mozilla.org/en-US/firefox/addon/433"
-}
similarity index 98%
rename from www-plugins/adobe-flash/adobe-flash-10.3.181.26.ebuild
rename to www-plugins/adobe-flash/adobe-flash-10.3.183.7.ebuild
index c071400b11734bcd3e72a813d7c16477e6fc0ad0..b3893de0e852924a3ca7478a0cd7d8d07133c0fe 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.181.26.ebuild,v 1.5 2011/08/11 14:31:46 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.7.ebuild,v 1.1 2011/09/02 15:11:07 scarabeus Exp $
 
 EAPI=4
 inherit nsplugins rpm multilib toolchain-funcs