From 276e3aa500241adcf5277c7b2ad67f551501dfe2 Mon Sep 17 00:00:00 2001 From: Alexander Vershilov Date: Mon, 20 Aug 2012 06:32:07 +0000 Subject: ucommon-5.2.2 patch fixed (Portage version: 2.2.0_alpha120/cvs/Linux x86_64) --- dev-libs/ucommon/ChangeLog | 9 +++- dev-libs/ucommon/files/ucommon-5.2.2-address.patch | 28 +++++----- dev-libs/ucommon/ucommon-5.2.2-r2.ebuild | 58 --------------------- dev-libs/ucommon/ucommon-5.2.2-r3.ebuild | 59 ++++++++++++++++++++++ 4 files changed, 81 insertions(+), 73 deletions(-) delete mode 100644 dev-libs/ucommon/ucommon-5.2.2-r2.ebuild create mode 100644 dev-libs/ucommon/ucommon-5.2.2-r3.ebuild (limited to 'dev-libs/ucommon') 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 + -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 ---- /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 + 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 + 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 + 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-r2.ebuild deleted file mode 100644 index e5f86985ce49..000000000000 --- a/dev-libs/ucommon/ucommon-5.2.2-r2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# 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 $ - -EAPI="4" - -inherit autotools-utils - -DESCRIPTION="Portable C++ runtime for threads and sockets" -HOMEPAGE="http://www.gnu.org/software/commoncpp" -SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="doc static-libs socks +cxx debug ssl gnutls" - -RDEPEND="ssl? ( dev-libs/openssl )" - -DEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen ) - ${RDEPEND}" - -DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) -PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch ) -AUTOTOOLS_IN_SOURCE_BUILD=1 - -src_configure() { - local myconf="" - if ! use ssl && ! use gnutls; then - myconf=" --with-sslstack=nossl " - fi - - if use ssl; then - myconf=" --with-sslstack=ssl " - fi - - local myeconfargs=( - $(use_enable socks) - $(use_enable cxx stdcpp) - ${myconf} - --enable-atomics - --with-pkg-config - ) - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile - use doc && autotools-utils_src_compile doxy -} - -src_install() { - autotools-utils_src_install - if use doc; then - dohtml doc/html/* - fi -} diff --git a/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild b/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild new file mode 100644 index 000000000000..de0ba531499e --- /dev/null +++ b/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild @@ -0,0 +1,59 @@ +# 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-r3.ebuild,v 1.1 2012/08/20 06:32:06 qnikst Exp $ + +EAPI="4" + +inherit autotools-utils + +DESCRIPTION="Portable C++ runtime for threads and sockets" +HOMEPAGE="http://www.gnu.org/software/commoncpp" +SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux" +IUSE="doc static-libs socks +cxx debug ssl gnutls" + +RDEPEND="ssl? ( dev-libs/openssl )" + +DEPEND="virtual/pkgconfig + doc? ( app-doc/doxygen ) + ${RDEPEND}" + +DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) +PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch + "${FILESDIR}/${P}-address.patch") +AUTOTOOLS_IN_SOURCE_BUILD=1 + +src_configure() { + local myconf="" + if ! use ssl && ! use gnutls; then + myconf=" --with-sslstack=nossl " + fi + + if use ssl; then + myconf=" --with-sslstack=ssl " + fi + + local myeconfargs=( + $(use_enable socks) + $(use_enable cxx stdcpp) + ${myconf} + --enable-atomics + --with-pkg-config + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile + use doc && autotools-utils_src_compile doxy +} + +src_install() { + autotools-utils_src_install + if use doc; then + dohtml doc/html/* + fi +} -- cgit v1.2.3-65-gdbad