[pkgsrc/trunk]: pkgsrc/sysutils/same Fix zlib fallout.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f6ad680db03
branches:  trunk
changeset: 358699:3f6ad680db03
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Feb 18 13:57:37 2017 +0000

description:
Fix zlib fallout.

diffstat:

 sysutils/same/distinfo         |   4 ++--
 sysutils/same/patches/patch-ac |  37 ++++++++++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 5 deletions(-)

diffs (78 lines):

diff -r f0b112fa3d70 -r 3f6ad680db03 sysutils/same/distinfo
--- a/sysutils/same/distinfo    Sat Feb 18 13:57:06 2017 +0000
+++ b/sysutils/same/distinfo    Sat Feb 18 13:57:37 2017 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 01:32:30 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/02/18 13:57:37 joerg Exp $
 
 SHA1 (same-1.8.tar.gz) = 39d95e70c09703b5c7525a6ea896c097f744d288
 RMD160 (same-1.8.tar.gz) = 987e6dc1c99258f00ed831af3fa3f034ebe08134
 SHA512 (same-1.8.tar.gz) = 33b4e8bf18bf793ec507d5167d64932741a0317380958d986bb120476b8b74593e63fd79ddeb90a80cfd3bcce7dff5f5b554730fa5773851a5f2ee29a482199c
 Size (same-1.8.tar.gz) = 9398 bytes
-SHA1 (patch-ac) = aeeb53af5ee90558eef3dcb96acbf54378271c50
+SHA1 (patch-ac) = a3adc11c2ab49f7ffe22e63c7247ed672d8c6dc6
diff -r f0b112fa3d70 -r 3f6ad680db03 sysutils/same/patches/patch-ac
--- a/sysutils/same/patches/patch-ac    Sat Feb 18 13:57:06 2017 +0000
+++ b/sysutils/same/patches/patch-ac    Sat Feb 18 13:57:37 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2013/09/10 14:44:28 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2017/02/18 13:57:37 joerg Exp $
 
 --- same.c.orig        2004-07-16 17:30:01.000000000 +0000
 +++ same.c
@@ -61,6 +61,15 @@
      unsigned int crc;         /* valid if flags & F_CRC_VALID only */
      /* The four fields below are valid if flags & F_STAT_VALID only */
      dev_t device;
+@@ -265,7 +261,7 @@ static void dump_inode_entry(const struc
+ static void dump_hashtable(void);
+ static void load_cache(void);
+ static void save_cache(void);
+-static void save_entry(gzFile *out, const struct inode_entry *entry);
++static void save_entry(gzFile out, const struct inode_entry *entry);
+ static void *p_malloc(unsigned int hash, size_t size);
+ static struct inode_entry *alloc_inode_entry(unsigned int hash, int is_new);
+ static void delete_inode_entry(struct inode_entry *entry);
 @@ -288,7 +284,7 @@ static void read_list(void);
  static const char *get_fname(void);
  static struct inode_entry *get_entry(void);
@@ -79,8 +88,12 @@
           (unsigned long)entry->device, (unsigned long)entry->inode,
           entry->nlink, (unsigned long)entry->uid);
      for (names = entry->names; names; names = names->next)
-@@ -429,7 +425,7 @@ static void load_cache(void)
-     gzFile *in;
+@@ -426,10 +422,10 @@ static inline int is_new(const struct in
+ static void load_cache(void)
+ {
+     static char buf[BUFSIZE];
+-    gzFile *in;
++    gzFile in;
      unsigned long line = 0;
      char *s;
 -    loff_t size;
@@ -88,6 +101,24 @@
      unsigned int crc;
      const char *name;
      unsigned int hash = 0;
+@@ -505,7 +501,7 @@ static void *Malloc (size_t size)
+ static void save_cache(void)
+ {
+     struct stat sb;
+-    gzFile *out;
++    gzFile out;
+     unsigned int i;
+     struct inode_entry *entry;
+     char backup[PATH_MAX+1], tmpname[PATH_MAX+1];
+@@ -563,7 +559,7 @@ static void save_cache(void)
+      *  Save a cache entry
+      */
+ 
+-static void save_entry(gzFile *out, const struct inode_entry *entry)
++static void save_entry(gzFile out, const struct inode_entry *entry)
+ {
+     const struct name_entry *names;
+ 
 @@ -587,7 +583,7 @@ static void *p_malloc(unsigned int hash,
      void *data;