wok-next view e4rat/stuff/patches/boost-fs3-v2.patch @ rev 21442

updated samba (4.6.14 -> 4.12.2)
author Hans-G?nter Theisgen
date Tue May 05 16:27:22 2020 +0100 (2020-05-05)
parents
children
line source
1 diff -rupN e4rat-0.2.3-fresh/CMakeLists.txt e4rat-0.2.3-fixed/CMakeLists.txt
2 --- e4rat-0.2.3-fresh/CMakeLists.txt 2012-05-03 08:43:12.000000000 +0200
3 +++ e4rat-0.2.3-fixed/CMakeLists.txt 2013-06-03 16:36:45.582255709 +0200
4 @@ -14,9 +14,8 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_D
5 set(CMAKE_INSTALL_PREFIX "/" CACHE PATH "e4rat install prefix" FORCE)
6 ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
7
8 -set(Boost_USE_STATIC_LIBS ON)
9 +set(Boost_USE_STATIC_LIBS OFF)
10 set(Boost_USE_MULTITHREADED OFF)
11 -add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
12 find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED)
13 set(${PROJECT_NAME}_LIBRARIES ${${PROJECT_NAME}_LIBRARIES}
14 ${Boost_LIBRARIES})
15 @@ -27,56 +26,6 @@ add_subdirectory( ${CMAKE_CURRENT_SOUR
16
17
18 # to generate debian package run: make package
19 -FIND_PROGRAM(DPKG_CMD dpkg)
20 -if(DPKG_CMD)
21 - EXECUTE_PROCESS(COMMAND "${DPKG_CMD}" --print-architecture
22 - OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
23 - OUTPUT_STRIP_TRAILING_WHITESPACE
24 - )
25 -else(DPKG_CMD)
26 - MESSAGE(STATUS "CPACK: Can not find dpkg in your path, default to i386.")
27 - SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386)
28 -endif(DPKG_CMD)
29 -
30 -SET (CPACK_GENERATOR DEB)
31 -SET(CPACK_PACKAGE_VERSION ${E4RAT_VERSION})
32 -SET(CPACK_PACKAGE_FILE_NAME
33 - "${PROJECT_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
34 -
35 -IF(NOT CMAKE_BUILD_TYPE STREQUAL "release")
36 - SET(CPACK_PACKAGE_FILE_NAME
37 - ${CPACK_PACKAGE_FILE_NAME}_debug)
38 -endif(NOT CMAKE_BUILD_TYPE STREQUAL "release")
39 -
40 -SET (CPACK_INSTALL_PREFIX "/")
41 -
42 -if(NOT CPACK_INSTALL_PREFIX STREQUAL CMAKE_INSTALL_PREFIX)
43 -SET(CPACK_PACKAGE_FILE_NAME
44 - ${CPACK_PACKAGE_FILE_NAME}_invalid-prefix)
45 -endif(NOT CPACK_INSTALL_PREFIX STREQUAL CMAKE_INSTALL_PREFIX)
46 -
47 -SET (CPACK_PACKAGE_DESCRIPTION_SUMMARY
48 - "Reduce disk access time on ext4 filesystems through relevant file defragmentation.")
49 -SET (CPACK_PACKAGE_CONTACT "Andreas Rid <conso@users.sf.net>")
50 -SET (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
51 -SET (CPACK_DEBIAN_PACKAGE_SECTION "extra")
52 -SET (CPACK_DEBIAN_PACKAGE_MAINTAINER "Andreas Rid")
53 -set (CPACK_SET_DESTDIR "ON") # Necessary because of the absolute install paths
54 -
55 -# extra install and uninstall create subfolders
56 -# I don't know why cpack deb does not create or remove directories.
57 -set( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
58 - "${CMAKE_CURRENT_SOURCE_DIR}/debian/preinst"
59 - "${CMAKE_CURRENT_SOURCE_DIR}/debian/postrm")
60 -
61 -SET (CPACK_DEBIAN_PACKAGE_DEPENDS
62 - "e2fslibs (>=1.41)")
63 -
64 -SET (CPACK_DEBIAN_PACKAGE_CONFLICTS
65 - "auditd, ureadahead")
66 -
67 -INCLUDE(CPack)
68 -
69 add_custom_target(src
70 COMMAND test -e ${PROJECT_NAME}-${E4RAT_VERSION} || mkdir ${PROJECT_NAME}-${E4RAT_VERSION}
71 COMMAND rsync -p --relative `git ls-files` ${PROJECT_NAME}-${E4RAT_VERSION}
72 diff -rupN e4rat-0.2.3-fresh/src/CMakeLists.txt e4rat-0.2.3-fixed/src/CMakeLists.txt
73 --- e4rat-0.2.3-fresh/src/CMakeLists.txt 2012-05-03 08:43:12.000000000 +0200
74 +++ e4rat-0.2.3-fixed/src/CMakeLists.txt 2013-06-03 16:42:44.028413549 +0200
75 @@ -180,7 +180,7 @@ if(NOT BUILD_CORE_LIBRARY_STATIC)
76 endif(NOT BUILD_CORE_LIBRARY_STATIC)
77
78 INSTALL(TARGETS ${${PROJECT_NAME}_TARGETS}
79 - RUNTIME DESTINATION "sbin"
80 + RUNTIME DESTINATION "/usr/bin"
81 LIBRARY DESTINATION "lib"
82 ARCHIVE DESTINATION "lib"
83 )
84 diff -rupN e4rat-0.2.3-fresh/src/common.cc e4rat-0.2.3-fixed/src/common.cc
85 --- e4rat-0.2.3-fresh/src/common.cc 2012-05-03 08:43:12.000000000 +0200
86 +++ e4rat-0.2.3-fixed/src/common.cc 2013-06-03 16:36:45.582255709 +0200
87 @@ -157,7 +157,7 @@ std::vector<std::string> matchPath( cons
88 p /= filesearch;
89 }
90 // Initialize regex filter - use * as default if nothing is given in filesearch
91 - std::string f( p.has_filename() ? p.filename() : "*");
92 + std::string f( p.has_filename() ? p.filename().string() : "*");
93
94 fs::path dir(system_complete(p).parent_path());
95 if( is_directory(dir) )
96 @@ -166,8 +166,8 @@ std::vector<std::string> matchPath( cons
97 it!=boost::filesystem::directory_iterator();
98 ++it )
99 {
100 - if( boost::regex_match( it->leaf(), path2regex(f) ) )
101 - fileset.push_back(it->string());
102 + if( boost::regex_match( it->path().filename().string(), path2regex(f) ) )
103 + fileset.push_back(it->path().filename().string());
104 }
105 return fileset;
106 }
107 diff -rupN e4rat-0.2.3-fresh/src/config.cc e4rat-0.2.3-fixed/src/config.cc
108 --- e4rat-0.2.3-fresh/src/config.cc 2012-05-03 08:43:12.000000000 +0200
109 +++ e4rat-0.2.3-fixed/src/config.cc 2013-06-03 16:36:45.582255709 +0200
110 @@ -71,7 +71,7 @@ Config::Config()
111 return;
112 }
113
114 - tool_name = fs::path(argv[0]).filename();
115 + tool_name = fs::path(argv[0]).filename().string();
116 found = tool_name.find_last_of("-");
117 if(found)
118 defaultSection = tool_name.substr(found+1);
119 diff -rupN e4rat-0.2.3-fresh/src/device.cc e4rat-0.2.3-fixed/src/device.cc
120 --- e4rat-0.2.3-fresh/src/device.cc 2012-05-03 08:43:12.000000000 +0200
121 +++ e4rat-0.2.3-fixed/src/device.cc 2013-06-03 16:36:45.582255709 +0200
122 @@ -196,13 +196,13 @@ int Device::getDevNameFromDevfs()
123 it != end_itr;
124 ++it )
125 {
126 - if(it->filename() == "root")
127 + if(it->path().filename().string() == "root")
128 continue;
129 - if(lstat(it->string().c_str(), &st))
130 + if(lstat(it->path().filename().c_str(), &st))
131 continue;
132 if(st.st_rdev == get()->devno)
133 {
134 - get()->deviceName = it->filename();
135 + get()->deviceName = it->path().filename().string();
136 get()->devicePath = "/dev/" + get()->deviceName;
137 return 0;
138 }
139 @@ -225,7 +225,7 @@ int Device::getDevNameFromMajorMinor()
140 // the minor number of virtual filesystems are allocated dynamically in function set_anon_super() in fs/super.c
141 // for convenience set deviceName and devicePath to a common name
142 get()->deviceName = "virtual file system";
143 - get()->devicePath = get()->mount_point.filename();
144 + get()->devicePath = get()->mount_point.filename().string();
145 return 0;
146 case 2:
147 ss << "fd";
148 diff -rupN e4rat-0.2.3-fresh/src/e4rat-collect.cc e4rat-0.2.3-fixed/src/e4rat-collect.cc
149 --- e4rat-0.2.3-fresh/src/e4rat-collect.cc 2012-05-03 08:43:12.000000000 +0200
150 +++ e4rat-0.2.3-fixed/src/e4rat-collect.cc 2013-06-03 16:36:45.582255709 +0200
151 @@ -396,7 +396,7 @@ int main(int argc, char* argv[])
152 * Parse application list given as arguments
153 */
154 for ( ; optind < argc; optind++)
155 - project.observeApp(fs::path(argv[optind]).filename());
156 + project.observeApp(fs::path(argv[optind]).filename().string());
157
158 /*
159 * Parse application list on stdin