Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/e4rat/, sys-fs/e4rat/files/, profiles/
Date: Fri, 17 Sep 2021 13:40:52
Message-Id: 1631886002.8095b415ffb83d2795a96c2e7ab03527a505736f.jsmolic@gentoo
1 commit: 8095b415ffb83d2795a96c2e7ab03527a505736f
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 16 12:15:50 2021 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 17 13:40:02 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8095b415
7
8 sys-fs/e4rat: Remove last-rited package
9
10 Closes: https://bugs.gentoo.org/722882
11 Closes: https://bugs.gentoo.org/808673
12 Closes: https://bugs.gentoo.org/742290
13 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
14
15 profiles/package.mask | 6 --
16 sys-fs/e4rat/Manifest | 1 -
17 sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild | 63 -------------------
18 sys-fs/e4rat/files/e4rat-0.2.2-libdir.patch | 14 -----
19 sys-fs/e4rat/files/e4rat-0.2.2-shared-build.patch | 74 -----------------------
20 sys-fs/e4rat/files/e4rat-0.2.4-gcc6.patch | 11 ----
21 sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch | 41 -------------
22 sys-fs/e4rat/files/e4rat-0.2.4-sysmacros.patch | 13 ----
23 sys-fs/e4rat/metadata.xml | 11 ----
24 9 files changed, 234 deletions(-)
25
26 diff --git a/profiles/package.mask b/profiles/package.mask
27 index 0c1dc5e8fa4..0ea4be18aef 100644
28 --- a/profiles/package.mask
29 +++ b/profiles/package.mask
30 @@ -246,12 +246,6 @@ dev-python/pydns
31 net-analyzer/netwox
32 net-analyzer/netwag
33
34 -# Sam James <sam@g.o> (2021-08-17)
35 -# Fails to build with >= Boost 1.73, so broken for well over a year.
36 -# Several open bugs: bug #722882, bug #742290, bug #808673.
37 -# Removal on 2021-09-17.
38 -sys-fs/e4rat
39 -
40 # David Seifert <soap@g.o> (2021-08-04)
41 # Last release over 4 years ago, upstream pretty much dead, the
42 # ecosystem has switched to dev-util/pkgconf, which is alive. Testing
43
44 diff --git a/sys-fs/e4rat/Manifest b/sys-fs/e4rat/Manifest
45 deleted file mode 100644
46 index 5f73fa80519..00000000000
47 --- a/sys-fs/e4rat/Manifest
48 +++ /dev/null
49 @@ -1 +0,0 @@
50 -DIST e4rat-0.2.4_pre20141201.tar.xz 60408 BLAKE2B 4ebedfcca7f21bb1f3be59dac64694e0f69ecb5ebdc1637210c68097178e2ae38959581a51fc55b8773d63ce629aaf69765bb755d45467bf5e4f4e741b715101 SHA512 61a53f6ac420392df5894d3f76de28c5d2e33fd3a6548cf8c9de52818bf937ba8bf8629db1b89103faa73b660548d7e467e17d7f2794a4100ca07971ded0cfb9
51
52 diff --git a/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild b/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild
53 deleted file mode 100644
54 index 1894e09017d..00000000000
55 --- a/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild
56 +++ /dev/null
57 @@ -1,63 +0,0 @@
58 -# Copyright 1999-2021 Gentoo Authors
59 -# Distributed under the terms of the GNU General Public License v2
60 -
61 -EAPI=6
62 -
63 -inherit cmake-utils linux-info readme.gentoo-r1
64 -
65 -DESCRIPTION="Toolset to accelerate the boot process and application startup"
66 -HOMEPAGE="http://e4rat.sourceforge.net/"
67 -#SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
68 -SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${PN}-0.2.4_pre20141201.tar.xz"
69 -
70 -LICENSE="GPL-3"
71 -SLOT="0"
72 -KEYWORDS="amd64 x86"
73 -
74 -RDEPEND="
75 - dev-lang/perl:=
76 - >=dev-libs/boost-1.42:=
77 - sys-fs/e2fsprogs
78 - sys-process/audit[static-libs(+)]
79 - sys-process/lsof
80 -"
81 -DEPEND="${RDEPEND}"
82 -
83 -CONFIG_CHECK="~AUDITSYSCALL"
84 -
85 -PATCHES=(
86 - "${FILESDIR}"/${PN}-0.2.2-shared-build.patch
87 - "${FILESDIR}"/${PN}-0.2.2-libdir.patch
88 - "${FILESDIR}"/${PN}-0.2.4-sysmacros.patch #580534
89 - "${FILESDIR}"/${PN}-0.2.4-gcc6.patch #594046
90 - "${FILESDIR}"/${PN}-0.2.4-strdup.patch
91 -)
92 -
93 -pkg_setup() {
94 - check_extra_config
95 - DOC_CONTENTS="
96 - To launch systemd from e4rat you simply need to edit /etc/e4rat.conf
97 - and set:\n
98 - ; path to init process binary (DEFAULT: /sbin/init)\n
99 - init /usr/lib/systemd/systemd"
100 -}
101 -
102 -src_install() {
103 - cmake-utils_src_install
104 - # relocate binaries to /sbin. If someone knows of a better way to do it
105 - # please do tell me
106 - dodir sbin
107 - find "${D}"/usr/sbin -type f -exec mv {} "${D}"/sbin/. \; \
108 - || die
109 -
110 - readme.gentoo_create_doc
111 -}
112 -
113 -pkg_postinst() {
114 - readme.gentoo_print_elog
115 - if has_version sys-apps/preload; then
116 - elog "It appears you have sys-apps/preload installed. This may"
117 - elog "has negative effects on ${PN}. You may want to disable preload"
118 - elog "when using ${PN}."
119 - fi
120 -}
121
122 diff --git a/sys-fs/e4rat/files/e4rat-0.2.2-libdir.patch b/sys-fs/e4rat/files/e4rat-0.2.2-libdir.patch
123 deleted file mode 100644
124 index eaa2695d787..00000000000
125 --- a/sys-fs/e4rat/files/e4rat-0.2.2-libdir.patch
126 +++ /dev/null
127 @@ -1,14 +0,0 @@
128 -Index: e4rat-0.2.2/src/CMakeLists.txt
129 -===================================================================
130 ---- e4rat-0.2.2.orig/src/CMakeLists.txt
131 -+++ e4rat-0.2.2/src/CMakeLists.txt
132 -@@ -170,8 +170,7 @@ endif(NOT BUILD_CORE_LIBRARY_STATIC)
133 -
134 - INSTALL(TARGETS ${${PROJECT_NAME}_TARGETS}
135 - RUNTIME DESTINATION "sbin"
136 -- LIBRARY DESTINATION "lib"
137 -- ARCHIVE DESTINATION "lib"
138 -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
139 - )
140 -
141 - INSTALL(DIRECTORY DESTINATION "/var/lib/${PROJECT_NAME}")
142
143 diff --git a/sys-fs/e4rat/files/e4rat-0.2.2-shared-build.patch b/sys-fs/e4rat/files/e4rat-0.2.2-shared-build.patch
144 deleted file mode 100644
145 index 636eb52fb61..00000000000
146 --- a/sys-fs/e4rat/files/e4rat-0.2.2-shared-build.patch
147 +++ /dev/null
148 @@ -1,74 +0,0 @@
149 -Index: e4rat-0.2.2/CMakeLists.txt
150 -===================================================================
151 ---- e4rat-0.2.2.orig/CMakeLists.txt
152 -+++ e4rat-0.2.2/CMakeLists.txt
153 -@@ -14,7 +14,6 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_D
154 - set(CMAKE_INSTALL_PREFIX "/" CACHE PATH "e4rat install prefix" FORCE)
155 - ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
156 -
157 --set(Boost_USE_STATIC_LIBS ON)
158 - set(Boost_USE_MULTITHREADED OFF)
159 - add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
160 - find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED)
161 -Index: e4rat-0.2.2/src/CMakeLists.txt
162 -===================================================================
163 ---- e4rat-0.2.2.orig/src/CMakeLists.txt
164 -+++ e4rat-0.2.2/src/CMakeLists.txt
165 -@@ -131,21 +131,12 @@ IF(CMAKE_BUILD_TYPE STREQUAL "debug")
166 - )
167 - ENDIF(CMAKE_BUILD_TYPE STREQUAL "debug")
168 -
169 --# On 64 bit architecture you cannot link a static to a shared library
170 --# Therefore -static-libstdc++ will fail.
171 --if(BUILD_CORE_LIBRARY_STATIC)
172 -- add_library(${PROJECT_NAME}-core STATIC
173 -- ${${PROJECT_NAME}-core_SRC}
174 -- )
175 --else(BUILD_CORE_LIBRARY_STATIC)
176 -- add_library(${PROJECT_NAME}-core SHARED
177 -- ${${PROJECT_NAME}-core_SRC}
178 -- )
179 -- set_target_properties(${PROJECT_NAME}-core PROPERTIES
180 -- SOVERSION 0
181 -- LINK_FLAGS "-static-libgcc -static-libstdc++"
182 -- )
183 --endif(BUILD_CORE_LIBRARY_STATIC)
184 -+add_library(${PROJECT_NAME}-core SHARED
185 -+ ${${PROJECT_NAME}-core_SRC}
186 -+)
187 -+set_target_properties(${PROJECT_NAME}-core PROPERTIES
188 -+ SOVERSION 0
189 -+)
190 -
191 - target_link_libraries(${PROJECT_NAME}-core
192 - ${${PROJECT_NAME}_LIBRARIES}
193 -@@ -158,15 +149,13 @@ foreach( EXE ${PROJECT_NAME}-collect
194 - TARGET_LINK_LIBRARIES(${EXE}
195 - ${PROJECT_NAME}-core
196 - )
197 -- set_target_properties(${EXE} PROPERTIES
198 -- LINK_FLAGS "-static-libgcc -static-libstdc++"
199 -- )
200 - endforeach( EXE )
201 -
202 - ###
203 - # install project targets
204 - ###
205 - set(${PROJECT_NAME}_TARGETS
206 -+ ${PROJECT_NAME}-core
207 - ${PROJECT_NAME}-collect
208 - ${PROJECT_NAME}-preload
209 - ${PROJECT_NAME}-realloc
210 -Index: e4rat-0.2.2/src/cmake/Findaudit.cmake
211 -===================================================================
212 ---- e4rat-0.2.2.orig/src/cmake/Findaudit.cmake
213 -+++ e4rat-0.2.2/src/cmake/Findaudit.cmake
214 -@@ -1,7 +1,7 @@
215 - FIND_PATH(AUDIT_INCLUDE_DIR libaudit.h /usr/include
216 - /usr/local/include)
217 -
218 --FIND_LIBRARY(AUDIT_LIBRARY NAMES libaudit.a PATH /usr/lib /usr/local/lib)
219 -+FIND_LIBRARY(AUDIT_LIBRARY NAMES audit PATH /usr/lib /usr/local/lib)
220 -
221 - IF (AUDIT_INCLUDE_DIR AND AUDIT_LIBRARY)
222 - SET(AUDIT_FOUND TRUE)
223
224 diff --git a/sys-fs/e4rat/files/e4rat-0.2.4-gcc6.patch b/sys-fs/e4rat/files/e4rat-0.2.4-gcc6.patch
225 deleted file mode 100644
226 index cdf14e5c92e..00000000000
227 --- a/sys-fs/e4rat/files/e4rat-0.2.4-gcc6.patch
228 +++ /dev/null
229 @@ -1,11 +0,0 @@
230 ---- e4rat-0.2.4_pre20141201/src/logging.hh.old 2016-09-21 22:01:37.631925077 -0400
231 -+++ e4rat-0.2.4_pre20141201/src/logging.hh 2016-09-21 22:01:44.351086734 -0400
232 -@@ -93,7 +93,7 @@
233 - #define dump_log(...) logger.write(__VA_ARGS__)
234 -
235 - #ifdef DEBUG_ENABLED
236 -- #define debug(format,args...) dump_log(Debug, "%s:%d in %s(): "format, __FILE__, __LINE__, __FUNCTION__, ## args)
237 -+ #define debug(format,args...) dump_log(Debug, "%s:%d in %s(): " format, __FILE__, __LINE__, __FUNCTION__, ## args)
238 - #else
239 - #define debug(format,args...)
240 - #endif
241
242 diff --git a/sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch b/sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch
243 deleted file mode 100644
244 index c3a9cd0e8ca..00000000000
245 --- a/sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch
246 +++ /dev/null
247 @@ -1,41 +0,0 @@
248 ---- e4rat-0.2.4_pre20141201/src/e4rat-collect.cc.orig 2014-11-24 12:12:12.000000000 +0300
249 -+++ e4rat-0.2.4_pre20141201/src/e4rat-collect.cc 2017-02-12 02:16:25.151757182 +0300
250 -@@ -32,6 +32,7 @@
251 - #include <fcntl.h>
252 - #include <fstream>
253 - #include <signal.h>
254 -+#include <cstring>
255 -
256 - /* EXT2_SUPER_MAGIC */
257 - #include <ext2fs/ext2_fs.h>
258 -@@ -361,7 +362,9 @@
259 - {
260 - create_pid_late = true;
261 -
262 -- outPath = Config::get<std::string>("startup_log_file").c_str();
263 -+ // It is unsafe to use Config::get<T>(arg)c_str() pointer
264 -+ // directly, since it may be overwritten by later get calls.
265 -+ outPath = strdup(Config::get<std::string>("startup_log_file").c_str());
266 - verbose = 0;
267 - }
268 - else
269 ---- e4rat-0.2.4_pre20141201/src/e4rat-preload.cc.orig 2014-11-24 12:12:12.000000000 +0300
270 -+++ e4rat-0.2.4_pre20141201/src/e4rat-preload.cc 2017-02-12 02:16:38.425552630 +0300
271 -@@ -25,6 +25,7 @@
272 -
273 - #include <iostream>
274 - #include <fstream>
275 -+#include <cstring>
276 -
277 - #include <sys/types.h>
278 - #include <sys/stat.h>
279 -@@ -227,7 +228,8 @@
280 - try {
281 - if(getpid() == 1)
282 - {
283 -- const char* logfile = Config::get<std::string>("startup_log_file").c_str();
284 -+ // pointer may change, string must be copied
285 -+ const char* logfile = strdup(Config::get<std::string>("startup_log_file").c_str());
286 - notice("Open %s ... ", logfile);
287 - FILE* infile = fopen(logfile, "r");
288 - if(!infile)
289
290 diff --git a/sys-fs/e4rat/files/e4rat-0.2.4-sysmacros.patch b/sys-fs/e4rat/files/e4rat-0.2.4-sysmacros.patch
291 deleted file mode 100644
292 index 5cdcf3f05ae..00000000000
293 --- a/sys-fs/e4rat/files/e4rat-0.2.4-sysmacros.patch
294 +++ /dev/null
295 @@ -1,13 +0,0 @@
296 -https://sourceforge.net/p/e4rat/tickets/5/
297 -https://bugs.gentoo.org/580534
298 -
299 ---- a/src/common.hh
300 -+++ b/src/common.hh
301 -@@ -20,6 +20,7 @@
302 - #ifndef COMMON_HH
303 - #define COMMON_HH
304 -
305 -+#include <sys/sysmacros.h>
306 - #include <linux/types.h>
307 - #include <boost/filesystem.hpp>
308 - #include <boost/regex.hpp>
309
310 diff --git a/sys-fs/e4rat/metadata.xml b/sys-fs/e4rat/metadata.xml
311 deleted file mode 100644
312 index cb0a6ad4656..00000000000
313 --- a/sys-fs/e4rat/metadata.xml
314 +++ /dev/null
315 @@ -1,11 +0,0 @@
316 -<?xml version="1.0" encoding="UTF-8"?>
317 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
318 -<pkgmetadata>
319 - <maintainer type="person">
320 - <email>bircoph@g.o</email>
321 - <name>Andrew Savchenko</name>
322 - </maintainer>
323 - <upstream>
324 - <remote-id type="sourceforge">e4rat</remote-id>
325 - </upstream>
326 -</pkgmetadata>
Report Message
Find on MARC Find on Google Groups