update to tentakel-3.1.3
This commit is contained in:
sthen
parent
c68f029d50
commit
cb6d2eaa68
|
|
@ -1,32 +1,30 @@
|
|||
COMMENT= distributed command execution
|
||||
|
||||
DISTNAME= tentakel-357
|
||||
REVISION = 5
|
||||
CATEGORIES= sysutils
|
||||
HOMEPAGE= http://tentakel.biskalar.de/
|
||||
MODPY_EGG_VERSION = 3.1.3
|
||||
# this _might_ be the actual release, not entirely sure, if not then
|
||||
# it's fairly close. pypi distfiles don't include the manual/sample conf.
|
||||
# use a pre tag in the version just in case.
|
||||
GH_ACCOUNT= sfermigier
|
||||
GH_PROJECT= tentakel
|
||||
GH_COMMIT= 5d7662a00dfd6bf61b0773b596bbf255a9cbafe3
|
||||
|
||||
MODPY_EGG_VERSION = 2.2.1
|
||||
DISTNAME= tentakel-${MODPY_EGG_VERSION}pre20220719
|
||||
CATEGORIES= sysutils
|
||||
|
||||
HOMEPAGE= https://github.com/sfermigier/tentakel
|
||||
|
||||
EPOCH= 0
|
||||
|
||||
# BSD + LGPL
|
||||
PERMIT_PACKAGE= Yes
|
||||
|
||||
MASTER_SITES= https://spacehopper.org/mirrors/
|
||||
|
||||
MODULES= lang/python
|
||||
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
|
||||
|
||||
WRKSRC= ${WRKDIST}/py
|
||||
|
||||
TEST_IS_INTERACTIVE= yes
|
||||
|
||||
do-configure:
|
||||
@perl -pi -e 's,/etc,${SYSCONFDIR},g' \
|
||||
${WRKDIST}/tentakel.1 \
|
||||
${WRKDIST}/py/tentakel
|
||||
|
||||
do-test:
|
||||
@cd ${WRKSRC}/lekatnet && ${MODPY_BIN} ./config.py
|
||||
@cd ${WRKSRC}/lekatnet && ${MODPY_BIN} ./remote.py
|
||||
MODPY_PYBUILD= poetry-core
|
||||
|
||||
post-install:
|
||||
${INSTALL_MAN} ${WRKSRC}/doc/tentakel.1 ${PREFIX}/man/man1
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tentakel
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/tentakel.conf.example \
|
||||
${PREFIX}/share/examples/tentakel
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (tentakel-357.tar.gz) = Qv+PWVc+7jp4IelBaCKwqUqmmFRN+inQqwuq6Cl7Yh8=
|
||||
SIZE (tentakel-357.tar.gz) = 51794
|
||||
SHA256 (tentakel-3.1.3pre20220719-5d7662a0.tar.gz) = kRBsXqKSEOhdQfyX6XBDD7U/RNAYVUfGQlRYPZmpirw=
|
||||
SIZE (tentakel-3.1.3pre20220719-5d7662a0.tar.gz) = 55417
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
--- py/lekatnet/config.py.orig Wed Oct 20 13:06:10 2010
|
||||
+++ py/lekatnet/config.py Wed Oct 20 13:08:06 2010
|
||||
@@ -52,7 +52,7 @@ import pwd
|
||||
import tempfile
|
||||
import sys
|
||||
import tpg
|
||||
-import popen2
|
||||
+from subprocess import Popen, PIPE
|
||||
|
||||
PARAMS = { 'ssh_path': "/usr/bin/ssh",
|
||||
'rsh_path': "/usr/bin/rsh",
|
||||
@@ -265,10 +265,9 @@ class ConfigBase(dict):
|
||||
for dhost in dhosts:
|
||||
if not os.path.isabs(dhost):
|
||||
dhost = os.path.join(_user_dir, dhost)
|
||||
- p = popen2.Popen3(dhost, capturestderr=True)
|
||||
- p.tochild.close()
|
||||
- err = p.childerr.read()
|
||||
- out = p.fromchild.read()
|
||||
+ p = Popen(dhost, stderr=PIPE, stdin=PIPE, stdout=PIPE, close_fds=True, shell=True)
|
||||
+ err = p.stderr.read()
|
||||
+ out = p.stdout.read()
|
||||
status = p.wait() >> 8
|
||||
if err:
|
||||
for line in err.split('\n'):
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
--- py/lekatnet/plugins/rsh.py.orig Wed Oct 20 13:15:33 2010
|
||||
+++ py/lekatnet/plugins/rsh.py Wed Oct 20 13:18:22 2010
|
||||
@@ -26,7 +26,11 @@ from lekatnet.remote import registerRemoteCommandPlugi
|
||||
from lekatnet.remote import RemoteCommand
|
||||
import time
|
||||
import random
|
||||
-import md5
|
||||
+
|
||||
+try:
|
||||
+ from hashlib import md5
|
||||
+except ImportError:
|
||||
+ from md5 import new as md5
|
||||
|
||||
class RSHRemoteCommand(RemoteCommand):
|
||||
"RSH remote execution class"
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
--- py/lekatnet/remote.py.orig Wed Oct 20 13:08:11 2010
|
||||
+++ py/lekatnet/remote.py Wed Oct 20 13:09:47 2010
|
||||
@@ -45,7 +45,7 @@ import tpg
|
||||
import time
|
||||
import os
|
||||
import config
|
||||
-from popen2 import Popen3
|
||||
+from subprocess import Popen, PIPE
|
||||
|
||||
|
||||
class FormatString(tpg.Parser):
|
||||
@@ -138,13 +138,10 @@ class RemoteCommand(threading.Thread):
|
||||
#
|
||||
def getstatusoutput(self, cmd):
|
||||
"""Return (status, output) of executing cmd in a shell."""
|
||||
- p = Popen3(cmd, capturestderr=True)
|
||||
- p.tochild.write(self.stdin)
|
||||
- p.tochild.close()
|
||||
- err = p.childerr.read()
|
||||
- p.childerr.close()
|
||||
- text = p.fromchild.read()
|
||||
- p.fromchild.close()
|
||||
+ p = Popen(cmd, stderr=PIPE, stdin=PIPE, stdout=PIPE, close_fds=True, shell=True)
|
||||
+ p.stdin.write(self.stdin)
|
||||
+ err = p.stderr.read()
|
||||
+ text = p.stdout.read()
|
||||
sts = p.wait()
|
||||
if sts is None: sts = 0
|
||||
if text[-1:] == '\n': text = text[:-1]
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
--- py/setup.py.orig Sun Feb 8 12:23:08 2009
|
||||
+++ py/setup.py Sun Feb 8 12:24:10 2009
|
||||
@@ -16,9 +16,8 @@ setup(
|
||||
packages = ["lekatnet", "lekatnet.plugins"],
|
||||
scripts = ["tentakel"],
|
||||
data_files = [ ("man/man1", ["../tentakel.1"]),
|
||||
- ("share/doc/tentakel", ["../tentakel.conf.example",
|
||||
- "../README",
|
||||
+ ("share/examples/tentakel", ["../tentakel.conf.example"]),
|
||||
+ ("share/doc/tentakel", ["../README",
|
||||
"../TODO",
|
||||
- "../PLUGINS",
|
||||
- "../tentakel.1.html"]) ]
|
||||
+ "../PLUGINS"]) ]
|
||||
)
|
||||
|
|
@ -1,30 +1,44 @@
|
|||
bin/tentakel
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/__init__.py
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/__init__.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/config.py
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/config.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/error.py
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/error.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/plugins/
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/plugins/__init__.py
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/plugins/__init__.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/plugins/rsh.py
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/plugins/rsh.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/plugins/ssh.py
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/plugins/ssh.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/remote.py
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/remote.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/shell.py
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/shell.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/tpg.py
|
||||
lib/python${MODPY_VERSION}/site-packages/lekatnet/tpg.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel-${MODPY_EGG_VERSION}.dist-info/
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel-${MODPY_EGG_VERSION}.dist-info/METADATA
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel-${MODPY_EGG_VERSION}.dist-info/RECORD
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel-${MODPY_EGG_VERSION}.dist-info/WHEEL
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/__init__.py
|
||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}/
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}remote.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}remote.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}shell.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}shell.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}tpg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/${MODPY_PYCACHE}tpg.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/config.py
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/error.py
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/main.py
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/plugins/
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/plugins/__init__.py
|
||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tentakel/plugins/${MODPY_PYCACHE}/
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/plugins/${MODPY_PYCACHE}rsh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/plugins/${MODPY_PYCACHE}rsh.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/plugins/${MODPY_PYCACHE}ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/plugins/${MODPY_PYCACHE}ssh.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/plugins/rsh.py
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/plugins/ssh.py
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/remote.py
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/shell.py
|
||||
lib/python${MODPY_VERSION}/site-packages/tentakel/tpg.py
|
||||
@man man/man1/tentakel.1
|
||||
share/doc/tentakel/
|
||||
share/doc/tentakel/PLUGINS
|
||||
share/doc/tentakel/README
|
||||
share/doc/tentakel/TODO
|
||||
share/examples/tentakel/
|
||||
share/examples/tentakel/tentakel.conf.example
|
||||
@sample ${SYSCONFDIR}/tentakel.conf
|
||||
|
|
|
|||
Loading…
Reference in New Issue