jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kwebapp: update to 0.6.12.

Browse source
This commit is contained in:
Duncaen 2018-12-30 21:56:59 +01:00
parent 2b7c03d4ae
commit 5c84531726
2 changed files with 2 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
srcpkgs/kwebapp/patches/NULL_va_list.patch
View file

@ -1,83 +0,0 @@
diff --git config.c config.c
index 16683a1..a9357c2 100644
--- config.c
+++ config.c
@@ -882,7 +882,7 @@ ort_config_msg(struct config *cfg, enum msgtype type,
if (NULL == fmt) {
ort_config_msgv(cfg, type,
- chan, er, pos, NULL, NULL);
+ chan, er, pos, NULL, ap);
return;
}
diff --git linker.c linker.c
index 33ca33d..c5cd929 100644
--- linker.c
+++ linker.c
@@ -65,16 +65,17 @@ gen_warnx(struct config *cfg,
va_end(ap);
} else
ort_config_msgv(cfg, MSGTYPE_WARN,
- channel, 0, pos, NULL, NULL);
+ channel, 0, pos, NULL, ap);
}
static void
gen_err(struct config *cfg, const struct pos *pos)
{
+ va_list ap;
int er = errno;
ort_config_msgv(cfg, MSGTYPE_FATAL,
- channel, er, pos, NULL, NULL);
+ channel, er, pos, NULL, ap);
}
static void
@@ -90,7 +91,7 @@ gen_errx(struct config *cfg,
va_end(ap);
} else
ort_config_msgv(cfg, MSGTYPE_ERROR,
- channel, 0, pos, NULL, NULL);
+ channel, 0, pos, NULL, ap);
}
/*
diff --git parser.c parser.c
index 05a4cef..f9b75e9 100644
--- parser.c
+++ parser.c
@@ -341,12 +341,13 @@ parse_warnx(struct parse *p, const char *fmt, ...)
va_end(ap);
} else
ort_config_msgv(p->cfg, MSGTYPE_WARN,
- channel, 0, &pos, NULL, NULL);
+ channel, 0, &pos, NULL, ap);
}
static enum tok
parse_err(struct parse *p)
{
+ va_list ap;
int er = errno;
struct pos pos;
@@ -355,7 +356,7 @@ parse_err(struct parse *p)
pos.column = p->column;
ort_config_msgv(p->cfg, MSGTYPE_FATAL,
- channel, er, &pos, NULL, NULL);
+ channel, er, &pos, NULL, ap);
p->lasttype = TOK_ERR;
return p->lasttype;
@@ -378,7 +379,7 @@ parse_errx(struct parse *p, const char *fmt, ...)
va_end(ap);
} else
ort_config_msgv(p->cfg, MSGTYPE_ERROR,
- channel, 0, &pos, NULL, NULL);
+ channel, 0, &pos, NULL, ap);
p->lasttype = TOK_ERR;
return p->lasttype;

4
srcpkgs/kwebapp/template
View file

@ -1,6 +1,6 @@
# Template file for 'kwebapp'
pkgname=kwebapp
version=0.6.9
version=0.6.12
revision=1
build_style=configure
configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.eu>"
license="ISC"
homepage="https://kristaps.bsd.lv/kwebapp/"
distfiles="https://kristaps.bsd.lv/kwebapp/snapshots/kwebapp-${version}.tar.gz"
checksum=b2bf1e0a3f7609e53e0877eb033c9a8a5e847628433aeb3d2e1e0f202bcad18e
checksum=93661936dac2a90a032c9af16e4a29fb3fdb64042a5d338b4f506f44762a26fd
post_install() {
sed -n '2,16p' main.c >LICENSE