From 1d8fb780938cde91eef1fe30bf7ffb8884e91df8 Mon Sep 17 00:00:00 2001
From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com>
Date: Wed, 13 Nov 2024 19:51:30 +0000
Subject: [PATCH 01/10] zetasql/2024.11.1 package update

Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com>
---
 zetasql.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zetasql.yaml b/zetasql.yaml
index d8b46596b6f..eb9f4e88d3e 100644
--- a/zetasql.yaml
+++ b/zetasql.yaml
@@ -1,7 +1,7 @@
 package:
   name: zetasql
-  version: 2024.06.1
-  epoch: 2
+  version: 2024.11.1
+  epoch: 0
   description: ZetaSQL - Analyzer Framework for SQL
   copyright:
     - license: Apache-2.0
@@ -35,7 +35,7 @@ pipeline:
     with:
       repository: https://github.com/google/zetasql
       tag: ${{package.version}}
-      expected-commit: f6df6971a205790966e73eda0134f05a022d0e6a
+      expected-commit: a516c6b26d183efc4f56293256bba92e243b7a61
 
   - uses: patch
     with:

From c8ea173052b972a9c0e6135d2d4570d1a112d240 Mon Sep 17 00:00:00 2001
From: hectorj2f <hector@chainguard.dev>
Date: Thu, 21 Nov 2024 11:27:17 +0100
Subject: [PATCH 02/10] fix: update the patch

Signed-off-by: hectorj2f <hector@chainguard.dev>
---
 zetasql/multi-arch-for-linux.patch | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/zetasql/multi-arch-for-linux.patch b/zetasql/multi-arch-for-linux.patch
index 75be71f4269..180e689d57e 100644
--- a/zetasql/multi-arch-for-linux.patch
+++ b/zetasql/multi-arch-for-linux.patch
@@ -1,8 +1,8 @@
 diff --git a/java/com/google/zetasql/BUILD b/java/com/google/zetasql/BUILD
-index dec4bef..3bd4fab 100644
+index 3ca01857..d9cbc35a 100644
 --- a/java/com/google/zetasql/BUILD
 +++ b/java/com/google/zetasql/BUILD
-@@ -198,7 +198,7 @@ javadoc_library(
+@@ -204,7 +204,7 @@ javadoc_library(
  java_library(
      name = "jni_channel_linux",
      resources = select({
@@ -11,23 +11,3 @@ index dec4bef..3bd4fab 100644
          "//conditions:default": [],
      }),
      tags = ["maven_coordinates=com.google.zetasql:zetasql-jni-channel-linux:${project.version}"],
-diff --git a/zetasql/jdk/BUILD b/zetasql/jdk/BUILD
-index 56c30f5..41b5235 100644
---- a/zetasql/jdk/BUILD
-+++ b/zetasql/jdk/BUILD
-@@ -25,13 +25,13 @@ cc_library(
-         "@local_jdk//:jni_header",
-     ] + select({
-         "@bazel_tools//src/conditions:darwin": ["@local_jdk//:jni_md_header-darwin"],
--        "@bazel_tools//src/conditions:linux_x86_64": ["@local_jdk//:jni_md_header-linux"],
-+        "@bazel_tools//src/conditions:linux": ["@local_jdk//:jni_md_header-linux"],
-     }),
-     includes = [
-         "../../external/local_jdk/include",
-     ] + select({
-         "@bazel_tools//src/conditions:darwin": ["../../external/local_jdk/include/darwin"],
--        "@bazel_tools//src/conditions:linux_x86_64": ["../../external/local_jdk/include/linux"],
-+        "@bazel_tools//src/conditions:linux": ["../../external/local_jdk/include/linux"],
-     }),
-     linkstatic = 1,
- )
\ No newline at end of file

From abaf00962222ee1aa0225ccccd95732b96e17af1 Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@chainguard.dev>
Date: Tue, 21 Jan 2025 21:44:24 +0000
Subject: [PATCH 03/10] zetasql: go.lsp.dev is down, use github mirror instead

See: https://github.com/google/zetasql/issues/157

Signed-off-by: dann frazier <dann.frazier@chainguard.dev>
---
 zetasql.yaml                    |  2 +-
 zetasql/dev_lsp-to-github.patch | 34 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 zetasql/dev_lsp-to-github.patch

diff --git a/zetasql.yaml b/zetasql.yaml
index eb9f4e88d3e..c0a591250bc 100644
--- a/zetasql.yaml
+++ b/zetasql.yaml
@@ -39,7 +39,7 @@ pipeline:
 
   - uses: patch
     with:
-      patches: multi-arch-for-linux.patch
+      patches: multi-arch-for-linux.patch dev_lsp-to-github.patch
 
   - runs: |
       cd zetasql
diff --git a/zetasql/dev_lsp-to-github.patch b/zetasql/dev_lsp-to-github.patch
new file mode 100644
index 00000000000..cc4a8215e5d
--- /dev/null
+++ b/zetasql/dev_lsp-to-github.patch
@@ -0,0 +1,34 @@
+diff --git a/bazel/zetasql_deps_step_2.bzl b/bazel/zetasql_deps_step_2.bzl
+index 2b6b01fa..ff8eb93d 100644
+--- a/bazel/zetasql_deps_step_2.bzl
++++ b/bazel/zetasql_deps_step_2.bzl
+@@ -48,21 +48,29 @@ def textmapper_dependencies():
+         name = "dev_lsp_go_jsonrpc2",
+         importpath = "go.lsp.dev/jsonrpc2",
+         commit = "8c68d4fd37cd4bd06b62b3243f0d2292c681d164",
++        remote = "https://github.com/go-language-server/jsonrpc2",
++        vcs = "git",
+     )
+     go_repository(
+         name = "dev_lsp_go_protocol",
+         importpath = "go.lsp.dev/protocol",
+         commit = "da30f9ae0326cc45b76adc5cd8920ac1ffa14a15",
++        remote = "https://github.com/go-language-server/protocol",
++        vcs = "git",
+     )
+     go_repository(
+         name = "dev_lsp_go_uri",
+         importpath = "go.lsp.dev/uri",
+         commit = "63eaac75cc850f596be19073ff6d4ec198603779",
++        remote = "https://github.com/go-language-server/uri",
++        vcs = "git",
+     )
+     go_repository(
+         name = "dev_lsp_go_pkg",
+         importpath = "go.lsp.dev/pkg",
+         commit = "384b27a52fb2b5d74d78cfe89c7738e9a3e216a5",
++        remote = "https://github.com/go-language-server/pkg",
++        vcs = "git",
+     )
+     go_repository(
+         name = "org_uber_go_zap",

From 17d0d047c3891bcb52b018cc2bff067979ac9678 Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@chainguard.dev>
Date: Fri, 24 Jan 2025 15:57:27 +0000
Subject: [PATCH 04/10] zetasql: Specify specific LLVM tarball download

bazel uses @toolchains_llvm to identify the OS and
find a compatible llvm_toolchain to download. wolfi
is not yet supported. Upstream uses Ubuntu 18.04 to
do their docker-based builds. We can't use the exact
same toolchain on wolfi, because it needs older
system libs to run. Let's use the latest 6.0.x
toolchain for the latest available Ubuntu. This is
compatible with wolfi, although it does cause the
build to spew warnings about our libtinfo versioning
that I haven't looked into.

Of course, we should be using our own llvm build,
not downloading one from the Internet. This should
be possible using toolchain_roots. But this
will require some setup magic to organize our
LLVM/clang files into the expected structure,
perhaps by adding some -compat packages.

FIXME: Need checksums for verifying the download
FIXME: Doesn't provide ARM support

Signed-off-by: dann frazier <dann.frazier@chainguard.dev>
---
 zetasql.yaml                   |  3 ++-
 zetasql/llvm-specify-url.patch | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 zetasql/llvm-specify-url.patch

diff --git a/zetasql.yaml b/zetasql.yaml
index c0a591250bc..ff205bf3198 100644
--- a/zetasql.yaml
+++ b/zetasql.yaml
@@ -20,6 +20,7 @@ environment:
       - ca-certificates-bundle
       - gcc-12
       - git
+      - libxml2 # Required by downloaded llvm toolchain
       - openjdk-17-default-jdk
       - patch
       - python3
@@ -39,7 +40,7 @@ pipeline:
 
   - uses: patch
     with:
-      patches: multi-arch-for-linux.patch dev_lsp-to-github.patch
+      patches: multi-arch-for-linux.patch dev_lsp-to-github.patch llvm-specify-url.patch
 
   - runs: |
       cd zetasql
diff --git a/zetasql/llvm-specify-url.patch b/zetasql/llvm-specify-url.patch
new file mode 100644
index 00000000000..1c7161bc4f1
--- /dev/null
+++ b/zetasql/llvm-specify-url.patch
@@ -0,0 +1,23 @@
+--- a/bazel/zetasql_deps_step_1.bzl
++++ b/bazel/zetasql_deps_step_1.bzl
+@@ -33,13 +33,19 @@
+     llvm_toolchain(
+         name = "llvm_toolchain",
+         llvm_versions = {
+-            "": "16.0.0",
++            "": "16.0.4",
+             # The LLVM repo stops providing pre-built binaries for the MacOS x86_64
+             # architecture for versions >= 16.0.0: https://github.com/llvm/llvm-project/releases,
+             # but our Kokoro MacOS tests are still using x86_64 (ventura).
+             # TODO: Upgrade the MacOS version to sonoma-slcn.
+             "darwin-x86_64": "15.0.7",
+         },
++        strip_prefix = {
++            "linux-x86_64": "clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04",
++        },
++        urls = {
++            "linux-x86_64": ["https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04.tar.xz"],
++        },
+     )
+ 
+     http_archive(

From 524868cbfbfdca9700747bcf45eeabf42a095557 Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@chainguard.dev>
Date: Fri, 24 Jan 2025 15:39:02 +0000
Subject: [PATCH 05/10] zetasql: bump bazel version from bazel-6 to bazel-7

This is what upstream uses in their docker-based builds,
and seems to be required. With -6, the build fails with:

 ERROR: /home/build/.cache/bazel/_bazel_build/79a1bfc8c8b5b6a6d226b38d072f165b/external/llvm_toolchain/BUILD.bazel:161:18: in system_module_map rule @llvm_toolchain//:module-x86_64-linux:
 Traceback (most recent call last):
    File "/home/build/.cache/bazel/_bazel_build/79a1bfc8c8b5b6a6d226b38d072f165b/external/toolchains_llvm/toolchain/internal/system_module_map.bzl", line 57, column 29, in _system_module_map
        template_dict.add_joined(
 Error in add_joined: add_joined() got unexpected keyword argument 'allow_closure'

Note that this requires a bump in JDK versions because
our bazel-7 uses class file format 65. That requires
openjdk >= 21, so let's just bump to the latest stable.

Signed-off-by: dann frazier <dann.frazier@chainguard.dev>
---
 zetasql.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/zetasql.yaml b/zetasql.yaml
index ff205bf3198..165e1af149e 100644
--- a/zetasql.yaml
+++ b/zetasql.yaml
@@ -9,11 +9,14 @@ package:
     cpu: 33
     memory: 100Gi
 
+vars:
+  openjdk-version: 23
+
 environment:
   contents:
     packages:
       - bash
-      - bazel-6
+      - bazel-7
       - binutils
       - build-base
       - busybox
@@ -21,7 +24,7 @@ environment:
       - gcc-12
       - git
       - libxml2 # Required by downloaded llvm toolchain
-      - openjdk-17-default-jdk
+      - openjdk-${{vars.openjdk-version}}-default-jdk
       - patch
       - python3
       - tzdata
@@ -29,7 +32,7 @@ environment:
   environment:
     BAZEL_ARGS: "--config=g++"
     EXTRA_BAZEL_ARGS: "--tool_java_runtime_version=local_jdk"
-    JAVA_HOME: /usr/lib/jvm/java-17-openjdk
+    JAVA_HOME: /usr/lib/jvm/java-${{vars.openjdk-version}}-openjdk
 
 pipeline:
   - uses: git-checkout

From 133a2a4d96ca4f10a9b060d7810d60ba1fdf7af2 Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@chainguard.dev>
Date: Fri, 24 Jan 2025 16:21:32 +0000
Subject: [PATCH 06/10] zetasql: Stop specifying the g++ config

zetasql does not build with gcc. Setting this
config in upstream's docker-base build also fails.

Drop the build-dep on gcc-12, which probably wasn't
doing anything anyway because it was not the system
default.

Signed-off-by: dann frazier <dann.frazier@chainguard.dev>
---
 zetasql.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/zetasql.yaml b/zetasql.yaml
index 165e1af149e..08bd3a2e2b7 100644
--- a/zetasql.yaml
+++ b/zetasql.yaml
@@ -21,7 +21,6 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
-      - gcc-12
       - git
       - libxml2 # Required by downloaded llvm toolchain
       - openjdk-${{vars.openjdk-version}}-default-jdk
@@ -30,7 +29,7 @@ environment:
       - tzdata
       - wolfi-baselayout
   environment:
-    BAZEL_ARGS: "--config=g++"
+    BAZEL_ARGS:
     EXTRA_BAZEL_ARGS: "--tool_java_runtime_version=local_jdk"
     JAVA_HOME: /usr/lib/jvm/java-${{vars.openjdk-version}}-openjdk
 

From dc750dc7d9d8a51d1688bd18d5342efcd394d7fc Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@chainguard.dev>
Date: Wed, 22 Jan 2025 01:31:06 +0000
Subject: [PATCH 07/10] zetasql: strip test files with non-latin filenames
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

boost and civetweb include test files with non-latin filenames.
Something in the build system is unable to deal with them:

 WARN ERROR: /home/build/.cache/bazel/_bazel_build/79a1bfc8c8b5b6a6d226b38d072f165b/external/boost/BUILD.bazel:27:12: Foreign Cc - BoostBuild: Building boost failed: error reading file '@boost//:libs/wave/test/testwave/testfiles/utf8-test-ßµ™∃/file.hpp': /home/build/.cache/bazel/_bazel_build/79a1bfc8c8b5b6a6d226b38d072f165b/external/boost/libs/wave/test/testwave/testfiles/utf8-test-ßµ™∃/file.hpp (No such file or directory)
 WARN ERROR: /home/build/.cache/bazel/_bazel_build/79a1bfc8c8b5b6a6d226b38d072f165b/external/boost/BUILD.bazel:27:12: Foreign Cc - BoostBuild: Building boost failed: 1 input file(s) are in error

Note that it is not the project test suites detecting a regression,
rather it is part of the bazel build setup.

Until this is root caused, work around it by stripping those
files out of the build area.

Signed-off-by: dann frazier <dann.frazier@chainguard.dev>
---
 zetasql.yaml                 |  2 +-
 zetasql/strip-nonlatin.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 zetasql/strip-nonlatin.patch

diff --git a/zetasql.yaml b/zetasql.yaml
index 08bd3a2e2b7..8eb7aa75673 100644
--- a/zetasql.yaml
+++ b/zetasql.yaml
@@ -42,7 +42,7 @@ pipeline:
 
   - uses: patch
     with:
-      patches: multi-arch-for-linux.patch dev_lsp-to-github.patch llvm-specify-url.patch
+      patches: multi-arch-for-linux.patch dev_lsp-to-github.patch llvm-specify-url.patch strip-nonlatin.patch
 
   - runs: |
       cd zetasql
diff --git a/zetasql/strip-nonlatin.patch b/zetasql/strip-nonlatin.patch
new file mode 100644
index 00000000000..2a540d02f99
--- /dev/null
+++ b/zetasql/strip-nonlatin.patch
@@ -0,0 +1,26 @@
+diff --git a/bazel/boost.BUILD b/bazel/boost.BUILD
+index 1c757ee4..ee1b0617 100644
+--- a/bazel/boost.BUILD
++++ b/bazel/boost.BUILD
+@@ -20,7 +20,7 @@ load("@rules_foreign_cc//foreign_cc:defs.bzl", "boost_build")
+ 
+ filegroup(
+     name = "all_srcs",
+-    srcs = glob(["**"]),
++    srcs = glob(["**"], exclude=["libs/wave/test/testwave/testfiles/**"]),
+     visibility = ["//visibility:private"],
+ )
+ 
+diff --git a/bazel/civetweb.BUILD b/bazel/civetweb.BUILD
+index 5cc6271d..efb1728a 100644
+--- a/bazel/civetweb.BUILD
++++ b/bazel/civetweb.BUILD
+@@ -24,7 +24,7 @@ load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")
+ 
+ filegroup(
+     name = "all",
+-    srcs = glob(["**"]),
++    srcs = glob(["**"], exclude=["test/nonlatin/*"]),
+ )
+ 
+ cmake(

From f4a7643435be159c6f15f44fa2b6c918af314dea Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@chainguard.dev>
Date: Wed, 22 Jan 2025 02:56:56 +0000
Subject: [PATCH 08/10] zetasql: Use CMAKE_INSTALL_LIBDIR to fix civetweb
 install

The civetweb dependency fails to build on wolfi:

  [...]/external/civetweb/BUILD.bazel:30:6: output 'external/civetweb/civetweb/lib/libcivetweb.a' was not created
  [...]/external/civetweb/BUILD.bazel:30:6: output 'external/civetweb/civetweb/lib/libcivetweb-cpp.a' was not created
  [...]/external/civetweb/BUILD.bazel:30:6: Foreign Cc - CMake: Building civetweb failed: not all outputs were created or valid

These files are being built, but are being installed in the wrong
directory. Use CMAKE_INSTALL_LIBDIR to tell it where to install
things.

Signed-off-by: dann frazier <dann.frazier@chainguard.dev>
---
 zetasql.yaml                  |  2 +-
 zetasql/civetweb-libdir.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 zetasql/civetweb-libdir.patch

diff --git a/zetasql.yaml b/zetasql.yaml
index 8eb7aa75673..4b9b0a04224 100644
--- a/zetasql.yaml
+++ b/zetasql.yaml
@@ -42,7 +42,7 @@ pipeline:
 
   - uses: patch
     with:
-      patches: multi-arch-for-linux.patch dev_lsp-to-github.patch llvm-specify-url.patch strip-nonlatin.patch
+      patches: multi-arch-for-linux.patch dev_lsp-to-github.patch llvm-specify-url.patch strip-nonlatin.patch civetweb-libdir.patch
 
   - runs: |
       cd zetasql
diff --git a/zetasql/civetweb-libdir.patch b/zetasql/civetweb-libdir.patch
new file mode 100644
index 00000000000..404685492fe
--- /dev/null
+++ b/zetasql/civetweb-libdir.patch
@@ -0,0 +1,12 @@
+diff --git a/bazel/civetweb.BUILD b/bazel/civetweb.BUILD
+index 5cc6271d..6733fa16 100644
+--- a/bazel/civetweb.BUILD
++++ b/bazel/civetweb.BUILD
+@@ -32,6 +32,7 @@ cmake(
+     cache_entries = {
+         "CMAKE_C_FLAGS": "-fPIC",
+         "CMAKE_CXX_FLAGS": "-fPIC",
++	"CMAKE_INSTALL_LIBDIR": "lib",
+     },
+     generate_args = [
+         "-DCIVETWEB_ENABLE_CXX=ON",

From 8ca7494fd167ea109e5d3b282106bf553330d9e5 Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@chainguard.dev>
Date: Fri, 24 Jan 2025 11:12:31 -0700
Subject: [PATCH 09/10] Remove zetasql

The apk we produce is empty, and nothing depends on it.

Signed-off-by: dann frazier <dann.frazier@chainguard.dev>
---
 zetasql.yaml                       | 67 ------------------------------
 zetasql/civetweb-libdir.patch      | 12 ------
 zetasql/dev_lsp-to-github.patch    | 34 ---------------
 zetasql/llvm-specify-url.patch     | 23 ----------
 zetasql/multi-arch-for-linux.patch | 13 ------
 zetasql/strip-nonlatin.patch       | 26 ------------
 6 files changed, 175 deletions(-)
 delete mode 100644 zetasql.yaml
 delete mode 100644 zetasql/civetweb-libdir.patch
 delete mode 100644 zetasql/dev_lsp-to-github.patch
 delete mode 100644 zetasql/llvm-specify-url.patch
 delete mode 100644 zetasql/multi-arch-for-linux.patch
 delete mode 100644 zetasql/strip-nonlatin.patch

diff --git a/zetasql.yaml b/zetasql.yaml
deleted file mode 100644
index 4b9b0a04224..00000000000
--- a/zetasql.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-package:
-  name: zetasql
-  version: 2024.11.1
-  epoch: 0
-  description: ZetaSQL - Analyzer Framework for SQL
-  copyright:
-    - license: Apache-2.0
-  resources:
-    cpu: 33
-    memory: 100Gi
-
-vars:
-  openjdk-version: 23
-
-environment:
-  contents:
-    packages:
-      - bash
-      - bazel-7
-      - binutils
-      - build-base
-      - busybox
-      - ca-certificates-bundle
-      - git
-      - libxml2 # Required by downloaded llvm toolchain
-      - openjdk-${{vars.openjdk-version}}-default-jdk
-      - patch
-      - python3
-      - tzdata
-      - wolfi-baselayout
-  environment:
-    BAZEL_ARGS:
-    EXTRA_BAZEL_ARGS: "--tool_java_runtime_version=local_jdk"
-    JAVA_HOME: /usr/lib/jvm/java-${{vars.openjdk-version}}-openjdk
-
-pipeline:
-  - uses: git-checkout
-    with:
-      repository: https://github.com/google/zetasql
-      tag: ${{package.version}}
-      expected-commit: a516c6b26d183efc4f56293256bba92e243b7a61
-
-  - uses: patch
-    with:
-      patches: multi-arch-for-linux.patch dev_lsp-to-github.patch llvm-specify-url.patch strip-nonlatin.patch civetweb-libdir.patch
-
-  - runs: |
-      cd zetasql
-      bazel build --verbose_failures ${BAZEL_ARGS} $EXTRA_BAZEL_ARGS -c opt ...
-      # TODO need to copy whats required after this from either bazel-bin or bazel-out
-
-  - uses: strip
-
-subpackages:
-  - name: ${{package.name}}-dev
-    description: ${{package.name}} dev
-    pipeline:
-      - uses: split/dev
-    dependencies:
-      runtime:
-        - zetasql
-
-update:
-  enabled: true
-  github:
-    identifier: google/zetasql
-    use-tag: true
diff --git a/zetasql/civetweb-libdir.patch b/zetasql/civetweb-libdir.patch
deleted file mode 100644
index 404685492fe..00000000000
--- a/zetasql/civetweb-libdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/bazel/civetweb.BUILD b/bazel/civetweb.BUILD
-index 5cc6271d..6733fa16 100644
---- a/bazel/civetweb.BUILD
-+++ b/bazel/civetweb.BUILD
-@@ -32,6 +32,7 @@ cmake(
-     cache_entries = {
-         "CMAKE_C_FLAGS": "-fPIC",
-         "CMAKE_CXX_FLAGS": "-fPIC",
-+	"CMAKE_INSTALL_LIBDIR": "lib",
-     },
-     generate_args = [
-         "-DCIVETWEB_ENABLE_CXX=ON",
diff --git a/zetasql/dev_lsp-to-github.patch b/zetasql/dev_lsp-to-github.patch
deleted file mode 100644
index cc4a8215e5d..00000000000
--- a/zetasql/dev_lsp-to-github.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/bazel/zetasql_deps_step_2.bzl b/bazel/zetasql_deps_step_2.bzl
-index 2b6b01fa..ff8eb93d 100644
---- a/bazel/zetasql_deps_step_2.bzl
-+++ b/bazel/zetasql_deps_step_2.bzl
-@@ -48,21 +48,29 @@ def textmapper_dependencies():
-         name = "dev_lsp_go_jsonrpc2",
-         importpath = "go.lsp.dev/jsonrpc2",
-         commit = "8c68d4fd37cd4bd06b62b3243f0d2292c681d164",
-+        remote = "https://github.com/go-language-server/jsonrpc2",
-+        vcs = "git",
-     )
-     go_repository(
-         name = "dev_lsp_go_protocol",
-         importpath = "go.lsp.dev/protocol",
-         commit = "da30f9ae0326cc45b76adc5cd8920ac1ffa14a15",
-+        remote = "https://github.com/go-language-server/protocol",
-+        vcs = "git",
-     )
-     go_repository(
-         name = "dev_lsp_go_uri",
-         importpath = "go.lsp.dev/uri",
-         commit = "63eaac75cc850f596be19073ff6d4ec198603779",
-+        remote = "https://github.com/go-language-server/uri",
-+        vcs = "git",
-     )
-     go_repository(
-         name = "dev_lsp_go_pkg",
-         importpath = "go.lsp.dev/pkg",
-         commit = "384b27a52fb2b5d74d78cfe89c7738e9a3e216a5",
-+        remote = "https://github.com/go-language-server/pkg",
-+        vcs = "git",
-     )
-     go_repository(
-         name = "org_uber_go_zap",
diff --git a/zetasql/llvm-specify-url.patch b/zetasql/llvm-specify-url.patch
deleted file mode 100644
index 1c7161bc4f1..00000000000
--- a/zetasql/llvm-specify-url.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/bazel/zetasql_deps_step_1.bzl
-+++ b/bazel/zetasql_deps_step_1.bzl
-@@ -33,13 +33,19 @@
-     llvm_toolchain(
-         name = "llvm_toolchain",
-         llvm_versions = {
--            "": "16.0.0",
-+            "": "16.0.4",
-             # The LLVM repo stops providing pre-built binaries for the MacOS x86_64
-             # architecture for versions >= 16.0.0: https://github.com/llvm/llvm-project/releases,
-             # but our Kokoro MacOS tests are still using x86_64 (ventura).
-             # TODO: Upgrade the MacOS version to sonoma-slcn.
-             "darwin-x86_64": "15.0.7",
-         },
-+        strip_prefix = {
-+            "linux-x86_64": "clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04",
-+        },
-+        urls = {
-+            "linux-x86_64": ["https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04.tar.xz"],
-+        },
-     )
- 
-     http_archive(
diff --git a/zetasql/multi-arch-for-linux.patch b/zetasql/multi-arch-for-linux.patch
deleted file mode 100644
index 180e689d57e..00000000000
--- a/zetasql/multi-arch-for-linux.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/java/com/google/zetasql/BUILD b/java/com/google/zetasql/BUILD
-index 3ca01857..d9cbc35a 100644
---- a/java/com/google/zetasql/BUILD
-+++ b/java/com/google/zetasql/BUILD
-@@ -204,7 +204,7 @@ javadoc_library(
- java_library(
-     name = "jni_channel_linux",
-     resources = select({
--        "@bazel_tools//src/conditions:linux_x86_64": ["//zetasql/local_service:liblocal_service_jni.so"],
-+        "@bazel_tools//src/conditions:linux": ["//zetasql/local_service:liblocal_service_jni.so"],
-         "//conditions:default": [],
-     }),
-     tags = ["maven_coordinates=com.google.zetasql:zetasql-jni-channel-linux:${project.version}"],
diff --git a/zetasql/strip-nonlatin.patch b/zetasql/strip-nonlatin.patch
deleted file mode 100644
index 2a540d02f99..00000000000
--- a/zetasql/strip-nonlatin.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/bazel/boost.BUILD b/bazel/boost.BUILD
-index 1c757ee4..ee1b0617 100644
---- a/bazel/boost.BUILD
-+++ b/bazel/boost.BUILD
-@@ -20,7 +20,7 @@ load("@rules_foreign_cc//foreign_cc:defs.bzl", "boost_build")
- 
- filegroup(
-     name = "all_srcs",
--    srcs = glob(["**"]),
-+    srcs = glob(["**"], exclude=["libs/wave/test/testwave/testfiles/**"]),
-     visibility = ["//visibility:private"],
- )
- 
-diff --git a/bazel/civetweb.BUILD b/bazel/civetweb.BUILD
-index 5cc6271d..efb1728a 100644
---- a/bazel/civetweb.BUILD
-+++ b/bazel/civetweb.BUILD
-@@ -24,7 +24,7 @@ load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")
- 
- filegroup(
-     name = "all",
--    srcs = glob(["**"]),
-+    srcs = glob(["**"], exclude=["test/nonlatin/*"]),
- )
- 
- cmake(

From 6d2f482c62b7aca106ec1a009bdc9614b6912535 Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@chainguard.dev>
Date: Tue, 4 Feb 2025 10:20:36 -0700
Subject: [PATCH 10/10] Withdraw zetasql

Signed-off-by: dann frazier <dann.frazier@chainguard.dev>
---
 withdrawn-packages.txt | 229 +----------------------------------------
 1 file changed, 2 insertions(+), 227 deletions(-)

diff --git a/withdrawn-packages.txt b/withdrawn-packages.txt
index 5fd5c322f6c..19fffe11274 100644
--- a/withdrawn-packages.txt
+++ b/withdrawn-packages.txt
@@ -1,227 +1,2 @@
-glibc-2.41-r0.apk
-glibc-dev-2.41-r0.apk
-glibc-iconv-2.41-r0.apk
-glibc-locale-aa-2.41-r0.apk
-glibc-locale-af-2.41-r0.apk
-glibc-locale-agr-2.41-r0.apk
-glibc-locale-ak-2.41-r0.apk
-glibc-locale-am-2.41-r0.apk
-glibc-locale-an-2.41-r0.apk
-glibc-locale-anp-2.41-r0.apk
-glibc-locale-ar-2.41-r0.apk
-glibc-locale-as-2.41-r0.apk
-glibc-locale-ast-2.41-r0.apk
-glibc-locale-ayc-2.41-r0.apk
-glibc-locale-az-2.41-r0.apk
-glibc-locale-be-2.41-r0.apk
-glibc-locale-bem-2.41-r0.apk
-glibc-locale-ber-2.41-r0.apk
-glibc-locale-bg-2.41-r0.apk
-glibc-locale-bhb-2.41-r0.apk
-glibc-locale-bho-2.41-r0.apk
-glibc-locale-bi-2.41-r0.apk
-glibc-locale-bn-2.41-r0.apk
-glibc-locale-bo-2.41-r0.apk
-glibc-locale-br-2.41-r0.apk
-glibc-locale-brx-2.41-r0.apk
-glibc-locale-bs-2.41-r0.apk
-glibc-locale-byn-2.41-r0.apk
-glibc-locale-ca-2.41-r0.apk
-glibc-locale-ce-2.41-r0.apk
-glibc-locale-chr-2.41-r0.apk
-glibc-locale-ckb-2.41-r0.apk
-glibc-locale-cmn-2.41-r0.apk
-glibc-locale-crh-2.41-r0.apk
-glibc-locale-cs-2.41-r0.apk
-glibc-locale-csb-2.41-r0.apk
-glibc-locale-cv-2.41-r0.apk
-glibc-locale-cy-2.41-r0.apk
-glibc-locale-da-2.41-r0.apk
-glibc-locale-de-2.41-r0.apk
-glibc-locale-doi-2.41-r0.apk
-glibc-locale-dsb-2.41-r0.apk
-glibc-locale-dv-2.41-r0.apk
-glibc-locale-dz-2.41-r0.apk
-glibc-locale-el-2.41-r0.apk
-glibc-locale-en-2.41-r0.apk
-glibc-locale-eo-2.41-r0.apk
-glibc-locale-es-2.41-r0.apk
-glibc-locale-et-2.41-r0.apk
-glibc-locale-eu-2.41-r0.apk
-glibc-locale-fa-2.41-r0.apk
-glibc-locale-ff-2.41-r0.apk
-glibc-locale-fi-2.41-r0.apk
-glibc-locale-fil-2.41-r0.apk
-glibc-locale-fo-2.41-r0.apk
-glibc-locale-fr-2.41-r0.apk
-glibc-locale-fur-2.41-r0.apk
-glibc-locale-fy-2.41-r0.apk
-glibc-locale-ga-2.41-r0.apk
-glibc-locale-gbm-2.41-r0.apk
-glibc-locale-gd-2.41-r0.apk
-glibc-locale-gez-2.41-r0.apk
-glibc-locale-gl-2.41-r0.apk
-glibc-locale-gu-2.41-r0.apk
-glibc-locale-gv-2.41-r0.apk
-glibc-locale-ha-2.41-r0.apk
-glibc-locale-hak-2.41-r0.apk
-glibc-locale-he-2.41-r0.apk
-glibc-locale-hi-2.41-r0.apk
-glibc-locale-hif-2.41-r0.apk
-glibc-locale-hne-2.41-r0.apk
-glibc-locale-hr-2.41-r0.apk
-glibc-locale-hsb-2.41-r0.apk
-glibc-locale-ht-2.41-r0.apk
-glibc-locale-hu-2.41-r0.apk
-glibc-locale-hy-2.41-r0.apk
-glibc-locale-ia-2.41-r0.apk
-glibc-locale-id-2.41-r0.apk
-glibc-locale-ig-2.41-r0.apk
-glibc-locale-ik-2.41-r0.apk
-glibc-locale-is-2.41-r0.apk
-glibc-locale-it-2.41-r0.apk
-glibc-locale-iu-2.41-r0.apk
-glibc-locale-ja-2.41-r0.apk
-glibc-locale-ka-2.41-r0.apk
-glibc-locale-kab-2.41-r0.apk
-glibc-locale-kk-2.41-r0.apk
-glibc-locale-kl-2.41-r0.apk
-glibc-locale-km-2.41-r0.apk
-glibc-locale-kn-2.41-r0.apk
-glibc-locale-ko-2.41-r0.apk
-glibc-locale-kok-2.41-r0.apk
-glibc-locale-ks-2.41-r0.apk
-glibc-locale-ku-2.41-r0.apk
-glibc-locale-kv-2.41-r0.apk
-glibc-locale-kw-2.41-r0.apk
-glibc-locale-ky-2.41-r0.apk
-glibc-locale-lb-2.41-r0.apk
-glibc-locale-lg-2.41-r0.apk
-glibc-locale-li-2.41-r0.apk
-glibc-locale-lij-2.41-r0.apk
-glibc-locale-ln-2.41-r0.apk
-glibc-locale-lo-2.41-r0.apk
-glibc-locale-lt-2.41-r0.apk
-glibc-locale-ltg-2.41-r0.apk
-glibc-locale-lv-2.41-r0.apk
-glibc-locale-lzh-2.41-r0.apk
-glibc-locale-mag-2.41-r0.apk
-glibc-locale-mai-2.41-r0.apk
-glibc-locale-mdf-2.41-r0.apk
-glibc-locale-mfe-2.41-r0.apk
-glibc-locale-mg-2.41-r0.apk
-glibc-locale-mhr-2.41-r0.apk
-glibc-locale-mi-2.41-r0.apk
-glibc-locale-miq-2.41-r0.apk
-glibc-locale-mjw-2.41-r0.apk
-glibc-locale-mk-2.41-r0.apk
-glibc-locale-ml-2.41-r0.apk
-glibc-locale-mn-2.41-r0.apk
-glibc-locale-mni-2.41-r0.apk
-glibc-locale-mnw-2.41-r0.apk
-glibc-locale-mr-2.41-r0.apk
-glibc-locale-ms-2.41-r0.apk
-glibc-locale-mt-2.41-r0.apk
-glibc-locale-my-2.41-r0.apk
-glibc-locale-nan-2.41-r0.apk
-glibc-locale-nb-2.41-r0.apk
-glibc-locale-nds-2.41-r0.apk
-glibc-locale-ne-2.41-r0.apk
-glibc-locale-nhn-2.41-r0.apk
-glibc-locale-niu-2.41-r0.apk
-glibc-locale-nl-2.41-r0.apk
-glibc-locale-nn-2.41-r0.apk
-glibc-locale-nr-2.41-r0.apk
-glibc-locale-nso-2.41-r0.apk
-glibc-locale-oc-2.41-r0.apk
-glibc-locale-om-2.41-r0.apk
-glibc-locale-or-2.41-r0.apk
-glibc-locale-os-2.41-r0.apk
-glibc-locale-pa-2.41-r0.apk
-glibc-locale-pap-2.41-r0.apk
-glibc-locale-pl-2.41-r0.apk
-glibc-locale-posix-2.41-r0.apk
-glibc-locale-ps-2.41-r0.apk
-glibc-locale-pt-2.41-r0.apk
-glibc-locale-quz-2.41-r0.apk
-glibc-locale-raj-2.41-r0.apk
-glibc-locale-rif-2.41-r0.apk
-glibc-locale-ro-2.41-r0.apk
-glibc-locale-ru-2.41-r0.apk
-glibc-locale-rw-2.41-r0.apk
-glibc-locales-2.41-r0.apk
-glibc-locale-sa-2.41-r0.apk
-glibc-locale-sah-2.41-r0.apk
-glibc-locale-sat-2.41-r0.apk
-glibc-locale-sc-2.41-r0.apk
-glibc-locale-scn-2.41-r0.apk
-glibc-locale-sd-2.41-r0.apk
-glibc-locale-se-2.41-r0.apk
-glibc-locale-sgs-2.41-r0.apk
-glibc-locale-shn-2.41-r0.apk
-glibc-locale-shs-2.41-r0.apk
-glibc-locale-si-2.41-r0.apk
-glibc-locale-sid-2.41-r0.apk
-glibc-locale-sk-2.41-r0.apk
-glibc-locale-sl-2.41-r0.apk
-glibc-locale-sm-2.41-r0.apk
-glibc-locale-so-2.41-r0.apk
-glibc-locale-sq-2.41-r0.apk
-glibc-locale-sr-2.41-r0.apk
-glibc-locale-ss-2.41-r0.apk
-glibc-locale-ssy-2.41-r0.apk
-glibc-locale-st-2.41-r0.apk
-glibc-locale-su-2.41-r0.apk
-glibc-locale-sv-2.41-r0.apk
-glibc-locale-sw-2.41-r0.apk
-glibc-locale-syr-2.41-r0.apk
-glibc-locale-szl-2.41-r0.apk
-glibc-locale-ta-2.41-r0.apk
-glibc-locale-tcy-2.41-r0.apk
-glibc-locale-te-2.41-r0.apk
-glibc-locale-tg-2.41-r0.apk
-glibc-locale-th-2.41-r0.apk
-glibc-locale-the-2.41-r0.apk
-glibc-locale-ti-2.41-r0.apk
-glibc-locale-tig-2.41-r0.apk
-glibc-locale-tk-2.41-r0.apk
-glibc-locale-tl-2.41-r0.apk
-glibc-locale-tn-2.41-r0.apk
-glibc-locale-to-2.41-r0.apk
-glibc-locale-tok-2.41-r0.apk
-glibc-locale-tpi-2.41-r0.apk
-glibc-locale-tr-2.41-r0.apk
-glibc-locale-ts-2.41-r0.apk
-glibc-locale-tt-2.41-r0.apk
-glibc-locale-ug-2.41-r0.apk
-glibc-locale-uk-2.41-r0.apk
-glibc-locale-unm-2.41-r0.apk
-glibc-locale-ur-2.41-r0.apk
-glibc-locale-uz-2.41-r0.apk
-glibc-locale-ve-2.41-r0.apk
-glibc-locale-vi-2.41-r0.apk
-glibc-locale-wa-2.41-r0.apk
-glibc-locale-wae-2.41-r0.apk
-glibc-locale-wal-2.41-r0.apk
-glibc-locale-wo-2.41-r0.apk
-glibc-locale-xh-2.41-r0.apk
-glibc-locale-yi-2.41-r0.apk
-glibc-locale-yo-2.41-r0.apk
-glibc-locale-yue-2.41-r0.apk
-glibc-locale-yuw-2.41-r0.apk
-glibc-locale-zgh-2.41-r0.apk
-glibc-locale-zh-2.41-r0.apk
-glibc-locale-zu-2.41-r0.apk
-glibc-tracing-2.41-r0.apk
-ld-linux-2.41-r0.apk
-libc-bin-2.41-r0.apk
-libcrypt1-2.41-r0.apk
-localedef-2.41-r0.apk
-nscd-2.41-r0.apk
-nss-db-2.41-r0.apk
-nss-hesiod-2.41-r0.apk
-pcprofiledump-2.41-r0.apk
-posix-libc-utils-2.41-r0.apk
-sln-2.41-r0.apk
-sotruss-2.41-r0.apk
-tzutils-2.41-r0.apk
+zetasql-2024.06.1-r2.apk
+zetasql-dev-2024.06.1-r2.apk