Wed Jan 5 16:57:17 2022 UTC ()
Pullup ticket #6559 - requested by sborrill
www/e2guardian: build fix
Revisions pulled up:
- www/e2guardian/distinfo 1.7
- www/e2guardian/patches/patch-configure.ac 1.1
---
Module Name: pkgsrc
Committed By: sborrill
Date: Wed Jan 5 15:53:41 UTC 2022
Modified Files:
pkgsrc/www/e2guardian: distinfo
Added Files:
pkgsrc/www/e2guardian/patches: patch-configure.ac
Log Message:
Fix build of e2guardian by applying commit from 5.4 branch:
Don't expand AM_INIT_AUTOMAKE multiple times.
https://github.com/e2guardian/e2guardian/pull/705
(bsiegert)
diff -r1.6 -r1.6.2.1 pkgsrc/www/e2guardian/distinfo
diff -r0 -r1.1.2.2 pkgsrc/www/e2guardian/patches/patch-configure.ac
--- pkgsrc/www/e2guardian/distinfo 2021/10/26 11:29:25 1.6
+++ pkgsrc/www/e2guardian/distinfo 2022/01/05 16:57:16 1.6.2.1
| @@ -1,5 +1,6 @@ | | | @@ -1,5 +1,6 @@ |
| 1 | $NetBSD: distinfo,v 1.6 2021/10/26 11:29:25 nia Exp $ | | 1 | $NetBSD: distinfo,v 1.6.2.1 2022/01/05 16:57:16 bsiegert Exp $ |
| 2 | | | 2 | |
| 3 | BLAKE2s (e2guardian-5.1.1.tar.gz) = 59b0d34047e6d604a9e1633e4f067137763a8351c3fc31547456f7bc3575b8cf | | 3 | BLAKE2s (e2guardian-5.1.1.tar.gz) = 59b0d34047e6d604a9e1633e4f067137763a8351c3fc31547456f7bc3575b8cf |
| 4 | SHA512 (e2guardian-5.1.1.tar.gz) = a678c6d5b5672e40985cfbb9c718b61a7aee0f67092db6e20706cc525ad58c5b87d296575987a0c3e8ec4fd61b802cfa9d9f8b8d0b3a46cdee0f1f637c9bac37 | | 4 | SHA512 (e2guardian-5.1.1.tar.gz) = a678c6d5b5672e40985cfbb9c718b61a7aee0f67092db6e20706cc525ad58c5b87d296575987a0c3e8ec4fd61b802cfa9d9f8b8d0b3a46cdee0f1f637c9bac37 |
| 5 | Size (e2guardian-5.1.1.tar.gz) = 850980 bytes | | 5 | Size (e2guardian-5.1.1.tar.gz) = 850980 bytes |
| | | 6 | SHA1 (patch-configure.ac) = 56c44fa90fbe79f9d531f4aebcbd3709cab1e01e |
$NetBSD: patch-configure.ac,v 1.1.2.2 2022/01/05 16:57:16 bsiegert Exp $
Don't expand AM_INIT_AUTOMAKE multiple times.
https://github.com/e2guardian/e2guardian/pull/705
-- configure.ac.orig 2022-01-05 15:31:32.533021485 +0000
+++ configure.ac 2022-01-05 15:31:52.340711618 +0000
@@ -6,7 +6,6 @@
AC_PREREQ(2.57)
AC_INIT(e2guardian, 5.1.1)
-AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([dgconfig.h])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([subdir-objects])