- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] Fix memory leaks in dump_pkg_ful
by Allan McRae 24 Feb '15

24 Feb '15

Leaks when using -Sii with package signatures Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/package.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pacman/package.c b/src/pacman/package.c index 14a7b9f..33184bd 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -201,6 +201,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) alpm_decode_signature(base64_sig, &decoded_sigdata, &data_len); alpm_extract_keyid(config->handle, alpm_pkg_get_name(pkg), decoded_sigdata, data_len, &keys); + free(decoded_sigdata); } else { keys = alpm_list_add(keys, _("None")); } @@ -208,6 +209,10 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) string_display(_("MD5 Sum :"), alpm_pkg_get_md5sum(pkg), cols); string_display(_("SHA-256 Sum :"), alpm_pkg_get_sha256sum(pkg), cols); list_display(_("Signatures :"), keys, cols); + + if(base64_sig) { + FREELIST(keys); + } } else { list_display(_("Validated By :"), validation, cols); } -- 2.3.0

1 0

[pacman-dev] Delete just $pkgdir instead of whole $pkgdirbase
by David Macek 24 Feb '15

24 Feb '15

Hi. makepkg deletes the whole $pkgdirbase directory before starting build(). <https://github.com/elieux/pacman/blob/upstream/scripts/makepkg.sh.in#L3460> I propose a change to delete just $pkgdir, and an addition of similar code before starting package*(). I don't see any downside to this (except for the time it takes to implement the change) and I give two reasons for the change: Reason 1: in case $pkgdirbase is a symlink, it gets re-created as a regular directory, which is probably unwanted behavior. The MSYS2 guys even have a patch for this. <https://github.com/elieux/pacman/blob/master/scripts/makepkg.sh.in#L3378-33…> Reason 2: in case makepkg is ran twice in the same directory (but with different configurations and different $pkgname), the second run deletes the $pkgdirbase of the first run, but sometimes it's beneficial to inspect the $pkgdir after makepkg has finished. This may seem as an obscure use-case, but it's very common with the MSYS2 project. <https://github.com/elieux/MSYS2-packages/blob/master/pacman/makepkg-mingw> (Since this seems to be a fairly easy thing to change, I may even prepare a patch myself.) -- David Macek

2 7