diff -Nru dpkg-www-2.56/debian/changelog dpkg-www-2.57/debian/changelog --- dpkg-www-2.56/debian/changelog 2015-09-15 19:22:16.000000000 +0000 +++ dpkg-www-2.57/debian/changelog 2017-11-17 02:32:01.000000000 +0000 @@ -1,3 +1,27 @@ +dpkg-www (2.57) unstable; urgency=medium + + * QA upload. + * Update archive section names and descriptions. (Closes: #847532) + * Wrap and sort debian/control and debian/copyright fields. + * Spell CGI in uppercase. + * Remove now unused dh-apache2 lintian override. + * Use balanced quotes '' instead of `' in text. + * Remove trailing spaces. + * Update Vcs field URLs. + * Remove obsolete perl5 alternative dependency. + * Replace iceweasel with firefox dependency. + * Add sensible-utils to Suggests. + * Use https in debian/copyright Format URL. + * Move location of license on Debian systems into a Comment field in + debian/copyright file. + * Bump debhelper compatibilty level to 10. + * Set Rules-Requires-Root to no. + * Add lintian override for bogus tech-ctte decision imposed onto policy, + as the less bad of all alternatives. + * Bump Standards-Version to 4.1.1. + + -- Guillem Jover Fri, 17 Nov 2017 03:32:01 +0100 + dpkg-www (2.56) unstable; urgency=medium * QA upload. @@ -446,7 +470,7 @@ dpkg-www (2.16) unstable; urgency=low * Added missing doublequotes to sanity check tests. - Added missing backslashes to addButton functions. + Added missing backslashes to addButton functions. -- Massimo Dal Zotto Tue, 6 Mar 2001 15:50:00 +0100 diff -Nru dpkg-www-2.56/debian/compat dpkg-www-2.57/debian/compat --- dpkg-www-2.56/debian/compat 2015-09-15 19:12:06.000000000 +0000 +++ dpkg-www-2.57/debian/compat 2017-11-17 02:32:01.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru dpkg-www-2.56/debian/control dpkg-www-2.57/debian/control --- dpkg-www-2.56/debian/control 2015-09-15 19:12:06.000000000 +0000 +++ dpkg-www-2.57/debian/control 2017-11-17 02:32:01.000000000 +0000 @@ -2,16 +2,31 @@ Section: doc Priority: optional Maintainer: Debian QA Group -Build-Depends: debhelper (>= 9), dh-apache2 -Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/collab-maint/dpkg-www.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/dpkg-www.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/dpkg-www.git +Vcs-Browser: https://anonscm.debian.org/git/collab-maint/dpkg-www.git +Rules-Requires-Root: no +Build-Depends: + debhelper (>= 10), + dh-apache2, +Standards-Version: 4.1.1 Package: dpkg-www Architecture: all -Depends: ${misc:Depends}, apt, dwww, info2www, perl | perl5 -Recommends: ${misc:Recommends} -Suggests: dlocate, grep-dctrl, iceweasel | www-browser, man2html, tasksel +Depends: + ${misc:Depends}, + apt, + dwww, + info2www, + perl, +Recommends: + ${misc:Recommends}, +Suggests: + dlocate, + grep-dctrl, + firefox | www-browser, + sensible-utils, + man2html, + tasksel, Description: Web based Debian package browser With the dpkg cgi-bin you can browse Debian packages on a local or remote host using a normal web browser. @@ -22,6 +37,6 @@ those providing a virtual package. . If you are the system administrator you can also install or remove - packages by clicking on the buttons found in the package info page, + packages by clicking on the buttons found in the package info page, provided that this feature has been enabled and you have properly configured your web browser. diff -Nru dpkg-www-2.56/debian/copyright dpkg-www-2.57/debian/copyright --- dpkg-www-2.56/debian/copyright 2015-09-15 19:12:06.000000000 +0000 +++ dpkg-www-2.57/debian/copyright 2017-11-17 02:32:01.000000000 +0000 @@ -1,9 +1,10 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Files: * -Copyright: 1999-2006 Massimo Dal Zotto - 2008 Raphael Geissert - 2015 Jean-Michel Nirgal Vourgère +Copyright: + 1999-2006 Massimo Dal Zotto + 2008 Raphael Geissert + 2015 Jean-Michel Nirgal Vourgère License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,6 +19,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - . +Comment: On Debian systems, the text of the GNU General Public License version 2 - can be found in `/usr/share/common-licenses/GPL-2'. + can be found in '/usr/share/common-licenses/GPL-2'. diff -Nru dpkg-www-2.56/debian/dpkg-www.lintian-overrides dpkg-www-2.57/debian/dpkg-www.lintian-overrides --- dpkg-www-2.56/debian/dpkg-www.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ dpkg-www-2.57/debian/dpkg-www.lintian-overrides 2017-11-17 02:32:01.000000000 +0000 @@ -0,0 +1,4 @@ +# We have now a Suggests which should be enough. +dpkg-www: script-needs-depends-on-sensible-utils usr/bin/dpkg-www * +# Ignore bogus tech-ctte decision imposed onto policy. +dpkg-www: command-in-menu-file-and-desktop-file dpkg-www usr/share/menu/dpkg-www:* diff -Nru dpkg-www-2.56/debian/README.Debian dpkg-www-2.57/debian/README.Debian --- dpkg-www-2.56/debian/README.Debian 2015-09-15 19:12:06.000000000 +0000 +++ dpkg-www-2.57/debian/README.Debian 2017-11-17 02:32:01.000000000 +0000 @@ -3,7 +3,7 @@ Web based Debian package browser. -With this cgi program you can browse Debian packages using a WEB browser. +With this CGI program you can browse Debian packages using a WEB browser. You can easily follow package dependencies and browse package documentation with a mouse click. @@ -13,7 +13,7 @@ You can even install or remove packages from your browser if this feature is enabled in the site configuration file. -WARNING! +WARNING! Allowing access to /cgi-bin/dpkg from any foreign host could allow a malicious external user to know your installed packages and try possible security exploits. You should therefore disable access to dpkg-www from diff -Nru dpkg-www-2.56/debian/source/lintian-overrides dpkg-www-2.57/debian/source/lintian-overrides --- dpkg-www-2.56/debian/source/lintian-overrides 2015-09-15 19:12:06.000000000 +0000 +++ dpkg-www-2.57/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# dh_apache2 build usage requires dependency on dh-apache2, which is temporarily provided by apache2-dev -# See https://bugs.debian.org/778820 -dpkg-www source: missing-build-dependency-for-dh-addon apache2 => apache2-dev diff -Nru dpkg-www-2.56/src/dpkg dpkg-www-2.57/src/dpkg --- dpkg-www-2.56/src/dpkg 2015-09-15 19:12:06.000000000 +0000 +++ dpkg-www-2.57/src/dpkg 2017-11-17 02:32:01.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# Cgi interface to dpkg. Show information about debian packages. +# CGI interface to dpkg. Show information about debian packages. # # Copyright (C) 1999-2006 Massimo Dal Zotto # @@ -18,39 +18,68 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -PROG_VERSION=2.56 +PROG_VERSION=2.57 SELF=${0##*/}; export SELF HELP_PAGE="/usr/share/man/man8/dpkg-www.8.gz" COLUMNS=256; export COLUMNS SECTION_DESCRIPTIONS=" -admin Utilities to administer the system +admin Administrative utilities (install software, manage users, etc) base Basic needed utilities of every Debian system -comm Software to use your modem in the old fashioned style -devel Development utilities, compilers, environments, libraries, etc. -doc FAQs, HOWTOs, documents and software to browse documentation -editors Software to edit files and programming environments -electronics Electronics utilities -games Programs to spend a nice time with after setting up Debian -graphics Editors, viewers, converters... Everything to become an artist -hamradio Software for ham radio +cli-mono Mono and the Common Language Infrastructure +comm Programs for faxmodems and other communication devices +database Database servers and tools +debug Debug symbols +devel Utilities and programs for software development +doc Documentation and specialized programs for viewing documentation +editors Text editors and word processors +education Software, documentation or data related to educational activities +electronics Programs for working with circuits and electronics +embedded Programs for embedded systems +fonts Fonts and font utilities +games Games, toys, and fun programs +gnome The GNOME Desktop Environment +gnu-r The GNU R statistical computation and graphics system +gnustep The GNUstep Environment +graphics Utilities to create, view, and edit graphics files +hamradio Software for ham radio operators +haskell Haskell programming language and libraries +httpd Webservers and their modules interpreters Interpreters for interpreted languages and macro processors -libs Libraries to make other programs work -mail Programs to route, read, and compose E-mail messages -math Math software -misc Miscellaneous utilities that didn't fit well anywhere else -net Daemons and clients to connect your system to the world -news Software to access Usenet, to set up news servers, etc. -non-us Software restricted in the US by export regulations or patents -oldlibs Old versions of libraries, kept for backward compatibility -otherosfs Software to use programs and filesystems for other O.S. -science Basic tools for scientific work -shells Command shells and friendly user interfaces for beginners. -sound Utilities to deal with sound: mixers, players, recorders, etc. -tex The famous typesetting software and related programs -text Utilities to format and print text documents -utils Utilities for file/disk manipulation, backup, monitoring, etc. -web Web servers, browsers, proxies, download tools etc. -x11 X servers, libraries, fonts, window managers, and applications +introspection Introspection support for programming languages +java Java programming language and libraries +javascript JavaScript programming language, libraries, and development tools +kde The KDE Desktop Environment +kernel Kernel and kernel modules +libdevel Development files for libraries +libs Collections of software routines +lisp Lisp programming language and libraries +localization Language packs +mail Programs to write, send, and route email messages +math Numeric analysis and other mathematics-related software +metapackages Packages which solely depend on other packages +misc Miscellaneous software +net Programs to connect to and provide various services +news Usenet clients and servers +ocaml OCaml programming language and libraries +oldlibs Obsolete libraries +otherosfs Emulators and software to read foreign filesystems +perl Perl programming language and libraries +php PHP programming language and libraries +python Python programming language and libraries +ruby Ruby programming language and libraries +rust Rust programming language, library crates, and development tools +science Software for scientific work +shells Command shells and alternative console environments +sound Utilities to play and record sound +tex The TeX typesetting system +text Text processing utilities +utils Various system utilities +vcs Version control systems +video Utilities to record, view, edit, and stream video files +web Web browsers, servers, proxies, and other tools +x11 The X window system and related software +xfce The Xfce Desktop Environment +zope Zope/Plone framework " TASK_DESCRIPTIONS=" @@ -878,11 +907,11 @@ gsub("\\(", " (") for (f=2; f<=NF; f++) { if ($f == "|") { - continue + continue } if (match($f,"^\\(")) { f++; - continue + continue } r = $f; gsub(",", "", r) @@ -995,7 +1024,7 @@ if (needs_desc) { update_descs() } - if (NR < 6) { + if (NR < 6) { if (!missing) { print "no packages found" } @@ -1430,7 +1459,7 @@ elif [ "$browse" ]; then printHtmlHeader "Package Browser" application/dpkg-www-browser printBrowseRequest "$packages" - printHtmlBottom + printHtmlBottom else printHtmlHeader "$title" printInputForm diff -Nru dpkg-www-2.56/src/dpkg-www.1 dpkg-www-2.57/src/dpkg-www.1 --- dpkg-www-2.56/src/dpkg-www.1 2015-09-15 19:12:06.000000000 +0000 +++ dpkg-www-2.57/src/dpkg-www.1 2017-11-17 02:32:01.000000000 +0000 @@ -17,7 +17,7 @@ If not running under X it will try to use a text browser instead. If Netscape is found and a Netscape instance is already running it -will be asked to open the dpkg URL on localhost with the optional +will be asked to open the dpkg URL on localhost with the optional .I query supplied on the command line. If there is no browser running, it will start automatically a new one. @@ -32,19 +32,19 @@ installation. It should never be invoked directly by the user. .SH OPTIONS -.TP +.TP \fB\-s\fR, \fB\-\-stdout\fR Redirect output to stdout. Requires one of the text browsers (lynx, lynx-ssl or links) installed. -.TP +.TP \fB\-h\fR, \fB\-\-host\fR \fBhost\fR Send the query to a remote host, where dpkg-www must be installed. -.TP +.TP .BI query Specifies an optional package name, an absolute pathname or a query argument which is passed to the dpkg cgi-bin. See .BR dpkg-www(8) -for more information about the use of the cgi. +for more information about the use of the CGI. .SH FILES .IP /etc/dpkg-www.conf diff -Nru dpkg-www-2.56/src/dpkg-www.8 dpkg-www-2.57/src/dpkg-www.8 --- dpkg-www-2.56/src/dpkg-www.8 2015-09-15 19:12:06.000000000 +0000 +++ dpkg-www-2.57/src/dpkg-www.8 2017-11-17 02:32:01.000000000 +0000 @@ -17,7 +17,7 @@ .PP With the .B dpkg-www -cgi you can instead browse Debian packages info with a WEB browser, +CGI you can instead browse Debian packages info with a WEB browser, following package dependencies and locating documentation (man pages, Info files, READMEs, and so on) with a few mouse clicks. If you have superuser privileges you can even install, upgrade or remove packages @@ -30,7 +30,7 @@ files. .PP -The cgi program can take an optional query argument which can be given in +The CGI program can take an optional query argument which can be given in the URL or entered in the query field of the html form. This can be: .IP list concisely all installed packages @@ -40,11 +40,11 @@ list concisely the requested packages .IP list concisely all packages whose name matches the expression, for -example `*image*' will find all packages which contain the string `image'. -.IP +example '*image*' will find all packages which contain the string 'image'. +.IP list verbosely a package and, if the package is installed, all its files. If the package is not installed and the WEB installation is enabled you -can install it by clicking on the `Install' button. If the package is +can install it by clicking on the 'Install' button. If the package is installed you can remove it or upgrade to a new version, if available, by clicking on the respective buttons. .IP @@ -58,12 +58,12 @@ omitted the value is searched in any control field. The default search is a case-insensitive fixed substring match but it can be changed with the .B GREP_DCTRL_OPTS -option in the config file. +option in the config file. This feature works only if the .B grep-dctrl package is installed. .IP ?\ (question\ mark) -show a concise help about the cgi usage. +show a concise help about the CGI usage. .IP \ (a\ single\ space) print only the input form, for use from window-manager menus. @@ -76,13 +76,13 @@ script that defines some or all the following variables (defaults are used if the file doesn't exist, or doesn't define the variable): .IP CHECK_BUTTONS -If this option is enabled +If this option is enabled .B dpkw-www -will add a small `install' check-button for each package shown in the package +will add a small 'install' check-button for each package shown in the package list. Default is 0 (disabled) because the resulting interface is not very nice. The use of this option is therefore not recommended. .IP INSTALL_BUTTON -If this option is set the `Install' or `Upgrade' and `Remove' buttons will +If this option is set the 'Install' or 'Upgrade' and 'Remove' buttons will be added to the verbose info of a package. By clicking on these button you will start the installation of removal the package as described in the section .B WEB Installation. @@ -91,8 +91,8 @@ If the variable is set to "top" the button will be located before the file list, default is the bottom of the page. .IP SHOW_LOCAL_FILES -If this variable is set, dpkg-www will use file:/ style URL's to -access html files -- bypassing the cgi script. This is faster +If this variable is set, dpkg-www will use file:/ style URL's to +access html files -- bypassing the CGI script. This is faster on slow machines. Default is not defined, which means use local files for connection from localhost and http:// URL's for remote connections. .IP CHECK_PACKAGE_VERSION @@ -130,7 +130,7 @@ .B dlocate , or .B auto . -Default is auto, meaning that the cgi will use +Default is auto, meaning that the CGI will use .B dlocate if installed, otherwise revert to .B dpkg @@ -142,7 +142,7 @@ .B man2html or .B auto . -Default is auto, meaning that the cgi will use +Default is auto, meaning that the CGI will use .B man2thml if installed, otherwise revert to .B dwww . @@ -235,29 +235,29 @@ .br .br -# Enable cgi debugging. Not really useful. +# Enable CGI debugging. Not really useful. .br # DEBUG=1 .PP -.SS Cgi access +.SS CGI access The information provided by .B dpkg-www and the ability to install or remove packages also remotely can potentially give useful information to crackers and open security holes. For these reasons -access to this cgi program should be allowed only from localhost and trusted +access to this CGI program should be allowed only from localhost and trusted hosts or domains. Unfortunately this configuration is dependent on the particular installed WEB server. The dpkg-www package configures the apache server, if installed, to allow access only from localhost. Other WEB servers must be configured manually by the system administrator to restrict access to trusted hosts. If you administer many Debian system on a local network -you may want to enable access to the cgi from your network and browse +you may want to enable access to the CGI from your network and browse packages on any host from any other machine. .SS WEB installation -If this option is enabled in the +If this option is enabled in the .I /etc/dpkg-www.conf -file, the `Install', `Upgrade' and `Remove' buttons are added to the info +file, the 'Install', 'Upgrade' and 'Remove' buttons are added to the info page of installed or uninstalled packages. By clicking on this button the system administrator, or more precisely any user who has the ability to become system administrator (since you don't @@ -267,12 +267,12 @@ .PP For security reasons the installation is done entirely from the browser side, -so that you don't need to gain root privileges from the cgi program which is +so that you don't need to gain root privileges from the CGI program which is run on the server. The only thing done on the server is to generate an installation request which is downloaded to the browser for the execution, which is started under control of the user and with his privileges. The real installation is done by a small helper script run from the user's -browser when a document with content-type `application/dpkg-www-installer' +browser when a document with content-type 'application/dpkg-www-installer' is received from the web server. The helper script opens an XTerm on the user's display and runs a script which becomes superuser, after asking the root password, and execs an apt-get command to install the requested @@ -302,7 +302,7 @@ .PP In order to be able to install the packages the user must known the root -password asked for `su root' when installing on the local server, or have +password asked for 'su root' when installing on the local server, or have the ability to ssh as root to the remote host when installing from a remote client. diff -Nru dpkg-www-2.56/src/dpkg-www.conf dpkg-www-2.57/src/dpkg-www.conf --- dpkg-www-2.56/src/dpkg-www.conf 2015-09-15 19:12:06.000000000 +0000 +++ dpkg-www-2.57/src/dpkg-www.conf 2017-11-17 02:32:01.000000000 +0000 @@ -39,7 +39,7 @@ # HTML background color. BGCOLOR="#d0e0d0" -# Enable cgi debugging. Not really useful to normal users. +# Enable CGI debugging. Not really useful to normal users. # DEBUG=1 # Path on webserver to dwww diff -Nru dpkg-www-2.56/src/dpkg-www-installer dpkg-www-2.57/src/dpkg-www-installer --- dpkg-www-2.56/src/dpkg-www-installer 2015-09-15 19:12:06.000000000 +0000 +++ dpkg-www-2.57/src/dpkg-www-installer 2017-11-17 02:32:01.000000000 +0000 @@ -158,7 +158,6 @@ echo -n "Root "; su root -c "\ apt-get -s $REINSTALL $ACTION $PACKAGES; echo apt-get $REINSTALL $ACTION $PACKAGES" - fi ;; *)