I have prepared an NMU based on Thierry's patch. Please find the final changeset attached.
Cheers, -- Steve Langasek postmodern programmer
diff -Nru /var/tmp/klUvMk9p6w/lists-archives-200300506/debian/changelog /var/tmp/01MFj6DNm2/lists-archives-200300506/debian/changelog --- /var/tmp/klUvMk9p6w/lists-archives-200300506/debian/changelog 2003-05-07 12:02:19.000000000 -0700 +++ /var/tmp/01MFj6DNm2/lists-archives-200300506/debian/changelog 2005-01-11 23:50:24.000000000 -0800 @@ -1,3 +1,14 @@ +lists-archives (200300506-1.1) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for sarge-targetted RC bugfix. + * Drop dependency on symlinks, which is being dropped from main due to + licensing reasons (#273338), and replace calls to symlinks -dr with + a bit of shell code borrowed from XFree86; thanks to Thierry Reding + for her work in preparing this patch. Closes: #288158. + + -- Steve Langasek <[EMAIL PROTECTED]> Tue, 11 Jan 2005 23:44:56 -0800 + lists-archives (200300506-1) unstable; urgency=low * Fixed lists-archives doesn't write the dates list in index.html. Closes: #171457 diff -Nru /var/tmp/klUvMk9p6w/lists-archives-200300506/debian/control /var/tmp/01MFj6DNm2/lists-archives-200300506/debian/control --- /var/tmp/klUvMk9p6w/lists-archives-200300506/debian/control 2003-05-07 12:01:53.000000000 -0700 +++ /var/tmp/01MFj6DNm2/lists-archives-200300506/debian/control 2005-01-11 23:43:52.000000000 -0800 @@ -7,7 +7,7 @@ Package: lists-archives Architecture: all -Depends: perl5, mhonarc, procmail, symlinks +Depends: perl5, mhonarc, procmail Description: Web archive for mailing lists Creates a website of historical posts to mailing lists, in the sorted style used by the Debian Project (http://www.debian.org/Lists-Archives). diff -Nru /var/tmp/klUvMk9p6w/lists-archives-200300506/debian/copyright /var/tmp/01MFj6DNm2/lists-archives-200300506/debian/copyright --- /var/tmp/klUvMk9p6w/lists-archives-200300506/debian/copyright 2001-08-27 07:03:57.000000000 -0700 +++ /var/tmp/01MFj6DNm2/lists-archives-200300506/debian/copyright 2005-01-11 23:43:52.000000000 -0800 @@ -16,3 +16,41 @@ On Debian GNU/Linux systems, the text of the GPL can be found in /usr/share/common-licenses/GPL. + + +The script /etc/cron.daily/lists-archives includes code adapted from the +`cleanlinks' script that is copyright (C) 2000 by The XFree86 Project, Inc. +and released under the XFree86 1.0 License, the text of which follows: + +--- + + XFree86 License + +XFree86 code without an explicit copyright is covered by the following copy- +right/license: + +Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is fur- +nished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- +NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from the XFree86 +Project. + +--- diff -Nru /var/tmp/klUvMk9p6w/lists-archives-200300506/debian/cron.daily /var/tmp/01MFj6DNm2/lists-archives-200300506/debian/cron.daily --- /var/tmp/klUvMk9p6w/lists-archives-200300506/debian/cron.daily 2003-05-06 09:13:47.000000000 -0700 +++ /var/tmp/01MFj6DNm2/lists-archives-200300506/debian/cron.daily 2005-01-11 23:44:30.000000000 -0800 @@ -1,4 +1,25 @@ #!/bin/sh -e + +# Silently remove dangling symlinks. +# +# This function is adapted from the `cleanlinks' program which is part of +# XFree86 (see /usr/share/doc/lists-archives/copyright). +function clean_symlinks +{ + if [ -n "$1" ]; then + find "$1" -type l -print | + ( + read i || break + while [ -n "$i" ]; do + if [ ! -f "$i" ]; then + rm -f "$i" + fi + read i || break + done + ) + fi +} + [ -d /var/lib/lists-archives/archives ] || exit 0 umask 002 @@ -24,7 +45,7 @@ done # Not sure yet why this is needed. :-) -symlinks -dr /var/lib/lists-archives > /dev/null 2>&1 +clean_symlinks /var/lib/lists-archives # Fix stray ownerships and permissions (searchlists.log must be www-data). chown -R daemon.list /var/lib/lists-archives/archives @@ -51,4 +72,4 @@ ln -sf $dir $base done -symlinks -dr /var/lib/lists-archives > /dev/null 2>&1 +clean_symlinks /var/lib/lists-archives
signature.asc
Description: Digital signature
