From d21c3fdf9f3e4e9952b258a59c35bf20022ef8cb Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Sat, 22 Jul 2023 05:28:57 +0300 Subject: [PATCH] Release 2.10.0 --- docs/ahriman.1 | 19 ++++++++++--------- docs/completions/bash/_ahriman | 24 ++++++++++++++++-------- docs/completions/zsh/_ahriman | 6 +++++- package/archlinux/PKGBUILD | 2 +- src/ahriman/version.py | 2 +- 5 files changed, 33 insertions(+), 20 deletions(-) diff --git a/docs/ahriman.1 b/docs/ahriman.1 index bc575cbc..ced9bb1a 100644 --- a/docs/ahriman.1 +++ b/docs/ahriman.1 @@ -1,4 +1,4 @@ -.TH AHRIMAN "1" "2023\-06\-03" "ahriman" "Generated Python Manual" +.TH AHRIMAN "1" "2023\-07\-22" "ahriman" "Generated Python Manual" .SH NAME ahriman .SH SYNOPSIS @@ -669,9 +669,10 @@ key server for key import .SH COMMAND \fI\,'ahriman service\-setup'\/\fR usage: ahriman service\-setup [\-h] [\-\-build\-as\-user BUILD_AS_USER] [\-\-build\-command BUILD_COMMAND] - [\-\-from\-configuration FROM_CONFIGURATION] [\-\-makeflags\-jobs | \-\-no\-makeflags\-jobs] - [\-\-mirror MIRROR] [\-\-multilib | \-\-no\-multilib] \-\-packager PACKAGER \-\-repository REPOSITORY - [\-\-sign\-key SIGN_KEY] [\-\-sign\-target {disabled,packages,repository}] [\-\-web\-port WEB_PORT] + [\-\-from\-configuration FROM_CONFIGURATION] [\-\-generate\-salt | \-\-no\-generate\-salt] + [\-\-makeflags\-jobs | \-\-no\-makeflags\-jobs] [\-\-mirror MIRROR] [\-\-multilib | \-\-no\-multilib] + \-\-packager PACKAGER \-\-repository REPOSITORY [\-\-sign\-key SIGN_KEY] + [\-\-sign\-target {disabled,packages,repository}] [\-\-web\-port WEB_PORT] [\-\-web\-unix\-socket WEB_UNIX_SOCKET] create initial service configuration, requires root @@ -689,6 +690,10 @@ build command prefix \fB\-\-from\-configuration\fR \fI\,FROM_CONFIGURATION\/\fR path to default devtools pacman configuration +.TP +\fB\-\-generate\-salt\fR, \fB\-\-no\-generate\-salt\fR +generate salt for user passwords + .TP \fB\-\-makeflags\-jobs\fR, \fB\-\-no\-makeflags\-jobs\fR append MAKEFLAGS variable with parallelism set to number of cores @@ -735,7 +740,7 @@ drop into python shell while having created application instead of dropping into shell, just execute the specified code .SH COMMAND \fI\,'ahriman user\-add'\/\fR -usage: ahriman user\-add [\-h] [\-\-key KEY] [\-\-packager PACKAGER] [\-p PASSWORD] [\-r {unauthorized,read,reporter,full}] [\-s] +usage: ahriman user\-add [\-h] [\-\-key KEY] [\-\-packager PACKAGER] [\-p PASSWORD] [\-r {unauthorized,read,reporter,full}] username update user for web services with the given password and role. In case if password was not entered it will be asked interactively @@ -762,10 +767,6 @@ authorization type. \fB\-r\fR \fI\,{unauthorized,read,reporter,full}\/\fR, \fB\-\-role\fR \fI\,{unauthorized,read,reporter,full}\/\fR user access level -.TP -\fB\-s\fR, \fB\-\-secure\fR -set file permissions to user\-only - .SH COMMAND \fI\,'ahriman user\-list'\/\fR usage: ahriman user\-list [\-h] [\-e] [\-r {unauthorized,read,reporter,full}] [username] diff --git a/docs/completions/bash/_ahriman b/docs/completions/bash/_ahriman index 219ead01..43d892d5 100644 --- a/docs/completions/bash/_ahriman +++ b/docs/completions/bash/_ahriman @@ -58,14 +58,14 @@ _shtab_ahriman_config_validate_option_strings=('-h' '--help' '-e' '--exit-code') _shtab_ahriman_repo_config_validate_option_strings=('-h' '--help' '-e' '--exit-code') _shtab_ahriman_service_key_import_option_strings=('-h' '--help' '--key-server') _shtab_ahriman_key_import_option_strings=('-h' '--help' '--key-server') -_shtab_ahriman_service_setup_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket') -_shtab_ahriman_init_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket') -_shtab_ahriman_repo_init_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket') -_shtab_ahriman_repo_setup_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket') -_shtab_ahriman_setup_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket') +_shtab_ahriman_service_setup_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket') +_shtab_ahriman_init_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket') +_shtab_ahriman_repo_init_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket') +_shtab_ahriman_repo_setup_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket') +_shtab_ahriman_setup_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket') _shtab_ahriman_service_shell_option_strings=('-h' '--help') _shtab_ahriman_shell_option_strings=('-h' '--help') -_shtab_ahriman_user_add_option_strings=('-h' '--help' '--key' '--packager' '-p' '--password' '-r' '--role' '-s' '--secure') +_shtab_ahriman_user_add_option_strings=('-h' '--help' '--key' '--packager' '-p' '--password' '-r' '--role') _shtab_ahriman_user_list_option_strings=('-h' '--help' '-e' '--exit-code' '-r' '--role') _shtab_ahriman_user_remove_option_strings=('-h' '--help') _shtab_ahriman_web_option_strings=('-h' '--help') @@ -413,30 +413,40 @@ _shtab_ahriman_key_import__h_nargs=0 _shtab_ahriman_key_import___help_nargs=0 _shtab_ahriman_service_setup__h_nargs=0 _shtab_ahriman_service_setup___help_nargs=0 +_shtab_ahriman_service_setup___generate_salt_nargs=0 +_shtab_ahriman_service_setup___no_generate_salt_nargs=0 _shtab_ahriman_service_setup___makeflags_jobs_nargs=0 _shtab_ahriman_service_setup___no_makeflags_jobs_nargs=0 _shtab_ahriman_service_setup___multilib_nargs=0 _shtab_ahriman_service_setup___no_multilib_nargs=0 _shtab_ahriman_init__h_nargs=0 _shtab_ahriman_init___help_nargs=0 +_shtab_ahriman_init___generate_salt_nargs=0 +_shtab_ahriman_init___no_generate_salt_nargs=0 _shtab_ahriman_init___makeflags_jobs_nargs=0 _shtab_ahriman_init___no_makeflags_jobs_nargs=0 _shtab_ahriman_init___multilib_nargs=0 _shtab_ahriman_init___no_multilib_nargs=0 _shtab_ahriman_repo_init__h_nargs=0 _shtab_ahriman_repo_init___help_nargs=0 +_shtab_ahriman_repo_init___generate_salt_nargs=0 +_shtab_ahriman_repo_init___no_generate_salt_nargs=0 _shtab_ahriman_repo_init___makeflags_jobs_nargs=0 _shtab_ahriman_repo_init___no_makeflags_jobs_nargs=0 _shtab_ahriman_repo_init___multilib_nargs=0 _shtab_ahriman_repo_init___no_multilib_nargs=0 _shtab_ahriman_repo_setup__h_nargs=0 _shtab_ahriman_repo_setup___help_nargs=0 +_shtab_ahriman_repo_setup___generate_salt_nargs=0 +_shtab_ahriman_repo_setup___no_generate_salt_nargs=0 _shtab_ahriman_repo_setup___makeflags_jobs_nargs=0 _shtab_ahriman_repo_setup___no_makeflags_jobs_nargs=0 _shtab_ahriman_repo_setup___multilib_nargs=0 _shtab_ahriman_repo_setup___no_multilib_nargs=0 _shtab_ahriman_setup__h_nargs=0 _shtab_ahriman_setup___help_nargs=0 +_shtab_ahriman_setup___generate_salt_nargs=0 +_shtab_ahriman_setup___no_generate_salt_nargs=0 _shtab_ahriman_setup___makeflags_jobs_nargs=0 _shtab_ahriman_setup___no_makeflags_jobs_nargs=0 _shtab_ahriman_setup___multilib_nargs=0 @@ -451,8 +461,6 @@ _shtab_ahriman_shell__v_nargs=0 _shtab_ahriman_shell___verbose_nargs=0 _shtab_ahriman_user_add__h_nargs=0 _shtab_ahriman_user_add___help_nargs=0 -_shtab_ahriman_user_add__s_nargs=0 -_shtab_ahriman_user_add___secure_nargs=0 _shtab_ahriman_user_list__h_nargs=0 _shtab_ahriman_user_list___help_nargs=0 _shtab_ahriman_user_list__e_nargs=0 diff --git a/docs/completions/zsh/_ahriman b/docs/completions/zsh/_ahriman index d6d37331..36e4c349 100644 --- a/docs/completions/zsh/_ahriman +++ b/docs/completions/zsh/_ahriman @@ -169,6 +169,7 @@ _shtab_ahriman_init_options=( "--build-as-user[force makepkg user to the specific one]:build_as_user:" "--build-command[build command prefix]:build_command:" "--from-configuration[path to default devtools pacman configuration]:from_configuration:" + {--generate-salt,--no-generate-salt}"[generate salt for user passwords]:generate_salt:" {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores]:makeflags_jobs:" "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:" {--multilib,--no-multilib}"[add or do not multilib repository]:multilib:" @@ -335,6 +336,7 @@ _shtab_ahriman_repo_init_options=( "--build-as-user[force makepkg user to the specific one]:build_as_user:" "--build-command[build command prefix]:build_command:" "--from-configuration[path to default devtools pacman configuration]:from_configuration:" + {--generate-salt,--no-generate-salt}"[generate salt for user passwords]:generate_salt:" {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores]:makeflags_jobs:" "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:" {--multilib,--no-multilib}"[add or do not multilib repository]:multilib:" @@ -376,6 +378,7 @@ _shtab_ahriman_repo_setup_options=( "--build-as-user[force makepkg user to the specific one]:build_as_user:" "--build-command[build command prefix]:build_command:" "--from-configuration[path to default devtools pacman configuration]:from_configuration:" + {--generate-salt,--no-generate-salt}"[generate salt for user passwords]:generate_salt:" {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores]:makeflags_jobs:" "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:" {--multilib,--no-multilib}"[add or do not multilib repository]:multilib:" @@ -466,6 +469,7 @@ _shtab_ahriman_service_setup_options=( "--build-as-user[force makepkg user to the specific one]:build_as_user:" "--build-command[build command prefix]:build_command:" "--from-configuration[path to default devtools pacman configuration]:from_configuration:" + {--generate-salt,--no-generate-salt}"[generate salt for user passwords]:generate_salt:" {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores]:makeflags_jobs:" "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:" {--multilib,--no-multilib}"[add or do not multilib repository]:multilib:" @@ -487,6 +491,7 @@ _shtab_ahriman_setup_options=( "--build-as-user[force makepkg user to the specific one]:build_as_user:" "--build-command[build command prefix]:build_command:" "--from-configuration[path to default devtools pacman configuration]:from_configuration:" + {--generate-salt,--no-generate-salt}"[generate salt for user passwords]:generate_salt:" {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores]:makeflags_jobs:" "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:" {--multilib,--no-multilib}"[add or do not multilib repository]:multilib:" @@ -547,7 +552,6 @@ _shtab_ahriman_user_add_options=( "--packager[optional packager id used for build process in form of \`Name Surname \\`]:packager:" {-p,--password}"[user password. Blank password will be treated as empty password, which is in particular must be used for OAuth2 authorization type.]:password:" {-r,--role}"[user access level]:role:(unauthorized read reporter full)" - {-s,--secure}"[set file permissions to user-only]" ":username for web service:" ) diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index da4b539b..c198e401 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Evgeniy Alekseev pkgname='ahriman' -pkgver=2.9.0 +pkgver=2.10.0 pkgrel=1 pkgdesc="ArcH linux ReposItory MANager" arch=('any') diff --git a/src/ahriman/version.py b/src/ahriman/version.py index 8610b3f0..aa3dea74 100644 --- a/src/ahriman/version.py +++ b/src/ahriman/version.py @@ -17,4 +17,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -__version__ = "2.9.0" +__version__ = "2.10.0"