Ubuntu Hardy Upgrade breaks vpn & patch (FIXED)

[hoarder]

* This is all for 64 bit instructions! To be clear these are the instructions I followed:

Code: Select all

1. Untar the VPN Client
# tar xzf vpnclient-linux-x86_64-4.8.01.0640-k9.tar.gz

2. Download the patch
# wget -q http://projects.tuxx-home.at/ciscovpn/patches/cisco_skbuff_offset.patch

3. Change to the vpnclient directory
# cd vpnclient

4. Apply the patch
# patch <../cisco_skbuff_offset.patch
patching file frag.c
patching file interceptor.c
patching file linuxcniapi.c
patching file linuxkernelapi.c

5. Now the patch has been applied and you can safely install the client
#./vpn_install



I had no problem with the instructions on http://projects.tuxx-home.at/?id=cisco_vpn_client prior to upgrading to hardy. For Hardy, I downloaded the newer vpn client (I had 4.8.00.0640, and I downloaded 4.8.01.0640), I ran the patch and it went fine, then I ran into the EXTRA_CFLAGS issue noted on the page, I fixed the one and only reference to this tag and ran it again and got the following:

Code: Select all

Shutting down /opt/cisco-vpnclient/bin/vpnclient: module cisco_ipsec is not running.
Stopped: /etc/init.d/vpnclient_init (VPN init script)
Making module
make -C /lib/modules/2.6.24-16-generic/build SUBDIRS=/home/me/Documents/vpnclient modules
make[1]: Entering directory `/usr/src/linux-headers-2.6.24-16-generic'
  CC [M]  /home/me/Documents/vpnclient/linuxcniapi.o
In file included from /home/me/Documents/vpnclient/Cniapi.h:15,
                 from /home/me/Documents/vpnclient/linuxcniapi.c:31:
/home/me/Documents/vpnclient/GenDefs.h:110:2: warning: #warning 64 bit
In file included from /home/me/Documents/vpnclient/Cniapi.h:15,
                 from /home/me/Documents/vpnclient/linuxcniapi.c:31:
/home/me/Documents/vpnclient/GenDefs.h:111: error: conflicting types for ‘uintptr_t’
include/linux/types.h:40: error: previous declaration of ‘uintptr_t’ was here
make[2]: *** [/home/me/Documents/vpnclient/linuxcniapi.o] Error 1
make[1]: *** [_module_/home/me/Documents/vpnclient] Error 2
make[1]: Leaving directory `/usr/src/linux-headers-2.6.24-16-generic'
make: *** [default] Error 2
Failed to make module "cisco_ipsec.ko".



What can I do to get this working again?

[hoarder]

Ok, for those of you running 64 bit Hardy here's what you need to do:

Run BOTH sets of instructions the non 64 bit and the 64 bit, plus the CFLAGS changes. Refer back to the main page, but here's what I did:

Code: Select all

1. Untar the VPN Client
# tar xzf vpnclient-linux-4.8.01.0640-k9.tar.gz

2. Download the patch  #1
# wget -q http://projects.tuxx-home.at/ciscovpn/patches/vpnclient-linux-2.6.24-final.diff

3. Download the patch #2
# wget -q http://projects.tuxx-home.at/ciscovpn/patches/cisco_skbuff_offset.patch

4. Change to the vpnclient diretory
# cd vpnclient

5. Apply the patch #1
# patch <../vpnclient-linux-2.6.24-final.diff
patching file GenDefs.h
patching file interceptor.c

6. Apply the patch #2
# patch <../cisco_skbuff_offset.patch
patching file frag.c
patching file interceptor.c
Hunk #1 succeeded at 646 (offset 16 lines).
Hunk #2 succeeded at 685 (offset 16 lines).
Hunk #3 succeeded at 807 (offset 16 lines).
patching file linuxcniapi.c
patching file linuxkernelapi.c

7. Open your "Makefile" and rename the CFLAGS line to EXTRA_CFLAGS

8. Now the patches have been applied and you can safely install the client
#./vpn_install



[tuxx-home.at]

Many thanks for this summary!