Skip to content

Commit 965f7e7

Browse files
cgrzembacgrzemba
committed
squid: add version 6.7 to extra.omnios
1 parent 51602dd commit 965f7e7

12 files changed

+316
-1
lines changed

‎build/squid/build.sh

+129
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
#!/usr/bin/bash
2+
#
3+
# {{{
4+
# This file and its contents are supplied under the terms of the
5+
# Common Development and Distribution License ("CDDL"), version 1.0.
6+
# You may only use this file in accordance with the terms of version
7+
# 1.0 of the CDDL.
8+
#
9+
# A full copy of the text of the CDDL should have accompanied this
10+
# source. A copy of the CDDL is also available via the Internet at
11+
# http://www.illumos.org/license/CDDL.
12+
#
13+
# }}}
14+
#
15+
# Copyright 2023 Carsten Grzemba
16+
17+
. ../../lib/build.sh
18+
19+
PROG=squid
20+
VER=6.7
21+
PKG=ooce/network/proxy/squid
22+
SUMMARY="Squid WEB Proxy"
23+
DESC="Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more."
24+
25+
OPREFIX=$PREFIX
26+
PREFIX+=/$PROG
27+
CONFPATH=/etc$PREFIX
28+
LOGPATH=/var$PREFIX/logs
29+
VARPATH=/var$PREFIX
30+
RUNPATH=$LOGPATH
31+
PIDFILE=/var/run/squid.pid
32+
33+
set_arch 64
34+
35+
XFORM_ARGS="
36+
-DOPREFIX=${OPREFIX#/}
37+
-DPREFIX=${PREFIX#/}
38+
-DPROG=$PROG
39+
-DPKGROOT=$PROG
40+
-DUSER=squid
41+
-DGROUP=squid
42+
-DPIDFILE=${PIDFILE}
43+
"
44+
45+
CONFIGURE_OPTS="
46+
--sysconfdir=/etc${PREFIX}
47+
--localstatedir=/var${PREFIX}
48+
--with-swapdir=/var${PREFIX}/cache
49+
--mandir=/usr/share/man
50+
--with-default-user=squid
51+
--with-logdir=/var${PREFIX}/logs
52+
--with-pidfile=${PIDFILE}
53+
--enable-large-cache-files
54+
--disable-static
55+
--with-mit-krb5
56+
--with-ldap=/opt/ooce
57+
--with-build-environment=POSIX_V6_LP64_OFF64
58+
--with-openssl
59+
--enable-arp-acl
60+
--enable-auth
61+
--enable-auth-basic
62+
--enable-auth-digest
63+
--enable-auth-negotiate
64+
--enable-auth-ntlm
65+
--enable-basic-auth-helpers='DB,NCSA,YP,LDAP,PAM,getpwnam,MSNT,POP3,multi-domain-NTLM,SMB,SASL'
66+
--enable-cache-digests
67+
--enable-carp
68+
--enable-coss-aio-ops
69+
--enable-delay-pools
70+
--enable-digest-auth-helpers='ldap,password'
71+
--enable-follow-x-forwarded-for
72+
--enable-forward-log
73+
--enable-forw-via-db
74+
--enable-htcp
75+
--enable-icmp
76+
--enable-large-cache-files
77+
--enable-multicast-miss
78+
--enable-negotiate-auth-helpers='squid_kerb_auth'
79+
--enable-ntlm-auth-helpers='smb_lm,fakeauth,no_check'
80+
--enable-ntlm-fail-open
81+
--enable-referer-log
82+
--enable-snmp
83+
--enable-ssl
84+
--enable-ssl-crtd
85+
--enable-zph-qos
86+
--enable-icap-client
87+
--enable-storeio='aufs,diskd,ufs'
88+
--enable-storeid-rewrite-helpers=file
89+
--enable-inline
90+
--enable-useragent-log
91+
--enable-x-accelerator-vary
92+
--enable-translation
93+
--enable-gnuregex
94+
--enable-htpc
95+
--with-aio
96+
--with-tbd
97+
--with-aufs-threads=8
98+
--enable-wccp
99+
--enable-wccpv2
100+
--disable-arch-native
101+
--disable-esi
102+
ac_cv_path_krb5_config=/usr/bin/krb5-config
103+
squid_cv_OpenLDAP=0
104+
"
105+
106+
CONFIGURE_OPTS[amd64]+="
107+
--libdir=$PREFIX/lib/amd64
108+
"
109+
110+
CXXFLAGS+=" -Wno-unknown-pragmas -Wno-deprecated-declarations"
111+
export LIBLDAP_LIBS="-lldap -llber"
112+
export LIBLDAP_PATH="-L$OPREFIX/lib/amd64 "
113+
LDFLAGS[amd64]+=" -Wl,-z -Wl,ignore -L$OPREFIX/lib/amd64 -R$OPREFIX/lib/amd64"
114+
115+
init
116+
download_source $PROG $PROG $VER
117+
patch_source
118+
prep_build
119+
build
120+
for f in squid; do
121+
xform files/$f > $TMPDIR/$f
122+
done
123+
install_execattr
124+
install_smf -oocemethod ooce $PROG.xml $PROG
125+
make_package
126+
clean_up
127+
128+
# Vim hints
129+
# vim:ts=4:sw=4:et:fdm=marker

‎build/squid/files/exec_attr

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Forced Privilege:solaris:cmd:::/opt/ooce/squid/libexec/amd64/pinger:privs=net_icmpaccess

‎build/squid/files/squid

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/usr/bin/ksh93
2+
3+
source /lib/svc/share/smf_include.sh
4+
5+
typeset -r SQUID_HOME=/$(PREFIX)
6+
typeset -r CONF_FILE=/etc${SQUID_HOME}/squid.conf
7+
typeset -r SQUID="${SQUID_HOME}/sbin/squid"
8+
9+
[[ ! -f ${CONF_FILE} ]] && exit $SMF_EXIT_ERR_CONFIG
10+
11+
CACHE_DIR=/var${SQUID_HOME}/cache
12+
13+
case "$1" in
14+
start)
15+
/bin/rm -f $(PIDFILE)
16+
if [[ ! -d $CACHE_DIR/00 ]] ; then
17+
out="$(${SQUID} -z)"
18+
fi
19+
20+
exec ${SQUID} 2>&1
21+
;;
22+
stop)
23+
exec ${SQUID} -k shutdown 2>&1
24+
;;
25+
*)
26+
print "Usage: $0 {start|stop}"
27+
exit 1
28+
;;
29+
esac
30+
31+
# not reached

‎build/squid/files/squid.xml

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
3+
<service_bundle type="manifest"
4+
name="export">
5+
6+
<service name="ooce/proxy/squid"
7+
type="service"
8+
version="0">
9+
10+
<instance name="default"
11+
enabled="true">
12+
13+
<dependency name="autofs"
14+
grouping="optional_all"
15+
restart_on="error"
16+
type="service">
17+
<service_fmri value="svc:/system/filesystem/autofs:default" />
18+
</dependency>
19+
20+
<dependency name="filesystem-local"
21+
grouping="require_all"
22+
restart_on="none"
23+
type="service">
24+
<service_fmri value="svc:/system/filesystem/local:default" />
25+
</dependency>
26+
27+
<dependency name="network"
28+
grouping="require_all"
29+
restart_on="error"
30+
type="service">
31+
<service_fmri value="svc:/milestone/network:default" />
32+
</dependency>
33+
34+
<exec_method name="start"
35+
type="method"
36+
exec="/lib/svc/method/ooce/squid start"
37+
timeout_seconds="60"></exec_method>
38+
39+
<exec_method name="stop"
40+
type="method"
41+
exec="/lib/svc/method/ooce/squid stop"
42+
timeout_seconds="120" />
43+
44+
<property_group name="startd"
45+
type="framework">
46+
<propval name="ignore_error"
47+
type="astring"
48+
value="core,signal" />
49+
</property_group>
50+
51+
<template>
52+
<common_name>
53+
<loctext xml:lang="C">Squid WebCache</loctext>
54+
</common_name>
55+
<documentation>
56+
<doc_link name="squid-cache.org"
57+
uri="http://www.squid-cache.org" />
58+
<manpage title="squid"
59+
section="8"
60+
manpath="/usr/share/man" />
61+
</documentation>
62+
</template>
63+
64+
</instance>
65+
66+
<stability value="Evolving" />
67+
68+
</service>
69+
70+
</service_bundle>

‎build/squid/local.mog

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#
2+
# This file and its contents are supplied under the terms of the
3+
# Common Development and Distribution License ("CDDL"), version 1.0.
4+
# You may only use this file in accordance with the terms of version
5+
# 1.0 of the CDDL.
6+
#
7+
# A full copy of the text of the CDDL should have accompanied this
8+
# source. A copy of the CDDL is also available via the Internet at
9+
# http://www.illumos.org/license/CDDL.
10+
#
11+
# Copyright 2020 Carsten Grzemba
12+
13+
license COPYING license=GPLv2
14+
15+
<include binlink.mog>
16+
<include manlink.mog>
17+
18+
group groupname=$(GROUP) gid=98
19+
user ftpuser=false username=$(USER) uid=98 group=$(GROUP) \
20+
gcos-field="$(PROG) User" home-dir=/var/$(PREFIX) password=NP
21+
22+
<transform file path=etc/opt/ooce/squid/.* -> set preserve renamenew>
23+
24+
# Restart services on upgrade
25+
<transform file path=$(PREFIX)/sbin/squid$ \
26+
-> set restart_fmri svc:/ooce/proxy/$(PROG):default>
27+
28+
<transform dir path=$(PREFIX)/var \
29+
-> drop >
30+
<transform dir path=var/run \
31+
-> drop >
32+
<transform dir path=var/opt/ooce/squid/run(/.*)* \
33+
-> drop >
34+
35+
<transform dir path=var/$(PREFIX)(/.*)* \
36+
-> default group squid >
37+
<transform dir path=var/$(PREFIX)(/.*)* \
38+
-> default owner squid>
39+

‎build/squid/patches/ac_squid-util.m4.patch

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/squid-6.7/acinclude/squid-util.m4 b/squid-6.7/acinclude/squid-util.m4
2+
index 60ecd50..1f7849a 100644
3+
--- src/acinclude/squid-util.m4.orig
4+
+++ src/acinclude/squid-util.m4
5+
@@ -224,6 +224,7 @@ AC_DEFUN([SQUID_AUTO_LIB],[
6+
AS_CASE(["$withval"],[yes|no],,[
7+
AS_IF([test ! -d "$withval"],AC_MSG_ERROR([--with-$1 path does not point to a directory]))
8+
m4_translit([with_$1], [-+.], [___])=yes
9+
+ AS_IF([test -d "$withval/amd64"],[$3_PATH+="-L$withval/amd64"])
10+
AS_IF([test -d "$withval/lib64"],[$3_PATH+="-L$withval/lib64"])
11+
AS_IF([test -d "$withval/lib"],[$3_PATH+="-L$withval/lib"])
12+
AS_IF([test -d "$withval/include"],[$3_CFLAGS+="-I$withval/include"])
13+
@@ -236,6 +237,7 @@ AC_DEFUN([SQUID_OPTIONAL_LIB],[
14+
AS_CASE(["$withval"],[yes|no],,[
15+
AS_IF([test ! -d "$withval"],AC_MSG_ERROR([--with-$1 path does not point to a directory]))
16+
m4_translit([with_$1], [-+.], [___])=yes
17+
+ AS_IF([test -d "$withval/amd64"],[$3_PATH+="-L$withval/amd64"])
18+
AS_IF([test -d "$withval/lib64"],[$3_PATH+="-L$withval/lib64"])
19+
AS_IF([test -d "$withval/lib"],[$3_PATH+="-L$withval/lib"])
20+
AS_IF([test -d "$withval/include"],[$3_CFLAGS+="-I$withval/include"])

‎build/squid/patches/configure.ac.patch

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
use 64-bit libraries
2+
3+
--- src/configure.ac.orig 2024-02-08 10:22:02.770828532 +0100
4+
+++ src/configure.ac 2024-02-08 10:22:46.518281824 +0100
5+
@@ -1257,9 +1257,9 @@ AS_IF([test "x$with_mit_krb5" != "xno" -
6+
# Get libs, etc
7+
AC_MSG_NOTICE([Use krb5-config to get CXXFLAGS and LIBS])
8+
LIB_KRB5_CFLAGS="`$ac_krb5_config --cflags krb5 2>/dev/null`"
9+
- LIB_KRB5_LIBS="`$ac_krb5_config --libs krb5 2>/dev/null`"
10+
+ LIB_KRB5_LIBS="`$ac_krb5_config --libs krb5 2>/dev/null`"/amd64
11+
LIB_KRB5_CFLAGS="`$ac_krb5_config --cflags gssapi 2>/dev/null` $LIB_KRB5_CFLAGS"
12+
- LIB_KRB5_LIBS="`$ac_krb5_config --libs gssapi 2>/dev/null` $LIB_KRB5_LIBS"
13+
+ LIB_KRB5_LIBS="`$ac_krb5_config --libs gssapi 2>/dev/null` $LIB_KRB5_LIBS"/amd64
14+
],[
15+
## For some OS pkg-config is broken or unavailable.
16+
## Detect libraries the hard way.

‎build/squid/patches/series

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ac_squid-util.m4.patch
2+
configure.ac.patch

‎build/squid/rtime

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
UNREF_OBJ libgen\.so\.1
2+
UNREF_OBJ libnsl\.so\.1
3+
UNREF_OBJ libresolv\.so\.2
4+
UNREF_OBJ libpthread\.so\.1

‎doc/baseline

+1
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ extra.omnios ooce/network/nsd
202202
extra.omnios ooce/network/openldap
203203
extra.omnios ooce/network/openvpn
204204
extra.omnios ooce/network/openvpn-auth-ldap
205+
extra.omnios ooce/network/proxy/squid
205206
extra.omnios ooce/network/rclone
206207
extra.omnios ooce/network/sic
207208
extra.omnios ooce/network/smtp/postfix

‎doc/idlist.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
| illumos | 95 | svctag
6161
| illumos | 96 | unknown
6262
| pkg5 | 97 | pkg5srv
63+
| extra | 98 | squid
6364

6465
### Groups
6566

@@ -122,4 +123,4 @@
122123
| illumos | 95 | slocate
123124
| illumos | 96 | unknown
124125
| pkg5 | 97 | pkg5srv
125-
126+
| extra | 98 | squid

‎doc/packages.md

+1
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@
167167
| ooce/network/rclone | 1.65.2 | https://github.com/rclone/rclone/releases/ | [omniosorg](https://github.com/omniosorg)
168168
| ooce/network/sic | 1.3 | https://tools.suckless.org/sic/ | [r7st](https://github.com/r7st)
169169
| ooce/network/smtp/postfix | 3.8.5 | https://high5.nl/mirrors/postfix-release/index.html | [omniosorg](https://github.com/omniosorg)
170+
| ooce/network/proxy/squid | 6.7 | http://www.squid-cache.org/Versions/v6/ [cgrzemba](https://github.com/cgrzemba)
170171
| ooce/network/tailscale | 1.50.0 | https://www.tailscale.com/ | [nshalman](https://github.com/nshalman)
171172
| ooce/network/tcpdump | 4.99.4 | https://www.tcpdump.org/release/ | [omniosorg](https://github.com/omniosorg)
172173
| ooce/network/unbound | 1.19.0 | https://nlnetlabs.nl/downloads/unbound/ | [omniosorg](https://github.com/omniosorg)

0 commit comments

Comments
 (0)