[rpms/icecream] epel10.2: Current git snapshot

[rpms/icecream] epel10.2: Current git snapshot

[Michal Schmidt]

A new commit has been pushed.

Repo   : rpms/icecream
Branch : epel10.2
Commit : de573cacd18329c6793f687c6329e5aedab445e5
Author : Michal Schmidt <mschmidt@redhat.com>
Date   : 2017-07-03T18:00:42+02:00
Stats  : +24/-20 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/icecream/c/de573cacd18329c6793f687c6329e5aedab445e5?branch=epel10.2

Log:
Current git snapshot

---
diff --git a/.gitignore b/.gitignore
index c0f9094..0149c20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ icecream-manpages.tar.bz2
 /icecream-20140822.tar.xz
 /icecc-1.0.98.tar.bz2
 /icecream-a79f70f.tar.gz
+/icecream-1c15f6b.tar.gz

diff --git a/0001-Revert-chmod-chown-envs-dir-when-preparing-this.patch b/0001-Revert-chmod-chown-envs-dir-when-preparing-this.patch
index 8f76666..fd59fde 100644
--- a/0001-Revert-chmod-chown-envs-dir-when-preparing-this.patch
+++ b/0001-Revert-chmod-chown-envs-dir-when-preparing-this.patch
@@ -1,4 +1,4 @@
-From abe354f5b4b1e1fbf0f7eaa8909aa5263c078d43 Mon Sep 17 00:00:00 2001
+From a38c813764c36f24bbfdc3713c4d5db262e984bb Mon Sep 17 00:00:00 2001
 From: Michal Schmidt <mschmidt@redhat.com>
 Date: Mon, 26 Aug 2013 17:08:52 +0200
 Subject: [PATCH 1/4] Revert "chmod/chown envs dir when preparing this"
@@ -14,10 +14,10 @@ and its owned by root:icecc. We cannot and do not want to chown/chmod it.
  3 files changed, 3 insertions(+), 8 deletions(-)
 
 diff --git a/daemon/environment.cpp b/daemon/environment.cpp
-index a054419ce3..e9aacd7334 100644
+index 65cad30270..37079bb94b 100644
 --- a/daemon/environment.cpp
 +++ b/daemon/environment.cpp
-@@ -201,7 +201,7 @@ static bool cleanup_directory(const string &directory)
+@@ -203,7 +203,7 @@ static bool cleanup_directory(const string &directory)
      return true;
  }
  
@@ -26,12 +26,12 @@ index a054419ce3..e9aacd7334 100644
  {
      flush_debug();
  
-@@ -220,11 +220,6 @@ bool cleanup_cache(const string &basedir, uid_t user_uid, gid_t user_gid)
+@@ -222,11 +222,6 @@ bool cleanup_cache(const string &basedir, uid_t user_uid, gid_t user_gid)
          return false;
      }
  
 -    if (chown(basedir.c_str(), user_uid, user_gid) || chmod(basedir.c_str(), 0775)) {
--        log_perror("chown/chmod in cleanup_cache() failed");
+-        log_perror("chown/chmod in cleanup_cache() failed") << "\t" << basedir << endl;;
 -        return false;
 -    }
 -
@@ -39,7 +39,7 @@ index a054419ce3..e9aacd7334 100644
  }
  
 diff --git a/daemon/environment.h b/daemon/environment.h
-index 3d7fe318ae..87a4033224 100644
+index cae6fbd808..dd37005201 100644
 --- a/daemon/environment.h
 +++ b/daemon/environment.h
 @@ -29,7 +29,7 @@
@@ -52,10 +52,10 @@ index 3d7fe318ae..87a4033224 100644
                              uid_t user_uid, gid_t user_gid,
                              const std::string &compiler, const std::list<std::string> &extrafiles);
 diff --git a/daemon/main.cpp b/daemon/main.cpp
-index 9c2983a530..696b5ef028 100644
+index f87a799d28..00dfab7fe2 100644
 --- a/daemon/main.cpp
 +++ b/daemon/main.cpp
-@@ -2276,7 +2276,7 @@ int main(int argc, char **argv)
+@@ -2326,7 +2326,7 @@ int main(int argc, char **argv)
      pidFile << dcc_master_pid << endl;
      pidFile.close();
  
@@ -65,5 +65,5 @@ index 9c2983a530..696b5ef028 100644
      }
  
 -- 
-2.9.3
+2.13.0
 

diff --git a/0002-daemon-main-do-not-create-run-icecc-by-ourselves.patch b/0002-daemon-main-do-not-create-run-icecc-by-ourselves.patch
index 4ed9175..887ae81 100644
--- a/0002-daemon-main-do-not-create-run-icecc-by-ourselves.patch
+++ b/0002-daemon-main-do-not-create-run-icecc-by-ourselves.patch
@@ -1,4 +1,4 @@
-From bf7975c7ec725e99517db25b750d90307b156626 Mon Sep 17 00:00:00 2001
+From 1fb8269ea6bbefafb627f4f070cba41d3f01a0d8 Mon Sep 17 00:00:00 2001
 From: Michal Schmidt <mschmidt@redhat.com>
 Date: Thu, 29 Aug 2013 18:12:02 +0200
 Subject: [PATCH 2/4] daemon/main: do not create /run/icecc by ourselves
@@ -11,10 +11,10 @@ instead of creating it from the daemon.
  1 file changed, 4 deletions(-)
 
 diff --git a/daemon/main.cpp b/daemon/main.cpp
-index 696b5ef028..615235316b 100644
+index 00dfab7fe2..e86534118b 100644
 --- a/daemon/main.cpp
 +++ b/daemon/main.cpp
-@@ -2181,10 +2181,6 @@ int main(int argc, char **argv)
+@@ -2231,10 +2231,6 @@ int main(int argc, char **argv)
              logfile = "/var/log/icecc/iceccd.log";
          }
  
@@ -26,5 +26,5 @@ index 696b5ef028..615235316b 100644
          capng_clear(CAPNG_SELECT_BOTH);
          capng_update(CAPNG_ADD, (capng_type_t)(CAPNG_EFFECTIVE | CAPNG_PERMITTED), CAP_SYS_CHROOT);
 -- 
-2.9.3
+2.13.0
 

diff --git a/0003-Ignore-the-suse-directory.patch b/0003-Ignore-the-suse-directory.patch
index a797bdc..4518af0 100644
--- a/0003-Ignore-the-suse-directory.patch
+++ b/0003-Ignore-the-suse-directory.patch
@@ -1,4 +1,4 @@
-From d4b933291f31d371d912db00c766cd921dd7aa0c Mon Sep 17 00:00:00 2001
+From e36ef9d943bc18759ee1a55e3f48db709c7fc98a Mon Sep 17 00:00:00 2001
 From: Michal Schmidt <mschmidt@redhat.com>
 Date: Fri, 11 Nov 2016 15:14:28 +0100
 Subject: [PATCH 3/4] Ignore the 'suse' directory
@@ -24,5 +24,5 @@ index 316893602e..52d0002fd3 100644
  	scheduler \
  	tests
 -- 
-2.9.3
+2.13.0
 

diff --git a/0004-do-not-use-usr-bin-env.patch b/0004-do-not-use-usr-bin-env.patch
index 4398561..a4c3ade 100644
--- a/0004-do-not-use-usr-bin-env.patch
+++ b/0004-do-not-use-usr-bin-env.patch
@@ -1,4 +1,4 @@
-From 180aef18b54f83b17efe57a9f4aa1d5cf175cc1a Mon Sep 17 00:00:00 2001
+From e8b48461f4269a5680bb968f0ea5be63e3cb67ce Mon Sep 17 00:00:00 2001
 From: Michal Schmidt <mschmidt@redhat.com>
 Date: Fri, 11 Nov 2016 15:23:40 +0100
 Subject: [PATCH 4/4] do not use #!/usr/bin/env
@@ -18,5 +18,5 @@ index 414f18cae0..2f1eae5c49 100755
  #
  # Copyright (C) 2004 by the Icecream Authors
 -- 
-2.9.3
+2.13.0
 

diff --git a/icecream.spec b/icecream.spec
index 02e4d96..22d7a52 100644
--- a/icecream.spec
+++ b/icecream.spec
@@ -1,12 +1,12 @@
 %global _hardened_build 1
 %bcond_without selinux
 
-%global commit0 a79f70f389acaad63aa073b45d4e5ca085f5c8db
+%global commit0 1c15f6b9c6ddd329e4fe1e2a03c7420a0407ae25
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name:     icecream
 Version:  1.1
-Release:  0.6.rc2.g%{shortcommit0}%{?dist}
+Release:  0.7.rc2.g%{shortcommit0}%{?dist}
 Summary:  Distributed compiler
 License:  GPLv2+
 URL:      https://github.com/icecc/icecream
@@ -266,6 +266,9 @@ exit 0
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Mon Jul 03 2017 Michal Schmidt <mschmidt@redhat.com> - 1.1-0.7.rc2.g1c15f6b
+- Current git snapshot.
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-0.6.rc2.ga79f70f
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

diff --git a/sources b/sources
index f9ad4e3..a65dff0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fae20af1ff67d3b1633f544bae0196b  icecream-a79f70f.tar.gz
+SHA512 (icecream-1c15f6b.tar.gz) = 8da7cceb6a807817bf6f6b9c974abbc40fad8f03af97cfb2c89d0cfe4f38f0b55c2dc0ab396add7e125b579e288ea700e5c6d08cc3234bb6216fbf8c9c39681e