m4rtink pushed to anaconda (master). "New version 27.17-1 (..more)"
by notificationsï¼ fedoraproject.org
From 557b0fbc4825c289785cd23ae4e2c7560e1446ca Mon Sep 17 00:00:00 2001
From: Martin Kolman <mkolman(a)redhat.com>
Date: Sat, 1 Jul 2017 01:49:37 +0200
Subject: New version 27.17-1
- Require "blivet-gui-runtime" instead of "blivet-gui" (vtrefny)
- Fix a typo in python-meh initialization (#1462825) (mkolman)
---
.gitignore | 1 +
anaconda.spec | 10 +++++++---
sources | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index f8e8e39..cb95f3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,3 +108,4 @@
/anaconda-27.14.tar.bz2
/anaconda-27.15.tar.bz2
/anaconda-27.16.tar.bz2
+/anaconda-27.17.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index 5dda4b5..ca89dd2 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -2,7 +2,7 @@
Summary: Graphical system installer
Name: anaconda
-Version: 27.16
+Version: 27.17
Release: 1%{?dist}
License: GPLv2+ and MIT
Group: Applications/System
@@ -39,7 +39,7 @@ Source0: %{name}-%{version}.tar.bz2
%define libtimezonemapver 0.4.1-2
%define helpver 22.1-1
%define libblockdevver 2.1
-%define blivetguiver 2.1.4
+%define blivetguiver 2.1.5-2
BuildRequires: audit-libs-devel
BuildRequires: gettext >= %{gettextver}
@@ -184,7 +184,7 @@ Requires: NetworkManager-wifi
Requires: anaconda-user-help >= %{helpver}
Requires: yelp
Requires: python3-gobject-base
-Requires: blivet-gui >= %{blivetguiver}
+Requires: blivet-gui-runtime >= %{blivetguiver}
# Needed to compile the gsettings files
BuildRequires: gsettings-desktop-schemas
@@ -328,6 +328,10 @@ update-desktop-database &> /dev/null || :
%{_prefix}/libexec/anaconda/dd_*
%changelog
+* Sat Jul 01 2017 Martin Kolman <mkolman(a)redhat.com> - 27.17-1
+- Require "blivet-gui-runtime" instead of "blivet-gui" (vtrefny)
+- Fix a typo in python-meh initialization (#1462825) (mkolman)
+
* Mon Jun 26 2017 Martin Kolman <mkolman(a)redhat.com> - 27.16-1
- Install class shouldn't set the default boot fstype (#1463297) (vponcova)
- Store testing logs properly (jkonecny)
diff --git a/sources b/sources
index 828ac55..753077f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (anaconda-27.16.tar.bz2) = e2b97a4e06afad8a40c3db5de6a82c915c5df091e615e0324a114f7ab22c213668c0ad9ad1b0d340a5376d7c81c218240bf8b0a0b1c0219910cd07635d872d33
+SHA512 (anaconda-27.17.tar.bz2) = dad15347c90f18fd0546365adfed05400efa595b0d33d3e9731b83aaa8f45f84ee016d87d34a28c2163b00fa41885ce072abecc8f6060e5253ccfcdce277fa1a
--
cgit v1.1
https://src.fedoraproject.org/cgit/anaconda.git/commit/?h=master&id=557b0...
6Â years, 2Â months
kkofler pushed to qt5-qtwebengine (master). "Update to 5.9.1 (..more)"
by notificationsï¼ fedoraproject.org
From f456610d8c80d8fdbf3dfaca93a55b2e960befc6 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sat, 1 Jul 2017 01:30:34 +0200
Subject: Update to 5.9.1
* Fri Jun 30 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.9.1-1
- Update to 5.9.1
- Rebase qtbug-61521 patch (drop the parts that are already in 5.9.1)
- Drop backported GN aarch64 patches already included in 5.9.1
---
.gitignore | 1 +
qt5-qtwebengine.spec | 27 ++-
...pensource-src-5.9.0-aarch64-gcc-toolchain.patch | 30 ----
qtwebengine-opensource-src-5.9.0-gn-aarch64.patch | 43 -----
qtwebengine-opensource-src-5.9.0-qtbug-61521.patch | 181 ---------------------
qtwebengine-opensource-src-5.9.1-qtbug-61521.patch | 160 ++++++++++++++++++
sources | 2 +-
7 files changed, 174 insertions(+), 270 deletions(-)
delete mode 100644 qtwebengine-opensource-src-5.9.0-aarch64-gcc-toolchain.patch
delete mode 100644 qtwebengine-opensource-src-5.9.0-gn-aarch64.patch
delete mode 100644 qtwebengine-opensource-src-5.9.0-qtbug-61521.patch
create mode 100644 qtwebengine-opensource-src-5.9.1-qtbug-61521.patch
diff --git a/.gitignore b/.gitignore
index 3eee6b2..01c15f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/qtwebengine-opensource-src-5.7.1-clean.tar.xz
/qtwebengine-opensource-src-5.8.0-clean.tar.xz
/qtwebengine-opensource-src-5.9.0-clean.tar.xz
+/qtwebengine-opensource-src-5.9.1-clean.tar.xz
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 480d8c7..319699a 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -55,8 +55,8 @@
Summary: Qt5 - QtWebEngine components
Name: qt5-qtwebengine
-Version: 5.9.0
-Release: 4%{?dist}
+Version: 5.9.1
+Release: 1%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -64,8 +64,8 @@ Release: 4%{?dist}
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
URL: http://www.qt.io
# cleaned tarball with patent-encumbered codecs removed from the bundled FFmpeg
-# wget http://download.qt.io/official_releases/qt/5.9/5.9.0/submodules/qtwebengi...
-# ./clean_qtwebengine.sh 5.9.0
+# wget http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebengi...
+# ./clean_qtwebengine.sh 5.9.1
Source0: qtwebengine-opensource-src-%{version}-clean.tar.xz
# cleanup scripts used above
Source1: clean_qtwebengine.sh
@@ -119,13 +119,7 @@ Patch21: qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose.patch
Patch22: qtwebengine-opensource-src-5.9.0-system-re2.patch
# Fix broken binary compatibility for C memory management functions (incomplete
# upstream fix for QTBUG-60565) (QTBUG-61521)
-Patch23: qtwebengine-opensource-src-5.9.0-qtbug-61521.patch
-# Backport upstream patch to fix GN FTBFS on aarch64 (QTBUG-61128)
-# https://codereview.qt-project.org/196178
-Patch100: qtwebengine-opensource-src-5.9.0-gn-aarch64.patch
-# Backport patch to fix FTBFS with GCC on aarch64 from upstream Chromium
-# https://codereview.chromium.org/2545053002
-Patch101: qtwebengine-opensource-src-5.9.0-aarch64-gcc-toolchain.patch
+Patch23: qtwebengine-opensource-src-5.9.1-qtbug-61521.patch
%if 0%{?fedora} && 0%{?fedora} < 25
# work around missing qt5_qtwebengine_arches macro on F24
@@ -215,9 +209,9 @@ BuildRequires: pkgconfig(vpx) >= 1.6.0
# Of course, Chromium itself is bundled. It cannot be unbundled because it is
# not a library, but forked (modified) application code.
-# Some security fixes (up to version 58.0.3029.96) are backported, see:
+# Some security fixes (up to version 59.0.3071.104) are backported, see:
# http://code.qt.io/cgit/qt/qtwebengine-chromium.git/log/?h=56-based
-# see dist/changes-5.9.0 for the version numbers (base, security fixes) and for
+# see dist/changes-5.9.1 for the version numbers (base, security fixes) and for
# a list of CVEs fixed by the added security backports
Provides: bundled(chromium) = 56.0.2924.122
@@ -372,8 +366,6 @@ BuildArch: noarch
%patch21 -p1 -b .gn-bootstrap-verbose
%patch22 -p1 -b .system-re2
%patch23 -p1 -b .qtbug-61521
-%patch100 -p1 -b .gn-aarch64
-%patch101 -p1 -b .aarch64-gcc-toolchain
# fix // in #include in content/renderer/gpu to avoid debugedit failure
sed -i -e 's!gpu//!gpu/!g' \
src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc
@@ -580,6 +572,11 @@ done
%changelog
+* Fri Jun 30 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.9.1-1
+- Update to 5.9.1
+- Rebase qtbug-61521 patch (drop the parts that are already in 5.9.1)
+- Drop backported GN aarch64 patches already included in 5.9.1
+
* Mon Jun 26 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.9.0-4
- Add a hunk to the QTBUG-61521 fix according to the upstream review
diff --git a/qtwebengine-opensource-src-5.9.0-aarch64-gcc-toolchain.patch b/qtwebengine-opensource-src-5.9.0-aarch64-gcc-toolchain.patch
deleted file mode 100644
index 76228a0..0000000
--- a/qtwebengine-opensource-src-5.9.0-aarch64-gcc-toolchain.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
-diff --git a/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn b/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
-index 548722d3938017ac936b9088b7a686c2afbbb5fe..86cd7dabc6e86d22a266817dfbb3bf0c719f7992 100644
---- a/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
-+++ b/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
-@@ -21,6 +21,24 @@ clang_toolchain("clang_arm64") {
- }
- }
-
-+gcc_toolchain("arm64") {
-+ toolprefix = "aarch64-linux-gnu-"
-+
-+ cc = "${toolprefix}gcc"
-+ cxx = "${toolprefix}g++"
-+
-+ ar = "${toolprefix}ar"
-+ ld = cxx
-+ readelf = "${toolprefix}readelf"
-+ nm = "${toolprefix}nm"
-+
-+ toolchain_args = {
-+ current_cpu = "arm64"
-+ current_os = "linux"
-+ is_clang = false
-+ }
-+}
-+
- gcc_toolchain("arm") {
- toolprefix = "arm-linux-gnueabihf-"
-
diff --git a/qtwebengine-opensource-src-5.9.0-gn-aarch64.patch b/qtwebengine-opensource-src-5.9.0-gn-aarch64.patch
deleted file mode 100644
index 1e8f31f..0000000
--- a/qtwebengine-opensource-src-5.9.0-gn-aarch64.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 801c957651fba94b5d7dde9cc490378a4dc3a987 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen(a)qt.io>
-Date: Thu, 1 Jun 2017 11:40:02 +0200
-Subject: [PATCH] [Backport] GN: Add Arm64 Linux support
-
-Add Arm64 linux support be able to build GN binary for
-native arm64 builds.
-
-R=dpranke(a)chromium.org, brettw(a)chromium.org
-
-Review-Url: https://codereview.chromium.org/2550673002
-
-Task-number: QTBUG-61128
-Change-Id: I3aa6b6ca7df374428a7f4a8b4db9f488a8926f6c
-Reviewed-by: Joerg Bornemann <joerg.bornemann(a)qt.io>
----
- chromium/tools/gn/args.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/3rdparty/chromium/tools/gn/args.cc b/src/3rdparty/chromium/tools/gn/args.cc
-index 7285d7a..54703e1 100644
---- a/src/3rdparty/chromium/tools/gn/args.cc
-+++ b/src/3rdparty/chromium/tools/gn/args.cc
-@@ -266,6 +266,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const {
- static const char kX86[] = "x86";
- static const char kX64[] = "x64";
- static const char kArm[] = "arm";
-+ static const char kArm64[] = "arm64";
- static const char kMips[] = "mipsel";
- static const char kS390X[] = "s390x";
- static const char kPPC64[] = "ppc64";
-@@ -280,6 +281,8 @@ void Args::SetSystemVarsLocked(Scope* dest) const {
- arch = kX64;
- else if (os_arch.substr(0, 3) == "arm")
- arch = kArm;
-+ else if (os_arch == "aarch64")
-+ arch = kArm64;
- else if (os_arch == "mips")
- arch = kMips;
- else if (os_arch == "s390x")
---
-2.7.4
-
diff --git a/qtwebengine-opensource-src-5.9.0-qtbug-61521.patch b/qtwebengine-opensource-src-5.9.0-qtbug-61521.patch
deleted file mode 100644
index a9a0109..0000000
--- a/qtwebengine-opensource-src-5.9.0-qtbug-61521.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/base/process/memory_linux.cc qtwebengine-opensource-src-5.9.0-qtbug-61521/src/3rdparty/chromium/base/process/memory_linux.cc
---- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/base/process/memory_linux.cc 2017-05-18 16:51:44.000000000 +0200
-+++ qtwebengine-opensource-src-5.9.0-qtbug-61521/src/3rdparty/chromium/base/process/memory_linux.cc 2017-06-26 23:48:15.166464570 +0200
-@@ -60,6 +60,7 @@
- #endif
- void* __libc_memalign(size_t alignment, size_t size);
-
-+#if !defined(TOOLKIT_QT) //QTBUG-61521,QTBUG-60565
- // Overriding the system memory allocation functions:
- //
- // For security reasons, we want malloc failures to be fatal. Too much code
-@@ -129,6 +130,7 @@
- *ptr = memalign(alignment, size);
- return 0;
- }
-+#endif // TOOLKIT_QT
-
- } // extern C
-
-diff -ur qtwebengine-opensource-src-5.9.0/src/core/api/qtbug-60565.cpp qtwebengine-opensource-src-5.9.0-qtbug-61521/src/core/api/qtbug-60565.cpp
---- qtwebengine-opensource-src-5.9.0/src/core/api/qtbug-60565.cpp 2017-05-19 06:22:04.000000000 +0200
-+++ qtwebengine-opensource-src-5.9.0-qtbug-61521/src/core/api/qtbug-60565.cpp 2017-06-25 22:33:28.508223362 +0200
-@@ -39,6 +39,8 @@
-
- #include <new>
- #include <unistd.h>
-+#include <stdlib.h>
-+#include <malloc.h>
-
- #if defined(__LP64__)
- # define SIZE_T_MANGLING "m"
-@@ -47,6 +49,7 @@
- #endif
-
- #define SHIM_ALIAS_SYMBOL(fn) __attribute__((weak, alias(#fn)))
-+#define SHIM_HIDDEN __attribute__ ((visibility ("hidden")))
-
- extern "C" {
-
-@@ -82,26 +85,100 @@
- void __ShimCppDeleteArrayNoThrow(void* address, const std::nothrow_t&) noexcept
- SHIM_ALIAS_SYMBOL(ShimCppDeleteArray);
-
-+__asm__(".symver __ShimMalloc, malloc@Qt_5");
-+void* __ShimMalloc(size_t size) noexcept
-+ SHIM_ALIAS_SYMBOL(ShimMalloc);
-+
-+__asm__(".symver __ShimCalloc, calloc@Qt_5");
-+void* __ShimCalloc(size_t n, size_t size) noexcept
-+ SHIM_ALIAS_SYMBOL(ShimCalloc);
-+
-+__asm__(".symver __ShimRealloc, realloc@Qt_5");
-+void* __ShimRealloc(void* address, size_t size) noexcept
-+ SHIM_ALIAS_SYMBOL(ShimRealloc);
-+
-+__asm__(".symver __ShimMemalign, memalign@Qt_5");
-+void* __ShimMemalign(size_t alignment, size_t size) noexcept
-+ SHIM_ALIAS_SYMBOL(ShimMemalign);
-+
-+__asm__(".symver __ShimPosixMemalign, posix_memalign@Qt_5");
-+int __ShimPosixMemalign(void** res, size_t alignment, size_t size) noexcept
-+ SHIM_ALIAS_SYMBOL(ShimPosixMemalign);
-+
-+__asm__(".symver __ShimValloc, valloc@Qt_5");
-+void* __ShimValloc(size_t size) noexcept
-+ SHIM_ALIAS_SYMBOL(ShimValloc);
-+
-+__asm__(".symver __ShimPvalloc, pvalloc@Qt_5");
-+void* __ShimPvalloc(size_t size) noexcept
-+ SHIM_ALIAS_SYMBOL(ShimPvalloc);
-+
-+__asm__(".symver __ShimFree, free@Qt_5");
-+void __ShimFree(void* address) noexcept
-+ SHIM_ALIAS_SYMBOL(ShimFree);
-+
- static void* __shimCppNew(size_t size);
- static void* __shimCppNewArray(size_t size);
- static void __shimCppDelete(void *address);
- static void __shimCppDeleteArray(void *address);
-+static void* __shimMalloc(size_t size) noexcept;
-+static void* __shimCalloc(size_t n, size_t size) noexcept;
-+static void* __shimRealloc(void* address, size_t size) noexcept;
-+static void* __shimMemalign(size_t alignment, size_t size) noexcept;
-+static int __shimPosixMemalign(void** res, size_t alignment, size_t size)
-+ noexcept;
-+static void* __shimValloc(size_t size) noexcept;
-+static void* __shimPvalloc(size_t size) noexcept;
-+static void __shimFree(void* address) noexcept;
-
--static void* ShimCppNew(size_t size) {
-+SHIM_HIDDEN void* ShimCppNew(size_t size) {
- return __shimCppNew(size);
- }
-
--static void* ShimCppNewArray(size_t size) {
-+SHIM_HIDDEN void* ShimCppNewArray(size_t size) {
- return __shimCppNewArray(size);
- }
-
--static void ShimCppDelete(void* address) {
-+SHIM_HIDDEN void ShimCppDelete(void* address) {
- __shimCppDelete(address);
- }
-
--static void ShimCppDeleteArray(void* address) {
-+SHIM_HIDDEN void ShimCppDeleteArray(void* address) {
- __shimCppDeleteArray(address);
- }
-+
-+SHIM_HIDDEN void* ShimMalloc(size_t size) noexcept {
-+ return __shimMalloc(size);
-+}
-+
-+SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) noexcept {
-+ return __shimCalloc(n, size);
-+}
-+
-+SHIM_HIDDEN void* ShimRealloc(void* address, size_t size) noexcept {
-+ return __shimRealloc(address, size);
-+}
-+
-+SHIM_HIDDEN void* ShimMemalign(size_t alignment, size_t size) noexcept {
-+ return __shimMemalign(alignment, size);
-+}
-+
-+SHIM_HIDDEN int ShimPosixMemalign(void** res, size_t alignment, size_t size)
-+ noexcept {
-+ return __shimPosixMemalign(res, alignment, size);
-+}
-+
-+SHIM_HIDDEN void* ShimValloc(size_t size) noexcept {
-+ return __shimValloc(size);
-+}
-+
-+SHIM_HIDDEN void* ShimPvalloc(size_t size) noexcept {
-+ return __shimPvalloc(size);
-+}
-+
-+SHIM_HIDDEN void ShimFree(void* address) noexcept {
-+ __shimFree(address);
-+}
- } // extern "C"
-
- static void* __shimCppNew(size_t size) {
-@@ -119,3 +196,36 @@
- static void __shimCppDeleteArray(void* address) {
- operator delete[](address);
- }
-+
-+static void* __shimMalloc(size_t size) noexcept {
-+ return malloc(size);
-+}
-+
-+static void* __shimCalloc(size_t n, size_t size) noexcept {
-+ return calloc(n, size);
-+}
-+
-+static void* __shimRealloc(void* address, size_t size) noexcept {
-+ return realloc(address, size);
-+}
-+
-+static void* __shimMemalign(size_t alignment, size_t size) noexcept {
-+ return memalign(alignment, size);
-+}
-+
-+static int __shimPosixMemalign(void** res, size_t alignment, size_t size)
-+ noexcept {
-+ return posix_memalign(res, alignment, size);
-+}
-+
-+static void* __shimValloc(size_t size) noexcept {
-+ return valloc(size);
-+}
-+
-+static void* __shimPvalloc(size_t size) noexcept {
-+ return pvalloc(size);
-+}
-+
-+static void __shimFree(void* address) noexcept {
-+ free(address);
-+}
diff --git a/qtwebengine-opensource-src-5.9.1-qtbug-61521.patch b/qtwebengine-opensource-src-5.9.1-qtbug-61521.patch
new file mode 100644
index 0000000..82d3a14
--- /dev/null
+++ b/qtwebengine-opensource-src-5.9.1-qtbug-61521.patch
@@ -0,0 +1,160 @@
+diff -ur qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/base/process/memory_linux.cc qtwebengine-opensource-src-5.9.1-qtbug-61521/src/3rdparty/chromium/base/process/memory_linux.cc
+--- qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/base/process/memory_linux.cc 2017-06-20 11:10:02.000000000 +0200
++++ qtwebengine-opensource-src-5.9.1-qtbug-61521/src/3rdparty/chromium/base/process/memory_linux.cc 2017-07-01 01:20:35.113886332 +0200
+@@ -60,6 +60,7 @@
+ #endif
+ void* __libc_memalign(size_t alignment, size_t size);
+
++#if !defined(TOOLKIT_QT) //QTBUG-61521,QTBUG-60565
+ // Overriding the system memory allocation functions:
+ //
+ // For security reasons, we want malloc failures to be fatal. Too much code
+@@ -129,6 +130,7 @@
+ *ptr = memalign(alignment, size);
+ return 0;
+ }
++#endif // TOOLKIT_QT
+
+ } // extern C
+
+diff -ur qtwebengine-opensource-src-5.9.1/src/core/api/qtbug-60565.cpp qtwebengine-opensource-src-5.9.1-qtbug-61521/src/core/api/qtbug-60565.cpp
+--- qtwebengine-opensource-src-5.9.1/src/core/api/qtbug-60565.cpp 2017-06-23 08:29:46.000000000 +0200
++++ qtwebengine-opensource-src-5.9.1-qtbug-61521/src/core/api/qtbug-60565.cpp 2017-07-01 01:22:27.626242360 +0200
+@@ -39,6 +39,8 @@
+
+ #include <new>
+ #include <unistd.h>
++#include <stdlib.h>
++#include <malloc.h>
+
+ #if defined(__LP64__)
+ # define SIZE_T_MANGLING "m"
+@@ -83,10 +85,51 @@
+ void __ShimCppDeleteArrayNoThrow(void* address, const std::nothrow_t&) noexcept
+ SHIM_ALIAS_SYMBOL(ShimCppDeleteArray);
+
++__asm__(".symver __ShimMalloc, malloc@Qt_5");
++void* __ShimMalloc(size_t size) noexcept
++ SHIM_ALIAS_SYMBOL(ShimMalloc);
++
++__asm__(".symver __ShimCalloc, calloc@Qt_5");
++void* __ShimCalloc(size_t n, size_t size) noexcept
++ SHIM_ALIAS_SYMBOL(ShimCalloc);
++
++__asm__(".symver __ShimRealloc, realloc@Qt_5");
++void* __ShimRealloc(void* address, size_t size) noexcept
++ SHIM_ALIAS_SYMBOL(ShimRealloc);
++
++__asm__(".symver __ShimMemalign, memalign@Qt_5");
++void* __ShimMemalign(size_t alignment, size_t size) noexcept
++ SHIM_ALIAS_SYMBOL(ShimMemalign);
++
++__asm__(".symver __ShimPosixMemalign, posix_memalign@Qt_5");
++int __ShimPosixMemalign(void** res, size_t alignment, size_t size) noexcept
++ SHIM_ALIAS_SYMBOL(ShimPosixMemalign);
++
++__asm__(".symver __ShimValloc, valloc@Qt_5");
++void* __ShimValloc(size_t size) noexcept
++ SHIM_ALIAS_SYMBOL(ShimValloc);
++
++__asm__(".symver __ShimPvalloc, pvalloc@Qt_5");
++void* __ShimPvalloc(size_t size) noexcept
++ SHIM_ALIAS_SYMBOL(ShimPvalloc);
++
++__asm__(".symver __ShimFree, free@Qt_5");
++void __ShimFree(void* address) noexcept
++ SHIM_ALIAS_SYMBOL(ShimFree);
++
+ static void* __shimCppNew(size_t size);
+ static void* __shimCppNewArray(size_t size);
+ static void __shimCppDelete(void *address);
+ static void __shimCppDeleteArray(void *address);
++static void* __shimMalloc(size_t size) noexcept;
++static void* __shimCalloc(size_t n, size_t size) noexcept;
++static void* __shimRealloc(void* address, size_t size) noexcept;
++static void* __shimMemalign(size_t alignment, size_t size) noexcept;
++static int __shimPosixMemalign(void** res, size_t alignment, size_t size)
++ noexcept;
++static void* __shimValloc(size_t size) noexcept;
++static void* __shimPvalloc(size_t size) noexcept;
++static void __shimFree(void* address) noexcept;
+
+ SHIM_HIDDEN void* ShimCppNew(size_t size) {
+ return __shimCppNew(size);
+@@ -103,6 +146,39 @@
+ SHIM_HIDDEN void ShimCppDeleteArray(void* address) {
+ __shimCppDeleteArray(address);
+ }
++
++SHIM_HIDDEN void* ShimMalloc(size_t size) noexcept {
++ return __shimMalloc(size);
++}
++
++SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) noexcept {
++ return __shimCalloc(n, size);
++}
++
++SHIM_HIDDEN void* ShimRealloc(void* address, size_t size) noexcept {
++ return __shimRealloc(address, size);
++}
++
++SHIM_HIDDEN void* ShimMemalign(size_t alignment, size_t size) noexcept {
++ return __shimMemalign(alignment, size);
++}
++
++SHIM_HIDDEN int ShimPosixMemalign(void** res, size_t alignment, size_t size)
++ noexcept {
++ return __shimPosixMemalign(res, alignment, size);
++}
++
++SHIM_HIDDEN void* ShimValloc(size_t size) noexcept {
++ return __shimValloc(size);
++}
++
++SHIM_HIDDEN void* ShimPvalloc(size_t size) noexcept {
++ return __shimPvalloc(size);
++}
++
++SHIM_HIDDEN void ShimFree(void* address) noexcept {
++ __shimFree(address);
++}
+ } // extern "C"
+
+ static void* __shimCppNew(size_t size) {
+@@ -120,3 +196,36 @@
+ static void __shimCppDeleteArray(void* address) {
+ operator delete[](address);
+ }
++
++static void* __shimMalloc(size_t size) noexcept {
++ return malloc(size);
++}
++
++static void* __shimCalloc(size_t n, size_t size) noexcept {
++ return calloc(n, size);
++}
++
++static void* __shimRealloc(void* address, size_t size) noexcept {
++ return realloc(address, size);
++}
++
++static void* __shimMemalign(size_t alignment, size_t size) noexcept {
++ return memalign(alignment, size);
++}
++
++static int __shimPosixMemalign(void** res, size_t alignment, size_t size)
++ noexcept {
++ return posix_memalign(res, alignment, size);
++}
++
++static void* __shimValloc(size_t size) noexcept {
++ return valloc(size);
++}
++
++static void* __shimPvalloc(size_t size) noexcept {
++ return pvalloc(size);
++}
++
++static void __shimFree(void* address) noexcept {
++ free(address);
++}
diff --git a/sources b/sources
index 2a6156f..979b865 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtwebengine-opensource-src-5.9.0-clean.tar.xz) = b97da4c9cd98d4c9c3cd4f59a4b488f55234dab947d324956643d0ccd61a527d3b5d7c647626b947dfde6dedcce1a9fa630d81b40ff1200c445547e3466c0607
+SHA512 (qtwebengine-opensource-src-5.9.1-clean.tar.xz) = 86bbfe50d557b82df3b3598a43340b5fa913d01df0a8c7cd43ae8d36eed59e6deca633e42f8813c1074b3bbc5ac21179571f2ef9fd125838875bddd92faca36c
--
cgit v1.1
https://src.fedoraproject.org/cgit/qt5-qtwebengine.git/commit/?h=master&i...
6Â years, 2Â months
kevin pushed to rkhunter (el6). "- Update to 1.4.4. Fixes bug
#1466318 (..more)"
by notificationsï¼ fedoraproject.org
From 413d957175993d1913c6b4ea45f1a10c2b68ccd0 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin(a)scrye.com>
Date: Fri, 30 Jun 2017 16:10:39 -0600
Subject: - Update to 1.4.4. Fixes bug #1466318 - Fix for logger and spaces.
Fixes bug #1284403
---
rkhunter-1.4.2-fedoraconfig.patch | 216 -------------------------------------
rkhunter-1.4.2-ipcs-locale.patch | 18 ----
rkhunter-1.4.4-fedoraconfig.patch | 217 ++++++++++++++++++++++++++++++++++++++
rkhunter.spec | 19 ++--
sources | 2 +-
5 files changed, 226 insertions(+), 246 deletions(-)
delete mode 100644 rkhunter-1.4.2-fedoraconfig.patch
delete mode 100644 rkhunter-1.4.2-ipcs-locale.patch
create mode 100644 rkhunter-1.4.4-fedoraconfig.patch
diff --git a/rkhunter-1.4.2-fedoraconfig.patch b/rkhunter-1.4.2-fedoraconfig.patch
deleted file mode 100644
index 3056168..0000000
--- a/rkhunter-1.4.2-fedoraconfig.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-diff -Nur rkhunter-1.4.2.orig/files/rkhunter.conf rkhunter-1.4.2/files/rkhunter.conf
---- rkhunter-1.4.2.orig/files/rkhunter.conf 2014-01-25 14:29:51.000000000 -0700
-+++ rkhunter-1.4.2/files/rkhunter.conf 2014-06-06 12:41:46.353437955 -0600
-@@ -155,6 +155,7 @@
- # default directory beneath the installation directory.
- #
- #TMPDIR=/var/lib/rkhunter/tmp
-+TMPDIR=/var/lib/rkhunter
-
- #
- # This option specifies the database directory to use.
-@@ -164,6 +165,7 @@
- # default directory beneath the installation directory.
- #
- #DBDIR=/var/lib/rkhunter/db
-+DBDIR=/var/lib/rkhunter/db
-
- #
- # This option specifies the script directory to use.
-@@ -172,6 +174,7 @@
- # subsequently commented out or removed, then the program will not run.
- #
- #SCRIPTDIR=/usr/local/lib/rkhunter/scripts
-+SCRIPTDIR=/usr/share/rkhunter/scripts
-
- #
- # This option can be used to modify the command directory list used by rkhunter
-@@ -228,7 +231,8 @@
- #
- # The default value is '/var/log/rkhunter.log'.
- #
--LOGFILE=/var/log/rkhunter.log
-+#LOGFILE=/var/log/rkhunter.log
-+LOGFILE=/var/log/rkhunter/rkhunter.log
-
- #
- # Set this option to '1' if the log file is to be appended to whenever rkhunter
-@@ -238,6 +242,7 @@
- # The default value is '0'.
- #
- #APPEND_LOG=0
-+APPEND_LOG=1
-
- #
- # Set the following option to '1' if the log file is to be copied when rkhunter
-@@ -265,6 +270,7 @@
- # The default value is not to use syslog.
- #
- #USE_SYSLOG=authpriv.notice
-+USE_SYSLOG=authpriv.notice
-
- #
- # Set the following option to '1' if the second colour set is to be used. This
-@@ -304,6 +310,7 @@
- # The default value is 'no'.
- #
- #ALLOW_SSH_ROOT_USER=no
-+ALLOW_SSH_ROOT_USER=unset
-
- #
- # Set this option to '1' to allow the use of the SSH-1 protocol, but note
-@@ -350,7 +357,7 @@
- # program defaults.
- #
- ENABLE_TESTS=ALL
--DISABLE_TESTS=suspscan hidden_ports hidden_procs deleted_files packet_cap_apps
-+DISABLE_TESTS=suspscan hidden_procs deleted_files packet_cap_apps apps
-
- #
- # The HASH_CMD option can be used to specify the command to use for the file
-@@ -422,6 +429,7 @@
- # Also see the PKGMGR_NO_VRFY and USE_SUNSUM options.
- #
- #PKGMGR=NONE
-+PKGMGR=RPM
-
- #
- # It is possible that a file, which is part of a package, may have been
-@@ -545,6 +553,12 @@
- # The default value is the null string.
- #
- #EXISTWHITELIST=""
-+EXISTWHITELIST=/var/log/pki-ca/system
-+# FreeIPA Certificate Authority
-+EXISTWHITELIST=/var/log/pki/pki-tomcat/ca/system
-+# Some non default installed files we check
-+EXISTWHITELIST=/usr/bin/GET
-+EXISTWHITELIST=/usr/bin/whatis
-
- #
- # Whitelist various attributes of the specified file. The attributes are those
-@@ -575,6 +589,12 @@
- # The default value is the null string.
- #
- #SCRIPTWHITELIST=/usr/bin/groups
-+SCRIPTWHITELIST=/usr/bin/whatis
-+SCRIPTWHITELIST=/usr/bin/ldd
-+SCRIPTWHITELIST=/usr/bin/groups
-+SCRIPTWHITELIST=/usr/bin/GET
-+SCRIPTWHITELIST=/sbin/ifup
-+SCRIPTWHITELIST=/sbin/ifdown
-
- #
- # Allow the specified file to have the immutable attribute set.
-@@ -602,9 +622,24 @@
- # The default value is the null string.
- #
- #ALLOWHIDDENDIR=/etc/.java
-+ALLOWHIDDENDIR=/etc/.java
- #ALLOWHIDDENDIR=/dev/.udev
- #ALLOWHIDDENDIR=/dev/.udevdb
- #ALLOWHIDDENDIR=/dev/.mdadm
-+ALLOWHIDDENDIR=/dev/.udev
-+ALLOWHIDDENDIR=/dev/.udevdb
-+ALLOWHIDDENDIR=/dev/.udev.tdb
-+ALLOWHIDDENDIR=/dev/.udev/db
-+ALLOWHIDDENDIR=/dev/.udev/rules.d
-+ALLOWHIDDENDIR=/dev/.static
-+ALLOWHIDDENDIR=/dev/.initramfs
-+ALLOWHIDDENDIR=/dev/.SRC-unix
-+ALLOWHIDDENDIR=/dev/.mdadm
-+ALLOWHIDDENDIR=/dev/.systemd
-+ALLOWHIDDENDIR=/dev/.mount
-+# for etckeeper
-+ALLOWHIDDENDIR=/etc/.git
-+ALLOWHIDDENDIR=/etc/.bzr
-
- #
- # Allow the specified hidden file to be whitelisted.
-@@ -614,12 +649,38 @@
- # The default value is the null string.
- #
- #ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz
-+ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz
- #ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
- #ALLOWHIDDENFILE=/usr/bin/.ssh.hmac
- #ALLOWHIDDENFILE=/usr/lib/.libfipscheck.so.1.1.0.hmac
- #ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha1hmac.hmac
- #ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha256hmac.hmac
- #ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
-+ALLOWHIDDENFILE=/lib*/.libcrypto.so.*.hmac
-+ALLOWHIDDENFILE=/lib*/.libssl.so.*.hmac
-+ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh-keygen.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh-keyscan.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh-add.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh-agent.hmac
-+ALLOWHIDDENFILE=/usr/lib*/.libfipscheck.so.*.hmac
-+ALLOWHIDDENFILE=/usr/lib*/.libgcrypt.so.*.hmac
-+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha1hmac.hmac
-+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha256hmac.hmac
-+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha384hmac.hmac
-+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha512hmac.hmac
-+ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
-+ALLOWHIDDENFILE=/dev/.mdadm.map
-+ALLOWHIDDENFILE=/dev/.udev/queue.bin
-+ALLOWHIDDENFILE=/usr/share/man/man5/.k5login.5.gz
-+ALLOWHIDDENFILE=/usr/share/man/man5/.k5identity.5.gz
-+ALLOWHIDDENFILE=/usr/sbin/.ipsec.hmac
-+ALLOWHIDDENFILE=/sbin/.cryptsetup.hmac
-+# etckeeper
-+ALLOWHIDDENFILE=/etc/.etckeeper
-+ALLOWHIDDENFILE=/etc/.gitignore
-+ALLOWHIDDENFILE=/etc/.bzrignore
-
- #
- # Allow the specified process to use deleted files. The process name may be
-@@ -681,6 +742,22 @@
- #
- #ALLOWDEVFILE=/dev/shm/pulse-shm-*
- #ALLOWDEVFILE=/dev/shm/sem.ADBE_*
-+ALLOWDEVFILE=/dev/shm/pulse-shm-*
-+ALLOWDEVFILE=/dev/md/md-device-map
-+# tomboy creates this one
-+ALLOWDEVFILE="/dev/shm/mono.*"
-+# created by libv4l
-+ALLOWDEVFILE="/dev/shm/libv4l-*"
-+# created by spice video
-+ALLOWDEVFILE="/dev/shm/spice.*"
-+ALLOWDEVFILE=/dev/.mdadm.map
-+ALLOWDEVFILE=/dev/.udev/queue.bin
-+ALLOWDEVFILE=/dev/.udev/db/*
-+ALLOWDEVFILE=/dev/.udev/rules.d/99-root.rules
-+# created by mdadm
-+ALLOWDEVFILE="/dev/md/autorebuild.pid"
-+# 389 Directory Server
-+ALLOWDEVFILE=/dev/shm/sem.slapd-*.stats
-
- #
- # This option is used to indicate if the Phalanx2 test is to perform a basic
-@@ -854,6 +931,7 @@
- # The default value is the '/tmp' and '/var/tmp' directories.
- #
- #SUSPSCAN_DIRS=/tmp /var/tmp
-+SUSPSCAN_DIRS=/tmp /var/tmp
-
- #
- # This option specifies the directory for temporary files used by the
-@@ -1004,6 +1082,10 @@
- #
- #RTKT_DIR_WHITELIST=""
- #RTKT_FILE_WHITELIST=""
-+# FreeIPA Certificate Authority
-+RTKT_FILE_WHITELIST=/var/log/pki-ca/system
-+# FreeIPA Certificate Authority
-+RTKT_FILE_WHITELIST=/var/log/pki/pki-tomcat/ca/system
-
- #
- # The following option can be used to whitelist shared library files that would
-@@ -1222,3 +1304,5 @@
- #
- #EMPTY_LOGFILES=""
- #MISSING_LOGFILES=""
-+
-+INSTALLDIR="/usr"
diff --git a/rkhunter-1.4.2-ipcs-locale.patch b/rkhunter-1.4.2-ipcs-locale.patch
deleted file mode 100644
index 0457e4c..0000000
--- a/rkhunter-1.4.2-ipcs-locale.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur rkhunter-1.4.2.orig/files/rkhunter rkhunter-1.4.2/files/rkhunter
---- rkhunter-1.4.2.orig/files/rkhunter 2014-03-12 14:54:55.000000000 -0600
-+++ rkhunter-1.4.2/files/rkhunter 2014-04-06 11:39:44.776583858 -0600
-@@ -13964,11 +13964,11 @@
- touch "${IPCS_TMPFILE}"
- FOUND=0; echo $FOUND > "${IPCS_TMPFILE}"
-
-- if [ `${IPCS_CMD} -u 2>/dev/null | awk -F' ' '/segments allocated/ {print $3}'` -ne 0 ]; then
-- ${IPCS_CMD} -m | grep "^0x" | while read RKH_SHM_KEY RKH_SHM_SHMID RKH_SHM_OWNER RKH_SHM_PERMS RKH_SHM_BYTES RKH_SHM_NATTACH RKH_SHM_STATUS; do
-+ if [ `LC_ALL=C ${IPCS_CMD} -u 2>/dev/null | awk -F' ' '/segments allocated/ {print $3}'` -ne 0 ]; then
-+ LC_ALL=C ${IPCS_CMD} -m | grep "^0x" | while read RKH_SHM_KEY RKH_SHM_SHMID RKH_SHM_OWNER RKH_SHM_PERMS RKH_SHM_BYTES RKH_SHM_NATTACH RKH_SHM_STATUS; do
- if [ $RKH_SHM_PERMS -eq 666 -a $RKH_SHM_BYTES -ge 1000000 ]; then
- FOUND=1; echo $FOUND > "${IPCS_TMPFILE}"
-- ${IPCS_CMD} -p | grep "^${RKH_SHM_SHMID}" | while read RKH_SHM_SHMID RKH_SHM_OWNER RKH_SHM_CPID RKH_SHM_LPID; do
-+ LC_ALL=C ${IPCS_CMD} -p | grep "^${RKH_SHM_SHMID}" | while read RKH_SHM_SHMID RKH_SHM_OWNER RKH_SHM_CPID RKH_SHM_LPID; do
- RKH_SHM_PATH=`${READLINK_CMD} -f /proc/${RKH_SHM_CPID}/exe`
- if [ $VERBOSE_LOGGING -eq 1 ]; then
- display --to LOG --type PLAIN --result FOUND --log-indent 2 ROOTKIT_MALWARE_IPCS_DETAILS "${RKH_SHM_PATH}" "${RKH_SHM_CPID}" "${RKH_SHM_OWNER}"
diff --git a/rkhunter-1.4.4-fedoraconfig.patch b/rkhunter-1.4.4-fedoraconfig.patch
new file mode 100644
index 0000000..96c95aa
--- /dev/null
+++ b/rkhunter-1.4.4-fedoraconfig.patch
@@ -0,0 +1,217 @@
+diff -Nur rkhunter-1.4.4.orig/files/rkhunter.conf rkhunter-1.4.4/files/rkhunter.conf
+--- rkhunter-1.4.4.orig/files/rkhunter.conf 2017-06-22 18:19:20.000000000 -0600
++++ rkhunter-1.4.4/files/rkhunter.conf 2017-06-30 16:07:57.075870336 -0600
+@@ -158,6 +158,7 @@
+ # default directory beneath the installation directory.
+ #
+ #TMPDIR=/var/lib/rkhunter/tmp
++TMPDIR=/var/lib/rkhunter
+
+ #
+ # This option specifies the database directory to use.
+@@ -167,6 +168,7 @@
+ # default directory beneath the installation directory.
+ #
+ #DBDIR=/var/lib/rkhunter/db
++DBDIR=/var/lib/rkhunter/db
+
+ #
+ # This option specifies the script directory to use.
+@@ -175,6 +177,7 @@
+ # subsequently commented out or removed, then the program will not run.
+ #
+ #SCRIPTDIR=/usr/local/lib/rkhunter/scripts
++SCRIPTDIR=/usr/share/rkhunter/scripts
+
+ #
+ # This option can be used to modify the command directory list used by rkhunter
+@@ -231,7 +234,8 @@
+ #
+ # The default value is '/var/log/rkhunter.log'.
+ #
+-LOGFILE=/var/log/rkhunter.log
++#LOGFILE=/var/log/rkhunter.log
++LOGFILE=/var/log/rkhunter/rkhunter.log
+
+ #
+ # Set this option to '1' if the log file is to be appended to whenever rkhunter
+@@ -241,6 +245,7 @@
+ # The default value is '0'.
+ #
+ #APPEND_LOG=0
++APPEND_LOG=1
+
+ #
+ # Set the following option to '1' if the log file is to be copied when rkhunter
+@@ -268,6 +273,7 @@
+ # The default value is not to use syslog.
+ #
+ #USE_SYSLOG=authpriv.notice
++USE_SYSLOG=authpriv.notice
+
+ #
+ # Set the following option to '1' if the second colour set is to be used. This
+@@ -307,6 +313,7 @@
+ # The default value is 'no'.
+ #
+ #ALLOW_SSH_ROOT_USER=no
++ALLOW_SSH_ROOT_USER=unset
+
+ #
+ # Set this option to '1' to allow the use of the SSH-1 protocol, but note
+@@ -353,7 +360,8 @@
+ # program defaults.
+ #
+ ENABLE_TESTS=ALL
+-DISABLE_TESTS=suspscan hidden_ports hidden_procs deleted_files packet_cap_apps apps
++#DISABLE_TESTS=suspscan hidden_ports hidden_procs deleted_files packet_cap_apps apps
++DISABLE_TESTS=suspscan hidden_procs deleted_files packet_cap_apps apps
+
+ #
+ # The HASH_CMD option can be used to specify the command to use for the file
+@@ -434,6 +442,7 @@
+ # Also see the PKGMGR_NO_VRFY and USE_SUNSUM options.
+ #
+ #PKGMGR=NONE
++PKGMGR=RPM
+
+ #
+ # It is possible that a file, which is part of a package, may have been
+@@ -557,6 +566,12 @@
+ # The default value is the null string.
+ #
+ #EXISTWHITELIST=""
++EXISTWHITELIST=/var/log/pki-ca/system
++# FreeIPA Certificate Authority
++EXISTWHITELIST=/var/log/pki/pki-tomcat/ca/system
++# Some non default installed files we check
++EXISTWHITELIST=/usr/bin/GET
++EXISTWHITELIST=/usr/bin/whatis
+
+ #
+ # Whitelist various attributes of the specified file. The attributes are those
+@@ -587,6 +602,12 @@
+ # The default value is the null string.
+ #
+ #SCRIPTWHITELIST=/usr/bin/groups
++SCRIPTWHITELIST=/usr/bin/whatis
++SCRIPTWHITELIST=/usr/bin/ldd
++SCRIPTWHITELIST=/usr/bin/groups
++SCRIPTWHITELIST=/usr/bin/GET
++SCRIPTWHITELIST=/sbin/ifup
++SCRIPTWHITELIST=/sbin/ifdown
+
+ #
+ # Allow the specified file to have the immutable attribute set.
+@@ -614,9 +635,24 @@
+ # The default value is the null string.
+ #
+ #ALLOWHIDDENDIR=/etc/.java
++ALLOWHIDDENDIR=/etc/.java
+ #ALLOWHIDDENDIR=/dev/.udev
+ #ALLOWHIDDENDIR=/dev/.udevdb
+ #ALLOWHIDDENDIR=/dev/.mdadm
++ALLOWHIDDENDIR=/dev/.udev
++ALLOWHIDDENDIR=/dev/.udevdb
++ALLOWHIDDENDIR=/dev/.udev.tdb
++ALLOWHIDDENDIR=/dev/.udev/db
++ALLOWHIDDENDIR=/dev/.udev/rules.d
++ALLOWHIDDENDIR=/dev/.static
++ALLOWHIDDENDIR=/dev/.initramfs
++ALLOWHIDDENDIR=/dev/.SRC-unix
++ALLOWHIDDENDIR=/dev/.mdadm
++ALLOWHIDDENDIR=/dev/.systemd
++ALLOWHIDDENDIR=/dev/.mount
++# for etckeeper
++ALLOWHIDDENDIR=/etc/.git
++ALLOWHIDDENDIR=/etc/.bzr
+
+ #
+ # Allow the specified hidden file to be whitelisted.
+@@ -626,12 +662,38 @@
+ # The default value is the null string.
+ #
+ #ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz
++ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz
+ #ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
+ #ALLOWHIDDENFILE=/usr/bin/.ssh.hmac
+ #ALLOWHIDDENFILE=/usr/lib/.libfipscheck.so.1.1.0.hmac
+ #ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha1hmac.hmac
+ #ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha256hmac.hmac
+ #ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
++ALLOWHIDDENFILE=/lib*/.libcrypto.so.*.hmac
++ALLOWHIDDENFILE=/lib*/.libssl.so.*.hmac
++ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh-keygen.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh-keyscan.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh-add.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh-agent.hmac
++ALLOWHIDDENFILE=/usr/lib*/.libfipscheck.so.*.hmac
++ALLOWHIDDENFILE=/usr/lib*/.libgcrypt.so.*.hmac
++ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha1hmac.hmac
++ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha256hmac.hmac
++ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha384hmac.hmac
++ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha512hmac.hmac
++ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
++ALLOWHIDDENFILE=/dev/.mdadm.map
++ALLOWHIDDENFILE=/dev/.udev/queue.bin
++ALLOWHIDDENFILE=/usr/share/man/man5/.k5login.5.gz
++ALLOWHIDDENFILE=/usr/share/man/man5/.k5identity.5.gz
++ALLOWHIDDENFILE=/usr/sbin/.ipsec.hmac
++ALLOWHIDDENFILE=/sbin/.cryptsetup.hmac
++# etckeeper
++ALLOWHIDDENFILE=/etc/.etckeeper
++ALLOWHIDDENFILE=/etc/.gitignore
++ALLOWHIDDENFILE=/etc/.bzrignore
+
+ #
+ # Allow the specified process to use deleted files. The process name may be
+@@ -701,6 +763,22 @@
+ #
+ #ALLOWDEVFILE=/dev/shm/pulse-shm-*
+ #ALLOWDEVFILE=/dev/shm/sem.ADBE_*
++ALLOWDEVFILE=/dev/shm/pulse-shm-*
++ALLOWDEVFILE=/dev/md/md-device-map
++# tomboy creates this one
++ALLOWDEVFILE="/dev/shm/mono.*"
++# created by libv4l
++ALLOWDEVFILE="/dev/shm/libv4l-*"
++# created by spice video
++ALLOWDEVFILE="/dev/shm/spice.*"
++ALLOWDEVFILE=/dev/.mdadm.map
++ALLOWDEVFILE=/dev/.udev/queue.bin
++ALLOWDEVFILE=/dev/.udev/db/*
++ALLOWDEVFILE=/dev/.udev/rules.d/99-root.rules
++# created by mdadm
++ALLOWDEVFILE="/dev/md/autorebuild.pid"
++# 389 Directory Server
++ALLOWDEVFILE=/dev/shm/sem.slapd-*.stats
+
+ #
+ # Allow the specified process pathnames to use shared memory segments.
+@@ -885,6 +963,7 @@
+ # The default value is the '/tmp' and '/var/tmp' directories.
+ #
+ #SUSPSCAN_DIRS=/tmp /var/tmp
++SUSPSCAN_DIRS=/tmp /var/tmp
+
+ #
+ # This option specifies the directory for temporary files used by the
+@@ -1035,6 +1114,10 @@
+ #
+ #RTKT_DIR_WHITELIST=""
+ #RTKT_FILE_WHITELIST=""
++# FreeIPA Certificate Authority
++RTKT_FILE_WHITELIST=/var/log/pki-ca/system
++# FreeIPA Certificate Authority
++RTKT_FILE_WHITELIST=/var/log/pki/pki-tomcat/ca/system
+
+ #
+ # The following option can be used to whitelist shared library files that would
+@@ -1274,3 +1357,5 @@
+ # The default value is '0'.
+ #
+ #GLOBSTAR=0
++
++INSTALLDIR="/usr"
diff --git a/rkhunter.spec b/rkhunter.spec
index 2b55352..63272cc 100644
--- a/rkhunter.spec
+++ b/rkhunter.spec
@@ -1,6 +1,6 @@
Name: rkhunter
-Version: 1.4.2
-Release: 4%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
Summary: A host-based tool to scan for rootkits, backdoors and local exploits
Group: Applications/System
@@ -9,11 +9,7 @@ URL: http://rkhunter.sourceforge.net/
Source0: http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz
Source2: 01-rkhunter
Source3: rkhunter.sysconfig
-Patch0: rkhunter-1.4.2-fedoraconfig.patch
-#
-# Fix issue with ipcs command and locales
-#
-Patch1: rkhunter-1.4.2-ipcs-locale.patch
+Patch0: rkhunter-1.4.4-fedoraconfig.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,10 +24,7 @@ and other unwanted tools.
%prep
-%setup -q
-
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
%{__cat} <<'EOF' >%{name}.logrotate
%{_localstatedir}/log/%{name}/%{name}.log {
@@ -99,6 +92,10 @@ EOF
%{_mandir}/man8/*
%changelog
+* Fri Jun 30 2017 Kevin Fenzi <kevin(a)scrye.com> - 1.4.4-1
+- Update to 1.4.4. Fixes bug #1466318
+- Fix for logger and spaces. Fixes bug #1284403
+
* Mon Oct 27 2014 Kevin Fenzi <kevin(a)scrye.com> 1.4.2-5
- Set /var/lib/rkhunter to be mode 700. fixes bug #1154428
diff --git a/sources b/sources
index 873ec5b..458900a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85ad366b7f3999eb2a9371e39a1a4df7 rkhunter-1.4.2.tar.gz
+SHA512 (rkhunter-1.4.4.tar.gz) = 87e9c617220765678cc4519eee27d1d56185c3a7fb1d6338c8fb984ac4f5176c31bb54b69e1de615d66a0cf1e72b672e66b368e37851a459def69463cbb8661e
--
cgit v1.1
https://src.fedoraproject.org/cgit/rkhunter.git/commit/?h=el6&id=413d9571...
6Â years, 2Â months
kevin pushed to rkhunter (epel7). "- Update to 1.4.4. Fixes bug
#1466318 (..more)"
by notificationsï¼ fedoraproject.org
From fe8a3880272717ac554a671f1c8f5005e849d32f Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin(a)scrye.com>
Date: Fri, 30 Jun 2017 15:59:08 -0600
Subject: - Update to 1.4.4. Fixes bug #1466318 - Fix for logger and spaces.
Fixes bug #1284403
---
.gitignore | 1 +
rkhunter-1.4.2-epel7.patch | 214 ---------------------------------------
rkhunter-1.4.2-ipcs-locale.patch | 18 ----
rkhunter-1.4.4-epel7.patch | 188 ++++++++++++++++++++++++++++++++++
rkhunter.spec | 19 ++--
sources | 2 +-
6 files changed, 198 insertions(+), 244 deletions(-)
delete mode 100644 rkhunter-1.4.2-epel7.patch
delete mode 100644 rkhunter-1.4.2-ipcs-locale.patch
create mode 100644 rkhunter-1.4.4-epel7.patch
diff --git a/.gitignore b/.gitignore
index 8ffe1c8..1422757 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ rkhunter-1.3.6.tar.gz
/rkhunter-1.3.8.tar.gz
/rkhunter-1.4.0.tar.gz
/rkhunter-1.4.2.tar.gz
+/rkhunter-1.4.4.tar.gz
diff --git a/rkhunter-1.4.2-epel7.patch b/rkhunter-1.4.2-epel7.patch
deleted file mode 100644
index 3fe5809..0000000
--- a/rkhunter-1.4.2-epel7.patch
+++ /dev/null
@@ -1,214 +0,0 @@
---- rkhunter-1.4.2.orig/files/rkhunter.conf 2017-01-25 21:03:14.142522097 -0500
-+++ rkhunter-1.4.2/files/rkhunter.conf 2017-01-25 21:31:34.721348188 -0500
-@@ -155,6 +155,7 @@
- # default directory beneath the installation directory.
- #
- #TMPDIR=/var/lib/rkhunter/tmp
-+TMPDIR=/var/lib/rkhunter
-
- #
- # This option specifies the database directory to use.
-@@ -163,7 +164,7 @@
- # subsequently commented out or removed, then the program will assume a
- # default directory beneath the installation directory.
- #
--#DBDIR=/var/lib/rkhunter/db
-+DBDIR=/var/lib/rkhunter/db
-
- #
- # This option specifies the script directory to use.
-@@ -172,6 +173,7 @@
- # subsequently commented out or removed, then the program will not run.
- #
- #SCRIPTDIR=/usr/local/lib/rkhunter/scripts
-+SCRIPTDIR=/usr/share/rkhunter/scripts
-
- #
- # This option can be used to modify the command directory list used by rkhunter
-@@ -228,7 +230,7 @@
- #
- # The default value is '/var/log/rkhunter.log'.
- #
--LOGFILE=/var/log/rkhunter.log
-+LOGFILE=/var/log/rkhunter/rkhunter.log
-
- #
- # Set this option to '1' if the log file is to be appended to whenever rkhunter
-@@ -238,6 +240,7 @@
- # The default value is '0'.
- #
- #APPEND_LOG=0
-+APPEND_LOG=1
-
- #
- # Set the following option to '1' if the log file is to be copied when rkhunter
-@@ -303,7 +306,8 @@
- #
- # The default value is 'no'.
- #
--#ALLOW_SSH_ROOT_USER=no
-+ALLOW_SSH_ROOT_USER=unset
-+
-
- #
- # Set this option to '1' to allow the use of the SSH-1 protocol, but note
-@@ -318,6 +322,7 @@
- # The default value is '0'.
- #
- #ALLOW_SSH_PROT_V1=0
-+ALLOW_SSH_PROT_V1=2
-
- #
- # This setting tells rkhunter the directory containing the SSH configuration
-@@ -350,7 +355,8 @@
- # program defaults.
- #
- ENABLE_TESTS=ALL
--DISABLE_TESTS=suspscan hidden_ports hidden_procs deleted_files packet_cap_apps
-+#DISABLE_TESTS=suspscan hidden_ports hidden_procs deleted_files packet_cap_apps
-+DISABLE_TESTS=suspscan hidden_ports deleted_files packet_cap_apps apps
-
- #
- # The HASH_CMD option can be used to specify the command to use for the file
-@@ -422,6 +428,7 @@
- # Also see the PKGMGR_NO_VRFY and USE_SUNSUM options.
- #
- #PKGMGR=NONE
-+PKGMGR=RPM
-
- #
- # It is possible that a file, which is part of a package, may have been
-@@ -545,6 +552,14 @@
- # The default value is the null string.
- #
- #EXISTWHITELIST=""
-+EXISTWHITELIST=/bin/ad
-+# FreeIPA Certificate Authority
-+EXISTWHITELIST=/var/log/pki-ca/system
-+# FreeIPA Certificate Authority
-+EXISTWHITELIST=/var/log/pki/pki-tomcat/ca/system
-+# Some non default installed files we check
-+EXISTWHITELIST=/usr/bin/GET
-+EXISTWHITELIST=/usr/bin/whatis
-
- #
- # Whitelist various attributes of the specified file. The attributes are those
-@@ -575,6 +590,12 @@
- # The default value is the null string.
- #
- #SCRIPTWHITELIST=/usr/bin/groups
-+SCRIPTWHITELIST=/usr/bin/whatis
-+SCRIPTWHITELIST=/usr/bin/ldd
-+SCRIPTWHITELIST=/usr/bin/groups
-+SCRIPTWHITELIST=/usr/bin/GET
-+SCRIPTWHITELIST=/sbin/ifup
-+SCRIPTWHITELIST=/sbin/ifdown
-
- #
- # Allow the specified file to have the immutable attribute set.
-@@ -605,6 +626,19 @@
- #ALLOWHIDDENDIR=/dev/.udev
- #ALLOWHIDDENDIR=/dev/.udevdb
- #ALLOWHIDDENDIR=/dev/.mdadm
-+ALLOWHIDDENDIR="/etc/.java"
-+ALLOWHIDDENDIR=/dev/.udev
-+ALLOWHIDDENDIR=/dev/.udevdb
-+ALLOWHIDDENDIR=/dev/.udev.tdb
-+ALLOWHIDDENDIR=/dev/.static
-+ALLOWHIDDENDIR=/dev/.initramfs
-+ALLOWHIDDENDIR=/dev/.SRC-unix
-+ALLOWHIDDENDIR=/dev/.mdadm
-+ALLOWHIDDENDIR=/dev/.systemd
-+ALLOWHIDDENDIR=/dev/.mount
-+# for etckeeper
-+ALLOWHIDDENDIR=/etc/.git
-+ALLOWHIDDENDIR=/etc/.bzr
-
- #
- # Allow the specified hidden file to be whitelisted.
-@@ -620,6 +654,44 @@
- #ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha1hmac.hmac
- #ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha256hmac.hmac
- #ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
-+ALLOWHIDDENFILE="/usr/share/man/man1/..1.gz"
-+ALLOWHIDDENFILE=/lib*/.libcrypto.so.*.hmac
-+ALLOWHIDDENFILE=/lib*/.libssl.so.*.hmac
-+ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh-keygen.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh-keyscan.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh-add.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh-agent.hmac
-+ALLOWHIDDENFILE=/usr/lib*/.libfipscheck.so.*.hmac
-+ALLOWHIDDENFILE=/usr/lib*/.libgcrypt.so.*.hmac
-+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha1hmac.hmac
-+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha256hmac.hmac
-+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha384hmac.hmac
-+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha512hmac.hmac
-+ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
-+ALLOWHIDDENFILE=/dev/.mdadm.map
-+ALLOWHIDDENFILE=/usr/share/man/man5/.k5login.5.gz
-+ALLOWHIDDENFILE=/usr/share/man/man5/.k5identity.5.gz
-+ALLOWHIDDENFILE=/usr/sbin/.ipsec.hmac
-+# etckeeper
-+ALLOWHIDDENFILE=/etc/.etckeeper
-+ALLOWHIDDENFILE=/etc/.gitignore
-+ALLOWHIDDENFILE=/etc/.bzrignore
-+# systemd
-+ALLOWHIDDENFILE=/etc/.updated
-+
-+# Allow PCS/Pacemaker/Corosync
-+ALLOWDEVFILE=/dev/shm/qb-attrd-*
-+ALLOWDEVFILE=/dev/shm/qb-cfg-*
-+ALLOWDEVFILE=/dev/shm/qb-cib_rw-*
-+ALLOWDEVFILE=/dev/shm/qb-cib_shm-*
-+ALLOWDEVFILE=/dev/shm/qb-corosync-*
-+ALLOWDEVFILE=/dev/shm/qb-cpg-*
-+ALLOWDEVFILE=/dev/shm/qb-lrmd-*
-+ALLOWDEVFILE=/dev/shm/qb-pengine-*
-+ALLOWDEVFILE=/dev/shm/qb-quorum-*
-+ALLOWDEVFILE=/dev/shm/qb-stonith-*
-
- #
- # Allow the specified process to use deleted files. The process name may be
-@@ -681,6 +753,22 @@
- #
- #ALLOWDEVFILE=/dev/shm/pulse-shm-*
- #ALLOWDEVFILE=/dev/shm/sem.ADBE_*
-+ALLOWDEVFILE=/dev/shm/pulse-shm-*
-+ALLOWDEVFILE=/dev/md/md-device-map
-+# tomboy creates this one
-+ALLOWDEVFILE="/dev/shm/mono.*"
-+# created by libv4l
-+ALLOWDEVFILE="/dev/shm/libv4l-*"
-+# created by spice video
-+ALLOWDEVFILE="/dev/shm/spice.*"
-+# created by mdadm
-+ALLOWDEVFILE="/dev/md/autorebuild.pid"
-+# 389 Directory Server
-+ALLOWDEVFILE=/dev/shm/sem.slapd-*.stats
-+# squid proxy
-+ALLOWDEVFILE=/dev/shm/squid-cf*
-+# squid ssl cache
-+ALLOWDEVFILE=/dev/shm/squid-ssl_session_cache.shm
-
- #
- # This option is used to indicate if the Phalanx2 test is to perform a basic
-@@ -1004,6 +1092,11 @@
- #
- #RTKT_DIR_WHITELIST=""
- #RTKT_FILE_WHITELIST=""
-+RTKT_FILE_WHITELIST=/bin/ad
-+# FreeIPA Certificate Authority
-+RTKT_FILE_WHITELIST=/var/log/pki-ca/system
-+# FreeIPA Certificate Authority
-+RTKT_FILE_WHITELIST=/var/log/pki/pki-tomcat/ca/system
-
- #
- # The following option can be used to whitelist shared library files that would
-@@ -1222,3 +1315,5 @@
- #
- #EMPTY_LOGFILES=""
- #MISSING_LOGFILES=""
-+
-+INSTALLDIR="/usr"
diff --git a/rkhunter-1.4.2-ipcs-locale.patch b/rkhunter-1.4.2-ipcs-locale.patch
deleted file mode 100644
index 0457e4c..0000000
--- a/rkhunter-1.4.2-ipcs-locale.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur rkhunter-1.4.2.orig/files/rkhunter rkhunter-1.4.2/files/rkhunter
---- rkhunter-1.4.2.orig/files/rkhunter 2014-03-12 14:54:55.000000000 -0600
-+++ rkhunter-1.4.2/files/rkhunter 2014-04-06 11:39:44.776583858 -0600
-@@ -13964,11 +13964,11 @@
- touch "${IPCS_TMPFILE}"
- FOUND=0; echo $FOUND > "${IPCS_TMPFILE}"
-
-- if [ `${IPCS_CMD} -u 2>/dev/null | awk -F' ' '/segments allocated/ {print $3}'` -ne 0 ]; then
-- ${IPCS_CMD} -m | grep "^0x" | while read RKH_SHM_KEY RKH_SHM_SHMID RKH_SHM_OWNER RKH_SHM_PERMS RKH_SHM_BYTES RKH_SHM_NATTACH RKH_SHM_STATUS; do
-+ if [ `LC_ALL=C ${IPCS_CMD} -u 2>/dev/null | awk -F' ' '/segments allocated/ {print $3}'` -ne 0 ]; then
-+ LC_ALL=C ${IPCS_CMD} -m | grep "^0x" | while read RKH_SHM_KEY RKH_SHM_SHMID RKH_SHM_OWNER RKH_SHM_PERMS RKH_SHM_BYTES RKH_SHM_NATTACH RKH_SHM_STATUS; do
- if [ $RKH_SHM_PERMS -eq 666 -a $RKH_SHM_BYTES -ge 1000000 ]; then
- FOUND=1; echo $FOUND > "${IPCS_TMPFILE}"
-- ${IPCS_CMD} -p | grep "^${RKH_SHM_SHMID}" | while read RKH_SHM_SHMID RKH_SHM_OWNER RKH_SHM_CPID RKH_SHM_LPID; do
-+ LC_ALL=C ${IPCS_CMD} -p | grep "^${RKH_SHM_SHMID}" | while read RKH_SHM_SHMID RKH_SHM_OWNER RKH_SHM_CPID RKH_SHM_LPID; do
- RKH_SHM_PATH=`${READLINK_CMD} -f /proc/${RKH_SHM_CPID}/exe`
- if [ $VERBOSE_LOGGING -eq 1 ]; then
- display --to LOG --type PLAIN --result FOUND --log-indent 2 ROOTKIT_MALWARE_IPCS_DETAILS "${RKH_SHM_PATH}" "${RKH_SHM_CPID}" "${RKH_SHM_OWNER}"
diff --git a/rkhunter-1.4.4-epel7.patch b/rkhunter-1.4.4-epel7.patch
new file mode 100644
index 0000000..7f6b6ec
--- /dev/null
+++ b/rkhunter-1.4.4-epel7.patch
@@ -0,0 +1,188 @@
+diff -Nur rkhunter-1.4.4.orig/files/rkhunter.conf rkhunter-1.4.4/files/rkhunter.conf
+--- rkhunter-1.4.4.orig/files/rkhunter.conf 2017-06-22 18:19:20.000000000 -0600
++++ rkhunter-1.4.4/files/rkhunter.conf 2017-06-30 15:44:08.547591493 -0600
+@@ -1,4 +1,4 @@
+-#
++##
+ # This is the main configuration file for Rootkit Hunter.
+ #
+ # You can modify this file directly, or you can create a local configuration
+@@ -158,6 +158,7 @@
+ # default directory beneath the installation directory.
+ #
+ #TMPDIR=/var/lib/rkhunter/tmp
++TMPDIR=/var/lib/rkhunter
+
+ #
+ # This option specifies the database directory to use.
+@@ -167,6 +168,7 @@
+ # default directory beneath the installation directory.
+ #
+ #DBDIR=/var/lib/rkhunter/db
++DBDIR=/var/lib/rkhunter/db
+
+ #
+ # This option specifies the script directory to use.
+@@ -241,6 +243,7 @@
+ # The default value is '0'.
+ #
+ #APPEND_LOG=0
++APPEND_LOG=0
+
+ #
+ # Set the following option to '1' if the log file is to be copied when rkhunter
+@@ -321,6 +324,7 @@
+ # The default value is '0'.
+ #
+ #ALLOW_SSH_PROT_V1=0
++ALLOW_SSH_PROT_V1=unset
+
+ #
+ # This setting tells rkhunter the directory containing the SSH configuration
+@@ -353,7 +357,8 @@
+ # program defaults.
+ #
+ ENABLE_TESTS=ALL
+-DISABLE_TESTS=suspscan hidden_ports hidden_procs deleted_files packet_cap_apps apps
++#DISABLE_TESTS=suspscan hidden_ports hidden_procs deleted_files packet_cap_apps apps
++DISABLE_TESTS=suspscan hidden_ports deleted_files packet_cap_apps apps
+
+ #
+ # The HASH_CMD option can be used to specify the command to use for the file
+@@ -557,6 +562,15 @@
+ # The default value is the null string.
+ #
+ #EXISTWHITELIST=""
++XISTWHITELIST=""
+++EXISTWHITELIST=/bin/ad
++# FreeIPA Certificate Authority
++EXISTWHITELIST=/var/log/pki-ca/system
++# FreeIPA Certificate Authority
++EXISTWHITELIST=/var/log/pki/pki-tomcat/ca/system
++# Some non default installed files we check
++EXISTWHITELIST=/usr/bin/GET
++EXISTWHITELIST=/usr/bin/whatis
+
+ #
+ # Whitelist various attributes of the specified file. The attributes are those
+@@ -587,6 +601,12 @@
+ # The default value is the null string.
+ #
+ #SCRIPTWHITELIST=/usr/bin/groups
++SCRIPTWHITELIST=/usr/bin/whatis
++SCRIPTWHITELIST=/usr/bin/ldd
++SCRIPTWHITELIST=/usr/bin/groups
++SCRIPTWHITELIST=/usr/bin/GET
++SCRIPTWHITELIST=/sbin/ifup
++SCRIPTWHITELIST=/sbin/ifdown
+
+ #
+ # Allow the specified file to have the immutable attribute set.
+@@ -617,6 +637,19 @@
+ #ALLOWHIDDENDIR=/dev/.udev
+ #ALLOWHIDDENDIR=/dev/.udevdb
+ #ALLOWHIDDENDIR=/dev/.mdadm
++ALLOWHIDDENDIR="/etc/.java"
++ALLOWHIDDENDIR=/dev/.udev
++ALLOWHIDDENDIR=/dev/.udevdb
++ALLOWHIDDENDIR=/dev/.udev.tdb
++ALLOWHIDDENDIR=/dev/.static
++ALLOWHIDDENDIR=/dev/.initramfs
++ALLOWHIDDENDIR=/dev/.SRC-unix
++ALLOWHIDDENDIR=/dev/.mdadm
++ALLOWHIDDENDIR=/dev/.systemd
++ALLOWHIDDENDIR=/dev/.mount
++# for etckeeper
++ALLOWHIDDENDIR=/etc/.git
++ALLOWHIDDENDIR=/etc/.bzr
+
+ #
+ # Allow the specified hidden file to be whitelisted.
+@@ -631,7 +664,33 @@
+ #ALLOWHIDDENFILE=/usr/lib/.libfipscheck.so.1.1.0.hmac
+ #ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha1hmac.hmac
+ #ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha256hmac.hmac
+-#ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
++ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
++ALLOWHIDDENFILE="/usr/share/man/man1/..1.gz"
++ALLOWHIDDENFILE=/lib*/.libcrypto.so.*.hmac
++ALLOWHIDDENFILE=/lib*/.libssl.so.*.hmac
++ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh-keygen.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh-keyscan.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh-add.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh-agent.hmac
++ALLOWHIDDENFILE=/usr/lib*/.libfipscheck.so.*.hmac
++ALLOWHIDDENFILE=/usr/lib*/.libgcrypt.so.*.hmac
++ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha1hmac.hmac
++ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha256hmac.hmac
++ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha384hmac.hmac
++ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha512hmac.hmac
++ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
++ALLOWHIDDENFILE=/dev/.mdadm.map
++ALLOWHIDDENFILE=/usr/share/man/man5/.k5login.5.gz
++ALLOWHIDDENFILE=/usr/share/man/man5/.k5identity.5.gz
++ALLOWHIDDENFILE=/usr/sbin/.ipsec.hmac
++# etckeeper
++ALLOWHIDDENFILE=/etc/.etckeeper
++ALLOWHIDDENFILE=/etc/.gitignore
++ALLOWHIDDENFILE=/etc/.bzrignore
++# systemd
++ALLOWHIDDENFILE=/etc/.updated
+
+ #
+ # Allow the specified process to use deleted files. The process name may be
+@@ -701,6 +760,33 @@
+ #
+ #ALLOWDEVFILE=/dev/shm/pulse-shm-*
+ #ALLOWDEVFILE=/dev/shm/sem.ADBE_*
++# Allow PCS/Pacemaker/Corosync
++ALLOWDEVFILE=/dev/shm/qb-attrd-*
++ALLOWDEVFILE=/dev/shm/qb-cfg-*
++ALLOWDEVFILE=/dev/shm/qb-cib_rw-*
++ALLOWDEVFILE=/dev/shm/qb-cib_shm-*
++ALLOWDEVFILE=/dev/shm/qb-corosync-*
++ALLOWDEVFILE=/dev/shm/qb-cpg-*
++ALLOWDEVFILE=/dev/shm/qb-lrmd-*
++ALLOWDEVFILE=/dev/shm/qb-pengine-*
++ALLOWDEVFILE=/dev/shm/qb-quorum-*
++ALLOWDEVFILE=/dev/shm/qb-stonith-*
++ALLOWDEVFILE=/dev/shm/pulse-shm-*
++ALLOWDEVFILE=/dev/md/md-device-map
++# tomboy creates this one
++ALLOWDEVFILE="/dev/shm/mono.*"
++# created by libv4l
++ALLOWDEVFILE="/dev/shm/libv4l-*"
++# created by spice video
++ALLOWDEVFILE="/dev/shm/spice.*"
++# created by mdadm
++ALLOWDEVFILE="/dev/md/autorebuild.pid"
++# 389 Directory Server
++ALLOWDEVFILE=/dev/shm/sem.slapd-*.stats
++# squid proxy
++ALLOWDEVFILE=/dev/shm/squid-cf*
++# squid ssl cache
++ALLOWDEVFILE=/dev/shm/squid-ssl_session_cache.shm
+
+ #
+ # Allow the specified process pathnames to use shared memory segments.
+@@ -1035,6 +1121,11 @@
+ #
+ #RTKT_DIR_WHITELIST=""
+ #RTKT_FILE_WHITELIST=""
++RTKT_FILE_WHITELIST=/bin/ad
++# FreeIPA Certificate Authority
++RTKT_FILE_WHITELIST=/var/log/pki-ca/system
++# FreeIPA Certificate Authority
++RTKT_FILE_WHITELIST=/var/log/pki/pki-tomcat/ca/system
+
+ #
+ # The following option can be used to whitelist shared library files that would
+@@ -1274,3 +1365,6 @@
+ # The default value is '0'.
+ #
+ #GLOBSTAR=0
++
++
++INSTALLDIR="/usr"
diff --git a/rkhunter.spec b/rkhunter.spec
index 3da7579..d272872 100644
--- a/rkhunter.spec
+++ b/rkhunter.spec
@@ -2,8 +2,8 @@
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Name: rkhunter
-Version: 1.4.2
-Release: 8%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
Summary: A host-based tool to scan for rootkits, backdoors and local exploits
Group: Applications/System
@@ -12,11 +12,7 @@ URL: http://rkhunter.sourceforge.net/
Source0: http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz
Source2: 01-rkhunter
Source3: rkhunter.sysconfig
-Patch0: rkhunter-1.4.2-epel7.patch
-#
-# Fix issue with ipcs command and locales
-#
-Patch1: rkhunter-1.4.2-ipcs-locale.patch
+Patch0: rkhunter-1.4.4-epel7.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,10 +28,7 @@ and other unwanted tools.
%prep
-%setup -q
-
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
%{__cat} <<'EOF' >%{name}.logrotate
%{_localstatedir}/log/%{name}/%{name}.log {
@@ -105,6 +98,10 @@ EOF
%{_mandir}/man8/*
%changelog
+* Fri Jun 30 2017 Kevin Fenzi <kevin(a)scrye.com> - 1.4.4-1
+- Update to 1.4.4. Fixes bug #1466318
+- Fix for logger and spaces. Fixes bug #1284403
+
* Wed Jan 25 2017 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 1.4.2-8
- Add /dev/shm/qb* files to whitelist. Fixes bug #1403602
- Add /dev/shm/squid-ssl_session_cache.shm to whitelist. Fixes bug #1411130
diff --git a/sources b/sources
index 873ec5b..458900a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85ad366b7f3999eb2a9371e39a1a4df7 rkhunter-1.4.2.tar.gz
+SHA512 (rkhunter-1.4.4.tar.gz) = 87e9c617220765678cc4519eee27d1d56185c3a7fb1d6338c8fb984ac4f5176c31bb54b69e1de615d66a0cf1e72b672e66b368e37851a459def69463cbb8661e
--
cgit v1.1
https://src.fedoraproject.org/cgit/rkhunter.git/commit/?h=epel7&id=fe8a38...
6Â years, 2Â months
orion pushed to grib_api (master). "Update to 1.23.0"
by notificationsï¼ fedoraproject.org
From 65715c2b2e101a79202920eb8a36ec2273519b60 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)cora.nwra.com>
Date: Fri, 30 Jun 2017 15:28:07 -0600
Subject: Update to 1.23.0
---
.gitignore | 1 +
grib_api.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 161cf8e..8fb5af7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ grib_api-1.7.0.tar.gz
/grib_api-1.19.0-Source.tar.gz
/grib_api-1.21.0-Source.tar.gz
/grib_api-1.22.0-Source.tar.gz
+/grib_api-1.23.0-Source.tar.gz
diff --git a/grib_api.spec b/grib_api.spec
index 23d13e0..6e6cd7b 100644
--- a/grib_api.spec
+++ b/grib_api.spec
@@ -1,5 +1,5 @@
Name: grib_api
-Version: 1.22.0
+Version: 1.23.0
Release: 1%{?dist}
Summary: WMO FM-92 GRIB (v1,v2) interface accessible from C and FORTRAN programs
@@ -147,6 +147,9 @@ make check || true
%{_libdir}/*.a
%changelog
+* Fri Jun 30 2017 Orion Poplawski <orion(a)cora.nwra.com> - 1.23.0-1
+- Update to 1.23.0
+
* Wed May 24 2017 Orion Poplawski <orion(a)cora.nwra.com> - 1.22.0-1
- Update to 1.22.0
diff --git a/sources b/sources
index c1bddbc..82af06a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (grib_api-1.22.0-Source.tar.gz) = 881ee0000f83b3c7410535eefe6b54e157fc169d2164a5dbf52d26d5c0b48ac1463735874a5c2db07a31dc48be6fb52a02def9720bfc76b23d2982a60353276f
SHA512 (grib_api_test_data.tar.gz) = 627b3f5cd179a8d7f5a5acea11eabd6945c13e4fa4247f6dd7b3570b8877e98f6c91ed3ebaa77db9c0a04fecc3214ac9fa41bf75887f3bf48e4d3393e3c5cc92
+SHA512 (grib_api-1.23.0-Source.tar.gz) = f0428e20cf774678daccfa12dacb60b703369d5275a4b2bc71764f93b655623678ed9a644d0ea09a1ba05a215c013ac99067d6a97c2d28aec75fea8164581a18
--
cgit v1.1
https://src.fedoraproject.org/cgit/grib_api.git/commit/?h=master&id=65715...
6Â years, 2Â months
orion pushed to zabbix (master). "Update Conflicts versions"
by notificationsï¼ fedoraproject.org
From 699b213af9f8ca8d227866d3b00f5350aa379778 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)cora.nwra.com>
Date: Fri, 30 Jun 2017 15:27:14 -0600
Subject: Update Conflicts versions
---
zabbix.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/zabbix.spec b/zabbix.spec
index 2bdc3e7..d2ef2db 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -55,8 +55,9 @@ Provides: bundled(md5-deutsch)
# Could alternatively be conditional on Fedora/EL
%if %{srcname} != %{name}
Provides: %{srcname} = %{version}-%{release}
-Conflicts: %{srcname} < 2.2
+Conflicts: %{srcname} < 3.0
Conflicts: %{srcname}20
+Conflicts: %{srcname}22
%else
Obsoletes: %{srcname}-docs < 1.8.15-2
Obsoletes: %{srcname}-web-sqlite3 < 2.0.3-3
--
cgit v1.1
https://src.fedoraproject.org/cgit/zabbix.git/commit/?h=master&id=699b213...
6Â years, 2Â months
djbw pushed to ndctl (f24). "Release v57.1"
by notificationsï¼ fedoraproject.org
From 7e8a9021d8421c230dfbe7c233fa11488535a7d0 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams(a)intel.com>
Date: Fri, 30 Jun 2017 14:20:31 -0700
Subject: Release v57.1
---
.gitignore | 1 +
ndctl.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8036483..68b1141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/ndctl-55.tar.gz
/ndctl-56.tar.gz
/ndctl-57.tar.gz
+/ndctl-57.1.tar.gz
diff --git a/ndctl.spec b/ndctl.spec
index 52d18d5..d641f13 100644
--- a/ndctl.spec
+++ b/ndctl.spec
@@ -1,5 +1,5 @@
Name: ndctl
-Version: 57
+Version: 57.1
Release: 1%{?dist}
Summary: Manage "libnvdimm" subsystem devices (Non-volatile Memory)
License: GPLv2
@@ -88,7 +88,7 @@ control API for these devices.
%setup -q ndctl-%{version}
%build
-echo "57" > version
+echo "57.1" > version
./autogen.sh
%configure --disable-static --enable-local --disable-silent-rules
make %{?_smp_mflags}
@@ -145,6 +145,9 @@ make check
%changelog
+* Fri Jun 30 2017 Dan Williams <dan.j.williams(a)intel.com> - 57.1-1
+- Release v57.1
+
* Sat May 27 2017 Dan Williams <dan.j.williams(a)intel.com> - 57-1
- Release v57
diff --git a/sources b/sources
index 708ae9c..4c8ff4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ndctl-57.tar.gz) = 2b29192ccbded55e70cff6cd3322d4419deb98cea19120cea56eca9de521a7b14ecc3d5c2c43db3f23875195b9446f6e6ef555e44b8337041920eb671286d114
+SHA512 (ndctl-57.1.tar.gz) = 74e3c47574e7ef8ddb51d61e2c76cbb1564238b3d7b6da41294d7d46e7deef4758857fc671b7723aab16fc8bcea9b1acbfe35a19264c5d3567824b2fd713320a
--
cgit v1.1
https://src.fedoraproject.org/cgit/ndctl.git/commit/?h=f24&id=7e8a9021d84...
6Â years, 2Â months