diff options
| -rw-r--r-- | net-fs/samba/Manifest | 4 | ||||
| -rw-r--r-- | net-fs/samba/samba-4.5.15-r1.ebuild (renamed from net-fs/samba/samba-4.5.10-r2.ebuild) | 21 |
2 files changed, 14 insertions, 11 deletions
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index f1355c01..6c065666 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,2 +1,2 @@ -DIST samba-4.5.10.tar.gz 20989431 SHA256 7cb753f5f6d5527ef40d4c1f47dacafb7c876cb304b4906ccb390c6a18477714 SHA512 046bae9c66083a4fe656d6a7b02b64343c66e0ea4925193a898dbda107b5b158d1897f16c36f4c393a30457a49215fa6ef91720367f4946760ec48ce02a4a68a WHIRLPOOL 2359a40337c2a85c17e3c860a8531c21ec5cf3c180dfd5a1e554f2eb5e10576a8b706464d490e008af441d9ce6a14043112d621d8e140461806c97947362933a -DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 SHA256 fa0d776e04e3222c0dc4761e376717f4154937cdcb85f4117b8978dfb770a78e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927 WHIRLPOOL 6d55710895435ad012e23f8c252e5276966241014710349ca7fa9cf037e8742030b8e053f7cb71309a0a45f48d2235d55393243bf4d19476a22dd39bb1b7748d +DIST samba-4.5.11-disable-python-patches.tar.xz 6292 SHA256 8db451910c3d46fc715203e0b674c49846528cf864c381520dc93de20a3637d3 SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d WHIRLPOOL 641d429fc4865e12e89bad28110b03ca87c6b658f59943f4d44c0b3a91fc49b5dc90e496a8a9d391c2897aec87fc43ea1c9a26084f3394b1883ad9755fd0eca3 +DIST samba-4.5.15.tar.gz 21020181 SHA256 811bf727892a1e1e3d170eb72eb39c43d06ed8ff557e5e036a41aabc19008e94 SHA512 e77d746767d55ff933cddbb4d6e0f97f0b12e630c564852bee02f5f9764633167f1c098df7606af2a1930a9bdd4665fb79d7748ff07532db4e9a581fb639450c WHIRLPOOL dfd0244976da688115d4cd93bf98d77ddd52f98917e6fce57c5f4486ab387d19811b5332ad9f9126e077fb91fefd7670d5b56c251580966ee12b005bde31f271 diff --git a/net-fs/samba/samba-4.5.10-r2.ebuild b/net-fs/samba/samba-4.5.15-r1.ebuild index 10f58050..26f83294 100644 --- a/net-fs/samba/samba-4.5.10-r2.ebuild +++ b/net-fs/samba/samba-4.5.15-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,12 +14,12 @@ SRC_PATH="stable" [[ ${PV} = *_rc* ]] && SRC_PATH="rc" SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz - https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.5.0_rc1.tar.xz" + https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz" [[ ${PV} = *_rc* ]] || \ -KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" DESCRIPTION="Samba Suite Version 4" -HOMEPAGE="https://www.samba.org/" +HOMEPAGE="http://www.samba.org/" LICENSE="GPL-3" SLOT="0" @@ -49,6 +49,7 @@ CDEPEND="${PYTHON_DEPS} dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}] + <sys-libs/ldb-1.1.30[ldap(+)?,python(+),${MULTILIB_USEDEP}] sys-libs/libcap sys-libs/ncurses:0=[${MULTILIB_USEDEP}] sys-libs/readline:0= @@ -106,6 +107,7 @@ PATCHES=( "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320 ) +#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" CONFDIR="${FILESDIR}/4.4" WAF_BINARY="${S}/buildtools/bin/waf" @@ -139,7 +141,7 @@ src_prepare() { } multilib_src_configure() { - # when specifying libs for samba build you must append NONE to the end to + # when specifying libs for samba build you must append NONE to the end to # stop it automatically including things local bundled_libs="NONE" if ! use system-heimdal && ! use system-mitkrb5 ; then @@ -160,6 +162,7 @@ multilib_src_configure() { --disable-rpath-install --nopyc --nopyo + --disable-cephfs ) if multilib_is_native_abi ; then myconf+=( @@ -234,7 +237,7 @@ multilib_src_install() { # create symlink for cups (bug #552310) if use cups ; then - dosym /usr/bin/smbspool /usr/libexec/cups/backend/smb + dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb fi # install example config file @@ -276,7 +279,7 @@ pkg_postinst() { ewarn "controller work previously known as 'samba4'." elog "For further information and migration steps make sure to read " - elog "https://www.samba.org/samba/history/${P}.html " - elog "https://www.samba.org/samba/history/${PN}-4.5.0.html and" - elog "https://wiki.samba.org/index.php/Samba4/HOWTO " + elog "http://samba.org/samba/history/${P}.html " + elog "http://samba.org/samba/history/${PN}-4.5.0.html and" + elog "http://wiki.samba.org/index.php/Samba4/HOWTO " } |