- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.3-12-g6744533
by dan＠archlinux.org 08 Aug '11

08 Aug '11

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, maint has been updated via 67445334e71eaf6138561eee8e5561733a59fc69 (commit) via 4c37d74ae50fc7c0f067aca07164fe75516d055b (commit) via 88644e181db49f3f94e6891166823fd5f46acbcc (commit) via 005eab0a080925d0d6f780d751f9019dafbafc64 (commit) from 297cd7897bfe060ce46d703e15ad7cbe37aedced (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.txt | 3 +-- lib/libalpm/dload.c | 1 + lib/libalpm/po/fi.po | 17 +++++++++++------ lib/libalpm/po/libalpm.pot | 4 ++-- po/de.po | 18 +++++++++++------- po/fi.po | 13 ++++++++----- po/pacman.pot | 4 ++-- src/pacman/sync.c | 11 ++++++++++- src/pacman/util.c | 38 +++++++++++++++++++++++++++++++++++--- 9 files changed, 81 insertions(+), 28 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Check return value of rename() calls
by Dan McGee 08 Aug '11

08 Aug '11

We did a good job checking this in add.c, but not necessarily anywhere else. Fix this up by adding checks into dload.c, remove.c, and conf.c in the frontend. Also add loggers where appropriate and make the message syntax more consistent. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Dave- any memories/reasoning as to why you didn't port this bit over when you added the curl backend stuff? (commit 96e458b705eda4ddff) The remove.c changes pretty much parallel the checks and logging done in add.c, if you're looking to see where the basic stuff from this patch came from. conf.c is the only user of rename() in the frontend, so this does add a new message there, but it seems like a worthwhile addition. -Dan lib/libalpm/dload.c | 7 +++++-- lib/libalpm/remove.c | 24 ++++++++++++++++++------ src/pacman/conf.c | 8 ++++++-- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 23b8db7..dc4f91e 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -373,8 +373,11 @@ cleanup: } if(ret == 0) { - rename(tempfile, destfile); - if(final_file) { + if(rename(tempfile, destfile)) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not rename %s to %s (%s)\n"), + tempfile, destfile, strerror(errno)); + ret = -1; + } else if(final_file) { *final_file = strdup(strrchr(destfile, '/') + 1); } } diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 83c437f..3c19c90 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -220,7 +220,7 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, /* Helper function for iterating through a package's file and deleting them * Used by _alpm_remove_commit. */ -static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, +static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, const alpm_file_t *fileobj, alpm_list_t *skip_remove, int nosave) { struct stat buf; @@ -234,7 +234,7 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, if(alpm_list_find_str(skip_remove, fileobj->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in skip_remove, skipping removal\n", file); - return; + return 1; } /* we want to do a lstat here, and not a _alpm_lstat. @@ -243,7 +243,7 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, * actual symlink */ if(lstat(file, &buf)) { _alpm_log(handle, ALPM_LOG_DEBUG, "file %s does not exist\n", file); - return; + return 1; } if(S_ISDIR(buf.st_mode)) { @@ -280,6 +280,7 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, if(rmdir(file)) { _alpm_log(handle, ALPM_LOG_DEBUG, "directory removal of %s failed: %s\n", file, strerror(errno)); + return -1; } else { _alpm_log(handle, ALPM_LOG_DEBUG, "removed directory %s (no remaining owners)\n", file); @@ -299,10 +300,16 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, if(cmp != 0) { char newpath[PATH_MAX]; snprintf(newpath, PATH_MAX, "%s.pacsave", file); - rename(file, newpath); + if(rename(file, newpath)) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not rename %s to %s (%s)\n"), + file, newpath, strerror(errno)); + alpm_logaction(handle, "error: could not rename %s to %s (%s)\n", + file, newpath, strerror(errno)); + return -1; + } _alpm_log(handle, ALPM_LOG_WARNING, _("%s saved as %s\n"), file, newpath); alpm_logaction(handle, "warning: %s saved as %s\n", file, newpath); - return; + return 0; } } } @@ -310,10 +317,14 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, _alpm_log(handle, ALPM_LOG_DEBUG, "unlinking %s\n", file); if(unlink(file) == -1) { - _alpm_log(handle, ALPM_LOG_ERROR, _("cannot remove file '%s': %s\n"), + _alpm_log(handle, ALPM_LOG_ERROR, _("cannot remove %s (%s)\n"), file, strerror(errno)); + alpm_logaction(handle, "error: cannot remove %s (%s)\n", + file, strerror(errno)); + return -1; } } + return 0; } int _alpm_remove_single_package(alpm_handle_t *handle, @@ -397,6 +408,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle, for(i = filelist->count; i > 0; i--) { alpm_file_t *file = filelist->files + i - 1; int percent; + /* TODO: check return code and handle accordingly */ unlink_file(handle, oldpkg, file, skip_remove, handle->trans->flags & ALPM_TRANS_FLAG_NOSAVE); diff --git a/src/pacman/conf.c b/src/pacman/conf.c index a580406..29e835c 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -184,10 +184,14 @@ static int download_with_xfercommand(const char *url, const char *localpath, ret = -1; } else { /* download was successful */ + ret = 0; if(usepart) { - rename(tempfile, destfile); + if(rename(tempfile, destfile)) { + pm_printf(ALPM_LOG_ERROR, _("could not rename %s to %s (%s)\n"), + tempfile, destfile, strerror(errno)); + ret = -1; + } } - ret = 0; } cleanup: -- 1.7.6

2 1

[pacman-dev] [PATCH 1/3] pacsort: add new utility
by Dave Reisner 07 Aug '11

07 Aug '11

pacsort is a command line sorting utility that implements libalpm's alpm_pkg_vercmp algorithm. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- On Dan's prodding and enthusiasm, I cleaned this up into a real thing: * no hard coded buffer sizes. Everything grows on demand. My initial values and growth may be a little off, but they seemed reasonable for my use cases. * support for null delimited data. Was easy enough, so why not. * support for sorting on specific column. As a necessary evil with it, support for changing the field delimiter. The default is a single space, as that's what pacman -Q uses. Unlike GNU sort, -d '\t' does what you think it does. src/util/.gitignore | 2 + src/util/Makefile.am | 6 +- src/util/pacsort.c | 397 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 403 insertions(+), 2 deletions(-) create mode 100644 src/util/pacsort.c diff --git a/src/util/.gitignore b/src/util/.gitignore index 2880ce2..1813506 100644 --- a/src/util/.gitignore +++ b/src/util/.gitignore @@ -2,6 +2,8 @@ .libs cleanupdelta cleanupdelta.exe +pacsort +pacsort.exe pactree pactree.exe testdb diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 30a2ee3..f277465 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -3,7 +3,7 @@ conffile = ${sysconfdir}/pacman.conf dbpath = ${localstatedir}/lib/pacman/ cachedir = ${localstatedir}/cache/pacman/pkg/ -bin_PROGRAMS = vercmp testpkg testdb cleanupdelta pactree +bin_PROGRAMS = vercmp testpkg testdb cleanupdelta pacsort pactree DEFS = -DLOCALEDIR=\"@localedir@\" \ -DCONFFILE=\"$(conffile)\" \ @@ -27,8 +27,10 @@ testdb_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la cleanupdelta_SOURCES = cleanupdelta.c cleanupdelta_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la +pacsort_SOURCES = pacsort.c +pacsort_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la + pactree_SOURCES = pactree.c pactree_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la - # vim:set ts=2 sw=2 noet: diff --git a/src/util/pacsort.c b/src/util/pacsort.c new file mode 100644 index 0000000..04815b8 --- /dev/null +++ b/src/util/pacsort.c @@ -0,0 +1,397 @@ +/* + * pacsort.c - a sort utility implementing alpm_pkg_vercmp + * + * Copyright (c) 2010-2011 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "config.h" + +#include <errno.h> +#include <getopt.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include <alpm.h> + +#define DELIM ' ' + +struct buffer_t { + char *mem; + size_t len; + size_t maxlen; +}; + +struct list_t { + char **list; + size_t count; + size_t maxcount; +}; + +static struct options_t { + int order; + int sortkey; + int null; + char delim; +} opts; + +static struct buffer_t *buffer_new(size_t initial_size) +{ + struct buffer_t *buf; + + buf = calloc(1, sizeof(*buf)); + if(!buf) { + return NULL; + } + + buf->mem = calloc(initial_size, sizeof(char)); + if(!buf->mem) { + free(buf); + return NULL; + } + + buf->len = 0; + buf->maxlen = initial_size; + + return buf; +} + +static void buffer_free(struct buffer_t *buf) +{ + if(!buf) { + return; + } + + if(buf->mem) { + free(buf->mem); + } + + free(buf); +} + +static int buffer_grow(struct buffer_t *buffer) +{ + size_t newsz = buffer->maxlen * 2.5; + buffer->mem = realloc(buffer->mem, newsz * sizeof(char)); + if(!buffer->mem) { + return 1; + } + buffer->maxlen = newsz; + + return 0; +} + +static struct list_t *list_new(size_t initial_size) +{ + struct list_t *list; + + list = calloc(1, sizeof(struct list_t)); + if(!list) { + return NULL; + } + + list->list = calloc(initial_size, sizeof(char **)); + if(!list->list) { + free(list); + return NULL; + } + + list->maxcount = initial_size; + + return list; +} + +static int list_grow(struct list_t *list) +{ + size_t newsz = list->maxcount * 2.5; + list->list = realloc(list->list, newsz * sizeof(char*)); + if(!list->list) { + return 1; + } + + list->maxcount = newsz; + + return 0; +} + +static int list_add(struct list_t *list, char *name) +{ + if(!list|!name) { + return 1; + } + + if(list->count + 1 >= list->maxcount) { + if(list_grow(list) != 0) { + return 1; + } + } + + list->list[list->count] = name; + list->count++; + + return 0; +} + +static void list_free(struct list_t *list) +{ + size_t i; + + if(!list) { + return; + } + + if(list->list) { + for(i = 0; i < list->count; i++) { + free(list->list[i]); + } + free(list->list); + free(list); + } +} + +static char *explode(struct buffer_t *buffer, struct list_t *list) +{ + char *name, *ptr, *end; + const char linedelim = opts.null ? '\0' : '\n'; + + ptr = buffer->mem; + while((end = memchr(ptr, linedelim, &buffer->mem[buffer->len] - ptr))) { + *end = '\0'; + name = strdup(ptr); + list_add(list, name); + ptr = end + 1; + } + + return ptr; +} + +static int splitfile(FILE *stream, struct buffer_t *buffer, struct list_t *list) +{ + size_t nread; + char *ptr; + + while(1) { + /* check if a read of BUFSIZ chars will overflow */ + if (buffer->len + BUFSIZ + 1 >= buffer->maxlen) { + if(buffer_grow(buffer) != 0) { + return 1; + } + } + + nread = fread(&buffer->mem[buffer->len], 1, BUFSIZ, stream); + if(nread == 0) { + if(feof(stream)) { + if(buffer->len) { + char *name = strndup(buffer->mem, buffer->len + 1); + if(list_add(list, name) != 0) { + return 1; + } + } + break; /* EOF */ + } else { + continue; + } + } + buffer->len += nread; + + if((ptr = explode(buffer, list)) == NULL) { + return 1; + } + + if(ptr != buffer->mem) { + /* realign the data in the buffer */ + buffer->len = &buffer->mem[buffer->len] - ptr; + memmove(&buffer->mem[0], ptr, buffer->len + 1); + } + } + + return 0; +} + +/* returns a pointer to the nth column of a string without being destructive */ +static const char *nth_column(const char *string) +{ + const char *prev, *ptr; + int col; + + ptr = prev = string; + for(col = 1; ptr && col <= opts.sortkey; col++) { + prev = ptr; + ptr = strchr(ptr, opts.delim); + if(ptr) { + ptr++; + } + } + + return prev; +} + +static int vercmp(const void *p1, const void *p2) +{ + const char *name1, *name2; + + name1 = *(const char **)p1; + name2 = *(const char **)p2; + + if(opts.sortkey == 0) { + return opts.order * alpm_pkg_vercmp(name1, name2); + } else { + return opts.order * alpm_pkg_vercmp(nth_column(name1), nth_column(name2)); + } +} + +static char escape_char(const char *string) +{ + const size_t len = strlen(string); + + if(!string || len > 2) { + return -1; + } + + if(len == 1) { + return *string; + } + + if(*string != '\\') { + return -1; + } + + switch(string[1]) { + case 't': + return '\t'; + case 'n': + return '\n'; + case 'v': + return '\v'; + case '0': + return '\0'; + default: + return -1; + } +} + +static void usage(void) +{ + fprintf(stderr, "pacsort v" PACKAGE_VERSION "\n" + "Usage: pacsort [options] [files...]\n\n" + " -d, --delim DELIM field separator instead of a space\n" + " -h, --help this help message\n" + " -k, --key INDEX sort input starting on column\n" + " -r, --reverse sort in reverse order\n" + " -z, --null lines end with null bytes, not newlines\n\n"); +} + +static int parse_options(int argc, char **argv) +{ + int opt; + + static struct option opttable[] = { + {"delim", required_argument, 0, 'd'}, + {"help", no_argument, 0, 'h'}, + {"key", required_argument, 0, 'k'}, + {"reverse", no_argument, 0, 'r'}, + {"null", no_argument, 0, 'z'}, + {0, 0, 0, 0} + }; + + while((opt = getopt_long(argc, argv, "d:hk:rz", opttable, NULL)) != -1) { + switch(opt) { + case 'd': + opts.delim = escape_char(optarg); + if(opts.delim == -1) { + fprintf(stderr, "error: invalid field delimiter -- `%s'\n", optarg); + return 1; + } + break; + case 'h': + return 1; + case 'k': + opts.sortkey = (int)strtol(optarg, NULL, 10); + if(opts.sortkey <= 0) { + fprintf(stderr, "error: invalid sort key -- %s\n", optarg); + return 1; + } + break; + case 'r': + opts.order = -1; + break; + case 'z': + opts.null = 1; + break; + default: + return 1; + } + } + + return 0; +} + +int main(int argc, char *argv[]) +{ + struct list_t *list; + struct buffer_t *buffer; + size_t i; + + /* option defaults */ + opts.order = 1; + opts.delim = DELIM; + opts.sortkey = 0; + opts.null = 0; + + if(parse_options(argc, argv) != 0) { + usage(); + return 2; + } + + list = list_new(100); + buffer = buffer_new(BUFSIZ * 3); + + if(optind == argc) { + if(splitfile(stdin, buffer, list) != 0) { + fprintf(stderr, "%s: memory exhausted\n", argv[0]); + return ENOMEM; + } + } else { + while(optind < argc) { + FILE *input = fopen(argv[optind], "r"); + if(input) { + if(splitfile(input, buffer, list) != 0) { + fprintf(stderr, "%s: memory exhausted\n", argv[0]); + return ENOMEM; + } + fclose(input); + } else { + fprintf(stderr, "%s: %s: %s\n", argv[0], argv[optind], strerror(errno)); + } + optind++; + } + } + + if(list->count) { + const char linedelim = opts.null ? '\0' : '\n'; + qsort(list->list, list->count, sizeof(char *), vercmp); + for(i = 0; i < list->count; i++) { + printf("%s%c", list->list[i], linedelim); + } + list_free(list); + } + + buffer_free(buffer); + + return 0; +} + +/* vim: set ts=2 sw=2 noet: */ -- 1.7.6

1 2

[pacman-dev] [PATCH] doc/PKGBUILD: fix pkgver for -git packages
by Florian Pritz 05 Aug '11

05 Aug '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- doc/PKGBUILD.5.txt | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index d9cf623..69913dd 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -401,8 +401,7 @@ from (e.g., 'makepkg-git', 'mplayer-svn'). The SVN module to fetch. *Git*:: - The generated pkgver will be one formatted by the 'git-describe' - command, with '-' characters converted to '_' characters. + The generated pkgver will be the date the package is built. *_gitroot*;; The URL (all protocols supported) to the GIT repository. -- 1.7.6

1 0

[pacman-dev] portable package sorting for shell scripts
by Dave Reisner 05 Aug '11

05 Aug '11

So it occurs to me that while it's all well and good to have a portable package cache cleaner, it's no good at all if it all hinges on a GNU sort flag (-V) which poorly approximates what vercmp does. Would we have room for sort tool that implements alpm_pkg_vercmp? A simple implementation could be as easy as the below... I think this would get a lot of mileage out of the AUR/pacman wrapper crowd. thoughts? d #include <alpm.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #define MAXLEN 4096 int vercmp(const void *p1, const void *p2) { return alpm_pkg_vercmp(*(const char**)p1, *(const char**)p2); } int main(void) { char **pkglist = NULL; char *pkg; char buf[MAXLEN + 1]; int i, pkgcount = 0; while (fgets(buf, MAXLEN + 1, stdin)) { pkg = strndup(buf, MAXLEN); *(pkg + strlen(pkg) - 1) = '\0'; pkglist = realloc(pkglist, ++pkgcount * sizeof(*pkglist)); *(pkglist + pkgcount - 1) = pkg; } qsort(pkglist, pkgcount, sizeof(char*), vercmp); for (i = 0; i < pkgcount; i++) { printf("%s\n", *(pkglist + i)); free(*(pkglist + i)); } if (pkgcount > 0) { free(pkglist); } return 0; }

2 2

[pacman-dev] makepkg: keep PACMAN_OPTS in environment
by Matthew Farkas-Dyck 04 Aug '11

04 Aug '11

Patch to make makepkg keep PACMAN_OPTS environment variable, thus allowing operation to be better controlled, e.g. by an AUR- or other helper script to build packages on and install packages to a mounted guest filesystem. --- pacman-3.5.3_/scripts/makepkg.sh.in 2011-06-07 10:49:28.000000000 -0500 +++ pacman-3.5.3/scripts/makepkg.sh.in 2011-07-27 09:33:11.413361098 -0500 @@ -80,8 +80,6 @@ # when dealing with svn/cvs/etc PKGBUILDs. FORCE_VER="" -PACMAN_OPTS= - ### SUBROUTINES ### plain() { Cheers, Matthew Farkas-Dyck

3 4

[pacman-dev] [PATCH v2 2/2] Save backup files with extension .pacsave.n
by Pang Yan Han 03 Aug '11

03 Aug '11

Teach pacman to save backup files with extension .pacsave.n, where n is a positive integer. The current backup file shall be saved as <name>.pacsave, while existing .pacsave.n files will be renamed to <name>.pacsave.n+1 Example: 1. You have subversion installed in your local repo. /etc/conf.d/svnserve is a file to be backed up. It contains local modifications 2. You remove subversion from your repo. /etc/conf.d/svnserve is backed up as /etc/conf.d/svnserve.pacsave 2. You install subversion again 3. You edit /etc/conf.d/svnserve 4. You remove subversion. The existing /etc/conf.d/svnserve.pacsave is renamed to /etc/conf.d/svnserve.pacsave.1 and /etc/conf.d/svnserve is backed up as /etc/conf.d/svnserve.pacsave Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- lib/libalpm/remove.c | 75 ++++++++++++++++++++++++++++++++++++++++ test/pacman/tests/remove012.py | 20 +++++++++++ 2 files changed, 95 insertions(+), 0 deletions(-) create mode 100644 test/pacman/tests/remove012.py diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 83c437f..22c4e23 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -28,8 +28,11 @@ #include <errno.h> #include <string.h> #include <limits.h> +#include <dirent.h> +#include <regex.h> #include <unistd.h> #include <sys/stat.h> +#include <sys/types.h> /* libalpm */ #include "remove.h" @@ -218,6 +221,77 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, return 1; } +static void shift_pacsave(alpm_handle_t *handle, const char *file) +{ + DIR *dir = NULL; + struct dirent *ent; + struct stat st; + regex_t reg; + + const char *basename; + char *dirname; + char oldfile[PATH_MAX]; + char newfile[PATH_MAX]; + char regstr[PATH_MAX]; + + unsigned long log_max = 0; + size_t basename_len; + + dirname = _alpm_mdirname(file); + if (!dirname) { + return; + } + + basename = _alpm_mbasename(file); + basename_len = strlen(basename); + + snprintf(regstr, PATH_MAX, "^%s\\.pacsave\\.([[:digit:]]+)$", basename); + if (regcomp(&reg, regstr, REG_EXTENDED | REG_NEWLINE) != 0) { + goto cleanup; + } + + dir = opendir(dirname); + if (dir == NULL) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not open directory: %s: %s\n"), + dirname, strerror(errno)); + goto cleanup; + } + + while ((ent = readdir(dir)) != NULL) { + if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) { + continue; + } + + if (regexec(&reg, ent->d_name, 0, 0, 0) == 0) { + unsigned long cur_log; + cur_log = strtoul(ent->d_name + basename_len + strlen(".pacsave."), NULL, 10); + if (cur_log > log_max) { + log_max = cur_log; + } + } + } + + /* Shift pacsaves */ + unsigned long i; + for (i = log_max + 1; i > 1; i--) { + snprintf(oldfile, PATH_MAX, "%s.pacsave.%lu", file, i-1); + snprintf(newfile, PATH_MAX, "%s.pacsave.%lu", file, i); + rename(oldfile, newfile); + } + + snprintf(oldfile, PATH_MAX, "%s.pacsave", file); + if (stat(oldfile, &st) == 0) { + snprintf(newfile, PATH_MAX, "%s.1", oldfile); + rename(oldfile, newfile); + } + + regfree(&reg); + +cleanup: + free(dirname); + closedir(dir); +} + /* Helper function for iterating through a package's file and deleting them * Used by _alpm_remove_commit. */ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, @@ -298,6 +372,7 @@ static void unlink_file(alpm_handle_t *handle, alpm_pkg_t *info, FREE(filehash); if(cmp != 0) { char newpath[PATH_MAX]; + shift_pacsave(handle, file); snprintf(newpath, PATH_MAX, "%s.pacsave", file); rename(file, newpath); _alpm_log(handle, ALPM_LOG_WARNING, _("%s saved as %s\n"), file, newpath); diff --git a/test/pacman/tests/remove012.py b/test/pacman/tests/remove012.py new file mode 100644 index 0000000..4274487 --- /dev/null +++ b/test/pacman/tests/remove012.py @@ -0,0 +1,20 @@ +self.description = "Remove a package with a modified file marked for backup and has existing pacsaves" + +self.filesystem = ["etc/dummy.conf.pacsave", + "etc/dummy.conf.pacsave.1", + "etc/dummy.conf.pacsave.2"] + +p1 = pmpkg("dummy") +p1.files = ["etc/dummy.conf*"] +p1.backup = ["etc/dummy.conf"] +self.addpkg2db("local", p1) + +self.args = "-R %s" % p1.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=dummy") +self.addrule("!FILE_EXIST=etc/dummy.conf") +self.addrule("FILE_PACSAVE=etc/dummy.conf") +self.addrule("FILE_EXIST=etc/dummy.conf.pacsave.1") +self.addrule("FILE_EXIST=etc/dummy.conf.pacsave.2") +self.addrule("FILE_EXIST=etc/dummy.conf.pacsave.3") -- 1.7.6

1 0

[pacman-dev] [PATCH v2 1/2] libalpm: Introduce _alpm_mbasename and _alpm_mdirname
by Pang Yan Han 03 Aug '11

03 Aug '11

_alpm_mbasename and _alpm_mdirname are the same functions as mbasename and mdirname in src/pacman/util.c . Borrow them over to libalpm to prepare for the next patch which teaches pacman to save backup files with .pacsave.n extension. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- lib/libalpm/util.c | 42 ++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/util.h | 2 ++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 123cd24..413e406 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -175,6 +175,48 @@ cleanup: return ret; } +/** Parse the basename of a program from a path. +* @param path path to parse basename from +* +* @return everything following the final '/' +*/ +const char *_alpm_mbasename(const char *path) +{ + const char *last = strrchr(path, '/'); + if(last) { + return last + 1; + } + return path; +} + +/** Parse the dirname of a program from a path. +* The path returned should be freed. +* @param path path to parse dirname from +* +* @return everything preceding the final '/' +*/ +char *_alpm_mdirname(const char *path) +{ + char *ret, *last; + + /* null or empty path */ + if(path == NULL || path == '\0') { + return strdup("."); + } + + ret = strdup(path); + last = strrchr(ret, '/'); + + if(last != NULL) { + /* we found a '/', so terminate our string */ + *last = '\0'; + return ret; + } + /* no slash found */ + free(ret); + return strdup("."); +} + /* Trim whitespace and newlines from a string */ char *_alpm_strtrim(char *str) diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 9ee6370..febfef9 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -94,6 +94,8 @@ struct archive_read_buffer { int _alpm_makepath(const char *path); int _alpm_makepath_mode(const char *path, mode_t mode); int _alpm_copyfile(const char *src, const char *dest); +const char *_alpm_mbasename(const char *path); +char *_alpm_mdirname(const char *path); char *_alpm_strtrim(char *str); size_t _alpm_strip_newline(char *str); int _alpm_unpack_single(alpm_handle_t *handle, const char *archive, -- 1.7.6

1 0

[pacman-dev] [PATCH] contrib/paccache: misc cleanup and bugfix
by Dave Reisner 03 Aug '11

03 Aug '11

* add paccache to .gitignore * change error verbiage when run as root * delete sigs along with packages * fix bug in diskspace calculations Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This should cover Allan and Dan's concerns, as well as addressing a silly bug I found in counting diskspace saved. contrib/paccache.in | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/contrib/paccache.in b/contrib/paccache.in index 0bd0cf7..34ca06b 100755 --- a/contrib/paccache.in +++ b/contrib/paccache.in @@ -110,10 +110,11 @@ pkgfilter() { size_to_human() { awk -v size="$1" ' BEGIN { - suffix[1] = "KiB" - suffix[2] = "MiB" - suffix[3] = "GiB" - suffix[4] = "TiB" + suffix[1] = "B" + suffix[2] = "KiB" + suffix[3] = "MiB" + suffix[4] = "GiB" + suffix[5] = "TiB" count = 1 while (size > 1024) { @@ -142,7 +143,7 @@ runcmd() { } summarize() { - local -i filecount=$# + local -i filecount=$1; shift local seenarch= seen= arch= name= local -r pkg_re='(.+)-[^-]+-[0-9]+-([^.]+)\.pkg.*' @@ -204,7 +205,7 @@ EOF } if (( ! UID )); then - error "Bad dog, no biscuit. You will be prompted for privilege escalation." + error "Do not run this script as root. You will be prompted for privilege escalation." exit 42 fi @@ -277,8 +278,19 @@ if (( ! ${#candidates[*]} )); then exit 1 fi +# grab this prior to signature scavenging +pkgcount=${#candidates[*]} + +# copy the list, merging in any found sigs +for cand in "${candidates[@]}"; do + candtemp+=("$cand") + [[ -f $cand.sig ]] && candtemp+=("$cand.sig") +done +candidates=("${candtemp[@]}") +unset candtemp + # do this before we destroy anything -totalsaved=$(@SIZECMD@ "${candidates[@]}" | awk '{ sum = $1 } END { print sum }') +totalsaved=$(@SIZECMD@ "${candidates[@]}" | awk '{ sum += $1 } END { print sum }') # crush. kill. destroy. (( verbose )) && cmdopts+=(-v) @@ -288,4 +300,4 @@ elif (( move )); then runcmd mv "${cmdopts[@]}" "${candidates[@]}" "$movedir" fi -summarize "${candidates[@]}" +summarize "$pkgcount" "${candidates[@]}" -- 1.7.6

2 3

[pacman-dev] [PATCH] cachemoney: add new contrib script
by Dave Reisner 02 Aug '11

02 Aug '11

cachemoney is a robust and flexible package cache cleaner with a variety of options. Much credit goes to DJ Mills and Pat Brisbin for the ideas behind this script. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This sort of functionality has been in a few feature requests, and there exist a number of tools that already provide this, but none flexible enough (or portable enough) to be to my liking. This is all bash3 compat with awk, tested on gawk 3.1.8, gawk 4.0.0, bwk (the one true), mawk, and busybox awk (which fscking _sucks_) to do the heavy lifting (rather than bash4). It ends up being insanely fast, with the drawback being that its dependent on the format of the filename to find and consider packages for deletion. In other words, a valid package tarball that isn't compliant with the extglob *.pkg.tar?(.+([^.])) isn't going to be considered. I'm a fan of the name, but I'm also happy to hear alternatives. contrib/Makefile.am | 4 + contrib/cachemoney.in | 294 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 298 insertions(+), 0 deletions(-) create mode 100755 contrib/cachemoney.in diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 69304a4..301de41 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,5 +1,6 @@ OURSCRIPTS = \ bacman \ + cachemoney \ pacdiff \ paclist \ paclog-pkglist \ @@ -14,6 +15,7 @@ EXTRA_DIST = \ PKGBUILD.vim \ bacman.in \ bash_completion.in \ + cachemoney.in \ paclog-pkglist.in \ pacdiff.in \ paclist.in \ @@ -29,6 +31,7 @@ MOSTLYCLEANFILES = $(OURSCRIPTS) $(OURFILES) *.tmp edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e '1s|!/bin/bash|!$(BASH_SHELL)|g' $(OURSCRIPTS): Makefile @@ -50,6 +53,7 @@ all-am: $(OURSCRIPTS) $(OURFILES) bacman: $(srcdir)/bacman.in bash_completion: $(srcdir)/bash_completion.in +cachemoney: $(srcdir)/cachemoney.in pacdiff: $(srcdir)/pacdiff.in paclist: $(srcdir)/paclist.in paclog-pkglist: $(srcdir)/paclog-pkglist.in diff --git a/contrib/cachemoney.in b/contrib/cachemoney.in new file mode 100755 index 0000000..794ae45 --- /dev/null +++ b/contrib/cachemoney.in @@ -0,0 +1,294 @@ +#!/bin/bash +# +# cachemoney - clean yo pacman cache, dawg +# +# Copyright (C) 2011 Dave Reisner <dreisner(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + + +shopt -s extglob + +declare -a candidates=() cmdopts=() whitelist=() blacklist=() +declare -i delete=0 diskspace=0 dryrun=0 filecount=0 keep=3 move=0 totalsaved=0 +declare cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' movedir= scanarch= + +msg() { + local mesg=$1; shift + printf "==> $mesg\n" "$@" +} >&2 + +error() { + local mesg=$1; shift + printf "==> ERROR: $mesg\n" "$@" +} >&2 + +die() { + error "$@" + exit 1 +} + +# reads a list of files on stdin and prints out deletion candidates +pkgfilter() { + # there's whitelist and blacklist parameters passed to this + # script after the block of awk. + + awk -v keep="$1" -v scanarch="$2" ' + function parse_filename(filename, parts, count, i, pkgname, arch) { + + count = split(filename, parts, "-") + + i = 1 + pkgname = parts[i++] + while (i <= count - 3) { + pkgname = pkgname "-" parts[i++] + } + + arch = substr(parts[count], 1, index(parts[count], ".") - 1) + + # filter on whitelist or blacklist + if (wlen && !whitelist[pkgname]) return + if (blen && blacklist[pkgname]) return + + if ("" == packages[pkgname,arch]) { + packages[pkgname,arch] = filename + } else { + packages[pkgname,arch] = packages[pkgname,arch] SUBSEP filename + } + } + + BEGIN { + # create whitelist + wlen = ARGV[1]; delete ARGV[1] + for (i = 2; i < 2 + wlen; i++) { + whitelist[ARGV[i]] = 1 + delete ARGV[i] + } + + # create blacklist + blen = ARGV[i]; delete ARGV[i] + while (i++ < ARGC) { + blacklist[ARGV[i]] = 1 + delete ARGV[i] + } + + # read package filenames + while (getline < "/dev/stdin") { + parse_filename($0) + } + } + + END { + for (pkglist in packages) { + # idx[1,2] = idx[pkgname,arch] + split(pkglist, idx, SUBSEP) + + # enforce architecture match if specified + if (!scanarch || scanarch == idx[2]) { + count = split(packages[idx[1], idx[2]], pkgs, SUBSEP) + if (count > keep) { + for(i = 1; i <= count - keep; i++) { + print pkgs[i] + } + } + } + } + }' "${@:3}" +} + +size_to_human() { + awk -v size="$1" ' + BEGIN { + suffix[1] = "KiB" + suffix[2] = "MiB" + suffix[3] = "GiB" + suffix[4] = "TiB" + count = 1 + + while (size > 1024) { + size /= 1024 + count++ + } + + sizestr = sprintf("%.2f", size) + sub(/.?0+$/, "", sizestr) + printf("%s %s", sizestr, suffix[count]) + }' +} + +runcmd() { + if (( needsroot )); then + msg "Privilege escalation required" + if sudo -v &>/dev/null && sudo -l &>/dev/null; then + sudo "$@" + else + printf '%s ' 'root' + su -c "$(printf '%q ' "$@")" + fi + else + "$@" + fi +} + +summarize() { + local -i filecount=$# + local seenarch= seen= arch= name= + local -r pkg_re='(.+)-[^-]+-[0-9]+-([^.]+)\.pkg.*' + + if (( delete )); then + printf -v output 'finished: %d packages removed' "$filecount" + elif (( move )); then + printf -v output "finished: %d packages moved to \`%s'" "$filecount" "$movedir" + elif (( dryrun )); then + if (( verbose )); then + msg "Candidate packages:" + while read -r pkg; do + if (( verbose >= 3 )); then + [[ $pkg =~ $pkg_re ]] && name=${BASH_REMATCH[1]} arch=${BASH_REMATCH[2]} + if [[ -z $seen || $seenarch != $arch || $seen != $name ]]; then + printf '%s (%s):\n' "$name" "$arch" + fi + printf ' %s\n' "$pkg" + elif (( verbose >= 2 )); then + printf "$PWD/%s$delim" "$pkg" + else + printf "%s$delim" "$pkg" + fi + done < <(printf '%s\n' "$@" | sort -V) + printf '\n' >&2 + fi + + printf -v output 'finished dry run: %d candidates' "$filecount" + fi + + if (( diskspace )); then + output+=" (diskspace saved: $(size_to_human "$totalsaved"))" + fi + + msg "$output" +} +usage() { + cat <<EOF +usage: ${0##*/} <operation> [options] [targets...] + + Operations: + -d perform a dry run, only finding candidate packages. + -m <movedir> move candidate packages to 'movedir'. + -r remove candidate packages. + + Options: + -a <arch> scan for 'arch' (default: all architectures). + -c <cachedir> scan 'cachedir' for packages (default: @localstatedir@/cache/pacman/pkg). + -f apply force to mv(1) and rm(1) operations. + -h display this help message. + -i <pkgs> ignore 'pkgs', which is a comma separated. Alternatively, + specify '-' to read package names from stdin, newline delimited. + -k <num> keep 'num' of each package in 'cachedir' (default: 3). + -s show diskspace saved by the operation. + -u target uninstalled packages. + -v increase verbosity. specify up to 3 times. + -z use null delimiters for candidate names (only with -v and -vv) + +EOF +} + +if (( ! UID )); then + error "Bad dog, no biscuit. You will be prompted for privilege escalation." + exit 42 +fi + +while getopts ':a:c:dfhi:k:m:rsuvz' opt; do + case $opt in + a) scanarch=$OPTARG ;; + c) cachedir=$OPTARG ;; + d) dryrun=1 ;; + f) cmdopts=(-f) ;; + h) usage + exit 0 ;; + i) if [[ $OPTARG = '-' ]]; then + [[ ! -t 0 ]] && IFS=$'\n' read -r -d '' -a ign + else + IFS=',' read -r -a ign <<< "$OPTARG" + fi + blacklist+=("${ign[@]}") + unset i ign ;; + k) keep=$OPTARG + if [[ $keep != $OPTARG ]] || (( keep < 0 )); then + die 'argument to option -k must be a non-negative integer' + fi ;; + m) move=1 movedir=$OPTARG ;; + r) delete=1 ;; + s) diskspace=1 ;; + u) IFS=$'\n' read -r -d '' -a ign < <(pacman -Qq) + blacklist+=("${ign[@]}") + unset ign ;; + v) (( ++verbose )) ;; + z) delim='\0' ;; + :) die "option '--%s' requires an argument" "$OPTARG" ;; + ?) die "invalid option -- '%s'" "$OPTARG" ;; + esac +done +shift $(( OPTIND - 1 )) + +# remaining args are a whitelist +whitelist=("$@") + +# sanity checks +case $(( dryrun+delete+move )) in + 0) die "no operation specified (use -h for help)" ;; + [^1]) die "only one operation may be used at a time" ;; +esac + +[[ -d $cachedir ]] || + die "cachedir \`%s' does not exist or is not a directory" "$cachedir" + +[[ $movedir && ! -d $movedir ]] && + die "move-to directory \`%s' does not exist or is not a directory" "$movedir" + +if (( move || delete )); then + # make it an absolute path since we're about to chdir + [[ ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir + [[ ! -w $cachedir || ( $movedir && ! -w $movedir ) ]] && needsroot=1 +fi + +# unlikely that this will fail, but better make sure +cd "$cachedir" || die "failed to chdir to \`%s'" "$cachedir" + +# note that these results are returned in an arbitrary order from awk, but +# they'll be resorted (in summarize) iff we have a verbosity level set. +IFS=$'\n' read -r -d '' -a candidates < \ + <(printf '%s\n' *.pkg.tar?(.+([^.])) | sort -V | + pkgfilter "$keep" "$scanarch" \ + "${#whitelist[*]}" "${whitelist[@]}" \ + "${#blacklist[*]}" "${blacklist[@]}") + +if (( ! ${#candidates[*]} )); then + msg 'no candidate packages found for pruning' + exit 1 +fi + +# do this before we destroy anything +if (( diskspace )); then + totalsaved=$(@SIZECMD@ "${candidates[@]}" | awk '{ sum = $1 } END { print sum }') +fi + +# crush. kill. destroy. +(( verbose )) && cmdopts+=(-v) +if (( delete )); then + runcmd rm "${cmdopts[@]}" "${candidates[@]}" +elif (( move )); then + runcmd mv "${cmdopts[@]}" "${candidates[@]}" "$movedir" +fi + +summarize "${candidates[@]}" -- 1.7.6

4 8