From 5cfe5fdd4f0b1df73c6b4ca644d035d001824dcb Mon Sep 17 00:00:00 2001 From: David P Date: Fri, 20 Apr 2018 12:02:34 -0300 Subject: db-remove: pcr/desktop-privilges, pcr/pm-utils Signed-off-by: David P --- pcr/desktop-privileges/10-cpufreqselector.rules | 5 -- pcr/desktop-privileges/10-udisks.rules | 5 -- pcr/desktop-privileges/10-udisks2.rules | 5 -- pcr/desktop-privileges/10-upower.rules | 6 --- pcr/desktop-privileges/PKGBUILD | 34 ------------ pcr/pm-utils/02-logging-append.patch | 19 ------- .../12-fix-intel-audio-powersave-hook.patch | 40 -------------- pcr/pm-utils/13-49bluetooth-sync.patch | 43 --------------- pcr/pm-utils/14-disable-sata-alpm.patch | 26 --------- pcr/pm-utils/PKGBUILD | 63 ---------------------- 10 files changed, 246 deletions(-) delete mode 100644 pcr/desktop-privileges/10-cpufreqselector.rules delete mode 100644 pcr/desktop-privileges/10-udisks.rules delete mode 100644 pcr/desktop-privileges/10-udisks2.rules delete mode 100644 pcr/desktop-privileges/10-upower.rules delete mode 100644 pcr/desktop-privileges/PKGBUILD delete mode 100644 pcr/pm-utils/02-logging-append.patch delete mode 100644 pcr/pm-utils/12-fix-intel-audio-powersave-hook.patch delete mode 100644 pcr/pm-utils/13-49bluetooth-sync.patch delete mode 100644 pcr/pm-utils/14-disable-sata-alpm.patch delete mode 100644 pcr/pm-utils/PKGBUILD diff --git a/pcr/desktop-privileges/10-cpufreqselector.rules b/pcr/desktop-privileges/10-cpufreqselector.rules deleted file mode 100644 index b17ab2aa6..000000000 --- a/pcr/desktop-privileges/10-cpufreqselector.rules +++ /dev/null @@ -1,5 +0,0 @@ -polkit.addRule(function(action, subject) { - if (action.id == "org.gnome.cpufreqselector" && subject.isInGroup("power")) { - return polkit.Result.YES; - } -}); diff --git a/pcr/desktop-privileges/10-udisks.rules b/pcr/desktop-privileges/10-udisks.rules deleted file mode 100644 index 4fef5f496..000000000 --- a/pcr/desktop-privileges/10-udisks.rules +++ /dev/null @@ -1,5 +0,0 @@ -polkit.addRule(function(action, subject) { -if (action.id.indexOf("org.freedesktop.udisks.") == 0 && subject.isInGroup("storage")) { - return polkit.Result.YES; - } -}); diff --git a/pcr/desktop-privileges/10-udisks2.rules b/pcr/desktop-privileges/10-udisks2.rules deleted file mode 100644 index af1e1a122..000000000 --- a/pcr/desktop-privileges/10-udisks2.rules +++ /dev/null @@ -1,5 +0,0 @@ -polkit.addRule(function(action, subject) { - if (action.id.indexOf("org.freedesktop.udisks2.") == 0 && subject.isInGroup("storage")) { - return polkit.Result.YES; - } -}); diff --git a/pcr/desktop-privileges/10-upower.rules b/pcr/desktop-privileges/10-upower.rules deleted file mode 100644 index af91947ef..000000000 --- a/pcr/desktop-privileges/10-upower.rules +++ /dev/null @@ -1,6 +0,0 @@ -polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.upower.hibernate" || - action.id == "org.freedesktop.upower.suspend") { - return polkit.Result.YES; - } -}); diff --git a/pcr/desktop-privileges/PKGBUILD b/pcr/desktop-privileges/PKGBUILD deleted file mode 100644 index d5addd14e..000000000 --- a/pcr/desktop-privileges/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: David P. -# Contributor (Arch): Ulf WInkelvos -# Former Maintainer (Arch): anonymous_user <31337h4ck3r at gmail dot com> -# Former Maintainer (Arch): 3V0LU710N -# Former Maintainer (Arch): nous at archlinux.us -# Maintainer (Arch): Philipp A. - -pkgname=desktop-privileges -pkgver=0.5 -pkgrel=3.parabola1 -pkgdesc="A collection of polkit rules to manage automounting of removable media, suspend and hibernate actions and CPU frequency settings." -arch=('any') -url="https://aur.archlinux.org/packages/desktop-privileges/" -license=('GPL') -depends=('polkit' 'udisks2' 'upower' 'pm-utils') -optdepends=('mate-power-manager-upower') -conflicts=('polkit-automount-upower-rules') -replaces=('polkit-automount-upower-rules') -source=('10-cpufreqselector.rules' '10-udisks.rules' '10-udisks2.rules' '10-upower.rules') - -build() { -true -} - -package() { - install -dm755 "${pkgdir}/etc/polkit-1/" - install -dm750 "${pkgdir}/etc/polkit-1/rules.d/" - install -Dm644 *.rules ${pkgdir}/etc/polkit-1/rules.d/ -} - -sha256sums=('681d85042aa06197e00aa54a47d0331f9c8675fdc555321b611a6ec3ab0eb73f' - '002ec5fd0592bb9a25321ed4836913cdaa818d3322212bd7d0f315509bda7b62' - 'f3f8cb03c13a84cacbc8f1e4517253a009d96335eb648a1253676dac75466766' - '805cadc921bce8b11f1f6e170428a7d30fc9377f143df1ff4b0efe0e625a96bf') diff --git a/pcr/pm-utils/02-logging-append.patch b/pcr/pm-utils/02-logging-append.patch deleted file mode 100644 index 987e0570a..000000000 --- a/pcr/pm-utils/02-logging-append.patch +++ /dev/null @@ -1,19 +0,0 @@ -Author: James Westby -Description: Do not clear the log file on each operation, but instead append to it. - This makes debugging of several suspends much easier. -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25255 -Bug-Ubuntu: https://launchpad.net/bugs/410352 - -Index: pm-utils/pm/pm-functions.in -=================================================================== ---- pm-utils.orig/pm/pm-functions.in 2010-07-05 18:41:21.118322244 +0200 -+++ pm-utils/pm/pm-functions.in 2010-07-05 18:41:24.126325221 +0200 -@@ -271,7 +271,7 @@ - return 1 - fi - export LOGGING=true -- exec > "$1" 2>&1 -+ exec >> "$1" 2>&1 - } - - check_suspend() { [ -n "$SUSPEND_MODULE" ]; } diff --git a/pcr/pm-utils/12-fix-intel-audio-powersave-hook.patch b/pcr/pm-utils/12-fix-intel-audio-powersave-hook.patch deleted file mode 100644 index 2d884da1e..000000000 --- a/pcr/pm-utils/12-fix-intel-audio-powersave-hook.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Florian Kriener -To: submit@bugs.debian.org -Subject: [pm-utils] wrong path in intel-audio-powersave (and a small bug) -Date: Sat, 25 Sep 2010 11:27:30 +0200 - -In the script intel-audio-powersave is this loop - -for dev in /sys/module/snd_*/parameters/power_save; do - [ -w "$dev/parameters/power_save" ] || continue - printf "Setting power savings for $s to %d..." "$dev##*/" "$1" - echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. -done - -I think it should be - -for dev in /sys/module/snd_*; do - [ -w "$dev/parameters/power_save" ] || continue - printf "Setting power savings for %s to %d..." "${dev##*/}" "$1" - echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. -done - - -This fixes the two bugs. - -diff --git a/pm/power.d/intel-audio-powersave b/pm/power.d/intel-audio-powersave -index 36675a8..da63e40 100644 ---- a/pm/power.d/intel-audio-powersave -+++ b/pm/power.d/intel-audio-powersave -@@ -20,9 +20,9 @@ EOF - - audio_powersave() { - [ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA -- for dev in /sys/module/snd_*/parameters/power_save; do -+ for dev in /sys/module/snd_*; do - [ -w "$dev/parameters/power_save" ] || continue -- printf "Setting power savings for $s to %d..." "$dev##*/" "$1" -+ printf "Setting power savings for %s to %d..." "${dev##*/}" "$1" - echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. - done - } diff --git a/pcr/pm-utils/13-49bluetooth-sync.patch b/pcr/pm-utils/13-49bluetooth-sync.patch deleted file mode 100644 index b41f32cf9..000000000 --- a/pcr/pm-utils/13-49bluetooth-sync.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 640b53438c20818b3e344343b58b1f1765606a85 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Mon, 31 Jan 2011 15:30:01 +0100 -Subject: [PATCH] 49bluetooth: Wait for btusb module to get unused - -The 49bluetooth hook disables /proc/acpi/ibm/bluetooth but this isn't -synchronous, i. e. it doesn't wait until the module usage count actually drops -to 0. Due to that, it's impossible to add btusb to SUSPEND_MODULES (on some -models/older kernels you need to do that to fix suspend problems), as at that -point the module is still in use. - -On my system (ThinkPad X201) the module takes between 0.3 and 0.5 seconds to -unload, so use 100 ms wait steps with a timeout of 2 seconds. - -Bug: https://bugs.freedesktop.org//show_bug.cgi?id=33759 -Bug-Ubuntu: https://launchpad.net/bugs/698331 ---- - pm/sleep.d/49bluetooth | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/pm/sleep.d/49bluetooth b/pm/sleep.d/49bluetooth -index d46ba49..0dc1909 100755 ---- a/pm/sleep.d/49bluetooth -+++ b/pm/sleep.d/49bluetooth -@@ -12,6 +12,15 @@ suspend_bluetooth() - if grep -q enabled /proc/acpi/ibm/bluetooth; then - savestate ibm_bluetooth enable - echo disable > /proc/acpi/ibm/bluetooth -+ -+ # wait for up to 2 seconds for the module to actually get -+ # unused -+ TIMEOUT=20 -+ while [ $TIMEOUT -ge 0 ]; do -+ [ `cat /sys/module/btusb/refcnt` = 0 ] && break -+ TIMEOUT=$((TIMEOUT-1)) -+ sleep 0.1 -+ done - else - savestate ibm_bluetooth disable - fi --- -1.7.2.3 - diff --git a/pcr/pm-utils/14-disable-sata-alpm.patch b/pcr/pm-utils/14-disable-sata-alpm.patch deleted file mode 100644 index 7b5494932..000000000 --- a/pcr/pm-utils/14-disable-sata-alpm.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Disable SATA link power management by default, as it still causes disk errors and corruptions on many hardware. -Author: Martin Pitt -Bug-Ubuntu: https://launchpad.net/bugs/539467 - -Index: pm-utils/pm/power.d/sata_alpm -=================================================================== ---- pm-utils.orig/pm/power.d/sata_alpm 2011-02-01 15:53:09.164867778 +0100 -+++ pm-utils/pm/power.d/sata_alpm 2011-02-01 15:53:28.954867786 +0100 -@@ -2,7 +2,7 @@ - - . "${PM_FUNCTIONS}" - --SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-true} -+SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-false} - - help() { - cat < -# Contributor: artoo -# Contributor: Jan de Groot -# Contributor: Thayer Williams -# Contributor: Giovanni Scafora - -_date=20100619 -_extra=pm-quirks - -pkgname=pm-utils -pkgver=1.4.1 -pkgrel=7.parabola2 -pkgdesc="Utilities and scripts for suspend and hibernate power management" -arch=('any') -url="https://pm-utils.freedesktop.org" -license=('GPL') -depends=('bash' 'procps') -conflicts=('pm-quirks') -replaces=('pm-quirks') -makedepends=('xmlto' 'docbook-xml' 'docbook-xsl') -source=("https://pm-utils.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz" - '02-logging-append.patch' - '12-fix-intel-audio-powersave-hook.patch' - '13-49bluetooth-sync.patch' - '14-disable-sata-alpm.patch' - "https://pm-utils.freedesktop.org/releases/${_extra}-${_date}.tar.gz") -sha512sums=('5bc9479fe75f120aee136befeb24c8d7d85f61410b551177ed61fd1b4ea9cce7989796b067e357ea93b44b4ae9f66311687066f188236c5efdfd3750695a8017' - '608a98f8603748c97d05593f4a107d15656dffed46d3ecd9d1d8bd03c94309ad4419f4335c91dbdab15074d6b9120195a4d21903d5233116bc1d9f61158b2e57' - '5c5cc0e810c9a189de5d3b603cac1c5adb69058f2033daad3558463d1a0f65c039e19132da54da373929fe8e652ae06e28edad2ea9ce17a2f73527e494eecaff' - '35e02607280b4cd166fbbb1dfc44ef33d20debe1e564db9d532af74a773cc4f8cc3ee3be149318cbbc0f9cc451b5001a499609dd962ff42c0a7c3305215ef831' - '9359943f3909985995dd68197ab25cf2560bcc458ba17b3b60f5503fe805e40c31856ac909604fbf419d69e833f2cd722e89e7ef029523e87e17c8fe25586f54' - 'e20244fb72475945e08010d7ec19db2c017c1a04fa01d3d08c03d704d7f07f9c087bac6a5a44242cc8ed6cec5db47bc06a8862dd0f74088a565d37b6d7b95afc') - -prepare(){ - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/02-logging-append.patch" - patch -Np1 -i "${srcdir}/12-fix-intel-audio-powersave-hook.patch" - patch -Np1 -i "${srcdir}/13-49bluetooth-sync.patch" - patch -Np1 -i "${srcdir}/14-disable-sata-alpm.patch" -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --localstatedir=/var - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # nm >=0.8.2 has native udev suspend/resume support - rm -f "${pkgdir}/usr/lib/pm-utils/sleep.d/55NetworkManager" - - # Remove hooks that cause hardware failure or don't make sense at all - rm -f "${pkgdir}/usr/lib/pm-utils/power.d/"{harddrive,disable_wol} - - install -m755 -d "${pkgdir}/usr/lib/pm-utils/video-quirks" - install -m644 ${srcdir}/video-quirks/*.quirkdb "${pkgdir}/usr/lib/pm-utils/video-quirks/" -} -- cgit v1.2.3