[PR PATCH] lighttpd: update to 1.4.68

[PR PATCH] lighttpd: update to 1.4.68

[gstrauss]

[-- Attachment #1: Type: text/plain, Size: 418 bytes --]

There is a new pull request by gstrauss against master on the void-packages repository

https://github.com/gstrauss/void-packages lighttpd-1.4.68
https://github.com/void-linux/void-packages/pull/41428

lighttpd: update to 1.4.68
lighttpd: update to 1.4.68

#### Testing the changes
- I tested the changes in this PR: **NO**

A patch file from https://github.com/void-linux/void-packages/pull/41428.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lighttpd-1.4.68-41428.patch --]
[-- Type: text/x-diff, Size: 2552 bytes --]

From 79b86885291955341fb95c6939d6b6044c92627f Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Thu, 24 Nov 2022 02:35:41 -0500
Subject: [PATCH 1/2] lighttpd: modify build cmd for type: feature opts

modify build command for meson type: feature options
---
 srcpkgs/lighttpd/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0f4379940ce4..5a1438bb132b 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -3,12 +3,13 @@ pkgname=lighttpd
 version=1.4.67
 revision=1
 build_style=meson
-configure_args="-Dwith_brotli=false -Dwith_bzip=false
- -Dwith_krb5=true -Dwith_ldap=true
- -Dwith_libunwind=false -Dwith_lua=true
- -Dwith_mysql=false -Dwith_openssl=true -Dwith_pcre2=true -Dwith_pgsql=false
- -Dwith_sasl=false -Dwith_webdav_props=true -Dwith_webdav_locks=true
- -Dwith_xattr=true -Dwith_zlib=true -Dwith_zstd=false -Dwith_dbi=false
+configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
+ -Dwith_krb5=enabled -Dwith_ldap=enabled
+ -Dwith_libunwind=disabled -Dwith_lua=true
+ -Dwith_mysql=disabled -Dwith_openssl=true -Dwith_pcre2=true
+ -Dwith_pgsql=disabled
+ -Dwith_sasl=disabled -Dwith_webdav_props=enabled -Dwith_webdav_locks=enabled
+ -Dwith_xattr=true -Dwith_zlib=enabled -Dwith_zstd=disabled -Dwith_dbi=disabled
  -Dmoduledir=lib/lighttpd/modules"
 hostmakedepends="pkg-config"
 makedepends="

From 833998e784670462bf6ca1f206ea4e9e3ea6e87e Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Tue, 3 Jan 2023 13:03:57 -0500
Subject: [PATCH 2/2] lighttpd: update to 1.4.68

---
 srcpkgs/lighttpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 5a1438bb132b..fc84d9400749 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,6 +1,6 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
-version=1.4.67
+version=1.4.68
 revision=1
 build_style=meson
 configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
@@ -20,7 +20,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://lighttpd.net"
 distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz"
-checksum=7e04d767f51a8d824b32e2483ef2950982920d427d1272ef4667f49d6f89f358
+checksum=e56f37ae52b63e1ada4d76ce78005affb6e56eea2f6bdb0ce17d6d36e9583384
 
 conf_files="/etc/lighttpd/lighttpd.conf"
 system_accounts="_lighttpd"

Re: lighttpd: update to 1.4.68

[gstrauss]

[-- Attachment #1: Type: text/plain, Size: 392 bytes --]

New comment by gstrauss on void-packages repository

https://github.com/void-linux/void-packages/pull/41428#issuecomment-1370123745

Comment:
> src/meson.build:718:0: ERROR: File t/test_mod_evasive.c does not exist.

It is true that mod_evasive.c and t/test_mod_evasive.c no longer exist, and the meson.build files were updated.

It appears that a clean build needs to be done by the CI.

Re: [PR PATCH] [Updated] lighttpd: update to 1.4.68

[gstrauss]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

There is an updated pull request by gstrauss against master on the void-packages repository

https://github.com/gstrauss/void-packages lighttpd-1.4.68
https://github.com/void-linux/void-packages/pull/41428

lighttpd: update to 1.4.68
lighttpd: update to 1.4.68

#### Testing the changes
- I tested the changes in this PR: **NO**

A patch file from https://github.com/void-linux/void-packages/pull/41428.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lighttpd-1.4.68-41428.patch --]
[-- Type: text/x-diff, Size: 2552 bytes --]

From 0d0098168074cda8520a5fe29e5611a72e6c2afb Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Thu, 24 Nov 2022 02:35:41 -0500
Subject: [PATCH 1/2] lighttpd: modify build cmd for type: feature opts

modify build command for meson type: feature options
---
 srcpkgs/lighttpd/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0f4379940ce4..5a1438bb132b 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -3,12 +3,13 @@ pkgname=lighttpd
 version=1.4.67
 revision=1
 build_style=meson
-configure_args="-Dwith_brotli=false -Dwith_bzip=false
- -Dwith_krb5=true -Dwith_ldap=true
- -Dwith_libunwind=false -Dwith_lua=true
- -Dwith_mysql=false -Dwith_openssl=true -Dwith_pcre2=true -Dwith_pgsql=false
- -Dwith_sasl=false -Dwith_webdav_props=true -Dwith_webdav_locks=true
- -Dwith_xattr=true -Dwith_zlib=true -Dwith_zstd=false -Dwith_dbi=false
+configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
+ -Dwith_krb5=enabled -Dwith_ldap=enabled
+ -Dwith_libunwind=disabled -Dwith_lua=true
+ -Dwith_mysql=disabled -Dwith_openssl=true -Dwith_pcre2=true
+ -Dwith_pgsql=disabled
+ -Dwith_sasl=disabled -Dwith_webdav_props=enabled -Dwith_webdav_locks=enabled
+ -Dwith_xattr=true -Dwith_zlib=enabled -Dwith_zstd=disabled -Dwith_dbi=disabled
  -Dmoduledir=lib/lighttpd/modules"
 hostmakedepends="pkg-config"
 makedepends="

From a4a51ed5a3edc383e563a3fea3b699cf06cbf571 Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Tue, 3 Jan 2023 13:03:57 -0500
Subject: [PATCH 2/2] lighttpd: update to 1.4.68

---
 srcpkgs/lighttpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 5a1438bb132b..fc84d9400749 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,6 +1,6 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
-version=1.4.67
+version=1.4.68
 revision=1
 build_style=meson
 configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
@@ -20,7 +20,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://lighttpd.net"
 distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz"
-checksum=7e04d767f51a8d824b32e2483ef2950982920d427d1272ef4667f49d6f89f358
+checksum=e56f37ae52b63e1ada4d76ce78005affb6e56eea2f6bdb0ce17d6d36e9583384
 
 conf_files="/etc/lighttpd/lighttpd.conf"
 system_accounts="_lighttpd"

Re: lighttpd: update to 1.4.68

[gstrauss]

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]

New comment by gstrauss on void-packages repository

https://github.com/void-linux/void-packages/pull/41428#issuecomment-1370297667

Comment:
Maintainers: how can a clean build for lighttpd be triggered in the CI?

Re: lighttpd: update to 1.4.68

[gstrauss]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New comment by gstrauss on void-packages repository

https://github.com/void-linux/void-packages/pull/41428#issuecomment-1370298890

Comment:
@Gottox: how can a clean build for lighttpd be triggered in the CI?

Re: lighttpd: update to 1.4.68

[gstrauss]

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]

New comment by gstrauss on void-packages repository

https://github.com/void-linux/void-packages/pull/41428#issuecomment-1370300014

Comment:
ick.  There is a stray reference to t/test_mod_evasive.c that must be removed.  I'll have to patch it.

Re: [PR PATCH] [Updated] lighttpd: update to 1.4.68

[gstrauss]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

There is an updated pull request by gstrauss against master on the void-packages repository

https://github.com/gstrauss/void-packages lighttpd-1.4.68
https://github.com/void-linux/void-packages/pull/41428

lighttpd: update to 1.4.68
lighttpd: update to 1.4.68

#### Testing the changes
- I tested the changes in this PR: **NO**

A patch file from https://github.com/void-linux/void-packages/pull/41428.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lighttpd-1.4.68-41428.patch --]
[-- Type: text/x-diff, Size: 3848 bytes --]

From 0d0098168074cda8520a5fe29e5611a72e6c2afb Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Thu, 24 Nov 2022 02:35:41 -0500
Subject: [PATCH 1/3] lighttpd: modify build cmd for type: feature opts

modify build command for meson type: feature options
---
 srcpkgs/lighttpd/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0f4379940ce4..5a1438bb132b 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -3,12 +3,13 @@ pkgname=lighttpd
 version=1.4.67
 revision=1
 build_style=meson
-configure_args="-Dwith_brotli=false -Dwith_bzip=false
- -Dwith_krb5=true -Dwith_ldap=true
- -Dwith_libunwind=false -Dwith_lua=true
- -Dwith_mysql=false -Dwith_openssl=true -Dwith_pcre2=true -Dwith_pgsql=false
- -Dwith_sasl=false -Dwith_webdav_props=true -Dwith_webdav_locks=true
- -Dwith_xattr=true -Dwith_zlib=true -Dwith_zstd=false -Dwith_dbi=false
+configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
+ -Dwith_krb5=enabled -Dwith_ldap=enabled
+ -Dwith_libunwind=disabled -Dwith_lua=true
+ -Dwith_mysql=disabled -Dwith_openssl=true -Dwith_pcre2=true
+ -Dwith_pgsql=disabled
+ -Dwith_sasl=disabled -Dwith_webdav_props=enabled -Dwith_webdav_locks=enabled
+ -Dwith_xattr=true -Dwith_zlib=enabled -Dwith_zstd=disabled -Dwith_dbi=disabled
  -Dmoduledir=lib/lighttpd/modules"
 hostmakedepends="pkg-config"
 makedepends="

From a4a51ed5a3edc383e563a3fea3b699cf06cbf571 Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Tue, 3 Jan 2023 13:03:57 -0500
Subject: [PATCH 2/3] lighttpd: update to 1.4.68

---
 srcpkgs/lighttpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 5a1438bb132b..fc84d9400749 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,6 +1,6 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
-version=1.4.67
+version=1.4.68
 revision=1
 build_style=meson
 configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
@@ -20,7 +20,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://lighttpd.net"
 distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz"
-checksum=7e04d767f51a8d824b32e2483ef2950982920d427d1272ef4667f49d6f89f358
+checksum=e56f37ae52b63e1ada4d76ce78005affb6e56eea2f6bdb0ce17d6d36e9583384
 
 conf_files="/etc/lighttpd/lighttpd.conf"
 system_accounts="_lighttpd"

From 416ae824d8284efa003bc326e7ede23ab183c3d9 Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Tue, 3 Jan 2023 17:51:37 -0500
Subject: [PATCH 3/3] lighttpd: fix meson build

---
 .../lighttpd/patches/020-meson-tests.patch    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/lighttpd/patches/020-meson-tests.patch

diff --git a/srcpkgs/lighttpd/patches/020-meson-tests.patch b/srcpkgs/lighttpd/patches/020-meson-tests.patch
new file mode 100644
index 000000000000..c49cad9dd32b
--- /dev/null
+++ b/srcpkgs/lighttpd/patches/020-meson-tests.patch
@@ -0,0 +1,24 @@
+From d809433d6d900e899f796606b11bdc6a73413ac5 Mon Sep 17 00:00:00 2001
+From: Glenn Strauss <gstrauss@gluelogic.com>
+Date: Tue, 3 Jan 2023 17:50:16 -0500
+Subject: [PATCH] [meson] remove t/test_mod_evasive.c
+
+---
+ src/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index ff472c32..77089fc3 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -721,7 +721,6 @@ test('test_mod', executable('test_mod',
+ 		't/test_mod.c',
+ 		't/test_mod_access.c',
+ 		't/test_mod_alias.c',
+-		't/test_mod_evasive.c',
+ 		't/test_mod_evhost.c',
+ 		't/test_mod_indexfile.c',
+ 		't/test_mod_simple_vhost.c',
+-- 
+2.39.0
+

Re: lighttpd: update to 1.4.68

[kruceter]

[-- Attachment #1: Type: text/plain, Size: 243 bytes --]

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/41428#issuecomment-1370888188

Comment:
Please squash your commits into one.

Do not forget to retain the explanation about meson options.

Re: [PR PATCH] [Updated] lighttpd: update to 1.4.68

[gstrauss]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

There is an updated pull request by gstrauss against master on the void-packages repository

https://github.com/gstrauss/void-packages lighttpd-1.4.68
https://github.com/void-linux/void-packages/pull/41428

lighttpd: update to 1.4.68
lighttpd: update to 1.4.68

#### Testing the changes
- I tested the changes in this PR: **NO**

A patch file from https://github.com/void-linux/void-packages/pull/41428.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lighttpd-1.4.68-41428.patch --]
[-- Type: text/x-diff, Size: 3036 bytes --]

From 87bd7978dcb77ab6d9b6dfd77e39e68b9e569e7d Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Thu, 24 Nov 2022 02:35:41 -0500
Subject: [PATCH] lighttpd: update to 1.4.68

* update to 1.4.68
* modify build command for meson type: feature options
* fix meson build
---
 .../lighttpd/patches/020-meson-tests.patch    | 24 +++++++++++++++++++
 srcpkgs/lighttpd/template                     | 17 ++++++-------
 2 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/lighttpd/patches/020-meson-tests.patch

diff --git a/srcpkgs/lighttpd/patches/020-meson-tests.patch b/srcpkgs/lighttpd/patches/020-meson-tests.patch
new file mode 100644
index 000000000000..c49cad9dd32b
--- /dev/null
+++ b/srcpkgs/lighttpd/patches/020-meson-tests.patch
@@ -0,0 +1,24 @@
+From d809433d6d900e899f796606b11bdc6a73413ac5 Mon Sep 17 00:00:00 2001
+From: Glenn Strauss <gstrauss@gluelogic.com>
+Date: Tue, 3 Jan 2023 17:50:16 -0500
+Subject: [PATCH] [meson] remove t/test_mod_evasive.c
+
+---
+ src/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index ff472c32..77089fc3 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -721,7 +721,6 @@ test('test_mod', executable('test_mod',
+ 		't/test_mod.c',
+ 		't/test_mod_access.c',
+ 		't/test_mod_alias.c',
+-		't/test_mod_evasive.c',
+ 		't/test_mod_evhost.c',
+ 		't/test_mod_indexfile.c',
+ 		't/test_mod_simple_vhost.c',
+-- 
+2.39.0
+
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0f4379940ce4..fc84d9400749 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,14 +1,15 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
-version=1.4.67
+version=1.4.68
 revision=1
 build_style=meson
-configure_args="-Dwith_brotli=false -Dwith_bzip=false
- -Dwith_krb5=true -Dwith_ldap=true
- -Dwith_libunwind=false -Dwith_lua=true
- -Dwith_mysql=false -Dwith_openssl=true -Dwith_pcre2=true -Dwith_pgsql=false
- -Dwith_sasl=false -Dwith_webdav_props=true -Dwith_webdav_locks=true
- -Dwith_xattr=true -Dwith_zlib=true -Dwith_zstd=false -Dwith_dbi=false
+configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
+ -Dwith_krb5=enabled -Dwith_ldap=enabled
+ -Dwith_libunwind=disabled -Dwith_lua=true
+ -Dwith_mysql=disabled -Dwith_openssl=true -Dwith_pcre2=true
+ -Dwith_pgsql=disabled
+ -Dwith_sasl=disabled -Dwith_webdav_props=enabled -Dwith_webdav_locks=enabled
+ -Dwith_xattr=true -Dwith_zlib=enabled -Dwith_zstd=disabled -Dwith_dbi=disabled
  -Dmoduledir=lib/lighttpd/modules"
 hostmakedepends="pkg-config"
 makedepends="
@@ -19,7 +20,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://lighttpd.net"
 distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz"
-checksum=7e04d767f51a8d824b32e2483ef2950982920d427d1272ef4667f49d6f89f358
+checksum=e56f37ae52b63e1ada4d76ce78005affb6e56eea2f6bdb0ce17d6d36e9583384
 
 conf_files="/etc/lighttpd/lighttpd.conf"
 system_accounts="_lighttpd"

Re: lighttpd: update to 1.4.68

[gstrauss]

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

New comment by gstrauss on void-packages repository

https://github.com/void-linux/void-packages/pull/41428#issuecomment-1371322671

Comment:
squashed as requested.

Re: [PR PATCH] [Merged]: lighttpd: update to 1.4.68

[abenson]

[-- Attachment #1: Type: text/plain, Size: 257 bytes --]

There's a merged pull request on the void-packages repository

lighttpd: update to 1.4.68
https://github.com/void-linux/void-packages/pull/41428

Description:
lighttpd: update to 1.4.68

#### Testing the changes
- I tested the changes in this PR: **NO**