pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Update pkgtools/mtree to 20040722 (the latest on src H...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9f5d090ac135
branches:  trunk
changeset: 479695:9f5d090ac135
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Aug 21 04:10:40 2004 +0000

description:
Update pkgtools/mtree to 20040722 (the latest on src HEAD).  Changes
from the previous version include:

- Add a mtree2nbcompat script to ease importing from src HEAD into
  pkgsrc.

* Implement -M to "merge" entries, even with different types.  This
  can be used in /etc/security to allow special.local to override
  types of entries in special (e.g, replacing a dir with a link).

* Rename Wflag to mtree_Wflag, to be more "external namespace" friendly.

diffstat:

 doc/CHANGES                         |    3 +-
 pkgtools/mtree/Makefile             |    4 +-
 pkgtools/mtree/files/compare.c      |   26 +++++---
 pkgtools/mtree/files/config.h.in    |    4 +-
 pkgtools/mtree/files/configure.ac   |    4 +-
 pkgtools/mtree/files/crc.c          |    8 +-
 pkgtools/mtree/files/create.c       |   13 ++-
 pkgtools/mtree/files/excludes.c     |    8 +-
 pkgtools/mtree/files/extern.h       |   13 ++-
 pkgtools/mtree/files/getid.c        |    6 +-
 pkgtools/mtree/files/misc.c         |   12 +++-
 pkgtools/mtree/files/mtree.8        |   47 ++++++++++++++-
 pkgtools/mtree/files/mtree.c        |   17 +++-
 pkgtools/mtree/files/mtree.cat8     |   28 +++++---
 pkgtools/mtree/files/mtree.h        |    3 +-
 pkgtools/mtree/files/mtree2nbcompat |   57 ++++++++++++++++++
 pkgtools/mtree/files/pack_dev.c     |  110 ++++++++++++++++++------------------
 pkgtools/mtree/files/pack_dev.h     |    4 +-
 pkgtools/mtree/files/spec.c         |   68 ++++++++++++++++++---
 pkgtools/mtree/files/stat_flags.c   |   20 +++--
 pkgtools/mtree/files/verify.c       |   16 +++-
 21 files changed, 329 insertions(+), 142 deletions(-)

diffs (truncated from 1190 to 300 lines):

diff -r de9c127a33b9 -r 9f5d090ac135 doc/CHANGES
--- a/doc/CHANGES       Sat Aug 21 03:28:49 2004 +0000
+++ b/doc/CHANGES       Sat Aug 21 04:10:40 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6958 2004/08/21 03:28:49 jlam Exp $
+$NetBSD: CHANGES,v 1.6959 2004/08/21 04:10:40 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -3925,3 +3925,4 @@
        Updated ifile to 1.3.4 [salo 2004-08-20]
        Updated pkg_install to 20040813 [jlam 2004-08-20]
        Updated pax to 20040802 [jlam 2004-08-21]
+       Updated mtree to 20040722 [jlam 2004-08-21]
diff -r de9c127a33b9 -r 9f5d090ac135 pkgtools/mtree/Makefile
--- a/pkgtools/mtree/Makefile   Sat Aug 21 03:28:49 2004 +0000
+++ b/pkgtools/mtree/Makefile   Sat Aug 21 04:10:40 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/08/14 02:33:32 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/08/21 04:10:45 jlam Exp $
 #
 
-DISTNAME=              mtree-20031220
+DISTNAME=              mtree-20040722
 CATEGORIES=            pkgtools
 MASTER_SITES=          # empty
 DISTFILES=             # empty
diff -r de9c127a33b9 -r 9f5d090ac135 pkgtools/mtree/files/compare.c
--- a/pkgtools/mtree/files/compare.c    Sat Aug 21 03:28:49 2004 +0000
+++ b/pkgtools/mtree/files/compare.c    Sat Aug 21 04:10:40 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compare.c,v 1.3 2004/04/16 23:43:36 heinz Exp $        */
+/*     $NetBSD: compare.c,v 1.4 2004/08/21 04:10:45 jlam Exp $ */
 
 /*-
  * Copyright (c) 1989, 1993
@@ -32,6 +32,10 @@
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
@@ -40,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)compare.c  8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: compare.c,v 1.3 2004/04/16 23:43:36 heinz Exp $");
+__RCSID("$NetBSD: compare.c,v 1.4 2004/08/21 04:10:45 jlam Exp $");
 #endif
 #endif /* not lint */
 
@@ -176,16 +180,18 @@
                if (!S_ISLNK(p->fts_statp->st_mode))
                        goto typeerr;
                break;
+#ifdef S_ISSOCK
        case F_SOCK:
-               if (!S_ISSOCK(p->fts_statp->st_mode)) {
- typeerr:              LABEL;
-                       printf("\ttype (%s, %s)\n",
-                           nodetype(s->type), inotype(p->fts_statp->st_mode));
-                       return (label);
-               }
+               if (!S_ISSOCK(p->fts_statp->st_mode))
+                       goto typeerr;
                break;
+#endif
+typeerr:               LABEL;
+               printf("\ttype (%s, %s)\n",
+                   nodetype(s->type), inotype(p->fts_statp->st_mode));
+               return (label);
        }
-       if (Wflag)
+       if (mtree_Wflag)
                goto afterpermwhack;
 #if HAVE_FILE_FLAGS
        if (iflag && !uflag) {
@@ -311,7 +317,7 @@
                struct stat *ps = p->fts_statp;
                time_t smtime = s->st_mtimespec.tv_sec;
 
-#ifdef BSD4_4
+#if defined(BSD4_4) && !defined(HAVE_NBTOOL_CONFIG_H)
                time_t pmtime = ps->st_mtimespec.tv_sec;
 
                TIMESPEC_TO_TIMEVAL(&tv[0], &s->st_mtimespec);
diff -r de9c127a33b9 -r 9f5d090ac135 pkgtools/mtree/files/config.h.in
--- a/pkgtools/mtree/files/config.h.in  Sat Aug 21 03:28:49 2004 +0000
+++ b/pkgtools/mtree/files/config.h.in  Sat Aug 21 04:10:40 2004 +0000
@@ -238,9 +238,7 @@
 
 /* define HAVE_FILE_FLAGS if the user- and root-changeable masks
 were detected */
-#if defined(HAVE_STRUCT_STAT_ST_FLAGS) && (HAVE_DECL_UF_SETTABLE == 1) && (HAVE_DECL_SF_SETTABLE == 1)
+#if HAVE_STRUCT_STAT_ST_FLAGS && HAVE_DECL_UF_SETTABLE && HAVE_DECL_SF_SETTABLE
 #define HAVE_FILE_FLAGS 1
-#else
-#define HAVE_FILE_FLAGS 0
 #endif
 
diff -r de9c127a33b9 -r 9f5d090ac135 pkgtools/mtree/files/configure.ac
--- a/pkgtools/mtree/files/configure.ac Sat Aug 21 03:28:49 2004 +0000
+++ b/pkgtools/mtree/files/configure.ac Sat Aug 21 04:10:40 2004 +0000
@@ -32,10 +32,8 @@
 AC_CHECK_DECLS([UF_SETTABLE, SF_SETTABLE])
 AH_BOTTOM([/* define HAVE_FILE_FLAGS if the user- and root-changeable masks
 were detected */
-#if defined(HAVE_STRUCT_STAT_ST_FLAGS) && (HAVE_DECL_UF_SETTABLE == 1) && (HAVE_DECL_SF_SETTABLE == 1)
+#if HAVE_STRUCT_STAT_ST_FLAGS && HAVE_DECL_UF_SETTABLE && HAVE_DECL_SF_SETTABLE
 #define HAVE_FILE_FLAGS 1
-#else
-#define HAVE_FILE_FLAGS 0
 #endif
 ])
 AC_HEADER_TIME
diff -r de9c127a33b9 -r 9f5d090ac135 pkgtools/mtree/files/crc.c
--- a/pkgtools/mtree/files/crc.c        Sat Aug 21 03:28:49 2004 +0000
+++ b/pkgtools/mtree/files/crc.c        Sat Aug 21 04:10:40 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: crc.c,v 1.2 2003/09/05 04:38:47 grant Exp $    */
+/*     $NetBSD: crc.c,v 1.3 2004/08/21 04:10:45 jlam Exp $     */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -35,6 +35,10 @@
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
@@ -43,7 +47,7 @@
 #if 0
 static char sccsid[] = "@(#)crc.c      8.1 (Berkeley) 6/17/93";
 #else
-__RCSID("$NetBSD: crc.c,v 1.2 2003/09/05 04:38:47 grant Exp $");
+__RCSID("$NetBSD: crc.c,v 1.3 2004/08/21 04:10:45 jlam Exp $");
 #endif
 #endif /* not lint */
 
diff -r de9c127a33b9 -r 9f5d090ac135 pkgtools/mtree/files/create.c
--- a/pkgtools/mtree/files/create.c     Sat Aug 21 03:28:49 2004 +0000
+++ b/pkgtools/mtree/files/create.c     Sat Aug 21 04:10:40 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: create.c,v 1.3 2004/04/16 23:43:36 heinz Exp $ */
+/*     $NetBSD: create.c,v 1.4 2004/08/21 04:10:45 jlam Exp $  */
 
 /*-
  * Copyright (c) 1989, 1993
@@ -32,6 +32,10 @@
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
@@ -40,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)create.c   8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: create.c,v 1.3 2004/04/16 23:43:36 heinz Exp $");
+__RCSID("$NetBSD: create.c,v 1.4 2004/08/21 04:10:45 jlam Exp $");
 #endif
 #endif /* not lint */
 
@@ -51,7 +55,7 @@
 #include <sys/stat.h>
 #endif
 
-#if !HAVE_CONFIG_H
+#if ! HAVE_NBTOOL_CONFIG_H
 #if HAVE_DIRENT_H
 #include <dirent.h>
 #endif
@@ -218,7 +222,7 @@
                output(&indent, "nlink=%u", p->fts_statp->st_nlink);
        if (keys & F_SIZE && S_ISREG(p->fts_statp->st_mode))
                output(&indent, "size=%lld", (long long)p->fts_statp->st_size);
-#ifdef BSD4_4
+#if defined(BSD4_4) && !defined(HAVE_NBTOOL_CONFIG_H)
        if (keys & F_TIME)
                output(&indent, "time=%ld.%ld",
                    (long)p->fts_statp->st_mtimespec.tv_sec,
@@ -412,4 +416,3 @@
        }
        *offset += printf(" %s", buf) + 1;
 }
-
diff -r de9c127a33b9 -r 9f5d090ac135 pkgtools/mtree/files/excludes.c
--- a/pkgtools/mtree/files/excludes.c   Sat Aug 21 03:28:49 2004 +0000
+++ b/pkgtools/mtree/files/excludes.c   Sat Aug 21 04:10:40 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: excludes.c,v 1.3 2003/12/20 04:54:56 grant Exp $       */
+/*     $NetBSD: excludes.c,v 1.4 2004/08/21 04:10:45 jlam Exp $        */
 
 /*
  * Copyright 2000 Massachusetts Institute of Technology
@@ -32,13 +32,17 @@
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: excludes.c,v 1.3 2003/12/20 04:54:56 grant Exp $");
+__RCSID("$NetBSD: excludes.c,v 1.4 2004/08/21 04:10:45 jlam Exp $");
 #endif
 
 #if HAVE_SYS_TYPES_H
diff -r de9c127a33b9 -r 9f5d090ac135 pkgtools/mtree/files/extern.h
--- a/pkgtools/mtree/files/extern.h     Sat Aug 21 03:28:49 2004 +0000
+++ b/pkgtools/mtree/files/extern.h     Sat Aug 21 04:10:40 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.h,v 1.1 2003/09/05 18:38:58 jlam Exp $  */
+/*     $NetBSD: extern.h,v 1.2 2004/08/21 04:10:45 jlam Exp $  */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -31,12 +31,13 @@
  *     @(#)extern.h    8.1 (Berkeley) 6/6/93
  */
 
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "mtree.h"
 
-#if HAVE_CONFIG_H
-#include "config.h" 
-#else 
-#define HAVE_STRUCT_STAT_ST_FLAGS 1
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
 #endif
  
 #include <nbcompat.h>
@@ -77,7 +78,7 @@
 int     verify(void);
 
 extern int     dflag, eflag, iflag, lflag, mflag, rflag, sflag, tflag, uflag;
-extern int     Wflag;
+extern int     mtree_Mflag, mtree_Wflag;
 extern size_t  mtree_lineno;
 extern u_int32_t crc_total;
 extern int     ftsoptions, keys;
diff -r de9c127a33b9 -r 9f5d090ac135 pkgtools/mtree/files/getid.c
--- a/pkgtools/mtree/files/getid.c      Sat Aug 21 03:28:49 2004 +0000
+++ b/pkgtools/mtree/files/getid.c      Sat Aug 21 04:10:40 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getid.c,v 1.1 2003/09/05 18:38:58 jlam Exp $   */
+/*     $NetBSD: getid.c,v 1.2 2004/08/21 04:10:45 jlam Exp $   */
 /*     from: NetBSD: getpwent.c,v 1.48 2000/10/03 03:22:26 enami Exp */
 /*     from: NetBSD: getgrent.c,v 1.41 2002/01/12 23:51:30 lukem Exp */
 
@@ -70,6 +70,10 @@
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <nbcompat.h>
 #if HAVE_SYS_PARAM_H
 #include <sys/param.h>
diff -r de9c127a33b9 -r 9f5d090ac135 pkgtools/mtree/files/misc.c
--- a/pkgtools/mtree/files/misc.c       Sat Aug 21 03:28:49 2004 +0000
+++ b/pkgtools/mtree/files/misc.c       Sat Aug 21 04:10:40 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: misc.c,v 1.1 2003/09/05 18:38:59 jlam Exp $    */
+/*     $NetBSD: misc.c,v 1.2 2004/08/21 04:10:45 jlam Exp $    */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -34,12 +34,16 @@
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"



Home | Main Index | Thread Index | Old Index