- Pacman-dev - lists.archlinux.org

[pacman-dev] Status of package signing work
by Allan McRae 22 Nov '10

22 Nov '10

Hi, I just rebased the gpg work on top of my working branch and pulled in a couple of patches to do with the pacman-key tool so I thought it would be a good time to get a summary of where we are on this. Here is my take on the current status. I would like to keep this list up-to-date so we can track progress, so feel free to reply adding anything I have missed. pacman-key: - tool to manage pacman keyring - TODO: man page needs tidying/clarification makepkg: - will sign packages and produce detached signature if the "sign" option is enabled in makepkg.conf - split packages, PKGDEST etc all handled - TODO: allow selection of key used for signing (patch: http://mailman.archlinux.org/pipermail/pacman-dev/2010-July/011435.html) - TODO: documentation (patch: http://mailman.archlinux.org/pipermail/pacman-dev/2010-July/011436.html) repo-add: - adds package signature (base64) to repos if available when adding package - has option to sign a repo after creation and verify current signature before making changes - TODO: check signature used to verify is not only good but is also in a list of accepted keys (???) - TODO: allow selection of key used for signing (patch: http://mailman.archlinux.org/pipermail/pacman-dev/2010-July/011435.html) - TODO: documentation (patch: http://mailman.archlinux.org/pipermail/pacman-dev/2010-July/011436.html) pacman: - reads in keys from repo-db and decodes them when needed - reads in .sig files when beside a package being loaded from the filesystem - integrated gpgme into pacman for signature verification - provide options to control signature verification on a per repo basis - verifies signatures of packages when installing from repo - TODO: create directories needed for keyring during "make install" - TODO: verify signatures for packages installed from filesystem (???) - TODO: download and verify signatures of dbs (patches: http://mailman.archlinux.org/pipermail/pacman-dev/2010-July/011433.html http://mailman.archlinux.org/pipermail/pacman-dev/2010-July/011434.html) I think the very last TODO there is the only thing stopping us from getting some actual testing of this work underway. I think I have my head around what the two patches are doing now, but I am not sure I like the "how" of that doing. So I will make an attempt into hacking them as I see fit in the next few days... Then I will publish a signed repo with a pacman-git and we can see how this all goes! Allan

2 5

[pacman-dev] makepkg: gpg signature verification?
by Florian Pritz 22 Nov '10

22 Nov '10

I'd like to add $gpgsource (urls to gpg signatures of the sources) to PKGBUILDs and when building check the signatures, but I'm not sure what to do when the check fails. If the user doesn't have the key in his keyring or doesn't trust it my idea would be to display an error message and exit, but that doesn't seem practical although I think it's the right way. I also have no idea how to handle chroots. I really can't expect users to copy their keyring into the chroot, but I could add an option to makepkg.conf so you can disable the checking and wrapper scripts could then do that before chrooting (using a new --verify option maybe). C&C please. -- Florian Pritz -- {flo,bluewind}(a)server-speed.net

2 1

[pacman-dev] [PATCH 2/2] Download and verify package database signatures
by Allan McRae 22 Nov '10

22 Nov '10

If signature verification is needed, attempt to download a signature file for a repo when it is updated. Return an error if unable to download signature only when checking is mandatory, or if signature is invalid. TODO: At the moment the database signature is only checked on download. Should we do anything with a database if it fails to be verified to prevent its future usage? Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_sync.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 36 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index d3399b2..1cf6727 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -104,23 +104,54 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) sprintf(syncpath, "%s%s", dbpath, "sync/"); ret = _alpm_download_single_file(dbfile, db->servers, syncpath, force); - free(dbfile); - free(syncpath); if(ret == 1) { /* files match, do nothing */ pm_errno = 0; - return(1); + goto cleanup; } else if(ret == -1) { /* pm_errno was set by the download code */ _alpm_log(PM_LOG_DEBUG, "failed to sync db: %s\n", alpm_strerrorlast()); - return(-1); + goto cleanup; + } + + /* Download and check the signature of the database if needed */ + if(db->pgp_verify != PM_PGP_VERIFY_NEVER) { + char *sigfile; + int sigret; + + len = strlen(dbfile) + 5; + MALLOC(sigfile, len, RET_ERR(PM_ERR_MEMORY, -1)); + sprintf(sigfile, "%s.sig", dbfile); + + sigret = _alpm_download_single_file(sigfile, db->servers, syncpath, 1); + free(sigfile); + + if(sigret == -1 && db->pgp_verify == PM_PGP_VERIFY_ALWAYS) { + _alpm_log(PM_LOG_ERROR, _("Failed to download signature for db: %s\n"), + alpm_strerrorlast()); + pm_errno = PM_ERR_SIG_INVALID; + ret = -1; + goto cleanup; + } + + sigret = alpm_db_check_pgp_signature(db); + if((db->pgp_verify == PM_PGP_VERIFY_ALWAYS && sigret != 0) || + (db->pgp_verify == PM_PGP_VERIFY_OPTIONAL && sigret == 1)) { + /* pm_errno was set by the checking code */ + /* TODO: should we just leave the unverified database */ + ret = -1; + goto cleanup; + } } /* Cache needs to be rebuilt */ _alpm_db_free_pkgcache(db); - return(0); +cleanup: + free(dbfile); + free(syncpath); + return(ret); } int _alpm_sync_db_populate(pmdb_t *db) -- 1.7.3.2

1 0

[pacman-dev] [PATCH 1/2] Add functions for verifying db signature
by Allan McRae 22 Nov '10

22 Nov '10

Add a pmpgpsig_t struct to the database entry struct and functions for the lazy loading of database signatures. Add a function for checking database signatures, reusing (and generalizing) the code currently used for checking package signatures. TODO: The code for reading in signature files from the filesystem is duplicated for local packages and database and needs refactored. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 1 + lib/libalpm/db.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/db.h | 7 +++++- lib/libalpm/package.h | 11 +-------- lib/libalpm/signing.c | 61 ++++++++++++++++++++++++++++++------------------ lib/libalpm/signing.h | 12 +++++++++- 6 files changed, 113 insertions(+), 35 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 9dd222d..74598ef 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -253,6 +253,7 @@ alpm_list_t *alpm_pkg_unused_deltas(pmpkg_t *pkg); */ int alpm_pkg_check_pgp_signature(pmpkg_t *pkg); +int alpm_db_check_pgp_signature(pmdb_t *db); /* GPG signature verification option */ typedef enum _pgp_verify_t { diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 9fd918a..a7718d5 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -409,6 +409,62 @@ pmdb_t *_alpm_db_new(const char *treename, int is_local) return(db); } +static int load_pgpsig(pmdb_t *db) { + size_t len; + const char *dbfile; + char *sigfile; + + dbfile = _alpm_db_path(db); + len = strlen(dbfile) + 5; + MALLOC(sigfile, len, RET_ERR(PM_ERR_MEMORY, -1)); + sprintf(sigfile, "%s.sig", dbfile); + + if(access(sigfile, R_OK) == 0) { + FILE *f; + long bytes; + size_t bytes_read; + f = fopen(sigfile, "rb"); + fseek(f, 0L, SEEK_END); + bytes = ftell(f); + fseek(f, 0L, SEEK_SET); + CALLOC(db->pgpsig.rawdata, bytes, sizeof(char), + goto error); + bytes_read = fread(db->pgpsig.rawdata, sizeof(char), bytes, f); + if(bytes_read == bytes) { + db->pgpsig.rawlen = bytes; + _alpm_log(PM_LOG_DEBUG, + "loaded database .sig file, location %s\n", sigfile); + } else { + _alpm_log(PM_LOG_WARNING, _("Failed reading PGP signature file for %s"), + dbfile); + } + fclose(f); + } else { + _alpm_log(PM_LOG_DEBUG, "no database signature file found\n"); + } + + return(0); + +error: + FREE(db->pgpsig.rawdata); + db->pgpsig.rawlen = 0; + return(1); +} + +const pmpgpsig_t *_alpm_db_pgpsig(pmdb_t *db) +{ + ALPM_LOG_FUNC; + + /* Sanity checks */ + ASSERT(db != NULL, return(NULL)); + + if(db->pgpsig.rawdata == NULL) { + load_pgpsig(db); + } + + return &(db->pgpsig); +} + void _alpm_db_free(pmdb_t *db) { ALPM_LOG_FUNC; diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index ab896b9..1372b0d 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -22,7 +22,6 @@ #ifndef _ALPM_DB_H #define _ALPM_DB_H -#include "alpm.h" #include <limits.h> #include <time.h> @@ -30,6 +29,9 @@ #include <archive.h> #include <archive_entry.h> +#include "alpm.h" +#include "signing.h" + /* Database entries */ typedef enum _pmdbinfrq_t { INFRQ_BASE = 1, @@ -58,6 +60,8 @@ struct __pmdb_t { alpm_list_t *pkgcache; alpm_list_t *grpcache; alpm_list_t *servers; + /* do not access directly, use _alpm_db_pgpsig(db) for lazy access */ + pmpgpsig_t pgpsig; pgp_verify_t pgp_verify; struct db_operations *ops; @@ -73,6 +77,7 @@ pmdb_t *_alpm_db_register_local(void); pmdb_t *_alpm_db_register_sync(const char *treename); void _alpm_db_unregister(pmdb_t *db); pmdb_t *_alpm_db_new(const char *treename, int is_local); +const pmpgpsig_t *_alpm_db_pgpsig(pmdb_t *db); /* be_*.c, backend specific calls */ int _alpm_local_db_populate(pmdb_t *db); diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index be5ce32..7c11e38 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -29,6 +29,7 @@ #include "alpm.h" #include "db.h" +#include "signing.h" typedef enum _pmpkgfrom_t { PKG_FROM_FILE = 1, @@ -90,16 +91,6 @@ struct pkg_operations { */ extern struct pkg_operations default_pkg_ops; -struct __pmpgpsig_t { - /* we will either store the encoded data or the raw data- - * this way we can decode on an as-needed basis since most - * operations won't require the overhead of base64 decodes - * on all packages in a sync repository. */ - char *encdata; - size_t rawlen; - unsigned char *rawdata; -}; - struct __pmpkg_t { char *filename; char *name; diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 2b15528..826c34b 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -92,28 +92,28 @@ error: } /** - * Check the PGP package signature for the given package file. - * @param pkgpath the full path to a package file + * Check the PGP package signature for the given file. + * @param path the full path to a file * @param sig PGP signature data in raw form (already decoded) * @return a int value : 0 (valid), 1 (invalid), -1 (an error occured) */ -int _alpm_gpgme_checksig(const char *pkgpath, const pmpgpsig_t *sig) +int _alpm_gpgme_checksig(const char *path, const pmpgpsig_t *sig) { int ret = 0; gpgme_error_t err; gpgme_ctx_t ctx; - gpgme_data_t pkgdata, sigdata; + gpgme_data_t filedata, sigdata; gpgme_verify_result_t result; gpgme_signature_t gpgsig; - FILE *pkgfile = NULL, *sigfile = NULL; + FILE *file = NULL, *sigfile = NULL; ALPM_LOG_FUNC; if(!sig || !sig->rawdata) { RET_ERR(PM_ERR_SIG_UNKNOWN, -1); } - if(!pkgpath || access(pkgpath, R_OK) != 0) { - RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); + if(!path || access(path, R_OK) != 0) { + RET_ERR(PM_ERR_NOT_A_FILE, -1); } if(gpgme_init()) { /* pm_errno was set in gpgme_init() */ @@ -124,13 +124,13 @@ int _alpm_gpgme_checksig(const char *pkgpath, const pmpgpsig_t *sig) /* create our necessary data objects to verify the signature */ /* first the package itself */ - pkgfile = fopen(pkgpath, "rb"); - if(pkgfile == NULL) { - pm_errno = PM_ERR_PKG_OPEN; + file = fopen(path, "rb"); + if(file == NULL) { + pm_errno = PM_ERR_NOT_A_FILE; ret = -1; goto error; } - err = gpgme_data_new_from_stream(&pkgdata, pkgfile); + err = gpgme_data_new_from_stream(&filedata, file); CHECK_ERR(); /* next create data object for the signature */ @@ -138,7 +138,7 @@ int _alpm_gpgme_checksig(const char *pkgpath, const pmpgpsig_t *sig) CHECK_ERR(); /* here's where the magic happens */ - err = gpgme_op_verify(ctx, sigdata, pkgdata, NULL); + err = gpgme_op_verify(ctx, sigdata, filedata, NULL); CHECK_ERR(); result = gpgme_op_verify_result(ctx); gpgsig = result->signatures; @@ -161,34 +161,34 @@ int _alpm_gpgme_checksig(const char *pkgpath, const pmpgpsig_t *sig) if(gpgsig->summary & GPGME_SIGSUM_VALID) { /* good signature, continue */ - _alpm_log(PM_LOG_DEBUG, _("Package %s has a valid signature.\n"), - pkgpath); + _alpm_log(PM_LOG_DEBUG, _("File %s has a valid signature.\n"), + path); } else if(gpgsig->summary & GPGME_SIGSUM_GREEN) { /* 'green' signature, not sure what to do here */ - _alpm_log(PM_LOG_WARNING, _("Package %s has a green signature.\n"), - pkgpath); + _alpm_log(PM_LOG_WARNING, _("File %s has a green signature.\n"), + path); } else if(gpgsig->summary & GPGME_SIGSUM_KEY_MISSING) { pm_errno = PM_ERR_SIG_UNKNOWN; - _alpm_log(PM_LOG_WARNING, _("Package %s has a signature from an unknown key.\n"), - pkgpath); + _alpm_log(PM_LOG_WARNING, _("File %s has a signature from an unknown key.\n"), + path); ret = -1; } else { /* we'll capture everything else here */ pm_errno = PM_ERR_SIG_INVALID; - _alpm_log(PM_LOG_ERROR, _("Package %s has an invalid signature.\n"), - pkgpath); + _alpm_log(PM_LOG_ERROR, _("File %s has an invalid signature.\n"), + path); ret = 1; } error: gpgme_data_release(sigdata); - gpgme_data_release(pkgdata); + gpgme_data_release(filedata); gpgme_release(ctx); if(sigfile) { fclose(sigfile); } - if(pkgfile) { - fclose(pkgfile); + if(file) { + fclose(file); } if(err != GPG_ERR_NO_ERROR) { _alpm_log(PM_LOG_ERROR, _("GPGME error: %s\n"), gpgme_strerror(err)); @@ -211,4 +211,19 @@ int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg) alpm_pkg_get_pgpsig(pkg))); } +/** + * Check the PGP package signature for the given database. + * @param db the database to check + * @return a int value : 0 (valid), 1 (invalid), -1 (an error occured) + */ +int SYMEXPORT alpm_db_check_pgp_signature(pmdb_t *db) +{ + ALPM_LOG_FUNC; + ASSERT(db != NULL, return(0)); + + return(_alpm_gpgme_checksig(_alpm_db_path(db), + _alpm_db_pgpsig(db))); +} + + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index c004697..8fbb25d 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -21,7 +21,17 @@ #include "alpm.h" -int _alpm_gpgme_checksig(const char *pkgpath, const pmpgpsig_t *sig); +struct __pmpgpsig_t { + /* we will either store the encoded data or the raw data- + * this way we can decode on an as-needed basis since most + * operations won't require the overhead of base64 decodes + * on all packages in a sync repository. */ + char *encdata; + size_t rawlen; + unsigned char *rawdata; +}; + +int _alpm_gpgme_checksig(const char *path, const pmpgpsig_t *sig); #endif /* _ALPM_SIGNING_H */ -- 1.7.3.2

1 0

[pacman-dev] Appendix to signature patchset
by Denis A. Altoé Falqueto 20 Nov '10

20 Nov '10

Guys, This is a last patch for that series. It is a new patch, as Allan asked, so you can apply it in an already patched branch. The description on the patch itself is self explanatory. This is just to justify the new patch without poluting its description. Any sugestions or criticisms are always welcome. -- Denis Falqueto

2 9

[pacman-dev] Warn about using -Sy
by Evangelos Foutras 17 Nov '10

17 Nov '10

Oftentimes, I come across people using `pacman -Sy <name>' to install new packages. This installs the latest version of a package, while leaving any required libraries at their old version. The introduction of an incompatibility between a package and its dependencies is highly possible. A recent example of this issue is [1]. Could you please review the attached tiny patch for code structure, language used, and overall approach? -- [1] http://mailman.archlinux.org/pipermail/arch-general/2010-November/017198.ht…

7 12

[pacman-dev] Disk space checking branch "complete"
by Allan McRae 17 Nov '10

17 Nov '10

Hi, I have "finished" the disk space checking implementation. The only TODO left is to add the statvfs version of getmntinfo code path (NetBSD), but otherwise I consider this done. The calculations done are quite good but it is near impossible to be exact (e.g. adding/removing a block for directories but only once across the transaction, .pacsave/.pacnew files, filelist db files). I suppose I could add a block for those and not remove blocks to get an upper limit. However, the difference will likely be orders of magnitude smaller than the transaction size so I am not sure it is worth further effort... As far as the interface goes, the check is performed only when the CheckSpace option is given in pacman.conf. We also get a nice progress bar in pacman while the check is being performed (think of what is displayed during file conflict checking). See the work here: http://projects.archlinux.org/users/allan/pacman.git/diff/?h=diskspace&id2=… I need to rebase that branch into useful commit(s), but the overall changes are rather small (12 files changed, 447 insertions, 2 deletions - with 365 of those additions being in two new files). So I think code review can happen now. I am looking for comments on code correctness and very specific implementation details only. Anything other than that needs to be submitted in patch form... Allan

6 16

[pacman-dev] [PATCH 1/2] dirent usage cleanup
by Dan McGee 16 Nov '10

16 Nov '10

We were including the header in a lot of places it is no longer used. Additionally, use the correct autoconf macro for determining whether d_type is available as a member: HAVE_STRUCT_DIRENT_D_TYPE. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- configure.ac | 1 + lib/libalpm/be_local.c | 2 +- lib/libalpm/be_sync.c | 1 - lib/libalpm/db.c | 1 - lib/libalpm/sync.c | 1 - src/pacman/callback.c | 1 - 6 files changed, 2 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 6f601f4..e8541d2 100644 --- a/configure.ac +++ b/configure.ac @@ -179,6 +179,7 @@ AC_TYPE_PID_T AC_TYPE_SIZE_T AC_STRUCT_TM AC_TYPE_UID_T +AC_STRUCT_DIRENT_D_TYPE # Checks for library functions. AC_FUNC_FORK diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 2212752..988248d 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -340,7 +340,7 @@ static int checkdbdir(pmdb_t *db) static int is_dir(const char *path, struct dirent *entry) { -#ifdef DT_DIR +#ifdef HAVE_STRUCT_DIRENT_D_TYPE return(entry->d_type == DT_DIR); #else char buffer[PATH_MAX]; diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index e1c7663..bec6abe 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -21,7 +21,6 @@ #include "config.h" #include <errno.h> -#include <dirent.h> #include <ctype.h> #include <locale.h> diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 79d20d4..1e7d3a2 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -29,7 +29,6 @@ #include <errno.h> #include <string.h> #include <sys/stat.h> -#include <dirent.h> #include <regex.h> #include <time.h> diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 1e73b8b..2fd79ea 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -31,7 +31,6 @@ #include <stdint.h> /* intmax_t */ #include <unistd.h> #include <time.h> -#include <dirent.h> /* libalpm */ #include "sync.h" diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 32dafb5..925f1fc 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -26,7 +26,6 @@ #include <sys/time.h> #include <sys/types.h> /* off_t */ #include <unistd.h> -#include <dirent.h> #include <wchar.h> #include <alpm.h> -- 1.7.3.2

1 1

[pacman-dev] Checking free space before transaction
by Allan McRae 13 Nov '10

13 Nov '10

Hi, I have implemented some basic disk space checking in pacman. The code is still a bit rough and there are some TODOs in there (especially related to output). But the basics are all there, so it seems time to get some comments. See my diskspace branch: http://projects.archlinux.org/users/allan/pacman.git/log/?h=diskspace Obviously I need to do some rebasing there, so it is probably easiest to look at the diff between that and my working branch: http://projects.archlinux.org/users/allan/pacman.git/diff/?h=diskspace&id2=… Here are some basic examples of what is implemented so far: > sudo src/pacman/pacman -S grub --dbpath /home/allan/tmp/db/ ... (1/1) checking for file conflicts [######################] 100% Partition: / - blocks needed: 112 - blocks free: 2635828 Partition: /boot - blocks needed: 1 - blocks free: 109046 (1/1) installing grub [######################] 100% > sudo src/pacman/pacman -S grub --dbpath /home/allan/tmp/db/ ... (1/1) checking for file conflicts [######################] 100% Partition: / - blocks needed: 0 - blocks free: 2635684 Partition: /boot - blocks needed: 0 - blocks free: 109044 (1/1) upgrading grub [######################] 100% It also handles the space freed by removing conflicts etc. Obviously the space calculations could be improved, e.g. - for /boot on installing grub, the /boot/grub directory should require a block in addition to the one used by the menu.lst file - directories get counted for removal even when they are not being removed... and that multiplies across packages - .PKGINFO etc count towards / (rather than to dbpath ???) - space for .pacnew/.pacsave files is ignored But it is close enough... In its current form the calculations should catch major stupidity. Allan

4 27

[pacman-dev] Versioned packages on the command line.
by Xyne 11 Nov '10

11 Nov '10

Hi, If two repos (obviously not both official) provide the same binary package, pacman will install the package from the repo that is listed first in pacman.conf, if specified on the command line, e.g. "pacman -S foo". If another package depends on "foo", the same thing happens, but if it instead depends on "foo=1.4" and only the second repo provides it, then pacman will correctly skip over the first repo and install it from the second. If so, would you consider making it possible to specify versions directly on the command line, e.g. "pacman -S foo=1.4". I know that it's possible to first do a search for the package to see which repos contain it, then prepend the repo, e.g. "pacman -S second-repo/foo", but it would be more useful sometimes to be able to just specify the version using "=", "<=", etc. This would ideally also work for detecting providers too, e.g. if "bar" provides "foo=1.4" then "pacman -S foo=1.4" would install bar (or bring up the provider selection dialogue once that's included... I really like that idea btw... considered doing that in powerpill at some point) For a possible use of this, see the following post on the arch-haskell mailing list: http://www.haskell.org/pipermail/arch-haskell/2010-November/000740.html Regards, Xyne

2 2

[pacman-dev] pkgsum - Checksum package files against installed files
by Andre "Osku" Schmidt 08 Nov '10

08 Nov '10

Hello, once upon a time someone at #archlinux did `make install` and i wanted to know if it overwrote any system files (cause it was not /usr/local he used). so i hacked this little script to checksum files in package against installed files. and today someone even wanted this kind of tool at the channel, and lastly allanmademeposthere :P Usage: pkgsum <packagename> it also reads a lazy VERBOSE variable: 0 (default) = print only results 1 = print also not matching checksums 2 = print also all files if anyone finds bugs, improvements, etc. please fix it! :P cheers .andre ps. i dont think that pkgsum fits as name 100% but for now its sufficient enough for me (tm)

4 6

[pacman-dev] Which BSD?
by Allan McRae 08 Nov '10

08 Nov '10

Hi, Can the people who run pacman on some flavor of BSD let me know what type you use? I would like to install a relevant version in a VM to test out some changes to pacman. Allan

2 1

[pacman-dev] [PATCH] Support reading package args from stdin
by Dave Reisner 05 Nov '10

05 Nov '10

Only occurs if no arguments were provided directly. Arguments can be separated by any amount of valid whitespace. This allows for piping into pacman from other programs or from itself, e.g.: pacman -Qdtq | pacman -Rs This is better than using xargs, as xargs will not reconnect stdin to the terminal. The above operation performed using xargs would require the --noconfirm flag to be passed to pacman. Signed-off-by: Dave Reisner <d(a)falconindy.com> --- Additional cleanup at Dan's request, and added documentation to man page wrt to this feature. Woo, documentation. doc/pacman.8.txt | 5 +++++ src/pacman/pacman.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 4bdb3f9..418ddfc 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -25,6 +25,11 @@ Since version 3.0.0, pacman has been the frontend to linkman:libalpm[3], the ``Arch Linux Package Management'' library. This library allows alternative front ends to be written (for instance, a GUI front end). +Invoking pacman involves specifying an operation with any potential options +and targets to operate on. A 'target' is usually a package name, filename, URL, +or a search string. Targets can be provided as arguments to pacman and/or +passed through standard input. + Operations ---------- diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 15abecc..39390a5 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -26,6 +26,7 @@ #define PACKAGE_VERSION GIT_VERSION #endif +#include <ctype.h> /* isspace */ #include <stdlib.h> /* atoi */ #include <stdio.h> #include <limits.h> @@ -1305,6 +1306,39 @@ int main(int argc, char *argv[]) cleanup(ret); } + /* we also support reading targets from stdin */ + if(!isatty(fileno(stdin))) { + char line[PATH_MAX]; + int i = 0; + while(i < PATH_MAX && (line[i] = fgetc(stdin)) != EOF) { + if(isspace((unsigned char)line[i])) { + /* avoid adding zero length arg when multiple spaces separate args */ + if(i > 0) { + line[i] = '\0'; + pm_targets = alpm_list_add(pm_targets, strdup(line)); + i = 0; + } + } else { + i++; + } + } + /* check for buffer overflow */ + if (i >= PATH_MAX) { + pm_printf(PM_LOG_ERROR, _("buffer overflow detected in arg parsing\n")); + cleanup(EXIT_FAILURE); + } + + /* end of stream -- check for data still in line buffer */ + if(i > 0) { + line[i] = '\0'; + pm_targets = alpm_list_add(pm_targets, strdup(line)); + } + if (!freopen(ctermid(NULL), "r", stdin)) { + pm_printf(PM_LOG_ERROR, _("failed to reopen stdin for reading: (%s)\n"), + strerror(errno)); + } + } + /* parse the config file */ ret = parseconfig(config->configfile); if(ret != 0) { -- 1.7.3.2

2 1

[pacman-dev] [RFC] New member selection when installing group
by Xavier Chantry 04 Nov '10

04 Nov '10

One part of what's on http://code.toofishes.net/cgit/xavier/pacman.git/log/?h=working is about proposing a new interactive selection for installing groups. I did not like the old one, because I don't want to answer 50 questions when I install one group with 50 members. This is ugly, and the selection is not easily reproducible, for example you cannot easily copy/paste the answers of one run to another. I think a text frontend really sucks for this kind of workflow, a graphical or at least ncurses frontend would do much better. But my new provision selection inspired to both Jakob and Dan that we could have the same for groups, so I went ahead and implemented it over the weekend. $ pacman -S base-devel :: There are 11 members in group base-devel: :: Repository testing 1) make :: Repository core 2) autoconf 3) automake 4) bison 5) fakeroot 6) flex 7) gcc 8) libtool 9) m4 10) patch 11) pkg-config Which ones do you want to install? Enter a number (default=all): Multiple choices are possible, separated by spaces. Either single number or a range a-b. Both single numbers and range can be negated with ^ prefix. Choices are applied successively, so each choice override previous ones (in case of conflict). If first choice is negative, all targets are implicitly selected, otherwise no target is implicitly selected. Examples : 1) 3 6 8 : install automake, flex and libtool 2) 2-11 : install all targets in core repo 3) ^1 or 1-11 ^1 : install everything but make (like 2)) 4) ^2-11 : install everything but targets 2-11, i.e. only testing/make is left No idea how practical / user-friendly it is, so feedback and testing welcome.

4 7

[pacman-dev] [PATCH] Support reading package args from stdin
by Dave Reisner 04 Nov '10

04 Nov '10

Only occurs if no arguments were provided directly. Arguments can be separated by any amount of valid whitespace. This allows for piping into pacman from other programs or from itself, e.g.: pacman -Qdtq | pacman -Rs This is better than using xargs, as xargs will not reconnect stdin to the terminal. The above operation performed using xargs would require the --noconfirm flag to be passed to pacman. Signed-off-by: Dave Reisner <d(a)falconindy.com> --- Resending as per Allan's request with modifications from the origin 7/24 submission. Changes: * Check return value of freopen * Assign '\0' instead of 0 to null terminate * Use post-increment instead of pre-increment * Check for buffer overflow condition (not convinced my method is reasonable) * Dynamically find stdin's FD instead of assuming it's 1 * Use PATH_MAX instead of BUFSIZ Concerns: * The verbiage I've used in the new strings is probably not ideal. src/pacman/pacman.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 15abecc..e078aab 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -26,6 +26,7 @@ #define PACKAGE_VERSION GIT_VERSION #endif +#include <ctype.h> /* isspace */ #include <stdlib.h> /* atoi */ #include <stdio.h> #include <limits.h> @@ -1305,6 +1306,38 @@ int main(int argc, char *argv[]) cleanup(ret); } + /* read package arguments from stdin if we have none yet */ + if(!pm_targets && !isatty(fileno(stdin))) { + char line[PATH_MAX]; + int i = 0; + while(i < PATH_MAX && (line[i] = fgetc(stdin)) != EOF) { + if(isspace((unsigned char)line[i])) { + line[i] = '\0'; + /* avoid adding zero length arg when multiple spaces separate args */ + if(i > 0) { + pm_targets = alpm_list_add(pm_targets, strdup(line)); + i = 0; + } + } else { + i++; + } + } + /* check for buffer overflow */ + if (i >= PATH_MAX) { + pm_printf(PM_LOG_ERROR, _("buffer overflow detected in arg parsing\n")); + cleanup(EXIT_FAILURE); + } + + /* end of stream -- check for data still in line buffer */ + if(i > 0) { + pm_targets = alpm_list_add(pm_targets, strdup(line)); + } + if (!freopen(ctermid(NULL), "r", stdin)) { + pm_printf(PM_LOG_ERROR, _("failed to reopen stdin for reading: (%s)\n"), + strerror(errno)); + } + } + /* parse the config file */ ret = parseconfig(config->configfile); if(ret != 0) { -- 1.7.3.2

2 1

[pacman-dev] [PATCH] Support reading package args from stdin
by Dave Reisner 04 Nov '10

04 Nov '10

Only occurs if no arguments were provided directly. Arguments can be separated by any amount of valid whitespace. This allows for piping into pacman from other programs or from itself, e.g.: pacman -Qdtq | pacman -Rs This is better than using xargs, as xargs will not reconnect stdin to the terminal. The above operation performed using xargs would require the --noconfirm flag to be passed to pacman. Revised from the original 7/24 submission at Allan's request to check the return value of freopen(). Signed-off-by: Dave Reisner <d(a)falconindy.com> --- src/pacman/pacman.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 15abecc..6f40a97 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -26,6 +26,7 @@ #define PACKAGE_VERSION GIT_VERSION #endif +#include <ctype.h> /* isspace */ #include <stdlib.h> /* atoi */ #include <stdio.h> #include <limits.h> @@ -1305,6 +1306,32 @@ int main(int argc, char *argv[]) cleanup(ret); } + /* read package arguments from stdin if we have none yet */ + if(!pm_targets && !isatty(0)) { + char line[BUFSIZ]; + int i = 0; + while((line[i] = fgetc(stdin)) != EOF) { + if(isspace(line[i])) { + line[i] = 0; + /* avoid adding zero length arg when multiple spaces separate args */ + if(i > 0) { + pm_targets = alpm_list_add(pm_targets, strdup(line)); + i = 0; + } + } else { + ++i; + } + } + /* end of stream -- check for data still in line buffer */ + if(i > 0) { + pm_targets = alpm_list_add(pm_targets, strdup(line)); + } + if (!freopen(ctermid(NULL), "r", stdin)) { + pm_printf(PM_LOG_ERROR, _("failed to reopen stdin for reading: (%s)\n"), + strerror(errno)); + } + } + /* parse the config file */ ret = parseconfig(config->configfile); if(ret != 0) { -- 1.7.3.2

3 6

[pacman-dev] [PATCH] Sync data after writing to the local db
by Allan McRae 31 Oct '10

31 Oct '10

This should hopefully reduce local db corruption issues. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_local.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 4574bd4..cb12abb 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -841,6 +841,7 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fprintf(fp, "\n"); } + fdatasync(fileno(fp)); fclose(fp); fp = NULL; } @@ -869,6 +870,8 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } fprintf(fp, "\n"); } + + fdatasync(fileno(fp)); fclose(fp); fp = NULL; } -- 1.7.3.2

4 4

[pacman-dev] [PATCH] Add function to list mount points
by Allan McRae 31 Oct '10

31 Oct '10

The helper function _alpm_mount_list provides a relatively portable interface to obtaining a list of mount pints on a system. This will be useful in checking for disk space availability when installing packages. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I have not tested the HAVE_GETMNTINFO path as that requires BSD4.4, OSX or NetBSD 3.0. However, it is taken from various example code on the internet so should work... configure.ac | 6 +++--- lib/libalpm/util.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/util.h | 1 + 3 files changed, 53 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6f601f4..5bbd761 100644 --- a/configure.ac +++ b/configure.ac @@ -185,9 +185,9 @@ AC_FUNC_FORK AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK AC_FUNC_MKTIME AC_TYPE_SIGNAL -AC_CHECK_FUNCS([geteuid realpath regcomp strcasecmp \ - strndup strrchr strsep swprintf \ - wcwidth uname]) +AC_CHECK_FUNCS([geteuid getmntent getmntinfo realpath \ + regcomp strcasecmp strndup strrchr \ + strsep swprintf wcwidth uname]) # Enable large file support if available AC_SYS_LARGEFILE diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 2661241..9b7454f 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -39,6 +39,15 @@ #include <sys/stat.h> #include <sys/wait.h> +#ifdef HAVE_GETMNTENT +#include <mntent.h> +#endif + +#ifdef HAVE_GETMNTINFO +#include <sys/mount.h> +#include <sys/statvfs.h> +#endif + /* libarchive */ #include <archive.h> #include <archive_entry.h> @@ -845,4 +854,44 @@ int _alpm_splitname(const char *target, pmpkg_t *pkg) return(0); } +alpm_list_t *_alpm_mount_list() +{ + alpm_list_t *mount_points = NULL; + +#ifdef HAVE_GETMNTENT + struct mntent *mnt; + FILE *fp; + + fp = setmntent(MOUNTED, "r"); + + if (fp == NULL) { + return NULL; + } + + while((mnt = getmntent (fp))) { + mount_points = alpm_list_add(mount_points, strdup(mnt->mnt_dir)); + } + + endmntent(fp); +#endif + +#ifdef HAVE_GETMNTINFO + struct statvfs *fsp; + int entries; + + entries = getmntinfo (&fsp, MNT_NOWAIT); + + if (entries < 0) { + return NULL; + } + + for (; entries-- > 0; fsp++) { + mount_points = alpm_list_add(mount_points, strdup(fsp->f_mntonname)); + } +#endif + + mount_points = alpm_list_msort(mount_points, alpm_list_count(mount_points), _alpm_str_cmp); + return(mount_points); +} + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 75e2c45..0d2ac79 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -78,6 +78,7 @@ int _alpm_lstat(const char *path, struct stat *buf); int _alpm_test_md5sum(const char *filepath, const char *md5sum); char *_alpm_archive_fgets(char *line, size_t size, struct archive *a); int _alpm_splitname(const char *target, pmpkg_t *pkg); +alpm_list_t *_alpm_mount_list(); #ifndef HAVE_STRSEP char *strsep(char **, const char *); -- 1.7.3.2

2 3

Re: [pacman-dev] Chat with toofishes@jabber.org
by Xavier Chantry 30 Oct '10

30 Oct '10

On Fri, Oct 8, 2010 at 7:06 PM, toofishes(a)jabber.org <toofishes(a)jabber.org>wrote: > 5:48 PM me: waoh, where does this come from ? :) > what made you implement epoch ? > toofishes: the stupid bug reports > clicked on one and went "ok we have three of these lets fix this shit" > 5:49 PM it ended up not even being that much change, which was nice > had to fix a few things after running tests and such, but overall pretty > straightforward > me: what was hard ? keep support for force ? > 5:50 PM toofishes: yeah > ensuring both forward/backward support > 5:51 PM me: the result looks pretty good and natural > toofishes: yeah > and eventually some of it can be cleaned up > can you spot the one drawback from this though? i didn't catch it at > first, had to go back and fix my patch > you will laugh because you were talking about it the other day. > 5:52 PM me: give me a hint, is it pacman related or makepkg/repo-add > toofishes: pacman > database releated > 5:56 PM me: damn I cannot see, looking at the patch in be_files.c . and > last thing I remember discussing about database was sanity check. > maybe bogus epoch values or something > force was just on/off > toofishes: no > we didn't have to read every desc file before > but now we do to always get the epoch value back > 5:58 PM me: damn I actually spotted the vercmp call and force/epoch was in > a different order > but I just thought force definitely looked weird > 5:59 PM ok I mentioned slow db too, I never considered this depends/desc > thing really. nagy mentioned it many times though > and I thought we were already fucked > toofishes: yeah > we just need to redo the db, tahts all :) > Nagy and I discussed a bit that topic. Don't we already read all local depends file for conflict and/or dep checking ? So this means we'll now read all local depends + all desc files ? Why not put epoch stuff in the local depends file then ? IIRC there has been a plan for years to move replaces and force from depends to desc, probably for sync db? and for similar reasons, but no one ever dared to do it. Another crazy thought, since epoch is really just a version extension, why not define it as a version prefix or something ? 3.5.0 < 2#3.4 < 3#2.0 or whatever crazy syntax we can come up with. Then we just need to have vercmp support that, and that's all, nothing complex to do in any database. I am sorry this comes up a bit late, but only git code has been touched and no harm has been made as far as I know, I just want to be sure that we carefully considered all possible solutions for the stupid versioning some projects use, and that we indeed chose the best way (epoch is probably alright and better than force), but also the best implementation.

3 4

[pacman-dev] [PATCH 2/3] Merge desc and depends files in local db
by Allan McRae 30 Oct '10

30 Oct '10

Whenever depends is needed from the local db, so is desc. The only disadvantage to merging them is the additional time taken to read the depends entries when they are not needed. As depends is in general relatively small, the additional time taken to read it in will be negligable. Also, merging these files will speed up local database access due to less file seeks. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_local.c | 144 ++++++++++++++++++---------------------------- lib/libalpm/be_package.c | 2 +- lib/libalpm/db.h | 9 +-- 3 files changed, 61 insertions(+), 94 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 2212752..4574bd4 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -165,25 +165,25 @@ int _cache_get_epoch(pmpkg_t *pkg) alpm_list_t *_cache_get_depends(pmpkg_t *pkg) { - LAZY_LOAD(INFRQ_DEPENDS, NULL); + LAZY_LOAD(INFRQ_DESC, NULL); return pkg->depends; } alpm_list_t *_cache_get_optdepends(pmpkg_t *pkg) { - LAZY_LOAD(INFRQ_DEPENDS, NULL); + LAZY_LOAD(INFRQ_DESC, NULL); return pkg->optdepends; } alpm_list_t *_cache_get_conflicts(pmpkg_t *pkg) { - LAZY_LOAD(INFRQ_DEPENDS, NULL); + LAZY_LOAD(INFRQ_DESC, NULL); return pkg->conflicts; } alpm_list_t *_cache_get_provides(pmpkg_t *pkg) { - LAZY_LOAD(INFRQ_DEPENDS, NULL); + LAZY_LOAD(INFRQ_DESC, NULL); return pkg->provides; } @@ -614,32 +614,28 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) if(!info->epoch) { info->epoch = 1; } - } - } - fclose(fp); - fp = NULL; - } - - /* FILES */ - if(inforeq & INFRQ_FILES) { - 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; - } - while(fgets(line, sizeof(line), fp)) { - _alpm_strtrim(line); - if(strcmp(line, "%FILES%") == 0) { + } else if(strcmp(line, "%DEPENDS%") == 0) { + while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { + pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); + info->depends = alpm_list_add(info->depends, dep); + } + } else if(strcmp(line, "%OPTDEPENDS%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); - info->files = alpm_list_add(info->files, linedup); + info->optdepends = alpm_list_add(info->optdepends, linedup); } - } else if(strcmp(line, "%BACKUP%") == 0) { + } else if(strcmp(line, "%CONFLICTS%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); - info->backup = alpm_list_add(info->backup, linedup); + info->conflicts = alpm_list_add(info->conflicts, linedup); + } + } else if(strcmp(line, "%PROVIDES%") == 0) { + while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { + char *linedup; + STRDUP(linedup, _alpm_strtrim(line), goto error); + info->provides = alpm_list_add(info->provides, linedup); } } } @@ -647,40 +643,26 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fp = NULL; } - /* DEPENDS */ - if(inforeq & INFRQ_DEPENDS) { - snprintf(path, PATH_MAX, "%sdepends", pkgpath); + /* FILES */ + if(inforeq & INFRQ_FILES) { + 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; } - while(!feof(fp)) { - if(fgets(line, sizeof(line), fp) == NULL) { - break; - } + while(fgets(line, sizeof(line), fp)) { _alpm_strtrim(line); - if(strcmp(line, "%DEPENDS%") == 0) { - while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { - pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); - info->depends = alpm_list_add(info->depends, dep); - } - } else if(strcmp(line, "%OPTDEPENDS%") == 0) { - while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->optdepends = alpm_list_add(info->optdepends, linedup); - } - } else if(strcmp(line, "%CONFLICTS%") == 0) { + if(strcmp(line, "%FILES%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); - info->conflicts = alpm_list_add(info->conflicts, linedup); + info->files = alpm_list_add(info->files, linedup); } - } else if(strcmp(line, "%PROVIDES%") == 0) { + } else if(strcmp(line, "%BACKUP%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); - info->provides = alpm_list_add(info->provides, linedup); + info->backup = alpm_list_add(info->backup, linedup); } } } @@ -828,49 +810,6 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fprintf(fp, "%%REASON%%\n" "%u\n\n", info->reason); } - - fclose(fp); - fp = NULL; - } - - /* FILES */ - if(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, "%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; - goto cleanup; - } - if(info->files) { - fprintf(fp, "%%FILES%%\n"); - for(lp = info->files; lp; lp = lp->next) { - fprintf(fp, "%s\n", (char *)lp->data); - } - fprintf(fp, "\n"); - } - if(info->backup) { - fprintf(fp, "%%BACKUP%%\n"); - for(lp = info->backup; lp; lp = lp->next) { - fprintf(fp, "%s\n", (char *)lp->data); - } - fprintf(fp, "\n"); - } - fclose(fp); - fp = NULL; - } - - /* DEPENDS */ - 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, "%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; - goto cleanup; - } if(info->depends) { fputs("%DEPENDS%\n", fp); for(lp = info->depends; lp; lp = lp->next) { @@ -901,6 +840,35 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } fprintf(fp, "\n"); } + + fclose(fp); + fp = NULL; + } + + /* FILES */ + if(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, "%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; + goto cleanup; + } + if(info->files) { + fprintf(fp, "%%FILES%%\n"); + for(lp = info->files; lp; lp = lp->next) { + fprintf(fp, "%s\n", (char *)lp->data); + } + fprintf(fp, "\n"); + } + if(info->backup) { + fprintf(fp, "%%BACKUP%%\n"); + for(lp = info->backup; lp; lp = lp->next) { + fprintf(fp, "%s\n", (char *)lp->data); + } + fprintf(fp, "\n"); + } fclose(fp); fp = NULL; } diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 254f830..d63ab1f 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -363,7 +363,7 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full) } else { /* get rid of any partial filelist we may have collected, it is invalid */ FREELIST(newpkg->files); - newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_DEPENDS; + newpkg->infolevel = INFRQ_BASE | INFRQ_DESC; } return(newpkg); diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 5352e9e..133b095 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -34,12 +34,11 @@ typedef enum _pmdbinfrq_t { INFRQ_BASE = 1, INFRQ_DESC = (1 << 1), - INFRQ_DEPENDS = (1 << 2), - INFRQ_FILES = (1 << 3), - INFRQ_SCRIPTLET = (1 << 4), - INFRQ_DSIZE = (1 << 5), + INFRQ_FILES = (1 << 2), + INFRQ_SCRIPTLET = (1 << 3), + INFRQ_DSIZE = (1 << 4), /* ALL should be info stored in the package or database */ - INFRQ_ALL = 0x3F + INFRQ_ALL = 0x1F } pmdbinfrq_t; struct db_operations { -- 1.7.3.2

1 2

[pacman-dev] [PATCH 3/3] Update pactest suite for change in db structure
by Allan McRae 30 Oct '10

30 Oct '10

Merging desc and depends files in sync and local db. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/pmdb.py | 62 ++++++++++++++----------------------------------- test/pacman/pmpkg.py | 4 --- 2 files changed, 18 insertions(+), 48 deletions(-) diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index af5525c..7f79819 100755 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -163,6 +163,14 @@ def db_read(self, name): elif line == "%FORCE%": fd.readline() pkg.force = 1 + elif line == "%DEPENDS%": + pkg.depends = _getsection(fd) + elif line == "%OPTDEPENDS%": + pkg.optdepends = _getsection(fd) + elif line == "%CONFLICTS%": + pkg.conflicts = _getsection(fd) + elif line == "%PROVIDES%": + pkg.provides = _getsection(fd) fd.close() pkg.checksum["desc"] = getmd5sum(filename) pkg.mtime["desc"] = getmtime(filename) @@ -189,29 +197,6 @@ def db_read(self, name): pkg.checksum["files"] = getmd5sum(filename) pkg.mtime["files"] = getmtime(filename) - # depends - filename = os.path.join(path, "depends") - if not os.path.isfile(filename): - print "invalid db entry found (depends missing) for pkg", pkgname - return None - fd = file(filename, "r") - while 1: - line = fd.readline() - if not line: - break - line = line.strip("\n") - if line == "%DEPENDS%": - pkg.depends = _getsection(fd) - elif line == "%OPTDEPENDS%": - pkg.optdepends = _getsection(fd) - elif line == "%CONFLICTS%": - pkg.conflicts = _getsection(fd) - elif line == "%PROVIDES%": - pkg.provides = _getsection(fd) - fd.close() - pkg.checksum["depends"] = getmd5sum(filename) - pkg.mtime["depends"] = getmtime(filename) - # install filename = os.path.join(path, "install") if os.path.isfile(filename): @@ -233,9 +218,9 @@ def db_write(self, pkg): # desc # for local db entries: name, version, desc, groups, url, license, # arch, builddate, installdate, packager, - # size, reason + # size, reason, depends, conflicts, provides # for sync entries: name, version, desc, groups, csize, md5sum, - # replaces, force + # replaces, force, depends, conflicts, provides data = [_mksection("NAME", pkg.name)] data.append(_mksection("VERSION", pkg.version)) if pkg.desc: @@ -250,6 +235,14 @@ def db_write(self, pkg): data.append(_mksection("BUILDDATE", pkg.builddate)) if pkg.packager: data.append(_mksection("PACKAGER", pkg.packager)) + if pkg.depends: + data.append(_mksection("DEPENDS", pkg.depends)) + if pkg.optdepends: + data.append(_mksection("OPTDEPENDS", pkg.optdepends)) + if pkg.conflicts: + data.append(_mksection("CONFLICTS", pkg.conflicts)) + if pkg.provides: + data.append(_mksection("PROVIDES", pkg.provides)) if self.treename == "local": if pkg.url: data.append(_mksection("URL", pkg.url)) @@ -297,25 +290,6 @@ def db_write(self, pkg): pkg.checksum["files"] = getmd5sum(filename) pkg.mtime["files"] = getmtime(filename) - # depends - # for local db entries: depends, conflicts, provides - # for sync ones: depends, conflicts, provides - data = [] - if pkg.depends: - data.append(_mksection("DEPENDS", pkg.depends)) - if pkg.optdepends: - data.append(_mksection("OPTDEPENDS", pkg.optdepends)) - if pkg.conflicts: - data.append(_mksection("CONFLICTS", pkg.conflicts)) - if pkg.provides: - data.append(_mksection("PROVIDES", pkg.provides)) - if data: - data.append("") - filename = os.path.join(path, "depends") - mkfile(filename, "\n".join(data)) - pkg.checksum["depends"] = getmd5sum(filename) - pkg.mtime["depends"] = getmtime(filename) - # install if self.treename == "local": empty = 1 diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index aaee28b..9ce0978 100755 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -51,7 +51,6 @@ def __init__(self, name, version = "1.0-1"): self.replaces = [] self.force = 0 self.epoch = 0 - # depends self.depends = [] self.optdepends = [] self.conflicts = [] @@ -70,13 +69,11 @@ def __init__(self, name, version = "1.0-1"): } self.checksum = { "desc": "", - "depends": "", "files": "", "install": "" } self.mtime = { "desc": (0, 0, 0), - "depends": (0, 0, 0), "files": (0, 0, 0), "install": (0, 0, 0) } @@ -85,7 +82,6 @@ def __str__(self): s = ["%s" % self.fullname()] s.append("description: %s" % self.desc) s.append("url: %s" % self.url) - s.append("depends: %s" % " ".join(self.depends)) s.append("files: %s" % " ".join(self.files)) s.append("reason: %d" % self.reason) return "\n".join(s) -- 1.7.3.2

1 0

[pacman-dev] [PATCH 1/3] Combine reading from depends and desc in sync db
by Allan McRae 30 Oct '10

30 Oct '10

This will allow us to eventually combine the depends and desc entries within the sync database. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_sync.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index e1c7663..275a858 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -241,7 +241,7 @@ int _alpm_sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry return(-1); } - if(strcmp(filename, "desc") == 0) { + if(strcmp(filename, "desc") == 0 || strcmp(filename, "depends") == 0) { while(_alpm_archive_fgets(line, sizeof(line), archive) != NULL) { _alpm_strtrim(line); if(strcmp(line, "%NAME%") == 0) { @@ -356,12 +356,7 @@ int _alpm_sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry if(!pkg->epoch) { pkg->epoch = 1; } - } - } - } else if(strcmp(filename, "depends") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) != NULL) { - _alpm_strtrim(line); - if(strcmp(line, "%DEPENDS%") == 0) { + } else if(strcmp(line, "%DEPENDS%") == 0) { while(_alpm_archive_fgets(line, sizeof(line), archive) && strlen(_alpm_strtrim(line))) { pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); -- 1.7.3.2

1 0

[pacman-dev] [PATCH] Add epoch to PKGBUILD prototypes
by Allan McRae 29 Oct '10

29 Oct '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- PKGBUILD-split.proto | 1 + PKGBUILD.proto | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index d7f1de1..f5114ab 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -8,6 +8,7 @@ pkgname=('pkg1' 'pkg2') pkgbase=BASE pkgver=VERSION pkgrel=1 +epoch= pkgdesc="" arch=() url="" diff --git a/PKGBUILD.proto b/PKGBUILD.proto index ebbdf0a..71dbc14 100644 --- a/PKGBUILD.proto +++ b/PKGBUILD.proto @@ -7,6 +7,7 @@ pkgname=NAME pkgver=VERSION pkgrel=1 +epoch= pkgdesc="" arch=() url="" -- 1.7.3.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.1-15-ga91250b
by dan＠archlinux.org 28 Oct '10

28 Oct '10

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 a91250b7bb718c7e36c9784d51bdcb6e0051c259 (commit) via a08638edc8cdacf7840414d82bc687727d7b2363 (commit) via 592211b6dc4b9997a60543309378f1595cf38056 (commit) via d901646f7a2e67d27bcae43f90490299857646fc (commit) from 30734c9a4a63a1bfac0921b944e84f24dc87d76f (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 a91250b7bb718c7e36c9784d51bdcb6e0051c259 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 28 09:50:54 2010 -0500 Add initial 3.4.2 NEWS draft Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a08638edc8cdacf7840414d82bc687727d7b2363 Author: Tobias Eriksson <tobier(a)tobier.se> Date: Wed Oct 20 20:26:36 2010 +0200 Update Swedish translation 442 translated strings, no fuzzies, no untranslated. modified: po/sv.po Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 592211b6dc4b9997a60543309378f1595cf38056 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sat Oct 23 14:32:33 2010 +0200 PKGBUILD.vim: add special licenses BSD MIT ZLIB Python Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d901646f7a2e67d27bcae43f90490299857646fc Author: Ricardo Pérez <ricpelo(a)gmail.com> Date: Thu Oct 28 09:13:24 2010 -0500 Small updates to Spanish translation Also addresses FS#21373. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 6 ++ contrib/PKGBUILD.vim | 9 ++- po/es.po | 40 ++++++------ po/sv.po | 168 ++++++++++++++++++++++--------------------------- 4 files changed, 107 insertions(+), 116 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Swedish translations, yet again
by Tobias Eriksson 28 Oct '10

28 Oct '10

Translation of pacman to Swedish. No fuzzies or untranslated entries left. Signed-off-by: Tobias Eriksson <tobier(a)tobier.se> --- po/sv.po | 173 +++++++++++++++++++++++++------------------------------------- 1 files changed, 70 insertions(+), 103 deletions(-) diff --git a/po/sv.po b/po/sv.po index c61ef2f..9418ea0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" "POT-Creation-Date: 2010-08-23 21:30-0500\n" -"PO-Revision-Date: 2009-10-06 21:11+0200\n" -"Last-Translator: Christian Larsson <congacx(a)gmail.com>\n" +"PO-Revision-Date: 2010-10-20 20:26+0200\n" +"Last-Translator: Tobias Eriksson <tobier(a)tobier.se>\n" "Language-Team: Swedish\n" "Language: \n" "MIME-Version: 1.0\n" @@ -80,13 +80,13 @@ msgstr ":: %s finns i IgnorePkg/IgnoreGroup. Installera ändå?" msgid ":: Replace %s with %s/%s?" msgstr ":: Ersätt %s med %s/%s?" -#, fuzzy, c-format +#, c-format msgid ":: %s and %s are in conflict. Remove %s?" -msgstr ":: %s strider mot %s. Ta bort %s?" +msgstr ":: %s krockar med %s. Ta bort %s?" -#, fuzzy, c-format +#, c-format msgid ":: %s and %s are in conflict (%s). Remove %s?" -msgstr ":: %s strider mot %s. Ta bort %s?" +msgstr ":: %s krockar med %s (%s). Ta bort %s?" #, c-format msgid "" @@ -318,7 +318,7 @@ msgstr "" msgid " -d, --nodeps skip dependency checks\n" msgstr " -d, --nodeps hoppa över kontroll av beroenden\n" -#, fuzzy, c-format +#, c-format msgid "" " -k, --dbonly only remove database entries, do not remove files\n" msgstr "" @@ -335,8 +335,7 @@ msgid "" " (-ss includes explicitly installed dependencies too)\n" msgstr "" " -s, --recursive ta även bort beroenden (som inte stör andra paket)\n" -" (-ss inkluderar även uttryckligt installerade " -"beroenden\n" +" (-ss inkluderar även uttryckligt installerade beroenden\n" #, c-format msgid "" @@ -349,13 +348,15 @@ msgstr "" msgid "" " --print only print the targets instead of performing the " "operation\n" -msgstr "" +msgstr "--print skriv endast ut, utan att utföra operationen\n" #, c-format msgid "" " --print-format <string>\n" " specify how the targets should be printed\n" msgstr "" +" --print-format <string>\n" +" specificera utskriftsformatet\n" #, c-format msgid " --asdeps install packages as non-explicitly installed\n" @@ -371,13 +372,11 @@ msgid " -f, --force force install, overwrite conflicting files\n" msgstr "" " -f, --force tvingfa installation, skriv över motstridiga filer\n" -#, fuzzy, c-format +#, c-format msgid "" " -k, --dbonly add database entries, do not install or keep existing " "files\n" -msgstr "" -" -k, --dbonly ta enbart bort databasinlägg, men ta inte bort några " -"filer\n" +msgstr " -k, --dbonly lägg till databasinlägg, men installera inte eller behåll inga befintliga filer.\n\n" #, c-format msgid " -c, --changelog view the changelog of a package\n" @@ -517,14 +516,13 @@ msgstr "" " ignorera en gruppuppgradering (kan användas mer än en " "gång)\n" -#, fuzzy, c-format +#, c-format msgid " --asdeps mark packages as non-explicitly installed\n" -msgstr "" -" --asdeps installera paket som icke-utryckligt installerade\n" +msgstr " --asdeps markera paket som icke-utryckligt installerade\n" -#, fuzzy, c-format +#, c-format msgid " --asexplicit mark packages as explicitly installed\n" -msgstr " --asexplicit installera paket som utryckligt installerade\n" +msgstr " --asexplicit markera paket som utryckligt installerade\n" #, c-format msgid " --config <path> set an alternate configuration file\n" @@ -572,9 +570,9 @@ msgstr " -b, --dbpath <path> ange en alternativ plats för databasen\n" msgid " --cachedir <dir> set an alternate package cache location\n" msgstr " --cachedir <dir> ange en alternativ plats för paketcachen\n" -#, fuzzy, c-format +#, c-format msgid " --arch <arch> set an alternate architecture\n" -msgstr " --config <path> ange en alternativ konfigurationsfil\n" +msgstr " --arch <arch> ange en alternativ arkitektur\n" #, c-format msgid "" @@ -616,23 +614,23 @@ msgstr "kunde inte chdir till nerladdningskatalogen% s\n" msgid "running XferCommand: fork failed!\n" msgstr "vid körning av XferCommand: delning misslyckades!\n" -#, fuzzy, c-format +#, c-format msgid "directive '%s' without value not recognized\n" -msgstr "konfigurationsfil %s, rad %d: direktiv '%s' känns inte igen\n" +msgstr "direktiv '%s' utan värde känns inte igen\n" #, c-format msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "ogiltigt värde för 'CleanMethod' : '%s'\n" -#, fuzzy, c-format +#, c-format msgid "directive '%s' with a value not recognized\n" -msgstr "konfigurationsfil %s, rad %d: direktiv '%s' känns inte igen\n" +msgstr "direktiv '%s' med ett värde känns inte igen\n" #, c-format msgid "" "The mirror '%s' contains the $arch variable, but no Architecture is " "defined.\n" -msgstr "" +msgstr "Adressen '%s' innehålle $arch-variabeln, men ingen arkitektur är definerad.\n" #, c-format msgid "could not add server URL to database '%s': %s (%s)\n" @@ -661,19 +659,19 @@ msgid "config file %s, line %d: All directives must belong to a section.\n" msgstr "" "konfigurationsfil %s, rad %d: Alla direktiv måste tillhöra en sektion.\n" -#, fuzzy, c-format +#, c-format msgid "config file %s, line %d: directive %s needs a value\n" -msgstr "konfigurationsfil %s, rad %d: direktiv '%s' känns inte igen\n" +msgstr "konfigurationsfil %s, rad %d: direktiv '%s' kräver ett värde\n" -#, fuzzy, c-format +#, c-format msgid "config file %s, line %d: problem in options section\n" -msgstr "konfigurationsfil %s, rad %d: ogiltigt sektionsnamn.\n" +msgstr "konfigurationsfil %s, rad %d: problem i alternativsektionen.\n" -#, fuzzy, c-format +#, c-format msgid "" "config file %s, line %d: directive '%s' in repository section '%s' not " "recognized.\n" -msgstr "konfigurationsfil %s, rad %d: direktiv '%s' känns inte igen\n" +msgstr "konfigurationsfil %s, rad %d: direktiv '%s' i sektion '%s' känns inte igen.\n" #, c-format msgid "failed to initialize alpm library (%s)\n" @@ -695,9 +693,9 @@ msgstr "ingen operation specifierad (använd -h för hjälp)\n" msgid "no file was specified for --owns\n" msgstr "ingen fil specifierades för --owns\n" -#, fuzzy, c-format +#, c-format msgid "failed to find '%s' in PATH: %s\n" -msgstr "misslyckades att läsa fil '%s': %s\n" +msgstr "misslyckades hitta '%s' i PATH: %s\n" #, c-format msgid "failed to read file '%s': %s\n" @@ -751,9 +749,9 @@ msgstr "paketet \"%s\" hittades inte\n" msgid "failed to prepare transaction (%s)\n" msgstr "misslyckades att förbereda överföring (%s)\n" -#, fuzzy, c-format +#, c-format msgid ":: package %s does not have a valid architecture\n" -msgstr "'%s' har inte ett giltigt suffix för arkiv." +msgstr ":: paket %s har inte en giltig arkitektur.\n" #, c-format msgid ":: %s: requires %s\n" @@ -767,9 +765,9 @@ msgstr "%s är utnämnd som en HoldPkg.\n" msgid "HoldPkg was found in target list. Do you want to continue?" msgstr "HoldPkg hittades i mållistan. Vill du fortsätta?" -#, fuzzy, c-format +#, c-format msgid " there is nothing to do\n" -msgstr "Inga paket modifierade, ingenting att göra." +msgstr " det finns inget att göra\n" #, c-format msgid "Do you want to remove these packages?" @@ -827,9 +825,9 @@ msgstr "Vill du ta bort ALLA filer från cacen?" msgid "removing all files from cache...\n" msgstr "tar bort alla filer från cachen...\n" -#, fuzzy, c-format +#, c-format msgid "could not access cache directory %s\n" -msgstr "kunde inte få tillgång till cachekatalogen\n" +msgstr "kunde inte få tillgång till cachekatalogen %s\n" #, c-format msgid "File %s does not seem to be a valid package, remove it?" @@ -847,9 +845,9 @@ msgstr " %s är senaste versionen\n" msgid "failed to synchronize any databases\n" msgstr "misslyckades att synkronisera någon databas\n" -#, fuzzy, c-format +#, c-format msgid "installed" -msgstr "installerar" +msgstr "installerad" #, c-format msgid "repository '%s' does not exist\n" @@ -877,11 +875,11 @@ msgstr ":: Påbörjar full systemuppgradering...\n" #, c-format msgid ":: %s and %s are in conflict\n" -msgstr "" +msgstr ":: %s och %s krockar.\n" -#, fuzzy, c-format +#, c-format msgid ":: %s and %s are in conflict (%s)\n" -msgstr ":: %s: strider mot %s\n" +msgstr ":: %s krockar med %s (%s)\n" #, c-format msgid "Proceed with download?" @@ -1028,9 +1026,8 @@ msgstr "FEL: " msgid "Cleaning up..." msgstr "Städar upp..." -#, fuzzy msgid "Unable to find source file %s." -msgstr "Kunde inte hitta källkodsfil %s att extrahera." +msgstr "Kunde inte hitta källkodsfil %s." msgid "Aborting..." msgstr "Avbryter..." @@ -1041,16 +1038,14 @@ msgstr "Det finns ingen agent angedd för att hantera %s URL. Kolla %s." msgid "The download program %s is not installed." msgstr "Nerladdningsprogramet %s är inte installerat." -#, fuzzy msgid "'%s' returned a fatal error (%i): %s" -msgstr "Pacman returnerade ett allvarligt fel (%i): %s" +msgstr "'%s' returnerade ett allvarligt fel (%i): %s" msgid "Installing missing dependencies..." msgstr "Installerar saknade beroenden..." -#, fuzzy msgid "'%s' failed to install missing dependencies." -msgstr "Pacman misslyckades att installera saknade beroenden" +msgstr "'%s' misslyckades att installera saknade beroenden" msgid "Failed to install all missing dependencies." msgstr "Misslyckades att installera alla saknade beroenden." @@ -1065,7 +1060,7 @@ msgid "Retrieving Sources..." msgstr "Hämtar Källor..." msgid "Found %s" -msgstr "" +msgstr "Hittade %s" msgid "%s was not found in the build directory and is not a URL." msgstr "%s hittades inte i byggkatalogen och är inte ett URL" @@ -1130,9 +1125,8 @@ msgstr "Rensar andra filer..." msgid "Compressing man and info pages..." msgstr "Komprimerar man och info sidor..." -#, fuzzy msgid "Stripping unneeded symbols from binaries and libraries..." -msgstr "Tar bort felsökningssymboler från binärer och bibliotek..." +msgstr "Tar bort onödiga symboler från binärer och bibliotek..." msgid "Removing libtool .la files..." msgstr "Tar bort libtool .la filer..." @@ -1149,12 +1143,11 @@ msgstr "Var vänlig och lägg till en licens rad i din %s!" msgid "Example for GPL'ed software: license=('GPL')." msgstr "Exempel för GPL licenserad mjukvara: license=('GPL')." -#, fuzzy msgid "Invalid backup entry : %s" -msgstr "Ej giltig paketfil '%s'." +msgstr "Ej giltigt backupinlägg : %s." msgid "Package contains reference to %s" -msgstr "" +msgstr "Paketet innehåller referens till %s" msgid "Missing pkg/ directory." msgstr "Saknar pkg/ katalog" @@ -1177,13 +1170,11 @@ msgstr "'%s' är inte ett giltig paket-suffix" msgid "Failed to create package file." msgstr "Misslyckades att skapa paketfil." -#, fuzzy msgid "Failed to create symlink to package file." -msgstr "Misslyckades att skapa källkodsfil." +msgstr "Misslyckades att symbolisk länk till paketfil." -#, fuzzy msgid "Skipping integrity checks." -msgstr "Hoppar över kontroll av beroenden." +msgstr "Hoppar över integritetskontroll." msgid "Creating source package..." msgstr "Skapar källpaket" @@ -1191,9 +1182,8 @@ msgstr "Skapar källpaket" msgid "Adding %s..." msgstr "Lägger till %s..." -#, fuzzy msgid "Adding %s file (%s)..." -msgstr "Lägger till %s..." +msgstr "Lägger till fil %s (%s)..." msgid "Compressing source package..." msgstr "Komprimerar källpaket..." @@ -1201,12 +1191,11 @@ msgstr "Komprimerar källpaket..." msgid "Failed to create source package file." msgstr "Misslyckades att skapa källkodsfil." -#, fuzzy msgid "Installing package %s with %s -U..." -msgstr "genererar %s med %s... " +msgstr "Installerar paket %s med %s -U... " msgid "Installing %s package group with %s -U..." -msgstr "" +msgstr "Installerar paketgruppen %s med %s -U..." msgid "Failed to install built package(s)." msgstr "Misslyckades att installera byggt/byggda paket." @@ -1232,13 +1221,11 @@ msgstr "som arch=('%s')." msgid "Provides array cannot contain comparison (< or >) operators." msgstr "Provides raden kan inte innehålla jämförande (< eller >) tecken" -#, fuzzy msgid "Invalid syntax for optdepend : '%s'" -msgstr "ogiltigt värde för 'CleanMethod' : '%s'\n" +msgstr "Fel syntax för optdepend : '%s'" -#, fuzzy msgid "%s file (%s) does not exist." -msgstr "Installations scriptlet (%s) existerar inte." +msgstr "Filen %s (%s) existerar inte." msgid "options array contains unknown option '%s'" msgstr "options raden innehåller okända parametrar '%s'" @@ -1247,7 +1234,7 @@ msgid "missing package function for split package '%s'" msgstr "saknar paketfunktion för att dela paket '%s'" msgid "requested package %s is not provided in %s" -msgstr "" +msgstr "efterfrågat paket %s finns ej i %s" msgid "Determining latest darcs revision..." msgstr "Fastställer senaste darcs revisionen..." @@ -1322,10 +1309,8 @@ msgstr " -m, --nocolor Inaktivera färglagda meddelanden" msgid " -o, --nobuild Download and extract files only" msgstr " -o, --nobuild Ladda ner och extrahera enbart filerna" -#, fuzzy msgid " -p <file> Use an alternate build script (instead of '%s')" -msgstr "" -" -p <buildscript> Använd ett alternativt byggskript (istället för '%s')" +msgstr " -p <file> Använd ett alternativt byggskript (istället för '%s')" msgid "" " -r, --rmdeps Remove installed dependencies after a successful build" @@ -1337,56 +1322,41 @@ msgstr " -R, --repackage Packa om innehållet i paketet utan att bygga om" msgid " -s, --syncdeps Install missing dependencies with pacman" msgstr " -s, --syncdeps Installera saknade beroende med pacman" -#, fuzzy msgid "" " --allsource Generate a source-only tarball including downloaded " "sources" -msgstr "" -" --allsource Generera en tarball innehållandes enbart nerladdade källor" +msgstr " --allsource Generera en tarball innehållandes enbart nerladdade källkodsfiler" -#, fuzzy msgid " --asroot Allow makepkg to run as root user" msgstr " --asroot Tillåt makepkg att köras som root" -#, fuzzy msgid " --config <file> Use an alternate config file (instead of '%s')" -msgstr "" -" --config <config> Använd en alternativ konfigurationsfil (istället för " -"'%s')" +msgstr " --config <file> Använd en alternativ konfigurationsfil (istället för '%s')" -#, fuzzy msgid "" " --holdver Prevent automatic version bumping for development " "PKGBUILDs" -msgstr "" -" --holdver Förhindra automatisk versionsdump för " -"utvecklingsversioner av PKGBUILDs " +msgstr " --holdver Förhindra automatisk versionsuppdatering för utvecklingsversioner av PKGBUILDs " msgid " --pkg <list> Only build listed packages from a split package" -msgstr "" +msgstr " --pkg <list> Bygg endast listade paket från ett delat paket" -#, fuzzy msgid " --skipinteg Do not fail when integrity checks are missing" msgstr " --skipinteg Misslyckas inte när integritetskontroller saknas" -#, fuzzy msgid "" " --source Generate a source-only tarball without downloaded sources" -msgstr "" -" --source Generera en tarball med enbart källkoden utan att ladda " -"ner källor" +msgstr " --source Generera en tarball med enbart källkod utan nerladdade källkodsfiler" msgid "These options can be passed to pacman:" msgstr "Dessa argument kan skickas till pacman:" -#, fuzzy msgid "" " --noconfirm Do not ask for confirmation when resolving dependencies" msgstr "" " --noconfirm Fråga inte efter bekräftelse vid bestämmande av " "beroenden" -#, fuzzy msgid " --noprogressbar Do not show a progress bar when downloading files" msgstr "" " --noprogressbar Visa inte en förloppsindikator vid nerladdning av " @@ -1409,9 +1379,8 @@ msgstr "" msgid "%s not found." msgstr "% hittades inte." -#, fuzzy msgid "You do not have write permission to store packages in %s." -msgstr "Du har inte skrivrättigheter för att spara nerladdningar i %s." +msgstr "Du har inte skrivrättigheter för att spara paket i %s." msgid "You do not have write permission to store downloads in %s." msgstr "Du har inte skrivrättigheter för att spara nerladdningar i %s." @@ -1479,7 +1448,7 @@ msgstr "" "Använd inte flaggan '-F'. Detta argument är enbart för användning av makepkg." msgid "Sudo can not be found. Will use su to acquire root privileges." -msgstr "" +msgstr "Sudo kunde inte hittas, använder su för att få root-rättigheter." msgid "%s does not exist." msgstr "%s existerar inte." @@ -1506,10 +1475,10 @@ msgstr "" "över)" msgid "Repackaging without the use of a package() function is deprecated." -msgstr "" +msgstr "Ompaketering utan att använda en package()-funktion är föråldrat." msgid "File permissions may not be preserved." -msgstr "" +msgstr "Filrättigheterna kanske inte bevaras." msgid "Leaving fakeroot environment." msgstr "Lämnar fakeroot miljö." @@ -1517,9 +1486,8 @@ msgstr "Lämnar fakeroot miljö." msgid "Making package: %s" msgstr "Skapar paket: %s" -#, fuzzy msgid "A source package has already been built. (use -f to overwrite)" -msgstr "Ett paket har redan blivit byggt, (använd -f för att skriva över)" +msgstr "Ett källkodspaket har redan blivit byggt, (använd -f för att skriva över)" msgid "Source package created: %s" msgstr "Källkodspaket skapat: %s" @@ -1536,9 +1504,8 @@ msgstr "Kollar beroenden för bygget..." msgid "Could not resolve all dependencies." msgstr "Kan inte lösa alla beroenden." -#, fuzzy msgid "%s was not found in PATH; skipping dependency checks." -msgstr "pacman hittades inte i PATH; hoppar över kontroll av beroenden." +msgstr "%s hittades inte i PATH; hoppar över kontroll av beroenden." msgid "Skipping source retrieval -- using existing src/ tree" msgstr "" -- 1.7.3.1

2 3