February 2016 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Added the --bell switch.
by Eric Toombs 26 Jun '16

26 Jun '16

This switch rings the terminal bell when user input is required. Obviously, it has no effect if --noconfirm is also passed. --- doc/pacman.8.txt | 3 +++ src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 3 +++ src/pacman/util.c | 15 +++++++++------ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 514f559..6e0617a 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -148,6 +148,9 @@ Options *\--arch* <arch>:: Specify an alternate architecture. +*\--bell*:: + Sound the terminal bell when input is required. + *\--cachedir* <dir>:: Specify an alternative package cache location (a typical default is +{localstatedir}/cache/pacman/pkg+). Multiple cache directories can be diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 7a7e9cf..463ae48 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -55,6 +55,7 @@ typedef struct __config_t { unsigned short checkspace; unsigned short usesyslog; unsigned short color; + unsigned short bell; double deltaratio; char *arch; char *print_format; @@ -201,7 +202,8 @@ enum { OP_VERBOSE, OP_DOWNLOADONLY, OP_REFRESH, - OP_ASSUMEINSTALLED + OP_ASSUMEINSTALLED, + OP_BELL }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 94685a7..07282e7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -221,6 +221,7 @@ static void usage(int op, const char * const myname) addlist(_(" --logfile <path> set an alternate log file\n")); addlist(_(" --noconfirm do not ask for any confirmation\n")); addlist(_(" --confirm always ask for confirmation\n")); + addlist(_(" --bell sound the terminal bell when input is required\n")); } list = alpm_list_msort(list, alpm_list_count(list), options_cmp); for(i = list; i; i = alpm_list_next(i)) { @@ -480,6 +481,7 @@ static int parsearg_global(int opt) case OP_CONFIRM: config->noconfirm = 0; break; + case OP_BELL: config->bell = 1; break; case OP_DBPATH: case 'b': free(config->dbpath); @@ -981,6 +983,7 @@ static int parseargs(int argc, char *argv[]) {"gpgdir", required_argument, 0, OP_GPGDIR}, {"dbonly", no_argument, 0, OP_DBONLY}, {"color", required_argument, 0, OP_COLOR}, + {"bell", no_argument, 0, OP_BELL}, {0, 0, 0, 0} }; diff --git a/src/pacman/util.c b/src/pacman/util.c index 5f331e8..9183047 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1396,13 +1396,14 @@ int multiselect_question(char *array, int count) fprintf(stream, "\n"); fprintf(stream, _("Enter a selection (default=all)")); fprintf(stream, ": "); - fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); break; + } else if(config->bell) { + fprintf(stream, "\a"); } - + fflush(stream); flush_term_input(fileno(stdin)); if(safe_fgets(response, response_len, stdin)) { @@ -1463,13 +1464,14 @@ int select_question(int count) fprintf(stream, "\n"); fprintf(stream, _("Enter a number (default=%d)"), preset); fprintf(stream, ": "); - fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); break; + } else if(config->bell) { + fprintf(stream, "\a"); } - + fflush(stream); flush_term_input(fileno(stdin)); if(safe_fgets(response, sizeof(response), stdin)) { @@ -1517,13 +1519,14 @@ static int question(short preset, const char *format, va_list args) } fputs(config->colstr.nocolor, stream); - fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); return preset; + } else if(config->bell) { + fprintf(stream, "\a"); } - + fflush(stream); flush_term_input(fd_in); if(safe_fgets(response, sizeof(response), stdin)) { -- 2.6.2

3 8

[pacman-dev] Please make the colourised output exactly like that of "pacman-color"
by Xavion 29 Apr '16

29 Apr '16

Hi All, It's great that "pacman" finally has native colour support in v4.1.0. It's just a shame that it's not as good as that of "pacman-color". Without meaning any offence, it falls way short of the mark IMHO. I'm hoping you can just replicate the colourisation of "pacman-color". For your convenience, I've attached the relevant files you'd need. I'm only requesting this because "pacman-color" no longer exists. -- Regards, Xavion.

10 60

[pacman-dev] [PATCH] pactree: Add support for getting optional dependencies
by Johannes Löthberg 18 Apr '16

18 Apr '16

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- doc/pactree.8.txt | 3 +++ src/util/pactree.c | 41 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/doc/pactree.8.txt b/doc/pactree.8.txt index b177788..4c391c0 100644 --- a/doc/pactree.8.txt +++ b/doc/pactree.8.txt @@ -49,6 +49,9 @@ Options *-l, \--linear*:: Prints package names at the start of each line, one per line. +*-o, \--optdeps*:: + Show packages that are optionally depended upon by the named package. + *-r, \--reverse*:: Show packages that depend on the named package. diff --git a/src/util/pactree.c b/src/util/pactree.c index 67be9f9..fb91b39 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -118,6 +118,7 @@ struct graph_style *style = &graph_utf8; int graphviz = 0; int max_depth = -1; int reverse = 0; +int optdeps = 0; int unique = 0; int searchsyncs = 0; const char *dbpath = DBPATH; @@ -182,6 +183,7 @@ static int parse_options(int argc, char *argv[]) {"help", no_argument, 0, 'h'}, {"linear", no_argument, 0, 'l'}, {"reverse", no_argument, 0, 'r'}, + {"optdeps", no_argument, 0, 'o'}, {"sync", no_argument, 0, 's'}, {"unique", no_argument, 0, 'u'}, @@ -198,7 +200,7 @@ static int parse_options(int argc, char *argv[]) style = &graph_default; #endif - while((opt = getopt_long(argc, argv, "ab:cd:ghlrsu", opts, &option_index))) { + while((opt = getopt_long(argc, argv, "ab:cd:ghlorsu", opts, &option_index))) { if(opt < 0) { break; } @@ -236,6 +238,9 @@ static int parse_options(int argc, char *argv[]) case 's': searchsyncs = 1; break; + case 'o': + optdeps = 1; + break; case 'u': unique = 1; style = &graph_linear; @@ -266,6 +271,7 @@ static void usage(void) " -g, --graph generate output for graphviz's dot\n" " -h, --help display this help message\n" " -l, --linear enable linear output\n" + " -o, --optdeps list packages that are optionally depended upon by the named package\n" " -r, --reverse list packages that depend on the named package\n" " -s, --sync search sync databases instead of local\n" " -u, --unique show dependencies with no duplicates (implies -l)\n" @@ -381,12 +387,29 @@ static alpm_list_t *get_pkg_dep_names(alpm_pkg_t *pkg) return names; } +static alpm_list_t *get_pkg_optdep_names(alpm_pkg_t *pkg) +{ + alpm_list_t *i = NULL, *names = NULL; + for(i = alpm_pkg_get_optdepends(pkg); i; i = alpm_list_next(i)) { + alpm_depend_t *d = i->data; + if(searchsyncs) { + names = alpm_list_add(names, d->name); + } else { + alpm_db_t *localdb = alpm_get_localdb(handle); + if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), d->name)) { + names = alpm_list_add(names, d->name); + } + } + } + return names; +} + /** * walk dependencies, showing dependencies of the target */ -static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int rev) +static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int rev, int optdeps) { - alpm_list_t *deps, *i; + alpm_list_t *deps = NULL, *i = NULL; if(!pkg || ((max_depth >= 0) && (depth->level > max_depth))) { return; @@ -396,8 +419,16 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int r if(rev) { deps = alpm_pkg_compute_requiredby(pkg); + if(optdeps) { + alpm_list_t *odeps = alpm_pkg_compute_optionalfor(pkg); + deps = alpm_list_join(deps, odeps); + } } else { deps = get_pkg_dep_names(pkg); + if(optdeps) { + alpm_list_t *odeps = get_pkg_optdep_names(pkg); + deps = alpm_list_join(deps, odeps); + } } for(i = deps; i; i = alpm_list_next(i)) { @@ -431,7 +462,7 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int r d.prev = NULL; } } - walk_deps(dblist, dep_pkg, &d, rev); + walk_deps(dblist, dep_pkg, &d, rev, optdeps); depth->next = NULL; } } @@ -494,7 +525,7 @@ int main(int argc, char *argv[]) NULL, 1 }; - walk_deps(dblist, pkg, &d, reverse); + walk_deps(dblist, pkg, &d, reverse, optdeps); print_end(); -- 2.7.1

3 4

[pacman-dev] [PATCH] libmakepkg: extract functions for writing .SRCINFO files
by Ashley Whetter 21 Mar '16

21 Mar '16

Signed-off-by: Ashley Whetter <ashley(a)awhetter.co.uk> --- scripts/Makefile.am | 1 + scripts/libmakepkg/srcinfo.sh.in | 120 +++++++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 94 ------------------------------ 3 files changed, 121 insertions(+), 94 deletions(-) create mode 100644 scripts/libmakepkg/srcinfo.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d660c0b..2dfd238 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -74,6 +74,7 @@ LIBMAKEPKG_IN = \ libmakepkg/lint_pkgbuild/source.sh \ libmakepkg/lint_pkgbuild/util.sh \ libmakepkg/lint_pkgbuild/variable.sh \ + libmakepkg/srcinfo.sh \ libmakepkg/source.sh \ libmakepkg/source/bzr.sh \ libmakepkg/source/file.sh \ diff --git a/scripts/libmakepkg/srcinfo.sh.in b/scripts/libmakepkg/srcinfo.sh.in new file mode 100644 index 0000000..96dc59b --- /dev/null +++ b/scripts/libmakepkg/srcinfo.sh.in @@ -0,0 +1,120 @@ +#!/bin/bash +# +# srcinfo.sh - functions for writing .SRCINFO files +# +# Copyright (c) 2016 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_SRCINFO_SH" ]] && return +LIBMAKEPKG_SRCINFO_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/pkgbuild.sh" + +srcinfo_open_section() { + printf '%s = %s\n' "$1" "$2" +} + +srcinfo_close_section() { + echo +} + +srcinfo_write_attr() { + # $1: attr name + # $2: attr values + + local attrname=$1 attrvalues=("${@:2}") + + # normalize whitespace, strip leading and trailing + attrvalues=("${attrvalues[@]//+([[:space:]])/ }") + attrvalues=("${attrvalues[@]#[[:space:]]}") + attrvalues=("${attrvalues[@]%[[:space:]]}") + + printf "\t$attrname = %s\n" "${attrvalues[@]}" +} + +pkgbuild_extract_to_srcinfo() { + # $1: pkgname + # $2: attr name + # $3: multivalued + + local pkgname=$1 attrname=$2 isarray=$3 outvalue= + + if get_pkgbuild_attribute "$pkgname" "$attrname" "$isarray" 'outvalue'; then + srcinfo_write_attr "$attrname" "${outvalue[@]}" + fi +} + +srcinfo_write_section_details() { + local attr package_arch a + local multivalued_arch_attrs=(source provides conflicts depends replaces + optdepends makedepends checkdepends + {md5,sha{1,224,256,384,512}}sums) + + for attr in "${singlevalued[@]}"; do + pkgbuild_extract_to_srcinfo "$1" "$attr" 0 + done + + for attr in "${multivalued[@]}"; do + pkgbuild_extract_to_srcinfo "$1" "$attr" 1 + done + + get_pkgbuild_attribute "$1" 'arch' 1 'package_arch' + for a in "${package_arch[@]}"; do + # 'any' is special. there's no support for, e.g. depends_any. + [[ $a = any ]] && continue + + for attr in "${multivalued_arch_attrs[@]}"; do + pkgbuild_extract_to_srcinfo "$1" "${attr}_$a" 1 + done + done +} + +srcinfo_write_global() { + local singlevalued=(pkgdesc pkgver pkgrel epoch url install changelog) + local multivalued=(arch groups license checkdepends makedepends + depends optdepends provides conflicts replaces + noextract options backup + source validpgpkeys {md5,sha{1,224,256,384,512}}sums) + + srcinfo_open_section 'pkgbase' "${pkgbase:-$pkgname}" + srcinfo_write_section_details '' + srcinfo_close_section +} + +srcinfo_write_package() { + local singlevalued=(pkgdesc url install changelog) + local multivalued=(arch groups license checkdepends depends optdepends + provides conflicts replaces options backup) + + srcinfo_open_section 'pkgname' "$1" + srcinfo_write_section_details "$1" + srcinfo_close_section +} + +write_srcinfo() { + local pkg + + printf "# Generated by makepkg %s\n" "$makepkg_version" + printf "# %s\n" "$(LC_ALL=C date -u)" + + srcinfo_write_global + + for pkg in "${pkgname[@]}"; do + srcinfo_write_package "$pkg" + done +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 80b95f4..4411ac2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -999,100 +999,6 @@ find_libprovides() { printf '%s\n' "${libprovides[@]}" } -srcinfo_open_section() { - printf '%s = %s\n' "$1" "$2" -} - -srcinfo_close_section() { - echo -} - -srcinfo_write_attr() { - # $1: attr name - # $2: attr values - - local attrname=$1 attrvalues=("${@:2}") - - # normalize whitespace, strip leading and trailing - attrvalues=("${attrvalues[@]//+([[:space:]])/ }") - attrvalues=("${attrvalues[@]#[[:space:]]}") - attrvalues=("${attrvalues[@]%[[:space:]]}") - - printf "\t$attrname = %s\n" "${attrvalues[@]}" -} - -pkgbuild_extract_to_srcinfo() { - # $1: pkgname - # $2: attr name - # $3: multivalued - - local pkgname=$1 attrname=$2 isarray=$3 outvalue= - - if get_pkgbuild_attribute "$pkgname" "$attrname" "$isarray" 'outvalue'; then - srcinfo_write_attr "$attrname" "${outvalue[@]}" - fi -} - -srcinfo_write_section_details() { - local attr package_arch a - local multivalued_arch_attrs=(source provides conflicts depends replaces - optdepends makedepends checkdepends - {md5,sha{1,224,256,384,512}}sums) - - for attr in "${singlevalued[@]}"; do - pkgbuild_extract_to_srcinfo "$1" "$attr" 0 - done - - for attr in "${multivalued[@]}"; do - pkgbuild_extract_to_srcinfo "$1" "$attr" 1 - done - - get_pkgbuild_attribute "$1" 'arch' 1 'package_arch' - for a in "${package_arch[@]}"; do - # 'any' is special. there's no support for, e.g. depends_any. - [[ $a = any ]] && continue - - for attr in "${multivalued_arch_attrs[@]}"; do - pkgbuild_extract_to_srcinfo "$1" "${attr}_$a" 1 - done - done -} - -srcinfo_write_global() { - local singlevalued=(pkgdesc pkgver pkgrel epoch url install changelog) - local multivalued=(arch groups license checkdepends makedepends - depends optdepends provides conflicts replaces - noextract options backup - source validpgpkeys {md5,sha{1,224,256,384,512}}sums) - - srcinfo_open_section 'pkgbase' "${pkgbase:-$pkgname}" - srcinfo_write_section_details '' - srcinfo_close_section -} - -srcinfo_write_package() { - local singlevalued=(pkgdesc url install changelog) - local multivalued=(arch groups license checkdepends depends optdepends - provides conflicts replaces options backup) - - srcinfo_open_section 'pkgname' "$1" - srcinfo_write_section_details "$1" - srcinfo_close_section -} - -write_srcinfo() { - local pkg - - printf "# Generated by makepkg %s\n" "$makepkg_version" - printf "# %s\n" "$(LC_ALL=C date -u)" - - srcinfo_write_global - - for pkg in "${pkgname[@]}"; do - srcinfo_write_package "$pkg" - done -} - write_pkginfo() { local builddate=$(date -u "+%s") if [[ -n $PACKAGER ]]; then -- 2.7.0

2 1

[pacman-dev] [PATCH] makepkg: do not run prepare() with --noextract
by Evangelos Foutras 18 Mar '16

18 Mar '16

This is partial revert of 8454daa7feef (makepkg: run pkgver() and prepare() with --noextract). Reasoning for the reversion (copied from FS#43498): Running prepare() when --noextract is used no longer allows running 'makepkg -o && makepkg -e' with any PKGBUILD that applies patches in prepare(). [1] Sure there's --noprepare which restores the old behavior, but that's a lot of extra typing for what I believe is a much more common use of --noextract. For OP's use case of doing git bisects, you can specify the commit in the source array and thus skip --noextract since makepkg will checkout the correct commit each time. [1] I often extract the sources using 'makepkg -o', manually edit some source files, and then use 'makepkg -e' to package it (while possibly repeating the edit/package steps). --- doc/makepkg.8.txt | 10 +++++----- scripts/makepkg.sh.in | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 6f3f6b0..2dff1b1 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -55,11 +55,11 @@ Options installed. *-e, \--noextract*:: - Do not extract source files; use whatever source already exists in the - $srcdir/ directory. This is handy if you want to go into $srcdir/ and - manually patch or tweak code, then make a package out of the result. - Keep in mind that creating a patch may be a better solution to allow - others to use your PKGBUILD. + Do not extract source files or run the prepare() function (if present); + use whatever source already exists in the $srcdir/ directory. This is + handy if you want to go into $srcdir/ and manually patch or tweak code, + then make a package out of the result. Keep in mind that creating a + patch may be a better solution to allow others to use your PKGBUILD. *\--verifysource*:: For each source file in the source array of PKGBUILD, download the file diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 80b95f4..2fa3058 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2206,6 +2206,9 @@ if (( !REPKG )); then fi extract_sources + if (( PREPAREFUNC )); then + run_prepare + fi fi if (( PKGVERFUNC )); then @@ -2213,9 +2216,6 @@ if (( !REPKG )); then basever=$(get_full_version) check_build_status fi - if (( PREPAREFUNC )); then - run_prepare - fi fi if (( NOBUILD )); then -- 2.7.1

4 8

[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