Build Fail - gargoyle-ispy 2015-September-12

[ispyisail]

Hi Guys

Trying to build 1.8.x

only changes I can see

Code: Select all

bump tor-0.2.6.10

Code: Select all

CFLAGS+= -std=gnu99

Code: Select all

dnsmasq: backport CVE-2015-3294 security fix
Back port of security fix without bumping dnsmasq version.
Fix is included in CC because dnsmasq version is up to date there.

Result

Code: Select all

Applying ./patches/471-wpa_cli_ifdef.patch using plaintext:
patching file wpa_supplicant/wpa_cli.c

Applying ./patches/480-max_num_sta_probe.patch using plaintext:
patching file src/ap/beacon.c

Applying ./patches/490-scan_wait.patch using plaintext:
patching file hostapd/main.c

Applying ./patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch using plaintext:
patching file src/drivers/driver.h
patching file wpa_supplicant/config.c
patching file wpa_supplicant/config_ssid.h
patching file wpa_supplicant/wpa_supplicant.c

Applying ./patches/501-driver_nl80211-use-new-parameters-during-ibss-join.patch using plaintext:
patching file src/drivers/driver_nl80211.c

Applying ./patches/502-wpa_s-support-htmode-param.patch using plaintext:
patching file src/drivers/driver.h
patching file src/drivers/driver_nl80211.c
patching file wpa_supplicant/config.c
patching file wpa_supplicant/config_ssid.h
patching file wpa_supplicant/wpa_supplicant.c

Applying ./patches/600-ubus_support.patch using plaintext:
patching file hostapd/Makefile
patching file src/ap/hostapd.h
patching file src/ap/ubus.c
patching file src/ap/ubus.h
patching file src/ap/hostapd.c
patching file src/ap/ieee802_11.c
patching file src/ap/beacon.c
patching file src/ap/beacon.h

Applying ./patches/700-fix-radius-reconnect.patch using plaintext:
patching file src/radius/radius_client.c

Applying ./patches/950-hostapd-fix-radius.patch using plaintext:
patching file src/radius/radius_client.c
Hunk #1 FAILED at 658.
Hunk #2 FAILED at 672.
2 out of 2 hunks FAILED -- saving rejects to file src/radius/radius_client.c.rej
Patch failed!  Please fix ./patches/950-hostapd-fix-radius.patch!
make[4]: *** [/home/user/gargoyle/brcm47xx-src/build_dir/target-mipsel_mips32_uClibc-0.9.33.2/hostapd-wpad-mini/hostapd-2014-06-03.1/.prepared_c04cbe439063becfeb64bd7d1a937114] Error 1
make[4]: Leaving directory `/home/user/gargoyle/brcm47xx-src/package/network/services/hostapd'
make[3]: *** [package/network/services/hostapd/compile] Error 2
make[3]: Leaving directory `/home/user/gargoyle/brcm47xx-src'
make[2]: *** [/home/user/gargoyle/brcm47xx-src/staging_dir/target-mipsel_mips32_uClibc-0.9.33.2/stamp/.package_compile] Error 2
make[2]: Leaving directory `/home/user/gargoyle/brcm47xx-src'
make[1]: *** [world] Error 2
make[1]: Leaving directory `/home/user/gargoyle/brcm47xx-src'

Thoughts?

[nworbnhoj]

I don't think that it relates to the tor bump or the -std-gnu99 as they relate to a different area in the code.

Can you post the contents of
Hunk #1 FAILED at 658.
Hunk #2 FAILED at 672.
2 out of 2 hunks FAILED -- saving rejects to file src/radius/radius_client.c.rej

[krzyko]

Openwrt revision was bumped from 46287 to 46817 thus including 46512 changeset. Changeset 46512 added

Code: Select all

700-fix-radius-reconnect.patch

file which changes

Code: Select all

/src/radius/radius_client.c

content in such way that

Code: Select all

/package/network/services/hostapd/patches/950-hostapd-fix-radius.patch

created from

Code: Select all

/patches-generic/11-hostapd-fix-radius.patch

does not apply cleanly.

So,

Code: Select all

/patches-generic/11-hostapd-fix-radius.patch

file should be regenerated to conform to the changes from openwrt 46512 changeset.

[Lantis]

Ahh! That's my bad I didn't check the patches.
I'll try and redo the patch later today.

[Lantis]

Urgh. This took a while lol.

https://github.com/lantis1008/gargoyle/ ... 8c9e4305c6

Do you want to try building with that change BEFORE i push it to Eric, iSpy? I'd rather know if it applies nicely first.

[ispyisail]

building

[ispyisail]

It appears to build ok now

thanks

[Lantis]

great. i'll push that patch.

https://github.com/ericpaulbishop/gargoyle/pull/368