diff -u tiger-3.2.2/Makefile.in tiger-3.2.2/Makefile.in --- tiger-3.2.2/Makefile.in +++ tiger-3.2.2/Makefile.in @@ -166,7 +166,8 @@ ./util/mkfilelst \ ./util/mksig \ ./util/setsh \ - ./util/sgrep + ./util/sgrep \ + ./doc/explain.idx MISCDIRS=./bin \ ./check.d \ @@ -265,7 +266,7 @@ cd c && $(MAKE) install cd doc && $(MAKE) install @echo "Copying miscellaneous dirs..." - @for dir in $(MISCDIRS); do \ + for dir in $(MISCDIRS); do \ tar cf - $$dir | (cd $(DESTDIR)$(TIGERHOME); tar xpf -); \ done @echo "Copying miscellaneous files..." diff -u tiger-3.2.2/systems/Linux/2/gen_mounts tiger-3.2.2/systems/Linux/2/gen_mounts --- tiger-3.2.2/systems/Linux/2/gen_mounts +++ tiger-3.2.2/systems/Linux/2/gen_mounts @@ -52,7 +52,8 @@ # - Added bind as a non-local FS (Debian bug #451879) # - Skip udev fs even if its in a tmpfs FS, prevent analysis # of unexistant symlinks (See Debian bug 434333) -# +# Linux/2/gen_mounts - 11/27/2008 - Added ecryptfs, used by ecryptfs-utils (See Debian bug 506512) +# - Fix bashism (Debian bug #505939) #----------------------------------------------------------------------------- # @@ -129,6 +130,7 @@ [ "$1" = "fuse.truecrypt" ] && LOCAL=0 # Encrypted filesystem, used in Ubuntu 'hardy' [ "$1" = "fuse.encfs" ] && LOCAL=0 # Encrypted filesystem [ "$1" = "fuse.gvfs-fuse-daemon" ] && LOCAL=0 # Used in Ubuntu 'hardy' + [ "$1" = "ecryptfs" ] && LOCAL=0 # Encrypted filesystem used by ecryptfs-utils # Filesystems of other OS [ "$1" = "msdos" ] && LOCAL=1 [ "$1" = "umsdos" ] && LOCAL=1 @@ -208,7 +210,7 @@ # The rest we warn about if [ "$LOCAL" -eq 2 ] ; then - if [ -z "$Tiger_FSScan_WarnUnknown" ] || [ "$Tiger_FSScan_WarnUnknown" == "Y" ] ; then + if [ -z "$Tiger_FSScan_WarnUnknown" ] || [ "$Tiger_FSScan_WarnUnknown" = "Y" ] ; then echo "--CONFIG-- [con010c] Filesystem '$1' used by '$2' is not recognised as a valid filesystem" >&2 fi LOCAL=1 diff -u tiger-3.2.2/doc/Makefile.in tiger-3.2.2/doc/Makefile.in --- tiger-3.2.2/doc/Makefile.in +++ tiger-3.2.2/doc/Makefile.in @@ -24,7 +24,7 @@ TXTFILES = $(wildcard *.txt) HTMLFILES = $(patsubst %.txt,%.html,$(TXTFILES)) -all: $(HTMLFILES) +all: $(HTMLFILES) explain.idx install: $(INSTALL) -m 0644 *.html ../html/ @@ -33,7 +33,7 @@ sh ../util/doc2html explain.idx: $(TXTFILES) ../util/genmsgidx - ../util/genmsgidx + BASEDIR=../ ../util/genmsgidx clean: -rm -f ../html/*.html diff -u tiger-3.2.2/debian/watch tiger-3.2.2/debian/watch --- tiger-3.2.2/debian/watch +++ tiger-3.2.2/debian/watch @@ -1,8 +1,7 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# Site Directory Pattern Version Script -ftp://www.net.tamu.edu /pub/security/TAMU/ tiger-(.*)\.tar\.gz debian uupdate -# Other archives -#ftp://coast.cs.purdue.edu /pub/tools/unix/tiger/TAMU/ tiger-(.*)\.tar\.gz debian uupdate -#ftp://sunsite.unc.edu /pub/Linux/system/security tiger-(.*)\.tar\.gz debian uupdate +# Watch control file for uscan for Tiger +version=3 +# Savannah site +http://download.savannah.gnu.org/releases/tiger/tiger-(.*)\.tar\.gz +# +# Old site, no longer available and no longer upstream +# ftp://www.net.tamu.edu/pub/security/TAMU/tiger-(.*)\.tar\.gz diff -u tiger-3.2.2/debian/rules tiger-3.2.2/debian/rules --- tiger-3.2.2/debian/rules +++ tiger-3.2.2/debian/rules @@ -8,8 +8,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatability version to use. -export DH_COMPAT=4 +# This is the debhelper compatibility version to use. +# export DH_COMPAT=5 build: build-stamp build-stamp: diff -u tiger-3.2.2/debian/compat tiger-3.2.2/debian/compat --- tiger-3.2.2/debian/compat +++ tiger-3.2.2/debian/compat @@ -1 +1 @@ -4 +5 diff -u tiger-3.2.2/debian/control tiger-3.2.2/debian/control --- tiger-3.2.2/debian/control +++ tiger-3.2.2/debian/control @@ -4,7 +4,8 @@ Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Javier Fernandez-Sanguino Pen~a Build-Depends: debhelper (>= 4.1.13), autoconf, po-debconf (>= 0.5.0) -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 +Homepage: http://savannah.nongnu.org/projects/tiger/ Package: tiger Architecture: any diff -u tiger-3.2.2/debian/changelog tiger-3.2.2/debian/changelog --- tiger-3.2.2/debian/changelog +++ tiger-3.2.2/debian/changelog @@ -1,3 +1,32 @@ +tiger (1:3.2.2-8ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #303893): + - debian/postrm: + + Clean directories correctly when purging. + - config.in: + + Auto-create the work directory if it's in /var/run, /tmp, or /var/tmp. + + Use temporary file instead of hardcoded rcfile for temporary work. + + -- Nick Ellery Sun, 30 Nov 2008 22:59:52 -0800 + +tiger (1:3.2.2-8) unstable; urgency=low + + * Acknowledge NMU (Closes: #502672) + * Fix Makefiles so that the explanation index file is generated and distributed + properly (Closes: #507028) + * system/Linux/2/gen_mounts: + - Added ecryptfs, used by ecryptfs-utils (Closes: 506512) + - Fix bashism (Closes: #505939) + * Update Standards-Version to 3.8.0: + - Added a Homepage field in debian/control + * Use debhelper version 5 + * Lintian fix: + - Comment out DH_COMPAT definition in debian/rules + - Fixed debian/watch file used by uscan by adding a version and a proper + location for upstream updates + + -- Javier Fernandez-Sanguino Pen~a Thu, 27 Nov 2008 23:47:16 +0100 + tiger (1:3.2.2-7.1ubuntu1) jaunty; urgency=low * Merge from debian unstable, remaining changes: