Skip to content

Commit

Permalink
Merge pull request #1380 from hadfl/pkgupd
Browse files Browse the repository at this point in the history
  • Loading branch information
citrus-it authored Jan 1, 2024
2 parents 212bdd7 + c9e6a78 commit 1a3dc5f
Show file tree
Hide file tree
Showing 20 changed files with 67 additions and 77 deletions.
4 changes: 2 additions & 2 deletions build/ansible/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
# http://www.illumos.org/license/CDDL.
# }}}
#
# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.

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

PROG=ansible
# NB: When bumping this version, also run this script with -P to re-generate
# files/constraints which fixes the version of dependant python modules for
# reproducible builds.
VER=6.3.0
VER=9.1.0
PKG=ooce/system/management/ansible
SUMMARY="Radically simple IT automation"
DESC="Ansible is a radically simple IT automation system."
Expand Down
9 changes: 4 additions & 5 deletions build/ansible/files/constraints
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
## This file was auto-generated and can be updated with ./build.sh -P
ansible-core==2.13.3
ansible-core==2.16.2
Jinja2==3.1.2
MarkupSafe==2.1.1
packaging==21.3
pyparsing==3.0.9
resolvelib==0.8.1
MarkupSafe==2.1.3
packaging==23.2
resolvelib==1.0.1
4 changes: 2 additions & 2 deletions build/cargo-c/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=cargo-c
VER=0.9.28
VER=0.9.29
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
4 changes: 2 additions & 2 deletions build/cmake/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=cmake
VER=3.28.0
VER=3.28.1
PKG=ooce/developer/cmake
SUMMARY="Build coordinator"
DESC="An extensible system that manages the build process in a "
Expand Down
6 changes: 3 additions & 3 deletions build/ffmpeg/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@
# http://www.illumos.org/license/CDDL.
# }}}

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

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

PROG=ffmpeg
VER=6.1
VER=6.1.1
PKG=ooce/multimedia/ffmpeg
SUMMARY="ffmpeg"
DESC="A complete, cross-platform solution to record, "
DESC+="convert and stream audio and video."

# Previous versions that also need to be built and packaged since compiled
# software may depend on it.
PVERS="4.4.3 5.1.2"
PVERS="4.4.4 5.1.4"

test_relver '>=' 151041 && set_clangver

Expand Down
4 changes: 2 additions & 2 deletions build/fontconfig/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=fontconfig
VER=2.14.2
VER=2.15.0
PKG=ooce/library/fontconfig
SUMMARY="$PROG"
DESC="A library for configuring and customizing font access"
Expand Down
8 changes: 4 additions & 4 deletions build/fontconfig/patches/04.bitmap-hacks.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
diff -wpruN '--exclude=*.orig' a~/src/fcmatch.c a/src/fcmatch.c
diff -wpruN --no-dereference '--exclude=*.orig' a~/src/fcmatch.c a/src/fcmatch.c
--- a~/src/fcmatch.c 1970-01-01 00:00:00
+++ a/src/fcmatch.c 1970-01-01 00:00:00
@@ -50,6 +50,15 @@ FcCompareNumber (const FcValue *value1,
Expand All @@ -17,7 +17,7 @@ diff -wpruN '--exclude=*.orig' a~/src/fcmatch.c a/src/fcmatch.c
if (v < 0)
v = -v;
*bestValue = FcValueCanonicalize (value2);
@@ -855,6 +864,46 @@ FcFontRenderPrepare (FcConfig *confi
@@ -857,6 +866,46 @@ FcFontRenderPrepare (FcConfig *confi
return new;
}

Expand Down Expand Up @@ -64,7 +64,7 @@ diff -wpruN '--exclude=*.orig' a~/src/fcmatch.c a/src/fcmatch.c
static FcPattern *
FcFontSetMatchInternal (FcFontSet **sets,
int nsets,
@@ -870,6 +919,8 @@ FcFontSetMatchInternal (FcFontSet **se
@@ -872,6 +921,8 @@ FcFontSetMatchInternal (FcFontSet **se
FcCompareData data;
const FcPatternElt *elt;

Expand All @@ -73,7 +73,7 @@ diff -wpruN '--exclude=*.orig' a~/src/fcmatch.c a/src/fcmatch.c
for (i = 0; i < PRI_END; i++)
bestscore[i] = 0;
best = 0;
@@ -1210,6 +1261,8 @@ FcFontSetSort (FcConfig *config FC_U
@@ -1212,6 +1263,8 @@ FcFontSetSort (FcConfig *config FC_U
FcValue patternLang;
FcCompareData data;

Expand Down
4 changes: 2 additions & 2 deletions build/gnuplot/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=gnuplot
VER=5.4.10
VER=6.0.0
PKG=ooce/application/gnuplot
SUMMARY="gnuplot"
DESC="A portable command-line driven graphing utility"
Expand Down
14 changes: 3 additions & 11 deletions build/lsof/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
# http://www.illumos.org/license/CDDL.
# }}}

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

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

PROG=lsof
PKG=ooce/file/lsof
VER=4.99.0
VER=4.99.3
SUMMARY="List open files"
DESC="Report a list of all open files and the processes that opened them"

Expand All @@ -36,15 +36,7 @@ XFORM_ARGS="
-DPKGROOT=$PROG
"

pre_configure() {
typeset arch=$1

CONFIGURE_OPTS[$arch]+="
--disable-static
--includedir=$OPREFIX/include
--libdir=$OPREFIX/${LIBDIRS[$arch]}
"
}
CONFIGURE_OPTS+=" --disable-liblsof"

init
download_source $PROG $PROG $VER
Expand Down
5 changes: 2 additions & 3 deletions build/mbuffer/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
# }}}
#
# Copyright 2011-2013 OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.

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

PROG=mbuffer
VER=20230301
VER=20231216
PKG=ooce/system/mbuffer
SUMMARY="$PROG - measuring buffer"
DESC="$PROG is a tool for buffering data streams"
Expand All @@ -36,7 +36,6 @@ XFORM_ARGS="
-DPKGROOT=$PROG
"


init
download_source $PROG $PROG $VER
patch_source
Expand Down
4 changes: 2 additions & 2 deletions build/minio-mc/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
# http://www.illumos.org/license/CDDL.
# }}}

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

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

PROG=minio-mc
PKG=ooce/storage/minio-mc
VER=2023-12-20T07-14-22Z
VER=2023-12-23T08-47-21Z
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/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
# http://www.illumos.org/license/CDDL.
# }}}

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

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

PROG=minio
PKG=ooce/storage/minio
VER=2023-12-20T01-00-02Z
VER=2023-12-23T07-19-11Z
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/neovim/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=neovim
VER=0.9.4
VER=0.9.5
PKG=ooce/editor/neovim
SUMMARY="Neovim"
DESC="hyperextensible Vim-based text editor"
Expand Down
2 changes: 1 addition & 1 deletion build/neovim/patches/illumos-support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/cmake.deps/CMakeLists.txt a/c
diff -wpruN --no-dereference '--exclude=*.orig' a~/src/nvim/CMakeLists.txt a/src/nvim/CMakeLists.txt
--- a~/src/nvim/CMakeLists.txt 1970-01-01 00:00:00
+++ a/src/nvim/CMakeLists.txt 1970-01-01 00:00:00
@@ -358,6 +358,9 @@ foreach(sfile ${NVIM_SOURCES})
@@ -360,6 +360,9 @@ foreach(sfile ${NVIM_SOURCES})
if(NOT WIN32 AND ${f} MATCHES "^(os_win_console.c)$")
list(APPEND to_remove ${sfile})
endif()
Expand Down
4 changes: 2 additions & 2 deletions build/rav1e/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=rav1e
VER=0.6.6
VER=0.7.0
PKG=ooce/multimedia/rav1e
SUMMARY="$PROG - AV1 encoder"
DESC="AV1 video encoder"
Expand Down
4 changes: 2 additions & 2 deletions build/rust/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
# http://www.illumos.org/license/CDDL.
# }}}

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

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

PROG=rust
PKG=ooce/developer/rust
VER=1.74.1
VER=1.75.0
SUMMARY="Rust systems programming language"
DESC="Rust is a systems programming language that runs blazingly fast, "
DESC+="prevents segfaults, and guarantees thread safety."
Expand Down
4 changes: 2 additions & 2 deletions build/subversion/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 2022 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.

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

PROG=subversion
VER=1.14.2
VER=1.14.3
PKG=ooce/developer/subversion
SUMMARY="Subversion is an open source version control system"
DESC="Subversion is a version control system designed to be \
Expand Down
4 changes: 2 additions & 2 deletions build/tcpdump/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=tcpdump
VER=4.99.3
VER=4.99.4
PKG=ooce/network/tcpdump
SUMMARY="tcpdump - TCP packet analyzer"
DESC="tcpdump - a powerful command-line TCP packet analyzer"
Expand Down
22 changes: 11 additions & 11 deletions build/tcpdump/testsuite.log
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Running tests from /temp/build_hadfl/tcpdump-4.99.3/tcpdump-4.99.3/tests
Running tests from /temp/build_hadfl/tcpdump-4.99.4/tcpdump-4.99.4/tests
with ./tcpdump, version:
tcpdump version 4.99.3
libpcap version 1.10.3
OpenSSL 3.0.8 7 Feb 2023
tcpdump version 4.99.4
libpcap version 1.10.4
OpenSSL 3.1.4 24 Oct 2023
print-x : passed
print-xx : passed
print-X : passed
Expand Down Expand Up @@ -347,7 +347,7 @@ OpenSSL 3.0.8 7 Feb 2023
isoclns-oobr : passed
nfs-attr-oobr : passed
decnet-oobr : passed
oobr_parse_elements : passed
ieee802.11_parse_elements_oobr : passed
hoobr_ripng_print : passed
hoobr_juniper : passed
hoobr_juniper2 : passed
Expand Down Expand Up @@ -546,7 +546,7 @@ OpenSSL 3.0.8 7 Feb 2023
unsupported-link-type-dbus : passed
lsp-ping-timestamp : passed
lwres_with_extra : passed
FILE: /temp/build_hadfl/tcpdump-4.99.3/tcpdump-4.99.3/tests/crypto.tests
FILE: /temp/build_hadfl/tcpdump-4.99.4/tcpdump-4.99.4/tests/crypto.tests
esp1 : passed
esp2 : passed
esp3 : passed
Expand All @@ -559,14 +559,14 @@ FILE: /temp/build_hadfl/tcpdump-4.99.3/tcpdump-4.99.3/tests/crypto.tests
bgp-aigp-oobr-ssl : passed
bgp-as-path-oobr-nossl : skipped (HAVE_LIBCRYPTO set)
bgp-aigp-oobr-nossl : skipped (HAVE_LIBCRYPTO set)
FILE: /temp/build_hadfl/tcpdump-4.99.3/tcpdump-4.99.3/tests/isis-seg-fault-1-v.tests
FILE: /temp/build_hadfl/tcpdump-4.99.4/tcpdump-4.99.4/tests/isis-seg-fault-1-v.tests
isis-seg-fault-1-v : passed
FILE: /temp/build_hadfl/tcpdump-4.99.3/tcpdump-4.99.3/tests/lmp-v.tests
FILE: /temp/build_hadfl/tcpdump-4.99.4/tcpdump-4.99.4/tests/lmp-v.tests
lmp-v-fptype1 : passed
lmp-v-fptype2 : skipped (HAVE_FPTYPE2 not set)
FILE: /temp/build_hadfl/tcpdump-4.99.3/tcpdump-4.99.3/tests/non-bsd.tests
FILE: /temp/build_hadfl/tcpdump-4.99.4/tcpdump-4.99.4/tests/non-bsd.tests
heap-overflow-1 : passed
FILE: /temp/build_hadfl/tcpdump-4.99.3/tcpdump-4.99.3/tests/printf_z.tests
FILE: /temp/build_hadfl/tcpdump-4.99.4/tcpdump-4.99.4/tests/printf_z.tests
ospf-gmpls : passed
ospf-nssa-bitnt : passed
ospf3_ah-vv : passed
Expand All @@ -585,7 +585,7 @@ FILE: /temp/build_hadfl/tcpdump-4.99.3/tcpdump-4.99.3/tests/printf_z.tests
dns-zlip-2 : passed
dns-zlip-3 : passed
sflow_print-segv : passed
FILE: /temp/build_hadfl/tcpdump-4.99.3/tcpdump-4.99.3/tests/smb.tests
FILE: /temp/build_hadfl/tcpdump-4.99.4/tcpdump-4.99.4/tests/smb.tests
eapon1 : skipped (ENABLE_SMB not set)
eapon1-nosmb : passed
eapon1-v : skipped (ENABLE_SMB not set)
Expand Down
Loading

0 comments on commit 1a3dc5f

Please sign in to comment.