Attachment #554962 for bug #671004

View | Details | Raw Unified | Return to bug 671004
Collapse All | Expand All




	${EROOT%/}/usr/share/doc/${PF}/
"

S="${WORKDIR}/${P}/${PN}"

Kconfig_style_config() {
		#param 1 is CONFIG_* item
		#param 2 is what to set it = to, defaulting in y

}

src_prepare() {
	default

	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
	sed -i \
		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
		src/l2_packet/l2_packet_freebsd.c || die

	# People seem to take the example configuration file too literally (bug #102361)
	sed -i \
		-e "s:^\(opensc_engine_path\):#\1:" \
		-e "s:^\(pkcs11_engine_path\):#\1:" \
		-e "s:^\(pkcs11_module_path\):#\1:" \
		"${PN}/wpa_supplicant.conf" || die

	# Change configuration to match Gentoo locations (bug #143750)
	sed -i \
		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
		"${PN}/wpa_supplicant.conf" || die

	# systemd entries to D-Bus service files (bug #372877)
	echo 'SystemdService=wpa_supplicant.service' \
		| tee -a "${PN}"/dbus/*.service >/dev/null || die

	cd "${WORKDIR}/${P}" || die

	if use wimax; then
		# generate-libeap-peer.patch comes before


	# bug (640492)
	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die

	default
}

src_configure() {
	cd "${PN}" || die

	# Toolchain setup
	tc-export CC


	fi

	if use qt5 ; then
		pushd "${S}/${PN}"/wpa_gui-qt4 > /dev/null || die
		eqmake5 wpa_gui.pro
		popd > /dev/null || die
	fi
}

src_compile() {
	cd "${PN}" || die
	einfo "Building wpa_supplicant"
	emake V=1 BINDIR=/usr/sbin



	if use qt5; then
		einfo "Building wpa_gui"
		emake -C "${S}/${PN}"/wpa_gui-qt4
	fi

	if use eapol_test ; then

}

src_install() {
	cd "${PN}" || die
	dosbin wpa_supplicant
	use privsep && dosbin wpa_priv
	dobin wpa_cli wpa_passphrase

	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install

	if use dbus ; then
		pushd "${S}/${PN}"/dbus > /dev/null || die
		insinto /etc/dbus-1/system.d
		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
		insinto /usr/share/dbus-1/system-services

Return to bug 671004

Lines 59-66 Link Here

(-)/usr/portage/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r8.ebuild (-13 / +13 lines)
59	${EROOT%/}/usr/share/doc/${PF}/	59	${EROOT%/}/usr/share/doc/${PF}/
60	"	60	"
61		61
62	S="${WORKDIR}/${P}/${PN}"
63
64	Kconfig_style_config() {	62	Kconfig_style_config() {
65	#param 1 is CONFIG_* item	63	#param 1 is CONFIG_* item
66	#param 2 is what to set it = to, defaulting in y	64	#param 2 is what to set it = to, defaulting in y
Lines 92-122 Link Here
92	}	90	}
93		91
94	src_prepare() {	92	src_prepare() {
95	default
96
97	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD	93	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
98	sed -i \	94	sed -i \
99	-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \	95	-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
100	../src/l2_packet/l2_packet_freebsd.c \|\| die	96	src/l2_packet/l2_packet_freebsd.c \|\| die
101		97
102	# People seem to take the example configuration file too literally (bug #102361)	98	# People seem to take the example configuration file too literally (bug #102361)
103	sed -i \	99	sed -i \
104	-e "s:^\(opensc_engine_path\):#\1:" \	100	-e "s:^\(opensc_engine_path\):#\1:" \
105	-e "s:^\(pkcs11_engine_path\):#\1:" \	101	-e "s:^\(pkcs11_engine_path\):#\1:" \
106	-e "s:^\(pkcs11_module_path\):#\1:" \	102	-e "s:^\(pkcs11_module_path\):#\1:" \
107	wpa_supplicant.conf \|\| die	103	"${PN}/wpa_supplicant.conf" \|\| die
108		104
109	# Change configuration to match Gentoo locations (bug #143750)	105	# Change configuration to match Gentoo locations (bug #143750)
110	sed -i \	106	sed -i \
111	-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \	107	-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
112	-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \	108	-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
113	wpa_supplicant.conf \|\| die	109	"${PN}/wpa_supplicant.conf" \|\| die
114		110
115	# systemd entries to D-Bus service files (bug #372877)	111	# systemd entries to D-Bus service files (bug #372877)
116	echo 'SystemdService=wpa_supplicant.service' \	112	echo 'SystemdService=wpa_supplicant.service' \
117	\| tee -a dbus/*.service >/dev/null \|\| die	113	\| tee -a "${PN}"/dbus/*.service >/dev/null \|\| die
118
119	cd "${WORKDIR}/${P}" \|\| die
120		114
121	if use wimax; then	115	if use wimax; then
122	# generate-libeap-peer.patch comes before	116	# generate-libeap-peer.patch comes before
Lines 145-153 Link Here
145		139
146	# bug (640492)	140	# bug (640492)
147	sed -i 's#-Werror ##' wpa_supplicant/Makefile \|\| die	141	sed -i 's#-Werror ##' wpa_supplicant/Makefile \|\| die
		142
		143	default
148	}	144	}
149		145
150	src_configure() {	146	src_configure() {
		147	cd "${PN}" \|\| die
		148
151	# Toolchain setup	149	# Toolchain setup
152	tc-export CC	150	tc-export CC
153		151
Lines 338-350 Link Here
338	fi	336	fi
339		337
340	if use qt5 ; then	338	if use qt5 ; then
341	pushd "${S}"/wpa_gui-qt4 > /dev/null \|\| die	339	pushd "${S}/${PN}"/wpa_gui-qt4 > /dev/null \|\| die
342	eqmake5 wpa_gui.pro	340	eqmake5 wpa_gui.pro
343	popd > /dev/null \|\| die	341	popd > /dev/null \|\| die
344	fi	342	fi
345	}	343	}
346		344
347	src_compile() {	345	src_compile() {
		346	cd "${PN}" \|\| die
348	einfo "Building wpa_supplicant"	347	einfo "Building wpa_supplicant"
349	emake V=1 BINDIR=/usr/sbin	348	emake V=1 BINDIR=/usr/sbin
350		349
Lines 355-361 Link Here
355		354
356	if use qt5; then	355	if use qt5; then
357	einfo "Building wpa_gui"	356	einfo "Building wpa_gui"
358	emake -C "${S}"/wpa_gui-qt4	357	emake -C "${S}/${PN}"/wpa_gui-qt4
359	fi	358	fi
360		359
361	if use eapol_test ; then	360	if use eapol_test ; then
Lines 364-369 Link Here
364	}	363	}
365		364
366	src_install() {	365	src_install() {
		366	cd "${PN}" \|\| die
367	dosbin wpa_supplicant	367	dosbin wpa_supplicant
368	use privsep && dosbin wpa_priv	368	use privsep && dosbin wpa_priv
369	dobin wpa_cli wpa_passphrase	369	dobin wpa_cli wpa_passphrase
Lines 404-410 Link Here
404	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install	404	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
405		405
406	if use dbus ; then	406	if use dbus ; then
407	pushd "${S}"/dbus > /dev/null \|\| die	407	pushd "${S}/${PN}"/dbus > /dev/null \|\| die
408	insinto /etc/dbus-1/system.d	408	insinto /etc/dbus-1/system.d
409	newins dbus-wpa_supplicant.conf wpa_supplicant.conf	409	newins dbus-wpa_supplicant.conf wpa_supplicant.conf
410	insinto /usr/share/dbus-1/system-services	410	insinto /usr/share/dbus-1/system-services