Date: Tuesday, October 25, 2022 @ 22:40:45 Author: heftig Revision: 459019
43.0-1 Modified: gnome-user-share/trunk/PKGBUILD Deleted: gnome-user-share/trunk/fix-no-password-mode.patch ----------------------------+ PKGBUILD | 30 ++++++++++++--------- fix-no-password-mode.patch | 59 ------------------------------------------- 2 files changed, 17 insertions(+), 72 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-25 22:40:13 UTC (rev 459018) +++ PKGBUILD 2022-10-25 22:40:45 UTC (rev 459019) @@ -1,22 +1,22 @@ # Contributor: Roman Kyrylych <[email protected]> pkgname=gnome-user-share -pkgver=3.34.0 -pkgrel=2 +pkgver=43.0 +pkgrel=1 pkgdesc="Easy to use user-level file sharing for GNOME" +url="https://gitlab.gnome.org/GNOME/gnome-user-share"; arch=(x86_64) -url="https://gitlab.gnome.org/GNOME/gnome-user-share"; license=(GPL) -depends=(mod_dnssd dconf gtk3 libnotify libcanberra) -makedepends=(libnautilus-extension git meson yelp-tools) +depends=(glib2 dconf mod_dnssd systemd) +makedepends=(git meson) groups=(gnome) -_commit=6f5213ad76e78f0ea3040610ce9fa94a59505913 # tags/GNOME_USER_SHARE_3_34_0^0 +_commit=a0e790aa9494db9d1b1f48b4fc0d2f78e112044d # tags/43.0^0 source=("git+https://gitlab.gnome.org/GNOME/gnome-user-share.git#commit=$_commit";) sha256sums=('SKIP') pkgver() { cd $pkgname - git describe --tags | sed 's/^GNOME_USER_SHARE_//;s/_/./g;s/-/+/g' + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' } prepare() { @@ -24,11 +24,13 @@ } build() { - arch-meson $pkgname build \ - -D httpd=/usr/bin/httpd \ - -D modules_path=/usr/lib/httpd/modules \ - -D nautilus_extension=true - ninja -C build + local meson_options=( + -D httpd=/usr/bin/httpd + -D modules_path=/usr/lib/httpd/modules + ) + + arch-meson $pkgname build "${meson_options[@]}" + meson compile -C build } check() { @@ -36,5 +38,7 @@ } package() { - DESTDIR="$pkgdir" meson install -C build + meson install -C build --destdir "$pkgdir" } + +# vim:set sw=2 sts=-1 et: Deleted: fix-no-password-mode.patch =================================================================== --- fix-no-password-mode.patch 2022-10-25 22:40:13 UTC (rev 459018) +++ fix-no-password-mode.patch 2022-10-25 22:40:45 UTC (rev 459019) @@ -1,59 +0,0 @@ -From a1afc2e9aa3b86f408739e78bd23382c53df5b5c Mon Sep 17 00:00:00 2001 -From: Josselin Mouette <[email protected]> -Date: Tue, 24 Jun 2014 15:00:36 +0200 -Subject: data: Fix httpd configuration with require_password=never -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The AuthType, AuthName, AuthDigestDomain, AuthDigestProvider, -AuthUserFile and AuthGroupFile directives should be in an -<IfDefine> section, executed only when password authentication -is configured, otherwise we get this error: -"AuthType configured with no corresponding authorization directives" - -Thanks to [email protected] and Arno Töll. - -diff --git a/data/dav_user_2.4.conf b/data/dav_user_2.4.conf -index de2e885..9604637 100644 ---- a/data/dav_user_2.4.conf -+++ b/data/dav_user_2.4.conf -@@ -30,20 +30,28 @@ DNSSDAutoRegisterUserDir Off - <Location /> - DAV On - -- AuthType Digest -- AuthName "${GUS_LOGIN_LABEL}" -- AuthDigestDomain / -+ <IfDefine RequirePasswordAlways> -+ AuthType Digest -+ AuthName "${GUS_LOGIN_LABEL}" -+ AuthDigestDomain / - -- AuthDigestProvider file -- AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd -- AuthGroupFile /usr/share/gnome-user-share/dav_groupfile -+ AuthDigestProvider file -+ AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd -+ AuthGroupFile /usr/share/gnome-user-share/dav_groupfile - -- <IfDefine RequirePasswordAlways> - Require user guest - Require group guest - </IfDefine> - - <IfDefine RequirePasswordOnWrite> -+ AuthType Digest -+ AuthName "${GUS_LOGIN_LABEL}" -+ AuthDigestDomain / -+ -+ AuthDigestProvider file -+ AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd -+ AuthGroupFile /usr/share/gnome-user-share/dav_groupfile -+ - <LimitExcept GET OPTIONS PROPFIND> - Require user guest - Require group guest --- -cgit v0.10.1 -
