- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] sync_prepare: exclude removals from resolvedeps
by Andrew Gregory 03 Mar '15

03 Mar '15

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 44a0ba8..cf7f0a8 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -402,7 +402,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { alpm_list_t *resolved = NULL; - alpm_list_t *remove = NULL; + alpm_list_t *remove = alpm_list_copy(trans->remove); alpm_list_t *localpkgs; /* Build up list by repeatedly resolving each transaction package */ -- 1.9.0

2 1

[pacman-dev] [PATCH 1/2] PKGBUILD.5.txt: Add note about functions starting in $srcdir
by Johannes Löthberg 03 Mar '15

03 Mar '15

From: Johannes Löthberg <johannes(a)kyriasis.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- doc/PKGBUILD.5.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 10980ab..2dba100 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -374,6 +374,9 @@ variables for use during the build and install process: *srcdir*:: This contains the directory where makepkg extracts, or copies, all source files. ++ +All of the above defined packaging functions in PKGBUILDs are run from inside +the `$srcdir` *pkgdir*:: This contains the directory where makepkg bundles the installed package. -- 2.3.0

3 6

[pacman-dev] [PATCH] Allow UPX compression for DOS/Win executables
by David Macek 03 Mar '15

03 Mar '15

Hi. This change allows makepkg to UPX-compress executables on Windows, but will probably affect some Linux packages as well (I'm guessing gdbserver, wine, mingw-w64). --- scripts/libmakepkg/tidy/upx.sh.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/tidy/upx.sh.in b/scripts/libmakepkg/tidy/upx.sh.in index ec40b2e..d699f0f 100644 --- a/scripts/libmakepkg/tidy/upx.sh.in +++ b/scripts/libmakepkg/tidy/upx.sh.in @@ -35,10 +35,12 @@ tidy_upx() { msg2 "$(gettext "Compressing binaries with %s...")" "UPX" local binary find . -type f -perm -u+w 2>/dev/null | while read -r binary ; do - if [[ $(file --brief --mime-type "$binary") = 'application/x-executable' ]]; then + case "$(file --brief --mime-type "$binary")" in + 'application/x-executable' | 'application/x-dosexec') upx "${UPXFLAGS[@]}" "$binary" &>/dev/null || warning "$(gettext "Could not compress binary : %s")" "${binary/$pkgdir\//}" - fi + ;; + esac done fi } -- 1.9.4.msysgit.2 -- David Macek

2 1

[pacman-dev] Patches for QNX support
by Will Miles 27 Feb '15

27 Feb '15

This patch set adds support for the QNX RTOS. The first four patches are essentially workarounds for QNX's libc; the last patch implements the QNX-specific sections in libalpm.

2 7

[pacman-dev] Doc bug in PKGBUILD(5)
by Eric Côté 25 Feb '15

25 Feb '15

Hi, I was reading the online HTML man page, and noticed a doc bug. Here's the relevant section, verbatim, except I put **** around the bug: ===== Using VCS Sources Building a developmental version of a package using sources from a version control system (VCS) is enabled by specifying the source in the form source=('folder::url#fragment'). Currently makepkg supports the bzr, git, hg and svn protocols. The source URL is divided into three components: folder (optional) Specifies an alternate folder name for makepkg to download the VCS source into. url The url to the VCS repo. This must include ****the the**** vcs in the URL protocol for makepkg to recognize this as a VCS source. If the protocol does not include the VCS name, it can be added by prefixing the URL with vcs+. For example, using a git repository over http would have a source URL in the form git+http://.... ===== A double 'the' is present. Thanks, Eric -- Sent from my Android device. -- Sent from my Android device.

2 1

[pacman-dev] [PATCH] calculate_removed_size: ensure llstat succeeds
by Allan McRae 24 Feb '15

24 Feb '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/diskspace.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 3b496c2..aaa0036 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -235,7 +235,12 @@ static int calculate_removed_size(alpm_handle_t *handle, const char *filename = file->name; snprintf(path, PATH_MAX, "%s%s", handle->root, filename); - llstat(path, &st); + + if(llstat(path, &st) == -1) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not get file information for %s\n"), filename); + continue; + } /* skip directories and symlinks to be consistent with libarchive that * reports them to be zero size */ -- 2.3.0

1 0

[pacman-dev] [PATCH] sync_cleandb: ensure stat call succeeds
by Allan McRae 24 Feb '15

24 Feb '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/sync.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 91eca7e..0c3151e 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -94,7 +94,10 @@ static int sync_cleandb(const char *dbpath, int keep_used) snprintf(path, PATH_MAX, "%s%s", dbpath, dname); /* remove all non-skipped directories and non-database files */ - stat(path, &buf); + if(stat(path, &buf) == -1) { + pm_printf(ALPM_LOG_ERROR, _("could not remove %s: %s\n"), + path, strerror(errno)); + } if(S_ISDIR(buf.st_mode)) { if(rmrf(path)) { pm_printf(ALPM_LOG_ERROR, _("could not remove %s: %s\n"), -- 2.3.0

1 0

[pacman-dev] [PATCH] pacsort: test string is not NULL before strlen
by Allan McRae 24 Feb '15

24 Feb '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/util/pacsort.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 02b9084..d864fdb 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -399,9 +399,13 @@ static int vercmp(const void *p1, const void *p2) static char escape_char(const char *string) { + if(!string) { + return -1; + } + const size_t len = strlen(string); - if(!string || len > 2) { + if(len > 2) { return -1; } -- 2.3.0

1 0

[pacman-dev] [PATCH] Abort of failure to add version file to empty local database
by Allan McRae 24 Feb '15

24 Feb '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_local.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 6fd6cd5..556157d 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -384,6 +384,11 @@ static int local_db_add_version(alpm_db_t UNUSED *db, const char *dbpath) snprintf(dbverpath, PATH_MAX, "%sALPM_DB_VERSION", dbpath); dbverfile = fopen(dbverpath, "w"); + + if(dbverfile == NULL) { + return 1; + } + fprintf(dbverfile, "%zu\n", ALPM_LOCAL_DB_VERSION); fclose(dbverfile); @@ -397,7 +402,10 @@ static int local_db_create(alpm_db_t *db, const char *dbpath) dbpath, strerror(errno)); RET_ERR(db->handle, ALPM_ERR_DB_CREATE, -1); } - local_db_add_version(db, dbpath); + if(local_db_add_version(db, dbpath) != 0) { + return 1; + } + return 0; } @@ -459,7 +467,9 @@ static int local_db_validate(alpm_db_t *db) } } - local_db_add_version(db, dbpath); + if(local_db_add_version(db, dbpath) != 0) { + goto version_error; + } goto version_latest; } -- 2.3.0

1 0

[pacman-dev] [PATCH] parse_descfile: fix memory leak in error case
by Allan McRae 24 Feb '15

24 Feb '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 3e27232..e284254 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -237,7 +237,7 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * } else if(strcmp(key, "backup") == 0) { alpm_backup_t *backup; CALLOC(backup, 1, sizeof(alpm_backup_t), return -1); - STRDUP(backup->name, ptr, return -1); + STRDUP(backup->name, ptr, FREE(backup); return -1); newpkg->backup = alpm_list_add(newpkg->backup, backup); } else if(strcmp(key, "force") == 0) { /* deprecated, skip it */ -- 2.3.0

1 0