diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-07-01 03:54:24 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-07-01 03:54:24 +0000 |
| commit | 88933a383866089c23f6d62783a6a24ab211e872 (patch) | |
| tree | 06df2798b84f9e12ebbef88948c0e5b2a3227e99 /extra/gnome-user-share | |
| parent | ffb384c05abcdb9c7a7d9df8407b8efc8caa78de (diff) | |
Tue Jul 1 03:46:37 UTC 2014
Diffstat (limited to 'extra/gnome-user-share')
| -rw-r--r-- | extra/gnome-user-share/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/gnome-user-share/fix-no-password-mode.patch | 59 |
2 files changed, 70 insertions, 4 deletions
diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD index 5ebe26808..4a701db3a 100644 --- a/extra/gnome-user-share/PKGBUILD +++ b/extra/gnome-user-share/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 211287 2014-04-18 15:10:19Z heftig $ +# $Id: PKGBUILD 215858 2014-06-30 18:40:47Z heftig $ # Maintainer: Roman Kyrylych <roman@archlinux.org> 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,8 +13,15 @@ makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl') 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}" diff --git a/extra/gnome-user-share/fix-no-password-mode.patch b/extra/gnome-user-share/fix-no-password-mode.patch new file mode 100644 index 000000000..d57e72b8d --- /dev/null +++ b/extra/gnome-user-share/fix-no-password-mode.patch @@ -0,0 +1,59 @@ +From a1afc2e9aa3b86f408739e78bd23382c53df5b5c Mon Sep 17 00:00:00 2001 +From: Josselin Mouette <joss@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@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 + |