Merge pull request #144 from kinvolk/contributions/update-to-samba-4.12.9

Add requirements for Samba-4.12.9 upgrade
This commit is contained in:
Thilo Fromm 2021-02-09 15:20:40 +01:00 committed by GitHub
commit a447c1dd07
12 changed files with 527 additions and 0 deletions

View File

@ -0,0 +1 @@
DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8

View File

@ -0,0 +1,56 @@
same as 4.7, but retargetted to apply with eapply
forward-ported from v58.2 to v64.2
--- a/config/mh-darwin
+++ b/config/mh-darwin
@@ -6,6 +6,12 @@
## Copyright (c) 1999-2012 International Business Machines Corporation and
## others. All Rights Reserved.
+SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
+FINAL_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION).$(SO)
+MIDDLE_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION_MAJOR).$(SO)
+
+IS_DARWIN = yes
+
## Flags for position independent code
SHAREDLIBCFLAGS = -dynamic
SHAREDLIBCXXFLAGS = -dynamic
@@ -33,7 +39,7 @@
ifeq ($(ENABLE_RPATH),YES)
LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
else
-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
endif
## Compiler switch to embed a runtime search path
--- a/stubdata/Makefile.in
+++ b/stubdata/Makefile.in
@@ -34,7 +34,11 @@
ifneq ($(ENABLE_SHARED),)
+ifeq ($(IS_DARWIN),)
SO_TARGET = $(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)
+else
+SO_TARGET = $(LIBDIR)/$(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)
+endif
ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT)
endif
--- a/tools/ctestfw/Makefile.in
+++ b/tools/ctestfw/Makefile.in
@@ -33,7 +33,11 @@
endif
ifneq ($(ENABLE_SHARED),)
+ifeq ($(IS_DARWIN),)
SO_TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
+else
+SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
+endif
ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
endif

View File

@ -0,0 +1,207 @@
--- a/config/icu-config-bottom
+++ b/config/icu-config-bottom
@@ -218,65 +218,65 @@
;;
--cflags)
- echo $ECHO_N "${CFLAGS} ${ECHO_C}"
+ printf "%s" "${CFLAGS} "
;;
--cc)
- echo $ECHO_N "${CC} ${ECHO_C}"
+ printf "%s" "${CC} "
;;
--cxx)
- echo $ECHO_N "${CXX} ${ECHO_C}"
+ printf "%s" "${CXX} "
;;
--cxxflags)
- echo $ECHO_N "${CXXFLAGS} ${ECHO_C}"
+ printf "%s" "${CXXFLAGS} "
;;
--cppflags)
# Don't echo the -I. - it's unneeded.
- echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //'
+ printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //'
;;
--cppflags-searchpath)
- echo $ECHO_N "-I${prefix}/include ${ECHO_C}"
+ printf "%s" "-I${prefix}/include "
;;
--cppflags-dynamic)
- echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}"
+ printf "%s" "${SHAREDLIBCPPFLAGS} "
;;
--cxxflags-dynamic)
- echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}"
+ printf "%s" "${SHAREDLIBCXXFLAGS} "
;;
--cflags-dynamic)
- echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}"
+ printf "%s" "${SHAREDLIBCFLAGS} "
;;
--ldflags-system)
- echo $ECHO_N "${LIBS} ${ECHO_C}"
+ printf "%s" "${LIBS} "
;;
--ldflags)
- echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}"
+ printf "%s" "${LDFLAGS} ${ICULIBS} "
# $RPATH_LDFLAGS
;;
--ldflags-libsonly)
- echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}"
+ printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} "
;;
--ldflags-icuio)
- echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}"
+ printf "%s" " ${ICULIBS_ICUIO} "
;;
--ldflags-obsolete)
- echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}"
+ printf "%s" "${ICULIBS_OBSOLETE} "
;;
--ldflags-toolutil)
- echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}"
+ printf "%s" " ${ICULIBS_TOOLUTIL} "
;;
--ldflags-layout)
@@ -285,7 +285,7 @@
;;
--ldflags-searchpath)
- echo $ECHO_N "-L${libdir} ${ECHO_C}"
+ printf "%s" "-L${libdir} "
;;
--detect-prefix)
@@ -321,47 +321,47 @@
;;
--shared-datadir)
- echo $ECHO_N "${datadir} ${ECHO_C}"
+ printf "%s" "${datadir} "
;;
--incfile)
- echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}"
+ printf "%s" "${pkglibdir}/Makefile.inc "
;;
--incpkgdatafile)
- echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}"
+ printf "%s" "${pkglibdir}/pkgdata.inc "
;;
--icudata)
- echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}"
+ printf "%s" "${ICUDATA_NAME} "
;;
--icudata-mode)
- echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}"
+ printf "%s" "${PKGDATA_MODE} "
;;
--icudata-install-dir)
- echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}"
+ printf "%s" "${ICUPKGDATA_DIR} "
;;
--icudatadir)
- echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}"
+ printf "%s" "${ICUDATA_DIR} "
;;
--shlib-c)
- echo $ECHO_N "${SHLIB_c} ${ECHO_C}"
+ printf "%s" "${SHLIB_c} "
;;
--shlib-cc)
- echo $ECHO_N "${SHLIB_cc} ${ECHO_C}"
+ printf "%s" "${SHLIB_cc} "
;;
--version)
- echo $ECHO_N $VERSION
+ printf "%s" "$VERSION"
;;
--unicode-version)
- echo $ECHO_N $UNICODE_VERSION
+ printf "%s" "$UNICODE_VERSION"
;;
--host)
--- a/config/Makefile.inc.in
+++ b/config/Makefile.inc.in
@@ -124,12 +124,6 @@
# with usually. Many applications will want to add $(ICULIBS_I18N) as well.
ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA)
-# Proper echo newline handling is needed in icu-config
-ECHO_N=@ICU_ECHO_N@
-ECHO_C=@ICU_ECHO_C@
-# Not currently being used but good to have for proper tab handling
-ECHO_T=@ICU_ECHO_T@
-
##################################################################
##################################################################
#
--- a/configure.ac
+++ b/configure.ac
@@ -26,24 +26,6 @@
PACKAGE="icu"
AC_SUBST(PACKAGE)
-# Use custom echo test for newline option
-# Current autoconf (2.65) gives incorrect echo newline option
-# for icu-config
-# This may be removed later - mow (June 17, 2010)
-ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T=
-case `/bin/sh -c "echo -n x"` in
--n*)
- case `/bin/sh -c "echo 'x\c'"` in
- *c*) ICU_ECHO_T=' ';; # ECHO_T is single tab character.
- *) ICU_ECHO_C='\c';;
- esac;;
-*)
- ICU_ECHO_N='-n';;
-esac
-AC_SUBST(ICU_ECHO_N)
-AC_SUBST(ICU_ECHO_C)
-AC_SUBST(ICU_ECHO_T)
-
AC_MSG_CHECKING(for ICU version numbers)
# Get the ICU version from uversion.h or other headers
--- a/icudefs.mk.in
+++ b/icudefs.mk.in
@@ -161,11 +161,6 @@
ENABLE_STATIC = @ENABLE_STATIC@
ENABLE_SHARED = @ENABLE_SHARED@
-# Echo w/o newline
-
-#ECHO_N = @ICU_ECHO_N@
-#ECHO_C = @ICU_ECHO_C@
-
# Commands to compile
COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c
COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c

View File

@ -0,0 +1,12 @@
diff -ruN a/common/unicode/platform.h b/common/unicode/platform.h
--- a/common/unicode/platform.h 2020-10-28 23:21:12.000000000 +0200
+++ b/common/unicode/platform.h 2020-11-28 20:48:53.223629867 +0200
@@ -649,7 +649,7 @@
/* Use the predefined value. */
#elif U_PLATFORM_IS_LINUX_BASED || U_PLATFORM_IS_DARWIN_BASED || \
U_PLATFORM == U_PF_EMSCRIPTEN
-# define U_CHARSET_IS_UTF8 1
+# define U_CHARSET_IS_UTF8 0
#else
# define U_CHARSET_IS_UTF8 0
#endif

View File

@ -0,0 +1,141 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7} )
inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
DESCRIPTION="International Components for Unicode"
HOMEPAGE="http://site.icu-project.org/"
SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="debug doc examples static-libs"
BDEPEND="${PYTHON_DEPS}
virtual/pkgconfig
doc? ( app-doc/doxygen[dot] )
"
S="${WORKDIR}/${PN}/source"
MULTILIB_CHOST_TOOLS=(
/usr/bin/icu-config
)
PATCHES=(
"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
"${FILESDIR}/${PN}-64.2-darwin.patch"
)
src_prepare() {
default
local variable
# Disable renaming as it is stupid thing to do
sed -i \
-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
common/unicode/uconfig.h || die
# Fix linking of icudata
sed -i \
-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
config/mh-linux || die
# Append doxygen configuration to configure
sed -i \
-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
configure.ac || die
eautoreconf
}
src_configure() {
append-cxxflags -std=c++14
if tc-is-cross-compiler; then
mkdir "${WORKDIR}"/host || die
pushd "${WORKDIR}"/host >/dev/null || die
CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
"${S}"/configure --disable-renaming --disable-debug \
--disable-samples --enable-static || die
emake
popd >/dev/null || die
fi
multilib-minimal_src_configure
}
multilib_src_configure() {
local myeconfargs=(
--disable-renaming
--disable-samples
--disable-layoutex
$(use_enable debug)
$(use_enable static-libs static)
$(multilib_native_use_enable examples samples)
)
tc-is-cross-compiler && myeconfargs+=(
--with-cross-build="${WORKDIR}"/host
)
# icu tries to use clang by default
tc-export CC CXX
# make sure we configure with the same shell as we run icu-config
# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
export CONFIG_SHELL="${EPREFIX}/bin/sh"
# probably have no /bin/sh in prefix-chain
[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
multilib_src_compile() {
default
if multilib_is_native_abi && use doc; then
doxygen -u Doxyfile || die
doxygen Doxyfile || die
fi
}
multilib_src_test() {
# INTLTEST_OPTS: intltest options
# -e: Exhaustive testing
# -l: Reporting of memory leaks
# -v: Increased verbosity
# IOTEST_OPTS: iotest options
# -e: Exhaustive testing
# -v: Increased verbosity
# CINTLTST_OPTS: cintltst options
# -e: Exhaustive testing
# -v: Increased verbosity
emake -j1 VERBOSE="1" check
}
multilib_src_install() {
default
if multilib_is_native_abi && use doc; then
docinto html
dodoc -r doc/html/*
fi
}
multilib_src_install_all() {
einstalldocs
docinto html
dodoc ../readme.html
}

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
<name>Gentoo Office project</name>
</maintainer>
</pkgmetadata>

View File

@ -0,0 +1 @@
DIST Parse-Yapp-1.21.tar.gz 108661 BLAKE2B b5d8e135f8befc4841250c75385fb935757e665b213373c983428809e5990e9f50fed250c3af9a5253da0f6a1494883b23b6ae42e4ae23cff799c3663bd054f0 SHA512 dbf6182d4813ff7e355ea1713c748bfdf8290040a93f123acec645c7a1733fe457ab6e0ab51c4ec83cf82bc43d7fb35cbf89875df7b5c2ffc9635e85458cfeee

View File

@ -0,0 +1,21 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DIST_AUTHOR=WBRASWELL
DIST_VERSION=1.21
DIST_EXAMPLES=( "Calc.yp" "YappParse.yp" )
inherit perl-module
DESCRIPTION="Compiles yacc-like LALR grammars to generate Perl OO parser modules"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<net-fs/samba-4.10.6"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
"
mydoc="docs/*"

View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>perl@gentoo.org</email>
<name>Gentoo Perl Project</name>
</maintainer>
<upstream>
<remote-id type="cpan">Parse-Yapp</remote-id>
<remote-id type="cpan-module">Parse::Yapp</remote-id>
<remote-id type="cpan-module">Parse::Yapp::Driver</remote-id>
<remote-id type="cpan-module">Parse::Yapp::Grammar</remote-id>
<remote-id type="cpan-module">Parse::Yapp::Lalr</remote-id>
<remote-id type="cpan-module">Parse::Yapp::Options</remote-id>
<remote-id type="cpan-module">Parse::Yapp::Output</remote-id>
<remote-id type="cpan-module">Parse::Yapp::Parse</remote-id>
</upstream>
</pkgmetadata>

View File

@ -0,0 +1 @@
DIST liburing-0.7.tar.bz2 86386 BLAKE2B a4fa00cc8e384f9909f3c628d479774beaffd5ab09c9f321ef22bfbabd273e4c8d4dbb30a3280633e89e1a79e893348e68f0aa2f3b1b4deda56759f77d9b1875 SHA512 9a23bc08e0fa59273264295859dddbe3276b2911df6d937b3c6f7647a250a3175222b5f051f3094efc98e48cacd242511327c5c5b895ebde10c8c87929ba4328

View File

@ -0,0 +1,50 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit multilib-minimal toolchain-funcs
DESCRIPTION="Efficient I/O with io_uring"
HOMEPAGE="https://github.com/axboe/liburing"
SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
LICENSE="MIT"
SLOT="0/1.0.7" # liburing.so version
IUSE="static-libs"
# fsync test hangs forever
RESTRICT="test"
src_prepare() {
default
multilib_copy_sources
}
multilib_src_configure() {
local myconf=(
--prefix="${EPREFIX}/usr"
--libdir="${EPREFIX}/usr/$(get_libdir)"
--libdevdir="${EPREFIX}/usr/$(get_libdir)"
--mandir="${EPREFIX}/usr/share/man"
--cc="$(tc-getCC)"
)
# No autotools configure! "econf" will fail.
TMPDIR="${T}" ./configure "${myconf[@]}"
}
multilib_src_compile() {
emake V=1 AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
}
multilib_src_install_all() {
einstalldocs
if ! use static-libs ; then
find "${ED}" -type f -name "*.a" -delete || die
fi
}
multilib_src_test() {
emake V=1 runtests
}

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
<upstream>
<remote-id type="github">axboe/liburing</remote-id>
</upstream>
</pkgmetadata>