[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 822fa11f38838f5d27d380dcb5445063f0200e87 - IPFire-SCM

10 Mar 2010

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  822fa11f38838f5d27d380dcb5445063f0200e87 (commit)
       via  a443986b63989d14e622c3750d047bbe0c1ae8ef (commit)
       via  a8844147ebe6216fffa100ec7d1cd570220d1a32 (commit)
       via  fb25052fb3f254f21a3d65273f606374d56aa00d (commit)
       via  6803ea5902156881c55829f108a4273e7db0f259 (commit)
      from  139a9b4fa189c63c94544a556e593e8c83c07a05 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 822fa11f38838f5d27d380dcb5445063f0200e87
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 10 14:24:26 2010 +0100
Update packages-list.txt.
commit a443986b63989d14e622c3750d047bbe0c1ae8ef
Merge: a8844147ebe6216fffa100ec7d1cd570220d1a32 fb25052fb3f254f21a3d65273f606374d56aa00d
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 10 14:24:12 2010 +0100
Merge branch 'cryptodev' into next
commit a8844147ebe6216fffa100ec7d1cd570220d1a32
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 10 14:23:43 2010 +0100
kernel: Enable tickless system on std kernel.
commit fb25052fb3f254f21a3d65273f606374d56aa00d
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 10 00:18:18 2010 +0100
Add cryptodev support to kernel.
commit 6803ea5902156881c55829f108a4273e7db0f259
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 10 00:16:45 2010 +0100
Add cryptodev support to kernel.
-----------------------------------------------------------------------
Summary of changes:
 config/kernel/kernel.config.i586-ipfire   |    5 +-
 doc/packages-list.txt                     |    2 +
 lfs/{v4l-dvb => cryptodev}                |   21 ++++---
 lfs/openssl                               |    1 +
 make.sh                                   |    2 +
 src/patches/openssl-0.9.8k-cryptodev.diff |  101 +++++++++++++++++++++++++++++
 6 files changed, 121 insertions(+), 11 deletions(-)
 copy lfs/{v4l-dvb => cryptodev} (89%)
 create mode 100644 src/patches/openssl-0.9.8k-cryptodev.diff
Difference in files:

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 28dd0c6..aab5582 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.9-ipfire
-# Sat Feb 27 16:19:37 2010
+# Wed Mar 10 13:22:52 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -194,7 +194,7 @@ CONFIG_FREEZER=y
 # Processor type and features
 #
 CONFIG_TICK_ONESHOT=y
-# CONFIG_NO_HZ is not set
+CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_SMP=y
@@ -442,6 +442,7 @@ CONFIG_X86_SPEEDSTEP_LIB=m
 # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
#
 # Bus options (PCI etc.)
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 8f02a4c..eb98dab 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -70,6 +70,8 @@
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-007
+* cryptodev-20091126-kmod-2.6.32.9-ipfire
+* cryptodev-20091126-kmod-2.6.32.9-ipfire-xen
 * cups-1.4.2
 * curl-7.19.5
 * cyrus-imapd-2.2.12
diff --git a/lfs/cryptodev b/lfs/cryptodev
new file mode 100644
index 0000000..5c1646b
--- /dev/null
+++ b/lfs/cryptodev
@@ -0,0 +1,90 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+ifeq "$(XEN)" "1"
+	VERSUFIX=ipfire-xen
+else
+	VERSUFIX=ipfire
+endif
+
+VER        = 20091126
+
+THISAPP    = cryptodev-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 26ffa32ef75bea7e980ab66166616e95
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && make build \
+		KERNEL_DIR=/lib/modules/$(KVER)-$(VERSUFIX)/build
+
+	-mkdir -pv /usr/include/crypto
+	cd $(DIR_APP) && make install \
+		KERNEL_DIR=/lib/modules/$(KVER)-$(VERSUFIX)/build
+	ln -svf ../crypto/cryptodev.h /usr/include/linux/cryptodev.h
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/openssl b/lfs/openssl
index 96c66bb..eaa5d65 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8k-cryptodev.diff
 ifeq "$(PADLOCK)" "1"
    cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8g-engine-padlock.patch
 endif
diff --git a/make.sh b/make.sh
index c7a6924..6a7c63a 100755
--- a/make.sh
+++ b/make.sh
@@ -351,6 +351,7 @@ buildipfire() {
   ipfiremake openswan			XEN=1 KMOD=1
   #ipfiremake mISDN			XEN=1
   #ipfiremake compat-wireless		XEN=1
+  ipfiremake cryptodev			XEN=1
   ipfiremake linux
   ipfiremake kqemu
   #ipfiremake kvm-kmod
@@ -361,6 +362,7 @@ buildipfire() {
   ipfiremake openswan			KMOD=1
   #ipfiremake mISDN
   #ipfiremake compat-wireless
+  ipfiremake cryptodev
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
diff --git a/src/patches/openssl-0.9.8k-cryptodev.diff b/src/patches/openssl-0.9.8k-cryptodev.diff
new file mode 100644
index 0000000..0a4793a
--- /dev/null
+++ b/src/patches/openssl-0.9.8k-cryptodev.diff
@@ -0,0 +1,101 @@
+diff -ur openssl-0.9.8k/crypto/engine/eng_all.c openssl-0.9.8k.new/crypto/engine/eng_all.c
+--- openssl-0.9.8k/crypto/engine/eng_all.c	2008-06-04 21:01:39.000000000 +0300
++++ openssl-0.9.8k.new/crypto/engine/eng_all.c	2009-11-24 13:41:49.000000000 +0200
+@@ -104,16 +104,15 @@
+ #endif
+ #endif
+ #ifndef OPENSSL_NO_HW
+-#if defined(__OpenBSD__) || defined(__FreeBSD__)
++# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041) || defined(__linux__)
+ 	ENGINE_load_cryptodev();
+-#endif
++# endif
+ #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
+ 	ENGINE_load_capi();
+ #endif
+ #endif
+ 	}
+ 
+-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+ void ENGINE_setup_bsd_cryptodev(void) {
+ 	static int bsd_cryptodev_default_loaded = 0;
+ 	if (!bsd_cryptodev_default_loaded) {
+@@ -122,4 +121,3 @@
+ 	}
+ 	bsd_cryptodev_default_loaded=1;
+ }
+-#endif
+diff -ur openssl-0.9.8k/crypto/engine/eng_cryptodev.c openssl-0.9.8k.new/crypto/engine/eng_cryptodev.c
+--- openssl-0.9.8k/crypto/engine/eng_cryptodev.c	2004-06-15 14:45:42.000000000 +0300
++++ openssl-0.9.8k.new/crypto/engine/eng_cryptodev.c	2009-11-24 13:45:31.000000000 +0200
+@@ -34,14 +34,15 @@
+ #if (defined(__unix__) || defined(unix)) && !defined(USG) && \
+ 	(defined(OpenBSD) || defined(__FreeBSD_version))
+ #include <sys/param.h>
+-# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041)
+-#  define HAVE_CRYPTODEV
+-# endif
+ # if (OpenBSD >= 200110)
+ #  define HAVE_SYSLOG_R
+ # endif
+ #endif
+ 
++#if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041) || defined(__linux__)
++# define HAVE_CRYPTODEV
++#endif
++
+ #ifndef HAVE_CRYPTODEV
+ 
+ void
+@@ -54,7 +55,12 @@
+ #else 
+  
+ #include <sys/types.h>
+-#include <crypto/cryptodev.h>
++#if defined(__linux__)
++# include <linux/cryptodev.h>
++# define HAVE_CRYPTODEV_NAME
++#else
++# include <crypto/cryptodev.h>
++#endif
+ #include <sys/ioctl.h>
+ #include <errno.h>
+ #include <stdio.h>
+@@ -77,7 +83,11 @@
+ static int get_dev_crypto(void);
+ static int cryptodev_max_iv(int cipher);
+ static int cryptodev_key_length_valid(int cipher, int len);
+-static int cipher_nid_to_cryptodev(int nid);
++#ifndef HAVE_CRYPTODEV_NAME
++ static int cipher_nid_to_cryptodev(int nid);
++#else
++ static char *cipher_nid_to_cryptodev_name(int nid);
++#endif
+ static int get_cryptodev_ciphers(const int **cnids);
+ static int get_cryptodev_digests(const int **cnids);
+ static int cryptodev_usable_ciphers(const int **nids);
+diff -ur openssl-0.9.8k/crypto/engine/engine.h openssl-0.9.8k.new/crypto/engine/engine.h
+--- openssl-0.9.8k/crypto/engine/engine.h	2008-06-04 21:01:40.000000000 +0300
++++ openssl-0.9.8k.new/crypto/engine/engine.h	2009-11-24 13:41:49.000000000 +0200
+@@ -703,9 +703,7 @@
+  * values. */
+ void *ENGINE_get_static_state(void);
+ 
+-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+ void ENGINE_setup_bsd_cryptodev(void);
+-#endif
+ 
+ /* BEGIN ERROR CODES */
+ /* The following lines are auto generated by the script mkerr.pl. Any changes
+diff -ur openssl-0.9.8k/crypto/evp/c_all.c openssl-0.9.8k.new/crypto/evp/c_all.c
+--- openssl-0.9.8k/crypto/evp/c_all.c	2004-08-29 19:36:04.000000000 +0300
++++ openssl-0.9.8k.new/crypto/evp/c_all.c	2009-11-24 13:41:49.000000000 +0200
+@@ -83,8 +83,6 @@
+ 	OpenSSL_add_all_ciphers();
+ 	OpenSSL_add_all_digests();
+ #ifndef OPENSSL_NO_ENGINE
+-# if defined(__OpenBSD__) || defined(__FreeBSD__)
+ 	ENGINE_setup_bsd_cryptodev();
+-# endif
+ #endif
+ 	}
hooks/post-receive
--
IPFire 2.x development tree

    