diff options
| author | Dan McGee <dan@archlinux.org> | 2012-09-18 08:36:10 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-09-18 08:36:10 -0500 |
| commit | 369c5aa7ddabb81c335bb5b0dbd425c42f892459 (patch) | |
| tree | 494074de2ae73c77ee51a6a84331953234cb73ae | |
| parent | 37de9df7c048dc20522ccacaebf7e898ff20b96e (diff) | |
| parent | c4ab50584fc70f9cbf94fdb1153e2eb08c4052df (diff) | |
| download | pacman-369c5aa7ddabb81c335bb5b0dbd425c42f892459.tar.xz | |
Merge branch 'maint'
| -rw-r--r-- | doc/makepkg.conf.5.txt | 4 | ||||
| -rw-r--r-- | doc/pacman.8.txt | 3 | ||||
| -rw-r--r-- | lib/libalpm/signing.c | 5 | ||||
| -rw-r--r-- | test/pacman/pmtest.py | 5 |
4 files changed, 13 insertions, 4 deletions
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index de2b4b42..3dbaea1e 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -25,6 +25,10 @@ build environment. NOTE: This does not guarantee that all package Makefiles will use your exported variables. Some of them are non-standard. +The system-wide configuration file is found in {sysconfdir}/makepkg.conf. +Individual options can be overridden (or added to) on a per user basis in +~/.makepkg.conf. + The default file is fairly well commented, so it may be easiest to simply follow directions given there for customization. diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 0ad81882..24c22431 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -401,9 +401,6 @@ system upgrade and install/upgrade the foo package in the same operation. will force a refresh of all package lists even if they appear to be up to date. -*\--needed*:: - Do not reinstall the targets that are already up to date. - Handling Config Files[[HCF]] ---------------------------- diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 1e417164..6eb2da58 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -530,6 +530,11 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, string_validity(gpgsig->validity), gpgme_strerror(gpgsig->validity_reason)); + if((time_t)gpgsig->timestamp > time(NULL)) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("System time is greater than signature timestamp.\n")); + } + result = siglist->results + sigcount; err = gpgme_get_key(ctx, gpgsig->fpr, &key, 0); if(gpg_err_code(err) == GPG_ERR_EOF) { diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 1a026864..00a0b96e 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -203,9 +203,12 @@ class pmtest(object): if pacman["gdb"]: cmd.extend(["libtool", "execute", "gdb", "--args"]) if pacman["valgrind"]: + suppfile = os.path.join(os.path.dirname(__file__), + '..', '..', 'valgrind.supp') cmd.extend(["libtool", "execute", "valgrind", "-q", "--tool=memcheck", "--leak-check=full", - "--show-reachable=yes", "--suppressions=%s/valgrind.supp" % os.getcwd()]) + "--show-reachable=yes", + "--suppressions=%s" % suppfile]) cmd.extend([pacman["bin"], "--config", os.path.join(self.root, util.PACCONF), "--root", self.root, |