Skip to content

Commit 39b2587

Browse files
hadflhadfl
authored
Merge pull request #1435 from hyvanix/pkgupd-extra-20240409
pkgupd extra 20240409
2 parents 45a61ae + 7476b33 commit 39b2587

File tree

12 files changed

+46
-50
lines changed

12 files changed

+46
-50
lines changed

‎build/go/build-121.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
PROG=go
2020
PKG=ooce/developer/go-121
21-
VER=1.21.8
21+
VER=1.21.9
2222
SUMMARY="The Go Programming Language"
2323
DESC="An open source programming language that makes it easy to build simple, "
2424
DESC+="reliable, and efficient software."

‎build/go/build-122.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
PROG=go
2020
PKG=ooce/developer/go-122
21-
VER=1.22.1
21+
VER=1.22.2
2222
SUMMARY="The Go Programming Language"
2323
DESC="An open source programming language that makes it easy to build simple, "
2424
DESC+="reliable, and efficient software."

‎build/haproxy/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
. ../../lib/build.sh
1818

1919
PROG=haproxy
20-
VER=2.8.7
20+
VER=2.8.9
2121
PKG=ooce/server/haproxy
2222
SUMMARY="HAProxy - fast and reliable http reverse proxy and load balancer"
2323
DESC="A TCP/HTTP reverse proxy which is particularly suited for high "

‎build/radare2/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
# http://www.illumos.org/license/CDDL.
1313
# }}}
1414

15-
# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
15+
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
1616

1717
. ../../lib/build.sh
1818

1919
PROG=radare2
2020
PKG=ooce/developer/radare2
21-
VER=5.8.8
21+
VER=5.9.0
2222
SUMMARY="A low-level software forensics tool"
2323
DESC="$PROG - $SUMMARY"
2424

‎build/rclone/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
PROG=rclone
2020
PKG=ooce/network/rclone
21-
VER=1.65.2
21+
VER=1.66.0
2222
SUMMARY="rsync for cloud storage"
2323
DESC="A command line program to sync files and directories to and from "
2424
DESC+="different cloud storage providers"

‎build/squid/build.sh

+18-18
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,24 @@
1313
# }}}
1414
#
1515
# Copyright 2023 Carsten Grzemba
16+
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
1617

1718
. ../../lib/build.sh
1819

1920
PROG=squid
20-
VER=6.7
21+
VER=6.9
2122
PKG=ooce/network/proxy/squid
2223
SUMMARY="Squid WEB Proxy"
23-
DESC="Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more."
24+
DESC="Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, "
25+
DESC+="and more."
2426

2527
OPREFIX=$PREFIX
2628
PREFIX+=/$PROG
2729
CONFPATH=/etc$PREFIX
28-
LOGPATH=/var$PREFIX/logs
2930
VARPATH=/var$PREFIX
30-
RUNPATH=$LOGPATH
31-
PIDFILE=/var/run/squid.pid
31+
LOGPATH=$VARPATH/logs
32+
RUNPATH=$VARPATH/run
33+
PIDFILE=$RUNPATH/squid.pid
3234

3335
set_arch 64
3436

@@ -39,17 +41,16 @@ XFORM_ARGS="
3941
-DPKGROOT=$PROG
4042
-DUSER=squid
4143
-DGROUP=squid
42-
-DPIDFILE=${PIDFILE}
44+
-DPIDFILE=$PIDFILE
4345
"
4446

4547
CONFIGURE_OPTS="
46-
--sysconfdir=/etc${PREFIX}
47-
--localstatedir=/var${PREFIX}
48-
--with-swapdir=/var${PREFIX}/cache
49-
--mandir=/usr/share/man
48+
--sysconfdir=$CONFPATH
49+
--localstatedir=$VARPATH
50+
--with-swapdir=$VARPATH/cache
5051
--with-default-user=squid
51-
--with-logdir=/var${PREFIX}/logs
52-
--with-pidfile=${PIDFILE}
52+
--with-logdir=$LOGPATH
53+
--with-pidfile=$PIDFILE
5354
--enable-large-cache-files
5455
--disable-static
5556
--with-mit-krb5
@@ -104,22 +105,21 @@ CONFIGURE_OPTS="
104105
"
105106

106107
CONFIGURE_OPTS[amd64]+="
107-
--libdir=$PREFIX/lib/amd64
108+
--libdir=$PREFIX/${LIBDIRS[amd64]}
108109
"
109110

110111
CXXFLAGS+=" -Wno-unknown-pragmas -Wno-deprecated-declarations"
111112
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"
113+
export LIBLDAP_PATH="-L$OPREFIX/${LIBDIRS[amd64]}"
114+
LDFLAGS[amd64]+=" -Wl,-z -Wl,ignore"
115+
LDFLAGS[amd64]+=" -L$OPREFIX/${LIBDIRS[amd64]} -R$OPREFIX/${LIBDIRS[amd64]}"
114116

115117
init
116118
download_source $PROG $PROG $VER
117119
patch_source
118120
prep_build
119121
build
120-
for f in squid; do
121-
xform files/$f > $TMPDIR/$f
122-
done
122+
xform files/$PROG > $TMPDIR/$PROG
123123
install_execattr
124124
install_smf -oocemethod ooce $PROG.xml $PROG
125125
make_package

‎build/squid/files/exec_attr

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

‎build/squid/files/squid

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
source /lib/svc/share/smf_include.sh
44

5-
typeset -r SQUID_HOME=/$(PREFIX)
6-
typeset -r CONF_FILE=/etc${SQUID_HOME}/squid.conf
5+
typeset -r SQUID_HOME="/$(PREFIX)"
6+
typeset -r CONF_FILE="/etc${SQUID_HOME}/squid.conf"
77
typeset -r SQUID="${SQUID_HOME}/sbin/squid"
88

99
[[ ! -f ${CONF_FILE} ]] && exit $SMF_EXIT_ERR_CONFIG
@@ -24,7 +24,7 @@ stop)
2424
;;
2525
*)
2626
print "Usage: $0 {start|stop}"
27-
exit 1
27+
exit $SMF_EXIT_ERR_FATAL
2828
;;
2929
esac
3030

‎build/squid/files/squid.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<exec_method name="start"
3535
type="method"
3636
exec="/lib/svc/method/ooce/squid start"
37-
timeout_seconds="60"></exec_method>
37+
timeout_seconds="60" />
3838

3939
<exec_method name="stop"
4040
type="method"

‎build/squid/local.mog

+8-12
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# http://www.illumos.org/license/CDDL.
1010
#
1111
# Copyright 2020 Carsten Grzemba
12+
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
1213

1314
license COPYING license=GPLv2
1415

@@ -19,21 +20,16 @@ group groupname=$(GROUP) gid=98
1920
user ftpuser=false username=$(USER) uid=98 group=$(GROUP) \
2021
gcos-field="$(PROG) User" home-dir=/var/$(PREFIX) password=NP
2122

22-
<transform file path=etc/opt/ooce/squid/.* -> set preserve renamenew>
23+
<transform file path=etc/opt/ooce/squid -> set preserve renamenew>
24+
25+
# See also files/exec_attr
26+
<transform file path=$(PREFIX)/libexec/amd64/pinger -> set mode 04555>
2327

2428
# Restart services on upgrade
2529
<transform file path=$(PREFIX)/sbin/squid$ \
2630
-> set restart_fmri svc:/ooce/proxy/$(PROG):default>
2731

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>
32+
<transform dir path=var/$(PREFIX)/run/squid -> drop>
33+
<transform dir path=var/$(PREFIX) -> set group squid>
34+
<transform dir path=var/$(PREFIX) -> set owner squid>
3935

‎build/stress-ng/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
# http://www.illumos.org/license/CDDL.
1313
# }}}
1414

15-
# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
15+
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
1616

1717
. ../../lib/build.sh
1818

1919
PROG=stress-ng
20-
VER=0.17.00
20+
VER=0.17.07
2121
PKG=ooce/util/stress-ng
2222
SUMMARY="Stress test a computer system in various selectable ways"
2323
DESC="$PROG - $SUMMARY"

‎doc/packages.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
| ooce/developer/freepascal | 3.2.2 | https://sourceforge.net/projects/freepascal/files/Source/ https://www.freepascal.org/ | [omniosorg](https://github.com/omniosorg)
6565
| ooce/developer/gdb | 14.2 | https://ftp.gnu.org/gnu/gdb/ | [omniosorg](https://github.com/omniosorg)
6666
| ooce/developer/git-absorb | 0.6.11 | https://github.com/tummychow/git-absorb/releases| [omniosorg](https://github.com/omniosorg)
67-
| ooce/developer/go-121 | 1.21.8 | https://golang.org/dl/ | [omniosorg](https://github.com/omniosorg)
68-
| ooce/developer/go-122 | 1.22.1 | https://golang.org/dl/ | [omniosorg](https://github.com/omniosorg)
67+
| ooce/developer/go-121 | 1.21.9 | https://golang.org/dl/ | [omniosorg](https://github.com/omniosorg)
68+
| ooce/developer/go-122 | 1.22.2 | https://golang.org/dl/ | [omniosorg](https://github.com/omniosorg)
6969
| ooce/developer/gperf | 3.1 | https://ftp.gnu.org/pub/gnu/gperf/ | [omniosorg](https://github.com/omniosorg)
7070
| ooce/developer/llvm-13 | 13.0.1 | https://github.com/llvm/llvm-project/releases | [omniosorg](https://github.com/omniosorg)
7171
| ooce/developer/llvm-14 | 14.0.6 | https://github.com/llvm/llvm-project/releases | [omniosorg](https://github.com/omniosorg)
@@ -77,7 +77,7 @@
7777
| ooce/developer/omni | github-latest | https://github.com/omniosorg/omni/releases | [omniosorg](https://github.com/omniosorg)
7878
| ooce/developer/pkgmgr | github-latest | https://github.com/omniosorg/pkgmgr/releases | [omniosorg](https://github.com/omniosorg)
7979
| ooce/developer/protobuf | 26.1 | https://github.com/protocolbuffers/protobuf/releases | [omniosorg](https://github.com/omniosorg)
80-
| ooce/developer/radare2 | 5.8.8 | https://github.com/radareorg/radare2/releases | [omniosorg](https://github.com/omniosorg)
80+
| ooce/developer/radare2 | 5.9.0 | https://github.com/radareorg/radare2/releases | [omniosorg](https://github.com/omniosorg)
8181
| ooce/developer/rust | 1.77.1 | https://forge.rust-lang.org/infra/other-installation-methods.html | [omniosorg](https://github.com/omniosorg)
8282
| ooce/developer/subversion | 1.14.3 | https://downloads.apache.org/subversion/ | [omniosorg](https://github.com/omniosorg)
8383
| ooce/developer/valgrind | 3.22.0 | https://valgrind.org/downloads/current.html | [omniosorg](https://github.com/omniosorg)
@@ -167,10 +167,10 @@
167167
| ooce/network/openldap | 2.6.7 | https://www.openldap.org/software/download/ | [omniosorg](https://github.com/omniosorg)
168168
| ooce/network/openvpn | 2.6.10 | https://build.openvpn.net/downloads/releases/ | [omniosorg](https://github.com/omniosorg)
169169
| ooce/network/openvpn-auth-ldap | 2.0.4 | https://github.com/threerings/openvpn-auth-ldap/releases | [omniosorg](https://github.com/omniosorg)
170-
| ooce/network/rclone | 1.65.2 | https://github.com/rclone/rclone/releases/ | [omniosorg](https://github.com/omniosorg)
170+
| ooce/network/rclone | 1.66.0 | https://github.com/rclone/rclone/releases/ | [omniosorg](https://github.com/omniosorg)
171171
| ooce/network/sic | 1.3 | https://tools.suckless.org/sic/ | [r7st](https://github.com/r7st)
172172
| ooce/network/smtp/postfix | 3.9.0 | https://high5.nl/mirrors/postfix-release/index.html | [omniosorg](https://github.com/omniosorg)
173-
| ooce/network/proxy/squid | 6.7 | http://www.squid-cache.org/Versions/v6/ | [cgrzemba](https://github.com/cgrzemba)
173+
| ooce/network/proxy/squid | 6.9 | http://www.squid-cache.org/Versions/v6/ | [cgrzemba](https://github.com/cgrzemba)
174174
| ooce/network/tailscale | 1.50.0 | https://www.tailscale.com/ | [nshalman](https://github.com/nshalman)
175175
| ooce/network/tcpdump | 4.99.4 | https://www.tcpdump.org/release/ | [omniosorg](https://github.com/omniosorg)
176176
| ooce/network/unbound | 1.19.3 | https://nlnetlabs.nl/downloads/unbound/ | [omniosorg](https://github.com/omniosorg)
@@ -196,7 +196,7 @@
196196
| ooce/server/apache-24/modules/wsgi | 5.0.0 | https://github.com/GrahamDumpleton/mod_wsgi/tags/ | [cgrzemba](https://github.com/cgrzemba)
197197
| ooce/server/caddy | 2.7.6 | https://github.com/caddyserver/caddy/releases | [gkoh](https://github.com/gkoh)
198198
| ooce/server/freeradius | 3.2.3 | https://github.com/FreeRADIUS/freeradius-server/releases https://freeradius.org/releases | [omniosorg](https://github.com/omniosorg)
199-
| ooce/server/haproxy | 2.8.7 | https://www.haproxy.org/ | [omniosorg](https://github.com/omniosorg)
199+
| ooce/server/haproxy | 2.8.9 | https://www.haproxy.org/ | [omniosorg](https://github.com/omniosorg)
200200
| ooce/server/nginx | 1.25.4 | https://nginx.org/en/download.html | [omniosorg](https://github.com/omniosorg)
201201
| ooce/server/nginx-124 | 1.24.0 | https://nginx.org/en/download.html | [omniosorg](https://github.com/omniosorg)
202202
| ooce/storage/minio | 2024-03-30T09-41-56Z | https://github.com/minio/minio/releases | [omniosorg](https://github.com/omniosorg)
@@ -240,7 +240,7 @@
240240
| ooce/util/pass | 1.7.4 | https://git.zx2c4.com/password-store/refs/ | [omniosorg](https://github.com/omniosorg)
241241
| ooce/util/rargs | 0.3.0 | https://github.com/lotabout/rargs/releases | [omniosorg](https://github.com/omniosorg)
242242
| ooce/util/rlwrap | 0.46.1 | https://github.com/hanslub42/rlwrap/releases | [r7st](https://github.com/r7st)
243-
| ooce/util/stress-ng | 0.17.00 | https://github.com/ColinIanKing/stress-ng/tags | [omniosorg](https://github.com/omniosorg)
243+
| ooce/util/stress-ng | 0.17.07 | https://github.com/ColinIanKing/stress-ng/tags | [omniosorg](https://github.com/omniosorg)
244244
| ooce/util/u-boot | 2024.01 | https://ftp.denx.de/pub/u-boot/ https://github.com/u-boot/u-boot | [omniosorg](https://github.com/omniosorg)
245245
| ooce/util/uefivars | 1.0.1 | https://github.com/citrus-it/uefivars/releases | [omniosorg](https://github.com/omniosorg)
246246
| ooce/util/xjobs | 20200726 | https://www.maier-komor.de/xjobs.html | [omniosorg](https://github.com/omniosorg)

0 commit comments

Comments
 (0)