Skip to content

DISPATCH-2370: Configure "Packit-as-a-Service" application for github.com/apache/qpid-dispatch #1741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions .packit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

# See the documentation for more information:
# https://packit.dev/docs/configuration/

# https://packit.dev/docs/configuration/#top-level-keys
upstream_project_url: https://qpid.apache.org/components/dispatch-router
issue_repository: https://issues.apache.org/jira/projects/DISPATCH/issues

specfile_path: packaging/qpid-dispatch.spec
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is aimed at testing changes with fedora-rawhide then the structure should perhaps convey that rather than simply using a root of 'packaging' ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was thought out in skupper-router. We wanted to appear vendor neutral. If Ubuntu rolled out it's own Packit-like service, we wanted to have inclusively-named directory where their stuff could also live.

Admit that it would've worked well if there was a single Fedora file, not when there is multiple like this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thats fine, if its thought all such things can coexist and be easily maintained in one dir. I was just thinking to add a packaging/subdir for each.


# add or remove files that should be synced
files_to_sync:
- .packit.yaml

# name in upstream package repository/registry (e.g. in PyPI)
upstream_package_name: qpid-dispatch
# downstream (Fedora) RPM package name
downstream_package_name: qpid-dispatch

jobs:
- job: copr_build
trigger: pull_request
targets:
- fedora-all
39 changes: 39 additions & 0 deletions packaging/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
////
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License
////

= Packaging

== rpm

The https://packit.dev/docs/cli[`packit` tool] expects to have a `.packit.yaml` file at the source root.

.Example: install build dependencies
[source,shell script]
----
dnf install 'dnf-command(builddep)'
dnf builddep -y packaging/skupper-router.spec
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems questionable

----

.Example: local packit build
[source,shell script]
----
packit build locally
----

https://copr.fedorainfracloud.org/[COPR] builds can be triggered with Packit (`packit build`) as well.
30 changes: 30 additions & 0 deletions packaging/dispatch.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
diff --git a/etc/qdrouterd.conf b/etc/qdrouterd.conf
index 4e8e506c..add40c69 100644
--- a/etc/qdrouterd.conf
+++ b/etc/qdrouterd.conf
@@ -32,6 +32,13 @@ listener {
saslMechanisms: ANONYMOUS
}

+listener {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems unclear that it should have a different default config for this?

Coming back after later looks...is this intended for the console? Unclear if that bit of the spec is even being used? If so and if not, surely this shouldnt be there?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is how dispatch has been always packaged for Fedora (and also as a Red Hat product). No idea where this came from.

It's true that I removed console from the .spec file. If I can't find a way to build it as part of the spec, I'll revisit this, but if I get the console working, then I'd like to leave this as is.

Previously, the console build has been performed by the .spec file author (on their own machine), and the finished console build was uploaded into fedpkg look aside cache as a "source" file.

+ host: 0.0.0.0
+ port: 8672
+ authenticatePeer: no
+ http: yes
+}
+
address {
prefix: closest
distribution: closest
diff --git a/tests/cpp-stub/cpp_stub.h b/tests/cpp-stub/cpp_stub.h
index 7532ede5..6559fe28 100644
--- a/tests/cpp-stub/cpp_stub.h
+++ b/tests/cpp-stub/cpp_stub.h
@@ -23,6 +23,7 @@
#include <cstring>
//c++
#include <map>
+#include <cstdint>


#define ADDR(CLASS_NAME,MEMBER_NAME) (&CLASS_NAME::MEMBER_NAME)
15 changes: 15 additions & 0 deletions packaging/licenses.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<licenseSummary>
<dependencies>
<dependency>
<packageName>qpid-dispatch</packageName>
<version>1.19.0</version>
<licenses>
<license>
<name>ASL 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
</dependency>
</dependencies>
</licenseSummary>
38 changes: 38 additions & 0 deletions packaging/qpid-dispatch-1.19.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
diff --git a/python/setup.py.in b/python/setup.py.in
index 200cb84b8..75ddc4b1e 100755
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -18,9 +18,8 @@
# under the License.
#

-from distutils.core import setup
-from distutils.command.build_py import build_py
-from distutils.file_util import copy_file
+from setuptools import setup
+from setuptools.command.build_py import build_py
from os.path import join
from os import environ

@@ -35,7 +34,7 @@ class BuildPy(build_py):
def run(self):
build_py.run(self) # Run the standard build, copies source .py files into builddir
for m in self.MODULES:
- copy_file(join('${CMAKE_CURRENT_BINARY_DIR}', m), join(self.build_lib, m))
+ build_py.copy_file(self, join('${CMAKE_CURRENT_BINARY_DIR}', m), join(self.build_lib, m))

def get_outputs(self, **kwargs):
return build_py.get_outputs(self, **kwargs) + [join(self.build_lib, m) for m in self.MODULES]
diff --git a/src/remote_sasl.c b/src/remote_sasl.c
index 548b3c2ae..c5ee1ae6b 100644
--- a/src/remote_sasl.c
+++ b/src/remote_sasl.c
@@ -33,6 +33,8 @@
#include "qpid/dispatch/ctools.h"
#include "qpid/dispatch/log.h"

+#include <proton/object.h>
+
static qd_log_source_t* auth_service_log;

typedef struct
Loading
Loading