diff -Nru safecat-1.13/debian/changelog safecat-1.13/debian/changelog --- safecat-1.13/debian/changelog 2011-12-03 04:19:10.000000000 +0000 +++ safecat-1.13/debian/changelog 2012-06-11 03:15:09.000000000 +0000 @@ -1,8 +1,15 @@ -safecat (1.13-1build1) precise; urgency=low +safecat (1.13-2) unstable; urgency=low - * No-change rebuild to drop spurious libsfgcc1 dependency on armhf. + * Bump to debhelper compatibility level 9. + * Ignore source changes to conf-(cc|ld) (Closes: #643268). + * Do not include RPLINE and DTLINE environment variables in files + (Closes: #240647). + * Add patch quoting dashes in the manpage. + * Update watch file. + * Rewrite copyright file in machine readable format. + * Bump to Standards-Version 3.9.3, no changes needed. - -- Adam Conrad Fri, 02 Dec 2011 21:19:10 -0700 + -- Teemu Hukkanen Sat, 09 Jun 2012 11:05:20 +0100 safecat (1.13-1) unstable; urgency=low @@ -88,5 +95,3 @@ * Initial Release. -- Teemu Hukkanen Mon, 18 Jan 1999 09:18:17 +0200 - - diff -Nru safecat-1.13/debian/compat safecat-1.13/debian/compat --- safecat-1.13/debian/compat 2010-03-14 12:55:47.000000000 +0000 +++ safecat-1.13/debian/compat 2012-06-08 21:54:55.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru safecat-1.13/debian/control safecat-1.13/debian/control --- safecat-1.13/debian/control 2010-03-14 12:55:47.000000000 +0000 +++ safecat-1.13/debian/control 2012-06-11 03:36:32.000000000 +0000 @@ -2,15 +2,15 @@ Section: utils Priority: optional Maintainer: Teemu Hukkanen -Build-Depends: groff-base, debhelper (>= 7.0.50) -Standards-Version: 3.8.4.0 +Build-Depends: groff-base, debhelper (>= 9) +Standards-Version: 3.9.3 Homepage: http://pobox.com/~lbudney/linux/software/safecat.html Package: safecat Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: safely copy stdin to a file - safecat is a program which implements Daniel Bernstein's maildir +Description: Safely copy stdin to a file + Safecat is a program which implements Daniel Bernstein's maildir algorithm to copy stdin safely to a file in a specified directory. It can be used to write mail messages to a qmail-style maildir, or to write data to a "spool" directory reliably. diff -Nru safecat-1.13/debian/copyright safecat-1.13/debian/copyright --- safecat-1.13/debian/copyright 2010-03-14 12:55:47.000000000 +0000 +++ safecat-1.13/debian/copyright 2012-06-09 10:13:22.000000000 +0000 @@ -1,69 +1,61 @@ -This package was debianized by Teemu Hukkanen tjhukkan@iki.fi on -Mon, 18 Jan 1999 09:18:17 +0200. - -It was downloaded from - - -Upstream Authors: Len Budney - -Copyright: ---- -All original content is Copyright (c) 2000, Len Budney. All rights -reserved. - -Copying permissions for safecat comes in two parts: +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: http://pobox.com/~lbudney/linux/software/safecat.html +Files: * +Copyright: 2000-2001, Len Budney +License: + Copying permissions for safecat comes in two parts: + . 1. All code written by me is offered under the BSD license. See below for the text of the BSD license. Original content is clearly marked with a copyright notice and my name. - + . 2. Other components of the package, like the programs ``setup'' and ``instcheck'', were derived from code written by Dan Bernstein. Dan has not specified the licensing of (some of) his code; some of his code he has released into the public domain. - + . My best understanding of Dan's position, based on what he has written on the subject, is that he doesn't mind if people borrow his code--as long as you make supporting that code your own problem. In particular, the following considerations apply: - + . a. If you have problems with safecat or anything in this distribution, contact me about it--. Do NOT bother Dan. - + . b. If you think you've found problems in Dan's code, as contained in this distribution, contact me first anyway. If I can verify that the bug exists and isn't mine, I'll pass the info on to Dan. Do NOT bother Dan. - + . c. If you want to use Dan's code for your own projects, then 1) you do so at your own risk, and 2) you should assume full responsibility for maintenance of your project, including borrowed code, just as I'm doing here for safecat. - - -The BSD License states: - + . + The BSD License states: + . Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + . - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + . - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + . - All advertising materials mentioning features or use of this software must display the following acknowledgement: This product includes software developed by the University of California, Berkeley and its contributors. - + . - Neither name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + . THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS `AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -75,3 +67,33 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: debian/* +Copyright: 1999-2012, Teemu Hukkanen +License: BSD-2-clause + Copyright (c) 1999-2012, Teemu Hukkanen + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. diff -Nru safecat-1.13/debian/patches/01-respect-umask.patch safecat-1.13/debian/patches/01-respect-umask.patch --- safecat-1.13/debian/patches/01-respect-umask.patch 1970-01-01 00:00:00.000000000 +0000 +++ safecat-1.13/debian/patches/01-respect-umask.patch 2011-10-23 10:35:44.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Use a permissive mode for the output file by default + This allows modifying the mode by using umask. +Origin: vendor +Bug-Debian: http://bugs.debian.org/211546 +--- a/safecat.c ++++ b/safecat.c +@@ -95,7 +95,7 @@ + + /* Step 4: Create the file tempdir/time.MusecPpid.host */ + alarm(86400); +- outfd = open(tmppath.s,O_WRONLY | O_EXCL | O_CREAT | O_LARGEFILE,0644); ++ outfd = open(tmppath.s,O_WRONLY | O_EXCL | O_CREAT | O_LARGEFILE,0666); + if(outfd == -1) { + strerr_die2sys(111,"safecat: fatal: ","couldn't create output file: "); + } diff -Nru safecat-1.13/debian/patches/02-do-not-mention-procmail.patch safecat-1.13/debian/patches/02-do-not-mention-procmail.patch --- safecat-1.13/debian/patches/02-do-not-mention-procmail.patch 1970-01-01 00:00:00.000000000 +0000 +++ safecat-1.13/debian/patches/02-do-not-mention-procmail.patch 2012-06-09 10:06:33.000000000 +0000 @@ -0,0 +1,40 @@ +Description: Remove mention of procmail from manpage +Bug-Debian: http://bugs.debian.org/479020 + +--- safecat-1.13.orig/safecat.1 ++++ safecat-1.13/safecat.1 +@@ -152,34 +152,6 @@ consider converting your inbox to + for its superior reliability. If your home directory is NFS + mounted, qmail forces you to use + .IR maildir . +-On the downside, the lovely tool +-.IR procmail , +-which filters your spam, does not know +-.IR maildir . +-Rather than running the patched +-.IR procmail , +-you might consider +-using +-.I safecat +-to deliver to your inbox. That allows you to use the latest +-.I procmail +-without waiting for the +-.I maildir +-patches to be applied to it. +- +-(Note: the previous paragraph was written before +-.I procmail +-started handling maildir delivery. Since maildir delivery has been added, +-my point is made +-.IR stronger ! +-.IR Procmail 's +-maildir support does not comply with Dan's algorithm, and so does +-not offer the reliability promised by maildir delivery. +-.I Procmail +-plus +-.I safecat +-has always offered reliable maildir delivery. Another victory for +-modularity!) + + If you write CGI applications to collect data over the World Wide + Web, you might find diff -Nru safecat-1.13/debian/patches/03-no-RPLINE-DTLINE.patch safecat-1.13/debian/patches/03-no-RPLINE-DTLINE.patch --- safecat-1.13/debian/patches/03-no-RPLINE-DTLINE.patch 1970-01-01 00:00:00.000000000 +0000 +++ safecat-1.13/debian/patches/03-no-RPLINE-DTLINE.patch 2012-06-09 10:06:19.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Do not add RPLINE and DTLINE to files + Qmail includes the contents of the environment variables RPLINE and + DTLINE in files written to a Maildir. This is unnecessary with safecat. +Bug-Debian: http://bugs.debian.org/240647 + +--- a/writefile.c ++++ b/writefile.c +@@ -24,12 +24,14 @@ + substdio_fdbuf(&ssout,write,fd,outbuf,sizeof(outbuf)); + + /* Print DTLINE and RPLINE, if supplied. */ ++ /* + dtline = env_get("DTLINE"); + rpline = env_get("RPLINE"); + if (dtline && rpline) { + if(substdio_puts(&ssout,rpline) == -1) goto fail; + if(substdio_puts(&ssout,dtline) == -1) goto fail; + } ++ */ + + /* Copy stdin to the output file, watching the return values each time. */ + if (substdio_copy(&ssout,&ssin) < 0) goto fail; diff -Nru safecat-1.13/debian/patches/04-manpage-dashes.patch safecat-1.13/debian/patches/04-manpage-dashes.patch --- safecat-1.13/debian/patches/04-manpage-dashes.patch 1970-01-01 00:00:00.000000000 +0000 +++ safecat-1.13/debian/patches/04-manpage-dashes.patch 2012-06-09 10:06:13.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Quote dashes in manpage +--- a/safecat.1 ++++ b/safecat.1 +@@ -219,8 +219,8 @@ + try() { $* 2>/dev/null || echo NO 1>&2 } + + set `( try $MYPROGRAM | try safecat $TEMPDIR $DESTDIR ) 2>&1` +-test "$?" = "0" || exit -1 +-test "$1" = "NO" && { rm -f $DESTDIR/$2; exit -1; } ++test "$?" = "0" || exit \-1 ++test "$1" = "NO" && { rm \-f $DESTDIR/$2; exit \-1; } + .sp + .fi + This script illustrates the pitfalls of writing secure programs diff -Nru safecat-1.13/debian/patches/debian-changes-1.13-1 safecat-1.13/debian/patches/debian-changes-1.13-1 --- safecat-1.13/debian/patches/debian-changes-1.13-1 2010-03-14 15:51:39.000000000 +0000 +++ safecat-1.13/debian/patches/debian-changes-1.13-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -Description: Upstream changes introduced in version 1.13-1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - safecat (1.13-1) unstable; urgency=low - . - * Add watch file. - * Minimal rules file with debhelper. - * Add Homepage control field. - * Remove obsolete references to procmail from the manpage (Closes: #479020). - * Update Standards-Version to 3.8.4.0. - * Update to new source format (3.0 (quilt)). - * Make the mode for creating new files more permissive to allow changing - it with umask (Closes: #211546). - * For completeness, update to new upstream version (no code changes). - . - The person named in the Author field signed this changelog entry. -Author: Teemu Hukkanen -Bug-Debian: http://bugs.debian.org/211546 -Bug-Debian: http://bugs.debian.org/479020 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Forwarded: -Reviewed-By: -Last-Update: - ---- safecat-1.13.orig/conf-ld -+++ safecat-1.13/conf-ld -@@ -1,3 +1,3 @@ --cc -s -+cc - - This will be used to link .o files into an executable. ---- safecat-1.13.orig/safecat.1 -+++ safecat-1.13/safecat.1 -@@ -152,34 +152,6 @@ consider converting your inbox to - for its superior reliability. If your home directory is NFS - mounted, qmail forces you to use - .IR maildir . --On the downside, the lovely tool --.IR procmail , --which filters your spam, does not know --.IR maildir . --Rather than running the patched --.IR procmail , --you might consider --using --.I safecat --to deliver to your inbox. That allows you to use the latest --.I procmail --without waiting for the --.I maildir --patches to be applied to it. -- --(Note: the previous paragraph was written before --.I procmail --started handling maildir delivery. Since maildir delivery has been added, --my point is made --.IR stronger ! --.IR Procmail 's --maildir support does not comply with Dan's algorithm, and so does --not offer the reliability promised by maildir delivery. --.I Procmail --plus --.I safecat --has always offered reliable maildir delivery. Another victory for --modularity!) - - If you write CGI applications to collect data over the World Wide - Web, you might find ---- safecat-1.13.orig/safecat.c -+++ safecat-1.13/safecat.c -@@ -95,7 +95,7 @@ int main(int argc, char *argv[]) { - - /* Step 4: Create the file tempdir/time.MusecPpid.host */ - alarm(86400); -- outfd = open(tmppath.s,O_WRONLY | O_EXCL | O_CREAT | O_LARGEFILE,0644); -+ outfd = open(tmppath.s,O_WRONLY | O_EXCL | O_CREAT | O_LARGEFILE,0666); - if(outfd == -1) { - strerr_die2sys(111,"safecat: fatal: ","couldn't create output file: "); - } ---- safecat-1.13.orig/conf-cc -+++ safecat-1.13/conf-cc -@@ -1,4 +1,4 @@ --cc -O2 -+cc -g -O2 -D_LARGEFILE64_SOURCE - - This will be used to compile .c files. Add any needed flags here; for - example, if you want support for files larger than 2GB on Linux systems, diff -Nru safecat-1.13/debian/patches/series safecat-1.13/debian/patches/series --- safecat-1.13/debian/patches/series 2010-03-14 13:28:07.000000000 +0000 +++ safecat-1.13/debian/patches/series 2012-06-09 10:03:14.000000000 +0000 @@ -1 +1,4 @@ -debian-changes-1.13-1 +01-respect-umask.patch +02-do-not-mention-procmail.patch +03-no-RPLINE-DTLINE.patch +04-manpage-dashes.patch diff -Nru safecat-1.13/debian/rules safecat-1.13/debian/rules --- safecat-1.13/debian/rules 2010-03-14 12:55:47.000000000 +0000 +++ safecat-1.13/debian/rules 2012-06-11 03:15:03.000000000 +0000 @@ -1,17 +1,14 @@ #!/usr/bin/make -f -CFLAGS = -g -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif +CFLAGS += -D_LARGEFILE64_SOURCE %: dh $@ override_dh_auto_configure: - sed -i -e "s/cc -O./cc ${CFLAGS}/" conf-cc + sed -i -e "s/cc \(.*\)/cc ${CFLAGS} \1/" conf-cc + sed -i -e "s/cc -s/cc ${LDFLAGS}/" conf-ld # Skip running make check, as it isn't useful for us override_dh_auto_test: + true diff -Nru safecat-1.13/debian/source/options safecat-1.13/debian/source/options --- safecat-1.13/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ safecat-1.13/debian/source/options 2012-06-09 08:20:00.000000000 +0000 @@ -0,0 +1 @@ +extend-diff-ignore = "conf-(cc|ld)$" diff -Nru safecat-1.13/debian/watch safecat-1.13/debian/watch --- safecat-1.13/debian/watch 2010-03-14 12:55:47.000000000 +0000 +++ safecat-1.13/debian/watch 2012-06-09 10:13:18.000000000 +0000 @@ -1,2 +1,3 @@ version=3 -http://www.pobox.com/~lbudney/linux/software/safecat/safecat-(.*)\.tar\.gz +http://pobox.com/~lbudney/linux/software/safecat.html \ + safecat/safecat-(.*)\.tar\.gz