Fix up strict alias warnings #137440 by Andrew Gaffney.

Package-Manager: portage-2.1.1_pre1-r2

5 files changed, 114 insertions, 8 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 2eb275b0c533..e5a7039f45d6 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.31 2006/06/25 00:21:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.32 2006/06/25 00:51:37 vapier Exp $
+
+*mdadm-2.5-r1 (25 Jun 2006)
+
+  25 Jun 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/mdadm-2.5-pointer-magic.patch, +mdadm-2.5-r1.ebuild:
+  Fix up strict alias warnings #137440 by Andrew Gaffney.
 
   25 Jun 2006; Mike Frysinger <vapier@gentoo.org>
   +files/mdadm-2.5-build.patch, files/mdadm-2.5-ssl-cleanup.patch,
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index d999e91eb8dc..64102968e005 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -21,6 +21,10 @@ AUX mdadm-2.5-build.patch 637 RMD160 ba9e726e124e6e608f4e723d3ab371e418de62ac SH
 MD5 c0d08f11fef502935312a424de4b7850 files/mdadm-2.5-build.patch 637
 RMD160 ba9e726e124e6e608f4e723d3ab371e418de62ac files/mdadm-2.5-build.patch 637
 SHA256 96014191d6e819f18ab81f0dd1bbb9f0b0b0d71989b833bf65e8e2bd9b5e8833 files/mdadm-2.5-build.patch 637
+AUX mdadm-2.5-pointer-magic.patch 1061 RMD160 84ece0ef92a6e345bc2377da40d80d5a274c3f5a SHA1 7d3f16634d776e08639c29add212ee129602ee16 SHA256 0546cdc13871c10712650341cd73ec1282d45b6905111826c6807c86bbad024c
+MD5 aebe38b2ef4096ecef42459aca2d6144 files/mdadm-2.5-pointer-magic.patch 1061
+RMD160 84ece0ef92a6e345bc2377da40d80d5a274c3f5a files/mdadm-2.5-pointer-magic.patch 1061
+SHA256 0546cdc13871c10712650341cd73ec1282d45b6905111826c6807c86bbad024c files/mdadm-2.5-pointer-magic.patch 1061
 AUX mdadm-2.5-ssl-cleanup.patch 1031 RMD160 f11ef2d10f78f24626c70818e98118bb0717e6d5 SHA1 81b18ae6cfad3cb51e2600ec4fd9adca49373db2 SHA256 0a2cbe6fef30620c9dda5a0ee56101bc68ea8f6460b0d5a5465291ce855bf7b0
 MD5 8640a321637c2907359bf778def5e36d files/mdadm-2.5-ssl-cleanup.patch 1031
 RMD160 f11ef2d10f78f24626c70818e98118bb0717e6d5 files/mdadm-2.5-ssl-cleanup.patch 1031
@@ -56,14 +60,18 @@ EBUILD mdadm-2.4.1.ebuild 1230 RMD160 f0307f4f51cb0c63bf4735b74fa0b0961f7e6462 S
 MD5 c7f60353a408466abd3891e1e6543be0 mdadm-2.4.1.ebuild 1230
 RMD160 f0307f4f51cb0c63bf4735b74fa0b0961f7e6462 mdadm-2.4.1.ebuild 1230
 SHA256 540323ce865dbe90d5b16c0b12061eae78fe02fb2cf25cd3dce8dced4cd9ee04 mdadm-2.4.1.ebuild 1230
+EBUILD mdadm-2.5-r1.ebuild 1612 RMD160 9166cedad30476f91bada7cefb3e3cfe1ce529a9 SHA1 b1dfa9799ebc30bb78ca4b3625474e247b19caae SHA256 e94acd1c54e0821ebe977b7385f4504d00da0caf35dadf4fbc254ef136aa79c6
+MD5 c4b4ddc82338c9447ee124305b5d2d07 mdadm-2.5-r1.ebuild 1612
+RMD160 9166cedad30476f91bada7cefb3e3cfe1ce529a9 mdadm-2.5-r1.ebuild 1612
+SHA256 e94acd1c54e0821ebe977b7385f4504d00da0caf35dadf4fbc254ef136aa79c6 mdadm-2.5-r1.ebuild 1612
 EBUILD mdadm-2.5.ebuild 1548 RMD160 4297ac9ee17d8935ad069fe00e89ad9459fa8baa SHA1 f637415868dc638245eba744337950b6d57162fb SHA256 c6c8cffece429a991548449cf2e7c8d76d92cf8bf2edcd1a52b1195a60367e30
 MD5 4d5f0b915ef752b4abeaf38288b2ac68 mdadm-2.5.ebuild 1548
 RMD160 4297ac9ee17d8935ad069fe00e89ad9459fa8baa mdadm-2.5.ebuild 1548
 SHA256 c6c8cffece429a991548449cf2e7c8d76d92cf8bf2edcd1a52b1195a60367e30 mdadm-2.5.ebuild 1548
-MISC ChangeLog 7023 RMD160 68b6952d61ae8143606e19b831f391de2f979469 SHA1 195c3d722cf050b8c5c19be6dac8af5ea52d896c SHA256 e1ded7e707786387184fca95c0e5e4f0568eb5e63b7c80b675a4a525256964c9
-MD5 04d93d2cf6b5caeac2a7a55f52200288 ChangeLog 7023
-RMD160 68b6952d61ae8143606e19b831f391de2f979469 ChangeLog 7023
-SHA256 e1ded7e707786387184fca95c0e5e4f0568eb5e63b7c80b675a4a525256964c9 ChangeLog 7023
+MISC ChangeLog 7223 RMD160 8451143d27a5ac010be752383d482eb74894a307 SHA1 02e8bf35cc66e16f5dd92600860f7aaed7ec38c5 SHA256 e1f84ed63cb2439bbff799ac3ef5b6c13d6b0c5a0438762d4879a9adb269bdc2
+MD5 69f0878642866aab7109f0694bcdb175 ChangeLog 7223
+RMD160 8451143d27a5ac010be752383d482eb74894a307 ChangeLog 7223
+SHA256 e1f84ed63cb2439bbff799ac3ef5b6c13d6b0c5a0438762d4879a9adb269bdc2 ChangeLog 7223
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -80,10 +88,13 @@ SHA256 cdaa4cb665d809a130747b668baf6ae88095aa7b2eebbd87e4dfd60694f22c30 files/di
 MD5 6009d7f8aa520235defc770ccd1ce11f files/digest-mdadm-2.5 232
 RMD160 1cc69fbf8acd57f93202c80d442b6f31b73ca064 files/digest-mdadm-2.5 232
 SHA256 db0272a9239da2c4081cbe5b25d8f9dbd8a300681840c7166417d63bfa2caddb files/digest-mdadm-2.5 232
+MD5 6009d7f8aa520235defc770ccd1ce11f files/digest-mdadm-2.5-r1 232
+RMD160 1cc69fbf8acd57f93202c80d442b6f31b73ca064 files/digest-mdadm-2.5-r1 232
+SHA256 db0272a9239da2c4081cbe5b25d8f9dbd8a300681840c7166417d63bfa2caddb files/digest-mdadm-2.5-r1 232
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEndg/amhnQswr0vIRAifnAKCpo0amLm0IablhWiw7V+Dw2LcWSgCgvqOQ
-nIYzxDC2htUb4WoeSAIatiA=
-=DIwE
+iD8DBQFEnd9famhnQswr0vIRAt0wAJ0Qu3psv1J19xR7W87ZnjIt7fCyAQCgiRs7
+GcEYklZyKVkvIMCmtgDX+SA=
+=J9+U
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/files/digest-mdadm-2.5-r1 b/sys-fs/mdadm/files/digest-mdadm-2.5-r1
new file mode 100644
index 000000000000..d5fea9e68ed8
--- /dev/null
+++ b/sys-fs/mdadm/files/digest-mdadm-2.5-r1
@@ -0,0 +1,3 @@
+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.5-pointer-magic.patch b/sys-fs/mdadm/files/mdadm-2.5-pointer-magic.patch
new file mode 100644
index 000000000000..fc72667a284b
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-2.5-pointer-magic.patch
@@ -0,0 +1,35 @@
+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/mdadm-2.5-r1.ebuild b/sys-fs/mdadm/mdadm-2.5-r1.ebuild
new file mode 100644
index 000000000000..2b32f8ea4c41
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-2.5-r1.ebuild
@@ -0,0 +1,51 @@
+# 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.1 2006/06/25 00:51:37 vapier 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
+}