- Pacman-dev - lists.archlinux.org

[pacman-dev] What to do with pacsysclean and pacsize?
by Allan McRae 20 Nov '14

20 Nov '14

pacsysclean is broken... In short it only looks for KiB in output to assess file size, whereas pacman now outputs the correct thing. See [1]. No-one has bothered to fix this. pacsize was submitted as a replacement [2]. It currently works, but is another tool that parses pacman output. I think we should remove pacsysclean and not add pacsize. There is expac available (and potentially being added to the pacman codebase for the next release). [I am told expac can do the same thing but I don't know how...] Opinions? [1] https://bugs.archlinux.org/task/41531 [2] https://patchwork.archlinux.org/patch/2030/

3 3

[pacman-dev] [PATCH] checkupdates: do not print ignored packages
by Allan McRae 19 Nov '14

19 Nov '14

FS#41223 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/checkupdates.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index 06e1b12..f4f36c0 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -44,7 +44,7 @@ eval $(awk -F' *= *' '$1 ~ /DBPath/ { print $1 "=" $2 }' @sysconfdir@/pacman.con mkdir -p "$CHECKUPDATES_DB" ln -s "${DBPath}/local" "$CHECKUPDATES_DB" &> /dev/null fakeroot pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null &> /dev/null -pacman -Qqu --dbpath "$CHECKUPDATES_DB" 2> /dev/null +pacman -Qqu --dbpath "$CHECKUPDATES_DB" 2> /dev/null | grep -v '\[.*\]' exit 0 -- 2.1.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-502-gef0577e
by allan＠archlinux.org 19 Nov '14

19 Nov '14

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 ef0577e3d5560c2d7f2869586219040beffdbb6b (commit) via 3446453c72b7fea6e07d0e1f5a547a870bf60484 (commit) via 193b2b33f86e549f15feb5fe82a83de88b5c7e98 (commit) via db402d6029c77d6fa7d8295b529edf9ff0f605ce (commit) via eda65967ec6831515fdcc59adec1529da81cb521 (commit) via 96e9cf35f11f271e46af8d3c0f00c9664052fc74 (commit) via 5d11605958dd9d07f902287468104a996b3bddcc (commit) via 5d618438c4831af92e82251051a128e8591fef59 (commit) via a7298c36fdc58ae4d9007a69adea988fbb9cd0db (commit) via d9aa7025ea8c9441bfd50b339a7accc7b61637ab (commit) via 8c00dd7341e6df4ebe8c6ac9d9347acdcbb003b7 (commit) via 4c1f41a7c18355542d9d7f5c58ac5a026a71bb4d (commit) from 0d249949345e69fc1728df236569d1153582244c (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 ef0577e3d5560c2d7f2869586219040beffdbb6b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Nov 18 09:02:05 2014 -0500 version: fix memory leak in early return Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3446453c72b7fea6e07d0e1f5a547a870bf60484 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 18 15:26:42 2014 +1000 Fix translation error and remove empty po files Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 193b2b33f86e549f15feb5fe82a83de88b5c7e98 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 18 15:14:51 2014 +1000 Update po files to send to Transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> commit db402d6029c77d6fa7d8295b529edf9ff0f605ce Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 18 15:06:30 2014 +1000 Pull translation updates from Transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> commit eda65967ec6831515fdcc59adec1529da81cb521 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 18 12:50:56 2014 +1000 Do not warn about missing files in NoExtract When checking a packages files, ignore any missing files in NoExtract Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 96e9cf35f11f271e46af8d3c0f00c9664052fc74 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 18 12:31:30 2014 +1000 Add alpm_option_match_noextract This is useful for frontends testing whether a file is in NoExtract Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5d11605958dd9d07f902287468104a996b3bddcc Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 18 00:47:19 2014 +1000 extract_single_file: fix memory leak in error condition The memory assigned to checkfile was leaked in the error condition. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5d618438c4831af92e82251051a128e8591fef59 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 18 00:34:46 2014 +1000 _alpm_backup_dup: fix memory leak in error case Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a7298c36fdc58ae4d9007a69adea988fbb9cd0db Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 18 00:09:11 2014 +1000 makepkg: symlink files in noextract into $srcdir File in noextract should still be symlinked into $srcdir so that they can be accessed without using $SRCDEST. Using noextract on VCS files makes no sense as these are not being extracted, so now this does nothing. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d9aa7025ea8c9441bfd50b339a7accc7b61637ab Author: Allan McRae <allan(a)archlinux.org> Date: Mon Nov 17 23:39:31 2014 +1000 Remove logging of NoExtract events With globbing in NoExtract, these log events can quickly pile up hiding important information from the log. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8c00dd7341e6df4ebe8c6ac9d9347acdcbb003b7 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Nov 17 17:13:48 2014 +1000 Fix crash when using external downloader Commit 9d96bed9 attempts to use the same effective URL for the db and its signature download. However, this information is not available when we use an external downloader, resulting in a crash. Fall back to the old method when the effective URL is unavailable. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4c1f41a7c18355542d9d7f5c58ac5a026a71bb4d Author: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Date: Mon Dec 9 20:31:21 2013 +0000 makepkg: svn: update existing sources in srcdir without removing them first. This matches the behaviour with non-VCS sources. It also allows incremental builds when subversion is used to obtain sources. Signed-off-by: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 4 +- lib/libalpm/alpm.h | 1 + lib/libalpm/backup.c | 9 +- lib/libalpm/be_sync.c | 21 +- lib/libalpm/handle.c | 5 + lib/libalpm/po/LINGUAS | 2 - lib/libalpm/po/ar.po | 527 +++++++++---- lib/libalpm/po/{eo.po => ast.po} | 55 +- lib/libalpm/po/bg.po | 616 +++++++++++++++ lib/libalpm/po/ca.po | 270 ++++++- lib/libalpm/po/cs.po | 261 ++++++- lib/libalpm/po/da.po | 264 ++++++- lib/libalpm/po/de.po | 279 ++++++- lib/libalpm/po/el.po | 265 ++++++- lib/libalpm/po/en_GB.po | 264 ++++++- lib/libalpm/po/es.po | 376 +++++++-- lib/libalpm/po/{en_GB.po => eu.po} | 313 ++++---- lib/libalpm/po/fi.po | 274 ++++++- lib/libalpm/po/fr.po | 267 ++++++- lib/libalpm/po/gl.po | 273 ++++++- lib/libalpm/po/hr.po | 283 ++++++- lib/libalpm/po/hu.po | 270 ++++++- lib/libalpm/po/id.po | 270 ++++++- lib/libalpm/po/it.po | 259 ++++++- lib/libalpm/po/ja.po | 259 ++++++- lib/libalpm/po/kk.po | 261 ++++++- lib/libalpm/po/ko.po | 279 ++++++- lib/libalpm/po/libalpm.pot | 235 +++++- lib/libalpm/po/lt.po | 259 ++++++- lib/libalpm/po/nb.po | 261 ++++++- lib/libalpm/po/nl.po | 259 ++++++- lib/libalpm/po/pl.po | 263 ++++++- lib/libalpm/po/pt.po | 260 ++++++- lib/libalpm/po/pt_BR.po | 259 ++++++- lib/libalpm/po/ro.po | 284 ++++++- lib/libalpm/po/ru.po | 259 ++++++- lib/libalpm/po/sk.po | 259 ++++++- lib/libalpm/po/sl.po | 508 +++++++++---- lib/libalpm/po/sr.po | 274 ++++++- lib/libalpm/po/sr(a)latin.po | 274 ++++++- lib/libalpm/po/sv.po | 288 ++++++- lib/libalpm/po/tr.po | 259 ++++++- lib/libalpm/po/uk.po | 259 ++++++- lib/libalpm/po/{eo.po => ur.po} | 118 +-- lib/libalpm/po/{fa.po => uz.po} | 36 +- lib/libalpm/po/{fa.po => vi.po} | 68 +- lib/libalpm/po/zh_CN.po | 261 ++++++- lib/libalpm/po/zh_TW.po | 264 ++++++- lib/libalpm/version.c | 3 +- scripts/makepkg.sh.in | 17 +- scripts/po/LINGUAS | 4 - scripts/po/ar.po | 944 ++++++++++++++++++----- scripts/po/{eo.po => ast.po} | 138 ++-- scripts/po/{nl.po => bg.po} | 211 +++--- scripts/po/ca.po | 838 ++++++++++++++++++--- scripts/po/cs.po | 826 +++++++++++++++++--- scripts/po/da.po | 838 ++++++++++++++++++--- scripts/po/de.po | 956 +++++++++++++++++++---- scripts/po/el.po | 832 +++++++++++++++++--- scripts/po/en_GB.po | 826 +++++++++++++++++--- scripts/po/es.po | 1466 +++++++++++++++++++++++++++--------- scripts/po/eu.po | 1214 +++++++++++++++++++++++++++++ scripts/po/fa.po | 1205 ----------------------------- scripts/po/fi.po | 874 ++++++++++++++++++--- scripts/po/fr.po | 852 ++++++++++++++++++--- scripts/po/gl.po | 1318 +++++++++++++++++++++++++------- scripts/po/hr.po | 810 +++++++++++++++++--- scripts/po/hu.po | 835 +++++++++++++++++--- scripts/po/id.po | 837 +++++++++++++++++--- scripts/po/it.po | 823 ++++++++++++++++++-- scripts/po/ja.po | 822 +++++++++++++++++--- scripts/po/kk.po | 765 +++++++++++++++++-- scripts/po/ko.po | 1453 ++++++++++++++++++++++++++--------- scripts/po/lt.po | 824 +++++++++++++++++--- scripts/po/nb.po | 832 +++++++++++++++++--- scripts/po/pacman-scripts.pot | 703 +++++++++++++++-- scripts/po/pl.po | 1067 +++++++++++++++++++++----- scripts/po/pt.po | 834 +++++++++++++++++--- scripts/po/pt_BR.po | 832 +++++++++++++++++--- scripts/po/ro.po | 863 ++++++++++++++++++--- scripts/po/ru.po | 830 +++++++++++++++++--- scripts/po/sk.po | 823 +++++++++++++++++--- scripts/po/sl.po | 958 +++++++++++++++++++---- scripts/po/sr.po | 830 +++++++++++++++++--- scripts/po/sr(a)latin.po | 830 +++++++++++++++++--- scripts/po/sv.po | 1196 +++++++++++++++++++++++------ scripts/po/tr.po | 824 +++++++++++++++++--- scripts/po/uk.po | 826 +++++++++++++++++--- scripts/po/{zh_TW.po => uz.po} | 116 +-- scripts/po/zh_CN.po | 817 ++++++++++++++++++-- src/pacman/check.c | 30 +- src/pacman/po/ar.po | 777 ++++++++++++++----- src/pacman/po/{gl.po => ast.po} | 641 +++++++--------- src/pacman/po/bg.po | 1274 +++++++++++++++++++++++++++++++ src/pacman/po/ca.po | 554 ++++++++++++-- src/pacman/po/cs.po | 547 ++++++++++++-- src/pacman/po/da.po | 544 +++++++++++-- src/pacman/po/de.po | 591 ++++++++++++--- src/pacman/po/el.po | 539 +++++++++++-- src/pacman/po/en_GB.po | 539 +++++++++++-- src/pacman/po/eo.po | 507 +++++++++++-- src/pacman/po/es.po | 878 +++++++++++++++------ src/pacman/po/{da.po => eu.po} | 704 ++++++++--------- src/pacman/po/fa.po | 475 ++++++++++-- src/pacman/po/fi.po | 554 ++++++++++++-- src/pacman/po/fr.po | 556 ++++++++++++-- src/pacman/po/gl.po | 711 +++++++++++++---- src/pacman/po/hr.po | 592 ++++++++++++--- src/pacman/po/hu.po | 544 +++++++++++-- src/pacman/po/id.po | 541 +++++++++++-- src/pacman/po/it.po | 576 +++++++++++--- src/pacman/po/ja.po | 539 +++++++++++-- src/pacman/po/kk.po | 520 +++++++++++-- src/pacman/po/ko.po | 1079 ++++++++++++++++++-------- src/pacman/po/lt.po | 541 +++++++++++-- src/pacman/po/nb.po | 590 ++++++++++++--- src/pacman/po/nl.po | 1078 ++++++++++++++++++-------- src/pacman/po/pacman.pot | 455 +++++++++-- src/pacman/po/pl.po | 861 +++++++++++++++------ src/pacman/po/pt.po | 544 +++++++++++-- src/pacman/po/pt_BR.po | 543 +++++++++++-- src/pacman/po/ro.po | 600 ++++++++++++--- src/pacman/po/ru.po | 540 +++++++++++-- src/pacman/po/sk.po | 539 +++++++++++-- src/pacman/po/sl.po | 770 ++++++++++++++----- src/pacman/po/sr.po | 551 ++++++++++++-- src/pacman/po/sr(a)latin.po | 551 ++++++++++++-- src/pacman/po/sv.po | 632 +++++++++++++--- src/pacman/po/tr.po | 540 +++++++++++-- src/pacman/po/uk.po | 539 +++++++++++-- src/pacman/po/{ko.po => ur.po} | 63 +- src/pacman/po/{ko.po => uz.po} | 180 +++-- src/pacman/po/zh_CN.po | 547 ++++++++++++-- src/pacman/po/zh_TW.po | 536 +++++++++++-- 134 files changed, 58870 insertions(+), 12288 deletions(-) copy lib/libalpm/po/{eo.po => ast.po} (90%) create mode 100644 lib/libalpm/po/bg.po copy lib/libalpm/po/{en_GB.po => eu.po} (53%) rename lib/libalpm/po/{eo.po => ur.po} (72%) copy lib/libalpm/po/{fa.po => uz.po} (92%) rename lib/libalpm/po/{fa.po => vi.po} (82%) rename scripts/po/{eo.po => ast.po} (87%) rename scripts/po/{nl.po => bg.po} (80%) create mode 100644 scripts/po/eu.po delete mode 100644 scripts/po/fa.po rename scripts/po/{zh_TW.po => uz.po} (90%) copy src/pacman/po/{gl.po => ast.po} (57%) create mode 100644 src/pacman/po/bg.po copy src/pacman/po/{da.po => eu.po} (52%) copy src/pacman/po/{ko.po => ur.po} (95%) copy src/pacman/po/{ko.po => uz.po} (87%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] version: fix memory leak in early return
by Dave Reisner 18 Nov '14

18 Nov '14

--- lib/libalpm/version.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c index 0048167..6d68aac 100644 --- a/lib/libalpm/version.c +++ b/lib/libalpm/version.c @@ -109,7 +109,8 @@ static int rpmvercmp(const char *a, const char *b) /* If the separator lengths were different, we are also finished */ if ((one - ptr1) != (two - ptr2)) { - return (one - ptr1) < (two - ptr2) ? -1 : 1; + ret = (one - ptr1) < (two - ptr2) ? -1 : 1; + goto cleanup; } ptr1 = one; -- 2.1.3

1 1

[pacman-dev] Translation for upcoming 4.2 release
by Allan McRae 18 Nov '14

18 Nov '14

Hi all, I have updated the translation files for the upcoming pacman-4.2 release. We have not reached final freeze yet, but it is unlikely there will be many changes and this will give everyone a head start. There are a few bugs reported for translations: Output formatting: pt_PT: https://bugs.archlinux.org/task/22575 de: https://bugs.archlinux.org/task/30474 Translation corrections: fr: https://bugs.archlinux.org/task/40513 zn_CH: https://bugs.archlinux.org/task/42351 pl: https://bugs.archlinux.org/task/42702 Thanks, Allan

1 0

[pacman-dev] [PATCH 1/2] Add alpm_option_match_noextract
by Allan McRae 18 Nov '14

18 Nov '14

This is useful for frontends testing whether a file is in NoExtract Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 1 + lib/libalpm/handle.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 1831fcf..234bd6b 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -827,6 +827,7 @@ alpm_list_t *alpm_option_get_noextracts(alpm_handle_t *handle); int alpm_option_add_noextract(alpm_handle_t *handle, const char *path); int alpm_option_set_noextracts(alpm_handle_t *handle, alpm_list_t *noextract); int alpm_option_remove_noextract(alpm_handle_t *handle, const char *path); +int alpm_option_match_noextract(alpm_handle_t *handle, const char *path); /** @} */ /** @name Accessors to the list of ignored packages. diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 6545592..5ef619e 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -542,6 +542,11 @@ int SYMEXPORT alpm_option_remove_noextract(alpm_handle_t *handle, const char *pa return _alpm_option_strlist_rem(handle, &(handle->noextract), path); } +int SYMEXPORT alpm_option_match_noextract(alpm_handle_t *handle, const char *path) +{ + return _alpm_fnmatch_patterns(handle->noextract, path); +} + int SYMEXPORT alpm_option_add_ignorepkg(alpm_handle_t *handle, const char *pkg) { return _alpm_option_strlist_add(handle, &(handle->ignorepkg), pkg); -- 2.1.3

1 1

[pacman-dev] [PATCH 1/3] Make (_alpm_)fnmatch_patterns available to front-end
by Allan McRae 18 Nov '14

18 Nov '14

This function will be useful in determining if any files are in the NoExtract array when checking for missing files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/add.c | 4 ++-- lib/libalpm/util.c | 31 ------------------------------- lib/libalpm/util.h | 1 - src/common/util-common.c | 32 ++++++++++++++++++++++++++++++++ src/common/util-common.h | 4 ++++ 5 files changed, 38 insertions(+), 34 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index bbf2a51..9f7c9fa 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -190,7 +190,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, } /* if a file is in NoExtract then we never extract it */ - if(_alpm_fnmatch_patterns(handle->noextract, entryname) == 0) { + if(fnmatch_patterns(handle->noextract, entryname) == 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract," " skipping extraction of %s\n", entryname, filename); @@ -266,7 +266,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, } else { /* case 3: */ /* if file is in NoUpgrade, don't touch it */ - if(_alpm_fnmatch_patterns(handle->noupgrade, entryname) == 0) { + if(fnmatch_patterns(handle->noupgrade, entryname) == 0) { notouch = 1; } else { alpm_backup_t *backup; diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 43d0d7b..39ac890 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1224,37 +1224,6 @@ int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int a return ret; } -/** Checks whether a string matches at least one shell wildcard pattern. - * Checks for matches with fnmatch. Matches are inverted by prepending - * patterns with an exclamation mark. Preceding exclamation marks may be - * escaped. Subsequent matches override previous ones. - * @param patterns patterns to match against - * @param string string to check against pattern - * @return 0 if string matches pattern, negative if they don't match and - * positive if the last match was inverted - */ -int _alpm_fnmatch_patterns(alpm_list_t *patterns, const char *string) -{ - alpm_list_t *i; - char *pattern; - short inverted; - - for(i = alpm_list_last(patterns); i; i = alpm_list_previous(i)) { - pattern = i->data; - - inverted = pattern[0] == '!'; - if(inverted || pattern[0] == '\\') { - pattern++; - } - - if(_alpm_fnmatch(pattern, string) == 0) { - return inverted; - } - } - - return -1; -} - /** Checks whether a string matches a shell wildcard pattern. * Wrapper around fnmatch. * @param pattern pattern to match against diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 6f47073..9422646 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -137,7 +137,6 @@ alpm_time_t _alpm_parsedate(const char *line); int _alpm_raw_cmp(const char *first, const char *second); int _alpm_raw_ncmp(const char *first, const char *second, size_t max); int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int amode); -int _alpm_fnmatch_patterns(alpm_list_t *patterns, const char *string); int _alpm_fnmatch(const void *pattern, const void *string); void *_alpm_realloc(void **data, size_t *current, const size_t required); void *_alpm_greedy_grow(void **data, size_t *current, const size_t required); diff --git a/src/common/util-common.c b/src/common/util-common.c index ab74e7c..1930d64 100644 --- a/src/common/util-common.c +++ b/src/common/util-common.c @@ -20,6 +20,7 @@ #include <errno.h> #include <stdlib.h> #include <string.h> +#include <fnmatch.h> #include "util-common.h" @@ -103,6 +104,37 @@ int llstat(char *path, struct stat *buf) return ret; } +/** Checks whether a string matches at least one shell wildcard pattern. + * Checks for matches with fnmatch. Matches are inverted by prepending + * patterns with an exclamation mark. Preceding exclamation marks may be + * escaped. Subsequent matches override previous ones. + * @param patterns patterns to match against + * @param string string to check against pattern + * @return 0 if string matches pattern, negative if they don't match and + * positive if the last match was inverted + */ +int fnmatch_patterns(alpm_list_t *patterns, const char *string) +{ + alpm_list_t *i; + char *pattern; + short inverted; + + for(i = alpm_list_last(patterns); i; i = alpm_list_previous(i)) { + pattern = i->data; + + inverted = pattern[0] == '!'; + if(inverted || pattern[0] == '\\') { + pattern++; + } + + if(fnmatch(pattern, string, 0) == 0) { + return inverted; + } + } + + return -1; +} + /** Wrapper around fgets() which properly handles EINTR * @param s string to read into * @param size maximum length to read diff --git a/src/common/util-common.h b/src/common/util-common.h index ca8db5a..17f8d87 100644 --- a/src/common/util-common.h +++ b/src/common/util-common.h @@ -20,6 +20,8 @@ #ifndef _PM_UTIL_COMMON_H #define _PM_UTIL_COMMON_H +#include <alpm_list.h> + #include <stdio.h> #include <sys/stat.h> /* struct stat */ @@ -28,6 +30,8 @@ char *mdirname(const char *path); int llstat(char *path, struct stat *buf); +int fnmatch_patterns(alpm_list_t *patterns, const char *string); + char *safe_fgets(char *s, int size, FILE *stream); #ifndef HAVE_STRNDUP -- 2.1.3

2 5

[pacman-dev] [PATCH] _alpm_backup_dup: fix memory leak in error case
by Allan McRae 18 Nov '14

18 Nov '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/backup.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index c2989b6..aeb4131 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -87,10 +87,15 @@ alpm_backup_t *_alpm_backup_dup(const alpm_backup_t *backup) alpm_backup_t *newbackup; CALLOC(newbackup, 1, sizeof(alpm_backup_t), return NULL); - STRDUP(newbackup->name, backup->name, return NULL); - STRDUP(newbackup->hash, backup->hash, return NULL); + STRDUP(newbackup->name, backup->name, goto error); + STRDUP(newbackup->hash, backup->hash, goto error); return newbackup; + +error: + free(newbackup->name); + free(newbackup); + return NULL; } /* vim: set noet: */ -- 2.1.3

2 4

[pacman-dev] [PATCH] pacsort: only look at versions in file mode
by Dave Reisner 17 Nov '14

17 Nov '14

alpm_pkg_vercmp rightfully considers foo-1-1 to be newer than foo-1:1-1 because of the leading characters. So, in file mode, pacsort must necessarily ignore the package name when performing comparisons. Create a struct, for convenience, which overlays pointers and lengths to the name and version within a filename. Using this, we can avoid some amount of heap allocation, and do better at comparing versions for similar package names. ref: https://bugs.archlinux.org/task/37631 --- Since I forgot about this, and now it's now been declared release blocking, here's the easy solution (with a TODO for the rest). src/util/pacsort.c | 78 +++++++++++++++++++++++++++++++++++++++++------- test/util/pacsorttest.sh | 11 ++++++- 2 files changed, 78 insertions(+), 11 deletions(-) diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 86f2fc6..b3ef1b5 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -28,6 +28,15 @@ #define DELIM ' ' +#ifndef MIN +#define MIN(a, b) \ + __extension__({ \ + __typeof__(a) _a = (a); \ + __typeof__(b) _b = (b); \ + _a < _b ? _a : _b; \ + }) +#endif + struct buffer_t { char *mem; size_t len; @@ -40,6 +49,14 @@ struct list_t { size_t maxcount; }; +struct pkgmeta_t { + const char *pkgname; + size_t pkgname_len; + + const char *pkgver; + size_t pkgver_len; +}; + static struct options_t { int order; int sortkey; @@ -256,6 +273,37 @@ static const char *nth_column(const char *string) return prev; } +static void extract_pkgmeta(const char *path, struct pkgmeta_t *meta) { + const char *pkgver_end; + const char *slash; + + memset(meta, 0, sizeof(struct pkgmeta_t)); + + slash = strrchr(path, '/'); + if(slash == NULL) { + meta->pkgname = path; + } else { + meta->pkgname = slash + 1; + } + + pkgver_end = strrchr(meta->pkgname, '-'); + + /* read backwards through pkgrel */ + for(meta->pkgver = pkgver_end - 1; + meta->pkgver > meta->pkgname && *meta->pkgver != '-'; + --meta->pkgver) + ; + /* read backwards through pkgver */ + for(--meta->pkgver; + meta->pkgver > meta->pkgname && *meta->pkgver != '-'; + --meta->pkgver) + ; + ++meta->pkgver; + + meta->pkgname_len = meta->pkgver - meta->pkgname - 1; + meta->pkgver_len = pkgver_end - meta->pkgver; +} + static int vercmp(const void *p1, const void *p2) { const char *name1, *name2; @@ -276,19 +324,29 @@ static int vercmp(const void *p1, const void *p2) * Will be considered equal by this version comparison */ if(opts.filemode) { + /* TODO: Extract this data earlier so that we don't need to do this parsing + * (potentially multiple times) on the sort callback. */ if(fnmatch("*-*.pkg.tar.?z", name1, 0) == 0 && fnmatch("*-*.pkg.tar.?z", name2, 0) == 0) { - const char *start, *end; - - start = strrchr(name1, '/'); - start = start ? start + 1 : name1; - end = strrchr(name1, '-'); - fn1 = strndup(start, end - start); + struct pkgmeta_t pkgmeta1, pkgmeta2; + int namecmp; + + /* Extract name and version */ + extract_pkgmeta(name1, &pkgmeta1); + extract_pkgmeta(name2, &pkgmeta2); + + /* If the package names aren't the same, there's no sense in comparing + * the versions. Short circuit and return a comparison based on the + * pkgnames. This probably could be cleaner, but I'm favoring clarity + * over cleverness. */ + namecmp = memcmp(pkgmeta1.pkgname, pkgmeta2.pkgname, + MIN(pkgmeta1.pkgname_len, pkgmeta2.pkgname_len)); + if(pkgmeta1.pkgname_len != pkgmeta2.pkgname_len || namecmp != 0) { + return opts.order * namecmp; + } - start = strrchr(name2, '/'); - start = start ? start + 1 : name2; - end = strrchr(name2, '-'); - fn2 = strndup(start, end - start); + fn1 = strndup(pkgmeta1.pkgver, pkgmeta1.pkgver_len); + fn2 = strndup(pkgmeta2.pkgver, pkgmeta2.pkgver_len); name1 = fn1; name2 = fn2; diff --git a/test/util/pacsorttest.sh b/test/util/pacsorttest.sh index a2adac9..3373cbc 100755 --- a/test/util/pacsorttest.sh +++ b/test/util/pacsorttest.sh @@ -21,7 +21,7 @@ # default binary if one was not specified as $1 bin=${1:-${PMTEST_UTIL_DIR}pacsort} # holds counts of tests -total=23 +total=26 run=0 failure=0 @@ -89,6 +89,15 @@ runtest $in $in "filename sort with uneven leading path components" "--files" in="firefox-18.0-2-i686.pkg.tar.xz\nfirefox-18.0.1-1-x86_64.pkg.tar.gz\n" runtest $in $in "filename sort with different extensions" "--files" +in="/packages/dialog-1.2_20131001-1-x86_64.pkg.tar.xz\n/packages/dialog-1:1.2_20130928-1-x86_64.pkg.tar.xz\n" +runtest $in $in "filename sort with epoch" "--files" + +in="/packages/dia-log-1:1.2_20130928-1-x86_64.pkg.tar.xz\n/packages/dialog-1.2_20131001-1-x86_64.pkg.tar.xz\n" +runtest $in $in "filename sort with epoch" "--files" + +in="/packages/dialoggg-1:1.2_20130928-1-x86_64.pkg.tar.xz\n/packages/dialog-1.2_20131001-1-x86_64.pkg.tar.xz\n" +runtest $in $in "filename sort with epoch" "--files" + # generate some long input/expected for the next few tests declare normal reverse names_normal names_reverse for ((i=1; i<600; i++)); do -- 2.1.3

3 2

[pacman-dev] [PATCH] makepkg: symlink files in noextract into $srcdir
by Allan McRae 17 Nov '14

17 Nov '14

File in noextract should still be symlinked into $srcdir so that they can be accessed without using $SRCDEST. Using noextract on VCS files makes no sense as these are not being extracted, so now this does nothing. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4e9da4b..771aa72 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -391,6 +391,12 @@ extract_file() { rm -f "$srcdir/${file}" ln -s "$filepath" "$srcdir/" + if in_array "$file" "${noextract[@]}"; then + # skip source files in the noextract=() array + # these are marked explicitly to NOT be extracted + return 0 + fi + # do not rely on extension for file type local file_type=$(file -bizL "$file") local ext=${file##*.} @@ -1556,11 +1562,6 @@ extract_sources() { get_all_sources_for_arch 'all_sources' for netfile in "${all_sources[@]}"; do local file=$(get_filename "$netfile") - if in_array "$file" "${noextract[@]}"; then - # skip source files in the noextract=() array - # these are marked explicitly to NOT be extracted - continue - fi local proto=$(get_protocol "$netfile") case "$proto" in bzr*) -- 2.1.3

1 0