gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-05 12:38:09 -07:00
Code Issues Projects Releases Wiki Activity

dev-libs/libebml: Security cleanup (bug #564424)

Browse Source 
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3465
This commit is contained in:
Thomas Deutschmann
2017-01-14 16:15:39 +01:00
committed by Aaron Bauman
parent 7b772e5232
commit 2f87d7ca8e
7 changed files with 0 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev-libs/libebml/Manifest
View File

@@ -1,6 +1,2 @@
DIST libebml-1.2.1.tar.bz2 60662 SHA256 8f9e06630eab83f337d280d38eff53e41e030530015a4c423d509a20f6ea81b2 SHA512 c8bd4d903fcd6ea70cd6aace2096768c7e62deb8ddd41d354b71527d6f4595f06b86169996f2ed56e1da0531b9f7ebcac4c9ccdd2e208614f7cd3271b8cf0f4d WHIRLPOOL 4d1207143fc618b8c0f3d93aecd9d1f063845486c9ddcdaa7cd697d9e27ff01dcd31526c52b33e46e4fc5191689009e7960ebc384321a90a34e7c4770f1d6b17
DIST libebml-1.2.2.tar.bz2 60802 SHA256 476b08c6436a96c024a53e788e7c945ce9b41cd8654165763444aa7e5245b7a5 SHA512 aa9b446aadbfea6cd7031a08a8cd0251a764febb8ef43ee3ba44d066b945698311bda7db6bb2d983d5f0c1e24f108ae4cf1c6551b04337210b13daf7e2236135 WHIRLPOOL 5bfa5ee38b9e4bb6cbc8bc27e949e64621ecc8fe3cf76a0686c85b53579d80ee53bca520ef70b9af13bbf589fd51e5f20eae908928ee0b651d23951a532777e0
DIST libebml-1.3.0.tar.gz 70425 SHA256 cd48a6d943905afe877e86f421647092956d71c7345dc9264a5123750ca8b158 SHA512 804b8e9e29add421304ef104f48170ee434cc97d6063dc4338b7fd6ad559733ed1bffd8440146674b70b3d6906f45ded4cc482d606c94c8c04bf424fd85c366e WHIRLPOOL b5656fa835753bee8b4cfa995db220de85d69604d7332e793c6b45c13100e4041e0fee8517940bde600909b529d3eee959340d3f997b174b249f13c4183ed5cd
DIST libebml-1.3.1.tar.bz2 599116 SHA256 195894b31aaca55657c9bc157d744f23b0c25597606b97cfa5a9039c4b684295 SHA512 b42d198611e480a4938fe95b920f6ee6ca37453f9551990e4310ed82651f93284f1de1d871357b6280219634bbbf6a98d4ac988e25e7bd7b5bbf5c0ba5766334 WHIRLPOOL 10879d351eb66dce6e04b0a1635e370dc82a9215b1ee61ad4b300466257bb0b06219f3ea65b090e415aef354bb8e200e19e35859d25ec5d46fa3208501373801
DIST libebml-1.3.3.tar.bz2 588607 SHA256 35fb44daa41961f94a0ac1b8f06801e88cc9bf2ad6f562ced8ab7c1f1a875499 SHA512 3ae048b468272e5ff1dc813121c1addcbbe324cd466e4b43ccce5aca148095190c10196433db951529ff62c587cc2b9a3c0c713db7921825221babaf7d4e824d WHIRLPOOL 85e973177ba1d437c0b461d81fd3b82432f22db5b1462fb6285cde7a0d6d8528ad7c9e24b0d64aa53eba78d44aec64d3842a96f00a0b6d72b255946967de1b81
DIST libebml-1.3.4.tar.bz2 606205 SHA256 c50d3ecf133742c6549c0669c3873f968e11a365a5ba17b2f4dc339bbe51f387 SHA512 ebf5b71afe725e40ee6415463e51ca14810eecc2fef186caacd0269077f5febeb62623fd48674b21ea732f43a620d0c91603fa48d3f8d163284d1cf204642194 WHIRLPOOL 9502f132fea7d7d10add1c42da33bc2eac1a13b3b02f5b4eb331b1ab5f14a41a255503fedb16b579bb8defa94786d0f6fc5324cd55c06b6d7b5319de74a75e84

107
dev-libs/libebml/files/libebml-1.2.0-makefile-fixup.patch
View File

@@ -1,107 +0,0 @@
--- libebml-1.2.0/make/linux/Makefile.orig
+++ libebml-1.2.0/make/linux/Makefile
@@ -50,6 +50,8 @@
LIBRARY=libebml.a
LIBRARY_SO=libebml.so
LIBRARY_SO_VER=libebml.so.3
+LIBRARY_DYLIB=libebml.dylib
+LIBRARY_DYLIB_VER=libebml.3.dylib
# source-files
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
@@ -62,11 +64,11 @@
objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
-COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
+COMPILEFLAGS=$(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE)
ifeq (Darwin,$(shell uname -s))
-all: staticlib
+all: staticlib macholib
else
all: staticlib sharedlib
endif
@@ -75,8 +77,10 @@
sharedlib: $(LIBRARY_SO)
+macholib: $(LIBRARY_DYLIB)
+
lib:
- @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
+ @echo "Use the 'staticlib', 'sharedlib', 'macholib' or 'all' targets."
@false
# Build rules
@@ -91,15 +95,22 @@
$(RANLIB) $@
$(LIBRARY_SO): $(objects_so)
- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
+ $(CXX) $(LDFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) $(LIBS)
rm -f $(LIBRARY_SO)
ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
+$(LIBRARY_DYLIB): $(objects_so)
+ $(CXX) $(LDFLAGS) -dynamiclib -install_name $(libdir)/$(LIBRARY_DYLIB_VER) -o $(LIBRARY_DYLIB_VER) $(objects_so) $(LIBS)
+ rm -f $(LIBRARY_DYLIB)
+ ln -s $(LIBRARY_DYLIB_VER) $(LIBRARY_DYLIB)
+
clean:
rm -f $(objects) $(objects_so)
rm -f $(LIBRARY)
rm -f $(LIBRARY_SO)
rm -f $(LIBRARY_SO_VER)
+ rm -f $(LIBRARY_DYLIB)
+ rm -f $(LIBRARY_DYLIB_VER)
rm -f CORE
distclean dist-clean: clean
@@ -116,30 +127,34 @@
done
ifeq (Darwin,$(shell uname -s))
-install: install_staticlib install_headers
+install: install_staticlib install_macholib install_headers
else
install: install_staticlib install_sharedlib install_headers
endif
install_headers:
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
for i in $(INCLUDE_DIR)/*.h; do \
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
done
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
for i in $(INCLUDE_DIR)/c/*.h; do \
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
done
install_staticlib: $(LIBRARY)
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
install_sharedlib: $(LIBRARY_SO)
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
-
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
+ ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
+
+install_macholib: $(LIBRARY_DYLIB)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)
+ ln -fs $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)/$(LIBRARY_DYLIB)
ifneq ($(wildcard .depend),)
include .depend

102
dev-libs/libebml/files/libebml-1.3.0-makefile.patch
View File

@@ -1,102 +0,0 @@
--- libebml-release-1.3.0/make/linux/Makefile
+++ libebml-release-1.3.0/make/linux/Makefile
@@ -50,6 +50,8 @@
LIBRARY=libebml.a
LIBRARY_SO=libebml.so
LIBRARY_SO_VER=libebml.so.4
+LIBRARY_DYLIB=libebml.dylib
+LIBRARY_DYLIB_VER=libebml.4.dylib
# source-files
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
@@ -66,7 +68,7 @@
DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE)
ifeq (Darwin,$(shell uname -s))
-all: staticlib
+all: staticlib macholib
else
all: staticlib sharedlib
endif
@@ -75,8 +77,10 @@
sharedlib: $(LIBRARY_SO)
+macholib: $(LIBRARY_DYLIB)
+
lib:
- @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
+ @echo "Use the 'staticlib', 'sharedlib', 'macholib' or 'all' targets."
@false
# Build rules
@@ -91,15 +95,22 @@
$(RANLIB) $@
$(LIBRARY_SO): $(objects_so)
- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
+ $(CXX) $(LDFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
rm -f $(LIBRARY_SO)
ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
+$(LIBRARY_DYLIB): $(objects_so)
+ $(CXX) $(LDFLAGS) -dynamiclib -install_name $(libdir)/$(LIBRARY_DYLIB_VER) -o $(LIBRARY_DYLIB_VER) $(objects_so) $(LIBS)
+ rm -f $(LIBRARY_DYLIB)
+ ln -s $(LIBRARY_DYLIB_VER) $(LIBRARY_DYLIB)
+
clean:
rm -f $(objects) $(objects_so)
rm -f $(LIBRARY)
rm -f $(LIBRARY_SO)
rm -f $(LIBRARY_SO_VER)
+ rm -f $(LIBRARY_DYLIB)
+ rm -f $(LIBRARY_DYLIB_VER)
rm -f CORE
distclean dist-clean: clean
@@ -116,30 +127,34 @@
done
ifeq (Darwin,$(shell uname -s))
-install: install_staticlib install_headers
+install: install_staticlib install_macholib install_headers
else
install: install_staticlib install_sharedlib install_headers
endif
install_headers:
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
for i in $(INCLUDE_DIR)/*.h; do \
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
done
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
for i in $(INCLUDE_DIR)/c/*.h; do \
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
done
install_staticlib: $(LIBRARY)
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
install_sharedlib: $(LIBRARY_SO)
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
-
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
+ ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
+
+install_macholib: $(LIBRARY_DYLIB)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)
+ ln -fs $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)/$(LIBRARY_DYLIB)
ifneq ($(wildcard .depend),)
include .depend

45
dev-libs/libebml/libebml-1.2.1.ebuild
View File

@@ -1,45 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=2
inherit eutils multilib toolchain-funcs
DESCRIPTION="Extensible binary format library (kinda like XML)"
HOMEPAGE="http://www.matroska.org/"
SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
DEPEND=""
RDEPEND=""
S="${WORKDIR}/${P}/make/linux"
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.2.0-makefile-fixup.patch
}
src_compile() {
# keep the prefix in here to make sure the binary is built with a correct
# install_name on Darwin
emake \
prefix="${EPREFIX}/usr" \
CC="$(tc-getCC)" \
CXX="$(tc-getCXX)" \
|| die "emake failed"
}
src_install() {
emake \
DESTDIR="${D}" \
prefix="${EPREFIX}/usr" \
libdir="${EPREFIX}/usr/$(get_libdir)" \
install || die "emake install failed"
dodoc "${WORKDIR}/${P}/ChangeLog"
}

62
dev-libs/libebml/libebml-1.2.2.ebuild
View File

@@ -1,62 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=4
inherit eutils multilib toolchain-funcs
DESCRIPTION="Extensible binary format library (kinda like XML)"
HOMEPAGE="http://www.matroska.org/"
SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="debug static-libs"
S="${WORKDIR}/${P}/make/linux"
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.2.0-makefile-fixup.patch
sed -i -e "s:\(DEBUGFLAGS=\)-g :\1:" Makefile || die
}
src_compile() {
local targets
if [[ ${CHOST} != *-darwin* ]] ; then
targets="sharedlib"
else
targets="macholib"
fi
use static-libs && targets+=" staticlib"
# keep the prefix in here to make sure the binary is built with a correct
# install_name on Darwin
emake \
prefix="${EPREFIX}/usr" \
AR="$(tc-getAR)" \
CC="$(tc-getCC)" \
CXX="$(tc-getCXX)" \
$(use debug && echo DEBUG=yes || echo DEBUG=no) \
${targets}
}
src_install() {
local targets="install_headers"
if [[ ${CHOST} != *-darwin* ]] ; then
targets+=" install_sharedlib"
else
targets+=" install_macholib"
fi
use static-libs && targets+=" install_staticlib"
emake \
DESTDIR="${D}" \
prefix="${EPREFIX}/usr" \
libdir="${EPREFIX}/usr/$(get_libdir)" \
${targets}
dodoc "${WORKDIR}/${P}/ChangeLog"
}

62
dev-libs/libebml/libebml-1.3.0.ebuild
View File

@@ -1,62 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils multilib toolchain-funcs
DESCRIPTION="Extensible binary format library (kinda like XML)"
HOMEPAGE="http://www.matroska.org/ https://github.com/Matroska-Org/libebml/"
SRC_URI="https://github.com/Matroska-Org/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/4" # subslot = soname major version
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="debug static-libs"
S=${WORKDIR}/${PN}-release-${PV}/make/linux
src_prepare() {
epatch "${FILESDIR}"/${P}-makefile.patch
sed -i "s:\(DEBUGFLAGS=\)-g :\1:" Makefile || die
}
src_compile() {
local targets
if [[ ${CHOST} != *-darwin* ]] ; then
targets="sharedlib"
else
targets="macholib"
fi
use static-libs && targets+=" staticlib"
# keep the prefix in here to make sure the binary is built with a correct
# install_name on Darwin
emake \
prefix="${EPREFIX}"/usr \
AR="$(tc-getAR)" \
CC="$(tc-getCC)" \
CXX="$(tc-getCXX)" \
$(use debug && echo DEBUG=yes || echo DEBUG=no) \
${targets}
}
src_install() {
local targets="install_headers"
if [[ ${CHOST} != *-darwin* ]] ; then
targets+=" install_sharedlib"
else
targets+=" install_macholib"
fi
use static-libs && targets+=" install_staticlib"
emake \
DESTDIR="${D}" \
prefix="${EPREFIX}"/usr \
libdir="${EPREFIX}"/usr/$(get_libdir) \
${targets}
dodoc "${WORKDIR}"/${PN}-release-${PV}/ChangeLog
}

30
dev-libs/libebml/libebml-1.3.1.ebuild
View File

@@ -1,30 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
AUTOTOOLS_AUTORECONF=1
inherit autotools-utils
DESCRIPTION="Extensible binary format library (kinda like XML)"
HOMEPAGE="http://www.matroska.org/ https://github.com/Matroska-Org/libebml/"
SRC_URI="http://dl.matroska.org/downloads/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0/4" # subslot = soname major version
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="debug static-libs"
src_prepare() {
sed -i '/^AM_CXXFLAGS += -g/d' Makefile.am || die
autotools-utils_src_prepare
}
src_configure() {
local myeconfargs=(
$(use_enable debug)
)
autotools-utils_src_configure
}