Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] squid: update to 5.7
@ 2023-02-03 15:49 dkwo
  2023-02-03 16:02 ` dkwo
                   ` (20 more replies)
  0 siblings, 21 replies; 22+ messages in thread
From: dkwo @ 2023-02-03 15:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages O3sq
https://github.com/void-linux/void-packages/pull/42054

squid: update to 5.7
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)

seems to build fine with openssl 3 #openssl3

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

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

From c60808964c041625d11835f6c15b8da85dc9518f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 3 Feb 2023 10:47:26 -0500
Subject: [PATCH] squid: update to 5.7

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

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..3306180dbec7 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,6 +1,6 @@
 # Template file for 'squid'
 pkgname=squid
-version=5.3
+version=5.7
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -65,7 +65,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.squid-cache.org/"
 changelog="http://www.squid-cache.org/Versions/v5/changesets/"
 distfiles="http://www.squid-cache.org/Versions/v5/squid-${version}.tar.xz"
-checksum=45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715
+checksum=6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81
 system_accounts="squid"
 # squid-conf-tests requires a squid user in the system
 make_check=no

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
@ 2023-02-03 16:02 ` dkwo
  2023-02-03 16:03 ` kruceter
                   ` (19 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: dkwo @ 2023-02-03 16:02 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416072507

Comment:
cross compile fails with:
```
./cf_gen cf.data ./cf.data.depend
./cf_gen: ./cf_gen: cannot execute binary file
make[1]: *** [Makefile:8153: cf_parser.cci] Error 126
make[1]: Leaving directory '/builddir/squid-5.7/src'
make: *** [Makefile:594: all-recursive] Error 1
=> ERROR: squid-5.7_1: do_build: '${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}' exited with 2
=> ERROR:   in do_build() at common/build-style/gnu-configure.sh:15
```

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
  2023-02-03 16:02 ` dkwo
@ 2023-02-03 16:03 ` kruceter
  2023-02-03 16:05 ` dkwo
                   ` (18 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: kruceter @ 2023-02-03 16:03 UTC (permalink / raw)
  To: ml

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416074611

Comment:
This package definitely is hostile towards cross-compiling:

```
./cf_gen: ./cf_gen: cannot execute binary file
```

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
  2023-02-03 16:02 ` dkwo
  2023-02-03 16:03 ` kruceter
@ 2023-02-03 16:05 ` dkwo
  2023-02-03 16:11 ` kruceter
                   ` (17 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: dkwo @ 2023-02-03 16:05 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416077458

Comment:
@Vaelatern any ideas?

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (2 preceding siblings ...)
  2023-02-03 16:05 ` dkwo
@ 2023-02-03 16:11 ` kruceter
  2023-02-03 16:21 ` [PR PATCH] [Updated] " dkwo
                   ` (16 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: kruceter @ 2023-02-03 16:11 UTC (permalink / raw)
  To: ml

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416083986

Comment:
@dkwo, you can try this: https://github.com/hongkongkiwi/openwrt-squid/blob/master/patches/001-cross_compile.patch

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (3 preceding siblings ...)
  2023-02-03 16:11 ` kruceter
@ 2023-02-03 16:21 ` dkwo
  2023-02-03 16:25 ` kruceter
                   ` (15 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: dkwo @ 2023-02-03 16:21 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages O3sq
https://github.com/void-linux/void-packages/pull/42054

squid: update to 5.7
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)

seems to build fine with openssl 3 #37681 

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

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

From f173990dec30aab339cd3826348062df14a7bf45 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 3 Feb 2023 10:47:26 -0500
Subject: [PATCH] squid: update to 5.7, patch for cross-compile

---
 srcpkgs/squid/patches/001-cross_compile.patch | 28 +++++++++++++++++++
 srcpkgs/squid/template                        |  4 +--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/squid/patches/001-cross_compile.patch

diff --git a/srcpkgs/squid/patches/001-cross_compile.patch b/srcpkgs/squid/patches/001-cross_compile.patch
new file mode 100644
index 000000000000..50dc07954400
--- /dev/null
+++ b/srcpkgs/squid/patches/001-cross_compile.patch
@@ -0,0 +1,28 @@
+From: https://raw.githubusercontent.com/hongkongkiwi/openwrt-squid/master/patches/001-cross_compile.patch
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -7761,3 +7761,3 @@ cache_cf.o: cf_parser.cci
+ cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
+-	$(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
++	g++ -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
+ 
+--- a/configure
++++ b/configure
+@@ -20133,3 +20133,3 @@ if test "$cross_compiling" = yes; then :
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
++_as_fn_error $? "cannot run test program while cross compiling
+ See \`config.log' for more details" "$LINENO" 5; }
+@@ -28289,3 +28289,3 @@ else
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
++_as_fn_error $? "cannot run test program while cross compiling
+ See \`config.log' for more details" "$LINENO" 5; }
+@@ -28314,3 +28314,3 @@ else
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
++_as_fn_error $? "cannot run test program while cross compiling
+ See \`config.log' for more details" "$LINENO" 5; }
+
+
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..3306180dbec7 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,6 +1,6 @@
 # Template file for 'squid'
 pkgname=squid
-version=5.3
+version=5.7
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -65,7 +65,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.squid-cache.org/"
 changelog="http://www.squid-cache.org/Versions/v5/changesets/"
 distfiles="http://www.squid-cache.org/Versions/v5/squid-${version}.tar.xz"
-checksum=45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715
+checksum=6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81
 system_accounts="squid"
 # squid-conf-tests requires a squid user in the system
 make_check=no

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (4 preceding siblings ...)
  2023-02-03 16:21 ` [PR PATCH] [Updated] " dkwo
@ 2023-02-03 16:25 ` kruceter
  2023-02-03 16:25 ` [PR PATCH] [Updated] " dkwo
                   ` (14 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: kruceter @ 2023-02-03 16:25 UTC (permalink / raw)
  To: ml

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416101802

Comment:
Oi, oi, oi. The patch is so old, so you have to adjust it manually. Forgot to mention that, sorry.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (5 preceding siblings ...)
  2023-02-03 16:25 ` kruceter
@ 2023-02-03 16:25 ` dkwo
  2023-02-03 16:42 ` dkwo
                   ` (13 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: dkwo @ 2023-02-03 16:25 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages O3sq
https://github.com/void-linux/void-packages/pull/42054

squid: update to 5.7
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)

seems to build fine with openssl 3 #37681 

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

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

From 5c025b3f5a8ec060a4bd67519f32688248bc9e8e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 3 Feb 2023 10:47:26 -0500
Subject: [PATCH] squid: update to 5.7, patch for cross-compile

---
 srcpkgs/squid/patches/001-cross_compile.patch | 9 +++++++++
 srcpkgs/squid/template                        | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/squid/patches/001-cross_compile.patch

diff --git a/srcpkgs/squid/patches/001-cross_compile.patch b/srcpkgs/squid/patches/001-cross_compile.patch
new file mode 100644
index 000000000000..27538b7365d8
--- /dev/null
+++ b/srcpkgs/squid/patches/001-cross_compile.patch
@@ -0,0 +1,9 @@
+From: https://raw.githubusercontent.com/hongkongkiwi/openwrt-squid/master/patches/001-cross_compile.patch
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -7761,3 +7761,3 @@ cache_cf.o: cf_parser.cci
+ cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
+-	$(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
++	g++ -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
+ 
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..3306180dbec7 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,6 +1,6 @@
 # Template file for 'squid'
 pkgname=squid
-version=5.3
+version=5.7
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -65,7 +65,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.squid-cache.org/"
 changelog="http://www.squid-cache.org/Versions/v5/changesets/"
 distfiles="http://www.squid-cache.org/Versions/v5/squid-${version}.tar.xz"
-checksum=45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715
+checksum=6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81
 system_accounts="squid"
 # squid-conf-tests requires a squid user in the system
 make_check=no

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (6 preceding siblings ...)
  2023-02-03 16:25 ` [PR PATCH] [Updated] " dkwo
@ 2023-02-03 16:42 ` dkwo
  2023-02-03 17:00 ` kruceter
                   ` (12 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: dkwo @ 2023-02-03 16:42 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416121841

Comment:
@kruceter Seems to be working, thank you!

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (7 preceding siblings ...)
  2023-02-03 16:42 ` dkwo
@ 2023-02-03 17:00 ` kruceter
  2023-02-03 17:00 ` kruceter
                   ` (11 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: kruceter @ 2023-02-03 17:00 UTC (permalink / raw)
  To: ml

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416146634

Comment:
Alright, the problem here actually is `CXX_host` not being set in `configure_args` properly (i.e. it is empty). I will try to find a proper solution.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (8 preceding siblings ...)
  2023-02-03 17:00 ` kruceter
@ 2023-02-03 17:00 ` kruceter
  2023-02-03 17:00 ` kruceter
                   ` (10 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: kruceter @ 2023-02-03 17:00 UTC (permalink / raw)
  To: ml

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416146634

Comment:
Alright, the problem here actually is `CXX_host` not being set in `configure_args` properly (i.e. it is empty). I will try to find the proper solution.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (9 preceding siblings ...)
  2023-02-03 17:00 ` kruceter
@ 2023-02-03 17:00 ` kruceter
  2023-02-03 18:29 ` kruceter
                   ` (9 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: kruceter @ 2023-02-03 17:00 UTC (permalink / raw)
  To: ml

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416146634

Comment:
Alright, the problem here actually is `BUILDCXX` not being set in `configure_args` properly (i.e. it is empty). I will try to find the proper solution.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (10 preceding siblings ...)
  2023-02-03 17:00 ` kruceter
@ 2023-02-03 18:29 ` kruceter
  2023-02-03 18:40 ` Vaelatern
                   ` (8 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: kruceter @ 2023-02-03 18:29 UTC (permalink / raw)
  To: ml

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416246093

Comment:
Here is my proposal.

[0001-fixup-squid-update-to-5.7-patch-for-cross-compile.txt](https://github.com/void-linux/void-packages/files/10581712/0001-fixup-squid-update-to-5.7-patch-for-cross-compile.txt)

BUILDCXX is set properly, obsolete/unnecessary flags are removed.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (11 preceding siblings ...)
  2023-02-03 18:29 ` kruceter
@ 2023-02-03 18:40 ` Vaelatern
  2023-02-03 18:50 ` kruceter
                   ` (7 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Vaelatern @ 2023-02-03 18:40 UTC (permalink / raw)
  To: ml

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

New comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416256464

Comment:
Can you try upstreaming the proposed patch? I'd rather any build fix go upstream if we can...

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (12 preceding siblings ...)
  2023-02-03 18:40 ` Vaelatern
@ 2023-02-03 18:50 ` kruceter
  2023-02-03 18:56 ` [PR PATCH] [Updated] " dkwo
                   ` (6 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: kruceter @ 2023-02-03 18:50 UTC (permalink / raw)
  To: ml

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416266231

Comment:
> Can you try upstreaming the proposed patch? I'd rather any build fix go upstream if we can...

There is nothing to upstream here. It looks like `BUILDCXX` is not set properly, so I proposed the fix above which eliminates the need for patching.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (13 preceding siblings ...)
  2023-02-03 18:50 ` kruceter
@ 2023-02-03 18:56 ` dkwo
  2023-02-03 18:57 ` dkwo
                   ` (5 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: dkwo @ 2023-02-03 18:56 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages O3sq
https://github.com/void-linux/void-packages/pull/42054

squid: update to 5.7
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)

seems to build fine with openssl 3 #37681 

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

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

From fa0301864b50e0f7c829a8e3d8fd2b832bf2b608 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 3 Feb 2023 10:47:26 -0500
Subject: [PATCH] squid: update to 5.7, patch for cross-compile

---
 srcpkgs/squid/patches/001-cross_compile.patch |  9 +++++++
 srcpkgs/squid/template                        | 25 ++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/squid/patches/001-cross_compile.patch

diff --git a/srcpkgs/squid/patches/001-cross_compile.patch b/srcpkgs/squid/patches/001-cross_compile.patch
new file mode 100644
index 000000000000..27538b7365d8
--- /dev/null
+++ b/srcpkgs/squid/patches/001-cross_compile.patch
@@ -0,0 +1,9 @@
+From: https://raw.githubusercontent.com/hongkongkiwi/openwrt-squid/master/patches/001-cross_compile.patch
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -7761,3 +7761,3 @@ cache_cf.o: cf_parser.cci
+ cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
+-	$(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
++	g++ -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
+ 
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..49b9eb9d7b91 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,10 +1,9 @@
 # Template file for 'squid'
 pkgname=squid
-version=5.3
+version=5.7
 revision=1
 build_style=gnu-configure
 configure_args="
- --sbindir=/usr/bin
  --sysconfdir=/etc/squid
  --libexecdir=/usr/libexec/squid
  --datadir=/usr/share/squid
@@ -26,28 +25,18 @@ configure_args="
  --enable-icmp
  --enable-linux-netfilter
  --enable-ident-lookups
- --enable-useragent-log
  --enable-cache-digests
- --enable-referer-log
- --enable-arp-acl
  --enable-htcp
- --enable-carp
  --enable-epoll
  --with-large-files
- --enable-arp-acl
  --with-default-user=squid
  --enable-async-io
- --enable-truncate
  --enable-icap-client
  --enable-ssl-crtd
  --disable-arch-native
  --disable-strict-error-checking
  --enable-wccpv2
- --with-build-environment=default
- squid_cv_gnu_atomics=yes
- squid_opt_enable_large_files=yes
- BUILDCXX=${CXX_host}
- BUILDCXXFLAGS=-O2"
+ --with-build-environment=default"
 conf_files="/etc/squid/squid.conf
  /etc/squid/errorpage.css
  /etc/squid/cachemgr.conf
@@ -65,7 +54,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.squid-cache.org/"
 changelog="http://www.squid-cache.org/Versions/v5/changesets/"
 distfiles="http://www.squid-cache.org/Versions/v5/squid-${version}.tar.xz"
-checksum=45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715
+checksum=6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81
 system_accounts="squid"
 # squid-conf-tests requires a squid user in the system
 make_check=no
@@ -75,6 +64,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	LDFLAGS+=" -latomic"
 fi
 
+pre_configure() {
+	export BUILDCXX="${CXX_host}"
+	export BUILDCXXFLAGS="-O2"
+}
+
 post_install() {
 	chmod u+s \
 		${DESTDIR}/usr/libexec/squid/basic_ncsa_auth \
@@ -82,7 +76,4 @@ post_install() {
 		${DESTDIR}/usr/libexec/squid/pinger
 	vsv squid
 	vinstall ${FILESDIR}/cron.daily 0744 etc/cron.daily squid
-
-	# CVE-2018-1000027
-	echo 'log_uses_indirect_client off' >> ${DESTDIR}/etc/squid/squid.conf
 }

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (14 preceding siblings ...)
  2023-02-03 18:56 ` [PR PATCH] [Updated] " dkwo
@ 2023-02-03 18:57 ` dkwo
  2023-02-03 22:18 ` kruceter
                   ` (4 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: dkwo @ 2023-02-03 18:57 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages O3sq
https://github.com/void-linux/void-packages/pull/42054

squid: update to 5.7
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)

seems to build fine with openssl 3 #37681 

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

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

From f6c8686dee099092034c52ab4fa5cc9b0168bc81 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 3 Feb 2023 10:47:26 -0500
Subject: [PATCH] squid: update to 5.7

---
 srcpkgs/squid/template | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..49b9eb9d7b91 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,10 +1,9 @@
 # Template file for 'squid'
 pkgname=squid
-version=5.3
+version=5.7
 revision=1
 build_style=gnu-configure
 configure_args="
- --sbindir=/usr/bin
  --sysconfdir=/etc/squid
  --libexecdir=/usr/libexec/squid
  --datadir=/usr/share/squid
@@ -26,28 +25,18 @@ configure_args="
  --enable-icmp
  --enable-linux-netfilter
  --enable-ident-lookups
- --enable-useragent-log
  --enable-cache-digests
- --enable-referer-log
- --enable-arp-acl
  --enable-htcp
- --enable-carp
  --enable-epoll
  --with-large-files
- --enable-arp-acl
  --with-default-user=squid
  --enable-async-io
- --enable-truncate
  --enable-icap-client
  --enable-ssl-crtd
  --disable-arch-native
  --disable-strict-error-checking
  --enable-wccpv2
- --with-build-environment=default
- squid_cv_gnu_atomics=yes
- squid_opt_enable_large_files=yes
- BUILDCXX=${CXX_host}
- BUILDCXXFLAGS=-O2"
+ --with-build-environment=default"
 conf_files="/etc/squid/squid.conf
  /etc/squid/errorpage.css
  /etc/squid/cachemgr.conf
@@ -65,7 +54,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.squid-cache.org/"
 changelog="http://www.squid-cache.org/Versions/v5/changesets/"
 distfiles="http://www.squid-cache.org/Versions/v5/squid-${version}.tar.xz"
-checksum=45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715
+checksum=6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81
 system_accounts="squid"
 # squid-conf-tests requires a squid user in the system
 make_check=no
@@ -75,6 +64,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	LDFLAGS+=" -latomic"
 fi
 
+pre_configure() {
+	export BUILDCXX="${CXX_host}"
+	export BUILDCXXFLAGS="-O2"
+}
+
 post_install() {
 	chmod u+s \
 		${DESTDIR}/usr/libexec/squid/basic_ncsa_auth \
@@ -82,7 +76,4 @@ post_install() {
 		${DESTDIR}/usr/libexec/squid/pinger
 	vsv squid
 	vinstall ${FILESDIR}/cron.daily 0744 etc/cron.daily squid
-
-	# CVE-2018-1000027
-	echo 'log_uses_indirect_client off' >> ${DESTDIR}/etc/squid/squid.conf
 }

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (15 preceding siblings ...)
  2023-02-03 18:57 ` dkwo
@ 2023-02-03 22:18 ` kruceter
  2023-02-04 16:20 ` [PR PATCH] [Updated] " dkwo
                   ` (3 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: kruceter @ 2023-02-03 22:18 UTC (permalink / raw)
  To: ml

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416477134

Comment:
Would you mind to include this into the commit message? Thank you.

```markdown
* --sbindir is already defined in
  common/environment/configure/gnu-configure-args.sh

* --enable-useragent-log and --enable-referer-log are obsolete since
  version 3.2.0.4.

* --enable-arp-acl is gone
  (squid-cache/squid@41b91720118a5cf1d0eb47fdb903a841f46bb750).

* --enable-carp is gone, CARP is compiled in
  (squid-cache/squid@b2ea838f690d122679eeafda2ec30faadf1d5e82).

* --enable-truncate was removed upstream
  (squid-cache/squid@b3fb907032613d7151410eceb4622bb43f5af6bc).

* squid_cv_gnu_atomics is replaced with c++11 std::atomic
  (squid-cache/squid@ddd4edb743d82be97fc651d529e04bf55329a50d).

* squid_opt_enable_large_files is the duplicate of --with-large-files.
  Apparently Juan RP (aka xtraeme) used this option back in 2016 to fix
  cross build for arm* and glibc. Now that squid builds completely fine
  without it, it is safe to assume this option is not needed anymore.

* define BUILDCXX properly (CXX_host cannot be set outside of
  functions).

* CVE-2018-1000027 was fixed since version 4.0.23.
```

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (16 preceding siblings ...)
  2023-02-03 22:18 ` kruceter
@ 2023-02-04 16:20 ` dkwo
  2023-02-04 16:22 ` dkwo
                   ` (2 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: dkwo @ 2023-02-04 16:20 UTC (permalink / raw)
  To: ml

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

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

https://github.com/dkwo/void-packages O3sq
https://github.com/void-linux/void-packages/pull/42054

squid: update to 5.7
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)

seems to build fine with openssl 3 #37681 

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

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

From 82647849a1d338d8e85c284c1c8a6a5f142ab58b Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 3 Feb 2023 10:47:26 -0500
Subject: [PATCH] squid: update to 5.7

* --sbindir is already defined in
  common/environment/configure/gnu-configure-args.sh

* --enable-useragent-log and --enable-referer-log are obsolete since
  version 3.2.0.4.

* --enable-arp-acl is gone
  (squid-cache/squid@41b91720118a5cf1d0eb47fdb903a841f46bb750).

* --enable-carp is gone, CARP is compiled in
  (squid-cache/squid@b2ea838f690d122679eeafda2ec30faadf1d5e82).

* --enable-truncate was removed upstream
  (squid-cache/squid@b3fb907032613d7151410eceb4622bb43f5af6bc).

* squid_cv_gnu_atomics is replaced with c++11 std::atomic
  (squid-cache/squid@ddd4edb743d82be97fc651d529e04bf55329a50d).

* squid_opt_enable_large_files is the duplicate of --with-large-files.
  Apparently Juan RP (aka xtraeme) used this option back in 2016 to fix
  cross build for arm* and glibc. Now that squid builds completely fine
  without it, it is safe to assume this option is not needed anymore.

* define BUILDCXX properly (CXX_host cannot be set outside of
  functions).

* CVE-2018-1000027 was fixed since version 4.0.23.
---
 srcpkgs/squid/template | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..49b9eb9d7b91 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,10 +1,9 @@
 # Template file for 'squid'
 pkgname=squid
-version=5.3
+version=5.7
 revision=1
 build_style=gnu-configure
 configure_args="
- --sbindir=/usr/bin
  --sysconfdir=/etc/squid
  --libexecdir=/usr/libexec/squid
  --datadir=/usr/share/squid
@@ -26,28 +25,18 @@ configure_args="
  --enable-icmp
  --enable-linux-netfilter
  --enable-ident-lookups
- --enable-useragent-log
  --enable-cache-digests
- --enable-referer-log
- --enable-arp-acl
  --enable-htcp
- --enable-carp
  --enable-epoll
  --with-large-files
- --enable-arp-acl
  --with-default-user=squid
  --enable-async-io
- --enable-truncate
  --enable-icap-client
  --enable-ssl-crtd
  --disable-arch-native
  --disable-strict-error-checking
  --enable-wccpv2
- --with-build-environment=default
- squid_cv_gnu_atomics=yes
- squid_opt_enable_large_files=yes
- BUILDCXX=${CXX_host}
- BUILDCXXFLAGS=-O2"
+ --with-build-environment=default"
 conf_files="/etc/squid/squid.conf
  /etc/squid/errorpage.css
  /etc/squid/cachemgr.conf
@@ -65,7 +54,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.squid-cache.org/"
 changelog="http://www.squid-cache.org/Versions/v5/changesets/"
 distfiles="http://www.squid-cache.org/Versions/v5/squid-${version}.tar.xz"
-checksum=45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715
+checksum=6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81
 system_accounts="squid"
 # squid-conf-tests requires a squid user in the system
 make_check=no
@@ -75,6 +64,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	LDFLAGS+=" -latomic"
 fi
 
+pre_configure() {
+	export BUILDCXX="${CXX_host}"
+	export BUILDCXXFLAGS="-O2"
+}
+
 post_install() {
 	chmod u+s \
 		${DESTDIR}/usr/libexec/squid/basic_ncsa_auth \
@@ -82,7 +76,4 @@ post_install() {
 		${DESTDIR}/usr/libexec/squid/pinger
 	vsv squid
 	vinstall ${FILESDIR}/cron.daily 0744 etc/cron.daily squid
-
-	# CVE-2018-1000027
-	echo 'log_uses_indirect_client off' >> ${DESTDIR}/etc/squid/squid.conf
 }

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (17 preceding siblings ...)
  2023-02-04 16:20 ` [PR PATCH] [Updated] " dkwo
@ 2023-02-04 16:22 ` dkwo
  2023-02-04 21:09 ` kruceter
  2023-02-05  6:20 ` [PR PATCH] [Merged]: " Vaelatern
  20 siblings, 0 replies; 22+ messages in thread
From: dkwo @ 2023-02-04 16:22 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416793116

Comment:
@kruceter Should I also acknowledge your contribution in some way?

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (18 preceding siblings ...)
  2023-02-04 16:22 ` dkwo
@ 2023-02-04 21:09 ` kruceter
  2023-02-05  6:20 ` [PR PATCH] [Merged]: " Vaelatern
  20 siblings, 0 replies; 22+ messages in thread
From: kruceter @ 2023-02-04 21:09 UTC (permalink / raw)
  To: ml

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/42054#issuecomment-1416850723

Comment:
> Should I also acknowledge your contribution in some way?

No need to do this. Thank you.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Merged]: squid: update to 5.7
  2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
                   ` (19 preceding siblings ...)
  2023-02-04 21:09 ` kruceter
@ 2023-02-05  6:20 ` Vaelatern
  20 siblings, 0 replies; 22+ messages in thread
From: Vaelatern @ 2023-02-05  6:20 UTC (permalink / raw)
  To: ml

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

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

squid: update to 5.7
https://github.com/void-linux/void-packages/pull/42054

Description:
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)

seems to build fine with openssl 3 #37681 

^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2023-02-05  6:20 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-03 15:49 [PR PATCH] squid: update to 5.7 dkwo
2023-02-03 16:02 ` dkwo
2023-02-03 16:03 ` kruceter
2023-02-03 16:05 ` dkwo
2023-02-03 16:11 ` kruceter
2023-02-03 16:21 ` [PR PATCH] [Updated] " dkwo
2023-02-03 16:25 ` kruceter
2023-02-03 16:25 ` [PR PATCH] [Updated] " dkwo
2023-02-03 16:42 ` dkwo
2023-02-03 17:00 ` kruceter
2023-02-03 17:00 ` kruceter
2023-02-03 17:00 ` kruceter
2023-02-03 18:29 ` kruceter
2023-02-03 18:40 ` Vaelatern
2023-02-03 18:50 ` kruceter
2023-02-03 18:56 ` [PR PATCH] [Updated] " dkwo
2023-02-03 18:57 ` dkwo
2023-02-03 22:18 ` kruceter
2023-02-04 16:20 ` [PR PATCH] [Updated] " dkwo
2023-02-04 16:22 ` dkwo
2023-02-04 21:09 ` kruceter
2023-02-05  6:20 ` [PR PATCH] [Merged]: " Vaelatern

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).