July 2013 - Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] Highlight new dependencies brought in by an upgrade
by Connor Behan 16 Jul '13

16 Jul '13

Users trying to keep a lightweight system often scan the list of targets for red flags. This just makes it easier for them. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- src/pacman/util.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 23c4009..f3202f7 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -909,8 +909,14 @@ static void _display_targets(alpm_list_t *targets, int verbose) } if(target->install) { - pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), - alpm_pkg_get_version(target->install)); + if(!target->remove && config->op_s_upgrade) { + const colstr_t *colstr = &config->colstr; + pm_asprintf(&str, "%s%s-%s%s", colstr->title, alpm_pkg_get_name(target->install), + alpm_pkg_get_version(target->install), colstr->nocolor); + } else { + pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), + alpm_pkg_get_version(target->install)); + } } else if(isize == 0) { pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->remove), alpm_pkg_get_version(target->remove)); -- 1.8.3.2

2 3

[pacman-dev] Fix for FS#36097
by Ashley Whetter 15 Jul '13

15 Jul '13

Hey everyone, I've attached (and pasted below) a couple of possible patches that fix FS#36097 (Wrong exit code for `pacman -Sg`). >From 045b58ada05747c6743e8bf68e7e7d8156016eee Mon Sep 17 00:00:00 2001 From: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> Date: Fri, 12 Jul 2013 00:15:15 +0100 Subject: [PATCH] Sg flag now returns correct return value for errors sync_group now returns non-zero if no groups are found in the (non-empty) list of groups to search for Fixes FS#36097 Signed-off-by: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> --- src/pacman/sync.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index fc1314b..af26ae4 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -367,6 +367,7 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) { alpm_list_t *i, *j, *k, *s = NULL; + int found_group = 0; if(targets) { for(i = targets; i; i = alpm_list_next(i)) { @@ -376,6 +377,7 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) alpm_group_t *grp = alpm_db_get_group(db, grpname); if(grp) { + found_group = 1; /* get names of packages in group */ for(k = grp->packages; k; k = alpm_list_next(k)) { if(!config->quiet) { @@ -396,6 +398,8 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) alpm_group_t *grp = j->data; if(level > 1) { + found_group |= (int)(intptr_t) grp->packages; + for(k = grp->packages; k; k = alpm_list_next(k)) { printf("%s %s\n", grp->name, alpm_pkg_get_name(k->data)); @@ -403,6 +407,7 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) } else { /* print grp names only, no package names */ if(!alpm_list_find_str (s, grp->name)) { + found_group = 1; s = alpm_list_add (s, grp->name); printf("%s\n", grp->name); } @@ -412,7 +417,7 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) alpm_list_free(s); } - return 0; + return (found_group == 0); } static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) -- 1.8.3.2 >From 2b36585f5aeca8adbe15fc4609ff4bc5536af798 Mon Sep 17 00:00:00 2001 From: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> Date: Fri, 12 Jul 2013 00:35:55 +0100 Subject: [PATCH] Sg flag now returns correct return value for errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit sync_group now returns non-zero if no groups are found in the (non-empty) list of groups to search for Fixes FS#36097 Signed-off-by: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> --- src/pacman/sync.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index fc1314b..9d2dbd6 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -367,6 +367,7 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) { alpm_list_t *i, *j, *k, *s = NULL; + int found = 0; if(targets) { for(i = targets; i; i = alpm_list_next(i)) { @@ -376,6 +377,7 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) alpm_group_t *grp = alpm_db_get_group(db, grpname); if(grp) { + found = 1; /* get names of packages in group */ for(k = grp->packages; k; k = alpm_list_next(k)) { if(!config->quiet) { @@ -410,9 +412,13 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) } } alpm_list_free(s); + + /* Even if there are no groups we have still done everything we should + * have */ + found = 1; } - return 0; + return (found == 0); } static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) -- 1.8.3.2 With the first patch, the new double cast line is a bit weird but genuinely flags whether or not we found any groups. The second patch seems a bit more sane to me in terms of the functionality. It just marks there to be a group found if the user didn't search for a specific group, regardless of whether any groups were actually found. I think this makes sense because in the highly unlikely scenario that there are no groups and the user didn't search for any specifically, pacman has still done everything it should have done so shouldn't return an error. Regards, Ashley

4 4

[pacman-dev] [PATCH] Clarify inter-conflicts message
by Allan McRae 15 Jul '13

15 Jul '13

Use a clear message ather than using a made up work to describe what we are doing. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/callback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index c57ef34..d0b7c40 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -169,7 +169,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_("resolving dependencies...\n")); break; case ALPM_EVENT_INTERCONFLICTS_START: - printf(_("looking for inter-conflicts...\n")); + printf(_("looking for conflicting packages...\n")); break; case ALPM_EVENT_ADD_START: if(config->noprogressbar) { -- 1.8.3.2

2 1

[pacman-dev] [PATCH] Do not refer to FlySpray numbers
by Allan McRae 15 Jul '13

15 Jul '13

These references to bug numbers assume we will forever be using that bug tracker and all did not provide any information beyond the comment and commit message. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Left that FS numbers in the test suite as that requries a much larger clean-up. lib/libalpm/add.c | 2 +- lib/libalpm/dload.c | 2 +- scripts/makepkg.sh.in | 2 +- src/pacman/sync.c | 2 +- src/pacman/util.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 8ef9ef0..df39274 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -516,7 +516,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, } /* prepare directory for database entries so permission are correct after - changelog/install script installation (FS#12263) */ + changelog/install script installation */ if(_alpm_local_db_prepare(db, newpkg)) { alpm_logaction(handle, ALPM_CALLER_PREFIX, "error: could not create database entry %s-%s\n", diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 342afbc..8537b3d 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -466,7 +466,7 @@ static int curl_download_internal(struct dload_payload *payload, /* disconnect relationships from the curl handle for things that might go out * of scope, but could still be touched on connection teardown. This really - * only applies to FTP transfers. See FS#26327 for an example. */ + * only applies to FTP transfers. */ curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, (char *)NULL); diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 06f7c25..e95e9a0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -389,7 +389,7 @@ download_file() { extract_file() { local file=$1 - # fix flyspray #6246 + # do not rely on extension for file type local file_type=$(file -bizL "$file") local ext=${file##*.} local cmd='' diff --git a/src/pacman/sync.c b/src/pacman/sync.c index fc1314b..04c8f86 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -639,7 +639,7 @@ static int process_targname(alpm_list_t *dblist, const char *targname, { alpm_pkg_t *pkg = alpm_find_dbs_satisfier(config->handle, dblist, targname); - /* #FS#23342 - skip ignored packages when user says no */ + /* skip ignored packages when user says no */ if(alpm_errno(config->handle) == ALPM_ERR_PKG_IGNORED) { pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), targname); return 0; diff --git a/src/pacman/util.c b/src/pacman/util.c index 23c4009..9eb0042 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1094,7 +1094,7 @@ double humanize_size(off_t bytes, const char target_unit, int precision, *label = labels[index]; } - /* fix FS#27924 so that it doesn't display negative zeroes */ + /* do not display negative zeroes */ if(precision >= 0 && val < 0.0 && val > (-0.5 / simple_pow(10, precision))) { val = 0.0; @@ -1531,7 +1531,7 @@ static int question(short preset, const char *format, va_list args) } /* if stdin is piped, response does not get printed out, and as a result - * a \n is missing, resulting in broken output (FS#27909) */ + * a \n is missing, resulting in broken output */ if(!isatty(fd_in)) { fprintf(stream, "%s\n", response); } -- 1.8.3.2

2 2

[pacman-dev] [PATCH] clarified descriptions for pactree -r (--help and pactree(8))
by Zulker Nayeen Nahiyan 15 Jul '13

15 Jul '13

Signed-off-by: Zulker Nayeen Nahiyan <nahiyan02(a)gmail.com> --- doc/pactree.8.txt | 2 +- src/util/pactree.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/pactree.8.txt b/doc/pactree.8.txt index 6ecaf23..0e9f733 100644 --- a/doc/pactree.8.txt +++ b/doc/pactree.8.txt @@ -48,7 +48,7 @@ Options Prints package names at the start of each line, one per line. *-r, \--reverse*:: - Show packages that depend on the named package. + Show packages that depend on the named package instead. *-s, \--sync*:: Read package data from sync databases instead of local database. diff --git a/src/util/pactree.c b/src/util/pactree.c index 33cf66c..3b4eb9e 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -319,7 +319,7 @@ static void usage(void) " -g, --graph generate output for graphviz's dot\n" " -h, --help display this help message\n" " -l, --linear enable linear output\n" - " -r, --reverse show reverse dependencies\n" + " -r, --reverse list packages that depend on PACKAGE instead\n" " -s, --sync search sync DBs instead of local\n" " -u, --unique show dependencies with no duplicates (implies -l)\n" " --config <path> set an alternate configuration file\n"); -- 1.8.3.2

3 6

[pacman-dev] [PATCH] makedeps and checkdeps are now installed together
by awhetter.2011＠my.bristol.ac.uk 15 Jul '13

15 Jul '13

From: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> Thanks for the feedback on my last patch. I've updated the patch and included the recommended changes here. I dedcided to quote the arrays because it doesn't really cost anything to do it anyway. Regards, Ashley P.S. Hopefully I've used git send-email properly here! I tried to reply to the original thread but I don't think I can do it because I didn't use send-email the first time. Ashley Whetter (1): makedeps and checkdeps are now installed together scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 1.8.3.2

2 2

[pacman-dev] [PATCH] Removed installed optional dependencies from post-installation listing
by Drew DeVault 13 Jul '13

13 Jul '13

Per feedback on prior patch. My only concern here is that I'm not particularly familiar with how localization works, and I don't know if my changes will affect that. --- src/pacman/util.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 23c4009..ab94629 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1243,14 +1243,16 @@ void display_optdepends(alpm_pkg_t *pkg) optdeps = alpm_pkg_get_optdepends(pkg); - /* turn optdepends list into a text list */ + /* turn uninstalled optdepends list into a text list */ for(i = optdeps; i; i = alpm_list_next(i)) { alpm_depend_t *optdep = i->data; - optstrings = alpm_list_add(optstrings, make_optstring(optdep)); + if(alpm_db_get_pkg(alpm_get_localdb(config->handle), optdep->name) == 0) { + optstrings = alpm_list_add(optstrings, make_optstring(optdep)); + } } if(optstrings) { - printf(_("Optional dependencies for %s\n"), alpm_pkg_get_name(pkg)); + printf(_("Remaining optional dependencies for %s:\n"), alpm_pkg_get_name(pkg)); unsigned short cols = getcols(fileno(stdout)); list_display_linebreak(" ", optstrings, cols); } -- 1.8.3.2

2 1