- Pacman-dev - lists.archlinux.org

[pacman-dev] #10530: checksum verification does not work on BSD
by Sebastian Nowicki 06 Jun '08

06 Jun '08

I don't really like this solution, but it's the only portable solution I could think of. Instead of using md5sum, sha1sum, etc from GNU coreutils, openssl is used. Openssl has the limitation that it does not support the other sha* algorithms, so they had to be removed from makepkg. I don't like having to remove features in order to make something more portable. The patch has been tested on Mac OSX (10.5) and Archlinux. References http://bugs.archlinux.org/task/10530 doc/makepkg.conf.5.txt | 2 +- etc/makepkg.conf.in | 2 +- scripts/makepkg.sh.in | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-)

7 23

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.4-13-g4a80283
by Dan McGee 05 Jun '08

05 Jun '08

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 4a802838cb2e2d1eca4c4e07b31a923dc29bd1e3 (commit) from 398d4aff2dc25585e51310ba2f7f8d64a9f52081 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4a802838cb2e2d1eca4c4e07b31a923dc29bd1e3 Author: Anton Fiuman <llexiw(a)gmail.com> Date: Mon Jun 2 06:41:52 2008 +0200 Don't require --force when using the --nobuild option 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> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-192-g5ae02e6
by Dan McGee 05 Jun '08

05 Jun '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 5ae02e6ae72b7648318e319eba9ab02f489d858a (commit) via d030d12542dabfe0b6c648f48d2ff08b4feb4d41 (commit) via 0966c33a72ce172526762ac988ee6edbbba07b52 (commit) via fe781e4ce4ace4410bbc8bec441140cfc323d262 (commit) via 0669c9bfac7aead01f1400444e691d542f7645c2 (commit) via 62b4195c7680f9d404e175eb0869182efdd09ef2 (commit) via 5f0692def87b5c15d2ad6606e95c9139187a8132 (commit) via 636610432a8dc633812d323d3e85b639aabb3302 (commit) from 54e1e3e642d834d8c676db7f74e95c6e24b19eab (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5ae02e6ae72b7648318e319eba9ab02f489d858a Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed May 28 23:25:40 2008 +0200 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) because this field was no longer filled. Now pkg_load fills it. But 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> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d030d12542dabfe0b6c648f48d2ff08b4feb4d41 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed May 28 22:55:03 2008 +0200 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 : * -Syu or -Su : we can proceed * -Sy : we can end now (this is actually a bugfix) * -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> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0966c33a72ce172526762ac988ee6edbbba07b52 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri May 30 08:52:27 2008 +0200 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> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fe781e4ce4ace4410bbc8bec441140cfc323d262 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jun 1 23:10:30 2008 -0500 Reimplement TotalDownload functionality Add a new totaldlcb callback function to libalpm and make pacman utilize it when the TotalDownload option is enabled. This callback function is pretty simple- it is meant to be called once at the beginning of a "list download" action, and once at the end (with value 0 to indicate the list has been finished). The frontend is responsible for keeping track of adding individual file download amounts to the total xfered amount in order to display some sort of overall progress. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0669c9bfac7aead01f1400444e691d542f7645c2 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jun 1 21:47:31 2008 -0500 Use correct C type for file sizes We have been using unsigned long as a file size type for a while, which works but isn't quite correct and could easily break. Worse was probably our use of int in the download callback functions, which could be restrictive for packages > 2GB in size. Switch all file size variables to use off_t, which is the preferred type for file sizes. Note that at least on Linux, all applications compiled against libalpm must now be sure to use large file support, where _FILE_OFFSET_BITS is defined to be 64 or there will be some weird issues that crop up. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 62b4195c7680f9d404e175eb0869182efdd09ef2 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 2 15:14:37 2008 -0500 libalpm/md5: Fix license header This was mistakenly referencing the LGPL even after the XySSL code bump, so fix the license clause to be correct. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5f0692def87b5c15d2ad6606e95c9139187a8132 Author: Dan McGee <dan(a)archlinux.org> Date: Fri May 30 19:32:28 2008 -0500 makepkg: remove some dead TODO code Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 636610432a8dc633812d323d3e85b639aabb3302 Author: Dan McGee <dan(a)archlinux.org> Date: Sat May 31 11:53:51 2008 -0500 Allow GIT version to be used in pacman builds Add a new configure flag, --enable-git-version, that allows the output of 'git describe' to be used in the version string associated with this package. This could aid in debugging for users that are using a development version of pacman and we should be able to figure out which cut of code they are using. Sample output: $ pacman --version Pacman v3.1.4-190-g4cfa-dirty - libalpm v2.3.1 $ makepkg --version makepkg (pacman) 3.1.4-190-g5861-dirty Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 47 +++++++++++++++------- lib/libalpm/add.c | 18 ++++++--- lib/libalpm/alpm.h | 20 ++++++---- lib/libalpm/be_files.c | 100 ++++++++++++++++++++++++++++++---------------- lib/libalpm/be_package.c | 9 +++- lib/libalpm/db.c | 1 - lib/libalpm/delta.c | 16 ++++---- lib/libalpm/delta.h | 8 ++- lib/libalpm/dload.c | 6 +- lib/libalpm/graph.h | 4 +- lib/libalpm/handle.c | 18 ++++++++ lib/libalpm/handle.h | 1 + lib/libalpm/md5.c | 5 +- lib/libalpm/md5.h | 5 +- lib/libalpm/package.c | 4 +- lib/libalpm/package.h | 11 +++-- lib/libalpm/sync.c | 33 ++++++++++++--- scripts/Makefile.am | 9 ++++- scripts/makepkg.sh.in | 7 --- src/pacman/Makefile.am | 5 ++ src/pacman/callback.c | 81 ++++++++++++++++++++++++++++--------- src/pacman/callback.h | 6 ++- src/pacman/package.c | 3 - src/pacman/pacman.c | 11 +++++ src/pacman/sync.c | 76 +++++++++++++++++------------------ src/pacman/util.c | 2 +- 26 files changed, 332 insertions(+), 174 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Reimplement TotalDownload functionality
by Dan McGee 05 Jun '08

05 Jun '08

Add a new totaldlcb callback function to libalpm and make pacman utilize it when the TotalDownload option is enabled. This callback function is pretty simple- it is meant to be called once at the beginning of a "list download" action, and once at the end (with value 0 to indicate the list has been finished). The frontend is responsible for keeping track of adding individual file download amounts to the total xfered amount in order to display some sort of overall progress. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.h | 6 ++- lib/libalpm/handle.c | 18 +++++++++++ lib/libalpm/handle.h | 1 + lib/libalpm/sync.c | 20 ++++++++++++- src/pacman/callback.c | 76 +++++++++++++++++++++++++++++++++++++----------- src/pacman/callback.h | 2 + src/pacman/pacman.c | 5 +++ 7 files changed, 107 insertions(+), 21 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index fd3be0d..9ed2c67 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -82,19 +82,21 @@ int alpm_logaction(char *fmt, ...); typedef void (*alpm_cb_download)(const char *filename, off_t xfered, off_t total); +typedef void (*alpm_cb_totaldl)(off_t total); /* * Options */ -#define PM_DLFNM_LEN 22 - alpm_cb_log alpm_option_get_logcb(); void alpm_option_set_logcb(alpm_cb_log cb); alpm_cb_download alpm_option_get_dlcb(); void alpm_option_set_dlcb(alpm_cb_download cb); +alpm_cb_totaldl alpm_option_get_totaldlcb(); +void alpm_option_set_totaldlcb(alpm_cb_totaldl cb); + const char *alpm_option_get_root(); int alpm_option_set_root(const char *root); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index c01dd55..af1cc78 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -115,6 +115,15 @@ alpm_cb_download SYMEXPORT alpm_option_get_dlcb() return handle->dlcb; } +alpm_cb_totaldl SYMEXPORT alpm_option_get_totaldlcb() +{ + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return NULL; + } + return handle->totaldlcb; +} + const char SYMEXPORT *alpm_option_get_root() { if (handle == NULL) { @@ -268,6 +277,15 @@ void SYMEXPORT alpm_option_set_dlcb(alpm_cb_download cb) handle->dlcb = cb; } +void SYMEXPORT alpm_option_set_totaldlcb(alpm_cb_totaldl cb) +{ + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } + handle->totaldlcb = cb; +} + int SYMEXPORT alpm_option_set_root(const char *root) { struct stat st; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 9c537b1..bec0a6f 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -39,6 +39,7 @@ typedef struct _pmhandle_t { /* callback functions */ alpm_cb_log logcb; /* Log callback function */ alpm_cb_download dlcb; /* Download callback function */ + alpm_cb_totaldl totaldlcb; /* Total download callback function */ /* filesystem paths */ char *root; /* Root path, default '/' */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 2dad8bf..3dc54d0 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -811,12 +811,25 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) ALPM_LOG_FUNC; - ASSERT(db_local != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); cachedir = _alpm_filecache_setup(); trans->state = STATE_DOWNLOADING; + /* Total progress - figure out the total download size if required to + * pass to the callback. This function is called once, and it is up to the + * frontend to compute incremental progress. */ + if(handle->totaldlcb) { + off_t total_size = (off_t)0; + /* sum up the download size for each package and store total */ + for(i = trans->packages; i; i = i->next) { + pmsyncpkg_t *sync = i->data; + pmpkg_t *spkg = sync->pkg; + total_size += spkg->download_size; + } + handle->totaldlcb(total_size); + } + /* group sync records by repository and download */ for(i = handle->dbs_sync; i; i = i->next) { pmdb_t *current = i->data; @@ -877,6 +890,11 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) return(0); } + /* clear out value to let callback know we are done */ + if(handle->totaldlcb) { + handle->totaldlcb(0); + } + if(handle->usedelta) { int ret = 0; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 1942aef..ff125c3 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -38,6 +38,8 @@ /* download progress bar */ static float rate_last; static off_t xfered_last; +static off_t list_xfered = 0.0; +static off_t list_total = 0.0; static struct timeval initial_time; /* transaction progress bar */ @@ -84,14 +86,15 @@ static float get_update_timediff(int first_call) } /* refactored from cb_trans_progress */ -static void fill_progress(const int percent, const int proglen) +static void fill_progress(const int bar_percent, const int disp_percent, + const int proglen) { const unsigned int hashlen = proglen - 8; - const unsigned int hash = percent * hashlen / 100; + const unsigned int hash = bar_percent * hashlen / 100; static unsigned int lasthash = 0, mouth = 0; unsigned int i; - if(percent == 0) { + if(bar_percent == 0) { lasthash = 0; mouth = 0; } @@ -136,10 +139,12 @@ static void fill_progress(const int percent, const int proglen) } /* print percent after progress bar */ if(proglen > 5) { - printf(" %3d%%", percent); + /* use disp_percent if it is not 0, else show bar_percent */ + int p = disp_percent ? disp_percent : bar_percent; + printf(" %3d%%", p); } - if(percent == 100) { + if(bar_percent == 100) { printf("\n"); } else { printf("\r"); @@ -395,7 +400,7 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, free(wcstr); /* call refactored fill progress function */ - fill_progress(percent, getcols() - infolen); + fill_progress(percent, percent, getcols() - infolen); if(percent == 100) { alpm_list_t *i = NULL; @@ -410,8 +415,19 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, } } +/* callback to handle receipt of total download value */ +void cb_dl_total(off_t total) +{ + list_total = total; + /* if we get a 0 value, it means this list has finished downloading, + * so clear out our list_xfered as well */ + if(total == 0) { + list_xfered = 0; + } +} + /* callback to handle display of download progress */ -void cb_dl_progress(const char *filename, off_t xfered, off_t total) +void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) { const int infolen = 50; const int filenamelen = infolen - 27; @@ -420,24 +436,38 @@ void cb_dl_progress(const char *filename, off_t xfered, off_t total) int len, wclen, wcwid, padwid; wchar_t *wcfname; + off_t xfered, total; float rate = 0.0, timediff = 0.0, f_xfered = 0.0; unsigned int eta_h = 0, eta_m = 0, eta_s = 0; - int percent; + int file_percent = 0, total_percent = 0; char rate_size = 'K', xfered_size = 'K'; if(config->noprogressbar) { return; } + /* only use TotalDownload if enabled and we have a callback value */ + if(config->totaldownload && list_total) { + xfered = list_xfered + file_xfered; + total = list_total; + } else { + xfered = file_xfered; + total = file_total; + } + /* this is basically a switch on xfered: 0, total, and * anything else */ - if(xfered == 0) { - /* set default starting values */ - gettimeofday(&initial_time, NULL); - xfered_last = (off_t)0; - rate_last = 0.0; - timediff = get_update_timediff(1); - } else if(xfered == total) { + if(file_xfered == 0) { + /* set default starting values, ensure we only call this once + * if TotalDownload is enabled */ + if(!(config->totaldownload) + || (config->totaldownload && list_xfered == 0)) { + gettimeofday(&initial_time, NULL); + xfered_last = (off_t)0; + rate_last = 0.0; + timediff = get_update_timediff(1); + } + } else if(file_xfered == file_total) { /* compute final values */ struct timeval current_time; float diff_sec, diff_usec; @@ -446,7 +476,7 @@ void cb_dl_progress(const char *filename, off_t xfered, off_t total) diff_sec = current_time.tv_sec - initial_time.tv_sec; diff_usec = current_time.tv_usec - initial_time.tv_usec; timediff = diff_sec + (diff_usec / 1000000.0); - rate = total / (timediff * 1024.0); + rate = xfered / (timediff * 1024.0); /* round elapsed time to the nearest second */ eta_s = (int)(timediff + 0.5); @@ -466,7 +496,17 @@ void cb_dl_progress(const char *filename, off_t xfered, off_t total) xfered_last = xfered; } - percent = (int)((float)xfered) / ((float)total) * 100; + file_percent = (int)((float)file_xfered) / ((float)file_total) * 100; + + if(config->totaldownload && list_total) { + total_percent = (int)((float)list_xfered + file_xfered) / + ((float)list_total) * 100; + + /* if we are at the end, add the completed file to list_xfered */ + if(file_xfered == file_total) { + list_xfered += file_total; + } + } /* fix up time for display */ eta_h = eta_s / 3600; @@ -539,7 +579,7 @@ void cb_dl_progress(const char *filename, off_t xfered, off_t total) free(fname); free(wcfname); - fill_progress(percent, getcols() - infolen); + fill_progress(file_percent, total_percent, getcols() - infolen); return; } diff --git a/src/pacman/callback.h b/src/pacman/callback.h index 28d396e..2961be8 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -34,6 +34,8 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, int howmany, int remain); +/* callback to handle receipt of total download value */ +void cb_dl_total(off_t total); /* callback to handle display of download progress */ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 66fafa1..27e4b75 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -844,6 +844,11 @@ int main(int argc, char *argv[]) cleanup(ret); } + /* set TotalDownload callback if option enabled */ + if(config->totaldownload) { + alpm_option_set_totaldlcb(cb_dl_total); + } + #if defined(HAVE_GETEUID) && !defined(CYGWIN) /* check if we have sufficient permission for the requested operation */ if(myuid > 0 && needs_transaction()) { -- 1.5.5.3

2 1

[pacman-dev] Configure --prefix in PKGBUILD scripts
by Antonio Huete Jimenez 04 Jun '08

04 Jun '08

Hi I was thinking a way of changing --prefix= used in configure. I think it's desirable to have a chance to change this to another directory, specially in BSD where a lot of userland applications should not be replaced with packages. pkgsrc does that by installing on /usr/pkg its bin, doc, lib, etc ... We could add to makepkg.conf the option PREFIX so we can use later $PREFIX in PKGBUILD. For Archlinux we could specify /usr by default and use /usr/pac for others, or whatever the user needs to. This wouldn't affect ABS behaviour in Archlinux IMHO What do you think guys? :) Regards, Antonio Huete

6 12

[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