From 8ae1039a95f2f1988ba220ec839b2ddea1754866 Mon Sep 17 00:00:00 2001
From: Dylan Van Assche <me@dylanvanassche.be>
Date: Sun, 5 Sep 2021 18:30:16 +0200
Subject: [PATCH] temp/modemmanager: drop, upstreamed to Alpine (MR 2490)

All patches are merged upstream and released in the latest release.
Drop our fork and use Alpine's version again.
---
 temp/modemmanager/APKBUILD           | 86 ----------------------------
 temp/modemmanager/modemmanager.initd | 11 ----
 temp/modemmanager/modemmanager.rules | 19 ------
 3 files changed, 116 deletions(-)
 delete mode 100644 temp/modemmanager/APKBUILD
 delete mode 100644 temp/modemmanager/modemmanager.initd
 delete mode 100644 temp/modemmanager/modemmanager.rules

diff --git a/temp/modemmanager/APKBUILD b/temp/modemmanager/APKBUILD
deleted file mode 100644
index 46af8bd1e..000000000
--- a/temp/modemmanager/APKBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# Forked from Alpine to package latest 1.18rc1 release candidate
-pkgname=modemmanager
-pkgver=9999_git20210819
-_pkgver=1.17.900
-pkgrel=0
-pkgdesc="ModemManager library"
-url="http://www.freedesktop.org/wiki/Software/ModemManager"
-arch="all !mips !mips64 !s390x !riscv64" # limited by polkit
-license="GPL-2.0-or-later AND LGPL-2.1-or-later"
-depends="dbus polkit"
-depends_dev="libmm-glib"
-makedepends="$depends_dev gobject-introspection-dev gtk-doc vala
-	libgudev-dev polkit-dev libmbim-dev libqmi-dev linux-headers"
-checkdepends="glib-dev"
-options="!check" # https://bugs.freedesktop.org/show_bug.cgi?id=101197
-subpackages="
-	$pkgname-lang
-	$pkgname-doc
-	libmm-glib:libmm
-	$pkgname-dev
-	$pkgname-openrc
-	$pkgname-bash-completion
-	"
-source="https://www.freedesktop.org/software/ModemManager/ModemManager-$_pkgver.tar.xz
-	$pkgname.rules
-	$pkgname.initd
-	"
-builddir="$srcdir"/ModemManager-$_pkgver
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--with-polkit=permissive \
-		--enable-plugin-qcom-soc \
-		--enable-gtk-doc \
-		--disable-static \
-		--enable-vala=yes \
-		--with-systemd-suspend-resume=yes
-	make
-}
-
-libmm() {
-	cd "$builddir"
-	mkdir -p "$subpkgdir"
-	make DESTDIR="$subpkgdir" -C libmm-glib install
-	# move dev files to modemmnager-dev
-	mv -f "$subpkgdir/usr/include/libmm-glib" "$pkgdir/usr/include/"
-	mv -f "$subpkgdir/usr/share/gir-1.0" "$pkgdir/usr/share/"
-	rmdir "$subpkgdir/usr/include" "$subpkgdir/usr/share"
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	make DESTDIR="$pkgdir" -C libmm-glib uninstall
-	rmdir "$pkgdir"/usr/lib/girepository-1.0 # in libmm-glib
-	rm -rf "$pkgdir"/usr/share/dbus-1/system-services #systemd-service
-	mkdir -p "$pkgdir/usr/share/polkit-1/rules.d"
-	install -m644 -D "$srcdir/$pkgname.rules" \
-		"$pkgdir/usr/share/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
-	install -m755 -D "$srcdir/$pkgname.initd" \
-		"$pkgdir/etc/init.d/$pkgname"
-	# post-install message
-	mkdir -p "$pkgdir/usr/share/doc/$pkgname"
-	cat > $pkgdir/usr/share/doc/$pkgname/README.alpine <<EOF
-If your USB modem shows up as a Flash drive when you plug it in:
-
-install 'usb-modeswitch' to automatically switch to USB modem mode whenever you plug it in.
-To control your modem without the root password: add your user account to the 'plugdev' group.
-EOF
-}
-
-check() {
-	make check
-}
-
-sha512sums="
-0318f7c20a5090e32a2752ec05c33d447956f15cbccfe7773cbd39b81f42c02f18fbf1941c26ef766747d22c10787250c23b106fc4017ed4c4906c3c9810a0ff  ModemManager-1.17.900.tar.xz
-6fab86c27502b29be0c6610d835a3249a4a81993eb986cff2c3ea9393fadd3f693ba4bb0532ae0e50a83d359559511859dd05f7ea2f0cb52839f535a7e49f8a0  modemmanager.rules
-9f74a2473b9cc7be42a467809639f5720ab251d13f29f8bbd4fd9a13edb80c10c5ee50fbe50819bfe67f231805b92f007c3e7403c46ab998dc843e1f9549659b  modemmanager.initd
-"
diff --git a/temp/modemmanager/modemmanager.initd b/temp/modemmanager/modemmanager.initd
deleted file mode 100644
index 29310b355..000000000
--- a/temp/modemmanager/modemmanager.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-
-supervisor=supervise-daemon
-command=/usr/sbin/ModemManager
-command_args="${modemmanager_opts}"
-
-description="ModemManager Daemon"
-
-depend() {
-   need dbus
-}
diff --git a/temp/modemmanager/modemmanager.rules b/temp/modemmanager/modemmanager.rules
deleted file mode 100644
index 4c56fb7f9..000000000
--- a/temp/modemmanager/modemmanager.rules
+++ /dev/null
@@ -1,19 +0,0 @@
-// Let users in plugdev group modify ModemManager
-polkit.addRule(function(action, subject) {
-    if ((action.id == "org.freedesktop.ModemManager1.Device.Control" ||
-	action.id == "org.freedesktop.ModemManager1.Contacts" ||
-	action.id == "org.freedesktop.ModemManager1.Messaging" ||
-	action.id == "org.freedesktop.ModemManager1.Location") &&
-        subject.isInGroup("plugdev") && subject.active) {
-        return "yes";
-    }
-});
-
-// Let geoclue modify ModemManager for location gathering
-polkit.addRule(function(action, subject) {
-    if ((action.id == "org.freedesktop.ModemManager1.Device.Control" ||
-	action.id == "org.freedesktop.ModemManager1.Location") &&
-        subject.isInGroup("geoclue")) {
-        return "yes";
-    }
-});