Accepting request 870258 from home:pmonrealgonzalez:branches:security:tls

- Use gzip instead of xz in obscpio and sources

- Do not build the manpages to avoid build cycles
- Add crypto-policies-no-build-manpages.patch

OBS-URL: https://build.opensuse.org/request/show/870258
OBS-URL: https://build.opensuse.org/package/show/security:tls/crypto-policies?expand=0&rev=8

_service

@@ -9,7 +9,7 @@
   <service name="tar" mode="buildtime"/>
   <service name="recompress" mode="buildtime">
     <param name="file">*.tar</param>
-    <param name="compression">xz</param>
+    <param name="compression">gz</param>
   </service>
   <service name="set_version" mode="disabled"/>
 </services>

crypto-policies-no-build-manpages.patch

@@ -0,0 +1,32 @@
+Index: fedora-crypto-policies-master/Makefile
+===================================================================
+--- fedora-crypto-policies-master.orig/Makefile	2020-09-23 08:49:28.000000000 +0200
++++ fedora-crypto-policies-master/Makefile	2020-11-12 10:00:52.418204054 +0100
+@@ -60,8 +60,8 @@ clean:
+ 	rm -rf output
+ 
+ %: %.txt
+-	asciidoc -v -d manpage -b docbook $<
+-	xsltproc --nonet -o $@ /etc/asciidoc/docbook-xsl/manpage.xsl $@.xml
++	# asciidoc -v -d manpage -b docbook $<
++	# xsltproc --nonet -o $@ /etc/asciidoc/docbook-xsl/manpage.xsl $@.xml
+ 
+ dist:
+ 	rm -rf crypto-policies && git clone . crypto-policies && rm -rf crypto-policies/.git/ && tar -czf crypto-policies-git$(VERSION).tar.gz crypto-policies && rm -rf crypto-policies
+Index: fedora-crypto-policies-master
+===================================================================
+--- fedora-crypto-policies-master.orig/Makefile
++++ fedora-crypto-policies-master/Makefile
+@@ -21,9 +21,9 @@ install: $(MANPAGES)
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man7
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man8
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+-	install -p -m 644 $(MAN7PAGES) $(DESTDIR)$(MANDIR)/man7
+-	install -p -m 644 $(MAN8PAGES) $(DESTDIR)$(MANDIR)/man8
+-	install -p -m 755 $(SCRIPTS) $(DESTDIR)$(BINDIR)
++# install -p -m 644 $(MAN7PAGES) $(DESTDIR)$(MANDIR)/man7
++# install -p -m 644 $(MAN8PAGES) $(DESTDIR)$(MANDIR)/man8
++# install -p -m 755 $(SCRIPTS) $(DESTDIR)$(BINDIR)
+ 	mkdir -p $(DESTDIR)$(DIR)/
+ 	install -p -m 644 default-config $(DESTDIR)$(DIR)
+ 	install -p -m 644 output/reload-cmds.sh $(DESTDIR)$(DIR)

crypto-policies.7.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbc5e573f2bd5dad2e405f9de35cc94c469d434b466b40890d87400f7f4cb8c1
+size 6127

crypto-policies.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Feb  8 11:22:31 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
+
+- Use gzip instead of xz in obscpio and sources
+
+-------------------------------------------------------------------
+Fri Feb  5 10:57:46 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
+
+- Do not build the manpages to avoid build cycles
+- Add crypto-policies-no-build-manpages.patch
+
 -------------------------------------------------------------------
 Tue Feb  2 17:38:27 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 

crypto-policies.spec

@@ -24,21 +24,26 @@ Summary:        System-wide crypto policies
 License:        LGPL-2.1-or-later
 Group:          Productivity/Networking/Security
 URL:            https://gitlab.com/redhat-crypto/fedora-%{name}
-Source0:        fedora-%{name}-%{version}.tar.xz
+Source0:        fedora-%{name}-%{version}.tar.gz
 Source1:        README.SUSE
+Source2:        crypto-policies.7.gz
+Source3:        fips-mode-setup.8.gz
+Source4:        fips-finish-install.8.gz
+Source5:        update-crypto-policies.8.gz
 Patch0:         crypto-policies-asciidoc.patch
 Patch1:         crypto-policies-typos.patch
 Patch2:         crypto-policies-test_supported_modules_only.patch
-BuildRequires:  asciidoc
+Patch3:         crypto-policies-no-build-manpages.patch
+# BuildRequires:  asciidoc
 # BuildRequires:  gnutls >= 3.6.0
-BuildRequires:  java-devel
+# BuildRequires:  java-devel
-BuildRequires:  libxslt
+# BuildRequires:  libxslt
 # BuildRequires:  openssl
-BuildRequires:  perl
+# BuildRequires:  perl
-BuildRequires:  python3-devel >= 3.6
+# BuildRequires:  python3-devel >= 3.6
-BuildRequires:  perl(File::Copy)
+# BuildRequires:  perl(File::Copy)
-BuildRequires:  perl(File::Temp)
+# BuildRequires:  perl(File::Temp)
-BuildRequires:  perl(File::Which)
+# BuildRequires:  perl(File::Which)
 # BuildRequires:  perl(File::pushd)
 Recommends:     crypto-policies-scripts
 Conflicts:      gnutls < 3.7.0
@@ -84,6 +89,17 @@ mkdir -p -m 755 %{buildroot}%{_sysconfdir}/crypto-policies/policies/modules/
 mkdir -p -m 755 %{buildroot}%{_bindir}
 
 make DESTDIR=%{buildroot} DIR=%{_datarootdir}/crypto-policies MANDIR=%{_mandir} %{?_smp_mflags} install
+
+# Install the manpages
+mkdir -p -m 755 %{buildroot}%{_mandir}/
+mkdir -p -m 755 %{buildroot}%{_mandir}/man7/
+mkdir -p -m 755 %{buildroot}%{_mandir}/man8/
+cp %{SOURCE2} %{buildroot}%{_mandir}/man7/
+cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{buildroot}%{_mandir}/man8/
+
+# Install the executable files
+install -p -m 755 update-crypto-policies fips-finish-install fips-mode-setup %{buildroot}%{_bindir}/
+
 install -p -m 644 default-config %{buildroot}%{_sysconfdir}/crypto-policies/config
 touch %{buildroot}%{_sysconfdir}/crypto-policies/state/current
 touch %{buildroot}%{_sysconfdir}/crypto-policies/state/CURRENT.pol

fedora-crypto-policies-20210118.b21c811.obscpio

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8855cf9bc7aeb43d4169bde73f25dcf49bbab88cae89c8e6abfadfd26f90a9d3
+oid sha256:4427a57c1c7e2d54c159085fc93cf135b4c45c05097628bfdb1cd74532934416
 size 259083

fips-finish-install.8.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0df0d2341bf1c34847e7a9ed44ece1b6484e2f1daeb3134f16a89914a6a1cfdc
+size 881

fips-mode-setup.8.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de5a21524d5f6ddb030d5349c6bfb0b850ce2360d4f00bd23aaf8a0d9ad9a09d
+size 1124

update-crypto-policies.8.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0151e1a8a5e4bb626284b6a2f93824f849b8d070ed017b6995a20a90f9180b2b
+size 4018