- adapted to kernel-module-build and tested by Marcin Biczan

Changed files:
    cisco-vpnclient-kernel.patch -> 1.1
    cisco-vpnclient.spec -> 1.20

diff --git a/cisco-vpnclient-kernel.patch b/cisco-vpnclient-kernel.patch
new file mode 100644 (file)
index 0000000..975027f
--- /dev/null
+++ b/cisco-vpnclient-kernel.patch
@@ -0,0 +1,21 @@
+diff -Nur cisco-vpnclient-4.7.00.0640_k9-old/vpnclient/linuxcniapi.c cisco-vpnclient-4.7.00.0640_k9/vpnclient/linuxcniapi.c
+--- cisco-vpnclient-4.7.00.0640_k9-old/vpnclient/linuxcniapi.c 2007-04-06 13:00:15.000000000 +0200
++++ cisco-vpnclient-4.7.00.0640_k9/vpnclient/linuxcniapi.c     2007-04-06 13:00:35.000000000 +0200
+@@ -289,7 +289,7 @@
+         goto exit_gracefully;
+     }
+     /* move the data into the packet */
+-    do_gettimeofday(&skb->stamp);
++    do_gettimeofday(&skb->tstamp);
+ 
+     pIP = skb_put(skb, lpPacketDescriptor->uiPacketSize);
+ 
+@@ -429,7 +429,7 @@
+     CniGetPacketData(Packet, 0, lpPacketDescriptor->uiPacketSize, pIP);
+ 
+     /* put the mac header on */
+-    do_gettimeofday(&skb->stamp);
++    do_gettimeofday(&skb->tstamp);
+ 
+     skb->dev = pBinding->pDevice;
+ 

diff --git a/cisco-vpnclient.spec b/cisco-vpnclient.spec
index 92d212a2717048aa467163a1c74841b3047beee4..07a2def4b0a7888e6985e6424911c367e908cd36 100644 (file)
--- a/cisco-vpnclient.spec
+++ b/cisco-vpnclient.spec
@@ -25,6 +25,7 @@ Source1:      vpnclient-linux-x86_64-4.7.00.0640-k9.tar.gz
 Source2:       cisco_vpnclient.init
 NoSource:      0
 NoSource:      1
+Patch0:                %{name}-kernel.patch
 URL:           http://www.cisco.com/en/US/products/sw/secursw/ps2308/tsd_products_support_series_home.html
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 3:2.6.0}
 BuildRequires: rpmbuild(macros) >= 1.268
@@ -78,6 +79,7 @@ tar -zxvf %{SOURCE0}
 %ifarch %{x8664}
 tar -zxvf %{SOURCE1}
 %endif
+%patch0 -p1
 
 %build
 cd vpnclient
@@ -86,22 +88,31 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
                exit 1
        fi
-       rm -rf include
-       install -d include/{linux,config}
-       ln -sf %{_kernelsrcdir}/config-$cfg .config
-       ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-       ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-       ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-%if !%{with dist_kernel}
-       ln -sf %{_kernelsrcdir}/scripts
-%endif
-       touch include/config/MARKER
+       install -d o/include/linux
+       ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+       ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+       ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+       %if %{with dist_kernel}
+               %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+       %else
+               install -d o/include/config
+               touch o/include/config/MARKER
+               ln -sf %{_kernelsrcdir}/scripts o/scripts
+       %endif
+#
+#       patching/creating makefile(s) (optional)
+#
        %{__make} -C %{_kernelsrcdir} clean \
                RCS_FIND_IGNORE="-name '*.ko' -o" \
-               M=$PWD O=$PWD \
+               SYSSRC=%{_kernelsrcdir} \
+               SYSOUT=$PWD/o \
+               M=$PWD O=$PWD/o \
                %{?with_verbose:V=1}
        %{__make} -C %{_kernelsrcdir} modules \
-               M=$PWD O=$PWD \
+               CC="%{__cc}" CPP="%{__cpp}" \
+               SYSSRC=%{_kernelsrcdir} \
+               SYSOUT=$PWD/o \
+               M=$PWD O=$PWD/o \
                %{?with_verbose:V=1}
        mv cisco_ipsec.ko cisco_ipsec-$cfg.ko
 done