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

[pacman-dev] [PATCH] conf.c: add missing newline to warning
by Andrew Gregory 30 Dec '13

30 Dec '13

Fixes tests that use pacman's output when built without libcurl. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index cf8a417..05c4610 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -716,7 +716,7 @@ static int setup_libalpm(void) if(config->xfercommand) { alpm_option_set_fetchcb(handle, download_with_xfercommand); } else if(!(alpm_capabilities() & ALPM_CAPABILITY_DOWNLOADER)) { - pm_printf(ALPM_LOG_WARNING, _("no '%s' configured"), "XferCommand"); + pm_printf(ALPM_LOG_WARNING, _("no '%s' configured\n"), "XferCommand"); } if(config->totaldownload) { -- 1.8.5.2

2 1

[pacman-dev] [PATCH] Have configure set pactest options that it knows.
by Jeremy Heiner 28 Dec '13

28 Dec '13

This patch is not ready for accepting into the repository. It does not work for VPATH builds (because the paths to all the .py tests are seen as relative to $(builddir)). Dave is working on a fix for this VPATH issue, so a real version of this patch must wait to incorporate his commit. This patch works fine for in-$(srcdir) builds. The purpose of posting it is to follow up Saturday's conversation. I think it implements all of Allan's suggestions (if I understood correctly). The real commit message would be something like: SCRIPTLET_SHELL and LDCONFIG can be set via args to configure, and up 'till now those options were passed to pactest by Makefile.am as command-line args. That works fine for 'make check', but required repeated specification when running pactest manually. This patch makes pactest a configured file so it has direct access to those options and they no longer need to be specified (by Makefile.am nor by hand). Also the default for the pactest '-p' arg is changed to be the pacman that the make builds. The '-p' arg is still available, but it should now be very rare to have to use it when calling pactest manually. --- Makefile.am | 4 -- configure.ac | 1 + test/pacman/.gitignore | 1 + test/pacman/pactest.py | 125 -------------------------------------------- test/pacman/pactest.py.in | 128 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 129 deletions(-) delete mode 100755 test/pacman/pactest.py create mode 100644 test/pacman/pactest.py.in diff --git a/Makefile.am b/Makefile.am index 4d5adae..9689992 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,10 +41,6 @@ LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ PY_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ $(top_srcdir)/build-aux/tap-driver.sh PY_LOG_COMPILER = $(top_srcdir)/test/pacman/pactest.py -AM_PY_LOG_FLAGS = \ - --scriptlet-shell $(SCRIPTLET_SHELL) \ - --ldconfig $(LDCONFIG) \ - -p $(top_builddir)/src/pacman/pacman # create the pacman DB and cache directories upon install install-data-local: diff --git a/configure.ac b/configure.ac index cfcc8d1..292260a 100644 --- a/configure.ac +++ b/configure.ac @@ -507,6 +507,7 @@ test/util/Makefile contrib/Makefile Makefile ]) +AC_CONFIG_FILES([test/pacman/pactest.py],[chmod +x test/pacman/pactest.py]) AC_OUTPUT echo " diff --git a/test/pacman/.gitignore b/test/pacman/.gitignore index 0d20b64..39fa72b 100644 --- a/test/pacman/.gitignore +++ b/test/pacman/.gitignore @@ -1 +1,2 @@ *.pyc +pactest.py diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py deleted file mode 100755 index e21cde7..0000000 --- a/test/pacman/pactest.py +++ /dev/null @@ -1,125 +0,0 @@ -#! /usr/bin/python2 -# -# pactest : run automated testing on the pacman binary -# -# Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> -# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -import glob -from optparse import OptionParser -import os -import shutil -import sys -import tempfile - -import pmenv -import tap -import util - -__author__ = "Aurelien FORET" -__version__ = "0.4" - -def resolve_binary_path(option, opt_str, value, parser): - setattr(parser.values, option.dest, os.path.abspath(value)) - -def create_parser(): - usage = "usage: %prog [options] <path/to/testfile.py>..." - description = "Runs automated tests on the pacman binary. Tests are " \ - "described using an easy python syntax, and several can be " \ - "ran at once." - parser = OptionParser(usage = usage, description = description) - - parser.add_option("-v", "--verbose", action = "count", - dest = "verbose", default = 0, - help = "print verbose output") - parser.add_option("-d", "--debug", type = "int", - dest = "debug", default = 0, - help = "set debug level for pacman") - parser.add_option("-p", "--pacman", action = "callback", - callback = resolve_binary_path, type = "string", - dest = "bin", default = "pacman", - help = "specify location of the pacman binary") - parser.add_option("--keep-root", action = "store_true", - dest = "keeproot", default = False, - help = "don't remove the generated pacman root filesystem") - parser.add_option("--nolog", action = "store_true", - dest = "nolog", default = False, - help = "do not log pacman messages") - parser.add_option("--gdb", action = "store_true", - dest = "gdb", default = False, - help = "use gdb while calling pacman") - parser.add_option("--valgrind", action = "store_true", - dest = "valgrind", default = False, - help = "use valgrind while calling pacman") - parser.add_option("--manual-confirm", action = "store_true", - dest = "manualconfirm", default = False, - help = "do not use --noconfirm for pacman calls") - parser.add_option("--scriptlet-shell", type = "string", - dest = "scriptletshell", default = "/bin/sh", - help = "specify path to shell used for install scriptlets") - parser.add_option("--ldconfig", type = "string", - dest = "ldconfig", default = "/sbin/ldconfig", - help = "specify path to ldconfig") - return parser - - -if __name__ == "__main__": - - if sys.hexversion < 0x02070000: - # bailing now with clear message better than mid-run with unhelpful one - tap.bail("Python versions before 2.7 are not supported.") - sys.exit(1) - - # instantiate env and parser objects - root_path = tempfile.mkdtemp() - env = pmenv.pmenv(root=root_path) - opt_parser = create_parser() - (opts, args) = opt_parser.parse_args() - - # add parsed options to env object - util.verbose = opts.verbose - env.pacman["debug"] = opts.debug - env.pacman["bin"] = opts.bin - env.pacman["nolog"] = opts.nolog - env.pacman["gdb"] = opts.gdb - env.pacman["valgrind"] = opts.valgrind - env.pacman["manual-confirm"] = opts.manualconfirm - env.pacman["scriptlet-shell"] = opts.scriptletshell - env.pacman["ldconfig"] = opts.ldconfig - - opts.testcases = [] - for path in args: - opts.testcases += glob.glob(path) - if opts.testcases is None or len(opts.testcases) == 0: - tap.bail("no tests defined, nothing to do") - os.rmdir(root_path) - sys.exit(2) - - for i in opts.testcases: - env.addtest(i) - - # run tests - env.run() - - if not opts.keeproot: - shutil.rmtree(root_path) - else: - tap.diag("pacman testing root saved: %s" % root_path) - - if env.failed > 0: - sys.exit(1) - -# vim: set ts=4 sw=4 et: diff --git a/test/pacman/pactest.py.in b/test/pacman/pactest.py.in new file mode 100644 index 0000000..0d9e1f7 --- /dev/null +++ b/test/pacman/pactest.py.in @@ -0,0 +1,128 @@ +#! /usr/bin/python2 +# +# @configure_input@ +# +# pactest : run automated testing on the pacman binary +# +# Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> +# Copyright (c) 2006-2013 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import glob +from optparse import OptionParser +import os +import shutil +import sys +import tempfile + +BUILDDIR = os.path.dirname(os.path.realpath(__file__)) +SRCDIR = os.path.realpath(os.path.join(BUILDDIR, "@srcdir@")) +if BUILDDIR != SRCDIR: sys.path.insert(0, SRCDIR) +TOP_BUILDDIR = os.path.realpath(os.path.join(BUILDDIR, "@top_builddir@")) +BUILT_EXE = os.path.realpath(os.path.join(TOP_BUILDDIR, "src/pacman/pacman")) + +import pmenv +import tap +import util + +__author__ = "Aurelien FORET" +__version__ = "0.4" + +def resolve_binary_path(option, opt_str, value, parser): + setattr(parser.values, option.dest, os.path.abspath(value)) + +def create_parser(): + usage = "usage: %prog [options] <path/to/testfile.py>..." + description = "Runs automated tests on the pacman binary. Tests are " \ + "described using an easy python syntax, and several can be " \ + "ran at once." + parser = OptionParser(usage = usage, description = description) + + parser.add_option("-v", "--verbose", action = "count", + dest = "verbose", default = 0, + help = "print verbose output") + parser.add_option("-d", "--debug", type = "int", + dest = "debug", default = 0, + help = "set debug level for pacman") + parser.add_option("-p", "--pacman", action = "callback", + callback = resolve_binary_path, type = "string", + dest = "bin", default = BUILT_EXE, + help = "specify location of the pacman binary") + parser.add_option("--keep-root", action = "store_true", + dest = "keeproot", default = False, + help = "don't remove the generated pacman root filesystem") + parser.add_option("--nolog", action = "store_true", + dest = "nolog", default = False, + help = "do not log pacman messages") + parser.add_option("--gdb", action = "store_true", + dest = "gdb", default = False, + help = "use gdb while calling pacman") + parser.add_option("--valgrind", action = "store_true", + dest = "valgrind", default = False, + help = "use valgrind while calling pacman") + parser.add_option("--manual-confirm", action = "store_true", + dest = "manualconfirm", default = False, + help = "do not use --noconfirm for pacman calls") + return parser + + +if __name__ == "__main__": + + if sys.hexversion < 0x02070000: + # bailing now with clear message better than mid-run with unhelpful one + tap.bail("Python versions before 2.7 are not supported.") + sys.exit(1) + + # instantiate env and parser objects + root_path = tempfile.mkdtemp() + env = pmenv.pmenv(root=root_path) + opt_parser = create_parser() + (opts, args) = opt_parser.parse_args() + + # add parsed options to env object + util.verbose = opts.verbose + env.pacman["debug"] = opts.debug + env.pacman["bin"] = opts.bin + env.pacman["nolog"] = opts.nolog + env.pacman["gdb"] = opts.gdb + env.pacman["valgrind"] = opts.valgrind + env.pacman["manual-confirm"] = opts.manualconfirm + # and add configured options + env.pacman["scriptlet-shell"] = "@SCRIPTLET_SHELL@" + env.pacman["ldconfig"] = "@LDCONFIG@" + + opts.testcases = [] + for path in args: + opts.testcases += glob.glob(path) + if opts.testcases is None or len(opts.testcases) == 0: + tap.bail("no tests defined, nothing to do") + os.rmdir(root_path) + sys.exit(2) + + for i in opts.testcases: + env.addtest(i) + + # run tests + env.run() + + if not opts.keeproot: + shutil.rmtree(root_path) + else: + tap.diag("pacman testing root saved: %s" % root_path) + + if env.failed > 0: + sys.exit(1) + +# vim: set ts=4 sw=4 et: -- 1.8.5.2

3 13

[pacman-dev] [PATCH 0/4] fix Doxygen
by Jeremy Heiner 28 Dec '13

28 Dec '13

My controversial topic for today is libalpm.3 and Doxygen (FS#9237). It is time to completely throw out the idea of generating that page. Who is going to 'man libalpm' and what would they hope to see? The API reference Doxygen produces is useful when it lets you click your way quickly to an answer: lots of narrowly focused pages with lots of links. But if you wanted that would you 'man libalpm'? No. Maybe some user guide stuff? But then Doxygen is not the right tool. A couple of hits might come from people poking around /usr/lib and wondering "WTF is this thing?". That would be rare (I hope), and yet still Doxygen is not the right tool to answer that question. So I just can't figure out a scenario starting with "I want help making a front end to libalpm" that leads to a Doxygen generated libalpm.3. But Doxygen is still useful. It just needs a new purpose. Or at least to be freed from the constraints of its current perceived purpose. Here's what this patch set proposes: Doxygen remains hidden behind a configure --enable (so most people will never notice) but patch 1 completely changes what that --enable does: forget libalpm.3, Doxygen now sees all the pacman code and produces modern HTML. Some of the markup that patch 1 added to Doxygen's INPUT was not current, so patches 2&3 fix those issues. And patch 4 deletes libalpm.3.txt, resolving FS#9237 in the most brutal way possible. See: not controversial at all. :) Happy solstice, everyone! Jeremy Heiner (4): Remove DOXYGEN_MANS. New Doxyfile.in. Add 'make doxygen-*'. Clean up doxygen markup for the libalpm groups. Clean up doxygen @param warnings. Remove all references to libalpm.3 configure.ac | 26 +++- doc/.gitignore | 3 +- doc/Doxyfile | 305 ----------------------------------------------- doc/Doxyfile.in | 43 +++++++ doc/Makefile.am | 36 +++--- doc/index.txt | 1 - doc/libalpm.3.txt | 39 ------ doc/pacman.8.txt | 4 +- doc/pacman.conf.5.txt | 4 +- doc/vercmp.8.txt | 2 +- lib/libalpm/alpm.c | 11 -- lib/libalpm/alpm.h | 34 +++--- lib/libalpm/alpm_list.c | 7 +- lib/libalpm/alpm_list.h | 36 +++++- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 3 +- lib/libalpm/be_sync.c | 1 - lib/libalpm/db.c | 6 +- lib/libalpm/delta.c | 7 -- lib/libalpm/deps.c | 4 +- lib/libalpm/dload.c | 3 +- lib/libalpm/log.c | 5 +- lib/libalpm/package.c | 5 +- lib/libalpm/signing.c | 3 + lib/libalpm/sync.c | 2 +- lib/libalpm/trans.c | 5 +- lib/libalpm/util.c | 7 +- src/pacman/conf.c | 1 - src/pacman/package.c | 4 +- src/pacman/util.c | 1 - 30 files changed, 162 insertions(+), 448 deletions(-) delete mode 100644 doc/Doxyfile create mode 100644 doc/Doxyfile.in delete mode 100644 doc/libalpm.3.txt -- 1.8.5.2

2 10

[pacman-dev] Removal of pacsearch?
by Pierre Neidhardt 27 Dec '13

27 Dec '13

pacsearch "Add[s] color and install information to a pacman -Ss search". This contrib script has last been updated for pacman 3.2 if I recall correctly. Since pacman now comes with color support, I feel like this script has become obsolete. Beside being redundant, it is slower and colors are somewhat less readable (as subjective as it may be). Shall we remove pacsearch from the contrib scripts? -- Pierre Neidhardt Whenever people agree with me I always feel I must be wrong. -- Oscar Wilde

4 4

[pacman-dev] [PATCH] pactest: explicitly list known tests
by Dave Reisner 26 Dec '13

26 Dec '13

This avoids surprises in the build system when the wildcard matches something that autotools doesn't explicitly know about. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- test/pacman/tests/Makefile.am | 297 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 295 insertions(+), 2 deletions(-) diff --git a/test/pacman/tests/Makefile.am b/test/pacman/tests/Makefile.am index 9ab0c77..ed3e900 100644 --- a/test/pacman/tests/Makefile.am +++ b/test/pacman/tests/Makefile.am @@ -1,8 +1,298 @@ CONFTESTS = $(patsubst %py.in,%py,$(wildcard *.py.in)) check_SCRIPTS = \ - $(wildcard *.py) \ - $(CONFTESTS) + $(CONFTESTS) \ + clean001.py \ + clean002.py \ + clean003.py \ + clean004.py \ + clean005.py \ + config001.py \ + config002.py \ + database001.py \ + database002.py \ + database010.py \ + database011.py \ + database012.py \ + depconflict100.py \ + depconflict110.py \ + depconflict111.py \ + depconflict120.py \ + deptest001.py \ + dummy001.py \ + epoch001.py \ + epoch002.py \ + epoch003.py \ + epoch004.py \ + epoch005.py \ + epoch010.py \ + epoch011.py \ + epoch012.py \ + fileconflict001.py \ + fileconflict002.py \ + fileconflict003.py \ + fileconflict004.py \ + fileconflict005.py \ + fileconflict006.py \ + fileconflict007.py \ + fileconflict008.py \ + fileconflict009.py \ + fileconflict010.py \ + fileconflict011.py \ + fileconflict012.py \ + fileconflict013.py \ + fileconflict015.py \ + fileconflict016.py \ + fileconflict017.py \ + fileconflict020.py \ + fileconflict021.py \ + fileconflict022.py \ + fileconflict023.py \ + fileconflict024.py \ + fileconflict025.py \ + fileconflict030.py \ + fileconflict031.py \ + fileconflict032.py \ + ignore001.py \ + ignore002.py \ + ignore003.py \ + ignore004.py \ + ignore005.py \ + ignore006.py \ + ignore007.py \ + ignore008.py \ + ldconfig001.py \ + ldconfig002.py \ + ldconfig003.py \ + mode001.py \ + mode002.py \ + mode003.py \ + pacman001.py \ + pacman002.py \ + pacman003.py \ + pacman004.py \ + pacman005.py \ + provision001.py \ + provision002.py \ + provision003.py \ + provision004.py \ + provision010.py \ + provision011.py \ + provision012.py \ + provision020.py \ + provision021.py \ + provision022.py \ + query001.py \ + query002.py \ + query003.py \ + query004.py \ + query005.py \ + query006.py \ + query007.py \ + query010.py \ + query011.py \ + query012.py \ + reason001.py \ + remove001.py \ + remove002.py \ + remove010.py \ + remove011.py \ + remove012.py \ + remove020.py \ + remove021.py \ + remove030.py \ + remove031.py \ + remove040.py \ + remove041.py \ + remove042.py \ + remove043.py \ + remove044.py \ + remove045.py \ + remove047.py \ + remove049.py \ + remove050.py \ + remove051.py \ + remove052.py \ + remove060.py \ + remove070.py \ + remove071.py \ + replace100.py \ + replace101.py \ + replace102.py \ + replace103.py \ + replace104.py \ + replace110.py \ + scriptlet001.py \ + scriptlet002.py \ + sign001.py \ + sign002.py \ + smoke001.py \ + smoke002.py \ + smoke003.py \ + smoke004.py \ + symlink001.py \ + symlink002.py \ + symlink010.py \ + symlink011.py \ + symlink012.py \ + symlink020.py \ + sync-nodepversion01.py \ + sync-nodepversion02.py \ + sync-nodepversion03.py \ + sync-nodepversion04.py \ + sync-nodepversion05.py \ + sync-nodepversion06.py \ + sync001.py \ + sync002.py \ + sync003.py \ + sync009.py \ + sync010.py \ + sync011.py \ + sync012.py \ + sync020.py \ + sync021.py \ + sync022.py \ + sync023.py \ + sync024.py \ + sync030.py \ + sync031.py \ + sync040.py \ + sync041.py \ + sync042.py \ + sync043.py \ + sync044.py \ + sync045.py \ + sync050.py \ + sync051.py \ + sync052.py \ + sync100.py \ + sync101.py \ + sync102.py \ + sync103.py \ + sync104.py \ + sync110.py \ + sync120.py \ + sync130.py \ + sync131.py \ + sync132.py \ + sync133.py \ + sync134.py \ + sync135.py \ + sync136.py \ + sync137.py \ + sync138.py \ + sync139.py \ + sync140.py \ + sync141.py \ + sync150.py \ + sync200.py \ + sync300.py \ + sync306.py \ + sync400.py \ + sync401.py \ + sync402.py \ + sync403.py \ + sync404.py \ + sync405.py \ + sync406.py \ + sync407.py \ + sync500.py \ + sync501.py \ + sync502.py \ + sync503.py \ + sync600.py \ + sync700.py \ + sync701.py \ + sync702.py \ + sync890.py \ + sync891.py \ + sync892.py \ + sync893.py \ + sync895.py \ + sync896.py \ + sync897.py \ + sync898.py \ + sync899.py \ + sync900.py \ + sync901.py \ + sync990.py \ + sync992.py \ + sync993.py \ + sync999.py \ + sync1000.py \ + sync1003.py \ + sync1004.py \ + sync1008.py \ + sync1100.py \ + sync1101.py \ + sync1102.py \ + sync1103.py \ + sync1104.py \ + sync1105.py \ + trans001.py \ + type001.py \ + unresolvable001.py \ + upgrade001.py \ + upgrade002.py \ + upgrade003.py \ + upgrade004.py \ + upgrade005.py \ + upgrade006.py \ + upgrade010.py \ + upgrade011.py \ + upgrade012.py \ + upgrade013.py \ + upgrade014.py \ + upgrade015.py \ + upgrade016.py \ + upgrade020.py \ + upgrade021.py \ + upgrade022.py \ + upgrade023.py \ + upgrade024.py \ + upgrade025.py \ + upgrade026.py \ + upgrade027.py \ + upgrade028.py \ + upgrade029.py \ + upgrade030.py \ + upgrade031.py \ + upgrade032.py \ + upgrade040.py \ + upgrade041.py \ + upgrade042.py \ + upgrade043.py \ + upgrade045.py \ + upgrade046.py \ + upgrade050.py \ + upgrade051.py \ + upgrade052.py \ + upgrade053.py \ + upgrade054.py \ + upgrade055.py \ + upgrade056.py \ + upgrade057.py \ + upgrade058.py \ + upgrade059.py \ + upgrade060.py \ + upgrade061.py \ + upgrade070.py \ + upgrade071.py \ + upgrade072.py \ + upgrade073.py \ + upgrade074.py \ + upgrade075.py \ + upgrade076.py \ + upgrade077.py \ + upgrade078.py \ + upgrade080.py \ + upgrade081.py \ + upgrade082.py \ + upgrade083.py \ + upgrade084.py \ + upgrade090.py \ + upgrade100.py \ + xfercommand001.py noinst_SCRIPTS = $(check_SCRIPTS) @@ -10,6 +300,9 @@ EXTRA_DIST = $(check_SCRIPTS) CLEANFILES = $(CONFTESTS) +%.py: %.py.in + $(AM_V_GEN)test -f $(srcdir)/$@.in && m4 -P -I $(srcdir) $(srcdir)/$@.py.in | $(edit) >$@.py + #### Taken from the autoconf scripts Makefile.am #### edit = sed \ -e 's|@LIBCURL[@]|$(LIBCURL)|g' \ -- 1.8.5.2

4 3

[pacman-dev] Discrepancy between -Si and -Qi output
by Jason St. John 22 Dec '13

22 Dec '13

I noticed that "Required By" and "Optional For" are shown in the output of "pacman -Qi <package>", but these fields are missing from the output of "pacman -Si <package>". Is this omission intentional or should I file a bug on the bug tracker? Jason

3 3

[pacman-dev] [PATCH 1/2] Add test to check for indirect optdepend removal
by Chirantan Ekbote 21 Dec '13

21 Dec '13

If package brown-sugar provides package sugar and package coffee optionally depends on sugar, pacman should print a warning when brown-sugar is removed. Signed-off-by: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> --- test/pacman/tests/TESTS | 1 + test/pacman/tests/remove072.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 test/pacman/tests/remove072.py diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index fc6a7e8..6c56268 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -112,6 +112,7 @@ TESTS += test/pacman/tests/remove052.py TESTS += test/pacman/tests/remove060.py TESTS += test/pacman/tests/remove070.py TESTS += test/pacman/tests/remove071.py +TESTS += test/pacman/tests/remove072.py TESTS += test/pacman/tests/replace100.py TESTS += test/pacman/tests/replace101.py TESTS += test/pacman/tests/replace102.py diff --git a/test/pacman/tests/remove072.py b/test/pacman/tests/remove072.py new file mode 100644 index 0000000..0a29b39 --- /dev/null +++ b/test/pacman/tests/remove072.py @@ -0,0 +1,14 @@ +self.description = "Remove a package that provides an optdepend" + +p1 = pmpkg("brown-sugar") +p1.provides = ["sugar"] +self.addpkg2db("local", p1) + +p2 = pmpkg("coffee") +p2.optdepends = ["sugar"] +self.addpkg2db("local", p2) + +self.args = "-R %s" % p1.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=coffee optionally requires sugar") -- 1.8.5.1

2 3

[pacman-dev] [PATCH] Fix build with --disable-gpgme
by Allan McRae 21 Dec '13

21 Dec '13

The alpm_decode_signature function was made available for frontends to display signature information, but this required libalpm to be build with gpgme support. As that function did not require anything from gpgme, have it build unconditionally. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/Makefile.am | 6 +---- lib/libalpm/signing.c | 60 ++++++++++++++++++++++++------------------------- 2 files changed, 31 insertions(+), 35 deletions(-) diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 171bc46..16a46ef 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -30,6 +30,7 @@ libalpm_la_SOURCES = \ alpm.h alpm.c \ alpm_list.h alpm_list.c \ backup.h backup.c \ + base64.h base64.c \ be_local.c \ be_package.c \ be_sync.c \ @@ -63,11 +64,6 @@ libalpm_la_SOURCES += \ sha2.h sha2.c endif -if HAVE_LIBGPGME -libalpm_la_SOURCES += \ - base64.h base64.c -endif - libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) libalpm_la_CFLAGS = \ diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index b594a9b..6043a8e 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -24,17 +24,46 @@ #if HAVE_LIBGPGME #include <locale.h> /* setlocale() */ #include <gpgme.h> -#include "base64.h" #endif /* libalpm */ #include "signing.h" #include "package.h" +#include "base64.h" #include "util.h" #include "log.h" #include "alpm.h" #include "handle.h" +/** + * Decode a loaded signature in base64 form. + * @param base64_data the signature to attempt to decode + * @param data the decoded data; must be freed by the caller + * @param data_len the length of the returned data + * @return 0 on success, -1 on failure to properly decode + */ + +int SYMEXPORT alpm_decode_signature(const char *base64_data, + unsigned char **data, size_t *data_len) +{ + size_t len = strlen(base64_data); + unsigned char *usline = (unsigned char *)base64_data; + /* reasonable allocation of expected length is 3/4 of encoded length */ + size_t destlen = len * 3 / 4; + MALLOC(*data, destlen, goto error); + if(base64_decode(*data, &destlen, usline, len)) { + free(*data); + goto error; + } + *data_len = destlen; + return 0; + +error: + *data = NULL; + *data_len = 0; + return -1; +} + #if HAVE_LIBGPGME #define CHECK_ERR(void) do { \ if(gpg_err_code(gpg_err) != GPG_ERR_NO_ERROR) { goto gpg_error; } \ @@ -418,35 +447,6 @@ int _alpm_key_import(alpm_handle_t *handle, const char *fpr) } /** - * Decode a loaded signature in base64 form. - * @param base64_data the signature to attempt to decode - * @param data the decoded data; must be freed by the caller - * @param data_len the length of the returned data - * @return 0 on success, -1 on failure to properly decode - */ - -int SYMEXPORT alpm_decode_signature(const char *base64_data, - unsigned char **data, size_t *data_len) -{ - size_t len = strlen(base64_data); - unsigned char *usline = (unsigned char *)base64_data; - /* reasonable allocation of expected length is 3/4 of encoded length */ - size_t destlen = len * 3 / 4; - MALLOC(*data, destlen, goto error); - if(base64_decode(*data, &destlen, usline, len)) { - free(*data); - goto error; - } - *data_len = destlen; - return 0; - -error: - *data = NULL; - *data_len = 0; - return -1; -} - -/** * Check the PGP signature for the given file path. * If base64_sig is provided, it will be used as the signature data after * decoding. If base64_sig is NULL, expect a signature file next to path -- 1.8.5.2

1 0

[pacman-dev] [PATCH] Fix build warnings with --disable-nls
by Allan McRae 21 Dec '13

21 Dec '13

The gettext functions return a "char *", so do the same for the defines in the case where gettext is unavailable. This prevents a number of warnings about const being dropped. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/util.h | 2 +- src/pacman/util.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index c12b39b..2142171 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -47,7 +47,7 @@ /* define _() as shortcut for gettext() */ #define _(str) dgettext ("libalpm", str) #else -#define _(s) s +#define _(s) (char *)s #endif void _alpm_alloc_fail(size_t size); diff --git a/src/pacman/util.h b/src/pacman/util.h index e2297f8..9920e74 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -34,8 +34,8 @@ #define _(str) gettext(str) #define _n(str1, str2, ct) ngettext(str1, str2, ct) #else -#define _(str) str -#define _n(str1, str2, ct) (ct == 1 ? str1 : str2) +#define _(str) (char *)str +#define _n(str1, str2, ct) (char *)(ct == 1 ? str1 : str2) #endif typedef struct _pm_target_t { -- 1.8.5.2

1 0

[pacman-dev] [PATCH] Flag parameters of mount_point_load_fsinfo as potentially unused
by Allan McRae 21 Dec '13

21 Dec '13

Fixes build issue on FreeBSD. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/diskspace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index dcab3b0..66d83c2 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -69,7 +69,7 @@ static void mount_point_list_free(alpm_list_t *mount_points) FREELIST(mount_points); } -static int mount_point_load_fsinfo(alpm_handle_t *handle, alpm_mountpoint_t *mountpoint) +static int mount_point_load_fsinfo(alpm_handle_t UNUSED *handle, alpm_mountpoint_t UNUSED *mountpoint) { #if defined(HAVE_GETMNTENT) /* grab the filesystem usage */ -- 1.8.5.2

1 0