flashplugin: use sed instead of patches

4 files changed, 14 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 67b0596a8392..7621dfd28346 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,20 +8,14 @@ pkgbase = flashplugin
 	license = LGPL
 	noextract = flash_player_npapi_linux_32.0.0.465.x86_64.tar.gz
 	noextract = flash_player_ppapi_linux_32.0.0.465.x86_64.tar.gz
-	noextract = flash_player_npapi_linux_32.0.0.465.x86_64-defuse_time_bomb.patch
-	noextract = flash_player_ppapi_linux_32.0.0.465.x86_64-defuse_time_bomb.patch
 	options = !strip
 	source = flash_player_npapi_linux_32.0.0.465.x86_64.tar.gz::https://fpdownload.adobe.com/get/flashplayer/pdc/32.0.0.465/flash_player_npapi_linux.x86_64.tar.gz
 	source = flash_player_ppapi_linux_32.0.0.465.x86_64.tar.gz::https://fpdownload.adobe.com/get/flashplayer/pdc/32.0.0.465/flash_player_ppapi_linux.x86_64.tar.gz
-	source = flash_player_npapi_linux_32.0.0.465.x86_64-defuse_time_bomb.patch
-	source = flash_player_ppapi_linux_32.0.0.465.x86_64-defuse_time_bomb.patch
 	sha256sums = a90f2edb98231896331c61a81017f390e180015f90193865e3295319cf636c35
 	sha256sums = 99fcc780897be55bac7d11c0204ba7a3d5e7dc1f1aed75d5e7b5ad28c0b2ff5d
-	sha256sums = 52cb9e361f8b40f279ea62b9a49021de3fab7d825b1eab944c290d1f9ced14c7
-	sha256sums = b71806b14583edf3ae7f5e759b23c2cb14f649c2e59495e39e5e5876128fd575
 
 pkgname = flashplugin
-	pkgdesc = Adobe Flash Player NPAPI (with time bomb workaround patch)
+	pkgdesc = Adobe Flash Player NPAPI
 	depends = libxt
 	depends = gtk2
 	depends = nss
@@ -30,7 +24,7 @@ pkgname = flashplugin
 	optdepends = libvdpau: GPU acceleration on Nvidia cards
 
 pkgname = pepper-flash
-	pkgdesc = Adobe Flash Player PPAPI (with time bomb workaround patch)
+	pkgdesc = Adobe Flash Player PPAPI
 	depends = gcc-libs
 	optdepends = flashplugin: settings utility
 
diff --git a/PKGBUILD b/PKGBUILD
index ea5195964fdb..e8918c79e39b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,28 +11,28 @@ url="https://get.adobe.com/flashplayer/"
 license=('custom' 'LGPL')
 options=('!strip')
 source=("flash_player_npapi_linux_$pkgver.x86_64.tar.gz::https://fpdownload.adobe.com/get/flashplayer/pdc/$pkgver/flash_player_npapi_linux.x86_64.tar.gz"
-        "flash_player_ppapi_linux_$pkgver.x86_64.tar.gz::https://fpdownload.adobe.com/get/flashplayer/pdc/$pkgver/flash_player_ppapi_linux.x86_64.tar.gz"
-        "flash_player_npapi_linux_$pkgver.x86_64-defuse_time_bomb.patch"
-        "flash_player_ppapi_linux_$pkgver.x86_64-defuse_time_bomb.patch")
+        "flash_player_ppapi_linux_$pkgver.x86_64.tar.gz::https://fpdownload.adobe.com/get/flashplayer/pdc/$pkgver/flash_player_ppapi_linux.x86_64.tar.gz")
 noextract=("${source[@]%::*}")
 sha256sums=('a90f2edb98231896331c61a81017f390e180015f90193865e3295319cf636c35'
-            '99fcc780897be55bac7d11c0204ba7a3d5e7dc1f1aed75d5e7b5ad28c0b2ff5d'
-            '52cb9e361f8b40f279ea62b9a49021de3fab7d825b1eab944c290d1f9ced14c7'
-            'b71806b14583edf3ae7f5e759b23c2cb14f649c2e59495e39e5e5876128fd575')
+            '99fcc780897be55bac7d11c0204ba7a3d5e7dc1f1aed75d5e7b5ad28c0b2ff5d')
 
 prepare() {
+  cd "$srcdir"
+
   local _f
-  for _f in *.tar.gz; do
-    local _dir=$(grep -Eo '([np]papi)' <<< "$_f")
+  for _f in "${noextract[@]}"; do
+    local _dir=$(grep -o '[np]papi' <<< "$_f")
     mkdir -p "$_dir"
     tar xzfC "$_f" "$_dir"
-    patch -Np1 -d "$_dir" \
-      -i "$srcdir/flash_player_${_dir}_linux_$pkgver.x86_64-defuse_time_bomb.patch"
   done
+
+  # From https://cache.tehsausage.com/flash/defuse.txt
+  sed -i 's/\x00\x00\x40\x46\x3E\x6F\x77\x42/\x00\x00\x00\x00\x00\x00\xF8\x7F/' \
+    npapi/libflashplayer.so ppapi/libpepflashplayer.so
 }
 
 package_flashplugin() {
-  pkgdesc+=" NPAPI (with time bomb workaround patch)"
+  pkgdesc+=" NPAPI"
   depends=('libxt' 'gtk2' 'nss' 'curl' 'hicolor-icon-theme')
   optdepends=('libvdpau: GPU acceleration on Nvidia cards')
 
@@ -45,7 +45,7 @@ package_flashplugin() {
 }
 
 package_pepper-flash() {
-  pkgdesc+=" PPAPI (with time bomb workaround patch)"
+  pkgdesc+=" PPAPI"
   depends=('gcc-libs')
   optdepends=('flashplugin: settings utility')
 
diff --git a/flash_player_npapi_linux_32.0.0.465.x86_64-defuse_time_bomb.patch b/flash_player_npapi_linux_32.0.0.465.x86_64-defuse_time_bomb.patch
deleted file mode 100644
index 0ff075356c1d..000000000000
--- a/flash_player_npapi_linux_32.0.0.465.x86_64-defuse_time_bomb.patch
+++ /dev/null
diff --git a/flash_player_ppapi_linux_32.0.0.465.x86_64-defuse_time_bomb.patch b/flash_player_ppapi_linux_32.0.0.465.x86_64-defuse_time_bomb.patch
deleted file mode 100644
index 354c438c5404..000000000000
--- a/flash_player_ppapi_linux_32.0.0.465.x86_64-defuse_time_bomb.patch
+++ /dev/null