Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package dwww (explain the reason for the unblock here) Somehow this package was not migrated its VCS-git etc. field to salsa. Ondřej Nový <on...@debian.org> created a salsa repo pull request for this issue. I applied Ondřej Nový's patch and also did some documentation brushup to help people to get dwww working with least effort under systemd. I also applied patch from Daniel Reichelt to help live image creation easier. This is pretty much my salvaging effort. So far, I got no message from Robert the maintainer. I guess he is busy... (include/attach the debdiff against the package in testing) diff -Nru dwww-1.13.4/debian/changelog dwww-1.13.4+nmu1/debian/changelog --- dwww-1.13.4/debian/changelog 2017-06-21 05:13:20.000000000 +0900 +++ dwww-1.13.4+nmu1/debian/changelog 2019-03-17 00:01:51.000000000 +0900 @@ -1,3 +1,17 @@ +dwww (1.13.4+nmu1) unstable; urgency=medium + + * NMU + + [ Ondřej Nový ] + * d/control: Set Vcs-* to salsa.debian.org . Closes: #924709 + + [ Osamu Aoki ] + * Document properly to enable CGI script. Closes: #781987, #822323 + * Apply patch from Daniel Reichelt to make sleep time after each file + configurable for dwww-index++. Closes: #881189 + + -- Osamu Aoki <os...@debian.org> Sun, 17 Mar 2019 00:01:51 +0900 + dwww (1.13.4) unstable; urgency=medium * dwww-txt2html.c: diff -Nru dwww-1.13.4/debian/control dwww-1.13.4+nmu1/debian/control --- dwww-1.13.4/debian/control 2017-06-21 05:13:20.000000000 +0900 +++ dwww-1.13.4+nmu1/debian/control 2019-03-16 18:31:19.000000000 +0900 @@ -5,8 +5,8 @@ Build-Depends: debhelper (>= 10), dh-apache2, lsb-release, publib-dev Build-Conflicts: apache2-dev (<< 2.4.4-6~) Standards-Version: 4.0.0 -Vcs-Git: https://anonscm.debian.org/git/users/robert/dwww.git -Vcs-Browser: https://anonscm.debian.org/cgit/users/robert/dwww.git +Vcs-Git: https://salsa.debian.org/debian/dwww.git +Vcs-Browser: https://salsa.debian.org/debian/dwww Package: dwww Architecture: any @@ -23,10 +23,26 @@ ${perl:Depends}, ${shlibs:Depends} Breaks: apache2 (<< 2.4.4-6~) -Recommends: apt, dlocate (>= 0.5-0.1), info2www, swish++, ${misc:Recommends} -Suggests: doc-debian, dpkg-www, links | www-browser +Recommends: apt, + dlocate (>= 0.5-0.1), + doc-debian, + dpkg-www, + info2www, + links | www-browser, + swish++, + ${misc:Recommends} Description: Read all on-line documentation with a WWW browser All installed on-line documentation will be served via a local HTTP - server. When possible, dwww converts the documentation to HTML. - You need to install both a CGI-capable HTTP server and a WWW - browser to read the documentation. + server at http://localhost/dwww/. This package runs cron scripts to + convert available resources to the HTML pages. Executing the dwww + command starts a sensible WWW browser locally to access them. + . + You need to install a CGI-capable HTTP server and enable its CGI script + capability manually (CGI may be disabled by default for the security + consideration). For apache2, do something along the following: + . + $ sudo a2enmod cgid + $ sudo systemctl restart apache2 + . + The default for the HTTP/CGI access is limited to the local user for + the security consideration. diff -Nru dwww-1.13.4/man/dwww.7 dwww-1.13.4+nmu1/man/dwww.7 --- dwww-1.13.4/man/dwww.7 2017-06-21 05:13:20.000000000 +0900 +++ dwww-1.13.4+nmu1/man/dwww.7 2019-03-16 16:14:00.000000000 +0900 @@ -230,6 +230,14 @@ .BR dwww\-index++ (8) will generate index of registered documentation. .\" +.IP DWWW_INDEX_FULL_SLEEP_TIME +In order to not impede regular server operation, +.BR dwww\-index++ (8) +sleeps for the specified amount of time (in seconds) before feeding the next file path to index to +.BR index++ (1). +The default value is +.BR 0.15 . +.\" .IP DWWW_INDEX_FULL_TIME_INTERVAL Specifies how often (in days) .BR dwww\-index++ (8) diff -Nru dwww-1.13.4/perl/Debian/Dwww/ConfigFile.pm dwww-1.13.4+nmu1/perl/Debian/Dwww/ConfigFile.pm --- dwww-1.13.4/perl/Debian/Dwww/ConfigFile.pm 2017-06-21 05:13:20.000000000 +0900 +++ dwww-1.13.4+nmu1/perl/Debian/Dwww/ConfigFile.pm 2019-03-16 16:14:00.000000000 +0900 @@ -96,6 +96,11 @@ defval => 28, descr => 'How often (in days) dwww-index++(8) will generate full index of documentation.' }, + 'DWWW_INDEX_FULL_SLEEP_TIME' => { + sort => 50, + defval => 0.15, + descr => 'How long (in seconds) dwww-index++ should sleep after each file in order to not impact regular server operation.' + }, 'DWWW_INDEX_INCREMENTAL_TIME_INTERVAL' => { sort => 50, defval => 7, diff -Nru dwww-1.13.4/perl/Debian/Dwww/Initialize.pm dwww-1.13.4+nmu1/perl/Debian/Dwww/Initialize.pm --- dwww-1.13.4/perl/Debian/Dwww/Initialize.pm 2017-06-21 05:13:20.000000000 +0900 +++ dwww-1.13.4+nmu1/perl/Debian/Dwww/Initialize.pm 2019-03-16 16:14:16.000000000 +0900 @@ -18,7 +18,7 @@ my $cfgvars = ReadConfigFile($filename); my $dwwwvars = {}; - map +{ $dwwwvars->{$_} = $cfgvars->{$_}->{'cfgval'} ? $cfgvars->{$_}->{'cfgval'} + map +{ $dwwwvars->{$_} = defined($cfgvars->{$_}->{'cfgval'}) ? $cfgvars->{$_}->{'cfgval'} : $cfgvars->{$_}->{'defval'} }, keys %$cfgvars; umask (022); diff -Nru dwww-1.13.4/README dwww-1.13.4+nmu1/README --- dwww-1.13.4/README 2017-06-21 05:13:20.000000000 +0900 +++ dwww-1.13.4+nmu1/README 2019-03-16 18:38:38.000000000 +0900 @@ -11,6 +11,15 @@ boa, roxen, wn, etc., but NOT dhttpd or fnord.) Sorry. +The CGI script capability of a web server may be disabled by default for +the security consideration. You need to enable its CGI script +capability manually. For apache2, do something along the following: + + $ sudo a2enmod cgid + $ sudo systemctl restart apache2 + +The default for the HTTP/CGI access is limited to the local user for the +security consideration. For more information, read the manual page dwww(7), and the other manual pages it refers to. diff -Nru dwww-1.13.4/scripts/dwww-index++ dwww-1.13.4+nmu1/scripts/dwww-index++ --- dwww-1.13.4/scripts/dwww-index++ 2017-06-21 05:13:20.000000000 +0900 +++ dwww-1.13.4+nmu1/scripts/dwww-index++ 2019-03-16 16:14:00.000000000 +0900 @@ -218,9 +218,9 @@ my $do_sleep = shift; foreach my $f (sort keys %new_files_hash) { - syswrite $FH, "$new_files_hash{$f}\n"; - # sleep 150 ms - select(undef, undef, undef, 0.15) if $do_sleep; + syswrite $FH, "$new_files_hash{$f}\n"; + # sleep the configured amount of time, if $do_sleep + select(undef, undef, undef, $dwwwconf->{'DWWW_INDEX_FULL_SLEEP_TIME'}) if $do_sleep; } } # }}} unblock dwww/1.13.4+nmu1 -- System Information: Debian Release: buster/sid APT prefers testing APT policy: (500, 'testing'), (10, 'unstable') Architecture: amd64 (x86_64) Kernel: Linux 4.19.0-2-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
