1 |
commit: 39a54f4318fee7b07d8121525e8889c960277de8 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 16 13:05:25 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 16 13:38:00 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a54f43 |
7 |
|
8 |
Revert "app-misc/mosquitto: add patch against CVE-2017-7652." |
9 |
|
10 |
This reverts commit 45182783da2fdcb0d34bfeb72a4f9e619254234a. |
11 |
|
12 |
Reasons: |
13 |
|
14 |
- Has nothing to do with CVE-2017-7652. |
15 |
|
16 |
- Patch doesn't apply. [Bug 653238] |
17 |
|
18 |
Bug: https://bugs.gentoo.org/653238 |
19 |
|
20 |
.../mosquitto-1.4.15-r1-conditional-tests.patch | 12 --- |
21 |
app-misc/mosquitto/mosquitto-1.4.15-r1.ebuild | 100 --------------------- |
22 |
2 files changed, 112 deletions(-) |
23 |
|
24 |
diff --git a/app-misc/mosquitto/files/mosquitto-1.4.15-r1-conditional-tests.patch b/app-misc/mosquitto/files/mosquitto-1.4.15-r1-conditional-tests.patch |
25 |
deleted file mode 100644 |
26 |
index 1642597c562..00000000000 |
27 |
--- a/app-misc/mosquitto/files/mosquitto-1.4.15-r1-conditional-tests.patch |
28 |
+++ /dev/null |
29 |
@@ -1,12 +0,0 @@ |
30 |
---- a/test/broker/c/Makefile 2016-02-14 14:36:55.000000000 +0000 |
31 |
-+++ b/test/broker/c/Makefile 2016-05-05 09:40:31.440608209 +0100 |
32 |
-@@ -13,7 +13,9 @@ |
33 |
- $(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1 |
34 |
- |
35 |
- 08-tls-psk-bridge.test : 08-tls-psk-bridge.c |
36 |
-+ifeq ($(WITH_BRIDGE),yes) |
37 |
- $(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1 |
38 |
-+endif |
39 |
- |
40 |
- |
41 |
- reallyclean : clean |
42 |
|
43 |
diff --git a/app-misc/mosquitto/mosquitto-1.4.15-r1.ebuild b/app-misc/mosquitto/mosquitto-1.4.15-r1.ebuild |
44 |
deleted file mode 100644 |
45 |
index 961c208d40b..00000000000 |
46 |
--- a/app-misc/mosquitto/mosquitto-1.4.15-r1.ebuild |
47 |
+++ /dev/null |
48 |
@@ -1,100 +0,0 @@ |
49 |
-# Copyright 1999-2018 Gentoo Foundation |
50 |
-# Distributed under the terms of the GNU General Public License v2 |
51 |
- |
52 |
-EAPI=6 |
53 |
-PYTHON_COMPAT=( python2_7 ) |
54 |
- |
55 |
-inherit systemd user toolchain-funcs python-any-r1 |
56 |
- |
57 |
-DESCRIPTION="An Open Source MQTT v3 Broker" |
58 |
-HOMEPAGE="http://mosquitto.org/" |
59 |
-SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz" |
60 |
- |
61 |
-LICENSE="EPL-1.0" |
62 |
-SLOT="0" |
63 |
-KEYWORDS="~amd64 ~arm ~x86" |
64 |
-IUSE="bridge examples +persistence +srv ssl tcpd test websockets" |
65 |
- |
66 |
-REQUIRED_USE="test? ( bridge )" |
67 |
- |
68 |
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers ) |
69 |
- ssl? ( dev-libs/openssl:0= )" |
70 |
-DEPEND="${RDEPEND} |
71 |
- ${PYTHON_DEPS} |
72 |
- srv? ( net-dns/c-ares ) |
73 |
- websockets? ( net-libs/libwebsockets )" |
74 |
- |
75 |
-_emake() { |
76 |
- LIBDIR=$(get_libdir) |
77 |
- emake \ |
78 |
- CC="$(tc-getCC)" \ |
79 |
- LIB_SUFFIX="${LIBDIR:3}" \ |
80 |
- WITH_BRIDGE="$(usex bridge)" \ |
81 |
- WITH_PERSISTENCE="$(usex persistence)" \ |
82 |
- WITH_SRV="$(usex srv)" \ |
83 |
- WITH_TLS="$(usex ssl)" \ |
84 |
- WITH_WEBSOCKETS="$(usex websockets)" \ |
85 |
- WITH_WRAP="$(usex tcpd)" \ |
86 |
- "$@" |
87 |
-} |
88 |
- |
89 |
-pkg_setup() { |
90 |
- enewgroup mosquitto |
91 |
- enewuser mosquitto -1 -1 -1 mosquitto |
92 |
-} |
93 |
- |
94 |
-src_prepare() { |
95 |
- eapply "${FILESDIR}/${P}-conditional-tests.patch" |
96 |
- if use persistence; then |
97 |
- sed -i -e "/^#autosave_interval/s|^#||" \ |
98 |
- -e "s|^#persistence false$|persistence true|" \ |
99 |
- -e "/^#persistence_file/s|^#||" \ |
100 |
- -e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \ |
101 |
- mosquitto.conf || die |
102 |
- fi |
103 |
- |
104 |
- # Remove prestripping |
105 |
- sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\ |
106 |
- client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die |
107 |
- |
108 |
- python_setup |
109 |
- python_fix_shebang test |
110 |
- eapply_user |
111 |
-} |
112 |
- |
113 |
-src_compile() { |
114 |
- _emake |
115 |
-} |
116 |
- |
117 |
-src_test() { |
118 |
- _emake test |
119 |
-} |
120 |
- |
121 |
-src_install() { |
122 |
- _emake DESTDIR="${D}" prefix=/usr install |
123 |
- keepdir /var/lib/mosquitto |
124 |
- fowners mosquitto:mosquitto /var/lib/mosquitto |
125 |
- dodoc readme.md CONTRIBUTING.md ChangeLog.txt |
126 |
- doinitd "${FILESDIR}"/mosquitto |
127 |
- insinto /etc/mosquitto |
128 |
- doins mosquitto.conf |
129 |
- systemd_dounit "${FILESDIR}/mosquitto.service" |
130 |
- |
131 |
- if use examples; then |
132 |
- docompress -x "/usr/share/doc/${PF}/examples" |
133 |
- docinto "/usr/share/doc/${PF}" |
134 |
- doins -r examples |
135 |
- fi |
136 |
-} |
137 |
- |
138 |
-pkg_postinst() { |
139 |
- elog "" |
140 |
- elog "The Python module has been moved out of mosquitto." |
141 |
- elog "See http://mosquitto.org/documentation/python/" |
142 |
- elog "" |
143 |
- elog "To start the mosquitto daemon at boot, add it to the default runlevel with:" |
144 |
- elog "" |
145 |
- elog " rc-update add mosquitto default" |
146 |
- elog " or" |
147 |
- elog " systemctl enable mosquitto" |
148 |
-} |