Author: jue Date: 2006-06-16 09:11:17 +0200 (Fri, 16 Jun 2006) New Revision: 1525 Removed: crux-2.2/ports/opt/mdadm/mdadm-ssl.patch Modified: crux-2.2/ports/opt/mdadm/.md5sum crux-2.2/ports/opt/mdadm/Pkgfile Log: mdadm: update to 2.5.1 Modified: crux-2.2/ports/opt/mdadm/.md5sum =================================================================== --- crux-2.2/ports/opt/mdadm/.md5sum 2006-06-16 06:58:45 UTC (rev 1524) +++ crux-2.2/ports/opt/mdadm/.md5sum 2006-06-16 07:11:17 UTC (rev 1525) @@ -1,2 +1 @@ -2c8bc887affb2247ee5f4b50067fac8f mdadm-2.5.tar.gz -69c81b2973dd0a24e105a718b94b6892 mdadm-ssl.patch +ec7fba336d75352228d58a65f385f32c mdadm-2.5.1.tar.gz Modified: crux-2.2/ports/opt/mdadm/Pkgfile =================================================================== --- crux-2.2/ports/opt/mdadm/Pkgfile 2006-06-16 06:58:45 UTC (rev 1524) +++ crux-2.2/ports/opt/mdadm/Pkgfile 2006-06-16 07:11:17 UTC (rev 1525) @@ -3,13 +3,11 @@ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de name=mdadm -version=2.5 +version=2.5.1 release=1 -source=(http://www.kernel.org/pub/linux/utils/raid/$name/$name-$version.tar.gz \ - $name-ssl.patch) +source=(http://www.kernel.org/pub/linux/utils/raid/$name/$name-$version.tar.gz) build() { cd $name-$version - patch -p1 < $SRC/$name-ssl.patch - make CXFLAGS="$CFLAGS" USE_SSL=0 DESTDIR=$PKG MANDIR=/usr/man install + make CXFLAGS="$CFLAGS" DESTDIR=$PKG MANDIR=/usr/man install } Deleted: crux-2.2/ports/opt/mdadm/mdadm-ssl.patch =================================================================== --- crux-2.2/ports/opt/mdadm/mdadm-ssl.patch 2006-06-16 06:58:45 UTC (rev 1524) +++ crux-2.2/ports/opt/mdadm/mdadm-ssl.patch 2006-06-16 07:11:17 UTC (rev 1525) @@ -1,26 +0,0 @@ -diff -Nru mdadm-2.5.orig/Makefile mdadm-2.5/Makefile ---- mdadm-2.5.orig/Makefile 2006-06-15 12:49:16.000000000 +0200 -+++ mdadm-2.5/Makefile 2006-06-15 12:52:54.000000000 +0200 -@@ -32,7 +32,9 @@ - TCC = tcc - UCLIBC_GCC = $(shell for nm in i386-uclibc-linux-gcc i386-uclibc-gcc; do which $$nm > /dev/null && { echo $$nm ; exit; } ; done; echo false No uclibc found ) - DIET_GCC = diet gcc --LDLIBS=-lssl -+ifeq ($(USE_SSL),1) -+LDLIBS=-lcrypto -+endif - - KLIBC=/home/src/klibc/klibc-0.77 - -@@ -72,6 +74,11 @@ - Create.c Detail.c Examine.c Grow.c Monitor.c dlink.c Kill.c Query.c \ - mdopen.c super0.c super1.c bitmap.c restripe.c sysfs.c - -+ifneq ($(USE_SSL),1) -+OBJS += SHA1.o sha1.o -+SRCS += SHA1.c sha1.c -+endif -+ - ASSEMBLE_SRCS := mdassemble.c Assemble.c config.c dlink.c util.c super0.c super1.c - ASSEMBLE_FLAGS:= -DMDASSEMBLE - ifdef MDASSEMBLE_AUTO