diff --git a/.gitignore b/.gitignore index c18ebc9..dd5cda5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /ipsilon-aa89b1fdaaf343165c593fa4d1aa231eba69211f.tar.gz /ipsilon-171ffda16f92a3721c74f98ec36e7a2d68c5bdfc.tar.gz /ipsilon-f99a7d4a31346780cc8fc84604d2d661bb74fc77.tar.gz +/ipsilon-c90a76b2063eb99b944dbe15a1599e527626a4bd.tar.gz diff --git a/1001-Revert-Move-Ipsilon-libexec-content-to-a-subdirector.patch b/1001-Revert-Move-Ipsilon-libexec-content-to-a-subdirector.patch new file mode 100644 index 0000000..9f1d4d4 --- /dev/null +++ b/1001-Revert-Move-Ipsilon-libexec-content-to-a-subdirector.patch @@ -0,0 +1,80 @@ +From a5383aff1ac4094f88631cd429ecb7f4f32e8dd2 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Thu, 18 Jun 2020 12:54:21 -0400 +Subject: [PATCH] Revert "Move Ipsilon libexec content to a subdirectory" + +This downstream-only revert is only until Ipsilon 3.0 is released, +as this breaks existing configurations. + +This reverts commit f673c9f48019c0c41fe1ad3fcdefc07583b4446c. +--- + contrib/fedora/ipsilon.spec | 6 +++--- + examples/apache.conf | 4 ++-- + ipsilon/install/ipsilon-server-install | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/contrib/fedora/ipsilon.spec b/contrib/fedora/ipsilon.spec +index 12f552e..56720ad 100644 +--- a/contrib/fedora/ipsilon.spec ++++ b/contrib/fedora/ipsilon.spec +@@ -261,13 +261,13 @@ CFLAGS="%{optflags}" %{__python} setup.py build + %install + %{__python} setup.py install --skip-build --root %{buildroot} + mkdir -p %{buildroot}%{_sbindir} +-mkdir -p %{buildroot}%{_libexecdir}/ipsilon ++mkdir -p %{buildroot}%{_libexecdir} + mkdir -p %{buildroot}%{_defaultdocdir} + mkdir -p %{buildroot}%{_localstatedir}/cache/ipsilon + # These 0700 permissions are because ipsilon will store private keys here + install -d -m 0700 %{buildroot}%{_sharedstatedir}/ipsilon + install -d -m 0700 %{buildroot}%{_sysconfdir}/ipsilon +-mv %{buildroot}/%{_bindir}/ipsilon %{buildroot}/%{_libexecdir}/ipsilon ++mv %{buildroot}/%{_bindir}/ipsilon %{buildroot}/%{_libexecdir} + mv %{buildroot}/%{_bindir}/ipsilon-db2conf %{buildroot}/%{_sbindir} + mv %{buildroot}/%{_bindir}/ipsilon-server-install %{buildroot}/%{_sbindir} + mv %{buildroot}/%{_bindir}/ipsilon-upgrade-database %{buildroot}/%{_sbindir} +@@ -359,7 +359,7 @@ fi + %{_datadir}/ipsilon/ui/js + %{_datadir}/ipsilon/ui/fonts + %{_datadir}/ipsilon/ui/fonts-local +-%{_libexecdir}/ipsilon/ ++%{_libexecdir}/ipsilon + %dir %attr(0751,root,root) %{_sharedstatedir}/ipsilon + %dir %attr(0751,root,root) %{_sysconfdir}/ipsilon + %dir %attr(0750,ipsilon,apache) %{_localstatedir}/cache/ipsilon +diff --git a/examples/apache.conf b/examples/apache.conf +index 90ed11f..cacbf70 100644 +--- a/examples/apache.conf ++++ b/examples/apache.conf +@@ -1,5 +1,5 @@ + Alias /idp/ui /usr/share/ipsilon/ui +-WSGIScriptAlias /idp /usr/libexec/ipsilon/ipsilon.py ++WSGIScriptAlias /idp /usr/libexec/ipsilon.py + WSGIDaemonProcess idp maximum-requests=2 user=ipsilon group=ipsilon + WSGIProcessGroup idp + +@@ -15,7 +15,7 @@ WSGIProcessGroup idp + ErrorDocument 500 /idp/login/gssapi/failed + + +- ++ + Order allow,deny + Allow from all + Require all granted +diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install +index b79db87..5f896dd 100755 +--- a/ipsilon/install/ipsilon-server-install ++++ b/ipsilon/install/ipsilon-server-install +@@ -31,7 +31,7 @@ TEMPLATES = '/usr/share/ipsilon/templates/install' + CONFDIR = '/etc/ipsilon' + DATADIR = '/var/lib/ipsilon' + HTTPDCONFD = '/etc/httpd/conf.d' +-BINDIR = '/usr/libexec/ipsilon' ++BINDIR = '/usr/libexec' + STATICDIR = '/usr/share/ipsilon' + CACHEDIR = '/var/cache/ipsilon' + WSGI_SOCKET_PREFIX = None +-- +2.26.2 + diff --git a/ipsilon.spec b/ipsilon.spec index 76a34c2..1c2404c 100644 --- a/ipsilon.spec +++ b/ipsilon.spec @@ -1,14 +1,14 @@ # Bundling request for bootstrap/patternfly: https://fedorahosted.org/fpc/ticket/483 -%global snapdate 20200428 -%global commit f99a7d4a31346780cc8fc84604d2d661bb74fc77 +%global snapdate 20200618 +%global commit c90a76b2063eb99b944dbe15a1599e527626a4bd %global shortcommit %(c=%{commit}; echo ${c:0:7}) # post-release format... %global snaprel %{?snapdate:.git%{snapdate}.%{shortcommit}} # for rpmdev-bumpspec -%global baserelease 13 +%global baserelease 14 Name: ipsilon Version: 2.1.0 @@ -23,6 +23,10 @@ Source0: %{url}/archive/%{commit}/%{name}-%{commit}.tar.gz Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz %endif +# Fedora-specific fixes +## Temporarily revert file path changes, those are for Ipsilon 3.0 release +Patch1001: 1001-Revert-Move-Ipsilon-libexec-content-to-a-subdirector.patch + BuildArch: noarch @@ -474,6 +478,9 @@ exit 0 %changelog +* Thu Jun 18 2020 Neal Gompa - 2.1.0-14.git20200618.c90a76b +- Bump to new snapshot + * Tue May 26 2020 Miro HronĨok - 2.1.0-13.git20200428.f99a7d4 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 831fda3..7e48966 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ipsilon-f99a7d4a31346780cc8fc84604d2d661bb74fc77.tar.gz) = ffa3ff05c82d5c80dc79071209b9a9dfb092aa198ec8cfaf3a93aae13e271ff9a5039260c0eab88cfafa5d61d5f5a0bdfbb9fe34eee16c8ab53e09515901b6c2 +SHA512 (ipsilon-c90a76b2063eb99b944dbe15a1599e527626a4bd.tar.gz) = 1f95afab478857268e45acd66aa7215c149745a32aca24d6f32719acb9fda87cf0fb0f3aec6a31accb0e98c88f618d82ff0d6e9e0237fd10bcef0ee1e5487cdb