Transmission: Remove busybox from deps (#4373)

* Remove busybox dep * transmission: remove unnecessary GROUP setting from service-setup.sh * transmission: set GROUP for backwards compatibility * Undo SPK_REV/CHANGELOG * Adjust wizard text * Remove now superfluous busybox configs
SynoCommunity · Apr 17, 2021 · fab7623 · fab7623
1 parent 32fb20b
commit fab7623
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 18 deletions.
diff --git a/spk/transmission/Makefile b/spk/transmission/Makefile
@@ -3,7 +3,7 @@ SPK_VERS = 3.00
 SPK_REV = 19
 SPK_ICON = src/transmission.png
 
-DEPENDS = cross/busybox cross/$(SPK_NAME)
+DEPENDS = cross/$(SPK_NAME)
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = Transmission is an easy and fast BitTorrent client. You can control it remotely with its web interface or dedicated applications.
@@ -30,13 +30,8 @@ ADMIN_PORT = $(SERVICE_PORT)
 
 POST_STRIP_TARGET = transmission_extra_install
 
-BUSYBOX_CONFIG = usrmng
-ENV += BUSYBOX_CONFIG="$(BUSYBOX_CONFIG)"
-
-
 include ../../mk/spksrc.spk.mk
 
-
 .PHONY: transmission_extra_install
 transmission_extra_install:
 	install -m 755 -d $(STAGING_DIR)/var

diff --git a/spk/transmission/src/service-setup.sh b/spk/transmission/src/service-setup.sh
@@ -56,12 +56,6 @@ service_postinst ()
             set_syno_permissions "${wizard_incomplete_dir}" "${GROUP}"
         fi
     fi
-
-    # Discard legacy obsolete busybox user account
-    BIN=${SYNOPKG_PKGDEST}/bin
-    $BIN/busybox --install $BIN >> ${INST_LOG}
-    $BIN/delgroup "${USER}" "users" >> ${INST_LOG}
-    $BIN/deluser "${USER}" >> ${INST_LOG}
 }
 
 

diff --git a/spk/transmission/src/wizard/install_uifile b/spk/transmission/src/wizard/install_uifile
@@ -118,7 +118,7 @@
         "step_title": "DSM Permissions",
         "items": [
             {
-                "desc": "Permissions for all download-related packages of SynoCommunity are managed with the group <b>'sc-download'</b> in DSM.<br>The group 'users' is no longer used as of DSM 6.<br>Package user will not appear on most UI settings.<br>Please read <a target=\"_blank\" href=\"https://github.com/SynoCommunity/spksrc/wiki/Permission-Management\">Permission Management</a> for details."
+                "desc": "Please read <a target=\"_blank\" href=\"https://github.com/SynoCommunity/spksrc/wiki/Permission-Management\">Permission Management</a> for details."
             }
         ]
     }

diff --git a/spk/transmission/src/wizard/install_uifile_fre b/spk/transmission/src/wizard/install_uifile_fre
@@ -64,6 +64,6 @@
 }, {
      "step_title": "Permissions DSM",
      "items": [{
-         "desc": "Les permissions de toutes les applications de SynoCommunity liés au téléchargement sont gérées par le groupe <b>'sc-download'</b> dans DSM.<br>Le groupe 'users' n'est plus utilisé depuis DSM 6.<br>L'utilisateur spécifique à l'application n'apparaît plus dans la plupart des interfaces de configuration.<br>Merci de lire <a target=\"_blank\" href=\"https://github.com/SynoCommunity/spksrc/wiki/Permission-Management\">Permission Management</a> pour plus de détails."
+         "desc": "Merci de lire <a target=\"_blank\" href=\"https://github.com/SynoCommunity/spksrc/wiki/Permission-Management\">Permission Management</a> pour plus de détails."
      }]
 }]
diff --git a/spk/transmission/src/wizard/upgrade_uifile b/spk/transmission/src/wizard/upgrade_uifile
@@ -1,9 +1,9 @@
 [{
     "step_title": "DSM Permissions",
     "items": [{
-        "desc": "Permissions for all download-related packages of SynoCommunity are managed with the group <b>'sc-download'</b> in DSM.<br>The group 'users' is no longer used as of DSM 6.<br>Package user will not appear on most UI settings.<br>Please read <a target=\"_blank\" href=\"https://github.com/SynoCommunity/spksrc/wiki/Permission-Management\">Permission Management</a> for details."
+        "desc": "Please read <a target=\"_blank\" href=\"https://github.com/SynoCommunity/spksrc/wiki/Permission-Management\">Permission Management</a> for details."
     },
     {
-        "desc": "<strong style='color:red'>NOTE:</strong> The package upgrade will try to set the correct permissions on your folders. If you get permission errors within Transmission, manually set Read/Write permissions for the 'sc-download' group on the reported folders using File Station."
+        "desc": "<strong style='color:red'>NOTE:</strong> The package upgrade will try to set the correct permissions on your folders. If you get permission errors within Transmission, manually set Read/Write permissions on the reported folders using File Station."
     }]
 }]
diff --git a/spk/transmission/src/wizard/upgrade_uifile_fre b/spk/transmission/src/wizard/upgrade_uifile_fre
@@ -1,9 +1,9 @@
 [{
     "step_title": "Permissions DSM",
     "items": [{
-        "desc": "Les permissions de toutes les applications de SynoCommunity liés au téléchargement sont gérées par le groupe <b>'sc-download'</b> dans DSM.<br>Le groupe 'users' n'est plus utilisé depuis DSM 6.<br>L'utilisateur spécifique à l'application n'apparaît plus dans la plupart des interfaces de configuration.<br>Merci de lire <a target=\"_blank\" href=\"https://github.com/SynoCommunity/spksrc/wiki/Permission-Management\">Permission Management</a> pour plus de détails."
+        "desc": "Merci de lire <a target=\"_blank\" href=\"https://github.com/SynoCommunity/spksrc/wiki/Permission-Management\">Permission Management</a> pour plus de détails."
     },
     {
-        "desc": "<strong style='color:red'>NOTE:</strong> La mise à jour de l'application va tenter de corriger les permissions des répertoires. En cas d'erreur de permission dans Transmission, donner les droits de Lecture/Ecriture au groupe 'sc-download' sur les répertoires mentionnés depuis File Station."
+        "desc": "En cas d'erreur de permission dans Transmission, donner les droits de Lecture/Ecriture sur les repertoires mentionnès depuis File Station."
     }]
 }]