[qpid-proton] branch main updated: PROTON-2544: temporary warning-as-error disable for DH_xxx calls in openssl related code
This is an automated email from the ASF dual-hosted git repository.
cliffjansen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/main by this push:
new 5aaa655cb PROTON-2544: temporary warning-as-error disable for DH_xxx
calls in openssl related code
5aaa655cb is described below
commit 5aaa655cb1023e9fb48e59f64e3d0c1307ea54f2
Author: Clifford Jansen
AuthorDate: Wed Jun 1 18:28:03 2022 -0700
PROTON-2544: temporary warning-as-error disable for DH_xxx calls in openssl
related code
---
c/src/ssl/openssl.c | 7 +++
c/src/tls/openssl.c | 7 +++
2 files changed, 14 insertions(+)
diff --git a/c/src/ssl/openssl.c b/c/src/ssl/openssl.c
index 2681d2d63..145f60e0b 100644
--- a/c/src/ssl/openssl.c
+++ b/c/src/ssl/openssl.c
@@ -371,6 +371,10 @@ static int verify_callback(int preverify_ok,
X509_STORE_CTX *ctx)
return preverify_ok;
}
+// Temporary: PROTON-2544 for build. Next release: replace or remove DH_xxx()
functions.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
// This was introduced in v1.1
#if OPENSSL_VERSION_NUMBER < 0x1010
int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
@@ -570,6 +574,9 @@ static bool pni_init_ssl_domain( pn_ssl_domain_t * domain,
pn_ssl_mode_t mode )
return true;
}
+// PROTON-2544: see earlier related push. Temporary only.
+#pragma GCC diagnostic pop
+
pn_ssl_domain_t *pn_ssl_domain( pn_ssl_mode_t mode )
{
pn_ssl_domain_t *domain = (pn_ssl_domain_t *) calloc(1,
sizeof(pn_ssl_domain_t));
diff --git a/c/src/tls/openssl.c b/c/src/tls/openssl.c
index d26836c0d..de07aca62 100644
--- a/c/src/tls/openssl.c
+++ b/c/src/tls/openssl.c
@@ -692,6 +692,10 @@ static int verify_callback(int preverify_ok,
X509_STORE_CTX *ctx)
return preverify_ok;
}
+// Temporary: PROTON-2544 for build. Next release: replace or remove DH_xxx()
functions.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
// This was introduced in v1.1
#if OPENSSL_VERSION_NUMBER < 0x1010
int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
@@ -868,6 +872,9 @@ static bool pni_init_ssl_domain( pn_tls_config_t * domain,
pn_tls_mode_t mode )
return true;
}
+// PROTON-2544: see earlier related push. Temporary only.
+#pragma GCC diagnostic pop
+
pn_tls_config_t *pn_tls_config( pn_tls_mode_t mode )
{
pn_tls_config_t *domain = (pn_tls_config_t *) calloc(1,
sizeof(pn_tls_config_t));
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] branch dependabot/npm_and_yarn/console/react/eventsource-1.1.1 created (now bd49b8cb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/console/react/eventsource-1.1.1 in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git at bd49b8cb Bump eventsource from 1.1.0 to 1.1.1 in /console/react No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] branch main updated (5d693210 -> bdd4fd4c)
This is an automated email from the ASF dual-hosted git repository. jdanek pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git from 5d693210 Fixes #482: replace reactor tests with proactor implementation (#488) new df74c0d9 NO-JIRA: Speed-up python-checker GHA job (#115) new bdd4fd4c Fixes #155: avoid unnecessary Tester() instance in QdManager The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/build.yaml | 88 +- tests/system_test.py | 41 tests/system_tests_autolinks.py| 18 +++ tests/system_tests_core_client.py | 2 +- tests/system_tests_edge_router.py | 12 ++--- tests/system_tests_http.py | 4 +- tests/system_tests_link_routes.py | 14 +++--- tests/system_tests_log_level_update.py | 14 +++--- tests/system_tests_one_router.py | 14 +++--- tests/system_tests_open_properties.py | 8 ++-- tests/system_tests_qdmanage.py | 2 +- tests/system_tests_sasl_plain.py | 6 +-- 12 files changed, 112 insertions(+), 111 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] 02/02: Fixes #155: avoid unnecessary Tester() instance in QdManager
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
commit bdd4fd4c0712815348c8e3619ec8cdd03ece1072
Author: Kenneth Giusti
AuthorDate: Thu Mar 10 21:33:43 2022 +0100
Fixes #155: avoid unnecessary Tester() instance in QdManager
---
tests/system_test.py | 41 +-
tests/system_tests_autolinks.py| 18 +++
tests/system_tests_core_client.py | 2 +-
tests/system_tests_edge_router.py | 12 +-
tests/system_tests_http.py | 4 ++--
tests/system_tests_link_routes.py | 14 ++--
tests/system_tests_log_level_update.py | 14 ++--
tests/system_tests_one_router.py | 14 ++--
tests/system_tests_open_properties.py | 8 +++
tests/system_tests_qdmanage.py | 2 +-
tests/system_tests_sasl_plain.py | 6 ++---
11 files changed, 67 insertions(+), 68 deletions(-)
diff --git a/tests/system_test.py b/tests/system_test.py
index f3968b56..bb01b090 100755
--- a/tests/system_test.py
+++ b/tests/system_test.py
@@ -1177,38 +1177,37 @@ class QdManager:
A means to invoke qdmanage during a testcase
"""
-def __init__(self, tester=None, address=None, timeout=TIMEOUT,
- router_id=None,
- edge_router_id=None):
+def __init__(self, address: Optional[str] = None,
+ timeout: Optional[float] = TIMEOUT,
+ router_id: Optional[str] = None,
+ edge_router_id: Optional[str] = None) -> None:
# 'tester' - can be 'self' when called in a test,
# or an instance any class derived from Process (like Qdrouterd)
-self._tester = tester or Tester(None)
self._timeout = timeout
self._address = address
self.router_id = router_id
self.edge_router_id = edge_router_id
-self.router = []
+self.router: List[str] = []
if self.router_id:
self.router = self.router + ['--router', self.router_id]
elif self.edge_router_id:
self.router = self.router + ['--edge-router', self.edge_router_id]
-def __call__(self, cmd, address=None, input=None, expect=Process.EXIT_OK,
- timeout=None):
-assert address or self._address, "address missing"
-p = self._tester.popen(
-['qdmanage'] + cmd.split(' ')
-+ self.router + ['--bus', address or self._address,
- '--indent=-1',
- '--timeout', str(timeout or self._timeout)],
-stdin=PIPE, stdout=PIPE, stderr=STDOUT, expect=expect,
-universal_newlines=True)
-out = p.communicate(input)[0]
-try:
-p.teardown()
-except Exception as e:
-raise Exception("%s\n%s" % (e, out))
-return out
+def __call__(self, cmd: str,
+ address: Optional[str] = None,
+ input: Optional[str] = None,
+ timeout: Optional[float] = None) -> str:
+addr = address or self._address
+assert addr, "address missing"
+with subprocess.Popen(['qdmanage'] + cmd.split(' ') + self.router
+ + ['--bus', addr, '--indent=-1', '--timeout',
+ str(timeout or self._timeout)], stdin=PIPE,
+ stdout=PIPE, stderr=STDOUT,
+ universal_newlines=True) as p:
+rc = p.communicate(input)
+if p.returncode != 0:
+raise Exception("%s %s" % rc)
+return rc[0]
def create(self, long_type, kwargs):
cmd = "CREATE --type=%s" % long_type
diff --git a/tests/system_tests_autolinks.py b/tests/system_tests_autolinks.py
index 33679e44..e3a2e8a8 100644
--- a/tests/system_tests_autolinks.py
+++ b/tests/system_tests_autolinks.py
@@ -124,7 +124,7 @@ class NameCollisionTest(TestCase):
al_long_type = 'org.apache.qpid.dispatch.router.config.autoLink'
addr_long_type = 'org.apache.qpid.dispatch.router.config.address'
lr_long_type = 'org.apache.qpid.dispatch.router.config.linkRoute'
-mgmt = QdManager(self, address=self.router.addresses[0])
+mgmt = QdManager(address=self.router.addresses[0])
test_pass = False
try:
mgmt.create(al_long_type, args)
@@ -137,7 +137,7 @@ class NameCollisionTest(TestCase):
args = {"name": "linkRoute", "prefix": "linkRoute",
"connection": "broker", "dir": "in"}
-mgmt = QdManager(self, address=self.router.addresses[0])
+mgmt = QdManager(address=self.router.addresses[0])
test_pass = False
try:
mgmt.create(lr_long_type, args)
@@ -148,7 +148,7 @@ class NameCollisionTest(TestCase):
args = {"name": "address", "prefix": "a
[qpid-dispatch] 01/02: NO-JIRA: Speed-up python-checker GHA job (#115)
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
commit df74c0d9cb9b17f1bf7caebbf863c748a38d1bb6
Author: Jiri Daněk
AuthorDate: Wed Mar 9 15:55:46 2022 +0100
NO-JIRA: Speed-up python-checker GHA job (#115)
Use Ubuntu directly, and install minimal necessary amount of packages.
---
.github/workflows/build.yaml | 88 ++--
1 file changed, 45 insertions(+), 43 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 36f07a95..fb602275 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -471,6 +471,51 @@ jobs:
path: |
**/core
+ python:
+name: 'Python Checker (${{ matrix.os }})'
+runs-on: '${{ matrix.os }}'
+strategy:
+ matrix:
+os: [ 'ubuntu-20.04' ]
+
+env:
+ DispatchBuildDir: ${{github.workspace}}/build
+ InstallPrefix: ${{github.workspace}}/install
+ DispatchCMakeExtraArgs: >
+-GNinja
+
+steps:
+
+ - name: Add Qpid PPA repository
+if: ${{ runner.os == 'Linux' }}
+# the `testing` ppa is less likely to be out-of-date
+run: |
+ sudo add-apt-repository ppa:qpid/testing && sudo apt-get update
+
+ - name: Install Linux build dependencies
+if: ${{ runner.os == 'Linux' }}
+run: |
+ sudo apt update; sudo apt install -y libqpid-proton-proactor1-dev
python3-qpid-proton libpython3-dev ninja-build
+
+ - name: Install python-checker test dependencies
+run: python3 -m pip install tox
+
+ - uses: actions/checkout@v2
+
+ - name: Create Build and Install directories
+run: mkdir -p "${DispatchBuildDir}" "{InstallPrefix}"
+
+ - name: qpid-dispatch cmake configure
+working-directory: ${{env.DispatchBuildDir}}
+run: >
+ cmake "${{github.workspace}}" \
+"-DCMAKE_INSTALL_PREFIX=${InstallPrefix}" \
+${DispatchCMakeExtraArgs}
+
+ - name: CTest -R python-checker
+working-directory: ${{env.DispatchBuildDir}}
+run: ctest -VV -R python-checker
+
docs:
name: 'Docs (${{ matrix.os }})'
runs-on: ${{ matrix.os }}
@@ -539,49 +584,6 @@ jobs:
name: book.pdf
path: ${{github.workspace}}/docs/books/user-guide/book.pdf
- python:
-name: 'Python Checkers (${{ matrix.container }})'
-runs-on: '${{ matrix.os }}'
-strategy:
- matrix:
-os: [ 'ubuntu-20.04' ]
-container: [ 'fedora' ]
-containerTag: [ '35' ]
-
-container:
- image: 'library/${{ matrix.container }}:${{ matrix.containerTag }}'
- volumes:
-- ${{github.workspace}}:${{github.workspace}}
-
-env:
- DispatchBuildDir: ${{github.workspace}}/build
- InstallPrefix: ${{github.workspace}}/install
- DispatchCMakeExtraArgs: >
--GNinja
--DCONSOLE_INSTALL=OFF
-
-steps:
-
- - name: Install build dependencies
-run: |
- dnf install -y 'dnf-command(builddep)' && dnf builddep -y
qpid-dispatch-router && dnf install -y git tox ninja-build
-
- - uses: actions/checkout@v2
-
- - name: Create Build and Install directories
-run: mkdir -p "${DispatchBuildDir}" "{InstallPrefix}"
-
- - name: qpid-dispatch cmake configure
-working-directory: ${{env.DispatchBuildDir}}
-run: >
- cmake "${{github.workspace}}" \
-"-DCMAKE_INSTALL_PREFIX=${InstallPrefix}" \
-${DispatchCMakeExtraArgs}
-
- - name: CTest -R python-checker
-working-directory: ${{env.DispatchBuildDir}}
-run: ctest -VV -R python-checker
-
console-test:
name: Console Tests
runs-on: ubuntu-latest
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
