pkgdb: track mtime in pkgdb

Store the file mtime in package manifests in order to be agnostic
of the container format (tar).

Author: strssndktn

docs/pkg-query.8

@@ -223,7 +223,7 @@ for the package origin, and
 for the package version.
 .It Cm \&%C
 Expands to the list of categories the matched package belongs to.
-.It Cm \&%F Ns Op psugmft
+.It Cm \&%F Ns Op psugmftl
 Expands to the list of files of the matched package, where
 .Cm p
 stands for path,
@@ -236,7 +236,9 @@ for group,
 .Cm m
 for mode (permissions),
 .Cm f
-for file flags, and
+for file flags,
+.Cm l
+for last modification time, and
 .Cm t
 for the symlink target (or empty string if no symlink).
 .It Cm \&%D

docs/pkg_printf.3

@@ -512,6 +512,9 @@ File flags [string]
 .It Cm %Fg
 File ownership: group name [string]
 .Vt struct pkg_file *
+.It Cm %Fl
+File last modification time [epoch]
+.Vt struct pkg_file *
 .It Cm %\^Fn
 File path name [string]
 .Vt struct pkg_file *

libpkg/pkg.c

@@ -493,12 +493,13 @@ pkg_addrdep(struct pkg *pkg, const char *name, const char *origin, const char *v
 int
 pkg_addfile(struct pkg *pkg, const char *path, const char *sum, bool check_duplicates)
 {
-	return (pkg_addfile_attr(pkg, path, sum, NULL, NULL, 0, 0, NULL, check_duplicates));
+	return (pkg_addfile_attr(pkg, path, sum, NULL, NULL, 0, 0, 0, NULL, check_duplicates));
 }
 
 int
 pkg_addfile_attr(struct pkg *pkg, const char *path, const char *sum,
-		 const char *uname, const char *gname, mode_t perm, u_long fflags,
+		 const char *uname, const char *gname, mode_t perm,
+		 u_long fflags, time_t mtime,
 		 const char *symlink_target, bool check_duplicates)
 {
 	struct pkg_file *f = NULL;
@@ -541,6 +542,9 @@ pkg_addfile_attr(struct pkg *pkg, const char *path, const char *sum,
 	if (symlink_target != NULL)
 		strlcpy(f->symlink_target, symlink_target, sizeof(f->symlink_target));
 
+	if (mtime > 0)
+		f->time[1].tv_sec = mtime;
+
 	pkghash_safe_add(pkg->filehash, f->path, f, NULL);
 	DL_APPEND(pkg->files, f);
 

libpkg/pkg_add.c

@@ -374,15 +374,15 @@ fill_timespec_buf(const struct stat *aest, struct timespec tspec[2])
 {
 #ifdef HAVE_STRUCT_STAT_ST_MTIM
 	tspec[0].tv_sec = aest->st_atim.tv_sec;
-	tspec[0].tv_nsec = aest->st_atim.tv_nsec;
+	tspec[0].tv_nsec = 0;
 	tspec[1].tv_sec = aest->st_mtim.tv_sec;
-	tspec[1].tv_nsec = aest->st_mtim.tv_nsec;
+	tspec[1].tv_nsec = 0;
 #else
 # if defined(_DARWIN_C_SOURCE) || defined(__APPLE__)
 	tspec[0].tv_sec = aest->st_atimespec.tv_sec;
-	tspec[0].tv_nsec = aest->st_atimespec.tv_nsec;
+	tspec[0].tv_nsec = 0;
 	tspec[1].tv_sec = aest->st_mtimespec.tv_sec;
-	tspec[1].tv_nsec = aest->st_mtimespec.tv_nsec;
+	tspec[1].tv_nsec = 0;
 # else
 	/* Portable unix version */
 	tspec[0].tv_sec = aest->st_atime;

libpkg/pkg_create.c

@@ -132,6 +132,9 @@ pkg_create_from_dir(struct pkg *pkg, const char *root,
 				}
 				file->symlink_target[linklen] = '\0';
 			}
+
+			file->time[0] = st.st_atim;
+			file->time[1] = st.st_mtim;
 		}
 
 		counter_count();

libpkg/pkg_manifest.c

@@ -580,6 +580,7 @@ pkg_set_files_from_object(struct pkg *pkg, const ucl_object_t *obj)
 	u_long fflags = 0;
 	char *fname = NULL;
 	const char *key, *okey;
+	time_t mtime = 0;
 
 	okey = ucl_object_key(obj);
 	if (okey == NULL)
@@ -618,14 +619,23 @@ pkg_set_files_from_object(struct pkg *pkg, const ucl_object_t *obj)
 #endif
 		} else if (STRIEQ(key, "symlink_target") && cur->type == UCL_STRING) {
 			symlink_target = ucl_object_tostring(cur);
+		} else if (STRIEQ(key, "mtime") &&
+			   (cur->type == UCL_STRING || cur->type == UCL_INT)) {
+			errno = 0;
+			mtime = strtoll(ucl_object_tostring_forced(cur), NULL, 10);
+			if (mtime == 0 && errno != 0) {
+				pkg_emit_errno("strtoll: invalid epoch value",
+					       ucl_object_tostring_forced(cur));
+				continue;
+			}
 		} else {
 			dbg(1, "Skipping unknown key for file(%s): %s",
 			    fname, key);
 		}
 	}
 
 	pkg_addfile_attr(pkg, fname, sum, uname, gname, perm, fflags,
-			 symlink_target, false);
+			 mtime, symlink_target, false);
 	free(fname);
 
 	return (EPKG_OK);
@@ -1177,6 +1187,11 @@ pkg_emit_object(struct pkg *pkg, short flags)
 							      ucl_object_fromstring(file->symlink_target),
 							      "symlink_target", 0, false);
 				}
+				if (file->time[1].tv_sec > 0) {
+					ucl_object_insert_key(file_attrs,
+							      ucl_object_fromint(file->time[1].tv_sec),
+							      "mtime", 0, false);
+				}
 
 				urlencode(dp, &tmpsbuf);
 				if (map == NULL)

libpkg/pkg_ports.c

@@ -407,12 +407,12 @@ meta_file(struct plist *p, char *line, struct file_attr *a, bool is_config)
 				       a->owner ? a->owner : p->uname,
 				       a->group ? a->group : p->gname,
 				       a->mode ? a->mode : p->perm,
-				       a->fflags,
+				       a->fflags, st.st_mtim.tv_sec,
 				       linklen > 0 ? symlink_target : NULL,
 				       true);
 	} else {
 		ret = pkg_addfile_attr(p->pkg, path, buf, p->uname,
-				       p->gname, p->perm, 0,
+				       p->gname, p->perm, 0, st.st_mtim.tv_sec,
 				       linklen > 0 ? symlink_target : NULL,
 				       true);
 	}

libpkg/pkg_printf.c

@@ -76,6 +76,7 @@
  * Ff pkg_file     File flags of file
  * Fg pkg_file     Group owner of file
  * Fk pkg_file     Keep flag
+ * Fl pkg_file     File modification time
  * Fn pkg_file     File path name
  * Fp pkg_file     File permissions
  * Fs pkg_file     File SHA256 checksum
@@ -320,6 +321,15 @@ static const struct pkg_printf_fmt	fmt[] = {
 		PP_PKG|PP_F,
 		&format_file_group,
 	},
+	[PP_PKG_FILE_MTIME] =
+	{
+		'F',
+		'l',
+		false,
+		false,
+		PP_PKG|PP_F,
+		&format_file_mtime,
+	},
 	[PP_PKG_FILE_PATH] =
 	{
 		'F',
@@ -885,6 +895,24 @@ format_fflags(xstring *buf, u_long fflags, struct percent_esc *p)
 	return (ret);
 }
 
+static xstring *
+format_time_t(xstring *buf, time_t timestamp, struct percent_esc *p)
+{
+	fflush(p->item_fmt->fp);
+	if (strlen(p->item_fmt->buf) == 0)
+		return (int_val(buf, timestamp, p));
+	else {
+		char	 buffer[1024];
+		time_t	 tsv;
+
+		tsv = timestamp;
+		strftime(buffer, sizeof(buffer), p->item_fmt->buf,
+			 localtime(&tsv));
+		fprintf(buf->fp, "%s", buffer);
+	}
+	return (buf);
+}
+
 /*
  * Note: List values -- special behaviour with ? and # modifiers.
  * Affects %A %B %C %D %F %G %L %O %U %b %d %r
@@ -1167,6 +1195,17 @@ format_files(xstring *buf, const void *data, struct percent_esc *p)
 	return (buf);
 }
 
+/*
+ * %Fm -- File modification time.
+ */
+xstring *
+format_file_mtime(xstring *buf, const void *data, struct percent_esc *p)
+{
+	const struct pkg_file *file = data;
+
+	return (format_time_t(buf, file->time[1].tv_sec, p));
+}
+
 /*
  * %Fg -- File group.
  */
@@ -1930,19 +1969,7 @@ format_install_tstamp(xstring *buf, const void *data, struct percent_esc *p)
 {
 	const struct pkg	*pkg = data;
 
-	fflush(p->item_fmt->fp);
-	if (strlen(p->item_fmt->buf) == 0)
-		return (int_val(buf, pkg->timestamp, p));
-	else {
-		char	 buffer[1024];
-		time_t	 tsv;
-
-		tsv = (time_t)pkg->timestamp;
-		strftime(buffer, sizeof(buffer), p->item_fmt->buf,
-			 localtime(&tsv));
-		fprintf(buf->fp, "%s", buffer);
-	}
-	return (buf);
+	return (format_time_t(buf, pkg->timestamp, p));
 }
 
 /*

libpkg/pkgdb.c

@@ -420,6 +420,7 @@ pkgdb_init(sqlite3 *sdb)
 		"gname TEXT,"
 		"perm INTEGER,"
 		"fflags INTEGER,"
+		"mtime INTEGER,"
 		"symlink_target TEXT,"
 		"package_id INTEGER REFERENCES packages(id) ON DELETE CASCADE"
 			" ON UPDATE CASCADE"
@@ -1366,22 +1367,22 @@ static sql_prstmt sql_prepared_statements[PRSTMT_LAST] = {
 	[FILES] = {
 		NULL,
 		"INSERT INTO files (path, sha256, uname, gname, "
-		"perm, fflags, symlink_target, package_id) "
-		"VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)",
-		"TTTTIITI",
+		"perm, fflags, symlink_target, mtime, package_id) "
+		"VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9)",
+		"TTTTIITII",
 	},
 	[FILES_REPLACE] = {
 		NULL,
 		"INSERT OR REPLACE INTO files (path, sha256, uname, gname, "
-		"perm, fflags, symlink_target, package_id) "
-		"VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)",
-		"TTTTIITI",
+		"perm, fflags, symlink_target, mtime, package_id) "
+		"VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9)",
+		"TTTTIITII",
 	},
 	[DIRS1] = {
 		NULL,
 		"INSERT OR IGNORE INTO directories(path, uname, gname, perm, fflags) "
 		"VALUES(?1,?2,?3,?4,?5)",
-		"TTTII",
+		"TTTIII",
 	},
 	[DIRS2] = {
 		NULL,
@@ -1770,6 +1771,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int forced,
 				 _pkgdb_empty_str_null(file->gname),
 				 file->perm, file->fflags,
 				 _pkgdb_empty_str_null(file->symlink_target),
+				 file->time[1].tv_sec,
 				 package_id);
 		if (ret == SQLITE_DONE)
 			continue;
@@ -1792,6 +1794,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int forced,
 					 _pkgdb_empty_str_null(file->gname),
 					 file->perm, file->fflags,
 					 _pkgdb_empty_str_null(file->symlink_target),
+					 file->time[1].tv_sec,
 					 package_id);
 			pkgdb_it_free(it);
 			if (ret == SQLITE_DONE)
@@ -1851,7 +1854,8 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int forced,
 	while (pkg_dirs(pkg, &dir) == EPKG_OK) {
 		if (run_prstmt(DIRS1, dir->path, _pkgdb_empty_str_null(dir->uname),
 			       _pkgdb_empty_str_null(dir->gname),
-			       dir->perm, dir->fflags) != SQLITE_DONE) {
+			       dir->perm, dir->fflags,
+			       dir->time[1].tv_sec) != SQLITE_DONE) {
 			ERROR_STMT_SQLITE(s, STMT(DIRS1));
 			goto cleanup;
 		}

libpkg/pkgdb_iterator.c

@@ -388,7 +388,7 @@ pkgdb_load_files(sqlite3 *sqlite, struct pkg *pkg)
 	sqlite3_stmt	*stmt = NULL;
 	int		 ret;
 	const char	 sql[] = ""
-		"SELECT path, sha256, uname, gname, perm, fflags, symlink_target "
+		"SELECT path, sha256, uname, gname, perm, fflags, mtime, symlink_target "
 		"  FROM files"
 		"  WHERE package_id = ?1"
 		"  ORDER BY PATH ASC";
@@ -418,9 +418,10 @@ pkgdb_load_files(sqlite3 *sqlite, struct pkg *pkg)
 		const char *gname = sqlite3_column_text(stmt, 3);
 		mode_t perm = sqlite3_column_int64(stmt, 4);
 		u_long fflags = sqlite3_column_int64(stmt, 5);
-		const char *symlink_target = sqlite3_column_text(stmt, 6);
+		time_t mtime = sqlite3_column_int64(stmt, 6);
+		const char *symlink_target = sqlite3_column_text(stmt, 7);
 		pkg_addfile_attr(pkg, path, sum, uname, gname, perm, fflags,
-				 symlink_target, false);
+				 mtime, symlink_target, false);
 	}
 	sqlite3_finalize(stmt);