CVS commit: pkgsrc/filesystems/glusterfs

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Mar 23 23:01:48 UTC 2020

Modified Files:
        pkgsrc/filesystems/glusterfs: Makefile distinfo
        pkgsrc/filesystems/glusterfs/patches:
            patch-libglusterfs_src_common-utils.c

Log Message:
glusterfs: Add bashism remediation patch


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/filesystems/glusterfs/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/filesystems/glusterfs/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/filesystems/glusterfs/patches/patch-libglusterfs_src_common-utils.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/filesystems/glusterfs/Makefile
diff -u pkgsrc/filesystems/glusterfs/Makefile:1.94 pkgsrc/filesystems/glusterfs/Makefile:1.95
--- pkgsrc/filesystems/glusterfs/Makefile:1.94  Thu Mar 12 23:52:37 2020
+++ pkgsrc/filesystems/glusterfs/Makefile       Mon Mar 23 23:01:48 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.94 2020/03/12 23:52:37 gdt Exp $
+# $NetBSD: Makefile,v 1.95 2020/03/23 23:01:48 gdt Exp $
 
 DISTNAME=      glusterfs-3.12.8
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    filesystems
 MASTER_SITES=  http://bits.gluster.org/pub/gluster/glusterfs/src/
 

Index: pkgsrc/filesystems/glusterfs/distinfo
diff -u pkgsrc/filesystems/glusterfs/distinfo:1.67 pkgsrc/filesystems/glusterfs/distinfo:1.68
--- pkgsrc/filesystems/glusterfs/distinfo:1.67  Mon Sep  3 00:06:35 2018
+++ pkgsrc/filesystems/glusterfs/distinfo       Mon Mar 23 23:01:48 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.67 2018/09/03 00:06:35 gdt Exp $
+$NetBSD: distinfo,v 1.68 2020/03/23 23:01:48 gdt Exp $
 
 SHA1 (glusterfs-3.12.8.tar.gz) = 9e8ab7a86c1a3eb476816c908718ad57753406ac
 RMD160 (glusterfs-3.12.8.tar.gz) = d0e09f748893829f85f6570eaad977f545745115
 SHA512 (glusterfs-3.12.8.tar.gz) = 4dfe00704489e5ce1c599d691105081c14f85209319c829d82e783fec09a4544e078dc956db5dce1d130e8fcc4e617b1dfecf915f9239e250869dc0cb2ef4397
 Size (glusterfs-3.12.8.tar.gz) = 7389786 bytes
-SHA1 (patch-libglusterfs_src_common-utils.c) = 71fbae30991b93c2e06c0213eafb4d8b28c2cd91
+SHA1 (patch-libglusterfs_src_common-utils.c) = 526e702fe5538d3957f4192dec0781edae686d20
+SHA1 (patch-tools_gfind__missing__files_gfind__missing__files.sh) = 000cbc70acbb4645b9e55654698fade5605aa5b8

Index: pkgsrc/filesystems/glusterfs/patches/patch-libglusterfs_src_common-utils.c
diff -u pkgsrc/filesystems/glusterfs/patches/patch-libglusterfs_src_common-utils.c:1.2 pkgsrc/filesystems/glusterfs/patches/patch-libglusterfs_src_common-utils.c:1.3
--- pkgsrc/filesystems/glusterfs/patches/patch-libglusterfs_src_common-utils.c:1.2      Mon Aug  6 02:22:31 2018
+++ pkgsrc/filesystems/glusterfs/patches/patch-libglusterfs_src_common-utils.c  Mon Mar 23 23:01:48 2020
@@ -1,11 +1,10 @@
-$NetBSD: patch-libglusterfs_src_common-utils.c,v 1.2 2018/08/06 02:22:31 manu Exp $
+$NetBSD: patch-libglusterfs_src_common-utils.c,v 1.3 2020/03/23 23:01:48 gdt Exp $
 
 Make NetBSD memory size reading routine 64-bit aware
 
---- libglusterfs/src/common-utils.c.orig       2018-08-05 19:00:57.102350607 +0200
-+++ libglusterfs/src/common-utils.c    2018-08-05 19:21:38.677872008 +0200
-@@ -2970,15 +2970,25 @@
- 
+--- libglusterfs/src/common-utils.c.orig       2018-04-12 17:46:46.578237383 +0000
++++ libglusterfs/src/common-utils.c
+@@ -2971,13 +2971,23 @@ get_mem_size ()
        memsize = page_size * num_pages;
  #endif
  
@@ -30,4 +29,3 @@ Make NetBSD memory size reading routine 
        return memsize;
  }
  
- /* Strips all whitespace characters in a string and returns length of new string