Hello community, here is the log from the commit of package encfs for openSUSE:Factory checked in at 2017-04-28 09:13:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/encfs (Old) and /work/SRC/openSUSE:Factory/.encfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "encfs" Fri Apr 28 09:13:23 2017 rev:37 rq:490951 version:1.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/encfs/encfs.changes 2017-03-31 15:09:29.524345708 +0200 +++ /work/SRC/openSUSE:Factory/.encfs.new/encfs.changes 2017-04-28 09:13:37.823315206 +0200 @@ -1,0 +2,11 @@ +Sun Apr 23 08:52:20 UTC 2017 - [email protected] + +- patch 0001-Use-INITIALIZE_EASYLOGGINGPP-in-Error.cpp.patch fixes + some undefined references. See upstream issue + https://github.com/vgough/encfs/issues/291 + With this patch, the %cmake macro can now be used for building if + version of cmake is greater than 3.3 +- improved detection of tinyxml: now builds on more architectures + and SLE12 SP2 + +------------------------------------------------------------------- New: ---- 0001-Use-INITIALIZE_EASYLOGGINGPP-in-Error.cpp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ encfs.spec ++++++ --- /var/tmp/diff_new_pack.RXotQC/_old 2017-04-28 09:13:38.487221585 +0200 +++ /var/tmp/diff_new_pack.RXotQC/_new 2017-04-28 09:13:38.491221022 +0200 @@ -19,17 +19,30 @@ # Perl-Test-More >= 0.31 is requires by checks but yet not present in SuSE repos %define do_checks 0 -# cmake macro on SuSE forces linker to use '--no-undefined' but this will -# produce errors related to easylogging++ like # "undefined references to -# `el::base::elStorage'". See https://github.com/vgough/encfs/issues/291 +# The cmake macro for distros with cmake 3.3 cannot build encfs +%define use_cmake_macro 1 +%if 0%{?suse_version} == 1315 && 0%{?sle_version} == 120100 +# Leap 42.1 %define use_cmake_macro 0 +%endif +%if 0%{?suse_version} > 1320 +%ifarch ppc +%define use_cmake_macro 0 +%endif +%endif # Leap 42.2 and Tumbleweed have tinyxml2-3. For other distribution use the # tinyxml2-3 that is shipped with encfs. -%if 0%{?sle_version}>=120200 || 0%{?suse_version} > 1320 -%define os_has_tinyxml2 1 -%else %define os_has_tinyxml2 0 +%if 0%{?leap_version} >= 420200 +%ifarch x86_64 +%define os_has_tinyxml2 1 +%endif +%endif +%if 0%{?suse_version} > 1320 +%ifnarch ppc +%define os_has_tinyxml2 1 +%endif %endif Name: encfs @@ -40,6 +53,8 @@ Group: System/Filesystems Url: https://vgough.github.io/encfs/ Source: https://github.com/vgough/encfs/releases/download/v%{version}/encfs-%{version}.tar.gz +# PATCH-FIX-UPSTREAM 0001-Use-INITIALIZE_EASYLOGGINGPP-in-Error.cpp.patch #212 +Patch0: 0001-Use-INITIALIZE_EASYLOGGINGPP-in-Error.cpp.patch BuildRequires: cmake >= 3.1 BuildRequires: fuse-devel BuildRequires: gcc-c++ @@ -96,14 +111,12 @@ %prep %setup +%patch0 -p1 %build -#simply calling %%cmake macro does not work since the macro hardcodes -#'--no-undefined' which breaks build with errors from easylogging++ %if %{use_cmake_macro} %cmake %else -# call cmake similarily to %%cmake macro but without '--no-undefined' mkdir build cd build /usr/bin/cmake .. -G"Unix Makefiles" \ @@ -117,8 +130,8 @@ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \ -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \ %if "%{?_lib}" == "lib64" -DLIB_SUFFIX=64 \ %endif ++++++ 0001-Use-INITIALIZE_EASYLOGGINGPP-in-Error.cpp.patch ++++++ >From d985b3ec9eee98da297ec7ccff96fabf539f610e Mon Sep 17 00:00:00 2001 From: benrubson <[email protected]> Date: Sat, 22 Apr 2017 20:13:02 +0200 Subject: [PATCH] Use INITIALIZE_EASYLOGGINGPP in Error.cpp --- encfs/Error.cpp | 2 ++ encfs/encfsctl.cpp | 2 -- encfs/main.cpp | 2 -- encfs/makeKey.cpp | 2 -- encfs/test.cpp | 2 -- 5 files changed, 2 insertions(+), 8 deletions(-) diff --git a/encfs/Error.cpp b/encfs/Error.cpp index 94c5909..63ae113 100644 --- a/encfs/Error.cpp +++ b/encfs/Error.cpp @@ -1,5 +1,7 @@ #include "Error.h" +INITIALIZE_EASYLOGGINGPP + namespace encfs { el::base::DispatchAction rlogAction = el::base::DispatchAction::NormalLog; diff --git a/encfs/encfsctl.cpp b/encfs/encfsctl.cpp index 6a5d17e..26b82da 100644 --- a/encfs/encfsctl.cpp +++ b/encfs/encfsctl.cpp @@ -53,8 +53,6 @@ using namespace std; using gnu::autosprintf; using namespace encfs; -INITIALIZE_EASYLOGGINGPP - static int showInfo(int argc, char **argv); static int showVersion(int argc, char **argv); static int chpasswd(int argc, char **argv); diff --git a/encfs/main.cpp b/encfs/main.cpp index ff6a485..fdf59f4 100644 --- a/encfs/main.cpp +++ b/encfs/main.cpp @@ -58,8 +58,6 @@ using namespace std; using namespace encfs; using gnu::autosprintf; -INITIALIZE_EASYLOGGINGPP - namespace encfs { class DirNode; diff --git a/encfs/makeKey.cpp b/encfs/makeKey.cpp index d0a14d2..1e69eda 100644 --- a/encfs/makeKey.cpp +++ b/encfs/makeKey.cpp @@ -31,8 +31,6 @@ using namespace std; using namespace encfs; -INITIALIZE_EASYLOGGINGPP - void genKey(const std::shared_ptr<Cipher> &cipher) { CipherKey key = cipher->newRandomKey(); diff --git a/encfs/test.cpp b/encfs/test.cpp index ee66469..e850db3 100644 --- a/encfs/test.cpp +++ b/encfs/test.cpp @@ -49,8 +49,6 @@ using namespace std; using namespace encfs; -INITIALIZE_EASYLOGGINGPP - const int FSBlockSize = 256; static int checkErrorPropogation(const std::shared_ptr<Cipher> &cipher, -- 2.12.0
