diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 63fb211..666b117 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -81,8 +81,6 @@ jobs: - ondemand-release-latest - ondemand-runtime - passenger - - cjose - - mod_auth_openidc - ondemand_exporter - ondemand-compute - python-websockify @@ -97,10 +95,6 @@ jobs: arch: aarch64 package: scl-utils exclude: - - dist: el9 - package: cjose - - dist: el9 - package: mod_auth_openidc - arch: aarch64 package: ondemand-release - arch: aarch64 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66dbab5..0f85dd6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,48 +146,6 @@ build-passenger: - tmp/output name: "$CI_PROJECT_NAME-$CI_COMMIT_TAG" -build-cjose: - stage: build - rules: - # Re-enable once Gitlab instance using plugin to integrate with Github - # - if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"' - - if: '$CI_COMMIT_BRANCH !~ /^(main|[0-9]\.[0-9])$/ && $CI_COMMIT_TAG == null' - - if: '$CI_COMMIT_TAG =~ /^cjose-/' - script: - - bundle exec rake ood_packaging:package:cjose[$DIST] - parallel: - matrix: - - OOD_PACKAGING_DIST: [el8] - OOD_PACKAGING_ARCH: [x86_64, aarch64, ppc64le] - OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand.sec - - OOD_PACKAGING_DIST: [amzn2023] - OOD_PACKAGING_ARCH: [x86_64, aarch64] - artifacts: - paths: - - tmp/output - name: "$CI_PROJECT_NAME-$CI_COMMIT_TAG" - -build-mod_auth_openidc: - stage: build - rules: - # Re-enable once Gitlab instance using plugin to integrate with Github - # - if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"' - - if: '$CI_COMMIT_BRANCH !~ /^(main|[0-9]\.[0-9])$/ && $CI_COMMIT_TAG == null' - - if: '$CI_COMMIT_TAG =~ /^mod_auth_openidc-/' - script: - - bundle exec rake ood_packaging:package:mod_auth_openidc[$DIST] - parallel: - matrix: - - OOD_PACKAGING_DIST: [el8] - OOD_PACKAGING_ARCH: [x86_64, aarch64, ppc64le] - OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand.sec - - OOD_PACKAGING_DIST: [amzn2023] - OOD_PACKAGING_ARCH: [x86_64, aarch64] - artifacts: - paths: - - tmp/output - name: "$CI_PROJECT_NAME-$CI_COMMIT_TAG" - build-ondemand_exporter: stage: build rules: @@ -308,7 +266,5 @@ package-deploy-build: - if: '$CI_COMMIT_TAG =~ /^ondemand-runtime-/' - if: '$CI_COMMIT_TAG =~ /^scl-utils-/' - if: '$CI_COMMIT_TAG =~ /^passenger-/' - - if: '$CI_COMMIT_TAG =~ /^cjose-/' - - if: '$CI_COMMIT_TAG =~ /^mod_auth_openidc-/' script: - ./release.py --debug --pkey /systems/osc_certs/ssh/ondemand-packaging/id_rsa -c build -r $OOD_BUILD_REPO ./tmp/output/* diff --git a/lib/ood_packaging/tasks.rb b/lib/ood_packaging/tasks.rb index e992293..0cfcf9a 100644 --- a/lib/ood_packaging/tasks.rb +++ b/lib/ood_packaging/tasks.rb @@ -86,16 +86,6 @@ Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch]) end - desc 'Package cjose' - task :cjose, [:dist, :arch] do |t, args| - Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch]) - end - - desc 'Package mod_auth_openidc' - task :mod_auth_openidc, [:dist, :arch] do |t, args| - Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch]) - end - desc 'Package ondemand_exporter' task :ondemand_exporter, [:dist, :arch] do |t, args| Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch]) diff --git a/lib/ood_packaging/version.rb b/lib/ood_packaging/version.rb index 694ad84..6b6341f 100644 --- a/lib/ood_packaging/version.rb +++ b/lib/ood_packaging/version.rb @@ -15,8 +15,6 @@ module OodPackaging 'ondemand-runtime' => '4.0.3', 'scl-utils' => '2.0.3', 'passenger' => '6.0.23', - 'cjose' => '0.6.1', - 'mod_auth_openidc' => '2.4.14.1', 'ondemand_exporter' => '0.10.0', 'ondemand-compute' => { '(ubuntu|debian)' => '4.0.0', diff --git a/packages/cjose/rpm/cjose.spec b/packages/cjose/rpm/cjose.spec deleted file mode 100644 index f1ed90b..0000000 --- a/packages/cjose/rpm/cjose.spec +++ /dev/null @@ -1,64 +0,0 @@ -%{!?package_release: %define package_release 1} -%if 0%{?amzn} > 0 -%define build_cflags "%{optflags} -Wno-error=deprecated-declarations" -%endif - -Name: cjose -Version: %{package_version} -Release: %{package_release}%{?dist} -Summary: JOSE implementation for C - -Group: Networking/Daemons/HTTP -License: Apache License Version 2.0 -URL: https://github.com/cisco/cjose -Source0: https://github.com/cisco/cjose/archive/%{version}.tar.gz - -BuildRequires: check-devel -BuildRequires: jansson-devel >= 2.9 -BuildRequires: openssl-devel -Requires: jansson >= 2.9 -Requires: openssl - -%description -JOSE implementation for C - -%package devel -Summary: Development libraries for cjose -Group: Networking/Daemons/HTTP -Requires: %{name} = %{version}-%{release} - -%description devel -Development libraries for cjose - -%prep -%setup -q - - -%build -%configure --disable-static -make %{?_smp_mflags} - -# Can't test: https://github.com/cisco/cjose/issues/91 -#%check -#make test - -%install -make install DESTDIR=${RPM_BUILD_ROOT} -rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib%{name}.la - - -%files -%doc -%{_libdir}/lib%{name}.so* - -%files devel -%{_includedir}/%{name} -%{_libdir}/pkgconfig/%{name}.pc - - -%changelog -* Wed Oct 11 2017 Trey Dockendorf 0.5.1-1 -- new package built with tito - -* Fri Jan 27 2017 Trey Dockendorf - 0.4.1-1 -- Initial build of cjose-0.4.1 diff --git a/packages/mod_auth_openidc/rpm/mod_auth_openidc.spec b/packages/mod_auth_openidc/rpm/mod_auth_openidc.spec deleted file mode 100644 index 0efa54a..0000000 --- a/packages/mod_auth_openidc/rpm/mod_auth_openidc.spec +++ /dev/null @@ -1,117 +0,0 @@ -%{?scl:%scl_package mod_auth_openidc} -%{!?scl:%global pkg_name %{name}} -%{!?package_release: %define package_release 1} - -%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}} -%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}} -%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %{_sysconfdir}/httpd/conf.d}} - -# Optionally build with hiredis if --with hiredis is passed -%{!?_with_hiredis: %{!?_without_hiredis: %global _without_hiredis --without-hiredis}} -# It is an error if both or neither required options exist. -%{?_with_hiredis: %{?_without_hiredis: %{error: both _with_hiredis and _without_hiredis}}} -%{!?_with_hiredis: %{!?_without_hiredis: %{error: neither _with_hiredis nor _without_hiredis}}} - -# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4 -%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}} - -%global httpd_pkg_cache_dir %{?scl:%{_scl_root}}/var/cache/httpd/mod_auth_openidc - -Name: %{?scl_prefix}mod_auth_openidc -Version: %{package_version} -Release: %{package_release}%{?dist} -Summary: OpenID Connect auth module for Apache HTTP Server - -Group: System Environment/Daemons -License: ASL 2.0 -URL: https://github.com/OpenIDC/mod_auth_openidc -Source0: https://github.com/OpenIDC/mod_auth_openidc/releases/download/v%{version}/mod_auth_openidc-%{version}.tar.gz - -BuildRequires: %{?scl_prefix}httpd-devel -BuildRequires: openssl-devel -BuildRequires: curl-devel -BuildRequires: jansson-devel -BuildRequires: cjose-devel -BuildRequires: pcre-devel -BuildRequires: autoconf -BuildRequires: automake -%{?_with_hiresdis:%{?scl_prefix}BuildRequires: %{?scl_prefix}hiresdis-devel} -Requires: %{?scl_prefix}httpd-mmn = %{_httpd_mmn} - -%description -This module enables an Apache 2.x web server to operate as -an OpenID Connect Relying Party and/or OAuth 2.0 Resource Server. - -%prep -%setup -n %{pkg_name}-%{version} -q - -%build -%{?scl:%define with_apxs "--with-apxs=%{_scl_root}%{_root_bindir}/apxs"} -autoreconf -%configure \ - %{?_with_hiredis} \ - %{?_without_hiredis} \ - %{?with_apxs} - -make %{?_smp_mflags} - -%check -make test - -%install -mkdir -p $RPM_BUILD_ROOT%{_httpd_moddir} -make install DESTDIR=$RPM_BUILD_ROOT - -install -m 755 -d $RPM_BUILD_ROOT%{_httpd_modconfdir} -echo 'LoadModule auth_openidc_module modules/mod_auth_openidc.so' > \ - $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-auth_openidc.conf - -install -m 755 -d $RPM_BUILD_ROOT%{_httpd_confdir} -install -m 644 auth_openidc.conf $RPM_BUILD_ROOT%{_httpd_confdir} -# Adjust httpd cache location in install config file -sed -i 's!/var/cache/apache2/!/var/cache/httpd/!' $RPM_BUILD_ROOT%{_httpd_confdir}/auth_openidc.conf -install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir} -install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir}/metadata -install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir}/cache - - -%files -%license LICENSE.txt -%doc ChangeLog -%doc AUTHORS -%doc README.md -%{_httpd_moddir}/mod_auth_openidc.so -%config(noreplace) %{_httpd_modconfdir}/10-auth_openidc.conf -%config(noreplace) %{_httpd_confdir}/auth_openidc.conf -%dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir} -%dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/metadata -%dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/cache - -%changelog -* Thu Jan 03 2019 Trey Dockendorf 2.3.10-1 -- Upgrade mod_auth_openidc to 2.3.10 (tdockendorf@osc.edu) - -* Thu Oct 12 2017 Trey Dockendorf 2.3.2-1 -- new package built with tito - -* Tue Jul 12 2016 John Dennis - 1.8.10.1-1 -- Upgrade to new upstream - See /usr/share/doc/mod_auth_openidc/ChangeLog for details - -* Tue Mar 29 2016 John Dennis - 1.8.8-3 -- Add %check to run test - -* Wed Mar 23 2016 John Dennis - 1.8.8-2 -- Make building with redis support optional (defaults to without) - -* Mon Mar 21 2016 John Dennis - 1.8.8-1 -- Update to 1.8.8 (#1316528) -- Add missing unpackaged files/directories - - Add to doc: README.md, DISCLAIMER, AUTHORS - Add to httpd/conf.d: auth_openidc.conf - Add to /var/cache: /var/cache/httpd/mod_auth_openidc/cache - /var/cache/httpd/mod_auth_openidc/metadata - -* Sat Nov 07 2015 Jan Pazdziora 1.8.6-1 -- Initial packaging for Fedora 23. diff --git a/release-manifest.yaml b/release-manifest.yaml index 1754d3a..eb67a29 100644 --- a/release-manifest.yaml +++ b/release-manifest.yaml @@ -16,25 +16,6 @@ ondemand-release: - '{major}.2-bookworm' # web -cjose: - packages: - - cjose - - cjose-debuginfo - - cjose-devel - versions: - - 0.6.1-1 -httpd24-mod_auth_openidc: - packages: - - httpd24-mod_auth_openidc - - httpd24-mod_auth_openidc-debuginfo - versions: - - 2.4.14.1-1 -mod_auth_openidc: - packages: - - mod_auth_openidc - - mod_auth_openidc-debuginfo - versions: - - 2.4.14.1-1 ondemand-nginx: packages: - ondemand-nginx