summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2008-10-02 20:51:41 +0000
committerjoerg <joerg>2008-10-02 20:51:41 +0000
commit66b3689ac2ae648a0c3988e1379bc817ac8122f5 (patch)
treec9e9c1fb2947ff436295c6de66c3539ae51dc861
parent92f3c7aa6de6410b4b16c8369cffb3ce4611cfb5 (diff)
downloadpkgsrc-66b3689ac2ae648a0c3988e1379bc817ac8122f5.tar.gz
Merge time_t fix from HEAD and call it pkg_install-20081003.
-rw-r--r--pkgtools/pkg_install/files/admin/audit.c12
-rw-r--r--pkgtools/pkg_install/files/lib/version.h4
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgtools/pkg_install/files/admin/audit.c b/pkgtools/pkg_install/files/admin/audit.c
index 484f19d9896..72b9716006b 100644
--- a/pkgtools/pkg_install/files/admin/audit.c
+++ b/pkgtools/pkg_install/files/admin/audit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: audit.c,v 1.8.2.4 2008/08/21 16:04:39 joerg Exp $ */
+/* $NetBSD: audit.c,v 1.8.2.5 2008/10/02 20:51:41 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -8,7 +8,7 @@
#include <sys/cdefs.h>
#endif
#ifndef lint
-__RCSID("$NetBSD: audit.c,v 1.8.2.4 2008/08/21 16:04:39 joerg Exp $");
+__RCSID("$NetBSD: audit.c,v 1.8.2.5 2008/10/02 20:51:41 joerg Exp $");
#endif
/*-
@@ -254,11 +254,11 @@ check_and_read_pkg_vulnerabilities(void)
if (now < 0)
warnx("pkg-vulnerabilities is from the future");
else if (now > 86400 * 7)
- warnx("pkg-vulnerabilities is out of day (%d days old)",
- now / 86400);
+ warnx("pkg-vulnerabilities is out of day (%ld days old)",
+ (long)(now / 86400));
else if (verbose >= 2)
- warnx("pkg-vulnerabilities is %d day%s old",
- now / 86400, now / 86400 == 1 ? "" : "s");
+ warnx("pkg-vulnerabilities is %ld day%s old",
+ (long)(now / 86400), now / 86400 == 1 ? "" : "s");
}
pv = read_pkg_vulnerabilities(pkg_vulnerabilities_file, 0, check_signature);
diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h
index ace5e5d64c8..011fd41632c 100644
--- a/pkgtools/pkg_install/files/lib/version.h
+++ b/pkgtools/pkg_install/files/lib/version.h
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.102.2.16 2008/09/16 19:03:54 joerg Exp $ */
+/* $NetBSD: version.h,v 1.102.2.17 2008/10/02 20:51:41 joerg Exp $ */
/*
* Copyright (c) 2001 Thomas Klausner. All rights reserved.
@@ -27,6 +27,6 @@
#ifndef _INST_LIB_VERSION_H_
#define _INST_LIB_VERSION_H_
-#define PKGTOOLS_VERSION "20080916"
+#define PKGTOOLS_VERSION "20081003"
#endif /* _INST_LIB_VERSION_H_ */