Imported Debian patch 1.0.11~git-20070212-1

diff --git a/compile b/compile
deleted file mode 100755 (executable)
index a81e000..0000000
--- a/compile
+++ /dev/null
@@ -1,136 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2003-11-09.00
-
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# 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.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit 0
-    ;;
-esac
-
-
-prog=$1
-shift
-
-ofile=
-cfile=
-args=
-while test $# -gt 0; do
-  case "$1" in
-    -o)
-      # configure might choose to run compile as `compile cc -o foo foo.c'.
-      # So we do something ugly here.
-      ofile=$2
-      shift
-      case "$ofile" in
-       *.o | *.obj)
-         ;;
-       *)
-         args="$args -o $ofile"
-         ofile=
-         ;;
-      esac
-       ;;
-    *.c)
-      cfile=$1
-      args="$args $1"
-      ;;
-    *)
-      args="$args $1"
-      ;;
-  esac
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$prog" $args
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir $lockdir > /dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
-
-# Run the compile.
-"$prog" $args
-status=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-fi
-
-rmdir $lockdir
-exit $status
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/debian/changelog b/debian/changelog
index 8960113c367ec0eea8c8e3190681eddfece44fc8..0f9cd8d1b415f12c513b5932669cc9cb8d247d50 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+nfs-utils (1:1.0.11~git-20070212-1) experimental; urgency=low
+
+  * New upstream snapshot.
+    * Update debian/copyright with the new version number and date.
+    * Add an extra backslash to debian/copyright.
+    * Add libblkid-dev as a build-dependency, as it's not required by
+      idmapd.
+  * Update patches for new upstream release:
+    * 01-bzero.patch: Now in upstream, removed.
+    * 02-document-debian-init-scripts.patch: Hunk offset, refreshed.
+    * 05-refuse-non-ident-maptypes.patch: Now in upstream, removed.
+    * 07-exports-default-options.patch: Now in upstream, removed.
+    * 08-dont-build-getkversion.patch: Obsoleted by upstream (getkversion
+      has been removed entirely), removed.
+    * 09-manpage-paths-fixup.patch: Obsoleted by upstream (paths no longer
+      used in the man pages), removed.
+    * 10-ccachedir-off-by-one.patch: Now in upstream, removed.
+    * 11-root-on-krb5-mounts.patch: Hunk offset, refreshed.
+  * Drop our custom clean hack in debian/rules, as distclean should now
+    remove generated files properly.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Mon, 12 Feb 2007 21:19:54 +0100
+

 nfs-utils (1:1.0.11~git-20060117-2) experimental; urgency=low
 
   * Give --with-tcp-wrappers to configure; for some reason it is no longer the
 nfs-utils (1:1.0.11~git-20060117-2) experimental; urgency=low
 
   * Give --with-tcp-wrappers to configure; for some reason it is no longer the

diff --git a/debian/control b/debian/control
index 537d2d6c85d3aedeebc3e940976b34c17848ef9b..dd0b59f857d81a5f17c6e8bd48513d6bf5889332 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: standard
 Section: net
 Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Uploaders: Steinar H. Gunderson <sesse@debian.org>, Daniel Baumann <daniel@debian.org>
 Section: net
 Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Uploaders: Steinar H. Gunderson <sesse@debian.org>, Daniel Baumann <daniel@debian.org>

-Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssapi-dev, librpcsecgss-dev, pkg-config, quilt (>= 0.40)
+Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssapi-dev, librpcsecgss-dev, libblkid-dev, pkg-config, quilt (>= 0.40)

 Build-Conflicts: librpcsecgss-dev (= 0.14-1)
 Standards-Version: 3.7.2
 
 Build-Conflicts: librpcsecgss-dev (= 0.14-1)
 Standards-Version: 3.7.2
 

diff --git a/debian/copyright b/debian/copyright
index 910768b7cf1dd97e1f9e957ca295ffed77df209e..5e2b4ab708e616fd0add3b473e5a009332a72b5c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
 This package was debianized by Chip Salzenberg <chip@debian.org> on Fri,  3 Dec 1999 20:00:00 -0800
 
 This package was debianized by Chip Salzenberg <chip@debian.org> on Fri,  3 Dec 1999 20:00:00 -0800
 

-This is a git snapshot, downloaded January 17th, 2007 using
+This is a git snapshot, downloaded February 12th, 2007 using

 the following commands:
 
 the following commands:
 

-  cg-clone git://git.linux-nfs.org/pub/linux/nfs-utils/ nfs-utils-1.0.11\~git-20060117
-  ( cd nfs-utils-1.0.11\~git-20060117/ && sh ./autogen.sh )
-  tar --exclude=.git -zcf nfs-utils_1.0.11~git-20060117.orig.tar.gz nfs-utils-1.0.11\~git-20060117
+  cg-clone git://git.linux-nfs.org/pub/linux/nfs-utils/ nfs-utils-1.0.11\~git-20070212
+  ( cd nfs-utils-1.0.11\~git-20070212/ && sh ./autogen.sh )
+  tar --exclude=.git -zcf nfs-utils_1.0.11\~git-20070212.orig.tar.gz nfs-utils-1.0.11\~git-20070212

 
 Regular releases are avilable from http://sourceforge.net/projects/nfs/.
 
 
 Regular releases are avilable from http://sourceforge.net/projects/nfs/.
 

diff --git a/debian/patches/01-bzero.patch b/debian/patches/01-bzero.patch
deleted file mode 100644 (file)
index 655c166..0000000
--- a/debian/patches/01-bzero.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: nfs-utils-1.0.10/support/nfs/svc_socket.c
-===================================================================
---- nfs-utils-1.0.10.orig/support/nfs/svc_socket.c
-+++ nfs-utils-1.0.10/support/nfs/svc_socket.c
-@@ -64,7 +64,7 @@ svc_socket (u_long number, int type, int
-       }
-     }
- 
--  __bzero ((char *) &addr, sizeof (addr));
-+  memset (&addr, 0, sizeof (addr));
-   addr.sin_family = AF_INET;
- 
-   ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,

diff --git a/debian/patches/02-document-debian-init-scripts.patch b/debian/patches/02-document-debian-init-scripts.patch
index f51cf7839356ffd904f4605ced9ae21814a75378..380ac7a8db02acb88f78670dd08bd4144d365e38 100644 (file)
--- a/debian/patches/02-document-debian-init-scripts.patch
+++ b/debian/patches/02-document-debian-init-scripts.patch
@@ -1,8 +1,8 @@
-Index: nfs-utils-1.0.10/utils/exportfs/exports.man
+Index: nfs-utils-1.0.11~git-20070205/utils/exportfs/exports.man

 ===================================================================
 ===================================================================

---- nfs-utils-1.0.10.orig/utils/exportfs/exports.man
-+++ nfs-utils-1.0.10/utils/exportfs/exports.man
-@@ -29,6 +29,9 @@ double quotes. You can also specify spac
+--- nfs-utils-1.0.11~git-20070205.orig/utils/exportfs/exports.man
++++ nfs-utils-1.0.11~git-20070205/utils/exportfs/exports.man
+@@ -34,6 +34,9 @@ double quotes. You can also specify spac

  the export name using a backslash followed by the character code as three
  octal digits.
  .PP
  the export name using a backslash followed by the character code as three
  octal digits.
  .PP

diff --git a/debian/patches/05-refuse-non-ident-maptypes.patch b/debian/patches/05-refuse-non-ident-maptypes.patch
deleted file mode 100644 (file)
index c2c93f4..0000000
--- a/debian/patches/05-refuse-non-ident-maptypes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: nfs-utils-1.0.11~git-20060117/utils/mountd/cache.c
-===================================================================
---- nfs-utils-1.0.11~git-20060117.orig/utils/mountd/cache.c
-+++ nfs-utils-1.0.11~git-20060117/utils/mountd/cache.c
-@@ -377,6 +377,12 @@ int cache_export(nfs_export *exp)
-       int err;
-       FILE *f;
- 
-+      if (exp->m_export.e_maptype != CLE_MAP_IDENT) {
-+              xlog(L_ERROR, "%s: unsupported mapping; kernel supports only 'identity' (default)",
-+                  exp->m_export.m_path);
-+              return;
-+      }
-+
-       f = fopen("/proc/net/rpc/auth.unix.ip/channel", "w");
-       if (!f)
-               return -1;

diff --git a/debian/patches/07-exports-default-options.patch b/debian/patches/07-exports-default-options.patch
deleted file mode 100644 (file)
index da799a4..0000000
--- a/debian/patches/07-exports-default-options.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-Index: nfs-utils-1.0.10/support/nfs/exports.c
-===================================================================
---- nfs-utils-1.0.10.orig/support/nfs/exports.c
-+++ nfs-utils-1.0.10/support/nfs/exports.c
-@@ -39,12 +39,13 @@ int export_errno;
- static char   *efname = NULL;
- static XFILE  *efp = NULL;
- static int    first;
-+static int    has_default_opts, has_default_subtree_opts;
- static int    *squids = NULL, nsquids = 0,
-               *sqgids = NULL, nsqgids = 0;
- 
- static int    getexport(char *exp, int len);
- static int    getpath(char *path, int len);
--static int    parseopts(char *cp, struct exportent *ep, int warn);
-+static int    parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr);
- static int    parsesquash(char *list, int **idp, int *lenp, char **ep);
- static int    parsenum(char **cpp);
- static int    parsemaptype(char *type);
-@@ -68,7 +69,7 @@ setexportent(char *fname, char *type)
- struct exportent *
- getexportent(int fromkernel, int fromexports)
- {
--      static struct exportent ee;
-+      static struct exportent ee, def_ee;
-       char            exp[512], *hostname;
-       char            rpath[MAXPATHLEN+1];
-       char            *opt, *sp;
-@@ -78,31 +79,36 @@ getexportent(int fromkernel, int fromexp
-               return NULL;
- 
-       freesquash();
--      ee.e_flags = EXPORT_DEFAULT_FLAGS;
--      /* some kernels assume the default is sync rather than
--       * async.  More recent kernels always report one or other,
--       * but this test makes sure we assume same as kernel
--       * Ditto for wgather
--       */
--      if (fromkernel) {
--              ee.e_flags &= ~NFSEXP_ASYNC;
--              ee.e_flags &= ~NFSEXP_GATHERED_WRITES;
--      }
--      ee.e_maptype = CLE_MAP_IDENT;
--      ee.e_anonuid = 65534;
--      ee.e_anongid = 65534;
--      ee.e_squids = NULL;
--      ee.e_sqgids = NULL;
--      ee.e_mountpoint = NULL;
--      ee.e_nsquids = 0;
--      ee.e_nsqgids = 0;
- 
-       if (first || (ok = getexport(exp, sizeof(exp))) == 0) {
--              ok = getpath(ee.e_path, sizeof(ee.e_path));
-+              has_default_opts = 0;
-+              has_default_subtree_opts = 0;
-+      
-+              def_ee.e_flags = EXPORT_DEFAULT_FLAGS;
-+              /* some kernels assume the default is sync rather than
-+               * async.  More recent kernels always report one or other,
-+               * but this test makes sure we assume same as kernel
-+               * Ditto for wgather
-+               */
-+              if (fromkernel) {
-+                      def_ee.e_flags &= ~NFSEXP_ASYNC;
-+                      def_ee.e_flags &= ~NFSEXP_GATHERED_WRITES;
-+              }
-+              def_ee.e_maptype = CLE_MAP_IDENT;
-+              def_ee.e_anonuid = 65534;
-+              def_ee.e_anongid = 65534;
-+              def_ee.e_squids = NULL;
-+              def_ee.e_sqgids = NULL;
-+              def_ee.e_mountpoint = NULL;
-+              def_ee.e_nsquids = 0;
-+              def_ee.e_nsqgids = 0;
-+
-+              ok = getpath(def_ee.e_path, sizeof(def_ee.e_path));
-               if (ok <= 0)
-                       return NULL;
--              strncpy (ee.m_path, ee.e_path, sizeof (ee.m_path) - 1);
--              ee.m_path [sizeof (ee.m_path) - 1] = '\0';
-+
-+              strncpy (def_ee.m_path, def_ee.e_path, sizeof (def_ee.m_path) - 1);
-+              def_ee.m_path [sizeof (def_ee.m_path) - 1] = '\0';
-               ok = getexport(exp, sizeof(exp));
-       }
-       if (ok < 0) {
-@@ -111,6 +117,23 @@ getexportent(int fromkernel, int fromexp
-               return NULL;
-       }
-       first = 0;
-+              
-+      /* Check for default options */
-+      if (exp[0] == '-') {
-+              if (parseopts(exp + 1, &def_ee, 0, &has_default_subtree_opts) < 0)
-+                      return NULL;
-+              
-+              has_default_opts = 1;
-+
-+              ok = getexport(exp, sizeof(exp));
-+              if (ok < 0) {
-+                      xlog(L_ERROR, "expected client(options...)");
-+                      export_errno = EINVAL;
-+                      return NULL;
-+              }
-+      }
-+
-+      ee = def_ee;
- 
-       /* Check for default client */
-       if (ok == 0)
-@@ -130,7 +153,8 @@ getexportent(int fromkernel, int fromexp
-               }
-               *sp = '\0';
-       } else {
--          xlog(L_WARNING, "No options for %s %s: suggest %s(sync) to avoid warning", ee.e_path, exp, exp);
-+              if (!has_default_opts)
-+                      xlog(L_WARNING, "No options for %s %s: suggest %s(sync) to avoid warning", ee.e_path, exp, exp);
-       }
-       if (strlen(hostname) >= sizeof(ee.e_hostname)) {
-               syntaxerr("client name too long");
-@@ -140,7 +164,7 @@ getexportent(int fromkernel, int fromexp
-       strncpy(ee.e_hostname, hostname, sizeof (ee.e_hostname) - 1);
-       ee.e_hostname[sizeof (ee.e_hostname) - 1] = '\0';
- 
--      if (parseopts(opt, &ee, fromexports) < 0)
-+      if (parseopts(opt, &ee, fromexports && !has_default_subtree_opts, NULL) < 0)
-               return NULL;
- 
-       /* resolve symlinks */
-@@ -293,7 +317,7 @@ mkexportent(char *hname, char *path, cha
-       ee.e_path[sizeof (ee.e_path) - 1] = '\0';
-       strncpy (ee.m_path, ee.e_path, sizeof (ee.m_path) - 1);
-       ee.m_path [sizeof (ee.m_path) - 1] = '\0';
--      if (parseopts(options, &ee, 0) < 0)
-+      if (parseopts(options, &ee, 0, NULL) < 0)
-               return NULL;
-       return &ee;
- }
-@@ -301,7 +325,7 @@ mkexportent(char *hname, char *path, cha
- int
- updateexportent(struct exportent *eep, char *options)
- {
--      if (parseopts(options, eep, 0) < 0)
-+      if (parseopts(options, eep, 0, NULL) < 0)
-               return 0;
-       return 1;
- }
-@@ -310,7 +334,7 @@ updateexportent(struct exportent *eep, c
-  * Parse option string pointed to by cp and set mount options accordingly.
-  */
- static int
--parseopts(char *cp, struct exportent *ep, int warn)
-+parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr)
- {
-       int     had_subtree_opt = 0;
-       char    *flname = efname?efname:"command line";
-@@ -461,6 +485,8 @@ out:
- 
-                               flname, flline,
-                               ep->e_hostname, ep->e_path);
-+      if (had_subtree_opt_ptr)
-+              *had_subtree_opt_ptr = had_subtree_opt;
- 
-       return 1;
- }
-Index: nfs-utils-1.0.10/utils/exportfs/exports.man
-===================================================================
---- nfs-utils-1.0.10.orig/utils/exportfs/exports.man
-+++ nfs-utils-1.0.10/utils/exportfs/exports.man
-@@ -22,6 +22,11 @@ client may be immediately followed by a 
- list of export options for that client. No whitespace is permitted
- between a client and its option list.
- .PP
-+Also, each line may have one or more specifications for default options
-+after the path name, in the form of a dash ("\-") followed by an option
-+list. The option list is used for all subsequent exports on that line
-+only.
-+.PP
- Blank lines are ignored.  A pound sign ("#") introduces a comment to the
- end of the line. Entries may be continued across newlines using a
- backslash. If an export name contains spaces it should be quoted using
-@@ -502,6 +507,7 @@ is supposedly that of user joe).
- /usr            *.local.domain(ro) @trusted(rw)
- /home/joe       pc001(rw,all_squash,anonuid=150,anongid=100)
- /pub            (ro,insecure,all_squash)
-+/srv/www        \-sync,rw server @trusted @external(ro)
- '''/pub/private    (noaccess)
- .fi
- .PP
-@@ -515,6 +521,9 @@ under the nobody account. The
- .I insecure 
- option in this entry also allows clients with NFS implementations that
- don't use a reserved port for NFS.
-+The sixth line exports a directory read-write to the machine 'server'
-+as well as the `@trusted' netgroup, and read-only to netgroup `@external',
-+all three mounts with the `sync' option enabled.
- ''' The last line denies all NFS clients
- '''access to the private directory.
- '''.SH CAVEATS

diff --git a/debian/patches/08-dont-build-getkversion.patch b/debian/patches/08-dont-build-getkversion.patch
deleted file mode 100644 (file)
index b5339be..0000000
--- a/debian/patches/08-dont-build-getkversion.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: nfs-utils-1.0.11~git-20060117/configure.in
-===================================================================
---- nfs-utils-1.0.11~git-20060117.orig/configure.in
-+++ nfs-utils-1.0.11~git-20060117/configure.in
-@@ -319,7 +319,6 @@ AC_CONFIG_FILES([
-       support/nfs/Makefile
-       tools/Makefile
-       tools/getiversion/Makefile
--      tools/getkversion/Makefile
-       tools/locktest/Makefile
-       tools/nlmtest/Makefile
-       tools/rpcdebug/Makefile
-Index: nfs-utils-1.0.11~git-20060117/tools/Makefile.am
-===================================================================
---- nfs-utils-1.0.11~git-20060117.orig/tools/Makefile.am
-+++ nfs-utils-1.0.11~git-20060117/tools/Makefile.am
-@@ -1,5 +1,5 @@
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS = getiversion getkversion locktest rpcdebug rpcgen nlmtest
-+SUBDIRS = getiversion locktest rpcdebug rpcgen nlmtest
- 
- MAINTAINERCLEANFILES = Makefile.in
-Index: nfs-utils-1.0.11~git-20060117/configure
-===================================================================
---- nfs-utils-1.0.11~git-20060117.orig/configure
-+++ nfs-utils-1.0.11~git-20060117/configure
-@@ -28722,7 +28722,7 @@ AM_CFLAGS="$my_am_cflags"
- ACLOCAL_AMFLAGS="-I $ac_macro_dir \$(ACLOCAL_FLAGS)"
- 
- 
--ac_config_files="$ac_config_files Makefile linux-nfs/Makefile support/Makefile support/export/Makefile support/include/nfs/Makefile support/include/rpcsvc/Makefile support/include/sys/fs/Makefile support/include/sys/Makefile support/include/Makefile support/misc/Makefile support/nfs/Makefile tools/Makefile tools/getiversion/Makefile tools/getkversion/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile tools/rpcgen/Makefile utils/Makefile utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile utils/lockd/Makefile utils/mount/Makefile utils/mountd/Makefile utils/nfsd/Makefile utils/nfsstat/Makefile utils/rquotad/Makefile utils/showmount/Makefile utils/statd/Makefile"
-+ac_config_files="$ac_config_files Makefile linux-nfs/Makefile support/Makefile support/export/Makefile support/include/nfs/Makefile support/include/rpcsvc/Makefile support/include/sys/fs/Makefile support/include/sys/Makefile support/include/Makefile support/misc/Makefile support/nfs/Makefile tools/Makefile tools/getiversion/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile tools/rpcgen/Makefile utils/Makefile utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile utils/lockd/Makefile utils/mount/Makefile utils/mountd/Makefile utils/nfsd/Makefile utils/nfsstat/Makefile utils/rquotad/Makefile utils/showmount/Makefile utils/statd/Makefile"
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -29357,7 +29357,6 @@ do
-     "support/nfs/Makefile") CONFIG_FILES="$CONFIG_FILES support/nfs/Makefile" ;;
-     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
-     "tools/getiversion/Makefile") CONFIG_FILES="$CONFIG_FILES tools/getiversion/Makefile" ;;
--    "tools/getkversion/Makefile") CONFIG_FILES="$CONFIG_FILES tools/getkversion/Makefile" ;;
-     "tools/locktest/Makefile") CONFIG_FILES="$CONFIG_FILES tools/locktest/Makefile" ;;
-     "tools/nlmtest/Makefile") CONFIG_FILES="$CONFIG_FILES tools/nlmtest/Makefile" ;;
-     "tools/rpcdebug/Makefile") CONFIG_FILES="$CONFIG_FILES tools/rpcdebug/Makefile" ;;
-Index: nfs-utils-1.0.11~git-20060117/tools/Makefile.in
-===================================================================
---- nfs-utils-1.0.11~git-20060117.orig/tools/Makefile.in
-+++ nfs-utils-1.0.11~git-20060117/tools/Makefile.in
-@@ -204,7 +204,7 @@ statduser = @statduser@
- statedir = @statedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = getiversion getkversion locktest rpcdebug rpcgen nlmtest
-+SUBDIRS = getiversion locktest rpcdebug rpcgen nlmtest
- MAINTAINERCLEANFILES = Makefile.in
- all: all-recursive
- 

diff --git a/debian/patches/09-manpage-paths-fixup.patch b/debian/patches/09-manpage-paths-fixup.patch
deleted file mode 100644 (file)
index a2e0d30..0000000
--- a/debian/patches/09-manpage-paths-fixup.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: nfs-utils-1.0.10/utils/lockd/lockd.man
-===================================================================
---- nfs-utils-1.0.10.orig/utils/lockd/lockd.man
-+++ nfs-utils-1.0.10/utils/lockd/lockd.man
-@@ -7,7 +7,7 @@
- .SH NAME
- rpc.lockd \- start kernel lockd process
- .SH SYNOPSIS
--.B "/usr/sbin/rpc.lockd
-+.B "/sbin/rpc.lockd
- .SH DESCRIPTION
- The
- .B rpc.lockd
-Index: nfs-utils-1.0.10/utils/showmount/showmount.man
-===================================================================
---- nfs-utils-1.0.10.orig/utils/showmount/showmount.man
-+++ nfs-utils-1.0.10/utils/showmount/showmount.man
-@@ -4,7 +4,7 @@
- .SH NAME
- showmount \- show mount information for an NFS server
- .SH SYNOPSIS
--.B /usr/sbin/showmount
-+.B /sbin/showmount
- .B "[\ \-adehv\ ]"
- .B "[\ \-\-all\ ]"
- .B "[\ \-\-directories\ ]"

diff --git a/debian/patches/10-ccachedir-off-by-one.patch b/debian/patches/10-ccachedir-off-by-one.patch
deleted file mode 100644 (file)
index c8503f7..0000000
--- a/debian/patches/10-ccachedir-off-by-one.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: nfs-utils-1.0.11~git-20060105/utils/gssd/gssd.c
-===================================================================
---- nfs-utils-1.0.11~git-20060105.orig/utils/gssd/gssd.c
-+++ nfs-utils-1.0.11~git-20060105/utils/gssd/gssd.c
-@@ -122,7 +122,7 @@ main(int argc, char *argv[])
-                               break;
-                       case 'd':
-                               strncpy(ccachedir, optarg, sizeof(ccachedir));
--                              if (ccachedir[sizeof(ccachedir-1)] != '\0')
-+                              if (ccachedir[sizeof(ccachedir)-1] != '\0')
-                                       errx(1, "ccachedir path name too long");
-                               break;
-                       default:

diff --git a/debian/patches/11-root-on-krb5-mounts.patch b/debian/patches/11-root-on-krb5-mounts.patch
index a8c4d21dcb82ee9334bc451fe5c9a66e29b54716..5d8c301c1a6a66df289387902331793847b7650e 100644 (file)
--- a/debian/patches/11-root-on-krb5-mounts.patch
+++ b/debian/patches/11-root-on-krb5-mounts.patch
@@ -1,7 +1,7 @@
-Index: nfs-utils-1.0.11~git-20060117/utils/gssd/krb5_util.c
+Index: nfs-utils-1.0.11~git-20070212/utils/gssd/krb5_util.c

 ===================================================================
 ===================================================================

---- nfs-utils-1.0.11~git-20060117.orig/utils/gssd/krb5_util.c
-+++ nfs-utils-1.0.11~git-20060117/utils/gssd/krb5_util.c
+--- nfs-utils-1.0.11~git-20070212.orig/utils/gssd/krb5_util.c
++++ nfs-utils-1.0.11~git-20070212/utils/gssd/krb5_util.c

 @@ -120,6 +120,9 @@
  #include "gss_oids.h"
  #include "krb5_util.h"
 @@ -120,6 +120,9 @@
  #include "gss_oids.h"
  #include "krb5_util.h"


@@ -12,7 +12,7 @@ Index: nfs-utils-1.0.11~git-20060117/utils/gssd/krb5_util.c
  /* Global list of principals/cache file names for machine credentials */
  struct gssd_k5_kt_princ *gssd_k5_kt_princ_list = NULL;
  
  /* Global list of principals/cache file names for machine credentials */
  struct gssd_k5_kt_princ *gssd_k5_kt_princ_list = NULL;
  

-@@ -496,13 +499,13 @@ gssd_process_krb5_keytab(krb5_context co
+@@ -490,13 +493,13 @@ gssd_process_krb5_keytab(krb5_context co

                printerr(2, "Processing keytab entry for principal '%s'\n",
                         pname);
  #ifdef HAVE_KRB5
                printerr(2, "Processing keytab entry for principal '%s'\n",
                         pname);
  #ifdef HAVE_KRB5


@@ -32,7 +32,7 @@ Index: nfs-utils-1.0.11~git-20060117/utils/gssd/krb5_util.c
                              
  #endif
                     (!gssd_have_realm_ple((void *)&kte.principal->realm)) ) {
                              
  #endif
                     (!gssd_have_realm_ple((void *)&kte.principal->realm)) ) {

-@@ -714,7 +717,7 @@ gssd_refresh_krb5_machine_creds(void)
+@@ -708,7 +711,7 @@ gssd_refresh_krb5_machine_creds(void)

                        printerr(0, "Do you have a valid keytab entry for "
                                    "%s/<your.host>@<YOUR.REALM> in "
                                    "keytab file %s ?\n",
                        printerr(0, "Do you have a valid keytab entry for "
                                    "%s/<your.host>@<YOUR.REALM> in "
                                    "keytab file %s ?\n",

diff --git a/debian/patches/series b/debian/patches/series
index e892c403fef1d035f36377b3c116494a23d4b795..30f711835cfe55d4dcbeb584c030e9ebf51b28d0 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,2 @@
-01-bzero.patch

 02-document-debian-init-scripts.patch
 02-document-debian-init-scripts.patch

-05-refuse-non-ident-maptypes.patch
-07-exports-default-options.patch
-08-dont-build-getkversion.patch
-09-manpage-paths-fixup.patch 
-10-ccachedir-off-by-one.patch

 11-root-on-krb5-mounts.patch
 11-root-on-krb5-mounts.patch

diff --git a/debian/rules b/debian/rules
index 877e659bf4b93a852838f4aaeae492d87b0ad28c..40a2daf4b996a6ae63228b8954427c64e3a7824f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,6 @@ clean: unpatch
        rm -f build-stamp
        rm -rf $(DEBTMP)
        -$(MAKE) distclean
        rm -f build-stamp
        rm -rf $(DEBTMP)
        -$(MAKE) distclean

-       $(RM) utils/rquotad/rquota.h utils/rquotad/rquota_xdr.c

        dh_clean
 
 binary-indep: build
        dh_clean
 
 binary-indep: build

diff --git a/tools/getkversion/Makefile.in b/tools/getkversion/Makefile.in
deleted file mode 100644 (file)
index ecd27b8..0000000
--- a/tools/getkversion/Makefile.in
+++ /dev/null
@@ -1,504 +0,0 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-SOURCES = $(getkversion_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = @host@
-noinst_PROGRAMS = getkversion$(EXEEXT)
-subdir = tools/getkversion
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/aclocal/bsdsignals.m4 \
-       $(top_srcdir)/aclocal/kerberos5.m4 \
-       $(top_srcdir)/aclocal/nfs-utils.m4 \
-       $(top_srcdir)/aclocal/tcp-wrappers.m4 \
-       $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
-CONFIG_HEADER = $(top_builddir)/support/include/config.h
-CONFIG_CLEAN_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-am_getkversion_OBJECTS = getkversion-getkversion.$(OBJEXT)
-getkversion_OBJECTS = $(am_getkversion_OBJECTS)
-getkversion_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/support/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/getkversion-getkversion.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
-       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-       $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(getkversion_SOURCES)
-DIST_SOURCES = $(getkversion_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = $(CC_FOR_BUILD)
-CCDEPMODE = @CCDEPMODE@
-CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS = @CFLAGS@
-CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
-CONFIG_GSS_FALSE = @CONFIG_GSS_FALSE@
-CONFIG_GSS_TRUE = @CONFIG_GSS_TRUE@
-CONFIG_MOUNT_FALSE = @CONFIG_MOUNT_FALSE@
-CONFIG_MOUNT_TRUE = @CONFIG_MOUNT_TRUE@
-CONFIG_NFSV4_FALSE = @CONFIG_NFSV4_FALSE@
-CONFIG_NFSV4_TRUE = @CONFIG_NFSV4_TRUE@
-CONFIG_RQUOTAD_FALSE = @CONFIG_RQUOTAD_FALSE@
-CONFIG_RQUOTAD_TRUE = @CONFIG_RQUOTAD_TRUE@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GREP = @GREP@
-GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
-GSSAPI_LIBS = @GSSAPI_LIBS@
-GSSD = @GSSD@
-HAVE_LIBWRAP = @HAVE_LIBWRAP@
-HAVE_TCP_WRAPPER = @HAVE_TCP_WRAPPER@
-IDMAPD = @IDMAPD@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-K5VERS = @K5VERS@
-KRBCFLAGS = @KRBCFLAGS@
-KRBDIR = @KRBDIR@
-KRBLDFLAGS = @KRBLDFLAGS@
-KRBLIBS = @KRBLIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
-LIBBSD = @LIBBSD@
-LIBCRYPT = @LIBCRYPT@
-LIBNSL = @LIBNSL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@ --tag=CC
-LIBWRAP = @LIBWRAP@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-RANLIB = @RANLIB@
-RELEASE = @RELEASE@
-RPCSECGSS_CFLAGS = @RPCSECGSS_CFLAGS@
-RPCSECGSS_LIBS = @RPCSECGSS_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SVCGSSD = @SVCGSSD@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-enable_gss = @enable_gss@
-enable_nfsv3 = @enable_nfsv3@
-enable_nfsv4 = @enable_nfsv4@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kprefix = @kprefix@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-secure_statd = @secure_statd@
-sharedstatedir = @sharedstatedir@
-statduser = @statduser@
-statedir = @statedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-getkversion_SOURCES = getkversion.c
-getkversion_CFLAGS = $(CFLAGS_FOR_BUILD)
-getkversion_CPPFLAGS = $(CPPFLAGS_FOR_BUILD)
-getkversion_LDFLAGS = $(LDFLAGS_FOR_BUILD)
-MAINTAINERCLEANFILES = Makefile.in
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-               && exit 0; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tools/getkversion/Makefile'; \
-       cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  tools/getkversion/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstPROGRAMS:
-       @list='$(noinst_PROGRAMS)'; for p in $$list; do \
-         f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-         echo " rm -f $$p $$f"; \
-         rm -f $$p $$f ; \
-       done
-getkversion$(EXEEXT): $(getkversion_OBJECTS) $(getkversion_DEPENDENCIES) 
-       @rm -f getkversion$(EXEEXT)
-       $(LINK) $(getkversion_LDFLAGS) $(getkversion_OBJECTS) $(getkversion_LDADD) $(LIBS)
-
-mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
-
-distclean-compile:
-       -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getkversion-getkversion.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@   if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
-
-getkversion-getkversion.o: getkversion.c
-@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getkversion_CPPFLAGS) $(CPPFLAGS) $(getkversion_CFLAGS) $(CFLAGS) -MT getkversion-getkversion.o -MD -MP -MF "$(DEPDIR)/getkversion-getkversion.Tpo" -c -o getkversion-getkversion.o `test -f 'getkversion.c' || echo '$(srcdir)/'`getkversion.c; \
-@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/getkversion-getkversion.Tpo" "$(DEPDIR)/getkversion-getkversion.Po"; else rm -f "$(DEPDIR)/getkversion-getkversion.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='getkversion.c' object='getkversion-getkversion.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='$(DEPDIR)/getkversion-getkversion.Po' tmpdepfile='$(DEPDIR)/getkversion-getkversion.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getkversion_CPPFLAGS) $(CPPFLAGS) $(getkversion_CFLAGS) $(CFLAGS) -c -o getkversion-getkversion.o `test -f 'getkversion.c' || echo '$(srcdir)/'`getkversion.c
-
-getkversion-getkversion.obj: getkversion.c
-@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getkversion_CPPFLAGS) $(CPPFLAGS) $(getkversion_CFLAGS) $(CFLAGS) -MT getkversion-getkversion.obj -MD -MP -MF "$(DEPDIR)/getkversion-getkversion.Tpo" -c -o getkversion-getkversion.obj `if test -f 'getkversion.c'; then $(CYGPATH_W) 'getkversion.c'; else $(CYGPATH_W) '$(srcdir)/getkversion.c'; fi`; \
-@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/getkversion-getkversion.Tpo" "$(DEPDIR)/getkversion-getkversion.Po"; else rm -f "$(DEPDIR)/getkversion-getkversion.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='getkversion.c' object='getkversion-getkversion.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='$(DEPDIR)/getkversion-getkversion.Po' tmpdepfile='$(DEPDIR)/getkversion-getkversion.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getkversion_CPPFLAGS) $(CPPFLAGS) $(getkversion_CFLAGS) $(CFLAGS) -c -o getkversion-getkversion.obj `if test -f 'getkversion.c'; then $(CYGPATH_W) 'getkversion.c'; else $(CYGPATH_W) '$(srcdir)/getkversion.c'; fi`
-
-getkversion-getkversion.lo: getkversion.c
-@am__fastdepCC_TRUE@   if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getkversion_CPPFLAGS) $(CPPFLAGS) $(getkversion_CFLAGS) $(CFLAGS) -MT getkversion-getkversion.lo -MD -MP -MF "$(DEPDIR)/getkversion-getkversion.Tpo" -c -o getkversion-getkversion.lo `test -f 'getkversion.c' || echo '$(srcdir)/'`getkversion.c; \
-@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/getkversion-getkversion.Tpo" "$(DEPDIR)/getkversion-getkversion.Plo"; else rm -f "$(DEPDIR)/getkversion-getkversion.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='getkversion.c' object='getkversion-getkversion.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      depfile='$(DEPDIR)/getkversion-getkversion.Plo' tmpdepfile='$(DEPDIR)/getkversion-getkversion.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getkversion_CPPFLAGS) $(CPPFLAGS) $(getkversion_CFLAGS) $(CFLAGS) -c -o getkversion-getkversion.lo `test -f 'getkversion.c' || echo '$(srcdir)/'`getkversion.c
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-
-distclean-libtool:
-       -rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       tags=; \
-       here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
-       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-         test -n "$$unique" || unique=$$empty_fix; \
-         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-           $$tags $$unique; \
-       fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       tags=; \
-       here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
-       test -z "$(CTAGS_ARGS)$$tags$$unique" \
-         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$tags $$unique
-
-GTAGS:
-       here=`$(am__cd) $(top_builddir) && pwd` \
-         && cd $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-       list='$(DISTFILES)'; for file in $$list; do \
-         case $$file in \
-           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-         esac; \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-           dir="/$$dir"; \
-           $(mkdir_p) "$(distdir)$$dir"; \
-         else \
-           dir=''; \
-         fi; \
-         if test -d $$d/$$file; then \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-           fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-         else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
-           || exit 1; \
-         fi; \
-       done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
-       mostlyclean-am
-
-distclean: distclean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-       distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-       clean-libtool clean-noinstPROGRAMS ctags distclean \
-       distclean-compile distclean-generic distclean-libtool \
-       distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am install-exec \
-       install-exec-am install-info install-info-am install-man \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-       pdf pdf-am ps ps-am tags uninstall uninstall-am \
-       uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT: