[Pkg-loop-aes-commits] r1378 - in /upstream/ciphers/current: ChangeLog Makefile dkms.conf

[xam at users.alioth.debian.org]

Author: xam
Date: Sun Feb 25 12:40:25 2007
New Revision: 1378

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1378
Log:
Import ciphers v3.0d

Modified:
    upstream/ciphers/current/ChangeLog
    upstream/ciphers/current/Makefile
    upstream/ciphers/current/dkms.conf

Modified: upstream/ciphers/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-loop-aes/upstream/ciphers/current/ChangeLog?rev=1378&op=diff
==============================================================================
--- upstream/ciphers/current/ChangeLog (original)
+++ upstream/ciphers/current/ChangeLog Sun Feb 25 12:40:25 2007
@@ -117,3 +117,6 @@
 
 ciphers-v3.0c    January 18 2006
     - Makefile changed to work around 2.6.16-rc1 build breakage.
+
+ciphers-v3.0d    April 10 2006
+    - Fixed Makefile incompatibility with USE_KBUILD=y build option.

Modified: upstream/ciphers/current/Makefile
URL: http://svn.debian.org/wsvn/pkg-loop-aes/upstream/ciphers/current/Makefile?rev=1378&op=diff
==============================================================================
--- upstream/ciphers/current/Makefile (original)
+++ upstream/ciphers/current/Makefile Sun Feb 25 12:40:25 2007
@@ -1,7 +1,7 @@
 #
 #  Makefile
 #
-#  Written by Jari Ruusu, January 6 2006
+#  Written by Jari Ruusu, January 27 2006
 #
 #  Copyright 2001-2006 by Jari Ruusu.
 #  Redistribution of this file is permitted under the GNU Public License.
@@ -83,10 +83,12 @@
 	SR1:=$(shell if grep -q -s "^basename_flags.*KBUILD_BASENAME.*KBUILD_STR" $(LS)/scripts/Makefile.lib; then echo y; fi)
 endif
 
+ifneq ($(USE_KBUILD),y)
 ifeq ($(SR1),y)
 	EF += -D"KBUILD_STR(s)=\#s"
 else
 	EF += -D"KBUILD_STR(s)=s"
+endif
 endif
 
 # This is list of modules to build and install

Modified: upstream/ciphers/current/dkms.conf
URL: http://svn.debian.org/wsvn/pkg-loop-aes/upstream/ciphers/current/dkms.conf?rev=1378&op=diff
==============================================================================
--- upstream/ciphers/current/dkms.conf (original)
+++ upstream/ciphers/current/dkms.conf Sun Feb 25 12:40:25 2007
@@ -1,7 +1,7 @@
 # dkms.conf for Dynamic Kernel Module Support
 # http://linux.dell.com/dkms/dkms.html for more info
 
-PACKAGE_VERSION=v3.0c
+PACKAGE_VERSION=v3.0d
 
 # Items below here should not have to change with each driver version
 PACKAGE_NAME="ciphers"