uppkg -> 2023.9.12-1

4 files changed, 65 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 68e88ece45da..d2313299e2aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,14 @@
 pkgbase = chromium-extension-privacybadger
 	pkgdesc = Block third party tracking in your browser
-	pkgver = 2023.6.23
+	pkgver = 2023.9.12
 	pkgrel = 1
 	url = https://privacybadger.org/
 	arch = any
 	license = GPL3
 	depends = chromium
-	source = chromium-extension-privacybadger-2023.6.23.crx::https://www.eff.org/files/privacy_badger-chrome.crx
-	sha256sums = 6ec1875afca1e5bbeb5e6d3b6240f7493be5600eceaf0da3ad14fa2660785a79
+	source = chromium-extension-privacybadger-2023.9.12::https://github.com/EFForg/privacybadger/archive/refs/tags/release-2023.9.12.tar.gz
+	source = privacybadger.pem
+	sha256sums = 4243752d01d1d8030c4cde74131d5971eab5871419286199f0967577b3102e05
+	sha256sums = 0f6e6fa1bb901480be99d24d26104f4ff67b41b9d748595f01f1779b7fc2a642
 
 pkgname = chromium-extension-privacybadger
diff --git a/.gitignore b/.gitignore
index c6b1e2379b38..7e5df6cdf93d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.zst
 pkg/
 src/
+chromium-extension-*
diff --git a/PKGBUILD b/PKGBUILD
index 49b9d6b95331..3dcf76a2725c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,45 @@
 # Maintainer: Qontinuum <qontinuum@artixlinux.org>
+# private key generated with `openssl genrsa 2048| openssl pkcs8 -topk8 -nocrypt -traditional`
 
-pkgname='chromium-extension-privacybadger'
-pkgver=2023.6.23
+_extension='privacybadger'
+pkgname="chromium-extension-$_extension"
+pkgver=2023.9.12
 pkgrel=1
 pkgdesc="Block third party tracking in your browser"
 license=('GPL3')
 arch=('any')
 url="https://privacybadger.org/"
 depends=('chromium')
-source=("$pkgname-$pkgver.crx::https://www.eff.org/files/privacy_badger-chrome.crx")
-sha256sums=('6ec1875afca1e5bbeb5e6d3b6240f7493be5600eceaf0da3ad14fa2660785a79')
+source=("$pkgname-$pkgver::https://github.com/EFForg/privacybadger/archive/refs/tags/release-$pkgver.tar.gz"
+        "$_extension.pem")
+sha256sums=('4243752d01d1d8030c4cde74131d5971eab5871419286199f0967577b3102e05'
+            '0f6e6fa1bb901480be99d24d26104f4ff67b41b9d748595f01f1779b7fc2a642')
 
 build() {
-    echo "{ \"external_crx\": \"/usr/share/$pkgname/$pkgname.crx\", \"external_version\": \"$pkgver\" }" > pkehgijcmpdhfbdbbnkijodmdjhbjlgp.json
+    cd "$srcdir"
+    mv "privacybadger-release-$pkgver/src" "$_extension-$pkgver"
+    _extver="$(jq -r '.version' "$_extension-$pkgver/manifest.json")"
+
+    pubkey="$(openssl rsa -in "$_extension.pem" -pubout -outform DER |base64 -w0)"
+    # create extension json
+    export _id="$(echo $pubkey |base64 -d |sha256sum |head -c32 |tr '0-9a-f' 'a-p')"
+    echo "extenson id should be: $_id"
+    cat << EOF > "$_id".json
+{
+    "external_crx": "/usr/lib/$pkgname/$_extension-$pkgver.crx",
+    "external_version": "$_extver"
+}
+EOF
+    cd "$_extension-$pkgver"
+    jq --ascii-output --arg key "$pubkey" '. + {key: $key}' manifest.json > manifest.json.new
+    mv manifest.json.new manifest.json
+
+    cd "$srcdir"
+    tmpdir="$(mktemp -d chromium-pack-XXXXXX)"
+    chromium --user-data-dir="$tmpdir" --pack-extension="$_extension-$pkgver" --pack-extension-key="$_extension.pem"
 }
 
 package() {
-    install -Dm644 "$pkgname-$pkgver.crx" "$pkgdir/usr/share/$pkgname/$pkgname.crx"
-    install -Dm644 pkehgijcmpdhfbdbbnkijodmdjhbjlgp.json "$pkgdir/usr/share/chromium/extensions/pkehgijcmpdhfbdbbnkijodmdjhbjlgp.json"
+    install -Dm644 -t "$pkgdir/usr/share/chromium/extensions/" "$_id.json"
+    install -Dm644 -t "$pkgdir/usr/lib/$pkgname/" "$_extension-$pkgver.crx"
 }
diff --git a/privacybadger.pem b/privacybadger.pem
new file mode 100644
index 000000000000..3748c021b362
--- /dev/null
+++ b/privacybadger.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/FDVL/5lrFCdu
+fPfiHX8JtbMg1pOCjvCASHJoZWFdVsNd/v+zukzcbbrnxXhTGQ8yICKgsNuDnHy/
+8A44v9+AmOV/A8huVW26bjItbKVzm/iouY6yCQ+NoipS53ujPNjBQwRfsTck945x
+dj2Ve+naueM97TWRJSH/ykJTVk0lG/kWD0qUN9U/mFy16BsvRAkxiGaHp183F/Jm
+kVLMLBZX0B8iNxa388R0FhoU3lDshLrG0vuIo1pweceVqqWaExb9VQbpfoQkl6vH
+0Kl+bWPDNLjes6wP85TH4CIgrv0EXSeUmHHM5L8LDOIEq7wWoyq4NkPT1bplSYyn
+VAuPbzV9AgMBAAECggEAAQH9bV8JFnWKGk0HIXaE3NtluRxdaLPR/mc2nUJw0t7a
+IG6JUQLmri0kLkR0tKfkh3mAA6dzI1ZQGexzv4zGUPJ3F8ym27gdIEpw/s7WIsFo
+yUds3BdsPgbwxxrb8TnPeqapfDGEocmhdj7Vc9EHvas7anBY49QiW58PBJgA4UHd
+n06nPmy9csOv85IYvCRdh1VqVWEDjLLWjr+5ZspELft+mQnDJmWzkYqQ7+wFhN5k
+dpaSw/9AWdckwiZllf6kdKKvbDvWKeeQ7tL4cx8ZTcz8GPnpE/N0LA4LpMiF6jEI
+gJc7wxne3PtGH8sYMJ4mYbRCU/fuOt7uNyzZrm/XmQKBgQDuNptk74FclTI9XTUa
+cGyiawIuvuk3SOM9wKralLyx1bwSnuLR1Df5z1qCJrMbm88EMSUrE16W3O8saFjm
+W8xJx9Ua+uE5R4grCVjfS/Cw2khlAHce2seu5Vx7Q4QGaLl6mljf3In9FZsUCuN5
+0U7geEV3PXOubUSt+qPgt1tF5QKBgQDNWKNx5gxxG52MEMj+3YDhUGXNbvFi/J7L
+/NO7MjzK8E3CRv9AzxsZc8nK5Q1xBH15uA3on+qhXXqu9OqM2XSSkTJofhrxXVDy
+ebwPAgz+FaD4K2eUTy5mJ/kBm3YQoWF3tU5OeohVROyPdBWE9K6JYsHbMcxwnrDa
+5KGb6Ue3uQKBgHd0KriS4evrZSYgd2Cqv88ymgWW9pwikNGGrCawL29+HrG3u0Y9
+hVRgBqL9hRNzLnyLqHfRXr2ITOeX6/yYS/kznEnLROXUWRQ7u7U9/5Sv4V3Evfda
+/odVvOqTEMGmAlzYyXh4vzmKfBmw3CFaNJObvDnvNvNhF++moEcvqzWBAoGAXWpz
+gH89Lb94Xp3MMlWmKdofVeOgoH136CiuUby69z92wGj3+g29sEiChnDJOp7mThcz
+DJ6jaKFUDH+SrFzIsVyoZ+zmaOMgzg4fRVyTeItyXTOxvUCARSzuFJMalNo1svWi
+GAWaO+BNFb2jhIajWBC7S/JNpPYsUogsFPd9DtECgYEAr0XT+YvWAlKvskigY0XV
+bG5avm1gI+ANmmQKoPr5qYXmbKaPmChc1PTaE5/Ft1MM+92yhydRhU7Aio/uNT0O
+GGb/tjJFfz1JTItzDGyg1/FZuFh7c+Stm87i2ddn7TFhKopOOhBhkR7X78mAkxb9
+vNViheUL5T3BneuhPBB453Y=
+-----END PRIVATE KEY-----