Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/webdavcgi/files/
Date: Sun, 27 Sep 2020 00:15:04
Message-Id: 1601165692.1f45c9a4fdcf926b91041438fd43440bff45bc1a.conikost@gentoo
1 commit: 1f45c9a4fdcf926b91041438fd43440bff45bc1a
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Sep 26 14:47:46 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 27 00:14:52 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f45c9a4
7
8 www-apps/webdavcgi: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/17684
11 Package-Manager: Portage-3.0.8, Repoman-3.0.1
12 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../files/0.8.3-logout-var-expansion.patch | 21 ------
16 .../files/apache-webdavcgi-0.8-example.conf | 59 ---------------
17 www-apps/webdavcgi/files/postinstall-en.txt | 29 -------
18 .../files/postinstall-webdavwrapper-en.txt | 32 --------
19 www-apps/webdavcgi/files/reconfig | 32 --------
20 www-apps/webdavcgi/files/reconfig-suid | 26 -------
21 www-apps/webdavcgi/files/webdav-0.8.conf | 88 ----------------------
22 7 files changed, 287 deletions(-)
23
24 diff --git a/www-apps/webdavcgi/files/0.8.3-logout-var-expansion.patch b/www-apps/webdavcgi/files/0.8.3-logout-var-expansion.patch
25 deleted file mode 100644
26 index 739ff7f4c79..00000000000
27 --- a/www-apps/webdavcgi/files/0.8.3-logout-var-expansion.patch
28 +++ /dev/null
29 @@ -1,21 +0,0 @@
30 -diff -ru cgi-bin.orig/logout-dist cgi-bin/logout-dist
31 ---- cgi-bin.orig/logout-dist 2011-03-22 17:25:52.000000000 +0100
32 -+++ cgi-bin/logout-dist 2012-10-03 21:44:35.057437306 +0200
33 -@@ -34,13 +34,13 @@
34 - # -----
35 - ### REALM: the basic authentication realm
36 - ### (must be equal to your AuthName value for Apache)
37 --REALM="Change Me"
38 -+REALM="${REALM:=Change Me}"
39 -
40 - ### HOMEURL: the home URL
41 --HOMEURL="/changemyhomeurl"
42 -+HOMEURL="${HOMEURL:=/changemyhomeurl}"
43 -
44 --### TIMEOUT: the refresh timeout for the logut page
45 --TIMEOUT=0
46 -+### TIMEOUT: the refresh timeout for the logout page
47 -+TIMEOUT=${TIMEOUT:=0}
48 -
49 - # SETUP END
50 -
51
52 diff --git a/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf b/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf
53 deleted file mode 100644
54 index cf1d4d4dafe..00000000000
55 --- a/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf
56 +++ /dev/null
57 @@ -1,59 +0,0 @@
58 -# Example Apache HTTP server configuration snippet for WebDAV CGI
59 -#
60 -# Add the following lines to the Apache HTTP virtual host which should run
61 -# WebDAV CGI.
62 -#
63 -# WebDAV CGI will be accessible via http://www.example.com/webdav/ and uses
64 -# basic HTTP authentication (by default). For this to work, you need to add all
65 -# valid users to the AuthUserFile with the help of the htpasswd command:
66 -#
67 -# htpasswd -c /etc/webdavcgi-0.8/default/users.htpasswd user1
68 -# htpasswd /etc/webdavcgi-0.8/default/users.htpasswd user2
69 -#
70 -# Note, that if you have the UID/GID wrapper enabled (USE=suid), WebDAV CGI will
71 -# switch to the login user after a successful login, thus the users within the
72 -# AuthType need to present on the system as well.
73 -#
74 -# You probably want to review and change the following settings:
75 -# - /webdavcgi should point to your desired webdavwrapper, which is either
76 -# webdavwrapper, webdavwrapper-afs, webdavwrapper-krb or in case you disabled
77 -# the UID/GID wrapper (USE=-suid), webdav.pl
78 -#
79 -# - The /webdav location
80 -# If you change this location, make sure to reflect the new path within the
81 -# WebDAV CGI configuration (WEBDAVCONF -> $VIRTUAL_BASE) as well.
82 -#
83 -# - The authentication provider and/or AuthUserFile
84 -#
85 -# - The HOMEURL environment variable. After a user logs out, the browser will
86 -# be redirected to this URL.
87 -#
88 -# - The WEBDAVCONF environment variable has to point to your configuration
89 -#
90 -# For further informations and other configuration possibilities consult the
91 -# WebDAV CGI documentation which is located at http://webdavcgi.sourceforge.net
92 -# and the Apache HTTP server documentation at https://httpd.apache.org/docs/
93 -#
94 - ScriptAlias /webdavcgi "/usr/libexec/webdavcgi-0.8/cgi-bin/webdavwrapper"
95 - ScriptAlias /webdav/logout "/usr/libexec/webdavcgi-0.8/cgi-bin/logout"
96 -
97 - <Location /webdav>
98 - Order Allow,Deny
99 - Allow from all
100 - </Location>
101 -
102 - <Location /webdavcgi>
103 - AuthType Basic
104 - AuthName "WebDAV-CGI"
105 - AuthUserFile /etc/webdavcgi-0.8/default/users.htpasswd
106 - Require valid-user
107 - Order Allow,Deny
108 - Allow from all
109 - </Location>
110 -
111 -
112 - RewriteEngine On
113 -
114 - RewriteRule ^/webdav/logout - [L,E=REALM:WebDAV-CGI,E=HOMEURL:/webdav,E=TIMEOUT:5]
115 -
116 - RewriteRule ^/webdav /webdavcgi [PT,L,E=WEBDAVCONF:/etc/webdavcgi-0.8/default/webdav.conf,E=PERLLIB:/usr/share/webdavcgi-0.8/lib/perl,E=LOGOUTURL:/webdav/logout]
117
118 diff --git a/www-apps/webdavcgi/files/postinstall-en.txt b/www-apps/webdavcgi/files/postinstall-en.txt
119 deleted file mode 100644
120 index 8aa6f95d87a..00000000000
121 --- a/www-apps/webdavcgi/files/postinstall-en.txt
122 +++ /dev/null
123 @@ -1,29 +0,0 @@
124 -Before you can run WebDAV CGI you need to configure your web server and WebDAV
125 -CGI itself.
126 -
127 -The following configuration snippet serves as an example for the Apache HTTPD
128 -web server. You will have to adapt it to suite your own server and configuration
129 -needs.
130 -
131 - ScriptAlias /cgi-bin/ "${VHOST_CGIBINDIR}/"
132 -
133 - <Location /${VHOST_CGIBINDIR##*/}/>
134 - AuthType Basic
135 - AuthName "WebDAV-CGI"
136 - AuthUserFile ${VHOST_ROOT}/etc/users.htpasswd
137 - Require valid-user
138 - Order Allow,Deny
139 - Allow from all
140 - </Location>
141 -
142 - RewriteEngine On
143 - RewriteRule ^/${VHOST_APPDIR}/logout /${VHOST_CGIBINDIR##*/}/logout [PT,E=REALM:WebDAV-CGI,E=HOMEURL:/${VHOST_APPDIR},L]
144 - RewriteRule ^/${VHOST_APPDIR} /${VHOST_CGIBINDIR##*/}/webdav.pl [PT,E=WEBDAVCONF:${VHOST_ROOT}/etc/webdav.conf,E=PERLLIB:${VHOST_ROOT}/lib/perl,L]
145 -
146 -
147 -Afterwards you need to copy the default configuration file and edit it:
148 -cp -p ${VHOST_ROOT}/etc/{webdav.conf-dist,webdav.conf}
149 -\$EDITOR ${VHOST_ROOT}/etc/webdav.conf
150 -
151 -For further informations study the online documentation which is located at:
152 -http://webdavcgi.sourceforge.net/doc.html
153
154 diff --git a/www-apps/webdavcgi/files/postinstall-webdavwrapper-en.txt b/www-apps/webdavcgi/files/postinstall-webdavwrapper-en.txt
155 deleted file mode 100644
156 index 5f30d81be7b..00000000000
157 --- a/www-apps/webdavcgi/files/postinstall-webdavwrapper-en.txt
158 +++ /dev/null
159 @@ -1,32 +0,0 @@
160 -Before you can run WebDAV CGI you need to configure your web server and WebDAV
161 -CGI itself.
162 -
163 -The following configuration snippet serves as an example for the Apache HTTPD
164 -web server. You will have to adapt it to suite your own server and configuration
165 -needs.
166 -
167 - ScriptAlias /cgi-bin/ "${VHOST_CGIBINDIR}/"
168 -
169 - <Location /${VHOST_CGIBINDIR##*/}/>
170 - AuthType Basic
171 - AuthName "WebDAV-CGI"
172 - AuthUserFile ${VHOST_ROOT}/etc/users.htpasswd
173 - Require valid-user
174 - Order Allow,Deny
175 - Allow from all
176 - </Location>
177 -
178 - RewriteEngine On
179 - RewriteRule ^/${VHOST_APPDIR}/logout /${VHOST_CGIBINDIR##*/}/logout [PT,E=REALM:WebDAV-CGI,E=HOMEURL:/${VHOST_APPDIR},L]
180 - RewriteRule ^/${VHOST_APPDIR} /${VHOST_CGIBINDIR##*/}/webdavwrapper [PT,E=WEBDAVCONF:${VHOST_ROOT}/etc/webdav.conf,E=PERLLIB:${VHOST_ROOT}/lib/perl,L]
181 -
182 -
183 -Afterwards you need to copy the default configuration file and edit it:
184 -cp -p ${VHOST_ROOT}/etc/{webdav.conf-dist,webdav.conf}
185 -\$EDITOR ${VHOST_ROOT}/etc/webdav.conf
186 -
187 -Also make sure that all system users which should be able to login to WebDAV CGI
188 -are able to access the installed files below ${VHOST_ROOT}.
189 -
190 -For further informations study the online documentation which is located at:
191 -http://webdavcgi.sourceforge.net/doc.html
192
193 diff --git a/www-apps/webdavcgi/files/reconfig b/www-apps/webdavcgi/files/reconfig
194 deleted file mode 100644
195 index 07710dd7c3e..00000000000
196 --- a/www-apps/webdavcgi/files/reconfig
197 +++ /dev/null
198 @@ -1,32 +0,0 @@
199 -#!/bin/bash
200 -
201 -confDir="etc"
202 -distConfFile="webdav.conf-dist"
203 -
204 -sedCmd="/bin/sed"
205 -
206 -
207 -function die ()
208 -{
209 - echo "reconfig error: $1" >&2
210 - exit 1
211 -}
212 -
213 -
214 -if [ $1 != "install" ]; then
215 - # nothing to be done, exit
216 - exit 0
217 -fi
218 -
219 -# Set the correct path within the config file
220 -distConfFilePath="${VHOST_ROOT}/${confDir}/${distConfFile}"
221 -if ! ${sedCmd} -i -e "s|^\(\$INSTALL_BASE\)=.*|\1='${VHOST_ROOT}/';|" \
222 - ${distConfFilePath}
223 -then
224 - die "Setting INSTALL_BASE path in ${distConfFilePath} failed"
225 -fi
226 -
227 -
228 -# Adding logout support
229 -# see: http://webdavcgi.sourceforge.net/doc.html#logout
230 -echo "\$HEADER = '<div class=\"header\">WebDAV CGI - Web interface: You are logged in as <span title="'.`id -a`.'">' .\$ENV{REMOTE_USER}.'</span> (<a href="/logout">Logout</a>).</div>';" >> ${distConfFilePath}
231
232 diff --git a/www-apps/webdavcgi/files/reconfig-suid b/www-apps/webdavcgi/files/reconfig-suid
233 deleted file mode 100644
234 index d7fb8772261..00000000000
235 --- a/www-apps/webdavcgi/files/reconfig-suid
236 +++ /dev/null
237 @@ -1,26 +0,0 @@
238 -#!/bin/bash
239 -
240 -webDavWrapper="webdavwrapper"
241 -webDavWrapperPath="${VHOST_CGIBINDIR}/${webDavWrapper}"
242 -
243 -chmodCmd="/bin/chmod"
244 -chownCmd="/bin/chown"
245 -
246 -
247 -function die ()
248 -{
249 - echo "reconfig error: $1" >&2
250 - exit 1
251 -}
252 -
253 -if [ $1 = "install" ]; then
254 - # In order to change the user and group ID at runtime, the webdavwrapper
255 - # needs to be run as root (set-user-ID and set-group-ID bit)
256 - if ! ${chownCmd} root:root ${webDavWrapperPath}; then
257 - die "Chown for ${webDavWrapperPath} failed"
258 - fi
259 -
260 - if ! ${chmodCmd} 6755 ${webDavWrapperPath}; then
261 - die "Setting SUID and SGID bit on ${webDavWrapperPath} failed"
262 - fi
263 -fi
264
265 diff --git a/www-apps/webdavcgi/files/webdav-0.8.conf b/www-apps/webdavcgi/files/webdav-0.8.conf
266 deleted file mode 100644
267 index 8563df7ad61..00000000000
268 --- a/www-apps/webdavcgi/files/webdav-0.8.conf
269 +++ /dev/null
270 @@ -1,88 +0,0 @@
271 -## -- INSTALL_BASE
272 -## folder path to the webdav.conf, .css, .js, and. msg files for the Web
273 -## interface
274 -## (don't forget the trailing slash)
275 -$INSTALL_BASE='/usr/share/webdavcgi-0.8/';
276 -
277 -## -- VIRTUAL_BASE
278 -## only neccassary if you use redirects or rewrites from a VIRTUAL_BASE to
279 -## the DOCUMENT_ROOT;
280 -## regular expressions are allowed
281 -## EXAMPLE: $VIRTUAL_BASE = '/';
282 -$VIRTUAL_BASE = '/webdav';
283 -
284 -## -- DOCUMENT_ROOT
285 -## by default the server document root
286 -## (don't forget a trailing slash '/'):
287 -$DOCUMENT_ROOT = '/home/';
288 -
289 -## -- UMASK
290 -## mask for file/folder creation
291 -## (it does not change permission of existing files/folders):
292 -$UMASK = 0007;
293 -
294 -## -- ENABLE_DAVMOUNT
295 -## enables DAV mount button in the folder navigation of the Web interface
296 -$ENABLE_DAVMOUNT = 1;
297 -
298 -## -- ENABLE_COMPRESSION
299 -## enables/disables gzip content encoding for the Web interface
300 -$ENABLE_COMPRESSION = 0;
301 -
302 -## -- PAGE_LIMIT
303 -## limits number of files/folders shown in the Web interface
304 -$PAGE_LIMIT=100;
305 -
306 -## -- PAGE_LIMITS
307 -## allowed selectable limits (-1 = show all)
308 -@PAGE_LIMITS = ( 5, 10, 15, 20, 30, 50, 100, -1);
309 -
310 -## -- DBI_(SRC/USER/PASS)
311 -## database setup for LOCK/UNLOCK/PROPPATCH/PROPFIND data
312 -##
313 -## SQLite config
314 -## If users share the same folder they should use the same database
315 -## in this case you have to use a single file writeable for all users.
316 -#$DBI_SRC='dbi:SQLite:dbname=/var/lib/webdavcgi/0.8/default/webdav.db';
317 -#$DBI_USER='';
318 -#$DBI_PASS='';
319 -#$CREATE_DB = !-e '/var/lib/webdavcgi/0.8/default/webdav.db';
320 -
321 -## MySQL config
322 -#$DBI_SRC='DBI:mysql:database=webdavcgi;host=localhost;port=3306';
323 -#$DBI_USER='mysqluser';
324 -#$DBI_PASS='changeme';
325 -#$CREATE_DB=0;
326 -
327 -## PostgreSQL config
328 -#$DBI_SRC='dbi:Pg:dbname=webdavcgi;host=localhost;port=5432';
329 -#$DBI_USER='pguser';
330 -#$DBI_PASS='changeme';
331 -#$CREATE_DB = 0;
332 -
333 -## -- HEADER
334 -## content after body tag in the Web interface
335 -$HEADER = '<div class="header">WebDAV CGI - Web interface: You are logged in as <span title=.`id -a`.>' .$ENV{REMOTE_USER}.'</span> (<a href="'.$ENV{LOGOUTURL}.'">Logout</a>).</div>';
336 -
337 -## -- ENABLE_CALDAV
338 -## Disable CalDAV support for Lightning/Sunbird/iCal/iPhone calender/task
339 -## support
340 -$ENABLE_CALDAV = 0;
341 -
342 -## -- ENABLE_GROUPDAV
343 -## Disables GroupDAV (http://groupdav.org/draft-hess-groupdav-01.txt)
344 -$ENABLE_GROUPDAV = 0;
345 -
346 -## -- ENABLE_THUMBNAIL
347 -## Disable image thumbnail support and media rss feed for folder listings of the
348 -## Web interface.
349 -## If enabled the default icons for images will be replaced by thumbnails
350 -## and if the mouse is over a icon the icon will be zoomed to the size of
351 -## $THUMBNAIL_WIDTH.
352 -$ENABLE_THUMBNAIL = 0;
353 -
354 -## -- THUMBNAIL_CACHEDIR
355 -## defines the path to a cache directory for image thumbnails
356 -## this is neccessary if you enable the thumbnail cache ($ENABLE_THUMBNAIL_CACHE)
357 -## EXAMPLE: $THUMBNAIL_CACHEDIR=".thumbs";
358 -$THUMBNAIL_CACHEDIR="/var/cache/webdavcgi/0.8/default/thumbnails";