Attachment #205158 for bug #238571

Lines 21-26 LDFLAGS+= -L${OPENSSLLIB} Link Here

(-)b/net/hostapd/Makefile (+3 lines)
21		21
22	PLIST_FILES= sbin/hostapd sbin/hostapd_cli man/man1/hostapd_cli.1.gz \	22	PLIST_FILES= sbin/hostapd sbin/hostapd_cli man/man1/hostapd_cli.1.gz \
23	man/man8/hostapd.8.gz	23	man/man8/hostapd.8.gz
		24	.if !exists(/etc/rc.d/hostapd)
		25	USE_RC_SUBR= hostapd
		26	.endif
24		27
25	post-patch:	28	post-patch:
26	@${REINPLACE_CMD} -e 's\|@$$(E) " CC " $$<\|@$$(E) " $$(CC) " $$<\|' \	29	@${REINPLACE_CMD} -e 's\|@$$(E) " CC " $$<\|@$$(E) " $$(CC) " $$<\|' \




#!/bin/sh
#
# $FreeBSD$
#

# PROVIDE: hostapd
# REQUIRE: mountcritremote
# KEYWORD: nojail shutdown

. /etc/rc.subr

name="hostapd"
desc="Authenticator for IEEE 802.11 networks"
#
# This portion of this rc.script is different from base.
case ${command} in
/usr/sbin/hostapd)	# Assume user does not want base hostapd because
			# user specified WITHOUT_WIRELESS in make.conf
			# and /etc/defaults/rc.conf contains this value.
			unset command;;
esac
command=${hostapd_program:-%%PREFIX%%/sbin/hostapd}
# End of differences from base. The rest of the file should remain the same.

ifn="$2"
if [ -z "$ifn" ]; then
	rcvar="hostapd_enable"
	conf_file="/etc/${name}.conf"
	pidfile="/var/run/${name}.pid"
else
	rcvar=
	conf_file="/etc/${name}-${ifn}.conf"
	pidfile="/var/run/${name}-${ifn}.pid"
fi

command_args="-P ${pidfile} -B ${conf_file}"
required_files="${conf_file}"
required_modules="wlan_xauth wlan_wep wlan_tkip wlan_ccmp"
extra_commands="reload"

load_rc_config ${name}
run_rc_command "$1"

Lines 26-31 PORTDOCS= README ChangeLog Link Here

(-)b/security/wpa_supplicant/Makefile (+4 lines)
26		26
27	CFG= ${BUILD_WRKSRC}/.config	27	CFG= ${BUILD_WRKSRC}/.config
28		28
		29	.if !exists(/etc/rc.d/wpa_supplicant)
		30	USE_RC_SUBR= wpa_supplicant
		31	.endif
		32
29	OPTIONS_MULTI= DRV EAP	33	OPTIONS_MULTI= DRV EAP
30	OPTIONS_MULTI_DRV= BSD WIRED NDIS TEST NONE #ROBOSWITCH	34	OPTIONS_MULTI_DRV= BSD WIRED NDIS TEST NONE #ROBOSWITCH
31	OPTIONS_MULTI_EAP= TLS PEAP TTLS MD5 MSCHAPV2 GTC LEAP OTP PSK FAST \	35	OPTIONS_MULTI_EAP= TLS PEAP TTLS MD5 MSCHAPV2 GTC LEAP OTP PSK FAST \




#!/bin/sh
#
# $FreeBSD$
#

# PROVIDE: wpa_supplicant
# REQUIRE: mountcritremote
# KEYWORD: nojail nostart

. /etc/rc.subr
. /etc/network.subr

name="wpa_supplicant"
desc="WPA/802.11i Supplicant for wireless network devices"
rcvar=

ifn="$2"
if [ -z "$ifn" ]; then
	return 1
fi

is_ndis_interface()
{
	case `sysctl -n net.wlan.${1#wlan}.%parent 2>/dev/null` in
		ndis*) true ;;
		*) false ;;
	esac
}

if is_wired_interface ${ifn} ; then
	driver="wired"
elif is_ndis_interface ${ifn} ; then
	driver="ndis"
else
	driver="bsd"
fi

load_rc_config $name

#
# This portion of this rc.script is different from base.
case ${command} in
/usr/sbin/wpa_supplicant)      # Assume user does not want base hostapd because
                        # user specified WITHOUT_WIRELESS in make.conf
                        # and /etc/defaults/rc.conf contains this value.
                        unset command;;
esac
command=${wpa_supplicant_program:-%%PREFIX%%/sbin/wpa_supplicant}
# End of differences from base. The rest of the file should remain the same.

conf_file=${wpa_supplicant_conf_file}
pidfile="/var/run/${name}/${ifn}.pid"
command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile"
required_files=$conf_file
required_modules="wlan_wep wlan_tkip wlan_ccmp"

run_rc_command "$1"

Return to bug 238571

Added Link Here

(-)b/net/hostapd/files/hostapd.in (+42 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD$
4	#
5
6	# PROVIDE: hostapd
7	# REQUIRE: mountcritremote
8	# KEYWORD: nojail shutdown
9
10	. /etc/rc.subr
11
12	name="hostapd"
13	desc="Authenticator for IEEE 802.11 networks"
14	#
15	# This portion of this rc.script is different from base.
16	case ${command} in
17	/usr/sbin/hostapd) # Assume user does not want base hostapd because
18	# user specified WITHOUT_WIRELESS in make.conf
19	# and /etc/defaults/rc.conf contains this value.
20	unset command;;
21	esac
22	command=${hostapd_program:-%%PREFIX%%/sbin/hostapd}
23	# End of differences from base. The rest of the file should remain the same.
24
25	ifn="$2"
26	if [ -z "$ifn" ]; then
27	rcvar="hostapd_enable"
28	conf_file="/etc/${name}.conf"
29	pidfile="/var/run/${name}.pid"
30	else
31	rcvar=
32	conf_file="/etc/${name}-${ifn}.conf"
33	pidfile="/var/run/${name}-${ifn}.pid"
34	fi
35
36	command_args="-P ${pidfile} -B ${conf_file}"
37	required_files="${conf_file}"
38	required_modules="wlan_xauth wlan_wep wlan_tkip wlan_ccmp"
39	extra_commands="reload"
40
41	load_rc_config ${name}
42	run_rc_command "$1"

Added Link Here

(-)b/security/wpa_supplicant/files/wpa_supplicant.in (+57 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD$
4	#
5
6	# PROVIDE: wpa_supplicant
7	# REQUIRE: mountcritremote
8	# KEYWORD: nojail nostart
9
10	. /etc/rc.subr
11	. /etc/network.subr
12
13	name="wpa_supplicant"
14	desc="WPA/802.11i Supplicant for wireless network devices"
15	rcvar=
16
17	ifn="$2"
18	if [ -z "$ifn" ]; then
19	return 1
20	fi
21
22	is_ndis_interface()
23	{
24	case `sysctl -n net.wlan.${1#wlan}.%parent 2>/dev/null` in
25	ndis*) true ;;
26	*) false ;;
27	esac
28	}
29
30	if is_wired_interface ${ifn} ; then
31	driver="wired"
32	elif is_ndis_interface ${ifn} ; then
33	driver="ndis"
34	else
35	driver="bsd"
36	fi
37
38	load_rc_config $name
39
40	#
41	# This portion of this rc.script is different from base.
42	case ${command} in
43	/usr/sbin/wpa_supplicant) # Assume user does not want base hostapd because
44	# user specified WITHOUT_WIRELESS in make.conf
45	# and /etc/defaults/rc.conf contains this value.
46	unset command;;
47	esac
48	command=${wpa_supplicant_program:-%%PREFIX%%/sbin/wpa_supplicant}
49	# End of differences from base. The rest of the file should remain the same.
50
51	conf_file=${wpa_supplicant_conf_file}
52	pidfile="/var/run/${name}/${ifn}.pid"
53	command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile"
54	required_files=$conf_file
55	required_modules="wlan_wep wlan_tkip wlan_ccmp"
56
57	run_rc_command "$1"