etc/system-release
+etc/sysctl.conf
var/ipfire/langs/
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
endif
endif
-VER = 8.0.19
+VER = 8.0.30
THISAPP = e1000-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = dc66dcbfd7c2e48af8cfc86f4f174fce
+$(DL_FILE)_MD5 = d85a64fdde2987b27ac6fbab5be605a0
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
endif
endif
-VER = 1.1.19
+VER = 1.3.10a
THISAPP = e1000e-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 94e86507f139226c1add173dafdbbd52
+$(DL_FILE)_MD5 = 04b8856433d5e582ab41bdd3b24f20a5
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
endif
endif
-VER = 2.3.4
+VER = 3.0.19
THISAPP = igb-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b0ea2a70198746b69392ef935b61454a
+$(DL_FILE)_MD5 = 8fdc04600bea4a4188672a1a8d0eb73b
install : $(TARGET)
endif
endif
-VER = 2.6.34.1
+VER = 2.6.38.6
THISAPP = kvm-kmod-$(VER)
DL_FILE = $(THISAPP).tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c227b58ee33f6035f16abd258bcd92ec
+$(DL_FILE)_MD5 = b631ba6ba7b0d3c07de870c6104ffbd5
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_pvclock_scale_delta_redifinition.patch
cd $(DIR_APP) && ./configure --kerneldir=/usr/src/linux
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && install -m 644 x86/*.ko \
include Config
-PATCHLEVEL = .43
-VER = 2.6.32.43
+PATCHLEVEL = .44
+VER = 2.6.32.44
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
CXXFLAGS =
PROG = linux-xen
-PAK_VER = 17
+PAK_VER = 18
DEPS = ""
# Normal build or XEN build.
reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
-$(DL_FILE)_MD5 = d6819da012da0d9772ac79da9dce3d63
+$(DL_FILE)_MD5 = 38d43bb91fff88783f57ada146415029
netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch
endif
- # Patch CVE 2011-1767 and 1768 dos hole
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.43-cve_2011_1767+1768.patch
-
# Not report deprecated syscall 1.23 (for kudzu)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
--- /dev/null
+diff -Naur kvm-kmod-2.6.38.6.org/x86/external-module-compat.h kvm-kmod-2.6.38.6/x86/external-module-compat.h
+--- kvm-kmod-2.6.38.6.org/x86/external-module-compat.h 2011-05-15 09:34:48.000000000 +0200
++++ kvm-kmod-2.6.38.6/x86/external-module-compat.h 2011-05-21 13:30:50.529469540 +0200
+@@ -1064,41 +1064,6 @@
+
+ #endif /* >= 2.6.36 */
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+-static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift)
+-{
+- u64 product;
+-#ifdef __i386__
+- u32 tmp1, tmp2;
+-#endif
+-
+- if (shift < 0)
+- delta >>= -shift;
+- else
+- delta <<= shift;
+-
+-#ifdef __i386__
+- __asm__ (
+- "mul %5 ; "
+- "mov %4,%%eax ; "
+- "mov %%edx,%4 ; "
+- "mul %5 ; "
+- "xor %5,%5 ; "
+- "add %4,%%eax ; "
+- "adc %5,%%edx ; "
+- : "=A" (product), "=r" (tmp1), "=r" (tmp2)
+- : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) );
+-#elif defined(__x86_64__)
+- __asm__ (
+- "mul %%rdx ; shrd $32,%%rdx,%%rax"
+- : "=a" (product) : "0" (delta), "d" ((u64)mul_frac) );
+-#else
+-#error implement me!
+-#endif
+-
+- return product;
+-}
+-#endif
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) && \
+ LINUX_VERSION_CODE != KERNEL_VERSION(2,6,32) && defined(CONFIG_X86_64)
+++ /dev/null
-diff -Naur linux-2.6.32.43.org/net/ipv4/ip_gre.c linux-2.6.32.43/net/ipv4/ip_gre.c
---- linux-2.6.32.43.org/net/ipv4/ip_gre.c 2011-07-13 05:29:43.000000000 +0200
-+++ linux-2.6.32.43/net/ipv4/ip_gre.c 2011-06-20 19:27:06.000000000 +0200
-@@ -1665,14 +1665,16 @@
-
- printk(KERN_INFO "GRE over IPv4 tunneling driver\n");
-
-- if (inet_add_protocol(&ipgre_protocol, IPPROTO_GRE) < 0) {
-- printk(KERN_INFO "ipgre init: can't add protocol\n");
-- return -EAGAIN;
-- }
--
- err = register_pernet_gen_device(&ipgre_net_id, &ipgre_net_ops);
- if (err < 0)
-+ goto out;
-+
-+ err = inet_add_protocol(&ipgre_protocol, IPPROTO_GRE);
-+ if (err < 0) {
-+ printk(KERN_INFO "ipgre init: can't add protocol\n");
-+ err = -EAGAIN;
- goto gen_device_failed;
-+ }
-
- err = rtnl_link_register(&ipgre_link_ops);
- if (err < 0)
-@@ -1688,9 +1690,9 @@
- tap_ops_failed:
- rtnl_link_unregister(&ipgre_link_ops);
- rtnl_link_failed:
-- unregister_pernet_gen_device(ipgre_net_id, &ipgre_net_ops);
--gen_device_failed:
- inet_del_protocol(&ipgre_protocol, IPPROTO_GRE);
-+gen_device_failed:
-+ unregister_pernet_gen_device(ipgre_net_id, &ipgre_net_ops);
- goto out;
- }
-
-@@ -1698,9 +1700,10 @@
- {
- rtnl_link_unregister(&ipgre_tap_ops);
- rtnl_link_unregister(&ipgre_link_ops);
-- unregister_pernet_gen_device(ipgre_net_id, &ipgre_net_ops);
- if (inet_del_protocol(&ipgre_protocol, IPPROTO_GRE) < 0)
- printk(KERN_INFO "ipgre close: can't remove protocol\n");
-+
-+ unregister_pernet_gen_device(ipgre_net_id, &ipgre_net_ops);
- }
-
- module_init(ipgre_init);
-diff -Naur linux-2.6.32.43.org/net/ipv4/ipip.c linux-2.6.32.43/net/ipv4/ipip.c
---- linux-2.6.32.43.org/net/ipv4/ipip.c 2011-07-13 05:29:43.000000000 +0200
-+++ linux-2.6.32.43/net/ipv4/ipip.c 2011-06-20 19:27:06.000000000 +0200
-@@ -830,15 +830,14 @@
-
- printk(banner);
-
-- if (xfrm4_tunnel_register(&ipip_handler, AF_INET)) {
-+ err = register_pernet_gen_device(&ipip_net_id, &ipip_net_ops);
-+ if (err < 0)
-+ return err;
-+ err = xfrm4_tunnel_register(&ipip_handler, AF_INET);
-+ if (err < 0) {
-+ unregister_pernet_gen_device(ipip_net_id, &ipip_net_ops);
- printk(KERN_INFO "ipip init: can't register tunnel\n");
-- return -EAGAIN;
- }
--
-- err = register_pernet_gen_device(&ipip_net_id, &ipip_net_ops);
-- if (err)
-- xfrm4_tunnel_deregister(&ipip_handler, AF_INET);
--
- return err;
- }
-
-diff -Naur linux-2.6.32.43.org/net/ipv6/ip6_tunnel.c linux-2.6.32.43/net/ipv6/ip6_tunnel.c
---- linux-2.6.32.43.org/net/ipv6/ip6_tunnel.c 2011-07-13 05:29:43.000000000 +0200
-+++ linux-2.6.32.43/net/ipv6/ip6_tunnel.c 2011-06-20 19:27:06.000000000 +0200
-@@ -1466,10 +1465,14 @@
- {
- int err;
-
-+ err = register_pernet_gen_device(&ip6_tnl_net_id, &ip6_tnl_net_ops);
-+ if (err < 0)
-+ goto out;
-+
- if (xfrm6_tunnel_register(&ip4ip6_handler, AF_INET)) {
- printk(KERN_ERR "ip6_tunnel init: can't register ip4ip6\n");
- err = -EAGAIN;
-- goto out;
-+ goto unreg_pernet_dev;
- }
-
- if (xfrm6_tunnel_register(&ip6ip6_handler, AF_INET6)) {
-@@ -1478,14 +1481,12 @@
- goto unreg_ip4ip6;
- }
-
-- err = register_pernet_gen_device(&ip6_tnl_net_id, &ip6_tnl_net_ops);
-- if (err < 0)
-- goto err_pernet;
- return 0;
--err_pernet:
-- xfrm6_tunnel_deregister(&ip6ip6_handler, AF_INET6);
-+
- unreg_ip4ip6:
- xfrm6_tunnel_deregister(&ip4ip6_handler, AF_INET);
-+unreg_pernet_dev:
-+ unregister_pernet_gen_device(ip6_tnl_net_id, &ip6_tnl_net_ops);
- out:
- return err;
- }
-diff -Naur linux-2.6.32.43.org/net/ipv6/sit.c linux-2.6.32.43/net/ipv6/sit.c
---- linux-2.6.32.43.org/net/ipv6/sit.c 2011-07-13 05:29:43.000000000 +0200
-+++ linux-2.6.32.43/net/ipv6/sit.c 2011-06-20 19:27:06.000000000 +0200
-@@ -1086,15 +1086,17 @@
-
- printk(KERN_INFO "IPv6 over IPv4 tunneling driver\n");
-
-- if (xfrm4_tunnel_register(&sit_handler, AF_INET6) < 0) {
-+ err = register_pernet_gen_device(&sit_net_id, &sit_net_ops);
-+ if (err < 0)
-+ return err;
-+
-+ err = xfrm4_tunnel_register(&sit_handler, AF_INET6);
-+ if (err < 0) {
-+ unregister_pernet_gen_device(sit_net_id, &sit_net_ops);
- printk(KERN_INFO "sit init: Can't add protocol\n");
- return -EAGAIN;
- }
-
-- err = register_pernet_gen_device(&sit_net_id, &sit_net_ops);
-- if (err < 0)
-- xfrm4_tunnel_deregister(&sit_handler, AF_INET6);
--
- return err;
- }
-
projects / people / teissler / ipfire-2.x.git / commitdiff
