- Pacman-dev - lists.archlinux.org

[pacman-dev] Fw: new message
by juergen＠hoetzel.info 09 Mar '16

09 Mar '16

Hey! Open message <http://sudarena.intelmedia.ro/sit.php?mejm> juergen(a)hoetzel.info

2 1

[pacman-dev] [PATCH] Fix segfaults during install when a package adds a new file to 'backup'
by Will Miles 29 Feb '16

29 Feb '16

When adding a new package release adds a new entry to the 'backup' list, no hash exists for that file in the previously installed package version. This patch fixes two places where that nonexistent hash may be dereferenced. Signed-off-by: Will Miles <wmiles(a)sgl.com> --- lib/libalpm/add.c | 2 +- lib/libalpm/be_local.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index f5c9a95..ff0b81d 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -341,7 +341,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, _alpm_log(handle, ALPM_LOG_DEBUG, "checking hashes for %s\n", origfile); _alpm_log(handle, ALPM_LOG_DEBUG, "current: %s\n", hash_local); _alpm_log(handle, ALPM_LOG_DEBUG, "new: %s\n", hash_pkg); - _alpm_log(handle, ALPM_LOG_DEBUG, "original: %s\n", hash_orig); + _alpm_log(handle, ALPM_LOG_DEBUG, "original: %s\n", (hash_orig ? hash_orig : "NULL") ); if(hash_local && hash_pkg && strcmp(hash_local, hash_pkg) == 0) { /* local and new files are the same, updating anyway to get diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index f817822..5e39199 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -1037,7 +1037,9 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq fputs("%BACKUP%\n", fp); for(lp = info->backup; lp; lp = lp->next) { const alpm_backup_t *backup = lp->data; - fprintf(fp, "%s\t%s\n", backup->name, backup->hash); + if (backup->hash) { + fprintf(fp, "%s\t%s\n", backup->name, backup->hash); + } } fputc('\n', fp); } -- 2.6.3

1 0

[pacman-dev] [PATCH] use multi-byte character matching for user input
by Andrew Gregory 26 Feb '16

26 Feb '16

Fixes FS#47992 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/util.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 48a3600..3f66947 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -33,6 +33,7 @@ #include <unistd.h> #include <limits.h> #include <wchar.h> +#include <wctype.h> #ifdef HAVE_TERMIOS_H #include <termios.h> /* tcflush */ #endif @@ -1487,6 +1488,37 @@ int select_question(int count) return (preset - 1); } +static int mbscasecmp(const char *s1, const char *s2) +{ + size_t len1 = strlen(s1), len2 = strlen(s2); + wchar_t c1, c2; + const char *p1 = s1, *p2 = s2; + mbstate_t ps1, ps2; + memset(&ps1, 0, sizeof(mbstate_t)); + memset(&ps2, 0, sizeof(mbstate_t)); + while(*p1 && *p2) { + size_t b1 = mbrtowc(&c1, p1, len1, &ps1); + size_t b2 = mbrtowc(&c2, p2, len2, &ps2); + if(b1 == (size_t) -2 || b1 == (size_t) -1 + || b2 == (size_t) -2 || b2 == (size_t) -1) { + /* invalid multi-byte string, fall back to strcasecmp */ + return strcasecmp(p1, p2); + } + if(b1 == 0 || b2 == 0) { + return c1 - c2; + } + c1 = towlower(c1); + c2 = towlower(c2); + if(c1 != c2) { + return c1 - c2; + } + p1 += b1; + p2 += b2; + len1 -= b1; + len2 -= b2; + } + return *p1 - *p2; +} /* presents a prompt and gets a Y/N answer */ __attribute__((format(printf, 2, 0))) @@ -1538,9 +1570,9 @@ static int question(short preset, const char *format, va_list args) fprintf(stream, "%s\n", response); } - if(strcasecmp(response, _("Y")) == 0 || strcasecmp(response, _("YES")) == 0) { + if(mbscasecmp(response, _("Y")) == 0 || mbscasecmp(response, _("YES")) == 0) { return 1; - } else if(strcasecmp(response, _("N")) == 0 || strcasecmp(response, _("NO")) == 0) { + } else if(mbscasecmp(response, _("N")) == 0 || mbscasecmp(response, _("NO")) == 0) { return 0; } } -- 2.7.1

2 1

[pacman-dev] [GIT] The official pacman repository branch, release/5.0.x, created. v5.0.1-2-gd4f499f
by allan＠archlinux.org 26 Feb '16

26 Feb '16

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, release/5.0.x has been created at d4f499f5638a68a3b7e17c5171aabdf535b79bd4 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-10-g1a94c00
by allan＠archlinux.org 26 Feb '16

26 Feb '16

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 1a94c00e363081594bd6940d98117289b03692d6 (commit) via f363cf78575cc4c54dee5801274e55d07e0971b1 (commit) via af5d69d59d2deb44bf21bb3f3d9587ec656bbc62 (commit) via 3da06c3519ad8df60ce8c067cdaeddb69a320a53 (commit) via 59112e186b5c64350db79f39574c6927a10346b6 (commit) via 76a7d2293c0e7a732254a1cfea6a62df07b8795e (commit) via 8ff03868a37b1f9c447784ae2fd639a49e426399 (commit) via 1a29744d0da8aa945b96b234574e0d5c80f13b62 (commit) via d4f499f5638a68a3b7e17c5171aabdf535b79bd4 (commit) via df5dc0c9debcf40bd9fd00a1d64a2e1ee483a3dd (commit) from f38de43eb68f1d9c577b4378310640c1eaa93338 (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 1a94c00e363081594bd6940d98117289b03692d6 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 23 14:42:35 2016 +1000 Add release instructions This serves as a release checklist for anyone making a pacman release. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f363cf78575cc4c54dee5801274e55d07e0971b1 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 21 19:06:37 2016 +1000 repo-add: do not alter the database if only verifying signature Fixes FS#48085. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit af5d69d59d2deb44bf21bb3f3d9587ec656bbc62 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 21 18:31:35 2016 +1000 Failed database downloads cause transaction to stop Previously, we errored only if all databases failed to download. If any database downloads fail, we are unable to determine whether an update is still considered safe. So now if any database download fails, the transaction is aborted (after attempting all database downloads). Fixes FS#47599. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3da06c3519ad8df60ce8c067cdaeddb69a320a53 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 21 16:43:36 2016 +1000 Use versions specified in optdepends Checking install status and if a package is optionally required on removal now considers the version of the optdepend. Fixes FS#44957. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 59112e186b5c64350db79f39574c6927a10346b6 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 21 16:24:41 2016 +1000 Consider provides when warning about optdepnd removal Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 76a7d2293c0e7a732254a1cfea6a62df07b8795e Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 21 16:20:22 2016 +1000 Consider provides when labelling optdepends status as pending install Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8ff03868a37b1f9c447784ae2fd639a49e426399 Author: Xyne <xyne(a)archlinux.ca> Date: Sat Feb 20 16:02:31 2016 +1000 makepkg: Turn PACMAN_OPTS into an array Avoid potential word expansion with future inclusions Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1a29744d0da8aa945b96b234574e0d5c80f13b62 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 2 11:38:42 2016 +1000 makepkg: Remove upx and optipng support These options were added before libmakepkg allowed passes like this to be dropped in. I prefer only real core packaging tasks to be included in makepkg and additional things like this to be dropped in by a user or distribution that wants to support them. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d4f499f5638a68a3b7e17c5171aabdf535b79bd4 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Feb 26 15:01:11 2016 +1000 libmakepkg: fix is_array function This happened to work for the majority of cases because the only calling function used a variable named "i" that was related to the variable being passed to the function. Fixes FS#48340. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit df5dc0c9debcf40bd9fd00a1d64a2e1ee483a3dd Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 23 14:18:03 2016 +1000 Update NEWS for pacman-5.0.1 Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 17 +++++++++++++ RELEASE | 23 ++++++++++++++++++ contrib/PKGBUILD.vim | 2 +- doc/PKGBUILD.5.txt | 6 ----- doc/makepkg.conf.5.txt | 10 +------- etc/makepkg.conf.in | 6 ++--- lib/libalpm/remove.c | 3 ++- scripts/Makefile.am | 2 -- scripts/libmakepkg/tidy/optipng.sh.in | 44 --------------------------------- scripts/libmakepkg/tidy/upx.sh.in | 46 ----------------------------------- scripts/libmakepkg/util/util.sh | 2 +- scripts/makepkg.sh.in | 26 ++++---------------- scripts/po/POTFILES.in | 2 -- scripts/repo-add.sh.in | 11 +++++++++ src/pacman/util.c | 17 ++++--------- 15 files changed, 68 insertions(+), 149 deletions(-) create mode 100644 RELEASE delete mode 100644 scripts/libmakepkg/tidy/optipng.sh.in delete mode 100644 scripts/libmakepkg/tidy/upx.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libmakepkg: fix is_array function
by Allan McRae 26 Feb '16

26 Feb '16

This happened to work for the majority of cases because the only calling function used a variable named "i" that was related to the variable being passed to the function. Fixes FS#48340. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/util/util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/util/util.sh b/scripts/libmakepkg/util/util.sh index 675e75d..f9f1c20 100644 --- a/scripts/libmakepkg/util/util.sh +++ b/scripts/libmakepkg/util/util.sh @@ -46,7 +46,7 @@ is_array() { local shellopts=$(shopt -p) shopt -s extglob - if [[ $(declare -p "$i") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then + if [[ $(declare -p "$v") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then ret=0 fi -- 2.7.1

1 0

[pacman-dev] [PATCH] Set an environment variable to indicate hooks support
by Thomas Bächler 24 Feb '16

24 Feb '16

When replacing existing post_install and post_upgrade functionality with hooks, it is necessary to ensure that pacman has already been upgraded. To allow a smooth transition, export the ALPM_FEATURE_HOOKS variable with the value 1 in all processes spawned by pacman. An install scriptlet can fall back to old behaviour if this variable is not set, but rely on pacman hooks if it is not set. --- lib/libalpm/util.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 001c042..86e3943 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -545,6 +545,11 @@ static int _alpm_chroot_read_from_child(alpm_handle_t *handle, int fd, return 0; } +void _alpm_setup_child_environment() +{ + setenv("ALPM_FEATURE_HOOKS", "1", 1); +} + /** Execute a command with arguments in a chroot. * @param handle the context handle * @param cmd command to execute @@ -618,6 +623,8 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], close(cwdfd); } + /* set up the child environment */ + _alpm_setup_child_environment(); /* use fprintf instead of _alpm_log to send output through the parent */ if(chroot(handle->root) != 0) { fprintf(stderr, _("could not change the root directory (%s)\n"), strerror(errno)); -- 2.7.1

5 6

[pacman-dev] [PATCH] Update NEWS for pacman-5.0.1
by Allan McRae 24 Feb '16

24 Feb '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- There is always something that slips my mind... Time for a release checklist to be added. NEWS | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/NEWS b/NEWS index 07aa028..63ceba0 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,22 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +5.0.1 - fix alignment issues with wide character locales (FS#47980) + - fix removal of .pacnew files (FS#47993) + - fix triggering of Install hooks (FS#47996) + - fix handling of stdin scripts called by pacman + - hook activity is logged + - documentataion updates for alpm-hooks (FS#48080) + - makepkg: + - increase robustness of variable array checks + - makepkg -g does not perform current architecture checks + - do not run prepare() with --noextact + - all directories in the packaging directory are cleared + before each build + - fix translations issues (FS#48057, FS#48298) + - repo-add: + - fix checking for non-existent database + - contrib: + - zsh_completion: updated makepkg options 5.0.0 - pacman can run hooks pre- and post-transaction. See the alpm-hooks(5) man page for details and an example hook (FS#2985) - pacman can now sync and read .files databases (-Fy) and do basic -- 2.7.1

2 2

[pacman-dev] [PATCH] Add release instructions
by Allan McRae 23 Feb '16

23 Feb '16

This serves as a release checklist for anyone making a pacman release. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Dan: anything else you see that is needed here? RELEASE | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 RELEASE diff --git a/RELEASE b/RELEASE new file mode 100644 index 0000000..6f800e3 --- /dev/null +++ b/RELEASE @@ -0,0 +1,22 @@ +The following checklist should be used for making a pacman release. + +- Ensure "make distcheck" succeeds +- Call a freeze to development. +- Send translation updates to Transifex (see below). At this stage, strings can + only be changed for a major issue. Pull translation updates after ~2 weeks. +- Update NEWS and README files +- Pull translation updates from Transifex +- Update version in configure.ac as described in file +- Update doc/index.txt +- Create a signed git tag (git tag -x vX.Y.Z -m "commit message") +- Create and sign release tarballs (generate with "make distcheck") +- Update pacman website + +Transifex updates are handled using the transifex client. The basic process is: +- Pull updates from transifex ("tx pull -a -f") +- Update po files ("make update-po") +- Fix all translation errors found +- Add any new locales to the relevant LINGUAS file +- Optional: Make any manual changes needed (e.g. fixing spacing in a string) + and update po files again +- Push updated po files to transifex ("tx push -s -t --skip") -- 2.7.1

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v5.0.1, created. v5.0.1
by allan＠archlinux.org 23 Feb '16

23 Feb '16

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 annotated tag, v5.0.1 has been created at fecec6a5ec41639162d127768cf6ac851db7c740 (tag) tagging f38de43eb68f1d9c577b4378310640c1eaa93338 (commit) replaces v5.0.0 tagged by Allan McRae on Tue Feb 23 13:47:57 2016 +1000 - Log ----------------------------------------------------------------- v5.0.1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABCAAGBQJWy9ZtAAoJEPmf/g/q6Zm91a4H/iUY7jGw1e+kvKGL5JuRlyQ4 YRRaD0OnDqRI2ApZQgdczCDtGt0786aJ2wrOSW1d3rQi2kq7b8M2ON1bTIvO+j4a I1Jdm4mCBW1/NWk9HoRZ/3gw1+xZ51LGf+kgD07Ul3Bn2eWGNCtRTpHxhNk8DfnR 9hery5rewEbEqDcAH47+qFoV8zgghM+G7iTBZlLxYk1BTu0hnVHrMjXxyVi/oJ/C FIF5VylqdP37L0aFF1PU0gdC6tsKh5ecEfuLO1GtDzTrzAEmtjJUo8CwigFi9BXP kgCnwmT/mbQoVIkqkmIjvkgNr0oNWafPQ1RjS799Og+uqeQy00y+x9dxDV7l+Fc= =KaYG -----END PGP SIGNATURE----- Alastair Hughes (2): Add the missing limits.h include to hook.c Make "makepkg -g" ignore the current architecture. Allan McRae (10): repo-remove: fix checking for non-existent .db database libmakepkg: increase robustness of the detection of array variables doc/alpm-hooks: mention that hooks must have a ".hooks" suffix. Revert "makepkg: Empty/create only $pkgdir's relevant to current PKGBUILD" makepkg: remove pkg from OPT_LONG array alpm-hooks.5: document hook running order Pull translation updates from Transifex Manually fix space before ellipses in translations Regenerate translations for 5.0.1 Release 5.0.1 Andrew Gregory (7): dump_pkg_info: fix wide character title alignment doc/index.txt: update for pacman 5.0 only remove pacnew file if it is new do not rely on localdb for hook matching ensure gpgdir has a trailing slash alpm_run_chroot: always connect parent2child pipe make alpm_unlock and trans_interrupt async safe Dominik Fischer (1): only include .SRCINFO comments in source tarball Doug Newgard (1): Bring makepkg zsh completions up to date Evangelos Foutras (1): makepkg: do not run prepare() with --noextract Olivier Brunel (1): Log to file when running hooks Stefan Tatschner (1): Fix inconsistent status messages ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0