[rpms/icecream] epel9: Upstream release 1.3

[rpms/icecream] epel9: Upstream release 1.3

[Michal Schmidt]

A new commit has been pushed.

Repo   : rpms/icecream
Branch : epel9
Commit : e140ed7326450fde5132444a91c4881328f77312
Author : Michal Schmidt <mschmidt@redhat.com>
Date   : 2019-09-27T15:46:10+02:00
Stats  : +29/-25 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/icecream/c/e140ed7326450fde5132444a91c4881328f77312?branch=epel9

Log:
Upstream release 1.3

---
diff --git a/.gitignore b/.gitignore
index 82d9613..d4f4dd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ icecream-manpages.tar.bz2
 /icecream-22fcc39.tar.gz
 /icecream-1.1.tar.gz
 /icecream-1.2.tar.gz
+/icecream-1.3.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 fd59fde..d94e4e4 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 a38c813764c36f24bbfdc3713c4d5db262e984bb Mon Sep 17 00:00:00 2001
+From 6212a5ec03bdcfea197ca205c3ca06c2d275c41e 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 65cad30270..37079bb94b 100644
+index 4cfb504e39..fac3334754 100644
 --- a/daemon/environment.cpp
 +++ b/daemon/environment.cpp
-@@ -203,7 +203,7 @@ static bool cleanup_directory(const string &directory)
+@@ -162,7 +162,7 @@ static bool cleanup_directory(const string &directory)
      return true;
  }
  
@@ -26,7 +26,7 @@ index 65cad30270..37079bb94b 100644
  {
      flush_debug();
  
-@@ -222,11 +222,6 @@ bool cleanup_cache(const string &basedir, uid_t user_uid, gid_t user_gid)
+@@ -181,11 +181,6 @@ bool cleanup_cache(const string &basedir, uid_t user_uid, gid_t user_gid)
          return false;
      }
  
@@ -39,7 +39,7 @@ index 65cad30270..37079bb94b 100644
  }
  
 diff --git a/daemon/environment.h b/daemon/environment.h
-index cae6fbd808..dd37005201 100644
+index dd61e7104b..9fbd331c5b 100644
 --- a/daemon/environment.h
 +++ b/daemon/environment.h
 @@ -29,7 +29,7 @@
@@ -50,12 +50,12 @@ index cae6fbd808..dd37005201 100644
 +extern bool cleanup_cache(const std::string &basedir);
  extern int start_create_env(const std::string &basedir,
                              uid_t user_uid, gid_t user_gid,
-                             const std::string &compiler, const std::list<std::string> &extrafiles);
+                             const std::string &compiler, const std::list<std::string> &extrafiles,
 diff --git a/daemon/main.cpp b/daemon/main.cpp
-index f87a799d28..00dfab7fe2 100644
+index b0dbd95ee4..9fe151a275 100644
 --- a/daemon/main.cpp
 +++ b/daemon/main.cpp
-@@ -2326,7 +2326,7 @@ int main(int argc, char **argv)
+@@ -2535,7 +2535,7 @@ int main(int argc, char **argv)
      pidFile << dcc_master_pid << endl;
      pidFile.close();
  
@@ -65,5 +65,5 @@ index f87a799d28..00dfab7fe2 100644
      }
  
 -- 
-2.13.0
+2.21.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 887ae81..af909ed 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 1fb8269ea6bbefafb627f4f070cba41d3f01a0d8 Mon Sep 17 00:00:00 2001
+From 0ca327dd48e5c9b7c1c26529cdc86e35c5eb30e3 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 00dfab7fe2..e86534118b 100644
+index 9fe151a275..3119555f6d 100644
 --- a/daemon/main.cpp
 +++ b/daemon/main.cpp
-@@ -2231,10 +2231,6 @@ int main(int argc, char **argv)
+@@ -2437,10 +2437,6 @@ int main(int argc, char **argv)
              logfile = "/var/log/icecc/iceccd.log";
          }
  
@@ -26,5 +26,5 @@ index 00dfab7fe2..e86534118b 100644
          capng_clear(CAPNG_SELECT_BOTH);
          capng_update(CAPNG_ADD, (capng_type_t)(CAPNG_EFFECTIVE | CAPNG_PERMITTED), CAP_SYS_CHROOT);
 -- 
-2.13.0
+2.21.0
 

diff --git a/0003-Ignore-the-suse-directory.patch b/0003-Ignore-the-suse-directory.patch
index 4518af0..05e94e3 100644
--- a/0003-Ignore-the-suse-directory.patch
+++ b/0003-Ignore-the-suse-directory.patch
@@ -1,4 +1,4 @@
-From e36ef9d943bc18759ee1a55e3f48db709c7fc98a Mon Sep 17 00:00:00 2001
+From b84e85638790fa51667c7440f5a79bb63196999f 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
@@ -12,17 +12,17 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1393742
  1 file changed, 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 316893602e..52d0002fd3 100644
+index 00fdf8a5f1..7311a9f4dd 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -7,7 +7,6 @@ SUBDIRS = \
+@@ -8,7 +8,6 @@ SUBDIRS = \
  	daemon \
  	client \
  	doc \
 -	suse \
  	compilerwrapper \
  	scheduler \
- 	tests
+ 	tests \
 -- 
-2.13.0
+2.21.0
 

diff --git a/0004-do-not-use-usr-bin-env.patch b/0004-do-not-use-usr-bin-env.patch
index a4c3ade..5e101ac 100644
--- a/0004-do-not-use-usr-bin-env.patch
+++ b/0004-do-not-use-usr-bin-env.patch
@@ -1,4 +1,4 @@
-From e8b48461f4269a5680bb968f0ea5be63e3cb67ce Mon Sep 17 00:00:00 2001
+From 8d14b19ed2bc174e2669e0effaafcb862a7c4054 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
@@ -8,7 +8,7 @@ Subject: [PATCH 4/4] do not use #!/usr/bin/env
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/client/icecc-create-env.in b/client/icecc-create-env.in
-index 414f18cae0..2f1eae5c49 100755
+index cb52c9daa7..deb686fd65 100755
 --- a/client/icecc-create-env.in
 +++ b/client/icecc-create-env.in
 @@ -1,4 +1,4 @@
@@ -18,5 +18,5 @@ index 414f18cae0..2f1eae5c49 100755
  #
  # Copyright (C) 2004 by the Icecream Authors
 -- 
-2.13.0
+2.21.0
 

diff --git a/icecream.spec b/icecream.spec
index 2308a6d..a44cf3c 100644
--- a/icecream.spec
+++ b/icecream.spec
@@ -2,8 +2,8 @@
 %bcond_without selinux
 
 Name:     icecream
-Version:  1.2
-Release:  4%{?dist}
+Version:  1.3
+Release:  1%{?dist}
 Summary:  Distributed compiler
 License:  GPLv2+
 URL:      https://github.com/icecc/icecream
@@ -28,7 +28,7 @@ Patch4:   0004-do-not-use-usr-bin-env.patch
 BuildRequires: gcc-c++
 BuildRequires: systemd
 BuildRequires: libcap-ng-devel
-BuildRequires: lzo-devel
+BuildRequires: lzo-devel libzstd-devel libarchive-devel
 BuildRequires: docbook2X
 BuildRequires: environment(modules)
 BuildRequires: firewalld-filesystem
@@ -262,6 +262,9 @@ exit 0
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Fri Sep 27 2019 Michal Schmidt <mschmidt@redhat.com> - 1.3-1
+- Upstream release 1.3.
+
 * Thu Aug 01 2019 Michal Schmidt <mschmidt@redhat.com> - 1.2-4
 - Fix FTBFS, rely on PATH to run hardlink.
 

diff --git a/sources b/sources
index d86b0c2..d657964 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (icecream-1.2.tar.gz) = 0c4df21889b59df77839dc4a9c1bbfd2360aed8b5927ed5c19e6ca3020fa6e738fb91534f4f504258d707e79f2c67f93462b308c17abcd010b19c2777ff59298
+SHA512 (icecream-1.3.tar.gz) = 6baccbc4fb6dcae76175e4407ba23e3805bb47e93f5f02aef6998ffeaabfa4203083bee2b374a98c5de8ed26ba2f280497225fbe1ac7c9bce9253d2be82ff7de