[arch-commits] Commit in gnome-user-share/trunk (PKGBUILD fix-no-password-mode.patch)

[Jan Steffens]

    Date: Monday, June 30, 2014 @ 20:38:00
  Author: heftig
Revision: 215857

Fix no-password mode

Added:
  gnome-user-share/trunk/fix-no-password-mode.patch
Modified:
  gnome-user-share/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   13 +++++++--
 fix-no-password-mode.patch |   59 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-30 17:59:11 UTC (rev 215856)
+++ PKGBUILD	2014-06-30 18:38:00 UTC (rev 215857)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-user-share
 pkgver=3.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Easy to use user-level file sharing for GNOME."
 arch=('i686' 'x86_64')
 url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
@@ -13,9 +13,16 @@
 options=('!emptydirs')
 groups=('gnome')
 install=gnome-user-share.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+        fix-no-password-mode.patch)
+sha256sums=('1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f'
+            'c35ba44284d5797fee3dfafd879333e5ec26f5b3fa18703e6235aa487c0e25bd')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../fix-no-password-mode.patch
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \

Added: fix-no-password-mode.patch
===================================================================
--- fix-no-password-mode.patch	                        (rev 0)
+++ fix-no-password-mode.patch	2014-06-30 18:38:00 UTC (rev 215857)
@@ -0,0 +1,59 @@
+From a1afc2e9aa3b86f408739e78bd23382c53df5b5c Mon Sep 17 00:00:00 2001
+From: Josselin Mouette <joss at debian.org>
+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 scorpy_sk at yahoo.com 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
+