From 56438aff20663a73c6297cc67a85d4cd1c754624 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Tue, 15 Jan 2019 09:49:40 +0000
Subject: pkgin: fix some clang build errors on NetBSD-current

---
 pkgtools/pkgin/distinfo                |  5 ++++-
 pkgtools/pkgin/patches/patch-main.c    | 14 ++++++++++++++
 pkgtools/pkgin/patches/patch-pkgindb.c | 14 ++++++++++++++
 pkgtools/pkgin/patches/patch-tools.c   | 14 ++++++++++++++
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 pkgtools/pkgin/patches/patch-main.c
 create mode 100644 pkgtools/pkgin/patches/patch-pkgindb.c
 create mode 100644 pkgtools/pkgin/patches/patch-tools.c

(limited to 'pkgtools/pkgin')

diff --git a/pkgtools/pkgin/distinfo b/pkgtools/pkgin/distinfo
index a1d53b81624..29a6e222861 100644
--- a/pkgtools/pkgin/distinfo
+++ b/pkgtools/pkgin/distinfo
@@ -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
diff --git a/pkgtools/pkgin/patches/patch-main.c b/pkgtools/pkgin/patches/patch-main.c
new file mode 100644
index 00000000000..3d7e9372259
--- /dev/null
+++ b/pkgtools/pkgin/patches/patch-main.c
@@ -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)
+ {
diff --git a/pkgtools/pkgin/patches/patch-pkgindb.c b/pkgtools/pkgin/patches/patch-pkgindb.c
new file mode 100644
index 00000000000..87909f9864d
--- /dev/null
+++ b/pkgtools/pkgin/patches/patch-pkgindb.c
@@ -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)
+ {
diff --git a/pkgtools/pkgin/patches/patch-tools.c b/pkgtools/pkgin/patches/patch-tools.c
new file mode 100644
index 00000000000..0572626bdb2
--- /dev/null
+++ b/pkgtools/pkgin/patches/patch-tools.c
@@ -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, ...)
+ {
-- 
cgit v1.2.3