ebuild diff between samba-4.2.14 and samba-4.5.10

ebuild-diff-samba-4.2.14-samba-4.5.10.txt (text/plain), 6.88 KB, created by Jeff on 2017-06-18 00:35:52 UTC

S2 ~ # diff /usr/portage/net-fs/samba/samba-4.2.14.ebuild /usr/portage/net-fs/samba/samba-4.5.10.ebuild 
4c4
< EAPI=5
---
> EAPI=6
17c17
<       https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.2.12.tar.xz"
---
>       https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.5.0_rc1.tar.xz"
19c19
< KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86"
---
> KEYWORDS="alpha amd64 ~arm ppc64 x86"
27,28c27,28
< IUSE="acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint
< ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
---
> IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam
> quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
44a45
>       dev-libs/libaio[${MULTILIB_USEDEP}]
48,49d48
<       sys-libs/readline:=
<       virtual/libiconv
51d49
<       >=net-libs/socket_wrapper-1.1.2[${MULTILIB_USEDEP}]
52a51
>       >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}]
54d52
<       >=sys-libs/ldb-1.1.24[ldap(+)?,${MULTILIB_USEDEP}]
56,61c54,57
<       >=sys-libs/nss_wrapper-1.0.2[${MULTILIB_USEDEP}]
<       >=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
<       >=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
<       >=sys-libs/tdb-1.3.6[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
<       >=sys-libs/tevent-0.9.28[${MULTILIB_USEDEP}]
<       >=sys-libs/uid_wrapper-1.0.1[${MULTILIB_USEDEP}]
---
>       sys-libs/readline:0=
>       >=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
>       >=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
>       >=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
62a59,60
>       virtual/libiconv
>       pam? ( virtual/pam )
65d62
<       aio? ( dev-libs/libaio )
70,71c67,71
<       gnutls? ( dev-libs/libgcrypt:0
<               >=net-libs/gnutls-1.4.0 )
---
>       gnutls? (
>               dev-libs/libgcrypt:0
>               >=net-libs/gnutls-1.4.0
>       )
>       gpg? ( app-crypt/gpgme )
73c73
<       pam? ( virtual/pam )
---
>       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
75d74
<       !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
78c77,85
<       virtual/pkgconfig"
---
>       virtual/pkgconfig
>       test? (
>               !system-mitkrb5? (
>                       >=sys-libs/nss_wrapper-1.1.3
>                       >=net-dns/resolv_wrapper-1.1.4
>                       >=net-libs/socket_wrapper-1.1.7
>                       >=sys-libs/uid_wrapper-1.2.1
>               )
>       )"
86a94,95
>       gpg? ( addc )
>       ?? ( system-heimdal system-mitkrb5 )
92,93c101,102
<       "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
<       "${FILESDIR}/${PN}-4.2.7-pam.patch"
---
>       "${FILESDIR}/${PN}-4.4.0-pam.patch"
>       "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
96c105,106
< CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
---
> #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
> CONFDIR="${FILESDIR}/4.4"
104,115d113
<       if use aio ; then
<               if ! linux_config_exists || ! linux_chkconfig_present AIO; then
<                       ewarn "You must enable AIO support in your kernel config, "
<                       ewarn "to be able to support asynchronous I/O. "
<                       ewarn "You can find it at"
<                       ewarn
<                       ewarn "General Support"
<                       ewarn " Enable AIO support "
<                       ewarn
<                       ewarn "and recompile your kernel..."
<               fi
<       fi
117c115,117
<               SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad"
---
>               SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
>       elif use ads ; then
>               SHAREDMODS="idmap_ad"
122c122
<       epatch "${PATCHES[@]}"
---
>       default
125,127c125,132
<       EPATCH_SUFFIX="patch" \
<       EPATCH_FORCE="yes" \
<       epatch "${WORKDIR}/patches"
---
>       eapply "${WORKDIR}/patches"
> 
>       # ugly hackaround for bug #592502
>       cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
> 
>       sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
>               -i source4/dsdb/samdb/ldb_modules/password_hash.c \
>               || die
129,130c134
<       # Allow user patches
<       epatch_user
---
>       # Friggin' WAF shit
134a139,145
>       # 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
>               bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
>       fi
> 
138,142c149,153
<               --sysconfdir=/etc
<               --localstatedir=/var
<               --with-modulesdir=/usr/$(get_libdir)/samba
<               --with-piddir=/run/${PN}
<               --bundled-libraries=NONE
---
>               --sysconfdir="${EPREFIX}/etc"
>               --localstatedir="${EPREFIX}/var"
>               --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
>               --with-piddir="${EPREFIX}/run/${PN}"
>               --bundled-libraries="${bundled_libs}"
155,157d165
<                       $(usex ads '--with-shared-modules=idmap_ad' '')
<                       $(use_with aio aio-support)
<                       $(use_enable avahi)
162a171
>                       $(use_with gpg gpgme)
166,167c175
<                       $(use_with pam pam_smbpass)
<                       $(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '')
---
>                       $(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
173a182
>                       $(use_enable zeroconf avahi)
182d190
<                       --without-aio-support
188a197
>                       --without-gpgme
192d200
<                       --without-pam_smbpass
202c210
<       CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
---
>       CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
227a236,244
>               # Fix paths in example file (#603964)
>               sed \
>                       -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
>                       -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
>                       -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
>                       -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
>                       -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
>                       -i "${ED%/}"/etc/samba/smb.conf.default || die
> 
255c272
<       elog "http://samba.org/samba/history/${PN}-4.2.0.html and"
---
>       elog "http://samba.org/samba/history/${PN}-4.5.0.html and"