- Arch-projects - lists.archlinux.org

[arch-projects] [netctl] [PATCH] Fix bash completion for profiles names.
by Romain Aigron 02 Nov '16

02 Nov '16

This patch fixes completion for the netctl and netctl_auto commands for profiles names, treating them as filenames. This allow proper completion for profiles with spaces or quotes in their name (as it happends for instance with wifi-menu's autogenerated profile names) Signed-off-by: Romain Aigron <aigron.romain(a)wanadoo.fr> --- contrib/bash-completion | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/bash-completion b/contrib/bash-completion index 2ab6acb..5778e84 100644 --- a/contrib/bash-completion +++ b/contrib/bash-completion @@ -13,7 +13,9 @@ _wireless_interfaces() _netctl_profiles() { - find -L /etc/netctl -maxdepth 1 -type f -not -name '.*' -not -name '*~' -not -name '*.conf' -not -name '*.service' -printf "%f\n" + local profile + find -L /etc/netctl -maxdepth 1 -type f -not -name '.*' -not -name '*~' -not -name '*.conf' -not -name '*.service' -printf "%f\n" | + while read -r profile; do quote_readline "$profile"; echo; done } @@ -27,6 +29,7 @@ _netctl() ;; 2) [[ ${COMP_WORDS[COMP_CWORD-1]} = @(start|stop|restart|switch-to|is-active|status|enable|disable|reenable|is-enabled|edit) ]] && + compopt -o filenames && mapfile -t COMPREPLY < <(IFS=$'\n'; compgen -W "$(_netctl_profiles)" -- "$cur") ;; esac @@ -44,6 +47,7 @@ _netctl_auto() ;; 2) [[ ${COMP_WORDS[COMP_CWORD-1]} = @(switch-to|is-active|enable|disable|is-enabled) ]] && + compopt -o filenames && mapfile -t COMPREPLY < <(IFS=$'\n'; compgen -W "$(_netctl_profiles)" -- "$cur") ;; esac -- 2.10.0

2 1

[arch-projects] [pyalpm][PATCH add tests] 4/4] Add `python setup.py test`
by Jelle van der Waa 29 Oct '16

29 Oct '16

Add the ability to run the unittests from setup.py. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- setup.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 44507a9..21196f9 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- import os +import subprocess +from distutils.cmd import Command from distutils.core import Extension, setup os.putenv('LC_CTYPE', 'en_US.UTF-8') @@ -36,6 +38,21 @@ alpm = Extension('pyalpm', 'src/util.h', ]) +class TestCommand(Command): + user_options = [] + + def initialize_options(self): + pass + + def finalize_options(self): + pass + + def run(self): + raise SystemExit( + subprocess.call(['nosetests', + 'tests'])) + + setup(name = 'pyalpm', version = pyalpm_version, description = 'libalpm bindings for Python 3', @@ -45,6 +62,9 @@ setup(name = 'pyalpm', packages = ["pycman"], scripts = ["scripts/lsoptdepends"] + ["scripts/pycman-" + i for i in ['database', 'deptest', 'query', 'remove', 'sync', 'upgrade', 'version']], - ext_modules = [alpm]) + ext_modules = [alpm], + cmdclass = { + 'test': TestCommand + }) # vim: set ts=4 sw=4 et tw=0: -- 2.10.1

1 0

[arch-projects] [pyalpm][PATCH add tests] 3/4] tests: Add tests for pyalpm.handle
by Jelle van der Waa 29 Oct '16

29 Oct '16

Add a few simple tests for functions which do not touch the local db. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- tests/test_handle.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 tests/test_handle.py diff --git a/tests/test_handle.py b/tests/test_handle.py new file mode 100644 index 0000000..03cd704 --- /dev/null +++ b/tests/test_handle.py @@ -0,0 +1,45 @@ +import unittest +import pyalpm + + +class handle(unittest.TestCase): + + def setUp(self): + self.handle = pyalpm.Handle('/', '/var/lib/pacman') + + def test_cachedirs(self): + self.handle.add_cachedir('/tmp/') + self.assertIn('/tmp/', self.handle.cachedirs) + + self.handle.remove_cachedir('/tmp/') + self.assertNotIn('/tmp/', self.handle.cachedirs) + + def test_ignoregrps(self): + self.handle.add_ignoregrp('base') + self.assertIn('base', self.handle.ignoregrps) + + self.handle.remove_ignoregrp('base') + self.assertNotIn('base', self.handle.ignoregrps) + + def test_ignorepkg(self): + self.handle.add_ignorepkg('pacman') + self.assertIn('pacman', self.handle.ignorepkgs) + + self.handle.remove_ignorepkg('pacman') + self.assertNotIn('pacman', self.handle.ignorepkgs) + + def test_noextracts(self): + self.handle.add_noextract('index.php') + self.assertIn('index.php', self.handle.noextracts) + + self.handle.remove_noextract('index.php') + self.assertNotIn('index.php', self.handle.noextracts) + + def test_noupgrade(self): + self.handle.add_noupgrade('linux') + self.assertIn('linux', self.handle.noupgrades) + + self.handle.remove_noupgrade('linux') + self.assertNotIn('linux', self.handle.noupgrades) + +# vim: set ts=4 sw=4 et: -- 2.10.1

1 0

[arch-projects] [pyalpm][PATCH add tests] 2/4] tests: Add pyalpm.vercmp tests
by Jelle van der Waa 29 Oct '16

29 Oct '16

Add tests for pyalpm.vercmp function. The tests are mostly taken from `man vercmp`. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- tests/test_vercmp.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 tests/test_vercmp.py diff --git a/tests/test_vercmp.py b/tests/test_vercmp.py new file mode 100644 index 0000000..8c42466 --- /dev/null +++ b/tests/test_vercmp.py @@ -0,0 +1,21 @@ +import unittest +import pyalpm + + +class vercmp(unittest.TestCase): + + def test_smaller(self): + self.assertEqual(pyalpm.vercmp('1', '2'), -1) + + def test_greater(self): + self.assertEqual(pyalpm.vercmp('2', '1'), 1) + self.assertEqual(pyalpm.vercmp('2.0-1', '1.7-6'), 1) + + def test_equal(self): + self.assertEqual(pyalpm.vercmp('1', '1'), 0) + self.assertEqual(pyalpm.vercmp('1.0', '1.0-10'), 0) + + def test_epoch(self): + self.assertEqual(pyalpm.vercmp('4.34', '1:001'), -1) + +# vim: set ts=4 sw=4 et: -- 2.10.1

1 0

[arch-projects] [pyalpm][PATCH add tests] 1/4] Remove old tests
by Jelle van der Waa 29 Oct '16

29 Oct '16

These options are no longer part of pyalpm. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- tests/options.py | 124 ------------------------------------------------------- 1 file changed, 124 deletions(-) delete mode 100644 tests/options.py diff --git a/tests/options.py b/tests/options.py deleted file mode 100644 index e2610c5..0000000 --- a/tests/options.py +++ /dev/null @@ -1,124 +0,0 @@ -import unittest -import pyalpm - -class TestOptions(unittest.TestCase): - def setUp(self): - pyalpm.initialize() - - def tearDown(self): - pyalpm.release() - - def test_paths(self): - "Test getter/setters for file path options" - opts = pyalpm.options - opts.root = "/root" - self.assertEqual(opts.root, "/root/") - - opts.dbpath = "/var/lib/pacman" - self.assertEqual(opts.dbpath, "/var/lib/pacman/") - self.assertEqual(opts.lockfile, "/var/lib/pacman/db.lck") - - opts.logfile = "/var/log/pacman.log" - self.assertEqual(opts.logfile, "/var/log/pacman.log") - - def test_paths_wrong_type(self): - opts = pyalpm.options - with self.assertRaises(TypeError): - opts.root = 3 - with self.assertRaises(TypeError): - opts.dbpath = 3 - with self.assertRaises(TypeError): - opts.logfile = 3 - - def test_string(self): - "Test getter/setters for string options" - pyalpm.options.arch = 'i686' - self.assertEqual(pyalpm.options.arch, 'i686') - with self.assertRaises(TypeError): - pyalpm.options.arch = ["i686"] - - def test_booleans(self): - "Test get/set for boolean options" - opts = pyalpm.options - opts.usesyslog = 1 - self.assertEqual(opts.usesyslog, 1) - opts.usesyslog = 0 - self.assertEqual(opts.usesyslog, 0) - opts.usedelta = 1 - self.assertEqual(opts.usedelta, 1) - opts.checkspace = 1 - self.assertEqual(opts.checkspace, 1) - - def test_lists(self): - "Test get/set for list options" - opts = pyalpm.options - - opts.noupgrades = ["glibc", "pacman"] - self.assertEqual(set(opts.noupgrades), set(["glibc", "pacman"])) - opts.add_noupgrade("kernel26") - self.assertEqual(set(opts.noupgrades), set(["glibc", "pacman", "kernel26"])) - opts.remove_noupgrade("glibc") - self.assertEqual(set(opts.noupgrades), set(["pacman", "kernel26"])) - - opts.ignorepkgs = ["glibc", "pacman"] - self.assertEqual(set(opts.ignorepkgs), set(["glibc", "pacman"])) - -class TestOptionsNotInit(unittest.TestCase): - def test_root(self): - opts = pyalpm.options - with self.assertRaises(pyalpm.error): - opts.root = "/root" - with self.assertRaises(pyalpm.error): - s = opts.root - - def test_dbpath(self): - opts = pyalpm.options - with self.assertRaises(pyalpm.error): - opts.dbpath = "/var/lib/pacman" - with self.assertRaises(pyalpm.error): - s = opts.dbpath - - def test_logfile(self): - opts = pyalpm.options - with self.assertRaises(pyalpm.error): - opts.logfile = "/var/log/pacman.log" - with self.assertRaises(pyalpm.error): - s = opts.logfile - - def test_lockfile(self): - opts = pyalpm.options - with self.assertRaises(pyalpm.error): - s = opts.lockfile - - def test_arch(self): - with self.assertRaises(pyalpm.error): - pyalpm.options.arch = "i686" - with self.assertRaises(pyalpm.error): - s = pyalpm.options.arch - - def test_usesyslog(self): - "Test get/set for boolean options" - opts = pyalpm.options - with self.assertRaises(pyalpm.error): - opts.usesyslog = 1 - with self.assertRaises(pyalpm.error): - x = opts.usesyslog - - def test_usedelta(self): - opts = pyalpm.options - with self.assertRaises(pyalpm.error): - opts.usedelta = 1 - with self.assertRaises(pyalpm.error): - x = opts.usedelta - - def test_checkspace(self): - opts = pyalpm.options - with self.assertRaises(pyalpm.error): - opts.checkspace = 1 - with self.assertRaises(pyalpm.error): - x = opts.checkspace - -if __name__ == "__main__": - unittest.main(verbosity = 2) - -# vim: set ts=4 sw=4 tw=0 et: -- 2.10.1

1 0

[arch-projects] [PATCH][devtools] Include more hardening in standard build flags
by Allan McRae 29 Oct '16

29 Oct '16

Adds -fstack-check to C{,XX}FLAGS and -z,now to LDFLAGS. Disabling lazy loading also allows us to add the -fno-plt optimisation. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- makepkg-i686.conf | 6 +++--- makepkg-x86_64.conf | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/makepkg-i686.conf b/makepkg-i686.conf index c565795..16d0bfb 100644 --- a/makepkg-i686.conf +++ b/makepkg-i686.conf @@ -37,9 +37,9 @@ CHOST="i686-pc-linux-gnu" # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family CPPFLAGS="-D_FORTIFY_SOURCE=2" -CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong" -CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong" -LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro" +CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fstack-check -fno-plt" +CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fstack-check -fno-plt" +LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" #-- Debugging flags diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf index 058da9b..127e088 100644 --- a/makepkg-x86_64.conf +++ b/makepkg-x86_64.conf @@ -37,9 +37,9 @@ CHOST="x86_64-pc-linux-gnu" # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family CPPFLAGS="-D_FORTIFY_SOURCE=2" -CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong" -CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong" -LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro" +CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fstack-check -fno-plt " +CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fstack-check -fno-plt" +LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" #-- Debugging flags -- 2.10.1

1 0

[arch-projects] [pyalpm][PATCH] Update authors
by Jelle van der Waa 28 Oct '16

28 Oct '16

Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- AUTHORS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/AUTHORS b/AUTHORS index bad9911..3c0d5ba 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,7 @@ +Dan McGee <dan(a)archlinux.org> Imanol Celaya <ilcra1989(a)gmail.com> +Jelle van der Waa <jelle(a)vdwaa.nl> Øyvind Heggstad <mrelendig(a)har-ikkje.net> Rémy Oudompheng <remy(a)archlinux.org> +Tasos Latsas <tlatsas2000(a)gmail.com> Xyne <xyne(a)archlinux.ca> -- 2.10.1

1 0

[arch-projects] [abs] manpage for abs
by Christian Rebischke 17 Oct '16

17 Oct '16

Hello developers, I have created a manpage for abs (arch linux build system). From 93896e6556ff9f7c93edd36a9d85b2d76b489979 Mon Sep 17 00:00:00 2001 From: Christian Rebischke <Chris.Rebischke(a)posteo.de> Date: Mon, 17 Oct 2016 10:54:18 +0200 Subject: [PATCH] manpage for abs --- docs/abs.1 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 docs/abs.1 diff --git a/docs/abs.1 b/docs/abs.1 new file mode 100644 index 0000000..aa93c32 --- /dev/null +++ b/docs/abs.1 @@ -0,0 +1,36 @@ +.TH "ABS" "1" "10/17/2016" "2.4.4" "ABS Manual" +.SH "NAME" +abs \- Arch Build System 2.4.4 \-\- synchronization utility +.SH "SYNOPSIS" +/usr/bin/abs [options] [repository1[/package1] [repository2[/package2]...]] +.SH "DESCRIPTION" +abs will synchronize PKGBUILD scripts from the Arch Linux repositories +into \fB/var/abs/\fR via rsync. If no argument is given, abs will synchronize +the repositories specified in \fB/etc/abs.conf\fR. +.SH "OPTIONS"" +.PP +\-h, \-\-help +.RS 4 +Displays this help message then exit. +.RE +.PP +\-V, \-\-version +.RS 4 +Displays version information then exit. +.RE +.PP +\-t, \-\-tarball +.RS 4 +Sync ABS tree using tarballs from your pacman mirror. +.RE +.SH "EXAMPLES" +.PP +\fI/usr/bin/abs core/pacman\fR +.RS 4 +Synchronizes the PKGBUILD for \fBpacman\fR into +\fB/var/abs/core/pacman\fR. +.RE +.SH "BUG REPORTING" +Report bugs to pacman-dev(a)archlinux.org with [ABS] in the subject. +.SH "AUTHOR" +The Arch Linux Developer Team <pacman-dev(a)archlinux.org> -- 2.10.0

2 4

[arch-projects] [pyalpm][PATCH v2] free log when it's no longer required
by Jelle van der Waa 11 Oct '16

11 Oct '16

Valgrind indicated that 253,052 bytes where definitely lost when running lsoptdepends. Valgrind reports before and after: - definitely lost: 253,052 bytes in 4,979 blocks - definitely lost: 48 bytes in 2 blocks Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- Changes since v2: * Check if vasprintf allocated memory. src/options.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/options.c b/src/options.c index 0dad965..2637c9d 100644 --- a/src/options.c +++ b/src/options.c @@ -340,6 +340,7 @@ void pyalpm_logcb(alpm_loglevel_t level, const char *fmt, va_list va_args) { if(ret == -1) log = "pyalpm_logcb: could not allocate memory"; result = PyObject_CallFunction(global_py_callbacks[CB_LOG], "is", level, log); + if (ret != -1) free(log); if (!result) PyErr_Print(); Py_CLEAR(result); } -- 2.10.0

1 0

[arch-projects] [pyalpm][PATCH] free log when it's no longer required
by Jelle van der Waa 10 Oct '16

10 Oct '16

Valgrind indicated that 253,052 bytes where definitely lost when running lsoptdepends. Valgrind reports before and after: - definitely lost: 253,052 bytes in 4,979 blocks - definitely lost: 48 bytes in 2 blocks Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- src/options.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/options.c b/src/options.c index 0dad965..cdbe4e0 100644 --- a/src/options.c +++ b/src/options.c @@ -340,6 +340,7 @@ void pyalpm_logcb(alpm_loglevel_t level, const char *fmt, va_list va_args) { if(ret == -1) log = "pyalpm_logcb: could not allocate memory"; result = PyObject_CallFunction(global_py_callbacks[CB_LOG], "is", level, log); + free(log); if (!result) PyErr_Print(); Py_CLEAR(result); } -- 2.10.0

1 0