From 8ed5f6929e50a637670f707a24c8f07cf8fc17a9 Mon Sep 17 00:00:00 2001
From: suyuan168 <175338101@qq.com>
Date: Sat, 15 Jan 2022 19:06:53 +0800
Subject: [PATCH] Revert "fixmodemmanager"

This reverts commit 45937aa2e79e9e081b27b63e7f8a9a289d56d35a.
---
 modemmanager/Makefile                         |  4 +--
 .../files/usr/sbin/ModemManager-wrapper       | 33 -------------------
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 modemmanager/files/usr/sbin/ModemManager-wrapper

diff --git a/modemmanager/Makefile b/modemmanager/Makefile
index db59989b2..570bc9293 100644
--- a/modemmanager/Makefile
+++ b/modemmanager/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=modemmanager
 PKG_VERSION:=1.18.2
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
 
 PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager
 PKG_HASH:=374be158ae1c1fb38a29eef1cc3cdf89ff3536b48ff1320d208ab204ea6c5f8a
 PKG_BUILD_DIR:=$(BUILD_DIR)/ModemManager-$(PKG_VERSION)
 
-PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>
+PKG_MAINTAINER:=Nicholas Smith <nicholas.smith@telcoantennas.com.au>
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
diff --git a/modemmanager/files/usr/sbin/ModemManager-wrapper b/modemmanager/files/usr/sbin/ModemManager-wrapper
deleted file mode 100644
index 4fd64227f..000000000
--- a/modemmanager/files/usr/sbin/ModemManager-wrapper
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-trap_with_arg() {
-	func="$1" ; shift
-	for sig ; do
-		# shellcheck disable=SC2064
-		trap "$func $sig" "$sig"
-	done
-}
-
-func_trap() {
-	logger "ModemManager-wrapper[$$]" "Sending signal ${1}..."
-	kill "-${1}" "$CHILD" 2>/dev/null
-}
-
-main() {
-	. /usr/share/ModemManager/modemmanager.common
-
-	trap_with_arg func_trap INT TERM KILL
-
-	mkdir -p "${MODEMMANAGER_RUNDIR}"
-	chmod 0755 "${MODEMMANAGER_RUNDIR}"
-	mm_cleanup_interfaces
-
-	/usr/sbin/ModemManager "$@" 1>/dev/null 2>/dev/null &
-	CHILD="$!"
-
-	mm_report_events_from_cache
-
-	wait "$CHILD"
-}
-
-main "$@"