diff options
| author |   Alexander Vershilov <qnikst@gentoo.org> | 2012-08-20 06:32:07 +0000 |
|---|---|---|
| committer | Alexander Vershilov <qnikst@gentoo.org> | 2012-08-20 06:32:07 +0000 |
| commit | 276e3aa500241adcf5277c7b2ad67f551501dfe2 (patch) | |
| tree | 1478352cf11f378317395c13445adbf3c93675be /dev-libs/ucommon | |
| parent | Add init script LICENSE. #426162 (diff) | |
| download | gentoo-2-276e3aa500241adcf5277c7b2ad67f551501dfe2.tar.gz gentoo-2-276e3aa500241adcf5277c7b2ad67f551501dfe2.tar.bz2 gentoo-2-276e3aa500241adcf5277c7b2ad67f551501dfe2.zip | |
ucommon-5.2.2 patch fixed
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/ucommon')
| -rw-r--r-- | dev-libs/ucommon/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-libs/ucommon/files/ucommon-5.2.2-address.patch | 28 | ||||
| -rw-r--r-- | dev-libs/ucommon/ucommon-5.2.2-r3.ebuild (renamed from dev-libs/ucommon/ucommon-5.2.2-r2.ebuild) | 5 |
3 files changed, 25 insertions, 17 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/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() { |