From 1151e8dc4dd214378bd5833f36075e13503d3b9f Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Fri, 9 Jun 2023 14:07:47 -0300 Subject: [PATCH 1/4] Build with packit Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 6 +- CONTRIBUTING.md | 3 + packaging/rhc-bash-worker.spec | 24 +++++--- packaging/yggdrasil.spec | 107 +++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+), 12 deletions(-) create mode 100644 CONTRIBUTING.md create mode 100644 packaging/yggdrasil.spec diff --git a/.packit.yaml b/.packit.yaml index 445010e..6fd23f5 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,14 +1,14 @@ specfile_path: packaging/rhc-bash-worker.spec upstream_package_name: rhc-bash-worker downstream_package_name: rhc-bash-worker -upstream_project_url: https://github.com/oamg/rhc-bash-worker +upstream_project_url: https://github.com/r0x0d/rhc-bash-worker srpm_build_deps: [] jobs: - job: copr_build trigger: pull_request - owner: "@oamg" + owner: "@r0x0d" project: rhc-bash-worker targets: - epel-7-x86_64 @@ -19,7 +19,7 @@ jobs: - job: copr_build trigger: commit branch: main - owner: "@oamg" + owner: "@r0x0d" project: rhc-bash-worker targets: - epel-7-x86_64 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..8a7feb1 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,3 @@ +# Contributing + +WIP diff --git a/packaging/rhc-bash-worker.spec b/packaging/rhc-bash-worker.spec index 9f9ef1f..b036c4b 100644 --- a/packaging/rhc-bash-worker.spec +++ b/packaging/rhc-bash-worker.spec @@ -1,25 +1,26 @@ -# Generated by go2rpm 1.9.0 %bcond_without check -# https://github.com/r0x0d/rhc-bash-worker +# TODO(r0x0d): Update this reference when we move to @oamg %global goipath github.com/r0x0d/rhc-bash-worker %gometa -f -%global godocs README.md +%global godocs CONTRIBUTING.md README.md + +%global common_description %{expand: +Experimental worker for Convert2RHEL.} Name: rhc-bash-worker -Version: 0.1 +Version: v0.1 Release: 1%{?dist} Summary: Experimental worker for Convert2RHEL. License: # FIXME URL: %{gourl} -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Source: %(gosource) BuildArch: noarch -%description -Experimental worker for Convert2RHEL. +%description %{common_description} %gopkg @@ -36,8 +37,12 @@ done %install %gopkginstall + +# Create a temporary directory /var/lib/rhc-bash-worker - used mainly for storing temporary files +install -d %{buildroot}%{_sharedstatedir}/%{name}/ install -m 0755 -vd %{buildroot}%{_bindir} -install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ +# install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ +install -m 0755 -vp %{buildroot}%{_libexecdir}/yggdrasil/%{_bindir}/ %if %{with check} %check @@ -45,9 +50,10 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ %endif %files -%doc README.md +%doc CONTRIBUTING.md README.md %{_bindir}/* %gopkgfiles %changelog +%autochangelog diff --git a/packaging/yggdrasil.spec b/packaging/yggdrasil.spec new file mode 100644 index 0000000..f046b66 --- /dev/null +++ b/packaging/yggdrasil.spec @@ -0,0 +1,107 @@ +# This RPM spec file exists primarily to enable CI/CD pipelines and automatic +# testing of built RPMs. This RPM can be used as a suitable baseline for a +# proper distribution package, but changes should be made to suit the needs of +# the package. +# +# See https://src.fedoraproject.org/rpms/yggdrasil/blob/rawhide/f/yggdrasil.spec +# for a better example of a downstream distribution packaging example. + +%bcond_without check + +# https://github.com/redhatinsights/yggdrasil +%global goipath github.com/redhatinsights/yggdrasil +%global commit @COMMIT@ +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +%if 0%{?fedora} +%gometa -f +%else +%gometa +%endif + +# Manually redefine %%dist to work around an issue in COPR where the build root +# that creates the srpm does not define a value for %%dist. This should *NOT* be +# carried in downstream; this is strictly an upstream/COPR/CI workaround. +%if "%{dist}" == "" +%global dist %{distprefix}.fc%{fedora} +%endif + +%if 0%{?fedora} +%global setup_flags -Dvendor=False -Dexamples=True +%else +%global setup_flags -Dvendor=True -Dexamples=True +%endif + +%global common_description %{expand: +yggdrasil is a system daemon that subscribes to topics on an MQTT broker and +routes any data received on the topics to an appropriate child "worker" process, +exchanging data with its worker processes through a D-Bus message broker.} + +%global golicenses LICENSE +%global godocs CONTRIBUTING.md README.md + +Name: yggdrasil +Version: @VERSION@ +Release: 0%{?dist} +Summary: Remote data transmission and processing client + +License: GPL-3.0-only +URL: %{gourl} +Source: %{gosource} + +BuildRequires: systemd-rpm-macros +BuildRequires: meson +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(bash-completion) + +%description %{common_description} + +%gopkg + +%prep +%if 0%{?fedora} +%goprep +%else +%goprep -k +%endif + +%if 0%{?fedora} +%generate_buildrequires +%go_generate_buildrequires +%endif + +%build +%undefine _auto_set_build_flags +export %gomodulesmode +%{?gobuilddir:export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"} +%meson %setup_flags "-Dgobuildflags=[%(echo %{expand:%gocompilerflags} | sed -e s/"^"/"'"/ -e s/" "/"', '"/g -e s/"$"/"'"/), '-tags', '"rpm_crashtraceback\ ${BUILDTAGS:-}"', '-a', '-v', '-x']" -Dgoldflags='%{?currentgoldflags} -B 0x%(head -c20 /dev/urandom|od -An -tx1|tr -d " \n") -compressdwarf=false -linkmode=external -extldflags "%{build_ldflags} %{?__golang_extldflags}"' +%meson_build + +%global gosupfiles ./ipc/com.redhat.Yggdrasil1.Dispatcher1.xml ./ipc/com.redhat.Yggdrasil1.Worker1.xml +%install +%meson_install +%gopkginstall + +%if %{with check} +%check +%gocheck +%endif + +%files +%license LICENSE +%doc CONTRIBUTING.md README.md +%{_bindir}/* +%{_libexecdir}/%{name}/* +%config(noreplace) %{_sysconfdir}/%{name} +%{_unitdir}/* +%{_userunitdir}/* +%{_datadir}/bash-completion/completions/* +%{_datadir}/dbus-1/{interfaces,system-services,system.d}/* +%{_datadir}/doc/%{name}/* +%{_mandir}/man1/* + +%gopkgfiles + +%changelog +%autochangelog From 674c87ab9c0550ca648e95097297f2cbb0204c47 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Fri, 9 Jun 2023 14:45:37 -0300 Subject: [PATCH 2/4] Add LICENSE Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 7 +- LICENSE | 674 +++++++++++++++++++++++++++++++++ packaging/rhc-bash-worker.spec | 2 +- 3 files changed, 679 insertions(+), 4 deletions(-) create mode 100644 LICENSE diff --git a/.packit.yaml b/.packit.yaml index 6fd23f5..2fcd27b 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,14 +1,14 @@ specfile_path: packaging/rhc-bash-worker.spec upstream_package_name: rhc-bash-worker downstream_package_name: rhc-bash-worker -upstream_project_url: https://github.com/r0x0d/rhc-bash-worker +upstream_project_url: https://github.com/oamg/rhc-bash-worker srpm_build_deps: [] jobs: - job: copr_build trigger: pull_request - owner: "@r0x0d" + owner: "@oamg" project: rhc-bash-worker targets: - epel-7-x86_64 @@ -16,10 +16,11 @@ jobs: # do not get the version from a tag (git describe) but from the spec file get-current-version: - grep -oP '^Version:\s+\K\S+' packaging/rhc-bash-worker.spec + - job: copr_build trigger: commit branch: main - owner: "@r0x0d" + owner: "@oamg" project: rhc-bash-worker targets: - epel-7-x86_64 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/packaging/rhc-bash-worker.spec b/packaging/rhc-bash-worker.spec index b036c4b..00e309c 100644 --- a/packaging/rhc-bash-worker.spec +++ b/packaging/rhc-bash-worker.spec @@ -15,7 +15,7 @@ Version: v0.1 Release: 1%{?dist} Summary: Experimental worker for Convert2RHEL. -License: # FIXME +License: GPLv3+ URL: %{gourl} Source: %(gosource) BuildArch: noarch From 8e7e569d19cc451c3993e3c42e0f85cb732f4fbb Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Fri, 9 Jun 2023 15:43:35 -0300 Subject: [PATCH 3/4] Update specfile Signed-off-by: Rodolfo Olivieri --- go.mod | 12 ++-- packaging/rhc-bash-worker.spec | 100 ++++++++++++++++++++---------- packaging/yggdrasil.spec | 107 --------------------------------- 3 files changed, 74 insertions(+), 145 deletions(-) delete mode 100644 packaging/yggdrasil.spec diff --git a/go.mod b/go.mod index 3bbb262..7cece03 100644 --- a/go.mod +++ b/go.mod @@ -10,10 +10,10 @@ require ( ) require ( - github.com/golang/protobuf v1.4.3 // indirect - golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 // indirect - golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f // indirect - golang.org/x/text v0.3.3 // indirect - google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect - google.golang.org/protobuf v1.25.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect + golang.org/x/net v0.10.0 // indirect + golang.org/x/sys v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230526161137-0005af68ea54 // indirect + google.golang.org/protobuf v1.30.0 // indirect ) diff --git a/packaging/rhc-bash-worker.spec b/packaging/rhc-bash-worker.spec index 00e309c..788278e 100644 --- a/packaging/rhc-bash-worker.spec +++ b/packaging/rhc-bash-worker.spec @@ -1,14 +1,24 @@ -%bcond_without check +# Specfile based and updated from +# https://github.com/theforeman/foreman-packaging/blob/rpm/develop/packages/client/foreman_ygg_worker/foreman_ygg_worker.spec -# TODO(r0x0d): Update this reference when we move to @oamg -%global goipath github.com/r0x0d/rhc-bash-worker +%define debug_package %{nil} -%gometa -f +%global repo_orgname oamg +%global repo_name rhc-bash-worker +%global yggdrasil_libexecdir %{_libexecdir}/yggdrasil +%{!?_root_sysconfdir:%global _root_sysconfdir %{_sysconfdir}} +%global yggdrasil_worker_conf_dir %{_root_sysconfdir}/yggdrasil/workers -%global godocs CONTRIBUTING.md README.md +%global goipath github.com/%{repo_orgname}/%{repo_name} -%global common_description %{expand: -Experimental worker for Convert2RHEL.} +%if 0%{?rhel} > 7 && ! 0%{?fedora} +%define gobuild(o:) \ + go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; +%else +%if ! 0%{?gobuild:1} +%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**}; +%endif +%endif Name: rhc-bash-worker Version: v0.1 @@ -16,44 +26,70 @@ Release: 1%{?dist} Summary: Experimental worker for Convert2RHEL. License: GPLv3+ -URL: %{gourl} -Source: %(gosource) +URL: https://github.com/%{repo_orgname}/%{repo_name}/ +Source0: https://github.com/%{repo_orgname}/%{repo_name}/releases/download/v%{version}/%{repo_name}-%{version}.tar.gz BuildArch: noarch -%description %{common_description} +BuildRequires: golang +Requires: yggdrasil -%gopkg +%description +Experimental worker for Convert2RHEL. %prep -%goprep - -%generate_buildrequires -%go_generate_buildrequires +%setup -q %build -for cmd in src; do - %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd -done +mkdir -p _gopath/src +ln -fs $(pwd)/src _gopath/src/%{name}-%{version} +ln -fs $(pwd)/vendor _gopath/src/%{name}-%{version}/vendor +export GOPATH=$(pwd)/_gopath +pushd _gopath/src/%{name}-%{version} +%{gobuild} +strip %{name}-%{version} +popd -%install -%gopkginstall +%install # Create a temporary directory /var/lib/rhc-bash-worker - used mainly for storing temporary files install -d %{buildroot}%{_sharedstatedir}/%{name}/ -install -m 0755 -vd %{buildroot}%{_bindir} -# install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ -install -m 0755 -vp %{buildroot}%{_libexecdir}/yggdrasil/%{_bindir}/ -%if %{with check} -%check -%gocheck -%endif +install -D -m 755 _gopath/src/%{name}-%{version}/%{name}-%{version} %{buildroot}%{yggdrasil_libexecdir}/%{name} +install -D -d -m 755 %{buildroot}%{yggdrasil_worker_conf_dir} -%files -%doc CONTRIBUTING.md README.md -%{_bindir}/* +cat <%{buildroot}%{yggdrasil_worker_conf_dir}/rhc-bash-worker.toml +exec = "%{yggdrasil_libexecdir}/%{name}" +protocol = "grpc" +env = [] +EOF -%gopkgfiles +%files +%{yggdrasil_libexecdir}/%{name} +%{yggdrasil_worker_conf_dir}/rhc-bash-worker.toml +%license LICENSE +%doc README.md %changelog -%autochangelog + +* Mon Jun 12 2023 Rodolfo Olivieri - v0.1-1.20230612143302651634.package.as.copr.build.3.g153ca5f +- Update specfile (Rodolfo Olivieri) +- Add LICENSE (Rodolfo Olivieri) +- Build with packit (Rodolfo Olivieri) + +* Mon Jun 12 2023 Rodolfo Olivieri - v0.1-1.20230612143251359449.package.as.copr.build.3.g153ca5f +- Update specfile (Rodolfo Olivieri) +- Add LICENSE (Rodolfo Olivieri) +- Build with packit (Rodolfo Olivieri) + +* Mon Jun 12 2023 Rodolfo Olivieri - v0.1-1.20230612143222265715.package.as.copr.build.3.g153ca5f +- Update specfile (Rodolfo Olivieri) +- Add LICENSE (Rodolfo Olivieri) +- Build with packit (Rodolfo Olivieri) + +* Mon Jun 12 2023 Rodolfo Olivieri - v0.1-1.20230612143057210246.package.as.copr.build.3.g153ca5f +- Update specfile (Rodolfo Olivieri) +- Add LICENSE (Rodolfo Olivieri) +- Build with packit (Rodolfo Olivieri) + +* Mon Jun 12 2023 Rodolfo Olivieri 0.1-1 +- Initial RPM release diff --git a/packaging/yggdrasil.spec b/packaging/yggdrasil.spec deleted file mode 100644 index f046b66..0000000 --- a/packaging/yggdrasil.spec +++ /dev/null @@ -1,107 +0,0 @@ -# This RPM spec file exists primarily to enable CI/CD pipelines and automatic -# testing of built RPMs. This RPM can be used as a suitable baseline for a -# proper distribution package, but changes should be made to suit the needs of -# the package. -# -# See https://src.fedoraproject.org/rpms/yggdrasil/blob/rawhide/f/yggdrasil.spec -# for a better example of a downstream distribution packaging example. - -%bcond_without check - -# https://github.com/redhatinsights/yggdrasil -%global goipath github.com/redhatinsights/yggdrasil -%global commit @COMMIT@ -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -%if 0%{?fedora} -%gometa -f -%else -%gometa -%endif - -# Manually redefine %%dist to work around an issue in COPR where the build root -# that creates the srpm does not define a value for %%dist. This should *NOT* be -# carried in downstream; this is strictly an upstream/COPR/CI workaround. -%if "%{dist}" == "" -%global dist %{distprefix}.fc%{fedora} -%endif - -%if 0%{?fedora} -%global setup_flags -Dvendor=False -Dexamples=True -%else -%global setup_flags -Dvendor=True -Dexamples=True -%endif - -%global common_description %{expand: -yggdrasil is a system daemon that subscribes to topics on an MQTT broker and -routes any data received on the topics to an appropriate child "worker" process, -exchanging data with its worker processes through a D-Bus message broker.} - -%global golicenses LICENSE -%global godocs CONTRIBUTING.md README.md - -Name: yggdrasil -Version: @VERSION@ -Release: 0%{?dist} -Summary: Remote data transmission and processing client - -License: GPL-3.0-only -URL: %{gourl} -Source: %{gosource} - -BuildRequires: systemd-rpm-macros -BuildRequires: meson -BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(systemd) -BuildRequires: pkgconfig(bash-completion) - -%description %{common_description} - -%gopkg - -%prep -%if 0%{?fedora} -%goprep -%else -%goprep -k -%endif - -%if 0%{?fedora} -%generate_buildrequires -%go_generate_buildrequires -%endif - -%build -%undefine _auto_set_build_flags -export %gomodulesmode -%{?gobuilddir:export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"} -%meson %setup_flags "-Dgobuildflags=[%(echo %{expand:%gocompilerflags} | sed -e s/"^"/"'"/ -e s/" "/"', '"/g -e s/"$"/"'"/), '-tags', '"rpm_crashtraceback\ ${BUILDTAGS:-}"', '-a', '-v', '-x']" -Dgoldflags='%{?currentgoldflags} -B 0x%(head -c20 /dev/urandom|od -An -tx1|tr -d " \n") -compressdwarf=false -linkmode=external -extldflags "%{build_ldflags} %{?__golang_extldflags}"' -%meson_build - -%global gosupfiles ./ipc/com.redhat.Yggdrasil1.Dispatcher1.xml ./ipc/com.redhat.Yggdrasil1.Worker1.xml -%install -%meson_install -%gopkginstall - -%if %{with check} -%check -%gocheck -%endif - -%files -%license LICENSE -%doc CONTRIBUTING.md README.md -%{_bindir}/* -%{_libexecdir}/%{name}/* -%config(noreplace) %{_sysconfdir}/%{name} -%{_unitdir}/* -%{_userunitdir}/* -%{_datadir}/bash-completion/completions/* -%{_datadir}/dbus-1/{interfaces,system-services,system.d}/* -%{_datadir}/doc/%{name}/* -%{_mandir}/man1/* - -%gopkgfiles - -%changelog -%autochangelog From 084f7fea25a5398dabdab5b1b4cbe4ab96541079 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Fri, 9 Jun 2023 15:43:35 -0300 Subject: [PATCH 4/4] Update specfile Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 32 ++++++++++++------- go.sum | 25 ++++++++++----- packaging/rhc-bash-worker.spec | 57 ++++++++-------------------------- 3 files changed, 51 insertions(+), 63 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 2fcd27b..305380a 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -3,32 +3,42 @@ upstream_package_name: rhc-bash-worker downstream_package_name: rhc-bash-worker upstream_project_url: https://github.com/oamg/rhc-bash-worker -srpm_build_deps: [] +srpm_build_deps: [golang, make] + jobs: - job: copr_build - trigger: pull_request + enable_net: true owner: "@oamg" - project: rhc-bash-worker + project: "rhc-bash-worker" targets: - - epel-7-x86_64 + - epel-7-x86_64 + trigger: pull_request actions: # do not get the version from a tag (git describe) but from the spec file get-current-version: - - grep -oP '^Version:\s+\K\S+' packaging/rhc-bash-worker.spec + - grep -oP '^Version:\s+\K\S+' packaging/rhc-bash-worker.spec + create-archive: + - "make distribution-tarball" + - bash -c "ls -1 ./rhc-bash-worker-*.tar.gz" - job: copr_build - trigger: commit - branch: main + enable_net: true owner: "@oamg" - project: rhc-bash-worker + project: "rhc-bash-worker" targets: - - epel-7-x86_64 + - epel-7-x86_64 + trigger: commit + branch: main actions: # bump spec so we get release starting with 2 and hence all the default branch builds will # have higher NVR than all the PR builds post-upstream-clone: - - rpmdev-bumpspec --comment='latest upstream build' ./packaging/rhc-bash-worker.spec + - rpmdev-bumpspec --comment='latest upstream build' ./packaging/rhc-bash-worker.spec + # do not get the version from a tag (git describe) but from the spec file get-current-version: - - grep -oP '^Version:\s+\K\S+' packaging/rhc-bash-worker.spec + - grep -oP '^Version:\s+\K\S+' packaging/rhc-bash-worker.spec + create-archive: + - "make distribution-tarball" + - bash -c "ls -1 ./rhc-bash-worker-*.tar.gz" diff --git a/go.sum b/go.sum index cfeeaca..9311edd 100644 --- a/go.sum +++ b/go.sum @@ -37,15 +37,18 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -78,8 +81,9 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 h1:42cLlJJdEh+ySyeUUbEQ5bsTiq8voBeTuweGVkY6Puw= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -91,26 +95,28 @@ golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230526161137-0005af68ea54 h1:wQvmPUaH4JVFCzNAL9ShNjezVoq3OhlinNMLYSAN9Vg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230526161137-0005af68ea54/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -128,8 +134,11 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/packaging/rhc-bash-worker.spec b/packaging/rhc-bash-worker.spec index 788278e..c54e411 100644 --- a/packaging/rhc-bash-worker.spec +++ b/packaging/rhc-bash-worker.spec @@ -5,33 +5,29 @@ %global repo_orgname oamg %global repo_name rhc-bash-worker -%global yggdrasil_libexecdir %{_libexecdir}/yggdrasil +%global rhc_libexecdir %{_libexecdir}/rhc %{!?_root_sysconfdir:%global _root_sysconfdir %{_sysconfdir}} -%global yggdrasil_worker_conf_dir %{_root_sysconfdir}/yggdrasil/workers +%global rhc_worker_conf_dir %{_root_sysconfdir}/rhc/workers -%global goipath github.com/%{repo_orgname}/%{repo_name} - -%if 0%{?rhel} > 7 && ! 0%{?fedora} -%define gobuild(o:) \ - go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; -%else -%if ! 0%{?gobuild:1} %define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**}; -%endif + +# EL7 doesn't define go_arche (it is available in go-srpm-macros which is EL8+)s +%if ! 0%{?go_arches:1} +%define go_arches %{ix86} x86_64 %{arm} aarch64 ppc64le %endif Name: rhc-bash-worker -Version: v0.1 +Version: 0.1 Release: 1%{?dist} Summary: Experimental worker for Convert2RHEL. License: GPLv3+ URL: https://github.com/%{repo_orgname}/%{repo_name}/ Source0: https://github.com/%{repo_orgname}/%{repo_name}/releases/download/v%{version}/%{repo_name}-%{version}.tar.gz -BuildArch: noarch +ExclusiveArch: %{go_arches} BuildRequires: golang -Requires: yggdrasil +Requires: rhc %description Experimental worker for Convert2RHEL. @@ -54,42 +50,15 @@ popd # Create a temporary directory /var/lib/rhc-bash-worker - used mainly for storing temporary files install -d %{buildroot}%{_sharedstatedir}/%{name}/ -install -D -m 755 _gopath/src/%{name}-%{version}/%{name}-%{version} %{buildroot}%{yggdrasil_libexecdir}/%{name} -install -D -d -m 755 %{buildroot}%{yggdrasil_worker_conf_dir} - -cat <%{buildroot}%{yggdrasil_worker_conf_dir}/rhc-bash-worker.toml -exec = "%{yggdrasil_libexecdir}/%{name}" -protocol = "grpc" -env = [] -EOF +install -D -m 755 _gopath/src/%{name}-%{version}/%{name}-%{version} %{buildroot}%{rhc_libexecdir}/%{name} +install -D -d -m 755 %{buildroot}%{rhc_worker_conf_dir} %files -%{yggdrasil_libexecdir}/%{name} -%{yggdrasil_worker_conf_dir}/rhc-bash-worker.toml +%{rhc_libexecdir}/%{name} %license LICENSE %doc README.md %changelog -* Mon Jun 12 2023 Rodolfo Olivieri - v0.1-1.20230612143302651634.package.as.copr.build.3.g153ca5f -- Update specfile (Rodolfo Olivieri) -- Add LICENSE (Rodolfo Olivieri) -- Build with packit (Rodolfo Olivieri) - -* Mon Jun 12 2023 Rodolfo Olivieri - v0.1-1.20230612143251359449.package.as.copr.build.3.g153ca5f -- Update specfile (Rodolfo Olivieri) -- Add LICENSE (Rodolfo Olivieri) -- Build with packit (Rodolfo Olivieri) - -* Mon Jun 12 2023 Rodolfo Olivieri - v0.1-1.20230612143222265715.package.as.copr.build.3.g153ca5f -- Update specfile (Rodolfo Olivieri) -- Add LICENSE (Rodolfo Olivieri) -- Build with packit (Rodolfo Olivieri) - -* Mon Jun 12 2023 Rodolfo Olivieri - v0.1-1.20230612143057210246.package.as.copr.build.3.g153ca5f -- Update specfile (Rodolfo Olivieri) -- Add LICENSE (Rodolfo Olivieri) -- Build with packit (Rodolfo Olivieri) - -* Mon Jun 12 2023 Rodolfo Olivieri 0.1-1 +* Wed Jun 14 2023 Rodolfo Olivieri 0.1-1 - Initial RPM release