old
authorMike Frysinger <vapier@gentoo.org>
Thu, 7 Sep 2006 06:08:00 +0000 (06:08 +0000)
committerMike Frysinger <vapier@gentoo.org>
Thu, 7 Sep 2006 06:08:00 +0000 (06:08 +0000)
sys-fs/mdadm/files/digest-mdadm-1.12.0 [deleted file]
sys-fs/mdadm/files/digest-mdadm-2.5-r1 [deleted file]
sys-fs/mdadm/files/mdadm-2.2-update-segv.patch [deleted file]
sys-fs/mdadm/files/mdadm-2.3.1-endian.patch [deleted file]
sys-fs/mdadm/files/mdadm-2.5-build.patch [deleted file]
sys-fs/mdadm/files/mdadm-2.5-pointer-magic.patch [deleted file]
sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch [deleted file]
sys-fs/mdadm/mdadm-1.12.0.ebuild [deleted file]
sys-fs/mdadm/mdadm-2.5-r1.ebuild [deleted file]

diff --git a/sys-fs/mdadm/files/digest-mdadm-1.12.0 b/sys-fs/mdadm/files/digest-mdadm-1.12.0
deleted file mode 100644 (file)
index a3feb00..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 736705240e918294740929518477fc6f mdadm-1.12.0.tar.bz2 79934
-RMD160 b3274cd12090e5fe1777a8b2d59bc35aa9854401 mdadm-1.12.0.tar.bz2 79934
-SHA256 22831449225cc39948b187c9e3bd89ba12d5c8abee18b2d0242da883cb7d9490 mdadm-1.12.0.tar.bz2 79934
diff --git a/sys-fs/mdadm/files/digest-mdadm-2.5-r1 b/sys-fs/mdadm/files/digest-mdadm-2.5-r1
deleted file mode 100644 (file)
index d5fea9e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 52b7264d6d06258c77439a9ed8dee5e5 mdadm-2.5.tar.bz2 133036
-RMD160 b00da521aad2bd3e3f3e2df7192b6fd71d29ee67 mdadm-2.5.tar.bz2 133036
-SHA256 b6ec7ff2da406b09fb6231238969db334c3881c2470c3e344ae9b0a98ceabff1 mdadm-2.5.tar.bz2 133036
diff --git a/sys-fs/mdadm/files/mdadm-2.2-update-segv.patch b/sys-fs/mdadm/files/mdadm-2.2-update-segv.patch
deleted file mode 100644 (file)
index 2f425c3..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix segfault when update is NULL
-
-http://bugs.gentoo.org/119245
-http://www.mail-archive.com/linux-raid@vger.kernel.org/msg03639.html
-
---- Assemble.c
-+++ Assemble.c
-@@ -219,7 +219,7 @@
-               }
-               if (dfd >= 0) close(dfd);
--              if (ident->uuid_set && (!update && strcmp(update, "uuid")!= 0) &&
-+              if (ident->uuid_set && (!update || strcmp(update, "uuid")!= 0) &&
-                   (!super || same_uuid(info.uuid, ident->uuid, tst->ss->swapuuid)==0)) {
-                       if ((inargv && verbose >= 0) || verbose > 0)
-                               fprintf(stderr, Name ": %s has wrong uuid.\n",
diff --git a/sys-fs/mdadm/files/mdadm-2.3.1-endian.patch b/sys-fs/mdadm/files/mdadm-2.3.1-endian.patch
deleted file mode 100644 (file)
index e0a35cf..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Screw Redhat !
-
-http://bugs.gentoo.org/122269
-
---- mdadm.h
-+++ mdadm.h
-@@ -72,16 +72,7 @@
- #include      "bitmap.h"
- #include <endian.h>
--/* #include "asm/byteorder.h" Redhat don't like this so... */
--#if __BYTE_ORDER == __LITTLE_ENDIAN
--#  include <linux/byteorder/little_endian.h>
--#elif __BYTE_ORDER == __BIG_ENDIAN
--#  include <linux/byteorder/big_endian.h>
--#elif __BYTE_ORDER == __PDP_ENDIAN
--#  include <linux/byteorder/pdp_endian.h>
--#else
--#  error "unknown endianness."
--#endif
-+#include <asm/byteorder.h>
diff --git a/sys-fs/mdadm/files/mdadm-2.5-build.patch b/sys-fs/mdadm/files/mdadm-2.5-build.patch
deleted file mode 100644 (file)
index 4af2b4a..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-Remove bogus depend otherwise things get rebuilt way too often
-
-http://bugs.gentoo.org/137823
-
---- Makefile
-+++ Makefile
-@@ -91,14 +91,12 @@
- everything: all mdadm.static mdadm.uclibc swap_super test_stripe  mdassemble mdassemble.uclibc mdassemble.static mdassemble.man
- # mdadm.tcc doesn't work..
--mdadm : rmconf $(OBJS)
-+mdadm : $(OBJS)
-       $(CC) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
- mdadm.static : STATIC=-DSTATIC
--mdadm.static : rmconf $(OBJS)
-+mdadm.static : $(OBJS)
-       $(CC) $(LDFLAGS) -DSTATIC -static -o mdadm.static $(OBJS) SHA1.o sha1.o
--rmconf:
--      rm -f config.o
- mdadm.tcc : $(SRCS) mdadm.h
-       $(TCC) -o mdadm.tcc $(SRCS)
diff --git a/sys-fs/mdadm/files/mdadm-2.5-pointer-magic.patch b/sys-fs/mdadm/files/mdadm-2.5-pointer-magic.patch
deleted file mode 100644 (file)
index fc72667..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-Clean up strict alias warnings:
-config.c: In function 'free_line':
-config.c:192: warning: dereferencing type-punned pointer will break strict-aliasing rules
-config.c:192: warning: dereferencing type-punned pointer will break strict-aliasing rules
-
-http://bugs.gentoo.org/137440
-
---- mdadm-2.5/dlink.c
-+++ mdadm-2.5/dlink.c
-@@ -8,6 +8,7 @@
- #ifdef __dietlibc__
- char *strncpy(char *dest, const char *src, size_t n) __THROW;
- #endif
-+#define __IN_DLINK
- #include      "dlink.h"
---- mdadm-2.5/dlink.h
-+++ mdadm-2.5/dlink.h
-@@ -12,8 +12,13 @@
- #define       dl_new(t)       ((t*)dl_alloc(sizeof(t)))
- #define       dl_newv(t,n)    ((t*)dl_alloc(sizeof(t)*n))
--#define dl_next(p) *((void**)&(((struct __dl_head*)(p))[-1].dh_next))
--#define dl_prev(p) *((void**)&(((struct __dl_head*)(p))[-1].dh_prev))
-+#ifdef __IN_DLINK
-+#define __DLINK_CAST
-+#else
-+#define __DLINK_CAST (void*)
-+#endif
-+#define dl_next(p) (__DLINK_CAST (((struct __dl_head*)(p))[-1].dh_next))
-+#define dl_prev(p) (__DLINK_CAST (((struct __dl_head*)(p))[-1].dh_prev))
- void *dl_head(void);
- char *dl_strdup(char *);
diff --git a/sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch b/sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch
deleted file mode 100644 (file)
index 71eb1f4..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
- - the SHA1 func is in libcrypto, not libssl
- - control ssl support a bit better
-
---- Makefile
-+++ Makefile
-@@ -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 +76,12 @@
-       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
-+CPPFLAGS += -DNO_SSL
-+endif
-+
- ASSEMBLE_SRCS := mdassemble.c Assemble.c config.c dlink.c util.c super0.c super1.c
- ASSEMBLE_FLAGS:= -DMDASSEMBLE
- ifdef MDASSEMBLE_AUTO
---- super0.c
-+++ super0.c
-@@ -28,7 +28,7 @@
-  */
- #include "mdadm.h"
--#ifndef UCLIBC
-+#ifndef NO_SSL
- #include <openssl/sha.h> /* for SHA1 */
- #else
- extern unsigned char *SHA1(unsigned char *buf, int len, unsigned char *dest);
diff --git a/sys-fs/mdadm/mdadm-1.12.0.ebuild b/sys-fs/mdadm/mdadm-1.12.0.ebuild
deleted file mode 100644 (file)
index 5c83d8b..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-1.12.0.ebuild,v 1.9 2005/12/21 15:09:32 cryos Exp $
-
-inherit eutils
-
-DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
-HOMEPAGE="http://cgi.cse.unsw.edu.au/~neilb/mdadm"
-SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="static"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-       >=sys-apps/portage-2.0.51"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}"/${PN}-1.9.0-dont-make-man.patch
-       if use static ; then
-               sed -i \
-                       -e "/^# LDFLAGS = -static/s:#::" \
-                       Makefile || die "sed Makefile failed"
-       fi
-}
-
-src_compile() {
-       emake CXFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die "make install failed"
-       exeinto /$(get_libdir)/rcscripts/addons
-       doexe "${FILESDIR}"/raid-{start,stop}.sh || die "addon failed"
-       dodoc INSTALL TODO "ANNOUNCE-${PV}"
-
-       insinto /etc
-       newins mdadm.conf-example mdadm.conf
-       newinitd "${FILESDIR}"/mdadm.rc mdadm
-}
diff --git a/sys-fs/mdadm/mdadm-2.5-r1.ebuild b/sys-fs/mdadm/mdadm-2.5-r1.ebuild
deleted file mode 100644 (file)
index 7c10fb6..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.5-r1.ebuild,v 1.6 2006/06/28 18:01:27 gustavoz Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
-HOMEPAGE="http://cgi.cse.unsw.edu.au/~neilb/mdadm"
-SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="static ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-       >=sys-apps/portage-2.0.51"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}"/${P}-ssl-cleanup.patch
-       epatch "${FILESDIR}"/${PN}-2.3.1-endian.patch #122269
-       epatch "${FILESDIR}"/${PN}-1.9.0-dont-make-man.patch
-       epatch "${FILESDIR}"/${PN}-2.4.1-syslog-updates.patch
-       epatch "${FILESDIR}"/${PN}-2.5-build.patch #137823
-       epatch "${FILESDIR}"/${PN}-2.5-pointer-magic.patch #137440
-       use static && append-ldflags -static
-       use ssl && export USE_SSL=1 || export USE_SSL=0
-       sed -i -e 1iUSE_SSL=${USE_SSL} Makefile
-}
-
-src_compile() {
-       emake \
-               CWFLAGS="-Wall" \
-               CXFLAGS="${CFLAGS}" \
-               || die "emake failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "make install failed"
-       exeinto /$(get_libdir)/rcscripts/addons
-       doexe "${FILESDIR}"/raid-{start,stop}.sh || die "addon failed"
-       dodoc INSTALL TODO "ANNOUNCE-${PV}"
-
-       insinto /etc
-       newins mdadm.conf-example mdadm.conf
-       newinitd "${FILESDIR}"/mdadm.rc mdadm || die
-       newconfd "${FILESDIR}"/mdadm.confd mdadm || die
-}