* [gentoo-commits] repo/gentoo:master commit in: sys-fs/e4rat/, sys-fs/e4rat/files/
@ 2017-02-04 15:40 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2017-02-04 15:40 UTC (permalink / raw
To: gentoo-commits
commit: da1f2e1db822b2e107135686fb5f09110582a47d
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 15:37:20 2017 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 15:39:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da1f2e1d
sys-fs/e4rat: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-fs/e4rat/Manifest | 1 -
sys-fs/e4rat/e4rat-0.2.3-r1.ebuild | 61 ----------------
sys-fs/e4rat/files/e4rat-0.2.3-boostfsv3.patch | 86 -----------------------
sys-fs/e4rat/files/e4rat-libdir.patch | 26 -------
sys-fs/e4rat/files/e4rat-shared-build.patch | 96 --------------------------
5 files changed, 270 deletions(-)
diff --git a/sys-fs/e4rat/Manifest b/sys-fs/e4rat/Manifest
index f057cb6..3300b86 100644
--- a/sys-fs/e4rat/Manifest
+++ b/sys-fs/e4rat/Manifest
@@ -1,2 +1 @@
DIST e4rat-0.2.4_pre20141201.tar.xz 60408 SHA256 757d9d76b395a8b5092205bf623ba73860546f5f13efdf6b6347217b4ebe9e4b SHA512 61a53f6ac420392df5894d3f76de28c5d2e33fd3a6548cf8c9de52818bf937ba8bf8629db1b89103faa73b660548d7e467e17d7f2794a4100ca07971ded0cfb9 WHIRLPOOL 6c33956a6a601fd05d89325a2d2fa96ddf00c7e8130ac599c39e59e1ee3d3c21fc5ce712421969d96e96cfadd91fdbe6acc24d31d7acf413632fb49a575edeae
-DIST e4rat_0.2.3_src.tar.gz 72459 SHA256 f6feda9618eff0f9442baf771b4776b634e5a2f39e678c10e4c7946b2c6a96a0 SHA512 e1b78b7d84e17f0ded494217f2eb5912401d365844bc966d649682979e1d3deaceab6e9d820fb7fbec819e15133aa2af61131325204620d9b16a3c7638d7fdb7 WHIRLPOOL 912632a516bcefe2171bd1bc207394396ecec9cc74351b2afa511258cb1dfdbb38d2e5fe41a7af747addb92a5f8ff8b2b2321dee8f51d8e8bf7f919183e80c8c
diff --git a/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild b/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild
deleted file mode 100644
index d6c7a2d..00000000
--- a/sys-fs/e4rat/e4rat-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils linux-info readme.gentoo
-
-DESCRIPTION="Toolset to accelerate the boot process and application startup"
-HOMEPAGE="http://e4rat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-lang/perl:=
- >=dev-libs/boost-1.42:=
- sys-fs/e2fsprogs
- sys-process/audit
- sys-process/lsof"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~AUDITSYSCALL"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.2.2-shared-build.patch
- "${FILESDIR}"/${PN}-0.2.2-libdir.patch
- "${FILESDIR}"/${P}-boostfsv3.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
-
- dodoc README
- 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
-}
diff --git a/sys-fs/e4rat/files/e4rat-0.2.3-boostfsv3.patch b/sys-fs/e4rat/files/e4rat-0.2.3-boostfsv3.patch
deleted file mode 100644
index 5450af1..00000000
--- a/sys-fs/e4rat/files/e4rat-0.2.3-boostfsv3.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Bug #425422
-Fixes building against boost-1.50
-Port to boost FS v3
-
---- CMakeLists.txt.orig 2012-09-07 03:17:55.515017487 +0200
-+++ CMakeLists.txt 2012-09-13 19:54:18.160054076 +0200
-@@ -15,7 +15,6 @@
- ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-
- set(Boost_USE_MULTITHREADED OFF)
--add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
- find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED)
- set(${PROJECT_NAME}_LIBRARIES ${${PROJECT_NAME}_LIBRARIES}
- ${Boost_LIBRARIES})
---- src/config.cc.orig 2012-09-13 19:50:32.829871091 +0200
-+++ src/config.cc 2012-09-13 19:55:37.023068153 +0200
-@@ -71,7 +71,7 @@
- return;
- }
-
-- tool_name = fs::path(argv[0]).filename();
-+ tool_name = fs::path(argv[0]).filename().string();
- found = tool_name.find_last_of("-");
- if(found)
- defaultSection = tool_name.substr(found+1);
---- src/common.cc.orig 2012-09-13 19:58:06.187203344 +0200
-+++ src/common.cc 2012-09-13 19:59:34.752096130 +0200
-@@ -157,7 +157,7 @@
- p /= filesearch;
- }
- // Initialize regex filter - use * as default if nothing is given in filesearch
-- std::string f( p.has_filename() ? p.filename() : "*");
-+ std::string f( p.has_filename() ? p.filename().string() : "*");
-
- fs::path dir(system_complete(p).parent_path());
- if( is_directory(dir) )
-@@ -166,8 +166,8 @@
- it!=boost::filesystem::directory_iterator();
- ++it )
- {
-- if( boost::regex_match( it->leaf(), path2regex(f) ) )
-- fileset.push_back(it->string());
-+ if( boost::regex_match( it->path().filename().string(), path2regex(f) ) )
-+ fileset.push_back(it->path().filename().string());
- }
- return fileset;
- }
---- src/e4rat-collect.cc.orig 2012-09-13 20:03:40.185027797 +0200
-+++ src/e4rat-collect.cc 2012-09-13 20:03:54.404850024 +0200
-@@ -396,7 +396,7 @@
- * Parse application list given as arguments
- */
- for ( ; optind < argc; optind++)
-- project.observeApp(fs::path(argv[optind]).filename());
-+ project.observeApp(fs::path(argv[optind]).filename().string());
-
- /*
- * Parse application list on stdin
---- src/device.cc.orig 2012-09-13 20:00:40.232277516 +0200
-+++ src/device.cc 2012-09-13 20:03:11.026392331 +0200
-@@ -196,13 +196,13 @@
- it != end_itr;
- ++it )
- {
-- if(it->filename() == "root")
-+ if(it->path().filename().string() == "root")
- continue;
-- if(lstat(it->string().c_str(), &st))
-+ if(lstat(it->path().filename().c_str(), &st))
- continue;
- if(st.st_rdev == get()->devno)
- {
-- get()->deviceName = it->filename();
-+ get()->deviceName = it->path().filename().string();
- get()->devicePath = "/dev/" + get()->deviceName;
- return 0;
- }
-@@ -225,7 +225,7 @@
- // the minor number of virtual filesystems are allocated dynamically in function set_anon_super() in fs/super.c
- // for convenience set deviceName and devicePath to a common name
- get()->deviceName = "virtual file system";
-- get()->devicePath = get()->mount_point.filename();
-+ get()->devicePath = get()->mount_point.filename().string();
- return 0;
- case 2:
- ss << "fd";
diff --git a/sys-fs/e4rat/files/e4rat-libdir.patch b/sys-fs/e4rat/files/e4rat-libdir.patch
deleted file mode 100644
index 885e616..00000000
--- a/sys-fs/e4rat/files/e4rat-libdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b2413a77f3f11c6722ea7e83aafbaa3fc5c73376 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
-Date: Sun, 11 Dec 2011 18:39:59 +0100
-Subject: [PATCH] Fix installing into libdir.
-
----
- e4rat-0.2.1/src/CMakeLists.txt | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/e4rat-0.2.1/src/CMakeLists.txt b/e4rat-0.2.1/src/CMakeLists.txt
-index d379ec6..9fc7492 100644
---- a/e4rat-0.2.1/src/CMakeLists.txt
-+++ b/e4rat-0.2.1/src/CMakeLists.txt
-@@ -163,8 +163,7 @@ endif(NOT HAVE_64_BIT)
-
- INSTALL(TARGETS ${${PROJECT_NAME}_TARGETS}
- RUNTIME DESTINATION "sbin"
-- LIBRARY DESTINATION "lib"
-+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-- ARCHIVE DESTINATION "lib"
- )
-
- INSTALL(DIRECTORY DESTINATION "/var/lib/${PROJECT_NAME}")
---
-1.7.8.110.g4cb5d1.dirty
-
diff --git a/sys-fs/e4rat/files/e4rat-shared-build.patch b/sys-fs/e4rat/files/e4rat-shared-build.patch
deleted file mode 100644
index 2e322e2..00000000
--- a/sys-fs/e4rat/files/e4rat-shared-build.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From d9114b018b79afdcedb59621dfc13a0423c65fae Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 10 Dec 2011 23:00:35 +0100
-Subject: [PATCH] Link with and install shared libraries.
-
----
- e4rat-0.2.1/CMakeLists.txt | 1 -
- e4rat-0.2.1/src/CMakeLists.txt | 13 +------------
- e4rat-0.2.1/src/cmake/Findaudit.cmake | 2 +-
- e4rat-0.2.1/src/cmake/Findauparse.cmake | 2 +-
- 4 files changed, 3 insertions(+), 15 deletions(-)
-
-diff --git a/e4rat-0.2.1/CMakeLists.txt b/e4rat-0.2.1/CMakeLists.txt
-index 72b0681..e5e64cf 100644
---- a/e4rat-0.2.1/CMakeLists.txt
-+++ b/e4rat-0.2.1/CMakeLists.txt
-@@ -14,7 +14,6 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- 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)
-diff --git a/e4rat-0.2.1/src/CMakeLists.txt b/e4rat-0.2.1/src/CMakeLists.txt
-index d379ec6..4f8c12e 100644
---- a/e4rat-0.2.1/src/CMakeLists.txt
-+++ b/e4rat-0.2.1/src/CMakeLists.txt
-@@ -113,21 +113,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(HAVE_64_BIT)
-- add_library(${PROJECT_NAME}-core STATIC
-- ${${PROJECT_NAME}-core_SRC}
-- )
--else(HAVE_64_BIT)
- 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(HAVE_64_BIT)
-
- target_link_libraries(${PROJECT_NAME}-core
- ${${PROJECT_NAME}_LIBRARIES}
-@@ -140,15 +131,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
-diff --git a/e4rat-0.2.1/src/cmake/Findaudit.cmake b/e4rat-0.2.1/src/cmake/Findaudit.cmake
-index 32ac636..d8de45a 100644
---- a/e4rat-0.2.1/src/cmake/Findaudit.cmake
-+++ b/e4rat-0.2.1/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)
-diff --git a/e4rat-0.2.1/src/cmake/Findauparse.cmake b/e4rat-0.2.1/src/cmake/Findauparse.cmake
-index 7db0511..3771cd5 100644
---- a/e4rat-0.2.1/src/cmake/Findauparse.cmake
-+++ b/e4rat-0.2.1/src/cmake/Findauparse.cmake
-@@ -1,7 +1,7 @@
- FIND_PATH(AUPARSE_INCLUDE_DIR auparse.h /usr/include
- /usr/local/include)
-
--FIND_LIBRARY(AUPARSE_LIBRARY NAMES libauparse.a PATH /usr/lib /usr/local/lib)
-+FIND_LIBRARY(AUPARSE_LIBRARY NAMES auparse PATH /usr/lib /usr/local/lib)
-
- IF (AUPARSE_INCLUDE_DIR AND AUPARSE_LIBRARY)
- SET(AUPARSE_FOUND TRUE)
---
-1.7.8.110.g4cb5d1.dirty
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/e4rat/, sys-fs/e4rat/files/
@ 2017-02-12 0:05 Andrew Savchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Savchenko @ 2017-02-12 0:05 UTC (permalink / raw
To: gentoo-commits
commit: 01bb8c32471a29081be7d77f52e0f95da371b1cf
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 00:05:33 2017 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 00:05:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01bb8c32
sys-fs/e4rat: fix memory corruption
It is unsafe to use Config::get<T>(arg)c_str() pointer
directly, since it may be overwritten by later get calls.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild | 64 ++++++++++++++++++++++++++
sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch | 41 +++++++++++++++++
2 files changed, 105 insertions(+)
diff --git a/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild b/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild
new file mode 100644
index 0000000000..6792b38e4e
--- /dev/null
+++ b/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+IUSE=""
+
+RDEPEND="
+ dev-lang/perl:=
+ >=dev-libs/boost-1.42:=
+ sys-fs/e2fsprogs
+ sys-process/audit[static-libs(+)]
+ sys-process/lsof
+"
+DEPEND="${DEPEND}"
+
+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
+}
diff --git a/sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch b/sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch
new file mode 100644
index 0000000000..c3a9cd0e8c
--- /dev/null
+++ b/sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch
@@ -0,0 +1,41 @@
+--- 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)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-12 0:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-12 0:05 [gentoo-commits] repo/gentoo:master commit in: sys-fs/e4rat/, sys-fs/e4rat/files/ Andrew Savchenko
-- strict thread matches above, loose matches on Subject: below --
2017-02-04 15:40 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox