diff -Naur mktemp-1.5.orig/Makefile.in mktemp-1.5/Makefile.in --- mktemp-1.5.orig/Makefile.in 2003-03-24 01:09:56.000000000 +0000 +++ mktemp-1.5/Makefile.in 2008-05-14 21:01:34.000000000 +0000 @@ -102,16 +102,19 @@ $(OBJS): config.h -install: install-dirs install-binaries install-man +install: install-dirs install-binaries install-man install-tempfile install-dirs: - $(SHELL) $(srcdir)/mkinstalldirs $(bindir) $(mandir)/man1 + $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 install-binaries: $(PROG) - $(INSTALL) -m 0555 -s $(PROG) $(bindir)/$(PROG) + $(INSTALL) -m 0555 -s $(PROG) $(DESTDIR)$(bindir)/$(PROG) install-man: - $(INSTALL) -m 0444 $(srcdir)/$(PROG).$(mantype) $(mandir)/man1/$(PROG).1 + $(INSTALL) -m 0444 $(srcdir)/$(PROG).$(mantype) $(DESTDIR)$(mandir)/man1/$(PROG).1 + +install-tempfile: $(srcdir)/tempfile + $(INSTALL) -m 0555 $(srcdir)/tempfile $(DESTDIR)$(bindir)/tempfile check: @echo nothing to check diff -Naur mktemp-1.5.orig/Makefile.in~ mktemp-1.5/Makefile.in~ --- mktemp-1.5.orig/Makefile.in~ 1970-01-01 00:00:00.000000000 +0000 +++ mktemp-1.5/Makefile.in~ 2008-05-14 20:59:01.000000000 +0000 @@ -0,0 +1,149 @@ +# +# Copyright (c) 2000, 2001 Todd C. Miller +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. 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. +# +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission +# from the author. +# +# THIS SOFTWARE IS PROVIDED ``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 AUTHOR 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. +# +# @configure_input@ +# +# $Id: Makefile.in,v 1.11 2003/03/24 01:09:56 millert Exp $ +# + +#### Start of system configuration section. #### + +srcdir = @srcdir@ +authdir = $(srcdir)/auth +VPATH = @srcdir@ + +# Compiler & tools to use +CC = @CC@ + +# Executable and object file extensions +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ + +# Which install program? +INSTALL = $(SHELL) $(srcdir)/install-sh -c + +# Libraries +LIBS = @LIBS@ + +# C preprocessor flags +CPPFLAGS = -I$(srcdir) -I. "-DMKTEMP_VERSION=\"$(VERSION)\"" @CPPFLAGS@ + +# Usually -O and/or -g +CFLAGS = @CFLAGS@ + +# Flags to pass to the link stage +LDFLAGS = @LDFLAGS@ + +# Man page type (man or mdoc) +mantype = @MANTYPE@ + +# Where to install things... +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +sbindir = @sbindir@ +sysconfdir = @sysconfdir@ +mandir = @mandir@ + +#### End of system configuration section. #### + +SHELL = /bin/sh + +PROG = mktemp$(EXEEXT) + +OBJS = mktemp.$(OBJEXT) @LIBOBJS@ + +VERSION = 1.5 + +DISTFILES = INSTALL INSTALL.configure LICENSE Makefile.in README RELEASE_NOTES \ + config.guess config.h.in config.sub configure configure.in \ + extern.h install-sh mkdtemp.c mkinstalldirs mktemp.c mktemp.man \ + mktemp.mdoc priv_mktemp.c random.c strdup.c strerror.c + +all: $(PROG) + +.SUFFIXES: .o .obj .c .h + +.c.o: + $(CC) -c $(CPPFLAGS) $(CFLAGS) $< + +.c.obj: + $(CC) -c $(CPPFLAGS) $(CFLAGS) $< + +$(PROG): $(OBJS) + $(CC) -o $@ $(OBJS) $(LIBS) + +$(OBJS): config.h + +install: install-dirs install-binaries install-man + +install-dirs: + $(SHELL) $(srcdir)/mkinstalldirs $(bindir) $(mandir)/man1 + +install-binaries: $(PROG) + $(INSTALL) -m 0555 -s $(PROG) $(bindir)/$(PROG) + +install-man: + $(INSTALL) -m 0444 $(srcdir)/$(PROG).$(mantype) $(mandir)/man1/$(PROG).1 + +install-tempfile: $(srcdir)/tempfile + $(INSTALL) -m 0555 $(srcdir)/tempfile $(bindir)/tempfile + +check: + @echo nothing to check + +tags: $(SRCS) + ctags $(SRCS) + +TAGS: $(SRCS) + etags $(SRCS) + +clean: + -rm -f *.$(OBJEXT) $(PROG) core $(PROG).core + +mostlyclean: clean + +distclean: clean + -rm -f Makefile config.h config.status config.cache config.log + +clobber: distclean + +realclean: distclean + rm -f TAGS tags + +cleandir: realclean + +dist: $(DISTFILES) + rm -f ../mktemp-$(VERSION).tar.gz + ( cd .. ; TF="/tmp/mktemp.dist$$$$" ; rm -f $$TF ; for i in $(DISTFILES) ; \ + do echo mktemp-$(VERSION)/$$i >> $$TF ; done ; \ + tar Ocf mktemp-$(VERSION).tar \ + `cat $$TF` && gzip --best mktemp-$(VERSION).tar && rm -f $$TF) + ls -l ../mktemp-$(VERSION).tar.gz diff -Naur mktemp-1.5.orig/tempfile mktemp-1.5/tempfile --- mktemp-1.5.orig/tempfile 1970-01-01 00:00:00.000000000 +0000 +++ mktemp-1.5/tempfile 2008-05-14 20:59:01.000000000 +0000 @@ -0,0 +1,85 @@ +#!/bin/bash +# A tempfile wrapper for mktemp +# Note: If you can, avoid using tempfile and use mktemp instead. +# This wrapper is provided for compatibility since some scripts use +# tempfile. If possible, the best solution is to patch the scripts +# to use mktemp. +# +# Copyright (c) Tushar Teredesai +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +# Usage info +usage() +{ + echo "Usage: tempfile [OPTION]" + echo + echo "Create a temporary file in a safe manner." + echo "This version is a wrapper that invokes mktemp." + echo "NOTE: Do not use tempfile in your scripts." + echo " Use mktemp instead." + echo + echo "[-d|--directory] DIR -> place temporary file in DIR" + echo "[-p|--prefix] PREFIX -> ignored" + echo "[-s|--suffix] SUFFIX -> ignored" + echo "[-n|--name] NAME -> ignored" + echo "[-m|--mode] MODE -> ignored" + echo "--version -> output version information and exit" +} + +# parse all arguments +while [ $# != 0 ] +do + case "$1" in + # -d for tempfile is equivalent to -p for mktemp + -d|--directory) + dir="$2" + shift 2 + ;; + --directory=*) + dir="${1#--directory=}" + shift 1 + ;; + -d*) + dir="${1#-d}" + shift 1 + ;; + # The following switches are ignored. + -p|--prefix|-s|--suffix|-n|--name|-m|--mode) + shift 2 + ;; + -p*|--prefix=*|-s*|--suffix=*|-n*|--name=*|-m*|--mode=*) + shift 1 + ;; + # --version for tempfile is equivalent to -V for mktemp + --version) + echo "tempfile 1.0 (`mktemp -V 2>/dev/null`)" + exit 0 + ;; + # Unknown switch + *) + usage + exit 1 + ;; + esac +done + +# Use the dir if $TMPDIR is not set. +if [ -z "$TMPDIR" -a ! -z "$dir" ] +then + export TMPDIR="$dir" +fi +# Execute mktemp with proper arguments +# the -t behaviour of mktemp is the default for tempfile +exec mktemp -t