Hello community,
here is the log from the commit of package mtree for openSUSE:Factory checked in at 2015-08-03 17:22:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mtree (Old)
and /work/SRC/openSUSE:Factory/.mtree.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mtree"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mtree/mtree.changes 2014-02-11 11:41:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mtree.new/mtree.changes 2015-08-03 17:22:21.000000000 +0200
@@ -1,0 +2,10 @@
+Sun Aug 2 16:28:18 UTC 2015 - mpluskal@suse.com
+
+- Update to 1.0.3
+ * Display symlink, modification time, and file type changes if
+ requested (contributed by Christophe Beauval)
+- Update project url (now hosted on github)
+- Use url for source
+- Cleanup spec file with spec-cleaner
+
+-------------------------------------------------------------------
Old:
----
mtree-1.0.2.tar.gz
New:
----
1.0.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mtree.spec ++++++
--- /var/tmp/diff_new_pack.CGDO7b/_old 2015-08-03 17:22:22.000000000 +0200
+++ /var/tmp/diff_new_pack.CGDO7b/_new 2015-08-03 17:22:22.000000000 +0200
@@ -1,8 +1,8 @@
#
# spec file for package mtree
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright 2010 Archie L. Cobbs.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 Archie L. Cobbs.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,17 +18,17 @@
Name: mtree
-Version: 1.0.2
+Version: 1.0.3
Release: 0
Summary: Tool for creating and verifying file hierarchies
License: BSD-3-Clause
Group: Productivity/File utilities
-Source: %{name}-%{version}.tar.gz
-Url: http://mtree-port.googlecode.com/
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: gcc
+Url: https://github.com/archiecobbs/mtree-port
+Source: https://github.com/archiecobbs/mtree-port/archive/%{version}.tar.gz
+BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: libopenssl-devel
-BuildRequires: make
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The %{name} utility compares the file hierarchy rooted in the current
@@ -38,10 +38,11 @@
hierarchy or the specification.
%prep
-%setup -q
+%setup -q -n mtree-port-%{version}
%build
-%{configure}
+./autogen.sh
+%configure
make %{?_smp_mflags}
%install
++++++ mtree-1.0.2.tar.gz -> 1.0.3.tar.gz ++++++
++++ 9460 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mtree-1.0.2/CHANGES new/mtree-port-1.0.3/CHANGES
--- old/mtree-1.0.2/CHANGES 2014-02-08 16:42:54.000000000 +0100
+++ new/mtree-port-1.0.3/CHANGES 2015-06-10 16:32:22.000000000 +0200
@@ -1,3 +1,7 @@
+Version 1.0.3 Released 10 June 2015
+
+ - Display symlink, modification time, and file type changes
+ if requested (contributed by Christophe Beauval)
Version 1.0.2 (r17) released 8 Feb 2014
@@ -13,4 +17,3 @@
- Initial release
-$Id: CHANGES 17 2014-02-08 15:42:54Z archie.cobbs $
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mtree-1.0.2/INSTALL new/mtree-port-1.0.3/INSTALL
--- old/mtree-1.0.2/INSTALL 2010-11-05 20:54:42.000000000 +0100
+++ new/mtree-port-1.0.3/INSTALL 2015-06-10 16:32:22.000000000 +0200
@@ -9,8 +9,7 @@
Please see
- http://code.google.com/p/mtree-port
+ https://github.com/archiecobbs/mtree-port
for more information.
-$Id: INSTALL 2 2010-11-05 19:54:42Z archie.cobbs $
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mtree-1.0.2/Makefile.am new/mtree-port-1.0.3/Makefile.am
--- old/mtree-1.0.2/Makefile.am 2010-11-05 20:54:42.000000000 +0100
+++ new/mtree-port-1.0.3/Makefile.am 2015-06-10 16:32:22.000000000 +0200
@@ -2,8 +2,6 @@
#
# mtree - Utility for creating and verifying file hierarchies
#
-# $Id: Makefile.am 2 2010-11-05 19:54:42Z archie.cobbs $
-#
bin_PROGRAMS= mtree
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mtree-1.0.2/README new/mtree-port-1.0.3/README
--- old/mtree-1.0.2/README 2010-11-05 20:54:42.000000000 +0100
+++ new/mtree-port-1.0.3/README 2015-06-10 16:32:22.000000000 +0200
@@ -10,4 +10,3 @@
Enjoy!
-$Id: README 2 2010-11-05 19:54:42Z archie.cobbs $
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mtree-1.0.2/README.md new/mtree-port-1.0.3/README.md
--- old/mtree-1.0.2/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/mtree-port-1.0.3/README.md 2015-06-10 16:32:22.000000000 +0200
@@ -0,0 +1,7 @@
+This project is a port of the very useful **mtree** utility, originally only available in BSD distributions, to Linux and other operating systems.
+
+The **mtree** utility compares the file hierarchy rooted in the current directory against a specification read from the standard input. Messages are written to the standard output for any files whose characteristics do not match the specifications, or which are missing from either the file hierarchy or the specification.
+
+This port of **mtree** uses the `autoconf` infrastructure to maintain portability.
+
+See the [ManPages](https://github.com/archiecobbs/mtree-port/wiki/ManPages) for details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mtree-1.0.2/autogen.sh new/mtree-port-1.0.3/autogen.sh
--- old/mtree-1.0.2/autogen.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/mtree-port-1.0.3/autogen.sh 2015-06-10 16:32:22.000000000 +0200
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+#
+# Script to regenerate all the GNU auto* gunk.
+# Run this from the top directory of the source tree.
+#
+# If it looks like I don't know what I'm doing here, you're right.
+#
+
+set -e
+
+echo "cleaning up"
+rm -rf autom4te*.cache scripts aclocal.m4 configure config.log config.status .deps stamp-h1
+rm -f config.h.in config.h.in~ config.h
+rm -f scripts
+find . \( -name Makefile -o -name Makefile.in \) -print0 | xargs -0 rm -f
+rm -f *.o mtree
+rm -f mtree-?.?.?.tar.gz
+if [ "${1}" = '-C' ]; then
+ exit 0
+fi
+
+ACLOCAL="aclocal"
+AUTOHEADER="autoheader"
+AUTOMAKE="automake"
+AUTOCONF="autoconf"
+
+echo "running aclocal"
+mkdir scripts
+${ACLOCAL} ${ACLOCAL_ARGS} -I scripts
+
+echo "running autoheader"
+${AUTOHEADER}
+
+echo "running automake"
+${AUTOMAKE} --add-missing -c --foreign
+
+echo "running autoconf"
+${AUTOCONF} -f -i
+
+if [ "${1}" = '-c' ]; then
+ echo "running configure"
+ ./configure
+fi
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mtree-1.0.2/config.h.in new/mtree-port-1.0.3/config.h.in
--- old/mtree-1.0.2/config.h.in 2014-02-08 16:44:00.000000000 +0100
+++ new/mtree-port-1.0.3/config.h.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,139 +0,0 @@
-/* config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_DIRENT_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_ERRNO_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_ERR_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_FNMATCH_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_FTS_H
-
-/* Define to 1 if you have the `getline' function. */
-#undef HAVE_GETLINE
-
-/* Define to 1 if you have the `getmode' function. */
-#undef HAVE_GETMODE
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_GRP_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `crypto' library (-lcrypto). */
-#undef HAVE_LIBCRYPTO
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_LIMITS_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_OPENSSL_MD5_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_OPENSSL_RIPEMD_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_OPENSSL_SHA_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_PWD_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_SIGNAL_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_STDARG_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_STDDEF_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_STDIO_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_SYS_CDEFS_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_SYS_PARAM_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_SYS_QUEUE_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_TIME_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* BSD functions */
-#undef _BSD_SOURCE
-
-/* MacOS functions */
-#undef _DARWIN_C_SOURCE
-
-/* GNU functions */
-#undef _GNU_SOURCE
-
-/* XOpen functions */
-#undef _XOPEN_SOURCE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mtree-1.0.2/configure.ac new/mtree-port-1.0.3/configure.ac
--- old/mtree-1.0.2/configure.ac 2013-05-30 17:29:35.000000000 +0200
+++ new/mtree-port-1.0.3/configure.ac 2015-06-10 16:32:22.000000000 +0200
@@ -1,15 +1,12 @@
#
# mtree - Utility for creating and verifying file hierarchies
#
-# $Id: configure.ac 15 2013-05-30 15:29:35Z archie.cobbs $
-#
-AC_INIT([mtree Utility for creating and verifying file hierarchies], [1.0.2], [http://www.freebsd.org/], [mtree])
+AC_INIT([mtree Utility for creating and verifying file hierarchies], [1.0.3], [http://www.freebsd.org/], [mtree])
AC_CONFIG_AUX_DIR(scripts)
AM_INIT_AUTOMAKE
dnl AM_MAINTAINER_MODE
AC_PREREQ(2.59)
-AC_REVISION($Id: configure.ac 15 2013-05-30 15:29:35Z archie.cobbs $)
AC_PREFIX_DEFAULT(/usr)
AC_PROG_MAKE_SET
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mtree-1.0.2/mtree.5 new/mtree-port-1.0.3/mtree.5
--- old/mtree-1.0.2/mtree.5 2012-11-28 17:58:51.000000000 +0100
+++ new/mtree-port-1.0.3/mtree.5 2015-06-10 16:32:22.000000000 +0200
@@ -230,7 +230,7 @@
.Xr mtree 8
.Rs
.%T "mtree-port: Utility for creating and verifying file hierarchies"
-.%O http://mtree-port.googlecode.com/
+.%O https://github.com/archiecobbs/mtree-port
.Re
.Sh BUGS
The
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mtree-1.0.2/mtree.8 new/mtree-port-1.0.3/mtree.8
--- old/mtree-1.0.2/mtree.8 2012-11-28 17:59:29.000000000 +0100
+++ new/mtree-port-1.0.3/mtree.8 2015-06-10 16:32:22.000000000 +0200
@@ -399,7 +399,7 @@
.Xr chown 8
.Rs
.%T "mtree-port: Utility for creating and verifying file hierarchies"
-.%O http://mtree-port.googlecode.com/
+.%O https://github.com/archiecobbs/mtree-port
.Re
.Sh HISTORY
The
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mtree-1.0.2/mtree.h new/mtree-port-1.0.3/mtree.h
--- old/mtree-1.0.2/mtree.h 2010-11-06 19:47:11.000000000 +0100
+++ new/mtree-port-1.0.3/mtree.h 2015-06-10 16:32:22.000000000 +0200
@@ -69,9 +69,9 @@
#define F_IGN 0x0010 /* ignore */
#define F_MAGIC 0x0020 /* name has magic chars */
#define F_MODE 0x0040 /* mode */
-#define F_NLINK 0x0080 /* number of links */
+#define F_NLINK 0x0080 /* number of hardlinks */
#define F_SIZE 0x0100 /* size */
-#define F_SLINK 0x0200 /* link count */
+#define F_SLINK 0x0200 /* symbolic link path */
#define F_TIME 0x0400 /* modification time */
#define F_TYPE 0x0800 /* file type */
#define F_UID 0x1000 /* uid */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mtree-1.0.2/mtree.spec new/mtree-port-1.0.3/mtree.spec
--- old/mtree-1.0.2/mtree.spec 2013-05-23 19:10:51.000000000 +0200
+++ new/mtree-port-1.0.3/mtree.spec 2015-06-10 16:32:22.000000000 +0200
@@ -1,5 +1,3 @@
-# $Id: mtree.spec 13 2013-05-23 17:10:49Z archie.cobbs $
-
#
# Copyright 2010 Archie L. Cobbs.
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mtree-1.0.2/scripts/missing new/mtree-port-1.0.3/scripts/missing
--- old/mtree-1.0.2/scripts/missing 2014-02-08 16:44:04.000000000 +0100
+++ new/mtree-port-1.0.3/scripts/missing 1970-01-01 01:00:00.000000000 +0100
@@ -1,330 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2012-01-06.18; # UTC
-
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard , 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
- echo 1>&2 "Try '$0 --help' for more information"
- exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, 'missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
-
- -h|--h|--he|--hel|--help)
- echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
- -h, --help display this help and exit
- -v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
- aclocal touch file 'aclocal.m4'
- autoconf touch file 'configure'
- autoheader touch file 'config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all 'Makefile.in' files
- bison create 'y.tab.[ch]', if possible, from existing .[ch]
- flex create 'lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create 'lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- yacc create 'y.tab.[ch]', if possible, from existing .[ch]
-
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
-'g' are ignored when checking the name.
-
-Send bug reports to ."
- exit $?
- ;;
-
- -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing $scriptversion (GNU Automake)"
- exit $?
- ;;
-
- -*)
- echo 1>&2 "$0: Unknown '$1' option"
- echo 1>&2 "Try '$0 --help' for more information"
- exit 1
- ;;
-
-esac
-
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running '$TOOL --version' or '$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified 'acinclude.m4' or '${configure_ac}'. You might want
- to install the Automake and Perl packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified '${configure_ac}'. You might want to install the
- Autoconf and GNU m4 packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified 'acconfig.h' or '${configure_ac}'. You might want
- to install the Autoconf and GNU m4 packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
- You might want to install the Automake and Perl packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
-
- autom4te*)
- echo 1>&2 "\
-WARNING: '$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get '$1' as part of Autoconf from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: '$1' $msg. You should only need it if
- you modified a '.y' file. You may need the Bison package
- in order for those modifications to take effect. You can get
- Bison from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG=\${$#}
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified a '.l' file. You may need the Flex package
- in order for those modifications to take effect. You can get
- Flex from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG=\${$#}
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- Help2man package in order for those modifications to take
- effect. You can get Help2man from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified a '.texi' or '.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy 'make' (AIX,
- DU, IRIX). You might want to install the Texinfo package or
- the GNU make package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: '$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the 'README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing '$1' program."
- exit 1
- ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mtree-1.0.2/specspec.c new/mtree-port-1.0.3/specspec.c
--- old/mtree-1.0.2/specspec.c 2010-11-06 19:07:12.000000000 +0100
+++ new/mtree-port-1.0.3/specspec.c 2015-06-10 16:32:22.000000000 +0200
@@ -67,8 +67,12 @@
printf(" mode=%o", n->st_mode);
if (f & F_NLINK)
printf(" nlink=%d", (int)n->st_nlink);
+ if (f & F_SLINK)
+ printf(" link=%s", n->slink);
if (f & F_SIZE)
printf(" size=%jd", (intmax_t)n->st_size);
+ if (f & F_TIME)
+ printf(" time=%ld.%09ld", (long)n->st_mtimespec.tv_sec, n->st_mtimespec.tv_nsec);
if (f & F_UID)
printf(" uid=%d", n->st_uid);
if (f & F_UNAME) {
@@ -117,7 +121,7 @@
compare_nodes(NODE *n1, NODE *n2, char const *path)
{
int differs;
-
+
if (n1 != NULL && n1->type == F_LINK)
n1->flags &= ~F_MODE;
if (n2 != NULL && n2->type == F_LINK)
@@ -134,7 +138,7 @@
return (1);
}
if (n1->type != n2->type) {
- differs = 0;
+ differs = F_TYPE;
mismatch(n1, n2, differs, path);
return (1);
}
@@ -172,7 +176,7 @@
mismatch(n1, n2, differs, path);
return (1);
}
- return (0);
+ return (0);
}
static int
walk_in_the_forest(NODE *t1, NODE *t2, char const *path)
