- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] Corrected return codes for Sg flag
by awhetter.2011＠my.bristol.ac.uk 20 Jul '13

20 Jul '13

From: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> This is a follow up from the 'Fix for FS#36097' thread. I tried to reply to it with git send-mail but I can't because I didn't start the thread with send-mail, so sorry for the new thread! I've taken Allan's suggestion and made the behaviour mirror -Ss. A 1 is returned if you search for a group that does not exist, or if you don't search for a specific group and no groups exist. Otherwise a 0 is returned. Ashley Whetter (1): Corrected return codes for Sg flag src/pacman/sync.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 1.8.3.2

5 13

[pacman-dev] So many HOOK puns could go here!
by Allan McRae 19 Jul '13

19 Jul '13

Looking at the ini parsing patch yesterday motivated me to get hooks implemented. But first we need to completely flesh out the details. This is too complex of a change to make up as we go along. >From the mention of the previous patch, you should be able to figure out the format I am pushing... Look here: https://wiki.archlinux.org/index.php/User:Allan/Pacman_Hooks Questions to answer: 1) Should hooks have a defined suffix. PRO: Avoids .pac{save,new} conflicts CON: There should be none (adjustments made in /etc) 2) Complete list of when hooks can be run. Current list: PreRemove PostRemove PreInstall PostInstall Transaction I guess we should add Pre/Post suffix to Transaction for generality. Any more needed? 3) Trigger. In the wiki I have "File" and "Package" to specify triggers, allowing wildcards. These can be suffixed with Install/Upgrade/Removal. Note that any operation can be triggered by using e.g "PackageInstall = *". Does that seem general enough? 4) Should File hooks run immediately after the file or at the end of the package. At the end of the package fits in with out current install scripts ad so would be easier to implement. Can anyone think of a situation with directly after the file is preferable? 5) How should we handle packages installing a new hook? e.g. In Arch, texinfo will carry the install-info hook. I think it will still need a post_install script to add all the info files installed before texinfo was to the info directory, but then the hook install should be recognised and act on any packages installed after that. Reasonable? 6) Any other comments? My plan is: 1) Finalise format (and I will make executive decisions here if bikeshedding occurs...) 2) Get the ini parsing patches into shape 3) Get the parsing of hook files occuring 4) Get transaction based hooks running 5) Get pre/post file/package install hooks running Allan

5 6

[pacman-dev] [PATCH] Use O_CLOEXEC as much as possible when opening files
by Dan McGee 16 Jul '13

16 Jul '13

When calling open(), use O_CLOEXEC as much as possible to ensure the file descriptor is closed when and if a process using libalpm forks. For most of these cases, and especially in utility functions, the file descriptor is opened and closed in the same function, so we don't have too much to worry about. However, for things like the log file and database lock file, we should ensure descriptors aren't left hanging around for children to touch. This patch is inspired by the problem in FS#36161, where an open file descriptor to the current working directory prevents chroot() from working on FreeBSD. We don't need this file descriptor in the child process, so open it (and now several others) with O_CLOEXEC. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/log.c | 8 ++++++-- lib/libalpm/util.c | 14 +++++++------- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 8ef9ef0..2d93077 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -542,7 +542,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, } /* save the cwd so we can restore it later */ - OPEN(cwdfd, ".", O_RDONLY); + OPEN(cwdfd, ".", O_RDONLY | O_CLOEXEC); if(cwdfd < 0) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not get current working directory\n")); } diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 53c86c5..274e3bc 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -110,7 +110,7 @@ int _alpm_handle_lock(alpm_handle_t *handle) FREE(dir); do { - fd = open(handle->lockfile, O_WRONLY | O_CREAT | O_EXCL, 0000); + fd = open(handle->lockfile, O_WRONLY | O_CREAT | O_EXCL | O_BINARY | O_CLOEXEC, 0000); } while(fd == -1 && errno == EINTR); if(fd >= 0) { FILE *f = fdopen(fd, "w"); diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index 271bd00..5f3b094 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -49,9 +49,13 @@ int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix, /* check if the logstream is open already, opening it if needed */ if(handle->logstream == NULL) { - handle->logstream = fopen(handle->logfile, "a"); + int fd; + OPEN(fd, handle->logfile, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC); + if(fd >= 0) { + handle->logstream = fdopen(fd, "a"); + } /* if we couldn't open it, we have an issue */ - if(handle->logstream == NULL) { + if(fd < 0 || handle->logstream == NULL) { if(errno == EACCES) { handle->pm_errno = ALPM_ERR_BADPERMS; } else if(errno == ENOENT) { diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 1e21362..863614e 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -154,9 +154,9 @@ int _alpm_copyfile(const char *src, const char *dest) MALLOC(buf, (size_t)ALPM_BUFFER_SIZE, return 1); - OPEN(in, src, O_RDONLY); + OPEN(in, src, O_RDONLY | O_CLOEXEC); do { - out = open(dest, O_WRONLY | O_CREAT, 0000); + out = open(dest, O_WRONLY | O_CREAT | O_BINARY | O_CLOEXEC, 0000); } while(out == -1 && errno == EINTR); if(in < 0 || out < 0) { goto cleanup; @@ -245,7 +245,7 @@ int _alpm_open_archive(alpm_handle_t *handle, const char *path, archive_read_support_format_all(*archive); _alpm_log(handle, ALPM_LOG_DEBUG, "opening archive %s\n", path); - OPEN(fd, path, O_RDONLY); + OPEN(fd, path, O_RDONLY | O_CLOEXEC); if(fd < 0) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); @@ -327,7 +327,7 @@ int _alpm_unpack(alpm_handle_t *handle, const char *path, const char *prefix, oldmask = umask(0022); /* save the cwd so we can restore it later */ - OPEN(cwdfd, ".", O_RDONLY); + OPEN(cwdfd, ".", O_RDONLY | O_CLOEXEC); if(cwdfd < 0) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not get current working directory\n")); } @@ -503,7 +503,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]) int retval = 0; /* save the cwd so we can restore it later */ - OPEN(cwdfd, ".", O_RDONLY); + OPEN(cwdfd, ".", O_RDONLY | O_CLOEXEC); if(cwdfd < 0) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not get current working directory\n")); } @@ -769,7 +769,7 @@ static int md5_file(const char *path, unsigned char output[16]) MALLOC(buf, (size_t)ALPM_BUFFER_SIZE, return 1); - OPEN(fd, path, O_RDONLY); + OPEN(fd, path, O_RDONLY | O_CLOEXEC); if(fd < 0) { free(buf); return 1; @@ -811,7 +811,7 @@ static int sha2_file(const char *path, unsigned char output[32], int is224) MALLOC(buf, (size_t)ALPM_BUFFER_SIZE, return 1); - OPEN(fd, path, O_RDONLY); + OPEN(fd, path, O_RDONLY | O_CLOEXEC); if(fd < 0) { free(buf); return 1; -- 1.8.3.2

5 4