Add support for zlib-ng

Author: catatsuy

builder/builder.go

@@ -51,6 +51,8 @@ func (builder *Builder) name() string {
 		name = "libressl"
 	case ComponentZlib:
 		name = "zlib"
+	case ComponentZlibNG:
+		name = "zlib-ng"
 	case ComponentOpenResty:
 		name = openresty.Name(builder.Version)
 	case ComponentFreenginx:
@@ -74,6 +76,11 @@ func (builder *Builder) option() string {
 		name = "pcre"
 	}
 
+	// zlib-ng does not match option name
+	if name == "zlib-ng" {
+		name = "zlib"
+	}
+
 	return fmt.Sprintf("--with-%s", name)
 }
 
@@ -89,6 +96,8 @@ func (builder *Builder) DownloadURL() string {
 		return fmt.Sprintf("%s/libressl-%s.tar.gz", LibreSSLDownloadURLPrefix, builder.Version)
 	case ComponentZlib:
 		return fmt.Sprintf("%s/zlib-%s.tar.gz", ZlibDownloadURLPrefix, builder.Version)
+	case ComponentZlibNG:
+		return fmt.Sprintf("%s/%s.tar.gz", ZlibNGDownloadURLPrefix, builder.Version)
 	case ComponentOpenResty:
 		return fmt.Sprintf("%s/openresty-%s.tar.gz", OpenRestyDownloadURLPrefix, builder.Version)
 	case ComponentFreenginx:
@@ -99,6 +108,9 @@ func (builder *Builder) DownloadURL() string {
 }
 
 func (builder *Builder) SourcePath() string {
+	if builder.name() == "" {
+		return fmt.Sprintf("%s", builder.Version)
+	}
 	return fmt.Sprintf("%s-%s", builder.name(), builder.Version)
 }
 
@@ -180,6 +192,8 @@ func MakeBuilder(component int, version string) Builder {
 		builder.DownloadURLPrefix = LibreSSLDownloadURLPrefix
 	case ComponentZlib:
 		builder.DownloadURLPrefix = ZlibDownloadURLPrefix
+	case ComponentZlibNG:
+		builder.DownloadURLPrefix = ZlibNGDownloadURLPrefix
 	case ComponentOpenResty:
 		builder.DownloadURLPrefix = OpenRestyDownloadURLPrefix
 	case ComponentFreenginx:

builder/builder_test.go

@@ -12,6 +12,7 @@ func setupBuilders(t *testing.T) []Builder {
 	builders[ComponentOpenSSL] = MakeLibraryBuilder(ComponentOpenSSL, OpenSSLVersion, true)
 	builders[ComponentLibreSSL] = MakeLibraryBuilder(ComponentLibreSSL, LibreSSLVersion, true)
 	builders[ComponentZlib] = MakeLibraryBuilder(ComponentZlib, ZlibVersion, false)
+	builders[ComponentZlibNG] = MakeLibraryBuilder(ComponentZlibNG, ZlibNGVersion, false)
 	builders[ComponentOpenResty] = MakeBuilder(ComponentOpenResty, OpenRestyVersion)
 	builders[ComponentFreenginx] = MakeBuilder(ComponentFreenginx, FreenginxVersion)
 	return builders
@@ -44,6 +45,10 @@ func TestName(t *testing.T) {
 			got:  builders[ComponentZlib].name(),
 			want: "zlib",
 		},
+		{
+			got:  builders[ComponentZlibNG].name(),
+			want: "zlib-ng",
+		},
 		{
 			got:  builders[ComponentOpenResty].name(),
 			want: "openresty",

builder/const.go

@@ -30,6 +30,12 @@ const (
 	ZlibDownloadURLPrefix = "https://zlib.net"
 )
 
+// zlib-ng
+const (
+	ZlibNGVersion           = "2.2.4"
+	ZlibNGDownloadURLPrefix = "https://github.com/zlib-ng/zlib-ng/archive/refs/tags"
+)
+
 // openResty
 const (
 	OpenRestyVersion           = "1.27.1.2"
@@ -51,5 +57,6 @@ const (
 	ComponentOpenSSL
 	ComponentLibreSSL
 	ComponentZlib
+	ComponentZlibNG
 	ComponentMax
 )

nginx-build.go

@@ -114,6 +114,7 @@ func main() {
 	openSSLStatic := nginxBuildOptions.Bools["openssl"].Enabled
 	libreSSLStatic := nginxBuildOptions.Bools["libressl"].Enabled
 	zlibStatic := nginxBuildOptions.Bools["zlib"].Enabled
+	zlibNGStatic := nginxBuildOptions.Bools["zlib-ng"].Enabled
 	clear := nginxBuildOptions.Bools["clear"].Enabled
 	versionPrint := nginxBuildOptions.Bools["version"].Enabled
 	versionsPrint := nginxBuildOptions.Bools["versions"].Enabled
@@ -131,6 +132,7 @@ func main() {
 	openSSLVersion := nginxBuildOptions.Values["opensslversion"].Value
 	libreSSLVersion := nginxBuildOptions.Values["libresslversion"].Value
 	zlibVersion := nginxBuildOptions.Values["zlibversion"].Value
+	zlibNGVersion := nginxBuildOptions.Values["zlibngversion"].Value
 	openRestyVersion := nginxBuildOptions.Values["openrestyversion"].Value
 	freenginxVersion := nginxBuildOptions.Values["freenginxversion"].Value
 	patchOption := nginxBuildOptions.Values["patch-opt"].Value
@@ -201,6 +203,7 @@ func main() {
 	openSSLBuilder := builder.MakeLibraryBuilder(builder.ComponentOpenSSL, *openSSLVersion, *openSSLStatic)
 	libreSSLBuilder := builder.MakeLibraryBuilder(builder.ComponentLibreSSL, *libreSSLVersion, *libreSSLStatic)
 	zlibBuilder := builder.MakeLibraryBuilder(builder.ComponentZlib, *zlibVersion, *zlibStatic)
+	zlibNGBuilder := builder.MakeLibraryBuilder(builder.ComponentZlibNG, *zlibNGVersion, *zlibNGStatic)
 
 	if *idempotent {
 		builders := []builder.Builder{
@@ -318,6 +321,14 @@ func main() {
 		}()
 	}
 
+	if *zlibNGStatic {
+		wg.Add(1)
+		go func() {
+			downloadAndExtractParallel(&zlibNGBuilder)
+			wg.Done()
+		}()
+	}
+
 	wg.Add(1)
 	go func() {
 		downloadAndExtractParallel(&nginxBuilder)
@@ -366,6 +377,10 @@ func main() {
 		dependencies = append(dependencies, builder.MakeStaticLibrary(&zlibBuilder))
 	}
 
+	if *zlibNGStatic {
+		dependencies = append(dependencies, builder.MakeStaticLibrary(&zlibNGBuilder))
+	}
+
 	log.Printf("Generate configure script for %s.....", nginxBuilder.SourcePath())
 
 	if *pcreStatic && pcreBuilder.IsIncludeWithOption(nginxConfigure) {

option.go

@@ -58,6 +58,9 @@ func makeNginxBuildOptions() Options {
 	argsBool["zlib"] = OptionBool{
 		Desc: "embedded zlib staticlibrary",
 	}
+	argsBool["zlib-ng"] = OptionBool{
+		Desc: "embedded zlib-ng staticlibrary",
+	}
 	argsBool["clear"] = OptionBool{
 		Desc: "remove entries in working directory",
 	}
@@ -115,6 +118,10 @@ func makeNginxBuildOptions() Options {
 		Desc:    "zlib version",
 		Default: builder.ZlibVersion,
 	}
+	argsString["zlibngversion"] = OptionValue{
+		Desc:    "zlib-ng version",
+		Default: builder.ZlibNGVersion,
+	}
 	argsString["openrestyversion"] = OptionValue{
 		Desc:    "openresty version",
 		Default: builder.OpenRestyVersion,