diff options
Diffstat (limited to 'pcr')
-rw-r--r-- | pcr/networkmanager-elogind/01-org.freedesktop.NetworkManager.settings.modify.system.rules | 6 | ||||
-rw-r--r-- | pcr/networkmanager-elogind/50-org.freedesktop.NetworkManager.rules | 5 | ||||
-rw-r--r-- | pcr/networkmanager-elogind/PKGBUILD | 78 | ||||
-rw-r--r-- | pcr/opensysusers/PKGBUILD | 12 | ||||
-rw-r--r-- | pcr/opentmpfiles/PKGBUILD | 12 | ||||
-rw-r--r-- | pcr/sddm-consolekit/PKGBUILD | 39 | ||||
-rw-r--r-- | pcr/sddm-elogind/PKGBUILD | 39 |
7 files changed, 74 insertions, 117 deletions
diff --git a/pcr/networkmanager-elogind/01-org.freedesktop.NetworkManager.settings.modify.system.rules b/pcr/networkmanager-elogind/01-org.freedesktop.NetworkManager.settings.modify.system.rules deleted file mode 100644 index ed4a41f9d..000000000 --- a/pcr/networkmanager-elogind/01-org.freedesktop.NetworkManager.settings.modify.system.rules +++ /dev/null @@ -1,6 +0,0 @@ -polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.NetworkManager.settings.modify.system" && - subject.isInGroup("network")) { - return "yes"; - } -}); diff --git a/pcr/networkmanager-elogind/50-org.freedesktop.NetworkManager.rules b/pcr/networkmanager-elogind/50-org.freedesktop.NetworkManager.rules deleted file mode 100644 index b6fe9c73f..000000000 --- a/pcr/networkmanager-elogind/50-org.freedesktop.NetworkManager.rules +++ /dev/null @@ -1,5 +0,0 @@ -polkit.addRule(function(action, subject) { - if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 && subject.isInGroup("network")) { - return polkit.Result.YES; - } -}); diff --git a/pcr/networkmanager-elogind/PKGBUILD b/pcr/networkmanager-elogind/PKGBUILD index 544f455f3..7e6ab73c0 100644 --- a/pcr/networkmanager-elogind/PKGBUILD +++ b/pcr/networkmanager-elogind/PKGBUILD @@ -1,19 +1,16 @@ -# Maintainer (Manjaro): artoo <artoo@manjaro.org> -# Contributor (Manjaro): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor (Manjaro): Jan de Groot <jgc@archlinxu.org> -# Contributor (Manjaro): Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor (Manjaro): Tor Krill <tor@krill.nu> -# Contributor (Manjaro): Will Rea <sillywilly@gmail.com> -# Contributor (Manjaro): Valentine Sinitsyn <e_val@inbox.ru> -# Maintainer: OmarVega Ramos <ovruni@gnu.org.pe> +# Maintainer: David P. <megver83@parabola.nu> +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Maintainer: Jan de Groot <jgc@archlinxu.org> +# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Tor Krill <tor@krill.nu> +# Contributor: Will Rea <sillywilly@gmail.com> +# Contributor: Valentine Sinitsyn <e_val@inbox.ru> _pppver=2.4.7 -_patch_url=https://cgit.freedesktop.org/NetworkManager/NetworkManager/patch - pkgname=networkmanager-elogind -pkgver=1.6.2 -pkgrel=3.parabola1 +pkgver=1.10.0 +pkgrel=1.parabola1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'armv7h') license=('GPL2' 'LGPL2.1') @@ -21,12 +18,11 @@ url="http://www.gnome.org/projects/NetworkManager/" provides=('networkmanager') conflicts=('networkmanager' 'networkmanager-consolekit') # replaces=('networkmanager-consolekit') -makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc' - "ppp=$_pppver" 'modemmanager' 'dbus-glib' 'iproute2' 'nss' - 'polkit' 'wpa_supplicant' 'libsoup' 'libgudev' 'libmm-glib' - 'rp-pppoe' 'libnewt' 'libndp' 'libteam' 'vala' 'perl-yaml' 'python-gobject' 'git' 'vala' - 'jansson' 'bluez-libs' 'glib2-docs' 'elogind') -checkdepends=('libx11' 'python-dbus' 'elogind') +makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager + dbus-glib iproute2 nss polkit wpa_supplicant libsoup elogind libgudev libmm-glib + libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs + glib2-docs eudev-systemd) +checkdepends=('libx11' 'python-dbus') depends=('libnm-glib' 'iproute2' 'polkit' 'wpa_supplicant' 'libsoup' 'libmm-glib' 'libnewt' 'libndp' 'libteam' 'elogind') optdepends=('dnsmasq: connection sharing' 'bluez: Bluetooth support' @@ -37,31 +33,17 @@ optdepends=('dnsmasq: connection sharing' 'modemmanager: cellular network support' 'networkmanager-openrc: networkmanager initscript') backup=('etc/NetworkManager/NetworkManager.conf') -_commit=037a12f96eff09aa48481fda7ea602a3388afc74 # tags/1.6.2^0 +_commit=1193fb1b08fe45ce8713220132184581c4669362 # tags/1.10.0^0 source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit" - #"https://download.gnome.org/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz" - 'NetworkManager.conf' - '01-org.freedesktop.NetworkManager.settings.modify.system.rules' - '50-org.freedesktop.NetworkManager.rules' - '20-connectivity.conf' - "elogind1.patch::${_patch_url}/?id=360e80b75faead6595ceb4ca8cd91dd7fbaa2f47" - "elogind2.patch::${_patch_url}/?id=c0d9243e7ebdb6efd5c3e866b03a28cd91b08c83") -sha256sums=('SKIP' - 'dd2d3a9c8a08ce961e263e1847453890f1b24c72a806d8c83a5b69b227a5ccec' - '4b815f43de58379e68653d890f529485aec4d2f83f11d050b08b31489d2267c2' - '02d9f7d836d297d6ddf39482d86a8573b3e41735b408aa2cd6df22048ec5f6c4' - '477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6' - 'f008c03a1b500bcdde176505e338280246af9431703951f97a88b4ae484c7e9b' - 'e845261a468586a360f68f812c5ca69c86a08cb455e3df430bda4cce58307ae4') + NetworkManager.conf 20-connectivity.conf) +sha512sums=('SKIP' + '25866b000096003d4c90decb6e19a742cf62792ddd217616b12a6415cd05514a6023d9986743b548a99d0e1c70acd0a3849144807228a59361b3493c879ffa56' + 'da52ba9603c279c1c865cc3bf63606e1daeeb2a22c68e4b0077e15c312e251b494c4f0c94bcb27c9f6923f8b69cd7ab9062d9b7ce499222d3d2240864ed9345f') prepare() { mkdir -p libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}} cd NetworkManager - - patch -Np 1 -i ${srcdir}/elogind1.patch - patch -Np 1 -i ${srcdir}/elogind2.patch - NOCONFIGURE=1 ./autogen.sh } @@ -138,14 +120,20 @@ build() { } check() { - cd NetworkManager #-$pkgver + cd NetworkManage make -k check } package() { - cd NetworkManager #-$pkgver + cd NetworkManager make DESTDIR="$pkgdir" install + install -dm700 "$pkgdir/etc/NetworkManager/system-connections" + install -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d + install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" + install -Dm644 ../20-connectivity.conf \ + "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" + ### rm libnm cd ../libnm @@ -172,16 +160,4 @@ package() { "$pkgdir"/usr/include \ "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} \ "$pkgdir"/usr/share/{gir-1.0,vala/vapi} - - install -m644 ${srcdir}/NetworkManager.conf "$pkgdir/etc/NetworkManager/" - install -dm700 "$pkgdir/etc/NetworkManager/system-connections" - install -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d - - install -dm 750 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d - - install -m 644 ${srcdir}/01-org.freedesktop.NetworkManager.settings.modify.system.rules $pkgdir/usr/share/polkit-1/rules.d/ - - install -m 644 ${srcdir}/50-org.freedesktop.NetworkManager.rules $pkgdir/usr/share/polkit-1/rules.d/ - - install -Dm644 ${srcdir}/20-connectivity.conf "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" } diff --git a/pcr/opensysusers/PKGBUILD b/pcr/opensysusers/PKGBUILD index 1ecb7490f..93d33bc0e 100644 --- a/pcr/opensysusers/PKGBUILD +++ b/pcr/opensysusers/PKGBUILD @@ -1,22 +1,22 @@ +# Maintainer: David P. <megver83@parabola.nu> # Maintainer (Artix): Chris Cromer <chris@cromer.cl> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _url="https://github.com/artix-linux/opensysusers/archive" pkgname=opensysusers -pkgver=0.2.1 -pkgrel=2.parabola1 +pkgver=0.3.1 +pkgrel=1.parabola1 pkgdesc="A standalone utility for handling systemd-style sysusers.d users and groups" arch=('any') url="https://github.com/artix-linux/opensysusers" license=('BSD2') -groups=('openrc-base') +groups=('openrc-base' 'base-openrc') depends=('shadow') optdepends=('openrc: update automatically on boot') source=("${pkgname}-${pkgver}.tar.gz::${_url}/${pkgver}.tar.gz" 'opensysusers.hook') -sha256sums=('1cbd13df62eeea65ad65e8abf5c7025929dbdc5a33be9ad6b19850bf54ab58f1' - '90fdf362a29138f1ed65e86e8b97d1251adb6b2e94d829cceb0094a63d00252a') +sha512sums=('f2c6969f8b6730ae7e64501bc277e8647da052e477850b3f6c02249106245b791fa9192ca8b711bf50dd35b164ac0d29ea4095c1b68b4ebc2a06c741a3ca03ea' + '1f5d110e0575ac41b66b3710e26a85cb9806589fb543c2ffaed81643225de0e23d473342931c12dd725e3b4744a5fb71b7bb9c5731dc0a7dfb02add019acebc9') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/pcr/opentmpfiles/PKGBUILD b/pcr/opentmpfiles/PKGBUILD index 391c3928d..d90a17e19 100644 --- a/pcr/opentmpfiles/PKGBUILD +++ b/pcr/opentmpfiles/PKGBUILD @@ -1,22 +1,22 @@ -# Maintainer (Manjaro): artoo <artoo@manjaro.org> -# Contributor (Manjaro): williamh <williamh@gentoo.org> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer: David P. <megver83@parabola.nu> +# Maintainer (Artix): artoo <artoo@manjaro.org> +# Contributor (Artix): williamh <williamh@gentoo.org> _sed_args+=(-e 's|#!/sbin/runscript|#!/usr/bin/openrc-run|g') pkgname=opentmpfiles pkgver=0.1.3 -pkgrel=2.1 +pkgrel=5.parabola1 pkgdesc="A standalone utility for handling systemd-style tmpfiles.d settings" arch=('any') url="https://github.com/OpenRC/opentmpfiles" license=('BSD2') -groups=('openrc-base') +groups=('openrc-base' 'base-openrc') depends=('openrc') backup=('etc/conf.d/opentmpfiles-dev' 'etc/conf.d/opentmpfiles-setup') source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz") -sha256sums=('1fdd4587c62d815296fb4162002cf001e3ed7aae8727d9b4360f527169e6b3be') +sha512sums=('fd0b10ebfeb621466edadede50ec6e8f415861ab3b14b833c75bd71f7296e9c091e59144d39e1f9efd342b6d97776cade5a692c941085e33e9651fd885da7121') _inst_initd(){ install -Dm755 openrc/$1.initd ${pkgdir}/etc/init.d/$1 diff --git a/pcr/sddm-consolekit/PKGBUILD b/pcr/sddm-consolekit/PKGBUILD index c3e081a98..e1ac8595b 100644 --- a/pcr/sddm-consolekit/PKGBUILD +++ b/pcr/sddm-consolekit/PKGBUILD @@ -2,49 +2,44 @@ # Contributor: artoo <artoo@manjaro.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> -_pkgname=sddm - pkgname=sddm-consolekit -pkgver=0.14.0 -pkgrel=2.1 +pkgver=0.16.0 +pkgrel=1 pkgdesc='QML based X11 display manager' arch=('armv7h' 'i686' 'x86_64') url='http://github.com/sddm/sddm' license=('GPL') -depends=('qt5-declarative' 'dbus-openrc' 'eudev-systemd' 'consolekit') +depends=('qt5-declarative' 'xorg-xauth' 'xorg-server' 'consolekit' 'eudev-systemd') makedepends=('extra-cmake-modules' 'python-docutils' 'qt5-tools') -install="${_pkgname}.install" backup=('usr/share/sddm/scripts/Xsetup' 'etc/pam.d/sddm' 'etc/sddm.conf') conflicts=('display-manager' 'sddm') provides=('display-manager' 'sddm') -source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/v${pkgver}.tar.gz" - "${_pkgname}-consolekit.patch" - "${_pkgname}-pam_kwallet.patch" +source=("${pkgname/-*/}-${pkgver}.tar.gz::https://github.com/${pkgname/-*/}/${pkgname/-*/}/archive/v${pkgver}.tar.gz" + "${pkgname/-*/}-consolekit.patch" 'sddm.conf' - "sddm-fix-avatars.patch::https://github.com/sddm/sddm/commit/ecb903e4.patch") -sha256sums=('a551551a6ba324e9c384c89bc63e871de65fea3740eadbea2d63df86045f8205' - 'a998f8a2594cd1e81f402605f01075477a017269b0ac93a22f5faa7d355d18e0' - 'dc46a0132cf0ea722a69cff45ed1ded3c93ade008e22fc90d1b797ca85ed535a' - 'ffcb9885cb41da54a97f62c2538975fbb9dc80c2b58326d479a87ea0f56f02cf' - 'b091f02d6d5b2ddc9d5208b17213a181c6e8deae23e5633d694119e79b66d38b') + 'sddm.sysusers' + 'sddm.tmpfiles') +sha512sums=('c4a8fc4cb23e61defb8ca5a48bb9354cfa694057cb6fc3697f9dcd52a24b21e9a24568ae1f54810137468f3e0b198483cbb500c11f19f654267c40053f301abc' + 'aa53338c3e154982388b2e98101cd49e607f1744acee28f46892e3a6848f06de4ba8a8bf204128da1a7b22df9efe5d95bb6ac1cd5dedb8a301f8587af381253a' + 'dcd89ed3b8849438921529b99cb14644f56ddf9200b1de9f7242d65bc171f6ba573a636e4eeb6b2077cea63b961ce3e7e4c7013731057218657f13baab3e52e4' + '1fbc3476034774576801d91ed8edf3c1a7f3ae59023134e10c3950e1cf9a84319bf184a1df65762d8485ee4bdecb690fbf53cbf3de98feb38c538a5439b036e0' + 'bb5ecdcc6cfcc6b1056a7b10b8a6f323a3e12ea5496a26d80f199a275402fd99ed0fa810fad6687407605964f980784c24082686e177063113a358e1d4220136') prepare() { mkdir -p build - cd ${_pkgname}-${pkgver} - patch -p1 -i ${srcdir}/${_pkgname}-consolekit.patch - patch -p1 -i ${srcdir}/${_pkgname}-pam_kwallet.patch - patch -p1 -i ${srcdir}/sddm-fix-avatars.patch + cd ${pkgname/-*/}-${pkgver} + patch -p1 -i ${srcdir}/${pkgname/-*/}-consolekit.patch } build() { cd build - cmake ../${_pkgname}-${pkgver} \ + cmake ../${pkgname/-*/}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \ - -DDBUS_CONFIG_FILENAME=org.freedesktop.sddm.conf \ + -DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf \ -DBUILD_MAN_PAGES=ON make } @@ -54,4 +49,6 @@ package() { make DESTDIR="${pkgdir}" install # sed -e 's|pam_systemd.so|pam_ck_connector.so nox11|' -i ${pkgdir}/etc/pam.d/sddm-greeter install -m 755 ${srcdir}/sddm.conf ${pkgdir}/etc + install -Dm644 "$srcdir"/sddm.sysusers "$pkgdir"/usr/lib/sysusers.d/sddm.conf + install -Dm644 "$srcdir"/sddm.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/sddm.conf } diff --git a/pcr/sddm-elogind/PKGBUILD b/pcr/sddm-elogind/PKGBUILD index 70c023f10..5a58223b8 100644 --- a/pcr/sddm-elogind/PKGBUILD +++ b/pcr/sddm-elogind/PKGBUILD @@ -1,52 +1,44 @@ -# Maintainer (Manjaro): artoo <artoo@manjaro.org> -# Contributor (Manjaro): Andrea Scarpino <andrea@archlinux.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> - -_pkgname=sddm +# Maintainer: David P. <megver83@parabola.nu> +# Maintainer (Artix): artoo <artoo@manjaro.org> +# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> pkgname=sddm-elogind -pkgver=0.14.0 -pkgrel=4 +pkgver=0.16.0 +pkgrel=1 pkgdesc='QML based X11 display manager' arch=('i686' 'x86_64' 'armv7h') url='http://github.com/sddm/sddm' license=('GPL') provides=('display-manager' 'sddm') -depends=('qt5-declarative' 'elogind' 'upower' 'eudev-systemd') +depends=('qt5-declarative' 'xorg-xauth' 'xorg-server' 'elogind' 'eudev-systemd') makedepends=('extra-cmake-modules' 'python-docutils' 'qt5-tools') optdepends=('displaymanager-openrc: displaymanager initscript') conflicts=('display-manager' 'sddm' 'sddm-consolekit') # replaces=('sddm-consolekit') -install="${_pkgname}.install" backup=('usr/share/sddm/scripts/Xsetup' 'etc/pam.d/sddm' 'etc/sddm.conf') -source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/v${pkgver}.tar.gz" - "sddm-fix-avatars.patch::https://github.com/sddm/sddm/commit/ecb903e4.patch" - 'sddm-pam.patch' - 'sddm-enable-elogind.patch') -sha256sums=('a551551a6ba324e9c384c89bc63e871de65fea3740eadbea2d63df86045f8205' - 'b091f02d6d5b2ddc9d5208b17213a181c6e8deae23e5633d694119e79b66d38b' - '151b9b4a16b919a4f3a6564b2cd794effdc07773c47f2d6b860bbd467c3e4798' - 'cff3f483415c95784d6b9977c31b89fac734d0d74facc4ac042ed8de970d5007') +source=("${pkgname/-*/}-${pkgver}.tar.gz::https://github.com/${pkgname/-*/}/${pkgname/-*/}/archive/v${pkgver}.tar.gz" + 'sddm.sysusers' + 'sddm.tmpfiles') +sha512sums=('c4a8fc4cb23e61defb8ca5a48bb9354cfa694057cb6fc3697f9dcd52a24b21e9a24568ae1f54810137468f3e0b198483cbb500c11f19f654267c40053f301abc' + '1fbc3476034774576801d91ed8edf3c1a7f3ae59023134e10c3950e1cf9a84319bf184a1df65762d8485ee4bdecb690fbf53cbf3de98feb38c538a5439b036e0' + 'bb5ecdcc6cfcc6b1056a7b10b8a6f323a3e12ea5496a26d80f199a275402fd99ed0fa810fad6687407605964f980784c24082686e177063113a358e1d4220136') prepare() { mkdir -p build - cd ${_pkgname}-${pkgver} - patch -p1 -i ${srcdir}/sddm-pam.patch - patch -p1 -i ${srcdir}/sddm-enable-elogind.patch } build() { cd build - cmake ../${_pkgname}-${pkgver} \ + cmake ../${pkgname/-*/}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_PAM=yes \ -DNO_SYSTEMD=yes \ -DUSE_ELOGIND=yes \ -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \ - -DDBUS_CONFIG_FILENAME=org.freedesktop.sddm.conf \ + -DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf \ -DBUILD_MAN_PAGES=ON make } @@ -54,4 +46,7 @@ build() { package() { cd build make DESTDIR="${pkgdir}" install + + install -Dm644 "$srcdir"/sddm.sysusers "$pkgdir"/usr/lib/sysusers.d/sddm.conf + install -Dm644 "$srcdir"/sddm.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/sddm.conf } |