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

[pacman-dev] [PATCH 2] Added tests for -Q --check (but not yet for mtree checks).
by Jeremy Heiner 30 Sep '13

30 Sep '13

Two new "hooks" were made available in pmtest: genhook is called after everything is generated just before the snapshot is taken, and snaphook is called just after. A hook is a list of strings. Calling a hook is "exec"ing each string in the list. Several helper functions were added to pmtest: pacmanrun, unlink, rmtree and warnmissing. These can be used in a hook to install a package and then intentionally mess it up, which then allows the pmtest to verify the results of "-Qk". An mtree attribute was added to pmtest, and a parameter added to pmpkg.makepkg, in anticipation of testing "-Qkk". TODO: figure out how to create an mtree in makepkg. Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail> --- test/pacman/pmpkg.py | 2 +- test/pacman/pmtest.py | 75 ++++++++++++++++++++++++++++---------- test/pacman/tests/querycheck001.py | 18 +++++++++ test/pacman/tests/querycheck002.py | 24 ++++++++++++ test/pacman/tests/querycheck003.py | 24 ++++++++++++ test/pacman/tests/querycheck004.py | 25 +++++++++++++ test/pacman/tests/querycheck005.py | 31 ++++++++++++++++ test/pacman/tests/querycheck006.py | 19 ++++++++++ test/pacman/util.py | 1 + 9 files changed, 199 insertions(+), 20 deletions(-) create mode 100644 test/pacman/tests/querycheck001.py create mode 100644 test/pacman/tests/querycheck002.py create mode 100644 test/pacman/tests/querycheck003.py create mode 100644 test/pacman/tests/querycheck004.py create mode 100644 test/pacman/tests/querycheck005.py create mode 100644 test/pacman/tests/querycheck006.py diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index 9b3147a..1397229 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -104,7 +104,7 @@ def parse_filename(name): filename, extra = filename.split("|") return filename - def makepkg(self, path): + def makepkg(self, mtree, path): """Creates an Arch Linux package archive. A package archive is generated in the location 'path', based on the data diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 63d25e8..739c445 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -18,6 +18,7 @@ import os +import re import shlex import shutil import stat @@ -92,6 +93,10 @@ def load(self): self.description = "" self.option = {} + self.mtree = False + self.genhook = [] + self.snaphook = [] + # Test rules self.rules = [] self.files = [] @@ -152,7 +157,7 @@ def generate(self): for pkg in self.localpkgs: vprint("\t%s" % os.path.join(util.TMPDIR, pkg.filename())) pkg.finalize() - pkg.makepkg(tmpdir) + pkg.makepkg(self.mtree, tmpdir) for key, value in self.db.iteritems(): for pkg in value.pkgs: pkg.finalize() @@ -161,9 +166,9 @@ def generate(self): for pkg in value.pkgs: vprint("\t%s" % os.path.join(util.PM_CACHEDIR, pkg.filename())) if self.cachepkgs: - pkg.makepkg(cachedir) + pkg.makepkg(self.mtree, cachedir) else: - pkg.makepkg(os.path.join(syncdir, value.treename)) + pkg.makepkg(self.mtree, os.path.join(syncdir, value.treename)) pkg.md5sum = util.getmd5sum(pkg.path) pkg.csize = os.stat(pkg.path)[stat.ST_SIZE] @@ -187,12 +192,58 @@ def generate(self): # Done. vprint(" Taking a snapshot of the file system") + for cmd in self.genhook: + exec cmd for roots, dirs, files in os.walk(root): for i in files: filename = os.path.join(roots, i) f = pmfile.PacmanFile(root, filename.replace(root + "/", "")) self.files.append(f) vprint("\t%s" % f.name) + for cmd in self.snaphook: + exec cmd + + def pacmanbin(self): + root = self.env.root + return([self.env.pacman["bin"], + "--config", os.path.join(root, util.PACCONF), + "--root", root, + "--dbpath", os.path.join(root, util.PM_DBPATH), + "--cachedir", os.path.join(root, util.PM_CACHEDIR)]) + + def pacmansub(self, cmd, output): + vprint("\trunning: %s" % " ".join(cmd)) + # Change to the tmp dir before running pacman, so that local package + # archives are made available more easily. + time_start = time.time() + retcode = subprocess.call(cmd, stdout=output, stderr=output, + cwd=os.path.join(self.env.root, util.TMPDIR), + env={'LC_ALL': 'C'}) + time_end = time.time() + vprint("\ttime elapsed: %.2fs" % (time_end - time_start)) + vprint("\tretcode = %s" % retcode) + return retcode + + def pacmanrun(self, args): + cmd = self.env.cmdroot() + cmd.extend(self.pacmanbin()) + cmd.append("--noconfirm") + cmd.extend(shlex.split(args)) + output = open(os.path.join(self.env.root, util.GENFILE), 'a') + self.pacmansub(cmd, output) + output.close() + + def unlink(self, path): + path = os.path.join(self.env.root, path) + os.unlink(path) + def rmtree(self, path): + path = os.path.join(self.env.root, path) + shutil.rmtree(path) + def warnmissing(self, pkg, path): + return "PACMAN_OUTPUT=^" + re.escape( + "warning: %s: %s (No such file or directory)" + % (pkg.name, os.path.join(self.env.root, path)) + ) + "$" def run(self): if os.path.isfile(util.PM_LOCK): @@ -215,11 +266,7 @@ def run(self): "--tool=memcheck", "--leak-check=full", "--show-reachable=yes", "--suppressions=%s" % suppfile]) - cmd.extend([pacman["bin"], - "--config", os.path.join(root, util.PACCONF), - "--root", root, - "--dbpath", os.path.join(root, util.PM_DBPATH), - "--cachedir", os.path.join(root, util.PM_CACHEDIR)]) + cmd.extend(self.pacmanbin()) if not pacman["manual-confirm"]: cmd.append("--noconfirm") if pacman["debug"]: @@ -229,21 +276,11 @@ def run(self): output = open(os.path.join(root, util.LOGFILE), 'w') else: output = None - vprint("\trunning: %s" % " ".join(cmd)) - - # Change to the tmp dir before running pacman, so that local package - # archives are made available more easily. - time_start = time.time() - self.retcode = subprocess.call(cmd, stdout=output, stderr=output, - cwd=os.path.join(root, util.TMPDIR), env={'LC_ALL': 'C'}) - time_end = time.time() - vprint("\ttime elapsed: %.2fs" % (time_end - time_start)) + self.retcode = self.pacmansub(cmd, output) if output: output.close() - vprint("\tretcode = %s" % self.retcode) - # Check if the lock is still there if os.path.isfile(util.PM_LOCK): tap.diag("\tERROR: %s not removed" % util.PM_LOCK) diff --git a/test/pacman/tests/querycheck001.py b/test/pacman/tests/querycheck001.py new file mode 100644 index 0000000..8587b50 --- /dev/null +++ b/test/pacman/tests/querycheck001.py @@ -0,0 +1,18 @@ +self.description = "Query--check files, all there" + +pkg = pmpkg("dummy") +pkg.files = [ + "etc/dummy.conf", + "lib/libdummy.so.0", + "lib/libdummy.so -> ./libdummy.so.0", + "lib/dummy/", + "lib/dummy/stuff", + "bin/dummy"] + +self.addpkg(pkg) +self.genhook.extend([ + "self.pacmanrun('-U %s')" % pkg.filename()]) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=0") diff --git a/test/pacman/tests/querycheck002.py b/test/pacman/tests/querycheck002.py new file mode 100644 index 0000000..0bc3ff4 --- /dev/null +++ b/test/pacman/tests/querycheck002.py @@ -0,0 +1,24 @@ +self.description = "Query--check files, missing a file" + +pkg = pmpkg("dummy") +pkg.files = [ + "etc/dummy.conf", + "lib/libdummy.so.0", + "lib/libdummy.so -> ./libdummy.so.0", + "lib/dummy/", + "lib/dummy/stuff", + "bin/dummy"] + +self.addpkg(pkg) + +zap = pkg.files[1] + +self.genhook.extend([ + "self.pacmanrun('-U %s')" % pkg.filename(), + "self.unlink('%s')" % zap]) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=1") +self.addrule(self.warnmissing(pkg, zap)) +self.addrule("PACMAN_OUTPUT= 1 missing file$") diff --git a/test/pacman/tests/querycheck003.py b/test/pacman/tests/querycheck003.py new file mode 100644 index 0000000..bda095d --- /dev/null +++ b/test/pacman/tests/querycheck003.py @@ -0,0 +1,24 @@ +self.description = "Query--check files, missing a link" + +pkg = pmpkg("dummy") +pkg.files = [ + "etc/dummy.conf", + "lib/libdummy.so.0", + "lib/libdummy.so -> ./libdummy.so.0", + "lib/dummy/", + "lib/dummy/stuff", + "bin/dummy"] + +self.addpkg(pkg) + +zap = pkg.files[2].split(' -> ')[0] + +self.genhook.extend([ + "self.pacmanrun('-U %s')" % pkg.filename(), + "self.unlink('%s')" % zap]) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=1") +self.addrule(self.warnmissing(pkg, zap)) +self.addrule("PACMAN_OUTPUT= 1 missing file$") diff --git a/test/pacman/tests/querycheck004.py b/test/pacman/tests/querycheck004.py new file mode 100644 index 0000000..be9c381 --- /dev/null +++ b/test/pacman/tests/querycheck004.py @@ -0,0 +1,25 @@ +self.description = "Query--check files, missing a dir" + +pkg = pmpkg("dummy") +pkg.files = [ + "etc/dummy.conf", + "lib/libdummy.so.0", + "lib/libdummy.so -> ./libdummy.so.0", + "lib/dummy/", + "lib/dummy/stuff", + "bin/dummy"] + +self.addpkg(pkg) + +zap = pkg.files[3] + +self.genhook.extend([ + "self.pacmanrun('-U %s')" % pkg.filename(), + "self.rmtree('%s')" % zap]) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=1") +self.addrule(self.warnmissing(pkg, zap)) +self.addrule(self.warnmissing(pkg, pkg.files[4])) +self.addrule("PACMAN_OUTPUT= 2 missing files$") diff --git a/test/pacman/tests/querycheck005.py b/test/pacman/tests/querycheck005.py new file mode 100644 index 0000000..416e17f --- /dev/null +++ b/test/pacman/tests/querycheck005.py @@ -0,0 +1,31 @@ +self.description = "Query--check files, missing several" + +pkg = pmpkg("dummy") +pkg.files = [ + "etc/dummy.conf", + "lib/libdummy.so.0", + "lib/libdummy.so -> ./libdummy.so.0", + "lib/dummy/", + "lib/dummy/stuff", + "bin/dummy"] + +self.addpkg(pkg) + +zap1 = pkg.files[1] +zap2 = pkg.files[2].split(' -> ')[0] +zap3 = pkg.files[3] + +self.genhook.extend([ + "self.pacmanrun('-U %s')" % pkg.filename(), + "self.unlink('%s')" % zap1, + "self.unlink('%s')" % zap2, + "self.rmtree('%s')" % zap3]) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=1") +self.addrule(self.warnmissing(pkg, zap1)) +self.addrule(self.warnmissing(pkg, zap2)) +self.addrule(self.warnmissing(pkg, zap3)) +self.addrule(self.warnmissing(pkg, pkg.files[4])) +self.addrule("PACMAN_OUTPUT= 4 missing files$") diff --git a/test/pacman/tests/querycheck006.py b/test/pacman/tests/querycheck006.py new file mode 100644 index 0000000..d710a5b --- /dev/null +++ b/test/pacman/tests/querycheck006.py @@ -0,0 +1,19 @@ +self.description = "Query--check mtree, no mtree" + +pkg = pmpkg("dummy") +pkg.files = [ + "etc/dummy.conf", + "lib/libdummy.so.0", + "lib/libdummy.so -> ./libdummy.so.0", + "lib/dummy/", + "lib/dummy/stuff", + "bin/dummy"] + +self.addpkg(pkg) +self.genhook.extend([ + "self.pacmanrun('-U %s')" % pkg.filename()]) + +self.args = "-Qkk" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=dummy: no mtree file") diff --git a/test/pacman/util.py b/test/pacman/util.py index 14035d7..db8fef3 100644 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -40,6 +40,7 @@ TMPDIR = "tmp" SYNCREPO = "var/pub" LOGFILE = "var/log/pactest.log" +GENFILE = "var/log/pacgen.log" verbose = 0 -- 1.8.4

1 0

[pacman-dev] [PATCH] Display old and new version in pacman -Qu output
by Florian Pritz 26 Sep '13

26 Sep '13

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> --- src/pacman/query.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index c9c82b9..a8499c0 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -318,8 +318,11 @@ static int display(alpm_pkg_t *pkg) && !config->op_q_changelog && !config->op_q_check) { if(!config->quiet) { const colstr_t *colstr = &config->colstr; - printf("%s%s %s%s%s\n", colstr->title, alpm_pkg_get_name(pkg), - colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); + alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle)); + + printf("%s%s %s%s%s -> %s%s%s\n", colstr->title, alpm_pkg_get_name(pkg), + colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor, + colstr->version, alpm_pkg_get_version(newpkg), colstr->nocolor); } else { printf("%s\n", alpm_pkg_get_name(pkg)); } -- 1.8.4

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-133-g8eb8995
by allan＠archlinux.org 19 Sep '13

19 Sep '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 8eb8995aa762c8eded8db4041a11d330094795fd (commit) via d1ac6ffc1399df928d768068231576b2ac3f5abe (commit) from 2379eb1fa629eebd9de8c1a542734243ff2ef471 (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 8eb8995aa762c8eded8db4041a11d330094795fd Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Sep 18 14:29:07 2013 -0400 TESTS: add missing tests Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d1ac6ffc1399df928d768068231576b2ac3f5abe Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Sep 18 14:27:00 2013 -0400 Fix make distcheck * set util binary paths relative to top_builddir * set pactest.py path relative to top_srcdir * include tap.py in check_SCRIPTS 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 ++-- test/pacman/Makefile.am | 1 + test/pacman/tests/TESTS | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] make distcheck fails - new test framework?
by Allan McRae 18 Sep '13

18 Sep '13

Hi, I have just noticed that "make distcheck" is failing in the check part: make --no-print-directory check-TESTS FAIL: test/util/pacsorttest.sh FAIL: test/util/vercmptest.sh ERROR: test/pacman/tests/clean001.py - missing test plan ERROR: test/pacman/tests/clean001.py - exited with status 127 (command not found?) ERROR: test/pacman/tests/clean002.py - missing test plan ERROR: test/pacman/tests/clean002.py - exited with status 127 (command not found?) PASS: test/scripts/parseopts_test.sh ERROR: test/pacman/tests/clean004.py - missing test plan ERROR: test/pacman/tests/clean004.py - exited with status 127 (command not found?) ERROR: test/pacman/tests/clean003.py - missing test plan ERROR: test/pacman/tests/clean003.py - exited with status 127 (command not found I'm guessing we are missing something needed for the test framework. @Andrew: any chance you can take a look? Allan

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-131-g2379eb1
by allan＠archlinux.org 18 Sep '13

18 Sep '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 2379eb1fa629eebd9de8c1a542734243ff2ef471 (commit) via 028490ddcf2dcf4130da6d50ce1adbc8dba17c03 (commit) via 5ef0c3caa56f696f32384a7bc90555bc369cd68a (commit) via 8561ad225672f57336fee357fa5d1f4f5a172870 (commit) via ec15e859a4e69681cf6d1a5808ecc8a619e91a55 (commit) via 3b3152fc501a1561d733c33557ff2f7be8376067 (commit) via 3f99cfba1b6ef1c5665488b651a3d6409730fa98 (commit) via 93888089643b017390538d1f6f3a2d2aa9918851 (commit) via de570d1a65a24dfc53797d4a53e2ff82ec814ab3 (commit) via 2091f7ab163926cdc6e6d5bfb1195ff36a6119a4 (commit) via cfbc4fe8098dd992258648470b76d2dce081af01 (commit) from 61e806b96a8828152e78ab9eff03c490a23b22e9 (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 2379eb1fa629eebd9de8c1a542734243ff2ef471 Author: Xyne <xyne(a)archlinux.ca> Date: Wed Sep 18 03:01:23 2013 +0000 makepkg: redirect downloader output to STDERR This allows scripts to safely capture the output of "makepkg -g". Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 028490ddcf2dcf4130da6d50ce1adbc8dba17c03 Author: Xyne <xyne(a)archlinux.ca> Date: Tue Sep 17 15:31:17 2013 +0000 makepkg: include all hash types in integlist Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5ef0c3caa56f696f32384a7bc90555bc369cd68a Author: Xyne <xyne(a)archlinux.ca> Date: Tue Sep 17 09:19:26 2013 +0000 bacman: optionally include unmodified backup files when available Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8561ad225672f57336fee357fa5d1f4f5a172870 Author: Xyne <xyne(a)archlinux.ca> Date: Tue Sep 17 09:19:25 2013 +0000 bacman: update copyright information in version function Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ec15e859a4e69681cf6d1a5808ecc8a619e91a55 Author: Xyne <xyne(a)archlinux.ca> Date: Tue Sep 17 09:19:24 2013 +0000 bacman: pass unshifted arguments to fakeroot Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3b3152fc501a1561d733c33557ff2f7be8376067 Author: Christian Hesse <mail(a)eworm.de> Date: Thu Sep 5 16:08:23 2013 +0200 dload: avoid renaming files downloaded via sync operations If the server redirects from ${repo}.db to ${repo}.db.tar.gz pacman gets this wrong: It saves to new filename and fails when accessing ${repo}.db. We need the remote filename only when downloading remote files with pacman's -U operation. This introduces a new field 'trust_remote_name' to payload. If set pacman downloads to the filename given by the server. The field trust_remote_name is set in alpm_fetch_pkgurl(). Fixes FS#36791 ([pacman] downloads to wrong filename with redirect). [dave: remove redundant assignment leading to memory leak] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3f99cfba1b6ef1c5665488b651a3d6409730fa98 Author: Aaron Lindsay <aaron(a)aclindsay.com> Date: Thu Sep 5 14:46:29 2013 -0400 contrib: Unify quoting in error messages This fixes error messages to display the contents of variables rather than the variable name by replacing backticks with single quotes (m4 eats backticks). It also removes $"" localization from error messages to eliminate security holes. For instance, `rankmirrors nonexistent_file' will now display: 'nonexistent_file' does not exist. rather than: $1 does not exist. Signed-off-by: Aaron Lindsay <aaron(a)aclindsay.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 93888089643b017390538d1f6f3a2d2aa9918851 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 3 20:03:04 2013 -0400 makepkg: use c-style for loops for integrity checks These loops already maintain an independent loop counter, so cut out the middle man. While this change doesn't necessarily require that we drop support for sparse arrays, we do via this patch. A new lint check is added in check_sanity to abort when a sparse array is encountered. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit de570d1a65a24dfc53797d4a53e2ff82ec814ab3 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 3 18:12:53 2013 -0400 makepkg: always use read's -r flag with filenames These are all cases where we're reading filenames -- any backslashes are intentional and should not be interpreted. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2091f7ab163926cdc6e6d5bfb1195ff36a6119a4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 3 15:47:10 2013 -0400 makepkg: inline creation of checksum indenting With some simple math and printf formatting tokens, we can create the whitespace necessary for this without the need for a loop and string concatentation. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cfbc4fe8098dd992258648470b76d2dce081af01 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Sep 2 16:50:08 2013 -0400 makepkg: cleanup a few format string injections Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bacman.sh.in | 87 ++++++++++++++++++++++++++++++++++------------- contrib/rankmirrors.sh.in | 10 +++--- contrib/updpkgsums.sh.in | 2 +- lib/libalpm/dload.c | 38 ++++++++++++--------- lib/libalpm/dload.h | 1 + scripts/makepkg.sh.in | 86 +++++++++++++++++++++------------------------- 6 files changed, 131 insertions(+), 93 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] updpkgsums: omit downloader output when capturing checksums
by Xyne 18 Sep '13

18 Sep '13

Download the source files with an invocation of makepkg before capturing the output of makepkg -g. Without this, data printed to STDOUT by the downloader is included in the PKGBUILD. --- contrib/updpkgsums.sh.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index ffea96b..760c414 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -72,6 +72,9 @@ if [[ ! -w . ]]; then fi { + # Download sources first to avoid downloader output in newsums array below. + makepkg --verifysource -dp "$buildfile" >/dev/null 2>&1 + # Generate the new sums and try to unlink the file before writing stdin back # into it. This final precaution shouldn't fail based on the previous checks, # but it's better to be extra careful before unlinking files. -- 1.8.4

3 18

[pacman-dev] Bacman patch
by Xyne 17 Sep '13

17 Sep '13

Hi, I have updated bacman with the following changes: * added option "--pacnew" to include unmodified .pacnew BACKUP files in package archive when available (instead of locally modified version) * added warning when modified BACKUP files are included * fixed bug in fakeroot invocation (fakeroot was invoked with shifted argument array, so the --nocolor (and --pacnew) options were lost * removed one unnecessary "cat <file> |" I cloned the pacman git repo to format a patch, but pacman/contrib/bacman.sh.in appears to be outdated (e.g. the shebang is still "#!/bin/bash", even though the current bacman uses "#!/usr/bin/bash"). So, where is the current bacman source? Regards, Xyne

4 11

[pacman-dev] [PATCH] pacman: add option --max-recv-speed
by Sami Kerola 08 Sep '13

08 Sep '13

My dad was watching internet connected television, while I decided to check fixes for Arch. There were new kernel, some libreoffice stuff, and so on making the download to be more than few megabytes. When I downloaded the packages television sound track was affected annoying way. Obviosly my download was affecting a stream that had greater service quality expectancy. This patch will allow an user to polite and throttle down bandwidth usage in benefit for others. Signed-off-by: Sami Kerola <kerolasa(a)iki.fi> --- doc/pacman.8.txt | 5 +++++ lib/libalpm/alpm.h | 5 +++++ lib/libalpm/dload.c | 4 ++++ lib/libalpm/handle.c | 13 +++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.c | 1 + src/pacman/conf.h | 2 ++ src/pacman/pacman.c | 6 ++++++ 8 files changed, 37 insertions(+) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 574995c..da8fa1b 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -362,6 +362,11 @@ Sync Options[[SO]] packages that are no longer installed; use two to remove all files from the cache. In both cases, you will have a yes or no option to remove packages and/or unused downloaded databases. + +*\--max-recv-speed* <bits>:: + Define maximum transfer rate in bits per seconds. This option is + useful when network bandwidth is scarce resource, and other users + of the network has greater service expecations. + If you use a network shared cache, see the 'CleanMethod' option in linkman:pacman.conf[5]. diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b049007..bc77641 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -533,6 +533,11 @@ int alpm_option_get_usesyslog(alpm_handle_t *handle); /** Sets whether to use syslog (0 is FALSE, TRUE otherwise). */ int alpm_option_set_usesyslog(alpm_handle_t *handle, int usesyslog); +/** Returns maximum download receive speed. */ +int alpm_option_get_max_recv_speed(alpm_handle_t *handle); +/** Sets maximum download receive speed. */ +int alpm_option_set_max_recv_speed(alpm_handle_t *handle, int rate); + /** @name Accessors to the list of no-upgrade files. * These functions modify the list of files which should * not be updated by package installation. diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 8537b3d..25f2423 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -331,6 +331,10 @@ static void curl_set_handle_opts(struct dload_payload *payload, (intmax_t)st.st_size); payload->initial_size = st.st_size; } + + if(payload->handle->max_recv_speed) { + curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, payload->handle->max_recv_speed); + } } static void mask_signal(int signum, void (*handler)(int), diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 53c86c5..b061efd 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -181,6 +181,12 @@ alpm_cb_progress SYMEXPORT alpm_option_get_progresscb(alpm_handle_t *handle) return handle->progresscb; } +int SYMEXPORT alpm_option_get_max_recv_speed(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->max_recv_speed; +} + const char SYMEXPORT *alpm_option_get_root(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); @@ -314,6 +320,13 @@ int SYMEXPORT alpm_option_set_progresscb(alpm_handle_t *handle, alpm_cb_progress return 0; } +int SYMEXPORT alpm_option_set_max_recv_speed(alpm_handle_t *handle, int rate) +{ + CHECK_HANDLE(handle, return -1); + handle->max_recv_speed = rate; + return 0; +} + static char *canonicalize_path(const char *path) { char *new_path; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 5e84d58..f5b4baf 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -90,6 +90,7 @@ struct __alpm_handle_t { char *arch; /* Architecture of packages we should allow */ double deltaratio; /* Download deltas if possible; a ratio value */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ + int max_recv_speed; /* Maximum download receive speed. */ int checkspace; /* Check disk space before installing */ alpm_siglevel_t siglevel; /* Default signature verification level */ alpm_siglevel_t localfilesiglevel; /* Signature verification level for local file diff --git a/src/pacman/conf.c b/src/pacman/conf.c index cd357ab..e6112f1 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -682,6 +682,7 @@ static int setup_libalpm(void) alpm_option_set_eventcb(handle, cb_event); alpm_option_set_questioncb(handle, cb_question); alpm_option_set_progresscb(handle, cb_progress); + alpm_option_set_max_recv_speed(handle, config->max_recv_speed); config->logfile = config->logfile ? config->logfile : strdup(LOGFILE); ret = alpm_option_set_logfile(handle, config->logfile); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index dcd3204..30ccd60 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -47,6 +47,7 @@ typedef struct __config_t { unsigned short checkspace; unsigned short usesyslog; unsigned short color; + unsigned int max_recv_speed; double deltaratio; char *arch; char *print_format; @@ -143,6 +144,7 @@ enum { OP_ASEXPLICIT, OP_ARCH, OP_PRINTFORMAT, + OP_MAXRECVSPEED, OP_GPGDIR, OP_DBONLY, OP_FORCE, diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 24fd57f..c1c6705 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -177,6 +177,7 @@ static void usage(int op, const char * const myname) addlist(_(" --force force install, overwrite conflicting files\n")); addlist(_(" --asdeps install packages as non-explicitly installed\n")); addlist(_(" --asexplicit install packages as explicitly installed\n")); + addlist(_(" --max-recv-speed <bits> limit download speed to bits per second (libcurl)\n")); addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); addlist(_(" --ignoregroup <grp>\n" " ignore a group upgrade (can be used more than once)\n")); @@ -510,6 +511,10 @@ static int parsearg_trans(int opt) check_optarg(); config->print_format = strdup(optarg); break; + case OP_MAXRECVSPEED: + check_optarg(); + config->max_recv_speed = (unsigned int)atoi(optarg); + break; default: return 1; } return 0; @@ -645,6 +650,7 @@ static int parseargs(int argc, char *argv[]) {"asexplicit", no_argument, 0, OP_ASEXPLICIT}, {"arch", required_argument, 0, OP_ARCH}, {"print-format", required_argument, 0, OP_PRINTFORMAT}, + {"max-recv-speed", required_argument, 0, OP_MAXRECVSPEED}, {"gpgdir", required_argument, 0, OP_GPGDIR}, {"dbonly", no_argument, 0, OP_DBONLY}, {"color", required_argument, 0, OP_COLOR}, -- 1.8.4

2 2

[pacman-dev] [PATCH 1/1] fix db filename handling
by Christian Hesse 07 Sep '13

07 Sep '13

From: Christian Hesse <mail(a)eworm.de> If the server redirects from ${repo}.db to ${repo}.db.tar.gz pacman gets this wrong: It saves to new filename and fails when accessing ${repo}.db. This introduces a new field 'deny_rename' to payload. If set pacman downloads to the filename specified in payload.remote_name. --- lib/libalpm/be_sync.c | 2 ++ lib/libalpm/dload.c | 36 ++++++++++++++++++++---------------- lib/libalpm/dload.h | 1 + 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 123d953..622153d 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -223,6 +223,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) payload.handle = handle; payload.force = force; payload.unlink_on_fail = 1; + payload.deny_rename = 1; ret = _alpm_download(&payload, syncpath, NULL, NULL); _alpm_dload_payload_reset(&payload); @@ -245,6 +246,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) snprintf(payload.fileurl, len, "%s/%s.db.sig", server, db->treename); payload.handle = handle; payload.force = 1; + payload.deny_rename = 1; payload.errors_ok = (level & ALPM_SIG_DATABASE_OPTIONAL); /* set hard upper limit of 16KiB */ diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 8537b3d..381e548 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -547,23 +547,27 @@ static int curl_download_internal(struct dload_payload *payload, goto cleanup; } - if(payload->content_disp_name) { - /* content-disposition header has a better name for our file */ - free(payload->destfile_name); - payload->destfile_name = get_fullpath(localpath, payload->content_disp_name, ""); + if(payload->deny_rename) { + payload->destfile_name = get_fullpath(localpath, payload->remote_name, ""); } else { - const char *effective_filename = strrchr(effective_url, '/'); - if(effective_filename && strlen(effective_filename) > 2) { - effective_filename++; - - /* if destfile was never set, we wrote to a tempfile. even if destfile is - * set, we may have followed some redirects and the effective url may - * have a better suggestion as to what to name our file. in either case, - * refactor destfile to this newly derived name. */ - if(!payload->destfile_name || strcmp(effective_filename, - strrchr(payload->destfile_name, '/') + 1) != 0) { - free(payload->destfile_name); - payload->destfile_name = get_fullpath(localpath, effective_filename, ""); + if(payload->content_disp_name) { + /* content-disposition header has a better name for our file */ + free(payload->destfile_name); + payload->destfile_name = get_fullpath(localpath, payload->content_disp_name, ""); + } else { + const char *effective_filename = strrchr(effective_url, '/'); + if(effective_filename && strlen(effective_filename) > 2) { + effective_filename++; + + /* if destfile was never set, we wrote to a tempfile. even if destfile is + * set, we may have followed some redirects and the effective url may + * have a better suggestion as to what to name our file. in either case, + * refactor destfile to this newly derived name. */ + if(!payload->destfile_name || strcmp(effective_filename, + strrchr(payload->destfile_name, '/') + 1) != 0) { + free(payload->destfile_name); + payload->destfile_name = get_fullpath(localpath, effective_filename, ""); + } } } } diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 95bb91a..bd01d8b 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -38,6 +38,7 @@ struct dload_payload { int allow_resume; int errors_ok; int unlink_on_fail; + int deny_rename; alpm_list_t *servers; #ifdef HAVE_LIBCURL CURLcode curlerr; /* last error produced by curl */ -- 1.8.4

3 5

[pacman-dev] [PATCH v3 1/1] contrib: Unify quoting in error messages
by Aaron Lindsay 05 Sep '13

05 Sep '13

This fixes error messages to display the contents of variables rather than the variable name by replacing backticks with single quotes (m4 eats backticks). It also removes $"" localization from error messages to eliminate security holes. For instance, `rankmirrors nonexistent_file' will now display: 'nonexistent_file' does not exist. rather than: $1 does not exist. Signed-off-by: Aaron Lindsay <aaron(a)aclindsay.com> --- contrib/bacman.sh.in | 2 +- contrib/rankmirrors.sh.in | 10 +++++----- contrib/updpkgsums.sh.in | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in index 5435e40..33e3920 100644 --- a/contrib/bacman.sh.in +++ b/contrib/bacman.sh.in @@ -124,7 +124,7 @@ fi if [[ ! -d $pkg_dir ]]; then error "package %s is found in pacman database," "${pkg_name}" - plain " but \`%s' is not a directory" "${pkg_dir}" + plain " but '%s' is not a directory" "${pkg_dir}" exit 1 fi diff --git a/contrib/rankmirrors.sh.in b/contrib/rankmirrors.sh.in index 875a143..5555edf 100644 --- a/contrib/rankmirrors.sh.in +++ b/contrib/rankmirrors.sh.in @@ -127,7 +127,7 @@ while [[ $1 ]]; do verbose) VERBOSE=1 ; shift ;; url) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; shift 2;; repo) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; shift 2;; - *) err "\`$1' is an invalid argument." + *) err "'$1' is an invalid argument." esac elif [[ ${1:0:1} = - ]]; then @@ -146,7 +146,7 @@ while [[ $1 ]]; do u) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; snum=2;; r) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; snum=2;; n) [[ $2 ]] || err "Must specify number." ; NUM="$2" ; snum=2;; - *) err "\`-$1' is an invald argument." ;; + *) err "'$1' is an invalid argument." ;; esac done shift $snum @@ -157,7 +157,7 @@ while [[ $1 ]]; do [[ $linearray ]] || err "File is empty." shift else - err "\`$1' does not exist." + err "'$1' does not exist." fi done @@ -169,7 +169,7 @@ done # Single url handling if [[ $CHECKURL ]]; then url="$(getfetchurl "$URL")" - [[ $url = fail ]] && err "url \`$URL' is malformed." + [[ $url = fail ]] && err "url '$URL' is malformed." [[ $VERBOSE ]] && echo "Testing $url..." time=$(gettime "$url") echo "$URL : $time" @@ -193,7 +193,7 @@ for line in "${linearray[@]}"; do server="${line#*= }" server="${server%%#*}" url="$(getfetchurl "$server")" - [[ $url = fail ]] && err "url \`$URL' is malformed." + [[ $url = fail ]] && err "url '$URL' is malformed." time=$(gettime "$url") timesarray+=("$time $server") diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index ffea96b..4d35357 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -67,7 +67,7 @@ fi # Check $PWD/ for permission to unlink the $buildfile and write a new one if [[ ! -w . ]]; then - printf $'==> ERROR: No write permission in `%s\'\n' "$PWD" + printf "==> ERROR: No write permission in '%s'\n" "$PWD" exit 1 fi -- 1.8.4

1 0