Commit forgotten patch (by Alexander Tsoy)

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 87 insertions, 5 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 78494de7aa9f..85f97007e24e 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.277 2012/11/24 08:45:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.278 2012/11/24 10:06:55 pacho Exp $
+
+  24 Nov 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/lvm2-2.02.97-strict-aliasing.patch:
+  Commit forgotten patch (by Alexander Tsoy)
 
 *lvm2-2.02.97-r1 (24 Nov 2012)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 6c3b8f74d8ae..372a393efb9b 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -32,6 +32,7 @@ AUX lvm2-2.02.92-dynamic-static-ldflags.patch 3031 SHA256 90b880572186d4d1abf049
 AUX lvm2-2.02.92-locale-muck.patch 570 SHA256 3b24abd3c1254de1727a91b6ade26c36dc8dbee8ecbfab4bf6afbad21fdd59ff SHA512 2496cd39b06a69441dc7fe223eab4da25ca76e9f79be85d0f162dba784c3a86afaf430a366dac83354e07dcf07a486d5abee2bb4c677a84c13bd22998cfdfd39 WHIRLPOOL ed28aa549983fb9c1b1e1fe17bf2eca624dec43400fe1c8b67b00e010c3d745ec5f29479e7b4bed67ac2d4d1d6237df91eba7318e33d5e592893f76b17e9074a
 AUX lvm2-2.02.95-lvmpath.patch 1247 SHA256 48d65570cbf86dcf749a0e77a1c57e26170ee90ddb8d8800988eab451f402456 SHA512 92b104476911882d0dae97251942a0dbf6c58d6d5c5af77e74b3e41de95a155966392fb539affef3de6def107168b436c54e5ee000bdff0c4701748481940eb4 WHIRLPOOL 26d00f35cdd4a0bbdabdda0a5a69956e7c7ed90dd3e774cfac46c4eb0e339a09e03dcd617b49863a550e79c72d327b3007ffa17ecd27750bf3a759058c4c9e7e
 AUX lvm2-2.02.95-udev185.patch 6792 SHA256 3067d45a2829f94b9c5f7f5d38cceb2c36bdf181417aaab7d45e359df501099f SHA512 2296344ca2746f71a12874723b2bbed218bd3114144329b3f0d0910512bd61d85b81d2e72fbb0e27d6c618fcb93be6ac05c95d32c3972a3df55357d004d7e713 WHIRLPOOL b7d971f7818384572c9307f828360d2faf395f949832560bbeeb647da7e0ebba6f4cca5dc2a40080e9ad440f8a6ca193076794e5be4d927ed40efa214e0e37c2
+AUX lvm2-2.02.97-strict-aliasing.patch 3142 SHA256 a4c799777c8e5a83fe1af52ed623ba472b859b5a0356dab2b53b31837b3a582e SHA512 7828562bb0fb95f3f75d08845b8c4767815dd74e117795ec873ea11135deaf389d6f0f8d66cf3c9b3843d6fa977c4be1a341013bcf4f016299e238c0d90be878 WHIRLPOOL 84f957d7b833896fe86fa9bf4c83183a8fb3c96780fd387288371df4fbf697f1ecc1c554862ea749ec72728bd608c1c8a1776cd26185903b53d559e3760d743c
 AUX lvm2-start.sh 1025 SHA256 8c7da13b6326a383888110b25f53a4902cbec7d0dace274b9c5f1d6b0a775039 SHA512 8f89b550f5220b0b0f9f2ac24b0a76b9beee0acaf2eff1b9c6d28287498d7255cce8f1cdabfdfdbebfd35159f251ce8b45fca50f1798b3facdf7915b4724329b WHIRLPOOL 131de6e639f2bd17e3ef7a10e2349451ada1e24db17955cb69d67c816471a0f6ef6c933acb87507f0f6e8d98ab3dda54c047c68cd35f0afd25abf744f24d289f
 AUX lvm2-start.sh-2.02.49-r3 1244 SHA256 e9c72d8500294301131183b37a7060dbcbd1d01b2a3e8425cf644e07652fae87 SHA512 5e57db4f24584437262f76d1c7ea8753decca8c4b041ec2e0414d92a81ea04cff48fee48fa01b7a0d7d9bc97493cee32ce78da6348f3920704be64f9671bb5ec WHIRLPOOL d90452503560ff6e97235c34f2bba7cca96905a4f881cd3fd7aa47c5a191b2529596c944c95aa8d7472ef5d2d7ad4a21432ac702ce1094697d42219a20d671a7
 AUX lvm2-start.sh-2.02.67-r1 1267 SHA256 48def1f022a337df7cd030c0d1e386d843026814da5494dde5610aa66af94bd2 SHA512 0b60d5be19673927872b310b6825c5912dea55028b05668914856cb085fcf229fffc0089479b1e5bf346cc9e6f1c7f024634cafca5ebfbd0f431264455ddc4f4 WHIRLPOOL 59db10f46e56ef19824b0c43a92790a29a108648138137dfe40c3fa9673d2df3087d8852bae4843dbdc04db393d12fc318a7db186ce2e5ab039dde288c259516
@@ -77,12 +78,12 @@ EBUILD lvm2-2.02.95-r4.ebuild 8576 SHA256 d37fc774ea63a4e9ed12f9793ba7e8e0fde50a
 EBUILD lvm2-2.02.95.ebuild 8340 SHA256 fbd1b45682794c1567c0ee446732aa82ecd09adb8c9e1302f4abe3bee0cc81d1 SHA512 a248b9965ffa4c61cbd32fd6066ba19c10ac75e825bf09d33acb0990322c2756188b780f48c64ed1e79f8f8530060faaa860652606dcab2dd7499d0f5d38530a WHIRLPOOL 34b71d19dc765cab3c67181d99b5d8d7b4af2e39afdb1bfc525b8d2cc1965d887ab5ea93461793c23c81d241566b2011a9f8bcba8e1dfeb58e25731cbec72713
 EBUILD lvm2-2.02.97-r1.ebuild 8894 SHA256 3dd0db2d32a1232197c51e5f13721d35985dcaf40e3e79763394c68536b5e9f9 SHA512 16bc62604571fd696635617b4deea7196c0ab61add302380e357277d95b8911fe69a99f90d83106c258da070f768ab5d6ea9bd79d453b6dc6bd69c2814f92ca9 WHIRLPOOL e35a2a80ca0130793bc154f31975b02a5ea769d87763b5c7910d91d193e25205aeb0b95e051c594fc95546d92edf62c2eb0ee24688b2a9d693d35ad5d9c81754
 EBUILD lvm2-2.02.97.ebuild 8611 SHA256 9ea852ce5485a7c32138bbc8a1115bf72c34cc2392ee21a5dd300a0de1fee60a SHA512 ac1221cb385518fddbc23c9414cc469ea894d945d307fa2568a980d6bd5a318ec5e9dc70c655d80ed293dd92d85950c0415592ac726b96d4f14b74a560094155 WHIRLPOOL 68ad0bc9b9d0085dc5147ff055736c887c284aea4a448dd33b3bedd9f8e9a3a6b996cbebe9910e7fc5f2f258ba83f7f5e0122a8eb0aa9086b7ed2314a02da4d3
-MISC ChangeLog 51274 SHA256 f4aaf7b1ec1990bcea314ccfc3b82b7bd79af4568dec6b16bf113e7caca89176 SHA512 e75b99af09a21dfa577f042ef0a2b0327cb6f1fccbd8367f521a521b421377f9fe3fe8a4656a0471606e28659f588652a3d101604d4732c99b022f5515aee577 WHIRLPOOL ca9dfaaef1e164178f768898d58194230299c1d8e13c27c5b50c8f11e4d3e504f90b66dcb389ec6aa86b8b4ac59df38f5e7f3252cbeafdbb281a90df8b16085a
+MISC ChangeLog 51411 SHA256 74cd408d81506705be7421f2b76a97dadcafd7e78d8b21cabb9b7b43bfe9dead SHA512 cb859be573cd4a311abe0cfef330a77298bc11dce884612e24ce928973e983ef5a15f47964d1087b4e2eed841a62e4b601e9f19a4fba22217569e0f6234eb9e8 WHIRLPOOL 89759bb58cc81df1ae910f20dee295b1f07f5dd2c794aa219b5568216c3efe4da992793e9d5ff9053c30684adda452f403f00540480f05bc36f22d18d667e78a
 MISC metadata.xml 822 SHA256 419b6c05e9d710ff09188d6fd97d1d5a2e1f6a40ee04cfb9b8673c4898ea3a5d SHA512 a5a3c4a5a6eec44b451ee78077325e466cb9205ae8dcc5095792b93c0bf9d87fad71d81c04265480708d59a4cf45e2fe863f06fa1650176a5a2e03a1e2ed1098 WHIRLPOOL 111c1c52eda324439850db82ef69a0c5659186db646857ea549963a38b4b76a67bdbdf0a3ff8945ee8ccacf9bdcfd827ce94482d63fee55956eca08ee6d869df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCwiRYACgkQCaWpQKGI+9QyuACdF9/V2Pe56o32K0HzPYb7lW4A
-HTMAnR4QDtWnD04ZM8yHWWQtehahh4+Y
-=tOSb
+iEYEAREIAAYFAlCwnEAACgkQCaWpQKGI+9RIyACfZhXeRra881PCcu1xzz51J7Bg
+NgEAn1Zw1yuTzgrzWC6ogy7rmPw5fVMM
+=RmRw
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/files/lvm2-2.02.97-strict-aliasing.patch b/sys-fs/lvm2/files/lvm2-2.02.97-strict-aliasing.patch
new file mode 100644
index 000000000000..77394c0dc2fd
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.97-strict-aliasing.patch
@@ -0,0 +1,77 @@
+From 6595cae6e9b65658430714b9731b604c036d0816 Mon Sep 17 00:00:00 2001
+From: Zdenek Kabelac <zkabelac@redhat.com>
+Date: Sat, 13 Oct 2012 18:51:07 +0000
+Subject: cleanup: resolve dereferencing type-punned pointer
+
+fix gcc warning:
+dereferencing type-punned pointer will break strict-aliasing rules
+Replace call by value and pass just const pointer to pvid.
+---
+diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c
+index 1a52787..a3b45d5 100644
+--- a/lib/cache/lvmetad.c
++++ b/lib/cache/lvmetad.c
+@@ -444,7 +444,7 @@ int lvmetad_vg_update(struct volume_group *vg)
+ 
+ 	dm_list_iterate_items(pvl, &vg->pvs) {
+ 		/* NB. the PV fmt pointer is sometimes wrong during vgconvert */
+-		if (pvl->pv->dev && !lvmetad_pv_found(pvl->pv->id, pvl->pv->dev,
++		if (pvl->pv->dev && !lvmetad_pv_found(&pvl->pv->id, pvl->pv->dev,
+ 						      vg->fid ? vg->fid->fmt : pvl->pv->fmt,
+ 						      pvl->pv->label_sector, NULL, NULL))
+ 			return 0;
+@@ -657,7 +657,7 @@ static int _extract_mdas(struct lvmcache_info *info, struct dm_config_tree *cft,
+ 	return 1;
+ }
+ 
+-int lvmetad_pv_found(struct id pvid, struct device *device, const struct format_type *fmt,
++int lvmetad_pv_found(const struct id *pvid, struct device *device, const struct format_type *fmt,
+ 		     uint64_t label_sector, struct volume_group *vg, activation_handler handler)
+ {
+ 	char uuid[64];
+@@ -670,7 +670,7 @@ int lvmetad_pv_found(struct id pvid, struct device *device, const struct format_
+ 	if (!lvmetad_active() || test_mode())
+ 		return 1;
+ 
+-	if (!id_write_format(&pvid, uuid, sizeof(uuid)))
++	if (!id_write_format(pvid, uuid, sizeof(uuid)))
+                 return_0;
+ 
+ 	pvmeta = dm_config_create();
+@@ -848,7 +848,7 @@ int lvmetad_pvscan_single(struct cmd_context *cmd, struct device *dev,
+ 	 * *exact* image of the system, the lvmetad instance that went out of
+ 	 * sync needs to be killed.
+ 	 */
+-	if (!lvmetad_pv_found(*(struct id *)dev->pvid, dev, lvmcache_fmt(info),
++	if (!lvmetad_pv_found((const struct id *) &dev->pvid, dev, lvmcache_fmt(info),
+ 			      label->sector, baton.vg, handler)) {
+ 		release_vg(baton.vg);
+ 		goto_bad;
+diff --git a/lib/cache/lvmetad.h b/lib/cache/lvmetad.h
+index 724922d..5f0f552 100644
+--- a/lib/cache/lvmetad.h
++++ b/lib/cache/lvmetad.h
+@@ -93,7 +93,7 @@ int lvmetad_vg_remove(struct volume_group *vg);
+  * number on the cached and on the discovered PV match but the metadata content
+  * does not.
+  */
+-int lvmetad_pv_found(struct id pvid, struct device *device,
++int lvmetad_pv_found(const struct id *pvid, struct device *device,
+ 		     const struct format_type *fmt, uint64_t label_sector,
+ 		     struct volume_group *vg, activation_handler handler);
+ 
+diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
+index 5a633b6..c210a63 100644
+--- a/lib/metadata/metadata.c
++++ b/lib/metadata/metadata.c
+@@ -3807,7 +3807,7 @@ int pv_write(struct cmd_context *cmd __attribute__((unused)),
+ 	if (!pv->fmt->ops->pv_write(pv->fmt, pv))
+ 		return_0;
+ 
+-	if (!lvmetad_pv_found(pv->id, pv->dev, pv->fmt, pv->label_sector,
++	if (!lvmetad_pv_found(&pv->id, pv->dev, pv->fmt, pv->label_sector,
+ 			      NULL, NULL))
+ 		return_0;
+ 
+--
+cgit v0.9.0.3