From 94ed35d3a786917f1fb9c779ea18c741307e6756 Mon Sep 17 00:00:00 2001 From: Dmitry Razumov Date: Thu, 28 Nov 2024 23:47:31 +0600 Subject: [PATCH 1/4] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB(?= =?UTF-8?q?=D0=B0)=20=D0=BD=D0=B0=20'com.ublinux.ubl-settings-kernel.polic?= =?UTF-8?q?y'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- com.ublinux.ubl-settings-kernel.policy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/com.ublinux.ubl-settings-kernel.policy b/com.ublinux.ubl-settings-kernel.policy index 211c7c1..8151649 100644 --- a/com.ublinux.ubl-settings-kernel.policy +++ b/com.ublinux.ubl-settings-kernel.policy @@ -13,9 +13,9 @@ Authentication is required to run ubl-settings-kernel Требуется авторизация для запуска утилиты ubl-settings-kernel с правами root - auth_admin - auth_admin - auth_admin + auth_admin_keep + auth_admin_keep + auth_admin_keep /usr/bin/ubl-settings-kernel true From 29e40e2f39afbdb18dc338bc0046e5cc629dd950 Mon Sep 17 00:00:00 2001 From: asmeron Date: Mon, 2 Jun 2025 21:48:45 +0600 Subject: [PATCH 2/4] Fix uninstall --- Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e02b91b..cb4bec0 100644 --- a/Makefile +++ b/Makefile @@ -85,14 +85,9 @@ uninstall: $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \ done - @for FILE_SVG in $(wildcard *.svg); do \ - for SIZE in 16x16 32x32 48x48 scalable; do \ - $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \ - done; \ - done @for FILE_ICON in $(wildcard icons/*/*.svg); do \ SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \ - $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}/$${FILE_ICON}"; \ + $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}/$${FILE_ICON##*/}"; \ done @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" @@ -112,7 +107,7 @@ uninstall: install: check uninstall @echo "Install ..." @for LANG in $$(find ./locale -iname "*.po" -print | sed -En "s/.+_([[:alpha:]]+)\.po/\1/p" | sort -u); do \ - install -dm755 "${DESTDIR}/share/locale/$${LANG}/LC_MESSAGES"; \ + install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \ # PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ PKGNAME_PO="./locale/${PKGNAME}_$${LANG}.po"; [[ -f "$${PKGNAME_PO}" ]] || PKGNAME_PO= ; \ From 3a3b3c35e3830597d2f97c989b76dc421962d74c Mon Sep 17 00:00:00 2001 From: asmeron Date: Mon, 2 Jun 2025 21:52:39 +0600 Subject: [PATCH 3/4] Returning a deletion --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index cb4bec0..2e62183 100644 --- a/Makefile +++ b/Makefile @@ -85,6 +85,11 @@ uninstall: $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \ done + @for FILE_SVG in $(wildcard *.svg); do \ + for SIZE in 16x16 32x32 48x48 scalable; do \ + $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \ + done; \ + done @for FILE_ICON in $(wildcard icons/*/*.svg); do \ SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \ $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}/$${FILE_ICON##*/}"; \ From 761f93a40956c7da603b9032adc3f7fffc33fdc1 Mon Sep 17 00:00:00 2001 From: asmeron Date: Tue, 8 Jul 2025 10:23:07 +0600 Subject: [PATCH 4/4] Fix kernel-list-addon.csv kernel-list.csv and locale --- kernel-list-addon.csv | 9 +++++--- kernel-list.csv | 7 ++++--- locale/kernel-list-addon.pot | 31 ++++++++++++++------------- locale/kernel-list-addon_ru.po | 38 +++++++++++++++++----------------- locale/kernel-list.pot | 6 +++--- locale/kernel-list_ru.po | 12 +++++------ 6 files changed, 53 insertions(+), 50 deletions(-) diff --git a/kernel-list-addon.csv b/kernel-list-addon.csv index ef9f6f4..d7f1808 100644 --- a/kernel-list-addon.csv +++ b/kernel-list-addon.csv @@ -1,10 +1,13 @@ NAME;PAСKAGE_UBM;PAСKAGE;DESCRIPTION Linux 5.15 headers;ubm-002-linux515-headers;linux515-headers;The Linux kernel headers v5.15 Linux 5.15 Docs;ubm-003-linux515-docs;linux515-docs;The Linux kernel docs v5.15 -Linux 5.15 DKMS modules;ubm-linux515-dkms;;The Linux kernel DKMS modules v5.15 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu +Linux 5.15 DKMS modules;ubm-linux515-dkms;;The Linux kernel DKMS modules v5.15 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu +Linux 5.15 DKMS modules;ubm-linux515-r8168-8136;;The Linux kernel DKMS modules v5.15 : r8168-8136 Linux 6.1 headers;ubm-002-linux61-headers;linux61-headers;The Linux kernel headers v6.1 Linux 6.1 Docs;ubm-003-linux61-docs;linux61-docs;The Linux kernel docs v6.1 -Linux 6.1 DKMS modules;ubm-linux61-dkms;;The Linux kernel DKMS modules v6.1 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu +Linux 6.1 DKMS modules;ubm-linux61-dkms;;The Linux kernel DKMS modules v6.1 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu +Linux 6.1 DKMS modules;ubm-linux61-r8168-8136;;The Linux kernel DKMS modules v6.1 : r8168-8136 Linux 6.6 headers;ubm-002-linux66-headers;linux66-headers;The Linux kernel headers v6.6 Linux 6.6 Docs;ubm-003-linux66-docs;linux66-docs;The Linux kernel docs v6.6 -Linux 6.6 DKMS modules;ubm-linux66-dkms;;The Linux kernel DKMS modules v6.6 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu \ No newline at end of file +Linux 6.6 DKMS modules;ubm-linux66-dkms;;The Linux kernel DKMS modules v6.6 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu +Linux 6.6 DKMS modules;ubm-linux66-dkms-r8168-8136;;The Linux kernel DKMS modules v6.6 : r8168-8136 \ No newline at end of file diff --git a/kernel-list.csv b/kernel-list.csv index eb5ba2f..e97af1f 100644 --- a/kernel-list.csv +++ b/kernel-list.csv @@ -1,4 +1,5 @@ NAME;PAСKAGE_UBM;PAСKAGE;PAСKAGE_UBM_REQUIRED;PAСKAGE_REQUIRED;TAG;DESCRIPTION -Linux 5.15;ubm-001-linux515;linux515;ubm-002-linux515-headers;linux515-headers;LTS, Stable, RealTime, Hardened, Recomended;The Linux kernel v5.15 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs -Linux 6.1;ubm-001-linux61;linux61;ubm-002-linux61-headers;linux61-headers;LTS, Stable, RealTime, Hardened, Recomended;The Linux kernel v6.1 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs -Linux 6.6;ubm-001-linux66;linux66;ubm-002-linux66-headers;linux66-headers;LTS, Stable, RealTime, Hardened, Recomended;The Linux kernel v6.6 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs \ No newline at end of file +Linux 5.15;ubm-001-linux515-test;linux515-test;ubm-002-linux515-test-headers;linux515-test-headers;LTS, Stable, RealTime, Hardened, Recomended;The Linux kernel v5.15 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs +Linux 5.15;ubm-001-linux515;linux515;ubm-002-linux515-headers;linux515-headers;LTS, Stable;The Linux kernel v5.15 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs +Linux 6.1;ubm-001-linux61;linux61;ubm-002-linux61-headers;linux61-headers;LTS, Stable, Recomended;The Linux kernel v6.1 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs +Linux 6.6;ubm-001-linux66;linux66;ubm-002-linux66-headers;linux66-headers;LTS, Stable;The Linux kernel v6.6 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs \ No newline at end of file diff --git a/locale/kernel-list-addon.pot b/locale/kernel-list-addon.pot index c09a779..a44d879 100644 --- a/locale/kernel-list-addon.pot +++ b/locale/kernel-list-addon.pot @@ -1,14 +1,14 @@ # Language translations for ubl-settings-kernel package. -# Copyright (C) 2022, UBTech LLC +# Copyright (C) 2025, UBTech LLC # This file is distributed under the same license as the ubl-settings-kernel.kernel-list-addon.csv package. -# UBLinux Team , 2022 +# UBLinux Team , 2025 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: ubl-settings-kernel 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-22 16:12+0600\n" +"POT-Creation-Date: 2025-05-22 16:12+0600\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -17,42 +17,41 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ./kernel-list-addon.csv:1 msgid "DESCRIPTION" msgstr "" -#: ./kernel-list-addon.csv:2 msgid "The Linux kernel headers v5.15" msgstr "" -#: ./kernel-list-addon.csv:3 msgid "The Linux kernel docs v5.15" msgstr "" -#: ./kernel-list-addon.csv:4 -msgid "The Linux kernel DKMS modules v5.15 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu" +msgid "The Linux kernel DKMS modules v5.15 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu" +msgstr "" + +msgid "The Linux kernel DKMS modules v5.15 : r8168-8136" msgstr "" -#: ./kernel-list-addon.csv:5 msgid "The Linux kernel headers v6.1" msgstr "" -#: ./kernel-list-addon.csv:6 msgid "The Linux kernel docs v6.1" msgstr "" -#: ./kernel-list-addon.csv:7 -msgid "The Linux kernel DKMS modules v6.1 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu" +msgid "The Linux kernel DKMS modules v6.1 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu" +msgstr "" + +msgid "The Linux kernel DKMS modules v6.1 : r8168-8136" msgstr "" -#: ./kernel-list-addon.csv:8 msgid "The Linux kernel headers v6.6" msgstr "" -#: ./kernel-list-addon.csv:9 msgid "The Linux kernel docs v6.6" msgstr "" -#: ./kernel-list-addon.csv:10 -msgid "The Linux kernel DKMS modules v6.6 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu" +msgid "The Linux kernel DKMS modules v6.6 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu" +msgstr "" + +msgid "The Linux kernel DKMS modules v6.6 : r8168-8136" msgstr "" diff --git a/locale/kernel-list-addon_ru.po b/locale/kernel-list-addon_ru.po index 8e24f02..90d3912 100644 --- a/locale/kernel-list-addon_ru.po +++ b/locale/kernel-list-addon_ru.po @@ -1,15 +1,15 @@ # Russian translations for ubl-settings-kernel package. -# Copyright (C) 2022, UBTech LLC +# Copyright (C) 2025, UBTech LLC # This file is distributed under the same license as the ubl-settings-kernel package. -# UBLinux Team , 2022 +# UBLinux Team , 2025 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: ubl-settings-kernel 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-22 16:12+0600\n" -"PO-Revision-Date: 2023-01-01 00:00+0600\n" +"POT-Creation-Date: 2025-05-22 16:12+0600\n" +"PO-Revision-Date: 2025-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" "Language-Team: Russian - UBLinux Team \n" "Language: Russian\n" @@ -17,38 +17,38 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ./kernel-list-addon.csv:2 msgid "The Linux kernel headers v5.15" msgstr "Ядро Linux, заголовки версии 5.15" -#: ./kernel-list-addon.csv:3 msgid "The Linux kernel docs v5.15" msgstr "Ядро Linux, документация версии 5.15" -#: ./kernel-list-addon.csv:4 -msgid "The Linux kernel DKMS modules v5.15 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu" -msgstr "Ядро Linux, DKMS-модули версии 5.15: v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu" +msgid "The Linux kernel DKMS modules v5.15 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu" +msgstr "Ядро Linux, DKMS-модули версии 5.15: v4l2loopback, rtl88x2bu, r8125, rtl8192eu" + +msgid "The Linux kernel DKMS modules v5.15 : r8168-8136" +msgstr "Ядро Linux, DKMS-модули версии 5.15: r8168-8136" -#: ./kernel-list-addon.csv:5 msgid "The Linux kernel headers v6.1" msgstr "Ядро Linux, заголовки версии 6.1" -#: ./kernel-list-addon.csv:6 msgid "The Linux kernel docs v6.1" msgstr "Ядро Linux, документация версии 6.1" -#: ./kernel-list-addon.csv:7 -msgid "The Linux kernel DKMS modules v6.1 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu" -msgstr "Ядро Linux, DKMS-модули версии 6.1: v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu" +msgid "The Linux kernel DKMS modules v6.1 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu" +msgstr "Ядро Linux, DKMS-модули версии 6.1: v4l2loopback, rtl88x2bu, r8125, rtl8192eu" + +msgid "The Linux kernel DKMS modules v6.1 : r8168-8136" +msgstr "Ядро Linux, DKMS-модули версии 6.1: r8168-8136" -#: ./kernel-list-addon.csv:8 msgid "The Linux kernel headers v6.6" msgstr "Ядро Linux, заголовки версии 6.6" -#: ./kernel-list-addon.csv:9 msgid "The Linux kernel docs v6.6" msgstr "Ядро Linux, документация версии 6.6" -#: ./kernel-list-addon.csv:10 -msgid "The Linux kernel DKMS modules v6.6 : v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu" -msgstr "Ядро Linux, DKMS-модули версии 6.6: v4l2loopback, r8168-8136, rtl88x2bu, r8125, rtl8192eu" +msgid "The Linux kernel DKMS modules v6.6 : v4l2loopback, rtl88x2bu, r8125, rtl8192eu" +msgstr "Ядро Linux, DKMS-модули версии 6.6: v4l2loopback, rtl88x2bu, r8125, rtl8192eu" + +msgid "The Linux kernel DKMS modules v6.6 : r8168-8136" +msgstr "Ядро Linux, DKMS-модули версии 6.6: r8168-8136" diff --git a/locale/kernel-list.pot b/locale/kernel-list.pot index 7dafa7d..009cf10 100644 --- a/locale/kernel-list.pot +++ b/locale/kernel-list.pot @@ -19,13 +19,13 @@ msgstr "" #: ./kernel-list.csv:1 #: ./kernel-list.csv:2 -msgid "The Linux kernel v5.15 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" +msgid "The Linux kernel v5.15 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" msgstr "" #: ./kernel-list.csv:3 -msgid "The Linux kernel v6.1 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" +msgid "The Linux kernel v6.1 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" msgstr "" #: ./kernel-list.csv:4 -msgid "The Linux kernel v6.6 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" +msgid "The Linux kernel v6.6 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" msgstr "" diff --git a/locale/kernel-list_ru.po b/locale/kernel-list_ru.po index 28b1cd7..13ba16b 100644 --- a/locale/kernel-list_ru.po +++ b/locale/kernel-list_ru.po @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ./kernel-list.csv:2 -msgid "The Linux kernel v5.15 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" -msgstr "Ядро Linux v5.15 и модули, заголовки. Ручные модули: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" +msgid "The Linux kernel v5.15 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" +msgstr "Ядро Linux v5.15 и модули, заголовки. Дополнительные модули ядра: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" #: ./kernel-list.csv:3 -msgid "The Linux kernel v6.1 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" -msgstr "Ядро Linux v6.1 и модули, заголовки. Ручные модули: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" +msgid "The Linux kernel v6.1 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" +msgstr "Ядро Linux v6.1 и модули, заголовки. Дополнительные модули ядра: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" #: ./kernel-list.csv:4 -msgid "The Linux kernel v6.6 and modules, headers. Manual modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" -msgstr "Ядро Linux v6.6 и модули, заголовки. Ручные модули: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" +msgid "The Linux kernel v6.6 and modules, headers. Additional kernel modules: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs" +msgstr "Ядро Linux v6.6 и модули, заголовки. Дополнительные модули ядра: acpi_call, bbswitch, broadcom-wl, r8168, rtl8723bu, tp_smapi, vhba-module, virtualbox-host-modules, zfs"