forked from pool/wsmancli
Compare commits
7 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 1689612e52 | |||
|
|
dbf1cc0483 | ||
| bcba6f8fba | |||
| a798ed69dc | |||
| 442ac793c6 | |||
| d9578206f2 | |||
|
|
b728f77d5c |
69
ab8eba36e2ea108ebf4c4942da6d1703706849f4.patch
Normal file
69
ab8eba36e2ea108ebf4c4942da6d1703706849f4.patch
Normal file
@@ -0,0 +1,69 @@
|
||||
commit ab8eba36e2ea108ebf4c4942da6d1703706849f4
|
||||
Author: Klaus Kämpf <kkaempf@gmail.com>
|
||||
Date: Mon Mar 3 19:58:48 2025 +0100
|
||||
|
||||
Add flag to enfore https transport scheme
|
||||
|
||||
https could only be choosen if a client certificate (cainfo) was
|
||||
passed, resulting in problems like #18
|
||||
|
||||
This adds a `--https` option enforcing https transport even in absence
|
||||
of certificate information.
|
||||
|
||||
Fixes #18
|
||||
|
||||
Signed-off-by: Klaus Kämpf <kkaempf@gmail.com>
|
||||
|
||||
diff --git a/ChangeLog b/ChangeLog
|
||||
index af1a121..c68c487 100644
|
||||
--- a/ChangeLog
|
||||
+++ b/ChangeLog
|
||||
@@ -1,3 +1,6 @@
|
||||
+Version 2.8.1
|
||||
+ - add '--https' option to enforce https scheme (issue #16)
|
||||
+
|
||||
Version 2.8.0
|
||||
- fix compatibility with Openwsman 2.8.0
|
||||
- fix compiler warnings
|
||||
diff --git a/configure.in b/configure.in
|
||||
index f2c11b8..ce2fa9f 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -1,6 +1,6 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
|
||||
-AC_INIT(wsmancli, 2.8.0)
|
||||
+AC_INIT(wsmancli, 2.8.1)
|
||||
AC_CONFIG_SRCDIR(wsmancli.spec.in)
|
||||
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
diff --git a/src/wsman.c b/src/wsman.c
|
||||
index 961677a..6abf2ed 100644
|
||||
--- a/src/wsman.c
|
||||
+++ b/src/wsman.c
|
||||
@@ -86,6 +86,7 @@ static char *proxy_upwd = NULL;
|
||||
|
||||
|
||||
static long int non_interactive = 0;
|
||||
+static long int use_https = 0;
|
||||
static long int debug_level = -1;
|
||||
static char *encoding = NULL;
|
||||
static char *test_case = NULL;
|
||||
@@ -195,6 +196,8 @@ static char wsman_parse_options(int argc, char **argv)
|
||||
u_option_entry_t options[] = {
|
||||
{"non-interactive", 0, U_OPTION_ARG_NONE, &non_interactive,
|
||||
"Non interactive mode, don't ask for credentials", NULL},
|
||||
+ {"https", 0, U_OPTION_ARG_NONE, &use_https,
|
||||
+ "Enforce https scheme for transport", NULL},
|
||||
{"version", 'q', U_OPTION_ARG_NONE, &my_version,
|
||||
"Display application version", NULL},
|
||||
{"debug", 'd', U_OPTION_ARG_INT, &debug_level,
|
||||
@@ -783,7 +786,7 @@ int main(int argc, char **argv)
|
||||
cl = wsmc_create(server,
|
||||
server_port,
|
||||
url_path,
|
||||
- cainfo ? "https" : "http",
|
||||
+ (cainfo || use_https) ? "https" : "http",
|
||||
username,
|
||||
password);
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
upstreaming at https://github.com/Openwsman/wsmancli/pull/8
|
||||
|
||||
commit c277ec5217d3aa3748b9420bbdc7f5d4973a010b
|
||||
Author: Bernhard M. Wiedemann <bwiedemann suse.de>
|
||||
Date: Wed Mar 21 15:17:26 2018 +0100
|
||||
|
||||
Use ChangeLog date instead of build date
|
||||
|
||||
in order to make builds reproducible
|
||||
See https://reproducible-builds.org/ for why this is good.
|
||||
|
||||
Index: wsmancli-2.6.0/configure
|
||||
===================================================================
|
||||
--- wsmancli-2.6.0.orig/configure
|
||||
+++ wsmancli-2.6.0/configure
|
||||
@@ -16507,7 +16507,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
WSMAN_PKG=$PACKAGE_NAME
|
||||
|
||||
-PACKAGE_BUILDTS=`date +%Y%m%d%H%M`
|
||||
+PACKAGE_BUILDTS=`date -u -r ChangeLog +%Y%m%d%H%M`
|
||||
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5051eb8b0a0b331411c5f52adcb5cf07bd7fa094ad7723992bd0b7c2c4b3fc70
|
||||
size 299668
|
||||
3
wsmancli-2.8.0.tar.bz2
Normal file
3
wsmancli-2.8.0.tar.bz2
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a0fcb548d3cabf583377df191b534a5d583de6fbcfa9915027b41e43b888f8db
|
||||
size 311447
|
||||
@@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 14 16:20:51 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
|
||||
|
||||
- Use %make_build instead of %jobs (boo#1237231)
|
||||
- touch ChangeLog to negate influence from patch on embedded build date
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 16 11:21:26 UTC 2025 - Adam Majer <adam.majer@suse.de>
|
||||
|
||||
- ab8eba36e2ea108ebf4c4942da6d1703706849f4.patch: fix connecting with TLS
|
||||
(bsc#1237243)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 10 13:43:41 UTC 2024 - Klaus Kämpf <kkaempf@suse.de>
|
||||
|
||||
- Version 2.8.0
|
||||
- fix compatibility with Openwsman 2.8.0
|
||||
- fix compiler warnings
|
||||
|
||||
- drop reproducible.patch, upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 20 15:25:49 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package wsmancli
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -12,7 +12,7 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
@@ -27,14 +27,14 @@ BuildRequires: libcurl-devel
|
||||
# SLE 10
|
||||
BuildRequires: curl-devel
|
||||
%endif
|
||||
Version: 2.6.0
|
||||
Version: 2.8.0
|
||||
Release: 0
|
||||
Url: http://www.openwsman.org/
|
||||
URL: http://www.openwsman.org/
|
||||
Summary: Command line client utilities for WS-Management
|
||||
License: BSD-3-Clause
|
||||
Group: System/Management
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Patch0: reproducible.patch
|
||||
Patch1: ab8eba36e2ea108ebf4c4942da6d1703706849f4.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@@ -46,10 +46,11 @@ the WS-Management protocol.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{version}
|
||||
test -n "$SOURCE_DATE_EPOCH" && touch -d "@$SOURCE_DATE_EPOCH" ChangeLog
|
||||
|
||||
%build
|
||||
%configure --disable-more-warnings
|
||||
make %{?jobs:-j%jobs}
|
||||
%make_build
|
||||
|
||||
%install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
|
||||
Reference in New Issue
Block a user