Compare commits

..

12 Commits

Author SHA1 Message Date
Fedora Release Engineering 1d0094977b Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 21:04:40 +00:00
Vitezslav Crhonek 613e85663e Rebuild 2024-06-25 13:08:46 +02:00
Yaakov Selkowitz 12519f950e Fix build with RPM 4.20
%_builddir now contains a build-specific path:

https://github.com/rpm-software-management/rpm/issues/2078
2024-06-23 14:12:10 -04:00
Python Maint d0cea79dae Rebuilt for Python 3.13 2024-06-18 09:37:36 +02:00
Jitka Plesnikova b4f95a4140 Perl 5.40 rebuild 2024-06-12 13:06:09 +02:00
Python Maint 4fd758ebc8 Rebuilt for Python 3.13 2024-06-07 18:57:17 +02:00
Vitezslav Crhonek b606719aa2 Update license tags in subpackages to SPDX format 2024-05-10 09:04:19 +02:00
Fedora Release Engineering ba629d7155 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-25 11:33:40 +00:00
Vitezslav Crhonek 049821cecd Fix FTBFS 2024-01-22 11:02:23 +01:00
Fedora Release Engineering 7c23549251 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-21 11:26:56 +00:00
Mamoru TASAKA 1d9613dae7 Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 2024-01-03 23:27:00 +09:00
Vitezslav Crhonek 25ae2ebc14 Update to openwsman-2.7.2, replace deprecated patchN
Signed-off-by: Vitezslav Crhonek <vcrhonek@redhat.com>
2023-08-31 09:50:31 +02:00
7 changed files with 64 additions and 92 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
/openwsmand.8.gz
/v2.7.1.tar.gz
/v2.7.2.tar.gz
+4 -4
View File
@@ -1,12 +1,12 @@
diff -up openwsman-2.4.12/bindings/ruby/extconf.rb.orig openwsman-2.4.12/bindings/ruby/extconf.rb
--- openwsman-2.4.12/bindings/ruby/extconf.rb.orig 2015-02-09 09:28:58.232581263 +0100
+++ openwsman-2.4.12/bindings/ruby/extconf.rb 2015-02-09 09:38:22.836772879 +0100
diff -up openwsman-2.7.2/bindings/ruby/extconf.rb.orig openwsman-2.7.2/bindings/ruby/extconf.rb
--- openwsman-2.7.2/bindings/ruby/extconf.rb.orig 2022-12-28 16:43:03.000000000 +0100
+++ openwsman-2.7.2/bindings/ruby/extconf.rb 2023-08-09 12:50:21.361216733 +0200
@@ -32,7 +32,7 @@ swig = find_executable("swig")
raise "SWIG not found" unless swig
major, minor, path = RUBY_VERSION.split(".")
-raise "SWIG failed to run" unless system("#{swig} -ruby -autorename -DRUBY_VERSION=#{major}#{minor} -I. -I/usr/include/openwsman -o openwsman_wrap.c openwsman.i")
+raise "SWIG failed to run" unless system("#{swig} -ruby -autorename -DRUBY_VERSION=#{major}#{minor} -I. -I/usr/include/openwsman -I/builddir/build/BUILD/openwsman-2.7.1/include/ -o openwsman_wrap.c openwsman.i")
+raise "SWIG failed to run" unless system("#{swig} -ruby -autorename -DRUBY_VERSION=#{major}#{minor} -I. -I/usr/include/openwsman -I/builddir/build/BUILD/openwsman-2.7.2-build/openwsman-2.7.2/include/ -o openwsman_wrap.c openwsman.i")
$CPPFLAGS = "-I/usr/include/openwsman -I.."
@@ -1,12 +0,0 @@
diff -up openwsman-2.7.1/bindings/ruby/helpers.h.orig openwsman-2.7.1/bindings/ruby/helpers.h
--- openwsman-2.7.1/bindings/ruby/helpers.h.orig 2021-04-07 17:25:55.000000000 +0200
+++ openwsman-2.7.1/bindings/ruby/helpers.h 2022-10-21 08:36:24.901459057 +0200
@@ -47,7 +47,7 @@
*
*/
-#if SWIGVERSION > 0x020004
+#if SWIG_VERSION > 0x020004
#define KLASS_DECL(k,t) swig_class *k = (swig_class *)(t->clientdata)
#define KLASS_OF(x) x->klass
#else
@@ -1,56 +0,0 @@
diff -up openwsman-2.7.1/src/lib/wsman-curl-client-transport.c.orig openwsman-2.7.1/src/lib/wsman-curl-client-transport.c
--- openwsman-2.7.1/src/lib/wsman-curl-client-transport.c.orig 2021-04-07 17:25:55.000000000 +0200
+++ openwsman-2.7.1/src/lib/wsman-curl-client-transport.c 2022-07-19 09:25:22.435355610 +0200
@@ -459,6 +459,7 @@ wsmc_handler( WsManClient *cl,
long http_code;
long auth_avail = 0;
char *_user = NULL, *_pass = NULL;
+ int _no_auth = 0; /* 0 if authentication is used, 1 if no authentication was used */
u_buf_t *response = NULL;
//char *soapaction;
char *tmp_str = NULL;
@@ -564,6 +565,7 @@ wsmc_handler( WsManClient *cl,
_user = wsmc_get_user(cl);
_pass = wsmc_get_password(cl);
if (_user && _pass && cl->data.auth_set) {
+ _no_auth = 0;
r = curl_easy_setopt(curl, CURLOPT_HTTPAUTH, cl->data.auth_set);
if (r != CURLE_OK) {
cl->fault_string = u_strdup(curl_easy_strerror(r));
@@ -584,6 +586,11 @@ wsmc_handler( WsManClient *cl,
curl_err("curl_easy_setopt(curl, CURLOPT_USERPWD, ..) failed");
goto DONE;
}
+ } else {
+ /* request without user credentials, remember this for
+ * later use when it might become necessary to print an error message
+ */
+ _no_auth = 1;
}
if (wsman_debug_level_debugged(DEBUG_LEVEL_MESSAGE)) {
@@ -616,6 +623,24 @@ wsmc_handler( WsManClient *cl,
break;
case 401:
// The server requires authentication.
+ /* RFC 2616 states:
+ *
+ * If the request already included Authorization credentials, then the 401
+ * response indicates that authorization has been refused for those
+ * credentials. If the 401 response contains the same challenge as the
+ * prior response, and the user agent has already attempted
+ * authentication at least once, then the user SHOULD be presented the
+ * entity that was given in the response, since that entity might
+ * include relevant diagnostic information.
+ */
+ if (_no_auth == 0) {
+ /* no authentication credentials were used. It is only
+ * possible to write a message about the current situation. There
+ * is no information about the last attempt to access the resource.
+ * Maybe at a later point in time I will implement more state information.
+ */
+ fprintf(stdout,"Authentication failed, please retry\n");
+ }
break;
default:
// The status code does not indicate success.
+12
View File
@@ -0,0 +1,12 @@
diff -up openwsman-2.7.2/bindings/openwsman.i.orig openwsman-2.7.2/bindings/openwsman.i
--- openwsman-2.7.2/bindings/openwsman.i.orig 2024-01-22 09:36:42.764721705 +0100
+++ openwsman-2.7.2/bindings/openwsman.i 2024-01-22 09:37:29.970817151 +0100
@@ -109,7 +109,7 @@ SWIGINTERNINLINE SV *SWIG_From_double S
%typemap(in) FILE* {
#if RUBY_VERSION > 18
- struct rb_io_t *fptr;
+ struct rb_io *fptr;
#else
struct OpenFile *fptr;
#endif
+46 -18
View File
@@ -24,8 +24,8 @@
%endif
Name: openwsman
Version: 2.7.1
Release: 14%{?dist}
Version: 2.7.2
Release: 11%{?dist}
Summary: Open source Implementation of WS-Management
License: BSD-3-Clause AND MIT
@@ -49,8 +49,7 @@ Patch2: openwsman-2.4.12-ruby-binding-build.patch
Patch3: openwsman-2.6.2-openssl-1.1-fix.patch
Patch4: openwsman-2.6.5-http-status-line.patch
Patch5: openwsman-2.6.8-update-ssleay-conf.patch
Patch6: openwsman-2.7.1-http-unauthorized-improve.patch
Patch7: openwsman-2.7.1-fix-ruby-bindings-for-swig-41.patch
Patch6: openwsman-2.7.2-fix-ftbfs.patch
BuildRequires: make
BuildRequires: swig
BuildRequires: libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
@@ -78,7 +77,7 @@ requirements that exposes a set of operations focused on and covers
all system management aspects.
%package -n libwsman1
License: BSD
License: BSD-3-Clause AND MIT
Summary: Open source Implementation of WS-Management
Provides: %{name} = %{version}-%{release}
Obsoletes: %{name} < %{version}-%{release}
@@ -87,7 +86,7 @@ Obsoletes: %{name} < %{version}-%{release}
Openwsman library for packages dependent on openwsman.
%package -n libwsman-devel
License: BSD
License: BSD-3-Clause AND MIT
Summary: Open source Implementation of WS-Management
Provides: %{name}-devel = %{version}-%{release}
Obsoletes: %{name}-devel < %{version}-%{release}
@@ -101,14 +100,14 @@ Requires: libcurl-devel
Development files for openwsman.
%package client
License: BSD
License: BSD-3-Clause AND MIT
Summary: Openwsman Client libraries
%description client
Openwsman Client libraries.
%package server
License: BSD
License: BSD-3-Clause AND MIT
Summary: Openwsman Server and service libraries
Requires: libwsman1 = %{version}-%{release}
%if 0%{?with_selinux}
@@ -122,7 +121,7 @@ Openwsman Server and service libraries.
%if %{with_python}
%package python3
License: BSD
License: BSD-3-Clause AND MIT
Summary: Python bindings for openwsman client API
Requires: %{__python3}
Requires: libwsman1 = %{version}-%{release}
@@ -134,7 +133,7 @@ This package provides Python3 bindings to access the openwsman client API.
%if %{with_ruby}
%package -n rubygem-%{gem_name}
License: BSD
License: BSD-3-Clause AND MIT
Summary: Ruby client bindings for Openwsman
Obsoletes: %{name}-ruby < %{version}-%{release}
Requires: libwsman1 = %{version}-%{release}
@@ -154,7 +153,7 @@ Documentation for rubygem-%{gem_name}
%if %{with_perl}
%package perl
License: BSD
License: BSD-3-Clause AND MIT
Summary: Perl bindings for openwsman client API
Requires: libwsman1 = %{version}-%{release}
@@ -187,13 +186,7 @@ Custom SELinux policy module
%prep
%setup -q
%patch1 -p1 -b .pamsetup
%patch2 -p1 -b .ruby-binding-build
%patch3 -p1 -b .openssl-1.1-fix
%patch4 -p1 -b .http-status-line
%patch5 -p1 -b .update-ssleay-conf
%patch6 -p1 -b .http-unauthorized-improve
%patch7 -p1 -b .fix-ruby-bindings-for-swig-41
%autopatch -p1
%build
# Removing executable permissions on .c and .h files to fix rpmlint warnings.
@@ -415,6 +408,41 @@ fi
%endif
%changelog
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Jun 25 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.7.2-10
- Rebuild
Resolves: #2290726
* Tue Jun 18 2024 Python Maint <python-maint@redhat.com> - 2.7.2-9
- Rebuilt for Python 3.13
* Wed Jun 12 2024 Jitka Plesnikova <jplesnik@redhat.com> - 2.7.2-8
- Perl 5.40 rebuild
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 2.7.2-7
- Rebuilt for Python 3.13
* Fri May 10 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.7.2-6
- Update license tags in subpackages to SPDX format
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.7.2-4
- Fix FTBFS
Resolves: #2259165
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 03 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.7.2-2
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3
* Thu Aug 31 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.7.2-1
- Update to openwsman-2.7.2
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+1 -1
View File
@@ -1,2 +1,2 @@
SHA512 (openwsmand.8.gz) = 751c40060781e8b5a847e09aee94833ed1e4fbe966f052e5023cb209361acc312078d0d75c0806bd9990da061d3048566418135d3670dd620c6b809e5d0e594c
SHA512 (v2.7.1.tar.gz) = 37738bc5be7b1c3fa961587fca4db74b8e7714fc0641a550682275fbe925b2c8e18a683cf493f4740e479f7461cc98392d3d675f4769f5cf04e7249f1e9ee880
SHA512 (v2.7.2.tar.gz) = ffd6a0d00a00b00e321b2b55e0c77326f5943ca3224eee74c706e53a1c5c44ef0e8b1cfde5d631966769eefd4e567b0db8713085b7a8b386c2871ab4ada83046