Date: Thursday, April 12, 2018 @ 06:09:06 Author: bgyorgy Revision: 315915
upgpkg: pyneighborhood 0.5.4-4 Use pkexec to mount/unmount Samba shares Added: pyneighborhood/trunk/pkexec.patch Modified: pyneighborhood/trunk/PKGBUILD --------------+ PKGBUILD | 13 +++++++++---- pkexec.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-12 05:52:28 UTC (rev 315914) +++ PKGBUILD 2018-04-12 06:09:06 UTC (rev 315915) @@ -4,16 +4,18 @@ pkgname=pyneighborhood pkgver=0.5.4 -pkgrel=3 +pkgrel=4 pkgdesc="A GTK+ 2 rewrite of the well-known LinNeighborhood tool" license=('GPL') url="https://launchpad.net/pyneighborhood" -source=("http://launchpad.net/pyneighborhood/0.5/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") +source=("http://launchpad.net/pyneighborhood/0.5/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2" + "pkexec.patch") depends=('pygtk' 'smbclient') -optdepends=('gksu: mount/unmount Samba shares') +optdepends=('polkit: mount/unmount Samba shares') arch=('any') options=('!emptydirs') -sha1sums=('b0d899230ed0212aa50c17f406b0ee7e3d6ac17a') +sha1sums=('b0d899230ed0212aa50c17f406b0ee7e3d6ac17a' + 'c23d054b2309fcc012f98e7274e6fd2e09d2f9a6') prepare() { cd ${srcdir}/${pkgname}-${pkgver} @@ -23,6 +25,9 @@ sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done + + # Use pkexec to mount/unmount Samba shares + patch -Np1 -i ../pkexec.patch } package() { Added: pkexec.patch =================================================================== --- pkexec.patch (rev 0) +++ pkexec.patch 2018-04-12 06:09:06 UTC (rev 315915) @@ -0,0 +1,49 @@ +diff -Naur pyneighborhood-0.5.4.orig/pyneighborhood/__init__.py pyneighborhood-0.5.4/pyneighborhood/__init__.py +--- pyneighborhood-0.5.4.orig/pyneighborhood/__init__.py 2011-03-22 20:51:25.000000000 +0100 ++++ pyneighborhood-0.5.4/pyneighborhood/__init__.py 2018-04-12 07:59:06.447097940 +0200 +@@ -40,7 +40,7 @@ + loglevel = 0 + mount_directory = + password = +-sudo = /usr/bin/gksu ++sudo = /usr/bin/pkexec --disable-internal-agent + username = + hidden_shares = False + [CIFS] +@@ -108,20 +108,9 @@ + config.set('CIFS',utility,'/bin/%s' % ('mount' if utility == 'mount' else 'umount')) + push_notification(_("Using %(util)s for future operations.\n") % { "util": config.get('CIFS',utility) }, level=1) + +-sudo_defaults = { "gnome": "/usr/bin/gksu", +- "kde": "/usr/bin/kdesudo", +- "lxde": "/usr/bin/gksu", +- "xfce": "/usr/bin/gksu", +- "default": "/usr/bin/gksu" } +- + if not access( config.get("Main", "sudo"), F_OK | X_OK): + push_notification(_("%(sudo)s isn't accessable... trying to determine correct sudo wrapper...\n") % { "sudo": config.get("Main", "sudo") }, level=2) +- if get_desktop_environ() in sudo_defaults.keys(): +- push_notification(_("Detected %(de)s desktop environment... falling back to %(wrapper)s as sudo wrapper...\n") % { "de": get_desktop_environ(), "wrapper": sudo_defaults[get_desktop_environ()] } ) +- config.set("Main", "sudo", sudo_defaults[get_desktop_environ()]) +- else: +- push_notification(_("Couldn't get valid sudo wrapper for detected desktop environment %(de)s, falling back to default %(default)s...\n") % { "de": get_desktop_environ(), "default": sudo_defaults["default"]}, level=2) +- config.set("Main", "sudo", sudo_defaults["default"]) ++ config.set("Main", "sudo", "/usr/bin/pkexec --disable-internal-agent") + + fileman_defaults = { "gnome": "/usr/bin/nautilus", + "kde": "/usr/bin/dolphin", +diff -Naur pyneighborhood-0.5.4.orig/pyneighborhood/mountwindow.py pyneighborhood-0.5.4/pyneighborhood/mountwindow.py +--- pyneighborhood-0.5.4.orig/pyneighborhood/mountwindow.py 2011-03-22 20:51:25.000000000 +0100 ++++ pyneighborhood-0.5.4/pyneighborhood/mountwindow.py 2018-04-12 07:22:04.351628369 +0200 +@@ -145,10 +145,7 @@ + options = [] + command = [] + if config.get("Main", "enable_sudo") == "True": +- for item in config.get("Main", "sudo").split(" "): +- command.append(item) +- del item +- command.append("--") ++ command.append(config.get("Main", "sudo")) + command.append(config.get("CIFS", "mount")) + if len(config.get("CIFS", "options")) > 0: + options.append(config.get("CIFS", "options"))