CVS commit: pkgsrc/x11/mcookie

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Nov 23 20:27:21 UTC 2017

Modified Files:
        pkgsrc/x11/mcookie: Makefile distinfo
        pkgsrc/x11/mcookie/patches: patch-lib_setproctitle.c

Log Message:
mcookie: update to 2.31.

no change.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/mcookie/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/mcookie/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/mcookie/patches/patch-lib_setproctitle.c

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

Modified files:

Index: pkgsrc/x11/mcookie/Makefile
diff -u pkgsrc/x11/mcookie/Makefile:1.11 pkgsrc/x11/mcookie/Makefile:1.12
--- pkgsrc/x11/mcookie/Makefile:1.11    Mon Oct  2 15:39:11 2017
+++ pkgsrc/x11/mcookie/Makefile Thu Nov 23 20:27:20 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.11 2017/10/02 15:39:11 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2017/11/23 20:27:20 wiz Exp $
 #
 # Changelog: see
 # https://git.kernel.org/cgit/utils/util-linux/util-linux.git/log/misc-utils/mcookie.c
 # https://git.kernel.org/cgit/utils/util-linux/util-linux.git/log/misc-utils/mcookie.1
 
-DISTNAME=      util-linux-2.30.2
+DISTNAME=      util-linux-2.31
 PKGNAME=       ${DISTNAME:S/util-linux/mcookie/}
 CATEGORIES=    sysutils
-MASTER_SITES=  https://www.kernel.org/pub/linux/utils/util-linux/v2.30/
+MASTER_SITES=  https://www.kernel.org/pub/linux/utils/util-linux/v2.31/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    reed%reedmedia.net@localhost

Index: pkgsrc/x11/mcookie/distinfo
diff -u pkgsrc/x11/mcookie/distinfo:1.10 pkgsrc/x11/mcookie/distinfo:1.11
--- pkgsrc/x11/mcookie/distinfo:1.10    Mon Oct  2 15:39:11 2017
+++ pkgsrc/x11/mcookie/distinfo Thu Nov 23 20:27:20 2017
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.10 2017/10/02 15:39:11 wiz Exp $
+$NetBSD: distinfo,v 1.11 2017/11/23 20:27:20 wiz Exp $
 
-SHA1 (util-linux-2.30.2.tar.xz) = a90e1e7e30e342862d062a885d2dfb8eb8a1f596
-RMD160 (util-linux-2.30.2.tar.xz) = af10e3806cbfed5c60baa6956f1b7055a60b1603
-SHA512 (util-linux-2.30.2.tar.xz) = b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d
-Size (util-linux-2.30.2.tar.xz) = 4442624 bytes
+SHA1 (util-linux-2.31.tar.xz) = 4ebb8a2c1da21a6da08b553abd0f4dd3dbc55b4e
+RMD160 (util-linux-2.31.tar.xz) = 451569f0c2dcc16cd34f5753c1028db8966ab296
+SHA512 (util-linux-2.31.tar.xz) = 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5
+Size (util-linux-2.31.tar.xz) = 4503892 bytes
 SHA1 (patch-configure) = 1e6e797b8a0c19f3a55c65a8a51a9fd08a35fead
 SHA1 (patch-include_setproctitle.h) = deb06015ca459886f82e22eaf6596ff79799b02a
 SHA1 (patch-include_ttyutils.h) = fa2b253d568e5aface99727c397d3c4c892b2c93
 SHA1 (patch-lib_ismounted.c) = 11f5148020dba2a22e1fbe4882fe423dfb11ad73
-SHA1 (patch-lib_setproctitle.c) = 2b6415d9fa484ba1969aa36610b695ba04d0a603
+SHA1 (patch-lib_setproctitle.c) = 9071d5993c8569ab80215ddbb33a103b1d644246

Index: pkgsrc/x11/mcookie/patches/patch-lib_setproctitle.c
diff -u pkgsrc/x11/mcookie/patches/patch-lib_setproctitle.c:1.1 pkgsrc/x11/mcookie/patches/patch-lib_setproctitle.c:1.2
--- pkgsrc/x11/mcookie/patches/patch-lib_setproctitle.c:1.1     Tue Sep 20 08:00:51 2016
+++ pkgsrc/x11/mcookie/patches/patch-lib_setproctitle.c Thu Nov 23 20:27:20 2017
@@ -1,18 +1,18 @@
-$NetBSD: patch-lib_setproctitle.c,v 1.1 2016/09/20 08:00:51 wiz Exp $
+$NetBSD: patch-lib_setproctitle.c,v 1.2 2017/11/23 20:27:20 wiz Exp $
 
 Remove setproctitle, conflicts with NetBSD version and not used
 in mcookie.
 
---- lib/setproctitle.c.orig    2016-03-08 12:00:42.000000000 +0000
+--- lib/setproctitle.c.orig    2017-09-27 09:05:13.698361518 +0000
 +++ lib/setproctitle.c
-@@ -48,27 +48,3 @@ void initproctitle (int argc, char **arg
-       else
-               argv_lth = argv0[argc-1] + strlen(argv0[argc-1]) - argv0[0];
+@@ -49,27 +49,3 @@ void initproctitle (int argc, char **arg
+       if (argv_lth > 1)
+               argv0 = argv;
  }
 -
 -void setproctitle (const char *prog, const char *txt)
 -{
--        int i;
+-        size_t i;
 -        char buf[SPT_BUFSIZE];
 -
 -        if (!argv0)