 @@ -1,24 +1,24 @@
-/*	$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"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #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
 /*-
  * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -244,31 +244,31 @@ check_and_read_pkg_vulnerabilities(void)
 	if (verbose >= 1) {
 		if (stat(pkg_vulnerabilities_file, &st) == -1) {
 			if (errno == ENOENT)
 				errx(EXIT_FAILURE,
 				    "pkg-vulnerabilities not found, run %s -d",
 				    getprogname());
 			errx(EXIT_FAILURE, "pkg-vulnerabilities not readable");
+		}
 		now = time(NULL);
 		now -= st.st_mtime;
 		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)",
+			warnx("pkg-vulnerabilities is out of day (%ld days old)",
-			    now / 86400);
+			    (long)(now / 86400));
 		else if (verbose >= 2)
-			warnx("pkg-vulnerabilities is %d day%s old",
+			warnx("pkg-vulnerabilities is %ld day%s old",
-			    now / 86400, now / 86400 == 1 ? "" : "s");
+			    (long)(now / 86400), now / 86400 == 1 ? "" : "s");
+	}
 	pv = read_pkg_vulnerabilities(pkg_vulnerabilities_file, 0, check_signature);
+}
 void
 audit_pkgdb(int argc, char **argv)
+{
 	int rv;
 	parse_options(argc, argv);
 	argv += optind;

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -17,16 +17,16 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
-#define PKGTOOLS_VERSION "20080916"
+#define PKGTOOLS_VERSION "20081003"
 #endif /* _INST_LIB_VERSION_H_ */