From 0463988faaeeec6c26aa09b64642767b01a14e63 Mon Sep 17 00:00:00 2001 From: Jan Tatje Date: Tue, 25 Jun 2019 20:32:26 +0000 Subject: [PATCH] main/nfs-utils: update to 2.4.1 --- main/nfs-utils/APKBUILD | 8 +- main/nfs-utils/sqlite-printf.patch | 123 ----------------------------- 2 files changed, 3 insertions(+), 128 deletions(-) delete mode 100644 main/nfs-utils/sqlite-printf.patch diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD index d2aa099982..f1abf58f2b 100644 --- a/main/nfs-utils/APKBUILD +++ b/main/nfs-utils/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter # Maintainer: Natanael Copa pkgname=nfs-utils -pkgver=2.3.4 -pkgrel=1 +pkgver=2.4.1 +pkgrel=0 pkgdesc="kernel-mode NFS" url="http://linux-nfs.org" arch="all" @@ -20,7 +20,6 @@ source="https://www.kernel.org/pub/linux/utils/nfs-utils/$pkgver/nfs-utils-$pkgv musl-configure_ac.patch musl-getservbyport.patch musl-svcgssd-sysconf.patch - sqlite-printf.patch limits.patch nfs.initd @@ -119,12 +118,11 @@ ldap() { mv "$pkgdir"/usr/lib/libnfsidmap/*ldap* "$subpkgdir"/usr/lib/libnfsidmap/ } -sha512sums="64a3a9ab4142d556e411351618e409d7402a9e8d1ebe6c124d1f75f59da271f3a0c44f49a89ac4ea509b8050f7aa6fd48ecbdbcce4e1404a50cab0edf0e35802 nfs-utils-2.3.4.tar.gz +sha512sums="5f1e301de0bd75a12ff501e20784fe316553c162872fac08ccdc91d33abae91037e2c56abf49ea05149f2dd17ef7c623c6e5bdc0ec0600212bd510aeccbbe1da nfs-utils-2.4.1.tar.gz 674ecf2c4bc8e9364ddd0f34cc03c96674753494cbc5a5d157bd70ed4342ff90356c3e85c544510648dbe90cb43b7fd83ba50653bddffc4b3b5550367b6d0b8e nfs-utils-mtab-sym.patch 99609058351733dc9d02bd90156ded96bb04924b7c00c07be485e06f60d5fb77d1dbc4deca7d9fb88c5bb8fe96c483c5ec5a8fac26ca61fd351304def79b057d musl-configure_ac.patch 94d7ba23164660f1da9298494dff75c57f5a300cb32b2922bc2226fcdaded7eaaa0c50a59a145ac7c75639d177558b5f5594fb1f03a50f60f4c577c93b135748 musl-getservbyport.patch 8499b0d129a86d56736720b6bd2caee042f9ad9a3504ba88d4ccc5f29fa55bc63ed015f84b5dcf958f1b05907e8cdb2e76fd6d56aad3a17c839aee564573e2e0 musl-svcgssd-sysconf.patch -b28b0dcd23ad76f78921eebf7373c4480b3cc3d8f64e990f43534ecd010f6f936704b0fbc0d907e3f78b73a56f451101d2920727f1373ce7aa261080fbfccd55 sqlite-printf.patch 9647d8f4a64a95a7abf5e26f040cf5567670e2194ce307a971a36eaae7fe490af5a494e7b380a48c88e309f4c25777d73d6c140b224aeed829fbc46b1d0baa64 limits.patch f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018 nfs.initd 89259b9f0878658d48792b5b2f42b43c966ed098dba1fecf9e07fb0de4aab37ad67655ea8dbcc2361ddab2b5013b2de35a03048a513aaeedf790e4b416a35a54 nfsmount.initd diff --git a/main/nfs-utils/sqlite-printf.patch b/main/nfs-utils/sqlite-printf.patch deleted file mode 100644 index 36d8240f67..0000000000 --- a/main/nfs-utils/sqlite-printf.patch +++ /dev/null @@ -1,123 +0,0 @@ -From a8133e1fd174267536cd459e19cfe0a1cbbe037c Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Wed, 22 May 2019 13:55:37 -0400 -Subject: [PATCH 1/1] sqlite.c: Use PRIx64 macro to print 64-bit integers - -On 32 bit machines, using "%016lx" format throws out -an format error due to the -Werror=format=2 -compiler option. On 64 bit machines using that -format is correct. - -So use the PRIx64 macro to have the correct -format defined on the different machines. - -Signed-off-by: Steve Dickson ---- - utils/nfsdcld/sqlite.c | 21 +++++++++++---------- - 1 file changed, 11 insertions(+), 10 deletions(-) - -diff --git a/utils/nfsdcld/sqlite.c b/utils/nfsdcld/sqlite.c -index faa62f9..cd658ef 100644 ---- a/utils/nfsdcld/sqlite.c -+++ b/utils/nfsdcld/sqlite.c -@@ -59,6 +59,7 @@ - #include - #include - #include -+#include - - #include "xlog.h" - #include "sqlite.h" -@@ -535,7 +536,7 @@ sqlite_copy_cltrack_records(int *num_rec) - xlog(L_ERROR, "Unable to begin transaction: %s", err); - goto rollback; - } -- ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\";", -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%" PRIx64 "\";", - current_epoch); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); -@@ -550,7 +551,7 @@ sqlite_copy_cltrack_records(int *num_rec) - xlog(L_ERROR, "Unable to clear records from current epoch: %s", err); - goto rollback; - } -- ret = snprintf(buf, sizeof(buf), "INSERT INTO \"rec-%016lx\" " -+ ret = snprintf(buf, sizeof(buf), "INSERT INTO \"rec-%" PRIx64 "\" " - "SELECT id FROM attached.clients;", - current_epoch); - if (ret < 0) { -@@ -703,7 +704,7 @@ sqlite_insert_client(const unsigned char *clname, const size_t namelen) - int ret; - sqlite3_stmt *stmt = NULL; - -- ret = snprintf(buf, sizeof(buf), "INSERT OR REPLACE INTO \"rec-%016lx\" " -+ ret = snprintf(buf, sizeof(buf), "INSERT OR REPLACE INTO \"rec-%" PRIx64 "\" " - "VALUES (?);", current_epoch); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); -@@ -748,7 +749,7 @@ sqlite_remove_client(const unsigned char *clname, const size_t namelen) - int ret; - sqlite3_stmt *stmt = NULL; - -- ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\" " -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%" PRIx64 "\" " - "WHERE id==?;", current_epoch); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); -@@ -798,7 +799,7 @@ sqlite_check_client(const unsigned char *clname, const size_t namelen) - int ret; - sqlite3_stmt *stmt = NULL; - -- ret = snprintf(buf, sizeof(buf), "SELECT count(*) FROM \"rec-%016lx\" " -+ ret = snprintf(buf, sizeof(buf), "SELECT count(*) FROM \"rec-%" PRIx64 "\" " - "WHERE id==?;", recovery_epoch); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); -@@ -873,7 +874,7 @@ sqlite_grace_start(void) - tcur++; - - ret = snprintf(buf, sizeof(buf), "UPDATE grace " -- "SET current = %ld, recovery = %ld;", -+ "SET current = %" PRId64 ", recovery = %" PRId64 ";", - (int64_t)tcur, (int64_t)trec); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); -@@ -891,7 +892,7 @@ sqlite_grace_start(void) - goto rollback; - } - -- ret = snprintf(buf, sizeof(buf), "CREATE TABLE \"rec-%016lx\" " -+ ret = snprintf(buf, sizeof(buf), "CREATE TABLE \"rec-%" PRIx64 "\" " - "(id BLOB PRIMARY KEY);", - tcur); - if (ret < 0) { -@@ -915,7 +916,7 @@ sqlite_grace_start(void) - * values in the grace table, just clear out the records for - * the current reboot epoch. - */ -- ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\";", -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%" PRIx64 "\";", - tcur); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); -@@ -976,7 +977,7 @@ sqlite_grace_done(void) - goto rollback; - } - -- ret = snprintf(buf, sizeof(buf), "DROP TABLE \"rec-%016lx\";", -+ ret = snprintf(buf, sizeof(buf), "DROP TABLE \"rec-%" PRIx64 "\";", - recovery_epoch); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); -@@ -1027,7 +1028,7 @@ sqlite_iterate_recovery(int (*cb)(struct cld_client *clnt), struct cld_client *c - return -EINVAL; - } - -- ret = snprintf(buf, sizeof(buf), "SELECT * FROM \"rec-%016lx\";", -+ ret = snprintf(buf, sizeof(buf), "SELECT * FROM \"rec-%" PRIx64 "\";", - recovery_epoch); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); --- -1.8.3.1 - -- 2.26.2