cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a couple of time_t format string issues in www/c-icap, spotted while

Browse Source 
trying to track down a backwards memcpy
This commit is contained in:
sthen 2016-01-11 17:05:46 +00:00
parent 1f64da10f5
commit 78d271183e
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/c-icap/c-icap/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2015/11/20 17:34:25 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2016/01/11 17:05:46 sthen Exp $
MULTI_PACKAGES= -main -db -ldap
COMMENT-main= ICAP server for use with web proxies
@ -6,7 +6,7 @@ COMMENT-db= Berkeley DB module for c-icap
COMMENT-ldap= LDAP module for c-icap
V= 0.4.2
REVISION-main= 0
REVISION-main= 1
DISTNAME= c_icap-$V
PKGNAME-main= c-icap-$V
PKGNAME-db= c-icap-db-$V

12
www/c-icap/c-icap/patches/patch-commands_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-commands_c,v 1.1 2016/01/11 17:05:46 sthen Exp $
--- commands.c.orig Mon Jan 11 17:03:48 2016
+++ commands.c Mon Jan 11 17:04:02 2016
@@ -215,7 +215,7 @@ void ci_command_schedule_on(const char *name, void *da
sch.when = time;
sch.data = data;
if (ci_list_search(COMMANDS_QUEUE, &sch)) {
- ci_debug_printf(7, "command %s already scheduled for execution on %ld, ignore\n", name, time);
+ ci_debug_printf(7, "command %s already scheduled for execution on %llu, ignore\n", name, (uint64_t)time);
return;
}
ci_thread_mutex_lock(&COMMANDS_MTX);

12
www/c-icap/c-icap/patches/patch-txt_format_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-txt_format_c,v 1.1 2016/01/11 17:05:46 sthen Exp $
--- txt_format.c.orig Mon Jan 11 17:00:04 2016
+++ txt_format.c Mon Jan 11 17:00:49 2016
@@ -423,7 +423,7 @@ int fmt_seconds(ci_request_t *req, char *buf,int len,
{
time_t tm;
time(&tm);
- return snprintf(buf, len, "%ld", tm);
+ return snprintf(buf, len, "%llu", (uint64_t) tm);
}
int fmt_httpclientip(ci_request_t *req, char *buf,int len, const char *param)