Update to 5.0.4, remove mongosh in favor of mongosh separate package

2 files changed, 30 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 52eac60d7b8c..2962b1488f36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mongodb-bin
 	pkgdesc = A high-performance, open source, schema-free document-oriented database
-	pkgver = 5.0.3
+	pkgver = 5.0.4
 	pkgrel = 1
 	url = https://www.mongodb.com/
 	arch = x86_64
@@ -9,14 +9,12 @@ pkgbase = mongodb-bin
 	license = Apache
 	depends = curl
 	optdepends = mongodb-tools: The MongoDB tools provide import, export, and diagnostic capabilities.
-	provides = mongodb=5.0.3
+	provides = mongodb=5.0.4
 	conflicts = mongodb
-	conflicts = mongosh-bin
 	conflicts = mongodb-shell-bin
-	noextract = mongodb-org-shell_5.0.3_x86_64.deb
-	noextract = mongodb-org-server_5.0.3_x86_64.deb
-	noextract = mongodb-org-mongos_5.0.3_x86_64.deb
-	noextract = mongodb-mongosh_1.0.4_x86_64.deb
+	noextract = mongodb-org-shell_5.0.4_x86_64.deb
+	noextract = mongodb-org-server_5.0.4_x86_64.deb
+	noextract = mongodb-org-mongos_5.0.4_x86_64.deb
 	backup = etc/mongodb.conf
 	source = mongodb.conf
 	source = mongodb.service
@@ -28,21 +26,17 @@ pkgbase = mongodb-bin
 	sha256sums = 47b884569102f7c79017ee78ef2e98204a25aa834c0ee7d5d62c270ab05d4e2b
 	sha256sums = 51ee1e1f71598aad919db79a195778e6cb6cfce48267565e88a401ebc64497ac
 	sha256sums = 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27
-	source_x86_64 = mongodb-org-shell_5.0.3_x86_64.deb::https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-amd64/mongodb-org-shell_5.0.3_amd64.deb
-	source_x86_64 = mongodb-org-server_5.0.3_x86_64.deb::https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-amd64/mongodb-org-server_5.0.3_amd64.deb
-	source_x86_64 = mongodb-org-mongos_5.0.3_x86_64.deb::https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-amd64/mongodb-org-mongos_5.0.3_amd64.deb
-	source_x86_64 = mongodb-mongosh_1.0.4_x86_64.deb::https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-amd64/mongodb-mongosh_1.0.4_amd64.deb
-	sha256sums_x86_64 = 91677a013d1ccff55bbb304ad5f0a23395ffb74b137e30b9a46c2d2c91ca4cde
-	sha256sums_x86_64 = fb189d87bfafa3e69eda249e0b9daaa4be535390c2b162e541822c80d1cfa043
-	sha256sums_x86_64 = 47a649c830a818e99efc0e18b3c8dd940453f36a279c833813429e8dd91f8393
-	sha256sums_x86_64 = 57d77e07c80c12f7a0c2c2e5d7041a682c162c25cab46496af0da624927a8913
-	source_aarch64 = mongodb-org-shell_5.0.3_aarch64.deb::https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-arm64/mongodb-org-shell_5.0.3_arm64.deb
-	source_aarch64 = mongodb-org-server_5.0.3_aarch64.deb::https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-arm64/mongodb-org-server_5.0.3_arm64.deb
-	source_aarch64 = mongodb-org-mongos_5.0.3_aarch64.deb::https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-arm64/mongodb-org-mongos_5.0.3_arm64.deb
-	source_aarch64 = mongodb-mongosh_1.0.4_aarch64.deb::https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-arm64/mongodb-mongosh_1.0.4_arm64.deb
-	sha256sums_aarch64 = 6788be092218f1dde71d179ac8a6370b7bdac8dc3c2449ab7fe004e5855d3f05
-	sha256sums_aarch64 = e090de5b55702af731feaf9cf5c79577233ecb24235a854c13056cca470f67c5
-	sha256sums_aarch64 = 7e8114e95fd93bbeccd9d72569a37db79d1ec7087e62727fc3487ce43b1e750f
-	sha256sums_aarch64 = b20ec0e5d573a183da2fbc3c7b27a2149b9a104cd715832a71c2b6b31491b68d
+	source_x86_64 = mongodb-org-shell_5.0.4_x86_64.deb::https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-amd64/mongodb-org-shell_5.0.4_amd64.deb
+	source_x86_64 = mongodb-org-server_5.0.4_x86_64.deb::https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-amd64/mongodb-org-server_5.0.4_amd64.deb
+	source_x86_64 = mongodb-org-mongos_5.0.4_x86_64.deb::https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-amd64/mongodb-org-mongos_5.0.4_amd64.deb
+	sha256sums_x86_64 = 72c27e4b071750be887afe7ff04067b47acee80400378e7434e6976b4ecb587f
+	sha256sums_x86_64 = d2379af18b62d1d84d66b5953620be5f2e4533e04920c2571ce1b66b5cbabaca
+	sha256sums_x86_64 = 4d4072a4b3a891bd5aaa2e298a0d546097eab99e4c93e415fda6daae3ac26a82
+	source_aarch64 = mongodb-org-shell_5.0.4_aarch64.deb::https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-arm64/mongodb-org-shell_5.0.4_arm64.deb
+	source_aarch64 = mongodb-org-server_5.0.4_aarch64.deb::https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-arm64/mongodb-org-server_5.0.4_arm64.deb
+	source_aarch64 = mongodb-org-mongos_5.0.4_aarch64.deb::https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-arm64/mongodb-org-mongos_5.0.4_arm64.deb
+	sha256sums_aarch64 = 629b4f62ae2f49563bc93fe26c4eac9e89a247d74a4973bd838017dcd400a16f
+	sha256sums_aarch64 = 24a191c43197945edf16fc906ee902fbd12a6b414e78e2f2bbbdf7cd7268d72c
+	sha256sums_aarch64 = 5a187bc61a2357f22551375681724021e6b6f96c8993e9e3e25eb69075ba8a55
 
 pkgname = mongodb-bin
diff --git a/PKGBUILD b/PKGBUILD
index 8dfe04d3325b..240bef1195e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,9 @@
 #Maintainer: Rafael Fontenelle <rafaelff at gnome dot org>
 
 pkgname="mongodb-bin"
-pkgver="5.0.3"
+pkgver="5.0.4"
 _basever="5.0"
 _basedist="focal"
-_mshver="1.0.4"
 pkgrel="1"
 pkgdesc="A high-performance, open source, schema-free document-oriented database"
 arch=("x86_64" "aarch64")
@@ -14,7 +13,7 @@ license=("custom:SSPLv1" "Apache")
 depends=("curl")
 optdepends=("mongodb-tools: The MongoDB tools provide import, export, and diagnostic capabilities.")
 provides=("mongodb=$pkgver")
-conflicts=("mongodb" "mongosh-bin" "mongodb-shell-bin")
+conflicts=("mongodb" "mongodb-shell-bin")
 backup=("etc/mongodb.conf")
 
 _repo_url=https://repo.mongodb.org/apt/ubuntu/dists/${_basedist}/mongodb-org/${_basever}/multiverse
@@ -28,44 +27,40 @@ source_x86_64=(
     mongodb-org-shell_${pkgver}_x86_64.deb::"${_repo_url}/binary-amd64/mongodb-org-shell_${pkgver}_amd64.deb"
     mongodb-org-server_${pkgver}_x86_64.deb::"${_repo_url}/binary-amd64/mongodb-org-server_${pkgver}_amd64.deb"
     mongodb-org-mongos_${pkgver}_x86_64.deb::"${_repo_url}/binary-amd64/mongodb-org-mongos_${pkgver}_amd64.deb"
-    mongodb-mongosh_${_mshver}_x86_64.deb::"${_repo_url}/binary-amd64/mongodb-mongosh_${_mshver}_amd64.deb")
+)
 source_aarch64=(
     mongodb-org-shell_${pkgver}_aarch64.deb::"${_repo_url}/binary-arm64/mongodb-org-shell_${pkgver}_arm64.deb"
     mongodb-org-server_${pkgver}_aarch64.deb::"${_repo_url}/binary-arm64/mongodb-org-server_${pkgver}_arm64.deb"
     mongodb-org-mongos_${pkgver}_aarch64.deb::"${_repo_url}/binary-arm64/mongodb-org-mongos_${pkgver}_arm64.deb"
-    mongodb-mongosh_${_mshver}_aarch64.deb::"${_repo_url}/binary-arm64/mongodb-mongosh_${_mshver}_arm64.deb")
+)
 noextract=(
     mongodb-org-shell_${pkgver}_${CARCH}.deb
     mongodb-org-server_${pkgver}_${CARCH}.deb
     mongodb-org-mongos_${pkgver}_${CARCH}.deb
-    mongodb-mongosh_${_mshver}_${CARCH}.deb)
+)
 sha256sums=('f2a79c7fcd75253ab1cb888541a0c0678bf3bb78700c79996e24a678f1e42850'
             'de4f6770c45bc5418883659c479783c0184a6057df1c405a7933637984f82f0a'
             '47b884569102f7c79017ee78ef2e98204a25aa834c0ee7d5d62c270ab05d4e2b'
             '51ee1e1f71598aad919db79a195778e6cb6cfce48267565e88a401ebc64497ac'
             '09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27')
-sha256sums_x86_64=('91677a013d1ccff55bbb304ad5f0a23395ffb74b137e30b9a46c2d2c91ca4cde'
-                   'fb189d87bfafa3e69eda249e0b9daaa4be535390c2b162e541822c80d1cfa043'
-                   '47a649c830a818e99efc0e18b3c8dd940453f36a279c833813429e8dd91f8393'
-                   '57d77e07c80c12f7a0c2c2e5d7041a682c162c25cab46496af0da624927a8913')
-sha256sums_aarch64=('6788be092218f1dde71d179ac8a6370b7bdac8dc3c2449ab7fe004e5855d3f05'
-                    'e090de5b55702af731feaf9cf5c79577233ecb24235a854c13056cca470f67c5'
-                    '7e8114e95fd93bbeccd9d72569a37db79d1ec7087e62727fc3487ce43b1e750f'
-                    'b20ec0e5d573a183da2fbc3c7b27a2149b9a104cd715832a71c2b6b31491b68d')
-
+sha256sums_x86_64=('72c27e4b071750be887afe7ff04067b47acee80400378e7434e6976b4ecb587f'
+                   'd2379af18b62d1d84d66b5953620be5f2e4533e04920c2571ce1b66b5cbabaca'
+                   '4d4072a4b3a891bd5aaa2e298a0d546097eab99e4c93e415fda6daae3ac26a82'
+)
+sha256sums_aarch64=('629b4f62ae2f49563bc93fe26c4eac9e89a247d74a4973bd838017dcd400a16f'
+                    '24a191c43197945edf16fc906ee902fbd12a6b414e78e2f2bbbdf7cd7268d72c'
+                    '5a187bc61a2357f22551375681724021e6b6f96c8993e9e3e25eb69075ba8a55'
+)
 prepare() {
   mkdir -p output
   bsdtar -O -xf mongodb-org-shell_${pkgver}_${CARCH}.deb data.tar.xz | bsdtar -C output -xJf -  #mongo extracted
   bsdtar -O -xf mongodb-org-server_${pkgver}_${CARCH}.deb data.tar.xz | bsdtar -C output -xJf - #server extracted
   bsdtar -O -xf mongodb-org-mongos_${pkgver}_${CARCH}.deb data.tar.xz | bsdtar -C output -xJf - #mongos extracted
-  bsdtar -O -xf mongodb-mongosh_${_mshver}_${CARCH}.deb data.tar.xz | bsdtar -C output -xJf -   #mongosh extracted
 }
 
 package() {
   mkdir -p "$pkgdir/usr/share/man"
   cp -r "output/usr/bin" "$pkgdir/usr/"
-  # TODO:mongocrypt-mongosh is missing libsasl2.so.2 soname, not available in Arch
-  #cp -r "output/usr/libexec"/* "$pkgdir/usr/bin/"
   cp -r "output/usr/share/man/man1" "$pkgdir/usr/share/man/"
   install -Dm644 "mongodb.conf" "$pkgdir/etc/mongodb.conf"
   install -Dm644 "mongodb.service" "$pkgdir/usr/lib/systemd/system/mongodb.service"