summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-07-18 15:31:52 +0000
committerJeroen Roovers <jer@gentoo.org>2014-07-18 15:31:52 +0000
commit1fe99859d0f8bf7edaf108affd78e8b4f2f28f68 (patch)
tree3572c8827d15b7d42df54dc460e7fd083cb675b1 /net-libs/libsmi
parentStop defining MAP_DIR in the ebuild because it's the default wrt http://git.n... (diff)
downloadgentoo-2-1fe99859d0f8bf7edaf108affd78e8b4f2f28f68.tar.gz
gentoo-2-1fe99859d0f8bf7edaf108affd78e8b4f2f28f68.tar.bz2
gentoo-2-1fe99859d0f8bf7edaf108affd78e8b4f2f28f68.zip
EAPI bump. Clean up patch. Add USE=static-libs.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-libs/libsmi')
-rw-r--r--net-libs/libsmi/ChangeLog8
-rw-r--r--net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch6
-rw-r--r--net-libs/libsmi/libsmi-0.4.8-r1.ebuild16
3 files changed, 16 insertions, 14 deletions
diff --git a/net-libs/libsmi/ChangeLog b/net-libs/libsmi/ChangeLog
index 76690e1a0e84..38b8ee576eca 100644
--- a/net-libs/libsmi/ChangeLog
+++ b/net-libs/libsmi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/libsmi
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/ChangeLog,v 1.40 2013/01/22 05:47:42 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/ChangeLog,v 1.41 2014/07/18 15:31:52 jer Exp $
+
+ 18 Jul 2014; Jeroen Roovers <jer@gentoo.org> libsmi-0.4.8-r1.ebuild,
+ files/libsmi-0.4.8-CVE-2010-2891.patch:
+ EAPI bump. Clean up patch. Add USE=static-libs.
22 Jan 2013; Mike Frysinger <vapier@gentoo.org> libsmi-0.4.8-r1.ebuild:
Mark s390/sh stable.
diff --git a/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch b/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch
index 114431d00e31..8c5e2f97dbf4 100644
--- a/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch
+++ b/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch
@@ -1,7 +1,5 @@
-Index: lib/smi.c
-===================================================================
---- lib/smi.c (revision 29144)
-+++ lib/smi.c (working copy)
+--- a/lib/smi.c
++++ b/lib/smi.c
@@ -1793,10 +1793,15 @@
}
diff --git a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
index 129bc6289d05..f4a4bce05833 100644
--- a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/libsmi-0.4.8-r1.ebuild,v 1.10 2013/01/22 05:47:42 vapier Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/libsmi-0.4.8-r1.ebuild,v 1.11 2014/07/18 15:31:52 jer Exp $
+EAPI=5
inherit eutils flag-o-matic
DESCRIPTION="A Library to Access SMI MIB Information"
@@ -13,7 +12,7 @@ HOMEPAGE="http://www.ibr.cs.tu-bs.de/projects/libsmi"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
+IUSE="static-libs"
src_prepare() {
epatch "${FILESDIR}"/${P}-CVE-2010-2891.patch
@@ -21,18 +20,19 @@ src_prepare() {
src_configure() {
replace-flags -O? -O2
- econf
+ econf $(use_enable static-libs static)
}
src_test() {
# sming test is known to fail and some other fail if LC_ALL!=C:
# http://mail.ibr.cs.tu-bs.de/pipermail/libsmi/2008-March/001014.html
sed -i '/^[[:space:]]*smidump-sming.test \\$/d' test/Makefile
- LC_ALL=C emake -j1 check || die "Make check failed. See above for details."
+ LC_ALL=C emake -j1 check || die
}
src_install () {
- emake DESTDIR="${D}" install || die
+ default
dodoc smi.conf-example ANNOUNCE ChangeLog README THANKS TODO \
doc/{*.txt,smi.dia,smi.dtd,smi.xsd}
+ prune_libtool_files
}