Date: Friday, April 19, 2019 @ 17:50:07 Author: mtorromeo Revision: 452036
Moved python2-meld3 to python-meld3 for the upgrade of supervisor Added: python-meld3/ Modified: python-meld3/trunk/PKGBUILD supervisor/trunk/PKGBUILD supervisor/trunk/supervisord.conf Deleted: python2-meld3/ -----------------------------------+ supervisor/trunk/PKGBUILD | 18 +---- supervisor/trunk/supervisord.conf | 129 ++++++++++++++++++++---------------- trunk/PKGBUILD | 14 +-- 3 files changed, 88 insertions(+), 73 deletions(-) Modified: python-meld3/trunk/PKGBUILD =================================================================== --- python2-meld3/trunk/PKGBUILD 2019-04-19 17:24:44 UTC (rev 452035) +++ python-meld3/trunk/PKGBUILD 2019-04-19 17:50:07 UTC (rev 452036) @@ -1,26 +1,26 @@ # Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> # Contributor: Daniele Paolella <d...@mcrservice.it> -pkgname=python2-meld3 +pkgname=python-meld3 _libname=meld3 pkgver=1.0.2 -pkgrel=2 +pkgrel=1 pkgdesc="An HTML/XML templating engine" arch=('any') url="https://github.com/supervisor/meld3" license=('Repoze') -depends=('python2') -makedepends=('python2-setuptools') +depends=('python') +makedepends=('python-setuptools') source=(https://files.pythonhosted.org/packages/source/${_libname:0:1}/$_libname/$_libname-$pkgver.tar.gz) sha256sums=('f7b754a0fde7a4429b2ebe49409db240b5699385a572501bb0d5627d299f9558') build() { cd "$srcdir"/meld3-$pkgver - python2 setup.py build + python setup.py build } package() { cd "$srcdir"/meld3-$pkgver - python2 setup.py install -O1 --skip-build --prefix=/usr --root="$pkgdir" - install -m0644 -D LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt + python setup.py install -O1 --skip-build --prefix=/usr --root="$pkgdir" + install -m0644 -D LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } Modified: supervisor/trunk/PKGBUILD =================================================================== --- supervisor/trunk/PKGBUILD 2019-04-19 17:24:44 UTC (rev 452035) +++ supervisor/trunk/PKGBUILD 2019-04-19 17:50:07 UTC (rev 452036) @@ -2,37 +2,31 @@ # Contributor: Daniele Paolella <d...@mcrservice.it> pkgname=supervisor -pkgver=3.3.5 +pkgver=4.0.2 pkgrel=1 pkgdesc="A system for controlling process state under UNIX" arch=('any') url="http://supervisord.org" license=('custom') -depends=('python2-meld3' 'python2-setuptools') +depends=('python-meld3' 'python-setuptools') backup=('etc/supervisord.conf') source=("https://files.pythonhosted.org/packages/source/s/$pkgname/$pkgname-$pkgver.tar.gz" 'supervisord.service' 'supervisor.logrotate' 'supervisord.conf') -sha256sums=('1b4d6d2e551dcb49e928cfffea857b8cca6b64a4a8fb755dcf86addf62866af0' +sha256sums=('5604457da4fb89d850e78c128205fe4938c9277f87301885b33c94c60361e575' '111f632081633dafae18ff069001e9ea78e9a24669ed75efc196f8d83d92f993' '7347d79c8b7f5cc59d5ffa31e4df64f92e89dee0dc84bdb3bdfcba212de93f4b' - 'fe0a60e34f67bf6ed7ca8731d9ce7657e00f37a43e0dfb96aa0df57adc4cd423') + 'ea2d6d2806b879e6c223e192d770ceb391c0c32e5970234e72fc6111536db526') -prepare() { - cd "$srcdir/$pkgname-$pkgver" - rm -rf "supervisor/medusa/"{debian,demo,docs,test} - find -type f -name "*.py" -exec sed -i 's|/usr/bin/env python|/usr/bin/env python2|' {} \; -} - build() { cd "$srcdir/$pkgname-$pkgver" - python2 setup.py build + python setup.py build } package() { cd "$srcdir/$pkgname-$pkgver" - python2 setup.py install -O1 --skip-build --prefix=/usr --root="$pkgdir" + python setup.py install -O1 --skip-build --prefix=/usr --root="$pkgdir" install -Dm600 "$srcdir/supervisord.conf" "$pkgdir/etc/supervisord.conf" install -Dm644 "$srcdir/supervisor.logrotate" "$pkgdir/etc/logrotate.d/supervisor" install -Dm644 "$srcdir/supervisord.service" "$pkgdir/usr/lib/systemd/system/supervisord.service" Modified: supervisor/trunk/supervisord.conf =================================================================== --- supervisor/trunk/supervisord.conf 2019-04-19 17:24:44 UTC (rev 452035) +++ supervisor/trunk/supervisord.conf 2019-04-19 17:50:07 UTC (rev 452036) @@ -1,51 +1,68 @@ ; Sample supervisor config file. +; +; For more information on the config file, please see: +; http://supervisord.org/configuration.html +; +; Notes: +; - Shell expansion ("~" or "$HOME") is not supported. Environment +; variables can be expanded using this syntax: "%(ENV_HOME)s". +; - Quotes around values are not supported, except in the case of +; the environment= options as shown below. +; - Comments must have a leading space: "a=b ;comment" not "a=b;comment". +; - Command will be truncated if it looks like a config file comment, e.g. +; "command=bash -c 'foo ; bar'" will truncate to "command=bash -c 'foo ". [unix_http_server] -file=/run/supervisor.sock ; (the path to the socket file) -;chmod=0700 ; socked file mode (default 0700) +file=/run/supervisor.sock ; the path to the socket file +;chmod=0700 ; socket file mode (default 0700) ;chown=nobody:nogroup ; socket file uid:gid owner -;username=user ; (default is no username (open server)) -;password=123 ; (default is no password (open server)) +;username=user ; default is no username (open server) +;password=123 ; default is no password (open server) [inet_http_server] ; inet (TCP) server disabled by default -port=127.0.0.1:9001 ; (ip_address:port specifier, *:port for all iface) -;username=user ; (default is no username (open server)) -;password=123 ; (default is no password (open server)) +port=127.0.0.1:9001 ; ip_address:port specifier, *:port for all iface +;username=user ; default is no username (open server) +;password=123 ; default is no password (open server) [supervisord] -logfile=/var/log/supervisord.log ; (main log file;default $CWD/supervisord.log) -;logfile_maxbytes=50MB ; (max main logfile bytes b4 rotation;default 50MB) -;logfile_backups=10 ; (num of main logfile rotation backups;default 10) -loglevel=info ; (log level;default info; others: debug,warn,trace) -pidfile=/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid) -nodaemon=false ; (start in foreground if true;default false) -;minfds=1024 ; (min. avail startup file descriptors;default 1024) -;minprocs=200 ; (min. avail process descriptors;default 200) -;umask=022 ; (process file creation umask;default 022) -;user=chrism ; (default is current user, required if root) -;identifier=supervisor ; (supervisord identifier, default is 'supervisor') -;directory=/tmp ; (default is not to cd during start) -;nocleanup=true ; (don't clean up tempfiles at start;default false) -childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP) -;environment=KEY=value ; (key value pairs to add to environment) -;strip_ansi=false ; (strip ansi escape codes in logs; def. false) +logfile=/var/log/supervisord.log ; main log file; default $CWD/supervisord.log +logfile_maxbytes=50MB ; max main logfile bytes b4 rotation; default 50MB +logfile_backups=10 ; # of main logfile backups; 0 means none, default 10 +loglevel=info ; log level; default info; others: debug,warn,trace +pidfile=/run/supervisord.pid ; supervisord pidfile; default supervisord.pid +nodaemon=false ; start in foreground if true; default false +minfds=1024 ; min. avail startup file descriptors; default 1024 +minprocs=200 ; min. avail process descriptors;default 200 +;umask=022 ; process file creation umask; default 022 +;user=supervisord ; setuid to this UNIX account at startup; recommended if root +;identifier=supervisor ; supervisord identifier, default is 'supervisor' +;directory=/tmp ; default is not to cd during start +;nocleanup=true ; don't clean up tempfiles at start; default false +childlogdir=/var/log/supervisor ; 'AUTO' child log dir, default $TEMP +;environment=KEY="value" ; key value pairs to add to environment +;strip_ansi=false ; strip ansi escape codes in logs; def. false -; the below section must remain in the config file for RPC -; (supervisorctl/web interface) to work, additional interfaces may be -; added by defining them in separate rpcinterface: sections +; The rpcinterface:supervisor section must remain in the config file for +; RPC (supervisorctl/web interface) to work. Additional interfaces may be +; added by defining them in separate [rpcinterface:x] sections. + [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface +; The supervisorctl section configures how supervisorctl will connect to +; supervisord. configure it match the settings in either the unix_http_server +; or inet_http_server section. + [supervisorctl] serverurl=unix:///run/supervisor.sock ; use a unix:// URL for a unix socket ;serverurl=http://127.0.0.1:9001 ; use an http:// url to specify an inet socket -;username=chris ; should be same as http_username if set -;password=123 ; should be same as http_password if set +;username=chris ; should be same as in [*_http_server] if set +;password=123 ; should be same as in [*_http_server] if set ;prompt=mysupervisor ; cmd line prompt (default "supervisor") ;history_file=~/.sc_history ; use readline history if available -; The below sample program section shows all possible program subsection values, -; create one or more 'real' program: sections to be able to control them under +; The sample program section below shows all possible program subsection values. +; Create one or more 'real' program: sections to be able to control them under ; supervisor. ;[program:theprogramname] @@ -56,32 +73,34 @@ ;umask=022 ; umask for process (default None) ;priority=999 ; the relative start priority (default 999) ;autostart=true ; start at supervisord start (default: true) -;autorestart=unexpected ; whether/when to restart (default: unexpected) -;startsecs=1 ; number of secs prog must stay running (def. 1) -;startretries=3 ; max # of serial start failures (default 3) -;exitcodes=0,2 ; 'expected' exit codes for process (default 0,2) +;startsecs=1 ; # of secs prog must stay up to be running (def. 1) +;startretries=3 ; max # of serial start failures when starting (default 3) +;autorestart=unexpected ; when to restart if exited after running (def: unexpected) +;exitcodes=0 ; 'expected' exit codes used with autorestart (default 0) ;stopsignal=QUIT ; signal used to kill process (default TERM) ;stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10) +;stopasgroup=false ; send stop signal to the UNIX process group (default false) ;killasgroup=false ; SIGKILL the UNIX process group (def false) ;user=chrism ; setuid to this UNIX account to run the program ;redirect_stderr=true ; redirect proc stderr to stdout (default false) ;stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO ;stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -;stdout_logfile_backups=10 ; # of stdout logfile backups (default 10) +;stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10) ;stdout_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) ;stdout_events_enabled=false ; emit events on stdout writes (default false) +;stdout_syslog=false ; send stdout to syslog with process name (default false) ;stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO ;stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -;stderr_logfile_backups=10 ; # of stderr logfile backups (default 10) +;stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none, default 10) ;stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) ;stderr_events_enabled=false ; emit events on stderr writes (default false) -;environment=A=1,B=2 ; process environment additions (def no adds) +;stderr_syslog=false ; send stderr to syslog with process name (default false) +;environment=A="1",B="2" ; process environment additions (def no adds) ;serverurl=AUTO ; override serverurl computation (childutils) -; The below sample eventlistener section shows all possible -; eventlistener subsection values, create one or more 'real' -; eventlistener: sections to be able to handle event notifications -; sent by supervisor. +; The sample eventlistener section below shows all possible eventlistener +; subsection values. Create one or more 'real' eventlistener: sections to be +; able to handle event notifications sent by supervisord. ;[eventlistener:theeventlistenername] ;command=/bin/eventlistener ; the program (relative uses PATH, can take args) @@ -93,29 +112,31 @@ ;umask=022 ; umask for process (default None) ;priority=-1 ; the relative start priority (default -1) ;autostart=true ; start at supervisord start (default: true) -;autorestart=unexpected ; whether/when to restart (default: unexpected) -;startsecs=1 ; number of secs prog must stay running (def. 1) -;startretries=3 ; max # of serial start failures (default 3) -;exitcodes=0,2 ; 'expected' exit codes for process (default 0,2) +;startsecs=1 ; # of secs prog must stay up to be running (def. 1) +;startretries=3 ; max # of serial start failures when starting (default 3) +;autorestart=unexpected ; autorestart if exited after running (def: unexpected) +;exitcodes=0 ; 'expected' exit codes used with autorestart (default 0) ;stopsignal=QUIT ; signal used to kill process (default TERM) ;stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10) +;stopasgroup=false ; send stop signal to the UNIX process group (default false) ;killasgroup=false ; SIGKILL the UNIX process group (def false) ;user=chrism ; setuid to this UNIX account to run the program -;redirect_stderr=true ; redirect proc stderr to stdout (default false) +;redirect_stderr=false ; redirect_stderr=true is not allowed for eventlisteners ;stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO ;stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -;stdout_logfile_backups=10 ; # of stdout logfile backups (default 10) +;stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10) ;stdout_events_enabled=false ; emit events on stdout writes (default false) +;stdout_syslog=false ; send stdout to syslog with process name (default false) ;stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO ;stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -;stderr_logfile_backups ; # of stderr logfile backups (default 10) +;stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none, default 10) ;stderr_events_enabled=false ; emit events on stderr writes (default false) -;environment=A=1,B=2 ; process environment additions +;stderr_syslog=false ; send stderr to syslog with process name (default false) +;environment=A="1",B="2" ; process environment additions ;serverurl=AUTO ; override serverurl computation (childutils) -; The below sample group section shows all possible group values, -; create one or more 'real' group: sections to create "heterogeneous" -; process groups. +; The sample group section below shows all possible group values. Create one +; or more 'real' group: sections to create "heterogeneous" process groups. ;[group:thegroupname] ;programs=progname1,progname2 ; each refers to 'x' in [program:x] definitions @@ -127,5 +148,5 @@ ; interpreted as relative to this file. Included files *cannot* ; include files themselves. -[include] -files = /etc/supervisor.d/*.ini +;[include] +;files = relative/directory/*.ini