October 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Ensure packages have a valid version
by Allan McRae 14 Oct '13

14 Oct '13

Currently you can manually create and then install a package with a version not containing a pkgrel. The created local database entry is invalid as the directory name can not be split by _alpm_splitname due to the assumtion of hyphens separating name-pkgver-pkgrel. Ensure the package has a valid version when it is loaded. Fixes FS#35514. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_package.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 6262621..69871c2 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -413,6 +413,10 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_ERROR, _("missing package version in %s\n"), pkgfile); goto pkg_invalid; } + if(strstr(newpkg->version, "-") == NULL) { + _alpm_log(handle, ALPM_LOG_ERROR, _("invalid package version in %s\n"), pkgfile); + goto pkg_invalid; + } config = 1; continue; } else if(strcmp(entry_name, ".INSTALL") == 0) { -- 1.8.4

2 2

[pacman-dev] [PATCH] makepkg: use source_safe when resourcing BUILDFILE
by Allan McRae 14 Oct '13

14 Oct '13

After updating the pkgver, we still need to safely source the BUILDFILE. 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 2b01c46..cedef4c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -815,7 +815,7 @@ update_pkgver() { if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" - source "$BUILDFILE" + source_safe "$BUILDFILE" local fullver=$(get_full_version) msg "$(gettext "Updated version: %s")" "$pkgbase $fullver" else -- 1.8.4

1 0

[pacman-dev] [PATCH] contrib/pacdiff: error if diffprog is not found
by Allan McRae 14 Oct '13

14 Oct '13

FS#35936 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/pacdiff.sh.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index 711763b..6e70fee 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -116,6 +116,11 @@ done m4_include(../scripts/library/term_colors.sh) +if ! type -p $diffprog >/dev/null; then + error "Cannot find the $diffprog binary required for viewing differences." + exit 1 +fi + case $(( USE_FIND + USE_LOCATE + USE_PACDB )) in 0) USE_PACDB=1;; # set the default search option [^1]) error "Only one search option may be used at a time" -- 1.8.4

1 0

[pacman-dev] [PATCH] proto: remove missed $srcdir redundancies
by Allan McRae 14 Oct '13

14 Oct '13

Most of the redundant "cd $srcdir" in the prototypes were removed in commit 5f80d7af. Fix the rest. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index fb4ca7b..f341052 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -30,7 +30,7 @@ noextract=() md5sums=() #generate with 'makepkg -g' prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" patch -p1 -i "$srcdir/$pkgname-$pkgver.patch" } diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 1380a0f..8d26c81 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -30,7 +30,7 @@ noextract=() md5sums=() #generate with 'makepkg -g' prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" patch -p1 -i "$srcdir/$pkgname-$pkgver.patch" } -- 1.8.4

1 0

[pacman-dev] [PATCH] Fix progress bar overflow while checking package integrity
by Allan McRae 14 Oct '13

14 Oct '13

On 32bit systems, the progress bar intergrity checking can show values greater than 100% with large transactions. This is due to the total size of all package files being greater than a size_t. Use uint64_t for these sizes. Fixes FS#36608 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/sync.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 0d01a5a..9081c73 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1054,7 +1054,7 @@ static int check_keyring(alpm_handle_t *handle) #endif /* HAVE_LIBGPGME */ static int check_validity(alpm_handle_t *handle, - size_t total, size_t total_bytes) + size_t total, uint64_t total_bytes) { struct validity { alpm_pkg_t *pkg; @@ -1064,7 +1064,8 @@ static int check_validity(alpm_handle_t *handle, alpm_pkgvalidation_t validation; alpm_errno_t error; }; - size_t current = 0, current_bytes = 0; + size_t current = 0; + uint64_t current_bytes = 0; alpm_list_t *i, *errors = NULL; /* Check integrity of packages */ @@ -1197,7 +1198,8 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data, int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) { alpm_list_t *i, *deltas = NULL; - size_t total = 0, total_bytes = 0; + size_t total = 0; + uint64_t total_bytes = 0; alpm_trans_t *trans = handle->trans; if(download_files(handle, &deltas)) { -- 1.8.4

1 0

[pacman-dev] [PATCH] Added list of mandatory options to PKGBUILD's man page
by Allan McRae 14 Oct '13

14 Oct '13

From: Eric Toombs <ewtoombs(a)uwaterloo.ca> [Allan: Adjust wording due to remove al license warning] Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 1b229aa..4ac7dc1 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -30,7 +30,9 @@ Options and Directives ---------------------- The following is a list of standard options and directives available for use in a PKGBUILD. These are all understood and interpreted by makepkg, and most -of them will be directly transferred to the built package. +of them will be directly transferred to the built package. The mandatory +fields for a minimally functional PKGBUILD are *pkgname*, *pkgver*, *pkgrel* +and *arch*. If you need to create any custom variables for use in your build process, it is recommended to prefix their name with an '_' (underscore). -- 1.8.4

1 0

[pacman-dev] [PATCH] autogen.sh: remove useless shell flag and subshells
by Dave Reisner 14 Oct '13

14 Oct '13

>From a bash shell where /bin/sh -> /bin/dash: $ ./autogen.sh ./autogen.sh: 3: ./autogen.sh: BASH_SOURCE: parameter not set The -u flag causes this (and lots of other mysterious problems). Since there aren't even any variables in this script, it makes no sense to use it. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- autogen.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 588e63d..18fa641 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,6 @@ -#!/bin/sh -xu +#!/bin/sh -x autoreconf -i -(cd build-aux && (patch -Np0 -i ltmain-asneeded.patch || true)) +patch -d build-aux -Np0 -i ltmain-asneeded.patch + +exit 0 -- 1.8.4

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-163-ge5f23e0
by allan＠archlinux.org 14 Oct '13

14 Oct '13

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 e5f23e0ebb14be22623c38130e6c2b3c37954a2b (commit) via d79872b4c71f93b225d7bc0987e33cebfe687e42 (commit) via e9c7c3b90d1f266aebc98a36b1d32a61f7113505 (commit) via 95b0a868f255f2766ae03733882f30c8c7f3b7ca (commit) via 071ba05534f1e5f3eee3435214caa2642e3e2c23 (commit) via 4d24da8cda18cdb1e7a69baec196ad502d4d12de (commit) via 372e26118f298f38b45c244fdb77785245ceefca (commit) via 807f014d777fbcc7b43fa5159a8b0d12a44d63ae (commit) via 2c11e5da1d7c6ac86ff23abfaff019793baed3a6 (commit) via 55ca38b4cdccc1ec57ec285f58f422f189d327b4 (commit) via 64e4f627c1ed2318bc24de8b8f680d7b3c5f993f (commit) via 3b804cb6543e10e3bc5f32af23925c35aadce444 (commit) via 122e16106fdcc30918e53832edd9c70fe3772054 (commit) via 0fc9545546cd6cff95ef32e043efbcbbf89ca89b (commit) via 5477f2597b8763adc1ef4b1495e25f87107620c1 (commit) via dfcf9187634956ca117cb4613ff63d545682ce8b (commit) via 8ab44c7986b24c407fcf622c9019d60d30c97275 (commit) via 1bb0085dfea1fbda0fc7715a064cbac193d381e2 (commit) via 31a55df3d9750b2cdb21d436c4bf3ffbf24c4f4d (commit) via c9ab8a7f6c4d70672e2681f0e57d3298a2bdab7b (commit) via 0308df07d3209770e5f1c37d765a79c44d731e68 (commit) via 141d7f234f9a34c346b0b1d8edf4a35bc53b739d (commit) via 043f250d0e93f07be60a94c92a027d6f61fc9158 (commit) via 2f7e92ad045fb276c8fe88d4793c8edc383d147c (commit) via d5ff21c221e2821462adf0d642554ba09642f481 (commit) via adfab9c89909c677467d390e44253a13c65aefcd (commit) via 37242ceb309b05645c89980aa34c19f2251137e3 (commit) via 80ee9994f0c9e8a2980924fbedf368f78939602e (commit) via 3a6bb2735b7715a8275826826ac3c525f03b121c (commit) via d43f54e5c494a3796cf7fadece7ca4ce73ca807d (commit) from 8eb8995aa762c8eded8db4041a11d330094795fd (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 e5f23e0ebb14be22623c38130e6c2b3c37954a2b Author: slavomir vlcek <svlc(a)inventati.org> Date: Thu Oct 10 17:25:22 2013 +0200 libalpm: move function pointer condition Function pointer gets uselessly compared for NULL in every iteration. Move the condition to do it just once. Signed-off-by: slavomir vlcek <svlc(a)inventati.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d79872b4c71f93b225d7bc0987e33cebfe687e42 Author: Jeremy Heiner <scalaprotractor(a)gmail.com> Date: Sat Oct 12 12:44:36 2013 -0400 Add parens around tuples in Python list comprehensions. Reported by 2to3: optional in Python 2, but required in 3. Signed-off-by: Jeremy Heiner <ScalaProtractor(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e9c7c3b90d1f266aebc98a36b1d32a61f7113505 Author: Jeremy Heiner <scalaprotractor(a)gmail.com> Date: Sat Oct 12 12:44:35 2013 -0400 Use Python's "range" instead of deprecated "xrange". Reported by 2to3. Python 3 throws out the old range, renames the old xrange to be the new range, leaving no xrange. A shim could be used, but using the less efficient version does not have a noticeable impact on the run time. This observed (lack of an) effect is as described in the Python 2 docs for xrange. The largest range created is only 1000 elements big, and the memory cost of those ranges is negligible when compared to that of all the pmpkg instances created. Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 95b0a868f255f2766ae03733882f30c8c7f3b7ca Author: Jeremy Heiner <scalaprotractor(a)gmail.com> Date: Sat Oct 12 12:44:33 2013 -0400 Use dict iteration methods common to both Python 2 and 3. The .items, .keys, and .values methods in Python 2 make copies, so the test framework uses the .iter* flavors of those methods. But in Python 3 those .iter* (and even the 2.7 .view*) flavors are removed and the original methods return views. Measurements were taken under Python2 to see what impact the copying had, and there was none. Thus it is not worth the effort to avoid. Reported as a compatibility issue by 2to3. Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 071ba05534f1e5f3eee3435214caa2642e3e2c23 Author: Jeremy Heiner <scalaprotractor(a)gmail.com> Date: Sat Oct 12 12:44:32 2013 -0400 Use Python's "0o#" octal literal instead of deprecated "0#". Reported as a compatibility issue by 2to3. Signed-off-by: Jeremy Heiner <ScalaProtractor(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4d24da8cda18cdb1e7a69baec196ad502d4d12de Author: Jeremy Heiner <scalaprotractor(a)gmail.com> Date: Sat Oct 12 12:44:31 2013 -0400 Use "exec" instead of "execfile" (deprecated in Python 3). This was the only compatibility issue reported by "python2 -3". Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 372e26118f298f38b45c244fdb77785245ceefca Author: Jeremy Heiner <scalaprotractor(a)gmail.com> Date: Sat Oct 12 12:44:30 2013 -0400 Bail early with a clear error message if Python runtime isn't 2.7+. Prior to this a test that used a feature too new for the runtime would blow up when it was "exec"d (possibly in the middle of a run of a bunch of tests) with an error message that was not very helpful. Remove Python 2.5 and 2.6 runtimes from the list configure searches. 2.5 suffers the problem described above. The code currently will run on 2.6 but, as was noted on the dev list, that runtime is at the end of its life, so 2.7 is a better cutoff. Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 807f014d777fbcc7b43fa5159a8b0d12a44d63ae Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Oct 12 13:32:06 2013 -0400 include invalid options in error messages On invalid combinations of flags we were only printing the unhelpfully vague message "invalid option". Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2c11e5da1d7c6ac86ff23abfaff019793baed3a6 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Oct 12 13:32:09 2013 -0400 pacman: die on invalid option combinations Fixes FS#20950 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 55ca38b4cdccc1ec57ec285f58f422f189d327b4 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Oct 12 13:32:08 2013 -0400 rename PKG_LOCALITY_LOCAL -> PKG_LOCALITY_NATIVE PKG_LOCALITY_LOCAL was confusing because the enum is used with -Q, so all packages are "local". Also reversed the config->op_q_locality assignment so that the locality matches the option used. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 64e4f627c1ed2318bc24de8b8f680d7b3c5f993f Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Oct 12 13:32:10 2013 -0400 do not run scriptlets with --dbonly Running an install script does not fall under "Adds/removes the database entry only." Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3b804cb6543e10e3bc5f32af23925c35aadce444 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Oct 12 13:32:07 2013 -0400 imply --print from --print-format --print-format is totally useless without --print. Implying --print will also save us the hassle of checking it when we add transaction option validation. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 122e16106fdcc30918e53832edd9c70fe3772054 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Oct 12 13:32:05 2013 -0400 use non-ascii identifiers for optflags Removes the overlap between optflags for different operations that allowed non-sensical combinations of flags such as: $ pacman -Si --changelog $package --changelog is -c, meaning --clean for -S $ pacman -Q --sysupgrade --sysupgrade is -u, meaning --upgrades for -Q Also add a few missing braces. Original-work-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0fc9545546cd6cff95ef32e043efbcbbf89ca89b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Oct 12 13:32:04 2013 -0400 pacman/util: remove strsplit strsplit was used in only one place and did the same thing as strtok. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5477f2597b8763adc1ef4b1495e25f87107620c1 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Oct 12 14:00:22 2013 -0400 submitting-patches: address common mistakes Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit dfcf9187634956ca117cb4613ff63d545682ce8b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Oct 12 14:00:21 2013 -0400 remove executable bit on paclog-pkglist.sh.in Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8ab44c7986b24c407fcf622c9019d60d30c97275 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Oct 12 14:00:20 2013 -0400 Makefile.am: remove old targets from .PHONY These targets were part of the old test suite and no longer exist. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1bb0085dfea1fbda0fc7715a064cbac193d381e2 Author: Jeremy Heiner <scalaprotractor(a)gmail.com> Date: Wed Oct 9 09:48:09 2013 -0400 Jettison the truncation of the display of pmrules. The truncation helped back when the test output appeared when run via make. But now "make check" logs that output, and it makes little sense to log the truncated rules. Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 31a55df3d9750b2cdb21d436c4bf3ffbf24c4f4d Author: Allan McRae <allan(a)archlinux.org> Date: Sun Sep 22 11:25:30 2013 +0100 makepkg: add LIBRARY variable This points makepkg to where is library is located. Can be overridden by value in the environment. Signed-off-by: Allan McRae <allan(a)archlinux.org> [Ashley: Rebased] Signed-off-by: Ashley Whetter <ashley(a)awhetter.co.uk> commit c9ab8a7f6c4d70672e2681f0e57d3298a2bdab7b Author: Allan McRae <allan(a)archlinux.org> Date: Sun Sep 22 11:25:29 2013 +0100 makepkg: run locally with libtool style wrapper Build makepkg to scripts/.lib/makepkg and add a wrapper script to call it. This is not useful at the moment, but is the first step to allowing makepkg to be split into smaller pieces. Signed-off-by: Allan McRae <allan(a)archlinux.org> [Ashley: rebased] Signed-off-by: Ashley Whetter <ashley(a)awhetter.co.uk> commit 0308df07d3209770e5f1c37d765a79c44d731e68 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 9 13:28:23 2013 +1000 makepkg: alphabetically order option variables Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 141d7f234f9a34c346b0b1d8edf4a35bc53b739d Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 9 13:20:11 2013 +1000 makepkg: do not refer to src/ or pkg/ Use $srcdir and $pkgdir instead. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 043f250d0e93f07be60a94c92a027d6f61fc9158 Author: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Date: Fri Oct 4 15:57:08 2013 +0200 Add a -C, --cleanbuild option to clear the source directory before building a package. Implements FS#17175. [Allan: Minor changes to output strings, fix removing of source directory] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2f7e92ad045fb276c8fe88d4793c8edc383d147c Author: Allan McRae <allan(a)archlinux.org> Date: Thu Oct 10 12:29:07 2013 +1000 Link non-vcs sources into $srcdir during extraction The separation between downloading and extracting for non-vsc sources was incomplete due to symlinks being made in $srcdir during the download stage. Have download_{local,file} just ensure the presence of the files in $startdir or $SRCDEST (downloading if needed) and then have extract_file symlink these files into $srcdir. Also replace "continue" with "return" in extract_file to make it clearer what is happening. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d5ff21c221e2821462adf0d642554ba09642f481 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Oct 10 10:28:44 2013 +1000 Ignore failure to patch during autogen.sh patch -N ignores the previously applied patch but still returns 1. This causes a git build with a reused source directory to fail. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit adfab9c89909c677467d390e44253a13c65aefcd Author: Allan McRae <allan(a)archlinux.org> Date: Thu Oct 3 13:41:54 2013 +1000 Remove makepkg license check There is little reason for this field to be checked over all other fields. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 37242ceb309b05645c89980aa34c19f2251137e3 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Oct 3 13:38:40 2013 +1000 Use $srcdir/ rather than src/ in makepkg help Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 80ee9994f0c9e8a2980924fbedf368f78939602e Author: Allan McRae <allan(a)archlinux.org> Date: Thu Oct 3 13:37:24 2013 +1000 Clarify --repackage description Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3a6bb2735b7715a8275826826ac3c525f03b121c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Sep 19 22:00:11 2013 -0400 Add make target for TESTS This causes make to update TESTS when tests are added (or updated). For simplicity, this changes TESTS from a single multi-line list to individually appending each test file. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> [Allan: use C locale for sorting] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d43f54e5c494a3796cf7fadece7ca4ce73ca807d Author: Florian Pritz <bluewind(a)xinu.at> Date: Thu Sep 26 10:55:21 2013 +0200 Display old and new version in pacman -Qu output This changes the output from "foo 1.0" to "foo 1.0 -> 1.1" which makes cronjobs that mail the -Qu output way more helpful. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 5 +- autogen.sh | 2 +- configure.ac | 2 +- contrib/paclog-pkglist.sh.in | 0 doc/makepkg.8.txt | 7 +- doc/pacman.8.txt | 2 +- doc/submitting-patches.txt | 15 +- lib/libalpm/alpm_list.c | 10 +- scripts/.gitignore | 1 + scripts/Makefile.am | 28 ++ scripts/makepkg-wrapper.sh.in | 23 ++ scripts/makepkg.sh.in | 86 +++--- src/pacman/conf.h | 36 ++- src/pacman/pacman.c | 404 +++++++++++++++++++----- src/pacman/query.c | 13 +- src/pacman/util.c | 34 -- src/pacman/util.h | 1 - test/pacman/pactest.py | 6 + test/pacman/pmdb.py | 4 +- test/pacman/pmpkg.py | 4 +- test/pacman/pmrule.py | 4 +- test/pacman/pmtest.py | 11 +- test/pacman/tests/TESTS | 583 +++++++++++++++++------------------ test/pacman/tests/depconflict100.py | 2 +- test/pacman/tests/depconflict120.py | 2 +- test/pacman/tests/fileconflict001.py | 2 +- test/pacman/tests/fileconflict002.py | 2 +- test/pacman/tests/remove052.py | 2 +- test/pacman/tests/smoke001.py | 4 +- test/pacman/tests/smoke003.py | 4 +- test/pacman/tests/sync030.py | 2 +- test/pacman/tests/sync031.py | 2 +- test/pacman/tests/sync040.py | 2 +- test/pacman/tests/sync041.py | 2 +- test/pacman/tests/sync405.py | 2 +- test/pacman/tests/sync406.py | 2 +- test/pacman/tests/sync891.py | 2 +- test/pacman/tests/sync892.py | 2 +- test/pacman/tests/sync893.py | 2 +- test/pacman/tests/sync898.py | 2 +- test/pacman/tests/sync990.py | 2 +- test/pacman/tests/sync992.py | 2 +- test/pacman/tests/upgrade005.py | 2 +- test/pacman/tests/upgrade013.py | 2 +- test/pacman/tests/upgrade014.py | 2 +- test/pacman/tests/upgrade030.py | 2 +- test/pacman/tests/upgrade031.py | 2 +- test/pacman/tests/upgrade032.py | 2 +- test/pacman/tests/upgrade040.py | 2 +- test/pacman/tests/upgrade041.py | 2 +- test/pacman/tests/upgrade042.py | 2 +- test/pacman/tests/upgrade043.py | 2 +- test/pacman/tests/upgrade046.py | 2 +- test/pacman/tests/upgrade050.py | 2 +- test/pacman/tests/upgrade059.py | 2 +- test/pacman/tests/upgrade060.py | 2 +- test/pacman/tests/upgrade061.py | 2 +- test/pacman/tests/upgrade073.py | 2 +- test/pacman/tests/upgrade090.py | 2 +- test/pacman/tests/xfercommand001.py | 2 +- test/pacman/util.py | 12 +- 61 files changed, 847 insertions(+), 524 deletions(-) mode change 100755 => 100644 contrib/paclog-pkglist.sh.in create mode 100644 scripts/makepkg-wrapper.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libalpm: move function pointer condition
by slavomir vlcek 13 Oct '13

13 Oct '13

From: slavomir vlcek <svlc(a)inventati.org> Date: Thu, 10 Oct 2013 17:25:22 +0200 Subject: [PATCH] libalpm: move function pointer condition Function pointer gets uselessly compared for NULL in every iteration. Move the condition to do it just once. Signed-off-by: slavomir vlcek <svlc(a)inventati.org> --- Hi, sending small performance patch. Haven't actually tried to compile it with this patch. So i hope there will be no syntax error. Thanks. lib/libalpm/alpm_list.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 59f99f9..a3c73aa 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -70,11 +70,13 @@ void SYMEXPORT alpm_list_free_inner(alpm_list_t *list, alpm_list_fn_free fn) { alpm_list_t *it = list; - while(it) { - if(fn && it->data) { - fn(it->data); + if(fn) { + while(it) { + if(it->data) { + fn(it->data); + } + it = it->next; } - it = it->next; } } -- 1.8.4

2 1

[pacman-dev] [PATCH 1/7] pacman/util: remove strsplit
by Andrew Gregory 13 Oct '13

13 Oct '13

strsplit was used in only one place and did the same thing as strtok. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/pacman.c | 10 +++++----- src/pacman/util.c | 34 ---------------------------------- src/pacman/util.h | 1 - 3 files changed, 5 insertions(+), 40 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 24fd57f..d2114e6 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -325,14 +325,14 @@ static void handler(int signum) static int parsearg_util_addlist(alpm_list_t **list) { - alpm_list_t *split, *item; + char *i, *save; check_optarg(); - split = strsplit(optarg, ','); - for(item = split; item; item = alpm_list_next(item)) { - *list = alpm_list_add(*list, item->data); + + for(i = strtok_r(optarg, ",", &save); i; i = strtok_r(NULL, ",", &save)) { + *list = alpm_list_add(*list, strdup(i)); } - alpm_list_free(split); + return 0; } diff --git a/src/pacman/util.c b/src/pacman/util.c index 6da1cd4..0e9a420 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -378,40 +378,6 @@ char *strreplace(const char *str, const char *needle, const char *replace) return newstr; } -/** Splits a string into a list of strings using the chosen character as - * a delimiter. - * - * @param str the string to split - * @param splitchar the character to split at - * - * @return a list containing the duplicated strings - */ -alpm_list_t *strsplit(const char *str, const char splitchar) -{ - alpm_list_t *list = NULL; - const char *prev = str; - char *dup = NULL; - - while((str = strchr(str, splitchar))) { - dup = strndup(prev, (size_t)(str - prev)); - if(dup == NULL) { - return NULL; - } - list = alpm_list_add(list, dup); - - str++; - prev = str; - } - - dup = strdup(prev); - if(dup == NULL) { - return NULL; - } - list = alpm_list_add(list, dup); - - return list; -} - static size_t string_length(const char *s) { int len; diff --git a/src/pacman/util.h b/src/pacman/util.h index 0a2a6f7..e2297f8 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -54,7 +54,6 @@ int rmrf(const char *path); void indentprint(const char *str, unsigned short indent, unsigned short cols); size_t strtrim(char *str); char *strreplace(const char *str, const char *needle, const char *replace); -alpm_list_t *strsplit(const char *str, const char splitchar); void string_display(const char *title, const char *string, unsigned short cols); double humanize_size(off_t bytes, const char target_unit, int precision, const char **label); -- 1.8.4

2 10