Diff hostapd-2.10-r2 with a hostapd-2.10-r3

/usr/portage/net-wireless/hostapd/hostapd-2.10-r3.ebuild 2023-10-09 14:52:34.780368483 +0300
5 5

  
6 6
inherit flag-o-matic systemd savedconfig toolchain-funcs
7 7

  
8
EXTRAS_VER="2.7-r2"
9
EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
10 8
DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
11 9
HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/"
12
SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
13 10
S="${S}/${PN}"
14 11

  
15 12
if [[ ${PV} == 9999 ]]; then
......
82 79
	fi
83 80

  
84 81
	# toolchain setup
85
	echo "CC = $(tc-getCC)" > ${CONFIG} || die
82
	echo "CC = $(tc-getCC)" > "${CONFIG}" || die
86 83

  
87 84
	# EAP authentication methods
88
	echo "CONFIG_EAP=y" >> ${CONFIG} || die
89
	echo "CONFIG_ERP=y" >> ${CONFIG} || die
90
	echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die
85
	echo "CONFIG_EAP=y" >> "${CONFIG}" || die
86
	echo "CONFIG_ERP=y" >> "${CONFIG}" || die
87
	echo "CONFIG_EAP_MD5=y" >> "${CONFIG}" || die
91 88

  
92 89
	if use suiteb; then
93
		echo "CONFIG_SUITEB=y" >> ${CONFIG} || die
94
		echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
90
		echo "CONFIG_SUITEB=y" >> "${CONFIG}" || die
91
		echo "CONFIG_SUITEB192=y" >> "${CONFIG}" || die
95 92
	fi
96 93

  
97 94
	if use internal-tls ; then
98
		echo "CONFIG_TLS=internal" >> ${CONFIG} || die
95
		echo "CONFIG_TLS=internal" >> "${CONFIG}" || die
99 96
	else
100 97
		# SSL authentication methods
101
		echo "CONFIG_DPP=y" >> ${CONFIG} || die
102
		echo "CONFIG_EAP_FAST=y" >> ${CONFIG} || die
103
		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} || die
104
		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} || die
105
		echo "CONFIG_EAP_PWD=y" >> ${CONFIG} || die
106
		echo "CONFIG_EAP_TLS=y" >> ${CONFIG} || die
107
		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} || die
108
		echo "CONFIG_OWE=y" >> ${CONFIG} || die
109
		echo "CONFIG_SAE=y" >> ${CONFIG} || die
110
		echo "CONFIG_TLSV11=y" >> ${CONFIG} || die
111
		echo "CONFIG_TLSV12=y" >> ${CONFIG} || die
98
		echo "CONFIG_DPP=y" >> "${CONFIG}" || die
99
		echo "CONFIG_EAP_FAST=y" >> "${CONFIG}" || die
100
		echo "CONFIG_EAP_MSCHAPV2=y" >> "${CONFIG}" || die
101
		echo "CONFIG_EAP_PEAP=y" >> "${CONFIG}" || die
102
		echo "CONFIG_EAP_PWD=y" >> "${CONFIG}" || die
103
		echo "CONFIG_EAP_TLS=y" >> "${CONFIG}" || die
104
		echo "CONFIG_EAP_TTLS=y" >> "${CONFIG}" || die
105
		echo "CONFIG_OWE=y" >> "${CONFIG}" || die
106
		echo "CONFIG_SAE=y" >> "${CONFIG}" || die
107
		echo "CONFIG_TLSV11=y" >> "${CONFIG}" || die
108
		echo "CONFIG_TLSV12=y" >> "${CONFIG}" || die
112 109
	fi
113 110

  
114 111
	if use wps; then
115 112
		# Enable Wi-Fi Protected Setup
116
		echo "CONFIG_WPS=y" >> ${CONFIG} || die
117
		echo "CONFIG_WPS2=y" >> ${CONFIG} || die
118
		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} || die
119
		echo "CONFIG_WPS_NFC=y" >> ${CONFIG} || die
113
		echo "CONFIG_WPS=y" >> "${CONFIG}" || die
114
		echo "CONFIG_WPS2=y" >> "${CONFIG}" || die
115
		echo "CONFIG_WPS_UPNP=y" >> "${CONFIG}" || die
116
		echo "CONFIG_WPS_NFC=y" >> "${CONFIG}" || die
120 117
		einfo "Enabling Wi-Fi Protected Setup support"
121 118
	fi
122 119

  
123
	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG} || die
124
	echo "CONFIG_EAP_TNC=y" >> ${CONFIG} || die
125
	echo "CONFIG_EAP_GTC=y" >> ${CONFIG} || die
126
	echo "CONFIG_EAP_SIM=y" >> ${CONFIG} || die
127
	echo "CONFIG_EAP_AKA=y" >> ${CONFIG} || die
128
	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG} || die
129
	echo "CONFIG_EAP_EKE=y" >> ${CONFIG} || die
130
	echo "CONFIG_EAP_PAX=y" >> ${CONFIG} || die
131
	echo "CONFIG_EAP_PSK=y" >> ${CONFIG} || die
132
	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} || die
133
	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} || die
134
	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} || die
120
	echo "CONFIG_EAP_IKEV2=y" >> "${CONFIG}" || die
121
	echo "CONFIG_EAP_TNC=y" >> "${CONFIG}" || die
122
	echo "CONFIG_EAP_GTC=y" >> "${CONFIG}" || die
123
	echo "CONFIG_EAP_SIM=y" >> "${CONFIG}" || die
124
	echo "CONFIG_EAP_AKA=y" >> "${CONFIG}" || die
125
	echo "CONFIG_EAP_AKA_PRIME=y" >> "${CONFIG}" || die
126
	echo "CONFIG_EAP_EKE=y" >> "${CONFIG}" || die
127
	echo "CONFIG_EAP_PAX=y" >> "${CONFIG}" || die
128
	echo "CONFIG_EAP_PSK=y" >> "${CONFIG}" || die
129
	echo "CONFIG_EAP_SAKE=y" >> "${CONFIG}" || die
130
	echo "CONFIG_EAP_GPSK=y" >> "${CONFIG}" || die
131
	echo "CONFIG_EAP_GPSK_SHA256=y" >> "${CONFIG}" || die
135 132

  
136 133
	einfo "Enabling drivers: "
137 134

  
138 135
	# drivers
139
	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG} || die
136
	echo "CONFIG_DRIVER_HOSTAP=y" >> "${CONFIG}" || die
140 137
	einfo "  HostAP driver enabled"
141
	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} || die
138
	echo "CONFIG_DRIVER_WIRED=y" >> "${CONFIG}" || die
142 139
	einfo "  Wired driver enabled"
143
	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} || die
140
	echo "CONFIG_DRIVER_NONE=y" >> "${CONFIG}" || die
144 141
	einfo "  None driver enabled"
145 142

  
146 143
	einfo "  nl80211 driver enabled"
147
	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} || die
144
	echo "CONFIG_DRIVER_NL80211=y" >> "${CONFIG}" || die
148 145

  
149 146
	# epoll
150
	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} || die
147
	echo "CONFIG_ELOOP_EPOLL=y" >> "${CONFIG}" || die
151 148

  
152 149
	# misc
153
	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} || die
154
	echo "CONFIG_PKCS12=y" >> ${CONFIG} || die
155
	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} || die
156
	echo "CONFIG_IAPP=y" >> ${CONFIG} || die
157
	echo "CONFIG_IEEE80211R=y" >> ${CONFIG} || die
158
	echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die
159
	echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die
160
	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die
161
	echo "CONFIG_IEEE80211AX=y" >> ${CONFIG} || die
162
	echo "CONFIG_OCV=y" >> ${CONFIG} || die
163
	echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die
164
	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die
165
	echo "CONFIG_INTERWORKING=y" >> ${CONFIG} || die
166
	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG} || die
167
	echo "CONFIG_HS20=y" >> ${CONFIG} || die
168
	echo "CONFIG_WNM=y" >> ${CONFIG} || die
169
	echo "CONFIG_FST=y" >> ${CONFIG} || die
170
	echo "CONFIG_FST_TEST=y" >> ${CONFIG} || die
171
	echo "CONFIG_ACS=y" >> ${CONFIG} || die
150
	echo "CONFIG_DEBUG_FILE=y" >> "${CONFIG}" || die
151
	echo "CONFIG_PKCS12=y" >> "${CONFIG}" || die
152
	echo "CONFIG_RADIUS_SERVER=y" >> "${CONFIG}" || die
153
	echo "CONFIG_IAPP=y" >> "${CONFIG}" || die
154
	echo "CONFIG_IEEE80211R=y" >> "${CONFIG}" || die
155
	echo "CONFIG_IEEE80211W=y" >> "${CONFIG}" || die
156
	echo "CONFIG_IEEE80211N=y" >> "${CONFIG}" || die
157
	echo "CONFIG_IEEE80211AC=y" >> "${CONFIG}" || die
158
	echo "CONFIG_IEEE80211AX=y" >> "${CONFIG}" || die
159
	echo "CONFIG_OCV=y" >> "${CONFIG}" || die
160
	echo "CONFIG_PEERKEY=y" >> "${CONFIG}" || die
161
	echo "CONFIG_RSN_PREAUTH=y" >> "${CONFIG}" || die
162
	echo "CONFIG_INTERWORKING=y" >> "${CONFIG}" || die
163
	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> "${CONFIG}" || die
164
	echo "CONFIG_HS20=y" >> "${CONFIG}" || die
165
	echo "CONFIG_WNM=y" >> "${CONFIG}" || die
166
	echo "CONFIG_FST=y" >> "${CONFIG}" || die
167
	echo "CONFIG_FST_TEST=y" >> "${CONFIG}" || die
168
	echo "CONFIG_ACS=y" >> "${CONFIG}" || die
172 169

  
173 170
	if use netlink; then
174 171
		# Netlink support
175
		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG} || die
172
		echo "CONFIG_VLAN_NETLINK=y" >> "${CONFIG}" || die
176 173
	fi
177 174

  
178 175
	if use ipv6; then
179 176
		# IPv6 support
180
		echo "CONFIG_IPV6=y" >> ${CONFIG} || die
177
		echo "CONFIG_IPV6=y" >> "${CONFIG}" || die
181 178
	fi
182 179

  
183 180
	if use sqlite; then
184 181
		# Sqlite support
185
		echo "CONFIG_SQLITE=y" >> ${CONFIG} || die
182
		echo "CONFIG_SQLITE=y" >> "${CONFIG}" || die
186 183
	fi
187 184

  
188 185
	if use kernel_linux; then
189
		echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die
190
		append-cflags $($(tc-getPKG_CONFIG) --cflags libnl-3.0)
186
		echo "CONFIG_LIBNL32=y" >> "${CONFIG}" || die
187
		append-cflags "$($(tc-getPKG_CONFIG) --cflags libnl-3.0)"
191 188
	fi
192 189

  
193 190
	# TODO: Add support for BSD drivers
......
217 214
		dobin nt_password_hash hlr_auc_gw
218 215
	fi
219 216

  
220
	newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN}
221
	newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN}
222
	systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service
217
	newinitd "${FILESDIR}/${PN}-init.d" ${PN}
218
	newconfd "${FILESDIR}/${PN}-conf.d" ${PN}
219
	systemd_dounit "${FILESDIR}/${PN}.service"
223 220

  
224 221
	doman ${PN}{.8,_cli.1}
225 222

  
Thank you!