- Pacman-dev - lists.archlinux.org

[pacman-dev] [RFC] makepkg: allow make-style environment var overrides
by Dave Reisner 24 Jul '13

24 Jul '13

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Curious if folks think this is useful -- can definitely see myself using this now and then. It's different than prefixing makepkg with variables because of the order of evaluation. Prefixed vars are still subject to being overriden by config files because said file are sourced after the environment is parsed. This patch adds the variables as late as possible to give them the best chance in life of taking effect. scripts/makepkg.sh.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 06f7c25..0cf55a4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2624,6 +2624,15 @@ while true; do shift done +# attempt to parse any extra args (after the end-of-options delimiter) as +# environment vars. +while [[ $1 ]]; do + if [[ $1 = ?(_[[:alpha:]])+([[:alnum:]_])=* ]]; then + extra_env_vars+=("$1") + fi + shift +done + # setup signal traps trap 'clean_up' 0 for signal in TERM HUP QUIT; do @@ -2706,6 +2715,11 @@ if [[ ! -w $BUILDDIR ]]; then exit 1 fi +# override settings from extra variables on commandline, if any +if (( ${#extra_env_vars[*]} )); then + declare -x "${extra_env_vars[@]}" +fi + PKGDEST=${_PKGDEST:-$PKGDEST} PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined if (( ! (NOBUILD || GENINTEG) )) && [[ ! -w $PKGDEST ]]; then -- 1.8.3.3

4 3

[pacman-dev] [PATCH] Report which package is missing a signature
by Allan McRae 22 Jul '13

22 Jul '13

If any package in a sync transaction is missing a required signature, we give an uninformative error message (which may or may not state that the missing signature is the issue). Always output the package with the missing signature. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- There are still output errors here... When there is a single package in a transaction and it has a missing required signature issue we output: error: failed to commit transaction (package missing required signature) If there are multiple packages in a transaction and one is missing a required signature, we could output either: error: failed to commit transaction (package missing required signature) or error: failed to commit transaction (invalid or corrupted package (PGP signature)) When there is a mixture of missing signatures and corrupt packages, we can out put either error message. (I guess technically both are correct!) However, with this change we will easily be able to identify all corrupt packages and all packages with missing signatures. And this finished my quest for more informative error output from signature checking... lib/libalpm/sync.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index f9217bd..c342bbf 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1094,6 +1094,10 @@ static int check_validity(alpm_handle_t *handle, if(errors) { for(i = errors; i; i = i->next) { struct validity *v = i->data; + if(v->error == ALPM_ERR_PKG_MISSING_SIG) { + _alpm_log(handle, ALPM_LOG_ERROR, + _("%s: missing required signature\n"), v->pkg->name); + } if(v->error == ALPM_ERR_PKG_INVALID_SIG) { _alpm_process_siglist(handle, v->pkg->name, v->siglist, v->level & ALPM_SIG_PACKAGE_OPTIONAL, -- 1.8.3.3

2 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-71-g6e3ea82
by allan＠archlinux.org 22 Jul '13

22 Jul '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 6e3ea82f9bd88fc12efbb6da24e2b52ca3cf9819 (commit) via 58832b0d7cb44b2842b7dba2f139009b3b2d93bb (commit) via 66f3b93331a3c376b1eadc5abfb3e630118a7de5 (commit) via 29498b6a2a67a9bc7b9648347b3bfbe5d9e92735 (commit) via a774e4d5e26f6e88ecf87237449cbbbe21df179f (commit) via 9108bfe08093e0c64a1879c4d74df2ad2c26302c (commit) via bcbb6a56a16bc875ec7f28ce832ccb14787cf445 (commit) via ec24d814abdce4a7e48d78dba99fa1a38220de91 (commit) via 28cb22e3c20676c42a08593b5553ee896b53e030 (commit) via 1438377401431af3872e2a0c323fb804802242ad (commit) via 96a4d1ca049a6e091cc65f4082693ef554da86bf (commit) via df9d19ba73317ff0ef63954534e61c82feada492 (commit) via 24abcddc574be22b82095ea647209e072080764a (commit) via ef6b6fe06572c75628943fee7067b1ef453c672a (commit) via 5cc099a8ab6129b809f80c6d9578dc8f2aba35ab (commit) from 897e2b121a107f6d250d38ff4d1d0a4960885c94 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6e3ea82f9bd88fc12efbb6da24e2b52ca3cf9819 Author: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> Date: Tue Jul 16 10:18:32 2013 +0100 Corrected return codes for Sg flag Non-zero is now returned if a group is searched for that doesn't exist. Fixes FS#36097. Signed-off-by: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 58832b0d7cb44b2842b7dba2f139009b3b2d93bb Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 15 14:29:28 2013 +1000 Fix typo Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 66f3b93331a3c376b1eadc5abfb3e630118a7de5 Author: Zulker Nayeen Nahiyan <nahiyan02(a)gmail.com> Date: Mon Jul 15 07:37:42 2013 +0600 clarified descriptions for pactree -r (--help) Signed-off-by: Zulker Nayeen Nahiyan <nahiyan02(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 29498b6a2a67a9bc7b9648347b3bfbe5d9e92735 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 15 11:45:11 2013 +1000 Clarify inter-conflicts message Use a clear message rather than using a made up word to describe what we are doing. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a774e4d5e26f6e88ecf87237449cbbbe21df179f Author: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> Date: Fri Jul 12 11:06:38 2013 +0100 Install makedepends and checkdepends together Fixes FS#31557 Signed-off-by: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9108bfe08093e0c64a1879c4d74df2ad2c26302c Author: Jonathan Frazier <eyeswide(a)gmail.com> Date: Thu Jul 11 13:03:36 2013 -0400 pacdiff: Add quit to found pacnew options Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bcbb6a56a16bc875ec7f28ce832ccb14787cf445 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 10 22:42:40 2013 +1000 Carry a copy of gpgme.m4 On systems without gpgme installed, autoreconf will fail with an unrelated error message unless the gpgme.m4 file is present. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ec24d814abdce4a7e48d78dba99fa1a38220de91 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 30 11:12:16 2013 +1000 Remove autoclean.sh Use 'git clean' instead. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 28cb22e3c20676c42a08593b5553ee896b53e030 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 26 14:37:53 2013 +1000 Patch ltmain on autoreconf We used to carry a patched version of ltmain in our repos to fix libtools issues with -Wl,-as-needed. Now that ltmain is "generated" by autoreconf, we manually patch it afterwards. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1438377401431af3872e2a0c323fb804802242ad Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 26 14:21:53 2013 +1000 Use autoreconf in autogen.sh Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 96a4d1ca049a6e091cc65f4082693ef554da86bf Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 26 14:20:59 2013 +1000 Update gitignore files for use with autoreconf Signed-off-by: Allan McRae <allan(a)archlinux.org> commit df9d19ba73317ff0ef63954534e61c82feada492 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 26 14:05:26 2013 +1000 Remove autotools files Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 24abcddc574be22b82095ea647209e072080764a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 7 19:52:13 2013 -0400 be_sync: avoid crashing on files in the root of a DB If a sync DB is malformed and contains entries in the root of the archive, load_pkg_for_entry will leave the 'filename' variable empty, leading to a crash in the ensuing strcmp() calls which determine the DB fragment being examined. While this isn't a read error, this should be reported to the user so that it can be addressed by the creator of the DB. As seen: https://bbs.archlinux.org/viewtopic.php?pid=1297766 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ef6b6fe06572c75628943fee7067b1ef453c672a Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 10 13:58:57 2013 +1000 Hide unused parameter warnings when building without libcurl Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5cc099a8ab6129b809f80c6d9578dc8f2aba35ab Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 10 13:41:09 2013 +1000 Add missing header Exposed when building with --without-libcurl Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + autoclean.sh | 22 - autogen.sh | 6 +- build-aux/.gitignore | 2 + build-aux/compile | 347 -- build-aux/config.guess | 1558 ------- build-aux/config.rpath | 614 --- build-aux/config.sub | 1788 -------- build-aux/depcomp | 791 ---- build-aux/install-sh | 527 --- build-aux/ltmain-asneeded.patch | 33 + build-aux/ltmain.sh | 9672 --------------------------------------- build-aux/missing | 215 - build-aux/mkinstalldirs | 162 - configure.ac | 2 +- contrib/pacdiff.sh.in | 5 +- lib/libalpm/be_sync.c | 9 + lib/libalpm/dload.c | 3 + lib/libalpm/po/.gitignore | 10 +- lib/libalpm/po/Makefile.in.in | 444 -- m4/.gitignore | 3 + m4/gettext.m4 | 383 -- m4/gpgme.m4 | 69 - m4/iconv.m4 | 214 - m4/intlmacosx.m4 | 51 - m4/lib-ld.m4 | 110 - m4/lib-link.m4 | 774 ---- m4/lib-prefix.m4 | 224 - m4/libtool.m4 | 7831 ------------------------------- m4/ltoptions.m4 | 369 -- m4/ltsugar.m4 | 123 - m4/ltversion.m4 | 23 - m4/lt~obsolete.m4 | 98 - m4/nls.m4 | 32 - m4/pkg.m4 | 159 - m4/po.m4 | 449 -- m4/progtest.m4 | 92 - scripts/makepkg.sh.in | 6 +- scripts/po/.gitignore | 10 +- scripts/po/Makefile.in.in | 444 -- src/pacman/callback.c | 2 +- src/pacman/package.c | 2 +- src/pacman/po/.gitignore | 10 +- src/pacman/po/Makefile.in.in | 444 -- src/pacman/sync.c | 11 +- src/util/pactree.c | 2 +- 46 files changed, 100 insertions(+), 28046 deletions(-) delete mode 100755 autoclean.sh create mode 100644 build-aux/.gitignore delete mode 100755 build-aux/compile delete mode 100755 build-aux/config.guess delete mode 100755 build-aux/config.rpath delete mode 100755 build-aux/config.sub delete mode 100755 build-aux/depcomp delete mode 100755 build-aux/install-sh create mode 100644 build-aux/ltmain-asneeded.patch delete mode 100644 build-aux/ltmain.sh delete mode 100755 build-aux/missing delete mode 100755 build-aux/mkinstalldirs delete mode 100644 lib/libalpm/po/Makefile.in.in create mode 100644 m4/.gitignore delete mode 100644 m4/gettext.m4 delete mode 100644 m4/iconv.m4 delete mode 100644 m4/intlmacosx.m4 delete mode 100644 m4/lib-ld.m4 delete mode 100644 m4/lib-link.m4 delete mode 100644 m4/lib-prefix.m4 delete mode 100644 m4/libtool.m4 delete mode 100644 m4/ltoptions.m4 delete mode 100644 m4/ltsugar.m4 delete mode 100644 m4/ltversion.m4 delete mode 100644 m4/lt~obsolete.m4 delete mode 100644 m4/nls.m4 delete mode 100644 m4/pkg.m4 delete mode 100644 m4/po.m4 delete mode 100644 m4/progtest.m4 delete mode 100644 scripts/po/Makefile.in.in delete mode 100644 src/pacman/po/Makefile.in.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/3] pacdiff: improve speed, accuracy finding active configs using pacmandb
by Jonathan Frazier 22 Jul '13

22 Jul '13

This is a new search type, using -p or --pacmandb options. It reads config file locations directly from the local pacman db. It will find active configs anywhere they are defined in installed packages. It is not dependant on outside configs such as updatedb.conf or scanning a large set of directories for find. This will find more pacnews than find when searching with the current default of /etc, and it is faster than both find and updatedb when searching the entire fs. When run directly after an update, the local db is more likely to be cached than all files in /etc or / as other methods read. This will increase performance further post upgrade. After a package is removed and a pacsave is created, this method will not find these pacsaves until the base config is added to the local db again. These files have no influence in a working system and only take up a few blocks of disk space. Active configs need to be dealt with immediately to keep a system working. pacsaves related to removed configs can remain for weeks or months without problems. I would recommend occasionally running other methods such as --locate to remove them. Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> --- contrib/pacdiff.sh.in | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index 7a2db2c..60c7c63 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -25,7 +25,7 @@ diffprog=${DIFFPROG:-vimdiff} diffsearchpath=${DIFFSEARCHPATH:-/etc} USE_COLOR='y' -declare -i findActive=0 locateActive=0 +declare -i findActive=0 locateActive=0 dbActive=0 declare -a oldsaves m4_include(../scripts/library/output_format.sh) @@ -34,11 +34,12 @@ usage() { cat <<EOF $myname is a simple pacnew/pacorig/pacsave updater. -Usage: $myname [-l | -f] [--nocolor] +Usage: $myname [-l | -f | -p] [--nocolor] Search Options: select one, default: find -l/--locate scan using locate -f/--find scan using find + -p/--pacmandb scan active config files from pacman db General Options: --nocolor remove colors from output @@ -59,11 +60,32 @@ version() { echo 'Copyright (C) 2013 Pacman Development Team <pacman-dev(a)archlinux.org>' } +check_backup() { + [[ -f "$1" ]] && printf "$1"'\0' +} + +check_pacsave(){ + for f in "${1}" ${1}.[0-9]; do + check_backup "$f" + done +} + cmd() { if (( $locateActive )); then locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave '*.pacsave.[0-9]' elif (( $findActive )); then find $diffsearchpath $ -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave -o -name '*.pacsave.[0-9]' $ -print0 + elif (( $dbActive )); then + awk '/^%BACKUP%$/ { + while (getline) { + if (/^$/) { nextfile } + print $1 + } + }' "${pac_db}"/*/files | while read -r bkup; do + check_backup "/$bkup.pacnew" + check_backup "/$bkup.pacorig" + check_pacsave "/$bkup.pacsave" + done fi } @@ -73,8 +95,10 @@ while [[ -n "$1" ]]; do locateActive=1;; -f|--find) findActive=1;; + -p|--pacmandb) + dbActive=1;; --nocolor) - USE_COLOR='n' ;; + USE_COLOR='n';; -V|--version) version; exit 0;; -h|--help) @@ -87,12 +111,26 @@ done m4_include(../scripts/library/term_colors.sh) -case $(( findActive+locateActive )) in +case $(( findActive+locateActive+dbActive )) in 0) findActive=1;; # set the default search option [^1]) error "Only one search option may be used at a time" usage; exit 1;; esac +if (( dbActive )); then + if [[ ! -r @sysconfdir@/pacman.conf ]]; then + error "unable to read @sysconfdir@/pacman.conf" + usage; exit 1 + fi + + eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) + pac_db="${DBPath:-@localstatedir@/lib/pacman/}local" + if [[ ! -d "${pac_db}" ]]; then + error "unable to read pacman db %s". "${pac_db}" + usage; exit 1 + fi +fi + # see http://mywiki.wooledge.org/BashFAQ/020 while IFS= read -u 3 -r -d '' pacfile; do file="${pacfile%.pac*}" -- 1.8.3.2

4 12

[pacman-dev] [PATCH 2/2] Warn when directory ownership differs between filesystem and package
by Allan McRae 21 Jul '13

21 Jul '13

We currently only warn if a directories permissions differ, but using -Qkk on my system shows that directory permissions tend to change in packages reasonably frequently without noitce. Provide a warning in such cases so that it can be altered. Example output: (1/1) reinstalling nginx warning: directory ownership differs on /var/lib/nginx/proxy/ filesystem: 33:0 package: 0:0 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/add.c | 16 +++++++++++++++- src/pacman/check.c | 18 ++++++++++++------ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index df39274..ac4e36a 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -215,18 +215,32 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, } else { if(S_ISDIR(lsbuf.st_mode)) { if(S_ISDIR(entrymode)) { + uid_t entryuid = archive_entry_uid(entry); + gid_t entrygid = archive_entry_gid(entry); + /* case 6: existing dir, ignore it */ if(lsbuf.st_mode != entrymode) { /* if filesystem perms are different than pkg perms, warn user */ mode_t mask = 07777; _alpm_log(handle, ALPM_LOG_WARNING, _("directory permissions differ on %s\n" - "filesystem: %o package: %o\n"), filename, lsbuf.st_mode & mask, + "filesystem: %o package: %o\n"), filename, lsbuf.st_mode & mask, entrymode & mask); alpm_logaction(handle, ALPM_CALLER_PREFIX, "warning: directory permissions differ on %s\n" "filesystem: %o package: %o\n", filename, lsbuf.st_mode & mask, entrymode & mask); } + + if((entryuid != lsbuf.st_uid) || (entrygid != lsbuf.st_gid)) { + _alpm_log(handle, ALPM_LOG_WARNING, _("directory ownership differs on %s\n" + "filesystem: %u:%u package: %u:%u\n"), filename, + lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid); + alpm_logaction(handle, ALPM_CALLER_PREFIX, + "warning: directory ownership differs on %s\n" + "filesystem: %u:%u package: %u:%u\n", filename, + lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid); + } + _alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping dir extraction of %s\n", filename); archive_read_data_skip(archive); diff --git a/src/pacman/check.c b/src/pacman/check.c index cdd3744..6c8889f 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -106,9 +106,12 @@ static int check_file_time(const char *pkgname, const char *filepath, { if(st->st_mtime != archive_entry_mtime(entry)) { if(backup) { - printf("%s%s%s: ", config->colstr.title, _("backup file"), config->colstr.nocolor); - printf(_("%s: %s (Modification time mismatch)\n"), - pkgname, filepath); + if(!config->quiet) { + printf("%s%s%s: ", config->colstr.title, _("backup file"), + config->colstr.nocolor); + printf(_("%s: %s (Modification time mismatch)\n"), + pkgname, filepath); + } return 0; } if(!config->quiet) { @@ -150,9 +153,12 @@ static int check_file_size(const char *pkgname, const char *filepath, { if(st->st_size != archive_entry_size(entry)) { if(backup) { - printf("%s%s%s: ", config->colstr.title, _("backup file"), config->colstr.nocolor); - printf(_("%s: %s (Size mismatch)\n"), - pkgname, filepath); + if(!config->quiet) { + printf("%s%s%s: ", config->colstr.title, _("backup file"), + config->colstr.nocolor); + printf(_("%s: %s (Size mismatch)\n"), + pkgname, filepath); + } return 0; } if(!config->quiet) { -- 1.8.3.3

2 1

[pacman-dev] [RFC PATCH 0/2] Improve sync db signature error messages
by Allan McRae 21 Jul '13

21 Jul '13

Currently we always say "Invalid or corrupt database" when database signature checking fails. This is particularly confusing when there is not signature. Also, we immediately verify databases at the start of the transaction which potentially results in (invalid) error messages being output that may be fixed when the sync database gets updated. I'm not 100% convinced this is the right way to fix this... Allan McRae (2): Provide a mechanism to skip validation of sync repos Provide more information for database signature failures lib/libalpm/alpm.h | 4 +++- lib/libalpm/be_sync.c | 20 ++++++++++++++++---- lib/libalpm/db.c | 4 ++-- lib/libalpm/db.h | 3 ++- lib/libalpm/error.c | 2 ++ src/pacman/conf.c | 2 +- src/util/cleanupdelta.c | 2 +- src/util/pactree.c | 2 +- src/util/testdb.c | 2 +- 9 files changed, 29 insertions(+), 12 deletions(-) -- 1.8.3.3

1 2

[pacman-dev] [PATCH] Report missing directory if we can not initialise alpm library
by Allan McRae 21 Jul '13

21 Jul '13

When pacman failed to initialise the alpm library due to the database directory being missing (either via the root not existing or the database directory itself not existing), it just printed the non-informative message "could not find or read directory". Add the directory information the the error output. E.g.: error: failed to initialize alpm library (could not find or read directory: /this/does/not/exist/var/lib/pacman/) Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 2985aba..ab6dae0 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -668,8 +668,8 @@ static int setup_libalpm(void) /* initialize library */ handle = alpm_initialize(config->rootdir, config->dbpath, &err); if(!handle) { - pm_printf(ALPM_LOG_ERROR, _("failed to initialize alpm library (%s)\n"), - alpm_strerror(err)); + pm_printf(ALPM_LOG_ERROR, _("failed to initialize alpm library\n(%s: %s)\n"), + alpm_strerror(err), config->dbpath); if(err == ALPM_ERR_DB_VERSION) { pm_printf(ALPM_LOG_ERROR, _(" try running pacman-db-upgrade\n")); } -- 1.8.3.3

1 0

[pacman-dev] [PATCH] Remove setlocale usage from the backend
by Allan McRae 21 Jul '13

21 Jul '13

Using setlocale in the backend is bound to lead to frontend issues and we have have been using epoch in our databases since April 2007 (commit 47622eef). Remove support for old style times. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/util.c | 15 --------------- test/pacman/tests/query002.py | 5 +---- test/pacman/tests/sync1100.py | 3 --- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 1e21362..f1f760a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -31,7 +31,6 @@ #include <errno.h> #include <limits.h> #include <sys/wait.h> -#include <locale.h> /* setlocale */ #include <fnmatch.h> /* libarchive */ @@ -1169,20 +1168,6 @@ alpm_time_t _alpm_parsedate(const char *line) long long result; errno = 0; - if(isalpha((unsigned char)line[0])) { - const char *oldlocale; - /* initialize to null in case of failure */ - struct tm tmp_tm; - memset(&tmp_tm, 0, sizeof(struct tm)); - - oldlocale = setlocale(LC_TIME, NULL); - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - setlocale(LC_TIME, oldlocale); - - return (alpm_time_t)mktime(&tmp_tm); - } - result = strtoll(line, &end, 10); if(result == 0 && end == line) { /* line was not a number */ diff --git a/test/pacman/tests/query002.py b/test/pacman/tests/query002.py index ccf18f4..5de1f37 100644 --- a/test/pacman/tests/query002.py +++ b/test/pacman/tests/query002.py @@ -1,4 +1,4 @@ -self.description = "Query info on a package (old date)" +self.description = "Query info on a package" p = pmpkg("foobar") p.files = ["bin/foobar"] @@ -7,8 +7,6 @@ p.url = "http://www.archlinux.org" p.license = "GPL2" p.arch = "i686" -# test old style date -p.builddate = "Mon Oct 1 01:40:21 2007 UTC" p.packager = "Arch Linux" self.addpkg2db("local", p) @@ -18,4 +16,3 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=^Name.*%s" % p.name) self.addrule("PACMAN_OUTPUT=^Description.*%s" % p.desc) -self.addrule("PACMAN_OUTPUT=^Build Date.* 2007") diff --git a/test/pacman/tests/sync1100.py b/test/pacman/tests/sync1100.py index c7bb56a..8f59f37 100644 --- a/test/pacman/tests/sync1100.py +++ b/test/pacman/tests/sync1100.py @@ -8,8 +8,6 @@ sp.url = "http://www.archlinux.org" sp.license = "GPL2" sp.arch = "i686" -# test both old style and new style dates -sp.builddate = "Mon Oct 1 01:40:21 2007 UTC" sp.packager = "Arch Linux" sp.md5sum = "00000000000000000000000000000000" @@ -20,4 +18,3 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=^Name.*%s" % sp.name) self.addrule("PACMAN_OUTPUT=^Description.*%s" % sp.desc) -self.addrule("PACMAN_OUTPUT=^Build Date.*2007") -- 1.8.3.3

1 0

[pacman-dev] [PATCH 1/2] Only note backup file changes with -Qkk
by Allan McRae 21 Jul '13

21 Jul '13

Backup files are expected to be changed and should not be flagged by -Qkk. Note changed back-up files in -Qkk but do not count them as altered. Do not report backup files in -Qqkk. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/check.c | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/src/pacman/check.c b/src/pacman/check.c index d7fe2d6..cdd3744 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -102,9 +102,15 @@ static int check_file_permissions(const char *pkgname, const char *filepath, } static int check_file_time(const char *pkgname, const char *filepath, - struct stat *st, struct archive_entry *entry) + struct stat *st, struct archive_entry *entry, int backup) { if(st->st_mtime != archive_entry_mtime(entry)) { + if(backup) { + printf("%s%s%s: ", config->colstr.title, _("backup file"), config->colstr.nocolor); + printf(_("%s: %s (Modification time mismatch)\n"), + pkgname, filepath); + return 0; + } if(!config->quiet) { pm_printf(ALPM_LOG_WARNING, _("%s: %s (Modification time mismatch)\n"), pkgname, filepath); @@ -140,9 +146,15 @@ static int check_file_link(const char *pkgname, const char *filepath, } static int check_file_size(const char *pkgname, const char *filepath, - struct stat *st, struct archive_entry *entry) + struct stat *st, struct archive_entry *entry, int backup) { if(st->st_size != archive_entry_size(entry)) { + if(backup) { + printf("%s%s%s: ", config->colstr.title, _("backup file"), config->colstr.nocolor); + printf(_("%s: %s (Size mismatch)\n"), + pkgname, filepath); + return 0; + } if(!config->quiet) { pm_printf(ALPM_LOG_WARNING, _("%s: %s (Size mismatch)\n"), pkgname, filepath); @@ -155,13 +167,13 @@ static int check_file_size(const char *pkgname, const char *filepath, /* placeholders - libarchive currently does not read checksums from mtree files static int check_file_md5sum(const char *pkgname, const char *filepath, - struct stat *st, struct archive_entry *entry) + struct stat *st, struct archive_entry *entry, int backup) { return 0; } static int check_file_sha256sum(const char *pkgname, const char *filepath, - struct stat *st, struct archive_entry *entry) + struct stat *st, struct archive_entry *entry, int backup) { return 0; } @@ -222,6 +234,7 @@ int check_pkg_full(alpm_pkg_t *pkg) struct archive *mtree; struct archive_entry *entry = NULL; size_t file_count = 0; + const alpm_list_t *lp; root = alpm_option_get_root(config->handle); rootlen = strlen(root); @@ -247,6 +260,7 @@ int check_pkg_full(alpm_pkg_t *pkg) const char *path = archive_entry_pathname(entry); mode_t type; size_t file_errors = 0; + int backup = 0; /* strip leading "./" from path entries */ if(path[0] == '.' && path[1] == '/') { @@ -298,19 +312,30 @@ int check_pkg_full(alpm_pkg_t *pkg) file_errors += check_file_permissions(pkgname, filepath, &st, entry); - if(type != AE_IFDIR) { - /* file or symbolic link */ - file_errors += check_file_time(pkgname, filepath, &st, entry); - } - if(type == AE_IFLNK) { file_errors += check_file_link(pkgname, filepath, &st, entry); } + /* the following checks are expected to fail if a backup file has been + modified */ + for(lp = alpm_pkg_get_backup(pkg); lp; lp = lp->next) { + alpm_backup_t *bl = lp->data; + + if(strcmp(path, bl->name) == 0) { + backup = 1; + continue; + } + } + + if(type != AE_IFDIR) { + /* file or symbolic link */ + file_errors += check_file_time(pkgname, filepath, &st, entry, backup); + } + if(type == AE_IFREG) { /* TODO: these are expected to be changed with backup files */ - file_errors += check_file_size(pkgname, filepath, &st, entry); - /* file_errors += check_file_md5sum(pkgname, filepath, &st, entry); */ + file_errors += check_file_size(pkgname, filepath, &st, entry, backup); + /* file_errors += check_file_md5sum(pkgname, filepath, &st, entry, backup); */ } if(config->quiet && file_errors) { -- 1.8.3.3

1 0

[pacman-dev] [PATCH 1/2] pacdiff: Search and give warnings for older pacsave.[0-9] files
by Jonathan Frazier 21 Jul '13

21 Jul '13

Signed-off-by: Jonathan Frazier <eyeswide(a)gmail.com> --- contrib/pacdiff.sh.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index 47779d6..1c24804 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -47,9 +47,9 @@ version() { cmd() { if [ $locate -eq 1 ]; then - locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave + locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave '*.pacsave.[0-9]' else - find $diffsearchpath $ -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave $ -print0 + find $diffsearchpath $ -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave '*.pacsave.[0-9]' $ -print0 fi } @@ -97,6 +97,8 @@ while IFS= read -u 3 -r -d '' pacfile; do fi done 3< <(cmd) +(( ${#oldsaves[@]} > 0 )) && warning "Ignoring %s" "${oldsaves[@]}" + exit 0 # vim: set ts=2 sw=2 noet: -- 1.8.3.2

5 23