New commits:
commit 160f559660fb08fabd12bbc028ea7eda0d076b01
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
SOURCE_HASH=sha512:dcfea29fd7ef9cfe28c8edb8e1e59183b7a51cbcf5641fafebe2721a6ed921c0ad6e115b90598e121cde4422a83481757f517942fc1e80f763d1992a27de244f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/libs/libnfsidmap/HISTORY b/libs/libnfsidmap/HISTORY
index 2d342ee..e885600 100644
--- a/libs/libnfsidmap/HISTORY
+++ b/libs/libnfsidmap/HISTORY
@@ -1,3 +1,6 @@
+2020-08-24 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Disable castfs (STAGED_INSTALL), breaks on install
+
2009-06-06 Elisamuel Resto <ryuji AT sourcemage.org>
* idmapd.conf: removed my personal domain from the config (Oops!)
diff --git a/net/dnsmasq/DETAILS b/net/dnsmasq/DETAILS
index 5ca790e..ea8b8f8 100755
--- a/net/dnsmasq/DETAILS
+++ b/net/dnsmasq/DETAILS
@@ -1,6 +1,6 @@
SPELL=dnsmasq
- VERSION=2.80
- PATCHLEVEL=1
+ VERSION=2.82
+ STAGED_INSTALL='off'
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.thekelleys.org.uk/dnsmasq/$SOURCE
diff --git a/net/dnsmasq/HISTORY b/net/dnsmasq/HISTORY
index 92d2fd0..2dd750d 100644
--- a/net/dnsmasq/HISTORY
+++ b/net/dnsmasq/HISTORY
@@ -1,3 +1,8 @@
+2020-08-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.82
+ Disable castfs (STAGED_INSTALL), fails during install
+ * PRE_BUILD,nettle-3.5.patch,nodata.patch: Remove, already applied
+
2019-08-09 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.80
* PRE_BUILD: Apply nettle-3.5.patch and nodata.patch
diff --git a/net/dnsmasq/PRE_BUILD b/net/dnsmasq/PRE_BUILD
deleted file mode 100755
index c63803c..0000000
--- a/net/dnsmasq/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-message "${MESSAGE_COLOR}Fixing compilation against nettle
3.5+...${DEFAULT_COLOR}" &&
-patch -p1 < "${SPELL_DIRECTORY}"/nettle-3.5.patch &&
-message "${MESSAGE_COLOR}Fixing returning NODATA instead of NXDOMAIN in
2.80...${DEFAULT_COLOR}" &&
-patch -p1 < "${SPELL_DIRECTORY}"/nodata.patch
diff --git a/net/dnsmasq/nettle-3.5.patch b/net/dnsmasq/nettle-3.5.patch
deleted file mode 100644
index 1ac413b..0000000
--- a/net/dnsmasq/nettle-3.5.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# From https://github.com/themiron/dnsmasq/commit/6fd9aba7abe1e084123bc5002959350897774ace
-diff --git a/src/crypto.c b/src/crypto.c
-index 1f1c12b..9cfe371 100644
---- a/src/crypto.c
-+++ b/src/crypto.c
-@@ -296,6 +296,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata
*key_data, unsigned int key_len
- static struct ecc_point *key_256 = NULL, *key_384 = NULL;
- static mpz_t x, y;
- static struct dsa_signature *sig_struct;
-+#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4
-+#define nettle_get_secp_256r1() (&nettle_secp_256r1)
-+#define nettle_get_secp_384r1() (&nettle_secp_384r1)
-+#endif
-
- if (!sig_struct)
- {
-@@ -315,7 +319,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata
*key_data, unsigned int key_len
- if (!(key_256 = whine_malloc(sizeof(struct ecc_point))))
- return 0;
-
-- nettle_ecc_point_init(key_256, &nettle_secp_256r1);
-+ nettle_ecc_point_init(key_256, nettle_get_secp_256r1());
- }
-
- key = key_256;
-@@ -328,7 +332,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata
*key_data, unsigned int key_len
- if (!(key_384 = whine_malloc(sizeof(struct ecc_point))))
- return 0;
-
-- nettle_ecc_point_init(key_384, &nettle_secp_384r1);
-+ nettle_ecc_point_init(key_384, nettle_get_secp_384r1());
- }
-
- key = key_384;
-
diff --git a/net/dnsmasq/nodata.patch b/net/dnsmasq/nodata.patch
deleted file mode 100644
index fba1523..0000000
--- a/net/dnsmasq/nodata.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# From https://github.com/themiron/dnsmasq/commit/162e5e0062ce923c494cc64282f293f0ed64fc10
-# Fix returning NODATA instead of NXDOMAIN, introduced in 2.80
-# See https://bugzilla.redhat.com/show_bug.cgi?id=1674067
-diff --git a/CHANGELOG b/CHANGELOG
-index 0673fc7..08bfda9 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -21,6 +21,11 @@ version 2.81
- correct error messages. Thanks to Christian Rosentreter
- for reporting this.
-
-+ Fix bug in DNS non-terminal code, added in 2.80, which could
-+ sometimes cause a NODATA rather than an NXDOMAIN reply.
-+ Thanks to Sven Mueller and Maciej Żenczykowski for spotting
-+ and diagnosing the bug and providing patches.
-+
-
- version 2.80
- Add support for RFC 4039 DHCP rapid commit. Thanks to Ashram Method
-diff --git a/src/cache.c b/src/cache.c
-index 906f5e1..44c13e4 100644
---- a/src/cache.c
-+++ b/src/cache.c
-@@ -790,6 +790,7 @@ int cache_find_non_terminal(char *name, time_t now)
- if (!is_outdated_cname_pointer(crecp) &&
- !is_expired(now, crecp) &&
- (crecp->flags & F_FORWARD) &&
-+ !(crecp->flags & F_NXDOMAIN) &&
- hostname_isequal(name, cache_get_name(crecp)))
- return 1;
-
diff --git a/net/monit/DETAILS b/net/monit/DETAILS
index 639be0b..8dcad65 100755
--- a/net/monit/DETAILS
+++ b/net/monit/DETAILS
@@ -2,6 +2,7 @@
VERSION=5.20.0
SECURITY_PATCH=1
PATCHLEVEL=1
+ STAGED_INSTALL="off"
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]="http://mmonit.com/${SPELL}/dist/${SOURCE}"