- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH v3 1/3] HACKING: Allow the use of 'sizeof' on values
by Pierre Neidhardt 21 Oct '15

21 Oct '15

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- HACKING | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/HACKING b/HACKING index 03605dd..962a5f9 100644 --- a/HACKING +++ b/HACKING @@ -75,15 +75,7 @@ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data) NOT return(0); -6. The sizeof() operator should accept a type, not a value. (TODO: in certain - cases, it may be better- should this be a set guideline? Read "The Practice - of Programming") - - sizeof(alpm_list_t); - NOT - sizeof(*mylist); - -7. When using strcmp() (or any function that returns 0 on success) in a +6. When using strcmp() (or any function that returns 0 on success) in a conditional statement, use != 0 or == 0 and not the negation (!) operator. It reads much cleaner for humans (using a negative to check for success is confusing) and the compiler will treat it correctly anyway. @@ -92,7 +84,7 @@ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data) NOT if(!strcmp(a, b)) -8. Use spaces around almost all arithmetic, comparison and assignment +7. Use spaces around almost all arithmetic, comparison and assignment operators and after all ',;:' separators. foobar[2 * size + 1] = function(a, 6); @@ -103,7 +95,7 @@ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data) NOT for(a=0;a<n&&n>0;a++,n--) {} -9. Declare all variables at the start of the block. +8. Declare all variables at the start of the block. [source,C] ------------------------------------------- int SYMEXPORT alpm_db_remove_server(alpm_db_t *db, const char *url) -- 2.6.1

3 10

[pacman-dev] [PATCH v4] Align titles automatically in information display
by Pierre Neidhardt 21 Oct '15

21 Oct '15

A v4 with _T_MAX just for Dave! :D Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- src/pacman/package.c | 173 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 141 insertions(+), 32 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 6b86599..319fd1f 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -25,6 +25,7 @@ #include <limits.h> #include <errno.h> #include <time.h> +#include <wchar.h> #include <alpm.h> #include <alpm_list.h> @@ -36,6 +37,107 @@ #define CLBUF_SIZE 4096 +/* The term "title" refers to the first field of each line in the package + * information displayed by pacman. Titles are stored in the `titles` array and + * referenced by the following indices. + */ +enum { + T_ARCHITECTURE = 0, + T_BACKUP_FILES, + T_BUILD_DATE, + T_COMPRESSED_SIZE, + T_CONFLICTS_WITH, + T_DEPENDS_ON, + T_DESCRIPTION, + T_DOWNLOAD_SIZE, + T_GROUPS, + T_INSTALL_DATE, + T_INSTALL_REASON, + T_INSTALL_SCRIPT, + T_INSTALLED_SIZE, + T_LICENSES, + T_MD5_SUM, + T_NAME, + T_OPTIONAL_DEPS, + T_OPTIONAL_FOR, + T_PACKAGER, + T_PROVIDES, + T_REPLACES, + T_REPOSITORY, + T_REQUIRED_BY, + T_SHA_256_SUM, + T_SIGNATURES, + T_URL, + T_VALIDATED_BY, + T_VERSION, + /* the following is a sentinel and should remain in last position */ + _T_MAX +}; + +/* As of 2015/10/20, the longest title (all locales considered) was less than 30 + * characters long. We set the title maximum length to 50 to allow for some + * potential growth. + */ +#define TITLE_MAXLEN 50 + +static char titles[_T_MAX][TITLE_MAXLEN * sizeof(wchar_t)]; + +/** Build the `titles` array of localized titles and pad them with spaces so + * that they align with the longest title. Storage for strings is stack + * allocated and naively truncated to TITLE_MAXLEN characters. + */ +static void make_aligned_titles() +{ + int i; + size_t max = 0; + static const wchar_t *title_suffix = L" :"; + static const size_t title_suffix_len = sizeof(title_suffix); + wchar_t wbuf[ARRAYSIZE(titles)][TITLE_MAXLEN + title_suffix_len]; + size_t wlen[ARRAYSIZE(wbuf)]; + char *buf[ARRAYSIZE(wbuf)]; + buf[T_ARCHITECTURE] = _("Architecture"); + buf[T_BACKUP_FILES] = _("Backup Files"); + buf[T_BUILD_DATE] = _("Build Date"); + buf[T_COMPRESSED_SIZE] = _("Compressed Size"); + buf[T_CONFLICTS_WITH] = _("Conflicts With"); + buf[T_DEPENDS_ON] = _("Depends On"); + buf[T_DESCRIPTION] = _("Description"); + buf[T_DOWNLOAD_SIZE] = _("Download Size"); + buf[T_GROUPS] = _("Groups"); + buf[T_INSTALL_DATE] = _("Install Date"); + buf[T_INSTALL_REASON] = _("Install Reason"); + buf[T_INSTALL_SCRIPT] = _("Install Script"); + buf[T_INSTALLED_SIZE] = _("Installed Size"); + buf[T_LICENSES] = _("Licenses"); + buf[T_MD5_SUM] = _("MD5 Sum"); + buf[T_NAME] = _("Name"); + buf[T_OPTIONAL_DEPS] = _("Optional Deps"); + buf[T_OPTIONAL_FOR] = _("Optional For"); + buf[T_PACKAGER] = _("Packager"); + buf[T_PROVIDES] = _("Provides"); + buf[T_REPLACES] = _("Replaces"); + buf[T_REPOSITORY] = _("Repository"); + buf[T_REQUIRED_BY] = _("Required By"); + buf[T_SHA_256_SUM] = _("SHA-256 Sum"); + buf[T_SIGNATURES] = _("Signatures"); + buf[T_URL] = _("URL"); + buf[T_VALIDATED_BY] = _("Validated By"); + buf[T_VERSION] = _("Version"); + + for(i = 0; i < ARRAYSIZE(wbuf); i++) { + wlen[i] = mbstowcs(wbuf[i], buf[i], strlen(buf[i]) + 1); + if(wlen[i] > max) { + max = wlen[i]; + } + } + + for(i = 0; i < ARRAYSIZE(wbuf); i++) { + wmemset(wbuf[i] + wlen[i], L' ', max - wlen[i]); + wmemcpy(wbuf[i] + max, title_suffix, title_suffix_len); + wcstombs(titles[i], wbuf[i], sizeof(wbuf[i])); + } +} + /** Turn a depends list into a text list. * @param deps a list with items of type alpm_depend_t */ @@ -70,7 +172,7 @@ static void optdeplist_display(alpm_pkg_t *pkg, unsigned short cols) } text = alpm_list_add(text, depstring); } - list_display_linebreak(_("Optional Deps :"), text, cols); + list_display_linebreak(titles[T_OPTIONAL_DEPS], text, cols); FREELIST(text); } @@ -91,6 +193,13 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) const char *label, *reason; alpm_list_t *validation = NULL, *requiredby = NULL, *optionalfor = NULL; + /* make aligned titles once only */ + static int need_alignment = 1; + if(need_alignment) { + need_alignment = 0; + make_aligned_titles(); + } + from = alpm_pkg_get_origin(pkg); /* set variables here, do all output below */ @@ -124,7 +233,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) validation = alpm_list_add(validation, _("MD5 Sum")); } if(v & ALPM_PKG_VALIDATION_SHA256SUM) { - validation = alpm_list_add(validation, _("SHA256 Sum")); + validation = alpm_list_add(validation, _("SHA-256 Sum")); } if(v & ALPM_PKG_VALIDATION_SIGNATURE) { validation = alpm_list_add(validation, _("Signature")); @@ -144,33 +253,33 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) /* actual output */ if(from == ALPM_PKG_FROM_SYNCDB) { - string_display(_("Repository :"), + string_display(titles[T_REPOSITORY], alpm_db_get_name(alpm_pkg_get_db(pkg)), cols); } - string_display(_("Name :"), alpm_pkg_get_name(pkg), cols); - string_display(_("Version :"), alpm_pkg_get_version(pkg), cols); - string_display(_("Description :"), alpm_pkg_get_desc(pkg), cols); - string_display(_("Architecture :"), alpm_pkg_get_arch(pkg), cols); - string_display(_("URL :"), alpm_pkg_get_url(pkg), cols); - list_display(_("Licenses :"), alpm_pkg_get_licenses(pkg), cols); - list_display(_("Groups :"), alpm_pkg_get_groups(pkg), cols); - deplist_display(_("Provides :"), alpm_pkg_get_provides(pkg), cols); - deplist_display(_("Depends On :"), alpm_pkg_get_depends(pkg), cols); + string_display(titles[T_NAME], alpm_pkg_get_name(pkg), cols); + string_display(titles[T_VERSION], alpm_pkg_get_version(pkg), cols); + string_display(titles[T_DESCRIPTION], alpm_pkg_get_desc(pkg), cols); + string_display(titles[T_ARCHITECTURE], alpm_pkg_get_arch(pkg), cols); + string_display(titles[T_URL], alpm_pkg_get_url(pkg), cols); + list_display(titles[T_LICENSES], alpm_pkg_get_licenses(pkg), cols); + list_display(titles[T_GROUPS], alpm_pkg_get_groups(pkg), cols); + deplist_display(titles[T_PROVIDES], alpm_pkg_get_provides(pkg), cols); + deplist_display(titles[T_DEPENDS_ON], alpm_pkg_get_depends(pkg), cols); optdeplist_display(pkg, cols); if(extra || from == ALPM_PKG_FROM_LOCALDB) { - list_display(_("Required By :"), requiredby, cols); - list_display(_("Optional For :"), optionalfor, cols); + list_display(titles[T_REQUIRED_BY], requiredby, cols); + list_display(titles[T_OPTIONAL_FOR], optionalfor, cols); } - deplist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg), cols); - deplist_display(_("Replaces :"), alpm_pkg_get_replaces(pkg), cols); + deplist_display(titles[T_CONFLICTS_WITH], alpm_pkg_get_conflicts(pkg), cols); + deplist_display(titles[T_REPLACES], alpm_pkg_get_replaces(pkg), cols); size = humanize_size(alpm_pkg_get_size(pkg), '\0', 2, &label); if(from == ALPM_PKG_FROM_SYNCDB) { - printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Download Size :"), + printf("%s%s%s %6.2f %s\n", config->colstr.title, titles[T_DOWNLOAD_SIZE], config->colstr.nocolor, size, label); } else if(from == ALPM_PKG_FROM_FILE) { - printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Compressed Size:"), + printf("%s%s%s %6.2f %s\n", config->colstr.title, titles[T_COMPRESSED_SIZE], config->colstr.nocolor, size, label); } else { /* autodetect size for "Installed Size" */ @@ -178,17 +287,17 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } size = humanize_size(alpm_pkg_get_isize(pkg), label[0], 2, &label); - printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Installed Size :"), + printf("%s%s%s %6.2f %s\n", config->colstr.title, titles[T_INSTALLED_SIZE], config->colstr.nocolor, size, label); - string_display(_("Packager :"), alpm_pkg_get_packager(pkg), cols); - string_display(_("Build Date :"), bdatestr, cols); + string_display(titles[T_PACKAGER], alpm_pkg_get_packager(pkg), cols); + string_display(titles[T_BUILD_DATE], bdatestr, cols); if(from == ALPM_PKG_FROM_LOCALDB) { - string_display(_("Install Date :"), idatestr, cols); - string_display(_("Install Reason :"), reason, cols); + string_display(titles[T_INSTALL_DATE], idatestr, cols); + string_display(titles[T_INSTALL_REASON], reason, cols); } if(from == ALPM_PKG_FROM_FILE || from == ALPM_PKG_FROM_LOCALDB) { - string_display(_("Install Script :"), + string_display(titles[T_INSTALL_SCRIPT], alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No"), cols); } @@ -206,27 +315,27 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) keys = alpm_list_add(keys, _("None")); } - 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); + string_display(titles[T_MD5_SUM], alpm_pkg_get_md5sum(pkg), cols); + string_display(titles[T_SHA_256_SUM], alpm_pkg_get_sha256sum(pkg), cols); + list_display(titles[T_SIGNATURES], keys, cols); if(base64_sig) { FREELIST(keys); } } else { - list_display(_("Validated By :"), validation, cols); + list_display(titles[T_VALIDATED_BY], validation, cols); } if(from == ALPM_PKG_FROM_FILE) { alpm_siglist_t siglist; int err = alpm_pkg_check_pgp_signature(pkg, &siglist); if(err && alpm_errno(config->handle) == ALPM_ERR_SIG_MISSING) { - string_display(_("Signatures :"), _("None"), cols); + string_display(titles[T_SIGNATURES], _("None"), cols); } else if(err) { - string_display(_("Signatures :"), + string_display(titles[T_SIGNATURES], alpm_strerror(alpm_errno(config->handle)), cols); } else { - signature_display(_("Signatures :"), &siglist, cols); + signature_display(titles[T_SIGNATURES], &siglist, cols); } alpm_siglist_cleanup(&siglist); } @@ -290,7 +399,7 @@ void dump_pkg_backups(alpm_pkg_t *pkg) { alpm_list_t *i; const char *root = alpm_option_get_root(config->handle); - printf("%s%s%s", config->colstr.title, _("Backup Files:\n"), + printf("%s%s\n%s", config->colstr.title, titles[T_BACKUP_FILES], config->colstr.nocolor); if(alpm_pkg_get_backup(pkg)) { /* package has backup files, so print them */ -- 2.6.1

2 2

[pacman-dev] [PATCH 1/3] pacsort: handle failing list_add
by Rikard Falkeborn 21 Oct '15

21 Oct '15

Since it can fail, check the return value. If it fails, we need to free the memory of the object we wanted to add to the list. Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> --- 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 b0137ec..003ec07 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -254,7 +254,10 @@ static char *explode(struct buffer_t *buffer, struct list_t *list) while((end = memchr(ptr, linedelim, &buffer->mem[buffer->len] - ptr))) { *end = '\0'; meta = input_new(ptr, end - ptr); - list_add(list, meta); + if(meta == NULL || list_add(list, meta) != 0) { + input_free(meta); + return NULL; + } ptr = end + 1; } @@ -294,6 +297,7 @@ static int splitfile(FILE *stream, struct buffer_t *buffer, struct list_t *list) if(buffer->len) { struct input_t *meta = input_new(buffer->mem, buffer->len + 1); if(meta == NULL || list_add(list, meta) != 0) { + input_free(meta); return 1; } } -- 2.5.0

2 5

[pacman-dev] [PATCH v2 1/3] package.c: Remove obsolete param from doc
by Pierre Neidhardt 20 Oct '15

20 Oct '15

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- src/pacman/package.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 2fd0a9c..0e4977f 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -79,7 +79,6 @@ static void optdeplist_display(alpm_pkg_t *pkg, unsigned short cols) * Extra information entails 'required by' info for sync packages and backup * files info for local packages. * @param pkg package to display information for - * @param from the type of package we are dealing with * @param extra should we show extra information */ void dump_pkg_full(alpm_pkg_t *pkg, int extra) -- 2.6.1

3 10

[pacman-dev] pacman-5.0 planning
by Allan McRae 20 Oct '15

20 Oct '15

Hi, Hooks have landed! That means we need to have a release. So here is what is done so far. 1) HOOKS! Andrew has implemented hooks. So far they can not be passed the file names triggered the hook, but there are some WIP patches available. The release is still a while off, so these can be included 9if they don't take months!). 2) File database operations. Listing, searching the sync files databases. 3) Libmakepkg. A lot has been split from makepkg. makepkg has gone from 3838 lines in the last to 2380 lines in current git. More can be split, but the work is done to allow most the most important areas of makepkg to be extended as wanted. Hooks has documentation written, files operations has no documentation yet, and I am not sure what documentation is needed for libmakepkg (suggestions welcome). Is there anything else that people are planning that they would like to land for pacman-5.0? Ping any patches that have not been applied yet, or bug reports that need addressed in reply to this. I will go through patchwork and the bug tracker at some stage anyway. Cheers, Allan

3 4

[pacman-dev] [PATCH] makepkg: Implement 'autolibprovides' option
by Mohammad Alsaleh 20 Oct '15

20 Oct '15

The option tries to find all real (no symlinks) library names in the paths a compiler/linker search for by default. And add those libraries to libprovides. The option is disabled by default. Signed-off-by: Mohammad Alsaleh <CE.Mohammad.AlSaleh(a)gmail.com> --- Side notes: 1- I wasn't sure where to define the option. Since all options were moved to libmakepkg/tidy. 2- A side benefit of this approach is that the developer does not have to guess what to put exactly in provides. A discussion from 2.5 years ago: https://lists.archlinux.org/pipermail/pacman-dev/2013-May/017147.html https://lists.archlinux.org/pipermail/pacman-dev/2013-May/017152.html etc/makepkg.conf.in | 23 ++++++++++++----------- scripts/makepkg.sh.in | 22 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 71ec624..da6e7ad 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -74,18 +74,19 @@ BUILDENV=(!distcc color !ccache check !sign) # Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !optipng !debug) # A negated option will do the opposite of the comments below. # -#-- strip: Strip symbols from binaries/libraries -#-- docs: Save doc directories specified by DOC_DIRS -#-- libtool: Leave libtool (.la) files in packages +#-- strip: Strip symbols from binaries/libraries +#-- docs: Save doc directories specified by DOC_DIRS +#-- libtool: Leave libtool (.la) files in packages #-- staticlibs: Leave static library (.a) files in packages -#-- emptydirs: Leave empty directories in packages -#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip -#-- purge: Remove files specified by PURGE_TARGETS -#-- upx: Compress binary executable files using UPX -#-- optipng: Optimize PNG images with optipng -#-- debug: Add debugging flags as specified in DEBUG_* variables -# -OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !optipng !debug) +#-- emptydirs: Leave empty directories in packages +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS +#-- upx: Compress binary executable files using UPX +#-- optipng: Optimize PNG images with optipng +#-- debug: Add debugging flags as specified in DEBUG_* variables +#-- autolibprovides: Auto-add so provides +# +OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !optipng !debug !autolibprovides) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6ededa3..5475bcc 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -48,6 +48,7 @@ declare -r startdir="$PWD" LIBRARY=${LIBRARY:-'@libmakepkgdir@'} +packaging_options+=('autolibprovides') build_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgdesc' 'arch' 'url' 'license' 'groups' 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' 'backup' @@ -944,6 +945,24 @@ find_libdepends() { printf '%s\n' "${libdepends[@]}" } +auto_libprovides() { + local f solib search_paths autolibprovides + + msg2 "$(gettext "Auto-adding libprovides...")" + + # Only search default library paths + search_paths=($(${CC:-gcc} -print-search-dirs | grep '^lib' | sed "s|^libraries: =|:|;s|:| ${pkgdir}|g")) + + for f in $(find ${search_paths[@]} -maxdepth 1 -type f 2>/dev/null); do + # Match solibs, but exclude ones with a relative path to avoid dups + if [[ "$f" =~ \.so ]] && [[ ! "$f" =~ \.\./ ]]; then + solib="${f##*/}" + autolibprovides+=("${solib%.so.*}.so") + fi + done + + printf '%s\n' "${autolibprovides[@]}" +} find_libprovides() { local p libprovides missing @@ -1130,6 +1149,9 @@ write_pkginfo() { printf "size = %s\n" "$size" printf "arch = %s\n" "$pkgarch" + if check_option "autolibprovides" "y"; then + mapfile -t provides < <(auto_libprovides) + fi mapfile -t provides < <(find_libprovides) mapfile -t depends < <(find_libdepends) -- 2.6.1

4 7

[pacman-dev] [PATCH 0/3] Fix translation issues reported on Transifex
by Allan McRae 19 Oct '15

19 Oct '15

Thanks to the translators who pointed these out. I will deal with removing the spaces before the ellipses in the translation files before pushing this to Transifex with the next release. Allan McRae (3): Pluralize malloc failure string Remove space before ellipses makepkg: separate "sourcefile" into two words scripts/libmakepkg/source/bzr.sh.in | 4 ++-- scripts/makepkg.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/repo-add.sh.in | 2 +- src/pacman/conf.c | 4 +++- 5 files changed, 8 insertions(+), 6 deletions(-) -- 2.6.1

1 3

[pacman-dev] [PATCH 1/3] libmakepkg: Add check_buildoption for distcc and ccache
by Jan Alexander Steffens (heftig) 19 Oct '15

19 Oct '15

This reduces code duplication a bit. It also highlights how these options are checked. Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> --- scripts/libmakepkg/util/option.sh | 22 ++++++++++++++++++++++ scripts/makepkg.sh.in | 8 ++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/scripts/libmakepkg/util/option.sh b/scripts/libmakepkg/util/option.sh index 1b2d94d..1266e05 100644 --- a/scripts/libmakepkg/util/option.sh +++ b/scripts/libmakepkg/util/option.sh @@ -106,3 +106,25 @@ check_buildenv() { # not found return 127 } + +## +# Check if option is present in BUILDENV and not inverted in options +# +# usage : check_buildoption( $option, $expected_val ) +# return : 0 - matches expected +# 1 - does not match expected +# 127 - not found +## +check_buildoption() { + case "$2" in + y) # assert enabled + check_buildenv "$1" "y" && ! check_option "$1" "n" + return ;; + n) # assert disabled + check_buildenv "$1" "n" && ! check_option "$1" "y" + return ;; + esac + + # not found + return 127 +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ec8218f..a8bac02 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -857,13 +857,13 @@ run_prepare() { run_build() { # use distcc if it is requested (check buildenv and PKGBUILD opts) - if check_buildenv "distcc" "y" && ! check_option "distcc" "n"; then + if check_buildoption "distcc" "y"; then [[ -d /usr/lib/distcc/bin ]] && export PATH="/usr/lib/distcc/bin:$PATH" export DISTCC_HOSTS fi # use ccache if it is requested (check buildenv and PKGBUILD opts) - if check_buildenv "ccache" "y" && ! check_option "ccache" "n"; then + if check_buildoption "ccache" "y"; then [[ -d /usr/lib/ccache/bin ]] && export PATH="/usr/lib/ccache/bin:$PATH" fi @@ -1562,7 +1562,7 @@ check_software() { fi # distcc - compilation with distcc - if check_buildenv "distcc" "y" && ! check_option "distcc" "n"; then + if check_buildoption "distcc" "y"; then if ! type -p distcc >/dev/null; then error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" ret=1 @@ -1570,7 +1570,7 @@ check_software() { fi # ccache - compilation with ccache - if check_buildenv "ccache" "y" && ! check_option "ccache" "n"; then + if check_buildoption "ccache" "y"; then if ! type -p ccache >/dev/null; then error "$(gettext "Cannot find the %s binary required for compiler cache usage.")" "ccache" ret=1 -- 2.5.2

2 6

[pacman-dev] [PATCH] Ignore cov-int directory for Coverity scan
by Allan McRae 18 Oct '15

18 Oct '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 09ed787..499d499 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ config.status config.status.lineno configure configure.lineno +cov-int cscope.in.out cscope.out cscope.po.out -- 2.6.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-219-g0ee1bec
by allan＠archlinux.org 18 Oct '15

18 Oct '15

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 0ee1beca12f6070d406bbf09c3036124018e57bf (commit) via c99ebca83e5c7ac59d9489ea98d310ee41c91de5 (commit) via 002acb467425755ea6203cce8c77733140489c18 (commit) via cbb7e180c755d1e84983b583518626125781da8a (commit) via a5759cb0d7a65d3637e0065258b7478530b75b7a (commit) via b76409609c051e236a849746db79bd438e353b60 (commit) via 4ceb1c5bf91dea2453d9b888138c40e4f97d408d (commit) via 60ebee7a6e1984f14ea3f88159c28fa9b99d7f5c (commit) via 7000bf919812f3ed56969a86b4aebf90e98ec6a3 (commit) via e8e872c8f93ba13f67b882d64c16606973f0ff67 (commit) via 16718a216ee5607c56d220a198fdb48a923aaafc (commit) via 568a89d58018e89e3a5bb3c28cb0ca3b845aae1b (commit) via c261210ccf0a7d08c7b3f24aee40b7c8d900e6ac (commit) via 46a1ac642907039a64f2ec93d352508b2ba3ba79 (commit) via e8deba3b87784ca14c9afc908046f36a3ad7578c (commit) via 0adb74b29395a727672e4af828a9e5426c738913 (commit) via dd3fe853b30069df19b8d18474c1e94a4038c369 (commit) via 19e61a9e0726d7524b13596da1a07e50ad72d21f (commit) via be503c6eacca4c24878f4aaa928751bc051ebb1f (commit) via 6946d7d1b77a550c3f4de48e4cc6ad1094ac6b10 (commit) via af747ef34a9a152614fcde18abcfc6e1e3ec5d0e (commit) via edbe6c2bdc6a3011e5aea208c44be5eee02f120b (commit) via 75fe6ef104b1071bf763354177f3c4339c1c7854 (commit) via 486643083c853a1d541d6f8e93c68b7a542f5a2d (commit) via 1586b23080f77abf2ffd8c42027dbf8180126cdd (commit) via ec50ec8a1587613a1f602c2e67c4cab33ac3115d (commit) from 578035075108a90d20f084f077badf05d1c8527c (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 0ee1beca12f6070d406bbf09c3036124018e57bf Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 18 11:27:56 2015 +1000 contrib/checkupdates: separate fakeroot call and command Separating the fakeroot command and the pacman call with "--" prevents weird interactions with some locales. See FS#46405. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c99ebca83e5c7ac59d9489ea98d310ee41c91de5 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Sat Oct 17 19:02:56 2015 +0200 package.c: Comment style Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 002acb467425755ea6203cce8c77733140489c18 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 17 19:50:05 2015 +1000 Do not print any root prefix in files database operations Combining with the --root flag and outputing a consistent root prefix leads to many situations that make no sense. Instead, do not print any prefix for any --files operations. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cbb7e180c755d1e84983b583518626125781da8a Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Sat Oct 17 19:02:55 2015 +0200 package.c: Remove obsolete param from doc Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a5759cb0d7a65d3637e0065258b7478530b75b7a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 16 20:28:31 2015 -0400 add hook tests Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b76409609c051e236a849746db79bd438e353b60 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 16 20:28:30 2015 -0400 pactest: add hook/script support Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4ceb1c5bf91dea2453d9b888138c40e4f97d408d Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 16 20:28:29 2015 -0400 util.py: return the created path Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 60ebee7a6e1984f14ea3f88159c28fa9b99d7f5c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 16 20:28:28 2015 -0400 pactest: use pacman --hookdir option Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7000bf919812f3ed56969a86b4aebf90e98ec6a3 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 16 20:28:27 2015 -0400 pacman: add user hook directories Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e8e872c8f93ba13f67b882d64c16606973f0ff67 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 16 20:28:26 2015 -0400 validate hooks after parsing Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 16718a216ee5607c56d220a198fdb48a923aaafc Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 16 20:28:25 2015 -0400 run hooks during trans_commit Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 568a89d58018e89e3a5bb3c28cb0ca3b845aae1b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 16 20:28:24 2015 -0400 add hook data types and parser Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c261210ccf0a7d08c7b3f24aee40b7c8d900e6ac Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 16 20:28:23 2015 -0400 handle: add hookdirs option Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 46a1ac642907039a64f2ec93d352508b2ba3ba79 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Sat Oct 17 11:36:13 2015 +0200 PKGBUILD.5: post_*() are functions, not scripts Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e8deba3b87784ca14c9afc908046f36a3ad7578c Author: Allan McRae <allan(a)archlinux.org> Date: Wed Sep 23 00:02:12 2015 +1000 makepkg: remove ability to build individual packages Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0adb74b29395a727672e4af828a9e5426c738913 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Sep 22 16:11:32 2015 +1000 libmakepkg: remove declaration of unused local variables Signed-off-by: Allan McRae <allan(a)archlinux.org> commit dd3fe853b30069df19b8d18474c1e94a4038c369 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Sep 22 16:06:29 2015 +1000 libmakepkg: return 1 on error in arch array The return value was being assigned when an error was found in a PKGBUILD's arch array but it never was returned. Also remove error message explaining about adding the arch array to a PKGBUILD. That was added a long time ago when the arch array first became compulsory. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 19e61a9e0726d7524b13596da1a07e50ad72d21f Author: Allan McRae <allan(a)archlinux.org> Date: Tue Sep 22 15:11:52 2015 +1000 libmakepkg: update .gitignore Signed-off-by: Allan McRae <allan(a)archlinux.org> commit be503c6eacca4c24878f4aaa928751bc051ebb1f Author: Allan McRae <allan(a)archlinux.org> Date: Tue Sep 22 14:54:03 2015 +1000 makepkg: remove FORCE_VER variable This variable is no longer in VCS building. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6946d7d1b77a550c3f4de48e4cc6ad1094ac6b10 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Sep 14 18:37:40 2015 -0400 check fileconflicts and diskspace outside commit This is necessary in order to be able to run PreTransaction hooks as close to the actual commit as possible so that we don't prematurely run hooks for a transaction that ultimately never happens. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit af747ef34a9a152614fcde18abcfc6e1e3ec5d0e Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Sep 14 18:37:39 2015 -0400 move ini parser into common Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit edbe6c2bdc6a3011e5aea208c44be5eee02f120b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Sep 14 18:37:38 2015 -0400 move strtrim to util-common Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 75fe6ef104b1071bf763354177f3c4339c1c7854 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Sep 15 01:08:16 2015 -0400 sortbydeps: skip local packages being updated Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 486643083c853a1d541d6f8e93c68b7a542f5a2d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 20 15:46:22 2015 +1000 libmakepkg: check if PKGBUILD variables are arrays or not as appropriate When extracting variables from PKGBUILD (e.g. for .SRCINFO creation) we make assumptions about whether variables are arrays or not. This adds a check to the PKGBUILD linter to ensure variables are arrays or not as appropriate. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1586b23080f77abf2ffd8c42027dbf8180126cdd Author: Allan McRae <allan(a)archlinux.org> Date: Sat Aug 8 13:42:07 2015 +1000 libmakepkg: util/pkgbuild.sh needs processing on build pkgbuild.sh contained @DEBUGSUFFIX@ and so needs to be run through the sed command on build. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ec50ec8a1587613a1f602c2e67c4cab33ac3115d Author: Allan McRae <allan(a)archlinux.org> Date: Sat Aug 8 10:47:13 2015 +1000 pacman.8: Consistently refer to the package database We use "package database" everywhere apart from in the description of "-y". Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/checkupdates.sh.in | 2 +- doc/PKGBUILD.5.txt | 2 +- doc/makepkg.8.txt | 4 - doc/pacman.8.txt | 6 +- doc/pacman.conf.5.txt | 8 + lib/libalpm/Makefile.am | 3 + lib/libalpm/alpm.c | 5 + lib/libalpm/alpm.h | 10 + lib/libalpm/deps.c | 11 +- lib/libalpm/error.c | 2 + lib/libalpm/handle.c | 59 +++ lib/libalpm/handle.h | 1 + lib/libalpm/hook.c | 498 +++++++++++++++++++++ lib/libalpm/{group.h => hook.h} | 20 +- lib/libalpm/ini.c | 1 + lib/libalpm/ini.h | 1 + lib/libalpm/sync.c | 18 +- lib/libalpm/sync.h | 3 +- lib/libalpm/trans.c | 12 +- scripts/Makefile.am | 3 +- scripts/libmakepkg/.gitignore | 5 +- scripts/libmakepkg/lint_pkgbuild/arch.sh.in | 4 +- scripts/libmakepkg/lint_pkgbuild/changelog.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 65 +++ .../util/{pkgbuild.sh => pkgbuild.sh.in} | 0 scripts/makepkg.sh.in | 12 - scripts/po/POTFILES.in | 1 + src/{pacman => common}/ini.c | 0 src/{pacman => common}/ini.h | 0 src/common/util-common.c | 39 ++ src/common/util-common.h | 2 + src/pacman/Makefile.am | 2 + src/pacman/conf.c | 22 + src/pacman/conf.h | 2 + src/pacman/files.c | 28 +- src/pacman/ini.c | 117 +---- src/pacman/ini.h | 31 +- src/pacman/package.c | 3 +- src/pacman/pacman.c | 10 + src/pacman/util.c | 39 -- src/pacman/util.h | 1 - src/util/pactree.c | 36 -- test/pacman/pmfile.py | 27 +- test/pacman/pmpkg.py | 3 +- test/pacman/pmtest.py | 30 +- test/pacman/tests/TESTS | 10 + .../tests/dependency-cycle-fixed-by-upgrade.py | 32 ++ test/pacman/tests/hook-abortonfail.py | 25 ++ test/pacman/tests/hook-file-change-packages.py | 32 ++ .../pacman/tests/hook-file-remove-trigger-match.py | 24 + test/pacman/tests/hook-file-upgrade-nomatch.py | 27 ++ test/pacman/tests/hook-invalid-trigger.py | 25 ++ .../pacman/tests/hook-pkg-install-trigger-match.py | 23 + test/pacman/tests/hook-pkg-remove-trigger-match.py | 23 + .../pacman/tests/hook-pkg-upgrade-trigger-match.py | 26 ++ test/pacman/tests/hook-upgrade-trigger-no-match.py | 23 + test/pacman/util.py | 5 +- 57 files changed, 1144 insertions(+), 281 deletions(-) create mode 100644 lib/libalpm/hook.c copy lib/libalpm/{group.h => hook.h} (69%) create mode 120000 lib/libalpm/ini.c create mode 120000 lib/libalpm/ini.h create mode 100644 scripts/libmakepkg/lint_pkgbuild/variable.sh.in rename scripts/libmakepkg/util/{pkgbuild.sh => pkgbuild.sh.in} (100%) copy src/{pacman => common}/ini.c (100%) copy src/{pacman => common}/ini.h (100%) mode change 100644 => 120000 src/pacman/ini.c mode change 100644 => 120000 src/pacman/ini.h create mode 100644 test/pacman/tests/dependency-cycle-fixed-by-upgrade.py create mode 100644 test/pacman/tests/hook-abortonfail.py create mode 100644 test/pacman/tests/hook-file-change-packages.py create mode 100644 test/pacman/tests/hook-file-remove-trigger-match.py create mode 100644 test/pacman/tests/hook-file-upgrade-nomatch.py create mode 100644 test/pacman/tests/hook-invalid-trigger.py create mode 100644 test/pacman/tests/hook-pkg-install-trigger-match.py create mode 100644 test/pacman/tests/hook-pkg-remove-trigger-match.py create mode 100644 test/pacman/tests/hook-pkg-upgrade-trigger-match.py create mode 100644 test/pacman/tests/hook-upgrade-trigger-no-match.py hooks/post-receive -- The official pacman repository

1 0