| 1 |
alonbl 14/06/07 18:18:46 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: gnutls-2.12.23-r6.ebuild |
| 5 |
Log: |
| 6 |
Fix CVE-2014-3466, CVE-2014-3467, CVE-2014-3468, CVE-2014-3469 of 2.12 series |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.495 net-libs/gnutls/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/ChangeLog?rev=1.495&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/ChangeLog?rev=1.495&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/ChangeLog?r1=1.494&r2=1.495 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v |
| 20 |
retrieving revision 1.494 |
| 21 |
retrieving revision 1.495 |
| 22 |
diff -u -r1.494 -r1.495 |
| 23 |
--- ChangeLog 7 Jun 2014 17:48:35 -0000 1.494 |
| 24 |
+++ ChangeLog 7 Jun 2014 18:18:46 -0000 1.495 |
| 25 |
@@ -1,6 +1,15 @@ |
| 26 |
# ChangeLog for net-libs/gnutls |
| 27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.494 2014/06/07 17:48:35 alonbl Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.495 2014/06/07 18:18:46 alonbl Exp $ |
| 30 |
+ |
| 31 |
+*gnutls-2.12.23-r6 (07 Jun 2014) |
| 32 |
+ |
| 33 |
+ 07 Jun 2014; Alon Bar-Lev <alonbl@g.o> |
| 34 |
+ +files/gnutls-2.12.23-CVE-2014-3466.patch, |
| 35 |
+ +files/gnutls-2.12.23-CVE-2014-3467.patch, |
| 36 |
+ +files/gnutls-2.12.23-CVE-2014-3468.patch, |
| 37 |
+ +files/gnutls-2.12.23-CVE-2014-3469.patch, +gnutls-2.12.23-r6.ebuild: |
| 38 |
+ Fix CVE-2014-3466, CVE-2014-3467, CVE-2014-3468, CVE-2014-3469 of 2.12 series |
| 39 |
|
| 40 |
07 Jun 2014; Alon Bar-Lev <alonbl@g.o> |
| 41 |
-files/gnutls-2.12.20-glibc-2.16.patch, -files/gnutls-3.3.1-guile.patch, |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.1 net-libs/gnutls/gnutls-2.12.23-r6.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-2.12.23-r6.ebuild?rev=1.1&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-2.12.23-r6.ebuild?rev=1.1&content-type=text/plain |
| 49 |
|
| 50 |
Index: gnutls-2.12.23-r6.ebuild |
| 51 |
=================================================================== |
| 52 |
# Copyright 1999-2014 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.23-r6.ebuild,v 1.1 2014/06/07 18:18:46 alonbl Exp $ |
| 55 |
|
| 56 |
EAPI=5 |
| 57 |
|
| 58 |
inherit autotools libtool eutils versionator |
| 59 |
|
| 60 |
DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" |
| 61 |
HOMEPAGE="http://www.gnutls.org/" |
| 62 |
SRC_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v$(get_version_component_range 1-2)/${P}.tar.bz2" |
| 63 |
|
| 64 |
# LGPL-2.1 for libgnutls library and GPL-3 for libgnutls-extra library. |
| 65 |
LICENSE="GPL-3 LGPL-2.1" |
| 66 |
SLOT="0" |
| 67 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
| 68 |
IUSE="bindist +cxx doc examples guile lzo +nettle nls pkcs11 static-libs test zlib" |
| 69 |
|
| 70 |
RDEPEND=">=dev-libs/libtasn1-0.3.4 |
| 71 |
<dev-libs/libtasn1-3 |
| 72 |
guile? ( >=dev-scheme/guile-1.8[networking] ) |
| 73 |
nettle? ( >=dev-libs/nettle-2.1[gmp] ) |
| 74 |
!nettle? ( >=dev-libs/libgcrypt-1.4.0:0 ) |
| 75 |
nls? ( virtual/libintl ) |
| 76 |
pkcs11? ( >=app-crypt/p11-kit-0.11 ) |
| 77 |
zlib? ( >=sys-libs/zlib-1.2.3.1 ) |
| 78 |
!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )" |
| 79 |
DEPEND="${RDEPEND} |
| 80 |
virtual/pkgconfig |
| 81 |
sys-devel/libtool |
| 82 |
doc? ( dev-util/gtk-doc ) |
| 83 |
nls? ( sys-devel/gettext ) |
| 84 |
test? ( app-misc/datefudge )" |
| 85 |
|
| 86 |
DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO ) |
| 87 |
|
| 88 |
pkg_setup() { |
| 89 |
if use lzo && use bindist; then |
| 90 |
ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues." |
| 91 |
fi |
| 92 |
} |
| 93 |
|
| 94 |
src_prepare() { |
| 95 |
# tests/suite directory is not distributed |
| 96 |
sed -i -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' \ |
| 97 |
configure.ac || die |
| 98 |
|
| 99 |
sed -i -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \ |
| 100 |
doc/Makefile.am || die |
| 101 |
|
| 102 |
for dir in . lib libextra; do |
| 103 |
sed -i -e '/^AM_INIT_AUTOMAKE/s/-Werror//' "${dir}/configure.ac" || die |
| 104 |
done |
| 105 |
|
| 106 |
epatch "${FILESDIR}"/${PN}-2.12.20-AF_UNIX.patch |
| 107 |
epatch "${FILESDIR}"/${PN}-2.12.20-libadd.patch |
| 108 |
epatch "${FILESDIR}"/${PN}-2.12.20-guile-parallelmake.patch |
| 109 |
epatch "${FILESDIR}"/${P}-hppa.patch |
| 110 |
epatch "${FILESDIR}"/${P}-gl-tests-getaddrinfo-skip-if-no-network.patch |
| 111 |
epatch "${FILESDIR}"/${P}-gdoc-perl-5.18.patch |
| 112 |
epatch "${FILESDIR}"/${P}-CVE-2013-2116.patch |
| 113 |
epatch "${FILESDIR}"/${P}-CVE-2014-0092.patch |
| 114 |
epatch "${FILESDIR}"/${P}-CVE-2014-1959.patch |
| 115 |
epatch "${FILESDIR}"/${P}-CVE-2014-3466.patch |
| 116 |
epatch "${FILESDIR}"/${P}-CVE-2014-3467.patch |
| 117 |
epatch "${FILESDIR}"/${P}-CVE-2014-3468.patch |
| 118 |
epatch "${FILESDIR}"/${P}-CVE-2014-3469.patch |
| 119 |
|
| 120 |
# support user patches |
| 121 |
epatch_user |
| 122 |
|
| 123 |
eautoreconf |
| 124 |
|
| 125 |
# Use sane .so versioning on FreeBSD. |
| 126 |
elibtoolize |
| 127 |
} |
| 128 |
|
| 129 |
src_configure() { |
| 130 |
local myconf |
| 131 |
use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)" |
| 132 |
[[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests" |
| 133 |
|
| 134 |
econf \ |
| 135 |
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
| 136 |
$(use_enable cxx) \ |
| 137 |
$(use_enable doc gtk-doc) \ |
| 138 |
$(use_enable doc gtk-doc-pdf) \ |
| 139 |
$(use_enable guile) \ |
| 140 |
$(use_with !nettle libgcrypt) \ |
| 141 |
$(use_enable nls) \ |
| 142 |
$(use_with pkcs11 p11-kit) \ |
| 143 |
$(use_enable static-libs static) \ |
| 144 |
$(use_with zlib) \ |
| 145 |
${myconf} |
| 146 |
} |
| 147 |
|
| 148 |
src_test() { |
| 149 |
if has_version dev-util/valgrind && [[ ${VALGRIND_TESTS} != 1 ]]; then |
| 150 |
elog |
| 151 |
elog "You can set VALGRIND_TESTS=\"1\" to enable Valgrind tests." |
| 152 |
elog |
| 153 |
fi |
| 154 |
|
| 155 |
# parallel testing often fails |
| 156 |
emake -j1 check |
| 157 |
} |
| 158 |
|
| 159 |
src_install() { |
| 160 |
default |
| 161 |
|
| 162 |
prune_libtool_files |
| 163 |
|
| 164 |
if use doc; then |
| 165 |
dodoc doc/gnutls.{pdf,ps} |
| 166 |
dohtml doc/gnutls.html |
| 167 |
fi |
| 168 |
|
| 169 |
if use examples; then |
| 170 |
docinto examples |
| 171 |
dodoc doc/examples/*.c |
| 172 |
fi |
| 173 |
} |
Archives