From 0415cca25819b320402f5e588533384f1283ea17 Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Mon, 24 Jul 2023 14:02:06 +0200 Subject: [PATCH] re-import sources as agreed with the maintainer --- .gitignore | 2 - openwsman-2.6.2-python3.patch | 179 ++++++++++++++++++++++++++++++++++ openwsman.spec | 8 +- 3 files changed, 183 insertions(+), 6 deletions(-) create mode 100644 openwsman-2.6.2-python3.patch diff --git a/.gitignore b/.gitignore index 8d89b06..77b5874 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -SOURCES/openwsmand.8.gz -SOURCES/v2.6.5.tar.gz /openwsmand.8.gz /v2.6.5.tar.gz diff --git a/openwsman-2.6.2-python3.patch b/openwsman-2.6.2-python3.patch new file mode 100644 index 0000000..3dcf3a0 --- /dev/null +++ b/openwsman-2.6.2-python3.patch @@ -0,0 +1,179 @@ +diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/CMakeLists.txt.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/CMakeLists.txt +--- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/CMakeLists.txt.orig 2016-07-27 16:03:55.000000000 +0200 ++++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/CMakeLists.txt 2017-01-16 14:08:53.201529586 +0100 +@@ -10,6 +10,7 @@ include_directories(${CMAKE_BINARY_DIR}) + + IF( BUILD_PYTHON ) + add_subdirectory(python) ++add_subdirectory(python3) + ENDIF( BUILD_PYTHON ) + + IF( BUILD_RUBY ) +diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python3/CMakeLists.txt.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python3/CMakeLists.txt +--- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python3/CMakeLists.txt.orig 2017-01-16 14:08:09.000000000 +0100 ++++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python3/CMakeLists.txt 2017-01-16 14:10:48.945480021 +0100 +@@ -12,11 +12,28 @@ enable_testing() + + add_subdirectory(tests) + +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_DIR) +-STRING(REPLACE "\n" "" PYTHON_LIB_DIR "${PYTHON_LIB_DIR}") ++MESSAGE(STATUS "Python3 build:") ++unset(Python_ADDITIONAL_VERSIONS) ++set(Python_ADDITIONAL_VERSIONS 3.5) ++FIND_PACKAGE(PythonLibs) ++IF (PYTHON_LIBRARY) ++ FIND_PACKAGE(PythonInterp REQUIRED) ++ #MESSAGE(STATUS "Found PythonLibs...") ++ FIND_PACKAGE(PythonLinkLibs) ++ #IF (PYTHON_LINK_LIBS) ++ # MESSAGE(STATUS "Building Python...") ++ #ENDIF (PYTHON_LINK_LIBS) ++ENDIF (PYTHON_LIBRARY) ++ ++set(PYTHON3_EXECUTABLE "${PYTHON_EXECUTABLE}") ++set(PYTHON3_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS}") ++set({PYTHON3_INCLUDE_PATH "${PYTHON_INCLUDE_PATH}") + +-MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") +-MESSAGE(STATUS "Python lib dir: ${PYTHON_LIB_DIR}") ++EXECUTE_PROCESS(COMMAND ${PYTHON3_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))" OUTPUT_VARIABLE PYTHON3_LIB_DIR) ++STRING(REPLACE "\n" "" PYTHON3_LIB_DIR "${PYTHON3_LIB_DIR}") ++ ++MESSAGE(STATUS "Python executable: ${PYTHON3_EXECUTABLE}") ++MESSAGE(STATUS "Python lib dir: ${PYTHON3_LIB_DIR}") + + SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/openwsman_wrap.c" ) + +@@ -36,14 +53,14 @@ SET(pywsman_SRCS ${SWIG_OUTPUT} ${CMAKE_ + ADD_LIBRARY( pywsman SHARED ${pywsman_SRCS} ) + SET_TARGET_PROPERTIES( pywsman PROPERTIES PREFIX "_" ) + +-INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} ) ++INCLUDE_DIRECTORIES( ${PYTHON3_INCLUDE_DIRS} ) + # RHEL5 needs this: +-INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} ) ++INCLUDE_DIRECTORIES( ${PYTHON3_INCLUDE_PATH} ) + INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) + INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/bindings ${CMAKE_SOURCE_DIR}/include ) + + TARGET_LINK_LIBRARIES( pywsman wsman ) + TARGET_LINK_LIBRARIES( pywsman wsman_client ) + +-INSTALL(TARGETS pywsman LIBRARY DESTINATION ${PYTHON_LIB_DIR}) +-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pywsman.py DESTINATION ${PYTHON_LIB_DIR} ) ++INSTALL(TARGETS pywsman LIBRARY DESTINATION ${PYTHON3_LIB_DIR}) ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pywsman.py DESTINATION ${PYTHON3_LIB_DIR} ) +diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python/CMakeLists.txt.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python/CMakeLists.txt +--- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python/CMakeLists.txt.orig 2016-07-27 16:03:55.000000000 +0200 ++++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python/CMakeLists.txt 2017-01-16 14:12:51.954427345 +0100 +@@ -12,11 +12,52 @@ enable_testing() + + add_subdirectory(tests) + +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_DIR) +-STRING(REPLACE "\n" "" PYTHON_LIB_DIR "${PYTHON_LIB_DIR}") ++MESSAGE(STATUS "Python2 build:") ++set(Python_ADDITIONAL_VERSIONS 2.7) ++FIND_PACKAGE(PythonLibs) ++IF (PYTHON_LIBRARY) ++ FIND_PACKAGE(PythonInterp REQUIRED) ++ #MESSAGE(STATUS "Found PythonLibs...") ++ FIND_PACKAGE(PythonLinkLibs) ++ #IF (PYTHON_LINK_LIBS) ++ # MESSAGE(STATUS "Building Python...") ++ #ENDIF (PYTHON_LINK_LIBS) ++ENDIF (PYTHON_LIBRARY) ++ ++set(PYTHON2_EXECUTABLE "${PYTHON_EXECUTABLE}") ++set(PYTHON2_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS}") ++set(PYTHON2_INCLUDE_PATH "${PYTHON_INCLUDE_PATH}") ++ ++# clear FIND_PACKAGE(PythonLibs) side effects ++unset(PYTHONLIBS_FOUND) ++unset(PYTHON_LIBRARIES) ++unset(PYTHON_INCLUDE_PATH) ++unset(PYTHON_INCLUDE_DIRS) ++unset(PYTHON_DEBUG_LIBRARIES) ++unset(PYTHONLIBS_VERSION_STRING) ++unset(PYTHON_DEBUG_LIBRARY CACHE) ++unset(PYTHON_LIBRARY) ++unset(PYTHON_LIBRARY_DEBUG) ++unset(PYTHON_LIBRARY_RELEASE) ++unset(PYTHON_LIBRARY CACHE) ++unset(PYTHON_LIBRARY_DEBUG CACHE) ++unset(PYTHON_LIBRARY_RELEASE CACHE) ++unset(PYTHON_INCLUDE_DIR CACHE) ++unset(PYTHON_INCLUDE_DIR2 CACHE) ++ ++# clear FIND_PACKAGE(PythonInterp) side effects ++unset(PYTHONINTERP_FOUND) ++unset(PYTHON_EXECUTABLE CACHE) ++unset(PYTHON_VERSION_STRING) ++unset(PYTHON_VERSION_MAJOR) ++unset(PYTHON_VERSION_MINOR) ++unset(PYTHON_VERSION_PATCH) + +-MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") +-MESSAGE(STATUS "Python lib dir: ${PYTHON_LIB_DIR}") ++EXECUTE_PROCESS(COMMAND ${PYTHON2_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" OUTPUT_VARIABLE PYTHON2_LIB_DIR) ++STRING(REPLACE "\n" "" PYTHON2_LIB_DIR "${PYTHON2_LIB_DIR}") ++ ++MESSAGE(STATUS "Python executable: ${PYTHON2_EXECUTABLE}") ++MESSAGE(STATUS "Python lib dir: ${PYTHON2_LIB_DIR}") + + SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/openwsman_wrap.c" ) + +@@ -36,14 +77,14 @@ SET(pywsman_SRCS ${SWIG_OUTPUT} ${CMAKE_ + ADD_LIBRARY( pywsman SHARED ${pywsman_SRCS} ) + SET_TARGET_PROPERTIES( pywsman PROPERTIES PREFIX "_" ) + +-INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} ) ++INCLUDE_DIRECTORIES( ${PYTHON2_INCLUDE_DIRS} ) + # RHEL5 needs this: +-INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} ) ++INCLUDE_DIRECTORIES( ${PYTHON2_INCLUDE_PATH} ) + INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) + INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/bindings ${CMAKE_SOURCE_DIR}/include ) + + TARGET_LINK_LIBRARIES( pywsman wsman ) + TARGET_LINK_LIBRARIES( pywsman wsman_client ) + +-INSTALL(TARGETS pywsman LIBRARY DESTINATION ${PYTHON_LIB_DIR}) +-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pywsman.py DESTINATION ${PYTHON_LIB_DIR} ) ++INSTALL(TARGETS pywsman LIBRARY DESTINATION ${PYTHON2_LIB_DIR}) ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pywsman.py DESTINATION ${PYTHON2_LIB_DIR} ) +diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/CMakeLists.txt.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/CMakeLists.txt +--- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/CMakeLists.txt.orig 2016-07-27 16:03:55.000000000 +0200 ++++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/CMakeLists.txt 2017-01-16 14:13:37.300407926 +0100 +@@ -175,30 +175,6 @@ MESSAGE(STATUS "Building Ruby bindings" + ENDIF(NOT RUBY_INCLUDE_PATH ) + ENDIF( BUILD_RUBY ) + +-IF( BUILD_PYTHON ) +- MESSAGE(STATUS "Building Python bindings" ) +- FIND_PACKAGE(PythonLibs 2.6 REQUIRED) +- IF (PYTHON_LIBRARY) +- FIND_PACKAGE(PythonInterp 2.6 REQUIRED) +- MESSAGE(STATUS "Found PythonLibs...") +- FIND_PACKAGE(PythonLinkLibs) +- IF (PYTHON_LINK_LIBS) +- MESSAGE(STATUS "Building Python...") +- ENDIF (PYTHON_LINK_LIBS) +- ENDIF (PYTHON_LIBRARY) +- IF(NOT PYTHON_INCLUDE_DIRS ) +- # fallback for older versions of cmake +- SET(PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_PATH) +- ENDIF(NOT PYTHON_INCLUDE_DIRS ) +- IF(NOT PYTHON_INCLUDE_DIRS ) +- IF(BUILD_PYTHON_EXPLICIT) +- NO_HEADERS_WARNING_EXPL(BUILD_PYTHON Python) +- ELSE(BUILD_PYTHON_EXPLICIT) +- NO_HEADERS_WARNING(BUILD_PYTHON Python) +- ENDIF(BUILD_PYTHON_EXPLICIT) +- ENDIF(NOT PYTHON_INCLUDE_DIRS ) +-ENDIF( BUILD_PYTHON ) +- + IF( BUILD_PERL ) + INCLUDE(FindPerl) + IF(PERL_EXECUTABLE) diff --git a/openwsman.spec b/openwsman.spec index 6de7727..75f05b7 100644 --- a/openwsman.spec +++ b/openwsman.spec @@ -289,13 +289,13 @@ rm -f /var/log/wsmand.log %{_bindir}/winrs %changelog -* Tue Sep 20 2022 Vitezslav Crhonek - 2.6.5-9 -- Rebuild - Related: #2124894 +* Tue Feb 14 2023 Vitezslav Crhonek - 2.6.5-9 +- Add rpminspect.yaml + Related: #2105315 * Thu Sep 08 2022 Vitezslav Crhonek - 2.6.5-8 - Improve handling of HTTP 401 Unauthorized - Resolves: #2124894 + Resolves: #2105315 * Mon May 11 2020 Vitezslav Crhonek - 2.6.5-7 - Fix CVE-2019-3833