commit: ce5d1baf3e3faf5f97f3c57d236696f7f7e2dfe5 Author: Hank Leininger <hlein <AT> korelogic <DOT> com> AuthorDate: Fri May 2 23:16:50 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri May 23 04:56:39 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce5d1baf
sys-apps/firejail: remove pre-compression of manpages Signed-off-by: Hank Leininger <hlein <AT> korelogic.com> Closes: https://bugs.gentoo.org/955236 Part-of: https://github.com/gentoo/gentoo/pull/41909 Closes: https://github.com/gentoo/gentoo/pull/41909 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/firejail-0.9.74-manpage-nocompress.patch | 52 ++++++++++++++++++++++ sys-apps/firejail/firejail-0.9.74.ebuild | 4 +- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/sys-apps/firejail/files/firejail-0.9.74-manpage-nocompress.patch b/sys-apps/firejail/files/firejail-0.9.74-manpage-nocompress.patch new file mode 100644 index 000000000000..e33076f7cb17 --- /dev/null +++ b/sys-apps/firejail/files/firejail-0.9.74-manpage-nocompress.patch @@ -0,0 +1,52 @@ +--- firejail-0.9.74.orig/Makefile 2025-03-19 05:33:03.000000000 -0600 ++++ firejail-0.9.74/Makefile 2025-05-02 17:03:53.088996160 -0600 +@@ -41,6 +41,8 @@ + MANPAGES5_IN := $(sort $(wildcard src/man/*.5.in)) + MANPAGES1_GZ := $(MANPAGES1_IN:.in=.gz) + MANPAGES5_GZ := $(MANPAGES5_IN:.in=.gz) ++MANPAGES1 := $(MANPAGES1_IN:.in=) ++MANPAGES5 := $(MANPAGES5_IN:.in=) + + SYSCALL_HEADERS := $(sort $(wildcard src/include/syscall*.h)) + +@@ -272,9 +274,9 @@ + ifneq ($(HAVE_MAN),no) + # man pages + $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man1 +- $(INSTALL) -m 0644 -t $(DESTDIR)$(mandir)/man1 $(MANPAGES1_GZ) ++ $(INSTALL) -m 0644 -t $(DESTDIR)$(mandir)/man1 $(MANPAGES1) + $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man5 +- $(INSTALL) -m 0644 -t $(DESTDIR)$(mandir)/man5 $(MANPAGES5_GZ) ++ $(INSTALL) -m 0644 -t $(DESTDIR)$(mandir)/man5 $(MANPAGES5) + endif + # bash completion + $(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/bash-completion/completions +@@ -296,8 +298,8 @@ + $(RM) $(DESTDIR)$(bindir)/jailcheck + $(RM) -r $(DESTDIR)$(libdir)/firejail + $(RM) -r $(DESTDIR)$(datarootdir)/doc/firejail +- $(RM) $(addprefix $(DESTDIR)$(mandir)/man1/,$(notdir $(MANPAGES1_GZ))) +- $(RM) $(addprefix $(DESTDIR)$(mandir)/man5/,$(notdir $(MANPAGES5_GZ))) ++ $(RM) $(addprefix $(DESTDIR)$(mandir)/man1/,$(notdir $(MANPAGES1))) ++ $(RM) $(addprefix $(DESTDIR)$(mandir)/man5/,$(notdir $(MANPAGES5))) + $(RM) $(DESTDIR)$(datarootdir)/bash-completion/completions/firejail + $(RM) $(DESTDIR)$(datarootdir)/bash-completion/completions/firemon + $(RM) $(DESTDIR)$(datarootdir)/bash-completion/completions/firecfg +--- firejail-0.9.74.orig/src/man/Makefile 2024-07-06 05:15:02.000000000 -0600 ++++ firejail-0.9.74/src/man/Makefile 2025-05-02 17:01:25.034878424 -0600 +@@ -9,7 +9,8 @@ + MOD_DIR := $(ROOT)/src/man + MANPAGES_IN := $(sort $(wildcard $(MOD_DIR)/*.in)) + MANPAGES_GZ := $(MANPAGES_IN:.in=.gz) +-TARGET = $(MANPAGES_GZ) ++MANPAGES := $(MANPAGES_IN:.in=) ++TARGET = $(MANPAGES) + + .PHONY: all + all: $(TARGET) +@@ -27,4 +28,4 @@ + @$(GZIP) -n9 $< + + .PHONY: clean +-clean:; $(RM) *.1 *.5 *.gz ++clean:; $(RM) *.1 *.5 diff --git a/sys-apps/firejail/firejail-0.9.74.ebuild b/sys-apps/firejail/firejail-0.9.74.ebuild index 88c870378fea..5816310371a1 100644 --- a/sys-apps/firejail/firejail-0.9.74.ebuild +++ b/sys-apps/firejail/firejail-0.9.74.ebuild @@ -43,6 +43,7 @@ DEPEND=" PATCHES=( "${FILESDIR}/${PN}-0.9.70-envlimits.patch" "${FILESDIR}/${PN}-0.9.74-firecfg.config.patch" + "${FILESDIR}/${PN}-0.9.74-manpage-nocompress.patch" ) pkg_setup() { @@ -72,9 +73,6 @@ src_prepare() { sed -i -r -e "s:/usr/share/doc/firejail([^-]|\$):/usr/share/doc/${PF}\1:" "${file}" || die done - # remove compression of man pages - sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile || die - if use contrib; then python_fix_shebang -f contrib/*.py fi
