- Pacman-dev - lists.archlinux.org

[pacman-dev] Arguments for alpm_initialize
by Zameer Manji 01 Mar '12

01 Mar '12

Hello, This is my first time posting on this list, so my apologies if this is the incorrect place to ask for help. I've been trying to create a wrapper around libalpm for my own uses and I'm trying to get the project off the ground with a simple program: #include <alpm.h> #include <stdio.h> int main(void) { enum _alpm_errno_t errno = 0; alpm_handle_t* t = alpm_initialize("/", "/var/lib/pacman", &errno); if(t == NULL) { printf("Got APLM handle"); } else { printf("No Handle"); if(errno == 0) { printf("No Error Code Given"); } } alpm_release(t); return 0; } Currently the program outputs "No Handle" and "No Error Code Given". What can I do inorder to either get the handle correctly or get an error code so I can investigate further? -- - Zameer Manji

2 1

[pacman-dev] [PATCH 1/3] Database cleanup enhancements
by Dan McGee 29 Feb '12

29 Feb '12

Ensure we give database signatures special treatment like we already did for package signatures. Attempt to parse the database name out of them before taking the proper steps to handle their existence. This fixes FS#28714. We also add an unlink_verbose() helper method that displays any errors that occur when unlinking, optionally opting to skip any ENOENT errors from being fatal. Finally, the one prompt per unknown database has been removed, this has no real sound purpose and we don't do this for packages. Simply kill databases we don't know about; other programs shouldn't have random data in this directory anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- For maint. src/pacman/sync.c | 71 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 26 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index fcc887a..a9a9e99 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -25,6 +25,7 @@ #include <string.h> #include <limits.h> #include <unistd.h> +#include <errno.h> #include <dirent.h> #include <sys/stat.h> @@ -37,6 +38,20 @@ #include "package.h" #include "conf.h" +static int unlink_verbose(const char *pathname, int ignore_missing) +{ + int ret = unlink(pathname); + if(ret) { + if(ignore_missing && errno == ENOENT) { + ret = 0; + } else { + pm_printf(ALPM_LOG_ERROR, _("could not remove %s: %s\n"), + pathname, strerror(errno)); + } + } + return ret; +} + /* if keep_used != 0, then the db files which match an used syncdb * will be kept */ static int sync_cleandb(const char *dbpath, int keep_used) @@ -44,6 +59,7 @@ static int sync_cleandb(const char *dbpath, int keep_used) DIR *dir; struct dirent *ent; alpm_list_t *syncdbs; + int ret = 0; dir = opendir(dbpath); if(dir == NULL) { @@ -60,6 +76,7 @@ static int sync_cleandb(const char *dbpath, int keep_used) struct stat buf; int found = 0; const char *dname = ent->d_name; + char *dbname; size_t len; if(strcmp(dname, ".") == 0 || strcmp(dname, "..") == 0) { @@ -79,44 +96,46 @@ static int sync_cleandb(const char *dbpath, int keep_used) /* remove all non-skipped directories and non-database files */ stat(path, &buf); - len = strlen(path); - if(S_ISDIR(buf.st_mode) || strcmp(path + len - 3, ".db") != 0) { + if(S_ISDIR(buf.st_mode)) { if(rmrf(path)) { - pm_printf(ALPM_LOG_ERROR, - _("could not remove %s\n"), path); - closedir(dir); - return 1; + pm_printf(ALPM_LOG_ERROR, _("could not remove %s: %s\n"), + path, strerror(errno)); } continue; } + len = strlen(dname); + if(len > 3 && strcmp(dname + len - 3, ".db") == 0) { + dbname = strndup(dname, len - 3); + } else if(len > 7 && strcmp(dname + len - 7, ".db.sig") == 0) { + dbname = strndup(dname, len - 7); + } else { + ret += unlink_verbose(path, 0); + continue; + } + if(keep_used) { alpm_list_t *i; - len = strlen(dname); - char *dbname = strndup(dname, len - 3); for(i = syncdbs; i && !found; i = alpm_list_next(i)) { alpm_db_t *db = alpm_list_getdata(i); found = !strcmp(dbname, alpm_db_get_name(db)); } - free(dbname); } - /* We have a database that doesn't match any syncdb. - * Ask the user if he wants to remove it. */ - if(!found) { - if(!yesno(_("Do you want to remove %s?"), path)) { - continue; - } - if(rmrf(path)) { - pm_printf(ALPM_LOG_ERROR, - _("could not remove %s\n"), path); - closedir(dir); - return 1; - } + /* We have a database that doesn't match any syncdb. */ + if(!found) { + /* ENOENT check is because the signature and database could come in any + * order in our readdir() call, so either file may already be gone. */ + snprintf(path, PATH_MAX, "%s%s.db", dbpath, dbname); + ret += unlink_verbose(path, 1); + /* unlink a signature file if present too */ + snprintf(path, PATH_MAX, "%s%s.db.sig", dbpath, dbname); + ret += unlink_verbose(path, 1); } + free(dbname); } closedir(dir); - return 0; + return ret; } static int sync_cleandb_all(void) @@ -130,6 +149,7 @@ static int sync_cleandb_all(void) if(!yesno(_("Do you want to remove unused repositories?"))) { return 0; } + printf(_("removing unused sync repositories...\n")); /* The sync dbs were previously put in dbpath/ but are now in dbpath/sync/. * We will clean everything in dbpath/ except local/, sync/ and db.lck, and * only the unused sync dbs in dbpath/sync/ */ @@ -142,7 +162,6 @@ static int sync_cleandb_all(void) ret += sync_cleandb(newdbpath, 1); free(newdbpath); - printf(_("Database directory cleaned up\n")); return ret; } @@ -210,7 +229,7 @@ static int sync_cleancache(int level) /* short circuit for removing all files from cache */ if(level > 1) { - unlink(path); + ret += unlink_verbose(path, 0); continue; } @@ -256,11 +275,11 @@ static int sync_cleancache(int level) if(delete) { size_t pathlen = strlen(path); - unlink(path); + ret += unlink_verbose(path, 0); /* unlink a signature file if present too */ if(PATH_MAX - 5 >= pathlen) { strcpy(path + pathlen, ".sig"); - unlink(path); + ret += unlink_verbose(path, 1); } } } -- 1.7.9.2

1 2

[pacman-dev] [PATCH] Write mtree of package files to local database
by Allan McRae 28 Feb '12

28 Feb '12

When installing a package, write an mtree of the package files into the local database. This will be useful for doing validation of all files on a system. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Query: should we keep the info on .INSTALL and .CHANGELOG files? Changing a .INSTALL file would be an interesting tactic, but if someone is doing that then they can already adjust the mtree file... Also, from http://goo.gl/Uq6X5 it appears that this could be made more efficient by reusing the file descriptor, but I could not get that working after many, many, many attempts. lib/libalpm/add.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index b007766..31313a7 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -449,6 +449,68 @@ needbackup_cleanup: return errors; } +static int write_package_mtree(alpm_handle_t *handle, alpm_pkg_t *pkg, const char *file) +{ + char *path; + struct archive *archive, *mtree; + struct archive_entry *entry; + struct stat buf; + char buffer[ALPM_BUFFER_SIZE]; + int fd, ret = 0, read = 0; + + _alpm_log(handle, ALPM_LOG_DEBUG, "creating package mtree\n"); + + fd = _alpm_open_archive(handle, file, &buf, + &archive, ALPM_ERR_PKG_OPEN); + if(fd < 0) { + ret = ALPM_ERR_PKG_OPEN; + goto error; + } + + if((mtree = archive_write_new()) == NULL) { + ret = ALPM_ERR_LIBARCHIVE; + archive_read_finish(archive); + goto error; + } + + archive_write_set_format_mtree(mtree); + archive_write_set_compression_gzip(mtree); + + /* output the type, uid, gid, mode, size, time, md5 and link fields */ + archive_write_set_options(mtree, "use-set,!device,!flags,!gname,!nlink,!uname,md5"); + + path = _alpm_local_db_pkgpath(handle->db_local, pkg, "files.mtree"); + + if(archive_write_open_filename(mtree, path) != ARCHIVE_OK) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"), + path, archive_error_string(archive)); + ret = ALPM_ERR_DB_WRITE; + goto cleanup; + } + + while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) { + const char *entryname = archive_entry_pathname(entry); + if(*entryname != '.') { + archive_write_header(mtree, entry); + while ((read = archive_read_data(archive, &buffer, ALPM_BUFFER_SIZE)) > 0) { + archive_write_data(mtree, buffer, read); + } + } + } + +cleanup: + archive_read_finish(archive); + archive_write_finish(mtree); + free(path); + + if(ret == 0) { + return 0; + } + +error: + RET_ERR(handle, ret, -1); +} + static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, size_t pkg_current, size_t pkg_count) { @@ -589,6 +651,12 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, archive_read_finish(archive); CLOSE(fd); + if(write_package_mtree(handle, newpkg, pkgfile) == -1) + { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not create mtree file (%s)\n"), alpm_strerror(handle->pm_errno)); + } + /* restore the old cwd if we have it */ if(cwdfd >= 0) { if(fchdir(cwdfd) != 0) { -- 1.7.9.1

2 3

[pacman-dev] little translation error
by solsTiCe d'Hiver 27 Feb '12

27 Feb '12

hi. I have sent a message about that to shining on transifex, but it seems to go unnoticed so I am reposting it here ==================== salut, j'ai noté cette petite erreur de traduction: #, c-format msgid ":: Import PGP key %s, \"%s\", created %s?" msgstr ":: Importation de la clé PGP %s, « %s », %s créée ?" en fait ça serait plutôt msgstr ":: Importation de la clé PGP %s, « %s », créée le %s ?" non ? parce que à l'heure actuelle ça donne des messages comme ça: Erreur : apg: key "65C110C1EA433FC7" is unknown :: Importation de la clé PGP EA433FC7, « Sergej Pupykin <ml(a)sergej.pp.ru> », 2011-07-15 créée ? [O/n] =======================

3 2

[pacman-dev] [PATCH v2] Do not dereference symlinks when calculating size
by Allan McRae 25 Feb '12

25 Feb '12

Passing the "-L" flag to stat means we get the size of the file being pointed to for symlinks instead of the size of the symlink. Keep "-L" usage in repo-add as we want the actual size of the package/delta/signature there. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Version 2: Now with less repo-add breakage... configure.ac | 6 +++--- scripts/repo-add.sh.in | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index cfd3340..12a6e65 100644 --- a/configure.ac +++ b/configure.ac @@ -256,14 +256,14 @@ GCC_VISIBILITY_CC GCC_GNU89_INLINE_CC # Host-dependant definitions -SIZECMD="stat -L -c %s" +SIZECMD="stat -c %s" SEDINPLACE="sed -i" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded" STRIP_STATIC="--strip-debug" case "${host_os}" in *bsd*) - SIZECMD="stat -L -f %z" + SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" ;; cygwin*) @@ -272,7 +272,7 @@ case "${host_os}" in ;; darwin*) host_os_darwin=yes - SIZECMD="/usr/bin/stat -L -f %z" + SIZECMD="/usr/bin/stat -f %z" SEDINPLACE="/usr/bin/sed -i ''" STRIP_BINARIES="" STRIP_SHARED="-S" diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index b113bad..043a0b8 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -144,7 +144,7 @@ db_write_delta() { # get md5sum and compressed size of package md5sum="$(openssl dgst -md5 "$deltafile")" md5sum="${md5sum##* }" - csize=$(@SIZECMD@ "$deltafile") + csize=$(@SIZECMD@ -L "$deltafile") oldfile=$(xdelta3 printhdr $deltafile | grep "XDELTA filename (source)" | sed 's/.*: *//') newfile=$(xdelta3 printhdr $deltafile | grep "XDELTA filename (output)" | sed 's/.*: *//') @@ -294,7 +294,7 @@ db_write_entry() { # compute base64'd PGP signature if [[ -f "$pkgfile.sig" ]]; then - pgpsigsize=$(@SIZECMD@ "$pkgfile.sig") + pgpsigsize=$(@SIZECMD@ -L "$pkgfile.sig") if (( pgpsigsize > 16384 )); then error "$(gettext "Invalid package signature file '%s'.")" "$pkgfile.sig" return 1 @@ -303,7 +303,7 @@ db_write_entry() { pgpsig=$(openssl base64 -in "$pkgfile.sig" | tr -d '\n') fi - csize=$(@SIZECMD@ "$pkgfile") + csize=$(@SIZECMD@ -L "$pkgfile") # compute checksums msg2 "$(gettext "Computing checksums...")" -- 1.7.9.2

1 0

[pacman-dev] [PATCH] Do not dereference symlinks when calculating size
by Allan McRae 25 Feb '12

25 Feb '12

Passing the "-L" flag to stat means we get the size of the file being pointed to for symlinks instead of the size of the symlink. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index cfd3340..12a6e65 100644 --- a/configure.ac +++ b/configure.ac @@ -256,14 +256,14 @@ GCC_VISIBILITY_CC GCC_GNU89_INLINE_CC # Host-dependant definitions -SIZECMD="stat -L -c %s" +SIZECMD="stat -c %s" SEDINPLACE="sed -i" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded" STRIP_STATIC="--strip-debug" case "${host_os}" in *bsd*) - SIZECMD="stat -L -f %z" + SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" ;; cygwin*) @@ -272,7 +272,7 @@ case "${host_os}" in ;; darwin*) host_os_darwin=yes - SIZECMD="/usr/bin/stat -L -f %z" + SIZECMD="/usr/bin/stat -f %z" SEDINPLACE="/usr/bin/sed -i ''" STRIP_BINARIES="" STRIP_SHARED="-S" -- 1.7.9.2

2 2

[pacman-dev] pacman on NetBSD
by Schreiberstein 22 Feb '12

22 Feb '12

Hello! I'm trying to build pacman on NetBSD 5.1x, but unfortunately it fails : http://pastebin.com/9NkbdX4G How to solve this problem? ("use arch" is not an option ;-) ) Have a nice day! Alex

3 2

[pacman-dev] [PATCH] Fix SyncFirst Not Checking For Ignored Packages
by Richard Pougnet 21 Feb '12

21 Feb '12

commit b6d3336284e4097b56aea098c18f3f551460d7cb Author: Richard Pougnet <richard(a)pougnet.ca> Date: Mon Feb 20 23:50:08 2012 -0400 Fix FS#26445 Add a new function to determine if the package selected to be upgr aded is also inside the ignore list. If so, override the SyncFirst option and skip the package installation. diff --git a/src/pacman/sync.c b/src/pacman/sync.c index f370f82..64099e2 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -556,6 +556,9 @@ static alpm_list_t *syncfirst(void) { for(i = config->syncfirst; i; i = alpm_list_next(i)) { const char *pkgname = i->data; + if(alpm_list_find_str(config->ignorepkg, pkgname)){ + continue; + } alpm_pkg_t *pkg = alpm_db_get_pkg(db_local, pkgname); if(pkg == NULL) { continue;

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.2-148-g687f7b6
by dan＠archlinux.org 21 Feb '12

21 Feb '12

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 687f7b6ba833db836d8d8387c5b728238b0eac5d (commit) from 3849c3aec130601572b9e06b42bb6af5938936de (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 687f7b6ba833db836d8d8387c5b728238b0eac5d Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 21 09:58:56 2012 +1000 Use "mode" in _alpm_makepath_mode It seems that if we pass the permissions that we want the created directory to have, then we should probably use it... Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Use "mode" in _alpm_makepath_mode
by Allan McRae 21 Feb '12

21 Feb '12

It seems that if we pass the permissions that we want the created directory to have, then we should probably use it... Signed-off-by: Allan McRae <allan(a)archlinux.org> --- <falconindy> NOW I LOOK LIKE THE ASS WHO DIDNT FIX IT lib/libalpm/util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index ba079f4..22e9e35 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -118,7 +118,7 @@ int _alpm_makepath_mode(const char *path, mode_t mode) /* temporarily mask the end of the path */ *ptr = '\0'; - if(mkdir(str, 0755) < 0 && errno != EEXIST) { + if(mkdir(str, mode) < 0 && errno != EEXIST) { ret = 1; goto done; } @@ -129,7 +129,7 @@ int _alpm_makepath_mode(const char *path, mode_t mode) /* end of the string. add the full path. It will already exist when the path * passed in has a trailing slash. */ - if(mkdir(str, 0755) < 0 && errno != EEXIST) { + if(mkdir(str, mode) < 0 && errno != EEXIST) { ret = 1; } -- 1.7.9.1

1 0