From: Michał Górny Date: Thu, 20 Nov 2014 19:40:51 +0000 (+0000) Subject: Enable multilib support, bug #409701. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4f0105f60fc50cb1fdb6529fb5c1071832fa3375;p=gentoo.git Enable multilib support, bug #409701. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- diff --git a/sys-auth/sssd/ChangeLog b/sys-auth/sssd/ChangeLog index a1917cbc34ec..59e89c93d8cb 100644 --- a/sys-auth/sssd/ChangeLog +++ b/sys-auth/sssd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-auth/sssd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.61 2014/11/15 13:35:38 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.62 2014/11/20 19:40:49 mgorny Exp $ + +*sssd-1.12.2-r1 (20 Nov 2014) + + 20 Nov 2014; Michał Górny +sssd-1.12.2-r1.ebuild: + Enable multilib support, bug #409701. *sssd-1.12.2 (15 Nov 2014) diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest index 2709a9dc8275..7fb465cbbf3a 100644 --- a/sys-auth/sssd/Manifest +++ b/sys-auth/sssd/Manifest @@ -13,26 +13,27 @@ DIST sssd-1.12.1.tar.gz 4088341 SHA256 18b2d7e93e77435708feaf3ff65656f89e5a531ae DIST sssd-1.12.2.tar.gz 4149084 SHA256 55a06a191b2e2506b23f80cf3d15f58b8d94d1f5a1bc5dc77ccf010c0eaafa5d SHA512 2565020834c5a9d5bc2e26ae19697b86f8e34275f0b8186e06c19b81f063a4ff4c9f5e18c2601687a100af0d355a87bfebfad9f7584c4307e3d37e6b57b358e6 WHIRLPOOL 393ea56a041258e0ed410c57f815753c180f80712316404b5895b97547666c45b0177582b09c1a7a46199b36ee68c335700ee9fc0348788d1b31c703f7141250 DIST sssd-1.9.6.tar.gz 3180066 SHA256 ca96e8d98eb4113396b13d9601dbdd20f4b2f2613d0f29a0157ffd05e3748601 SHA512 32d6056db1a17fe348f0b932d4242ce3b3dc615d4d93ebf580f5f9a3e16985324d9955e092803cf9a2bf35724feab0450737f516e9ce003f6812a0debf54ba15 WHIRLPOOL e496d63a042b39dd5d269a7d24b9a535c73a47741a4429e78e2a9d1282515747a83251338d6c94d75b2de06a415bfed18f7223864b1b4e9a824a25d41afa6a59 EBUILD sssd-1.12.1.ebuild 3502 SHA256 8b8023b21193017ad17aa17963504e1685d04116d1a78a0bd2fed705be4a2171 SHA512 8e8f8023173357be44f561b0b8eb6a207ca3c740151689c12fd1bb0dc0226d9a3c5a707ffa29d7c7c30a9b52153e9b49667fd295e5736f9a02d6a75dbc2d41c3 WHIRLPOOL 027620d38a894acf4df45387a78c922f353d7d95c50e6e7237d23ba8f452d5f75250060c3d648f7d2463c72ded6703ade5aa150d9cf08df1468ba996e837033d +EBUILD sssd-1.12.2-r1.ebuild 5299 SHA256 bb54b691f03c17eb5da278faf00a2869d127e7ef7f66c4f1828a03bdd00d2317 SHA512 fc1e90834051390e8302c622e7ca0fba0b398b55f62de122e78f45b343b949897c163f07cc200b3787cf77972bf0e764dbdc40b6191e6a449d318ccf59f26e25 WHIRLPOOL 48a49f44b560ae5af0219ef4b0a5381647574d439b2397db2d4fa807d94ce99d8925cadbd756efc110e2b114640b865019e68b3d8c9c5ca217dff0647561f5d2 EBUILD sssd-1.12.2.ebuild 3507 SHA256 480f3f916f288a45852d79a77daf242dd6e36e09b9784e718109e6773839108f SHA512 2bb4d4365703b44eb8fe58af090b0f4cf6d81956a3b78d2b8fce6a748f995224c83c2defe4ce069a0d9f39aa0b49b49e71982358f92b6479602b35072dae719b WHIRLPOOL 8e4a407043399c5bb7e3a6a9eb110f3edb3d893aeaa757272238404e6e60c76f1f1f19903036e7bd6887e9b519022c198a1c82bc6c569bb4af4e2f0da1a4d629 EBUILD sssd-1.9.6-r3.ebuild 3207 SHA256 a2bbbc9a67c9eadf4b45913bc4db4053f83541c56b1d7417bc307e10d1a1b0f9 SHA512 8fb1ed04a79e193c4636f7b97f6af3964613cceb8d5633c86c6f0f44702010356e5f80eec5b6c45b58a9abd247679c0e4bb5b8678bc0e25dacbeb4edbfb4359e WHIRLPOOL 2d17351343addd00b11956bf1d316501a2ade0953649608c4a29b3a1c24c7a1358412fcc1df99819e25e2366eac18a0d8c9ac0c81398e21861b14a644bb9402e -MISC ChangeLog 10203 SHA256 73d667a3632232e85f364f63113f3658ac7defc532769d5b1b1425cfee2254a7 SHA512 50c44a8ff24c4bc128e97e648a5b94e916e7744f64265311b1cd5adf99a5f0ded315b4b2e8a3456b60c00f4928831a2f2e7b8c9d9c7b3c016a59089fe03e6005 WHIRLPOOL b92237e2a2db8bf921e0c5dc8a1a1b885445406f386cbdacb697243917e3b6af8dac429bcf54dcbbb466a9dac8b999cf0cdc70d998a584d2da9d9f0d6fb1510a +MISC ChangeLog 10347 SHA256 c39239d26ebf9a1b0811b1614f6fc889270704e8e7757cabe864293e750617cb SHA512 36c3ed8cf0ec83ecea5e334182faedfd344f2ee0a418c90365fa9b7359ec9ce608f3af6d7919ad0192d6c0949db2e2db0a5415dc453a5e12d87210d3ff58b1ab WHIRLPOOL 302848814893d0e67cb1b7a7b4b36e4f8ff057efa0208904ad9600210ebba41a515f6b384d0b9f5ab7288255687d9d4fc93eff6de94d37ea093649c45116aba6 MISC metadata.xml 1023 SHA256 d056fd8216ec84da30390ed4f3961cb97969d2159cca695dd3fd2f939e808b4c SHA512 9296ab06d55fe4e81fd2dd81ca79220268496bdb686d7e49e3fe2eae0e253d91964c6101f09653de688b1fb1074a0dde78e999b5774a9d27e02fdb1cf9cd9f4c WHIRLPOOL df942efd13b9e8002fdf9be5b6d981832b014ea48814ed663725dc790f8e0f7b3a60c329d8f720b569eef563d5b219331f35dba3c18ec992676ed5ee2d1537b0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJUZ1arXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw -OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88pJ4P/j5uZJHI3WT3FH0rHNXS9y1U -7MzHSWOXg5iYGSQTE2RWBmT0q5sojowtbRdvujUJTeJj/43oiEpqeesKRnzp7y9S -/Hh4OPjVt/Tz0c0UEBxNVN+YkS55TzLVNORi3tpqzLqCbfVPrWfRjAMrzYrMvfjp -IT9z7SPdjXQudju2k2BBdFfARCJp/hslx0t8RUQI1CTM6c7Vvo/Vwm0jbisXI7wC -xRQVwjfpZU4YM/hWpFgHdLFYyZAlVC8u5xkgCdpu/tZR8CDDNjgceZuN8OFVfTLv -8WPjqXhUqXW8AYOJXc4sXPLo7i8N7htBHBrVETXvOSSX+3O7nrGuTmNRQktASkt7 -Wuxpt0rL2PxiD9zoIeTfFiq9j5vQm9YhyZ0L0rjWjsPLmdcZuYE+UwMtvhJX/OWE -fBVtGjXpjznKzYZhePPlRUnMwTiaGjVSmzE8yfiSOagnTj2o6QpT2b0VT1DVSv2u -J3nkRNstuIFdeBed4q3ffvlFtNeU3TtYNgKCK474RYA1ejJEvHVN3ktEG3RD1IRZ -DqTpuFB45NM0i16wRl4b38UshC0lMYCKLnHmyhw4OhK5WU5h0sg+EnmKNZ8yGc6W -/BsX+wjHw3UnRpf5Oi+0zCXVRUWmFn0T6g7hsKzl3MyU/xfM/aeDn3y8Kv5oYXIF -nanEIHCENrOOGssgCeAn -=0A5W +iQJ8BAEBCABmBQJUbkPDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOCpAQAKMAmwHitazvJCTfopvfSRoa +TmtWGuDlXbVlfVpKWoADyB8bm30r5xQ9n2Gl1cJUBwoHia9m9Gt42V/69yOTMjY1 +fQk8HfY2EiFzqACqspazasF1sQsAc6G6VI54oyDyaayFEUN5sm3ZpE+rkNBjDg7x +alsLO/RTPNVFVaSuZcwkFdkKEUksFz+XJurVWt0U/nVkcapbUr8Gt4Mh5uahC1Bk +rZVMILmMNLysceT6NKyLApJi8Qry9gXp8xIITs7JGhm2ogRP5IWVQFYXqBKQfMGr +grGNtSq2gak1YQcgo6jSR2BUsmmNrwbculQN5bUTeuxLdQ9kLPCBYSa8rjl4B6FD +It+DiTa61dWv/9v4+Y8+0ZX7AP9E+kEKZO5GyKXS96f63VYt7BqHGl6JH73hW1WF +9MUL9ug0naAoOpnhf5LbnvmxisL2rCEkqvheHiCnMDvlHXa8ntrxZpSTex1amB3J +msGmAYMh8CQlSKDQ2vPNLxBVfqUiFU22HKAvNVyRpJFF0+Eos0d+sgS6FQNkZhw7 +GVaSm2OZtoxDsRhW5Y3STzyzftimaIqDTikL1kZsnu6jV4aLUC8UD/GYfvLJKwA5 +0Dv1teRfCvTzMnmjum0t5bSQYv70EOTX8z3xgqn6ZUzhlvW1ae9k4BoL1TPnQy+H +mE+AxUAYu9WEyxuaeYhL +=2feT -----END PGP SIGNATURE----- diff --git a/sys-auth/sssd/sssd-1.12.2-r1.ebuild b/sys-auth/sssd/sssd-1.12.2-r1.ebuild new file mode 100644 index 000000000000..04a8d1c34e7e --- /dev/null +++ b/sys-auth/sssd/sssd-1.12.2-r1.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.12.2-r1.ebuild,v 1.1 2014/11/20 19:40:49 mgorny Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit python-single-r1 multilib pam linux-info autotools multilib-minimal systemd toolchain-funcs + +DESCRIPTION="System Security Services Daemon provides access to identity and authentication" +HOMEPAGE="http://fedorahosted.org/sssd/" +SRC_URI="http://fedorahosted.org/released/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="acl augeas autofs +locator netlink nfsv4 nls +manpages python selinux sudo ssh test" + +COMMON_DEP=" + >=virtual/pam-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/popt-1.16 + dev-libs/glib:2 + >=dev-libs/ding-libs-0.2 + >=sys-libs/talloc-2.0.7 + >=sys-libs/tdb-1.2.9 + >=sys-libs/tevent-0.9.16 + >=sys-libs/ldb-1.1.17-r1:= + >=net-nds/openldap-2.4.30[sasl] + >=dev-libs/libpcre-8.30 + >=app-crypt/mit-krb5-1.10.3 + locator? ( + >=app-crypt/mit-krb5-1.12.2[${MULTILIB_USEDEP}] + >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] + ) + >=sys-apps/keyutils-1.5 + >=net-dns/c-ares-1.7.4 + >=dev-libs/nss-3.12.9 + selinux? ( + >=sys-libs/libselinux-2.1.9 + >=sys-libs/libsemanage-2.1 + ) + >=net-dns/bind-tools-9.9[gssapi] + >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] + >=sys-apps/dbus-1.6 + acl? ( net-fs/cifs-utils[acl] ) + augeas? ( app-admin/augeas ) + nfsv4? ( net-libs/libnfsidmap ) + nls? ( >=sys-devel/gettext-0.18 ) + virtual/libintl + netlink? ( dev-libs/libnl:3 ) + " + +RDEPEND="${COMMON_DEP} + >=sys-libs/glibc-2.17[nscd] + selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 ) + " +DEPEND="${COMMON_DEP} + test? ( dev-libs/check ) + manpages? ( + >=dev-libs/libxslt-1.1.26 + app-text/docbook-xml-dtd:4.4 + )" + +CONFIG_CHECK="~KEYS" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/ipa_hbac.h + /usr/include/sss_idmap.h + /usr/include/sss_nss_idmap.h + /usr/include/wbclient_sssd.h + # --with-ifp + /usr/include/sss_sifp.h + /usr/include/sss_sifp_dbus.h +) + +pkg_setup(){ + use python && python-single-r1_pkg_setup + linux-info_pkg_setup +} + +src_prepare() { + eautoreconf + + multilib_copy_sources +} + +src_configure() { + local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1) + + multilib-minimal_src_configure +} + +multilib_src_configure() { + # no samba4 per 447022 + # set initscript to sysv because the systemd option needs systemd to + # be installed. We provide our own systemd file anyway. + local myconf=( + --localstatedir="${EPREFIX}"/var + --enable-nsslibdir="${EPREFIX}"/$(get_libdir) + --with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd + --enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir) + --with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb + --without-nscd + --with-unicode-lib="glib2" + --disable-rpath + --enable-silent-rules + --sbindir=/usr/sbin + --without-samba + $(multilib_native_use_enable acl cifs-idmap-plugin) + $(multilib_native_use_enable augeas config-lib) + $(multilib_native_use_with selinux) + $(multilib_native_use_with selinux semanage) + $(multilib_native_use_with python python-bindings) + $(use_enable locator krb5-locator-plugin) + $(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin) + $(use_enable nls ) + $(multilib_native_use_with netlink libnl) + $(multilib_native_use_with manpages) + $(multilib_native_use_with sudo) + $(multilib_native_use_with autofs) + $(multilib_native_use_with ssh) + --with-crypto="libcrypto" + --with-initscript="sysv" + + KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config + ) + + if ! multilib_is_native_abi; then + # work-around all the libraries that are used for CLI and server + myconf+=( + {POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' ' + # ldb headers are fine since native needs it + # ldb lib fails... but it does not seem to bother + {DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1}}_{CFLAGS,LIBS}=' ' + {PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO}_{CFLAGS,LIBS}=' ' + + # use native include path for dbus (needed for build) + DBUS_CFLAGS="${native_dbus_cflags}" + + # non-pkgconfig checks + ac_cv_lib_ldap_ldap_search=yes + ) + + use locator || myconf+=( + KRB5_CONFIG=/bin/true + ) + fi + + econf "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + emake libnss_sss.la pam_sss.la + use locator && emake sssd_krb5_locator_plugin.la + fi +} + +multilib_src_install() { + if multilib_is_native_abi; then + emake DESTDIR="${D}" "${_at_args[@]}" install + else + # easier than playing with automake... + dopammod .libs/pam_sss.so + + into / + dolib .libs/libnss_sss.so* + + if use locator; then + exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5 + doexe .libs/sssd_krb5_locator_plugin.so + fi + fi +} + +multilib_src_install_all() { + einstalldocs + prune_libtool_files --all + use python && python_optimize + + insinto /etc/sssd + insopts -m600 + doins "${S}"/src/examples/sssd-example.conf + + insinto /etc/logrotate.d + insopts -m644 + newins "${S}"/src/examples/logrotate sssd + + newconfd "${FILESDIR}"/sssd.conf sssd + + systemd_dounit "${FILESDIR}/${PN}.service" +} + +multilib_src_test() { + default +} + +pkg_postinst(){ + elog "You must set up sssd.conf (default installed into /etc/sssd)" + elog "and (optionally) configuration in /etc/pam.d in order to use SSSD" + elog "features. Please see howto in http://fedorahosted.org/sssd/wiki/HOWTO_Configure_1_0_2" +}