From fab762324e3c87ab0f3052f29147b7eaede5358c Mon Sep 17 00:00:00 2001 From: pkleinejaeger Date: Wed, 13 Jan 2021 02:39:38 +0100 Subject: [PATCH] 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 --- spk/transmission/Makefile | 7 +------ spk/transmission/src/service-setup.sh | 6 ------ spk/transmission/src/wizard/install_uifile | 2 +- spk/transmission/src/wizard/install_uifile_fre | 2 +- spk/transmission/src/wizard/upgrade_uifile | 4 ++-- spk/transmission/src/wizard/upgrade_uifile_fre | 4 ++-- 6 files changed, 7 insertions(+), 18 deletions(-) diff --git a/spk/transmission/Makefile b/spk/transmission/Makefile index ab526c5f6241..a10ab7c25943 100644 --- 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 index f3faa68ab62e..a065d5a5b1da 100644 --- 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 index ccd4e394faed..a8f3b66a800b 100644 --- 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 'sc-download' in DSM.
The group 'users' is no longer used as of DSM 6.
Package user will not appear on most UI settings.
Please read Permission Management for details." + "desc": "Please read Permission Management for details." } ] } diff --git a/spk/transmission/src/wizard/install_uifile_fre b/spk/transmission/src/wizard/install_uifile_fre index 052ae3fd2886..bea3414cbc44 100644 --- 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 'sc-download' dans DSM.
Le groupe 'users' n'est plus utilisé depuis DSM 6.
L'utilisateur spécifique à l'application n'apparaît plus dans la plupart des interfaces de configuration.
Merci de lire Permission Management pour plus de détails." + "desc": "Merci de lire Permission Management pour plus de détails." }] }] diff --git a/spk/transmission/src/wizard/upgrade_uifile b/spk/transmission/src/wizard/upgrade_uifile index bb14f4096928..434a171a9bc6 100644 --- 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 'sc-download' in DSM.
The group 'users' is no longer used as of DSM 6.
Package user will not appear on most UI settings.
Please read Permission Management for details." + "desc": "Please read Permission Management for details." }, { - "desc": "NOTE: 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": "NOTE: 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." }] }] \ No newline at end of file diff --git a/spk/transmission/src/wizard/upgrade_uifile_fre b/spk/transmission/src/wizard/upgrade_uifile_fre index 916e1d81e3d3..b7892f9449c9 100644 --- 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 'sc-download' dans DSM.
Le groupe 'users' n'est plus utilisé depuis DSM 6.
L'utilisateur spécifique à l'application n'apparaît plus dans la plupart des interfaces de configuration.
Merci de lire Permission Management pour plus de détails." + "desc": "Merci de lire Permission Management pour plus de détails." }, { - "desc": "NOTE: 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." }] }] \ No newline at end of file