- Arch-projects - lists.archlinux.org

[arch-projects] [pyalpm][PATCH] remove unrequired includes
by Jelle van der Waa 16 Nov '16

16 Nov '16

These unrequired includes where found by llvm's include-what-you-use Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- src/pyalpm.c | 1 - src/pyalpm.h | 6 ------ 2 files changed, 7 deletions(-) diff --git a/src/pyalpm.c b/src/pyalpm.c index 507f564..12e57c8 100644 --- a/src/pyalpm.c +++ b/src/pyalpm.c @@ -20,7 +20,6 @@ #include "pyalpm.h" #include "util.h" -#include "handle.h" #include "package.h" #include "db.h" diff --git a/src/pyalpm.h b/src/pyalpm.h index d9784e4..6f80570 100644 --- a/src/pyalpm.h +++ b/src/pyalpm.h @@ -20,12 +20,6 @@ This file is part of pyalpm. */ #include <Python.h> -#include <alpm.h> -#include <alpm_list.h> - -#include <stdio.h> -#include <string.h> - #ifndef PYALPM_H #define PYALPM_H -- 2.10.2

1 0

[arch-projects] [mkinitcpio] mkinitcpio-nfs-utils add nfsv4 support
by George Kranis 14 Nov '16

14 Nov '16

Hopefully this hasn't been posted in the wrong place >From e3349c4176a70a67411fd9959af5701467666f9f Mon Sep 17 00:00:00 2001 From: George Kranis <george(a)kranis.org> Date: Mon, 14 Nov 2016 23:29:31 +0200 Subject: [PATCH] mkinitcpio-nfs-utils: add nfsv4 support Signed-off-by: George Kranis <george(a)kranis.org> --- mkinitcpio-nfs-utils/trunk/PKGBUILD | 2 +- mkinitcpio-nfs-utils/trunk/initcpio-hook-net | 8 +++++++- mkinitcpio-nfs-utils/trunk/initcpio-install-net | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mkinitcpio-nfs-utils/trunk/PKGBUILD b/mkinitcpio-nfs-utils/trunk/PKGBUILD index 27006f6..a8d8e9a 100644 --- a/mkinitcpio-nfs-utils/trunk/PKGBUILD +++ b/mkinitcpio-nfs-utils/trunk/PKGBUILD @@ -8,7 +8,7 @@ pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio" arch=('i686' 'x86_64') url="http://www.archlinux.org/" license=('GPL2') -depends=('glibc') +depends=('glibc' 'nfs-utils') source=("https://sources.archlinux.org/other/mkinitcpio/$pkgname-$pkgver.tar.xz" 'nfsmount-fix-wrong-umount-path.patch' 'initcpio-install-net' diff --git a/mkinitcpio-nfs-utils/trunk/initcpio-hook-net b/mkinitcpio-nfs-utils/trunk/initcpio-hook-net index 4d1ebb9..aa9d4ae 100644 --- a/mkinitcpio-nfs-utils/trunk/initcpio-hook-net +++ b/mkinitcpio-nfs-utils/trunk/initcpio-hook-net @@ -62,6 +62,7 @@ run_hook() { line="${line#"${nfs_path}"}" [ -z "${nfs_path}" ] && nfs_path="${defaultrootpath}" nfs_option="${line#","}" + expr match "$nfs_option" '.*vers=4.*' >/dev/null && nfs_vers=4 fi # ensure root and filesystem type are set proper for nfs boot @@ -77,6 +78,7 @@ run_hook() { } nfs_mount_handler() { + local mountcommand if [ -z "$nfs_server" -o -z "$nfs_path" ]; then err "Unable to mount root filesystem over NFS: wrong parameters." echo "You are being dropped to a recovery shell" @@ -84,7 +86,11 @@ nfs_mount_handler() { launch_interactive_shell msg "Trying to continue (this will most likely fail) ..." fi - nfsmount ${nfs_option:+-o ${nfs_option}} "${nfs_server}:${nfs_path}" "$1" + mountcommand=nfsmount + if [ "$nfs_vers" -eq "4" ]; then + mountcommand="mount.nfs4" + fi + $mountcommand ${nfs_option:+-o ${nfs_option}} "${nfs_server}:${nfs_path}" "$1" } # vim: set ft=sh ts=4 sw=4 et: diff --git a/mkinitcpio-nfs-utils/trunk/initcpio-install-net b/mkinitcpio-nfs-utils/trunk/initcpio-install-net index 79b6789..d2d1c27 100644 --- a/mkinitcpio-nfs-utils/trunk/initcpio-install-net +++ b/mkinitcpio-nfs-utils/trunk/initcpio-install-net @@ -3,9 +3,12 @@ build() { add_checked_modules '/drivers/net/' add_module nfsv3? + add_module sunrpc + add_module nfsv4 add_binary "/usr/lib/initcpio/ipconfig" "/bin/ipconfig" add_binary "/usr/lib/initcpio/nfsmount" "/bin/nfsmount" + add_binary "/usr/bin/mount.nfs4" "/bin/mount.nfs4" add_runscript } -- 2.9.3

1 0

[arch-projects] [archweb] [PATCH] Fix auto-adoption
by Johannes Löthberg 10 Nov '16

10 Nov '16

Look up the packager using the UserFinder class, and create a PackageRelation. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- devel/management/commands/reporead.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py index 6e26710..3ebd45c 100644 --- a/devel/management/commands/reporead.py +++ b/devel/management/commands/reporead.py @@ -396,10 +396,13 @@ def db_update(archname, reponame, pkgs, force=False): with transaction.atomic(): populate_pkg(dbpkg, pkg, timestamp=timestamp) Update.objects.log_update(None, dbpkg) - prel = PackageRelation(pkgbase=dbpkg.pkgbase, - user=dbpkg.packager, - type=PackageRelation.MAINTAINER) - prel.save() + + packager = finder.find(pkg.packager) + if packager: + prel = PackageRelation(pkgbase=dbpkg.pkgbase, + user=packager, + type=PackageRelation.MAINTAINER) + prel.save() except IntegrityError: -- 2.10.2

1 0

[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