Skip to content

Commit

Permalink
Merge pull request #1529 from hadfl/pkgupd
Browse files Browse the repository at this point in the history
package updates
  • Loading branch information
citrus-it authored Oct 13, 2024
2 parents 3f6b2d0 + 57899df commit 1e1571d
Show file tree
Hide file tree
Showing 51 changed files with 141 additions and 512 deletions.
2 changes: 1 addition & 1 deletion build/cmake/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=cmake
VER=3.30.2
VER=3.30.5
PKG=ooce/developer/cmake
SUMMARY="Build coordinator"
DESC="An extensible system that manages the build process in a "
Expand Down
2 changes: 1 addition & 1 deletion build/direnv/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=direnv
VER=2.34.0
VER=2.35.0
PKG=ooce/util/direnv
SUMMARY="unclutter your .profile"
DESC="A shell extension that can load and unload environment variables "
Expand Down
8 changes: 4 additions & 4 deletions build/direnv/testsuite.log
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
=== RUN TestFTJsons
--- PASS: TestFTJsons (0.00s)
=== RUN TestRoundTrip
--- PASS: TestRoundTrip (0.01s)
--- PASS: TestRoundTrip (0.00s)
=== RUN TestCanonicalAdds
--- PASS: TestCanonicalAdds (0.00s)
=== RUN TestCheckPasses
Expand All @@ -40,7 +40,7 @@
=== RUN TestShellDetection
--- PASS: TestShellDetection (0.00s)
PASS
ok github.com/direnv/direnv/v2/internal/cmd (cached)
ok github.com/direnv/direnv/v2/internal/cmd 0.030s
=== RUN TestDotEnvExported
--- PASS: TestDotEnvExported (0.00s)
=== RUN TestDotEnvPlain
Expand All @@ -60,10 +60,10 @@ ok github.com/direnv/direnv/v2/internal/cmd (cached)
=== RUN TestVariableExpansionWithDefaults
--- PASS: TestVariableExpansionWithDefaults (0.00s)
PASS
ok github.com/direnv/direnv/v2/pkg/dotenv (cached)
ok github.com/direnv/direnv/v2/pkg/dotenv 0.026s
=== RUN TestWriter
--- PASS: TestWriter (0.00s)
=== RUN TestParser
--- PASS: TestParser (0.00s)
PASS
ok github.com/direnv/direnv/v2/pkg/sri (cached)
ok github.com/direnv/direnv/v2/pkg/sri 0.030s
4 changes: 2 additions & 2 deletions build/dtc/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
# http://www.illumos.org/license/CDDL.
# }}}

# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.

. ../../lib/build.sh

PROG=dtc
VER=1.7.0
VER=1.7.1
PKG=ooce/util/dtc
SUMMARY="Device Tree Compiler"
DESC="$PROG - $SUMMARY"
Expand Down
2 changes: 1 addition & 1 deletion build/freeradius/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=freeradius
PKG=ooce/server/freeradius
VER=3.2.5
VER=3.2.6
TALLOCVER=2.4.2 # https://www.samba.org/ftp/talloc/
MAJVER=${VER%.*} # M.m
sMAJVER=${MAJVER//./} # Mm
Expand Down
2 changes: 1 addition & 1 deletion build/gh/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=gh
PKG=ooce/util/gh
VER=2.49.0
VER=2.58.0
SUMMARY="github-cli"
DESC="The GitHub CLI tool"

Expand Down
2 changes: 1 addition & 1 deletion build/haproxy/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=haproxy
VER=2.8.9
VER=3.0.5
PKG=ooce/server/haproxy
SUMMARY="HAProxy - fast and reliable http reverse proxy and load balancer"
DESC="A TCP/HTTP reverse proxy which is particularly suited for high "
Expand Down
2 changes: 1 addition & 1 deletion build/libpciaccess/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=libpciaccess
VER=0.18
VER=0.18.1
PKG=ooce/library/libpciaccess
SUMMARY="PCI access utility library from X.org"
DESC="The pciaccess library wraps platform-dependent PCI access "
Expand Down
2 changes: 1 addition & 1 deletion build/mattermost/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=mattermost
VER=9.11.2
VER=9.11.3
# check for the current morph version/commit hash and create a patched branch in
# https://github.com/omniosorg/morph; then point to that branch
MORPHBRANCH=il_1.1.0
Expand Down
4 changes: 1 addition & 3 deletions build/mbuffer/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=mbuffer
VER=20240707
VER=20241007
PKG=ooce/system/mbuffer
SUMMARY="$PROG - measuring buffer"
DESC="$PROG is a tool for buffering data streams"
Expand All @@ -29,8 +29,6 @@ PREFIX+="/$PROG"
set_arch 64
set_clangver

set_builddir $PROG-r$VER

XFORM_ARGS="
-DOPREFIX=${OPREFIX#/}
-DPREFIX=${PREFIX#/}
Expand Down
2 changes: 1 addition & 1 deletion build/minio-mc/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=minio-mc
PKG=ooce/storage/minio-mc
VER=2024-03-30T15-29-52Z
VER=2024-10-02T08-27-28Z
SUMMARY="MinIO client"
DESC="A modern alternative to UNIX commands like ls, cat, cp, mirror, diff, "
DESC+="find etc. It supports filesystems and Amazon S3 compatible cloud "
Expand Down
4 changes: 2 additions & 2 deletions build/minio-mc/patches/Makefile.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -wpruN '--exclude=*.orig' a~/Makefile a/Makefile
diff -wpruN --no-dereference '--exclude=*.orig' a~/Makefile a/Makefile
--- a~/Makefile 1970-01-01 00:00:00
+++ a/Makefile 1970-01-01 00:00:00
@@ -57,7 +57,7 @@ verify:
@@ -64,7 +64,7 @@ verify:
# Builds mc locally.
build: checks
@echo "Building mc binary to './mc'"
Expand Down
169 changes: 0 additions & 169 deletions build/minio-mc/patches/console.patch

This file was deleted.

1 change: 0 additions & 1 deletion build/minio-mc/patches/series
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
Makefile.patch
console.patch -R
2 changes: 1 addition & 1 deletion build/minio/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=minio
PKG=ooce/storage/minio
VER=2024-03-30T09-41-56Z
VER=2024-10-02T17-50-41Z
SUMMARY="MinIO server"
DESC="A high Performance Object Storage. "
DESC+="It is API compatible with Amazon S3 cloud storage service."
Expand Down
4 changes: 2 additions & 2 deletions build/minio/patches/Makefile.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Makefile a/Makefile

GOARCH := $(shell go env GOARCH)
GOOS := $(shell go env GOOS)
@@ -132,7 +132,7 @@ build-debugging:
@@ -172,7 +172,7 @@ build-debugging:

build: checks ## builds minio to $(PWD)
build: checks build-debugging ## builds minio to $(PWD)
@echo "Building minio binary to './minio'"
- @CGO_ENABLED=0 go build -tags kqueue -trimpath --ldflags "$(LDFLAGS)" -o $(PWD)/minio 1>/dev/null
+ @CGO_ENABLED=1 go build -tags kqueue -trimpath --ldflags "$(LDFLAGS)" -o $(PWD)/minio 1>/dev/null
Expand Down
Loading

0 comments on commit 1e1571d

Please sign in to comment.