Attachment #455074 for bug #594130





SLOT="0"

IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpgme internal-heimdal iprint
ldap pam quota selinux syslog +system-mitkrb5 system-heimdal systemd test winbind zeroconf"

MULTILIB_WRAPPED_HEADERS=(
	/usr/include/samba-4.0/policy.h

	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
	>=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.29[${MULTILIB_USEDEP}]
	sys-libs/zlib[${MULTILIB_USEDEP}]
	pam? ( virtual/pam )
	acl? ( virtual/acl )

		>=net-libs/gnutls-1.4.0 )
	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
	gpgme? ( app-crypt/gpgme )
	systemd? ( sys-apps/systemd:0= )"
DEPEND="${CDEPEND}
	virtual/pkgconfig"

	!dev-perl/Parse-Yapp
"

REQUIRED_USE="
        ^^ ( internal-heimdal system-heimdal system-mitkrb5 )
        addc? ( gnutls internal-heimdal )
	ads? ( acl ldap )
	gpgme? ( addc )
	${PYTHON_REQUIRED_USE}"

S="${WORKDIR}/${MY_P}"

PATCHES=(
	"${FILESDIR}/${PN}-4.4.0-pam.patch"
        "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
)

#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"


WAF_BINARY="${S}/buildtools/bin/waf"

# when specifying libs for samba build you must append NONE to the end to 
# stop it automatically including things
HEIMDAL_LIBS="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"

SHAREDMODS=""

pkg_setup() {


src_prepare() {
	default
	if use system-heimdal ; then
		eapply "${FILESDIR}/${PN}-4.5.1-heimdal_compile_fix.patch"
	fi
	# install the patches from tarball(s)
#	eapply "${WORKDIR}/patches/"

	sed -i -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' source4/dsdb/samdb/ldb_modules/password_hash.c

	# ugly hackaround for bug #592502
	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die

		--localstatedir="${EPREFIX}/var"
		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
		--with-piddir="${EPREFIX}/run/${PN}"
		--bundled-libraries=$(usex internal-heimdal $HEIMDAL_LIBS NONE)
		--builtin-libraries=NONE
		--disable-rpath
		--disable-rpath-install

			$(use_with systemd)
			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
			$(use_with winbind)
			$(use_with gpgme)
			$(usex test '--enable-selftest' '')
			$(use_enable zeroconf avahi)
			--with-shared-modules=${SHAREDMODS}

			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
			--without-winbind
			--disable-python
			--without-gpgme
		)
	fi


Return to bug 594130

Lines 25-32 Link Here

(-)/usr/portage/net-fs/samba/samba-4.5.1.ebuild (-9 / +24 lines)
25		25
26	SLOT="0"	26	SLOT="0"
27		27
28	IUSE="acl addc addns ads client cluster cups dmapi fam gnutls iprint	28	IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpgme internal-heimdal iprint
29	ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind zeroconf"	29	ldap pam quota selinux syslog +system-mitkrb5 system-heimdal systemd test winbind zeroconf"
30		30
31	MULTILIB_WRAPPED_HEADERS=(	31	MULTILIB_WRAPPED_HEADERS=(
32	/usr/include/samba-4.0/policy.h	32	/usr/include/samba-4.0/policy.h
Lines 56-62 Link Here
56	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]	56	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
57	>=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]	57	>=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
58	>=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]	58	>=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
59	>=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]	59	>=sys-libs/tevent-0.9.29[${MULTILIB_USEDEP}]
60	sys-libs/zlib[${MULTILIB_USEDEP}]	60	sys-libs/zlib[${MULTILIB_USEDEP}]
61	pam? ( virtual/pam )	61	pam? ( virtual/pam )
62	acl? ( virtual/acl )	62	acl? ( virtual/acl )
Lines 69-75 Link Here
69	>=net-libs/gnutls-1.4.0 )	69	>=net-libs/gnutls-1.4.0 )
70	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )	70	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
71	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )	71	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
72	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )	72	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
		73	gpgme? ( app-crypt/gpgme )
73	systemd? ( sys-apps/systemd:0= )"	74	systemd? ( sys-apps/systemd:0= )"
74	DEPEND="${CDEPEND}	75	DEPEND="${CDEPEND}
75	virtual/pkgconfig"	76	virtual/pkgconfig"
Lines 79-92 Link Here
79	!dev-perl/Parse-Yapp	80	!dev-perl/Parse-Yapp
80	"	81	"
81		82
82	REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )	83	REQUIRED_USE="
83	ads? ( acl gnutls ldap )	84	^^ ( internal-heimdal system-heimdal system-mitkrb5 )
		85	addc? ( gnutls internal-heimdal )
		86	ads? ( acl ldap )
		87	gpgme? ( addc )
84	${PYTHON_REQUIRED_USE}"	88	${PYTHON_REQUIRED_USE}"
85		89
86	S="${WORKDIR}/${MY_P}"	90	S="${WORKDIR}/${MY_P}"
87		91
88	PATCHES=(	92	PATCHES=(
89	"${FILESDIR}/${PN}-4.4.0-pam.patch"	93	"${FILESDIR}/${PN}-4.4.0-pam.patch"
		94	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
90	)	95	)
91		96
92	#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"	97	#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
Lines 94-99 Link Here
94		99
95	WAF_BINARY="${S}/buildtools/bin/waf"	100	WAF_BINARY="${S}/buildtools/bin/waf"
96		101
		102	# when specifying libs for samba build you must append NONE to the end to
		103	# stop it automatically including things
		104	HEIMDAL_LIBS="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
		105
97	SHAREDMODS=""	106	SHAREDMODS=""
98		107
99	pkg_setup() {	108	pkg_setup() {
Lines 105-113 Link Here
105		114
106	src_prepare() {	115	src_prepare() {
107	default	116	default
108		117	if use system-heimdal ; then
		118	eapply "${FILESDIR}/${PN}-4.5.1-heimdal_compile_fix.patch"
		119	fi
109	# install the patches from tarball(s)	120	# install the patches from tarball(s)
110	eapply "${WORKDIR}/patches/"	121	# eapply "${WORKDIR}/patches/"
		122
		123	sed -i -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' source4/dsdb/samdb/ldb_modules/password_hash.c
111		124
112	# ugly hackaround for bug #592502	125	# ugly hackaround for bug #592502
113	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ \|\| die	126	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ \|\| die
Lines 123-129 Link Here
123	--localstatedir="${EPREFIX}/var"	136	--localstatedir="${EPREFIX}/var"
124	--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"	137	--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
125	--with-piddir="${EPREFIX}/run/${PN}"	138	--with-piddir="${EPREFIX}/run/${PN}"
126	--bundled-libraries=NONE	139	--bundled-libraries=$(usex internal-heimdal $HEIMDAL_LIBS NONE)
127	--builtin-libraries=NONE	140	--builtin-libraries=NONE
128	--disable-rpath	141	--disable-rpath
129	--disable-rpath-install	142	--disable-rpath-install
Lines 151-156 Link Here
151	$(use_with systemd)	164	$(use_with systemd)
152	$(usex system-mitkrb5 '--with-system-mitkrb5' '')	165	$(usex system-mitkrb5 '--with-system-mitkrb5' '')
153	$(use_with winbind)	166	$(use_with winbind)
		167	$(use_with gpgme)
154	$(usex test '--enable-selftest' '')	168	$(usex test '--enable-selftest' '')
155	$(use_enable zeroconf avahi)	169	$(use_enable zeroconf avahi)
156	--with-shared-modules=${SHAREDMODS}	170	--with-shared-modules=${SHAREDMODS}
Lines 176-181 Link Here
176	$(usex system-mitkrb5 '--with-system-mitkrb5' '')	190	$(usex system-mitkrb5 '--with-system-mitkrb5' '')
177	--without-winbind	191	--without-winbind
178	--disable-python	192	--disable-python
		193	--without-gpgme
179	)	194	)
180	fi	195	fi
181		196