CVS commit: pkgsrc/pkgtools/pkgin

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan 15 09:49:40 UTC 2019

Modified Files:
        pkgsrc/pkgtools/pkgin: distinfo
Added Files:
        pkgsrc/pkgtools/pkgin/patches: patch-main.c patch-pkgindb.c
            patch-tools.c

Log Message:
pkgin: fix some clang build errors on NetBSD-current


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/pkgtools/pkgin/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/pkgtools/pkgin/patches/patch-main.c
cvs rdiff -u -r0 -r1.1 pkgsrc/pkgtools/pkgin/patches/patch-pkgindb.c \
    pkgsrc/pkgtools/pkgin/patches/patch-tools.c

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

Modified files:

Index: pkgsrc/pkgtools/pkgin/distinfo
diff -u pkgsrc/pkgtools/pkgin/distinfo:1.54 pkgsrc/pkgtools/pkgin/distinfo:1.55
--- pkgsrc/pkgtools/pkgin/distinfo:1.54 Thu Sep 20 12:45:19 2018
+++ pkgsrc/pkgtools/pkgin/distinfo      Tue Jan 15 09:49:40 2019
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.54 2018/09/20 12:45:19 jperkin Exp $
+$NetBSD: distinfo,v 1.55 2019/01/15 09:49:40 wiz Exp $
 
 SHA1 (pkgin-0.11.6.tar.gz) = 25be08de68d07bb7b0d7c18f606401824d32ca12
 RMD160 (pkgin-0.11.6.tar.gz) = 928e4379785affb66ebaee89dd13dbdff2fa8be3
 SHA512 (pkgin-0.11.6.tar.gz) = 54435c871ec6d5400b6e44f26b7013bceac7821ae67ed091f172e61c6bb1469bcd496b5a34fc98721f2afef0611cb99a606e8ce0efb5a83ce83121dba940b5ed
 Size (pkgin-0.11.6.tar.gz) = 197396 bytes
+SHA1 (patch-main.c) = a40a09c6563fd90791f2b5ed2f36dafdaa8b54a7
+SHA1 (patch-pkgindb.c) = 95c0b32407ecd721495246da9f52a49db4367980
+SHA1 (patch-tools.c) = ddc90e21012c95c2064434cd5129f27e87aa1594

Added files:

Index: pkgsrc/pkgtools/pkgin/patches/patch-main.c
diff -u /dev/null pkgsrc/pkgtools/pkgin/patches/patch-main.c:1.4
--- /dev/null   Tue Jan 15 09:49:40 2019
+++ pkgsrc/pkgtools/pkgin/patches/patch-main.c  Tue Jan 15 09:49:40 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-main.c,v 1.4 2019/01/15 09:49:40 wiz Exp $
+
+main.c:340:1: error: function 'usage' could be declared with attribute 'noreturn' [-Werror,-Wmissing-noreturn]
+
+--- main.c.orig        2018-09-20 12:31:51.000000000 +0000
++++ main.c
+@@ -335,6 +335,7 @@ find_cmd(const char *arg)
+       return -1;
+ }
+ 
++__attribute__((noreturn))
+ static void
+ usage(int status)
+ {

Index: pkgsrc/pkgtools/pkgin/patches/patch-pkgindb.c
diff -u /dev/null pkgsrc/pkgtools/pkgin/patches/patch-pkgindb.c:1.1
--- /dev/null   Tue Jan 15 09:49:40 2019
+++ pkgsrc/pkgtools/pkgin/patches/patch-pkgindb.c       Tue Jan 15 09:49:40 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-pkgindb.c,v 1.1 2019/01/15 09:49:40 wiz Exp $
+
+pkgindb.c:280:1: error: function 'pkgindb_sqlfail' could be declared with attribute 'noreturn' [-Werror,-Wmissing-noreturn]
+
+--- pkgindb.c.orig     2018-09-20 12:31:51.000000000 +0000
++++ pkgindb.c
+@@ -275,6 +275,7 @@ pkgindb_close(void)
+       sqlite3_close(pdb);
+ }
+ 
++__attribute__((noreturn))
+ static void
+ pkgindb_sqlfail(void)
+ {
Index: pkgsrc/pkgtools/pkgin/patches/patch-tools.c
diff -u /dev/null pkgsrc/pkgtools/pkgin/patches/patch-tools.c:1.1
--- /dev/null   Tue Jan 15 09:49:40 2019
+++ pkgsrc/pkgtools/pkgin/patches/patch-tools.c Tue Jan 15 09:49:40 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-tools.c,v 1.1 2019/01/15 09:49:40 wiz Exp $
+
+tools.c:107:28: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
+
+--- tools.c.orig       2018-09-20 12:31:51.000000000 +0000
++++ tools.c
+@@ -96,6 +96,7 @@ trunc_str(char *str, char limit, int dir
+       }
+ }
+ 
++__attribute__((__format__ (__printf__, 2, 3)))
+ void
+ do_log(const char *path, const char *fmt, ...)
+ {