- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Give groups display text singular and plural forms
by Allan McRae 03 Feb '14

03 Feb '14

Reported on transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I suppose we could go further and not display the selection dialog when there is only one package in the group, but I thought keeping consistency there was better. src/pacman/sync.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index f6ee57a..3cb73bc 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -601,8 +601,9 @@ static int process_group(alpm_list_t *dbs, const char *group, int error) } if(config->print == 0) { - colon_printf(_("There are %d members in group %s:\n"), count, - group); + colon_printf(_n("There is %d member in group %s:\n", + "There are %d members in group %s:\n", count), + count, group); select_display(pkgs); char *array = malloc(count); if(!array) { -- 1.8.5.3

1 0

[pacman-dev] [PATCH 1/6] pacsearch: removed useless comment
by Pierre Neidhardt 03 Feb '14

03 Feb '14

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/pacsearch.in | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index 21043d4..71e0107 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -138,7 +138,6 @@ if ($#querypkgs >= 0) { foreach $_ (@querypkgs) { # we grab the following fields: repo, name, ver, group, installed, and desc my @pkgfields = /^(.*?)\/(.*?) (.*?) ?($.*?$)? ?(\[.*\])?\n(.*)$/s; - # my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; # skip any non-matching line next if not defined $pkgfields[1]; # check if the package was listed in the sync out -- 1.8.5.3

2 11

[pacman-dev] [PATCH] makepkg: remove unneeded "|| true"
by Allan McRae 02 Feb '14

02 Feb '14

makepkg only aborts on errors during PKGBUILD functions so the remaining "|| true" statements are unneeded. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ce6c9da..b69c071 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1094,16 +1094,16 @@ remove_deps() { # check for packages removed during dependency install (e.g. due to conflicts) # removing all installed packages is risky in this case if [[ -n $(grep -xvFf <(printf '%s\n' "${current_pkglist[@]}") \ - <(printf '%s\n' "${original_pkglist[@]}") || true) ]]; then + <(printf '%s\n' "${original_pkglist[@]}")) ]]; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi local deplist deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \ - <(printf "%s\n" "${current_pkglist[@]}") || true)) + <(printf "%s\n" "${current_pkglist[@]}"))) if [[ -z $deplist ]]; then - return + return 0 fi msg "Removing installed dependencies..." @@ -2674,7 +2674,7 @@ fi # set pacman command if not already defined PACMAN=${PACMAN:-pacman} # save full path to command as PATH may change when sourcing /etc/profile -PACMAN_PATH=$(type -P $PACMAN) || true +PACMAN_PATH=$(type -P $PACMAN) # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW -- 1.8.5.3

2 1

[pacman-dev] [PATCH] checkupdates: Add package download mode with "-d"
by Chris Down 02 Feb '14

02 Feb '14

This new mode, which must be run as root, allows for the precaching of packages which can then subsequently be updated by calling "pacman -Syu" as normal. This can then be integrated with a cron script (for example, checkupdates-cron[0]) for automated, safe downloading of packages alongside getting the list of packages to update, or run manually on the command line to download new packages, but avoid updating the main package database. As a side effect of adding the -d option, argument handling (which was previously not present) is now done using "getopts". This seems like a reasonable way to do it instead of just hacking in a check for "-d" as $1 now, but I'm not particularly averse to either. "getopts" would just allow for better future flexibility in this area. It is possible to do this as another script, say, downloadupdates, but we would encounter pretty heavy code duplication with "checkupdates", so it seems more sensible to do it here. Due to the use of --noconfirm, this has some limitations when we encounter more complex upgrade scenarios, for example when a new package conflict occurs, an upgrade path cannot be correctly/automatically determined, a package was replaced, etc. This is not a major problem -- in the worst case, we just don't get the packages that we wanted downloaded and an error message is displayed to the user. The choice to hide both STDOUT and STDERR of "pacman -Syuw" is potentially up for debate. It makes it more difficult to determine where the problem was if the command fails -- we still display a message saying that that was the case, and set the exit code accordingly, but the actual cause needs to be determined by the user elsewhere. For this reason, "-p" exists to force the package download to output as normal. It seems desirable that "-p" also affects the silence of the database update, but this is also up for discussion if people feel it should not be within the remit of the (( silent )) checks. [0]: https://github.com/cdown/checkupdates-cron --- contrib/checkupdates.sh.in | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index 413b78a..02acb67 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -21,16 +21,43 @@ declare -r myname='checkupdates' declare -r myver='@PACKAGE_VERSION@' -if (( $# > 0 )); then +download=0 +silent=1 + +usage() { echo "${myname} (pacman) v${myver}" echo echo "Safely print a list of pending updates" echo echo "Usage: ${myname}" echo + echo "Options:" + echo " -d Download upgradeable packages to pacman package cache." + echo " -p Print pacman output from the database upgrade and package download." + echo echo 'Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary database.' exit 0 -fi +} + +run_silent() ( + (( silent )) && exec &>/dev/null + "$@" +) + +while getopts ':dp' opt; do + case $opt in + d) + if (( UID )); then + echo "Download mode can only be run as root." >&2 + exit 2 + fi + + download=1 + ;; + p) silent=0 ;; + \?) usage ;; + esac +done if [[ -z $CHECKUPDATES_DB ]]; then CHECKUPDATES_DB="${TMPDIR:-/tmp}/checkup-db-${USER}/" @@ -43,9 +70,17 @@ 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 +run_silent fakeroot pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null pacman -Qqu --dbpath "$CHECKUPDATES_DB" 2> /dev/null +if (( download )); then + if ! run_silent pacman -Suw --noconfirm --dbpath "$CHECKUPDATES_DB"; then + ret=$? + (( silent )) && echo "Failed to download packages." >&2 + exit "$ret" + fi +fi + exit 0 # vim: set ts=2 sw=2 noet: -- 1.8.5.3

2 1

[pacman-dev] [PATCH] makepkg: Fix typo in variable name
by Allan McRae 02 Feb '14

02 Feb '14

It turns out that you should refer to variables by their actual name... Introduced in commit a521cea9. FS#38414. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- *cough* Dave *cough* scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e3d9a93..ce6c9da 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1093,8 +1093,8 @@ remove_deps() { # check for packages removed during dependency install (e.g. due to conflicts) # removing all installed packages is risky in this case - if [[ -n $(grep -xvFf <(printf '%s\n' "${current_packagelist[@]}") \ - <(printf '%s\n' "${original_packagelist[@]}") || true) ]]; then + if [[ -n $(grep -xvFf <(printf '%s\n' "${current_pkglist[@]}") \ + <(printf '%s\n' "${original_pkglist[@]}") || true) ]]; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi -- 1.8.5.3

1 0

[pacman-dev] [PATCH] Do not remove source code references in PO/POT files
by Allan McRae 02 Feb '14

02 Feb '14

From: Rafael Ferreira <josephgbr(a)archlinux.info> FS#34240. This is useful for translators and has little cost to us since we moved to transifex for translations. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/po/Makevars | 2 +- scripts/po/Makevars | 2 +- src/pacman/po/Makevars | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/po/Makevars b/lib/libalpm/po/Makevars index 09fb353..21bc008 100644 --- a/lib/libalpm/po/Makevars +++ b/lib/libalpm/po/Makevars @@ -8,7 +8,7 @@ subdir = lib/libalpm/po top_builddir = ../../../ # These options get passed to xgettext. -XGETTEXT_OPTIONS = --no-location \ +XGETTEXT_OPTIONS = \ --keyword=_ --flag=_:1:c-format \ --keyword=_n:1,2 --flag=_n:1:c-format --flag=_n:2:c-format diff --git a/scripts/po/Makevars b/scripts/po/Makevars index 494da1d..f658289 100644 --- a/scripts/po/Makevars +++ b/scripts/po/Makevars @@ -8,7 +8,7 @@ subdir = scripts/po top_builddir = ../../ # These options get passed to xgettext. -XGETTEXT_OPTIONS = --no-location +XGETTEXT_OPTIONS = # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding diff --git a/src/pacman/po/Makevars b/src/pacman/po/Makevars index 4e34304..ea30f05 100644 --- a/src/pacman/po/Makevars +++ b/src/pacman/po/Makevars @@ -8,7 +8,7 @@ subdir = src/pacman/po top_builddir = ../../../ # These options get passed to xgettext. -XGETTEXT_OPTIONS = --no-location \ +XGETTEXT_OPTIONS = \ --keyword=_ --flag=_:1:c-format \ --keyword=_n:1,2 --flag=_n:1:c-format --flag=_n:2:c-format -- 1.8.5.3

1 0

[pacman-dev] [PATCH] Prevent makepkg creating armored signatures
by Allan McRae 02 Feb '14

02 Feb '14

From: Lars Gustäbel <lars(a)gustaebel.de> If the user has "armor" in thier gpg.conf, makepkg will create an ascii-armored signature. Use --no-armor in the gpg call to avoid. FS#38503. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7d8a676..e3d9a93 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1968,7 +1968,7 @@ create_signature() { SIGNWITHKEY="-u ${GPGKEY}" fi # The signature will be generated directly in ascii-friendly format - gpg --detach-sign --use-agent ${SIGNWITHKEY} "$filename" &>/dev/null || ret=$? + gpg --detach-sign --use-agent ${SIGNWITHKEY} --no-armor "$filename" &>/dev/null || ret=$? if (( ! ret )); then -- 1.8.5.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-283-ge4f6edf
by allan＠archlinux.org 02 Feb '14

02 Feb '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 e4f6edf2374185c76a1f42a1aa6156d479bc6f40 (commit) via 1e07af1b0a16d9f8e42a76d00de8558e49cb57b7 (commit) via fe19a0c58d8c2d5b8fa6ca4a55647bbfe6bf5b51 (commit) via 15f4144e12c48283bdcfef50fec64b4040b0000a (commit) via 135d862eb6e3051e351888b08c94529c967c5387 (commit) via 6fb2035dd03f3ee33f945cacee4e835156e1f76b (commit) via c71efe6d62ad205d479b3872851d9ace4885677f (commit) via f5299d17523b1fc7ce5c36f852de3d6575e71327 (commit) via 6268e66efaae690ea7df1a8b84913fdf8528874c (commit) via ccabeafb3d489dfe285626b2fc2f7d2024d7aa7f (commit) via 3dc87ec59a675798df30904b99cb4bfa657a4fb5 (commit) via edce7555a6b7410d1a4da6d27d22383989306ccc (commit) via aa4d3298fb6d46bec3d8996ff8c7ec8c9cc50db9 (commit) via c2edd31eae73c9a4bf7b62e41a12fd5c3bba2ce0 (commit) via fac9ac6c4011ff643b7335c7381f6219b07bba80 (commit) via 4d68092e2fd8c8a3b6da39e509ad48db0fc9ed7a (commit) via 6be08f76f6c4188f0aa4d0a4d88595a898bf3d3b (commit) via 819b4cd54e3caec4d3803cc62772369031ed0847 (commit) via 77da9dc9748b3f151f98c4c301e8da3a2551860d (commit) via cb8eae24c9976c023c8ec2aff9bf305202edc4d7 (commit) via d895cae16cc97e5f1e3f95eb748a99161678f8ee (commit) via aabb7c3cddf5e97d1b1ebb3548664f1af85c1392 (commit) via 7ae25ac67fd4dd087791be55fa3c4997be7aac52 (commit) via 333373f90e515bbaf6997dc7bf7385fe114689b2 (commit) from 5be7b6a1b2e197a6d185fc6223ff1e7acc4c3e27 (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 e4f6edf2374185c76a1f42a1aa6156d479bc6f40 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Thu Jan 23 00:07:09 2014 +0100 pacsearch: CLI option to turn off colors Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1e07af1b0a16d9f8e42a76d00de8558e49cb57b7 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Thu Jan 23 00:07:08 2014 +0100 pacsearch: using pacman color theme No more per-repo coloring: this was not Arch-agnostic, and there is no reasonable, simple way to color repos in a consistant manner with only 6 colors. 'local' is in red: this way we benefit from the pacman -Ss && pacman -Qs combo. to_color subroutine: it takes an array instead of a string, this is faster and simpler. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fe19a0c58d8c2d5b8fa6ca4a55647bbfe6bf5b51 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Thu Jan 23 00:07:07 2014 +0100 pacsearch: colors are portable (ANSI) and have natural variable names Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 15f4144e12c48283bdcfef50fec64b4040b0000a Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Thu Jan 23 00:07:06 2014 +0100 pacsearch: Explicitly extract group information Also store pkgname and pkgver separately. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 135d862eb6e3051e351888b08c94529c967c5387 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Thu Jan 23 00:07:05 2014 +0100 pacsearch: localized output Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6fb2035dd03f3ee33f945cacee4e835156e1f76b Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Thu Jan 23 00:07:04 2014 +0100 pacsearch: more accurate help message Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c71efe6d62ad205d479b3872851d9ace4885677f Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Thu Jan 23 00:07:03 2014 +0100 pacsearch: Copyright year bump Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f5299d17523b1fc7ce5c36f852de3d6575e71327 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Sat Feb 1 19:42:44 2014 -0500 makepkg.conf(5): Fix and improve grammar and spelling issues Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6268e66efaae690ea7df1a8b84913fdf8528874c Author: Jason St. John <jstjohn(a)purdue.edu> Date: Sat Feb 1 21:28:09 2014 -0500 Remove ChangeLog.proto and move important info to PKGBUILD(5) The change log prototype should be distribution determined. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ccabeafb3d489dfe285626b2fc2f7d2024d7aa7f Author: Jason St. John <jstjohn(a)purdue.edu> Date: Sat Feb 1 20:43:18 2014 -0500 makepkg.conf(5): Add missing backticks around vars, and use single quotes around "gpg" command Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3dc87ec59a675798df30904b99cb4bfa657a4fb5 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Sat Feb 1 19:04:07 2014 -0500 proto: Remove recommendation of "makepkg -g" in comments This recommendation encouraged the practice of not checking the checksums provided upstream. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit edce7555a6b7410d1a4da6d27d22383989306ccc Author: Maxime Gauduin <alucryd(a)gmail.com> Date: Tue Jan 28 14:49:47 2014 +0100 Add PKGBUILD-vcs.proto This PKGBUILD proto covers the newly introduced VCS capabilities of pacman. It serves as a replacement for the current bzr, git, hg and svn protos found in ABS. Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> [Allan: add to Makefile.am] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aa4d3298fb6d46bec3d8996ff8c7ec8c9cc50db9 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 11:52:26 2014 -0500 table_display: free memory on errors Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c2edd31eae73c9a4bf7b62e41a12fd5c3bba2ce0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 11:52:25 2014 -0500 _alpm_resolvedeps: free targ inside loop Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fac9ac6c4011ff643b7335c7381f6219b07bba80 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 11:52:24 2014 -0500 sync_prepare: manually set pm_errno _alpm_resolvedeps resets pm_errno to 0 by calling alpm_checkdeps. Whenever the last call succeeded, pm_errno was not properly set, preventing pacman from properly handling the error and leaking additional memory. We know pm_errno should be ALPM_ERR_UNSATISFIED_DEPS if resolvedeps has failed, so just set it manually. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4d68092e2fd8c8a3b6da39e509ad48db0fc9ed7a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 11:52:23 2014 -0500 dump_pkg_full: fix optionalfor memory leak alpm_pkg_compute_optional returns a generated list that needs to be free'd. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6be08f76f6c4188f0aa4d0a4d88595a898bf3d3b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 6 11:52:22 2014 -0500 local_db_populate: initialize empty pkgcache If the db directory did not exist when local_db_populate was called, the pkgcache wouldn't be initialized, causing pkghash_add_pkg to fail. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 819b4cd54e3caec4d3803cc62772369031ed0847 Author: Silvan Jegen <s.jegen(a)gmail.com> Date: Tue Jan 28 18:58:52 2014 +0100 Move NULL check before dereference Signed-off-by: Silvan Jegen <s.jegen(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 77da9dc9748b3f151f98c4c301e8da3a2551860d Author: Silvan Jegen <s.jegen(a)gmail.com> Date: Tue Jan 28 17:50:44 2014 +0100 Another NULL check removed Signed-off-by: Silvan Jegen <s.jegen(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cb8eae24c9976c023c8ec2aff9bf305202edc4d7 Author: Silvan Jegen <s.jegen(a)gmail.com> Date: Tue Jan 28 17:50:43 2014 +0100 Another unneeded NULL check removed Signed-off-by: Silvan Jegen <s.jegen(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d895cae16cc97e5f1e3f95eb748a99161678f8ee Author: Silvan Jegen <s.jegen(a)gmail.com> Date: Tue Jan 28 17:50:42 2014 +0100 Remove unneeded NULL check Signed-off-by: Silvan Jegen <s.jegen(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aabb7c3cddf5e97d1b1ebb3548664f1af85c1392 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 28 21:40:37 2014 -0500 pacman: use exit status 0 for --help and --version The user requesting usage or version information is not an error. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7ae25ac67fd4dd087791be55fa3c4997be7aac52 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jan 28 21:37:00 2014 +1000 Consistently use 'directory' instead of 'folder' Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 333373f90e515bbaf6997dc7bf7385fe114689b2 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jan 23 09:39:17 2014 -0500 enable_colors: always set color strings Only setting color strings when colors is true allowed subsequent calls to enable colors but not disable them. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 4 +- NEWS | 2 +- contrib/pacsearch.in | 114 +++++++++++++++++++++++------------------ doc/PKGBUILD.5.txt | 9 ++-- doc/makepkg.8.txt | 24 ++++----- doc/makepkg.conf.5.txt | 75 +++++++++++++-------------- lib/libalpm/be_local.c | 1 + lib/libalpm/deps.c | 3 +- lib/libalpm/sync.c | 3 +- proto/ChangeLog.proto | 16 ------ proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD-vcs.proto | 78 ++++++++++++++++++++++++++++ proto/PKGBUILD.proto | 2 +- scripts/library/README | 2 +- src/pacman/conf.c | 10 ++++ src/pacman/package.c | 1 + src/pacman/pacman.c | 22 ++++---- src/pacman/util.c | 22 ++++---- src/util/pacsort.c | 14 +++-- test/pacman/tests/pacman001.py | 2 +- test/pacman/tests/pacman002.py | 2 +- test/pacman/tests/pacman003.py | 2 +- 22 files changed, 252 insertions(+), 158 deletions(-) delete mode 100644 proto/ChangeLog.proto create mode 100644 proto/PKGBUILD-vcs.proto hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/7] Copyright year bump
by Pierre Neidhardt 02 Feb '14

02 Feb '14

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/pacsearch.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index 624f201..63435f0 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -1,7 +1,7 @@ #!/usr/bin/perl # pacsearch - Adds color and install information to a 'pacman -Ss' search # -# Copyright (C) 2008-2011 Dan McGee <dan(a)archlinux.org> +# Copyright (C) 2008-2014 Dan McGee <dan(a)archlinux.org> # # Based off original shell script version: # Copyright (C) 2006-2007 Dan McGee <dan(a)archlinux.org> @@ -36,7 +36,7 @@ sub usage { sub version { printf "%s %s\n", $myname, $myver; - print "Copyright (C) 2008-2011 Dan McGee <dan\(a)archlinux.org>\n\n"; + print "Copyright (C) 2008-2014 Dan McGee <dan\(a)archlinux.org>\n\n"; print "Based off original shell script version:\n"; print "Copyright (C) 2006-2007 Dan McGee <dan\(a)archlinux.org>\n"; } -- 1.8.5.3

3 11

[pacman-dev] [PATCHv3] Remove ChangeLog.proto and move important info to PKGBUILD(5)
by Jason St. John 02 Feb '14

02 Feb '14

The change log prototype should be distribution determined. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This should fix the build errors found here: https://mailman.archlinux.org/pipermail/pacman-dev/2014-February/018671.html I tested this with 'make check' and 'make dist' in the PKGBUILD. Makefile.am | 3 +-- doc/PKGBUILD.5.txt | 1 + proto/ChangeLog.proto | 16 ---------------- 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 proto/ChangeLog.proto diff --git a/Makefile.am b/Makefile.am index 1f79ba9..0ad8932 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,8 +20,7 @@ pkgdatadir = ${datadir}/${PACKAGE} dist_pkgdata_DATA = \ proto/PKGBUILD.proto \ proto/PKGBUILD-split.proto \ - proto/proto.install \ - proto/ChangeLog.proto + proto/proto.install $(top_srcdir)/test/pacman/tests/TESTS: $(wildcard test/pacman/tests/*.py*) @printf "TESTS += %s\n" $^ | sed -e "s/\.py\.in/.py/" | LC_ALL=C sort -u > "$@" diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 6c5ef84..0638942 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -102,6 +102,7 @@ below). *changelog*:: Specifies a changelog file that is to be included in the package. + The changelog file should end in a single newline. This file should reside in the same directory as the PKGBUILD and will be copied into the package by makepkg. It does not need to be included in the source array (e.g., `changelog=$pkgname.changelog`). diff --git a/proto/ChangeLog.proto b/proto/ChangeLog.proto deleted file mode 100644 index 87e86e7..0000000 --- a/proto/ChangeLog.proto +++ /dev/null @@ -1,16 +0,0 @@ -2007-12-01 Your Name <youremail(a)domain.com> - - * pkgver-pkgrel : - new upstream release. - Reason we changed stuff. - Another reason we changed stuff. - - * gcc-4.1.patch : - Removed, no longer needed. - -2007-11-01 Your Name <youremail(a)domain.com> - - * 1.0-5 : - added ChangeLog. - the last line should end with just one newline. - you can cat the file to check it displays fine. -- 1.8.5.3

1 0