[arch-commits] Commit in (5 files)

Wed Mar 9 11:42:28 UTC 2022

Date: Wednesday, March 9, 2022 @ 11:42:27
  Author: artafinde
Revision: 1145660

makedumpfile: move from aur version 1.7.0

Added:
  makedumpfile/
  makedumpfile/repos/
  makedumpfile/trunk/
  makedumpfile/trunk/0001-PATCH-v2-Simplify-the-generation-of-man-pages.patch
  makedumpfile/trunk/PKGBUILD

----------------------------------------------------------+
 0001-PATCH-v2-Simplify-the-generation-of-man-pages.patch |  104 +++++++++++++
 PKGBUILD                                                 |   41 +++++
 2 files changed, 145 insertions(+)

Added: makedumpfile/trunk/0001-PATCH-v2-Simplify-the-generation-of-man-pages.patch
===================================================================

--- makedumpfile/trunk/0001-PATCH-v2-Simplify-the-generation-of-man-pages.patch	                        (rev 0)
+++ makedumpfile/trunk/0001-PATCH-v2-Simplify-the-generation-of-man-pages.patch	2022-03-09 11:42:27 UTC (rev 1145660)
@@ -0,0 +1,104 @@
+From 2169de66ecd4504a3e69e0be0330f492f966ce5e Mon Sep 17 00:00:00 2001
+From: Leonidas Spyropoulos <artafinde at archlinux.org>
+Date: Fri, 4 Mar 2022 15:17:48 +0000
+Subject: [PATCH] [PATCH v2] Simplify the generation of man pages
+
+Use `sed` to simplify the man pages generation. Keep the .in files
+intact during make and generate the actual man pages with sed.
+Additionally package tools already gz the man pages during install so it
+doesn't really need to do that during make and it breaks reproducibility
+of the package due to timestamps on files.
+
+Motivation: https://reproducible-builds.org
+
+Signed-off-by: Leonidas Spyropoulos <artafinde at archlinux.org>
+Reviewed-and-tested-by: Guilherme G. Piccoli <gpiccoli at igalia.com>
+Signed-off-by: Kazuhito Hagio <k-hagio-ab at nec.com>
+---
+ .gitignore                                    |  2 ++
+ Makefile                                      | 20 +++++++++----------
+ makedumpfile.8 => makedumpfile.8.in           |  2 +-
+ makedumpfile.conf.5 => makedumpfile.conf.5.in |  2 +-
+ 4 files changed, 13 insertions(+), 13 deletions(-)
+ rename makedumpfile.8 => makedumpfile.8.in (99%)
+ rename makedumpfile.conf.5 => makedumpfile.conf.5.in (99%)
+
+diff --git a/.gitignore b/.gitignore
+index 0b78a96..d6ff75f 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -78,3 +78,5 @@ GTAGS
+ *~
+ \#*#
+ makedumpfile
++makedumpfile.8
++makedumpfile.conf.5
+diff --git a/Makefile b/Makefile
+index 9f9fd22..f118b31 100644
+--- a/Makefile
++++ b/Makefile
+@@ -112,26 +112,24 @@ $(OBJ_ARCH): $(SRC_ARCH)
+ 
+ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS)
+-	echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8
+-	grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8
+-	mv temp.8 makedumpfile.8
+-	gzip -c ./makedumpfile.8 > ./makedumpfile.8.gz
+-	echo .TH MAKEDUMPFILE.CONF 5 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.5
+-	grep -v "^.TH MAKEDUMPFILE.CONF 5" $(VPATH)makedumpfile.conf.5 >> temp.5
+-	mv temp.5 makedumpfile.conf.5
+-	gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz
++	@sed -e "s/@DATE@/$(DATE)/" \
++	     -e "s/@VERSION@/$(VERSION)/" \
++	     $(VPATH)makedumpfile.8.in > $(VPATH)makedumpfile.8
++	@sed -e "s/@DATE@/$(DATE)/" \
++	     -e "s/@VERSION@/$(VERSION)/" \
++	     $(VPATH)makedumpfile.conf.5.in > $(VPATH)makedumpfile.conf.5
+ 
+ eppic_makedumpfile.so: extension_eppic.c
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo
+ 
+ clean:
+-	rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz
++	rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8 makedumpfile.conf.5
+ 
+ install:
+ 	install -m 755 -d ${DESTDIR}/usr/sbin ${DESTDIR}/usr/share/man/man5 ${DESTDIR}/usr/share/man/man8 ${DESTDIR}/etc
+ 	install -m 755 -t ${DESTDIR}/usr/sbin makedumpfile $(VPATH)makedumpfile-R.pl
+-	install -m 644 -t ${DESTDIR}/usr/share/man/man8 makedumpfile.8.gz
+-	install -m 644 -t ${DESTDIR}/usr/share/man/man5 makedumpfile.conf.5.gz
++	install -m 644 -t ${DESTDIR}/usr/share/man/man8 makedumpfile.8
++	install -m 644 -t ${DESTDIR}/usr/share/man/man5 makedumpfile.conf.5
+ 	install -m 644 -D $(VPATH)makedumpfile.conf ${DESTDIR}/etc/makedumpfile.conf.sample
+ 	mkdir -p ${DESTDIR}/usr/share/makedumpfile-${VERSION}/eppic_scripts
+ 	install -m 644 -t ${DESTDIR}/usr/share/makedumpfile-${VERSION}/eppic_scripts/ $(VPATH)eppic_scripts/*
+diff --git a/makedumpfile.8 b/makedumpfile.8.in
+similarity index 99%
+rename from makedumpfile.8
+rename to makedumpfile.8.in
+index ce8c700..d22588e 100644
+--- a/makedumpfile.8
++++ b/makedumpfile.8.in
+@@ -1,4 +1,4 @@
+-.TH MAKEDUMPFILE 8 "8 Nov 2021" "makedumpfile v1.7.0" "Linux System Administrator's Manual"
++.TH MAKEDUMPFILE 8 "@DATE@" "makedumpfile v at VERSION@" "Linux System Administrator's Manual"
+ .SH NAME
+ makedumpfile \- make a small dumpfile of kdump
+ .SH SYNOPSIS
+diff --git a/makedumpfile.conf.5 b/makedumpfile.conf.5.in
+similarity index 99%
+rename from makedumpfile.conf.5
+rename to makedumpfile.conf.5.in
+index 0f1a49b..54e1be8 100644
+--- a/makedumpfile.conf.5
++++ b/makedumpfile.conf.5.in
+@@ -1,4 +1,4 @@
+-.TH MAKEDUMPFILE.CONF 5 "8 Nov 2021" "makedumpfile v1.7.0" "Linux System Administrator's Manual"
++.TH MAKEDUMPFILE.CONF 5 "@DATE@" "makedumpfile v at VERSION@" "Linux System Administrator's Manual"
+ .SH NAME
+ makedumpfile.conf \- The filter configuration file for makedumpfile(8).
+ .SH DESCRIPTION
+-- 
+2.35.1
+

Added: makedumpfile/trunk/PKGBUILD
===================================================================
--- makedumpfile/trunk/PKGBUILD	                        (rev 0)
+++ makedumpfile/trunk/PKGBUILD	2022-03-09 11:42:27 UTC (rev 1145660)
@@ -0,0 +1,41 @@
+# Maintainer: Leonidas Spyropoulos <artafinde at archlinux dot org>
+# Contributor: Maurizio D'Addona <mauritiusdadd at gmail.com>
+# Contributor: Mathieu Pasquet <mathieui at mathieui.net>
+# Contributor: Bernhard Walle <bernhard.walle at gmx.de>
+# Contributor: Michael Eckert <michael.eckert at linuxmail.org>
+# Contributor: Guilherme G. Piccoli <gpiccoli at igalia.com>
+
+pkgname=makedumpfile
+pkgver=1.7.0
+pkgrel=4
+pkgdesc="A tool to generate smaller dumpfiles from kdump memory dumps"
+license=('GPL2')
+depends=('perl' 'libelf' 'zstd')
+options=('debug')
+arch=('i686' 'x86_64')
+url="https://github.com/makedumpfile/makedumpfile"
+source=("https://github.com/makedumpfile/makedumpfile/releases/download/${pkgver}/makedumpfile-${pkgver}.tar.gz"
+        0001-PATCH-v2-Simplify-the-generation-of-man-pages.patch)
+sha256sums=('8985f8df249087ea68c6051dec6dac3ef0703fe2aa87d0266f3951f93aa8da5e'
+            '5a884f904eeb2f914a3ae74e2a8b4b6305cf96366d014bd11134672d2cf27c4f')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  patch -Np1 < "${srcdir}/0001-PATCH-v2-Simplify-the-generation-of-man-pages.patch"
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  make -O \
+    LINKTYPE=dynamic \
+    USEZSTD=on \
+    V=1
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+  make install DESTDIR="${pkgdir}"
+  mv "${pkgdir}/usr/sbin" "${pkgdir}/usr/bin"
+}
+
+# vim:set ts=2 sw=2 et:

