From 1b7bd87978732344b4a51e74a05a86a1283f7b00 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Nov 03 2016 13:50:54 +0000 Subject: drop 120.patch I don't see the point of cherry-picking this patch. Both PATH_MAX and FILENAME_MAX are 4096 on Linux. Nobody expects the Fedora package to build on Hurd. --- diff --git a/120.patch b/120.patch deleted file mode 100644 index e7c200f..0000000 --- a/120.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2f1dcbb75a96f5e12ed56c665b3bdd48d4bf6011 Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Thu, 12 Feb 2015 23:03:28 +0100 -Subject: [PATCH] services: use PATH_MAX instead of FILENAME_MAX - -In a Linux-specific code, use PATH_MAX instead of FILENAME_MAX as -buffer size for getcwd(). ---- - services/logging.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/services/logging.cpp b/services/logging.cpp -index 4291f0c..c476a97 100644 ---- a/services/logging.cpp -+++ b/services/logging.cpp -@@ -25,6 +25,7 @@ - #include "logging.h" - #include - #include -+#include - #ifdef __linux__ - #include - #endif -@@ -63,7 +64,7 @@ void setup_debug(int level, const string &filename, const string &prefix) - #ifdef __linux__ - - if (fname[0] != '/') { -- char buf[FILENAME_MAX]; -+ char buf[PATH_MAX]; - - if (getcwd(buf, sizeof(buf))) { - fname.insert(0, "/"); diff --git a/icecream.spec b/icecream.spec index 668c35b..11191d9 100644 --- a/icecream.spec +++ b/icecream.spec @@ -25,9 +25,6 @@ Source12: icecream.xml Source13: icecream-scheduler.xml Patch1: 0001-Revert-chmod-chown-envs-dir-when-preparing-this.patch Patch2: 0002-daemon-main-do-not-create-run-icecc-by-ourselves.patch -# GitHub pull requests -# use PATH_MAX instead of FILENAME_MAX -Patch100: https://patch-diff.githubusercontent.com/raw/icecc/icecream/pull/120.patch BuildRequires: systemd BuildRequires: libcap-ng-devel @@ -79,7 +76,6 @@ This package contains development files for %{name}. %setup -q -n icecc-%{version} %patch1 -p1 %patch2 -p1 -%patch100 -p1 -b .github mkdir SELinux cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} SELinux