Your message dated Fri, 07 Oct 2005 05:32:05 -0700
with message-id <[EMAIL PROTECTED]>
and subject line Bug#315541: fixed in dpkg-www 2.48
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at maintonly) by bugs.debian.org; 23 Jun 2005 09:43:05 +0000
>From [EMAIL PROTECTED] Thu Jun 23 02:43:05 2005
Return-path: <[EMAIL PROTECTED]>
Received: from sysdev.oucs.ox.ac.uk [163.1.2.12]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1DlOEj-00035Y-00; Thu, 23 Jun 2005 02:43:05 -0700
Received: from curfew.oucs.ox.ac.uk (curfew.oucs.ox.ac.uk [129.67.101.64])
by sysdev.oucs.ox.ac.uk (Postfix) with ESMTP
id E3DBD1C039; Thu, 23 Jun 2005 10:42:33 +0100 (BST)
Received: from aaron by curfew.oucs.ox.ac.uk with local (Exim 3.35 #1 (Debian))
id 1DlOED-00061x-00; Thu, 23 Jun 2005 10:42:33 +0100
From: aaron <[EMAIL PROTECTED]>
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
Subject: Patch: alter location of info2www and dwww
X-Mailer: reportbug 1.50
Date: Thu, 23 Jun 2005 10:42:33 +0100
Message-Id: <[EMAIL PROTECTED]>
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.5 required=4.0 tests=BAYES_00,HAS_PACKAGE,
HTML_MESSAGE autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
Package: dpkg-www
Version: N/A; reported 2005-06-23
Severity: wishlist
Tags: patch
When setting up dpkg-www I wanted to install it with a URL of
something other than /cgi-bin/ (e.g /packages/), and also have
info2www and dwww appear in this location (e.g /packages/dwww).
Below is a patch which enables this.
aaron
--- dpkg-www-2.47.orig/src/dpkg
+++ dpkg-www-2.47/src/dpkg
@@ -105,6 +105,8 @@
BGCOLOR="#c0c0c0"
KEEP_INPUT=0
DEBUG=0
+DWWW_PATH="/cgi-bin/dwww"
+INFO2WWW_PATH="/cgi-bin/info2www"
# Install buttons support. This require that users define the following
# mime action in their netscape mailcap file:
@@ -132,7 +134,7 @@
# Select the Manpage to HTML translator
if [ "$MAN" = dwww ]; then
- MAN="/cgi-bin/dwww?type=man\\\\&location="
+ MAN="${DWWW_PATH}?type=man\\\\&location="
fi
if [ "$MAN" = man2html ]; then
if [ -x /usr/lib/cgi-bin/man/man2html ]; then
@@ -140,7 +142,7 @@
elif [ -x /usr/lib/cgi-bin/man2html ]; then
MAN="/cgi-bin/man2html?"
else
- MAN="/cgi-bin/dwww?type=man\\\\&location="
+ MAN="${DWWW_PATH}?type=man\\\\&location="
fi
fi
if [ ! "$MAN" -o "$MAN" = auto ]; then
@@ -149,7 +151,7 @@
elif [ -x /usr/lib/cgi-bin/man2html ]; then
MAN="/cgi-bin/man2html?"
else
- MAN="/cgi-bin/dwww?type=man\\\\&location="
+ MAN="${DWWW_PATH}?type=man\\\\&location="
fi
fi
@@ -1091,7 +1093,8 @@
# Convert a file list to html adding hrefs to files in /usr/{doc,info,man}.
#
fileFilter() {
- awk -v title="$*" -v show_local_files="$SHOW_LOCAL_FILES" -v man="$MAN" '
+ awk -v title="$*" -v show_local_files="$SHOW_LOCAL_FILES" \
+ -v man="$MAN" -v info2www=$INFO2WWW_PATH -v dwww=$DWWW_PATH '
/\/usr\/(share\/)?([a-zA-Z0-9_+-]+\/)?man\/.*\..*/ {
if (title) { t = title } else { t = $1 }
if ($2) { t = t " [" $2 "]"; NF=1 }
@@ -1110,7 +1113,7 @@
gsub("\\+", "\\+", r);
gsub("\\+", "%2B", s);
gsub("\\$","\\$",r)
- sub(r, "<A HREF=\"/cgi-bin/info2www?" s "\">" t "</A>")
+ sub(r, "<A HREF=\"" info2www "?" s "\">" t "</A>")
print
next
}
@@ -1124,7 +1127,7 @@
if (show_local_files == "true") {
sub(r, "<A HREF=\"file:" s "\">" t "</A>")
} else {
- sub(r, "<A HREF=\"/cgi-bin/dwww?type=file\\&location=" s "\">"\
+ sub(r, "<A HREF=\"" dwww "?type=file\\&location=" s "\">"\
t "</A>")
}
print
--- dpkg-www-2.47.orig/src/dpkg-www.conf
+++ dpkg-www-2.47/src/dpkg-www.conf
@@ -42,4 +42,10 @@
# Enable cgi debugging. Not really useful to normal users.
# DEBUG=1
+# Path on webserver to dwww
+DWWW_PATH="/cgi-bin/dwww"
+
+# Path on webserver to info2www
+INFO2WWW_PATH="/cgi-bin/info2www"
+
# end of file
---------------------------------------
Received: (at 315541-close) by bugs.debian.org; 7 Oct 2005 12:38:24 +0000
>From [EMAIL PROTECTED] Fri Oct 07 05:38:24 2005
Return-path: <[EMAIL PROTECTED]>
Received: from katie by spohr.debian.org with local (Exim 3.36 1 (Debian))
id 1ENrOP-0007uJ-00; Fri, 07 Oct 2005 05:32:05 -0700
From: Massimo Dal Zotto <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
X-Katie: $Revision: 1.56 $
Subject: Bug#315541: fixed in dpkg-www 2.48
Message-Id: <[EMAIL PROTECTED]>
Sender: Archive Administrator <[EMAIL PROTECTED]>
Date: Fri, 07 Oct 2005 05:32:05 -0700
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level:
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-CrossAssassin-Score: 3
Source: dpkg-www
Source-Version: 2.48
We believe that the bug you reported is fixed in the latest version of
dpkg-www, which is due to be installed in the Debian FTP archive:
dpkg-www_2.48.dsc
to pool/main/d/dpkg-www/dpkg-www_2.48.dsc
dpkg-www_2.48.tar.gz
to pool/main/d/dpkg-www/dpkg-www_2.48.tar.gz
dpkg-www_2.48_all.deb
to pool/main/d/dpkg-www/dpkg-www_2.48_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Massimo Dal Zotto <[EMAIL PROTECTED]> (supplier of updated dpkg-www package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Fri, 7 Oct 2005 13:10:38 +0200
Source: dpkg-www
Binary: dpkg-www
Architecture: source all
Version: 2.48
Distribution: unstable
Urgency: low
Maintainer: Massimo Dal Zotto <[EMAIL PROTECTED]>
Changed-By: Massimo Dal Zotto <[EMAIL PROTECTED]>
Description:
dpkg-www - powerful WEB based Debian package browser
Closes: 281833 311594 315541 329622 331805
Changes:
dpkg-www (2.48) unstable; urgency=low
.
* Fixed duplicate lines for doc-base documentation files.
.
* Use apache's conf.d instead modifying httpd.conf.
Also changed debconf templates to simply output a note.
Closes: #281833, #329622.
.
* Added Vietnamese translation. Thanks to Clytie Siddall.
Closes: #311594.
.
* Allow alternate location of info2www and dwww.
Closes: #315541.
.
* Added alternate dependency on debconf-2.0.
Closes: #331805.
.
* Added support for /usr/share/gtk-doc/html directory.
.
* Removed again dependency on awk.
Files:
6849651e837a0806bcd1d54f803cb793 498 doc optional dpkg-www_2.48.dsc
ad53a70a25d5c88be88806248e22def3 35903 doc optional dpkg-www_2.48.tar.gz
b43298a05ebbf915e99db41ddf5f6d93 32462 doc optional dpkg-www_2.48_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
iD8DBQFDRmewFH8a6i22VZYRAsUEAJ4z0lX0HB/0DQf7OzxrLdrputECAgCg0/5d
QDvUshcAgPiMx1UhPQGbo24=
=danX
-----END PGP SIGNATURE-----
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
