- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] RFC: sample/rough implementation to verify detached sigs for pkg.tar.gz
by Dan McGee 04 Jun '08

04 Jun '08

This code will attempt to fire every time we call pkg_load in libalpm, which happens every time we open a package file (during sync, upgrades, and -Qp). It checks for the existence of either a .sig or .asc file, and if present, attempts to verify them using gpgv. Right now a keyring file is hardcoded to /tmp/pacman.keyring; add any keys here that are to be seen as 'valid'. This is rough, there isn't enough error checking or any way of automatically prompting to ask if a key should be considered valid, etc. We also use the lighter weight gpgv rather than the full blown gpg. I'm not the biggest fan of all this process spawning code we have using popen and friends, but I don't know of a lot of other ways around it besides implementing something like git has to spawn child processes. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.h | 1 + lib/libalpm/be_package.c | 102 +++++++++++++++++++++++++++++++++++++++++----- lib/libalpm/error.c | 2 + lib/libalpm/package.c | 2 +- src/pacman/query.c | 4 +- 5 files changed, 98 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 62a517b..30f9a97 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -503,6 +503,7 @@ enum _pmerrno_t { /* Packages */ PM_ERR_PKG_NOT_FOUND, PM_ERR_PKG_INVALID, + PM_ERR_PKG_BAD_SIG, PM_ERR_PKG_OPEN, PM_ERR_PKG_LOAD, PM_ERR_PKG_CANT_FRESH, diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 85112fd..6eb597c 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -19,12 +19,15 @@ #include "config.h" +#include <sys/types.h> +#include <sys/wait.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <limits.h> #include <ctype.h> #include <locale.h> /* setlocale */ +#include <errno.h> /* libarchive */ #include <archive.h> @@ -122,6 +125,74 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) return(0); } +const char *keyring = "/tmp/pacman.keyring"; + +/** + * Check for the existence of a PGP signature file and verify it if it is + * found. Either a .sig or .asc file can be checked and verified. + * pm_errno is set to PM_ERR_PKG_BAD_SIG in addition to returning 1 if a + * signature is invalid. + * @param pkgfile path to the package file + * @return -1 if no signature, 0 on success, 1 on verification failure + */ +static int check_pgp(const char *pkgfile) +{ + char *pgpfile; + struct stat pgpst; + pid_t pid; + int ret = 0; + + /* check for a PGP .sig or .asc file */ + MALLOC(pgpfile, strlen(pkgfile) + 5, RET_ERR(PM_ERR_MEMORY, 1)); + sprintf(pgpfile, "%s.sig", pkgfile); + if(stat(pgpfile, &pgpst) != 0) { + sprintf(pgpfile, "%s.asc", pkgfile); + if(stat(pgpfile, &pgpst) != 0) { + /* we had neither a .sig or .asc file present */ + FREE(pgpfile); + return(-1); + } + } + + /* we found a signature, verify it */ + /* fork and execute */ + pid = fork(); + if(pid == -1) { + /* fork failure code */ + _alpm_log(PM_LOG_ERROR, _("could not fork a new process (%s)\n"), + strerror(errno)); + ret = 1; + } else if(pid == 0) { + /* child process code */ + int retval; + /* hide all output */ + freopen("/dev/null", "w", stdout); + freopen("/dev/null", "w", stderr); + retval = execlp("gpgv", "", "--keyring", keyring, + pgpfile, (char *)NULL); + exit(retval); + } else { + /* parent process code */ + pid_t retpid; + int status; + retpid = waitpid(pid, &status, 0); + if(retpid == -1) { + _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), + strerror(errno)); + ret = 1; + } else { + /* check the return status, make sure it is 0 (success) */ + if(WIFEXITED(status) && WEXITSTATUS(status) != 0) { + pm_errno = PM_ERR_PKG_BAD_SIG; + ret = 1; + } + } + } + + FREE(pgpfile); + return(ret); +} + /** * Load a package and create the corresponding pmpkg_t struct. * @param pkgfile path to the package file @@ -131,7 +202,7 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) */ static pmpkg_t *pkg_load(const char *pkgfile, unsigned short full) { - int ret = ARCHIVE_OK; + int ret; int config = 0; struct archive *archive; struct archive_entry *entry; @@ -144,6 +215,25 @@ static pmpkg_t *pkg_load(const char *pkgfile, unsigned short full) RET_ERR(PM_ERR_WRONG_ARGS, NULL); } + /* attempt to stat the file, ensure it exists */ + if(stat(pkgfile, &st) == 0) { + + newpkg = _alpm_pkg_new(); + if(newpkg == NULL) { + RET_ERR(PM_ERR_MEMORY, NULL); + } + newpkg->size = st.st_size; + + ret = check_pgp(pkgfile); + if(ret == 1) { + /* failed verification */ + RET_ERR(PM_ERR_PKG_BAD_SIG, NULL); + } + } else { + /* couldn't stat the pkgfile, return an error */ + RET_ERR(PM_ERR_PKG_OPEN, NULL); + } + if((archive = archive_read_new()) == NULL) { RET_ERR(PM_ERR_LIBARCHIVE, NULL); } @@ -156,16 +246,6 @@ static pmpkg_t *pkg_load(const char *pkgfile, unsigned short full) RET_ERR(PM_ERR_PKG_OPEN, NULL); } - newpkg = _alpm_pkg_new(); - if(newpkg == NULL) { - archive_read_finish(archive); - RET_ERR(PM_ERR_MEMORY, NULL); - } - - if(stat(pkgfile, &st) == 0) { - newpkg->size = st.st_size; - } - /* If full is false, only read through the archive until we find our needed * metadata. If it is true, read through the entire archive, which serves * as a verfication of integrity and allows us to create the filelist. */ diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 05caf8e..884b0b6 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -111,6 +111,8 @@ const char SYMEXPORT *alpm_strerror(int err) return _("could not find or read package"); case PM_ERR_PKG_INVALID: return _("invalid or corrupted package"); + case PM_ERR_PKG_BAD_SIG: + return _("invalid PGP signature"); case PM_ERR_PKG_OPEN: return _("cannot open package file"); case PM_ERR_PKG_LOAD: diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 685a411..0af43c3 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -895,7 +895,7 @@ pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle) return(info); } } - return(NULL); + RET_ERR(PM_ERR_PKG_NOT_FOUND, NULL); } /** Test if a package should be ignored. diff --git a/src/pacman/query.c b/src/pacman/query.c index 74d3ff2..52e66d9 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -416,7 +416,9 @@ int pacman_query(alpm_list_t *targets) } if(pkg == NULL) { - pm_fprintf(stderr, PM_LOG_ERROR, _("package \"%s\" not found\n"), strname); + pm_fprintf(stderr, PM_LOG_ERROR, + _("could not query package \"%s\" (%s)\n"), + strname, alpm_strerrorlast()); ret++; continue; } -- 1.5.5.3

1 0

[pacman-dev] Signing by default (was: [PATCH] Add Keyring/--keyring option in alpm/pacman)
by Dan McGee 03 Jun '08

03 Jun '08

On Tue, Jun 3, 2008 at 1:59 AM, Pierre Schmitz <pierre(a)archlinux.de> wrote: > Am Dienstag 03 Juni 2008 01:46:11 schrieb Geoffroy Carrier: >> We have to think about the default interaction. >> It would be easy to sign all packages as the first step, so excepting >> signed packages for the first pacman release including GPG support seems >> fair to me. I think asking confirmation from the user in case packages >> are not signed, like apt tools do. > > First: great work and thanks for starting the gpg-signing in pacman. Imho we > should force devs to sign packages by default. Because the whole thing will > become useless if only one single package in our repos is not signed. Keep in mind that this is 1. An Arch decision, not a pacman decision 2. A policy decision, not something that should be enforced by pacman code Enforcing this at the Arch-specific dbscripts level would be OK, but I don't think it is wise to force makepkg/pacman to sign all packages, especially those that are built for local use only. Some people don't have PGP keys so this would be a pain in the ass. -Dan

2 2

[pacman-dev] [PATCH] makepkg: add --allsource option
by Dan McGee 02 Jun '08

02 Jun '08

This supplements the --source option and does nearly the same thing, except downloaded source files are included in the archive as well. This is mainly an RFC patch and interested parties are encouraged to comment. I was also planning on making a patch for adding the package/ prefix to the archived files, but apparently no archive program makes this easy to do with is just plain stupid. If someone knows how without creating a temporary dir and moving files there, let me know. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 27da281..2c479fd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -856,6 +856,15 @@ create_package() { create_srcpackage() { cd "$startdir" + if [ "$SOURCEONLY" = "2" ]; then + # get back to our src directory so we can begin with sources + mkdir -p "$srcdir" + cd "$srcdir" + download_sources + # we can only check checksums if we have all files + check_checksums + cd "$startdir" + fi msg "$(gettext "Creating source package...")" local comp_files="$BUILDSCRIPT" msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT" @@ -874,11 +883,15 @@ create_srcpackage() { comp_files="$comp_files ChangeLog" fi - local i - for i in ${source[@]}; do - if [ -f $i ]; then - msg2 "$(gettext "Adding %s...")" "$i" - comp_files="$comp_files $i" + local netfile + for netfile in ${source[@]}; do + local file=$(strip_url "$netfile") + if [ -f $netfile ]; then + msg2 "$(gettext "Adding %s...")" "$netfile" + comp_files="$comp_files $netfile" + elif [ "$SOURCEONLY" = "2" -a -f "$srcdir/$file" ]; then + msg2 "$(gettext "Adding %s...")" "$file" + comp_files="$comp_files -C $srcdir $file" fi done @@ -1061,8 +1074,10 @@ SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined # Parse Command Line Options. OPT_SHORT="AbcCdefFghiLmop:rRsSV" -OPT_LONG="ignorearch,asroot,builddeps,clean,cleancache,nodeps,noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source,syncdeps,usesudo,version" +OPT_LONG="allsource,asroot,ignorearch,builddeps,clean,cleancache,nodeps" +OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver" +OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source" +OPT_LONG="$OPT_LONG,syncdeps,usesudo,version" # Pacman Options OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" OPT_TEMP="$(getopt -o "$OPT_SHORT" -l "$OPT_LONG" -n "$(basename "$0")" -- "$@" || echo 'GETOPT GO BANG!')" @@ -1080,6 +1095,7 @@ while true; do --noprogressbar) PACMAN_OPTS="$PACMAN_OPTS --noprogressbar" ;; # Makepkg Options + --allsource) SOURCEONLY=2 ;; --asroot) ASROOT=1 ;; -A|--ignorearch) IGNOREARCH=1 ;; -c|--clean) CLEANUP=1 ;; @@ -1316,7 +1332,7 @@ if [ $EUID -eq 0 ]; then fi # if we are creating a source-only package, go no further -if [ "$SOURCEONLY" = "1" ]; then +if [ "$SOURCEONLY" != "0" ]; then if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}${SRCEXT}" \ -a "$FORCE" = "0" ]; then error "$(gettext "A package has already been built. (use -f to overwrite)")" -- 1.5.5.3

6 15

[pacman-dev] [PATCH] Don't display filename on -Qip operation.
by Xavier 02 Jun '08

02 Jun '08

>From cafa4977a0639ebb30ed20974ad86bf404ca5044 Mon Sep 17 00:00:00 2001 From: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed, 28 May 2008 23:25:40 +0200 Subject: [PATCH] Don't display filename on -Qip operation. Some previous commits apparently broke the get_filename function for package loaded with pkg_load (on a -Qip operation), so this field is always empty now. It would be easy to fill the pkg->filename field in pkg_load, but what is the point? The -Qip operation needs to be run like this : -Qip <filename>, so the filename is already known. There is no need to display it again. Besides, on a normal -Qi operation, the filename is not displayed either because this information is not stored in the local database. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- src/pacman/package.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 21213c4..1698806 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -90,9 +90,6 @@ void dump_pkg_full(pmpkg_t *pkg, int level) } /* actual output */ - if(level == 0) { - string_display(_("Filename :"), alpm_pkg_get_filename(pkg)); - } string_display(_("Name :"), alpm_pkg_get_name(pkg)); string_display(_("Version :"), alpm_pkg_get_version(pkg)); string_display(_("URL :"), alpm_pkg_get_url(pkg)); -- 1.5.5.1

4 6

[pacman-dev] [PATCH] src/pacman/sync.c : cleanup of pacman_sync
by Xavier 02 Jun '08

02 Jun '08

>From 4cc1e73f8fcc5920fd2880b8d6fcb8ce6f9841cb Mon Sep 17 00:00:00 2001 From: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed, 28 May 2008 22:55:03 +0200 Subject: [PATCH] src/pacman/sync.c : cleanup of pacman_sync By putting the search / group / info / list operations just after the -Sy op, we can simplify several checks : 1) the check for "missing targets". Since we took care of the above operations, we now have less cases to consider : * -Sy : we can end now (this is actually a bugfix) * -Su : we can proceed * -S : this op requires targets, so exit with an error 2) the check to see if a transaction is needed. If we arrive at the end of the function, it is either because we have -Su or -S <targets> so we already know a transaction is needed there. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- src/pacman/sync.c | 76 +++++++++++++++++++++++++--------------------------- 1 files changed, 37 insertions(+), 39 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 134d4db..7fb8649 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -794,15 +794,6 @@ int pacman_sync(alpm_list_t *targets) return(1); } - if(targets == NULL && !(config->op_s_sync || config->op_s_upgrade - || config->op_s_search || config->group - || config->op_s_info || config->op_q_list)) { - /* don't proceed here unless we have an operation that doesn't require - * a target list */ - pm_printf(PM_LOG_ERROR, _("no targets specified (use -h for help)\n")); - return(1); - } - if(config->op_s_sync) { /* grab a fresh package list */ printf(_(":: Synchronizing package databases...\n")); @@ -810,35 +801,6 @@ int pacman_sync(alpm_list_t *targets) if(!sync_synctree(config->op_s_sync, sync_dbs)) { return(1); } - config->op_s_sync = 0; - } - - if(needs_transaction()) { - alpm_list_t *targs = alpm_list_strdup(targets); - if(!(config->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) { - /* check for newer versions of packages to be upgraded first */ - alpm_list_t *packages = syncfirst(); - if(packages) { - printf(_(":: The following packages should be upgraded first :\n")); - list_display(" ", packages); - if(yesno(1, _(":: Do you want to cancel the current operation\n" - ":: and upgrade these packages now?"))) { - FREELIST(targs); - targs = packages; - config->flags = 0; - config->op_s_upgrade = 0; - } else { - FREELIST(packages); - } - printf("\n"); - } - } - - int ret = sync_trans(targs); - FREELIST(targs); - if(ret == 1) { - return(1); - } } /* search for a package */ @@ -861,7 +823,43 @@ int pacman_sync(alpm_list_t *targets) return(sync_list(sync_dbs, targets)); } - return(0); + if(targets == NULL) { + if(config->op_s_sync) { + return(0); + } else if(config->op_s_upgrade) { + /* proceed */ + } else { + /* don't proceed here unless we have an operation that doesn't require a + * target list */ + pm_printf(PM_LOG_ERROR, _("no targets specified (use -h for help)\n")); + return(1); + } + } + + alpm_list_t *targs = alpm_list_strdup(targets); + if(!(config->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) { + /* check for newer versions of packages to be upgraded first */ + alpm_list_t *packages = syncfirst(); + if(packages) { + printf(_(":: The following packages should be upgraded first :\n")); + list_display(" ", packages); + if(yesno(1, _(":: Do you want to cancel the current operation\n" + ":: and upgrade these packages now?"))) { + FREELIST(targs); + targs = packages; + config->flags = 0; + config->op_s_upgrade = 0; + } else { + FREELIST(packages); + } + printf("\n"); + } + } + + int ret = sync_trans(targs); + FREELIST(targs); + + return(ret); } /* vim: set ts=2 sw=2 noet: */ -- 1.5.5.1

2 3

[pacman-dev] makepkg portability (was:10530: checksum verification does not work on BSD)
by Dan McGee 02 Jun '08

02 Jun '08

*PLEASE* edit the subject when you drift to another topic. Yes, portability is NOT the original topic of this thread; checksum verification on BSD systems is the original topic which is quite a bit narrower in scope. On Mon, Jun 2, 2008 at 6:54 AM, Antonio Huete Jimenez <ahuete.devel(a)gmail.com> wrote: > > > 2008/6/2 Allan McRae <mcrae_allan(a)hotmail.com>: >> >> Antonio Huete Jimenez wrote: >> > >> > And there comes the idea I was talking about. I think that scripts >> > should behave according to the operating from where they are running >> > on. I'm doing some changes to scripts for doing so, but it will take >> > me few days to have something useable. >> > I also think that every portable code should be welcome whenever it >> > doesn't break anything in ArchLinux and made scripts runnable on other >> > OSes. >> > >> > What do you guys think? >> >> Using openssl for this is optimal because it works the same on all >> systems. Having code which detects operating system and uses specific >> software in each case is ugly and should be avoided if at all possible. >> > And how do you plan to do OS specific checks and/or configurations for > portability? The whole point is avoiding situations when we do need OS-specific checks and configurations. Take a look at the pacman and libalpm code- you will notice no checks for definitions of things like LINUX, BSD, DARWIN, CYGWIN (well one of these, but its documented and explained), etc. Portability means "runs everywhere", not "has a case in a switch statement for each platform". -Dan

1 0

[pacman-dev] [PATCH] Get rid of double / in database paths.
by Xavier 02 Jun '08

02 Jun '08

>From c69a3efc4d6e08ea967a936afc8f9622e1e6b268 Mon Sep 17 00:00:00 2001 From: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri, 30 May 2008 08:52:27 +0200 Subject: [PATCH] Get rid of double / in database paths. Errors like the following one happen regularly (for unknown reasons...) : error: could not open file /var/lib/pacman/local//glibc-2.7-9/depends: No such file or directory Anyway, every time an user reported an error like that, it always seemed like he thought the error was caused by the double /, which is obviously wrong. Since db->path always include a trailing /, there is no need to add one when concatenating paths in be_files.c or add.c. Additionally, some static strings were switched to dynamic. And the computation of the "dbpath"/"pkgname"-"pkgversion" was refactored in db_read, db_write and db_remove with a get_pkgpath static function. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- lib/libalpm/add.c | 4 +- lib/libalpm/be_files.c | 98 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 68 insertions(+), 34 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index c5454ba..3d53a1c 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -287,12 +287,12 @@ static int extract_single_file(struct archive *archive, if(strcmp(entryname, ".INSTALL") == 0) { /* the install script goes inside the db */ - snprintf(filename, PATH_MAX, "%s/%s-%s/install", db->path, + snprintf(filename, PATH_MAX, "%s%s-%s/install", db->path, newpkg->name, newpkg->version); archive_entry_set_mode(entry, 0644); } else if(strcmp(entryname, ".CHANGELOG") == 0) { /* the changelog goes inside the db */ - snprintf(filename, PATH_MAX, "%s/%s-%s/changelog", db->path, + snprintf(filename, PATH_MAX, "%s%s-%s/changelog", db->path, newpkg->name, newpkg->version); archive_entry_set_mode(entry, 0644); } else if(*entryname == '.') { diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 2302374..6eebab7 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -56,6 +56,7 @@ time_t getlastupdate(const pmdb_t *db) FILE *fp; char *file; time_t ret = 0; + int len = 0; ALPM_LOG_FUNC; @@ -64,8 +65,9 @@ time_t getlastupdate(const pmdb_t *db) } /* db->path + '.lastupdate' + NULL */ - MALLOC(file, strlen(db->path) + 12, RET_ERR(PM_ERR_MEMORY, ret)); - sprintf(file, "%s.lastupdate", db->path); + len = strlen(db->path) + 12; + CALLOC(file, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, ret)); + snprintf(file, len, "%s.lastupdate", db->path); /* get the last update time, if it's there */ if((fp = fopen(file, "r")) == NULL) { @@ -90,6 +92,7 @@ int setlastupdate(const pmdb_t *db, time_t time) FILE *fp; char *file; int ret = 0; + int len = 0; ALPM_LOG_FUNC; @@ -98,8 +101,9 @@ int setlastupdate(const pmdb_t *db, time_t time) } /* db->path + '.lastupdate' + NULL */ - MALLOC(file, strlen(db->path) + 12, RET_ERR(PM_ERR_MEMORY, ret)); - sprintf(file, "%s.lastupdate", db->path); + len = strlen(db->path) + 12; + CALLOC(file, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, ret)); + snprintf(file, len, "%s.lastupdate", db->path); if((fp = fopen(file, "w")) == NULL) { free(file); @@ -123,9 +127,11 @@ int setlastupdate(const pmdb_t *db, time_t time) int SYMEXPORT alpm_db_update(int force, pmdb_t *db) { alpm_list_t *lp; - char path[PATH_MAX]; + char *dbfile, *dbfilepath; time_t newmtime = 0, lastupdate = 0; const char *dbpath; + int len; + int ret; ALPM_LOG_FUNC; @@ -154,11 +160,15 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) } } - snprintf(path, PATH_MAX, "%s" DBEXT, db->treename); + len = strlen(db->treename) + strlen(DBEXT) + 1; + CALLOC(dbfile, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, -1)); + snprintf(dbfile, len, "%s" DBEXT, db->treename); + dbpath = alpm_option_get_dbpath(); - ret = _alpm_download_single_file(path, db->servers, dbpath, + ret = _alpm_download_single_file(dbfile, db->servers, dbpath, lastupdate, &newmtime); + free(dbfile); if(ret == 1) { /* mtimes match, do nothing */ @@ -169,9 +179,6 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) _alpm_log(PM_LOG_DEBUG, "failed to sync db: %s\n", alpm_strerrorlast()); return(-1); } else { - /* form the path to the db location */ - snprintf(path, PATH_MAX, "%s%s" DBEXT, dbpath, db->treename); - /* remove the old dir */ _alpm_log(PM_LOG_DEBUG, "flushing database %s\n", db->path); for(lp = _alpm_db_get_pkgcache(db); lp; lp = lp->next) { @@ -186,11 +193,19 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) /* Cache needs to be rebuilt */ _alpm_db_free_pkgcache(db); + /* form the path to the db location */ + len = strlen(dbpath) + strlen(db->treename) + strlen(DBEXT) + 1; + CALLOC(dbfilepath, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, -1)); + snprintf(dbfilepath, len, "%s%s" DBEXT, dbpath, db->treename); + /* uncompress the sync database */ - if(_alpm_unpack(path, db->path, NULL)) { + ret = _alpm_unpack(dbfilepath, db->path, NULL); + if(ret) { + free(dbfilepath); RET_ERR(PM_ERR_SYSTEM, -1); } - unlink(path); + unlink(dbfilepath); + free(dbfilepath); /* if we have a new mtime, set the DB last update value */ if(newmtime) { @@ -293,7 +308,7 @@ int _alpm_db_populate(pmdb_t *db) continue; } /* stat the entry, make sure it's a directory */ - snprintf(path, PATH_MAX, "%s/%s", db->path, name); + snprintf(path, PATH_MAX, "%s%s", db->path, name); if(stat(path, &sbuf) != 0 || !S_ISDIR(sbuf.st_mode)) { continue; } @@ -329,12 +344,24 @@ int _alpm_db_populate(pmdb_t *db) return(count); } + +static char *get_pkgpath(pmdb_t *db, pmpkg_t *info) +{ + int len; + char *pkgpath; + len = strlen(db->path) + strlen(info->name) + strlen(info->version) + 3; + CALLOC(pkgpath, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, NULL)); + snprintf(pkgpath, len, "%s%s-%s/", db->path, info->name, info->version); + return(pkgpath); +} + int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) { FILE *fp = NULL; struct stat buf; char path[PATH_MAX]; char line[513]; + char *pkgpath = NULL; ALPM_LOG_FUNC; @@ -367,17 +394,19 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) /* clear out 'line', to be certain - and to make valgrind happy */ memset(line, 0, 513); - snprintf(path, PATH_MAX, "%s/%s-%s", db->path, info->name, info->version); - if(stat(path, &buf)) { + pkgpath = get_pkgpath(db, info); + + if(stat(pkgpath, &buf)) { /* directory doesn't exist or can't be opened */ _alpm_log(PM_LOG_DEBUG, "cannot find '%s-%s' in db '%s'\n", info->name, info->version, db->treename); + free(pkgpath); return(-1); } /* DESC */ if(inforeq & INFRQ_DESC) { - snprintf(path, PATH_MAX, "%s/%s-%s/desc", db->path, info->name, info->version); + snprintf(path, PATH_MAX, "%sdesc", pkgpath); if((fp = fopen(path, "r")) == NULL) { _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; @@ -521,7 +550,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) /* FILES */ if(inforeq & INFRQ_FILES) { - snprintf(path, PATH_MAX, "%s/%s-%s/files", db->path, info->name, info->version); + snprintf(path, PATH_MAX, "%sfiles", pkgpath); if((fp = fopen(path, "r")) == NULL) { _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; @@ -548,7 +577,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) /* DEPENDS */ if(inforeq & INFRQ_DEPENDS) { - snprintf(path, PATH_MAX, "%s/%s-%s/depends", db->path, info->name, info->version); + snprintf(path, PATH_MAX, "%sdepends", pkgpath); if((fp = fopen(path, "r")) == NULL) { _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; @@ -587,8 +616,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) /* DELTAS */ if(inforeq & INFRQ_DELTAS) { - snprintf(path, PATH_MAX, "%s/%s-%s/deltas", db->path, - info->name, info->version); + snprintf(path, PATH_MAX, "%sdeltas", pkgpath); if((fp = fopen(path, "r"))) { while(!feof(fp)) { fgets(line, 255, fp); @@ -606,7 +634,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) /* INSTALL */ if(inforeq & INFRQ_SCRIPTLET) { - snprintf(path, PATH_MAX, "%s/%s-%s/install", db->path, info->name, info->version); + snprintf(path, PATH_MAX, "%sinstall", pkgpath); if(!stat(path, &buf)) { info->scriptlet = 1; } @@ -632,6 +660,7 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) alpm_list_t *lp = NULL; int retval = 0; int local = 0; + char *pkgpath = NULL; ALPM_LOG_FUNC; @@ -639,9 +668,10 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) return(-1); } - snprintf(path, PATH_MAX, "%s/%s-%s", db->path, info->name, info->version); + pkgpath = get_pkgpath(db, info); + oldmask = umask(0000); - mkdir(path, 0755); + mkdir(pkgpath, 0755); /* make sure we have a sane umask */ umask(0022); @@ -653,7 +683,7 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) if(inforeq & INFRQ_DESC) { _alpm_log(PM_LOG_DEBUG, "writing %s-%s DESC information back to db\n", info->name, info->version); - snprintf(path, PATH_MAX, "%s/%s-%s/desc", db->path, info->name, info->version); + snprintf(path, PATH_MAX, "%sdesc", pkgpath); if((fp = fopen(path, "w")) == NULL) { _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); retval = -1; @@ -741,7 +771,7 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) if(local && (inforeq & INFRQ_FILES)) { _alpm_log(PM_LOG_DEBUG, "writing %s-%s FILES information back to db\n", info->name, info->version); - snprintf(path, PATH_MAX, "%s/%s-%s/files", db->path, info->name, info->version); + snprintf(path, PATH_MAX, "%sfiles", pkgpath); if((fp = fopen(path, "w")) == NULL) { _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); retval = -1; @@ -769,7 +799,7 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) if(inforeq & INFRQ_DEPENDS) { _alpm_log(PM_LOG_DEBUG, "writing %s-%s DEPENDS information back to db\n", info->name, info->version); - snprintf(path, PATH_MAX, "%s/%s-%s/depends", db->path, info->name, info->version); + snprintf(path, PATH_MAX, "%sdepends", pkgpath); if((fp = fopen(path, "w")) == NULL) { _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); retval = -1; @@ -814,6 +844,7 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) cleanup: umask(oldmask); + free(pkgpath); if(fp) { fclose(fp); @@ -824,7 +855,8 @@ cleanup: int _alpm_db_remove(pmdb_t *db, pmpkg_t *info) { - char path[PATH_MAX]; + int ret = 0; + char *pkgpath = NULL; ALPM_LOG_FUNC; @@ -832,12 +864,14 @@ int _alpm_db_remove(pmdb_t *db, pmpkg_t *info) RET_ERR(PM_ERR_DB_NULL, -1); } - snprintf(path, PATH_MAX, "%s%s-%s", db->path, info->name, info->version); - if(_alpm_rmrf(path) == -1) { - return(-1); - } + pkgpath = get_pkgpath(db, info); - return(0); + ret = _alpm_rmrf(pkgpath); + free(pkgpath); + if(ret != 0) { + ret = -1; + } + return(ret); } /* vim: set ts=2 sw=2 noet: */ -- 1.5.5.1

2 1

[pacman-dev] [PATCH] Cleanup of _alpm_pkg_compare_versions.
by Xavier 02 Jun '08

02 Jun '08

>From d8d35bb85e5f3eb89a1f68e528e25cafe2719790 Mon Sep 17 00:00:00 2001 From: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat, 31 May 2008 15:06:30 +0200 Subject: [PATCH] Cleanup of _alpm_pkg_compare_versions. * Change the return values to be more informative. It was previously boolean, only indicating if the sync pkg was newer than local pkg or not. Now it is a cmp function : -1 if sync pkg is older, 0 if same version, 1 if newer. * Add a new alpm_pkg_has_force function to access the pkg->force field like any other package fields. * Remove the not so useful and confusing "skipping" and "reinstalling" messages, which were also cluttering the -Sp and -Sw output. * Clarify the description of the --needed option. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- doc/pacman.8.txt | 2 +- lib/libalpm/alpm.h | 1 + lib/libalpm/package.c | 25 ++++++++++++++++--------- lib/libalpm/sync.c | 19 ++++++------------- src/pacman/pacman.c | 2 +- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index a6bc3d9..ccdabe6 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -291,7 +291,7 @@ linkman:pacman.conf[5]. to date. *\--needed*:: - Only install the targets that are not already installed and up-to-date. + Don't reinstall the targets that are already up-to-date. *\--ignore* <'package'>:: Directs pacman to ignore upgrades of package even if there is one diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 62a517b..9c08033 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -220,6 +220,7 @@ size_t alpm_pkg_changelog_read(void *ptr, size_t size, /*int alpm_pkg_changelog_feof(const pmpkg_t *pkg, void *fp);*/ int alpm_pkg_changelog_close(const pmpkg_t *pkg, void *fp); unsigned short alpm_pkg_has_scriptlet(pmpkg_t *pkg); +unsigned short alpm_pkg_has_force(pmpkg_t *pkg); unsigned long alpm_pkg_download_size(pmpkg_t *newpkg); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 07b5fa3..4d6da01 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -295,6 +295,20 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_groups(pmpkg_t *pkg) return pkg->groups; } +unsigned short SYMEXPORT alpm_pkg_has_force(pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + /* Sanity checks */ + ASSERT(handle != NULL, return(-1)); + ASSERT(pkg != NULL, return(-1)); + + if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { + _alpm_db_read(pkg->origin_data.db, pkg, INFRQ_DESC); + } + return pkg->force; +} + alpm_list_t SYMEXPORT *alpm_pkg_get_depends(pmpkg_t *pkg) { ALPM_LOG_FUNC; @@ -817,22 +831,16 @@ void _alpm_pkg_free(pmpkg_t *pkg) FREE(pkg); } -/* Is pkgB an upgrade for pkgA ? */ +/* Compare the versions of two packages, handling the force flag */ int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg) { int cmp = 0; ALPM_LOG_FUNC; - if(pkg->origin == PKG_FROM_CACHE) { - /* ensure we have the /desc file, which contains the 'force' option */ - _alpm_db_read(pkg->origin_data.db, pkg, INFRQ_DESC); - } - - /* compare versions and see if we need to upgrade */ cmp = alpm_pkg_vercmp(alpm_pkg_get_version(pkg), alpm_pkg_get_version(local_pkg)); - if(cmp != 0 && pkg->force) { + if(cmp < 0 && alpm_pkg_has_force(pkg)) { cmp = 1; _alpm_log(PM_LOG_WARNING, _("%s: forcing upgrade to version %s\n"), alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); @@ -842,7 +850,6 @@ int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg) _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"), alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg), alpm_db_get_name(db), alpm_pkg_get_version(pkg)); - cmp = 0; } return(cmp); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 0d6a6ee..d44f445 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -179,7 +179,7 @@ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync) } /* compare versions and see if spkg is an upgrade */ - if(_alpm_pkg_compare_versions(pkg, spkg)) { + if(_alpm_pkg_compare_versions(pkg, spkg) > 0) { _alpm_log(PM_LOG_DEBUG, "new version of '%s' found (%s => %s)\n", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg), alpm_pkg_get_version(spkg)); @@ -322,6 +322,7 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } + /* this is especially useful when installing a group */ if(_alpm_pkg_should_ignore(spkg)) { int resp; QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, spkg, NULL, NULL, &resp); @@ -332,18 +333,10 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy local = _alpm_db_get_pkgfromcache(db_local, alpm_pkg_get_name(spkg)); if(local) { - if(_alpm_pkg_compare_versions(local, spkg) == 0) { - /* spkg is NOT an upgrade */ - if(trans->flags & PM_TRANS_FLAG_NEEDED) { - _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"), - alpm_pkg_get_name(local), alpm_pkg_get_version(local)); - return(0); - } else { - if(!(trans->flags & PM_TRANS_FLAG_DOWNLOADONLY)) { - _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"), - alpm_pkg_get_name(local), alpm_pkg_get_version(local)); - } - } + int cmp = _alpm_pkg_compare_versions(local, spkg); + if(cmp == 0 && trans->flags & PM_TRANS_FLAG_NEEDED) { + /* with the NEEDED flag, packages up to date are not reinstalled */ + return(0); } } diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 66fafa1..8e8f058 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -123,7 +123,7 @@ static void usage(int op, const char * const myname) printf(_(" -u, --sysupgrade upgrade all packages that are out of date\n")); printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); printf(_(" -y, --refresh download fresh package databases from the server\n")); - printf(_(" --needed only upgrade outdated or not yet installed packages\n")); + printf(_(" --needed don't reinstall up to date packages\n")); printf(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); printf(_(" --ignoregroup <grp>\n" " ignore a group upgrade (can be used more than once)\n")); -- 1.5.5.1

1 0

[pacman-dev] bacman
by carlocci 02 Jun '08

02 Jun '08

Hello, as I wanted to learn a little about general shell scripting, with the great help of shining and Allan I wrote this script which rebuilds a package using the meta data in the pacman database and actual system files. Forum discussion: http://bbs.archlinux.org/viewtopic.php?id=49168 Script: http://pastebin.com/m3f763692 Thanks for your time, Carlo "carlocci" Bersani PS: Here's the patch for the autocompletition --- pacman 2008-05-29 23:49:22.000000000 +0200 +++ pacman.new 2008-05-29 23:48:58.000000000 +0200 @@ -361,3 +361,13 @@ } complete -o filenames -F _pacman pacman +## bacman completition + +_bacman () +{ + cur=${COMP_WORDS[COMP_CWORD]} + _installed_pkgs +} + +complete -o filenames -F _bacman bacman +

8 16

[pacman-dev] [PATCH] Don't bother if a package has already been built when using the --nobuild option
by Anton Fiuman 02 Jun '08

02 Jun '08

makepkg should not abort with error when a user uses the --nobuild option to extract sources if a package has already been built. Signed-off-by: Anton Fiuman <llexiw(a)gmail.com> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6e2f1ad..08313bf 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1354,7 +1354,7 @@ devel_check devel_update if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -a "$FORCE" = "0" -a "$GENINTEG" = "0" -a "$SOURCEONLY" = "0" ]; then + -a "$FORCE" = "0" -a "$GENINTEG" = "0" -a "$SOURCEONLY" = "0" -a "$NOBUILD" = "0" ]; then if [ "$INSTALL" = "1" ]; then warning "$(gettext "A package has already been built, installing existing package...")" install_package -- 1.5.5.3

3 2