1 |
commit: 64b400382afdbff8b60d4f9726ffd3bcee6e628e |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 30 23:33:16 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 30 23:33:16 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64b40038 |
7 |
|
8 |
dev-libs/json-c: security cleanup |
9 |
|
10 |
Closes: https://bugs.gentoo.org/722150 |
11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
dev-libs/json-c/Manifest | 2 -- |
15 |
dev-libs/json-c/json-c-0.12.ebuild | 40 ------------------------------ |
16 |
dev-libs/json-c/json-c-0.13.1-r1.ebuild | 43 --------------------------------- |
17 |
3 files changed, 85 deletions(-) |
18 |
|
19 |
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest |
20 |
index 84cb8c564bf..66a308c2f40 100644 |
21 |
--- a/dev-libs/json-c/Manifest |
22 |
+++ b/dev-libs/json-c/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
-DIST json-c-0.12.tar.gz 501419 BLAKE2B 24f035792ff1ba5c39e55bca6ee4ba2509ab71d0374c70b520791f38e1ec4ff2245a282f234fde9f4a02cd9eaaaaa998ce307563a20702c04ee972fdf51f2539 SHA512 c959804362386f6b77e9d04b5fedf6d6aff1fcd0ab50250edb25f759b510b402e7ad4b33d1cbadc3337b63a3145d19f310812a9ee351748348304b384dc2dc35 |
25 |
-DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1 |
26 |
DIST json-c-0.14.tar.gz 321677 BLAKE2B 39325988dd58dad589fc0f036c17b2337c81cf7aab8ecb2232f8d59fef9d38df28e096f8d22320e0003799d477debddc4926eaa7a170954263c6b303c1fa056e SHA512 75537c61d0632a01f94d2394d7a4387ef1eca0b68aa56c495d3d96dd29b38ed20eb0cc3f6e5e24dc6660c8939669f8954005d9c3ba20437f3fcc9f9dd896b00d |
27 |
DIST json-c-0.15.tar.gz 361488 BLAKE2B ae34f6dd45ebee55e6413ecb234e48fa5ae1c17e6fa12462aaaa04e8801457060e176abe90d76d04ad0ee9b903ff467bc3b8ed5816792da175aad8862b9d168e SHA512 dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34 |
28 |
|
29 |
diff --git a/dev-libs/json-c/json-c-0.12.ebuild b/dev-libs/json-c/json-c-0.12.ebuild |
30 |
deleted file mode 100644 |
31 |
index 18e4b3cc8a5..00000000000 |
32 |
--- a/dev-libs/json-c/json-c-0.12.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,40 +0,0 @@ |
35 |
-# Copyright 1999-2020 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=5 |
39 |
- |
40 |
-AUTOTOOLS_AUTORECONF=true |
41 |
- |
42 |
-inherit autotools-multilib |
43 |
- |
44 |
-DESCRIPTION="A JSON implementation in C" |
45 |
-HOMEPAGE="https://github.com/json-c/json-c/wiki" |
46 |
-SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz" |
47 |
- |
48 |
-LICENSE="MIT" |
49 |
-SLOT="0/2" |
50 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" |
51 |
-IUSE="doc static-libs" |
52 |
- |
53 |
-RDEPEND="" |
54 |
- |
55 |
-# tests break otherwise |
56 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
57 |
- |
58 |
-src_prepare() { |
59 |
- sed -i -e "s:-Werror::" Makefile.am.inc || die |
60 |
- autotools-multilib_src_prepare |
61 |
-} |
62 |
- |
63 |
-src_test() { |
64 |
- export USE_VALGRIND=0 VERBOSE=1 |
65 |
- autotools-multilib_src_test |
66 |
-} |
67 |
- |
68 |
-src_install() { |
69 |
- use doc && HTML_DOCS=( "${S}"/doc/html ) |
70 |
- autotools-multilib_src_install |
71 |
- |
72 |
- # add symlink for projects not using pkgconfig |
73 |
- dosym ../json-c /usr/include/json-c/json |
74 |
-} |
75 |
|
76 |
diff --git a/dev-libs/json-c/json-c-0.13.1-r1.ebuild b/dev-libs/json-c/json-c-0.13.1-r1.ebuild |
77 |
deleted file mode 100644 |
78 |
index 74ff2bc61f4..00000000000 |
79 |
--- a/dev-libs/json-c/json-c-0.13.1-r1.ebuild |
80 |
+++ /dev/null |
81 |
@@ -1,43 +0,0 @@ |
82 |
-# Copyright 1999-2020 Gentoo Authors |
83 |
-# Distributed under the terms of the GNU General Public License v2 |
84 |
- |
85 |
-EAPI=6 |
86 |
- |
87 |
-inherit autotools multilib-minimal ltprune |
88 |
- |
89 |
-DESCRIPTION="A JSON implementation in C" |
90 |
-HOMEPAGE="https://github.com/json-c/json-c/wiki" |
91 |
-SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz" |
92 |
- |
93 |
-LICENSE="MIT" |
94 |
-SLOT="0/4" |
95 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" |
96 |
-IUSE="doc static-libs" |
97 |
- |
98 |
-src_prepare() { |
99 |
- default |
100 |
- sed -i -e "s:-Werror::" configure.ac || die |
101 |
- eautoreconf |
102 |
- |
103 |
- # tests break otherwise |
104 |
- multilib_copy_sources |
105 |
-} |
106 |
- |
107 |
-multilib_src_configure() { |
108 |
- ECONF_SOURCE=${S} econf $(use_enable static-libs static) |
109 |
-} |
110 |
- |
111 |
-multilib_src_test() { |
112 |
- export USE_VALGRIND=0 VERBOSE=1 |
113 |
- default |
114 |
-} |
115 |
- |
116 |
-multilib_src_install_all() { |
117 |
- use doc && HTML_DOCS=( "${S}"/doc/html/. ) |
118 |
- einstalldocs |
119 |
- |
120 |
- # add symlink for projects not using pkgconfig |
121 |
- dosym ../json-c /usr/include/json-c/json |
122 |
- |
123 |
- prune_libtool_files |
124 |
-} |