diff options
| author | Alexander Dunlap | 2021-10-09 10:16:00 -0400 |
|---|---|---|
| committer | Alexander Dunlap | 2021-10-09 10:16:00 -0400 |
| commit | a1b39d9fe5c060f270e84a810e969e6baea709b3 (patch) | |
| tree | 605f6dbaf3c8bfadfe1de94b5a707b978268e1ef | |
| parent | d3b88655cc81de6c284bef8beb87b816b4eb2b18 (diff) | |
| download | aur-a1b39d9fe5c060f270e84a810e969e6baea709b3.tar.gz | |
Updating PKGBUILD to avoid compile failures with -Werror=format-security; thanks to Angel de Vicente for the patch
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | h4h5tools-format-security-fix.patch | 46 |
2 files changed, 51 insertions, 3 deletions
@@ -1,7 +1,7 @@ # Maintainer: Alexander Dunlap <alexander dot dunlap at gmail dot com> pkgname=h4h5tools pkgver=2.2.5 -pkgrel=1 +pkgrel=2 epoch= pkgdesc="Tools for converting between HDF4 and HDF5 formats" arch=('x86_64') @@ -19,9 +19,10 @@ backup=() options=() install= changelog= -source=("https://support.hdfgroup.org/ftp/HDF5/releases/h4toh5/h4toh5-$pkgver/src/$pkgname-$pkgver.tar.gz" "h4h5tools-configure-lm.patch") +source=("https://support.hdfgroup.org/ftp/HDF5/releases/h4toh5/h4toh5-$pkgver/src/$pkgname-$pkgver.tar.gz" "h4h5tools-configure-lm.patch" "h4h5tools-format-security-fix.patch") noextract=() -sha256sums=("79f6505c1df3ad0c2cc1a19b9b433b5d955dfd7d2dffefc080d89fdde01fd6f2" "ac04b58e9d84a9ca158ad58c4c83fe43d2bddecf685061c9e78ad07bd4ac6a83") +sha256sums=("79f6505c1df3ad0c2cc1a19b9b433b5d955dfd7d2dffefc080d89fdde01fd6f2" "ac04b58e9d84a9ca158ad58c4c83fe43d2bddecf685061c9e78ad07bd4ac6a83" +"04d4e7a9458f887187de2e8816eea238d9e49eae6f9e2b70524a69a510a48aeb") validpgpkeys=() prepare() { @@ -31,6 +32,7 @@ prepare() { build() { cd "$pkgname-$pkgver" patch -p0 -i "$srcdir/h4h5tools-configure-lm.patch" + patch -p1 -i "$srcdir/h4h5tools-format-security-fix.patch" autoreconf -i CC="/opt/hdf4/bin/h4cc" ./configure --with-hdf5=/usr --with-hdfeos2=/usr --prefix=/usr make diff --git a/h4h5tools-format-security-fix.patch b/h4h5tools-format-security-fix.patch new file mode 100644 index 000000000000..632a54e9da5e --- /dev/null +++ b/h4h5tools-format-security-fix.patch @@ -0,0 +1,46 @@ +From 42386fc3b0a4ef66baeeaba9e028e6d757a1548f Mon Sep 17 00:00:00 2001
+From: Angel de Vicente <angel.de.vicente@iac.es>
+Date: Sat, 9 Oct 2021 00:56:40 +0100
+Subject: [PATCH] fixed compiling error
+
+---
+ utils/h5toh4/h5toh4.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/utils/h5toh4/h5toh4.c b/utils/h5toh4/h5toh4.c
+index edb5300..dbc0fcf 100644
+--- a/utils/h5toh4/h5toh4.c
++++ b/utils/h5toh4/h5toh4.c
+@@ -302,7 +302,7 @@ main(int argc, char *argv[])
+ {
+ (void) fprintf(stderr, err1, argc);
+ PrintOptions_h5toh4();
+- (void) fprintf(stderr, err4);
++ (void) fprintf(stderr, "%s", err4);
+ return EXIT_FAILURE;
+ }
+
+@@ -317,7 +317,7 @@ main(int argc, char *argv[])
+ if ((token = gtoken(argv[i])) == TOK_ERR)
+ {
+ PrintOptions_h5toh4();
+- (void) fprintf(stderr, err4);
++ (void) fprintf(stderr, "%s", err4);
+ return EXIT_FAILURE;
+ }
+
+@@ -359,9 +359,9 @@ main(int argc, char *argv[])
+
+ case TOK_ERR: /* command syntax error */
+ default:
+- (void) fprintf(stderr, err2);
++ (void) fprintf(stderr, "%s", err2);
+ PrintOptions_h5toh4();
+- (void) fprintf(stderr, err4);
++ (void) fprintf(stderr, "%s", err4);
+ return EXIT_FAILURE;
+ }
+ }
+--
+2.33.0
+
|