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

bind updates #1493

Merged
merged 3 commits into from
Jul 28, 2024
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/isc-bind9/build-918.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=bind
VER=9.18.27
VER=9.18.28
PKG=ooce/network/bind-918
SUMMARY="ISC BIND DNS Server & Tools"
DESC="Server & Client Utilities for DNS"
Expand Down
113 changes: 113 additions & 0 deletions build/isc-bind9/build-920.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
#!/usr/bin/bash
#
# {{{ CDDL HEADER
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
# }}}
#
# Copyright 2017 OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.

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

PROG=bind
VER=9.20.0
PKG=ooce/network/bind-920
SUMMARY="ISC BIND DNS Server & Tools"
DESC="Server & Client Utilities for DNS"

BUILD_DEPENDS_IPS="
ooce/database/lmdb
ooce/library/json-c
ooce/library/liburcu
ooce/library/libuv
"

RUN_DEPENDS_IPS="
ooce/network/bind-common
"

set_arch 64
set_standard XPG4v2 CFLAGS

# configure complains about make not being GNU make
export MAKE

MAJVER=${VER%.*} # M.m
sMAJVER=${MAJVER//./} # Mm
set_patchdir patches-$sMAJVER

OPREFIX=$PREFIX
PREFIX+=/named-$MAJVER
CONFPATH=/etc$PREFIX
VARPATH=/var$OPREFIX/named/named-$MAJVER

HARDLINK_TARGETS="
${PREFIX#/}/bin/named-checkzone
${PREFIX#/}/sbin/tsig-keygen
"

SKIP_RTIME_CHECK=1
NO_SONAME_EXPECTED=1

XFORM_ARGS="
-DOPREFIX=${OPREFIX#/}
-DPREFIX=${PREFIX#/}
-DCONFPATH=${CONFPATH#/}
-DVARPATH=${VARPATH#/}
-DPROG=$PROG
-DPKGROOT=named-$MAJVER
-DMEDIATOR=$PROG -DMEDIATOR_VERSION=$MAJVER
-DVERSION=$MAJVER
-DsVERSION=$sMAJVER
-DUSER=named
-DGROUP=named
"

CONFIGURE_OPTS="
--prefix=$PREFIX
--bindir=$PREFIX/bin
--sbindir=$PREFIX/sbin
--libdir=$PREFIX/lib
--includedir=$PREFIX/include
--sysconfdir=$CONFPATH
--localstatedir=$VARPATH
--with-libtool
--with-openssl
--enable-threads=yes
--enable-devpoll=yes
--enable-fixed-rrset
--disable-getifaddrs
--enable-shared
--disable-static
--without-python
--with-zlib=yes
--with-libxml2=yes
--with-json-c=yes
--with-lmdb=$OPREFIX
"

# for lmdb
LDFLAGS[amd64]+=" -L$OPREFIX/lib/amd64 -R$OPREFIX/lib/amd64"

init
download_source $PROG $PROG $VER
patch_source
xform files/named.conf-template > $TMPDIR/named-$sMAJVER.conf
prep_build autoconf -autoreconf
build
xform files/named-template.xml > $TMPDIR/named-$sMAJVER.xml
xform files/named-template > $TMPDIR/named-$sMAJVER
install_smf -oocemethod ooce named-$sMAJVER.xml named-$sMAJVER
make_package
clean_up

# Vim hints
# vim:ts=4:sw=4:et:fdm=marker
30 changes: 30 additions & 0 deletions build/isc-bind9/patches-920/libs.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/m4/ax_pthread.m4 a/m4/ax_pthread.m4
--- a~/m4/ax_pthread.m4 1970-01-01 00:00:00
+++ a/m4/ax_pthread.m4 1970-01-01 00:00:00
@@ -204,7 +204,7 @@ case $target_os in
# that too in a future libc.) So we'll check first for the
# standard Solaris way of linking pthreads (-mt -lpthread).

- ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags"
+ # ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags"
;;
esac

@@ -237,13 +237,13 @@ ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555
# To solve this, first try -pthread together with -lpthread for GCC

-AS_IF([test "x$GCC" = "xyes"],
- [ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags"])
+# AS_IF([test "x$GCC" = "xyes"],
+# [ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags"])

# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first

-AS_IF([test "x$ax_pthread_clang" = "xyes"],
- [ax_pthread_flags="-pthread,-lpthread -pthread"])
+# AS_IF([test "x$ax_pthread_clang" = "xyes"],
+# [ax_pthread_flags="-pthread,-lpthread -pthread"])


# The presence of a feature test macro requesting re-entrant function
21 changes: 21 additions & 0 deletions build/isc-bind9/patches-920/linker_flags.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
--- a~/configure.ac 1970-01-01 00:00:00
+++ a/configure.ac 1970-01-01 00:00:00
@@ -328,17 +328,6 @@ AM_CONDITIONAL([HAVE_PYTEST], [test -n "
#
AC_PATH_PROG([XSLTPROC], [xsltproc])

-#
-# Using Solaris linker with gcc on Solaris breaks Thread Local Storage
-#
-AS_CASE([$host],
- [*-solaris*],[
- AS_IF([test "$GCC" = "yes"],
- [LDFLAGS="$LDFLAGS -zrelax=transtls"
- AC_MSG_WARN([When using GNU C Compiler on Solaris, -zrelax=transtls linker flag is used to fix bug in Thread Local Storage])
- ])
- ])
-
AC_CHECK_HEADERS([fcntl.h regex.h sys/time.h unistd.h sys/mman.h sys/sockio.h sys/select.h sys/param.h sys/sysctl.h net/if6.h sys/socket.h net/route.h linux/netlink.h linux/rtnetlink.h], [], [],
[$ac_includes_default
#ifdef HAVE_SYS_PARAM_H
2 changes: 2 additions & 0 deletions build/isc-bind9/patches-920/series
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
linker_flags.patch
libs.patch
58 changes: 58 additions & 0 deletions build/liburcu/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
#!/usr/bin/bash
#
# {{{ CDDL HEADER
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
# }}}

# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.

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

PROG=liburcu
VER=0.14.0
PKG=ooce/library/liburcu
SUMMARY="Userspace RCU"
DESC="Userspace RCU (read-copy-update) library. This data synchronization "
DESC+="library provides read-side access which scales linearly with the "
DESC+="number of cores."

set_clangver

set_builddir userspace-rcu-$VER

XFORM_ARGS="
-DPREFIX=${PREFIX#/}
"

# configure complains about make not being GNU make
export MAKE

CONFIGURE_OPTS="--disable-static"

pre_configure() {
typeset arch=$1

LDFLAGS[$arch]+=" -Wl,-R$PREFIX/${LIBDIRS[$arch]}"
}

CFLAGS[aarch64]+=" -mtls-dialect=trad"

init
download_source $PROG userspace-rcu $VER
patch_source
prep_build
build
run_testsuite check
make_package
clean_up

# Vim hints
# vim:ts=4:sw=4:et:fdm=marker
1 change: 1 addition & 0 deletions build/liburcu/files/ctf.ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
compat_arch.c
17 changes: 17 additions & 0 deletions build/liburcu/local.mog
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.

# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.

# Drop documentation
<transform path=$(PREFIX)/share/doc -> drop>

license lgpl-2.1.txt license=LGPLv2.1

Loading
Loading