I tried upgrading and solving all the errors I ran into. See patch attached.

I got stuck with a bunch of these linker errors in the end (97%) after
having upgraded the monero-upnpc also:

ld:
main.cpp:(.text._ZN8nodetool11node_serverIN10cryptonote29t_cryptonote_protocol_handlerINS1_4coreEEEE24delete_upnp_port_mappingEj[_ZN8no\
detool11node_serverIN10cryptonote29t_cryptonote_protocol_handlerINS1_4coreEEEE24delete_upnp_port_mappingEj]+0x26a):
undefined reference to \
`FreeUPNPUrls'

ld:
main.cpp:(.text._ZN8nodetool11node_serverIN10cryptonote29t_cryptonote_protocol_handlerINS1_4coreEEEE24delete_upnp_port_mappingEj[_ZN8no\
detool11node_serverIN10cryptonote29t_cryptonote_protocol_handlerINS1_4coreEEEE24delete_upnp_port_mappingEj]+0x4b4):
undefined reference to \
`UPNP_DeletePortMapping'

ld:
main.cpp:(.text._ZN8nodetool11node_serverIN10cryptonote29t_cryptonote_protocol_handlerINS1_4coreEEEE24delete_upnp_port_mappingEj[_ZN8no\
detool11node_serverIN10cryptonote29t_cryptonote_protocol_handlerINS1_4coreEEEE24delete_upnp_port_mappingEj]+0x4de):
undefined reference to \
`strupnperror'

collect2: error: ld returned 1 exit status

Does anyone have an idea how to solve this?

-- 
Cheers Swedebugia