[Pkg-loop-aes-commits] r1376 - in /upstream/ciphers/current:
ChangeLog Makefile README dkms.conf
xam at users.alioth.debian.org
xam at users.alioth.debian.org
Sun Feb 25 12:38:11 CET 2007
Author: xam
Date: Sun Feb 25 12:38:11 2007
New Revision: 1376
URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1376
Log:
Import ciphers v3.0c
Modified:
upstream/ciphers/current/ChangeLog
upstream/ciphers/current/Makefile
upstream/ciphers/current/README
upstream/ciphers/current/dkms.conf
Modified: upstream/ciphers/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-loop-aes/upstream/ciphers/current/ChangeLog?rev=1376&op=diff
==============================================================================
--- upstream/ciphers/current/ChangeLog (original)
+++ upstream/ciphers/current/ChangeLog Sun Feb 25 12:38:11 2007
@@ -114,3 +114,6 @@
- Changed gcc command line parameter order to be same as in kernel
Makefile. Wrong parameter order caused miscompilation with Xen
architecture (2.6 kernels).
+
+ciphers-v3.0c January 18 2006
+ - Makefile changed to work around 2.6.16-rc1 build breakage.
Modified: upstream/ciphers/current/Makefile
URL: http://svn.debian.org/wsvn/pkg-loop-aes/upstream/ciphers/current/Makefile?rev=1376&op=diff
==============================================================================
--- upstream/ciphers/current/Makefile (original)
+++ upstream/ciphers/current/Makefile Sun Feb 25 12:38:11 2007
@@ -1,9 +1,9 @@
#
# Makefile
#
-# Written by Jari Ruusu, February 27 2005
-#
-# Copyright 2001-2005 by Jari Ruusu.
+# Written by Jari Ruusu, January 6 2006
+#
+# Copyright 2001-2006 by Jari Ruusu.
# Redistribution of this file is permitted under the GNU Public License.
#
# To compile and install, use commands: make clean; make
@@ -56,6 +56,7 @@
VM1:=
VM2:=
VM3:=
+SR1:=n
ifeq ($(shell if [ "$(VERSION)$(PATCHLEVEL)0" -lt 260 ]; then echo y; fi),y)
OD1:=$(LS)
endif
@@ -78,6 +79,14 @@
else if test -f $(VM2)/extra/loop.ko; then echo $(VM2)/extra/loop.ko; \
else if test -f $(VM2)/kernel/drivers/block/loop.ko; then echo $(VM2)/kernel/drivers/block/loop.ko; \
fi; fi; fi)
+ # some 2.6 kernels need # character in KBUILD_BASENAME and KBUILD_MODNAME
+ SR1:=$(shell if grep -q -s "^basename_flags.*KBUILD_BASENAME.*KBUILD_STR" $(LS)/scripts/Makefile.lib; then echo y; fi)
+endif
+
+ifeq ($(SR1),y)
+ EF += -D"KBUILD_STR(s)=\#s"
+else
+ EF += -D"KBUILD_STR(s)=s"
endif
# This is list of modules to build and install
@@ -148,28 +157,28 @@
endif
loop_twofish.$(VM1)o: loop_twofish.c
- $(CP1) $(CC) $(CFLAGS) $(EF) -DKBUILD_BASENAME=loop_twofish -DKBUILD_MODNAME=loop_twofish -c $(PP1)loop_twofish.c -o $(PP1)loop_twofish.o
+ $(CP1) $(CC) $(CFLAGS) $(EF) -D"KBUILD_BASENAME=KBUILD_STR(loop_twofish)" -D"KBUILD_MODNAME=KBUILD_STR(loop_twofish)" -c $(PP1)loop_twofish.c -o $(PP1)loop_twofish.o
ifneq "$(VM1)" ""
$(CP1) $(MP1) vmlinux $(PP1)loop_twofish.o $(VM3) >/dev/null 2>&1
- $(CP1) $(CC) $(CFLAGS) $(EF) -DKBUILD_BASENAME=loop_twofish_mod -DKBUILD_MODNAME=loop_twofish -c $(PP1)loop_twofish.mod.c -o $(PP1)loop_twofish.mod.o
+ $(CP1) $(CC) $(CFLAGS) $(EF) -D"KBUILD_BASENAME=KBUILD_STR(loop_twofish_mod)" -D"KBUILD_MODNAME=KBUILD_STR(loop_twofish)" -c $(PP1)loop_twofish.mod.c -o $(PP1)loop_twofish.mod.o
$(LD) $(LF) loop_twofish.o loop_twofish.mod.o -o loop_twofish.$(VM1)o
rm -f loop_twofish.o loop_twofish.mod.[co] $(VM3).mod.[co]
endif
loop_serpent.$(VM1)o: loop_serpent.c
- $(CP1) $(CC) $(CFLAGS) $(EF) -DKBUILD_BASENAME=loop_serpent -DKBUILD_MODNAME=loop_serpent -c $(PP1)loop_serpent.c -o $(PP1)loop_serpent.o
+ $(CP1) $(CC) $(CFLAGS) $(EF) -D"KBUILD_BASENAME=KBUILD_STR(loop_serpent)" -D"KBUILD_MODNAME=KBUILD_STR(loop_serpent)" -c $(PP1)loop_serpent.c -o $(PP1)loop_serpent.o
ifneq "$(VM1)" ""
$(CP1) $(MP1) vmlinux $(PP1)loop_serpent.o $(VM3) >/dev/null 2>&1
- $(CP1) $(CC) $(CFLAGS) $(EF) -DKBUILD_BASENAME=loop_serpent_mod -DKBUILD_MODNAME=loop_serpent -c $(PP1)loop_serpent.mod.c -o $(PP1)loop_serpent.mod.o
+ $(CP1) $(CC) $(CFLAGS) $(EF) -D"KBUILD_BASENAME=KBUILD_STR(loop_serpent_mod)" -D"KBUILD_MODNAME=KBUILD_STR(loop_serpent)" -c $(PP1)loop_serpent.mod.c -o $(PP1)loop_serpent.mod.o
$(LD) $(LF) loop_serpent.o loop_serpent.mod.o -o loop_serpent.$(VM1)o
rm -f loop_serpent.o loop_serpent.mod.[co] $(VM3).mod.[co]
endif
loop_blowfish.$(VM1)o: loop_blowfish.c
- $(CP1) $(CC) $(CFLAGS) $(EF) -DKBUILD_BASENAME=loop_blowfish -DKBUILD_MODNAME=loop_blowfish -c $(PP1)loop_blowfish.c -o $(PP1)loop_blowfish.o
+ $(CP1) $(CC) $(CFLAGS) $(EF) -D"KBUILD_BASENAME=KBUILD_STR(loop_blowfish)" -D"KBUILD_MODNAME=KBUILD_STR(loop_blowfish)" -c $(PP1)loop_blowfish.c -o $(PP1)loop_blowfish.o
ifneq "$(VM1)" ""
$(CP1) $(MP1) vmlinux $(PP1)loop_blowfish.o $(VM3) >/dev/null 2>&1
- $(CP1) $(CC) $(CFLAGS) $(EF) -DKBUILD_BASENAME=loop_blowfish_mod -DKBUILD_MODNAME=loop_blowfish -c $(PP1)loop_blowfish.mod.c -o $(PP1)loop_blowfish.mod.o
+ $(CP1) $(CC) $(CFLAGS) $(EF) -D"KBUILD_BASENAME=KBUILD_STR(loop_blowfish_mod)" -D"KBUILD_MODNAME=KBUILD_STR(loop_blowfish)" -c $(PP1)loop_blowfish.mod.c -o $(PP1)loop_blowfish.mod.o
$(LD) $(LF) loop_blowfish.o loop_blowfish.mod.o -o loop_blowfish.$(VM1)o
rm -f loop_blowfish.o loop_blowfish.mod.[co] $(VM3).mod.[co]
endif
Modified: upstream/ciphers/current/README
URL: http://svn.debian.org/wsvn/pkg-loop-aes/upstream/ciphers/current/README?rev=1376&op=diff
==============================================================================
--- upstream/ciphers/current/README (original)
+++ upstream/ciphers/current/README Sun Feb 25 12:38:11 2007
@@ -1,6 +1,6 @@
-Written by Jari Ruusu <jariruusu at users.sourceforge.net>, November 27 2004
-
-Copyright 2002,2003,2004 by Jari Ruusu.
+Written by Jari Ruusu <jariruusu at users.sourceforge.net>, May 27 2005
+
+Copyright 2002-2005 by Jari Ruusu.
Redistribution of this file is permitted under the GNU Public License.
@@ -26,7 +26,7 @@
Latest version of this package can be found at:
http://loop-aes.sourceforge.net/
- http://members.tiscali.fi/ce6c8edf/ (limited downloads)
+ http://members.surfeu.fi/ce6c8edf/ (limited downloads)
New versions are announced to linux-crypto mailing list:
Modified: upstream/ciphers/current/dkms.conf
URL: http://svn.debian.org/wsvn/pkg-loop-aes/upstream/ciphers/current/dkms.conf?rev=1376&op=diff
==============================================================================
--- upstream/ciphers/current/dkms.conf (original)
+++ upstream/ciphers/current/dkms.conf Sun Feb 25 12:38:11 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.0b
+PACKAGE_VERSION=v3.0c
# Items below here should not have to change with each driver version
PACKAGE_NAME="ciphers"
More information about the Pkg-loop-aes-commits
mailing list