diff --git a/.gitignore b/.gitignore index 169a9da..39ad2f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /encfs-1.7.4.tgz /encfs-1.8.1.tar.gz +/encfs-1.9.tar.gz diff --git a/0008-add-LIB_INSTALL_DIR-override-fixes-213.patch b/0008-add-LIB_INSTALL_DIR-override-fixes-213.patch new file mode 100644 index 0000000..2d5fe6b --- /dev/null +++ b/0008-add-LIB_INSTALL_DIR-override-fixes-213.patch @@ -0,0 +1,73 @@ +From 3fa633fffe2376ff90c5134bd9aa736a63d29438 Mon Sep 17 00:00:00 2001 +From: Valient Gough +Date: Thu, 15 Sep 2016 16:34:03 -0700 +Subject: [PATCH 8/8] add LIB_INSTALL_DIR override, fixes #213 + +--- + CMakeLists.txt | 14 +++++++++----- + create-dev-pkg.sh | 2 +- + 2 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 69d298d..ca23d62 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,6 +19,10 @@ option (USE_INTERNAL_TINYXML "use built-in TinyXML2" ON) + option (ENABLE_NLS "compile with Native Language Support (using gettext)" ON) + option (INSTALL_LIBENCFS "install libencfs" OFF) + ++if (NOT DEFINED LIB_INSTALL_DIR) ++ set (LIB_INSTALL_DIR lib) ++endif () ++ + # We need C++ 11 + if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.0) + # CMake 3.1 has built-in CXX standard checks. +@@ -43,11 +47,11 @@ if (APPLE) + set(CMAKE_MACOSX_RPATH ON) + set(CMAKE_SKIP_BUILD_RPATH FALSE) + set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") ++ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +- list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) ++ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" isSystemDir) + if("${isSystemDir}" STREQUAL "-1") +- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") ++ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}") + endif() + endif() + +@@ -176,7 +180,7 @@ target_link_libraries(encfs + ${Intl_LIBRARIES} + ) + if (INSTALL_LIBENCFS) +- install (TARGETS encfs DESTINATION lib) ++ install (TARGETS encfs DESTINATION ${LIB_INSTALL_DIR}) + endif (INSTALL_LIBENCFS) + + if (IWYU) +@@ -191,7 +195,7 @@ endif() + + + # Set RPATH to library install path. +-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") ++set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}") + + add_executable (encfs-bin encfs/main.cpp) + target_link_libraries (encfs-bin encfs) +diff --git a/create-dev-pkg.sh b/create-dev-pkg.sh +index 04c5c40..2ad0072 100755 +--- a/create-dev-pkg.sh ++++ b/create-dev-pkg.sh +@@ -1,6 +1,6 @@ + mkdir build + cd build +-cmake .. ++cmake .. $@ + make -j4 + sudo checkinstall --install=no \ + --pkgname="encfs" \ +-- +2.7.4 + diff --git a/fuse-encfs.spec b/fuse-encfs.spec index 8b5a292..cc3a5b7 100644 --- a/fuse-encfs.spec +++ b/fuse-encfs.spec @@ -1,26 +1,26 @@ Name: fuse-encfs -Version: 1.8.1 -Release: 2%{?dist} +Version: 1.9.0 +Release: 1%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPLv3+ Group: System Environment/Kernel Url: http://www.arg0.net/encfs -Source0: https://github.com/vgough/encfs/releases/download/v%{version}/encfs-%{version}.tar.gz -Patch0: 0001-Revert-Remove-o-default_permissions-unless-needed.patch +Source0: https://github.com/vgough/encfs/releases/download/v1.9/encfs-1.9.tar.gz +Patch0: 0008-add-LIB_INSTALL_DIR-override-fixes-213.patch Requires: fuse >= 2.6 Provides: encfs = %{version}-%{release} Provides: encfs%{?_isa} = %{version}-%{release} + BuildRequires: pkgconfig(librlog) >= 1.3 BuildRequires: pkgconfig(openssl) -BuildRequires: boost-devel >= 1.34 +BuildRequires: cmake BuildRequires: pkgconfig(fuse) >= 2.6 BuildRequires: gettext-devel >= 0.18 -BuildRequires: autoconf -BuildRequires: automake BuildRequires: libtool BuildRequires: libattr-devel -BuildRequires: perl(Pod::Html) +BuildRequires: perl(Locale::TextDomain) +BuildRequires: pkgconfig(tinyxml2) %description EncFS implements an encrypted filesystem in userspace using FUSE. FUSE @@ -30,15 +30,19 @@ passes access through to the underlying filesystem. Similar to CFS except that it does not use NFS. %prep -%autosetup -n encfs-%{version} -p1 +%autosetup -p1 -n encfs-1.9 +rm -rf internal/tinyxml2-3.0.0 +mkdir %{_target_platform} %build -autoreconf -vfi -%configure --disable-static -%make_build +pushd %{_target_platform} + %cmake .. -DCMAKE_SKIP_RPATH=ON -DBUILD_SHARED_LIBS=ON -DINSTALL_LIBENCFS=ON -DUSE_INTERNAL_TINYXML=OFF +popd + +%make_build -C %{_target_platform} %install -%make_install +%make_install -C %{_target_platform} rm -f %{buildroot}/%{_libdir}/*.la rm -f %{buildroot}/%{_libdir}/*.so %find_lang encfs @@ -55,6 +59,9 @@ rm -f %{buildroot}/%{_libdir}/*.so %{_mandir}/man1/encfs* %changelog +* Thu Sep 15 2016 Vasiliy N. Glazov 1.9.0-1 +- Update to 1.9.0 + * Thu Aug 04 2016 Vasiliy N. Glazov 1.8.1-2 - Add default-permissions revert patch diff --git a/sources b/sources index a882edd..ec6a4b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8365378ab7c0d493e04f4e98ae7eb4e encfs-1.8.1.tar.gz +271ccc5735076c0fe17c56b102ead821 encfs-1.9.tar.gz