Date: Saturday, November 7, 2020 @ 15:24:34 Author: shibumi Revision: 745870
upgpkg: sysstat 12.4.0-2 fix broken man pages This release fixes the broken man pages by applying a patch. Fixes https://bugs.archlinux.org/task/67703 Added: sysstat/trunk/fe7e338e20f5f533d460f9151eba20250857c350.patch Modified: sysstat/trunk/PKGBUILD ------------------------------------------------+ PKGBUILD | 15 ++-- fe7e338e20f5f533d460f9151eba20250857c350.patch | 73 +++++++++++++++++++++++ 2 files changed, 81 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-11-07 15:23:47 UTC (rev 745869) +++ PKGBUILD 2020-11-07 15:24:34 UTC (rev 745870) @@ -3,7 +3,7 @@ pkgname=sysstat pkgver=12.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('x86_64') url="http://pagesperso-orange.fr/sebastien.godard/" @@ -16,13 +16,16 @@ backup=('etc/conf.d/sysstat' 'etc/conf.d/sysstat.ioconf') source=("http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${pkgver}.tar.xz" - 'lib64-fix.patch') + 'lib64-fix.patch' + 'fe7e338e20f5f533d460f9151eba20250857c350.patch') sha512sums=('68314a50d3ab97c9e0cba27964b83cbc21bf08730a6ca9da655ecbeb574fc8fd83ea69038ec5c66a2b0bb367975f6cf45db840fe8dce69ddc64e64a35d6a1823' - '46ec3eebb12232d30cddba60f16a57cd8d625513cf002d9e501797a6660f9da9cb4116ec81d0c292644fb6d91eb05c7be458da667260b238bcfef532a020b114') + '46ec3eebb12232d30cddba60f16a57cd8d625513cf002d9e501797a6660f9da9cb4116ec81d0c292644fb6d91eb05c7be458da667260b238bcfef532a020b114' + 'ed6cb88e8036f9edc364a194b68b26829d70d40b60d4357cb15cd1b29c7583f563e2cc72f83bfd16e76cf0e08eea3095c035091bb848482ab4aa9e1e0200ff99') prepare() { cd "${srcdir}"/"${pkgname}"-"${pkgver}" - patch -p1 < "${srcdir}"/lib64-fix.patch + patch -p1 < "${srcdir}/lib64-fix.patch" + patch -p1 < "${srcdir}/fe7e338e20f5f533d460f9151eba20250857c350.patch" autoreconf } @@ -29,12 +32,10 @@ build() { cd "${srcdir}"/"${pkgname}"-"${pkgver}" conf_dir=/etc/conf.d ./configure --prefix=/usr \ - --enable-yesterday \ --mandir=/usr/share/man \ - --enable-install-isag \ --enable-install-cron \ --enable-copy-only \ - --disable-man-group + --disable-compress-manpg # patch makefile for FULL RELRO builds sed -e 's|CFLAGS = |CFLAGS += \$(CPPFLAGS) |' -e 's|LFLAGS = |LFLAGS = $(LDFLAGS) |' -i Makefile make Added: fe7e338e20f5f533d460f9151eba20250857c350.patch =================================================================== --- fe7e338e20f5f533d460f9151eba20250857c350.patch (rev 0) +++ fe7e338e20f5f533d460f9151eba20250857c350.patch 2020-11-07 15:24:34 UTC (rev 745870) @@ -0,0 +1,73 @@ +From fe7e338e20f5f533d460f9151eba20250857c350 Mon Sep 17 00:00:00 2001 +From: Sebastien GODARD <syss...@users.noreply.github.com> +Date: Mon, 24 Aug 2020 10:53:24 +0200 +Subject: [PATCH] Fix #272: --disable-compress-manpg option does not work + +Signed-off-by: Sebastien GODARD <syss...@users.noreply.github.com> +--- + Makefile.in | 2 +- + configure | 9 ++++----- + configure.in | 5 ++--- + 3 files changed, 7 insertions(+), 9 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 4741ae4b..096e7eaf 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -383,7 +383,7 @@ ifeq ($(INSTALL_DOC),y) + $(INSTALL_DATA) $(MANGRPARG) man/pidstat.1 $(DESTDIR)$(MAN1_DIR) + rm -f $(DESTDIR)$(MAN1_DIR)/cifsiostat.1* + $(INSTALL_DATA) $(MANGRPARG) man/cifsiostat.1 $(DESTDIR)$(MAN1_DIR) +-ifeq ($(COMPRESS_MANPG),n) ++ifeq ($(COMPRESS_MANPG),y) + $(ZIP) $(DESTDIR)$(MAN8_DIR)/sa1.8 + $(ZIP) $(DESTDIR)$(MAN8_DIR)/sa2.8 + $(ZIP) $(DESTDIR)$(MAN8_DIR)/sadc.8 +diff --git a/configure b/configure +index 51ceee60..c0e6b6b7 100755 +--- a/configure ++++ b/configure +@@ -5346,18 +5346,17 @@ $as_echo "$AUX_IMG" >&6; } + + + # Compress manual pages? +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether manual pages should not be compressed" >&5 +-$as_echo_n "checking whether manual pages should not be compressed... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether manual pages should be compressed" >&5 ++$as_echo_n "checking whether manual pages should be compressed... " >&6; } + # Check whether --enable-compress-manpg was given. + if test "${enable_compress_manpg+set}" = set; then : +- enableval=$enable_compress_manpg; AUX_MPG=$enableval ++ enableval=$enable_compress_manpg; AUX_MPG=no + else +- AUX_MPG=no ++ AUX_MPG=yes + fi + + if test $AUX_MPG != "yes"; then + COMPRESS_MANPG=n +- AUX_MPG=no + else + COMPRESS_MANPG=y + fi +diff --git a/configure.in b/configure.in +index b3d9b11d..b6ab705f 100644 +--- a/configure.in ++++ b/configure.in +@@ -492,14 +492,13 @@ AC_MSG_RESULT($AUX_IMG) + AC_SUBST(IGNORE_FILE_ATTRIBUTES) + + # Compress manual pages? +-AC_MSG_CHECKING(whether manual pages should not be compressed) ++AC_MSG_CHECKING(whether manual pages should be compressed) + AC_ARG_ENABLE(compress-manpg, + AC_HELP_STRING([--disable-compress-manpg], + [do not compress sysstat manual pages]), +- AUX_MPG=$enableval,AUX_MPG=no) ++ AUX_MPG=no,AUX_MPG=yes) + if test $AUX_MPG != "yes"; then + COMPRESS_MANPG=n +- AUX_MPG=no + else + COMPRESS_MANPG=y + fi