From af5cdf3d1f4a38acfb77369c374a63b85695e459 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Tue, 2 Jul 2024 10:43:17 +0200 Subject: [PATCH 1/4] CI: Drop EL7 build --- .gitlab-ci.yml | 16 ---------------- rpm/el7-vault.repo | 12 ------------ 2 files changed, 28 deletions(-) delete mode 100644 rpm/el7-vault.repo diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2131f5a56..8bb6d8f6ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,21 +62,6 @@ build_noble: after_script: - DEBIAN_FRONTEND=noninteractive apt install -y ${CI_PROJECT_DIR}/result/ubuntu/noble/*_all.deb -build_centos_7: - extends: .build_job - image: buildpkg/centos:7 - script: - - yum-config-manager --disable base,updates,extras - - yum-config-manager --add-repo=rpm/el7-vault.repo - - yum clean all - - yum makecache - - yum -y update - - yum -y install epel-release - - make dist - - yum -y install openssl openssl-libs - - ci-build-pkg - - yum -y install ${CI_PROJECT_DIR}/result/centos/7/*.noarch.rpm - build_rocky_8: extends: .build_job image: registry.gitlab.com/orange-opensource/gitlab-buildpkg/rockylinux:8 @@ -110,7 +95,6 @@ sign: - ci-sign-pkg dependencies: - build_bullseye - - build_centos_7 - build_rocky_8 artifacts: expire_in: 1 day diff --git a/rpm/el7-vault.repo b/rpm/el7-vault.repo deleted file mode 100644 index 57d2b187a8..0000000000 --- a/rpm/el7-vault.repo +++ /dev/null @@ -1,12 +0,0 @@ -[base-vault] -name=CentOS-$releasever - Base -baseurl=https://vault.centos.org/7.9.2009/os/x86_64/ -enabled=1 -[updates-vault] -name=CentOS-$releasever - Updates -baseurl=https://vault.centos.org/7.9.2009/updates/x86_64/ -enabled=1 -[extras-vault] -name=CentOS-$releasever - Extras -baseurl=https://vault.centos.org/7.9.2009/extras/x86_64/ -enabled=1 -- GitLab From 92567458f0a28a7363411bb4c38f4537d2647ad4 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Tue, 18 Jun 2024 19:04:38 +0200 Subject: [PATCH 2/4] rpm: Drop EL7 support --- rpm/lemonldap-ng.spec | 60 ++++++++++--------------------------------- 1 file changed, 13 insertions(+), 47 deletions(-) diff --git a/rpm/lemonldap-ng.spec b/rpm/lemonldap-ng.spec index 8e27236a8d..c8226fab49 100644 --- a/rpm/lemonldap-ng.spec +++ b/rpm/lemonldap-ng.spec @@ -76,7 +76,7 @@ BuildRequires: perl(Crypt::OpenSSL::X509) BuildRequires: perl(Crypt::Rijndael) BuildRequires: perl(Crypt::URandom) BuildRequires: perl(Data::Dumper) -%{!?el7:BuildRequires: perl(Data::Password::zxcvbn)} +BuildRequires: perl(Data::Password::zxcvbn) BuildRequires: perl(Date::Parse) BuildRequires: perl(DateTime::Format::RFC3339) BuildRequires: perl(DBI) @@ -94,13 +94,13 @@ BuildRequires: perl(feature) BuildRequires: perl(fields) BuildRequires: perl(File::Temp) BuildRequires: perl(GD::SecurityImage) -%{!?el7:BuildRequires: perl(GeoIP2::Database::Reader)} +BuildRequires: perl(GeoIP2::Database::Reader) BuildRequires: perl(GSSAPI) BuildRequires: perl(Hash::Merge::Simple) BuildRequires: perl(HTML::Entities) BuildRequires: perl(HTML::FormatText::WithLinks) BuildRequires: perl(HTML::Template) -%{!?el7:BuildRequires: perl(HTTP::BrowserDetect)} +BuildRequires: perl(HTTP::BrowserDetect) BuildRequires: perl(HTTP::Headers) BuildRequires: perl(HTTP::Request) BuildRequires: perl(IO::Select) @@ -138,7 +138,7 @@ BuildRequires: perl(Regexp::Assemble) BuildRequires: perl(Regexp::Common) BuildRequires: perl(Safe) BuildRequires: perl(Scalar::Util) -%{!?el7:BuildRequires: perl(Sentry::Raven)} +BuildRequires: perl(Sentry::Raven) BuildRequires: perl(SOAP::Lite) BuildRequires: perl(SOAP::Transport::HTTP) BuildRequires: perl(strict) @@ -153,21 +153,21 @@ BuildRequires: perl(URI::QueryParam) BuildRequires: perl(URI::URL) BuildRequires: perl(utf8) BuildRequires: perl(warnings) -%{!?el7:BuildRequires: perl(Web::ID)} +BuildRequires: perl(Web::ID) BuildRequires: perl(XML::LibXML) BuildRequires: perl(XML::LibXSLT) BuildRequires: perl(YAML) # Runtime BuildRequires: perl(Apache::Session::Browseable) BuildRequires: perl(Apache::Session::Lock::File) -%{!?el7:BuildRequires: perl(Auth::Yubikey_WebClient)} -%{!?el7:BuildRequires: perl(Authen::WebAuthn)} +BuildRequires: perl(Auth::Yubikey_WebClient) +BuildRequires: perl(Authen::WebAuthn) BuildRequires: perl(CGI::Compile) BuildRequires: perl(CGI::Emulate::PSGI) BuildRequires: perl(Crypt::PK::ECC) BuildRequires: perl(Cwd) BuildRequires: perl(Email::Address) -%{!?el7:BuildRequires: perl(Email::Address::XS)} +BuildRequires: perl(Email::Address::XS) BuildRequires: perl(English) BuildRequires: perl(FCGI::ProcManager) BuildRequires: perl(File::Compare) @@ -187,7 +187,7 @@ BuildRequires: perl(Plack::Handler::FCGI) BuildRequires: perl(Pod::Usage) BuildRequires: perl(Storable) BuildRequires: perl(threads::shared) -%{!?el7:BuildRequires: perl(WWW::Form::UrlEncoded)} +BuildRequires: perl(WWW::Form::UrlEncoded) BuildRequires: perl(XML::Simple) # Tests BuildRequires: perl(Apache::Session::File) @@ -217,21 +217,13 @@ BuildRequires: perl(Test::Output) BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Time::Fake) -%if 0%{?fedora}%{?el9} -BuildRequires: systemd-rpm-macros -%else -BuildRequires: systemd -%endif +%{?el8:BuildRequires: systemd} +%{!?el8:BuildRequires: systemd-rpm-macros} BuildRequires: uglify-js # Doc -%if 0%{?el7} -BuildRequires: python-sphinx -BuildRequires: python2-sphinx-bootstrap-theme -%else BuildRequires: python3-sphinx-bootstrap-theme BuildRequires: python3-sphinx -%endif Requires: lemonldap-ng-common = %{version}-%{release} Requires: lemonldap-ng-doc = %{version}-%{release} @@ -240,8 +232,7 @@ Requires: lemonldap-ng-manager = %{version}-%{release} Requires: lemonldap-ng-portal = %{version}-%{release} Requires: lemonldap-ng-test = %{version}-%{release} -%if 0%{?with_selinux} && ! 0%{?el7} -# ! Not available in Centos7, you need to install lemonldap-ng-selinux manually +%if 0%{?with_selinux} # This ensures that the *-selinux package and all it’s dependencies are not pulled # into containers and other systems that do not use SELinux Requires: (%{name}-selinux = %{version}-%{release} if selinux-policy-%{selinuxtype}) @@ -250,8 +241,7 @@ Requires: (%{name}-selinux = %{version}-%{release} if selinux-policy-%{se # Setup requires filtering %{?perl_default_filter} -%{?el7:%global __requires_exclude perl\\(Web::ID|perl\\(Sentry::Raven} -%{!?el7:%global __requires_exclude perl\\(Apache2::|perl\\(APR::Table\\)} +%global __requires_exclude perl\\(Apache2::|perl\\(APR::Table\\) %description @@ -267,12 +257,6 @@ Requires: perl(Apache::Session::Browseable) Requires: perl(Cache::Cache) Requires: perl(IO::String) Requires: perl(String::Random) -%if 0%{?el7} -Requires(post): httpd -Requires: mod_fcgid -Requires: perl(mod_perl2) -Requires: perl(LWP::Protocol::https) -%else Requires: (httpd or nginx) Requires: httpd-filesystem Requires: nginx-filesystem @@ -281,7 +265,6 @@ Requires: (perl(mod_perl2) if httpd) Requires: (perl(Apache2::ServerRec) if httpd) Recommends: perl(LWP::Protocol::https) %{?fedora:Recommends: perl(Net::MQTT::Simple)} -%endif Obsoletes: perl-Lemonldap-NG-Common < %{version}-%{release} Provides: perl-Lemonldap-NG-Common = %{version}-%{release} Obsoletes: lemonldap-ng-conf < %{version}-%{release} @@ -300,7 +283,6 @@ This package contains HTML documentation. %package handler Summary: LemonLDAP-NG handler Requires: lemonldap-ng-common = %{version}-%{release} -%if 0%{!?el7} Requires: (perl(Apache2::Connection) if httpd) Requires: (perl(Apache2::Const) if httpd) Requires: (perl(Apache2::Filter) if httpd) @@ -310,7 +292,6 @@ Requires: (perl(Apache2::RequestRec) if httpd) Requires: (perl(Apache2::RequestUtil) if httpd) Requires: (perl(Apache2::ServerUtil) if httpd) Requires: (perl(APR::Table) if httpd) -%endif Obsoletes: lemonldap-ng-nginx < %{version}-%{release} Provides: lemonldap-ng-nginx = %{version}-%{release} Obsoletes: perl-Lemonldap-NG-Handler < %{version}-%{release} @@ -341,16 +322,6 @@ This package deploys the administration interface and sessions explorer. %package portal Summary: LemonLDAP-NG authentication portal Requires: lemonldap-ng-common = %{version}-%{release} -%if 0%{?el7} -# SAML -Requires: perl(Glib) -Requires: perl(Lasso) -# Facebook -Requires: perl(Net::Facebook::Oauth2) -# OpenID -Requires: perl(Net::OAuth) -Requires: perl(Net::OpenID::Consumer) -%else # Yubikey Recommends: perl(Auth::Yubikey_WebClient) # Fido2 @@ -368,7 +339,6 @@ Recommends: perl(Net::Facebook::Oauth2) # OpenID Recommends: perl(Net::OAuth) Recommends: perl(Net::OpenID::Consumer) -%endif Provides: bundled(fontawesome-fonts) = 4.7.0 Provides: bundled(js-bootstrap) = 4.5.2 Provides: bundled(js-fingerprint2) = 2.1.4 @@ -396,11 +366,7 @@ This package deploys small test applications. Summary: LemonLDAP-NG FastCGI Server Requires: lemonldap-ng-common = %{version}-%{release} Requires: perl(FCGI::ProcManager) -%if 0%{?el7} -Requires: mod_fcgid -%else Requires: (mod_fcgid if httpd) -%endif %description fastcgi-server This package deploys files needed to start a FastCGI server. -- GitLab From b7141615b79c679a896fb324a95b1a8ccbbb02d7 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Tue, 2 Jul 2024 10:53:24 +0200 Subject: [PATCH 3/4] Make use of ExtUtils::MakeMaker 6.76 enhancements --- rpm/lemonldap-ng.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/rpm/lemonldap-ng.spec b/rpm/lemonldap-ng.spec index c8226fab49..68bb15034f 100644 --- a/rpm/lemonldap-ng.spec +++ b/rpm/lemonldap-ng.spec @@ -410,7 +410,7 @@ into Lemonldap::NG's SSOaaS service. STORAGECONFFILE=%{lm_storagefile} \ DATADIR=%{lm_vardir} \ CACHEDIR=%{lm_cachedir} \ - PERLOPTIONS="INSTALLDIRS=vendor" + PERLOPTIONS="INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1" %make_build %if 0%{?with_selinux} @@ -457,11 +457,6 @@ bzip2 -9 %{modulename}.pp CHGRP=/usr/bin/true \ PROD=yes -# Remove some unwanted files -find %{buildroot} -name .packlist -exec rm -f {} \; -find %{buildroot} -name perllocal.pod -exec rm -f {} \; -find %{buildroot} -name *.bak -exec rm -f {} \; - # Drop sysvinit script for FastCGI Server rm -f %{buildroot}%{_sysconfdir}/init.d/llng-fastcgi-server -- GitLab From 7f8b33d5f68ad449e3ac26efa86c5e5d4488a6e9 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Tue, 2 Jul 2024 11:14:02 +0200 Subject: [PATCH 4/4] Drop trailing whitespace --- rpm/lemonldap-ng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/lemonldap-ng.spec b/rpm/lemonldap-ng.spec index 68bb15034f..c8e94c08f5 100644 --- a/rpm/lemonldap-ng.spec +++ b/rpm/lemonldap-ng.spec @@ -1037,7 +1037,7 @@ fi - Updated to release 0.9.2. - Using official tar.gz from forge. -* Tue Oct 7 2008 David Hannequin +* Tue Oct 7 2008 David Hannequin - New spec file * Sun Mar 02 2008 Dag Wieers - 0.85-1 -- GitLab