ucommon-5.2.2 patch fixed

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 28 insertions, 20 deletions

diff --git a/dev-libs/ucommon/ChangeLog b/dev-libs/ucommon/ChangeLog
index bdc222026255..8cbd18fcd17e 100644
--- a/dev-libs/ucommon/ChangeLog
+++ b/dev-libs/ucommon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/ucommon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ChangeLog,v 1.5 2012/08/19 21:22:42 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ChangeLog,v 1.6 2012/08/20 06:32:06 qnikst Exp $
+
+*ucommon-5.2.2-r3 (20 Aug 2012)
+
+  20 Aug 2012; Alexander Vershilov <qnikst@gentoo.org>
+  -ucommon-5.2.2-r2.ebuild, +ucommon-5.2.2-r3.ebuild,
+  files/ucommon-5.2.2-address.patch:
+  ucommon-5.2.2 patch fixed
 
 *ucommon-5.2.2-r2 (20 Aug 2012)
 
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index 709b7d1aa519..15565bdc471c 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -1,6 +1,6 @@
 AUX disable_rtf_gen_doxy.patch 446 SHA256 19742ff3a149ca50d7397f9ffafc5c70fb332837e2eae81b914e47cf9e8b1f20 SHA512 fe4168b313b5eca78fe8787b758c789c4b91df8355e380acd71c32735ad5c6984a3d6c06747e0215326870eba05d38ca015c88e5ca4166f42b3213ecfb1ad793 WHIRLPOOL 3bb313489028b0e0098e6338fa563327ecfd0cdd3f3e0e410d0c07d532ffe0572e742e4e81b4a9e8e94730211a0b3c4bd473302700f6cb78cd93a5998076796f
-AUX ucommon-5.2.2-address.patch 1511 SHA256 6dfc182e7621f152edd571c32b93ae2fabdcdb58049fcfdbf7556fde2d8bf4c2 SHA512 56d5852258af82485cd40d53615a11f8b0396dfdd2e22c3e7d4c35f7bfd3b32f9f3ad5baea86c2a3435b779b96b678fefe7cd4bdec7230f4d583abc701ff541d WHIRLPOOL d9efc66fa43c2fc98bde1a8be3597757a029f146259ee7c2e183f6951d7c41b0db415154b84ab0270551c0c838216d2d253bc1006ad4fd985091c8687af8d679
+AUX ucommon-5.2.2-address.patch 1289 SHA256 1185931d42376bf3b980eff21a255b4a1bad5f61a97bf9129711afbbecbbd8ad SHA512 22950b7c5adc3af05e21e8324dd46665ac197f1de4c988fd2b28096d3bd18f00c5e4ab275e02571251607bdd3661caae950a2397e253293b62097e9cfce8847c WHIRLPOOL 73c616b7dc99074c95241a50bd2a0aa63d0322412588674431988004a27372c0df25df7a69a96d0fcc08bcc29c96b550097c08c717f143425d912bc750e357c8
 DIST ucommon-5.2.2.tar.gz 792081 SHA256 9d5f3f4d1ef897482fe470b0dd65b0df516aaeb874eac3a33a455abca13f39e9 SHA512 5d5e526675cb39dffea48c38a14dff4eb1316a59c60e2352cfdbb0727ff4db00417e9704026f106da5d34f92ec2be3385b0763d66196f345f0b775bf62eb0125 WHIRLPOOL f857c4b06aff4bbb1ff84edc810d674c7d77a92bb4bcdb62fed64e77e9979c7d736b93596166de6c5fb848745aa7efc1b666231bdb6a33c3b959953b4b114ac2
-EBUILD ucommon-5.2.2-r2.ebuild 1265 SHA256 9af96852cca80e9e18fbf1f59e195f3ed593e71ba2c9c384c1a37acb6dfe8a5a SHA512 302598bcaca045a95f755c6cad6486791c7e1d4b26d92a058477cc34ab182ae9c03bc169a57a6f0caadbda23cd7eec86a6ec0ce687016f27f35a86d6e691b0a9 WHIRLPOOL 1a12486f8b21d3945cc163413465de1932cb1a22b1c5b9a6b0cec66b44546c5cf8f36ca0837ff03ef19da8d4ebef78435be74e7ca5691279c2667b4c2b8763af
-MISC ChangeLog 1150 SHA256 32ada14821b30b877a572de9f2dee0a2b4f65696df61fa0fe3dd92945d495111 SHA512 49509ca76407318499ec6e57228ce34eeeb2730fea113f97b3bffefb4e899a95dd6664f45dd226623d0661f9c3d54aafbe9583d89c3f0b1e875a439a4502e0be WHIRLPOOL a495a9e01203bfc580d66f50619183dca38a2e2698657b9a05dcc66521898ee647bb50196cbf5402323817045ece8589047058acca5d78b41d51ca84590b50af
+EBUILD ucommon-5.2.2-r3.ebuild 1301 SHA256 ab69fb75201292b98f4462461240446128642ab8fd853928f2e77e972b547a77 SHA512 63e32090ecb411f8a8267d6ee5127a6a1eaf48c3433daf1850f754a08708c91bbe8b164855e506289f630d8f8baf446841a7f59daf906c05b650d8c0f6f0292f WHIRLPOOL e959595841d8fefc01fb0574302457330837430dd3a64348f8615dc3a5c2928ae33e8b2dc47b8211c8633643eb71b3a4325f08e8e5974d125faae509fcabdd40
+MISC ChangeLog 1358 SHA256 659151c3662cbac19c7dc6d991d9be9e5e230244bf35a08a18d7633747cd498a SHA512 0987a565cae5732539294eea94eccde461b1b959c57e65de5e85d72579c390c487f01af51f5ff042c41a36935aa961b2a35c86de5cbb027f6f81c43d85c672eb WHIRLPOOL ba2e03b7e14d3c8e08171b016cfcae20dcd53fdd87422aabd770f0579f6264902e75970cc5dac677dec42099c8e64aa209a28a06ad830d0cf65f9757b3b32c10
 MISC metadata.xml 499 SHA256 7ecb2239abae6dabdb8cdb58bd89c3de5528abd72156c5c21f80260e73ff22da SHA512 0cba08ae15d8f49486bbf5fb52067e14803181300929200864eec90848f5f732e1867d90ffb4b0d9ede636395ca069c628337a0387acd989b06a76b3d5a548b6 WHIRLPOOL 3be73537f63e235b2105d89bcb8ac3732ddafebe8ce01fc6acf309ca2a41488062f2054a909289df63e019e20039935518b6f3b7337fd8284ccd1c41aadac1ee
diff --git a/dev-libs/ucommon/files/ucommon-5.2.2-address.patch b/dev-libs/ucommon/files/ucommon-5.2.2-address.patch
index d74f9299b9ba..142aa5941f8c 100644
--- a/dev-libs/ucommon/files/ucommon-5.2.2-address.patch
+++ b/dev-libs/ucommon/files/ucommon-5.2.2-address.patch
@@ -1,9 +1,10 @@
-This patch fixes fortify source
+This patch fixes memory errors
 
-Author: David Sugar <dyfet@gnutelephony.org>
---- /commoncpp/address.cpp
-+++ /commoncpp/address.cpp
-@@ -360,7 +360,7 @@ void IPV4Address::setAddress(const char *host)
+Author: David Sugar
+
+--- commoncpp/address.cpp
++++ commoncpp/address.cpp
+@@ -360,7 +360,7 @@
              if(ipaddr)
                  delete[] ipaddr;
              ipaddr = new struct in_addr[1];
@@ -11,19 +12,17 @@ Author: David Sugar <dyfet@gnutelephony.org>
 +            memset((void *)&ipaddr[0], 0, sizeof(struct in_addr));
              return;
          }
-
-@@ -498,7 +498,7 @@ IPV6Address::IPV6Address(const IPV6Validator
-*_validator)
+ 
+@@ -498,7 +498,7 @@
      : validator(_validator), hostname(NULL) {
      addr_count = 1;
      ipaddr = new struct in6_addr[1];
 -    memcpy(ipaddr, &in6addr_any, sizeof(in6_addr));
 +    memcpy(ipaddr, &in6addr_any, sizeof(struct in6_addr));
  }
-
- IPV6Address::IPV6Address(const char *address, const IPV6Validator
-*_validator) :
-@@ -716,7 +716,7 @@ void IPV6Address::setAddress(const char *host)
+ 
+ IPV6Address::IPV6Address(const char *address, const IPV6Validator *_validator) :
+@@ -716,7 +716,7 @@
              if(ipaddr)
                  delete[] ipaddr;
              ipaddr = new struct in6_addr[1];
@@ -31,8 +30,8 @@ Author: David Sugar <dyfet@gnutelephony.org>
 +            memset((void *)&ipaddr[0], 0, sizeof(struct in6_addr));
              return;
          }
-
-@@ -796,7 +796,7 @@ void IPV6Address::setAddress(const char *host)
+ 
+@@ -796,7 +796,7 @@
              if(ipaddr)
                  delete[] ipaddr;
              ipaddr = new struct in6_addr[1];
@@ -40,3 +39,4 @@ Author: David Sugar <dyfet@gnutelephony.org>
 +            memset((void *)&ipaddr[0], 0, sizeof(struct in6_addr));
              return;
          }
+
diff --git a/dev-libs/ucommon/ucommon-5.2.2-r2.ebuild b/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild
index e5f86985ce49..de0ba531499e 100644
--- a/dev-libs/ucommon/ucommon-5.2.2-r2.ebuild
+++ b/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-5.2.2-r2.ebuild,v 1.1 2012/08/19 21:22:42 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild,v 1.1 2012/08/20 06:32:06 qnikst Exp $
 
 EAPI="4"
 
@@ -22,7 +22,8 @@ DEPEND="virtual/pkgconfig
 	${RDEPEND}"
 
 DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch )
+PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch
+		  "${FILESDIR}/${P}-address.patch")
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
 src_configure() {