Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

package updates #1356

Merged
merged 19 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/bat/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=bat
VER=0.23.0
VER=0.24.0
PKG=ooce/util/bat
SUMMARY="A cat clone with wings"
DESC="A cat(1) clone with syntax highlighting and Git integration."
Expand Down
2 changes: 1 addition & 1 deletion build/cargo-c/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=cargo-c
VER=0.9.23
VER=0.9.27
PKG=ooce/developer/cargo-c
SUMMARY="build and install C-ABI compatible dynamic and static libraries"
DESC="produces and installs a correct pkg-config file, a static library and "
Expand Down
2 changes: 1 addition & 1 deletion build/clamav/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=clamav
VER=1.1.1
VER=1.2.0
PKG=ooce/system/clamav
SUMMARY="Clam Anti-virus"
DESC="$PROG is an open-source antivirus engine for detecting trojans, "
Expand Down
16 changes: 8 additions & 8 deletions build/clamav/files/clamd.conf.patch
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@

# Specify the type of syslog messages - please refer to 'man syslog'
# for facility names.
@@ -74,7 +69,7 @@
@@ -74,7 +74,7 @@
# It is recommended that the directory where this file is stored is
# also owned by root to keep other users from tampering with it.
# Default: disabled
-#PidFile /var/run/clamd.pid
-#PidFile /run/clamav/clamd.pid
+PidFile /var/$(PREFIX)/clamd.pid

# Optional path to the global temporary directory.
# Default: system specific (usually /tmp or /var/tmp).
@@ -82,7 +77,7 @@
Expand All @@ -40,13 +40,13 @@

# Only load the official signatures published by the ClamAV project.
# Default: no
@@ -93,7 +88,7 @@

@@ -99,7 +99,7 @@
# Path to a local socket file the daemon will listen on.
# Default: disabled (must be specified by a user)
-#LocalSocket /tmp/clamd.socket
+LocalSocket /tmp/clamd.socket

#LocalSocket /run/clamav/clamd.sock
-#LocalSocket /tmp/clamd.sock
+LocalSocket /tmp/clamd.sock

# Sets the group ownership on the unix socket.
# Default: disabled (the primary group of the user running clamd)
@@ -176,8 +171,10 @@
Expand Down
6 changes: 3 additions & 3 deletions build/clamav/files/freshclam.conf.patch
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@

# Specify the type of syslog messages - please refer to 'man syslog'
# for facility names.
@@ -51,7 +46,7 @@
@@ -52,7 +52,7 @@
# It is recommended that the directory where this file is stored is
# also owned by root to keep other users from tampering with it.
# Default: disabled
-#PidFile /var/run/freshclam.pid
-#PidFile /run/clamav/freshclam.pid
+PidFile /var/$(PREFIX)/freshclam.pid

# By default when started freshclam drops privileges and switches to the
# "clamav" user. This directive allows you to change the database owner.
6 changes: 3 additions & 3 deletions build/clamav/patches/no-version-script.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/libclamav/CMakeLists.txt a/libclamav/CMakeLists.txt
--- a~/libclamav/CMakeLists.txt 1970-01-01 00:00:00
+++ a/libclamav/CMakeLists.txt 1970-01-01 00:00:00
@@ -464,7 +464,7 @@ if(ENABLE_SHARED_LIB)
@@ -466,7 +466,7 @@ if(ENABLE_SHARED_LIB)
else()
target_link_libraries( clamav PUBLIC Iconv::Iconv )
endif()
Expand All @@ -13,7 +13,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/libclamav/CMakeLists.txt a/li
diff -wpruN --no-dereference '--exclude=*.orig' a~/libclamunrar/CMakeLists.txt a/libclamunrar/CMakeLists.txt
--- a~/libclamunrar/CMakeLists.txt 1970-01-01 00:00:00
+++ a/libclamunrar/CMakeLists.txt 1970-01-01 00:00:00
@@ -95,7 +95,7 @@ if(ENABLE_SHARED_LIB)
@@ -98,7 +98,7 @@ if(ENABLE_SHARED_LIB)

if(WIN32)
set_target_properties(clamunrar PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
Expand All @@ -25,7 +25,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/libclamunrar/CMakeLists.txt a
diff -wpruN --no-dereference '--exclude=*.orig' a~/libclamunrar_iface/CMakeLists.txt a/libclamunrar_iface/CMakeLists.txt
--- a~/libclamunrar_iface/CMakeLists.txt 1970-01-01 00:00:00
+++ a/libclamunrar_iface/CMakeLists.txt 1970-01-01 00:00:00
@@ -62,7 +62,7 @@ if(ENABLE_UNRAR)
@@ -64,7 +64,7 @@ if(ENABLE_UNRAR)

if(WIN32)
set_target_properties(clamunrar_iface PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
Expand Down
2 changes: 1 addition & 1 deletion build/clang/build-17.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=clang
PKG=ooce/developer/clang-17
VER=17.0.1
VER=17.0.2
SUMMARY="C language family frontend for LLVM"
DESC="The Clang project provides a language front-end and tooling "
DESC+="infrastructure for languages in the C language family (C, C++, "
Expand Down
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.27.6
VER=3.27.7
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/dav1d/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=dav1d
VER=1.2.1
VER=1.3.0
PKG=ooce/multimedia/dav1d
SUMMARY="AV1 decoder"
DESC="AV1 cross-platform decoder, open-source, and focused on speed, "
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.35.0
VER=2.36.0
SUMMARY="github-cli"
DESC="The GitHub CLI tool"

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

PROG=go
PKG=ooce/developer/go-120
VER=1.20.8
VER=1.20.10
SUMMARY="The Go Programming Language"
DESC="An open source programming language that makes it easy to build simple, "
DESC+="reliable, and efficient software."
Expand Down
2 changes: 1 addition & 1 deletion build/go/build-121.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=go
PKG=ooce/developer/go-121
VER=1.21.1
VER=1.21.3
SUMMARY="The Go Programming Language"
DESC="An open source programming language that makes it easy to build simple, "
DESC+="reliable, and efficient software."
Expand Down
2 changes: 1 addition & 1 deletion build/hyperfine/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=hyperfine
VER=1.17.0
VER=1.18.0
PKG=ooce/util/hyperfine
SUMMARY="benchmarking tool"
DESC="$PROG is a command-line benchmarking tool that provides "
Expand Down
4 changes: 3 additions & 1 deletion build/irssi/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=irssi
VER=1.4.4
VER=1.4.5
PKG=ooce/network/irssi
SUMMARY="Irssi"
DESC="Text-mode modular chat client"
Expand All @@ -34,6 +34,8 @@ XFORM_ARGS="
-DPKGROOT=$PROG
"

CONFIGURE_OPTS[aarch64]+=" --with-perl=no"

init
download_source $PROG $PROG $VER
patch_source
Expand Down
2 changes: 1 addition & 1 deletion build/llvm/build-17.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=llvm
PKG=ooce/developer/llvm-17
VER=17.0.1
VER=17.0.2
SUMMARY="Low Level Virtual Machine compiler infrastructure"
DESC="A collection of modular and reusable compiler and toolchain technologies"

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=2023-03-20T17-17-53Z
VER=2023-10-04T06-52-56Z
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
169 changes: 169 additions & 0 deletions build/minio-mc/patches/console.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
From fa15abf58f2a4dcfbac2767caf17f57c3e029006 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <[email protected]>
Date: Fri, 11 Feb 2022 15:08:07 +0100
Subject: [PATCH] remove solaris implementation

The solaris implementation is not used anywhere, and removed from most
projects, so we may as well clean up the corresponding files here.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
---
.github/workflows/ci.yml | 1 -
console_test.go | 4 ++--
console_unix.go | 4 ++--
pty_unix.go | 4 ++--
tc_solaris_cgo.go | 52 ----------------------------------------
tc_solaris_nocgo.go | 48 -------------------------------------
tc_unix.go | 4 ++--
7 files changed, 8 insertions(+), 109 deletions(-)
delete mode 100644 tc_solaris_cgo.go
delete mode 100644 tc_solaris_nocgo.go

diff --git a/_deps/pkg/mod/github.com/containerd/[email protected]/console_unix.go b/_deps/pkg/mod/github.com/containerd/[email protected]/console_unix.go
index 164dd59..022ae6c 100644
--- a/_deps/pkg/mod/github.com/containerd/[email protected]/console_unix.go
+++ b/_deps/pkg/mod/github.com/containerd/[email protected]/console_unix.go
@@ -1,5 +1,5 @@
-//go:build darwin || freebsd || linux || netbsd || openbsd || solaris || zos
-// +build darwin freebsd linux netbsd openbsd solaris zos
+//go:build darwin || freebsd || linux || netbsd || openbsd || zos
+// +build darwin freebsd linux netbsd openbsd zos

/*
Copyright The containerd Authors.
diff --git a/_deps/pkg/mod/github.com/containerd/[email protected]/pty_unix.go b/_deps/pkg/mod/github.com/containerd/[email protected]/pty_unix.go
index b090252..f5a5b80 100644
--- a/_deps/pkg/mod/github.com/containerd/[email protected]/pty_unix.go
+++ b/_deps/pkg/mod/github.com/containerd/[email protected]/pty_unix.go
@@ -1,5 +1,5 @@
-//go:build darwin || linux || netbsd || openbsd || solaris
-// +build darwin linux netbsd openbsd solaris
+//go:build darwin || linux || netbsd || openbsd
+// +build darwin linux netbsd openbsd

/*
Copyright The containerd Authors.
diff --git a/_deps/pkg/mod/github.com/containerd/[email protected]/tc_solaris_cgo.go b/_deps/pkg/mod/github.com/containerd/[email protected]/tc_solaris_cgo.go
deleted file mode 100644
index c755a9b..0000000
--- a/_deps/pkg/mod/github.com/containerd/[email protected]/tc_solaris_cgo.go
+++ /dev/null
@@ -1,52 +0,0 @@
-//go:build solaris && cgo
-// +build solaris,cgo
-
-/*
- Copyright The containerd Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package console
-
-import (
- "os"
-
- "golang.org/x/sys/unix"
-)
-
-//#include <stdlib.h>
-import "C"
-
-const (
- cmdTcGet = unix.TCGETS
- cmdTcSet = unix.TCSETS
-)
-
-// ptsname retrieves the name of the first available pts for the given master.
-func ptsname(f *os.File) (string, error) {
- ptspath, err := C.ptsname(C.int(f.Fd()))
- if err != nil {
- return "", err
- }
- return C.GoString(ptspath), nil
-}
-
-// unlockpt unlocks the slave pseudoterminal device corresponding to the master pseudoterminal referred to by f.
-// unlockpt should be called before opening the slave side of a pty.
-func unlockpt(f *os.File) error {
- if _, err := C.grantpt(C.int(f.Fd())); err != nil {
- return err
- }
- return nil
-}
diff --git a/_deps/pkg/mod/github.com/containerd/[email protected]/tc_solaris_nocgo.go b/_deps/pkg/mod/github.com/containerd/[email protected]/tc_solaris_nocgo.go
deleted file mode 100644
index 29c07d4..0000000
--- a/_deps/pkg/mod/github.com/containerd/[email protected]/tc_solaris_nocgo.go
+++ /dev/null
@@ -1,48 +0,0 @@
-//go:build solaris && !cgo
-// +build solaris,!cgo
-
-/*
- Copyright The containerd Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-//
-// Implementing the functions below requires cgo support. Non-cgo stubs
-// versions are defined below to enable cross-compilation of source code
-// that depends on these functions, but the resultant cross-compiled
-// binaries cannot actually be used. If the stub function(s) below are
-// actually invoked they will display an error message and cause the
-// calling process to exit.
-//
-
-package console
-
-import (
- "os"
-
- "golang.org/x/sys/unix"
-)
-
-const (
- cmdTcGet = unix.TCGETS
- cmdTcSet = unix.TCSETS
-)
-
-func ptsname(f *os.File) (string, error) {
- panic("ptsname() support requires cgo.")
-}
-
-func unlockpt(f *os.File) error {
- panic("unlockpt() support requires cgo.")
-}
diff --git a/_deps/pkg/mod/github.com/containerd/[email protected]/tc_unix.go b/_deps/pkg/mod/github.com/containerd/[email protected]/tc_unix.go
index 947cb75..f5053b2 100644
--- a/_deps/pkg/mod/github.com/containerd/[email protected]/tc_unix.go
+++ b/_deps/pkg/mod/github.com/containerd/[email protected]/tc_unix.go
@@ -1,5 +1,5 @@
-//go:build darwin || freebsd || linux || netbsd || openbsd || solaris || zos
-// +build darwin freebsd linux netbsd openbsd solaris zos
+//go:build darwin || freebsd || linux || netbsd || openbsd || zos
+// +build darwin freebsd linux netbsd openbsd zos

/*
Copyright The containerd Authors.
1 change: 1 addition & 0 deletions build/minio-mc/patches/series
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
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=2023-03-22T06-36-24Z
VER=2023-10-07T15-07-38Z
SUMMARY="MinIO server"
DESC="A high Performance Object Storage released under Apache License v2.0. "
DESC+="It is API compatible with Amazon S3 cloud storage service."
Expand Down
Loading
Loading