mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sys-fs/e4rat: Remove last-rited package
Closes: https://bugs.gentoo.org/722882 Closes: https://bugs.gentoo.org/808673 Closes: https://bugs.gentoo.org/742290 Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
This commit is contained in:
@@ -246,12 +246,6 @@ dev-python/pydns
|
||||
net-analyzer/netwox
|
||||
net-analyzer/netwag
|
||||
|
||||
# Sam James <sam@gentoo.org> (2021-08-17)
|
||||
# Fails to build with >= Boost 1.73, so broken for well over a year.
|
||||
# Several open bugs: bug #722882, bug #742290, bug #808673.
|
||||
# Removal on 2021-09-17.
|
||||
sys-fs/e4rat
|
||||
|
||||
# David Seifert <soap@gentoo.org> (2021-08-04)
|
||||
# Last release over 4 years ago, upstream pretty much dead, the
|
||||
# ecosystem has switched to dev-util/pkgconf, which is alive. Testing
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DIST e4rat-0.2.4_pre20141201.tar.xz 60408 BLAKE2B 4ebedfcca7f21bb1f3be59dac64694e0f69ecb5ebdc1637210c68097178e2ae38959581a51fc55b8773d63ce629aaf69765bb755d45467bf5e4f4e741b715101 SHA512 61a53f6ac420392df5894d3f76de28c5d2e33fd3a6548cf8c9de52818bf937ba8bf8629db1b89103faa73b660548d7e467e17d7f2794a4100ca07971ded0cfb9
|
||||
@@ -1,63 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils linux-info readme.gentoo-r1
|
||||
|
||||
DESCRIPTION="Toolset to accelerate the boot process and application startup"
|
||||
HOMEPAGE="http://e4rat.sourceforge.net/"
|
||||
#SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
|
||||
SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${PN}-0.2.4_pre20141201.tar.xz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
RDEPEND="
|
||||
dev-lang/perl:=
|
||||
>=dev-libs/boost-1.42:=
|
||||
sys-fs/e2fsprogs
|
||||
sys-process/audit[static-libs(+)]
|
||||
sys-process/lsof
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
CONFIG_CHECK="~AUDITSYSCALL"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-0.2.2-shared-build.patch
|
||||
"${FILESDIR}"/${PN}-0.2.2-libdir.patch
|
||||
"${FILESDIR}"/${PN}-0.2.4-sysmacros.patch #580534
|
||||
"${FILESDIR}"/${PN}-0.2.4-gcc6.patch #594046
|
||||
"${FILESDIR}"/${PN}-0.2.4-strdup.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
check_extra_config
|
||||
DOC_CONTENTS="
|
||||
To launch systemd from e4rat you simply need to edit /etc/e4rat.conf
|
||||
and set:\n
|
||||
; path to init process binary (DEFAULT: /sbin/init)\n
|
||||
init /usr/lib/systemd/systemd"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
# relocate binaries to /sbin. If someone knows of a better way to do it
|
||||
# please do tell me
|
||||
dodir sbin
|
||||
find "${D}"/usr/sbin -type f -exec mv {} "${D}"/sbin/. \; \
|
||||
|| die
|
||||
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
readme.gentoo_print_elog
|
||||
if has_version sys-apps/preload; then
|
||||
elog "It appears you have sys-apps/preload installed. This may"
|
||||
elog "has negative effects on ${PN}. You may want to disable preload"
|
||||
elog "when using ${PN}."
|
||||
fi
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
Index: e4rat-0.2.2/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- e4rat-0.2.2.orig/src/CMakeLists.txt
|
||||
+++ e4rat-0.2.2/src/CMakeLists.txt
|
||||
@@ -170,8 +170,7 @@ endif(NOT BUILD_CORE_LIBRARY_STATIC)
|
||||
|
||||
INSTALL(TARGETS ${${PROJECT_NAME}_TARGETS}
|
||||
RUNTIME DESTINATION "sbin"
|
||||
- LIBRARY DESTINATION "lib"
|
||||
- ARCHIVE DESTINATION "lib"
|
||||
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
)
|
||||
|
||||
INSTALL(DIRECTORY DESTINATION "/var/lib/${PROJECT_NAME}")
|
||||
@@ -1,74 +0,0 @@
|
||||
Index: e4rat-0.2.2/CMakeLists.txt
|
||||
===================================================================
|
||||
--- e4rat-0.2.2.orig/CMakeLists.txt
|
||||
+++ e4rat-0.2.2/CMakeLists.txt
|
||||
@@ -14,7 +14,6 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_D
|
||||
set(CMAKE_INSTALL_PREFIX "/" CACHE PATH "e4rat install prefix" FORCE)
|
||||
ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
||||
|
||||
-set(Boost_USE_STATIC_LIBS ON)
|
||||
set(Boost_USE_MULTITHREADED OFF)
|
||||
add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
|
||||
find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED)
|
||||
Index: e4rat-0.2.2/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- e4rat-0.2.2.orig/src/CMakeLists.txt
|
||||
+++ e4rat-0.2.2/src/CMakeLists.txt
|
||||
@@ -131,21 +131,12 @@ IF(CMAKE_BUILD_TYPE STREQUAL "debug")
|
||||
)
|
||||
ENDIF(CMAKE_BUILD_TYPE STREQUAL "debug")
|
||||
|
||||
-# On 64 bit architecture you cannot link a static to a shared library
|
||||
-# Therefore -static-libstdc++ will fail.
|
||||
-if(BUILD_CORE_LIBRARY_STATIC)
|
||||
- add_library(${PROJECT_NAME}-core STATIC
|
||||
- ${${PROJECT_NAME}-core_SRC}
|
||||
- )
|
||||
-else(BUILD_CORE_LIBRARY_STATIC)
|
||||
- add_library(${PROJECT_NAME}-core SHARED
|
||||
- ${${PROJECT_NAME}-core_SRC}
|
||||
- )
|
||||
- set_target_properties(${PROJECT_NAME}-core PROPERTIES
|
||||
- SOVERSION 0
|
||||
- LINK_FLAGS "-static-libgcc -static-libstdc++"
|
||||
- )
|
||||
-endif(BUILD_CORE_LIBRARY_STATIC)
|
||||
+add_library(${PROJECT_NAME}-core SHARED
|
||||
+ ${${PROJECT_NAME}-core_SRC}
|
||||
+)
|
||||
+set_target_properties(${PROJECT_NAME}-core PROPERTIES
|
||||
+ SOVERSION 0
|
||||
+)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}-core
|
||||
${${PROJECT_NAME}_LIBRARIES}
|
||||
@@ -158,15 +149,13 @@ foreach( EXE ${PROJECT_NAME}-collect
|
||||
TARGET_LINK_LIBRARIES(${EXE}
|
||||
${PROJECT_NAME}-core
|
||||
)
|
||||
- set_target_properties(${EXE} PROPERTIES
|
||||
- LINK_FLAGS "-static-libgcc -static-libstdc++"
|
||||
- )
|
||||
endforeach( EXE )
|
||||
|
||||
###
|
||||
# install project targets
|
||||
###
|
||||
set(${PROJECT_NAME}_TARGETS
|
||||
+ ${PROJECT_NAME}-core
|
||||
${PROJECT_NAME}-collect
|
||||
${PROJECT_NAME}-preload
|
||||
${PROJECT_NAME}-realloc
|
||||
Index: e4rat-0.2.2/src/cmake/Findaudit.cmake
|
||||
===================================================================
|
||||
--- e4rat-0.2.2.orig/src/cmake/Findaudit.cmake
|
||||
+++ e4rat-0.2.2/src/cmake/Findaudit.cmake
|
||||
@@ -1,7 +1,7 @@
|
||||
FIND_PATH(AUDIT_INCLUDE_DIR libaudit.h /usr/include
|
||||
/usr/local/include)
|
||||
|
||||
-FIND_LIBRARY(AUDIT_LIBRARY NAMES libaudit.a PATH /usr/lib /usr/local/lib)
|
||||
+FIND_LIBRARY(AUDIT_LIBRARY NAMES audit PATH /usr/lib /usr/local/lib)
|
||||
|
||||
IF (AUDIT_INCLUDE_DIR AND AUDIT_LIBRARY)
|
||||
SET(AUDIT_FOUND TRUE)
|
||||
@@ -1,11 +0,0 @@
|
||||
--- e4rat-0.2.4_pre20141201/src/logging.hh.old 2016-09-21 22:01:37.631925077 -0400
|
||||
+++ e4rat-0.2.4_pre20141201/src/logging.hh 2016-09-21 22:01:44.351086734 -0400
|
||||
@@ -93,7 +93,7 @@
|
||||
#define dump_log(...) logger.write(__VA_ARGS__)
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
- #define debug(format,args...) dump_log(Debug, "%s:%d in %s(): "format, __FILE__, __LINE__, __FUNCTION__, ## args)
|
||||
+ #define debug(format,args...) dump_log(Debug, "%s:%d in %s(): " format, __FILE__, __LINE__, __FUNCTION__, ## args)
|
||||
#else
|
||||
#define debug(format,args...)
|
||||
#endif
|
||||
@@ -1,41 +0,0 @@
|
||||
--- e4rat-0.2.4_pre20141201/src/e4rat-collect.cc.orig 2014-11-24 12:12:12.000000000 +0300
|
||||
+++ e4rat-0.2.4_pre20141201/src/e4rat-collect.cc 2017-02-12 02:16:25.151757182 +0300
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <fstream>
|
||||
#include <signal.h>
|
||||
+#include <cstring>
|
||||
|
||||
/* EXT2_SUPER_MAGIC */
|
||||
#include <ext2fs/ext2_fs.h>
|
||||
@@ -361,7 +362,9 @@
|
||||
{
|
||||
create_pid_late = true;
|
||||
|
||||
- outPath = Config::get<std::string>("startup_log_file").c_str();
|
||||
+ // It is unsafe to use Config::get<T>(arg)c_str() pointer
|
||||
+ // directly, since it may be overwritten by later get calls.
|
||||
+ outPath = strdup(Config::get<std::string>("startup_log_file").c_str());
|
||||
verbose = 0;
|
||||
}
|
||||
else
|
||||
--- e4rat-0.2.4_pre20141201/src/e4rat-preload.cc.orig 2014-11-24 12:12:12.000000000 +0300
|
||||
+++ e4rat-0.2.4_pre20141201/src/e4rat-preload.cc 2017-02-12 02:16:38.425552630 +0300
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
+#include <cstring>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
@@ -227,7 +228,8 @@
|
||||
try {
|
||||
if(getpid() == 1)
|
||||
{
|
||||
- const char* logfile = Config::get<std::string>("startup_log_file").c_str();
|
||||
+ // pointer may change, string must be copied
|
||||
+ const char* logfile = strdup(Config::get<std::string>("startup_log_file").c_str());
|
||||
notice("Open %s ... ", logfile);
|
||||
FILE* infile = fopen(logfile, "r");
|
||||
if(!infile)
|
||||
@@ -1,13 +0,0 @@
|
||||
https://sourceforge.net/p/e4rat/tickets/5/
|
||||
https://bugs.gentoo.org/580534
|
||||
|
||||
--- a/src/common.hh
|
||||
+++ b/src/common.hh
|
||||
@@ -20,6 +20,7 @@
|
||||
#ifndef COMMON_HH
|
||||
#define COMMON_HH
|
||||
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <linux/types.h>
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/regex.hpp>
|
||||
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>bircoph@gentoo.org</email>
|
||||
<name>Andrew Savchenko</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">e4rat</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
Reference in New Issue
Block a user