- Arch-projects - lists.archlinux.org

[arch-projects] [namcap] [PATCH] Add rule to report on unneeded dependencies from hooks
by Eli Schwartz 11 Apr '19

11 Apr '19

Just as it is unnecessary to run certain commands in a post_upgrade script, if a hook already runs it, so too is it usually unnecessary to depend on the package that installs the hook. Sometimes these dependencies are left in even when the install script is removed, because people lack understanding in the true subtleties of hooks and the commands they run -- but the commands do not depend on the list of files which trigger them in order to function, and are fully operative when installed later. In fact, they will already be required by the software that uses the results. e.g. desktop-file-utils and shared-mime-info provide hooks to compile the mime and desktop file databases, but upon first installing the hook, a full database will already be compiled. The hook does not need to be triggered by the filepath, and thus does not need to be a dependency of every package that provides a desktop or mime file. Instead, desktop environments which need a mime/desktop file database will depend on the package and thereby ensure the database exists when needed. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- With this plus my previous patch, namcap will stop warning when these dependencies are missing, and instead, warn when they are used. I've yet to hear a convincing reason why these dependencies would be wanted -- I suspect they exist mostly because of inertia, or because they were copied from another (historic?) PKGBUILD that was used as a role model. Namcap/rules/__init__.py | 1 + Namcap/rules/hookdepends.py | 48 +++++++++++++++++++++++++++++++++++++ namcap-tags | 8 ++++--- 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 Namcap/rules/hookdepends.py diff --git a/Namcap/rules/__init__.py b/Namcap/rules/__init__.py index 1e05326..525dbc6 100644 --- a/Namcap/rules/__init__.py +++ b/Namcap/rules/__init__.py @@ -31,6 +31,7 @@ from . import ( fileownership, gnomemime, hardlinks, + hookdepends, infodirectory, javafiles, kdeprograms, diff --git a/Namcap/rules/hookdepends.py b/Namcap/rules/hookdepends.py new file mode 100644 index 0000000..dcf03a1 --- /dev/null +++ b/Namcap/rules/hookdepends.py @@ -0,0 +1,48 @@ +# +# namcap rules - hookdepends +# Copyright (C) 2019 Eli Schwartz <eschwartz(a)archlinux.org> +# Copyright (C) 2016 Kyle Keen <keenerd(a)gmail.com> +# +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +import re +from Namcap.ruleclass import * + +class HookDependsRule(TarballRule): + name = "hookdepends" + description = "Check for redundant hook dependencies" + subrules = [ + { + 'path': '^usr/share/applications/.*\.desktop$', + 'dep': 'desktop-file-utils', + }, + { + 'path': '^usr/share/mime$', + 'dep': 'shared-mime-info', + } + ] + def analyze(self, pkginfo, tar): + names = [entry.name for entry in tar] + for subrule in self.subrules: + pattern = re.compile(subrule['path']) + if any(pattern.search(n) for n in names): + dep = subrule['dep'] + if dep in pkginfo['depends']: + self.warnings = [('external-hooks-unneeded-warning', ())] + self.infos.append(('external-hooks-unneeded-name %s', dep)) + + +# vim: set ts=4 sw=4 noet: diff --git a/namcap-tags b/namcap-tags index 17b9506..84cc3f7 100644 --- a/namcap-tags +++ b/namcap-tags @@ -1,11 +1,11 @@ # namcap tags file -# The tags file consists of lines specifying the human readable form of the -# hyphenated tags used in the namcap code. A line beginning with a '#' is +# The tags file consists of lines specifying the human readable form of the +# hyphenated tags used in the namcap code. A line beginning with a '#' is # treated as a comment. Otherwise the format of the file is: # # machine-parseable-tag %s :: This is machine parseable tag %s # -# Note that a double colon (::) is used to separate the hyphenated tag from the +# Note that a double colon (::) is used to separate the hyphenated tag from the # human readable description. # rules tags @@ -26,6 +26,8 @@ empty-directory %s :: Directory (%s) is empty error-running-rule %s :: Error running rule '%s' external-hooks-name %s :: .INSTALL file runs a command (%s) provided by hooks. external-hooks-warning :: .INSTALL file runs a command provided by hooks. +external-hooks-unneeded-name %s :: unneeded dependency on a package (%s) run when needed by hooks. +external-hooks-unneeded-warning :: unneeded dependency on a package run when needed by hooks. extra-var-begins-without-underscore %s :: Non standard variable '%s' doesn't start with an underscore file-in-non-standard-dir %s :: File (%s) exists in a non-standard directory. file-in-temporary-dir %s :: File (%s) is in a temporary directory. -- 2.21.0

1 0

[arch-projects] [namcap] [PATCH] Remove no longer useful warnings that have missing keys
by Eli Schwartz 11 Apr '19

11 Apr '19

Arch Linux now has pacman hooks that provide automatic handling for update-{desktop,mime}-database without each package requiring a hard dependency and a post_upgrade hook. This means it is no longer correct to depend on the packages or provide an install script. Instead, remove this entirely. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Namcap/rules/__init__.py | 7 ++- Namcap/rules/mimefiles.py | 40 --------------- Namcap/rules/pathdepends.py | 9 ++-- Namcap/tests/package/test_mimefiles.py | 62 ------------------------ Namcap/tests/package/test_pathdepends.py | 10 +--- 5 files changed, 8 insertions(+), 120 deletions(-) delete mode 100644 Namcap/rules/mimefiles.py delete mode 100644 Namcap/tests/package/test_mimefiles.py diff --git a/Namcap/rules/__init__.py b/Namcap/rules/__init__.py index dcc950f..1e05326 100644 --- a/Namcap/rules/__init__.py +++ b/Namcap/rules/__init__.py @@ -1,7 +1,7 @@ -# +# # namcap rules - __init__ # Copyright (C) 2003-2009 Jason Chu <jason(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 @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# +# from types import ModuleType import Namcap.ruleclass @@ -37,7 +37,6 @@ from . import ( libtool, licensepkg, lotsofdocs, - mimefiles, missingbackups, pathdepends, perllocal, diff --git a/Namcap/rules/mimefiles.py b/Namcap/rules/mimefiles.py deleted file mode 100644 index f9d56f4..0000000 --- a/Namcap/rules/mimefiles.py +++ /dev/null @@ -1,40 +0,0 @@ -# -# namcap rules - mimefiles -# Copyright (C) 2009 Hugo Doria <hugo(a)archlinux.org> -# Copyright (C) 2011 Rémy Oudompheng <remy(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, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -from Namcap.ruleclass import * - -class MimeDesktopRule(TarballRule): - name = "mimedesktop" - description = "Check for MIME desktop file depends" - def analyze(self, pkginfo, tar): - for entry in tar: - if entry.issym(): - continue - if not entry.name.startswith("usr/share/applications"): - continue - if not entry.name.endswith(".desktop"): - continue - with tar.extractfile(entry) as f: - if not any(l.startswith(b"MimeType=") for l in f): - continue - pkginfo.detected_deps["desktop-file-utils"].append( ('desktop-file-utils-needed', ()) ) - break - -# vim: set ts=4 sw=4 noet: diff --git a/Namcap/rules/pathdepends.py b/Namcap/rules/pathdepends.py index 5bc4313..87f9758 100644 --- a/Namcap/rules/pathdepends.py +++ b/Namcap/rules/pathdepends.py @@ -1,7 +1,7 @@ -# +# # namcap rules - pathdepends # Copyright (C) 2016 Kyle Keen <keenerd(a)gmail.com> -# +# # 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 @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# +# """ This contains a collection of essentially one-line rules: @@ -41,9 +41,6 @@ class PathDependsRule(TarballRule): {'path': '^usr/share/icons/hicolor$', 'dep':'hicolor-icon-theme', 'reason':'hicolor-icon-theme-needed-for-hicolor-dir'}, - {'path': '^usr/share/mime$', - 'dep':'shared-mime-info', - 'reason':'shared-mime-info-needed'}, ] def analyze(self, pkginfo, tar): names = [entry.name for entry in tar] diff --git a/Namcap/tests/package/test_mimefiles.py b/Namcap/tests/package/test_mimefiles.py deleted file mode 100644 index bfed439..0000000 --- a/Namcap/tests/package/test_mimefiles.py +++ /dev/null @@ -1,62 +0,0 @@ -# -# namcap tests - mimefiles -# Copyright (C) 2011 Rémy Oudompheng <remy(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, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# - -import os -from Namcap.tests.makepkg import MakepkgTest -import Namcap.rules.mimefiles - -class MimeFilesTest(MakepkgTest): - pkgbuild = """ -pkgname=__namcap_test_mimefiles -pkgver=1.0 -pkgrel=1 -pkgdesc="A package" -arch=('i686' 'x86_64') -url="http://www.example.com/" -license=('GPL') -depends=('glibc') -source=() -options=(!purge !zipman) -build() { - true -} -package() { - mkdir -p "${pkgdir}/usr/share/applications" - echo "MimeType=applcation/pdf" > "${pkgdir}/usr/share/applications/foobar.desktop" -} -""" - def test_mimetype_in_desktop(self): - "Package with desktop files and an missing dependency" - pkgfile = "__namcap_test_mimefiles-1.0-1-%(arch)s.pkg.tar" % { "arch": self.arch } - with open(os.path.join(self.tmpdir, "PKGBUILD"), "w") as f: - f.write(self.pkgbuild) - self.run_makepkg() - pkg, r = self.run_rule_on_tarball( - os.path.join(self.tmpdir, pkgfile), - Namcap.rules.mimefiles.MimeDesktopRule - ) - self.assertEqual(pkg.detected_deps, - {"desktop-file-utils": [('desktop-file-utils-needed', ())] } - ) - self.assertEqual(r.errors, []) - self.assertEqual(r.warnings, []) - self.assertEqual(r.infos, []) - -# vim: set ts=4 sw=4 noet: diff --git a/Namcap/tests/package/test_pathdepends.py b/Namcap/tests/package/test_pathdepends.py index 48f153c..7abe2a2 100644 --- a/Namcap/tests/package/test_pathdepends.py +++ b/Namcap/tests/package/test_pathdepends.py @@ -2,7 +2,7 @@ # namcap tests - glibfiles # Copyright (C) 2011 Rémy Oudompheng <remy(a)archlinux.org> # Copyright (C) 2016 Kyle Keen <keenerd(a)gmail.com> -# +# # 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 @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -# +# import os from Namcap.tests.makepkg import MakepkgTest @@ -50,10 +50,6 @@ package() { # hicolor-icon-theme-needed-for-hicolor-dir mkdir -p "${pkgdir}/usr/share/icons/hicolor/64x64/apps" touch "${pkgdir}/usr/share/icons/hicolor/64x64/apps/example.png" - - # shared-mime-info-needed - mkdir -p "${pkgdir}/usr/share/mime/text" - touch "${pkgdir}/usr/share/mime/text/example.xml" } """ @@ -70,7 +66,6 @@ package() { {'dconf': [('dconf-needed-for-glib-schemas', ())], 'glib2': [('glib2-needed-for-gio-modules', ())], 'hicolor-icon-theme': [('hicolor-icon-theme-needed-for-hicolor-dir', ())], - 'shared-mime-info': [('shared-mime-info-needed', ())], }) self.assertEqual(r.errors, []) self.assertEqual(r.warnings, []) @@ -78,4 +73,3 @@ package() { # vim: set ts=4 sw=4 noet: - -- 2.21.0

1 1

[arch-projects] [devtools] [PATCH] $pacconf_cmd in arch-nspawn should use the provided config file (-C)
by arch＠eckner.net 02 Apr '19

02 Apr '19

From: Erich Eckner <git(a)eckner.net> If arch-nspawn is called with -C, pacman inside the chroot will use the provided configuration file. This should also be the case for $pacconf_cmd when determining the remote servers. For example, Arch Linux 32 provides separate pacman configurations which use /etc/pacman.d/mirrorlist32 as mirrorlist for their build commands (extra-i686-build, etc.). This way, we can build i686 and x86_64 packages on the same x86_64 host with very minimal changes to devtools. Signed-off-by: Erich Eckner <git(a)eckner.net> --- arch-nspawn.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index e68e2e75..461154eb 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -60,8 +60,7 @@ fi pacconf_cmd=$(command -v pacman-conf || command -v pacconf) # shellcheck disable=2016 -host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) -# shellcheck disable=2016 +host_mirrors=($($pacconf_cmd ${pac_conf+--conf $pac_conf} --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) # {{{ functions build_mount_args() { -- 2.21.0

1 1

[arch-projects] [devtools] [PATCH] fix whitespace/indentation errors
by arch＠eckner.net 02 Apr '19

02 Apr '19

From: Erich Eckner <git(a)eckner.net> Some lines are indented by spaces, while adjacent lines are indentet by tabs. We should use tabs on both. Signed-off-by: Erich Eckner <git(a)eckner.net> --- archbuild.in | 2 +- find-libdeps.in | 2 +- mkarchroot.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/archbuild.in b/archbuild.in index bd5706d5..163a1082 100644 --- a/archbuild.in +++ b/archbuild.in @@ -71,7 +71,7 @@ else -C "@pkgdatadir@/pacman-${repo}.conf" \ -M "@pkgdatadir@/makepkg-${arch}.conf" \ "${chroots}/${repo}-${arch}/root" \ - pacman -Syu --noconfirm || abort + pacman -Syu --noconfirm || abort fi # Always build official packages reproducibly diff --git a/find-libdeps.in b/find-libdeps.in index 07ba3d84..7a3e6f5d 100644 --- a/find-libdeps.in +++ b/find-libdeps.in @@ -57,7 +57,7 @@ process_sofile() { case $script_mode in deps) find_args=(-perm -u+x);; - provides) find_args=(-name '*.so*');; + provides) find_args=(-name '*.so*');; esac find . -type f "${find_args[@]}" | while read -r filename; do diff --git a/mkarchroot.in b/mkarchroot.in index 52e363fc..a9a5a0fe 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -84,7 +84,7 @@ while read -r varname; do done < <(declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$') env -i "${_env[@]}" \ pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \ - "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages' + "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages' printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen" echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf" -- 2.21.0

1 0

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20190329 created. 20190329
by Levente Polyak 29 Mar '19

29 Mar '19

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 devtools repository". The annotated tag, 20190329 has been created at 8012ea91aab30bee02c10f695b559e81438ce876 (tag) tagging a49f55cbed51c815a9392c9f7fff5f8cec385935 (commit) replaces 20180531 tagged by Levente Polyak on Fri Mar 29 21:41:55 2019 +0100 - Log ----------------------------------------------------------------- Version 20190329 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE4kC1fixGMLp2ji8m/BtUfI2BcsgFAlyegx0ACgkQ/BtUfI2B csgbUA//dWvpq8DdUirOJq2/J7el8n3TL13colETC5ToQG40wFpafjE0BW4lPp4A IBnWnoFXfvZcHTEJDkEFICnrGTJMC5iGCeOFJIk65ZBv8+n4Am85I9p8eAX+FLrQ 7f+G2HujTG4LqpxhOT9Xe4kN4H8G8waHgQaczNHY62CTcEKJSaZYUsxjkCe0Kfm6 wCIbYQN6e9MMQrElj9vqjYwSq5/S+6sDThrxA+9jlV/H7veqqITv0Vash/ks+B+k vr5nhgHm/pLNvaZwy4pVLH1SnmO6aN9lHz/rajar61+omAh7m2cLzpxDfQopTnPH +eEQJh5xeTxdkJ4ZNqWaZDerpU+7WBv/C59j0xPoih070Em5kvbgIgxaQlL1EkZd T5yqXs6/VIScJIlPy4yrxdL9t4Gs2iagGiAaSj2xX8CKK74do9gkLz+/6bm8G7k2 CecYzrZvLMrSZELzoj3o76jTK/qW740vD+XNMU/i/XCcHApg9ExONV27Pj5Zey7I GKi5QuaShlTAakoHHlLxDamIadjQNUlYFwyktMiNZXadBwtOIty8m9b9Zm0b2qiJ oqa8A/hpJNg3xkUuzoSModlhN7wNCbvwnS52XrxM4CkmyVe9weBcPy/H5NQs853T Th0WKrB5dsiTv3cMfVEXon8YwxZ1Dl8Y136CtkN99tY1QpWgZX8= =EoDH -----END PGP SIGNATURE----- Christian Hesse (1): arch-nspawn: get all mirrors from host Eli Schwartz via arch-projects (3): sogrep: don't be templated when it is not templated add sogrep command fix up sogrep manpage to correspond with current sogrep command Erich Eckner (1): remove empty tree if "--verifysource" failed Jelle van der Waa (13): doc: Add lddd man page doc: Add checkpkg man page doc: add find-libprovides man page remove arch rm as it's not really useful crossrepomove: do not set svn propset doc: add man page for mkarchroot doc: add Environment variables section to sogrep doc: add man pages for find-{libdeps,libprovides} find-libdeps: fix indentation in case sogrep: rename to sogrep.in so make clean works doc: Add myself as maintainer sogrep: remove duplicate sogrep Create a general README Levente Polyak (6): find-libdeps: in functions use return instead of continue to abort ci: adding travis support for basic check conf: sync makepkg.conf with latest version from pacman package make: fix faulty install targets readme: fix faulty whitespace in release commands Version 20190329 Matt Robinson (1): makechrootpkg: keep *DEST, MAKEFLAGS & PACKAGER Morten Linderud (1): Expand check_root keepenv variables Sven-Hendrik Haase (1): Add sogrep ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180531-27-ga49f55c
by Levente Polyak 29 Mar '19

29 Mar '19

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 devtools repository". The branch, master has been updated via a49f55cbed51c815a9392c9f7fff5f8cec385935 (commit) via 5c016c38f25f26e0e78a246c2f7a54aea3059e0c (commit) via 1d4a60874badb8ef6f42e53ab8f0f53212a18edb (commit) from b66ce081e7849af19429949fad57e683b595fbfc (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 a49f55cbed51c815a9392c9f7fff5f8cec385935 Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Fri Mar 29 21:29:26 2019 +0100 Version 20190329 commit 5c016c38f25f26e0e78a246c2f7a54aea3059e0c Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Fri Mar 29 21:37:46 2019 +0100 readme: fix faulty whitespace in release commands commit 1d4a60874badb8ef6f42e53ab8f0f53212a18edb Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Fri Mar 29 21:35:13 2019 +0100 make: fix faulty install targets This fixes a regression introduced in eeb1c0e59ee8a5f7be4a6742ba6689af54e9ac7d ----------------------------------------------------------------------- Summary of changes: Makefile | 8 ++++---- README.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180531-24-gb66ce08
by Levente Polyak 28 Mar '19

28 Mar '19

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 devtools repository". The branch, master has been updated via b66ce081e7849af19429949fad57e683b595fbfc (commit) via 1ab9b34c4cac0648149ffdeeca223947816675f0 (commit) via ebba5a588534bce575c877694790af87a812aa6c (commit) from c9b6f58f8e511b62085fa7e592aa5ecbe2a38074 (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 b66ce081e7849af19429949fad57e683b595fbfc Author: Eli Schwartz via arch-projects <arch-projects(a)archlinux.org> Date: Mon Mar 25 16:32:20 2019 -0400 fix up sogrep manpage to correspond with current sogrep command Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> commit 1ab9b34c4cac0648149ffdeeca223947816675f0 Author: Eli Schwartz via arch-projects <arch-projects(a)archlinux.org> Date: Mon Mar 25 16:32:19 2019 -0400 add sogrep command This is the new and improved, canonical sogrep command, now with a valid license. The previous version of sogrep had several issues and inefficiencies, and ultimately wasn't really the finished project I wanted it to be. Due to a mistake in communication, I was totally unaware it was in the process of being merged at all, nor that there was a licensing issue, or I would have recommended waiting for both further improvements, and a declaration of license intent; nevertheless, here it is now, and I formally give this over into the GPLv2+ domain. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> commit ebba5a588534bce575c877694790af87a812aa6c Author: Eli Schwartz via arch-projects <arch-projects(a)archlinux.org> Date: Mon Mar 25 16:32:18 2019 -0400 sogrep: don't be templated when it is not templated Partition the Makefile targets to only clean configured files, and make the configured files be a subset of the bin programs. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 - Makefile | 9 ++- doc/sogrep.1.asciidoc | 10 +++- sogrep | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++ sogrep.in | 98 --------------------------------- 5 files changed, 163 insertions(+), 104 deletions(-) create mode 100755 sogrep delete mode 100644 sogrep.in hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180531-21-gc9b6f58
by Levente Polyak 25 Mar '19

25 Mar '19

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 devtools repository". The branch, master has been updated via c9b6f58f8e511b62085fa7e592aa5ecbe2a38074 (commit) via 155798b8b12224bc09b4349edf8259ead301740f (commit) via d9b73504484da7e185dc590ef13d5f31942f6051 (commit) from 6645701cb13a4801c870c8231d3cdc9988ce593c (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 c9b6f58f8e511b62085fa7e592aa5ecbe2a38074 Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Fri Mar 22 23:45:33 2019 +0100 Create a general README Introduce a README which describes where to send patches and how to release a new version of devtools. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> commit 155798b8b12224bc09b4349edf8259ead301740f Author: Matt Robinson <git(a)nerdoftheherd.com> Date: Sat Mar 16 11:29:59 2019 +0000 makechrootpkg: keep *DEST, MAKEFLAGS & PACKAGER If makechrootpkg is called as non-root, the {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER environment variables are lost in the call to check_root(). Add these to the passed keepenv list so that they are preserved instead. commit d9b73504484da7e185dc590ef13d5f31942f6051 Author: Christian Hesse <mail(a)eworm.de> Date: Fri Mar 22 12:21:08 2019 +0100 arch-nspawn: get all mirrors from host Now that pacconf gives us all mirrors we can use them, instead of just the first one. Signed-off-by: Christian Hesse <mail(a)eworm.de> ----------------------------------------------------------------------- Summary of changes: README.md | 24 ++++++++++++++++++++++++ arch-nspawn.in | 14 ++++++++------ makechrootpkg.in | 2 +- 3 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 README.md hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [PATCH 1/3] sogrep: don't be templated when it is not templated
by Eli Schwartz 25 Mar '19

25 Mar '19

Partition the Makefile targets to only clean configured files, and make the configured files be a subset of the bin programs. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- .gitignore | 1 - Makefile | 9 ++++++--- sogrep.in => sogrep | 0 3 files changed, 6 insertions(+), 4 deletions(-) rename sogrep.in => sogrep (100%) diff --git a/.gitignore b/.gitignore index 6a1d1e4..b63587b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,5 +15,4 @@ zsh_completion find-libdeps crossrepomove arch-nspawn -sogrep doc/*.1 diff --git a/Makefile b/Makefile index 055ed2d..39785c3 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ V=20180531 PREFIX = /usr/local MANDIR = $(PREFIX)/share/man -BINPROGS = \ +IN_PROGS = \ checkpkg \ commitpkg \ archco \ @@ -16,7 +16,10 @@ BINPROGS = \ crossrepomove\ arch-nspawn \ mkarchroot \ - makechrootpkg \ + makechrootpkg + +BINPROGS = \ + $(IN_PROGS) \ sogrep CONFIGFILES = \ @@ -90,7 +93,7 @@ doc/%: doc/%.asciidoc a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage -D doc $< clean: - rm -f $(BINPROGS) bash_completion zsh_completion $(MANS) + rm -f $(IN_PROGS) bash_completion zsh_completion $(MANS) install: install -dm0755 $(DESTDIR)$(PREFIX)/bin diff --git a/sogrep.in b/sogrep similarity index 100% rename from sogrep.in rename to sogrep -- 2.21.0

1 2

[arch-projects] [devtools] [PATCH] makechrootpkg: keep *DEST, MAKEFLAGS & PACKAGER
by anthraxx＠archlinux.org 23 Mar '19

23 Mar '19

From: Matt Robinson <git(a)nerdoftheherd.com> If makechrootpkg is called as non-root, the {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER environment variables are lost in the call to check_root(). Add these to the passed keepenv list so that they are preserved instead. --- makechrootpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 4b72a36..dc647b3 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -341,7 +341,7 @@ main() { [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.' makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}} - check_root SOURCE_DATE_EPOCH,GNUPGHOME + check_root SOURCE_DATE_EPOCH,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$passeddir") -- 2.21.0

1 0