hguemar pushed to diet (f22). "Upstream 2.9"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri May 29 00:35:00 UTC 2015
From bbfc2b0912a25407cdd6af64515d5c9f9735d2e8 Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar at fedoraproject.org>
Date: Fri, 29 May 2015 02:14:35 +0200
Subject: Upstream 2.9
diff --git a/.gitignore b/.gitignore
index 629b906..384a5f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/diet-2.8.0-gitcd326f85f75c.tar.gz
/diet-2.8.1.tar.gz
+/diet-2.9.tar.gz
diff --git a/0001-Fix-compilation-with-Werror-format-security.patch b/0001-Fix-compilation-with-Werror-format-security.patch
new file mode 100644
index 0000000..b451dc6
--- /dev/null
+++ b/0001-Fix-compilation-with-Werror-format-security.patch
@@ -0,0 +1,48 @@
+From aafe0be8e2d56b92f340af1178ff6eb396d19973 Mon Sep 17 00:00:00 2001
+From: Haikel Guemar <hguemar at fedoraproject.org>
+Date: Thu, 28 May 2015 23:15:21 +0200
+Subject: [PATCH] Fix compilation with -Werror=format-security
+
+This could be a security issue
+---
+ src/utils/log/DietLogComponent.cc | 4 ++--
+ src/utils/workflow/WfPortAdapter.cc | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/utils/log/DietLogComponent.cc b/src/utils/log/DietLogComponent.cc
+index e5338b1..fa75c9e 100644
+--- a/src/utils/log/DietLogComponent.cc
++++ b/src/utils/log/DietLogComponent.cc
+@@ -814,11 +814,11 @@ DietLogComponent::logSedChosen(const corba_request_t *request,
+ response->servers[i].estim.estValues[j].v_value.d());
+ break;
+ case str:
+- snprintf(v_value, BUFSIZE,
++ snprintf(v_value, BUFSIZE, "%s",
+ response->servers[i].estim.estValues[j].v_value.s());
+ break;
+ case bin:
+- snprintf(v_value, BUFSIZE,
++ snprintf(v_value, BUFSIZE, "%s",
+ reinterpret_cast<const char*>(response->servers[i].estim.estValues[j].v_value.b().get_buffer()));
+ break;
+ default:
+diff --git a/src/utils/workflow/WfPortAdapter.cc b/src/utils/workflow/WfPortAdapter.cc
+index b59edac..85619ca 100644
+--- a/src/utils/workflow/WfPortAdapter.cc
++++ b/src/utils/workflow/WfPortAdapter.cc
+@@ -764,9 +764,9 @@ WfValueAdapter::newFile() {
+ size_t sz = myValue.size() + 1;
+ str = new char[sz];
+ #ifdef __WIN32__
+- _snprintf(str, sz, myValue.c_str());
++ _snprintf(str, sz, "%s", myValue.c_str());
+ #else
+- snprintf(str, sz, myValue.c_str());
++ snprintf(str, sz, "%s", myValue.c_str());
+ #endif
+ return str;
+ }
+--
+2.4.1
+
diff --git a/diet-2.8.1-cmake.diff b/diet-2.8.1-cmake.diff
deleted file mode 100644
index dd21f62..0000000
--- a/diet-2.8.1-cmake.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur diet-2.8.1.orig/cmake/FindSSH.cmake diet-2.8.1/cmake/FindSSH.cmake
---- diet-2.8.1.orig/cmake/FindSSH.cmake 2012-06-13 09:24:53.000000000 +0200
-+++ diet-2.8.1/cmake/FindSSH.cmake 2014-05-23 13:05:27.359814404 +0200
-@@ -50,7 +50,7 @@
- MESSAGE("SSH binary was not found. Please provide SSH_DIR ")
- MESSAGE(" - through the GUI when working with ccmake, ")
- MESSAGE(" - as a command line argument when working with cmake e.g. ")
-- MESSAGE(" cmake .. -DSSH_DIR:PATH=C:\openssh ")
-+ MESSAGE(" cmake .. -DSSH_DIR:PATH=C:\\openssh ")
- MESSAGE("Note: the following message is triggered by cmake on the first ")
- MESSAGE(" undefined necessary PATH variable (e.g. SSH_DIR)")
- MESSAGE(" Providing SSH_DIR (as above described) is probably the")
diff --git a/diet-2.8.1-werror.diff b/diet-2.8.1-werror.diff
deleted file mode 100644
index 32e56bb..0000000
--- a/diet-2.8.1-werror.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur diet-2.8.1.orig/src/utils/workflow/WfPortAdapter.cc diet-2.8.1/src/utils/workflow/WfPortAdapter.cc
---- diet-2.8.1.orig/src/utils/workflow/WfPortAdapter.cc 2012-06-13 09:24:54.000000000 +0200
-+++ diet-2.8.1/src/utils/workflow/WfPortAdapter.cc 2014-05-23 13:22:28.082525058 +0200
-@@ -728,7 +728,7 @@
- #ifdef __WIN32__
- _snprintf(str, sz, myValue.c_str());
- #else
-- snprintf(str, sz, myValue.c_str());
-+ snprintf(str, sz, "%s", myValue.c_str());
- #endif
- return str;
- }
diff --git a/diet.spec b/diet.spec
index 4ecc5bf..fb15cfa 100644
--- a/diet.spec
+++ b/diet.spec
@@ -1,18 +1,15 @@
-%global sover 2.8.1
+%global sover 2.9
Name: diet
-Version: 2.8.1
-Release: 14%{?dist}
+Version: 2.9
+Release: 1%{?dist}
Summary: A computational servers toolkit
-Group: Development/Libraries
License: CeCILL
URL: http://graal.ens-lyon.fr/~diet/
# moved to a post-release tarball (upcoming upstream 2.8.1 release)
Source0: http://graal.ens-lyon.fr/~hguemar/%{name}/archives/%{name}-%{version}.tar.gz
-# Workaround broken quoting
-Patch0: diet-2.8.1-cmake.diff
# Workaround build breakdown triggered by -Werror=format-security
-Patch1: diet-2.8.1-werror.diff
+Patch0: 0001-Fix-compilation-with-Werror-format-security.patch
BuildRequires: cmake >= 2.6.2
BuildRequires: chrpath
@@ -28,7 +25,6 @@ DIET is a grid middleware that implements the Grid-RPC model.
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: xerces-c-devel%{_isa} >= 3.0
Requires: xqilla-devel%{_isa}
@@ -41,7 +37,6 @@ developing applications that use %{name}.
%package doc
Summary: Documentation for %{name}
-Group: Development/Libraries
Buildarch: noarch
%description doc
@@ -50,7 +45,6 @@ developing applications that use %{name}.
%package examples
Summary: Examples for %{name}
-Group: Development/Libraries
%description examples
The %{name}-examples package contains samples applications
@@ -61,9 +55,7 @@ that use %{name}.
%setup -q
%patch0 -p1
-%patch1 -p1
-sed -i 's/1.46.1/1.46.0/' CMakeLists.txt
cp LICENCE_eng.txt LICENSE.txt
iconv -f iso8859-1 -t utf-8 LICENSE.txt > LICENSE.conv && mv -f LICENSE.conv LICENSE.txt
@@ -140,6 +132,9 @@ popd
%changelog
+* Fri May 29 2015 Haïkel Guémar <hguemar at fedoraproject.org> - 2.9-1
+- Upstream 2.9
+
* Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 2.8.1-14
- Rebuilt for GCC 5 C++11 ABI change
diff --git a/sources b/sources
index 8f29626..8dbd84d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-440f111ac422a1687d1d75219d6bf535 diet-2.8.1.tar.gz
+6b26c0c4f9c80a2969b3e04c9ce1b053 diet-2.9.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/diet.git/commit/?h=f22&id=bbfc2b0912a25407cdd6af64515d5c9f9735d2e8
More information about the scm-commits
mailing list