From b1db4832ee9b1c3f18351055c771880012567baf Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 13 Jun 2019 09:20:47 -0500 Subject: [PATCH] Switch to Cirrus CI --- .cirrus.yml | 19 +++++++++++++++++++ SOURCES/00-base.conf => 00-base.conf | 0 SOURCES/00-dav.conf => 00-dav.conf | 0 SOURCES/00-lua.conf => 00-lua.conf | 0 SOURCES/00-mpm.conf => 00-mpm.conf | 0 SOURCES/00-optional.conf => 00-optional.conf | 0 SOURCES/00-proxy.conf => 00-proxy.conf | 0 .../00-proxyhtml.conf => 00-proxyhtml.conf | 0 SOURCES/00-ssl.conf => 00-ssl.conf | 0 SOURCES/00-systemd.conf => 00-systemd.conf | 0 SOURCES/01-cgi.conf => 01-cgi.conf | 0 SOURCES/01-ldap.conf => 01-ldap.conf | 0 SOURCES/01-session.conf => 01-session.conf | 0 .../10-listen443.conf => 10-listen443.conf | 0 SOURCES/README.confd => README.confd | 0 SOURCES/README.confmod => README.confmod | 0 ...tion-configtest.sh => action-configtest.sh | 0 .../action-graceful.sh => action-graceful.sh | 0 .../htcacheclean.init => htcacheclean.init | 0 ...cacheclean.service => htcacheclean.service | 0 ...cacheclean.sysconf => htcacheclean.sysconf | 0 ...4.1-apctl.patch => httpd-2.4.1-apctl.patch | 0 ...limit.patch => httpd-2.4.1-corelimit.patch | 0 ...deplibs.patch => httpd-2.4.1-deplibs.patch | 0 ...-sigint.patch => httpd-2.4.10-sigint.patch | 0 ...patch => httpd-2.4.10-sslciphdefault.patch | 0 ...ch => httpd-2.4.17-socket-activation.patch | 0 ...4.2-icons.patch => httpd-2.4.2-icons.patch | 0 ...patch => httpd-2.4.25-detect-systemd.patch | 0 ...elinux.patch => httpd-2.4.25-selinux.patch | 0 ...d.patch => httpd-2.4.3-apctl-systemd.patch | 0 ...-export.patch => httpd-2.4.33-export.patch | 0 ...ystemd.patch => httpd-2.4.33-systemd.patch | 0 ...38878.patch => httpd-2.4.34-r1738878.patch | 0 ....patch => httpd-2.4.35-layout-legacy.patch | 0 ...ax.patch => httpd-2.4.4-cachehardmax.patch | 0 ...7344+.patch => httpd-2.4.4-r1337344+.patch | 0 ...2.4.9-apxs.patch => httpd-2.4.9-apxs.patch | 0 ...d-ssl-pass-dialog => httpd-ssl-pass-dialog | 0 SOURCES/httpd.conf => httpd.conf | 0 SOURCES/httpd.init => httpd.init | 0 SOURCES/httpd.logrotate => httpd.logrotate | 0 ...logrotate-legacy => httpd.logrotate-legacy | 0 SOURCES/httpd.service => httpd.service | 0 .../httpd.service.xml => httpd.service.xml | 0 SOURCES/httpd.socket => httpd.socket | 0 SOURCES/httpd.sysconf => httpd.sysconf | 0 SOURCES/httpd.tmpfiles => httpd.tmpfiles | 0 SPECS/httpd24u.spec => httpd24u.spec | 2 +- SOURCES/manual.conf => manual.conf | 0 SOURCES/mkstatus.sh => mkstatus.sh | 0 SOURCES/pullrev.sh => pullrev.sh | 0 SOURCES/ssl.conf => ssl.conf | 0 SOURCES/userdir.conf => userdir.conf | 0 SOURCES/welcome.conf => welcome.conf | 0 55 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 .cirrus.yml rename SOURCES/00-base.conf => 00-base.conf (100%) rename SOURCES/00-dav.conf => 00-dav.conf (100%) rename SOURCES/00-lua.conf => 00-lua.conf (100%) rename SOURCES/00-mpm.conf => 00-mpm.conf (100%) rename SOURCES/00-optional.conf => 00-optional.conf (100%) rename SOURCES/00-proxy.conf => 00-proxy.conf (100%) rename SOURCES/00-proxyhtml.conf => 00-proxyhtml.conf (100%) rename SOURCES/00-ssl.conf => 00-ssl.conf (100%) rename SOURCES/00-systemd.conf => 00-systemd.conf (100%) rename SOURCES/01-cgi.conf => 01-cgi.conf (100%) rename SOURCES/01-ldap.conf => 01-ldap.conf (100%) rename SOURCES/01-session.conf => 01-session.conf (100%) rename SOURCES/10-listen443.conf => 10-listen443.conf (100%) rename SOURCES/README.confd => README.confd (100%) rename SOURCES/README.confmod => README.confmod (100%) rename SOURCES/action-configtest.sh => action-configtest.sh (100%) rename SOURCES/action-graceful.sh => action-graceful.sh (100%) rename SOURCES/htcacheclean.init => htcacheclean.init (100%) rename SOURCES/htcacheclean.service => htcacheclean.service (100%) rename SOURCES/htcacheclean.sysconf => htcacheclean.sysconf (100%) rename SOURCES/httpd-2.4.1-apctl.patch => httpd-2.4.1-apctl.patch (100%) rename SOURCES/httpd-2.4.1-corelimit.patch => httpd-2.4.1-corelimit.patch (100%) rename SOURCES/httpd-2.4.1-deplibs.patch => httpd-2.4.1-deplibs.patch (100%) rename SOURCES/httpd-2.4.10-sigint.patch => httpd-2.4.10-sigint.patch (100%) rename SOURCES/httpd-2.4.10-sslciphdefault.patch => httpd-2.4.10-sslciphdefault.patch (100%) rename SOURCES/httpd-2.4.17-socket-activation.patch => httpd-2.4.17-socket-activation.patch (100%) rename SOURCES/httpd-2.4.2-icons.patch => httpd-2.4.2-icons.patch (100%) rename SOURCES/httpd-2.4.25-detect-systemd.patch => httpd-2.4.25-detect-systemd.patch (100%) rename SOURCES/httpd-2.4.25-selinux.patch => httpd-2.4.25-selinux.patch (100%) rename SOURCES/httpd-2.4.3-apctl-systemd.patch => httpd-2.4.3-apctl-systemd.patch (100%) rename SOURCES/httpd-2.4.33-export.patch => httpd-2.4.33-export.patch (100%) rename SOURCES/httpd-2.4.33-systemd.patch => httpd-2.4.33-systemd.patch (100%) rename SOURCES/httpd-2.4.34-r1738878.patch => httpd-2.4.34-r1738878.patch (100%) rename SOURCES/httpd-2.4.35-layout-legacy.patch => httpd-2.4.35-layout-legacy.patch (100%) rename SOURCES/httpd-2.4.4-cachehardmax.patch => httpd-2.4.4-cachehardmax.patch (100%) rename SOURCES/httpd-2.4.4-r1337344+.patch => httpd-2.4.4-r1337344+.patch (100%) rename SOURCES/httpd-2.4.9-apxs.patch => httpd-2.4.9-apxs.patch (100%) rename SOURCES/httpd-ssl-pass-dialog => httpd-ssl-pass-dialog (100%) rename SOURCES/httpd.conf => httpd.conf (100%) rename SOURCES/httpd.init => httpd.init (100%) rename SOURCES/httpd.logrotate => httpd.logrotate (100%) rename SOURCES/httpd.logrotate-legacy => httpd.logrotate-legacy (100%) rename SOURCES/httpd.service => httpd.service (100%) rename SOURCES/httpd.service.xml => httpd.service.xml (100%) rename SOURCES/httpd.socket => httpd.socket (100%) rename SOURCES/httpd.sysconf => httpd.sysconf (100%) rename SOURCES/httpd.tmpfiles => httpd.tmpfiles (100%) rename SPECS/httpd24u.spec => httpd24u.spec (99%) rename SOURCES/manual.conf => manual.conf (100%) rename SOURCES/mkstatus.sh => mkstatus.sh (100%) rename SOURCES/pullrev.sh => pullrev.sh (100%) rename SOURCES/ssl.conf => ssl.conf (100%) rename SOURCES/userdir.conf => userdir.conf (100%) rename SOURCES/welcome.conf => welcome.conf (100%) diff --git a/.cirrus.yml b/.cirrus.yml new file mode 100644 index 0000000..9cb1f4d --- /dev/null +++ b/.cirrus.yml @@ -0,0 +1,19 @@ +task: + env: + matrix: + - RELEASEVER: 6 + - RELEASEVER: 7 + name: el$RELEASEVER + container: + image: centos:$RELEASEVER + epel_script: yum --assumeyes install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm -E %rhel).noarch.rpm + toolchain_script: yum --assumeyes install yum-utils rpmdevtools @buildsys-build + sources_script: spectool --get-files $CIRRUS_REPO_NAME.spec + srpm_script: rpmbuild -bs --define "_sourcedir $PWD" --define "_specdir $PWD" --define "dist .el$RELEASEVER.ius" --define "vendor IUS" $CIRRUS_REPO_NAME.spec + builddep_script: yum-builddep --assumeyes $HOME/rpmbuild/SRPMS/$CIRRUS_REPO_NAME-*.src.rpm + rpm_script: rpmbuild -bb --define "_sourcedir $PWD" --define "_specdir $PWD" --define "dist .el$RELEASEVER.ius" --define "vendor IUS" $CIRRUS_REPO_NAME.spec + gather_script: + - mv --verbose $HOME/rpmbuild/SRPMS/*.src.rpm . + - mv --verbose $HOME/rpmbuild/RPMS/*/*.rpm . + results_artifacts: + path: '*.rpm' diff --git a/SOURCES/00-base.conf b/00-base.conf similarity index 100% rename from SOURCES/00-base.conf rename to 00-base.conf diff --git a/SOURCES/00-dav.conf b/00-dav.conf similarity index 100% rename from SOURCES/00-dav.conf rename to 00-dav.conf diff --git a/SOURCES/00-lua.conf b/00-lua.conf similarity index 100% rename from SOURCES/00-lua.conf rename to 00-lua.conf diff --git a/SOURCES/00-mpm.conf b/00-mpm.conf similarity index 100% rename from SOURCES/00-mpm.conf rename to 00-mpm.conf diff --git a/SOURCES/00-optional.conf b/00-optional.conf similarity index 100% rename from SOURCES/00-optional.conf rename to 00-optional.conf diff --git a/SOURCES/00-proxy.conf b/00-proxy.conf similarity index 100% rename from SOURCES/00-proxy.conf rename to 00-proxy.conf diff --git a/SOURCES/00-proxyhtml.conf b/00-proxyhtml.conf similarity index 100% rename from SOURCES/00-proxyhtml.conf rename to 00-proxyhtml.conf diff --git a/SOURCES/00-ssl.conf b/00-ssl.conf similarity index 100% rename from SOURCES/00-ssl.conf rename to 00-ssl.conf diff --git a/SOURCES/00-systemd.conf b/00-systemd.conf similarity index 100% rename from SOURCES/00-systemd.conf rename to 00-systemd.conf diff --git a/SOURCES/01-cgi.conf b/01-cgi.conf similarity index 100% rename from SOURCES/01-cgi.conf rename to 01-cgi.conf diff --git a/SOURCES/01-ldap.conf b/01-ldap.conf similarity index 100% rename from SOURCES/01-ldap.conf rename to 01-ldap.conf diff --git a/SOURCES/01-session.conf b/01-session.conf similarity index 100% rename from SOURCES/01-session.conf rename to 01-session.conf diff --git a/SOURCES/10-listen443.conf b/10-listen443.conf similarity index 100% rename from SOURCES/10-listen443.conf rename to 10-listen443.conf diff --git a/SOURCES/README.confd b/README.confd similarity index 100% rename from SOURCES/README.confd rename to README.confd diff --git a/SOURCES/README.confmod b/README.confmod similarity index 100% rename from SOURCES/README.confmod rename to README.confmod diff --git a/SOURCES/action-configtest.sh b/action-configtest.sh similarity index 100% rename from SOURCES/action-configtest.sh rename to action-configtest.sh diff --git a/SOURCES/action-graceful.sh b/action-graceful.sh similarity index 100% rename from SOURCES/action-graceful.sh rename to action-graceful.sh diff --git a/SOURCES/htcacheclean.init b/htcacheclean.init similarity index 100% rename from SOURCES/htcacheclean.init rename to htcacheclean.init diff --git a/SOURCES/htcacheclean.service b/htcacheclean.service similarity index 100% rename from SOURCES/htcacheclean.service rename to htcacheclean.service diff --git a/SOURCES/htcacheclean.sysconf b/htcacheclean.sysconf similarity index 100% rename from SOURCES/htcacheclean.sysconf rename to htcacheclean.sysconf diff --git a/SOURCES/httpd-2.4.1-apctl.patch b/httpd-2.4.1-apctl.patch similarity index 100% rename from SOURCES/httpd-2.4.1-apctl.patch rename to httpd-2.4.1-apctl.patch diff --git a/SOURCES/httpd-2.4.1-corelimit.patch b/httpd-2.4.1-corelimit.patch similarity index 100% rename from SOURCES/httpd-2.4.1-corelimit.patch rename to httpd-2.4.1-corelimit.patch diff --git a/SOURCES/httpd-2.4.1-deplibs.patch b/httpd-2.4.1-deplibs.patch similarity index 100% rename from SOURCES/httpd-2.4.1-deplibs.patch rename to httpd-2.4.1-deplibs.patch diff --git a/SOURCES/httpd-2.4.10-sigint.patch b/httpd-2.4.10-sigint.patch similarity index 100% rename from SOURCES/httpd-2.4.10-sigint.patch rename to httpd-2.4.10-sigint.patch diff --git a/SOURCES/httpd-2.4.10-sslciphdefault.patch b/httpd-2.4.10-sslciphdefault.patch similarity index 100% rename from SOURCES/httpd-2.4.10-sslciphdefault.patch rename to httpd-2.4.10-sslciphdefault.patch diff --git a/SOURCES/httpd-2.4.17-socket-activation.patch b/httpd-2.4.17-socket-activation.patch similarity index 100% rename from SOURCES/httpd-2.4.17-socket-activation.patch rename to httpd-2.4.17-socket-activation.patch diff --git a/SOURCES/httpd-2.4.2-icons.patch b/httpd-2.4.2-icons.patch similarity index 100% rename from SOURCES/httpd-2.4.2-icons.patch rename to httpd-2.4.2-icons.patch diff --git a/SOURCES/httpd-2.4.25-detect-systemd.patch b/httpd-2.4.25-detect-systemd.patch similarity index 100% rename from SOURCES/httpd-2.4.25-detect-systemd.patch rename to httpd-2.4.25-detect-systemd.patch diff --git a/SOURCES/httpd-2.4.25-selinux.patch b/httpd-2.4.25-selinux.patch similarity index 100% rename from SOURCES/httpd-2.4.25-selinux.patch rename to httpd-2.4.25-selinux.patch diff --git a/SOURCES/httpd-2.4.3-apctl-systemd.patch b/httpd-2.4.3-apctl-systemd.patch similarity index 100% rename from SOURCES/httpd-2.4.3-apctl-systemd.patch rename to httpd-2.4.3-apctl-systemd.patch diff --git a/SOURCES/httpd-2.4.33-export.patch b/httpd-2.4.33-export.patch similarity index 100% rename from SOURCES/httpd-2.4.33-export.patch rename to httpd-2.4.33-export.patch diff --git a/SOURCES/httpd-2.4.33-systemd.patch b/httpd-2.4.33-systemd.patch similarity index 100% rename from SOURCES/httpd-2.4.33-systemd.patch rename to httpd-2.4.33-systemd.patch diff --git a/SOURCES/httpd-2.4.34-r1738878.patch b/httpd-2.4.34-r1738878.patch similarity index 100% rename from SOURCES/httpd-2.4.34-r1738878.patch rename to httpd-2.4.34-r1738878.patch diff --git a/SOURCES/httpd-2.4.35-layout-legacy.patch b/httpd-2.4.35-layout-legacy.patch similarity index 100% rename from SOURCES/httpd-2.4.35-layout-legacy.patch rename to httpd-2.4.35-layout-legacy.patch diff --git a/SOURCES/httpd-2.4.4-cachehardmax.patch b/httpd-2.4.4-cachehardmax.patch similarity index 100% rename from SOURCES/httpd-2.4.4-cachehardmax.patch rename to httpd-2.4.4-cachehardmax.patch diff --git a/SOURCES/httpd-2.4.4-r1337344+.patch b/httpd-2.4.4-r1337344+.patch similarity index 100% rename from SOURCES/httpd-2.4.4-r1337344+.patch rename to httpd-2.4.4-r1337344+.patch diff --git a/SOURCES/httpd-2.4.9-apxs.patch b/httpd-2.4.9-apxs.patch similarity index 100% rename from SOURCES/httpd-2.4.9-apxs.patch rename to httpd-2.4.9-apxs.patch diff --git a/SOURCES/httpd-ssl-pass-dialog b/httpd-ssl-pass-dialog similarity index 100% rename from SOURCES/httpd-ssl-pass-dialog rename to httpd-ssl-pass-dialog diff --git a/SOURCES/httpd.conf b/httpd.conf similarity index 100% rename from SOURCES/httpd.conf rename to httpd.conf diff --git a/SOURCES/httpd.init b/httpd.init similarity index 100% rename from SOURCES/httpd.init rename to httpd.init diff --git a/SOURCES/httpd.logrotate b/httpd.logrotate similarity index 100% rename from SOURCES/httpd.logrotate rename to httpd.logrotate diff --git a/SOURCES/httpd.logrotate-legacy b/httpd.logrotate-legacy similarity index 100% rename from SOURCES/httpd.logrotate-legacy rename to httpd.logrotate-legacy diff --git a/SOURCES/httpd.service b/httpd.service similarity index 100% rename from SOURCES/httpd.service rename to httpd.service diff --git a/SOURCES/httpd.service.xml b/httpd.service.xml similarity index 100% rename from SOURCES/httpd.service.xml rename to httpd.service.xml diff --git a/SOURCES/httpd.socket b/httpd.socket similarity index 100% rename from SOURCES/httpd.socket rename to httpd.socket diff --git a/SOURCES/httpd.sysconf b/httpd.sysconf similarity index 100% rename from SOURCES/httpd.sysconf rename to httpd.sysconf diff --git a/SOURCES/httpd.tmpfiles b/httpd.tmpfiles similarity index 100% rename from SOURCES/httpd.tmpfiles rename to httpd.tmpfiles diff --git a/SPECS/httpd24u.spec b/httpd24u.spec similarity index 99% rename from SPECS/httpd24u.spec rename to httpd24u.spec index 01a4452..80d5533 100644 --- a/SPECS/httpd24u.spec +++ b/httpd24u.spec @@ -23,7 +23,7 @@ Summary: Apache HTTP Server Name: httpd24u Version: 2.4.39 -Release: 1.ius%{?dist} +Release: 1%{?dist} URL: https://httpd.apache.org/ Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source2: httpd.logrotate diff --git a/SOURCES/manual.conf b/manual.conf similarity index 100% rename from SOURCES/manual.conf rename to manual.conf diff --git a/SOURCES/mkstatus.sh b/mkstatus.sh similarity index 100% rename from SOURCES/mkstatus.sh rename to mkstatus.sh diff --git a/SOURCES/pullrev.sh b/pullrev.sh similarity index 100% rename from SOURCES/pullrev.sh rename to pullrev.sh diff --git a/SOURCES/ssl.conf b/ssl.conf similarity index 100% rename from SOURCES/ssl.conf rename to ssl.conf diff --git a/SOURCES/userdir.conf b/userdir.conf similarity index 100% rename from SOURCES/userdir.conf rename to userdir.conf diff --git a/SOURCES/welcome.conf b/welcome.conf similarity index 100% rename from SOURCES/welcome.conf rename to welcome.conf