suite: update stale c patches

Author: baflor

harness-suite/projects-clike/brotli/prepare.sh

@@ -1,2 +1,2 @@
 set -e
-git clone-rev.sh https://github.com/google/brotli.git "$PROJECT/repo" db4dfda9e1d417dabe3abf1bdedf3d9a9cc3b1ef
+git clone-rev.sh https://github.com/google/brotli.git "$PROJECT/repo" af041f55e7bfa3e1bc502f234538e1d6dd6282bd

harness-suite/projects-clike/freetype2/build.sh

@@ -4,7 +4,7 @@ source set-buildflags.sh
 
 cd "$PROJECT/zlib"
 ./configure $CONFIGUREFLAGS
-make -j7 install prefix=/wasi-sdk/share/wasi-sysroot/ libdir=/wasi-sdk/share/wasi-sysroot/lib/wasm32-wasi/
+make -j7 install prefix=/wasi-sdk/share/wasi-sysroot/ libdir=/wasi-sdk/share/wasi-sysroot/lib/wasm32-wasip1/
 echo "int main(void){return 0;}" > empty.c
 $CC -lz empty.c
 

harness-suite/projects-clike/freetype2/libarchive-stubs.patch

@@ -86,7 +86,7 @@ index 0482c57c..5efd17d2 100644
  	static const size_t out_buf_len = 65536;
  	char *out_buf;
 diff --git a/libarchive/archive_write_add_filter_program.c b/libarchive/archive_write_add_filter_program.c
-index c661cc7f..bca03921 100644
+index c661cc7f..0f996f0e 100644
 --- a/libarchive/archive_write_add_filter_program.c
 +++ b/libarchive/archive_write_add_filter_program.c
 @@ -329,6 +329,7 @@ int
@@ -95,10 +95,9 @@ index c661cc7f..bca03921 100644
  {
 +#if !defined(__wasi__)
  	int ret, status;
+ 	pid_t pid;
  	ssize_t bytes_read;
- 
-@@ -386,5 +387,7 @@ cleanup:
- 		ret = ARCHIVE_FATAL;
+@@ -387,3 +388,5 @@ __archive_write_program_close(struct archive_write_filter *f,
  	}
  	return ret;
 +#endif

harness-suite/projects-clike/freetype2/prepare.sh

@@ -1,8 +1,8 @@
 set -e
-git clone-rev.sh https://gitlab.freedesktop.org/freetype/freetype.git "$PROJECT/freetype" ccabe7ac02c688d26d1753bafe80f5a2b00c479a
-git clone-rev.sh https://github.com/freetype/freetype2-testing.git "$PROJECT/freetype2-testing" 04fa94191645af39750f5eff0a66c49c5cb2c2cc
-git clone-rev.sh https://github.com/libarchive/libarchive.git "$PROJECT/libarchive" dcbf1e0ededa95849f098d154a25876ed5754bcf
-git clone-rev.sh https://github.com/madler/zlib.git "$PROJECT/zlib" 5a82f71ed1dfc0bec044d9702463dbdf84ea3b71
+git clone-rev.sh https://gitlab.freedesktop.org/freetype/freetype.git "$PROJECT/freetype" b6bcd2177f72bb4842c7701d7b7f633bb3fc951a
+git clone-rev.sh https://github.com/freetype/freetype2-testing.git "$PROJECT/freetype2-testing" db8ae87fead2ede5487e242dd9f5a129ca5e9fd2
+git clone-rev.sh https://github.com/libarchive/libarchive.git "$PROJECT/libarchive" 4b65c3866bc97c72897f00c7b7bb5c993a6de5a4
+git clone-rev.sh https://github.com/madler/zlib.git "$PROJECT/zlib" f9dd6009be3ed32415edf1e89d1bc38380ecb95d
 
 git -C freetype apply ../freetype2-testing/fuzzing/settings/freetype2/ftoption.patch
 git -C freetype apply ../freetype-stub-sjlj.patch

harness-suite/projects-clike/hunspell/fix_harness.patch

@@ -1,5 +1,5 @@
 diff --git a/src/hunspell/hunzip.hxx b/src/hunspell/hunzip.hxx
-index 87bd880..1c508ed 100644
+index 319b4f7..02f030b 100644
 --- a/src/hunspell/hunzip.hxx
 +++ b/src/hunspell/hunzip.hxx
 @@ -47,7 +47,7 @@
@@ -11,16 +11,3 @@ index 87bd880..1c508ed 100644
  #define HZIP_EXTENSION ".hz"
 
  #define MSG_OPEN "error: %s: cannot open\n"
-diff --git a/src/tools/affdicfuzzer.cxx b/src/tools/affdicfuzzer.cxx
-index 73e7d05..328de30 100644
---- a/src/tools/affdicfuzzer.cxx
-+++ b/src/tools/affdicfuzzer.cxx
-@@ -38,7 +38,7 @@ extern "C" int LLVMFuzzerTestOneInput(const char* data, size_t size)
-     int wordlen = data[0];
-     ++data;
-     --size;
--    if (wordlen > size)
-+    if (wordlen < 0 || wordlen >= size)
-         return 0;
- 
-     std::ofstream wrd("/tmp/test.word", std::ios_base::out | std::ios_base::trunc | std::ios_base::binary);

harness-suite/projects-clike/hunspell/prepare.sh

@@ -1,4 +1,4 @@
 set -e
-git clone-rev.sh https://github.com/hunspell/hunspell.git "$PROJECT/repo" 8fe07304cba052506915a405e915f6fc0c49aa94
+git clone-rev.sh https://github.com/hunspell/hunspell.git "$PROJECT/repo" 3522bd6eacf06df256bcc49c28c4511965cf204d
 git -C "$PROJECT/repo" apply ../stub_clock.patch
 git -C "$PROJECT/repo" apply ../fix_harness.patch

harness-suite/projects-clike/jsoncpp/patch_eh.patch

@@ -1,8 +1,8 @@
 diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
-index aa2b744..c3620a5 100644
+index 168251e..0ce4ab7 100644
 --- a/src/lib_json/json_value.cpp
 +++ b/src/lib_json/json_value.cpp
-@@ -212,13 +212,17 @@ JSONCPP_NORETURN void throwLogicError(String const& msg) {
+@@ -214,13 +214,17 @@ JSONCPP_NORETURN void throwLogicError(String const& msg) {
    throw LogicError(msg);
  }
  #else // !JSON_USE_EXCEPTION
@@ -23,28 +23,21 @@ index aa2b744..c3620a5 100644
  #endif
 
 diff --git a/src/test_lib_json/fuzz.cpp b/src/test_lib_json/fuzz.cpp
-index 5b75c22..8367d3b 100644
+index 3679a95..8367d3b 100644
 --- a/src/test_lib_json/fuzz.cpp
 +++ b/src/test_lib_json/fuzz.cpp
-@@ -11,10 +11,6 @@
- #include <memory>
- #include <string>
- 
--namespace Json {
--class Exception;
--}
--
- extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-   Json::CharReaderBuilder builder;
- 
-@@ -45,10 +41,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+@@ -41,14 +41,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
 
    Json::Value root;
    const auto data_str = reinterpret_cast<const char*>(data);
+-#if JSON_USE_EXCEPTION
 -  try {
+-#endif // JSON_USE_EXCEPTION
 -    reader->parse(data_str, data_str + size, &root, nullptr);
+-#if JSON_USE_EXCEPTION
 -  } catch (Json::Exception const&) {
 -  }
+-#endif // JSON_USE_EXCEPTION
 +  reader->parse(data_str, data_str + size, &root, nullptr);
    // Whether it succeeded or not doesn't matter.
    return 0;

harness-suite/projects-clike/jsoncpp/prepare.sh

@@ -1,3 +1,3 @@
 set -e
-git clone-rev.sh https://github.com/open-source-parsers/jsoncpp.git  "$PROJECT/repo" ca98c98457b1163cca1f7d8db62827c115fec6d1
+git clone-rev.sh https://github.com/open-source-parsers/jsoncpp.git  "$PROJECT/repo" 755d0a69d7109d465db6196a3c7e1c6f3c62a48f
 git -C "$PROJECT/repo" apply ../patch_eh.patch

harness-suite/projects-clike/lcms/prepare.sh

@@ -1,3 +1,3 @@
 set -e
-git clone-rev.sh https://github.com/mm2/Little-CMS.git "$PROJECT/repo"      4bf926a7905b27e863ad18bd7d40306b76e2f4d6
-git clone-rev.sh https://github.com/google/oss-fuzz.git "$PROJECT/oss-fuzz" d87225267726cf7ce1a3e17cf103c5ac943c4f05
+git clone-rev.sh https://github.com/mm2/Little-CMS.git "$PROJECT/repo"      21c582a594fe5279f90c0b93437c398f93bf62b0
+git clone-rev.sh https://github.com/google/oss-fuzz.git "$PROJECT/oss-fuzz" db53eebe19d09500c255d51c771ffb8ffa1f37ff

harness-suite/projects-clike/libarchive/libxml2-stub-dup.patch

@@ -1,10 +1,10 @@
 diff --git a/xmlIO.c b/xmlIO.c
-index cc861402..8a1f1756 100644
+index 416743b2..bef948df 100644
 --- a/xmlIO.c
 +++ b/xmlIO.c
-@@ -1088,7 +1088,11 @@ xmlInputFromFd(xmlParserInputBufferPtr buf, int fd, int flags) {
+@@ -1203,7 +1203,11 @@ xmlInputFromFd(xmlParserInputBuffer *buf, int fd,
 
-         pos = lseek(fd, 0, SEEK_CUR);
+         pos = xmlSeek(fd, 0, SEEK_CUR);
 
 +#ifdef __wasi__
 +        copy = -1;
@@ -14,7 +14,7 @@ index cc861402..8a1f1756 100644
          if (copy == -1)
              return(xmlIOErr(errno));
 
-@@ -1118,7 +1122,11 @@ xmlInputFromFd(xmlParserInputBufferPtr buf, int fd, int flags) {
+@@ -1235,7 +1239,11 @@ xmlInputFromFd(xmlParserInputBuffer *buf, int fd,
      }
  #endif /* LIBXML_ZLIB_ENABLED */
 
@@ -27,7 +27,7 @@ index cc861402..8a1f1756 100644
      if (copy == -1)
          return(xmlIOErr(errno));
 
-@@ -1198,7 +1206,11 @@ xmlOutputDefaultOpen(xmlOutputBufferPtr buf, const char *filename,
+@@ -1269,7 +1277,11 @@ xmlOutputDefaultOpen(xmlOutputBufferPtr buf, const char *filename,
      (void) compression;
 
      if (!strcmp(filename, "-")) {