Packman Build Service PMBS

Changes of Revision 4

flash-player.changes Changed

@@ -1,7 +1,21 @@
 -------------------------------------------------------------------
+Tue Dec 13 16:17:00 UTC 2016 - sor.alexei@meowr.ru
+
+- Update to version 24.0.0.186:
+  * APSB16-39, CVE-2016-7867, CVE-2016-7868, CVE-2016-7869,
+    CVE-2016-7870, CVE-2016-7871, CVE-2016-7872, CVE-2016-7873,
+    CVE-2016-7874, CVE-2016-7875, CVE-2016-7876, CVE-2016-7877,
+    CVE-2016-7878, CVE-2016-7879, CVE-2016-7880, CVE-2016-7881,
+    CVE-2016-7890, CVE-2016-7892.
+- Merge chromium-pepper-flash into this package (PPAPI plugin).
+- Own /usr/lib64/browser-plugins/.
+- Package the 24px flash-player-properties icon.
+- Remove Flash_Player_12_0.pdf: package license.pdf instead.
+
+-------------------------------------------------------------------
 Tue Nov  8 16:43:12 UTC 2016 - sor.alexei@meowr.ru
 
-- Security update to version 11.2.202.644:
+- Security update to version 11.2.202.644 (bsc#1009217):
   * APSB16-37, CVE-2016-7857, CVE-2016-7858, CVE-2016-7859,
     CVE-2016-7860, CVE-2016-7861, CVE-2016-7862, CVE-2016-7863,
     CVE-2016-7864, CVE-2016-7865.

flash-player.spec Changed

@@ -17,24 +17,24 @@
 
 
 Name:           flash-player
-Version:        11.2.202.644
+Version:        24.0.0.186
 Release:        0
 Summary:        Adobe Flash Plugin and Standalone Player
 License:        SUSE-NonFree
 Group:          Productivity/Networking/Web/Browsers
 Url:            https://get.adobe.com/flashplayer
 %ifarch %ix86
-Source0:        https://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/install_flash_player_11_linux.i386.tar.gz#/install_flash_player_%{version}_linux.i386.tar.gz
-Source1:        flashplayer_%{version}_sa.i386.tar.gz
+Source0:        https://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/flash_player_ppapi_linux.i386.tar.gz#/flash_player_ppapi_%{version}_linux.i386.tar.gz
+Source1:        https://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/flash_player_npapi_linux.i386.tar.gz#/flash_player_npapi_%{version}_linux.i386.tar.gz
+Source2:        flash_player_sa_11.2.202.644_linux.i386.tar.gz
 %endif
 %ifarch x86_64
-Source0:        https://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/install_flash_player_11_linux.x86_64.tar.gz#/install_flash_player_%{version}_linux.x86_64.tar.gz
-Source1:        flashplayer_11.1.102.55_sa.x86_64.tar.bz2
+Source0:        https://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/flash_player_ppapi_linux.x86_64.tar.gz#/flash_player_ppapi_%{version}_linux.x86_64.tar.gz
+Source1:        https://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/flash_player_npapi_linux.x86_64.tar.gz#/flash_player_npapi_%{version}_linux.x86_64.tar.gz
+Source2:        flash_player_sa_%{version}_linux.x86_64.tar.gz
 %endif
-# Licence referenced at https://adobe.com/legal/licenses-terms.html
-Source2:        http://wwwimages.adobe.com/content/dam/acom/en/legal/licenses-terms/pdf/Flash%20Player_12.0.pdf#/Flash_Player_12_0.pdf
-Source4:        flashplayer.desktop
-Source5:        flashplayer.png
+Source3:        flashplayer.desktop
+Source4:        flashplayer.png
 # PATCH-FIX-OPENSUSE desktop.diff -- Fix desktop file to be MATE/GNOME compatible.
 Patch0:         desktop.diff
 BuildRequires:  hicolor-icon-theme
@@ -43,8 +43,12 @@
 Requires:       libasound2%{?_isa}
 Requires:       libcurl4%{?_isa}
 Provides:       flash-plugin = %{version}
-Provides:       netscape-plugins
-Obsoletes:      netscape-plugins
+# chromium-pepper-flash was last used in openSUSE Leap 42.2.
+Provides:       chromium-pepper-flash = %{version}
+Obsoletes:      chromium-pepper-flash < %{version}
+# netscape-plugins was last used in SUSE Linux 8.1.
+Provides:       netscape-plugins = %{version}
+Obsoletes:      netscape-plugins < %{version}
 ExclusiveArch:  %ix86 x86_64
 
 %description
@@ -65,39 +69,50 @@
 and GNOME desktops.
 
 %prep
-%setup -q -c %{name}-%{version} -a 0 -b 1
+%setup -q -c -a 0 -b 1 -b 2
 %patch0
-mkdir -p EULA/
-cp -f %{SOURCE2} "EULA/Flash_Player_12_0.pdf"
+cp -f %{SOURCE3} flashplayer.desktop
+cp -f %{SOURCE4} flashplayer.png
 
 %build
 # Nothing to build.
 
 %install
-install -Dpm 0644 libflashplayer.so %{buildroot}%{_libdir}/browser-plugins/libflashplayer.so
+install -Dpm 0644 libpepflashplayer.so \
+  %{buildroot}%{_libdir}/chromium/PepperFlash/libpepflashplayer.so
+install -Dpm 0644 manifest.json \
+  %{buildroot}%{_libdir}/chromium/PepperFlash/manifest.json
+
+install -Dpm 0644 libflashplayer.so \
+  %{buildroot}%{_libdir}/browser-plugins/libflashplayer.so
 
 mkdir -p %{buildroot}%{_datadir}/icons/
-rm -rf .%{_datadir}/icons/hicolor/24x24/
-cp -a .%{_datadir}/icons/* %{buildroot}%{_datadir}/icons
+cp -a .%{_datadir}/icons/* %{buildroot}%{_datadir}/icons/
 
 # MATE/GNOME frontend.
-install -Dpm 0755 .%{_bindir}/flash-player-properties %{buildroot}%{_bindir}/flash-player-properties
+install -Dpm 0755 .%{_bindir}/flash-player-properties \
+  %{buildroot}%{_bindir}/flash-player-properties
 install -Dpm 0644 .%{_datadir}/applications/flash-player-properties.desktop \
   %{buildroot}%{_datadir}/applications/flash-player-properties.desktop
 
-if [ -f install_flash_player_linux_sa/flashplayer ]; then
-    install -Dpm 0755 install_flash_player_linux_sa/flashplayer %{buildroot}%{_bindir}/flashplayer
-else
-    install -Dpm 0755 flashplayer %{buildroot}%{_bindir}/flashplayer
-fi
-install -Dpm 0644 %{SOURCE4} %{buildroot}%{_datadir}/applications/flashplayer.desktop
-install -Dpm 0644 %{SOURCE5} %{buildroot}%{_datadir}/pixmaps/flashplayer.png
+install -Dpm 0755 flashplayer %{buildroot}%{_bindir}/flashplayer
+install -Dpm 0644 flashplayer.desktop \
+  %{buildroot}%{_datadir}/applications/flashplayer.desktop
+install -Dpm 0644 flashplayer.png %{buildroot}%{_datadir}/pixmaps/flashplayer.png
 
 %suse_update_desktop_file flashplayer
 %suse_update_desktop_file flash-player-properties
 
 %post
 %desktop_database_post
+
+CHROMIUM_CONFIG='%{_sysconfdir}/default/chromium'
+if [ -f "$CHROMIUM_CONFIG" ]; then
+    # Add the PPAPI Flash Player path to the Chromium config file.
+    if [[ $(cat "$CHROMIUM_CONFIG") != *ppapi*path* ]]; then
+        sed -i '/CHROMIUM_FLAGS/s|"$| --ppapi-flash-path=%{_libdir}/chromium/PepperFlash/libpepflashplayer.so"|' "$CHROMIUM_CONFIG"
+    fi
+fi
 %ifarch %ix86
 # This is an ugly hack: flash-player hard-requires SSE2. rpm nor
 # zypp can limit installation to SSE2 equipped systems only. We
@@ -105,6 +120,7 @@
 # or install and deliberately break it. We do the second here
 # (boo#856386).
 if ( ! grep -q '^flags.*sse2' /proc/cpuinfo ); then
+    rm -f %{_libdir}/chromium/PepperFlash/libpepflashplayer.so
     rm -f %{_libdir}/browser-plugins/libflashplayer.so
     rm -f %{_bindir}/flashplayer
     echo "Flash Player requires a CPU with SSE2. It cannot work on your system." >&2
@@ -115,6 +131,12 @@
 %postun
 %desktop_database_postun
 
+CHROMIUM_CONFIG='%{_sysconfdir}/default/chromium'
+# Remove the PPAPI Flash Player path from the Chromium config file.
+if [ -f "$CHROMIUM_CONFIG" ]; then
+    sed -i "s| --ppapi-flash-path=%{_libdir}/chromium/PepperFlash/libpepflashplayer.so||" "$CHROMIUM_CONFIG"
+fi
+
 %post gnome
 %desktop_database_post
 %icon_theme_cache_post
@@ -125,9 +147,12 @@
 
 %files
 %defattr(-,root,root)
-%doc readme.txt EULA/
-%{_libdir}/browser-plugins/libflashplayer.so
+%doc LGPL/ license.pdf readme.txt
 %{_bindir}/flashplayer
+%dir %{_libdir}/chromium/
+%{_libdir}/chromium/PepperFlash/
+%dir %{_libdir}/browser-plugins/
+%{_libdir}/browser-plugins/libflashplayer.so
 %{_datadir}/applications/flashplayer.desktop
 %{_datadir}/pixmaps/flashplayer.png

Flash_Player_12_0.pdf Deleted

flash_player_npapi_24.0.0.186_linux.i386.tar.gz Added

flash_player_npapi_24.0.0.186_linux.x86_64.tar.gz Added

flash_player_ppapi_24.0.0.186_linux.i386.tar.gz Added

flash_player_ppapi_24.0.0.186_linux.x86_64.tar.gz Added

flash_player_sa_11.2.202.644_linux.i386.tar.gz Added

flash_player_sa_24.0.0.186_linux.x86_64.tar.gz Added

flashplayer_11.1.102.55_sa.x86_64.tar.bz2 Deleted

flashplayer_11.2.202.644_sa.i386.tar.gz Deleted

install_flash_player_11.2.202.644_linux.i386.tar.gz Deleted

install_flash_player_11.2.202.644_linux.x86_64.tar.gz Deleted