+++ /dev/null
-Copyright (C) 2019 Wind River Systems, Inc.
-
-Source code included in the tree for individual recipes is under the LICENSE
-stated in the associated recipe (.bb file) unless otherwise stated.
-
-The metadata is under the following license unless otherwise stated.
-
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+++ /dev/null
-meta-starlingx
-=========
-
-Introduction
-------------------------
-
-StarlingX is a complete cloud infrastructure software stack for the edge used by
-the most demanding applications in industrial IOT, telecom, video delivery and
-other ultra-low latency use cases. With deterministic low latency required by
-edge applications, and tools that make distributed edge manageable, StarlingX
-provides a container-based infrastructure for edge implementations in scalable
-solutions that is ready for production now.
-
-For more info on StarlingX See:
-
-https://www.starlingx.io/
-
-This layer enables StarlingX on poky.
-
-Dependencies
--------------------------
-
-This layer depends on:
-
-```
- URI: git://git.openembedded.org/meta-openembedded
- branch: warrior
- revision: HEAD
- layers:
- openembedded-layer
- filesystem-layer
- meta-initramfs
- networking-layer
- perl-layer
- meta-python
- webserver
-
-
- URI: git://git.yoctoproject.org/meta-virtualization
- layer: virtualization-layer
- branch: warrior
- revision: HEAD
-
- URI: git://git.yoctoproject.org/meta-cloud-services
- branch: warrior
- revision: HEAD
- layers: cloud-services-layer
- openstack-layer
-
-
- URI: git://git.yoctoproject.org/meta-intel
- layer: intel
- branch: warrior
- revision: HEAD
-
- URI: git://git.yoctoproject.org/meta-security
- layer: security
- branch: warrior
- revision: HEAD
-
- URI: git://git.yoctoproject.org/meta-selinux
- layer: selinux
- branch: warrior
- revision: HEAD
-
- URI: https://github.com/intel-iot-devkit/meta-iot-cloud.git
- layer: iot-cloud
- branch: warrior
- revision: HEAD
-
- URI: git://git.openembedded.org/meta-python2
- layer: meta-python2
- branch: warrior
- revision: HEAD
-
- URI: https://git.yoctoproject.org/git/meta-dpdk
- layer: dpdk
- branch: warrior
- revision: HEAD
-
- URI: git://git.yoctoproject.org/meta-anaconda
- layer: meta-anaconda
- branch: warrior
- revision: HEAD
-
-```
-You are solely responsible for determining the appropriateness of using or redistributing the above dependencies and assume any risks associated with your exercise of permissions under the license.
-
-Maintenance
--------------------------
-
-Maintainers:
-
-Submit bug reports via launchpad and story board with [MultiOS][Yocto] tags.
-
-- Saul Wold <saul.wold@windriver.com>
-- Jackie Huang <jackie.huang@windriver.com>
-- Babak A. Sarashki <babak.sarashki@windriver.com>
-
-Build:
----------------------------
-
-A build script is found at git@github.com:zbsarashki/staging-stx.git.
-
-Setup Build Environment
----------------------------
-
-Tasks:
-- Setup and Build Runtime image
-- Setup and Build Installer image
-
-Setup and Build Runtime image:
----------------------------
-
-Setup build environment with the following added to the bblayers.conf:
-
-```
-
- ${LAYER_PATH}/layers/poky/meta
- ${LAYER_PATH}/layers/poky/meta-poky
- ${LAYER_PATH}/layers/poky/meta-yocto-bsp
- ${LAYER_PATH}/layers/meta-openembedded/meta-oe
- ${LAYER_PATH}/layers/meta-openembedded/meta-filesystems
- ${LAYER_PATH}/layers/meta-openembedded/meta-initramfs
- ${LAYER_PATH}/layers/meta-openembedded/meta-networking
- ${LAYER_PATH}/layers/meta-openembedded/meta-perl
- ${LAYER_PATH}/layers/meta-openembedded/meta-python
- ${LAYER_PATH}/layers/meta-openembedded/meta-webserver
- ${LAYER_PATH}/layers/meta-openembedded/meta-gnome
- ${LAYER_PATH}/layers/meta-virtualization
- ${LAYER_PATH}/layers/meta-cloud-services
- ${LAYER_PATH}/layers/meta-cloud-services/meta-openstack
- ${LAYER_PATH}/layers/meta-intel
- ${LAYER_PATH}/layers/meta-security
- ${LAYER_PATH}/layers/meta-selinux
- ${LAYER_PATH}/layers/meta-iot-cloud
- ${LAYER_PATH}/layers/meta-python2
- ${LAYER_PATH}/layers/meta-dpdk
- ${LAYER_PATH}/layers/meta-stx/meta-stx-cloud
- ${LAYER_PATH}/layers/meta-stx/meta-stx-distro
- ${LAYER_PATH}/layers/meta-stx/meta-stx-flock
- ${LAYER_PATH}/layers/meta-stx/meta-stx-integ
- ${LAYER_PATH}/layers/meta-stx/meta-stx-virt
- ${LAYER_PATH}/layers/meta-anaconda
-
-```
-
-Edit conf/local.conf and set:
-
-```
-MACHINE = "intel-corei7-64"
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
-IMAGE_FSTYPES = " tar.bz2"
-IMAGE_FSTYPES_remove = " wic"
-IMAGE_FSTYPES_remove = " ext4"
-EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
-EXTRA_IMAGE_FEATURES += "tools-sdk"
-EXTRA_IMAGE_FEATURES += "tools-debug"
-EXTRA_IMAGE_FEATURES += "package-management"
-DISTRO = "poky-stx"
-DISTRO_FEATURES_append = " anaconda-support"
-```
-
-Build target with:
-
-```
-bitbake stx-image-aio
-```
-
-Setup and Build Installer image:
----------------------------
-Setup build environment with the bblayers.conf as in RunTime image.
-
-Edit conf/local.conf and set:
-
-```
-CONF_VERSION = "1"
-DISTRO = 'anaconda'
-MACHINE = "intel-corei7-64"
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
-INSTALLER_TARGET_BUILD = "/<PATH_TO_RUNTIME_STX_PRJ_DIR>/build/"
-INSTALLER_TARGET_IMAGE = "stx-image-aio"
-
-```
-Build installer target with:
-
-```
-bitbake stx-image-installer-aio
-
-```
-
-Use Case:
----------------------------
-
-This layer currently limited to AIO simplex mode has been tested to provision on host as outlined at:
-
-- https://docs.starlingx.io/deploy_install_guides/r3_release/virtual/aio_simplex.html
-- https://docs.starlingx.io/deploy_install_guides/r3_release/bare_metal/aio_simplex.html
-
-License
--------
-Copyright (C) 2019 Wind River Systems, Inc.
-
-Source code included in tree for individual recipes is under the LICENSE
-stated in each recipe (.bb file) unless otherwise stated.
-
-The metadata is under the following license unless otherwise stated.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-# Legal Notices
-
-All product names, logos, and brands are property of their respective owners. All company, product and service names used in this software are for identification purposes only. Wind River is a registered trademarks of Wind River Systems, Inc. Linux is a registered trademark of Linus Torvalds.
-
-Disclaimer of Warranty / No Support: Wind River does not provide support and maintenance services for this software, under Wind River’s standard Software Support and Maintenance Agreement or otherwise. Unless required by applicable law, Wind River provides the software (and each contributor provides its contribution) on an “AS IS” BASIS, WITHOUT WARRANTIES OF ANY KIND, either express or implied, including, without limitation, any warranties of TITLE, NONINFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the software and assume any risks associated with your exercise of permissions under the license.
+++ /dev/null
-
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
- ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "stx-cloud-layer"
-BBFILE_PATTERN_stx-cloud-layer := "^${LAYERDIR}/"
-BBFILE_PRIORITY_stx-cloud-layer = "5"
-
-LAYERDEPENDS_STX_CLOUD = "\
- core \
- dpdk \
- networking-layer \
- openembedded-layer \
- networking-layer \
- filesystems-layer \
- perl-layer \
- meta-python \
- webserver \
- virtualization-layer \
- cloud-services-layer \
- openstack-layer \
-"
-
-# This should only be incremented on significant changes that will
-# cause compatibility issues with other layers
-LAYERVERSION_stx-cloud-version = "1"
-LAYERSERIES_COMPAT_stx-cloud-layer = "thud warrior"
-
-LAYER_PATH_meta-stx-cloud = "${LAYERDIR}"
-
-# Masked recipes:
-BBMASK += "/meta-python2/recipes-core/images/meta-python-ptest-image.bb"
-BBMASK += "/meta-python2/recipes-core/images/meta-python-image-base.bb"
-BBMASK += "/meta-python2/recipes-core/images/meta-python-image.bb"
-BBMASK += "/meta-stak-common/recipes-containers/kubernetes/kubernetes_git.bbappend"
-BBMASK += "/meta-cloud-services/meta-openstack/recipes-devtools/python/python-cephclient_0.1.0.5.bb"
-BBMASK += "/meta-openstack/recipes-devtools/qemu/qemu_2.%.bbappend"
-BBMASK += "/meta-cloud-services/meta-openstack/recipes-kernel/linux/linux-yocto_4.18.bbappend"
-BBMASK += "/meta-selinux/recipes-graphics/mesa/mesa_%.bbappend"
-BBMASK += "/meta-virtualization/recipes-containers/docker-distribution/docker-distribution_git.bb"
-BBMASK += "/meta-starlingX/recipes-containers/docker-distribution/docker-distribution_git.bbappend"
-BBMASK += "/meta-starlingX/recipes-support/puppet/puppetlabs-stdlib_git.bbappend"
+++ /dev/null
-diff -urN qpidc-0.20.orig/configure.ac qpidc-0.20/configure.ac
---- qpidc-0.20.orig/configure.ac 2019-08-19 13:36:13.592214698 +0800
-+++ qpidc-0.20/configure.ac 2019-08-19 13:36:29.160214501 +0800
-@@ -75,7 +75,7 @@
- # Can't test for -Werror as whether it fails or not depends on what's in
- # CFLAGS/CXXFLAGS. In any case it's been in gcc for a long time (since 2.95 at least)
- if test "${enableval}" = yes; then
-- COMPILER_FLAGS="-Werror"
-+ COMPILER_FLAGS=""
- gl_COMPILER_FLAGS(-pedantic)
- gl_COMPILER_FLAGS(-Wall)
- gl_COMPILER_FLAGS(-Wextra)
+++ /dev/null
-diff -urN qpid-proton-0.28.0~/CMakeLists.txt qpid-proton-0.28.0/CMakeLists.txt
---- qpid-proton-0.28.0~/CMakeLists.txt 2019-08-20 15:03:13.807056363 +0800
-+++ qpid-proton-0.28.0/CMakeLists.txt 2019-08-21 11:15:26.282136822 +0800
-@@ -222,15 +222,6 @@
- # So make these cached variables and the specific variables non cached
- # and derived from them.
-
--if (NOT DEFINED LIB_SUFFIX)
-- get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-- if ("${LIB64}" STREQUAL "TRUE" AND ${CMAKE_SIZEOF_VOID_P} STREQUAL "8")
-- set(LIB_SUFFIX 64)
-- else()
-- set(LIB_SUFFIX "")
-- endif()
--endif()
--
- # Start of variables used during install
- set (INCLUDE_INSTALL_DIR include CACHE PATH "Include file directory")
- set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Library object file directory")
-@@ -354,7 +345,7 @@
- # DEFAULT_{uppercase name of binding} to ON
-
- # Prerequisites for Python wrapper:
-- find_package (PythonLibs ${PYTHON_VERSION_STRING} EXACT)
-+ find_package (PythonLibs 2.7 REQUIRED)
- # TODO aconway 2018-09-07: get python binding tests working with sanitizers
- if (PYTHONLIBS_FOUND AND NOT SANITIZE_FLAGS)
- set (DEFAULT_PYTHON ON)
-@@ -393,10 +384,6 @@
-
- unset(BUILD_BINDINGS CACHE) # Remove from cache, only relevant when creating the initial cache.
-
--install (FILES LICENSE.txt README.md tests/share/CMakeLists.txt DESTINATION ${PROTON_SHARE})
--install (FILES tests/share/examples-README.md RENAME README.md DESTINATION ${PROTON_SHARE}/examples)
--install (DIRECTORY tests DESTINATION ${PROTON_SHARE} PATTERN share EXCLUDE)
--
- # Generate test environment settings
- configure_file(${CMAKE_SOURCE_DIR}/misc/config.sh.in
- ${CMAKE_BINARY_DIR}/config.sh @ONLY)
-diff -urN qpid-proton-0.28.0~/cpp/CMakeLists.txt qpid-proton-0.28.0/cpp/CMakeLists.txt
---- qpid-proton-0.28.0~/cpp/CMakeLists.txt 2019-08-20 15:03:13.763056364 +0800
-+++ qpid-proton-0.28.0/cpp/CMakeLists.txt 2019-08-20 15:06:51.195053615 +0800
-@@ -269,7 +269,7 @@
-
- macro(add_cpp_test test)
- add_executable (${test} src/${test}.cpp)
-- target_link_libraries (${test} qpid-proton-cpp ${PLATFORM_LIBS})
-+ target_link_libraries (${test} qpid-proton-cpp qpid-proton-core qpid-proton-proactor ${PLATFORM_LIBS})
- add_test (NAME cpp-${test}
- COMMAND ${PN_ENV_SCRIPT} -- ${test_env} ${TEST_EXE_PREFIX_CMD} $<TARGET_FILE:${test}> ${ARGN})
- endmacro(add_cpp_test)
-@@ -287,7 +287,7 @@
- add_cpp_test(credit_test)
- if (ENABLE_JSONCPP)
- add_cpp_test(connect_config_test)
-- target_link_libraries(connect_config_test qpid-proton-core) # For pn_sasl_enabled
-+ target_link_libraries(connect_config_test qpid-proton-core qpid-proton-proactor) # For pn_sasl_enabled
- set_tests_properties(cpp-connect_config_test PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
- # Test data and output directories for connect_config_test
- file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/testdata" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-@@ -300,7 +300,7 @@
-
- include_directories(${CMAKE_SOURCE_DIR}/tests/include)
- add_executable(cpp-test src/cpp-test.cpp src/url_test.cpp)
--target_link_libraries(cpp-test qpid-proton-cpp ${PLATFORM_LIBS})
-+target_link_libraries(cpp-test qpid-proton-cpp qpid-proton-core qpid-proton-proactor ${PLATFORM_LIBS})
-
- macro(add_catch_test tag)
- add_test (
-diff -urN qpid-proton-0.28.0~/cpp/examples/CMakeLists.txt qpid-proton-0.28.0/cpp/examples/CMakeLists.txt
---- qpid-proton-0.28.0~/cpp/examples/CMakeLists.txt 2019-08-20 15:03:13.767056363 +0800
-+++ qpid-proton-0.28.0/cpp/examples/CMakeLists.txt 2019-08-20 15:26:18.731038854 +0800
-@@ -82,6 +82,7 @@
- ssl_client_cert
- encode_decode)
- add_executable(${example} ${example}.cpp)
-+ target_link_libraries(${example} ${CMAKE_THREAD_LIBS_INIT} qpid-proton-core qpid-proton-proactor)
- endforeach()
-
- if(HAS_ENOUGH_CPP11)
-@@ -90,6 +91,7 @@
- scheduled_send
- service_bus)
- add_executable(${example} ${example}.cpp)
-+ target_link_libraries(${example} ${CMAKE_THREAD_LIBS_INIT} qpid-proton-core qpid-proton-proactor)
- endforeach()
-
- # Examples that use threads directly
-@@ -98,7 +100,7 @@
- multithreaded_client
- multithreaded_client_flow_control)
- add_executable(${example} ${example}.cpp)
-- target_link_libraries(${example} ${CMAKE_THREAD_LIBS_INIT})
-+ target_link_libraries(${example} ${CMAKE_THREAD_LIBS_INIT} qpid-proton-core qpid-proton-proactor)
- endforeach()
- endif()
- endif()
+++ /dev/null
-
-DESCRIPTION = "Qpid Proton is a high-performance, lightweight messaging library."
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b26578452df1dcf3b9a63978282b72d0"
-
-SRC_URI = "http://archive.apache.org/dist/qpid/proton/0.28.0/qpid-proton-0.28.0.tar.gz \
- file://fix-missing-libary-for-cpp-binding.patch \
- "
-
-SRC_URI[sha256sum] = "224e599a4e965a016087b6ce683e55ca918493e12cdd6d91dac1c17d64a7dafe"
-
-DEPENDS= "openssl swig-native python"
-
-inherit cmake pkgconfig
-
-EXTRA_OECMAKE = "-DCMAKE_INSTALL_PREFIX=/usr -DSYSINSTALL_BINDINGS=ON -DPYTHON_EXECUTABLE=`which python`"
-BBCLASSEXTEND =+ " native"
-
-PACKAGES =+ "\
- ${PN}-cpp \
- python-${PN} \
- "
-
-#FILES_qpid-proton-c = "${libdir}/libqpid-proton.so.*"
-#FILES_qpid-proton-c += "{libdir}/libqpid-proton-core.so.*"
-#FILES_qpid-proton-c += "${libdir}/libbqpid-proton-proactor.so.*"
-
-FILES_qpid-proton-cpp = "${libdir}/libqpid-proton-cpp.so.*"
-FILES_python-${PN} = "${libdir}/python*"
-
-RPROVIDES_${PN} = "qpid-proton-c"
-
-do_install_append() {
- rm -fr ${D}/usr/share
-}
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += "file://fix-compile-through-disable-cflag-werror.patch"
-
-
-EXTRA_OEMAKE += " CPPFLAGS='-std=gnu++98 -Wno-error' LDFLAGS='-std=gnu++98 -Wno-error'"
-TARGET_CC_ARCH += "${LDFLAGS}"
-RDEPENDS_${PN} += " bash"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-# erlang < 20.0 is not compatibel with OpenSSL 1.1.x
-inherit openssl10
-DEPENDS_append = " openssl-native"
-
-SRC_URI += "file://erts-configure.in-avoid-RPATH-warning.patch"
-
-EXTRA_OECONF = '--with-ssl=${STAGING_DIR_NATIVE}/usr --without-krb5 --without-zlib'
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-# erlang < 20.0 is not compatibel with OpenSSL 1.1.x
-inherit openssl10
-
-SRC_URI += " \
- file://fix-install-ownership.patch \
- "
-
-EXTRA_OECONF = '--with-ssl=${STAGING_DIR_TARGET}/usr --without-krb5 --without-zlib'
-
-do_configure_prepend () {
- export erl_xcomp_sysroot="${STAGING_DIR_HOST}/usr"
- export erl_xcomp_isysroot="${STAGING_DIR_NATIVE}"
-
- sed -i -e 's/opensslconf.h/opensslconf-64.h/' \
- ${STAGING_INCDIR}/openssl10/openssl/rc4.h \
- ${STAGING_INCDIR}/openssl10/openssl/rc2.h
-}
-
-do_install_append () {
- # Fix the do_package_qa issue
- chown -R root:root ${D}
-}
+++ /dev/null
-From fe07e40ed72021225fce05dc1557fd83200d4506 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 23 Mar 2020 13:00:10 +0800
-Subject: [PATCH] erts/configure.in: avoid RPATH warning
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- erts/configure | 2 +-
- erts/configure.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/erts/configure b/erts/configure
-index 6940143..a70d5a3 100755
---- a/erts/configure
-+++ b/erts/configure
-@@ -37534,7 +37534,7 @@ fi
-
-
-
--std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl"
-+std_ssl_locations="/usr/local /usr/sfw /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl"
-
-
- # Check whether --with-ssl-zlib or --without-ssl-zlib was given.
-diff --git a/erts/configure.in b/erts/configure.in
-index da4bf65..82e7d54 100644
---- a/erts/configure.in
-+++ b/erts/configure.in
-@@ -3843,7 +3843,7 @@ AC_SUBST(STATIC_KERBEROS_LIBS)
- AC_SUBST(SSL_LINK_WITH_ZLIB)
- AC_SUBST(STATIC_ZLIB_LIBS)
-
--std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl"
-+std_ssl_locations="/usr/local /usr/sfw /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl"
-
- AC_ARG_WITH(ssl-zlib,
- AS_HELP_STRING([--with-ssl-zlib=PATH],
---
-2.7.4
-
+++ /dev/null
-diff -Nurpd a/lib/kernel/examples/Makefile b/lib/kernel/examples/Makefile
---- a/lib/kernel/examples/Makefile 2020-03-01 18:17:45.600815403 +0000
-+++ b/lib/kernel/examples/Makefile 2020-03-01 18:18:31.148911639 +0000
-@@ -49,6 +49,6 @@ EXAMPLES = uds_dist
- release_spec:
- $(INSTALL_DIR) "$(RELSYSDIR)"
- tar cf - $(EXAMPLES) | \
-- (cd "$(RELSYSDIR)"; tar xf - ; chmod -R ug+w $(EXAMPLES) )
-+ (cd "$(RELSYSDIR)"; tar --no-same-owner -xf - ; chmod -R ug+w $(EXAMPLES) )
-
- release_docs_spec:
+++ /dev/null
-From bdbcd8615e1720b4098296752a2f4273a0947a8d Mon Sep 17 00:00:00 2001
-From: Daniel Badea <daniel.badea@windriver.com>
-Date: Tue, 6 Sep 2016 15:09:39 +0000
-Subject: [PATCH] CGTS-2869 close connection on HTTP 413 Request Entity Too
- Large
-
-Discard request body in case it's too large: close connection
-wile request is in progress.
----
- eventlet/wsgi.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/eventlet/wsgi.py b/eventlet/wsgi.py
-index 6af2b99..8eac966 100644
---- a/eventlet/wsgi.py
-+++ b/eventlet/wsgi.py
-@@ -525,6 +525,8 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler):
- finally:
- if hasattr(result, 'close'):
- result.close()
-+ if str(status_code[0]) == '413':
-+ self.close_connection = 1
- request_input = self.environ['eventlet.input']
- if (request_input.chunked_input or
- request_input.position < (request_input.content_length or 0)):
---
-1.8.3.1
-
+++ /dev/null
-From 1efb4cc41494201f6773ce2e92a562c96708dcb7 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Wed, 26 May 2021 14:17:07 +0800
-Subject: [PATCH] crypto.py: allow the constraint value to be lower case
-
-Upstream-Status: Inappropriate [poky-stx specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- lib/ansible/module_utils/crypto.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/ansible/module_utils/crypto.py b/lib/ansible/module_utils/crypto.py
-index 9b579a8..550ec26 100644
---- a/lib/ansible/module_utils/crypto.py
-+++ b/lib/ansible/module_utils/crypto.py
-@@ -1813,9 +1813,9 @@ def cryptography_get_basic_constraints(constraints):
- if constraints:
- for constraint in constraints:
- if constraint.startswith('CA:'):
-- if constraint == 'CA:TRUE':
-+ if constraint == 'CA:TRUE' or constraint == 'CA:true':
- ca = True
-- elif constraint == 'CA:FALSE':
-+ elif constraint == 'CA:FALSE' or constraint == 'CA:false':
- ca = False
- else:
- raise OpenSSLObjectError('Unknown basic constraint value "{0}" for CA'.format(constraint[3:]))
---
-2.7.4
-
+++ /dev/null
-Index: keyring-5.3/keyring/backends/file.py
-===================================================================
---- keyring-5.3.orig/keyring/backends/file.py
-+++ keyring-5.3/keyring/backends/file.py
-@@ -68,6 +68,9 @@ class BaseKeyring(FileBacked, KeyringBac
- service = escape_for_ini(service)
- username = escape_for_ini(username)
-
-+ # ensure the file exists
-+ self._ensure_file_path()
-+
- # load the passwords from the file
- config = configparser.RawConfigParser()
- if os.path.exists(self.file_path):
-@@ -146,12 +149,16 @@ class BaseKeyring(FileBacked, KeyringBac
- user_read_write = 0o644
- os.chmod(self.file_path, user_read_write)
- if not os.path.isfile(lockdir + "/" + lockfile):
-- import stat
-- with open(lockdir + "/" + lockfile, 'w'):
-- pass
-- # must have the lock file with the correct group permissisions g+rw
-- os.chmod(lockdir + "/" + lockfile, stat.S_IRWXG | stat.S_IRWXU)
-- os.chown(lockdir + "/" + lockfile,-1,345)
-+ with open(lockdir + "/" + lockfile, 'w'):
-+ pass
-+ if os.path.isfile(lockdir + "/" + lockfile):
-+ import stat
-+ import grp
-+ if oct(stat.S_IMODE(os.stat(lockdir + "/" + lockfile).st_mode)) != '0770':
-+ # Must have the lock file with the correct group and permissisions g+rw
-+ os.chmod(lockdir + "/" + lockfile, stat.S_IRWXG | stat.S_IRWXU)
-+ groupinfo = grp.getgrnam('sys_protected')
-+ os.chown(lockdir + "/" + lockfile,-1,groupinfo.gr_gid)
-
-
- def delete_password(self, service, username):
+++ /dev/null
-Index: keyring-5.3/keyring/backends/file.py
-===================================================================
---- keyring-5.3.orig/keyring/backends/file.py
-+++ keyring-5.3/keyring/backends/file.py
-@@ -151,6 +151,7 @@ class BaseKeyring(FileBacked, KeyringBac
- pass
- # must have the lock file with the correct group permissisions g+rw
- os.chmod(lockdir + "/" + lockfile, stat.S_IRWXG | stat.S_IRWXU)
-+ os.chown(lockdir + "/" + lockfile,-1,345)
-
-
- def delete_password(self, service, username):
+++ /dev/null
-Index: keyring-5.3/keyring/backends/file.py
-===================================================================
---- keyring-5.3.orig/keyring/backends/file.py
-+++ keyring-5.3/keyring/backends/file.py
-@@ -19,6 +19,8 @@ from ..util.escape import escape as esca
- from oslo_concurrency import lockutils
-
-
-+lockfile = "keyringlock"
-+
- class FileBacked(object):
- @abc.abstractproperty
- def filename(self):
-@@ -104,16 +106,18 @@ class BaseKeyring(FileBacked, KeyringBac
- service = escape_for_ini(service)
- username = escape_for_ini(username)
-
-+ # ensure the file exists
-+ self._ensure_file_path()
-+
- # encrypt the password
- password_encrypted = self.encrypt(password.encode('utf-8'))
- # encode with base64
- password_base64 = base64.encodestring(password_encrypted).decode()
-
-+ lockdir = os.path.dirname(self.file_path)
-
-- with lockutils.lock("keyringlock",external=True,lock_path="/tmp"):
-+ with lockutils.lock(lockfile,external=True,lock_path=lockdir):
-
-- # ensure the file exists
-- self._ensure_file_path()
-
- config = None
- try:
-@@ -159,14 +163,13 @@ class BaseKeyring(FileBacked, KeyringBac
-
-
-
--
--
- def _ensure_file_path(self):
- """
- Ensure the storage path exists.
- If it doesn't, create it with "go-rwx" permissions.
- """
- storage_root = os.path.dirname(self.file_path)
-+ lockdir = storage_root
- if storage_root and not os.path.isdir(storage_root):
- os.makedirs(storage_root)
- if not os.path.isfile(self.file_path):
-@@ -175,13 +178,22 @@ class BaseKeyring(FileBacked, KeyringBac
- pass
- user_read_write = 0o644
- os.chmod(self.file_path, user_read_write)
-+ if not os.path.isfile(lockdir + "/" + lockfile):
-+ import stat
-+ with open(lockdir + "/" + lockfile, 'w'):
-+ pass
-+ # must have the lock file with the correct group permissisions g+rw
-+ os.chmod(lockdir + "/" + lockfile, stat.S_IRWXG | stat.S_IRWXU)
-+
-
- def delete_password(self, service, username):
- """Delete the password for the username of the service.
- """
- service = escape_for_ini(service)
- username = escape_for_ini(username)
-- with lockutils.lock("keyringlock",external=True,lock_path="/tmp"):
-+
-+ lockdir = os.path.dirname(self.file_path)
-+ with lockutils.lock(lockfile,external=True,lock_path=lockdir):
- config = configparser.RawConfigParser()
- if os.path.exists(self.file_path):
- config.read(self.file_path)
-@@ -290,17 +302,6 @@ class EncryptedKeyring(Encrypted, BaseKe
- # set a reference password, used to check that the password provided
- # matches for subsequent checks.
-
-- # try to pre-create the /tmp/keyringlock if it doesn't exist
-- lockfile = "/tmp/keyringlock"
-- if os.geteuid() == 0 and (not os.path.exists(lockfile)):
-- from pwd import getpwnam
-- import stat
-- nonrootuser = "sysadmin"
-- with open(lockfile, 'w'):
-- pass
-- # must have the lock file with the correct group permissisions g+rw
-- os.chmod(lockfile, stat.S_IRWXG | stat.S_IRWXU)
--
-
- self.set_password('keyring-setting', 'password reference',
- 'password reference value')
-@@ -313,9 +314,10 @@ class EncryptedKeyring(Encrypted, BaseKe
- return False
- self._migrate()
-
-+ lockdir = os.path.dirname(self.file_path)
- # lock access to the file_path here, make sure it's not being written
- # to while while we're checking for keyring-setting
-- with lockutils.lock("keyringlock",external=True,lock_path="/tmp"):
-+ with lockutils.lock(lockfile,external=True,lock_path=lockdir):
- config = configparser.RawConfigParser()
- config.read(self.file_path)
- try:
-@@ -325,7 +327,6 @@ class EncryptedKeyring(Encrypted, BaseKe
- )
- except (configparser.NoSectionError, configparser.NoOptionError):
- # The current file doesn't have the keyring-setting, check the backup
-- logging.warning("_check_file: The current file doesn't have the keyring-setting, check the backup")
- if os.path.exists(self.backup_file_path):
- config = configparser.RawConfigParser()
- config.read(self.backup_file_path)
+++ /dev/null
----
- keyring/util/platform_.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/keyring/util/platform_.py
-+++ b/keyring/util/platform_.py
-@@ -2,6 +2,7 @@ from __future__ import absolute_import
-
- import os
- import platform
-+from tsconfig.tsconfig import SW_VERSION
-
- def _settings_root_XP():
- return os.path.join(os.environ['USERPROFILE'], 'Local Settings')
-@@ -19,7 +20,8 @@ def _data_root_Linux():
- Use freedesktop.org Base Dir Specfication to determine storage
- location.
- """
-- fallback = os.path.expanduser('/opt/platform/.keyring/')
-+ keyring_dir = os.path.join('/opt/platform/.keyring', SW_VERSION)
-+ fallback = os.path.expanduser(keyring_dir)
- root = os.environ.get('XDG_DATA_HOME', None) or fallback
- return os.path.join(root, 'python_keyring')
-
+++ /dev/null
-Index: keyring-5.3/keyring/backends/file.py
-===================================================================
---- keyring-5.3.orig/keyring/backends/file.py
-+++ keyring-5.3/keyring/backends/file.py
-@@ -6,6 +6,7 @@ import base64
- import sys
- import json
- import abc
-+import time
-
- from ..py27compat import configparser
-
-@@ -95,14 +96,29 @@ class BaseKeyring(FileBacked, KeyringBac
- config = configparser.RawConfigParser()
- config.read(self.file_path)
-
-+ # obtain lock for the keyring file
-+ lock = ''
-+ i = 60
-+ while i:
-+ if not os.path.isfile('/tmp/.keyringlock'):
-+ lock = open('/tmp/.keyringlock', 'w')
-+ break
-+ else:
-+ time.sleep(0.500)
-+ i=i-1
-+
- # update the keyring with the password
- if not config.has_section(service):
- config.add_section(service)
- config.set(service, username, password_base64)
-
-- # save the keyring back to the file
-- with open(self.file_path, 'w') as config_file:
-- config.write(config_file)
-+ if i:
-+ # save the keyring back to the file
-+ with open(self.file_path, 'w') as config_file:
-+ config.write(config_file)
-+ lock.close()
-+ os.remove('/tmp/.keyringlock')
-+
-
- def _ensure_file_path(self):
- """
+++ /dev/null
-Index: keyring-5.3/keyring/backends/file.py
-===================================================================
---- keyring-5.3.orig/keyring/backends/file.py
-+++ keyring-5.3/keyring/backends/file.py
-@@ -92,10 +92,6 @@ class BaseKeyring(FileBacked, KeyringBac
- # ensure the file exists
- self._ensure_file_path()
-
-- # load the keyring from the disk
-- config = configparser.RawConfigParser()
-- config.read(self.file_path)
--
- # obtain lock for the keyring file
- lock = ''
- i = 60
-@@ -107,15 +103,21 @@ class BaseKeyring(FileBacked, KeyringBac
- time.sleep(0.500)
- i=i-1
-
-- # update the keyring with the password
-- if not config.has_section(service):
-- config.add_section(service)
-- config.set(service, username, password_base64)
-
- if i:
-- # save the keyring back to the file
-+ # Load the keyring from the disk
-+ config = configparser.RawConfigParser()
-+ config.read(self.file_path)
-+
-+ # Update the keyring with the password
-+ if not config.has_section(service):
-+ config.add_section(service)
-+ config.set(service, username, password_base64)
-+
-+ # Save the keyring back to the file
- with open(self.file_path, 'w') as config_file:
- config.write(config_file)
-+
- lock.close()
- os.remove('/tmp/.keyringlock')
-
+++ /dev/null
-diff --git a/keyring/backends/file.py b/keyring/backends/file.py
-index f899880..ef6db1d 100644
---- a/keyring/backends/file.py
-+++ b/keyring/backends/file.py
-@@ -116,7 +116,7 @@ class BaseKeyring(FileBacked, KeyringBackend):
- # create the file without group/world permissions
- with open(self.file_path, 'w'):
- pass
-- user_read_write = 0o600
-+ user_read_write = 0o644
- os.chmod(self.file_path, user_read_write)
-
- def delete_password(self, service, username):
-@@ -172,12 +172,19 @@ class Encrypted(object):
-
- def _get_new_password(self):
- while True:
-- password = getpass.getpass(
-- "Please set a password for your new keyring: ")
-- confirm = getpass.getpass('Please confirm the password: ')
-- if password != confirm:
-- sys.stderr.write("Error: Your passwords didn't match\n")
-- continue
-+#****************************************************************
-+# Forging the Keyring password to allow automation and still keep
-+# the password encoded. TODO to be revisited when Barbican keyring
-+# Will be used with the complete PKI solution
-+#****************************************************************
-+# password = getpass.getpass(
-+# "Please set a password for your new keyring: ")
-+# confirm = getpass.getpass('Please confirm the password: ')
-+# if password != confirm:
-+# sys.stderr.write("Error: Your passwords didn't match\n")
-+# continue
-+ password = "Please set a password for your new keyring: "
-+
- if '' == password.strip():
- # forbid the blank password
- sys.stderr.write("Error: blank passwords aren't allowed.\n")
-@@ -248,8 +255,15 @@ class EncryptedKeyring(Encrypted, BaseKeyring):
- Unlock this keyring by getting the password for the keyring from the
- user.
- """
-- self.keyring_key = getpass.getpass(
-- 'Please enter password for encrypted keyring: ')
-+#****************************************************************
-+# Forging the Keyring password to allow automation and still keep
-+# the password encoded. TODO to be revisited when Barbican keyring
-+# Will be used with the complete PKI solution
-+#****************************************************************
-+# self.keyring_key = getpass.getpass(
-+# 'Please enter password for encrypted keyring: ')
-+ self.keyring_key = "Please set a password for your new keyring: "
-+
- try:
- ref_pw = self.get_password('keyring-setting', 'password reference')
- assert ref_pw == 'password reference value'
-diff --git a/keyring/util/platform_.py b/keyring/util/platform_.py
-index dcdffea..53b9eae 100644
---- a/keyring/util/platform_.py
-+++ b/keyring/util/platform_.py
-@@ -19,7 +19,7 @@ def _data_root_Linux():
- Use freedesktop.org Base Dir Specfication to determine storage
- location.
- """
-- fallback = os.path.expanduser('~/.local/share')
-+ fallback = os.path.expanduser('/opt/platform/.keyring/')
- root = os.environ.get('XDG_DATA_HOME', None) or fallback
- return os.path.join(root, 'python_keyring')
-
+++ /dev/null
----
- keyring/backends/file.py | 85 ++++++++++++++++++++++-------------------------
- 1 file changed, 41 insertions(+), 44 deletions(-)
-
---- a/keyring/backends/file.py
-+++ b/keyring/backends/file.py
-@@ -18,6 +18,7 @@ from ..backend import KeyringBackend
- from ..util import platform_, properties
- from ..util.escape import escape as escape_for_ini
- from oslo_concurrency import lockutils
-+from tempfile import mkstemp
-
-
- lockfile = "keyringlock"
-@@ -102,11 +103,9 @@ class BaseKeyring(FileBacked, KeyringBac
- # encode with base64
- password_base64 = base64.encodestring(password_encrypted).decode()
-
-- lockdir = os.path.dirname(self.file_path)
--
-- with lockutils.lock(lockfile,external=True,lock_path=lockdir):
--
-+ keyringdir = os.path.dirname(self.file_path)
-
-+ with lockutils.lock(lockfile, external=True, lock_path=keyringdir):
- config = None
- try:
- # Load the keyring from the disk
-@@ -121,16 +120,20 @@ class BaseKeyring(FileBacked, KeyringBac
- config.add_section(service)
- config.set(service, username, password_base64)
-
-- # Save the keyring back to the file
-- storage_root = os.path.dirname(self.file_path)
-- tmpfile = "tmpfile.%s" % os.getpid()
-- with open(storage_root + "/" + tmpfile, 'w') as config_file:
-- config.write(config_file)
-- # copy will overwrite but move will not
-- shutil.copy(storage_root + "/" + tmpfile,self.file_path)
-- # wipe out tmpfile here
-- os.remove(storage_root + "/" + tmpfile)
-+ # remove any residual temporary files here
-+ try:
-+ for tmpfile in glob.glob("%s/tmp*" % keyringdir):
-+ os.remove(tmpfile)
-+ except:
-+ logging.warning("_check_file: tmpfile removal failed")
-
-+ # Write the keyring to a temp file, then move the new file
-+ # to avoid overwriting the existing inode
-+ (fd, fname) = mkstemp(dir=keyringdir)
-+ with os.fdopen(fd, "w") as config_file:
-+ config.write(config_file)
-+ os.chmod(fname, os.stat(self.file_path).st_mode)
-+ shutil.move(fname, self.file_path)
-
-
- def _ensure_file_path(self):
-@@ -167,8 +170,8 @@ class BaseKeyring(FileBacked, KeyringBac
- service = escape_for_ini(service)
- username = escape_for_ini(username)
-
-- lockdir = os.path.dirname(self.file_path)
-- with lockutils.lock(lockfile,external=True,lock_path=lockdir):
-+ keyringdir = os.path.dirname(self.file_path)
-+ with lockutils.lock(lockfile, external=True, lock_path=keyringdir):
- config = configparser.RawConfigParser()
- if os.path.exists(self.file_path):
- config.read(self.file_path)
-@@ -177,15 +180,21 @@ class BaseKeyring(FileBacked, KeyringBac
- raise PasswordDeleteError("Password not found")
- except configparser.NoSectionError:
- raise PasswordDeleteError("Password not found")
-- # update the file
-- storage_root = os.path.dirname(self.file_path)
-- tmpfile = "tmpfile.%s" % os.getpid()
-- with open(storage_root + "/" + tmpfile, 'w') as config_file:
-+
-+ # remove any residual temporary files here
-+ try:
-+ for tmpfile in glob.glob("%s/tmp*" % keyringdir):
-+ os.remove(tmpfile)
-+ except:
-+ logging.warning("_check_file: tmpfile removal failed")
-+
-+ # Write the keyring to a temp file, then move the new file
-+ # to avoid overwriting the existing inode
-+ (fd, fname) = mkstemp(dir=keyringdir)
-+ with os.fdopen(fd, "w") as config_file:
- config.write(config_file)
-- # copy will overwrite but move will not
-- shutil.copy(storage_root + "/" + tmpfile,self.file_path)
-- # wipe out tmpfile
-- os.remove(storage_root + "/" + tmpfile)
-+ os.chmod(fname, os.stat(self.file_path).st_mode)
-+ shutil.move(fname, self.file_path)
-
-
- class PlaintextKeyring(BaseKeyring):
-@@ -294,27 +303,15 @@ class EncryptedKeyring(Encrypted, BaseKe
- return False
- self._migrate()
-
-- lockdir = os.path.dirname(self.file_path)
-- # lock access to the file_path here, make sure it's not being written
-- # to while while we're checking for keyring-setting
-- with lockutils.lock(lockfile,external=True,lock_path=lockdir):
-- config = configparser.RawConfigParser()
-- config.read(self.file_path)
-- try:
-- config.get(
-- escape_for_ini('keyring-setting'),
-- escape_for_ini('password reference'),
-- )
-- except (configparser.NoSectionError, configparser.NoOptionError):
-- return False
--
-- # remove any residual temporary files here
-- try:
-- for tmpfile in glob.glob(os.path.dirname(self.file_path) + "/" + "tmpfile.*"):
-- os.remove(tmpfile)
-- except:
-- logging.warning("_check_file: tmpfile removal failed")
--
-+ config = configparser.RawConfigParser()
-+ config.read(self.file_path)
-+ try:
-+ config.get(
-+ escape_for_ini('keyring-setting'),
-+ escape_for_ini('password reference'),
-+ )
-+ except (configparser.NoSectionError, configparser.NoOptionError):
-+ return False
-
- return True
-
+++ /dev/null
----
- keyring/backends/file.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/keyring/backends/file.py
-+++ b/keyring/backends/file.py
-@@ -149,7 +149,7 @@ class BaseKeyring(FileBacked, KeyringBac
- # create the file without group/world permissions
- with open(self.file_path, 'w'):
- pass
-- user_read_write = 0o644
-+ user_read_write = 0o640
- os.chmod(self.file_path, user_read_write)
- if not os.path.isfile(lockdir + "/" + lockfile):
- with open(lockdir + "/" + lockfile, 'w'):
+++ /dev/null
-Index: keyring-5.3/keyring/backends/file.py
-===================================================================
---- keyring-5.3.orig/keyring/backends/file.py
-+++ keyring-5.3/keyring/backends/file.py
-@@ -7,6 +7,8 @@ import sys
- import json
- import abc
- import time
-+import logging
-+import shutil
-
- from ..py27compat import configparser
-
-@@ -14,6 +16,7 @@ from ..errors import PasswordDeleteError
- from ..backend import KeyringBackend
- from ..util import platform_, properties
- from ..util.escape import escape as escape_for_ini
-+from oslo_concurrency import lockutils
-
-
- class FileBacked(object):
-@@ -31,6 +34,13 @@ class FileBacked(object):
- """
- return os.path.join(platform_.data_root(), self.filename)
-
-+ @properties.NonDataProperty
-+ def backup_file_path(self):
-+ """
-+ The path to the file where passwords are stored. This property
-+ may be overridden by the subclass or at the instance level.
-+ """
-+ return os.path.join(platform_.data_root(), self.backup_filename)
-
- class BaseKeyring(FileBacked, KeyringBackend):
- """
-@@ -78,6 +88,16 @@ class BaseKeyring(FileBacked, KeyringBac
- password = None
- return password
-
-+
-+ def filecopy(self,src,dest):
-+ """copy file src to dest with default buffer size
-+ """
-+ with open(src, 'r') as f1:
-+ with open(dest, 'w') as f2:
-+ shutil.copyfileobj(f1,f2)
-+ f2.flush()
-+
-+
- def set_password(self, service, username, password):
- """Write the password in the file.
- """
-@@ -89,37 +109,56 @@ class BaseKeyring(FileBacked, KeyringBac
- # encode with base64
- password_base64 = base64.encodestring(password_encrypted).decode()
-
-- # ensure the file exists
-- self._ensure_file_path()
-
-- # obtain lock for the keyring file
-- lock = ''
-- i = 60
-- while i:
-- if not os.path.isfile('/tmp/.keyringlock'):
-- lock = open('/tmp/.keyringlock', 'w')
-- break
-- else:
-- time.sleep(0.500)
-- i=i-1
-+ with lockutils.lock("keyringlock",external=True,lock_path="/tmp"):
-
-+ # ensure the file exists
-+ self._ensure_file_path()
-+
-+ config = None
-+ try:
-+ # Load the keyring from the disk
-+ config = configparser.RawConfigParser()
-+ config.read(self.file_path)
-+ except configparser.ParsingError as e:
-+ logging.warning("set_password: keyring file corrupted, Reverting to Backup")
-+ # Revert to the backup file (copy backup over current file)
-+ try:
-+ src = self.backup_file_path
-+ dest = self.file_path
-+ self.filecopy(src,dest)
-+ except shutil.Error as e:
-+ logging.warning("set_password: Revert from Backup failed. Error: %s" % e)
-+ raise
-+ # Load the keyring from the disk, if this fails exception is raised
-+ try:
-+ config = configparser.RawConfigParser()
-+ config.read(self.file_path)
-+ except:
-+ e = sys.exc_info()[0]
-+ logging.warning("set_password: Both keyring files are non useable. Error: %s" % e)
-+ raise
-
-- if i:
-- # Load the keyring from the disk
-- config = configparser.RawConfigParser()
-- config.read(self.file_path)
-
- # Update the keyring with the password
- if not config.has_section(service):
- config.add_section(service)
- config.set(service, username, password_base64)
-
-+ # Make a back up of the keyring file here
-+ try:
-+ src = self.file_path
-+ dest = self.backup_file_path
-+ self.filecopy(src,dest)
-+ except shutil.Error as e:
-+ logging.warning("set_password: Backup failed. Error: %s" % e)
-+
- # Save the keyring back to the file
- with open(self.file_path, 'w') as config_file:
- config.write(config_file)
-
-- lock.close()
-- os.remove('/tmp/.keyringlock')
-+
-+
-
-
- def _ensure_file_path(self):
-@@ -142,17 +181,18 @@ class BaseKeyring(FileBacked, KeyringBac
- """
- service = escape_for_ini(service)
- username = escape_for_ini(username)
-- config = configparser.RawConfigParser()
-- if os.path.exists(self.file_path):
-- config.read(self.file_path)
-- try:
-- if not config.remove_option(service, username):
-+ with lockutils.lock("keyringlock",external=True,lock_path="/tmp"):
-+ config = configparser.RawConfigParser()
-+ if os.path.exists(self.file_path):
-+ config.read(self.file_path)
-+ try:
-+ if not config.remove_option(service, username):
-+ raise PasswordDeleteError("Password not found")
-+ except configparser.NoSectionError:
- raise PasswordDeleteError("Password not found")
-- except configparser.NoSectionError:
-- raise PasswordDeleteError("Password not found")
-- # update the file
-- with open(self.file_path, 'w') as config_file:
-- config.write(config_file)
-+ # update the file
-+ with open(self.file_path, 'w') as config_file:
-+ config.write(config_file)
-
- class PlaintextKeyring(BaseKeyring):
- """Simple File Keyring with no encryption"""
-@@ -161,6 +201,7 @@ class PlaintextKeyring(BaseKeyring):
- "Applicable for all platforms, but not recommended"
-
- filename = 'keyring_pass.cfg'
-+ backup_filename = 'crypted_pass_backup.cfg'
-
- def encrypt(self, password):
- """Directly return the password itself.
-@@ -214,6 +255,7 @@ class EncryptedKeyring(Encrypted, BaseKe
- """PyCrypto File Keyring"""
-
- filename = 'crypted_pass.cfg'
-+ backup_filename = 'crypted_pass_backup.cfg'
- pw_prefix = 'pw:'.encode()
-
- @properties.ClassProperty
-@@ -247,6 +289,19 @@ class EncryptedKeyring(Encrypted, BaseKe
- self.keyring_key = self._get_new_password()
- # set a reference password, used to check that the password provided
- # matches for subsequent checks.
-+
-+ # try to pre-create the /tmp/keyringlock if it doesn't exist
-+ lockfile = "/tmp/keyringlock"
-+ if os.geteuid() == 0 and (not os.path.exists(lockfile)):
-+ from pwd import getpwnam
-+ import stat
-+ nonrootuser = "sysadmin"
-+ with open(lockfile, 'w'):
-+ pass
-+ # must have the lock file with the correct group permissisions g+rw
-+ os.chmod(lockfile, stat.S_IRWXG | stat.S_IRWXU)
-+
-+
- self.set_password('keyring-setting', 'password reference',
- 'password reference value')
-
-@@ -257,15 +312,41 @@ class EncryptedKeyring(Encrypted, BaseKe
- if not os.path.exists(self.file_path):
- return False
- self._migrate()
-- config = configparser.RawConfigParser()
-- config.read(self.file_path)
-- try:
-- config.get(
-- escape_for_ini('keyring-setting'),
-- escape_for_ini('password reference'),
-- )
-- except (configparser.NoSectionError, configparser.NoOptionError):
-- return False
-+
-+ # lock access to the file_path here, make sure it's not being written
-+ # to while while we're checking for keyring-setting
-+ with lockutils.lock("keyringlock",external=True,lock_path="/tmp"):
-+ config = configparser.RawConfigParser()
-+ config.read(self.file_path)
-+ try:
-+ config.get(
-+ escape_for_ini('keyring-setting'),
-+ escape_for_ini('password reference'),
-+ )
-+ except (configparser.NoSectionError, configparser.NoOptionError):
-+ # The current file doesn't have the keyring-setting, check the backup
-+ logging.warning("_check_file: The current file doesn't have the keyring-setting, check the backup")
-+ if os.path.exists(self.backup_file_path):
-+ config = configparser.RawConfigParser()
-+ config.read(self.backup_file_path)
-+ try:
-+ config.get(
-+ escape_for_ini('keyring-setting'),
-+ escape_for_ini('password reference'),
-+ )
-+ except (configparser.NoSectionError, configparser.NoOptionError):
-+ return False
-+ # backup file has it, let's use it
-+ try:
-+ src = self.backup_file_path
-+ dest = self.file_path
-+ shutil.copy(src,dest)
-+ except shutil.Error as e:
-+ logging.warning("Revert from Backup failed. Error: %s" % e)
-+ return False
-+ else:
-+ return False
-+
- return True
-
- def _unlock(self):
+++ /dev/null
-Index: keyring-5.3/keyring/backends/file.py
-===================================================================
---- keyring-5.3.orig/keyring/backends/file.py
-+++ keyring-5.3/keyring/backends/file.py
-@@ -9,6 +9,7 @@ import abc
- import time
- import logging
- import shutil
-+import glob
-
- from ..py27compat import configparser
-
-@@ -36,13 +37,6 @@ class FileBacked(object):
- """
- return os.path.join(platform_.data_root(), self.filename)
-
-- @properties.NonDataProperty
-- def backup_file_path(self):
-- """
-- The path to the file where passwords are stored. This property
-- may be overridden by the subclass or at the instance level.
-- """
-- return os.path.join(platform_.data_root(), self.backup_filename)
-
- class BaseKeyring(FileBacked, KeyringBackend):
- """
-@@ -91,15 +85,6 @@ class BaseKeyring(FileBacked, KeyringBac
- return password
-
-
-- def filecopy(self,src,dest):
-- """copy file src to dest with default buffer size
-- """
-- with open(src, 'r') as f1:
-- with open(dest, 'w') as f2:
-- shutil.copyfileobj(f1,f2)
-- f2.flush()
--
--
- def set_password(self, service, username, password):
- """Write the password in the file.
- """
-@@ -125,23 +110,7 @@ class BaseKeyring(FileBacked, KeyringBac
- config = configparser.RawConfigParser()
- config.read(self.file_path)
- except configparser.ParsingError as e:
-- logging.warning("set_password: keyring file corrupted, Reverting to Backup")
-- # Revert to the backup file (copy backup over current file)
-- try:
-- src = self.backup_file_path
-- dest = self.file_path
-- self.filecopy(src,dest)
-- except shutil.Error as e:
-- logging.warning("set_password: Revert from Backup failed. Error: %s" % e)
-- raise
-- # Load the keyring from the disk, if this fails exception is raised
-- try:
-- config = configparser.RawConfigParser()
-- config.read(self.file_path)
-- except:
-- e = sys.exc_info()[0]
-- logging.warning("set_password: Both keyring files are non useable. Error: %s" % e)
-- raise
-+ logging.warning("set_password: keyring file corrupted")
-
-
- # Update the keyring with the password
-@@ -149,17 +118,15 @@ class BaseKeyring(FileBacked, KeyringBac
- config.add_section(service)
- config.set(service, username, password_base64)
-
-- # Make a back up of the keyring file here
-- try:
-- src = self.file_path
-- dest = self.backup_file_path
-- self.filecopy(src,dest)
-- except shutil.Error as e:
-- logging.warning("set_password: Backup failed. Error: %s" % e)
--
- # Save the keyring back to the file
-- with open(self.file_path, 'w') as config_file:
-+ storage_root = os.path.dirname(self.file_path)
-+ tmpfile = "tmpfile.%s" % os.getpid()
-+ with open(storage_root + "/" + tmpfile, 'w') as config_file:
- config.write(config_file)
-+ # copy will overwrite but move will not
-+ shutil.copy(storage_root + "/" + tmpfile,self.file_path)
-+ # wipe out tmpfile here
-+ os.remove(storage_root + "/" + tmpfile)
-
-
-
-@@ -203,8 +170,15 @@ class BaseKeyring(FileBacked, KeyringBac
- except configparser.NoSectionError:
- raise PasswordDeleteError("Password not found")
- # update the file
-- with open(self.file_path, 'w') as config_file:
-+ storage_root = os.path.dirname(self.file_path)
-+ tmpfile = "tmpfile.%s" % os.getpid()
-+ with open(storage_root + "/" + tmpfile, 'w') as config_file:
- config.write(config_file)
-+ # copy will overwrite but move will not
-+ shutil.copy(storage_root + "/" + tmpfile,self.file_path)
-+ # wipe out tmpfile
-+ os.remove(storage_root + "/" + tmpfile)
-+
-
- class PlaintextKeyring(BaseKeyring):
- """Simple File Keyring with no encryption"""
-@@ -213,7 +187,6 @@ class PlaintextKeyring(BaseKeyring):
- "Applicable for all platforms, but not recommended"
-
- filename = 'keyring_pass.cfg'
-- backup_filename = 'crypted_pass_backup.cfg'
-
- def encrypt(self, password):
- """Directly return the password itself.
-@@ -267,7 +240,6 @@ class EncryptedKeyring(Encrypted, BaseKe
- """PyCrypto File Keyring"""
-
- filename = 'crypted_pass.cfg'
-- backup_filename = 'crypted_pass_backup.cfg'
- pw_prefix = 'pw:'.encode()
-
- @properties.ClassProperty
-@@ -326,27 +298,15 @@ class EncryptedKeyring(Encrypted, BaseKe
- escape_for_ini('password reference'),
- )
- except (configparser.NoSectionError, configparser.NoOptionError):
-- # The current file doesn't have the keyring-setting, check the backup
-- if os.path.exists(self.backup_file_path):
-- config = configparser.RawConfigParser()
-- config.read(self.backup_file_path)
-- try:
-- config.get(
-- escape_for_ini('keyring-setting'),
-- escape_for_ini('password reference'),
-- )
-- except (configparser.NoSectionError, configparser.NoOptionError):
-- return False
-- # backup file has it, let's use it
-- try:
-- src = self.backup_file_path
-- dest = self.file_path
-- shutil.copy(src,dest)
-- except shutil.Error as e:
-- logging.warning("Revert from Backup failed. Error: %s" % e)
-- return False
-- else:
-- return False
-+ return False
-+
-+ # remove any residual temporary files here
-+ try:
-+ for tmpfile in glob.glob(os.path.dirname(self.file_path) + "/" + "tmpfile.*"):
-+ os.remove(tmpfile)
-+ except:
-+ logging.warning("_check_file: tmpfile removal failed")
-+
-
- return True
-
+++ /dev/null
-From b21d5406cf8dc1e2ac9da81b04cf9f7b0af32015 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Tue, 25 Feb 2020 21:46:00 +0000
-Subject: [PATCH] port unittest2 argparse is part of stdlib
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 416afbe..00e51ca 100755
---- a/setup.py
-+++ b/setup.py
-@@ -57,7 +57,7 @@ KEYWORDS = "unittest testing tests".split(' ')
- # Both install and setup requires - because we read VERSION from within the
- # package, and the package also exports all the APIs.
- # six for compat helpers
--REQUIRES = ['argparse', 'six>=1.4', 'traceback2'],
-+REQUIRES = ['six>=1.4', 'traceback2'],
-
- params = dict(
- name=NAME,
---
-2.23.0
-
+++ /dev/null
-From 268a1f179e554027637bd2951b24ad44ecb4a1ee Mon Sep 17 00:00:00 2001
-From: Daniel Badea <daniel.badea@windriver.com>
-Date: Wed, 7 Sep 2016 09:10:10 +0000
-Subject: [PATCH] close connection on HTTP 413 Request Entity Too
- Large
-
-Allow low_conn to retrieve/handle unread response data buffers
-in case ProtocolError or socket.error are raised while sending
-request data.
----
- requests/adapters.py | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/requests/adapters.py b/requests/adapters.py
-index fd46325..087258a 100644
---- a/requests/adapters.py
-+++ b/requests/adapters.py
-@@ -466,12 +466,18 @@ class HTTPAdapter(BaseAdapter):
-
- low_conn.endheaders()
-
-- for i in request.body:
-- low_conn.send(hex(len(i))[2:].encode('utf-8'))
-- low_conn.send(b'\r\n')
-- low_conn.send(i)
-- low_conn.send(b'\r\n')
-- low_conn.send(b'0\r\n\r\n')
-+ try:
-+ for i in request.body:
-+ low_conn.send(hex(len(i))[2:].encode('utf-8'))
-+ low_conn.send(b'\r\n')
-+ low_conn.send(i)
-+ low_conn.send(b'\r\n')
-+ low_conn.send(b'0\r\n\r\n')
-+ except (ProtocolError, socket.error) as err:
-+ # allow low_conn to retrieve/handle unread response
-+ # data buffers in case ProtocolError or socket.error
-+ # are raised while sending request data
-+ pass
-
- # Receive the response from the server
- try:
---
-1.8.3.1
-
+++ /dev/null
-
-HOMEPAGE = "https://github.com/ansible/ansible/"
-SECTION = "devel/python"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
-
-PV = "2.8.5"
-
-SRCNAME = "ansible"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/${BPN}:"
-
-SRC_URI = " \
- http://releases.ansible.com/ansible/${SRCNAME}-${PV}.tar.gz \
- file://python-ansible-crypto.py-allow-the-constraint-value-to-be-lower-cas.patch \
- "
-
-SRC_URI[md5sum] = "86f0c18250895338709243d997005de3"
-SRC_URI[sha256sum] = "8e9403e755ce8ef27b6066cdd7a4c567aa80ebe2fd90d0ff8efa0a725d246986"
-
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-CLEANBROKEN = "1"
-
-ANSIBLE_WHITELIST_MODULES = " \
- cloud \
- clustering \
- commands \
- crypto \
- database \
- files \
- identity \
- inventory \
- messaging \
- monitoring \
- net_tools \
- network \
- notification \
- packaging \
- remote_management \
- source_control \
- storage \
- system \
- utilities \
- web_infrastructure \
- "
+++ /dev/null
-
-inherit python-backports-init
+++ /dev/null
-
-inherit python-backports-init
+++ /dev/null
-
-DESCRIPTION = "The AWS SDK for Python"
-HOMEPAGE = "https://aws.amazon.com/sdk-for-python/"
-AUTHOR = "Amazon Web Services"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
-
-SRC_URI[md5sum] = "a18e37ff05d0dd0a59e43e7bcfd79469"
-SRC_URI[sha256sum] = "b9c930982891229fe32c670c940835e4d5afcb52f60a5e512de8e5cba409900b"
-
-RDEPENDS_${PN} = "\
- ${PYTHON_PN}-botocore \
- ${PYTHON_PN}-jmespath \
- ${PYTHON_PN}-s3transfer \
-"
-
-inherit pypi
+++ /dev/null
-
-inherit setuptools
-require python-boto3.inc
+++ /dev/null
-
-RDEPENDS_${PN}_append = " python-pycparser"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "upstream"
-STX_SUBPATH = "openstack/python-horizon/centos/files"
-
-SRC_URI_STX += " \
- file://0001-Remove-the-hard-coded-internal-URL-for-keystone.patch \
- "
-
-do_configure_prepend () {
- cd ${S}
-
- # STX remove troublesome files introduced by tox
- rm -f openstack_dashboard/test/.secret_key_store
- rm -f openstack_dashboard/test/*.secret_key_store.lock
- rm -f openstack_dashboard/local/.secret_key_store
- rm -f openstack_dashboard/local/*.secret_key_store.lock
- rm -rf horizon.egg-info
-
- # drop config snippet
- cp -p ${STX_METADATA_PATH}/openstack-dashboard-httpd-logging.conf .
- cp -p ${STX_METADATA_PATH}/guni_config.py .
-
- # customize default settings
- # WAS [PATCH] disable debug, move web root
- sed -i "/^DEBUG =.*/c\DEBUG = False" openstack_dashboard/local/local_settings.py.example
- sed -i "/^WEBROOT =.*/c\WEBROOT = '/dashboard/'" openstack_dashboard/local/local_settings.py.example
- sed -i "/^.*ALLOWED_HOSTS =.*/c\ALLOWED_HOSTS = ['horizon.example.com', 'localhost']" openstack_dashboard/local/local_settings.py.example
- sed -i "/^.*LOCAL_PATH =.*/c\LOCAL_PATH = '/tmp'" openstack_dashboard/local/local_settings.py.example
- sed -i "/^.*POLICY_FILES_PATH =.*/c\POLICY_FILES_PATH = '/etc/openstack-dashboard'" openstack_dashboard/local/local_settings.py.example
-
- sed -i "/^BIN_DIR = .*/c\BIN_DIR = '/usr/bin'" openstack_dashboard/settings.py
- sed -i "/^COMPRESS_PARSER = .*/a COMPRESS_OFFLINE = True" openstack_dashboard/settings.py
-
- # set COMPRESS_OFFLINE=True
- sed -i 's:COMPRESS_OFFLINE.=.False:COMPRESS_OFFLINE = True:' openstack_dashboard/settings.py
-
- # STX: MANIFEST needs .eslintrc files for angular
- echo "include .eslintrc" >> MANIFEST.in
-
- # MANIFEST needs to include json and pot files under openstack_dashboard
- echo "recursive-include openstack_dashboard *.json *.pot .eslintrc" >> MANIFEST.in
-
- # MANIFEST needs to include pot files under horizon
- echo "recursive-include horizon *.pot .eslintrc" >> MANIFEST.in
-}
-
-do_install_append () {
- cd ${S}
-
- # STX
- install -d -m 755 ${D}/opt/branding
- mkdir -p ${D}${sysconfdir}/rc.d/init.d
- install -m 755 -D -p ${STX_METADATA_PATH}/horizon.init ${D}${sysconfdir}/rc.d/init.d/horizon
- install -m 755 -D -p ${STX_METADATA_PATH}/horizon.init ${D}${sysconfdir}/init.d/horizon
- install -m 755 -D -p ${STX_METADATA_PATH}/horizon-clearsessions ${D}/${bindir}/horizon-clearsessions
- install -m 755 -D -p ${STX_METADATA_PATH}/horizon-patching-restart ${D}/${bindir}/horizon-patching-restart
- install -m 755 -D -p ${STX_METADATA_PATH}/horizon-assets-compress ${D}/${bindir}/horizon-assets-compress
-
- # drop httpd-conf snippet
- install -m 0644 -D -p ${STX_METADATA_PATH}/openstack-dashboard-httpd-2.4.conf ${D}${sysconfdir}/httpd/conf.d/openstack-dashboard.conf
- install -d -m 755 ${D}${datadir}/openstack-dashboard
- install -d -m 755 ${D}${sysconfdir}/openstack-dashboard
-
- # create directory for systemd snippet
- mkdir -p ${D}${systemd_system_unitdir}/httpd.service.d/
- cp ${STX_METADATA_PATH}/python-django-horizon-systemd.conf ${D}${systemd_system_unitdir}/httpd.service.d/openstack-dashboard.conf
-
- # Copy everything to /usr/share
- mv ${D}${libdir}/python2.7/site-packages/openstack_dashboard \
- ${D}${datadir}/openstack-dashboard
- cp manage.py ${D}${datadir}/openstack-dashboard
-
- # STX
- cp guni_config.py ${D}${datadir}/openstack-dashboard
- rm -rf ${D}${libdir}/python2.7/site-packages/openstack_dashboard
-
- # remove unnecessary .po files
- find ${D} -name django.po -exec rm '{}' \;
- find ${D} -name djangojs.po -exec rm '{}' \;
-
- # Move config to /etc, symlink it back to /usr/share
- mv ${D}${datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py.example ${D}${sysconfdir}/openstack-dashboard/local_settings
-
- mv ${D}${datadir}/openstack-dashboard/openstack_dashboard/conf/*.json ${D}${sysconfdir}/openstack-dashboard
- cp -a ${S}/openstack_dashboard/conf/nova_policy.d ${D}${sysconfdir}/openstack-dashboard
-
- # copy static files to ${datadir}/openstack-dashboard/static
- mkdir -p ${D}${datadir}/openstack-dashboard/static
- cp -a openstack_dashboard/static/* ${D}${datadir}/openstack-dashboard/static
- cp -a horizon/static/* ${D}${datadir}/openstack-dashboard/static
-
- # create /var/run/openstack-dashboard/ and /var/log/horizon
- install -m 0755 -d ${D}/${sysconfdir}/tmpfiles.d
- echo "d ${localstatedir}/run/openstack-dashboard 0755 root root -" >> ${D}/${sysconfdir}/tmpfiles.d/openstack-dashboard.conf
- echo "d ${localstatedir}/log/horizon 0755 root root -" >> ${D}/${sysconfdir}/tmpfiles.d/openstack-dashboard.conf
-
- # place logrotate config:
- mkdir -p ${D}${sysconfdir}/logrotate.d
- cp -a ${STX_METADATA_PATH}/python-django-horizon-logrotate.conf ${D}${sysconfdir}/logrotate.d/openstack-dashboard
-
- chown -R root:root ${D}
-}
-
-FILES_${PN} += "\
- ${datadir}/openstack-dashboard \
- ${systemd_system_unitdir} \
- ${localstatedir} \
- /opt \
- "
-
-RPROVIDES_${PN} = "openstack-dashboard"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += " file://eventlet/0001-CGTS-2869-close-connection-on-HTTP-413-Request-Entit.patch"
+++ /dev/null
-
-BBCLASSEXTEND_append = " native nativesdk"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += " \
- file://python-keyring/no_keyring_password.patch \
- file://python-keyring/lock_keyring_file.patch \
- file://python-keyring/lock_keyring_file2.patch \
- file://python-keyring/use_new_lock.patch \
- file://python-keyring/fix_keyring_lockfile_location.patch \
- file://python-keyring/use_temporary_file.patch \
- file://python-keyring/chown_keyringlock_file.patch \
- file://python-keyring/chmod_keyringlock2.patch \
- file://python-keyring/keyring_path_change.patch \
- file://python-keyring/remove-reader-lock.patch \
- file://python-keyring/remove_others_perms_on_keyringcfg_file.patch \
-"
-
-DEPENDS += " python-hgtools-native"
+++ /dev/null
-
-SRC_URI = "\
- git://github.com/openstack/python-keystoneclient.git;branch=stable/train \
- "
-
-PV = "3.21.0+git${SRCPV}"
-SRCREV = "79f150f962a2300f4644ba735b4f28e337035251"
-DEPENDS += " \
- python-pip \
- python-pbr \
- "
-
-RDEPENDS_${PN}_append = " \
- python-keystone \
- keystone-setup \
- keystone-cronjobs \
- keystone \
- "
+++ /dev/null
-
-RDEPENDS_${PN} += "python-importlib-metadata"
+++ /dev/null
-
-RDEPENDS_${PN}_append = " python-paramiko"
+++ /dev/null
-
-PV = "0.36.0+git${SRCPV}"
-SRCREV="8b85e8c954baf550aefad83d8b48955a3c2382ed"
-
-RDEPENDS_${PN} += " \
- bash \
- python-munch \
- python2-os-service-types \
- "
+++ /dev/null
-
-PV = "3.33.0+git${SRCPV}"
-SRCREV = "58fb709f58bd031c5114d9b6fe2e0926175b87b6"
-SRC_URI = "git://github.com/openstack/oslo.utils.git;branch=stable/queens"
-
+++ /dev/null
-
-RDEPENDS_${PN}_append = " \
- python-bcrypt \
- python-pynacl \
- "
+++ /dev/null
-
-RDEPENDS_${PN}_append = " \
- ${PYTHON_PN}-singledispatch \
- "
+++ /dev/null
-
-RDEPENDS_${PN}_append = " \
- python-oauthlib \
- "
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += " file://requests/0001-close-connection-on-HTTP-413-Request-Entit.patch"
+++ /dev/null
-
-inherit python-dir
-RDEPENDS_${PN}_append = " \
- ${PYTHON_PN}-pygments \
- ${PYTHON_PN}-typing \
- ${PYTHON_PN}-sphinxcontrib-websupport \
- ${PYTHON_PN}-alabaster \
- ${PYTHON_PN}-imagesize \
- ${PYTHON_PN}-snowballstemmer \
- ${PYTHON_PN}-packaging \
- "
-
+++ /dev/null
-
-RDEPENDS_${PN}_append = " \
- python-mimeparse \
- python-traceback2 \
- python-unittest2 \
- "
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-DEPENDS_append = " \
- ${PYTHON_PN}-traceback2-native \
- ${PYTHON_PN}-six-native \
- "
-
-SRC_URI += " \
- file://python-unittest2/0001-port-unittest2-argparse-is-part-of-stdlib.patch \
- "
+++ /dev/null
-
-PV="1.21.1"
-
-
-SRC_URI[md5sum] = "ef6c72c79b9c6bcd68c204f9b92abc86"
-SRC_URI[sha256sum] = "b14486978518ca0901a76ba973d7821047409d7f726f22156b24e83fd71382a5"
-
+++ /dev/null
-
-RDEPENDS_${PN}_append = " \
- ${PYTHON_PN}-backports-ssl \
- "
+++ /dev/null
-
-RDEPENDS_${PN}_append = " \
- python-numpy \
- "
+++ /dev/null
-
-RDEPENDS_${PN}_append = " python-waitress"
+++ /dev/null
-
-RDEPENDS_${PN}_append = " \
- ${PYTHON_PN}-simplegeneric \
- "
+++ /dev/null
-
-do_install_append() {
- mv ${D}/${bindir}/mako-render ${D}/${bindir}/mako3-render
-}
+++ /dev/null
-
-inherit openssl10
+++ /dev/null
-
-DEPENDS += " libxcrypt"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += " \
- file://cloud-init-interactive-parted.patch \
- "
+++ /dev/null
-From 70b90db2364256fe8ba7e368cbd96cd53b246cb3 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Wed, 8 Nov 2017 11:02:42 -0500
-Subject: [PATCH] cloud-init-interactive-parted
-
----
- cloudinit/config/cc_growpart.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cloudinit/config/cc_growpart.py b/cloudinit/config/cc_growpart.py
-index 832bb3f..71c4f7f 100644
---- a/cloudinit/config/cc_growpart.py
-+++ b/cloudinit/config/cc_growpart.py
-@@ -182,7 +182,7 @@ class ResizeGpart(object):
-
- before = get_size(partdev)
- try:
-- util.subp(["gpart", "resize", "-i", partnum, diskdev])
-+ util.subp(["resizepart.sh", diskdev, partnum])
- except util.ProcessExecutionError as e:
- util.logexc(LOG, "Failed: gpart resize -i %s %s", partnum, diskdev)
- raise ResizeFailedException(e)
---
-1.8.3.1
-
+++ /dev/null
----
- cloudinit/sources/DataSourceConfigDrive.py | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
---- a/cloudinit/sources/DataSourceConfigDrive.py
-+++ b/cloudinit/sources/DataSourceConfigDrive.py
-@@ -52,12 +52,13 @@ class ConfigDriveHelper(object):
- def __init__(self, distro):
- self.distro = distro
-
-- def on_first_boot(self, data):
-+ def on_first_boot(self, data, dsmode="local"):
- if not data:
- data = {}
-- if 'network_config' in data:
-- LOG.debug("Updating network interfaces from config drive")
-- self.distro.apply_network(data['network_config'])
-+ if dsmode == "local":
-+ if 'network_config' in data:
-+ LOG.debug("Updating network interfaces from config drive")
-+ self.distro.apply_network(data['network_config'])
- files = data.get('files')
- if files:
- LOG.debug("Writing %s injected files", len(files))
-@@ -214,8 +215,8 @@ class DataSourceConfigDrive(sources.Data
- # instance-id
- prev_iid = get_previous_iid(self.paths)
- cur_iid = md['instance-id']
-- if prev_iid != cur_iid and self.dsmode == "local":
-- self.helper.on_first_boot(results)
-+ if prev_iid != cur_iid:
-+ self.helper.on_first_boot(results, dsmode=self.dsmode)
-
- # dsmode != self.dsmode here if:
- # * dsmode = "pass", pass means it should only copy files and then
+++ /dev/null
-From: Alexey Lebedeff <alebedev@mirantis.com>
-Date: Wed, 9 Mar 2016 14:55:02 +0300
-Subject: [PATCH] Avoid RPC roundtrips while listing items
-
-- Emit info about particular items in parallel on every node, with
- results delivered directly to a `rabbitmqctl` instance.
-- `rabbit_control_misc:wait_for_info_messages/5` can wait for results of
- more than one emitting map.
-- Stop passing arround InfoItemKeys in
- `rabbit_control_misc:wait_for_info_messages/5`, the same information
- could be directly encoded in DisplayFun closure.
-- Add `emit` to function names, to avoid confusion with regular ones
- which return result directly.
-
-Part of https://github.com/rabbitmq/rabbitmq-server/pull/683
-
-diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
-index 27b352a..e09e02c 100644
---- a/src/rabbit_amqqueue.erl
-+++ b/src/rabbit_amqqueue.erl
-@@ -25,10 +25,10 @@
- check_exclusive_access/2, with_exclusive_access_or_die/3,
- stat/1, deliver/2, requeue/3, ack/3, reject/4]).
- -export([list/0, list/1, info_keys/0, info/1, info/2, info_all/1, info_all/2,
-- info_all/6, info_local/1]).
-+ emit_info_all/5, list_local/1, info_local/1]).
- -export([list_down/1]).
- -export([force_event_refresh/1, notify_policy_changed/1]).
---export([consumers/1, consumers_all/1, consumers_all/3, consumer_info_keys/0]).
-+-export([consumers/1, consumers_all/1, emit_consumers_all/4, consumer_info_keys/0]).
- -export([basic_get/4, basic_consume/10, basic_cancel/4, notify_decorators/1]).
- -export([notify_sent/2, notify_sent_queue_down/1, resume/2]).
- -export([notify_down_all/2, notify_down_all/3, activate_limit_all/2, credit/5]).
-@@ -41,7 +41,8 @@
-
- %% internal
- -export([internal_declare/2, internal_delete/1, run_backing_queue/3,
-- set_ram_duration_target/2, set_maximum_since_use/2]).
-+ set_ram_duration_target/2, set_maximum_since_use/2,
-+ emit_info_local/4, emit_info_down/4, emit_consumers_local/3]).
-
- -include("rabbit.hrl").
- -include_lib("stdlib/include/qlc.hrl").
-@@ -117,10 +118,6 @@
- -spec info_all(rabbit_types:vhost()) -> [rabbit_types:infos()].
- -spec info_all(rabbit_types:vhost(), rabbit_types:info_keys()) ->
- [rabbit_types:infos()].
---spec info_all
-- (rabbit_types:vhost(), rabbit_types:info_keys(), boolean(), boolean(),
-- reference(), pid()) ->
-- 'ok'.
- -spec force_event_refresh(reference()) -> 'ok'.
- -spec notify_policy_changed(rabbit_types:amqqueue()) -> 'ok'.
- -spec consumers(rabbit_types:amqqueue()) ->
-@@ -130,7 +127,6 @@
- -spec consumers_all(rabbit_types:vhost()) ->
- [{name(), pid(), rabbit_types:ctag(), boolean(),
- non_neg_integer(), rabbit_framing:amqp_table()}].
---spec consumers_all(rabbit_types:vhost(), reference(), pid()) -> 'ok'.
- -spec stat(rabbit_types:amqqueue()) ->
- {'ok', non_neg_integer(), non_neg_integer()}.
- -spec delete_immediately(qpids()) -> 'ok'.
-@@ -627,16 +623,18 @@ info_all(VHostPath, Items) ->
- map(list(VHostPath), fun (Q) -> info(Q, Items) end) ++
- map(list_down(VHostPath), fun (Q) -> info_down(Q, Items, down) end).
-
--info_all(VHostPath, Items, NeedOnline, NeedOffline, Ref, AggregatorPid) ->
-- NeedOnline andalso rabbit_control_misc:emitting_map_with_exit_handler(
-- AggregatorPid, Ref, fun(Q) -> info(Q, Items) end, list(VHostPath),
-- continue),
-- NeedOffline andalso rabbit_control_misc:emitting_map_with_exit_handler(
-- AggregatorPid, Ref, fun(Q) -> info_down(Q, Items, down) end,
-- list_down(VHostPath),
-- continue),
-- %% Previous maps are incomplete, finalize emission
-- rabbit_control_misc:emitting_map(AggregatorPid, Ref, fun(_) -> no_op end, []).
-+emit_info_local(VHostPath, Items, Ref, AggregatorPid) ->
-+ rabbit_control_misc:emitting_map_with_exit_handler(
-+ AggregatorPid, Ref, fun(Q) -> info(Q, Items) end, list_local(VHostPath)).
-+
-+emit_info_all(Nodes, VHostPath, Items, Ref, AggregatorPid) ->
-+ Pids = [ spawn_link(Node, rabbit_amqqueue, emit_info_local, [VHostPath, Items, Ref, AggregatorPid]) || Node <- Nodes ],
-+ rabbit_control_misc:await_emitters_termination(Pids).
-+
-+emit_info_down(VHostPath, Items, Ref, AggregatorPid) ->
-+ rabbit_control_misc:emitting_map_with_exit_handler(
-+ AggregatorPid, Ref, fun(Q) -> info_down(Q, Items, down) end,
-+ list_down(VHostPath)).
-
- info_local(VHostPath) ->
- map(list_local(VHostPath), fun (Q) -> info(Q, [name]) end).
-@@ -664,12 +662,17 @@ consumers_all(VHostPath) ->
- map(list(VHostPath),
- fun(Q) -> get_queue_consumer_info(Q, ConsumerInfoKeys) end)).
-
--consumers_all(VHostPath, Ref, AggregatorPid) ->
-+emit_consumers_all(Nodes, VHostPath, Ref, AggregatorPid) ->
-+ Pids = [ spawn_link(Node, rabbit_amqqueue, emit_consumers_local, [VHostPath, Ref, AggregatorPid]) || Node <- Nodes ],
-+ rabbit_control_misc:await_emitters_termination(Pids),
-+ ok.
-+
-+emit_consumers_local(VHostPath, Ref, AggregatorPid) ->
- ConsumerInfoKeys = consumer_info_keys(),
- rabbit_control_misc:emitting_map(
- AggregatorPid, Ref,
- fun(Q) -> get_queue_consumer_info(Q, ConsumerInfoKeys) end,
-- list(VHostPath)).
-+ list_local(VHostPath)).
-
- get_queue_consumer_info(Q, ConsumerInfoKeys) ->
- [lists:zip(ConsumerInfoKeys,
-diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
-index ab7d38d..837a892 100644
---- a/src/rabbit_channel.erl
-+++ b/src/rabbit_channel.erl
-@@ -56,7 +56,7 @@
- -export([send_command/2, deliver/4, deliver_reply/2,
- send_credit_reply/2, send_drained/2]).
- -export([list/0, info_keys/0, info/1, info/2, info_all/0, info_all/1,
-- info_all/3, info_local/1]).
-+ emit_info_all/4, info_local/1]).
- -export([refresh_config_local/0, ready_for_close/1]).
- -export([force_event_refresh/1]).
-
-@@ -64,7 +64,7 @@
- handle_info/2, handle_pre_hibernate/1, prioritise_call/4,
- prioritise_cast/3, prioritise_info/3, format_message_queue/2]).
- %% Internal
---export([list_local/0, deliver_reply_local/3]).
-+-export([list_local/0, emit_info_local/3, deliver_reply_local/3]).
- -export([get_vhost/1, get_user/1]).
-
- -record(ch, {
-@@ -220,7 +220,6 @@
- -spec info(pid(), rabbit_types:info_keys()) -> rabbit_types:infos().
- -spec info_all() -> [rabbit_types:infos()].
- -spec info_all(rabbit_types:info_keys()) -> [rabbit_types:infos()].
---spec info_all(rabbit_types:info_keys(), reference(), pid()) -> 'ok'.
- -spec refresh_config_local() -> 'ok'.
- -spec ready_for_close(pid()) -> 'ok'.
- -spec force_event_refresh(reference()) -> 'ok'.
-@@ -329,9 +328,16 @@ info_all(Items) ->
- info_local(Items) ->
- rabbit_misc:filter_exit_map(fun (C) -> info(C, Items) end, list_local()).
-
--info_all(Items, Ref, AggregatorPid) ->
-+emit_info_all(Nodes, Items, Ref, AggregatorPid) ->
-+ Pids = [ spawn_link(Node, rabbit_channel, emit_info_local, [Items, Ref, AggregatorPid]) || Node <- Nodes ],
-+ rabbit_control_misc:await_emitters_termination(Pids).
-+
-+emit_info_local(Items, Ref, AggregatorPid) ->
-+ emit_info(list_local(), Items, Ref, AggregatorPid).
-+
-+emit_info(PidList, InfoItems, Ref, AggregatorPid) ->
- rabbit_control_misc:emitting_map_with_exit_handler(
-- AggregatorPid, Ref, fun(C) -> info(C, Items) end, list()).
-+ AggregatorPid, Ref, fun(C) -> info(C, InfoItems) end, PidList).
-
- refresh_config_local() ->
- rabbit_misc:upmap(
-diff --git a/src/rabbit_control_misc.erl b/src/rabbit_control_misc.erl
-index 2e1f6cc..3b0c60b 100644
---- a/src/rabbit_control_misc.erl
-+++ b/src/rabbit_control_misc.erl
-@@ -17,7 +17,8 @@
- -module(rabbit_control_misc).
-
- -export([emitting_map/4, emitting_map/5, emitting_map_with_exit_handler/4,
-- emitting_map_with_exit_handler/5, wait_for_info_messages/5,
-+ emitting_map_with_exit_handler/5, wait_for_info_messages/6,
-+ spawn_emitter_caller/7, await_emitters_termination/1,
- print_cmd_result/2]).
-
- -spec emitting_map(pid(), reference(), fun(), list()) -> 'ok'.
-@@ -25,7 +26,14 @@
- -spec emitting_map_with_exit_handler
- (pid(), reference(), fun(), list()) -> 'ok'.
- -spec emitting_map_with_exit_handler
-- (pid(), reference(), fun(), list(), atom()) -> 'ok'.
-+ (pid(), reference(), fun(), list(), 'continue') -> 'ok'.
-+
-+-type fold_fun() :: fun ((term(), term()) -> term()).
-+
-+-spec wait_for_info_messages (pid(), reference(), fold_fun(), term(), timeout(), non_neg_integer()) -> {'ok', term()} | {'error', term()}.
-+-spec spawn_emitter_caller (node(), module(), atom(), [term()], reference(), pid(), timeout()) -> 'ok'.
-+-spec await_emitters_termination ([pid()]) -> 'ok'.
-+
- -spec print_cmd_result(atom(), term()) -> 'ok'.
-
- emitting_map(AggregatorPid, Ref, Fun, List) ->
-@@ -65,27 +73,108 @@ step_with_exit_handler(AggregatorPid, Ref, Fun, Item) ->
- ok
- end.
-
--wait_for_info_messages(Pid, Ref, ArgAtoms, DisplayFun, Timeout) ->
-- _ = notify_if_timeout(Pid, Ref, Timeout),
-- wait_for_info_messages(Ref, ArgAtoms, DisplayFun).
-+%% Invokes RPC for async info collection in separate (but linked to
-+%% the caller) process. Separate process waits for RPC to finish and
-+%% in case of errors sends them in wait_for_info_messages/5-compatible
-+%% form to aggregator process. Calling process is then expected to
-+%% do blocking call of wait_for_info_messages/5.
-+%%
-+%% Remote function MUST use calls to emitting_map/4 (and other
-+%% emitting_map's) to properly deliver requested information to an
-+%% aggregator process.
-+%%
-+%% If for performance reasons several parallel emitting_map's need to
-+%% be run, remote function MUST NOT return until all this
-+%% emitting_map's are done. And during all this time remote RPC
-+%% process MUST be linked to emitting
-+%% processes. await_emitters_termination/1 helper can be used as a
-+%% last statement of remote function to ensure this behaviour.
-+spawn_emitter_caller(Node, Mod, Fun, Args, Ref, Pid, Timeout) ->
-+ spawn_monitor(
-+ fun () ->
-+ case rpc_call_emitter(Node, Mod, Fun, Args, Ref, Pid, Timeout) of
-+ {error, _} = Error ->
-+ Pid ! {Ref, error, Error};
-+ {bad_argument, _} = Error ->
-+ Pid ! {Ref, error, Error};
-+ {badrpc, _} = Error ->
-+ Pid ! {Ref, error, Error};
-+ _ ->
-+ ok
-+ end
-+ end),
-+ ok.
-+
-+rpc_call_emitter(Node, Mod, Fun, Args, Ref, Pid, Timeout) ->
-+ rabbit_misc:rpc_call(Node, Mod, Fun, Args++[Ref, Pid], Timeout).
-+
-+%% Agregator process expects correct numbers of explicits ACKs about
-+%% finished emission process. While everything is linked, we still
-+%% need somehow to wait for termination of all emitters before
-+%% returning from RPC call - otherwise links will be just broken with
-+%% reason 'normal' and we can miss some errors, and subsequentially
-+%% hang.
-+await_emitters_termination(Pids) ->
-+ Monitors = [erlang:monitor(process, Pid) || Pid <- Pids],
-+ collect_monitors(Monitors).
-
--wait_for_info_messages(Ref, InfoItemKeys, DisplayFun) when is_reference(Ref) ->
-+collect_monitors([]) ->
-+ ok;
-+collect_monitors([Monitor|Rest]) ->
- receive
-- {Ref, finished} ->
-- ok;
-- {Ref, {timeout, T}} ->
-+ {'DOWN', Monitor, _Pid, normal} ->
-+ collect_monitors(Rest);
-+ {'DOWN', Monitor, _Pid, noproc} ->
-+ %% There is a link and a monitor to a process. Matching
-+ %% this clause means that process has gracefully
-+ %% terminated even before we've started monitoring.
-+ collect_monitors(Rest);
-+ {'DOWN', _, Pid, Reason} ->
-+ exit({emitter_exit, Pid, Reason})
-+ end.
-+
-+%% Wait for result of one or more calls to emitting_map-family
-+%% functions.
-+%%
-+%% Number of expected acknowledgments is specified by ChunkCount
-+%% argument. Most common usage will be with ChunkCount equals to
-+%% number of live nodes, but it's not mandatory - thus more generic
-+%% name of 'ChunkCount' was chosen.
-+wait_for_info_messages(Pid, Ref, Fun, Acc0, Timeout, ChunkCount) ->
-+ notify_if_timeout(Pid, Ref, Timeout),
-+ wait_for_info_messages(Ref, Fun, Acc0, ChunkCount).
-+
-+wait_for_info_messages(Ref, Fun, Acc0, ChunksLeft) ->
-+ receive
-+ {Ref, finished} when ChunksLeft =:= 1 ->
-+ {ok, Acc0};
-+ {Ref, finished} ->
-+ wait_for_info_messages(Ref, Fun, Acc0, ChunksLeft - 1);
-+ {Ref, {timeout, T}} ->
- exit({error, {timeout, (T / 1000)}});
-- {Ref, []} ->
-- wait_for_info_messages(Ref, InfoItemKeys, DisplayFun);
-- {Ref, Result, continue} ->
-- DisplayFun(Result, InfoItemKeys),
-- wait_for_info_messages(Ref, InfoItemKeys, DisplayFun);
-- {error, Error} ->
-- Error;
-- _ ->
-- wait_for_info_messages(Ref, InfoItemKeys, DisplayFun)
-+ {Ref, []} ->
-+ wait_for_info_messages(Ref, Fun, Acc0, ChunksLeft);
-+ {Ref, Result, continue} ->
-+ wait_for_info_messages(Ref, Fun, Fun(Result, Acc0), ChunksLeft);
-+ {Ref, error, Error} ->
-+ {error, simplify_emission_error(Error)};
-+ {'DOWN', _MRef, process, _Pid, normal} ->
-+ wait_for_info_messages(Ref, Fun, Acc0, ChunksLeft);
-+ {'DOWN', _MRef, process, _Pid, Reason} ->
-+ {error, simplify_emission_error(Reason)};
-+ _Msg ->
-+ wait_for_info_messages(Ref, Fun, Acc0, ChunksLeft)
- end.
-
-+simplify_emission_error({badrpc, {'EXIT', {{nocatch, EmissionError}, _Stacktrace}}}) ->
-+ EmissionError;
-+simplify_emission_error({{nocatch, EmissionError}, _Stacktrace}) ->
-+ EmissionError;
-+simplify_emission_error(Anything) ->
-+ {error, Anything}.
-+
-+notify_if_timeout(_, _, infinity) ->
-+ ok;
- notify_if_timeout(Pid, Ref, Timeout) ->
- timer:send_after(Timeout, Pid, {Ref, {timeout, Timeout}}).
-
-diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
-index 8965c59..9341ea9 100644
---- a/src/rabbit_misc.erl
-+++ b/src/rabbit_misc.erl
-@@ -75,7 +75,7 @@
- -export([get_env/3]).
- -export([get_channel_operation_timeout/0]).
- -export([random/1]).
---export([rpc_call/4, rpc_call/5, rpc_call/7]).
-+-export([rpc_call/4, rpc_call/5]).
- -export([report_default_thread_pool_size/0]).
- -export([get_gc_info/1]).
-
-@@ -264,8 +264,6 @@
- -spec random(non_neg_integer()) -> non_neg_integer().
- -spec rpc_call(node(), atom(), atom(), [any()]) -> any().
- -spec rpc_call(node(), atom(), atom(), [any()], number()) -> any().
---spec rpc_call
-- (node(), atom(), atom(), [any()], reference(), pid(), number()) -> any().
- -spec report_default_thread_pool_size() -> 'ok'.
- -spec get_gc_info(pid()) -> integer().
-
-@@ -1184,9 +1182,6 @@ rpc_call(Node, Mod, Fun, Args, Timeout) ->
- rpc:call(Node, Mod, Fun, Args, Timeout)
- end.
-
--rpc_call(Node, Mod, Fun, Args, Ref, Pid, Timeout) ->
-- rpc_call(Node, Mod, Fun, Args++[Ref, Pid], Timeout).
--
- guess_number_of_cpu_cores() ->
- case erlang:system_info(logical_processors_available) of
- unknown -> % Happens on Mac OS X.
-diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
-index 5bf30ff..63e3ed0 100644
---- a/src/rabbit_networking.erl
-+++ b/src/rabbit_networking.erl
-@@ -33,7 +33,8 @@
- node_listeners/1, register_connection/1, unregister_connection/1,
- connections/0, connection_info_keys/0,
- connection_info/1, connection_info/2,
-- connection_info_all/0, connection_info_all/1, connection_info_all/3,
-+ connection_info_all/0, connection_info_all/1,
-+ emit_connection_info_all/4, emit_connection_info_local/3,
- close_connection/2, force_connection_event_refresh/1, tcp_host/1]).
-
- %% Used by TCP-based transports, e.g. STOMP adapter
-@@ -89,8 +90,6 @@
- -spec connection_info_all() -> [rabbit_types:infos()].
- -spec connection_info_all(rabbit_types:info_keys()) ->
- [rabbit_types:infos()].
---spec connection_info_all(rabbit_types:info_keys(), reference(), pid()) ->
-- 'ok'.
- -spec close_connection(pid(), string()) -> 'ok'.
- -spec force_connection_event_refresh(reference()) -> 'ok'.
-
-@@ -365,10 +364,15 @@ connection_info(Pid, Items) -> rabbit_reader:info(Pid, Items).
- connection_info_all() -> cmap(fun (Q) -> connection_info(Q) end).
- connection_info_all(Items) -> cmap(fun (Q) -> connection_info(Q, Items) end).
-
--connection_info_all(Items, Ref, AggregatorPid) ->
-+emit_connection_info_all(Nodes, Items, Ref, AggregatorPid) ->
-+ Pids = [ spawn_link(Node, rabbit_networking, emit_connection_info_local, [Items, Ref, AggregatorPid]) || Node <- Nodes ],
-+ rabbit_control_misc:await_emitters_termination(Pids),
-+ ok.
-+
-+emit_connection_info_local(Items, Ref, AggregatorPid) ->
- rabbit_control_misc:emitting_map_with_exit_handler(
- AggregatorPid, Ref, fun(Q) -> connection_info(Q, Items) end,
-- connections()).
-+ connections_local()).
-
- close_connection(Pid, Explanation) ->
- rabbit_log:info("Closing connection ~p because ~p~n", [Pid, Explanation]),
+++ /dev/null
-From: Peter Lemenkov <lemenkov@redhat.com>
-Date: Fri, 15 Jul 2016 16:01:08 +0200
-Subject: [PATCH] Use proto_dist from command line
-
-Use protocol distribution value from command line when provided instead
-of always using default value (inet_tcp) when trying to check epmd.
-
-If provided more than one protocol distribution types, then use the
-first one.
-
-Signed-off-by: Peter Lemenkov <lemenkov@redhat.com>
-
-diff --git a/src/rabbit_nodes.erl b/src/rabbit_nodes.erl
-index 70a5355..18f7714 100644
---- a/src/rabbit_nodes.erl
-+++ b/src/rabbit_nodes.erl
-@@ -221,9 +221,14 @@ set_cluster_name(Name) ->
- ensure_epmd() ->
- {ok, Prog} = init:get_argument(progname),
- ID = rabbit_misc:random(1000000000),
-+ ProtoDist = case init:get_argument(proto_dist) of
-+ {ok, [Proto | _Protos]} -> Proto;
-+ error -> "inet_tcp"
-+ end,
- Port = open_port(
- {spawn_executable, os:find_executable(Prog)},
- [{args, ["-sname", rabbit_misc:format("epmd-starter-~b", [ID]),
-+ "-proto_dist", rabbit_misc:format("~p", [ProtoDist]),
- "-noshell", "-eval", "halt()."]},
- exit_status, stderr_to_stdout, use_stdio]),
- port_shutdown_loop(Port).
+++ /dev/null
-#!/bin/sh
-## The contents of this file are subject to the Mozilla Public License
-## Version 1.1 (the "License"); you may not use this file except in
-## compliance with the License. You may obtain a copy of the License
-## at http://www.mozilla.org/MPL/
-##
-## Software distributed under the License is distributed on an "AS IS"
-## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-## the License for the specific language governing rights and
-## limitations under the License.
-##
-## The Original Code is RabbitMQ.
-##
-## The Initial Developer of the Original Code is GoPivotal, Inc.
-## Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved.
-##
-
-SED_OPT="-E"
-if [ $(uname -s) = "Linux" ]; then
- SED_OPT="-r"
-fi
-
-for arg in "$@" ; do
- # Wrap each arg in single quotes and wrap single quotes in double quotes, so that they're passed through cleanly.
- arg=`printf %s "$arg" | sed $SED_OPT -e "s/'/'\"'\"'/g"`
- CMDLINE="${CMDLINE} '${arg}'"
-done
-
-cd /var/lib/rabbitmq
-
-SCRIPT=`basename $0`
-
-if [ `id -u` = `id -u rabbitmq` -a "$SCRIPT" = "rabbitmq-server" ] ; then
- RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env
- RABBITMQ_SCRIPTS_DIR=$(dirname "$RABBITMQ_ENV")
- . "$RABBITMQ_ENV"
-
- exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@"
-elif [ `id -u` = `id -u rabbitmq` -o "$SCRIPT" = "rabbitmq-plugins" ] ; then
- if [ -f $PWD/.erlang.cookie ] ; then
- export HOME=.
- fi
- exec /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
-elif [ `id -u` = 0 ] ; then
- # WRS. Allow to run as root
- export HOME=${HOME:-/root}
- /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
-else
- /usr/lib/rabbitmq/bin/${SCRIPT}
- echo
- echo "Only root or rabbitmq should run ${SCRIPT}"
- echo
- exit 1
-fi
+++ /dev/null
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Thu, 19 May 2016 16:04:56 +0300
-Subject: [PATCH] Remove excessive sd_notify code
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/src/rabbit.erl b/src/rabbit.erl
-index a86fd97..32ff240 100644
---- a/src/rabbit.erl
-+++ b/src/rabbit.erl
-@@ -280,120 +280,8 @@ broker_start() ->
- Plugins = rabbit_plugins:setup(),
- ToBeLoaded = Plugins ++ ?APPS,
- start_apps(ToBeLoaded),
-- maybe_sd_notify(),
- ok = log_broker_started(rabbit_plugins:active()).
-
--%% Try to send systemd ready notification if it makes sense in the
--%% current environment. standard_error is used intentionally in all
--%% logging statements, so all this messages will end in systemd
--%% journal.
--maybe_sd_notify() ->
-- case sd_notify_ready() of
-- false ->
-- io:format(standard_error, "systemd READY notification failed, beware of timeouts~n", []);
-- _ ->
-- ok
-- end.
--
--sd_notify_ready() ->
-- case {os:type(), os:getenv("NOTIFY_SOCKET")} of
-- {{win32, _}, _} ->
-- true;
-- {_, [_|_]} -> %% Non-empty NOTIFY_SOCKET, give it a try
-- sd_notify_legacy() orelse sd_notify_socat();
-- _ ->
-- true
-- end.
--
--sd_notify_data() ->
-- "READY=1\nSTATUS=Initialized\nMAINPID=" ++ os:getpid() ++ "\n".
--
--sd_notify_legacy() ->
-- case code:load_file(sd_notify) of
-- {module, sd_notify} ->
-- SDNotify = sd_notify,
-- SDNotify:sd_notify(0, sd_notify_data()),
-- true;
-- {error, _} ->
-- false
-- end.
--
--%% socat(1) is the most portable way the sd_notify could be
--%% implemented in erlang, without introducing some NIF. Currently the
--%% following issues prevent us from implementing it in a more
--%% reasonable way:
--%% - systemd-notify(1) is unstable for non-root users
--%% - erlang doesn't support unix domain sockets.
--%%
--%% Some details on how we ended with such a solution:
--%% https://github.com/rabbitmq/rabbitmq-server/issues/664
--sd_notify_socat() ->
-- case sd_current_unit() of
-- {ok, Unit} ->
-- io:format(standard_error, "systemd unit for activation check: \"~s\"~n", [Unit]),
-- sd_notify_socat(Unit);
-- _ ->
-- false
-- end.
--
--socat_socket_arg("@" ++ AbstractUnixSocket) ->
-- "abstract-sendto:" ++ AbstractUnixSocket;
--socat_socket_arg(UnixSocket) ->
-- "unix-sendto:" ++ UnixSocket.
--
--sd_open_port() ->
-- open_port(
-- {spawn_executable, os:find_executable("socat")},
-- [{args, [socat_socket_arg(os:getenv("NOTIFY_SOCKET")), "STDIO"]},
-- use_stdio, out]).
--
--sd_notify_socat(Unit) ->
-- case sd_open_port() of
-- {'EXIT', Exit} ->
-- io:format(standard_error, "Failed to start socat ~p~n", [Exit]),
-- false;
-- Port ->
-- Port ! {self(), {command, sd_notify_data()}},
-- Result = sd_wait_activation(Port, Unit),
-- port_close(Port),
-- Result
-- end.
--
--sd_current_unit() ->
-- case catch re:run(os:cmd("systemctl status " ++ os:getpid()), "([-.@0-9a-zA-Z]+)", [unicode, {capture, all_but_first, list}]) of
-- {'EXIT', _} ->
-- error;
-- {match, [Unit]} ->
-- {ok, Unit};
-- _ ->
-- error
-- end.
--
--sd_wait_activation(Port, Unit) ->
-- case os:find_executable("systemctl") of
-- false ->
-- io:format(standard_error, "'systemctl' unavailable, falling back to sleep~n", []),
-- timer:sleep(5000),
-- true;
-- _ ->
-- sd_wait_activation(Port, Unit, 10)
-- end.
--
--sd_wait_activation(_, _, 0) ->
-- io:format(standard_error, "Service still in 'activating' state, bailing out~n", []),
-- false;
--sd_wait_activation(Port, Unit, AttemptsLeft) ->
-- case os:cmd("systemctl show --property=ActiveState " ++ Unit) of
-- "ActiveState=activating\n" ->
-- timer:sleep(1000),
-- sd_wait_activation(Port, Unit, AttemptsLeft - 1);
-- "ActiveState=" ++ _ ->
-- true;
-- _ = Err->
-- io:format(standard_error, "Unexpected status from systemd ~p~n", [Err]),
-- false
-- end.
--
- start_it(StartFun) ->
- Marker = spawn_link(fun() -> receive stop -> ok end end),
- case catch register(rabbit_boot, Marker) of
+++ /dev/null
-From: John Eckersberg <jeckersb@redhat.com>
-Date: Wed, 18 Feb 2015 16:11:12 -0500
-Subject: [PATCH] Add systemd notification support
-
-
-diff --git a/src/rabbit.erl b/src/rabbit.erl
-index 32ff240..f9e8231 100644
---- a/src/rabbit.erl
-+++ b/src/rabbit.erl
-@@ -280,6 +280,11 @@ broker_start() ->
- Plugins = rabbit_plugins:setup(),
- ToBeLoaded = Plugins ++ ?APPS,
- start_apps(ToBeLoaded),
-+ case code:load_file(sd_notify) of
-+ {module, sd_notify} -> SDNotify = sd_notify,
-+ SDNotify:sd_notify(0, "READY=1\nSTATUS=Initialized\nMAINPID=" ++ os:getpid() ++ "\n");
-+ {error, _} -> ok
-+ end,
- ok = log_broker_started(rabbit_plugins:active()).
-
- start_it(StartFun) ->
+++ /dev/null
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Wed, 25 May 2016 22:24:44 +0300
-Subject: [PATCH] Revert "Distinct exit-codes for CLI utilities"
-
-This reverts commit 7984540175d0b8852025165b6b6a0ac05d692c98.
-
-diff --git a/include/rabbit_cli.hrl b/include/rabbit_cli.hrl
-index a0d1ecf..efd328a 100644
---- a/include/rabbit_cli.hrl
-+++ b/include/rabbit_cli.hrl
-@@ -46,14 +46,3 @@
- -define(RAM_DEF, {?RAM_OPT, flag}).
- -define(OFFLINE_DEF, {?OFFLINE_OPT, flag}).
- -define(ONLINE_DEF, {?ONLINE_OPT, flag}).
--
--%% Subset of standartized exit codes from sysexits.h, see
--%% https://github.com/rabbitmq/rabbitmq-server/issues/396 for discussion.
---define(EX_OK , 0).
---define(EX_USAGE , 64). % Bad command-line arguments.
---define(EX_DATAERR , 65). % Wrong data in command-line arguments.
---define(EX_NOUSER , 67). % The user specified does not exist.
---define(EX_UNAVAILABLE, 69). % Could not connect to the target node.
---define(EX_SOFTWARE , 70). % Failed to execute command.
---define(EX_TEMPFAIL , 75). % Temporary error (e.g. something has timed out).
---define(EX_CONFIG , 78). % Misconfiguration detected
-diff --git a/src/rabbit_cli.erl b/src/rabbit_cli.erl
-index 6b35482..dc490ad 100644
---- a/src/rabbit_cli.erl
-+++ b/src/rabbit_cli.erl
-@@ -58,7 +58,7 @@ ensure_cli_distribution() ->
- {error, Error} ->
- print_error("Failed to initialize erlang distribution: ~p.",
- [Error]),
-- rabbit_misc:quit(?EX_TEMPFAIL)
-+ rabbit_misc:quit(2)
- end.
-
- %%----------------------------------------------------------------------------
-@@ -84,10 +84,10 @@ main(ParseFun, DoFun, UsageMod) ->
- %% thrown errors into normal return values
- case catch DoFun(Command, Node, Args, Opts) of
- ok ->
-- rabbit_misc:quit(?EX_OK);
-+ rabbit_misc:quit(0);
- {ok, Result} ->
- rabbit_control_misc:print_cmd_result(Command, Result),
-- rabbit_misc:quit(?EX_OK);
-+ rabbit_misc:quit(0);
- {'EXIT', {function_clause, [{?MODULE, action, _} | _]}} -> %% < R15
- PrintInvalidCommandError(),
- usage(UsageMod);
-@@ -97,51 +97,51 @@ main(ParseFun, DoFun, UsageMod) ->
- {error, {missing_dependencies, Missing, Blame}} ->
- print_error("dependent plugins ~p not found; used by ~p.",
- [Missing, Blame]),
-- rabbit_misc:quit(?EX_CONFIG);
-+ rabbit_misc:quit(2);
- {'EXIT', {badarg, _}} ->
- print_error("invalid parameter: ~p", [Args]),
-- usage(UsageMod, ?EX_DATAERR);
-+ usage(UsageMod, 2);
- {error, {Problem, Reason}} when is_atom(Problem), is_binary(Reason) ->
- %% We handle this common case specially to avoid ~p since
- %% that has i18n issues
- print_error("~s: ~s", [Problem, Reason]),
-- rabbit_misc:quit(?EX_SOFTWARE);
-+ rabbit_misc:quit(2);
- {error, Reason} ->
- print_error("~p", [Reason]),
-- rabbit_misc:quit(?EX_SOFTWARE);
-+ rabbit_misc:quit(2);
- {error_string, Reason} ->
- print_error("~s", [Reason]),
-- rabbit_misc:quit(?EX_SOFTWARE);
-+ rabbit_misc:quit(2);
- {badrpc, {'EXIT', Reason}} ->
- print_error("~p", [Reason]),
-- rabbit_misc:quit(?EX_SOFTWARE);
-+ rabbit_misc:quit(2);
- {badrpc, Reason} ->
- case Reason of
- timeout ->
- print_error("operation ~w on node ~w timed out", [Command, Node]),
-- rabbit_misc:quit(?EX_TEMPFAIL);
-+ rabbit_misc:quit(2);
- _ ->
- print_error("unable to connect to node ~w: ~w", [Node, Reason]),
- print_badrpc_diagnostics([Node]),
- case Command of
-- stop -> rabbit_misc:quit(?EX_OK);
-- _ -> rabbit_misc:quit(?EX_UNAVAILABLE)
-+ stop -> rabbit_misc:quit(0);
-+ _ -> rabbit_misc:quit(2)
- end
- end;
- {badrpc_multi, Reason, Nodes} ->
- print_error("unable to connect to nodes ~p: ~w", [Nodes, Reason]),
- print_badrpc_diagnostics(Nodes),
-- rabbit_misc:quit(?EX_UNAVAILABLE);
-+ rabbit_misc:quit(2);
- function_clause ->
- print_error("operation ~w used with invalid parameter: ~p",
- [Command, Args]),
- usage(UsageMod);
- {refused, Username, _, _} ->
- print_error("failed to authenticate user \"~s\"", [Username]),
-- rabbit_misc:quit(?EX_NOUSER);
-+ rabbit_misc:quit(2);
- Other ->
- print_error("~p", [Other]),
-- rabbit_misc:quit(?EX_SOFTWARE)
-+ rabbit_misc:quit(2)
- end.
-
- start_distribution_anon(0, LastError) ->
-@@ -172,7 +172,7 @@ name_type() ->
- end.
-
- usage(Mod) ->
-- usage(Mod, ?EX_USAGE).
-+ usage(Mod, 1).
-
- usage(Mod, ExitCode) ->
- io:format("~s", [Mod:usage()]),
+++ /dev/null
-From: John Eckersberg <jeckersb@redhat.com>
-Date: Thu, 30 Oct 2014 14:01:08 -0400
-Subject: [PATCH] Allow guest login from non-loopback connections
-
-
-diff --git a/src/rabbit.app.src b/src/rabbit.app.src
-index 572c1f6..4676e03 100644
---- a/src/rabbit.app.src
-+++ b/src/rabbit.app.src
-@@ -39,7 +39,7 @@
- {default_user_tags, [administrator]},
- {default_vhost, <<"/">>},
- {default_permissions, [<<".*">>, <<".*">>, <<".*">>]},
-- {loopback_users, [<<"guest">>]},
-+ {loopback_users, []},
- {password_hashing_module, rabbit_password_hashing_sha256},
- {cluster_nodes, {[], disc}},
- {server_properties, []},
+++ /dev/null
-From: Alexey Lebedeff <alebedev@mirantis.com>
-Date: Wed, 9 Mar 2016 18:09:04 +0300
-Subject: [PATCH] Avoid RPC roundtrips in list commands
-
-Current implementation of various `list_XXX` commands require cross-node
-roundtrip for every processed item - because `rabbitmqctl` target node
-is responsible for gathering global list of all items of
-interest (channels etc.) and then processing them one by one.
-
-For example, listing 10000 channels evenly distributed across 3 nodes
-where network has 1ms delay takes more than 10 seconds on my
-machine. And with the proposed change listing will take almost the same
-time as it'll take to gather this info locally. E.g. in the case above
-listing now takes 0.7 second on the same machine with same 1ms delay.
-
-It works by invoking emitting_map on every node, where it should send
-info about only local items to aggregator, in an async fashion - as no
-reply from aggregator is needed.
-
-diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
-index ea9d6a2..e6b168a 100644
---- a/src/rabbit_control_main.erl
-+++ b/src/rabbit_control_main.erl
-@@ -23,7 +23,7 @@
- sync_queue/1, cancel_sync_queue/1, become/1,
- purge_queue/1]).
-
---import(rabbit_misc, [rpc_call/4, rpc_call/5, rpc_call/7]).
-+-import(rabbit_misc, [rpc_call/4, rpc_call/5]).
-
- -define(EXTERNAL_CHECK_INTERVAL, 1000).
-
-@@ -595,56 +595,74 @@ action(purge_queue, Node, [Q], Opts, Inform, Timeout) ->
-
- action(list_users, Node, [], _Opts, Inform, Timeout) ->
- Inform("Listing users", []),
-- call(Node, {rabbit_auth_backend_internal, list_users, []},
-- rabbit_auth_backend_internal:user_info_keys(), true, Timeout);
-+ call_emitter(Node, {rabbit_auth_backend_internal, list_users, []},
-+ rabbit_auth_backend_internal:user_info_keys(),
-+ [{timeout, Timeout}, to_bin_utf8]);
-
- action(list_permissions, Node, [], Opts, Inform, Timeout) ->
- VHost = proplists:get_value(?VHOST_OPT, Opts),
- Inform("Listing permissions in vhost \"~s\"", [VHost]),
-- call(Node, {rabbit_auth_backend_internal, list_vhost_permissions, [VHost]},
-- rabbit_auth_backend_internal:vhost_perms_info_keys(), true, Timeout,
-- true);
-+ call_emitter(Node, {rabbit_auth_backend_internal, list_vhost_permissions, [VHost]},
-+ rabbit_auth_backend_internal:vhost_perms_info_keys(),
-+ [{timeout, Timeout}, to_bin_utf8, is_escaped]);
-
- action(list_parameters, Node, [], Opts, Inform, Timeout) ->
- VHostArg = list_to_binary(proplists:get_value(?VHOST_OPT, Opts)),
- Inform("Listing runtime parameters", []),
-- call(Node, {rabbit_runtime_parameters, list_formatted, [VHostArg]},
-- rabbit_runtime_parameters:info_keys(), Timeout);
-+ call_emitter(Node, {rabbit_runtime_parameters, list_formatted, [VHostArg]},
-+ rabbit_runtime_parameters:info_keys(),
-+ [{timeout, Timeout}]);
-
- action(list_policies, Node, [], Opts, Inform, Timeout) ->
- VHostArg = list_to_binary(proplists:get_value(?VHOST_OPT, Opts)),
- Inform("Listing policies", []),
-- call(Node, {rabbit_policy, list_formatted, [VHostArg]},
-- rabbit_policy:info_keys(), Timeout);
-+ call_emitter(Node, {rabbit_policy, list_formatted, [VHostArg]},
-+ rabbit_policy:info_keys(),
-+ [{timeout, Timeout}]);
-
- action(list_vhosts, Node, Args, _Opts, Inform, Timeout) ->
- Inform("Listing vhosts", []),
- ArgAtoms = default_if_empty(Args, [name]),
-- call(Node, {rabbit_vhost, info_all, []}, ArgAtoms, true, Timeout);
-+ call_emitter(Node, {rabbit_vhost, info_all, []}, ArgAtoms,
-+ [{timeout, Timeout}, to_bin_utf8]);
-
- action(list_user_permissions, _Node, _Args = [], _Opts, _Inform, _Timeout) ->
- {error_string,
- "list_user_permissions expects a username argument, but none provided."};
- action(list_user_permissions, Node, Args = [_Username], _Opts, Inform, Timeout) ->
- Inform("Listing permissions for user ~p", Args),
-- call(Node, {rabbit_auth_backend_internal, list_user_permissions, Args},
-- rabbit_auth_backend_internal:user_perms_info_keys(), true, Timeout,
-- true);
-+ call_emitter(Node, {rabbit_auth_backend_internal, list_user_permissions, Args},
-+ rabbit_auth_backend_internal:user_perms_info_keys(),
-+ [{timeout, Timeout}, to_bin_utf8, is_escaped]);
-
- action(list_queues, Node, Args, Opts, Inform, Timeout) ->
-- [Online, Offline] = rabbit_cli:filter_opts(Opts, [?ONLINE_OPT, ?OFFLINE_OPT]),
- Inform("Listing queues", []),
-+ %% User options
-+ [Online, Offline] = rabbit_cli:filter_opts(Opts, [?ONLINE_OPT, ?OFFLINE_OPT]),
- VHostArg = list_to_binary(proplists:get_value(?VHOST_OPT, Opts)),
- ArgAtoms = default_if_empty(Args, [name, messages]),
-- call(Node, {rabbit_amqqueue, info_all, [VHostArg, ArgAtoms, Online, Offline]},
-- ArgAtoms, Timeout);
-+
-+ %% Data for emission
-+ Nodes = nodes_in_cluster(Node, Timeout),
-+ OnlineChunks = if Online -> length(Nodes); true -> 0 end,
-+ OfflineChunks = if Offline -> 1; true -> 0 end,
-+ ChunksOpt = {chunks, OnlineChunks + OfflineChunks},
-+ TimeoutOpt = {timeout, Timeout},
-+ EmissionRef = make_ref(),
-+ EmissionRefOpt = {ref, EmissionRef},
-+
-+ _ = Online andalso start_emission(Node, {rabbit_amqqueue, emit_info_all, [Nodes, VHostArg, ArgAtoms]},
-+ [TimeoutOpt, EmissionRefOpt]),
-+ _ = Offline andalso start_emission(Node, {rabbit_amqqueue, emit_info_down, [VHostArg, ArgAtoms]},
-+ [TimeoutOpt, EmissionRefOpt]),
-+ display_emission_result(EmissionRef, ArgAtoms, [ChunksOpt, TimeoutOpt]);
-
- action(list_exchanges, Node, Args, Opts, Inform, Timeout) ->
- Inform("Listing exchanges", []),
- VHostArg = list_to_binary(proplists:get_value(?VHOST_OPT, Opts)),
- ArgAtoms = default_if_empty(Args, [name, type]),
-- call(Node, {rabbit_exchange, info_all, [VHostArg, ArgAtoms]},
-- ArgAtoms, Timeout);
-+ call_emitter(Node, {rabbit_exchange, info_all, [VHostArg, ArgAtoms]},
-+ ArgAtoms, [{timeout, Timeout}]);
-
- action(list_bindings, Node, Args, Opts, Inform, Timeout) ->
- Inform("Listing bindings", []),
-@@ -652,27 +670,31 @@ action(list_bindings, Node, Args, Opts, Inform, Timeout) ->
- ArgAtoms = default_if_empty(Args, [source_name, source_kind,
- destination_name, destination_kind,
- routing_key, arguments]),
-- call(Node, {rabbit_binding, info_all, [VHostArg, ArgAtoms]},
-- ArgAtoms, Timeout);
-+ call_emitter(Node, {rabbit_binding, info_all, [VHostArg, ArgAtoms]},
-+ ArgAtoms, [{timeout, Timeout}]);
-
- action(list_connections, Node, Args, _Opts, Inform, Timeout) ->
- Inform("Listing connections", []),
- ArgAtoms = default_if_empty(Args, [user, peer_host, peer_port, state]),
-- call(Node, {rabbit_networking, connection_info_all, [ArgAtoms]},
-- ArgAtoms, Timeout);
-+ Nodes = nodes_in_cluster(Node, Timeout),
-+ call_emitter(Node, {rabbit_networking, emit_connection_info_all, [Nodes, ArgAtoms]},
-+ ArgAtoms, [{timeout, Timeout}, {chunks, length(Nodes)}]);
-
- action(list_channels, Node, Args, _Opts, Inform, Timeout) ->
- Inform("Listing channels", []),
- ArgAtoms = default_if_empty(Args, [pid, user, consumer_count,
- messages_unacknowledged]),
-- call(Node, {rabbit_channel, info_all, [ArgAtoms]},
-- ArgAtoms, Timeout);
-+ Nodes = nodes_in_cluster(Node, Timeout),
-+ call_emitter(Node, {rabbit_channel, emit_info_all, [Nodes, ArgAtoms]}, ArgAtoms,
-+ [{timeout, Timeout}, {chunks, length(Nodes)}]);
-
- action(list_consumers, Node, _Args, Opts, Inform, Timeout) ->
- Inform("Listing consumers", []),
- VHostArg = list_to_binary(proplists:get_value(?VHOST_OPT, Opts)),
-- call(Node, {rabbit_amqqueue, consumers_all, [VHostArg]},
-- rabbit_amqqueue:consumer_info_keys(), Timeout);
-+ Nodes = nodes_in_cluster(Node, Timeout),
-+ call_emitter(Node, {rabbit_amqqueue, emit_consumers_all, [Nodes, VHostArg]},
-+ rabbit_amqqueue:consumer_info_keys(),
-+ [{timeout, Timeout}, {chunks, length(Nodes)}]);
-
- action(node_health_check, Node, _Args, _Opts, Inform, Timeout) ->
- Inform("Checking health of node ~p", [Node]),
-@@ -788,17 +810,18 @@ display_info_message_row(IsEscaped, Result, InfoItemKeys) ->
- {X, Value} -> Value
- end, IsEscaped) || X <- InfoItemKeys]).
-
--display_info_message(IsEscaped) ->
-+display_info_message(IsEscaped, InfoItemKeys) ->
- fun ([], _) ->
- ok;
-- ([FirstResult|_] = List, InfoItemKeys) when is_list(FirstResult) ->
-+ ([FirstResult|_] = List, _) when is_list(FirstResult) ->
- lists:foreach(fun(Result) ->
- display_info_message_row(IsEscaped, Result, InfoItemKeys)
- end,
- List),
- ok;
-- (Result, InfoItemKeys) ->
-- display_info_message_row(IsEscaped, Result, InfoItemKeys)
-+ (Result, _) ->
-+ display_info_message_row(IsEscaped, Result, InfoItemKeys),
-+ ok
- end.
-
- display_info_list(Results, InfoItemKeys) when is_list(Results) ->
-@@ -855,7 +878,10 @@ display_call_result(Node, MFA) ->
- end.
-
- unsafe_rpc(Node, Mod, Fun, Args) ->
-- case rpc_call(Node, Mod, Fun, Args) of
-+ unsafe_rpc(Node, Mod, Fun, Args, ?RPC_TIMEOUT).
-+
-+unsafe_rpc(Node, Mod, Fun, Args, Timeout) ->
-+ case rpc_call(Node, Mod, Fun, Args, Timeout) of
- {badrpc, _} = Res -> throw(Res);
- Normal -> Normal
- end.
-@@ -874,33 +900,42 @@ ensure_app_running(Node) ->
- call(Node, {Mod, Fun, Args}) ->
- rpc_call(Node, Mod, Fun, lists:map(fun list_to_binary_utf8/1, Args)).
-
--call(Node, {Mod, Fun, Args}, InfoKeys, Timeout) ->
-- call(Node, {Mod, Fun, Args}, InfoKeys, false, Timeout, false).
-+call_emitter(Node, {Mod, Fun, Args}, InfoKeys, Opts) ->
-+ Ref = start_emission(Node, {Mod, Fun, Args}, Opts),
-+ display_emission_result(Ref, InfoKeys, Opts).
-+
-+start_emission(Node, {Mod, Fun, Args}, Opts) ->
-+ ToBinUtf8 = proplists:get_value(to_bin_utf8, Opts, false),
-+ Timeout = proplists:get_value(timeout, Opts, infinity),
-+ Ref = proplists:get_value(ref, Opts, make_ref()),
-+ rabbit_control_misc:spawn_emitter_caller(
-+ Node, Mod, Fun, prepare_call_args(Args, ToBinUtf8),
-+ Ref, self(), Timeout),
-+ Ref.
-+
-+display_emission_result(Ref, InfoKeys, Opts) ->
-+ IsEscaped = proplists:get_value(is_escaped, Opts, false),
-+ Chunks = proplists:get_value(chunks, Opts, 1),
-+ Timeout = proplists:get_value(timeout, Opts, infinity),
-+ EmissionStatus = rabbit_control_misc:wait_for_info_messages(
-+ self(), Ref, display_info_message(IsEscaped, InfoKeys), ok, Timeout, Chunks),
-+ emission_to_action_result(EmissionStatus).
-+
-+%% Convert rabbit_control_misc:wait_for_info_messages/6 return value
-+%% into form expected by rabbit_cli:main/3.
-+emission_to_action_result({ok, ok}) ->
-+ ok;
-+emission_to_action_result({error, Error}) ->
-+ Error.
-
--call(Node, {Mod, Fun, Args}, InfoKeys, ToBinUtf8, Timeout) ->
-- call(Node, {Mod, Fun, Args}, InfoKeys, ToBinUtf8, Timeout, false).
-+prepare_call_args(Args, ToBinUtf8) ->
-+ case ToBinUtf8 of
-+ true -> valid_utf8_args(Args);
-+ false -> Args
-+ end.
-
--call(Node, {Mod, Fun, Args}, InfoKeys, ToBinUtf8, Timeout, IsEscaped) ->
-- Args0 = case ToBinUtf8 of
-- true -> lists:map(fun list_to_binary_utf8/1, Args);
-- false -> Args
-- end,
-- Ref = make_ref(),
-- Pid = self(),
-- spawn_link(
-- fun () ->
-- case rabbit_cli:rpc_call(Node, Mod, Fun, Args0,
-- Ref, Pid, Timeout) of
-- {error, _} = Error ->
-- Pid ! {error, Error};
-- {bad_argument, _} = Error ->
-- Pid ! {error, Error};
-- _ ->
-- ok
-- end
-- end),
-- rabbit_control_misc:wait_for_info_messages(
-- Pid, Ref, InfoKeys, display_info_message(IsEscaped), Timeout).
-+valid_utf8_args(Args) ->
-+ lists:map(fun list_to_binary_utf8/1, Args).
-
- list_to_binary_utf8(L) ->
- B = list_to_binary(L),
-@@ -950,7 +985,10 @@ split_list([_]) -> exit(even_list_needed);
- split_list([A, B | T]) -> [{A, B} | split_list(T)].
-
- nodes_in_cluster(Node) ->
-- unsafe_rpc(Node, rabbit_mnesia, cluster_nodes, [running]).
-+ unsafe_rpc(Node, rabbit_mnesia, cluster_nodes, [running], ?RPC_TIMEOUT).
-+
-+nodes_in_cluster(Node, Timeout) ->
-+ unsafe_rpc(Node, rabbit_mnesia, cluster_nodes, [running], Timeout).
-
- alarms_by_node(Name) ->
- case rpc_call(Name, rabbit, status, []) of
+++ /dev/null
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Sun, 17 Jul 2016 18:42:06 +0300
-Subject: [PATCH] rabbit_prelaunch must use RABBITMQ_SERVER_ERL_ARGS
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
-index 7433731..25fff3a 100755
---- a/scripts/rabbitmq-server
-+++ b/scripts/rabbitmq-server
-@@ -71,6 +71,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \
- -boot "${CLEAN_BOOT_FILE}" \
- -noinput \
- -hidden \
-+ ${RABBITMQ_SERVER_ERL_ARGS} \
- -s rabbit_prelaunch \
- ${RABBITMQ_NAME_TYPE} rabbitmqprelaunch$$ \
- -extra "${RABBITMQ_NODENAME}"
+++ /dev/null
-From 8141695bdab69d5abd4ae0611c35436840da3c07 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Sat, 21 Mar 2020 23:39:01 +0800
-Subject: [PATCH] rabbitmqctl: set HOME variable for stx bootstrap
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- scripts/rabbitmqctl | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
-index 2336c3d..430f4a3 100755
---- a/scripts/rabbitmqctl
-+++ b/scripts/rabbitmqctl
-@@ -24,6 +24,8 @@ if [ -z "$ERL_CRASH_DUMP_SECONDS" ]; then
- export ERL_CRASH_DUMP_SECONDS=0
- fi
-
-+export HOME
-+
- # We specify Mnesia dir and sasl error logger since some actions
- # (e.g. forget_cluster_node --offline) require us to impersonate the
- # real node.
---
-2.7.4
-
+++ /dev/null
-/var/log/rabbitmq/*.log {
- weekly
- missingok
- rotate 20
- compress
- delaycompress
- notifempty
- sharedscripts
- postrotate
- /usr/sbin/rabbitmqctl -q rotate_logs
- endscript
-}
+++ /dev/null
-[Unit]
-Description=RabbitMQ Messaging broker/server service
-After=network.target
-
-[Service]
-Type=simple
-User=root
-Environment=HOME=/home/root
-WorkingDirectory=/var/lib/rabbitmq
-LogsDirectory=rabbitmq
-ExecStartPre=/usr/bin/rabbitmq-server-setup
-ExecStart=/usr/bin/rabbitmq-server
-ExecStop=/usr/bin/rabbitmqctl stop
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-D /var/run/rabbitmq 0755 rabbitmq rabbitmq -
+++ /dev/null
-
-DESCRIPTION = "High-performance AMQP-compliant message broker written in Erlang."
-HOMEPAGE = "http://www.rabbitmq.com/"
-SECTION = "network"
-
-LICENSE = "MPL-1.1"
-LIC_FILES_CHKSUM = "file://LICENSE-MPL-RabbitMQ;md5=ce8293a7cc187353c90cb24a8ecee4ce"
-
-SRC_URI = " \
- https://github.com/rabbitmq/${BPN}/releases/download/rabbitmq_v3_6_5/${BP}.tar.xz \
- file://rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch \
- file://rabbitmq-server-0002-Add-systemd-notification-support.patch \
- file://rabbitmq-server-0003-Revert-Distinct-exit-codes-for-CLI-utilities.patch \
- file://rabbitmq-server-0004-Allow-guest-login-from-non-loopback-connections.patch \
- file://rabbitmq-server-0005-Avoid-RPC-roundtrips-in-list-commands.patch \
- file://rabbitmq-server-0006-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch \
- file://rabbitmq-common-0001-Avoid-RPC-roundtrips-while-listing-items.patch;patchdir=deps/rabbit_common \
- file://rabbitmq-common-0002-Use-proto_dist-from-command-line.patch;patchdir=deps/rabbit_common \
- file://rabbitmq-server-fails-with-home-not-set.patch \
- file://rabbitmq-script-wrapper \
- file://rabbitmq-server.logrotate \
- file://rabbitmq-server.tmpfiles \
-"
-
-SRC_URI[md5sum] = "e9f96b5763a89a246f53250e46c2796b"
-SRC_URI[sha256sum] = "9550433ca8aaf5130bf5235bb978c44d3c4694cbd09d97114b3859f4895788ec"
-
-DEPENDS = " \
- coreutils-native\
- erlang-ssl \
- erlang-ssl-dev \
- erlang-native \
- libxslt \
- libxslt-native \
- python-simplejson \
- rsync-native \
- unzip-native \
- xmlto-native \
- zip-native \
-"
-
-# ../../../../../recipe-sysroot/usr/lib/erlang/lib/ssl-5.3.3/src/
-do_compile() {
- export SOCKJS_ERLC_OPTS="-Dpre17_type_specs"
- rm -rf deps/rabbit_common/include/ssl
- mkdir ${S}/deps/rabbit_common/include/ssl
- cp -r ${RECIPE_SYSROOT}/${libdir}/erlang/lib/ssl-5.3.3/src ${S}/deps/rabbit_common/include/ssl
- oe_runmake
-}
-
-do_install() {
- RABBIT_LIB_DIR=${libdir}/rabbitmq
-
- oe_runmake install \
- DESTDIR=${D} \
- PREFIX=${prefix} \
- RMQ_ROOTDIR=${RABBIT_LIB_DIR}
-
- oe_runmake install-man \
- DESTDIR=${D} \
- PREFIX=${prefix} \
- RMQ_ROOTDIR=${RABBIT_LIB_DIR}
-
- mkdir -p ${D}${localstatedir}/lib/rabbitmq/mnesia
- mkdir -p ${D}${localstatedir}/log/rabbitmq
-
- # Copy all necessary lib files etc.
- install -p -D -m 0644 ${S}/docs/rabbitmq-server.service.example ${D}${systemd_system_unitdir}/rabbitmq-server.service
- install -p -D -m 0755 ${WORKDIR}/rabbitmq-script-wrapper ${D}${sbindir}/rabbitmqctl
- install -p -D -m 0755 ${WORKDIR}/rabbitmq-script-wrapper ${D}${sbindir}/rabbitmq-server
- install -p -D -m 0755 ${WORKDIR}/rabbitmq-script-wrapper ${D}${sbindir}/rabbitmq-plugins
-
- # Make necessary symlinks
- mkdir -p ${D}${RABBIT_LIB_DIR}/bin
- for app in rabbitmq-defaults rabbitmq-env rabbitmq-plugins rabbitmq-server rabbitmqctl; do
- ln -s ${RABBIT_LIB_DIR}/lib/rabbitmq_server-${PV}/sbin/${app} ${D}${RABBIT_LIB_DIR}/bin/${app}
- done
-
- install -p -D -m 0755 ${S}/scripts/rabbitmq-server.ocf ${D}${exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server
- install -p -D -m 0755 ${S}/scripts/rabbitmq-server-ha.ocf ${D}${exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server-ha
-
- install -p -D -m 0644 ${WORKDIR}/rabbitmq-server.logrotate ${D}${sysconfdir}/logrotate.d/rabbitmq-server
-
- install -p -D -m 0644 ${S}/docs/rabbitmq.config.example ${D}${sysconfdir}/rabbitmq/rabbitmq.config
-
- rm -rf ${D}${RABBIT_LIB_DIR}/lib/rabbitmq_server-${PV}/{LICENSE,LICENSE-*,INSTALL}
-
- install -p -D -m 0644 ${WORKDIR}/rabbitmq-server.tmpfiles ${D}${prefix}/lib/tmpfiles.d/${BPN}.conf
-}
-
-inherit useradd systemd openssl10
-
-USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system rabbitmq"
-USERADD_PARAM_${PN} = " \
- --system --create-home \
- --home ${localstatedir}/lib/rabbitmq \
- -g rabbitmq rabbitmq \
-"
-
-SYSTEMD_SERVICE_${PN} = "rabbitmq-server.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-
-FILES_${PN} += " \
- ${RABBIT_LIB_DIR}/* \
- ${exec_prefix}/lib/* \
- ${localstatedir} \
-"
-
-FILES_${PN}-doc += "LICENSE* INSTALL"
-
-RDEPENDS_${PN} = " \
- erlang \
- erlang-modules \
-"
-
-INSANE_SKIP_${PN} = "unsafe-references-in-scripts"
+++ /dev/null
-[Unit]
-Description=v2 Registry token server for Docker
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/docker-distribution/registry/token_server.conf
-ExecStart=/usr/bin/registry-token-server -addr=${REGISTRY_TOKEN_SERVER_ADDR} \
- -issuer=${REGISTRY_TOKEN_SERVER_ISSUER} \
- -endpoint=${REGISTRY_TOKEN_SERVER_KS_ENDPOINT} \
- -tlscert=${REGISTRY_TOKEN_SERVER_TLSCERT} \
- -tlskey=${REGISTRY_TOKEN_SERVER_TLSKEY} \
- -realm=${REGISTRY_TOKEN_SERVER_REALM} \
- -key=${REGISTRY_TOKEN_SERVER_KEY}
-Restart=on-failure
-ExecStartPost=/bin/bash -c 'echo $MAINPID > /var/run/registry-token-server.pid'
-ExecStopPost=/bin/rm -f /var/run/registry-token-server.pid
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
------BEGIN CERTIFICATE-----
-MIIDADCCAegCCQCSevkS4h7LQjANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJY
-WDEVMBMGA1UEBwwMRGVmYXVsdCBDaXR5MRwwGgYDVQQKDBNEZWZhdWx0IENvbXBh
-bnkgTHRkMB4XDTE4MDkyMTE0MTYwOFoXDTE5MDkyMTE0MTYwOFowQjELMAkGA1UE
-BhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UECgwTRGVmYXVsdCBD
-b21wYW55IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtCbNJ/
-aPEMkZFEtMKRomOh9NgeOv0jYFY5i23fXghtTgdXu9//H3Huz5/KDJ+XEUp2DZgK
-YQ2UHVR+cqj2sFjCllfAVrzmv9FFR0CQpQxqKcxChefVwsMh6XsqF+GzbqzFOx67
-bT39Xb5+spAmDHctFl3nrmyA1wM6e+OXcktC0chILeN+UEyq5Xeng6/BpVnI2UaY
-J1OpfuUrffddy5t0oeuKGZ/xG2g9sL6GMGBeVslOmLg4CBOwq3knUGoOTFYSjHVx
-rU/p4YgUotIUvb4GBsXqbiI7M2NakItTR6mxfcYiKkxfjadQlptFyGucI84mMYx8
-vO3o6TFLfcTYqZ8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAHXZR0U0pyMkYIeO5
-Y/n0H9Onj/PtCJHBbYzMHZGMPlX2IbW+JAeE/0XNIYGHtAtFwlb825Tkg2p7wpa8
-8HmOBqkTyn2ywDdmPqdfjCiMu/Ge6tkLjqkmYWv2l/d4+qEMR4dUh9g8SrrtUdZg
-DP7H22B+0knQ7s04JuiJ27hqi4nPOzdwdJNpz5Przgce8vN1ihk8194pR/uoNrjP
-td3Po+DwmxFKigoKPQCHgQuD63mAFor4vVnht+IkNbB3/lQyXP6Qv7DnWVW9WDBL
-nKxgXhRwyy5mYebYmwA//JX41O/Kdp1Q6oWgv4zSLd8M9FIMtESG8k4gSl0XfUBa
-Y24p0Q==
------END CERTIFICATE-----
+++ /dev/null
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAq0Js0n9o8QyRkUS0wpGiY6H02B46/SNgVjmLbd9eCG1OB1e7
-3/8fce7Pn8oMn5cRSnYNmAphDZQdVH5yqPawWMKWV8BWvOa/0UVHQJClDGopzEKF
-59XCwyHpeyoX4bNurMU7HrttPf1dvn6ykCYMdy0WXeeubIDXAzp745dyS0LRyEgt
-435QTKrld6eDr8GlWcjZRpgnU6l+5St9913Lm3Sh64oZn/EbaD2wvoYwYF5WyU6Y
-uDgIE7CreSdQag5MVhKMdXGtT+nhiBSi0hS9vgYGxepuIjszY1qQi1NHqbF9xiIq
-TF+Np1CWm0XIa5wjziYxjHy87ejpMUt9xNipnwIDAQABAoIBAFHCIV+QkdHZ9TiL
-u1vT2NmFvPTb4b9tfxVK3YRziVmujPy2Zqu2CRYEMzyOYd5iaU/J8g1ujwzDdAkd
-YLHHK0MEim+UFBSUeGh4kV6CbzjxCclIzNJz20n6y5MP8ly+o4x5kBLI2YsphPJn
-W+mzMGpIrQ/hhgSosX0KE5EAgQDqOfJSlhZvSgSO5UF9nXvEn7Y9Zc8GK0XQdcwB
-Pr8iFhuhEJmmb4LrCm+3Me/fhLxFjUAOAcLSkFnqfxo2vAuRqk99OOLxFEfPYZB8
-kLkKlQ+PwhkG3pjPg6w/rOmBHqW/ZEpd87972JWeHscXYpb/cLLVmcJbZI/claos
-YOHS7CECgYEA4XKo7GzuqSkLskfaZM2pyNhHbxphqyNfk8GmW5NJnKavpmY8YiXh
-7hNXXf4HCkcHvHMn4JUCHgHVavDNhNnrHNrQAzO3KwuUrrFiBP+yP1tRyQ4BP395
-KIBSUyeEOo9vM7d3yerI8WHboio5gaoqEfeNS1dakZ6ZiOpoP94CIxECgYEAwnfW
-Drdcqkpj794gYDlXH4D279f7+qmq11eI4C0zkZzTFkExl8BGfqpy49kruaTm0e4t
-L1B23TYfKC0ei4BQskyNCHUnl/eic/JHe9gJRd6BAZi2REfV0LI4ytYGgniCu50H
-EJVvTVMXS/+wWcjZr037oV6/WiB9Wzr7Z1oFoa8CgYBlmqdG5lEpK7Z5wqhKheXe
-/pozGFCsMGUC0mOHIfoq/3RqKelM0oXgJhdZ5QKHPzvdUojGTmGF5I2qhJwbI5sy
-her5hnUmkTGRCaCDYDmVFDLnycgGNg0Ek9CGaWjOe5ZCWI1EEuw83T1++Eiyh14u
-esLTEatftXq8megh4IxWAQKBgQCTNfox27ZnJrcuXn0tulpse8jy2RJjt0qfhyET
-asRN52SXxTRQhvoWattcBgsmlmEw69cCqSvB23WMiVNFERaFUpO0olMdpBUzJmXc
-pzal0IDh/4OCfsqqGDALxCbbX3S/p2gwsp617z+EhYMvBG9dWHAywTGjfVLH3Ady
-PmBi+wKBgQCWJS/PmTpyO8LU4MYZk91mJmjHAsPlgi/9n8yEqdmins+X698IsoCr
-s2FN8rol8+UP8c3m9o4kp62ouoby2QzAZw0y3UGWcxOb3ZpoozatKodsoETSLLoL
-T//wVn2Z2MsS9tLOBLZzsZiYlHyYxTUm7UTOdxdjbSLWVdLbCpKEhg==
------END RSA PRIVATE KEY-----
+++ /dev/null
-
-# This is a puppet managed config file
+++ /dev/null
-
-DESCRIPTION = " Token server for use with Docker registry with Openstack Keystone back end"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
-
-GO_IMPORT = "registry-token-server"
-
-SRC_URI = "file://registry-token-server-1.0.0.tar.gz \
- file://registry-token-server.service \
- file://token_server.conf \
- "
-
-RDEPENDS_${PN}-dev_append = "systemd"
-
-DEPENDS += "\
- go-logrus \
- docker-distribution \
- go-libtrust \
- go-patricia \
- go-mux \
- go-context \
- go-phercloud \
- "
-
-inherit go goarch ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
-
-do_compile() {
- mkdir -p _build/src
- ln -sfn ${WORKDIR}/${PN}-${PV} ./_build/src/registry-token-server
-
- # Pass the needed cflags/ldflags so that cgo
- # can find the needed headers files and libraries
- export GOARCH=${TARGET_GOARCH}
- export CGO_ENABLED="1"
- export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-
- export GOPATH="${WORKDIR}/build/_build:${STAGING_DIR_TARGET}/${prefix}/local/go"
- cd _build/src/${GO_IMPORT}
- #oe_runmake registry-token-server
- export GOROOT=${STAGING_DIR_TARGET}/${prefix}/local/go
- go build -o ${WORKDIR}/build/bin/registry-token-server registry-token-server
-}
-
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "registry-token-server.service"
-SYSTEMD_AUTO_ENABLE = "enable"
-
-do_install() {
- install -d ${D}/${sbindir}
- install -m 0755 bin/registry-token-server ${D}/${sbindir}
- install -d ${D}/${sysconfdir}/registry-token-server/registry
- install -m 0644 ${WORKDIR}/token_server.conf ${D}/${sysconfdir}/registry-token-server/registry
-
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/registry-token-server.service ${D}${systemd_unitdir}/system/
- fi
-}
-
+++ /dev/null
-
-DESCRIPTION = "StarlingX distributedcloud packages collection"
-HOMEPAGE = "https://opendev.org/starlingx"
-SECTION = "network"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/registry-token-server/registry-token-server/src/LICENSE;md5=d2794c0df5b907fdace235a619d80314"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCNAME = "containers"
-SRCREV = "1a4b803e946b488c1f3adb25ab0614d1b0c3c9b8"
-PV = "1.0.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-GO_IMPORT = "registry-token-server"
-
-RDEPENDS_${PN}-dev_append = " \
- systemd \
- "
-
-DEPENDS += "\
- go-logrus \
- docker-distribution \
- go-libtrust \
- go-patricia \
- go-mux \
- go-context \
- go-phercloud \
- "
-
-RDEPENDS_${PN} = " \
- docker-distribution \
- docker-ce \
- "
-
-inherit go goarch ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
-
-do_compile() {
- mkdir -p _build/src
- ln -sfn ${S}/src/registry-token-server/registry-token-server/src/ ./_build/src/registry-token-server
-
- # Pass the needed cflags/ldflags so that cgo
- # can find the needed headers files and libraries
- export GOARCH=${TARGET_GOARCH}
- export CGO_ENABLED="1"
- export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-
- export GOPATH="${WORKDIR}/build/_build:${STAGING_DIR_TARGET}/${prefix}/local/go"
- cd _build/src/${GO_IMPORT}
- #oe_runmake registry-token-server
- export GOROOT=${STAGING_DIR_TARGET}/${prefix}/local/go
- go build -o ${WORKDIR}/build/bin/registry-token-server registry-token-server
-}
-
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "registry-token-server.service"
-SYSTEMD_AUTO_ENABLE = "disable"
-
-do_install() {
- SRCPATH="${S}/src/registry-token-server/registry-token-server/centos/files"
- install -d ${D}/${bindir}
- install -m 0755 bin/registry-token-server ${D}/${bindir}
- install -d -m 0755 ${D}/${sysconfdir}/registry-token-server/registry
- install -m 0644 ${SRCPATH}//token_server.conf ${D}/${sysconfdir}/registry-token-server/registry
-
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${SRCPATH}/registry-token-server.service ${D}${systemd_unitdir}/system/
- fi
-}
-
+++ /dev/null
-From 377b11c0255d717912f585e7c16c6c053e6cc913 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Thu, 23 Jan 2020 07:02:11 +0000
-Subject: [PATCH] pragma ignore cast type errors with gcc 8.3
-
----
- core/emperor.c | 2 ++
- plugins/python/uwsgi_pymodule.c | 4 +++-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/core/emperor.c b/core/emperor.c
-index 97596556..d64110cb 100644
---- a/core/emperor.c
-+++ b/core/emperor.c
-@@ -988,7 +988,9 @@ int uwsgi_emperor_vassal_start(struct uwsgi_instance *n_ui) {
- #if defined(__linux__) && !defined(OBSOLETE_LINUX_KERNEL) && !defined(__ia64__)
- if (uwsgi.emperor_clone) {
- char stack[PTHREAD_STACK_MIN];
-+#pragma GCC diagnostic ignored "-Wcast-function-type"
- pid = clone((int (*)(void *)) uwsgi_emperor_spawn_vassal, stack + PTHREAD_STACK_MIN, SIGCHLD | uwsgi.emperor_clone, (void *) n_ui);
-+#pragma GCC diagnostic error "-Wcast-function-type"
- }
- else {
- #endif
-diff --git a/plugins/python/uwsgi_pymodule.c b/plugins/python/uwsgi_pymodule.c
-index d3075897..ac3ccb89 100644
---- a/plugins/python/uwsgi_pymodule.c
-+++ b/plugins/python/uwsgi_pymodule.c
-@@ -1,4 +1,5 @@
- #include "uwsgi_python.h"
-+#pragma GCC diagnostic ignored "-Wcast-function-type"
-
- extern struct uwsgi_server uwsgi;
- extern struct uwsgi_python up;
-@@ -2553,6 +2554,7 @@ PyObject *py_uwsgi_parse_file(PyObject * self, PyObject * args) {
- }
-
- static PyMethodDef uwsgi_spooler_methods[] = {
-+
- #ifdef PYTHREE
- {"send_to_spooler", (PyCFunction) py_uwsgi_send_spool, METH_VARARGS | METH_KEYWORDS, ""},
- {"spool", (PyCFunction) py_uwsgi_send_spool, METH_VARARGS | METH_KEYWORDS, ""},
-@@ -2569,7 +2571,6 @@ static PyMethodDef uwsgi_spooler_methods[] = {
- {NULL, NULL},
- };
-
--
- PyObject *py_uwsgi_suspend(PyObject * self, PyObject * args) {
-
- struct wsgi_request *wsgi_req = py_current_wsgi_req();
-@@ -3918,3 +3919,4 @@ void init_uwsgi_module_snmp(PyObject * current_uwsgi_module) {
-
- uwsgi_log( "SNMP python functions initialized.\n");
- }
-+#pragma GCC diagnostic error "-Wcast-function-type"
---
-2.23.0
-
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://0001-pragma-ignore-cast-type-errors-with-gcc-8.3.patch"
+++ /dev/null
-From f46352af3ad505830d14b016bc48310fd1c3cea5 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 27 Apr 2020 11:51:58 +0800
-Subject: [PATCH 1/4] disable doc build
-
-Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
-
-Rebase for 4.1.1
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index fccaca4..afd8fa5 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -37,7 +37,7 @@ RGMANAGER = with
- endif
-
- if BUILD_LINUX_HA
--SUBDIRS += include heartbeat tools ldirectord doc systemd
-+SUBDIRS += include heartbeat tools ldirectord systemd
- LINUX_HA = without
- else
- LINUX_HA = with
---
-2.7.4
-
+++ /dev/null
-From 09c0d3deaed7aa4aa6ec07dd89c4233833133c72 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 27 Apr 2020 11:53:02 +0800
-Subject: [PATCH 2/4] Set OCF_ROOT_DIR to ${libdir}/ocf
-
-Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
-
-Rebase for 4.1.1
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 113503e..e1ed2e8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -413,7 +413,7 @@ dnl Variables needed for substitution
- AC_CHECK_HEADERS(heartbeat/glue_config.h)
-
- if test "$ac_cv_header_heartbeat_glue_config_h" = "yes"; then
-- OCF_ROOT_DIR=`extract_header_define heartbeat/glue_config.h OCF_ROOT_DIR`
-+ OCF_ROOT_DIR="${libdir}/ocf"
- else
- enable_libnet=no
- fi
---
-2.7.4
-
+++ /dev/null
-From 6f3f2d6c129577f8666aee7b506d0b52a58bba0e Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 27 Apr 2020 11:53:55 +0800
-Subject: [PATCH 3/4] fix header defs lookup
-
-Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
-
-Rebase for 4.1.1
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- configure.ac | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e1ed2e8..4d5fb96 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -148,9 +148,8 @@ extract_header_define() {
- Cfile=$srcdir/extract_define.$2.${$}
- printf "#include <stdio.h>\n" > ${Cfile}.c
- printf "#include <%s>\n" $1 >> ${Cfile}.c
-- printf "int main(int argc, char **argv) { printf(\"%%s\", %s); return 0; }\n" $2 >> ${Cfile}.c
-- $CC $CFLAGS ${Cfile}.c -o ${Cfile}
-- value=`${Cfile}`
-+ printf "\"%s\":%s\n" $2 $2 >> ${Cfile}.c
-+ value=`$CC $CFLAGS -E ${Cfile}.c | grep \"$2\" | cut -f 2 -d ':'`
- AC_MSG_RESULT($value)
- printf $value
- rm -f ${Cfile}.c ${Cfile}
---
-2.7.4
-
+++ /dev/null
-From e2dff24c2d99e91c88a5532405a668f995b24a86 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 27 Apr 2020 11:55:33 +0800
-Subject: [PATCH 4/4] configure.ac: fix install-sh not found
-
-Fix configure.ac to cope with new autoconf.
-Recent autoconfs generate a bad configure when AM_INIT_AUTOMAKE is
-called as late as it was, ending up thinking that the am_aux_dir is pwd
-at the start of the build. Move it up to under AC_INIT to fix that.
-
-Author: William Grant <wgrant@ubuntu.com>
-
-Upstream-Status: Pending
-
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724116
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-
-Rebase for 4.1.1
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- configure.ac | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4d5fb96..af7f646 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,13 +23,20 @@ AC_INIT([resource-agents],
- m4_esyscmd([make/git-version-gen .tarball-version]),
- [to_be_defined@foobar.org])
-
-+AC_CONFIG_AUX_DIR(.)
-+
-+dnl
-+dnl AM_INIT_AUTOMAKE([1.11.1 foreign dist-bzip2 dist-xz])
-+dnl
-+
-+AM_INIT_AUTOMAKE([1.10.1 foreign dist-bzip2])
-+
- AC_USE_SYSTEM_EXTENSIONS
-
- CRM_DTD_VERSION="1.0"
-
- PKG_FEATURES=""
-
--AC_CONFIG_AUX_DIR(.)
- AC_CANONICAL_HOST
-
- dnl Where #defines go (e.g. `AC_CHECK_HEADERS' below)
-@@ -84,12 +91,6 @@ AC_ARG_WITH([systemdtmpfilesdir],
- fi
- AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdtmpfilesdir" -a "x$with_systemdtmpfilesdir" != xno ])
-
--dnl
--dnl AM_INIT_AUTOMAKE([1.11.1 foreign dist-bzip2 dist-xz])
--dnl
--
--AM_INIT_AUTOMAKE([1.10.1 foreign dist-bzip2])
--
- AC_DEFINE_UNQUOTED(AGENTS_VERSION, "$PACKAGE_VERSION", Current agents version)
-
- CC_IN_CONFIGURE=yes
---
-2.7.4
-
+++ /dev/null
-From 7c181a1afdc85456333f9cbf9c5827ceb0554a91 Mon Sep 17 00:00:00 2001
-From: Chris Friesen <chris.friesen@windriver.com>
-Date: Fri, 24 Aug 2018 03:51:37 +0800
-Subject: [PATCH] Fix VG activity bug in heartbeat/LVM script
-
-There is currently an issue in the lvm2 package where if you create an LVM thin
-pool, then create a thin volume in the pool, then the udev rule doesn't think
-there should be a /dev// symlink for the thin pool, but "vgmknodes" and
-"vgscan --mknodes" both think that there should be such a symlink. This is a
-bug, but it's in the field in CentOS 7 at least and likely elsewhere.
-
-The end result of this is that on such a system running either "vgscan
---mknodes" or "vgmknodes" and then running "vgchange -an " will
-leave the /dev/ directory with a dangling symlink in it.
-
-This breaks the LVM_status() function in this OCF script, since the
-/dev/ directory exists and is not empty even though the volume
-group is not active.
-
-This commit changes the code to directly query lvm about the volume group
-activity rather than relying on side effects.
-
-Signed-off-by: zhipengl <zhipengs.liu@intel.com>
-
----
- heartbeat/LVM | 15 ++++++---------
- 1 file changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/heartbeat/LVM b/heartbeat/LVM
-index 893ece8..1efb207 100755
---- a/heartbeat/LVM
-+++ b/heartbeat/LVM
-@@ -191,18 +191,15 @@ LVM_status() {
- fi
- fi
-
-- if [ -d /dev/$1 ]; then
-- test "`cd /dev/$1 && ls`" != ""
-- rc=$?
-- if [ $rc -ne 0 ]; then
-- ocf_exit_reason "VG $1 with no logical volumes is not supported by this RA!"
-- fi
-- fi
--
-- if [ $rc -ne 0 ]; then
-+ # Ask lvm whether the volume group is active. This maps to
-+ # the question "Are there any logical volumes that are active in
-+ # the specified volume group?".
-+ lvs --noheadings -o selected -S lv_active=active,vg_name=${1}|grep -q 1
-+ if [ $? -ne 0 ]; then
- ocf_log $loglevel "LVM Volume $1 is not available (stopped)"
- rc=$OCF_NOT_RUNNING
- else
-+ rc=0
- lvm_status
- rc=$?
- fi
---
-2.7.4
-
+++ /dev/null
-From 81bcbfb829001ccf61b515edb3d53ac8f15df334 Mon Sep 17 00:00:00 2001
-From: Scott Little <scott.little@windriver.com>
-Date: Fri, 26 Aug 2016 15:06:10 -0400
-Subject: [PATCH 04/12] WRS: Patch108: copyright.patch
-
----
- heartbeat/Filesystem | 2 ++
- heartbeat/LVM | 1 +
- heartbeat/pgsql | 1 +
- 3 files changed, 4 insertions(+)
-
-diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
-index 27f03d2..af821b2 100755
---- a/heartbeat/Filesystem
-+++ b/heartbeat/Filesystem
-@@ -2,6 +2,8 @@
- #
- # Support: users@clusterlabs.org
- # License: GNU General Public License (GPL)
-+#
-+# Copyright (c) 2014 Wind River Systems, Inc. All rights reserved.
- #
- # Filesystem
- # Description: Manages a Filesystem on a shared storage medium.
-diff --git a/heartbeat/LVM b/heartbeat/LVM
-index e435e7b..c11fed7 100755
---- a/heartbeat/LVM
-+++ b/heartbeat/LVM
-@@ -10,6 +10,7 @@
- # Support: users@clusterlabs.org
- # License: GNU General Public License (GPL)
- # Copyright: (C) 2002 - 2005 International Business Machines, Inc.
-+# Copyright (c) 2014 Wind River Systems, Inc. All rights reserved.
- #
- # This code significantly inspired by the LVM resource
- # in FailSafe by Lars Marowsky-Bree
-diff --git a/heartbeat/pgsql b/heartbeat/pgsql
-index 794f85e..b176b1d 100755
---- a/heartbeat/pgsql
-+++ b/heartbeat/pgsql
-@@ -10,6 +10,7 @@
- #
- # Copyright: 2006-2012 Serge Dubrouski <sergeyfd@gmail.com>
- # and other Linux-HA contributors
-+# Copyright (c) 2014 Wind River Systems, Inc. All rights reserved.
- # License: GNU General Public License (GPL)
- #
- ###############################################################################
---
-1.9.1
-
+++ /dev/null
-From c3448b1536d50291dc5ca49dce5957c39403cc82 Mon Sep 17 00:00:00 2001
-From: Bin Qian <bin.qian@windriver.com>
-Date: Wed, 29 Aug 2018 11:00:22 -0400
-Subject: [PATCH 1/1] avoid failing service when I/F is down
-
----
- heartbeat/IPaddr2 | 24 ++++++------------------
- 1 file changed, 6 insertions(+), 18 deletions(-)
-
-diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
-index 86009b9..2da5c5e 100755
---- a/heartbeat/IPaddr2
-+++ b/heartbeat/IPaddr2
-@@ -968,12 +968,8 @@ ip_start() {
- then
- exit $OCF_SUCCESS
- else
-- if [ "$OCF_RESKEY_dc" = "yes" ]; then
-- ocf_log info "NIC $NIC is DOWN..."
-- exit $OCF_SUCCESS
-- else
-- exit $OCF_ERR_GENERIC
-- fi
-+ ocf_log info "NIC $NIC is DOWN..."
-+ exit $OCF_SUCCESS
- fi
- fi
-
-@@ -1037,12 +1033,8 @@ ip_start() {
- then
- exit $OCF_SUCCESS
- else
-- if [ "$OCF_RESKEY_dc" = "yes" ]; then
-- ocf_log info "NIC $NIC is DOWN"
-- exit $OCF_SUCCESS
-- else
-- exit $OCF_ERR_GENERIC
-- fi
-+ ocf_log info "NIC $NIC is DOWN"
-+ exit $OCF_SUCCESS
- fi
- }
-
-@@ -1123,12 +1115,8 @@ ip_monitor() {
- then
- return $OCF_SUCCESS
- else
-- if [ "$OCF_RESKEY_dc" = "yes" ]; then
-- ocf_log info "NIC $NIC is DOWN"
-- return $OCF_SUCCESS
-- else
-- return $OCF_NOT_RUNNING
-- fi
-+ ocf_log info "NIC $NIC is DOWN"
-+ exit $OCF_SUCCESS
- fi
- ;;
- partial|no|partial2)
---
-1.8.3.1
-
+++ /dev/null
-From a39c83dbaf4054cc96cd4a0a2b671509dd10af28 Mon Sep 17 00:00:00 2001
-From: Bart Wensley <barton.wensley@windriver.com>
-Date: Wed, 21 Nov 2018 12:14:20 -0600
-Subject: [PATCH 1/1] ipaddr2 use host scope for addresses on loopback
-
----
- heartbeat/IPaddr2 | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
-index 2da5c5e..79dbdcf 100755
---- a/heartbeat/IPaddr2
-+++ b/heartbeat/IPaddr2
-@@ -622,10 +622,18 @@ add_interface () {
- add_ipv6_addrlabel $ipaddr
- fi
-
-- cmd="$IP2UTIL -f $FAMILY addr add $ipaddr/$netmask dev $iface"
-+ # Addresses assigned to the loopback interfaces must be assigned
-+ # using the host scope or assignment is prevented (can't have
-+ # multiple global scope addresses on the loopback interface).
-+ if [ "$iface" = "lo" ] ;then
-+ option="scope host"
-+ else
-+ option=""
-+ fi
-+ cmd="$IP2UTIL -f $FAMILY addr add $ipaddr/$netmask dev $iface $option"
- msg="Adding $FAMILY address $ipaddr/$netmask to device $iface"
- if [ "$broadcast" != "none" ]; then
-- cmd="$IP2UTIL -f $FAMILY addr add $ipaddr/$netmask brd $broadcast dev $iface"
-+ cmd="$IP2UTIL -f $FAMILY addr add $ipaddr/$netmask brd $broadcast dev $iface $option"
- msg="Adding $FAMILY address $ipaddr/$netmask with broadcast address $broadcast to device $iface"
- fi
-
---
-1.8.3.1
-
+++ /dev/null
-From fb5a76d9050c60b601a5dbbad65ed3dbff041af1 Mon Sep 17 00:00:00 2001
-From: Scott Little <scott.little@windriver.com>
-Date: Mon, 2 Oct 2017 15:12:36 -0400
-Subject: [PATCH 03/13] WRS: Patch1107: ipaddr2_check_if_state.patch
-
----
- heartbeat/IPaddr2 | 21 ++++++++++++++++++---
- 1 file changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
-index aef6dc7..67a7ca3 100755
---- a/heartbeat/IPaddr2
-+++ b/heartbeat/IPaddr2
-@@ -964,7 +964,12 @@ ip_start() {
- local ip_status=`ip_served`
-
- if [ "$ip_status" = "ok" ]; then
-- exit $OCF_SUCCESS
-+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
-+ then
-+ exit $OCF_SUCCESS
-+ else
-+ exit $OCF_ERR_GENERIC
-+ fi
- fi
-
- if [ -n "$IP_CIP" ] && ([ $ip_status = "no" ] || [ $ip_status = "partial2" ]); then
-@@ -1023,7 +1028,12 @@ ip_start() {
- fi
- ;;
- esac
-- exit $OCF_SUCCESS
-+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
-+ then
-+ exit $OCF_SUCCESS
-+ else
-+ exit $OCF_ERR_GENERIC
-+ fi
- }
-
- ip_stop() {
-@@ -1099,7 +1109,12 @@ ip_monitor() {
- case $ip_status in
- ok)
- run_arp_sender refresh
-- return $OCF_SUCCESS
-+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
-+ then
-+ return $OCF_SUCCESS
-+ else
-+ return $OCF_NOT_RUNNING
-+ fi
- ;;
- partial|no|partial2)
- exit $OCF_NOT_RUNNING
---
-1.9.1
-
+++ /dev/null
-From 573f0835621c5e64c6270260f607624aea29d21a Mon Sep 17 00:00:00 2001
-From: Bin Qian <bin.qian@windriver.com>
-Date: Sat, 21 Jan 2017 02:36:39 -0500
-Subject: [PATCH 1/1] ipaddr2_if_down
-
----
- heartbeat/IPaddr2 | 21 ++++++++++++++++++---
- 1 file changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
-index 67a7ca3..2cd822d 100755
---- a/heartbeat/IPaddr2
-+++ b/heartbeat/IPaddr2
-@@ -968,7 +968,12 @@ ip_start() {
- then
- exit $OCF_SUCCESS
- else
-- exit $OCF_ERR_GENERIC
-+ if [ "$OCF_RESKEY_dc" = "yes" ]; then
-+ ocf_log info "NIC $NIC is DOWN..."
-+ exit $OCF_SUCCESS
-+ else
-+ exit $OCF_ERR_GENERIC
-+ fi
- fi
- fi
-
-@@ -1032,7 +1037,12 @@ ip_start() {
- then
- exit $OCF_SUCCESS
- else
-- exit $OCF_ERR_GENERIC
-+ if [ "$OCF_RESKEY_dc" = "yes" ]; then
-+ ocf_log info "NIC $NIC is DOWN"
-+ exit $OCF_SUCCESS
-+ else
-+ exit $OCF_ERR_GENERIC
-+ fi
- fi
- }
-
-@@ -1113,7 +1123,12 @@ ip_monitor() {
- then
- return $OCF_SUCCESS
- else
-- return $OCF_NOT_RUNNING
-+ if [ "$OCF_RESKEY_dc" = "yes" ]; then
-+ ocf_log info "NIC $NIC is DOWN"
-+ return $OCF_SUCCESS
-+ else
-+ return $OCF_NOT_RUNNING
-+ fi
- fi
- ;;
- partial|no|partial2)
---
-1.9.1
-
+++ /dev/null
-From 81bb87debd2a683bad2173d6cb16327c776fe3b3 Mon Sep 17 00:00:00 2001
-From: Scott Little <scott.little@windriver.com>
-Date: Mon, 2 Oct 2017 15:13:46 -0400
-Subject: [PATCH 13/13] WRS: Patch1119: ipaddr2_ignore_lo_if_state.patch
-
----
- heartbeat/IPaddr2 | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
-index 2cd822d..59620d2 100755
---- a/heartbeat/IPaddr2
-+++ b/heartbeat/IPaddr2
-@@ -964,7 +964,7 @@ ip_start() {
- local ip_status=`ip_served`
-
- if [ "$ip_status" = "ok" ]; then
-- if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
-+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ] || [ "$NIC" = "lo" ]
- then
- exit $OCF_SUCCESS
- else
-@@ -1033,7 +1033,7 @@ ip_start() {
- fi
- ;;
- esac
-- if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
-+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ] || [ "$NIC" = "lo" ]
- then
- exit $OCF_SUCCESS
- else
-@@ -1119,7 +1119,7 @@ ip_monitor() {
- case $ip_status in
- ok)
- run_arp_sender refresh
-- if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
-+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ] || [ "$NIC" = "lo" ]
- then
- return $OCF_SUCCESS
- else
---
-1.9.1
-
+++ /dev/null
-From 72fcaed4a9cc3c847278dd4fca88ba0bca88125a Mon Sep 17 00:00:00 2001
-From: Vu Tran <vu.tran@windriver.com>
-Date: Thu Sep 29 19:07:25 2016 -0400
-Subject: CGTS-5173: LVM ocf cleanup refs on stop
-
-In LVM ocf script, LVM_stop() fails if any of the created logical volume
-dm block devices are being held by any process with the following error
-
-err ERROR: Logical volume cinder-volumes/volume-96a8becd-a1c1-4508-8b25-9bcbcfeff2fa
-contains a filesystem in use. Can't deactivate volume group "cinder-volumes"
-with 1 open logical volume(s)
-
-So here we want to have defensive code to scan through any process that
-holds what dm block devices and causes LVM_stop() to fail. There are
-2 cases:
-
-* dm block devices are mounted and processes are accessing files located
-in this mount point. We first need to kill all the processes which are
-opening files and then umount the dm block devices.
-
-* processes just hold/open dm block devices directly. We need to kill
-these processes.
-
-Signed-off-by: Sun Austin <austin.sun@intel.com>
----
- heartbeat/LVM | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 76 insertions(+)
-
-diff --git a/heartbeat/LVM b/heartbeat/LVM
-index 1efb207..bde381c 100755
---- a/heartbeat/LVM
-+++ b/heartbeat/LVM
-@@ -367,6 +367,81 @@ LVM_start() {
- }
-
- #
-+# Kill provided process that holds lv
-+#
-+log_and_kill_process_hold_lv() {
-+ p_info=$(ps -lfLp ${1} | tail -1)
-+ ocf_log warn "lv ${2} is being held by this process (will be forced killed):"
-+ ocf_log warn ${p_info}
-+ kill -s KILL ${1}
-+}
-+
-+#
-+# Scan for processes that hold any lvs and kill them
-+#
-+scan_and_kill_processes_hold_lv() {
-+ vg_name=${1}
-+
-+ # Get list of logical volumes which are busy
-+ lv_paths=$(lvdisplay -c ${vg_name} | awk -F ":" '{print $1}')
-+ for lv_path in ${lv_paths}; do
-+ open_num=$(lvdisplay ${lv_path} | grep "# open" | awk '{print $3}')
-+ if [ ${open_num} -gt 0 ]; then
-+ lv_name=$(lvdisplay ${lv_path} | grep "LV Name" | awk '{print $3}')
-+ lv_block=$(lvdisplay ${lv_path} | grep "Block device" | awk '{print $3}')
-+
-+ lv_list="${lv_list}
-+${lv_name}|${lv_block}"
-+ lv_block_list="${lv_block_list} ${lv_block}"
-+ fi
-+ done
-+
-+ # Exit if there is no busy logical volume
-+ [ -z "${lv_list}" ] && exit 0
-+
-+ # Checking to see if any of these busy logical volumes are caused by mount
-+ mountinfo=$(cat /proc/1/mountinfo)
-+ while read -r line; do
-+ mount_majorminor=$(echo ${line} | awk '{print $3}')
-+ mount_point=$(echo ${line} | awk '{print $5}')
-+
-+ for lv in ${lv_block_list}; do
-+ if [ "${lv}" == "${mount_majorminor}" ]; then
-+ lv_name=$(echo "${lv_list}" | grep ${lv} | awk -F "|" '{print $1}')
-+ ocf_log warn "lv ${lv_name} is busy mounted at ${mount_point} (will be forced unmounted)"
-+ processes_holding_mount_point=$(fuser -m ${mount_point} 2>/dev/null)
-+ if [ -n "${processes_holding_mount_point}" ]; then
-+ for p in ${processes_holding_mount_point}; do
-+ log_and_kill_process_hold_lv "${p}" "${lv_name}"
-+ done
-+ fi
-+ umount ${mount_point}
-+ [ $? -ne 0 ] && ocf_log warn "Cannot umount ${mount_point}"
-+ fi
-+ done
-+ done <<< "${mountinfo}"
-+
-+ # Now checking to see if any process holding these logical volumes
-+ all_processes=$(ps -e | awk '{print $1}')
-+ for p in ${all_processes}; do
-+ [ ! -d /proc/${p}/fd ] && continue
-+ opened_file_list=$(ls -l /proc/${p}/fd | awk -F "->" '{print $2}')
-+
-+ for f in ${opened_file_list}; do
-+ [ ! -b "${f}" ] && continue
-+ f_majorminor=$(printf "%d:%d" $(stat -c '0x%t 0x%T' ${f}))
-+
-+ for lv in ${lv_block_list}; do
-+ if [ "${lv}" == "${f_majorminor}" ]; then
-+ lv_name=$(echo "${lv_list}" | grep ${lv} | awk -F "|" '{print $1}')
-+ log_and_kill_process_hold_lv "${p}" "${lv_name}"
-+ fi
-+ done
-+ done
-+ done
-+}
-+
-+#
- # Disable the LVM volume
- #
- LVM_stop() {
-@@ -395,6 +470,7 @@ LVM_stop() {
- break
- fi
-
-+ scan_and_kill_processes_hold_lv $vg
- res=$OCF_ERR_GENERIC
- ocf_log warn "$vg still Active"
- ocf_log info "Retry deactivating volume group $vg"
---
-2.7.4
-
+++ /dev/null
-From 577055560d55b388d479ef398ffd839792dc1996 Mon Sep 17 00:00:00 2001
-From: Scott Little <scott.little@windriver.com>
-Date: Mon, 2 Oct 2017 15:12:54 -0400
-Subject: [PATCH 06/13] WRS: Patch1110: lvm_vg_activation.patch
-
----
- heartbeat/LVM | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 116 insertions(+), 1 deletion(-)
-
-diff --git a/heartbeat/LVM b/heartbeat/LVM
-index b0ca87a..38092f9 100755
---- a/heartbeat/LVM
-+++ b/heartbeat/LVM
-@@ -222,6 +222,81 @@ LVM_status() {
- }
-
- #
-+# Activate one volume explicitly.
-+#
-+activate_volume() {
-+ ocf_run lvchange $1 /dev/${2}/$3
-+ if [ $? -eq 0 ] ; then
-+ ocf_log info "Succesfully activated $LV."
-+ else
-+ ocf_log err "Problem activating $LV."
-+ fi
-+}
-+
-+#
-+# Kick off parallel activation of all volumes
-+#
-+activate_all_volumes() {
-+ VG=$1
-+ shift
-+ lvchange_args="$*"
-+
-+ # Get the list of volumes, without the first line which is column headings.
-+ VOLS=`lvs $VG |tail -n +2`
-+
-+ while read -r LINE; do
-+ # Convert the line into an array.
-+ LINE_ARRAY=($LINE)
-+
-+ # First array element is the volume/snapshot name.
-+ LV=${LINE_ARRAY[0]}
-+
-+ # Third array element is the attributes.
-+ ATTR=${LINE_ARRAY[2]}
-+
-+ # Fifth character in the attributes is "a" if it's active.
-+ ACTIVE=${ATTR:4:1}
-+ if [ "$ACTIVE" == "a" ]; then
-+ ocf_log info "$LV is already active."
-+ continue
-+ fi
-+
-+ SNAPSHOT_ORIGIN=${LINE_ARRAY[4]}
-+ if [ "$SNAPSHOT_ORIGIN" != "" ] ; then
-+ # If this is a snapshot, don't activate it.
-+ continue
-+ fi
-+
-+ ( activate_volume "$*" $VG $LV ) &
-+ done <<< "$VOLS"
-+}
-+
-+#
-+# Scan for inactive volumes and log any that are found.
-+#
-+log_inactive_volumes() {
-+ # Get the list of volumes, without the first line which is column headings.
-+ VOLS=`lvs $1 |tail -n +2`
-+
-+ while read -r LINE; do
-+ # Convert the line into an array.
-+ LINE_ARRAY=($LINE)
-+
-+ # First array element is the volume/snapshot name.
-+ LV=${LINE_ARRAY[0]}
-+
-+ # Third array element is the attributes.
-+ ATTR=${LINE_ARRAY[2]}
-+
-+ # Fifth character in the attributes is "a" if it's active.
-+ ACTIVE=${ATTR:4:1}
-+ if [ "$ACTIVE" != "a" ]; then
-+ ocf_log err "Volume $LV is not active after expiry of timeout."
-+ fi
-+ done <<< "$VOLS"
-+}
-+
-+#
- # Enable LVM volume
- #
- LVM_start() {
-@@ -241,10 +316,50 @@ LVM_start() {
- ocf_run vgscan
- fi
-
-+ # Kick off activation of all volumes. If it doesn't complete within
-+ # the timeout period, then we'll log the not-yet-activated volumes and
-+ # continue on.
- lvm_pre_activate || exit
-- ocf_run vgchange $vgchange_activate_options $vg
-+ (ocf_run vgchange $vgchange_activate_options $1) & PID=$!
- lvm_post_activate $?
-
-+ # Check every second for up to TIMEOUT seconds whether the vgchange has
-+ # completed.
-+ TIMEOUT=300
-+ TIMED_OUT=true
-+ SECONDS=0;
-+ PARALLEL_ACTIVATE_DELAY=10
-+ PARALLEL_ACTIVATE_DONE=false
-+ while [ $SECONDS -lt $TIMEOUT ] ; do
-+ kill -0 $PID &> /dev/null
-+ if [ $? -eq 1 ] ; then
-+ # process with pid of $PID doesn't exist, vgchange command completed
-+ TIMED_OUT=false
-+ break
-+ fi
-+ if [ $SECONDS -ge $PARALLEL_ACTIVATE_DELAY ] && \
-+ [ "$PARALLEL_ACTIVATE_DONE" != true ] && \
-+ [ "$1" == "cinder-volumes" ] ; then
-+ # This will kick off parallel activation of all LVs in the VG.
-+ # The delay is to ensure the VG is activated first.
-+ PARALLEL_ACTIVATE_DONE=true
-+ ocf_log info Explicitly activating all volumes in $1 with: $vgchange_activate_options
-+ activate_all_volumes $1 $vgchange_activate_options
-+ fi
-+ sleep 1
-+ done
-+
-+ if [ "$TIMED_OUT" = true ] ; then
-+ ocf_log err "Timed out running ocf_run vgchange $vgchange_activate_options $1"
-+ log_inactive_volumes $1
-+ else
-+ # Child process completed, get its status.
-+ wait $PID
-+ if [ $? -ne 0 ] ; then
-+ return $OCF_ERR_GENERIC
-+ fi
-+ fi
-+
- if LVM_status $vg; then
- : OK Volume $vg activated just fine!
- return $OCF_SUCCESS
---
-2.7.4
-
+++ /dev/null
-From 111343419dd381d81303354dad48cca5095ab080 Mon Sep 17 00:00:00 2001
-From: Scott Little <scott.little@windriver.com>
-Date: Fri, 26 Aug 2016 15:06:02 -0400
-Subject: [PATCH 02/12] WRS: Patch106: new_ocf_return_codes.patch
-
----
- heartbeat/ocf-returncodes | 35 +++++++++++++++++++++++++++++++++++
- 1 file changed, 35 insertions(+)
-
-diff --git a/heartbeat/ocf-returncodes b/heartbeat/ocf-returncodes
-index dd5f017..9200889 100644
---- a/heartbeat/ocf-returncodes
-+++ b/heartbeat/ocf-returncodes
-@@ -4,6 +4,7 @@
- #
- # Copyright (c) 2004 SUSE LINUX AG, Andrew Beekhof
- # All Rights Reserved.
-+# Copyright (c) 2014 Wind River Systems, Inc. All rights reserved.
- #
- #
- # This library is free software; you can redistribute it and/or
-@@ -53,3 +54,37 @@ OCF_NOT_RUNNING=7
- #
- OCF_RUNNING_MASTER=8
- OCF_FAILED_MASTER=9
-+
-+# Non-standard values particular to Wind River deployments.
-+#
-+# OCF does not include the concept of data sync states for master/slave
-+# resources.
-+#
-+# OCF_DATA_INCONSISTENT:
-+# The resource's data is not useable.
-+#
-+# OCF_DATA_OUTDATED:
-+# The resource's data is consistent, but a peer with more recent data
-+# has been seen.
-+#
-+# OCF_DATA_CONSISTENT:
-+# The resource's data is consistent, but it is unsure that this is the
-+# most recent data.
-+#
-+# OCF_SYNC:
-+# The resource is syncing data.
-+#
-+# OCF_STANDALONE:
-+# The resource is operating as standalone. No peer is available or
-+# syncing is not possible (i.e. split brain fencing).
-+#
-+OCF_DATA_INCONSISTENT=32
-+OCF_DATA_OUTDATED=33
-+OCF_DATA_CONSISTENT=34
-+OCF_DATA_SYNC=35
-+OCF_DATA_STANDALONE=36
-+OCF_RUNNING_MASTER_DATA_INCONSISTENT=37
-+OCF_RUNNING_MASTER_DATA_OUTDATED=38
-+OCF_RUNNING_MASTER_DATA_CONSISTENT=39
-+OCF_RUNNING_MASTER_DATA_SYNC=40
-+OCF_RUNNING_MASTER_DATA_STANDALONE=41
---
-1.9.1
-
+++ /dev/null
-From 64f5534579e8f14f723c48f317cd56badca225ee Mon Sep 17 00:00:00 2001
-From: Don Penney <don.penney@windriver.com>
-Date: Thu, 25 Aug 2016 13:07:16 -0400
-Subject: [PATCH 1/1] Set OCF_ prefix in logs for syslog destination sorting
-
----
- heartbeat/ocf-shellfuncs.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/heartbeat/ocf-shellfuncs.in b/heartbeat/ocf-shellfuncs.in
-index 3565e20..688c150 100644
---- a/heartbeat/ocf-shellfuncs.in
-+++ b/heartbeat/ocf-shellfuncs.in
-@@ -176,9 +176,9 @@ hadate() {
- set_logtag() {
- if [ -z "$HA_LOGTAG" ]; then
- if [ -n "$OCF_RESOURCE_INSTANCE" ]; then
-- HA_LOGTAG="$__SCRIPT_NAME($OCF_RESOURCE_INSTANCE)[$$]"
-+ HA_LOGTAG="OCF_$__SCRIPT_NAME($OCF_RESOURCE_INSTANCE)[$$]"
- else
-- HA_LOGTAG="$__SCRIPT_NAME[$$]"
-+ HA_LOGTAG="OCF_$__SCRIPT_NAME[$$]"
- fi
- fi
- }
---
-2.7.4
-
+++ /dev/null
-From 386e3919b703c5a3d06edfc5b078ab67604139ab Mon Sep 17 00:00:00 2001
-From: Scott Little <scott.little@windriver.com>
-Date: Mon, 2 Oct 2017 15:12:59 -0400
-Subject: [PATCH 07/13] WRS: Patch1111: pgsql.patch
-
----
- heartbeat/pgsql | 23 ++++++++++++++++++++---
- 1 file changed, 20 insertions(+), 3 deletions(-)
-
-diff --git a/heartbeat/pgsql b/heartbeat/pgsql
-index 768608e..28cc046 100755
---- a/heartbeat/pgsql
-+++ b/heartbeat/pgsql
-@@ -46,6 +46,7 @@ get_pgsql_param() {
- OCF_RESKEY_pgctl_default=/usr/bin/pg_ctl
- OCF_RESKEY_psql_default=/usr/bin/psql
- OCF_RESKEY_pgdata_default=/var/lib/pgsql/data
-+OCF_RESKEY_pgconf_default=/etc/postgresql
- OCF_RESKEY_pgdba_default=postgres
- OCF_RESKEY_pghost_default=""
- OCF_RESKEY_pgport_default=5432
-@@ -78,11 +79,12 @@ OCF_RESKEY_replication_slot_name_default=""
- : ${OCF_RESKEY_pgctl=${OCF_RESKEY_pgctl_default}}
- : ${OCF_RESKEY_psql=${OCF_RESKEY_psql_default}}
- : ${OCF_RESKEY_pgdata=${OCF_RESKEY_pgdata_default}}
-+: ${OCF_RESKEY_pgconf=${OCF_RESKEY_pgconf_default}}
- : ${OCF_RESKEY_pgdba=${OCF_RESKEY_pgdba_default}}
- : ${OCF_RESKEY_pghost=${OCF_RESKEY_pghost_default}}
- : ${OCF_RESKEY_pgport=${OCF_RESKEY_pgport_default}}
- : ${OCF_RESKEY_pglibs=${OCF_RESKEY_pglibs_default}}
--: ${OCF_RESKEY_config=${OCF_RESKEY_pgdata}/postgresql.conf}
-+: ${OCF_RESKEY_config=${OCF_RESKEY_pgconf}/postgresql.conf}
- : ${OCF_RESKEY_start_opt=${OCF_RESKEY_start_opt_default}}
- : ${OCF_RESKEY_ctl_opt=${OCF_RESKEY_ctl_opt_default}}
- : ${OCF_RESKEY_pgdb=${OCF_RESKEY_pgdb_default}}
-@@ -180,6 +182,14 @@ Path to PostgreSQL data directory.
- <content type="string" default="${OCF_RESKEY_pgdata_default}" />
- </parameter>
-
-+<parameter name="pgconf" unique="0" required="0">
-+<longdesc lang="en">
-+Path to PostgreSQL config directory.
-+</longdesc>
-+<shortdesc lang="en">pgconf</shortdesc>
-+<content type="string" default="${OCF_RESKEY_pgconf_default}" />
-+</parameter>
-+
- <parameter name="pgdba" unique="0" required="0">
- <longdesc lang="en">
- User that owns PostgreSQL.
-@@ -243,7 +253,7 @@ SQL script that will be used for monitor operations.
- Path to the PostgreSQL configuration file for the instance.
- </longdesc>
- <shortdesc lang="en">Configuration file</shortdesc>
--<content type="string" default="${OCF_RESKEY_pgdata}/postgresql.conf" />
-+<content type="string" default="${OCF_RESKEY_pgconf}/postgresql.conf" />
- </parameter>
-
- <parameter name="pgdb" unique="0" required="0">
-@@ -630,6 +640,12 @@ pgsql_real_start() {
- fi
- fi
-
-+ # WRS: Create an unversioned symlink under /var/run so SM can easily
-+ # find the PID file.
-+ if [ ! -h $PIDFILE_SYMLINK ]; then
-+ /bin/ln -s $PIDFILE $PIDFILE_SYMLINK
-+ fi
-+
- ocf_log info "PostgreSQL is started."
- return $rc
- }
-@@ -2078,10 +2094,11 @@ then
- fi
-
- PIDFILE=${OCF_RESKEY_pgdata}/postmaster.pid
-+PIDFILE_SYMLINK=/var/run/postmaster.pid
- BACKUPLABEL=${OCF_RESKEY_pgdata}/backup_label
- RESOURCE_NAME=`echo $OCF_RESOURCE_INSTANCE | cut -d ":" -f 1`
- PGSQL_WAL_RECEIVER_STATUS_ATTR="${RESOURCE_NAME}-receiver-status"
--RECOVERY_CONF=${OCF_RESKEY_pgdata}/recovery.conf
-+RECOVERY_CONF=${OCF_RESKEY_pgconf}/recovery.conf
- NODENAME=$(ocf_local_nodename | tr '[A-Z]' '[a-z]')
-
- case "$1" in
---
-1.9.1
-
+++ /dev/null
-From eb45b8271ce64a046d41c93b1cffd641245ce55f Mon Sep 17 00:00:00 2001
-From: Scott Little <scott.little@windriver.com>
-Date: Mon, 2 Oct 2017 15:12:48 -0400
-Subject: [PATCH 05/13] WRS: Patch1109: umount-in-namespace.patch
-
----
- heartbeat/Filesystem | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
-index f536298..05e4097 100755
---- a/heartbeat/Filesystem
-+++ b/heartbeat/Filesystem
-@@ -503,6 +503,10 @@ signal_processes() {
- }
- try_umount() {
- local SUB=$1
-+
-+ # We need to ensure we umount in namespaces, too
-+ /usr/sbin/umount-in-namespace $SUB
-+
- $UMOUNT $umount_force $SUB
- list_mounts | grep -q " $SUB " >/dev/null 2>&1 || {
- ocf_log info "unmounted $SUB successfully"
---
-1.9.1
-
+++ /dev/null
-#
-# Copyright (C) 2019 Wind River Systems, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-SUMMARY = "OCF resource agents for use by compatible cluster managers"
-
-DESCRIPTION = "A set of scripts to interface with several services \
-to operate in a High Availability environment for both Pacemaker and \
-rgmanager service managers. \
-"
-HOMEPAGE = "http://sources.redhat.com/cluster/wiki/"
-
-LICENSE = "GPLv2+ & LGPLv2+ & GPLv3"
-LIC_FILES_CHKSUM = " \
- file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
- file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
- file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-"
-
-SRC_URI = " \
- https://codeload.github.com/ClusterLabs/${BPN}/tar.gz/v${PV};downloadfilename=${BPN}-${PV}.tar.gz \
- file://0001-disable-doc-build.patch \
- file://0002-Set-OCF_ROOT_DIR-to-libdir-ocf.patch \
- file://0003-fix-header-defs-lookup.patch \
- file://0004-configure.ac-fix-install-sh-not-found.patch \
- \
- file://stx/new_ocf_return_codes.patch \
- file://stx/ipaddr2_check_if_state.patch \
- file://stx/copyright.patch \
- file://stx/umount-in-namespace.patch \
- file://stx/lvm_vg_activation.patch \
- file://stx/pgsql.patch \
- file://stx/Fix-VG-activity-bug-in-heartbeat-LVM-script.patch \
- file://stx/ocf-shellfuncs_change_logtag.patch \
- file://stx/lvm_cleanup_refs_on_stop.patch \
- file://stx/ipaddr2_if_down.patch \
- file://stx/ipaddr2_ignore_lo_if_state.patch \
- file://stx/ipaddr2-avoid-failing-svc-if-down.patch \
- file://stx/ipaddr2-use-host-scope-for-addresses-on-loopback.patch \
-"
-
-SRC_URI[md5sum] = "82e3a335f942347f1b7c27b9f8e8e984"
-SRC_URI[sha256sum] = "decc370bce20ee7a034886eb19ddb54d823f5e95c58f4d121f53cc965147f736"
-
-DEPENDS = "cluster-glue"
-
-inherit autotools systemd pkgconfig
-inherit update-alternatives
-
-ALTERNATIVE_PRIORITY = "70"
-ALTERNATIVE_${PN} = "drbd.sh"
-ALTERNATIVE_LINK_NAME[drbd.sh] = "${datadir}/cluster/drbd.sh"
-
-EXTRA_OECONF += " \
- --disable-fatal-warnings \
-"
-
-do_install_append() {
- rm -rf "${D}${localstatedir}/run"
- rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
-
- mv ${D}${datadir}/cluster/drbd.sh ${D}${datadir}/cluster/drbd.sh.${PN}
-
- # Create symbolic link between IPAddr and IPAddr2
- rm -f ${D}${libdir}/ocf/resource.d/heartbeat/IPaddr
- ln -s ${libdir}/ocf/resource.d/heartbeat/IPaddr2 ${D}${libdir}/ocf/resource.d/heartbeat/IPaddr
-}
-
-PACKAGES_prepend = " \
- ldirectord \
-"
-
-FILES_ldirectord = " \
- ${sbindir}/ldirectord \
- ${sysconfdir}/ha.d/resource.d/ldirectord \
- ${sysconfdir}/init.d/ldirectord \
- ${sysconfdir}/logrotate.d/ldirectord \
- ${libdir}/ocf/resource.d/heartbeat/ldirectord \
-"
-
-FILES_${PN} += " \
- ${datadir}/cluster/* \
- ${datadir}/${BPN}/ocft/configs/portblock \
- ${libdir}/ocf/resource.d/heartbeat/ \
- ${libdir}/ocf/lib/heartbeat/* \
- ${libdir}/ocf/resource.d/redhat \
- ${libdir}/tmpfiles.d/ \
-"
-
-FILES_${PN}-dbg += " \
- ${libdir}/ocf/resource.d/heartbeat/.debug \
- ${libdir}/${BPN}/heartbeat/.debug \
-"
-
-# There are many tools and scripts that need bash and perl.
-# lvm.sh requires: lvm2
-# ip.sh requires: ethtool iproute2 iputils-arping
-# fs.sh requires: e2fsprogs-e2fsck util-linux quota
-# netfs.sh requires: procps util-linux nfs-utils
-RDEPENDS_${PN} += " \
- bash perl lvm2 \
- ethtool iproute2 iputils-arping \
- e2fsprogs-e2fsck util-linux quota \
- procps nfs-utils \
-"
-
-RDEPENDS_ldirectord += " \
- ipvsadm \
- libdbi-perl \
- libdigest-hmac-perl \
- libmailtools-perl \
- libnet-dns-perl \
- libsocket6-perl \
- libwww-perl \
- perl \
- perl-module-getopt-long \
- perl-module-net-ftp \
- perl-module-net-smtp \
- perl-module-pod-usage \
- perl-module-posix \
- perl-module-socket \
- perl-module-strict \
- perl-module-sys-hostname \
- perl-module-sys-syslog \
- perl-module-vars \
-"
-
-SYSTEMD_PACKAGES += "ldirectord"
-SYSTEMD_SERVICE_${PN} += "resource-agents-deps.target"
-SYSTEMD_SERVICE_ldirectord += "ldirectord.service"
+++ /dev/null
-
-FILESEXTRAPATHS_append := ":${THISDIR}/files:"
-
-inherit openssl10
-DEPENDS_append = " openssl"
-
-SRC_URI += " \
- file://0001-ps.patch \
- file://0002-personality.patch \
- file://0003-centos_remove-net-commands-that-can-timeout.patch;striplevel=2 \
- file://0004-centos_fix-ipv6-regex.patch \
- file://0005-Hardcode-ipaddress-fact-to-localhost.patch \
- file://0006-facter-updates-for-poky-stx.patch \
- "
+++ /dev/null
-diff --git a/lib/facter/ps.rb b/lib/facter/ps.rb
-index 9163519..02117ac 100644
---- a/lib/facter/ps.rb
-+++ b/lib/facter/ps.rb
-@@ -12,7 +12,7 @@
- #
-
- Facter.add(:ps) do
-- setcode do 'ps -ef' end
-+ setcode do 'ps -efww' end
- end
-
- Facter.add(:ps) do
-diff --git a/spec/unit/ps_spec.rb b/spec/unit/ps_spec.rb
-index 2e25a4b..20c61af 100755
---- a/spec/unit/ps_spec.rb
-+++ b/spec/unit/ps_spec.rb
-@@ -27,9 +27,9 @@ describe "ps facts" do
- 'RedHat',
- 'Debian',
- ].each do |os|
-- it "should return gnu/linux style ps -ef on operatingsystem #{os}" do
-+ it "should return gnu/linux style ps -efww on operatingsystem #{os}" do
- Facter.fact(:operatingsystem).stubs(:value).returns os
-- Facter.fact(:ps).value.should == 'ps -ef'
-+ Facter.fact(:ps).value.should == 'ps -efww'
- end
- end
-
+++ /dev/null
----
- lib/facter/personality.rb | 21 ++++++++++++++++++
- lib/facter/subfunction.rb | 61 ++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 82 insertions(+)
-
---- /dev/null
-+++ b/lib/facter/personality.rb
-@@ -0,0 +1,21 @@
-+#
-+# personality.rb
-+#
-+# This fact gives the personality of this node.
-+#
-+require 'facter/util/file_read'
-+
-+Facter.add('personality') do
-+ confine :kernel => :linux
-+
-+ setcode do
-+ if release = Facter::Util::FileRead.read('/etc/platform/platform.conf')
-+ if match = release.match(/^nodetype\=(.*)/)
-+ match[1]
-+ end
-+ end
-+ end
-+end
-+
-+# vim: set ts=2 sw=2 et :
-+# encoding: utf-8
---- /dev/null
-+++ b/lib/facter/subfunction.rb
-@@ -0,0 +1,61 @@
-+#
-+# subfunction.rb
-+#
-+# This fact gives the subfunction of this node.
-+#
-+require 'facter/util/file_read'
-+
-+Facter.add('subfunction') do
-+ confine :kernel => :linux
-+
-+ setcode do
-+ if release = Facter::Util::FileRead.read('/etc/platform/platform.conf')
-+ if match = release.match(/^subfunction\=(.*)/)
-+ match[1]
-+ end
-+ end
-+ end
-+end
-+
-+Facter.add('is_worker_subfunction') do
-+ confine :kernel => :linux
-+
-+ setcode do
-+ if release = Facter::Util::FileRead.read('/etc/platform/platform.conf')
-+ match = release.match(/^subfunction\=.*worker/) ? true : false
-+ end
-+ end
-+end
-+
-+Facter.add('is_controller_subfunction') do
-+ confine :kernel => :linux
-+
-+ setcode do
-+ if release = Facter::Util::FileRead.read('/etc/platform/platform.conf')
-+ match = release.match(/^subfunction\=.*controller/) ? true : false
-+ end
-+ end
-+end
-+
-+Facter.add('is_storage_subfunction') do
-+ confine :kernel => :linux
-+
-+ setcode do
-+ if release = Facter::Util::FileRead.read('/etc/platform/platform.conf')
-+ match = release.match(/^subfunction\=.*storage/) ? true : false
-+ end
-+ end
-+end
-+
-+Facter.add('is_lowlatency_subfunction') do
-+ confine :kernel => :linux
-+
-+ setcode do
-+ if release = Facter::Util::FileRead.read('/etc/platform/platform.conf')
-+ match = release.match(/^subfunction\=.*lowlatency/) ? true : false
-+ end
-+ end
-+end
-+
-+# vim: set ts=2 sw=2 et :
-+# encoding: utf-8
+++ /dev/null
----
- facter-2.4.4/lib/facter/domain.rb | 24 +++++++++++++-----------
- facter-2.4.4/lib/facter/uniqueid.rb | 9 +++++----
- 2 files changed, 18 insertions(+), 15 deletions(-)
-
---- a/facter-2.4.4/lib/facter/domain.rb
-+++ b/facter-2.4.4/lib/facter/domain.rb
-@@ -33,22 +33,24 @@ Facter.add(:domain) do
- full_hostname = 'hostname -f 2> /dev/null'
- can_do_hostname_f = Regexp.union /Linux/i, /FreeBSD/i, /Darwin/i
-
-- hostname_command = if Facter.value(:kernel) =~ can_do_hostname_f
-- full_hostname
-- elsif Facter.value(:kernel) == "windows"
-- windows_hostname
-- else
-- basic_hostname
-- end
-+ # Because hostname -f doesn't work for IPv6, don't use that flag
-+ # hostname_command = if Facter.value(:kernel) =~ can_do_hostname_f
-+ # full_hostname
-+ # elsif Facter.value(:kernel) == "windows"
-+ # windows_hostname
-+ # else
-+ # basic_hostname
-+ # end
-+ hostname_command = basic_hostname
-
- if name = Facter::Core::Execution.exec(hostname_command) \
- and name =~ /.*?\.(.+$)/
-
- return_value = $1
-- elsif Facter.value(:kernel) != "windows" and domain = Facter::Core::Execution.exec('dnsdomainname 2> /dev/null') \
-- and domain =~ /.+/
--
-- return_value = domain
-+ # elsif Facter.value(:kernel) != "windows" and domain = Facter::Core::Execution.exec('dnsdomainname 2> /dev/null') \
-+ # and domain =~ /.+/
-+ #
-+ # return_value = domain
- elsif FileTest.exists?("/etc/resolv.conf")
- domain = nil
- search = nil
---- a/facter-2.4.4/lib/facter/uniqueid.rb
-+++ b/facter-2.4.4/lib/facter/uniqueid.rb
-@@ -1,4 +1,5 @@
--Facter.add(:uniqueid) do
-- setcode 'hostid'
-- confine :kernel => %w{SunOS Linux AIX GNU/kFreeBSD}
--end
-+# hostid does not work with IPv6, and is not needed for Titanium cloud, so remove
-+# Facter.add(:uniqueid) do
-+# setcode 'hostid'
-+# confine :kernel => %w{SunOS Linux AIX GNU/kFreeBSD}
-+# end
+++ /dev/null
-diff -Nurpd a/lib/facter/util/ip.rb b/lib/facter/util/ip.rb
---- a/lib/facter/util/ip.rb 2019-12-26 10:22:04.591601094 -0800
-+++ b/lib/facter/util/ip.rb 2019-12-26 10:24:10.639781276 -0800
-@@ -6,7 +6,7 @@ module Facter::Util::IP
- REGEX_MAP = {
- :linux => {
- :ipaddress => /inet (?:addr:)?([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-- :ipaddress6 => /inet6 (?:addr: )?((?!(?:fe80|::1))(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
-+ :ipaddress6 => /inet6 (?:addr: )?((?!(fe80|\:\:1))(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
- :macaddress => /(?:ether|HWaddr)\s+((\w{1,2}:){5,}\w{1,2})/,
- :netmask => /(?:Mask:|netmask )([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
- :mtu => /MTU:?\s*(\d+)/i
+++ /dev/null
----
- facter-2.4.4/lib/facter/util/ip.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/facter-2.4.4/lib/facter/util/ip.rb
-+++ b/facter-2.4.4/lib/facter/util/ip.rb
-@@ -6,7 +6,7 @@ module Facter::Util::IP
- REGEX_MAP = {
- :linux => {
- :ipaddress => /inet (?:addr:)?([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-- :ipaddress6 => /inet6 (?:addr: )?((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
-+ :ipaddress6 => /inet6 (?:addr: )?((?!(fe80|\:\:1))(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
- :macaddress => /(?:ether|HWaddr)\s+((\w{1,2}:){5,}\w{1,2})/,
- :netmask => /(?:Mask:|netmask )([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
- :mtu => /MTU:?\s*(\d+)/i
+++ /dev/null
-From af1818469ed789bad373e6c0f8d29669acc39669 Mon Sep 17 00:00:00 2001
-From: Don Penney <don.penney@windriver.com>
-Date: Thu, 26 Oct 2017 10:44:20 -0400
-Subject: [PATCH] Hardcode ipaddress fact to localhost
-
----
- lib/facter/ipaddress.rb | 163 +-----------------------------------------------
- 1 file changed, 2 insertions(+), 161 deletions(-)
-
-diff --git a/lib/facter/ipaddress.rb b/lib/facter/ipaddress.rb
-index 6179a4d..4c54791 100644
---- a/lib/facter/ipaddress.rb
-+++ b/lib/facter/ipaddress.rb
-@@ -1,169 +1,10 @@
- # Fact: ipaddress
- #
--# Purpose: Return the main IP address for a host.
-+# To avoid potential timeouts with this fact, just return 127.0.0.1 always
- #
--# Resolution:
--# On the Unixes does an ifconfig, and returns the first non 127.0.0.0/8
--# subnetted IP it finds.
--# On Windows, it attempts to use the socket library and resolve the machine's
--# hostname via DNS.
--#
--# On LDAP based hosts it tries to use either the win32/resolv library to
--# resolve the hostname to an IP address, or on Unix, it uses the resolv
--# library.
--#
--# As a fall back for undefined systems, it tries to run the "host" command to
--# resolve the machine's hostname using the system DNS.
--#
--# Caveats:
--# DNS resolution relies on working DNS infrastructure and resolvers on the
--# host system.
--# The ifconfig parsing purely takes the first IP address it finds without any
--# checking this is a useful IP address.
--#
--
--require 'facter/util/ip'
--
--Facter.add(:ipaddress) do
-- confine :kernel => :linux
-- setcode do
-- ip = nil
-- output = Facter::Util::IP.exec_ifconfig(["2>/dev/null"])
-- if output
-- regexp = /inet (?:addr:)?([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-- output.split("\n").each do |line|
-- match = regexp.match(line)
-- if match and not /^127\./.match(match[1])
-- ip = match[1]
-- break
-- end
-- end
-- end
-- ip
-- end
--end
--
--Facter.add(:ipaddress) do
-- confine :kernel => %w{FreeBSD OpenBSD Darwin DragonFly}
-- setcode do
-- ip = nil
-- output = Facter::Util::IP.exec_ifconfig
--
-- output.split(/^\S/).each do |str|
-- if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-- tmp = $1
-- unless tmp =~ /^127\./
-- ip = tmp
-- break
-- end
-- end
-- end
--
-- ip
-- end
--end
-
- Facter.add(:ipaddress) do
-- confine :kernel => %w{NetBSD SunOS}
-- setcode do
-- ip = nil
-- output = Facter::Util::IP.exec_ifconfig(["-a"])
--
-- output.split(/^\S/).each do |str|
-- if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-- tmp = $1
-- unless tmp =~ /^127\./ or tmp == "0.0.0.0"
-- ip = tmp
-- break
-- end
-- end
-- end
--
-- ip
-- end
--end
--
--Facter.add(:ipaddress) do
-- confine :kernel => %w{AIX}
-- setcode do
-- ip = nil
--
-- default_interface = Facter::Util::IP.exec_netstat(["-rn | grep default | awk '{ print $6 }'"])
-- output = Facter::Util::IP.exec_ifconfig([default_interface])
--
-- output.split(/^\S/).each do |str|
-- if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-- ip = $1
-- end
-- end
--
-- ip
-- end
--end
--
--Facter.add(:ipaddress) do
-- confine :kernel => %w{windows}
-- setcode do
-- require 'facter/util/ip/windows'
-- ipaddr = nil
--
-- adapters = Facter::Util::IP::Windows.get_preferred_ipv4_adapters
-- adapters.find do |nic|
-- nic.IPAddress.any? do |addr|
-- ipaddr = addr if Facter::Util::IP::Windows.valid_ipv4_address?(addr)
-- ipaddr
-- end
-- end
--
-- ipaddr
-- end
--end
--
--Facter.add(:ipaddress, :timeout => 2) do
-- setcode do
-- if Facter.value(:kernel) == 'windows'
-- require 'win32/resolv'
-- else
-- require 'resolv'
-- end
--
-- begin
-- if hostname = Facter.value(:hostname)
-- if Facter.value(:kernel) == 'windows'
-- ip = Win32::Resolv.get_resolv_info.last[0]
-- else
-- ip = Resolv.getaddress(hostname)
-- end
-- unless ip == "127.0.0.1"
-- ip
-- end
-- else
-- nil
-- end
-- rescue Resolv::ResolvError
-- nil
-- rescue NoMethodError # i think this is a bug in resolv.rb?
-- nil
-- end
-- end
--end
--
--Facter.add(:ipaddress, :timeout => 2) do
- setcode do
-- if hostname = Facter.value(:hostname)
-- # we need Hostname to exist for this to work
-- host = nil
-- if host = Facter::Core::Execution.execute("host #{hostname}")
-- list = host.chomp.split(/\s/)
-- if defined? list[-1] and
-- list[-1] =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/
-- list[-1]
-- end
-- else
-- nil
-- end
-- else
-- nil
-- end
-+ "127.0.0.1"
- end
- end
---
-1.8.3.1
-
+++ /dev/null
-diff --git a/lib/facter/architecture.rb b/lib/facter/architecture.rb
-index 72c5755..14ec620 100644
---- a/lib/facter/architecture.rb
-+++ b/lib/facter/architecture.rb
-@@ -31,7 +31,7 @@ Facter.add(:architecture) do
- end
- when "x86_64"
- case Facter.value(:operatingsystem)
-- when "Debian", "Gentoo", "GNU/kFreeBSD", "Ubuntu"
-+ when "Debian", "Gentoo", "GNU/kFreeBSD", "Ubuntu", "poky-stx"
- "amd64"
- else
- model
-diff --git a/lib/facter/operatingsystem/linux.rb b/lib/facter/operatingsystem/linux.rb
-index de7913d..797698a 100644
---- a/lib/facter/operatingsystem/linux.rb
-+++ b/lib/facter/operatingsystem/linux.rb
-@@ -13,6 +13,8 @@ module Facter
- @operatingsystem ||= "Ubuntu"
- elsif lsbdistid == "LinuxMint"
- @operatingsystem ||= "LinuxMint"
-+ elsif lsbdistid == "poky-stx"
-+ @operatingsystem ||= "poky-stx"
- else
- @operatingsystem ||= get_operatingsystem_with_release_files
- end
-@@ -27,7 +29,7 @@ module Facter
- "CloudLinux", "PSBM", "OracleLinux", "OVS", "OEL", "Amazon",
- "XenServer", "VirtuozzoLinux"
- "RedHat"
-- when "LinuxMint", "Ubuntu", "Debian"
-+ when "LinuxMint", "Ubuntu", "Debian", "poky-stx"
- "Debian"
- when "SLES", "SLED", "OpenSuSE", "SuSE"
- "Suse"
-@@ -74,6 +76,8 @@ module Facter
- get_ubuntu_release_with_release_file
- when "VMwareESX"
- get_vmwareESX_release_with_release_file
-+ when "poky-stx"
-+ get_lsbdistrelease
- else
- Facter.value(:kernelrelease)
- end
+++ /dev/null
-
-inherit openssl10
-DEPENDS_append = " openssl"
+++ /dev/null
-From bee43b9f75ee7a2cee0391319528264014d775f7 Mon Sep 17 00:00:00 2001
-From: Kam Nasim <kam.nasim@windriver.com>
-Date: Mon, 16 Apr 2018 14:58:03 -0400
-Subject: [PATCH] ldapscripts - allow anonymous bind for ldap search
-
----
- lib/runtime | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/lib/runtime b/lib/runtime
-index 012ac95..18acf3f 100644
---- a/lib/runtime
-+++ b/lib/runtime
-@@ -197,8 +197,11 @@ _ldapsearch () {
- elif [ -n "$BINDPWDFILE" ]
- then
- $LDAPSEARCHBIN $LDAPBINOPTS $LDAPSEARCHOPTS -y "$BINDPWDFILE" -D "$BINDDN" -b "${1:-$SUFFIX}" -xH "$SERVER" -s sub -LLL "${2:-(objectclass=*)}" "${3:-*}" 2>>"$LOGFILE"
-- else
-+ elif [ -n "$BINDPWD" ]
-+ then
- $LDAPSEARCHBIN $LDAPBINOPTS $LDAPSEARCHOPTS -w "$BINDPWD" -D "$BINDDN" -b "${1:-$SUFFIX}" -xH "$SERVER" -s sub -LLL "${2:-(objectclass=*)}" "${3:-*}" 2>>"$LOGFILE"
-+ else
-+ $LDAPSEARCHBIN $LDAPBINOPTS $LDAPSEARCHOPTS -D "$BINDDN" -b "${1:-$SUFFIX}" -xH "$SERVER" -s sub -LLL "${2:-(objectclass=*)}" "${3:-*}" 2>>"$LOGFILE"
- fi
- }
-
-@@ -785,7 +788,7 @@ then
- then
- warn_log "Warning : using command-line passwords, ldapscripts may not be safe"
- else
-- end_die "Unable to read password file $BINDPWDFILE, exiting..."
-+ warn_log "Warning: Unable to read password file $BINDPWDFILE, binding anonymously..."
- fi
- fi
- fi
---
-1.8.3.1
-
+++ /dev/null
----
- Makefile | 5 +-
- man/man1/ldapusersetup.1 | 60 +++++++++++
- sbin/ldapusersetup | 254 +++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 317 insertions(+), 2 deletions(-)
- create mode 100644 man/man1/ldapusersetup.1
- create mode 100644 sbin/ldapusersetup
-
-diff --git a/sbin/ldapusersetup b/sbin/ldapusersetup
-new file mode 100644
-index 0000000..27d12dc
---- /dev/null
-+++ b/sbin/ldapusersetup
-@@ -0,0 +1,254 @@
-+#!/bin/sh
-+
-+# ldapusersetup : interactive setup for adding users to LDAP
-+
-+# Copyright (c) 2015 Wind River Systems, Inc.
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version 2
-+# of the License, or (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+# USA.
-+
-+if [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ "$#" -eq 1 ]
-+then
-+ echo "Usage : $0 [-u <username | uid> <field> <value>]
-+where accepted field(s) are as follows:
-+--sudo : whether to add this user to sudoer list
-+--secondgroup <grp> : the secondary group to add this user to
-+--passmax <value> : the shadowMax value for this user
-+--passwarning <value> : the shadowWarning value for this user"
-+ exit 1
-+fi
-+
-+# Source runtime file
-+_RUNTIMEFILE="/usr/lib/ldapscripts/runtime"
-+. "$_RUNTIMEFILE"
-+
-+# runtime defaults
-+_DEFAULTGRP2="sys_protected"
-+_BASHSHELL="/bin/bash"
-+_DEFAULTSHADOWMAX="90"
-+_DEFAULTSHADOWWARNING="2"
-+_SHELL=""
-+
-+### Helper functions ###
-+
-+# Gets input from user and validates it.
-+# Will only return if input meets validation
-+# criteria otherwise will just sit there.
-+#
-+# Input : input string ($1), valid output options ($2)
-+# Output: the validated input
-+# Note : the validation list must be an array
-+LdapUserInput () {
-+declare -a optionAry=("${!2}")
-+while true; do
-+ read -p "$1" _output
-+ # convert to lower case
-+ _output2=${_output,,}
-+ # check if output is a valid option
-+ if [[ "${optionAry[@]}" =~ "$_output2" ]]; then
-+ break
-+ else
-+ echo "Invalid input \"$_output\". Allowed options: ${optionAry[@]}" >&2
-+ fi
-+done
-+ echo "$_output2"
-+}
-+
-+# Delete an ldap user if it exists
-+# and exit with error
-+# Input : username ($1), exit msg ($2)
-+# Output : none
-+LdapRollback() {
-+ ldapdeleteuser "$1"
-+ end_die "$2"
-+}
-+
-+# Add an ldap user and exit on failure
-+# Input : username ($1)
-+# Output : none
-+LdapAddUser() {
-+ ldapadduser "$1" users
-+ [ $? -eq 0 ] || end_die "Critical setup error: cannot add user"
-+}
-+
-+# Replace Login Shell and call Rollback on failure
-+# Input : username ($1), shell to set ($2)
-+# Output : none
-+LdapAddLoginShell () {
-+ # Support bash only now.
-+ _SHELL="$_BASHSHELL"
-+ # Replace the login shell
-+ ldapmodifyuser $1 replace loginShell $_SHELL &> /dev/null
-+ [ $? -eq 0 ] || LdapRollback $1 "Critical setup error: cannot set login shell"
-+}
-+
-+# Add user to sudoer list
-+# Input : username ($1)
-+# Output : true or false
-+LdapAddSudo() {
-+ ldapaddsudo "$1" 2> /dev/null
-+ [ $? -eq 0 ] || \
-+ echo_log "Non critical setup error: cannot add to sudoer list"
-+}
-+
-+# Add user to a secondary user group
-+# Input : username ($1), user group ($2)
-+# Output : true or false
-+LdapSecondaryGroup () {
-+ _newGrp="$2"
-+ [ -z "$2" ] && _newGrp=$_DEFAULTGRP2
-+
-+ ldapaddusertogroup $1 $_newGrp
-+ [ $? -eq 0 ] || \
-+ echo_log "Non critical setup error: cannot add $1 to $_newGrp"
-+}
-+
-+# Update shadowMax for user
-+# Input : username ($1), shadow Max value ($2)
-+# Output : none
-+LdapUpdateShadowMax () {
-+ _newShadow="$2"
-+ ! [[ "$2" =~ ^[0-9]+$ ]] || [ -z "$2" ] \
-+ && _newShadow=$_DEFAULTSHADOWMAX
-+
-+ ldapmodifyuser $1 replace shadowMax $_newShadow
-+ echo "Updating password expiry to $_newShadow days"
-+}
-+
-+# Update shadowWarning for user
-+# Input : username ($1), shadow Warning value ($2)
-+# Output : none
-+LdapUpdateShadowWarning () {
-+ _newWarning="$2"
-+ ! [[ "$2" =~ ^[0-9]+$ ]] || [ -z "$2" ] \
-+ && _newWarning=$_DEFAULTSHADOWWARNING
-+
-+ ldapmodifyuser $1 replace shadowWarning $_newWarning
-+ echo "Updating password expiry to $_newWarning days"
-+}
-+
-+# Since this setup script is meant to be a
-+# wrapper on top of existing ldap scripts,
-+# it share invoke those... we could have achieved
-+# loose coupling by not relying on helpers but
-+# at the expense of massively redundant code
-+# duplication.
-+declare -a helper_scripts=("ldapadduser" "ldapaddsudo" "ldapmodifyuser" "ldapaddusertogroup" "$_BASHSHELL")
-+
-+# Do some quick sanity tests to make sure
-+# helper scripts are present
-+for src in "${helper_scripts[@]}"; do
-+ if ! type "$src" &>/dev/null; then
-+ end_die "Cannot locate $src. Update your PATH variable"
-+ fi
-+done
-+
-+if [ "$#" -eq 0 ]; then
-+ # This setup collects all attributes
-+ # interactively during runtime
-+ echo -n "Enter username to add to LDAP: "
-+ read _username
-+ LdapAddUser "$_username"
-+
-+ # Replace the login shell. Only bash is supported now.
-+ LdapAddLoginShell "$_username"
-+
-+ # Should sudo be activated for this user
-+ echo -n "Add $_username to sudoer list? (yes/NO): "
-+ read CONFIRM
-+ CONFIRM=${CONFIRM,,}
-+
-+ if is_yes $CONFIRM
-+ then
-+ LdapAddSudo "$_username"
-+ fi
-+
-+ # Add to secondary user group
-+ shellInput="Add $_username to secondary user group? (yes/NO): "
-+ options=( "yes", "no" )
-+ CONFIRM=`LdapUserInput "$shellInput" options[@]`
-+ if is_yes $CONFIRM
-+ then
-+ echo -n "Secondary group to add user to? [$_DEFAULTGRP2]: "
-+ read _grp2
-+ LdapSecondaryGroup $_username $_grp2
-+ fi
-+
-+ # Set password expiry
-+ echo -n "Enter days after which user password must \
-+be changed [$_DEFAULTSHADOWMAX]: "
-+ read _shadowMax
-+ LdapUpdateShadowMax $_username $_shadowMax
-+
-+ # Set password warning
-+ echo -n "Enter days before password is to expire that \
-+user is warned [$_DEFAULTSHADOWWARNING]: "
-+ read _shadowWarning
-+ LdapUpdateShadowWarning $_username $_shadowWarning
-+
-+else
-+ # we have to read command line option
-+ while [[ $# > 1 ]]
-+ do
-+ key="$1"
-+
-+ case $key in
-+ -u|--user) # compulsory
-+ _username="$2"
-+ shift
-+ ;;
-+ --sudo) # optional
-+ _sudo="yes"
-+ ;;
-+ --passmax) # optional
-+ _shadowMax="$2"
-+ shift
-+ ;;
-+ --passwarning) # optional
-+ _shadowWarning="$2"
-+ shift
-+ ;;
-+ --secondgroup) # optional
-+ _grpConfirm="1"
-+ _grp2="$2"
-+ shift
-+ ;;
-+ *)
-+
-+ ;;
-+ esac
-+ shift
-+ done
-+
-+ # Add LDAP user
-+ [ -z "$_username" ] && end_die "No username argument specified"
-+ LdapAddUser $_username
-+
-+ # Change Login Shell
-+ LdapAddLoginShell $_username "$_loginshell"
-+
-+ # Add sudo if required
-+ if is_yes $_sudo
-+ then
-+ LdapAddSudo "$_username"
-+ fi
-+
-+ # Add secondary group if required
-+ [ -z "$_grpConfirm" ] || LdapSecondaryGroup $_username $_grp2
-+
-+ # Password modifications
-+ LdapUpdateShadowMax $_username $_shadowMax
-+ LdapUpdateShadowWarning $_username $_shadowWarning
-+fi
-diff --git a/Makefile b/Makefile
-index f81c272..6e5b193 100644
---- a/Makefile
-+++ b/Makefile
-@@ -41,12 +41,13 @@ SBINFILES = ldapdeletemachine ldapmodifygroup ldapsetpasswd lsldap ldapadduser l
- ldapdeleteuser ldapsetprimarygroup ldapfinger ldapid ldapgid ldapmodifymachine \
- ldaprenamegroup ldapaddgroup ldapaddusertogroup ldapdeleteuserfromgroup \
- ldapinit ldapmodifyuser ldaprenamemachine ldapaddmachine ldapdeletegroup \
-- ldaprenameuser ldapmodifysudo ldapdeletesudo
-+ ldaprenameuser ldapmodifysudo ldapdeletesudo ldapusersetup
- MAN1FILES = ldapdeletemachine.1 ldapmodifymachine.1 ldaprenamemachine.1 ldapadduser.1 \
- ldapdeleteuserfromgroup.1 ldapfinger.1 ldapid.1 ldapgid.1 ldapmodifyuser.1 lsldap.1 \
- ldapaddusertogroup.1 ldaprenameuser.1 ldapinit.1 ldapsetpasswd.1 ldapaddgroup.1 \
- ldapdeletegroup.1 ldapsetprimarygroup.1 ldapmodifygroup.1 ldaprenamegroup.1 \
-- ldapaddmachine.1 ldapdeleteuser.1 ldapaddsudo.1 ldapmodifysudo.1 ldapdeletesudo.1
-+ ldapaddmachine.1 ldapdeleteuser.1 ldapaddsudo.1 ldapmodifysudo.1 \
-+ ldapdeletesudo.1 ldapusersetup.1
- MAN5FILES = ldapscripts.5
- TMPLFILES = ldapaddgroup.template.sample ldapaddmachine.template.sample \
- ldapadduser.template.sample
-diff --git a/man/man1/ldapusersetup.1 b/man/man1/ldapusersetup.1
-new file mode 100644
-index 0000000..9b3129b
---- /dev/null
-+++ b/man/man1/ldapusersetup.1
-@@ -0,0 +1,60 @@
-+.\" Copyright (c) 2015 Wind River Systems, Inc.
-+.\"
-+.\" This program is free software; you can redistribute it and/or
-+.\" modify it under the terms of the GNU General Public License
-+.\" as published by the Free Software Foundation; either version 2
-+.\" of the License, or (at your option) any later version.
-+.\"
-+.\" This program is distributed in the hope that it will be useful,
-+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+.\" GNU General Public License for more details.
-+.\"
-+.\" You should have received a copy of the GNU General Public License
-+.\" along with this program; if not, write to the Free Software
-+.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+.\" USA.
-+.\"
-+.\" Kam Nasim
-+.\" knasim@windriver.com
-+.\"
-+.TH ldapusersetup 1 "December 16, 2015"
-+
-+.SH NAME
-+ldapusersetup \- wizard for adding an LDAP user to CGCS.
-+
-+.SH SYNOPSIS
-+.B ldapusersetup
-+
-+.SH DESCRIPTION
-+ldapusersetup interactively walks through the process of creating an LDAP user
-+for access to CGCS services. The user is prompted for:
-+- username
-+- if a sudoEntry needs to be created
-+- if a secondary user group needs to be added
-+- user password expiry and warning configuration
-+Alternatively, the user may provide these parameters as command line actions.
-+Look at the OPTIONS section for more information.
-+
-+To delete the user and all its group associations, simply use ldapdeleteuser(1)
-+
-+.SH OPTIONS
-+.TP
-+.B [-u <username | uid> <field> <value>]
-+The name or uid of the user to modify.
-+The following fields are available as long format options:
-+--sudo : whether to add this user to sudoer list
-+--secondgroup <grp> : the secondary group to add this user to
-+--passmax <value> : the shadowMax value for this user
-+--passwarning <value> : the shadowWarning value for this user"
-+
-+.SH "SEE ALSO"
-+ldapdeleteuser(1), ldapaddgroup(1), ldapaddusertogroup(1), ldapmodifyuser(1), ldapscripts(5).
-+
-+.SH AVAILABILITY
-+The ldapscripts are provided under the GNU General Public License v2 (see COPYING for more details).
-+The latest version of the ldapscripts is available on :
-+.B http://contribs.martymac.org
-+
-+.SH BUGS
-+No bug known.
+++ /dev/null
-dn: cn=<group>,<gsuffix>,<suffix>
-objectClass: posixGroup
-cn: <group>
-gidNumber: <gid>
-description: Group account
+++ /dev/null
-dn: cn=<user>,ou=SUDOers,<suffix>
-objectClass: top
-objectClass: sudoRole
-cn: <user>
-sudoUser: <user>
-sudoHost: ALL
-sudoRunAsUser: ALL
-sudoCommand: ALL
-#sudoOrder: <default: 0, if multiple entries match, this entry with the highest sudoOrder is used>
-#sudoOption: <specify other sudo specific attributes here>
+++ /dev/null
-dn: uid=<user>,<usuffix>,<suffix>
-objectClass: account
-objectClass: posixAccount
-objectClass: shadowAccount
-objectClass: top
-cn: <user>
-uid: <user>
-uidNumber: <uid>
-gidNumber: <gid>
-shadowMax: 99999
-shadowWarning: 7
-shadowLastChange: 0
-homeDirectory: <home>
-loginShell: <shell>
-gecos: <user>
-description: User account
+++ /dev/null
-dn: cn=<user>,ou=SUDOers,<suffix>
-changeType: modify
-<action>: <field>
-<field>: <value>
+++ /dev/null
-dn: uid=<user>,<usuffix>,<suffix>
-changeType: modify
-<action>: <field>
-<field>: <value>
+++ /dev/null
-# Copyright (C) 2005 Ganaël LAPLANCHE - Linagora
-# Copyright (C) 2006-2013 Ganaël LAPLANCHE
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
-
-# LDAP server
-SERVER="ldap://controller"
-
-# Suffixes
-SUFFIX="dc=cgcs,dc=local" # Global suffix
-GSUFFIX="ou=Group" # Groups ou (just under $SUFFIX)
-USUFFIX="ou=People" # Users ou (just under $SUFFIX)
-MSUFFIX="ou=Machines" # Machines ou (just under $SUFFIX)
-
-# Authentication type
-# If empty, use simple authentication
-# Else, use the value as an SASL authentication mechanism
-SASLAUTH=""
-#SASLAUTH="GSSAPI"
-
-# Simple authentication parameters
-# The following BIND* parameters are ignored if SASLAUTH is set
-BINDDN="cn=ldapadmin,dc=cgcs,dc=local"
-# The following file contains the raw password of the BINDDN
-# Create it with something like : echo -n 'secret' > $BINDPWDFILE
-# WARNING !!!! Be careful not to make this file world-readable
-BINDPWDFILE="/usr/local/etc/ldapscripts/ldapscripts.passwd"
-# For older versions of OpenLDAP, it is still possible to use
-# unsecure command-line passwords by defining the following option
-# AND commenting the previous one (BINDPWDFILE takes precedence)
-#BINDPWD="secret"
-
-# Start with these IDs *if no entry found in LDAP*
-GIDSTART="10000" # Group ID
-UIDSTART="10000" # User ID
-MIDSTART="20000" # Machine ID
-
-# Group membership management
-# ObjectCLass used for groups
-# Possible values : posixGroup, groupOfNames, groupOfUniqueNames (case-sensitive !)
-# Warning : when using groupOf*, be sure to be compliant with RFC 2307bis (AUXILIARY posixGroup).
-# Also, do not mix posixGroup and groupOf* entries up in you directory as, within RFC 2307bis,
-# the former is a subset of the latter. The ldapscripts wouldn't cope well with this configuration.
-GCLASS="posixGroup" # Leave "posixGroup" here if not sure !
-# When using groupOfNames or groupOfUniqueNames, creating a group requires an initial
-# member. Specify it below, you will be able to remove it once groups are populated.
-#GDUMMYMEMBER="uid=dummy,$USUFFIX,$SUFFIX"
-
-# User properties
-USHELL="/bin/sh"
-UHOMES="/home/%u" # You may use %u for username here
-CREATEHOMES="no" # Create home directories and set rights ?
-HOMESKEL="/etc/skel" # Directory where the skeleton files are located. Ignored if undefined or nonexistant.
-HOMEPERMS="700" # Default permissions for home directories
-
-# User passwords generation
-# Command-line used to generate a password for added users.
-# You may use %u for username here ; special value "<ask>" will ask for a password interactively
-# WARNING !!!! This is evaluated, everything specified here will be run !
-# WARNING(2) !!!! Some systems (Linux) use a blocking /dev/random (waiting for enough entropy).
-# In this case, consider using /dev/urandom instead.
-#PASSWORDGEN="cat /dev/random | LC_ALL=C tr -dc 'a-zA-Z0-9' | head -c8"
-#PASSWORDGEN="pwgen"
-#PASSWORDGEN="echo changeme"
-PASSWORDGEN="echo %u"
-#PASSWORDGEN="<ask>"
-
-# User passwords recording
-# you can keep trace of generated passwords setting PASSWORDFILE and RECORDPASSWORDS
-# (useful when performing a massive creation / net rpc vampire)
-# WARNING !!!! DO NOT FORGET TO DELETE THE GENERATED FILE WHEN DONE !
-# WARNING !!!! DO NOT FORGET TO TURN OFF RECORDING WHEN DONE !
-RECORDPASSWORDS="no"
-PASSWORDFILE="/var/log/ldapscripts_passwd.log"
-
-# Where to log
-LOGFILE="/var/log/ldapscripts.log"
-
-# Temporary folder
-TMPDIR="/tmp"
-
-# Various binaries used within the scripts
-# Warning : they also use uuencode, date, grep, sed, cut, which...
-# Please check they are installed before using these scripts
-# Note that many of them should come with your OS
-
-# OpenLDAP client commands
-LDAPSEARCHBIN="/usr/bin/ldapsearch"
-LDAPADDBIN="/usr/bin/ldapadd"
-LDAPDELETEBIN="/usr/bin/ldapdelete"
-LDAPMODIFYBIN="/usr/bin/ldapmodify"
-LDAPMODRDNBIN="/usr/bin/ldapmodrdn"
-LDAPPASSWDBIN="/usr/bin/ldappasswd"
-
-# OpenLDAP client common additional options
-# This allows for adding more configuration options to the OpenLDAP clients, e.g. '-ZZ' to enforce TLS
-#LDAPBINOPTS="-ZZ"
-
-# OpenLDAP ldapsearch-specific additional options
-# The following option disables long-line wrapping (which makes the scripts bug
-# when handling long lines). The option was introduced in OpenLDAP 2.4.24, so
-# comment it if you are using OpenLDAP < 2.4.24.
-LDAPSEARCHOPTS="-o ldif-wrap=no"
-# And here is an example to activate paged results
-#LDAPSEARCHOPTS="-E pr=500/noprompt"
-
-# Character set conversion : $ICONVCHAR <-> UTF-8
-# Comment ICONVBIN to disable UTF-8 conversion
-# ICONVBIN="/usr/bin/iconv"
-# ICONVCHAR=""
-
-# Base64 decoding
-# Comment UUDECODEBIN to disable Base64 decoding
-#UUDECODEBIN="/usr/bin/uudecode"
-
-# Getent command to use - choose the ones used
-# on your system. Leave blank or comment for auto-guess.
-# GNU/Linux
-GETENTPWCMD="getent passwd"
-GETENTGRCMD="getent group"
-# FreeBSD
-#GETENTPWCMD="pw usershow"
-#GETENTGRCMD="pw groupshow"
-# Auto
-#GETENTPWCMD=""
-#GETENTGRCMD=""
-
-# You can specify custom LDIF templates here
-# Leave empty to use default templates
-# See *.template.sample for default templates
-#GTEMPLATE="/path/to/ldapaddgroup.template"
-#UTEMPLATE="/path/to/ldapadduser.template"
-#MTEMPLATE="/path/to/ldapaddmachine.template"
-GTEMPLATE="/usr/local/etc/ldapscripts/ldapaddgroup.template.cgcs"
-UTEMPLATE="/usr/local/etc/ldapscripts/ldapadduser.template.cgcs"
-UMTEMPLATE="/usr/local/etc/ldapscripts/ldapmoduser.template.cgcs"
-STEMPLATE="/usr/local/etc/ldapscripts/ldapaddsudo.template.cgcs"
-SMTEMPLATE="/usr/local/etc/ldapscripts/ldapmodsudo.template.cgcs"
-MTEMPLATE=""
+++ /dev/null
-_LDAPADMIN_PW_
+++ /dev/null
----
- lib/runtime | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/lib/runtime
-+++ b/lib/runtime
-@@ -863,7 +863,7 @@ fi
- # Log command
- if [ "$LOGTOFILE" = "yes" ]
- then
-- log_to_file "$(date '+%b %d %H:%M:%S') $(uname -n | sed 's|\..*$||') ldapscripts: $(basename "$0")($USER): $0 $*"
-+ log_to_file "$(date '+%FT%T') $(uname -n | sed 's|\..*$||') ldapscripts: $(basename "$0")($USER): $0 $*"
- fi
- if [ "$LOGTOSYSLOG" = "yes" ]
- then
+++ /dev/null
----
- Makefile | 4 +--
- lib/runtime | 15 ++++++++++++
- man/man1/ldapaddsudo.1 | 54 +++++++++++++++++++++++++++++++++++++++++++
- man/man1/ldapdeletesudo.1 | 46 +++++++++++++++++++++++++++++++++++++
- man/man1/ldapdeleteuser.1 | 5 ++--
- man/man1/ldapmodifysudo.1 | 57 ++++++++++++++++++++++++++++++++++++++++++++++
- man/man1/ldapmodifyuser.1 | 15 ++++++++---
- sbin/ldapdeletesudo | 38 ++++++++++++++++++++++++++++++
- sbin/ldapdeleteuser | 5 ++++
- sbin/ldapmodifysudo | 2 -
- 10 files changed, 232 insertions(+), 9 deletions(-)
-
---- a/sbin/ldapdeleteuser
-+++ b/sbin/ldapdeleteuser
-@@ -46,6 +46,11 @@ _UDN="$_ENTRY"
- # Delete entry
- _ldapdelete "$_UDN" || end_die "Error deleting user $_UDN from LDAP"
-
-+
-+# Optionally, delete the sudoer entry if it exists
-+_ldapdeletesudo $1
-+[ $? -eq 2 ] && end_die "Found sudoEntry for user $_UDN but unable to delete"
-+
- # Finally, delete this user from all his secondary groups
- case $GCLASS in
- posixGroup)
---- a/sbin/ldapmodifysudo
-+++ b/sbin/ldapmodifysudo
-@@ -1,6 +1,6 @@
- #!/bin/sh
-
--# ldapmodifyuser : modifies a sudo entry in an LDAP directory
-+# ldapmodifysudo : modifies a sudo entry in an LDAP directory
-
- # Copyright (C) 2007-2013 Ganaël LAPLANCHE
- # Copyright (C) 2014 Stephen Crooks
---- /dev/null
-+++ b/sbin/ldapdeletesudo
-@@ -0,0 +1,38 @@
-+#!/bin/sh
-+
-+# ldapdeletesudo : deletes a sudoRole from LDAP
-+
-+# Copyright (C) 2005 Ganaël LAPLANCHE - Linagora
-+# Copyright (C) 2006-2013 Ganaël LAPLANCHE
-+# Copyright (c) 2015 Wind River Systems, Inc.
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version 2
-+# of the License, or (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+# USA.
-+
-+if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]
-+then
-+ echo "Usage : $0 <username>"
-+ exit 1
-+fi
-+
-+# Source runtime file
-+_RUNTIMEFILE="/usr/lib/ldapscripts/runtime"
-+. "$_RUNTIMEFILE"
-+
-+# Username = first argument
-+_ldapdeletesudo "$1"
-+[ $? -eq 0 ] || end_die "Unable to locate or delete sudoUser entry for $1"
-+
-+end_ok "Successfully deleted sudoUser entry for $1 from LDAP"
---- a/man/man1/ldapmodifyuser.1
-+++ b/man/man1/ldapmodifyuser.1
-@@ -1,4 +1,5 @@
- .\" Copyright (C) 2007-2017 Ganaël LAPLANCHE
-+.\" Copyright (c) 2015 Wind River Systems, Inc.
- .\"
- .\" This program is free software; you can redistribute it and/or
- .\" modify it under the terms of the GNU General Public License
-@@ -19,14 +20,14 @@
- .\" ganael.laplanche@martymac.org
- .\" http://contribs.martymac.org
- .\"
--.TH ldapmodifyuser 1 "August 22, 2007"
-+.TH ldapmodifyuser 1 "December 8, 2015"
-
- .SH NAME
- ldapmodifyuser \- modifies a POSIX user account in LDAP interactively
-
- .SH SYNOPSIS
- .B ldapmodifyuser
--.RB <username | uid>
-+.RB <username | uid> [<add | replace | delete> <field> <value>]
-
- .SH DESCRIPTION
- ldapmodifyuser first looks for the right entry to modify. Once found, the entry is presented and you
-@@ -34,13 +35,18 @@ are prompted to enter LDIF data to modif
- The DN of the entry being modified is already specified : just begin with a changeType attribute or any
- other one(s) of your choice (in this case, the defaut changeType is 'modify').
-
-+Alternatively, if an optional "action" argument <add | replace | delete> is given, followed by a
-+field - value pair then user will not be interactively prompted.
-+
- .SH OPTIONS
- .TP
--.B <username | uid>
-+.B <username | uid> [<add | replace | delete> <field> <value>]
- The name or uid of the user to modify.
-+The optional "action" pertaining to this user entry.
-+The field - value pair on which the action needs to be undertaken.
-
- .SH "SEE ALSO"
--ldapmodifygroup(1), ldapmodifymachine(1), ldapscripts(5).
-+ldapmodifygroup(1), ldapmodifymachine(1), ldapmodifysudo(1), ldapscripts(5).
-
- .SH AVAILABILITY
- The ldapscripts are provided under the GNU General Public License v2 (see COPYING for more details).
---- a/man/man1/ldapdeleteuser.1
-+++ b/man/man1/ldapdeleteuser.1
-@@ -1,4 +1,5 @@
- .\" Copyright (C) 2006-2017 Ganaël LAPLANCHE
-+.\" Copyright (c) 2015 Wind River Systems, Inc.
- .\"
- .\" This program is free software; you can redistribute it and/or
- .\" modify it under the terms of the GNU General Public License
-@@ -19,10 +20,10 @@
- .\" ganael.laplanche@martymac.org
- .\" http://contribs.martymac.org
- .\"
--.TH ldapdeleteuser 1 "January 1, 2006"
-+.TH ldapdeleteuser 1 "December 8, 2015"
-
- .SH NAME
--ldapdeleteuser \- deletes a POSIX user account from LDAP.
-+ldapdeleteuser \- deletes a POSIX user account, and its sudo entry, from LDAP.
-
- .SH SYNOPSIS
- .B ldapdeleteuser
---- /dev/null
-+++ b/man/man1/ldapaddsudo.1
-@@ -0,0 +1,54 @@
-+.\" Copyright (C) 2006-2013 Ganaël LAPLANCHE
-+.\" Copyright (c) 2015 Wind River Systems, Inc.
-+.\"
-+.\" This program is free software; you can redistribute it and/or
-+.\" modify it under the terms of the GNU General Public License
-+.\" as published by the Free Software Foundation; either version 2
-+.\" of the License, or (at your option) any later version.
-+.\"
-+.\" This program is distributed in the hope that it will be useful,
-+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+.\" GNU General Public License for more details.
-+.\"
-+.\" You should have received a copy of the GNU General Public License
-+.\" along with this program; if not, write to the Free Software
-+.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+.\" USA.
-+.\"
-+.\" Ganael Laplanche
-+.\" ganael.laplanche@martymac.org
-+.\" http://contribs.martymac.org
-+.\"
-+.TH ldapaddsudo 1 "December 8, 2015"
-+
-+.SH NAME
-+ldapaddsudo \- adds a POSIX user account to the sudoer list in LDAP.
-+
-+.SH SYNOPSIS
-+.B ldapaddsudo
-+.RB <username>
-+.RB <groupname | gid>
-+.RB [uid]
-+
-+.SH OPTIONS
-+.TP
-+.B <username>
-+The name of the user to add.
-+.TP
-+.B <groupname | gid>
-+The group name or the gid of the user to add.
-+.TP
-+.B [uid]
-+The uid of the user to add. Automatically computed if not specified.
-+
-+.SH "SEE ALSO"
-+ldapadduser(1), ldapaddgroup(1), ldapaddmachine(1), ldapscripts(5).
-+
-+.SH AVAILABILITY
-+The ldapscripts are provided under the GNU General Public License v2 (see COPYING for more details).
-+The latest version of the ldapscripts is available on :
-+.B http://contribs.martymac.org
-+
-+.SH BUGS
-+No bug known.
---- /dev/null
-+++ b/man/man1/ldapmodifysudo.1
-@@ -0,0 +1,57 @@
-+.\" Copyright (C) 2007-2013 Ganaël LAPLANCHE
-+.\" Copyright (c) 2015 Wind River Systems, Inc.
-+.\"
-+.\" This program is free software; you can redistribute it and/or
-+.\" modify it under the terms of the GNU General Public License
-+.\" as published by the Free Software Foundation; either version 2
-+.\" of the License, or (at your option) any later version.
-+.\"
-+.\" This program is distributed in the hope that it will be useful,
-+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+.\" GNU General Public License for more details.
-+.\"
-+.\" You should have received a copy of the GNU General Public License
-+.\" along with this program; if not, write to the Free Software
-+.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+.\" USA.
-+.\"
-+.\" Ganael Laplanche
-+.\" ganael.laplanche@martymac.org
-+.\" http://contribs.martymac.org
-+.\"
-+.TH ldapmodifysudo 1 "December 8, 2015"
-+
-+.SH NAME
-+ldapmodifysudo \- modifies the sudo entry of a POSIX user account in LDAP interactively
-+
-+.SH SYNOPSIS
-+.B ldapmodifysudo
-+.RB <username | uid> [<add | replace | delete> <field> <value>]
-+
-+.SH DESCRIPTION
-+ldapmodifysudo first looks for the right entry to modify. Once found, the entry is presented and you
-+are prompted to enter LDIF data to modify it as you would do using a standard LDIF file and ldapmodify(1).
-+The DN of the entry being modified is already specified : just begin with a changeType attribute or any
-+other one(s) of your choice (in this case, the defaut changeType is 'modify').
-+
-+Alternatively, if an optional "action" argument <add | replace | delete> is given, followed by a
-+field - value pair then user will not be interactively prompted.
-+
-+.SH OPTIONS
-+.TP
-+.B <username | uid> [<add | replace | delete> <field> <value>]
-+The name or uid of the user to modify.
-+The optional "action" pertaining to this user entry.
-+The field - value pair on which the action needs to be undertaken.
-+
-+.SH "SEE ALSO"
-+ldapmodifygroup(1), ldapmodifymachine(1), ldapmodifyuser(1), ldapscripts(5).
-+
-+.SH AVAILABILITY
-+The ldapscripts are provided under the GNU General Public License v2 (see COPYING for more details).
-+The latest version of the ldapscripts is available on :
-+.B http://contribs.martymac.org
-+
-+.SH BUGS
-+No bug known.
---- /dev/null
-+++ b/man/man1/ldapdeletesudo.1
-@@ -0,0 +1,46 @@
-+.\" Copyright (C) 2006-2013 Ganaël LAPLANCHE
-+.\" Copyright (c) 2015 Wind River Systems, Inc.
-+.\"
-+.\" This program is free software; you can redistribute it and/or
-+.\" modify it under the terms of the GNU General Public License
-+.\" as published by the Free Software Foundation; either version 2
-+.\" of the License, or (at your option) any later version.
-+.\"
-+.\" This program is distributed in the hope that it will be useful,
-+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+.\" GNU General Public License for more details.
-+.\"
-+.\" You should have received a copy of the GNU General Public License
-+.\" along with this program; if not, write to the Free Software
-+.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+.\" USA.
-+.\"
-+.\" Ganael Laplanche
-+.\" ganael.laplanche@martymac.org
-+.\" http://contribs.martymac.org
-+.\"
-+.TH ldapdeletesudo 1 "December 8, 2015"
-+
-+.SH NAME
-+ldapdeletesudo \- deletes a sudo entry, for a POSIX user account, in LDAP
-+
-+.SH SYNOPSIS
-+.B ldapdeletesudo
-+.RB <username | uid>
-+
-+.SH OPTIONS
-+.TP
-+.B <username | uid>
-+The name or uid of the user to delete.
-+
-+.SH "SEE ALSO"
-+ldapdeletegroup(1), ldapdeletemachine(1), ldapdeleteuser(1), ldapscripts(5).
-+
-+.SH AVAILABILITY
-+The ldapscripts are provided under the GNU General Public License v2 (see COPYING for more details).
-+The latest version of the ldapscripts is available on :
-+.B http://contribs.martymac.org
-+
-+.SH BUGS
-+No bug known.
---- a/Makefile
-+++ b/Makefile
-@@ -41,12 +41,12 @@ SBINFILES = ldapdeletemachine ldapmodifygroup ldapsetpasswd lsldap ldapadduser |
- ldapdeleteuser ldapsetprimarygroup ldapfinger ldapid ldapgid ldapmodifymachine \
- ldaprenamegroup ldapaddgroup ldapaddusertogroup ldapdeleteuserfromgroup \
- ldapinit ldapmodifyuser ldaprenamemachine ldapaddmachine ldapdeletegroup \
-- ldaprenameuser ldapmodifysudo
-+ ldaprenameuser ldapmodifysudo ldapdeletesudo
- MAN1FILES = ldapdeletemachine.1 ldapmodifymachine.1 ldaprenamemachine.1 ldapadduser.1 \
- ldapdeleteuserfromgroup.1 ldapfinger.1 ldapid.1 ldapgid.1 ldapmodifyuser.1 lsldap.1 \
- ldapaddusertogroup.1 ldaprenameuser.1 ldapinit.1 ldapsetpasswd.1 ldapaddgroup.1 \
- ldapdeletegroup.1 ldapsetprimarygroup.1 ldapmodifygroup.1 ldaprenamegroup.1 \
-- ldapaddmachine.1 ldapdeleteuser.1
-+ ldapaddmachine.1 ldapdeleteuser.1 ldapaddsudo.1 ldapmodifysudo.1 ldapdeletesudo.1
- MAN5FILES = ldapscripts.5
- TMPLFILES = ldapaddgroup.template.sample ldapaddmachine.template.sample \
- ldapadduser.template.sample
---- a/lib/runtime
-+++ b/lib/runtime
-@@ -294,6 +294,21 @@ _ldapdelete () {
- fi
- }
-
-+# Deletes a sudoUser entry in the LDAP directory
-+# Input : POSIX username whose sudo entry to delete ($1)
-+# Output: 0 on successful delete
-+# 1 on being unable to find sudoUser
-+# 2 on being unable to delete found sudoUser entry
-+_ldapdeletesudo () {
-+ [ -z "$1" ] && end_die "_ldapdeletesudo : missing argument"
-+ # Find the entry
-+ _findentry "$SUFFIX" "(&(objectClass=sudoRole)(|(cn=$1)(sudoUser=$1)))"
-+ [ -z "$_ENTRY" ] && return 1
-+
-+ # Now delete that entry
-+ _ldapdelete "$_ENTRY" || return 2
-+}
-+
- # Extracts LDIF information from $0 (the current script itself)
- # selecting lines beginning with $1 occurrences of '#'
- # Input : depth ($1)
+++ /dev/null
-Index: ldapscripts-2.0.8/sbin/ldapaddsudo
-===================================================================
---- /dev/null
-+++ ldapscripts-2.0.8/sbin/ldapaddsudo
-@@ -0,0 +1,63 @@
-+#!/bin/sh
-+
-+# ldapaddsudo : adds a sudoRole to LDAP
-+
-+# Copyright (C) 2005 Ganaël LAPLANCHE - Linagora
-+# Copyright (C) 2006-2013 Ganaël LAPLANCHE
-+# Copyright (c) 2014 Wind River Systems, Inc.
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version 2
-+# of the License, or (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+# USA.
-+
-+if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]
-+then
-+ echo "Usage : $0 <username>"
-+ exit 1
-+fi
-+
-+# Source runtime file
-+_RUNTIMEFILE="/usr/lib/ldapscripts/runtime"
-+. "$_RUNTIMEFILE"
-+
-+# Username = first argument
-+_USER="$1"
-+
-+# Use template if necessary
-+if [ -n "$STEMPLATE" ] && [ -r "$STEMPLATE" ]
-+then
-+ _getldif="cat $STEMPLATE"
-+else
-+ _getldif="_extractldif 2"
-+fi
-+
-+# Add sudo entry to LDAP
-+$_getldif | _filterldif | _askattrs | _utf8encode | _ldapadd
-+
-+[ $? -eq 0 ] || end_die "Error adding user $_USER to LDAP"
-+echo_log "Successfully added sudo access for user $_USER to LDAP"
-+
-+end_ok
-+
-+# Ldif template ##################################
-+##dn: cn=<user>,ou=SUDOers,<usuffix>,<suffix>
-+##objectClass: top
-+##objectClass: sudoRole
-+##cn: <user>
-+##sudoUser: <user>
-+##sudoHost: ALL
-+##sudoRunAsUser: ALL
-+##sudoCommand: ALL
-+###sudoOrder: <default: 0, if multiple entries match, this entry with the highest sudoOrder is used>
-+###sudoOption: <specify other sudo specific attributes here>
-Index: ldapscripts-2.0.8/sbin/ldapmodifyuser
-===================================================================
---- ldapscripts-2.0.8.orig/sbin/ldapmodifyuser
-+++ ldapscripts-2.0.8/sbin/ldapmodifyuser
-@@ -19,9 +19,11 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- # USA.
-
--if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]
-+if [ "$1" = "-h" ] || [ "$1" = "--help" ] || \
-+ [[ "$2" != "add" && "$2" != "replace" && "$2" != "delete" ]] || \
-+ [ "$#" -ne 4 ]
- then
-- echo "Usage : $0 <username | uid>"
-+ echo "Usage : $0 <username | uid> [<add | replace | delete> <field> <value>]"
- exit 1
- fi
-
-@@ -33,21 +35,48 @@ _RUNTIMEFILE="/usr/lib/ldapscripts/runti
- _findentry "$USUFFIX,$SUFFIX" "(&(objectClass=posixAccount)(|(uid=$1)(uidNumber=$1)))"
- [ -z "$_ENTRY" ] && end_die "User $1 not found in LDAP"
-
--# Allocate and create temp file
--mktempf
--echo "dn: $_ENTRY" > "$_TMPFILE" || end_die "Error writing to temporary file $_TMPFILE"
--
--# Display entry
--echo "# About to modify the following entry :"
--_ldapsearch "$_ENTRY"
--
--# Edit entry
--echo "# Enter your modifications here, end with CTRL-D."
--echo "dn: $_ENTRY"
--cat >> "$_TMPFILE" || end_die "Error writing to temporary file $_TMPFILE"
-+# Username = first argument
-+_USER="$1"
-+
-+if [ "$#" -eq 1 ]
-+then
-+ # Allocate and create temp file
-+ mktempf
-+ echo "dn: $_ENTRY" > "$_TMPFILE" || end_die "Error writing to temporary file $_TMPFILE"
-+
-+ # Display entry
-+ echo "# About to modify the following entry :"
-+ _ldapsearch "$_ENTRY"
-+
-+ # Edit entry
-+ echo "# Enter your modifications here, end with CTRL-D."
-+ echo "dn: $_ENTRY"
-+ cat >> "$_TMPFILE" || end_die "Error writing to temporary file $_TMPFILE"
-+
-+ # Send modifications
-+ cat "$_TMPFILE" | _utf8encode | _ldapmodify
-+else
-+ # Action = second argument
-+ _ACTION="$2"
-+
-+ # Field = third argument
-+ _FIELD="$3"
-+
-+ # Value = fourth argument
-+ _VALUE="$4"
-+
-+ # Use template if necessary
-+ if [ -n "$UMTEMPLATE" ] && [ -r "$UMTEMPLATE" ]
-+ then
-+ _getldif="cat $UMTEMPLATE"
-+ else
-+ _getldif="_extractldif 2"
-+ fi
-+
-+ # Modify user in LDAP
-+ $_getldif | _filterldif | _utf8encode | _ldapmodify
-+fi
-
--# Send modifications
--cat "$_TMPFILE" | _utf8encode | _ldapmodify
- if [ $? -ne 0 ]
- then
- reltempf
-@@ -55,3 +84,9 @@ then
- fi
- reltempf
- end_ok "Successfully modified user entry $_ENTRY in LDAP"
-+
-+# Ldif template ##################################
-+##dn: uid=<user>,<usuffix>,<suffix>
-+##changeType: modify
-+##<action>: <field>
-+##<field>: <value>
-Index: ldapscripts-2.0.8/lib/runtime
-===================================================================
---- ldapscripts-2.0.8.orig/lib/runtime
-+++ ldapscripts-2.0.8/lib/runtime
-@@ -344,6 +344,9 @@ s|<msuffix>|$MSUFFIX|g
- s|<_msuffix>|$_MSUFFIX|g
- s|<gsuffix>|$GSUFFIX|g
- s|<_gsuffix>|$_GSUFFIX|g
-+s|<action>|$_ACTION|g
-+s|<field>|$_FIELD|g
-+s|<value>|$_VALUE|g
- EOF
-
- # Use it
-Index: ldapscripts-2.0.8/Makefile
-===================================================================
---- ldapscripts-2.0.8.orig/Makefile
-+++ ldapscripts-2.0.8/Makefile
-@@ -37,11 +37,11 @@ LIBDIR = $(PREFIX)/lib/$(NAME)
- RUNFILE = runtime
- ETCFILE = ldapscripts.conf
- PWDFILE = ldapscripts.passwd
--SBINFILES = ldapdeletemachine ldapmodifygroup ldapsetpasswd lsldap ldapadduser \
-+SBINFILES = ldapdeletemachine ldapmodifygroup ldapsetpasswd lsldap ldapadduser ldapaddsudo \
- ldapdeleteuser ldapsetprimarygroup ldapfinger ldapid ldapgid ldapmodifymachine \
- ldaprenamegroup ldapaddgroup ldapaddusertogroup ldapdeleteuserfromgroup \
- ldapinit ldapmodifyuser ldaprenamemachine ldapaddmachine ldapdeletegroup \
-- ldaprenameuser
-+ ldaprenameuser ldapmodifysudo
- MAN1FILES = ldapdeletemachine.1 ldapmodifymachine.1 ldaprenamemachine.1 ldapadduser.1 \
- ldapdeleteuserfromgroup.1 ldapfinger.1 ldapid.1 ldapgid.1 ldapmodifyuser.1 lsldap.1 \
- ldapaddusertogroup.1 ldaprenameuser.1 ldapinit.1 ldapsetpasswd.1 ldapaddgroup.1 \
-Index: ldapscripts-2.0.8/sbin/ldapmodifysudo
-===================================================================
---- /dev/null
-+++ ldapscripts-2.0.8/sbin/ldapmodifysudo
-@@ -0,0 +1,93 @@
-+#!/bin/sh
-+
-+# ldapmodifyuser : modifies a sudo entry in an LDAP directory
-+
-+# Copyright (C) 2007-2013 Ganaël LAPLANCHE
-+# Copyright (C) 2014 Stephen Crooks
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version 2
-+# of the License, or (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+# USA.
-+
-+if [ "$1" = "-h" ] || [ "$1" = "--help" ] || \
-+ [[ "$2" != "add" && "$2" != "replace" && "$2" != "delete" ]] || \
-+ [ "$#" -ne 4 ]
-+then
-+ echo "Usage : $0 <username | uid> [<add | replace | delete> <field> <value>]"
-+ exit 1
-+fi
-+
-+# Source runtime file
-+_RUNTIMEFILE="/usr/lib/ldapscripts/runtime"
-+. "$_RUNTIMEFILE"
-+
-+# Find username : $1 must exist in LDAP !
-+_findentry "$SUFFIX" "(&(objectClass=sudoRole)(|(cn=$1)(sudoUser=$1)))"
-+[ -z "$_ENTRY" ] && end_die "Sudo user $1 not found in LDAP"
-+
-+# Username = first argument
-+_USER="$1"
-+
-+if [ "$#" -eq 1 ]
-+then
-+ # Allocate and create temp file
-+ mktempf
-+ echo "dn: $_ENTRY" > "$_TMPFILE" || end_die "Error writing to temporary file $_TMPFILE"
-+
-+ # Display entry
-+ echo "# About to modify the following entry :"
-+ _ldapsearch "$_ENTRY"
-+
-+ # Edit entry
-+ echo "# Enter your modifications here, end with CTRL-D."
-+ echo "dn: $_ENTRY"
-+ cat >> "$_TMPFILE" || end_die "Error writing to temporary file $_TMPFILE"
-+
-+ # Send modifications
-+ cat "$_TMPFILE" | _utf8encode | _ldapmodify
-+else
-+ # Action = second argument
-+ _ACTION="$2"
-+
-+ # Field = third argument
-+ _FIELD="$3"
-+
-+ # Value = fourth argument
-+ _VALUE="$4"
-+
-+ # Use template if necessary
-+ if [ -n "$SMTEMPLATE" ] && [ -r "$SMTEMPLATE" ]
-+ then
-+ _getldif="cat $SMTEMPLATE"
-+ else
-+ _getldif="_extractldif 2"
-+ fi
-+
-+ # Modify user in LDAP
-+ $_getldif | _filterldif | _utf8encode | _ldapmodify
-+fi
-+
-+if [ $? -ne 0 ]
-+then
-+ reltempf
-+ end_die "Error modifying sudo entry $_ENTRY in LDAP"
-+fi
-+reltempf
-+end_ok "Successfully modified sudo entry $_ENTRY in LDAP"
-+
-+# Ldif template ##################################
-+##dn: cn=<user>,ou=SUDOers,<suffix>
-+##changeType: modify
-+##<action>: <field>
-+##<field>: <value>
+++ /dev/null
-
-DESCRIPTION = " \
-The ldapscripts are originally designed to be used within Samba 3.x's \
-smb.conf file. They allow to manipulate POSIX entries for users, groups \
-and machines in an LDAP directory. They are written in shell and need ldap \
-client commands to work correctly (ldapadd, ldapdelete, ldapmodify, \
-ldapsearch). Other scripts also are provided as simple tools to (manually) \
-query your LDAP directory : ldapfinger, ldapid, lsldap (...). \
- \
-They are designed to be used under GNU/Linux or FreeBSD (any other \
-recent UNIX-like should also work) and require several binaries that should \
-come with your OS (uuencode, getent/pw, date, grep, sed, cut...). \
- \
-Latest version available on http://contribs.martymac.org \
-"
-
-SUMMARY = "Shell scripts to manage POSIX accounts in LDAP"
-
-SECTION = "base"
-LICENSE = "GPLv2"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI = "https://downloads.sourceforge.net/project/ldapscripts/ldapscripts/ldapscripts-2.0.8/ldapscripts-2.0.8.tgz"
-SRC_URI[md5sum] = "99a7222215eaea2c8bc790d0437f22ea"
-SRC_URI[sha256sum] = "7db3848501f257a10417c9bcfc0b70b76d0a8093eb993f2354925e156c3419ff"
-
-SRC_URI += " file://sudo-support.patch \
- file://sudo-delete-support.patch \
- file://log_timestamp.patch \
- file://ldap-user-setup-support.patch \
- file://allow-anonymous-bind-for-ldap-search.patch \
- file://ldapscripts.conf.cgcs \
- file://ldapadduser.template.cgcs \
- file://ldapaddgroup.template.cgcs \
- file://ldapmoduser.template.cgcs \
- file://ldapaddsudo.template.cgcs \
- file://ldapmodsudo.template.cgcs \
- file://ldapscripts.passwd \
-"
-
-SOURCE1 = "${WORKDIR}/ldapscripts.conf.cgcs"
-SOURCE2 = "${WORKDIR}/ldapadduser.template.cgcs"
-SOURCE3 = "${WORKDIR}/ldapaddgroup.template.cgcs"
-SOURCE4 = "${WORKDIR}/ldapmoduser.template.cgcs"
-SOURCE5 = "${WORKDIR}/ldapaddsudo.template.cgcs"
-SOURCE6 = "${WORKDIR}/ldapmodsudo.template.cgcs"
-SOURCE7 = "${WORKDIR}/ldapscripts.passwd"
-
-do_configure () {
- cd ${S}
- oe_runmake -e configure
-}
-
-do_compile () {
- :
-}
-
-do_install () {
- cd ${S}
- oe_runmake -e DESTDIR=${D} SBINDIR=${sbindir} \
- MANDIR=${mandir} ETCDIR=${sysconfdir}/ldapscripts \
- LIBDIR=${libdir} install
-
- rm -Rf ${D}${mandir}/*
- rm -f ${D}${sbindir}/*machine*
- rm -f ${D}${sysconfdir}//ldapscripts/ldapaddmachine.template.sample
- install -m 644 ${SOURCE1} ${D}${sysconfdir}/ldapscripts/ldapscripts.conf
- install -m 644 ${SOURCE2} ${D}${sysconfdir}/ldapscripts/ldapadduser.template.cgcs
- install -m 644 ${SOURCE3} ${D}${sysconfdir}/ldapscripts/ldapaddgroup.template.cgcs
- install -m 644 ${SOURCE4} ${D}${sysconfdir}/ldapscripts/ldapmoduser.template.cgcs
- install -m 644 ${SOURCE5} ${D}${sysconfdir}/ldapscripts/ldapaddsudo.template.cgcs
- install -m 644 ${SOURCE6} ${D}${sysconfdir}/ldapscripts/ldapmodsudo.template.cgcs
- install -m 600 ${SOURCE7} ${D}${sysconfdir}/ldapscripts/ldapscripts.passwd
-}
-
-FILES_${PN}_append = " ${libdir}/runtime \
- ${sysconfdir} \
-"
+++ /dev/null
-
-do_install_append() {
- sed -i -e 's|${libdir}|${libexecdir}|' ${D}/etc/apache2/modules.d/wsgi.load
-}
+++ /dev/null
-
-inherit useradd
-
-USERADD_PACKAGES = "${PN}"
-
-USERADD_PARAM_${PN} = "-r -g ldap -c 'LDAP Client User' -u 65 -d / -s /sbin/nologin nslcd"
+++ /dev/null
-
-DESCRIPTION = "A library to handle official service types for OpenStack and their historical aliases."
-HOMEPAGE = "https://opendev.org/openstack/os-service-types"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-STABLE = "master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "2e5b38088a43539621de82aa2d0c1b366c2638a9"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://opendev.org/openstack/os-service-types.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- python-lxml \
- python-requests \
- python-cython \
- "
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-barbican.gemspec 2019-10-28 13:33:43.108639914 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-barbican'
-+ s.version = '11.3.0'
-+ s.date = '2017-08-21'
-+ s.summary = "Puppet module for OpenStack Barbican"
-+ s.description = s.summary
-+ s.authors = ["Puppet Labs"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://launchpad.net/puppet-barbican'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
-From fd7e40080bc5681376d91aff3956004c6ad2bfc7 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Sat, 14 Mar 2020 20:12:45 +0800
-Subject: [PATCH] puppet-barbican: do not fail for poky-stx
-
-poky-stx is set as Debian osfamily, but we still use barbican-api
-as $service_name, so do not fail for it.
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- manifests/api.pp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/manifests/api.pp b/manifests/api.pp
-index a31088b..6716588 100644
---- a/manifests/api.pp
-+++ b/manifests/api.pp
-@@ -486,7 +486,7 @@ the future release. Please use barbican::api::package_ensure instead.")
- }
-
- if $service_name == 'barbican-api' {
-- if $::osfamily == 'Debian' {
-+ if $::osfamily == 'Debian' and $::operatingsystem != 'poky-stx' {
- fail('On Debian family the service_name must be set to httpd as there is no eventlet init script.')
- }
- service { 'barbican-api':
---
-2.7.4
-
+++ /dev/null
-From 647dd40c145c6b52746a21656a3809bf4d016ab3 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Sat, 14 Mar 2020 19:53:03 +0800
-Subject: [PATCH] puppet-barbican: fix the pkg and service names for poky-stx
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- manifests/params.pp | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/manifests/params.pp b/manifests/params.pp
-index 7dc418e..3a678c2 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
-@@ -19,9 +19,16 @@ class barbican::params {
- $httpd_config_file = '/etc/httpd/conf.d/barbican-api.conf'
- }
- 'Debian': {
-- $api_package_name = 'barbican-api'
-- $worker_package_name = 'barbican-worker'
-- $worker_service_name = 'barbican-worker'
-+ if ($::operatingsystem == 'poky-stx') {
-+ $api_package_name = 'barbican'
-+ $api_service_name = 'openstack-barbican-api'
-+ $worker_package_name = 'barbican'
-+ $worker_service_name = 'openstack-barbican-worker'
-+ } else {
-+ $api_package_name = 'barbican-api'
-+ $worker_package_name = 'barbican-worker'
-+ $worker_service_name = 'barbican-worker'
-+ }
- $barbican_wsgi_script_path = '/usr/lib/cgi-bin/barbican'
- $barbican_wsgi_script_source = '/usr/lib/python2.7/dist-packages/barbican/api/app.wsgi'
- $httpd_config_file = '/etc/apache2/conf-available/barbican-api.conf'
---
-2.7.4
-
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppet-boolean.gemspec 2019-10-30 08:37:38.629069755 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-boolean'
-+ s.version = '1.0.1'
-+ s.date = '2013-08-14'
-+ s.summary = "Boolean normalizing property for Puppet types."
-+ s.description = s.summary
-+ s.authors = ["Vox Pupuli"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.markdown Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/voxpupuli/puppet-boolean'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
-From 8875f0dfb30856ba9d2d629dc3c55d304537ad72 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Mon, 28 Oct 2019 14:38:12 -0700
-Subject: [PATCH] Remove puppetlabs-apt as ceph requirement
-
-STX patch ported from 8ab55c717d5088d8c75b465f5b9196036e0968ce
-We will never install apt or puppet-apt, so this requirement cannot be fulfilled
----
- metadata.json | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/metadata.json b/metadata.json
-index a760f1c..5997e16 100644
---- a/metadata.json
-+++ b/metadata.json
-@@ -47,10 +47,6 @@
- ],
- "description": "Installs and configures Ceph.",
- "dependencies": [
-- {
-- "name": "puppetlabs/apt",
-- "version_requirement": ">=2.0.0 <3.0.0"
-- },
- {
- "name": "puppetlabs/apache",
- "version_requirement": ">=1.4.1 <2.0.0"
---
-2.17.1
-
+++ /dev/null
-diff --git a/manifests/params.pp b/manifests/params.pp
-index 2d4d722..4cfb1b4 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
-@@ -51,11 +51,16 @@ class ceph::params (
-
- case $::osfamily {
- 'Debian': {
-- $pkg_radosgw = 'radosgw'
-+ if ($::operatingsystem == 'poky-stx') {
-+ $pkg_radosgw = 'ceph'
-+ $service_provider = 'systemd'
-+ } else {
-+ $pkg_radosgw = 'radosgw'
-+ $service_provider = 'debian'
-+ }
- $user_radosgw = 'www-data'
- $pkg_fastcgi = 'libapache2-mod-fastcgi'
- $pkg_nsstools = ['libnss3-tools', 'wget']
-- $service_provider = 'debian'
- $pkg_policycoreutils = 'policycoreutils'
- }
-
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-ceph.gemspec 2019-10-28 14:39:41.525008548 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-ceph'
-+ s.version = '2.4.1'
-+ s.date = '2017-09-07'
-+ s.summary = "Community Developed Ceph Module"
-+ s.description = s.summary
-+ s.authors = ["rcritten"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://launchpad.net/puppet-ceph'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
-From c513b8d9591740bac5cdbb240853700971eb7c62 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Sat, 7 Mar 2020 00:38:52 -0800
-Subject: [PATCH] puppet-certmonger: adjust path to poky rootfs
-
----
- manifests/scripts.pp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/manifests/scripts.pp b/manifests/scripts.pp
-index d53eacb..54945b6 100644
---- a/manifests/scripts.pp
-+++ b/manifests/scripts.pp
-@@ -15,7 +15,7 @@ class certmonger::scripts (
- mode => '0755',
- source => 'puppet:///modules/certmonger/verify_certmonger_request.sh',
- }
-- file { '/usr/local/bin/change-perms-restart':
-+ file { '/usr/bin/change-perms-restart':
- ensure => 'present',
- owner => 'root',
- group => 'root',
---
-2.23.0
-
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-certmonger.gemspec 2019-10-28 07:51:11.303843437 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-certmonger'
-+ s.version = '1.1.1'
-+ s.date = '2016-10-10'
-+ s.summary = "Puppet certmonger module"
-+ s.description = s.summary
-+ s.authors = ["Puppet saz "]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/earsdown/puppet-certmonger'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-collectd.gemspec 2019-10-28 08:10:42.292236594 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-collectd'
-+ s.version = '5.1.0'
-+ s.date = '2016-08-18'
-+ s.summary = "Puppet collectd module"
-+ s.description = s.summary
-+ s.authors = ["Puppet VoxPupuli"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/voxpupuli/puppet-collectd'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
-diff --git a/packstack/puppet/modules/dnsmasq/manifests/params.pp b/packstack/puppet/modules/dnsmasq/manifests/params.pp
-index 4d8e70a..b978224 100644
---- a/packstack/puppet/modules/dnsmasq/manifests/params.pp
-+++ b/packstack/puppet/modules/dnsmasq/manifests/params.pp
-@@ -38,7 +38,7 @@ class dnsmasq::params {
-
- $process_user = $::operatingsystem ? {
- /(?i:Debian|Ubuntu|Mint)/ => 'dnsmasq',
-- /(?i:wrlinux)/ => 'root',
-+ /(?i:wrlinux|poky-stx)/ => 'root',
- default => 'nobody',
- }
-
-@@ -63,7 +63,7 @@ class dnsmasq::params {
- }
-
- $config_file_init = $::operatingsystem ? {
-- /(?i:Debian|Ubuntu|Mint|wrlinux)/ => '/etc/default/dnsmasq',
-+ /(?i:Debian|Ubuntu|Mint|wrlinux|poky-stx)/ => '/etc/default/dnsmasq',
- default => '/etc/sysconfig/dnsmasq',
- }
-
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppet-dnsmasq.gemspec 2019-10-31 12:10:38.277914711 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-dnsmasq'
-+ s.version = '1.1.0'
-+ s.date = '2014-03-15'
-+ s.summary = "Puppet module for dnsmasq"
-+ s.description = s.summary
-+ s.authors = ["Javier Bertoli"]
-+ s.email = ''
-+ s.files = %w(Modulefile README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'http://www.netmanagers.com.ar'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/metadata.json 2019-10-31 12:11:57.326213149 -0700
-@@ -0,0 +1,14 @@
-+{
-+ "name": "puppet-dnsmasq",
-+ "version": "1.1.0",
-+ "author": "Javier Bertoli",
-+ "summary": "Puppet module for dnsmasq.",
-+ "license": "Apache-2.0",
-+ "source": "https://github.com/netmanagers/puppet-dnsmasq",
-+ "project_page": "http://www.netmanagers.com.ar",
-+ "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
-+ "dependencies": [
-+ {"name":"puppetlabs/stdlib","version_requirement":">= 4.1.0 < 5.0.0"},
-+ {"name":"puppetlabs/concat","version_requirement":">= 1.1.0 < 5.0.0"}
-+ ]
-+}
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppet-drbd.gemspec 2019-10-30 21:51:28.271880621 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-drbd'
-+ s.version = '0.3.1'
-+ s.date = '2016-12-30'
-+ s.summary = "DRBD Module"
-+ s.description = s.summary
-+ s.authors = ["Vox Pupuli"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/voxpupuli/puppet-drbd'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-etcd.gemspec 2019-10-28 10:02:42.678631063 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-etcd'
-+ s.version = '1.11.0'
-+ s.date = '2016-08-21'
-+ s.summary = "Installs and configures etcd"
-+ s.description = s.summary
-+ s.authors = ["Cristian Falcas"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/cristifalcas/puppet-etcd'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
-diff -ru a/manifests/config.pp b/manifests/config.pp
---- a/manifests/config.pp 2020-03-05 15:24:05.754122863 +0800
-+++ b/manifests/config.pp 2020-03-05 16:45:19.090255672 +0800
-@@ -14,6 +14,7 @@
- content => template("${module_name}/etc/etcd/etcd.yml.erb"),
- }
-
-+ # only available for Redhat??
- if $::etcd::manage_package and $::etcd::journald_forward_enable and $::operatingsystemmajrelease == '7' {
- file { '/etc/systemd/system/etcd.service.d':
- ensure => 'directory',
-diff -ru a/manifests/params.pp b/manifests/params.pp
---- a/manifests/params.pp 2020-03-05 15:24:05.754122863 +0800
-+++ b/manifests/params.pp 2020-03-05 16:15:42.434207254 +0800
-@@ -17,7 +17,11 @@
- }
- }
- 'Debian' : {
-- $config_file_path = '/etc/default/etcd.conf'
-+ if ($::operatingsystem == 'poky-stx') {
-+ $config_file_path = '/etc/etcd/etcd.conf'
-+ } else {
-+ $config_file_path = '/etc/default/etcd.conf'
-+ }
- }
- default : {
- fail('Unsupported OS.')
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/adrien-filemapper.gemspec 2019-10-31 11:12:27.233178439 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'adrien-filemapper'
-+ s.version = '1.1.3'
-+ s.date = '2014-09-13'
-+ s.summary = "Puppet provider file manipulation extension"
-+ s.description = s.summary
-+ s.authors = ["Adrien Thebo <adrien@somethingsinistral.net>"]
-+ s.email = ''
-+ s.files = %w(Modulefile README.markdown ) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/adrienthebo/puppet-filemapper'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/metadata.json 2019-10-31 13:24:24.780569778 -0700
-@@ -0,0 +1,11 @@
-+{
-+ "name": "adrien-filemapper",
-+ "version": "1.1.3",
-+ "author": "Adrien Tehbo <adrien@somethingsinistral.net>",
-+ "summary": "Puppet provider file manipulation extension",
-+ "license": "Apache-2.0",
-+ "source": "https://github.com/adrienthebo/puppet-filemapper",
-+ "project_page": "https://github.com/adrienthebo/puppet-filemapper",
-+ "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
-+ "dependencies": [ ]
-+}
+++ /dev/null
-From f5a7c8b73de90a50c66d60824dea8b85d1acf15c Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Mon, 28 Oct 2019 14:47:58 -0700
-Subject: [PATCH] Update memcached dependency
-
----
- metadata.json | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/metadata.json b/metadata.json
-index 27843d7..d48c0c2 100644
---- a/metadata.json
-+++ b/metadata.json
-@@ -11,7 +11,7 @@
- },
- {
- "name": "saz/memcached",
-- "version_requirement": ">=2.0.2 <3.0.0"
-+ "version_requirement": ">=2.0.2 <=3.0.2"
- }
- ],
- "description": "Installs and configures OpenStack Horizon (Dashboard).",
-@@ -58,4 +58,4 @@
- "source": "git://github.com/openstack/puppet-horizon.git",
- "summary": "Puppet module for OpenStack Horizon",
- "version": "11.5.0"
--}
-\ No newline at end of file
-+}
---
-2.17.1
-
+++ /dev/null
-diff -ru a/manifests/params.pp b/manifests/params.pp
---- a/manifests/params.pp 2020-04-13 18:34:56.702263928 +0800
-+++ b/manifests/params.pp 2020-04-13 18:36:23.158266284 +0800
-@@ -32,17 +32,27 @@
- $static_path = '/var/lib'
- $apache_user = 'www-data'
- $apache_group = 'www-data'
-- $wsgi_user = 'horizon'
-- $wsgi_group = 'horizon'
-- $memcache_package = 'python-memcache'
- case $::os_package_type {
- 'debian': {
- $package_name = 'openstack-dashboard-apache'
- $httpd_config_file = '/etc/apache2/sites-available/openstack-dashboard-alias-only.conf'
-+ $memcache_package = 'python-memcache'
-+ $wsgi_user = 'horizon'
-+ $wsgi_group = 'horizon'
-+ }
-+ 'poky': {
-+ $package_name = 'python-django-horizon'
-+ $httpd_config_file = '/etc/httpd/conf.d/openstack-dashboard.conf'
-+ $memcache_package = 'python-memcached'
-+ $wsgi_user = 'apache'
-+ $wsgi_group = 'apache'
- }
- default: {
- $package_name = 'openstack-dashboard'
- $httpd_config_file = '/etc/apache2/conf-available/openstack-dashboard.conf'
-+ $memcache_package = 'python-memcache'
-+ $wsgi_user = 'horizon'
-+ $wsgi_group = 'horizon'
- }
- }
- }
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-horizon.gemspec 2019-10-26 22:29:30.802030276 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-horizon'
-+ s.version = '11.5.0'
-+ s.date = '2019-09-24'
-+ s.summary = "Puppet horizon module"
-+ s.description = s.summary
-+ s.authors = ["Puppet Labs"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/openstack/puppet-horizon'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-keystone.gemspec 2019-10-28 15:09:10.705761083 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-keystone'
-+ s.version = '11.3.0'
-+ s.date = '2017-08-21'
-+ s.summary = "Puppet module for OpenStack Keystone."
-+ s.description = s.summary
-+ s.authors = ["Puppet Labs and OpenStack Contributors"]
-+ s.email = ''
-+ s.files = %w(LICENSE) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://launchpad.net/puppet-keystone'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
-From dc2512633a9552272acfcc180ddc86c621b51313 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Wed, 11 Mar 2020 11:12:34 +0800
-Subject: [PATCH] params.pp: fix the service name of openstack-keystone
-
-Upstream-Status: Inappropriate [poky-stx specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- manifests/params.pp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/manifests/params.pp b/manifests/params.pp
-index 0d61acf..590e02b 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
-@@ -11,7 +11,7 @@ class keystone::params {
- case $::osfamily {
- 'Debian': {
- $package_name = 'keystone'
-- $service_name = 'keystone'
-+ $service_name = 'openstack-keystone'
- $keystone_wsgi_script_path = '/usr/lib/cgi-bin/keystone'
- $python_memcache_package_name = 'python-memcache'
- $mellon_package_name = 'libapache2-mod-auth-mellon'
---
-2.7.4
-
+++ /dev/null
-From 3e976dc2357aa7a6f9a0352ff2a82e7203f28fba Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Wed, 8 Jan 2020 15:54:44 -0800
-Subject: [PATCH] puppet-keystone: specify full path to openrc
-
-issue 48: keystone endpoints cannot be populated properly
-
-Upstream-Status: Inappropriate [poky-stx specific]
-
----
- manifests/deps.pp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/manifests/deps.pp b/manifests/deps.pp
-index 30c29528..d98154dd 100644
---- a/manifests/deps.pp
-+++ b/manifests/deps.pp
-@@ -63,18 +63,25 @@ class keystone::deps {
- # The following resources need to be provisioned after the service is up.
- Anchor['keystone::service::end']
- -> Keystone_domain<||>
-+ -> File['/etc/platform/openrc']
- Anchor['keystone::service::end']
- -> Keystone_endpoint<||>
-+ -> File['/etc/platform/openrc']
- Anchor['keystone::service::end']
- -> Keystone_role<||>
-+ -> File['/etc/platform/openrc']
- Anchor['keystone::service::end']
- -> Keystone_service<||>
-+ -> File['/etc/platform/openrc']
- Anchor['keystone::service::end']
- -> Keystone_tenant<||>
-+ -> File['/etc/platform/openrc']
- Anchor['keystone::service::end']
- -> Keystone_user<||>
-+ -> File['/etc/platform/openrc']
- Anchor['keystone::service::end']
- -> Keystone_user_role<||>
-+ -> File['/etc/platform/openrc']
-
- # Installation or config changes will always restart services.
- Anchor['keystone::install::end'] ~> Anchor['keystone::service::begin']
---
-2.23.0
-
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/camptocamp-kmod.gemspec 2019-10-31 13:36:53.819223247 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'camptocamp-kmod'
-+ s.version = '2.1.0'
-+ s.date = '2016-06-24'
-+ s.summary = "Manage Linux kernel modules with Puppet"
-+ s.description = s.summary
-+ s.authors = ["camptocamp"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/camptocamp/puppet-kmod'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
-diff -ruN a/manifests/load.pp b/manifests/load.pp
---- a/manifests/load.pp 2020-05-13 10:13:02.620078850 +0000
-+++ b/manifests/load.pp 2020-05-13 10:16:12.488077982 +0000
-@@ -56,10 +56,18 @@
-
- case $::osfamily {
- 'Debian': {
-- augeas {"Manage ${name} in ${file}":
-- incl => $file,
-- lens => 'Modules.lns',
-- changes => $changes,
-+ if $::operatingsystem == 'poky-stx' {
-+ file { "/etc/modules-load.d/${name}.conf":
-+ ensure => $ensure,
-+ mode => '0644',
-+ content => template('kmod/poky.modprobe.erb'),
-+ }
-+ } else {
-+ augeas {"Manage ${name} in ${file}":
-+ incl => $file,
-+ lens => 'Modules.lns',
-+ changes => $changes,
-+ }
- }
- }
- 'RedHat': {
-diff -ruN a/templates/poky.modprobe.erb b/templates/poky.modprobe.erb
---- a/templates/poky.modprobe.erb 1970-01-01 00:00:00.000000000 +0000
-+++ b/templates/poky.modprobe.erb 2020-05-13 10:14:46.612078375 +0000
-@@ -0,0 +1 @@
-+vfio_pci
+++ /dev/null
-diff --git a/manifests/os/poky-stx.pp b/manifests/os/poky-stx.pp
-new file mode 100644
-index 0000000..03b1aa1
---- /dev/null
-+++ b/manifests/os/poky-stx.pp
-@@ -0,0 +1,3 @@
-+
-+class ldap::os::poky-stx {
-+}
+++ /dev/null
-diff -ru a/manifests/params.pp b/manifests/params.pp
---- a/manifests/params.pp 2020-03-05 13:55:59.165978792 +0800
-+++ b/manifests/params.pp 2020-03-05 14:03:14.677990660 +0800
-@@ -2,7 +2,11 @@
- class ldap::params {
- case $::osfamily {
- 'Debian' : {
-- $package = ['ldap-utils']
-+ if $::operatingsystem == 'poky-stx' {
-+ $package = ['libldap-2.4-slapd', 'libldap-2.4-bin']
-+ } else {
-+ $package = ['ldap-utils']
-+ }
-
- $prefix = '/etc/ldap'
- $owner = 'root'
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppet-ldap.gemspec 2019-10-30 21:04:14.309536996 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-ldap'
-+ s.version = '0.2.4'
-+ s.date = '2014-09-13'
-+ s.summary = "OpenLDAP module for Puppet."
-+ s.description = s.summary
-+ s.authors = ["Emiliano Castagnari ecastag@gmail.com (aka Torian)"]
-+ s.email = ''
-+ s.files = %w(Modulefile README.md) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/torian/puppet-ldap'
-+ s.license = 'GPL-2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-memcached.gemspec 2019-10-27 06:27:38.193407895 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-memcached'
-+ s.version = '3.0.2'
-+ s.date = '2017-05-10'
-+ s.summary = "Puppet memcached module"
-+ s.description = s.summary
-+ s.authors = ["Puppet saz "]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/saz/puppet-memcached'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
-From 0d6914c558620f8e82b2c84ce7bb4d35fdb882fd Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Thu, 31 Oct 2019 13:15:05 -0700
-Subject: [PATCH] Stx uses puppet-boolean instead of adrien-boolean
-
-Use puppet-boolean instead of adrien-boolean
----
- metadata.json | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/metadata.json b/metadata.json
-index 66dc6d7..2ca38b9 100644
---- a/metadata.json
-+++ b/metadata.json
-@@ -10,7 +10,7 @@
- "dependencies": [
- {"name":"puppetlabs/stdlib","version_requirement":">= 2.3.0 < 5.0.0"},
- {"name":"adrien/filemapper","version_requirement":">= 1.1.0 < 5.0.0"},
-- {"name":"adrien/boolean","version_requirement":">= 1.0.0"},
-+ {"name":"puppet/boolean","version_requirement":">= 1.0.0"},
- {"name":"camptocamp/kmod","version_requirement":">= 0.0.x"}
- ]
- }
---
-2.17.1
-
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppet-network.gemspec 2019-10-30 21:12:14.606035966 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-network'
-+ s.version = '0.5.0'
-+ s.date = '2015-06-03'
-+ s.summary = "Manage non-volatile network configuration"
-+ s.description = s.summary
-+ s.authors = ["Adrien Thebo <adrien@somethingsinistral.net>"]
-+ s.email = ''
-+ s.files = %w(Modulefile README.markdown Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/adrienthebo/puppet-network'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/metadata.json 2019-10-31 13:07:35.519435748 -0700
-@@ -0,0 +1,16 @@
-+{
-+ "name": "adrien-network",
-+ "version": "0.5.0",
-+ "author": "Adrien Tehbo <adrien@somethingsinistral.net>",
-+ "summary": "Manage non-volatile network configuration",
-+ "license": "Apache-2.0",
-+ "source": "https://github.com/adrienthebo/puppet-network",
-+ "project_page": "https://github.com/adrienthebo/puppet-network",
-+ "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
-+ "dependencies": [
-+ {"name":"puppetlabs/stdlib","version_requirement":">= 2.3.0 < 5.0.0"},
-+ {"name":"adrien/filemapper","version_requirement":">= 1.1.0 < 5.0.0"},
-+ {"name":"adrien/boolean","version_requirement":">= 1.0.0"},
-+ {"name":"camptocamp/kmod","version_requirement":">= 0.0.x"}
-+ ]
-+}
+++ /dev/null
-diff -ruN a/lib/puppet/provider/network_config/interfaces.rb b/lib/puppet/provider/network_config/interfaces.rb
---- a/lib/puppet/provider/network_config/interfaces.rb 2020-04-14 15:30:26.488316830 +0800
-+++ b/lib/puppet/provider/network_config/interfaces.rb 2020-04-14 15:30:11.388316418 +0800
-@@ -14,7 +14,7 @@
- desc "Debian interfaces style provider"
-
- confine :osfamily => :debian
-- defaultfor :osfamily => :debian
-+ defaultfor :operatingsystem => [:debian, :ubuntu]
-
- has_feature :provider_options
- has_feature :hotpluggable
-diff -ruN a/lib/puppet/provider/network_config/poky-stx.rb b/lib/puppet/provider/network_config/poky-stx.rb
---- a/lib/puppet/provider/network_config/poky-stx.rb 1970-01-01 08:00:00.000000000 +0800
-+++ b/lib/puppet/provider/network_config/poky-stx.rb 2020-04-15 15:40:31.266687901 +0800
-@@ -0,0 +1,310 @@
-+require 'puppetx/filemapper'
-+
-+Puppet::Type.type(:network_config).provide(:pokystx) do
-+ # Wind River Linux network_config interfaces provider.
-+ #
-+ # This provider uses the filemapper mixin to map the interfaces file to a
-+ # collection of network_config providers, and back.
-+ #
-+ include PuppetX::FileMapper
-+
-+ desc "Poky starlingX interfaces style provider"
-+
-+ defaultfor :operatingsystem => :'poky-stx'
-+
-+ has_feature :provider_options
-+ has_feature :hotpluggable
-+
-+ def select_file
-+ '/var/run/interfaces.puppet'
-+ end
-+
-+ def self.target_files
-+ ['/var/run/interfaces.puppet']
-+ end
-+
-+ class MalformedInterfacesError < Puppet::Error
-+ def initialize(msg = nil)
-+ msg = 'Malformed poky-stx interfaces file; cannot instantiate network_config resources' if msg.nil?
-+ super
-+ end
-+ end
-+
-+ def self.raise_malformed
-+ @failed = true
-+ raise MalformedInterfacesError
-+ end
-+
-+ class Instance
-+
-+ attr_reader :name
-+
-+ # Booleans
-+ attr_accessor :onboot, :hotplug
-+
-+
-+ # These fields are going to get rearranged to resolve issue 16
-+ # https://github.com/adrienthebo/puppet-network/issues/16
-+ attr_accessor :ipaddress, :netmask, :family, :method, :mtu
-+
-+ # Options hash
-+ attr_reader :options
-+
-+ def initialize(name)
-+ @name = name
-+
-+ @options = Hash.new {|hash, key| hash[key] = []}
-+ end
-+
-+ def to_hash
-+ h = {
-+ :name => @name,
-+ :onboot => @onboot,
-+ :hotplug => @hotplug,
-+ :ipaddress => @ipaddress,
-+ :netmask => @netmask,
-+ :family => @family,
-+ :method => @method,
-+ :mtu => @mtu,
-+ :options => squeeze_options
-+ }
-+
-+ h.inject({}) do |hash, (key, val)|
-+ hash[key] = val unless val.nil?
-+ hash
-+ end
-+ end
-+
-+ def squeeze_options
-+ @options.inject({}) do |hash, (key, value)|
-+ if value.size <= 1
-+ hash[key] = value.pop
-+ else
-+ hash[key] = value
-+ end
-+
-+ hash
-+ end
-+ end
-+
-+ class << self
-+
-+ def reset!
-+ @interfaces = {}
-+ end
-+
-+ # @return [Array<Instance>] All class instances
-+ def all_instances
-+ @interfaces ||= {}
-+ @interfaces
-+ end
-+
-+ def [](name)
-+ if all_instances[name]
-+ obj = all_instances[name]
-+ else
-+ obj = self.new(name)
-+ all_instances[name] = obj
-+ end
-+
-+ obj
-+ end
-+ end
-+ end
-+
-+ def self.parse_file(filename, contents)
-+ # Debian has a very irregular format for the interfaces file. The
-+ # parse_file method is somewhat derived from the ifup executable
-+ # supplied in the debian ifupdown package. The source can be found at
-+ # http://packages.debian.org/squeeze/ifupdown
-+
-+
-+ # The debian interfaces implementation requires global state while parsing
-+ # the file; namely, the stanza being parsed as well as the interface being
-+ # parsed.
-+ status = :none
-+ current_interface = nil
-+
-+ lines = contents.split("\n")
-+ # TODO Join lines that end with a backslash
-+
-+ # Iterate over all lines and determine what attributes they create
-+ lines.each do |line|
-+
-+ # Strip off any trailing comments
-+ line.sub!(/#.*$/, '')
-+
-+ case line
-+ when /^\s*#|^\s*$/
-+ # Ignore comments and blank lines
-+ next
-+
-+ when /^auto|^allow-auto/
-+ # Parse out any auto sections
-+ interfaces = line.split(' ')
-+ interfaces.delete_at(0)
-+
-+ interfaces.each do |name|
-+ Instance[name].onboot = true
-+ end
-+
-+ # Reset the current parse state
-+ current_interface = nil
-+
-+ when /^allow-hotplug/
-+ # parse out allow-hotplug lines
-+
-+ interfaces = line.split(' ')
-+ interfaces.delete_at(0)
-+
-+ interfaces.each do |name|
-+ Instance[name].hotplug = true
-+ end
-+
-+ # Don't reset Reset the current parse state
-+ when /^iface/
-+
-+ # Format of the iface line:
-+ #
-+ # iface <iface> <family> <method>
-+ # zero or more options for <iface>
-+
-+ if match = line.match(/^iface\s+(\S+)\s+(\S+)\s+(\S+)/)
-+ name = match[1]
-+ family = match[2]
-+ method = match[3]
-+
-+ # If an iface block for this interface has been seen, the file is
-+ # malformed.
-+ raise_malformed if Instance[name] and Instance[name].family
-+
-+ status = :iface
-+ current_interface = name
-+
-+ # This is done automatically
-+ #Instance[name].name = name
-+ Instance[name].family = family
-+ Instance[name].method = method
-+
-+ else
-+ # If we match on a string with a leading iface, but it isn't in the
-+ # expected format, malformed blar blar
-+ raise_malformed
-+ end
-+
-+ when /^mapping/
-+
-+ # XXX dox
-+ raise Puppet::DevError, "Debian interfaces mapping parsing not implemented."
-+ status = :mapping
-+
-+ else
-+ # We're currently examining a line that is within a mapping or iface
-+ # stanza, so we need to validate the line and add the options it
-+ # specifies to the known state of the interface.
-+
-+ case status
-+ when :iface
-+ if match = line.match(/(\S+)\s+(\S.*)/)
-+ # If we're parsing an iface stanza, then we should receive a set of
-+ # lines that contain two or more space delimited strings. Append
-+ # them as options to the iface in an array.
-+
-+ key = match[1]
-+ val = match[2]
-+
-+ name = current_interface
-+
-+ case key
-+ when 'address'; Instance[name].ipaddress = val
-+ when 'netmask'; Instance[name].netmask = val
-+ when 'mtu'; Instance[name].mtu = val
-+ else Instance[name].options[key] << val
-+ end
-+ else
-+ raise_malformed
-+ end
-+ when :mapping
-+ raise Puppet::DevError, "Debian interfaces mapping parsing not implemented."
-+ when :none
-+ raise_malformed
-+ end
-+ end
-+ end
-+
-+ Instance.all_instances.map {|name, instance| instance.to_hash }
-+ end
-+
-+ # Generate an array of sections
-+ def self.format_file(filename, providers)
-+ contents = []
-+ contents << header
-+
-+ # Add onboot interfaces
-+ if (auto_interfaces = providers.select {|provider| provider.onboot == true })
-+ stanza = []
-+ stanza << "auto " + auto_interfaces.map(&:name).sort.join(" ")
-+ contents << stanza.join("\n")
-+ end
-+
-+ # Build iface stanzas
-+ providers.sort_by(&:name).each do |provider|
-+ # TODO add validation method
-+ raise Puppet::Error, "#{provider.name} does not have a method." if provider.method.nil?
-+ raise Puppet::Error, "#{provider.name} does not have a family." if provider.family.nil?
-+
-+ stanza = []
-+ if provider.method == :static and (not provider.ipaddress or provider.ipaddress == :absent)
-+ stanza << %{iface #{provider.name} #{provider.family} manual}
-+ else
-+ stanza << %{iface #{provider.name} #{provider.family} #{provider.method}}
-+ end
-+
-+ [
-+ [:ipaddress, 'address'],
-+ [:netmask, 'netmask'],
-+ [:gateway, 'gateway'],
-+ [:mtu, 'mtu'],
-+ ].each do |(property, section)|
-+ stanza << " #{section} #{provider.send property}" if provider.send(property) and provider.send(property) != :absent
-+ end
-+
-+ if provider.options and provider.options != :absent
-+ provider.options.each_pair do |key_f, val|
-+ key = key_f.gsub('_', '-')
-+ if ['pre-up', 'up', 'post-up', 'down', 'pre-down', 'post-down'].include? key
-+ if val.is_a? String
-+ stanza << " #{key} #{val}"
-+ elsif val.is_a? Array
-+ val.each { |entry| stanza << " #{key} #{entry}" }
-+ else
-+ raise Puppet::Error, "#{self} options key #{key} expects a String or Array, got #{val.class}"
-+ end
-+ end
-+ if key == 'SCOPE'
-+ if val.is_a? String
-+ stanza << " #{val}"
-+ else
-+ raise Puppet::Error, "#{self} options key #{key} expects a String, got #{val.class}"
-+ end
-+ end
-+ end
-+ end
-+
-+ contents << stanza.join("\n")
-+ end
-+
-+ contents.map {|line| line + "\n\n"}.join
-+ end
-+
-+ def self.header
-+ str = <<-HEADER
-+# HEADER: This file is is being managed by puppet. Changes to
-+# HEADER: interfaces that are not being managed by puppet will persist;
-+# HEADER: however changes to interfaces that are being managed by puppet will
-+# HEADER: be overwritten. In addition, file order is NOT guaranteed.
-+# HEADER: Last generated at: #{Time.now}
-+HEADER
-+ str
-+ end
-+end
+++ /dev/null
-From c08ad0a7c950cf35a3f178fe8b84beb227bfe5ca Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Fri, 13 Nov 2020 17:45:42 +0800
-Subject: [PATCH] poky-stx.rb: add vlan support for poky-stx
-
-Current rules in poky-stx.rb doesn't recognize vlan mode,
-so add the mode option and corresponding handling for vlan
-to support vlan.
-
-Upstream-Status: Inappropriate [poky-stx specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- lib/puppet/provider/network_config/poky-stx.rb | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/lib/puppet/provider/network_config/poky-stx.rb b/lib/puppet/provider/network_config/poky-stx.rb
-index 17fa34c..9b0506a 100644
---- a/lib/puppet/provider/network_config/poky-stx.rb
-+++ b/lib/puppet/provider/network_config/poky-stx.rb
-@@ -45,7 +45,7 @@ Puppet::Type.type(:network_config).provide(:pokystx) do
-
- # These fields are going to get rearranged to resolve issue 16
- # https://github.com/adrienthebo/puppet-network/issues/16
-- attr_accessor :ipaddress, :netmask, :family, :method, :mtu
-+ attr_accessor :ipaddress, :netmask, :family, :method, :mtu, :mode
-
- # Options hash
- attr_reader :options
-@@ -66,6 +66,7 @@ Puppet::Type.type(:network_config).provide(:pokystx) do
- :family => @family,
- :method => @method,
- :mtu => @mtu,
-+ :mode => @mode,
- :options => squeeze_options
- }
-
-@@ -185,6 +186,7 @@ Puppet::Type.type(:network_config).provide(:pokystx) do
- #Instance[name].name = name
- Instance[name].family = family
- Instance[name].method = method
-+ Instance[name].mode = :raw
-
- else
- # If we match on a string with a leading iface, but it isn't in the
-@@ -219,6 +221,7 @@ Puppet::Type.type(:network_config).provide(:pokystx) do
- when 'address'; Instance[name].ipaddress = val
- when 'netmask'; Instance[name].netmask = val
- when 'mtu'; Instance[name].mtu = val
-+ when 'vlan-raw-device'; Instance[name].mode = :vlan
- else Instance[name].options[key] << val
- end
- else
-@@ -260,6 +263,11 @@ Puppet::Type.type(:network_config).provide(:pokystx) do
- stanza << %{iface #{provider.name} #{provider.family} #{provider.method}}
- end
-
-+ if provider.options['VLAN'] and provider.options['VLAN'] == 'yes'
-+ raw_device = provider.options['PHYSDEV']
-+ stanza << " vlan-raw-device #{raw_device}"
-+ end
-+
- [
- [:ipaddress, 'address'],
- [:netmask, 'netmask'],
---
-2.7.4
+++ /dev/null
-diff --git a/manifests/bond/poky-stx.pp b/manifests/bond/poky-stx.pp
-new file mode 100644
-index 0000000..c6af9c9
---- /dev/null
-+++ b/manifests/bond/poky-stx.pp
-@@ -0,0 +1,56 @@
-+# = Define: network::bond::poky-stx
-+#
-+# Instantiate bonded interfaces on Debian based systems.
-+#
-+# == See also
-+#
-+# * Debian Network Bonding http://wiki.wrlinux.org/Bonding
-+define network::bond::poky-stx(
-+ $slaves,
-+ $ensure = present,
-+ $ipaddress = undef,
-+ $netmask = undef,
-+ $method = undef,
-+ $family = undef,
-+ $onboot = undef,
-+
-+ $mode = undef,
-+ $miimon = undef,
-+ $downdelay = undef,
-+ $updelay = undef,
-+ $lacp_rate = undef,
-+ $primary = undef,
-+ $primary_reselect = undef,
-+ $xmit_hash_policy = undef,
-+) {
-+
-+ $raw = {
-+ 'bond-slaves' => join($slaves, ' '),
-+ 'bond-mode' => $mode,
-+ 'bond-miimon' => $miimon,
-+ 'bond-downdelay' => $downdelay,
-+ 'bond-updelay' => $updelay,
-+ 'bond-lacp-rate' => $lacp_rate,
-+ 'bond-primary' => $primary,
-+ 'bond-primary-reselect' => $primary_reselect,
-+ 'bond-xmit-hash-policy' => $xmit_hash_policy,
-+ }
-+
-+ $opts = compact_hash($raw)
-+
-+ network_config { $name:
-+ ensure => $ensure,
-+ ipaddress => $ipaddress,
-+ netmask => $netmask,
-+ family => $family,
-+ method => $method,
-+ onboot => $onboot,
-+ options => $opts,
-+ }
-+
-+ network_config { $slaves:
-+ ensure => absent,
-+ reconfigure => true,
-+ before => Network_config[$name],
-+ }
-+}
-diff --git a/manifests/bond/setup.pp b/manifests/bond/setup.pp
-index 0a30767..780722c 100644
---- a/manifests/bond/setup.pp
-+++ b/manifests/bond/setup.pp
-@@ -6,8 +6,10 @@ class network::bond::setup {
- # is available by default
- }
- Debian: {
-- package { 'ifenslave-2.6':
-- ensure => present,
-+ if $::operatingsystem != 'poky-stx' {
-+ package { 'ifenslave-2.6':
-+ ensure => present,
-+ }
- }
- }
- WRLinux: {
-diff --git a/manifests/bond.pp b/manifests/bond.pp
-index 26ca104..5f8e254 100644
---- a/manifests/bond.pp
-+++ b/manifests/bond.pp
-@@ -164,28 +164,51 @@ define network::bond(
-
- case $::osfamily {
- Debian: {
-- network::bond::debian { $name:
-- ensure => $ensure,
-- slaves => $slaves,
-- ipaddress => $ipaddress,
-- netmask => $netmask,
-- method => $method,
-- family => $family,
-- onboot => $onboot,
-- hotplug => $hotplug,
-- options => $options,
-- slave_options => $slave_options,
-+ if $::operatingsystem == 'poky-stx' {
-+ network::bond::poky-stx { $name:
-+ slaves => $slaves,
-+ ensure => $ensure,
-+ ipaddress => $ipaddress,
-+ netmask => $netmask,
-+ method => $method,
-+ family => $family,
-+ onboot => $onboot,
-
-- mode => $mode,
-- miimon => $miimon,
-- downdelay => $downdelay,
-- updelay => $updelay,
-- lacp_rate => $lacp_rate,
-- primary => $primary,
-- primary_reselect => $primary_reselect,
-- xmit_hash_policy => $xmit_hash_policy,
-+ mode => $mode,
-+ miimon => $miimon,
-+ downdelay => $downdelay,
-+ updelay => $updelay,
-+ lacp_rate => $lacp_rate,
-+ primary => $primary,
-+ primary_reselect => $primary_reselect,
-+ xmit_hash_policy => $xmit_hash_policy,
-
-- require => Kmod::Alias[$name],
-+ require => Kmod::Alias[$name],
-+ }
-+ } else {
-+ network::bond::debian { $name:
-+ ensure => $ensure,
-+ slaves => $slaves,
-+ ipaddress => $ipaddress,
-+ netmask => $netmask,
-+ method => $method,
-+ family => $family,
-+ onboot => $onboot,
-+ hotplug => $hotplug,
-+ options => $options,
-+ slave_options => $slave_options,
-+
-+ mode => $mode,
-+ miimon => $miimon,
-+ downdelay => $downdelay,
-+ updelay => $updelay,
-+ lacp_rate => $lacp_rate,
-+ primary => $primary,
-+ primary_reselect => $primary_reselect,
-+ xmit_hash_policy => $xmit_hash_policy,
-+
-+ require => Kmod::Alias[$name],
-+ }
- }
- }
- WRLinux: {
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppet-nslcd.gemspec 2019-10-30 21:26:00.013491029 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-nslcd'
-+ s.version = '0.0.1'
-+ s.date = '2015-01-26'
-+ s.summary = "Manages the nslcd daemon"
-+ s.description = s.summary
-+ s.authors = ["Johan Lyheden"]
-+ s.email = ''
-+ s.files = %w(Modulefile README.markdown ) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/adrienthebo/puppet-filemapper'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/metadata.json 2019-10-31 14:52:09.693312689 -0700
-@@ -0,0 +1,13 @@
-+{
-+ "name": "jlyheden-nslcd",
-+ "version": "0.0.1",
-+ "author": "John Lyheden",
-+ "summary": "Manages the nslcd daemon.",
-+ "license": "Apache-2.0",
-+ "source": "git://github.com/jlyheden/puppet-nslcd",
-+ "project_page": "https://github.com/jlyheden/puppet-nslcd",
-+ "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
-+ "dependencies": [
-+ {"name":"puppetlabs/stdlib","version_requirement":">= 2.6.0 < 5.0.0"}
-+ ]
-+}
+++ /dev/null
-diff --git a/manifests/params.pp b/manifests/params.pp
-index d050723..0f167e4 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
-@@ -29,7 +29,7 @@ class nslcd::params {
- # To add support for other distributions simply add
- # it here
- case $::operatingsystem {
-- 'Ubuntu','Debian': {
-+ 'Ubuntu','Debian', 'poky-stx': {
- $user = 'nslcd'
- $group = 'nslcd'
- $package = 'nslcd'
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-nssdb.gemspec 2019-10-28 13:06:00.202131209 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-nssdb'
-+ s.version = '1.0.1'
-+ s.date = '2017-05-17'
-+ s.summary = "NSS database Puppet Module"
-+ s.description = s.summary
-+ s.authors = ["rcritten"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/rcritten/puppet-nssdb'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/metadata.json 2019-10-31 15:37:09.270028865 -0700
-@@ -0,0 +1,13 @@
-+{
-+ "name": "rcritten/nssdb",
-+ "version": "1.0.1",
-+ "author": "Rob Crittenden",
-+ "summary": "NSS database Puppet Module.",
-+ "license": "Apache-2.0",
-+ "source": "https://github.com/netmanagers/puppet-dnsmasq",
-+ "project_page": "https://github.com/rcritten/puppet-nssdb",
-+ "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
-+ "dependencies": [
-+ {"name":"puppetlabs/stdlib","version_requirement":">= 0.0.1"}
-+ ]
-+}
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-openstacklib.gemspec 2019-10-28 19:41:18.343027332 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-openstacklib'
-+ s.version = '11.3.0'
-+ s.date = '2017-08-21'
-+ s.summary = "Puppet OpenStack Libraries"
-+ s.description = s.summary
-+ s.authors = ["Puppet Labs and OpenStack Contributors"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://launchpad.net/puppet-openstacklib'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
-diff --git a/lib/facter/os_package_type.rb b/lib/facter/os_package_type.rb
-index 134509e..adc39d9 100644
---- a/lib/facter/os_package_type.rb
-+++ b/lib/facter/os_package_type.rb
-@@ -24,6 +24,8 @@ Facter.add('os_package_type') do
- when 'Debian'
- if Facter.value(:operatingsystem) == 'Debian' then
- 'debian'
-+ elsif Facter.value(:operatingsystem) == 'poky-stx' then
-+ 'poky'
- else
- 'ubuntu'
- end
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-oslo.gemspec 2019-10-28 08:59:29.609410185 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-oslo'
-+ s.version = '11.3.0'
-+ s.date = '2016-08-21'
-+ s.summary = "Puppet oslo module"
-+ s.description = s.summary
-+ s.authors = ["OpenStack Contributors"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/openstack/puppet-oslo.git'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppet-puppi.gemspec 2019-10-30 21:37:32.685810531 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-puppi'
-+ s.version = '2.2.3'
-+ s.date = '2017-03-10'
-+ s.summary = "Installs and configures Puppi"
-+ s.description = s.summary
-+ s.authors = ["Alessandro Franceschi"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/example42/puppi'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
-diff --git a/manifests/init.pp b/manifests/init.pp
-index cebceec..cec4139 100644
---- a/manifests/init.pp
-+++ b/manifests/init.pp
-@@ -47,7 +47,7 @@ class puppi (
- # Manage Version
- $puppi_ensure = $puppi::version ? {
- '1' => '/usr/sbin/puppi.one',
-- '2' => '/usr/local/bin/puppi',
-+ '2' => '/usr/bin/puppi',
- }
-
- file { 'puppi.link':
-diff --git a/manifests/mcollective/client.pp b/manifests/mcollective/client.pp
-index 24f2f63..5260139 100644
---- a/manifests/mcollective/client.pp
-+++ b/manifests/mcollective/client.pp
-@@ -23,7 +23,7 @@ class puppi::mcollective::client {
- require puppi::mcollective::server
-
- # OLD STYLE mc-puppi command
-- file { '/usr/local/bin/mc-puppi':
-+ file { '/usr/bin/mc-puppi':
- ensure => 'present',
- mode => '0755',
- owner => 'root',
+++ /dev/null
-diff --git a/manifests/extras.pp b/manifests/extras.pp
-index 14f88a7..3d20115 100644
---- a/manifests/extras.pp
-+++ b/manifests/extras.pp
-@@ -107,6 +107,7 @@ class puppi::extras {
- $packages_run = $::operatingsystem ? {
- /(?i:RedHat|CentOS|Scientific|Amazon|Linux)/ => [ 'yum repolist' , 'rpm -qa' ] ,
- /(?i:Debian|Ubuntu|Mint)/ => [ 'apt-config dump' , 'apt-cache stats' , 'apt-key list' , 'dpkg -l' ],
-+ /(?i:poky-stx)/ => [ 'rpm -qa' ] ,
- /(Solaris)/ => [ 'pkginfo' ],
- /(Archlinux)/ => [ 'pacman -Qet' ],
- default => [ 'echo' ],
-diff --git a/manifests/params.pp b/manifests/params.pp
-index e236fb4..9fc34a1 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
-@@ -74,11 +74,13 @@ class puppi::params {
- $info_package_query = $::operatingsystem ? {
- /(?i:RedHat|CentOS|Scientific|Amazon|Linux)/ => 'rpm -qi',
- /(?i:Ubuntu|Debian|Mint)/ => 'dpkg -s',
-+ /(?i:poky-stx)/ => 'rpm -qi' ,
- default => 'echo',
- }
- $info_package_list = $::operatingsystem ? {
- /(?i:RedHat|CentOS|Scientific|Amazon|Linux)/ => 'rpm -ql',
- /(?i:Ubuntu|Debian|Mint)/ => 'dpkg -L',
-+ /(?i:poky-stx)/ => 'rpm -ql',
- default => 'echo',
- }
- $info_service_check = $::operatingsystem ? {
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/nanliu-staging.gemspec 2019-10-31 09:06:27.338571776 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'nanliu-staging'
-+ s.version = '1.0.4'
-+ s.date = '2015-01-29'
-+ s.summary = "Compressed file staging and deployment"
-+ s.description = s.summary
-+ s.authors = ["Nan Liu"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/nanliu/puppet-staging'
-+ s.license = 'Apache-2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/duritong-sysctl.gemspec 2019-10-31 10:26:28.088576478 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'duritong-sysctl'
-+ s.version = '0.0.11'
-+ s.date = '2015-06-05'
-+ s.summary = "This modules allows you to configure sysctl."
-+ s.description = s.summary
-+ s.authors = ["duritong"]
-+ s.email = ''
-+ s.files = %w(README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/duritong/puppet-sysctl'
-+ s.license = 'GPL-2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-vlan.gemspec 2019-10-28 13:57:07.799844748 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppet-vlan'
-+ s.version = '0.1.0'
-+ s.date = '2012-12-04'
-+ s.summary = "very simple puppet module to install a vlan"
-+ s.description = s.summary
-+ s.authors = ["derekhiggins"]
-+ s.email = ''
-+ s.files = %w(LICENSE) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/derekhiggins/puppet-vlan.git'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/metadata.json 2019-10-31 17:19:57.284059054 -0700
-@@ -0,0 +1,11 @@
-+{
-+ "name": "puppet-vlan",
-+ "version": "0.1.0",
-+ "author": "derekhiggins",
-+ "summary": "very simple puppet module to install a vlan",
-+ "license": "Apache-2.0",
-+ "source": "https://github.com/derekhiggins/puppet-vlan.git",
-+ "project_page": "https://github.com/derekhiggins/puppet-vlan.git",
-+ "issues_url": "https://github.com/derekhiggins/puppet-vlan.git",
-+ "dependencies": [ ]
-+}
+++ /dev/null
-diff -urN puppet-3.7.3_ori/puppet.gemspec puppet-3.7.3/puppet.gemspec
---- puppet-3.7.3_ori/puppet.gemspec 1970-01-01 08:00:00.000000000 +0800
-+++ puppet-3.7.3/puppet.gemspec 2014-11-12 14:30:07.000000000 +0800
-@@ -0,0 +1,19 @@
-+$:.unshift(File.dirname(__FILE__) + '/lib')
-+require 'puppet/version'
-+
-+Gem::Specification.new do |s|
-+ s.name = 'puppet'
-+ s.version = Puppet::PUPPETVERSION
-+ s.platform = Gem::Platform::RUBY
-+ s.summary = 'Open source Puppet is a configuration management system'
-+ s.description = s.summary
-+ s.author = 'Yang Haibo'
-+ s.email = 'b40869@freescale.com'
-+ s.homepage = 'https://puppetlabs.com/puppet/puppet-open-source'
-+ s.license = 'Apache 2.0'
-+
-+ s.bindir = 'bin'
-+ s.executables = ['puppet']
-+ s.require_path = 'lib'
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+end
+++ /dev/null
-diff --git a/lib/puppet/provider/package/dnf.rb b/lib/puppet/provider/package/dnf.rb
-index e144a1a..8497bec 100644
---- a/lib/puppet/provider/package/dnf.rb
-+++ b/lib/puppet/provider/package/dnf.rb
-@@ -29,6 +29,7 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do
- end
-
- defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => ['22', '23', '24']
-+ defaultfor :operatingsystem => :"poky-stx"
-
- def self.update_command
- # In DNF, update is deprecated for upgrade
+++ /dev/null
-diff --git a/lib/puppet/provider/service/systemd.rb b/lib/puppet/provider/service/systemd.rb
-index a673550..faf7b7b 100644
---- a/lib/puppet/provider/service/systemd.rb
-+++ b/lib/puppet/provider/service/systemd.rb
-@@ -23,6 +23,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
- defaultfor :osfamily => :redhat, :operatingsystem => :fedora
- defaultfor :osfamily => :suse
- defaultfor :operatingsystem => :debian, :operatingsystemmajrelease => "8"
-+ defaultfor :operatingsystem => :"poky-stx", :operatingsystemmajrelease => ["2"]
- defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["15.04","15.10","16.04","16.10"]
- defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ["3"]
-
+++ /dev/null
-
-[main]
-logdir=/var/log/puppet
-vardir=/var/lib/puppet
-ssldir=/var/lib/puppet/ssl
-rundir=/var/run/puppet
-factpath=$vardir/lib/facter
-
-[agent]
-server=puppet-server
+++ /dev/null
-#!/bin/bash
-#
-# chkconfig: 35 20 80
-# description: The puppet agent connects to a puppet master, requests a
-# catalog of resources, and configures the local system.
-#
-
-# Get function from functions library
-. /etc/init.d/functions
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/puppet
-DAEMON_OPTS="agent --server master --no-daemonize"
-NAME="agent"
-DESC="puppet agent"
-PIDFILE="/var/run/${NAME}.pid"
-PID=`test -f $PIDFILE && cat $PIDFILE`
-RETVAL=0
-
-test -x $DAEMON || exit 0
-
-[ -r /etc/default/puppet ] && . /etc/default/puppet
-
-reload_puppet_agent() {
- start-stop-daemon --stop --quiet --signal HUP --pidfile $PIDFILE
-}
-
-start_puppet_agent() {
- start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --startas $DAEMON -- $NAME $DAEMON_OPTS
-}
-
-stop_puppet_agent() {
- start-stop-daemon --stop --retry TERM/10/KILL/5 --quiet --oknodo --pidfile $PIDFILE
-}
-
-status_puppet_agent() {
- status_of_proc -p "${PIDFILE}" "${DAEMON}" "${NAME}"
-}
-
-case "$1" in
- start)
- echo -n "Starting $DESC"
- start_puppet_agent
- log_end_msg $?
- ;;
- stop)
- echo -n "Stopping $DESC"
- stop_puppet_agent
- log_end_msg $?
- ;;
- reload)
- echo -n "Reloading $DESC"
- reload_puppet_agent
- log_end_msg $?
- ;;
- status)
- status_puppet_agent
- ;;
- restart|force-reload)
- echo -n "Restarting $DESC"
- stop_puppet_agent
- start_puppet_agent
- log_end_msg $?
- ;;
-*)
- echo "Usage: $0 {start|stop|status|restart|force-reload|reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
+++ /dev/null
-[Unit]
-Description=Puppet agent
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/puppet agent --server master --no-daemonize
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-diff -ru a/lib/puppet/provider/package/yum.rb b/lib/puppet/provider/package/yum.rb
---- a/lib/puppet/provider/package/yum.rb 2020-03-05 20:30:49.582624408 +0800
-+++ b/lib/puppet/provider/package/yum.rb 2020-03-05 21:13:39.870694454 +0800
-@@ -24,6 +24,7 @@
- end
-
- defaultfor :osfamily => :redhat
-+ defaultfor :operatingsystem => :"poky-stx"
-
- def self.prefetch(packages)
- raise Puppet::Error, _("The yum provider can only be used as root") if Process.euid != 0
+++ /dev/null
-diff --git a/lib/puppet/provider/service/systemd.rb b/lib/puppet/provider/service/systemd.rb
-index 1c86404..a6363cb 100644
---- a/lib/puppet/provider/service/systemd.rb
-+++ b/lib/puppet/provider/service/systemd.rb
-@@ -25,6 +25,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
- defaultfor :osfamily => :coreos
- defaultfor :operatingsystem => :amazon, :operatingsystemmajrelease => ["2"]
- defaultfor :operatingsystem => :debian, :operatingsystemmajrelease => ["8", "stretch/sid", "9", "buster/sid"]
-+ defaultfor :operatingsystem => :"poky-stx", :operatingsystemmajrelease => ["2"]
- defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["15.04","15.10","16.04","16.10"]
- defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ["3"]
-
+++ /dev/null
-From aa11baed37639d37adfbb18f5431f597a6cedee8 Mon Sep 17 00:00:00 2001
-From: Bryan Jen <bryan.jen@gmail.com>
-Date: Thu, 15 Dec 2016 23:22:53 +0000
-Subject: [PATCH 1/2] (maint) Fix conditional in vhost ssl template
-
----
- templates/vhost/_ssl.erb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
-index 1ca7cbfb..c92f70c8 100644
---- a/templates/vhost/_ssl.erb
-+++ b/templates/vhost/_ssl.erb
-@@ -49,7 +49,7 @@
- <%- if @ssl_stapling_timeout && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
- SSLStaplingResponderTimeout <%= @ssl_stapling_timeout %>
- <%- end -%>
-- <%- if not @ssl_stapling_return_errors.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-+ <%- if (not @ssl_stapling_return_errors.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%>
- SSLStaplingReturnResponderErrors <%= scope.function_bool2httpd([@ssl_stapling_return_errors]) %>
- <%- end -%>
- <% end -%>
---
-2.17.1
-
+++ /dev/null
-From 90e50eedd7c8ba0d1e1c17ba678525630bb7e023 Mon Sep 17 00:00:00 2001
-From: Bryan Jen <bryan.jen@gmail.com>
-Date: Fri, 16 Dec 2016 15:57:46 +0000
-Subject: [PATCH 2/2] (maint) Fix the vhost ssl template correctly this time
-
----
- templates/vhost/_ssl.erb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
-index c92f70c8..e70efebd 100644
---- a/templates/vhost/_ssl.erb
-+++ b/templates/vhost/_ssl.erb
-@@ -49,7 +49,7 @@
- <%- if @ssl_stapling_timeout && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
- SSLStaplingResponderTimeout <%= @ssl_stapling_timeout %>
- <%- end -%>
-- <%- if (not @ssl_stapling_return_errors.nil? && scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%>
-+ <%- if (not @ssl_stapling_return_errors.nil?) && (scope.function_versioncmp([@apache_version, '2.4']) >= 0) -%>
- SSLStaplingReturnResponderErrors <%= scope.function_bool2httpd([@ssl_stapling_return_errors]) %>
- <%- end -%>
- <% end -%>
---
-2.17.1
-
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppetlabs-apache.gemspec 2019-10-28 12:43:41.741170991 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppetlabs-apache'
-+ s.version = '1.10.0'
-+ s.date = '2017-05-17'
-+ s.summary = "Installs, configures, and manages Apache virtual hosts, web services, and modules."
-+ s.description = s.summary
-+ s.authors = ["Puppet Labs"]
-+ s.email = ''
-+ s.files = %w(LICENSE Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/puppetlabs/puppetlabs-apache'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
-diff --git a/lib/puppet/provider/a2mod/a2mod.rb b/lib/puppet/provider/a2mod/a2mod.rb
-index e257a579..96d6151d 100644
---- a/lib/puppet/provider/a2mod/a2mod.rb
-+++ b/lib/puppet/provider/a2mod/a2mod.rb
-@@ -8,7 +8,7 @@ Puppet::Type.type(:a2mod).provide(:a2mod, :parent => Puppet::Provider::A2mod) do
- commands :apache2ctl => "apache2ctl"
-
- confine :osfamily => :debian
-- defaultfor :operatingsystem => [:debian, :ubuntu]
-+ defaultfor :operatingsystem => [:debian, :ubuntu, :'poky-stx']
-
- def self.instances
- modules = apache2ctl("-M").lines.collect { |line|
-diff --git a/manifests/params.pp b/manifests/params.pp
-index 55682f3b..2f849752 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
-@@ -220,7 +220,7 @@ class apache::params inherits ::apache::version {
- $suphp_addhandler = 'x-httpd-php'
- $suphp_engine = 'off'
- $suphp_configpath = '/etc/php5/apache2'
-- if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') < 0) {
-+ if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') < 0) or ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') < 0) or ($::operatingsystem == 'poky-stx') {
- # Only the major version is used here
- $php_version = '5'
- } else {
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppetlabs-concat.gemspec 2019-10-29 12:44:01.905771063 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppetlabs-concat'
-+ s.version = '2.2.0'
-+ s.date = '2016-06-27'
-+ s.summary = "Construct files from multiple fragments."
-+ s.description = s.summary
-+ s.authors = ["Puppet Labs"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/puppetlabs/puppetlabs-concat'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppetlabs-create-resources.gemspec 2019-10-30 09:22:32.165637534 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppetlabs-create-resources'
-+ s.version = '0.0.1'
-+ s.date = '2013-09-30'
-+ s.summary = "Function to dynamically create resources from hashes."
-+ s.description = s.summary
-+ s.authors = ["puppetlabs"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/puppetlabs/puppetlabs-create_resources'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/metadata.json 2019-10-31 12:18:48.281729608 -0700
-@@ -0,0 +1,11 @@
-+{
-+ "name": "puppetlabs-create_resources",
-+ "version": "0.0.1",
-+ "author": "Puppet Labs",
-+ "summary": "Function to dynamically create resources from hashes.",
-+ "license": "Apache-2.0",
-+ "source": "git://github.com/puppetlabs/puppetlabs-create_resources.git",
-+ "project_page": "https://github.com/puppetlabs/puppetlabs-create_resources",
-+ "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
-+ "dependencies": [ ]
-+}
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppetlabs-firewall.gemspec 2019-10-28 13:27:42.249066706 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppetlabs-firewall'
-+ s.version = '1.8.2'
-+ s.date = '2017-01-09'
-+ s.summary = "Manages Firewalls such as iptables"
-+ s.description = s.summary
-+ s.authors = ["Puppet Labs"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.markdown Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/puppetlabs/puppetlabs-firewall'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
-diff --git a/packstack/puppet/modules/firewall/manifests/linux.pp b/packstack/puppet/modules/firewall/manifests/linux.pp
-index 0fd758a..d9280f5 100644
---- a/packstack/puppet/modules/firewall/manifests/linux.pp
-+++ b/packstack/puppet/modules/firewall/manifests/linux.pp
-@@ -40,7 +40,7 @@ class firewall::linux (
- require => Package['iptables'],
- }
- }
-- 'Debian', 'Ubuntu': {
-+ 'Debian', 'Ubuntu', 'poky': {
- class { "${title}::debian":
- ensure => $ensure,
- enable => $enable,
+++ /dev/null
-diff -ru a/lib/puppet/util/firewall.rb b/lib/puppet/util/firewall.rb
---- a/lib/puppet/util/firewall.rb 2020-03-05 19:13:11.474497464 +0800
-+++ b/lib/puppet/util/firewall.rb 2020-03-05 19:18:52.030506745 +0800
-@@ -154,6 +154,8 @@
- 'RedHat'
- when 'Debian', 'Ubuntu'
- 'Debian'
-+ when 'poky'
-+ 'Debian_poky'
- else
- Facter.value(:operatingsystem)
- end
-@@ -208,7 +210,7 @@
- when :IPv4
- ["/bin/sh", "-c", "/sbin/iptables-save > /etc/iptables/rules"]
- end
-- when :Archlinux
-+ when :Archlinux, :Debian_poky
- case proto.to_sym
- when :IPv4
- ["/bin/sh", "-c", "/usr/sbin/iptables-save > /etc/iptables/iptables.rules"]
-diff -ru a/manifests/params.pp b/manifests/params.pp
---- a/manifests/params.pp 2020-03-05 19:13:11.478497464 +0800
-+++ b/manifests/params.pp 2020-03-05 19:13:20.794497718 +0800
-@@ -47,6 +47,10 @@
- }
-
- }
-+ 'poky': {
-+ $service_name = 'firewalld'
-+ $package_name = 'firewalld'
-+ }
- default: {
- $service_name = 'iptables-persistent'
- $package_name = 'iptables-persistent'
+++ /dev/null
-diff -ru x/lib/puppet/provider/firewall/iptables.rb y/lib/puppet/provider/firewall/iptables.rb
---- x/lib/puppet/provider/firewall/iptables.rb 2020-04-13 14:18:35.001844743 +0800
-+++ y/lib/puppet/provider/firewall/iptables.rb 2020-04-13 14:44:03.565886399 +0800
-@@ -54,6 +54,12 @@
- mark_flag = '--set-xmark'
- end
-
-+ kernelversion = Facter.value('kernelversion')
-+ if (kernelversion && Puppet::Util::Package.versioncmp(kernelversion, '3.13') >= 0) &&
-+ (iptables_version && Puppet::Util::Package.versioncmp(iptables_version, '1.6.2') >= 0)
-+ has_feature :random_fully
-+ end
-+
- @protocol = "IPv4"
-
- @resource_map = {
-@@ -94,6 +100,7 @@
- :proto => "-p",
- :queue_num => "--queue-num",
- :queue_bypass => "--queue-bypass",
-+ :random_fully => "--random-fully",
- :random => "--random",
- :rdest => "--rdest",
- :reap => "--reap",
-@@ -271,7 +278,7 @@
- :rhitcount, :rttl, :rname, :mask, :rsource, :rdest, :ipset, :string, :string_algo,
- :string_from, :string_to, :jump, :goto, :clusterip_new, :clusterip_hashmode,
- :clusterip_clustermac, :clusterip_total_nodes, :clusterip_local_node, :clusterip_hash_init, :queue_num, :queue_bypass,
-- :clamp_mss_to_pmtu, :gateway, :set_mss, :set_dscp, :set_dscp_class, :todest, :tosource, :toports, :to, :checksum_fill, :random, :log_prefix,
-+ :clamp_mss_to_pmtu, :gateway, :set_mss, :set_dscp, :set_dscp_class, :todest, :tosource, :toports, :to, :checksum_fill, :random_fully, :random, :log_prefix,
- :log_level, :log_uid, :reject, :set_mark, :match_mark, :mss, :connlimit_above, :connlimit_mask, :connmark, :time_start, :time_stop,
- :month_days, :week_days, :date_start, :date_stop, :time_contiguous, :kernel_timezone
- ]
-@@ -399,6 +406,8 @@
- # only replace those -f that are not followed by an l to
- # distinguish between -f and the '-f' inside of --tcp-flags.
- values = values.sub(/\s-f(?!l)(?=.*--comment)/, ' -f true')
-+ elsif bool == :random
-+ values = values.sub(%r{#{resource_map[bool]}(\s|$)(?!"!")}, "#{resource_map[bool]} true")
- else
- values = values.sub(/#{resource_map[bool]}/, "#{resource_map[bool]} true")
- end
-diff -ru x/lib/puppet/type/firewall.rb y/lib/puppet/type/firewall.rb
---- x/lib/puppet/type/firewall.rb 2020-04-13 14:18:35.001844743 +0800
-+++ y/lib/puppet/type/firewall.rb 2020-04-13 14:44:03.565886399 +0800
-@@ -63,6 +63,7 @@
- feature :string_matching, "String matching features"
- feature :queue_num, "Which NFQUEUE to send packets to"
- feature :queue_bypass, "If nothing is listening on queue_num, allow packets to bypass the queue"
-+ feature :random_fully, 'The ability to use --random-fully flag'
-
- # provider specific features
- feature :iptables, "The provider provides iptables features."
-@@ -564,6 +565,17 @@
- EOS
- end
-
-+ newproperty(:random_fully, required_features: :random_fully) do
-+ desc <<-EOS
-+ When using a jump value of "MASQUERADE", "DNAT", "REDIRECT", or "SNAT"
-+ this boolean will enable fully randomized port mapping.
-+
-+ **NOTE** Requires Kernel >= 3.13 and iptables >= 1.6.2
-+ EOS
-+
-+ newvalues(:true, :false)
-+ end
-+
- newproperty(:random, :required_features => :dnat) do
- desc <<-EOS
- When using a jump value of "MASQUERADE", "DNAT", "REDIRECT", or "SNAT"
+++ /dev/null
-diff -ru a/lib/puppet/util/firewall.rb b/lib/puppet/util/firewall.rb
---- a/lib/puppet/util/firewall.rb 2020-03-05 19:13:11.474497464 +0800
-+++ b/lib/puppet/util/firewall.rb 2020-03-05 19:18:52.030506745 +0800
-@@ -154,6 +154,8 @@
- 'RedHat'
- when 'Debian', 'Ubuntu'
- 'Debian'
-+ when 'poky-stx'
-+ 'Debian_poky-stx'
- else
- Facter.value(:operatingsystem)
- end
-@@ -208,7 +210,7 @@
- when :IPv4
- ["/bin/sh", "-c", "/sbin/iptables-save > /etc/iptables/rules"]
- end
-- when :Archlinux
-+ when :Archlinux, :Debian_poky-stx
- case proto.to_sym
- when :IPv4
- ["/bin/sh", "-c", "/usr/sbin/iptables-save > /etc/iptables/iptables.rules"]
-diff -ru a/manifests/params.pp b/manifests/params.pp
---- a/manifests/params.pp 2020-03-05 19:13:11.478497464 +0800
-+++ b/manifests/params.pp 2020-03-05 19:13:20.794497718 +0800
-@@ -47,6 +47,10 @@
- }
-
- }
-+ 'poky-stx': {
-+ $service_name = 'firewalld'
-+ $package_name = 'firewalld'
-+ }
- default: {
- $service_name = 'iptables-persistent'
- $package_name = 'iptables-persistent'
-diff --git a/manifests/linux.pp b/manifests/linux.pp
-index 0fd758a..d9280f5 100644
---- a/manifests/linux.pp
-+++ b/manifests/linux.pp
-@@ -40,7 +40,7 @@ class firewall::linux (
- require => Package['iptables'],
- }
- }
-- 'Debian', 'Ubuntu': {
-+ 'Debian', 'Ubuntu', 'poky-stx': {
- class { "${title}::debian":
- ensure => $ensure,
- enable => $enable,
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppetlabs-haproxy.gemspec 2019-10-28 21:37:14.320204197 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppetlabs-haproxy'
-+ s.version = '1.5.0'
-+ s.date = '2017-01-09'
-+ s.summary = "Configures HAProxy servers and manages the configuration of backend member servers."
-+ s.description = s.summary
-+ s.authors = ["Puppet Labs"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/puppetlabs/puppetlabs-haproxy'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-23 20:19:32.602763995 -0700
-+++ b/puppetlabs-inifile.gemspec 2019-10-28 09:20:41.514908926 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppetlabs-inifile'
-+ s.version = '1.6.0'
-+ s.date = '2016-08-30'
-+ s.summary = "Resource types for managing settings in INI files"
-+ s.description = s.summary
-+ s.authors = ["Puppet Labs"]
-+ s.email = ''
-+ s.files = %w(LICENSE Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/puppetlabs/puppetlabs-inifile'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppetlabs-lvm.gemspec 2019-10-30 21:16:54.774974158 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppetlabs-lvm'
-+ s.version = '0.5.0'
-+ s.date = '2014-09-13'
-+ s.summary = "Provides Puppet types and providers to manage Logical Resource Management (LVM) features."
-+ s.description = s.summary
-+ s.authors = ["Puppet Labs"]
-+ s.email = ''
-+ s.files = %w(metadata.json README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/puppetlabs/puppetlabs-lvm'
-+ s.license = 'GPL-2.0'
-+ end
+++ /dev/null
-From c92a9d11002184a67f8bedf542d84f527eea3107 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Tue, 29 Oct 2019 15:12:18 -0700
-Subject: [PATCH] Fix ruby path
-
----
- tasks/export.rb | 2 +-
- tasks/sql.rb | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tasks/export.rb b/tasks/export.rb
-index efd9d81..18106ec 100755
---- a/tasks/export.rb
-+++ b/tasks/export.rb
-@@ -1,4 +1,4 @@
--#!/opt/puppetlabs/puppet/bin/ruby
-+#!/usr/bin/ruby
- require 'json'
- require 'open3'
- require 'puppet'
-diff --git a/tasks/sql.rb b/tasks/sql.rb
-index 29b2c6b..7256f2d 100755
---- a/tasks/sql.rb
-+++ b/tasks/sql.rb
-@@ -1,4 +1,4 @@
--#!/opt/puppetlabs/puppet/bin/ruby
-+#!/usr/bin/ruby
- require 'json'
- require 'open3'
- require 'puppet'
---
-2.17.1
-
+++ /dev/null
-From 3b1cb5e63416223336d2bd6a43f66007b9d388e3 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Thu, 31 Oct 2019 13:54:47 -0700
-Subject: [PATCH] Stx uses nanliu-staging module
-
-Use nanliu-staging instead of puppet-staging
----
- metadata.json | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/metadata.json b/metadata.json
-index 94e9d69..682c1e1 100644
---- a/metadata.json
-+++ b/metadata.json
-@@ -9,7 +9,7 @@
- "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
- "dependencies": [
- {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0 < 5.0.0"},
-- {"name":"puppet/staging","version_requirement":">= 1.0.1 < 3.0.0"}
-+ {"name":"nanliu/staging","version_requirement":">= 1.0.1 < 3.0.0"}
- ],
- "operatingsystem_support": [
- {
---
-2.17.1
-
+++ /dev/null
-diff -ru a/manifests/params.pp b/manifests/params.pp
---- a/manifests/params.pp 2020-03-05 19:24:51.246516534 +0800
-+++ b/manifests/params.pp 2020-03-05 19:50:08.630557886 +0800
-@@ -167,7 +167,7 @@
- }
-
- 'Debian': {
-- if $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0 {
-+ if ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0 or $::operatingsystem == 'poky-stx' {
- $provider = 'mariadb'
- } else {
- $provider = 'mysql'
-@@ -188,8 +188,13 @@
- }
-
- $basedir = '/usr'
-- $config_file = '/etc/mysql/my.cnf'
-- $includedir = '/etc/mysql/conf.d'
-+ if $::operatingsystem == 'poky-stx' {
-+ $config_file = '/etc/my.cnf.d/server.cnf'
-+ $includedir = '/etc/my.cnf.d'
-+ } else {
-+ $config_file = '/etc/mysql/my.cnf'
-+ $includedir = '/etc/mysql/conf.d'
-+ }
- $datadir = '/var/lib/mysql'
- $log_error = '/var/log/mysql/error.log'
- $pidfile = '/var/run/mysqld/mysqld.pid'
+++ /dev/null
-diff --git a/manifests/server/mysqltuner.pp b/manifests/server/mysqltuner.pp
-index ae91e63..4857c0c 100644
---- a/manifests/server/mysqltuner.pp
-+++ b/manifests/server/mysqltuner.pp
-@@ -40,14 +40,14 @@ class mysql::server::mysqltuner(
- source => $_source,
- environment => $environment,
- }
-- file { '/usr/local/bin/mysqltuner':
-+ file { '/usr/bin/mysqltuner':
- ensure => $ensure,
- mode => '0550',
- source => "${::staging::path}/mysql/mysqltuner-${_version}",
- require => Staging::File["mysqltuner-${_version}"],
- }
- } else {
-- file { '/usr/local/bin/mysqltuner':
-+ file { '/usr/bin/mysqltuner':
- ensure => $ensure,
- }
- }
-diff --git a/spec/classes/mysql_server_mysqltuner_spec.rb b/spec/classes/mysql_server_mysqltuner_spec.rb
-index 4fef3d5..c9cf5f0 100644
---- a/spec/classes/mysql_server_mysqltuner_spec.rb
-+++ b/spec/classes/mysql_server_mysqltuner_spec.rb
-@@ -21,7 +21,7 @@ describe 'mysql::server::mysqltuner' do
- context 'ensure => absent' do
- let(:params) {{ :ensure => 'absent' }}
- it { is_expected.to compile }
-- it { is_expected.to contain_file('/usr/local/bin/mysqltuner').with(:ensure => 'absent') }
-+ it { is_expected.to contain_file('/usr/bin/mysqltuner').with(:ensure => 'absent') }
- end
-
- context 'custom version' do
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppetlabs-mysql.gemspec 2019-10-31 11:20:18.066704740 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppetlabs-mysql'
-+ s.version = '3.11.0'
-+ s.date = '2019-09-24'
-+ s.summary = "Installs, configures, and manages the MySQL service."
-+ s.description = s.summary
-+ s.authors = ["Puppet Labs"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/puppetlabs/puppetlabs-mysql'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
-From 01c2f67ba1a938c18f609a9ff3dabe30a547af6d Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Thu, 26 Dec 2019 11:32:12 -0800
-Subject: [PATCH] puppetlabs postgresql: account for naming diffs
-
-Centos and other distros package postgresql server into postgresql-server,
-whereas OE provides postgresql package. This causes problems during bootstrap
-and consequent failure.
-
-Here we are adding this patch as a bbappend to be removed once puppet support
-is fully functional.
----
- manifests/params.pp | 8 ++++----
- manifests/server/install.pp | 2 +-
- spec/unit/classes/server_spec.rb | 2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/manifests/params.pp b/manifests/params.pp
-index 45be360..3254d63 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
-@@ -34,12 +34,12 @@ class postgresql::params inherits postgresql::globals {
- $package_version = "${version_parts[0]}${version_parts[1]}"
-
- if $version == $postgresql::globals::default_version and $::operatingsystem != 'Amazon' {
-- $client_package_name = pick($client_package_name, 'postgresql')
-- $server_package_name = pick($server_package_name, 'postgresql-server')
-+ $client_package_name = pick($client_package_name, 'postgresql-client')
-+ $server_package_name = pick($server_package_name, 'postgresql')
- $contrib_package_name = pick($contrib_package_name,'postgresql-contrib')
-- $devel_package_name = pick($devel_package_name, 'postgresql-devel')
-+ $devel_package_name = pick($devel_package_name, 'postgresql-dev')
- $java_package_name = pick($java_package_name, 'postgresql-jdbc')
-- $docs_package_name = pick($docs_package_name, 'postgresql-docs')
-+ $docs_package_name = pick($docs_package_name, 'postgresql-doc')
- $plperl_package_name = pick($plperl_package_name, 'postgresql-plperl')
- $plpython_package_name = pick($plpython_package_name, 'postgresql-plpython')
- $service_name = pick($service_name, 'postgresql')
-diff --git a/manifests/server/install.pp b/manifests/server/install.pp
-index 8724f9f..ebee6af 100644
---- a/manifests/server/install.pp
-+++ b/manifests/server/install.pp
-@@ -11,7 +11,7 @@ class postgresql::server::install {
- default => $package_ensure,
- }
-
-- package { 'postgresql-server':
-+ package { 'postgresql':
- ensure => $_package_ensure,
- name => $package_name,
-
-diff --git a/spec/unit/classes/server_spec.rb b/spec/unit/classes/server_spec.rb
-index 852b7e4..24e64f5 100644
---- a/spec/unit/classes/server_spec.rb
-+++ b/spec/unit/classes/server_spec.rb
-@@ -119,7 +119,7 @@ describe 'postgresql::server', :type => :class do
- end
-
- it 'should remove the package' do
-- is_expected.to contain_package('postgresql-server').with({
-+ is_expected.to contain_package('postgresql').with({
- :ensure => 'purged',
- })
- end
---
-2.23.0
-
+++ /dev/null
-diff --git a/manifests/params.pp b/manifests/params.pp
-index 3254d63..20f91ef 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
-@@ -133,6 +133,7 @@ class postgresql::params inherits postgresql::globals {
- $needs_initdb = pick($needs_initdb, false)
- $service_name = $::operatingsystem ? {
- 'Debian' => pick($service_name, 'postgresql'),
-+ 'poky-stx' => pick($service_name, 'postgresql'),
- 'Ubuntu' => $::lsbmajdistrelease ? {
- /^10/ => pick($service_name, "postgresql-${version}"),
- default => pick($service_name, 'postgresql'),
+++ /dev/null
-diff -ru a/manifests/globals.pp b/manifests/globals.pp
---- a/manifests/globals.pp 2020-03-04 10:59:33.651335723 +0800
-+++ b/manifests/globals.pp 2020-03-04 11:00:13.407336807 +0800
-@@ -94,6 +94,10 @@
- /^(16.04)$/ => '9.5',
- default => undef,
- },
-+ 'poky-stx' => $::operatingsystemrelease ? {
-+ /^2\./ => '11.5',
-+ default => undef,
-+ },
- default => undef,
- },
- 'Archlinux' => $::operatingsystem ? {
-@@ -136,6 +140,7 @@
- '9.4' => '2.1',
- '9.5' => '2.2',
- '9.6' => '2.3',
-+ '11.5' => '2.5',
- default => undef,
- }
- $globals_postgis_version = $postgis_version ? {
-diff -ru a/manifests/params.pp b/manifests/params.pp
---- a/manifests/params.pp 2020-03-04 10:59:33.651335723 +0800
-+++ b/manifests/params.pp 2020-03-04 10:59:42.423335963 +0800
-@@ -166,6 +166,8 @@
- } elsif $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '15.04') >= 0 {
- # Ubuntu releases since vivid use systemd
- $service_status = pick($service_status, "/usr/sbin/service ${service_name} status")
-+ } elsif $::operatingsystem == 'poky-stx' {
-+ $service_status = "systemctl is-active ${service_name}"
- } else {
- $service_status = pick($service_status, "/etc/init.d/${service_name} status | /bin/egrep -q 'Running clusters: .+|online'")
- }
-diff -ru a/templates/systemd-override.erb b/templates/systemd-override.erb
---- a/templates/systemd-override.erb 2020-03-04 10:59:33.735335726 +0800
-+++ b/templates/systemd-override.erb 2020-03-04 10:59:42.423335963 +0800
-@@ -2,6 +2,8 @@
- .include /usr/lib64/systemd/system/<%= @service_name %>.service
- <%- elsif scope.lookupvar('::operatingsystem') == 'Fedora' -%>
- .include /lib/systemd/system/<%= @service_name %>.service
-+<%- elsif scope.lookupvar('::operatingsystem') == 'poky-stx' -%>
-+.include /lib/systemd/system/<%= @service_name %>.service
- <% else -%>
- .include /usr/lib/systemd/system/<%= @service_name %>.service
- <% end -%>
+++ /dev/null
-diff --git a/manifests/params.pp b/manifests/params.pp
-index 20f91ef..a894736 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
-@@ -298,7 +298,7 @@ class postgresql::params inherits postgresql::globals {
- }
- }
-
-- $validcon_script_path = pick($validcon_script_path, '/usr/local/bin/validate_postgresql_connection.sh')
-+ $validcon_script_path = pick($validcon_script_path, '/usr/bin/validate_postgresql_connection.sh')
- $initdb_path = pick($initdb_path, "${bindir}/initdb")
- $pg_hba_conf_path = pick($pg_hba_conf_path, "${confdir}/pg_hba.conf")
- $pg_hba_conf_defaults = pick($pg_hba_conf_defaults, true)
-diff --git a/spec/unit/defines/validate_db_connection_spec.rb b/spec/unit/defines/validate_db_connection_spec.rb
-index c7406dc..02adc04 100644
---- a/spec/unit/defines/validate_db_connection_spec.rb
-+++ b/spec/unit/defines/validate_db_connection_spec.rb
-@@ -34,7 +34,7 @@ describe 'postgresql::validate_db_connection', :type => :define do
-
- it 'should have proper path for validate command' do
- is_expected.to contain_exec('validate postgres connection for test@test:5432/test').with({
-- :unless => %r'^/usr/local/bin/validate_postgresql_connection.sh\s+\d+'
-+ :unless => %r'^/usr/bin/validate_postgresql_connection.sh\s+\d+'
- })
- end
- end
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppetlabs-postgresql.gemspec 2019-10-29 18:57:08.102259309 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppetlabs-postgresql'
-+ s.version = '4.8.0'
-+ s.date = '2016-12-22'
-+ s.summary = "Offers support for basic management of PostgreSQL databases."
-+ s.description = s.summary
-+ s.authors = ["Inkling/Puppet Labs"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/puppetlabs/puppetlabs-postgresql'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
-[Unit]
-Description=PostgreSQL database server
-After=network.target
-
-[Install]
-WantedBy=multi-user.target
-
-[Service]
-Type=forking
-User=postgres
-Group=postgres
-# Disable OOM kill on the postmaster
-OOMScoreAdjust=-17
-
-PermissionsStartOnly=true
-ExecStartPre=-/etc/postgresql/postgresql-init initdb
-ExecStart=/usr/bin/pg_ctl start -D ${PGDATA} -s -o "-p ${PGPORT}" -w -t 300
-ExecStop=/usr/bin/pg_ctl stop -D ${PGDATA} -s -m fast
-ExecReload=/usr/bin/pg_ctl reload -D ${PGDATA} -s
-
-# Give a reasonable amount of time for the server to start up/shut down
-TimeoutSec=300
+++ /dev/null
-From dfce3cde414089af920d60b0aa3e922137474cfe Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Sat, 14 Mar 2020 10:50:02 +0800
-Subject: [PATCH] init.pp: do not check the apt resource
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- manifests/init.pp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/manifests/init.pp b/manifests/init.pp
-index 7808464..9f3f55e 100644
---- a/manifests/init.pp
-+++ b/manifests/init.pp
-@@ -127,7 +127,7 @@ class rabbitmq(
- warning('$manage_repos is now deprecated. Please use $repos_ensure instead')
- }
-
-- if $manage_repos != false {
-+ if $repos_ensure != false {
- case $::osfamily {
- 'RedHat', 'SUSE': {
- include '::rabbitmq::repo::rhel'
---
-2.7.4
-
+++ /dev/null
-diff -ru a/manifests/config.pp b/manifests/config.pp
---- a/manifests/config.pp 2020-03-05 15:10:18.442100317 +0800
-+++ b/manifests/config.pp 2020-03-05 15:10:31.086100661 +0800
-@@ -170,7 +170,7 @@
-
- case $::osfamily {
- 'Debian': {
-- if versioncmp($::operatingsystemmajrelease, '16.04') >= 0 {
-+ if versioncmp($::operatingsystemmajrelease, '16.04') >= 0 or $::operatingsystem == 'poky-stx' {
- file { '/etc/systemd/system/rabbitmq-server.service.d':
- ensure => directory,
- owner => '0',
+++ /dev/null
-diff --git a/metadata.json b/metadata.json
-index 5803cf5..b3426f6 100644
---- a/metadata.json
-+++ b/metadata.json
-@@ -48,7 +48,6 @@
- ],
- "dependencies": [
- {"name":"puppetlabs/stdlib","version_requirement":">= 3.13.1 < 5.0.0"},
-- {"name":"puppetlabs/apt","version_requirement":">= 1.8.0 < 5.0.0"},
- {"name":"puppet/staging","version_requirement":">= 0.3.1 < 2.0.0"}
- ]
- }
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppetlabs-rabbitmq.gemspec 2019-10-28 21:37:51.198972160 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppetlabs-rabbitmq'
-+ s.version = '5.6.0'
-+ s.date = '2017-01-09'
-+ s.summary = "Installs, configures, and manages RabbitMQ."
-+ s.description = s.summary
-+ s.authors = ["Puppet Labs"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/puppetlabs/puppetlabs-rabbitmq'
-+ s.license = 'Apache 2.0'
-+ end
+++ /dev/null
---- /dev/null 2019-10-28 19:50:04.372284581 -0700
-+++ b/puppetlabs-stdlib.gemspec 2019-10-29 15:09:32.804637910 -0700
-@@ -0,0 +1,12 @@
-+Gem::Specification.new do |s|
-+ s.name = 'puppetlabs-stdlib'
-+ s.version = '4.18.0'
-+ s.date = '2017-08-10'
-+ s.summary = "Puppet Labs Standard Library module"
-+ s.description = s.summary
-+ s.authors = ["Puppet Labs"]
-+ s.email = ''
-+ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+ s.homepage = 'https://github.com/puppetlabs/puppetlabs-stdlib'
-+ s.license = 'Apache 2.0'
-+end
+++ /dev/null
-From f6d38d1003cdab21626f93c83bd94305881fb4c6 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Fri, 6 Mar 2020 22:52:19 -0800
-Subject: [PATCH] stx.3.0 rebase: adjust path
-
----
- puppet-manifests/src/bin/puppet-manifest-apply.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/puppet-manifests/src/bin/puppet-manifest-apply.sh b/puppet-manifests/src/bin/puppet-manifest-apply.sh
-index 95e9958..4d36059 100755
---- a/puppet-manifests/src/bin/puppet-manifest-apply.sh
-+++ b/puppet-manifests/src/bin/puppet-manifest-apply.sh
-@@ -98,7 +98,7 @@ export STDLIB_LOG_DEPRECATIONS=false
-
- echo "Applying puppet ${MANIFEST} manifest..."
- flock /var/run/puppet.lock \
-- puppet apply --debug --trace --modulepath ${PUPPET_MODULES_PATH} ${PUPPET_MANIFEST} \
-+ puppet apply --hiera_config=/etc/puppet/hiera.yaml --debug --trace --modulepath ${PUPPET_MODULES_PATH} ${PUPPET_MANIFEST} \
- < /dev/null 2>&1 | awk ' { system("date -u +%FT%T.%3N | tr \"\n\" \" \""); print $0; fflush(); } ' > ${LOGFILE}
- if [ $? -ne 0 ]; then
- echo "[FAILED]"
---
-2.23.0
-
+++ /dev/null
-From e321b75d4810c4bd66fe4ec10b974ad77184d74f Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Sat, 7 Mar 2020 00:18:43 -0800
-Subject: [PATCH] puppet-manifests port: Adjust path default bindir
-
----
- .../src/modules/platform/files/ldap.cgcs-shell.ldif | 2 +-
- .../src/modules/platform/manifests/collectd.pp | 2 +-
- .../src/modules/platform/manifests/drbd.pp | 4 ++--
- .../src/modules/platform/manifests/ldap.pp | 4 ++--
- .../src/modules/platform/manifests/network.pp | 2 +-
- .../src/modules/platform/manifests/remotelogging.pp | 2 +-
- .../modules/platform/templates/ldapscripts.conf.erb | 12 ++++++------
- 7 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/puppet-manifests/src/modules/platform/files/ldap.cgcs-shell.ldif b/puppet-manifests/src/modules/platform/files/ldap.cgcs-shell.ldif
-index 95005fd..6ae4838 100644
---- a/puppet-manifests/src/modules/platform/files/ldap.cgcs-shell.ldif
-+++ b/puppet-manifests/src/modules/platform/files/ldap.cgcs-shell.ldif
-@@ -1,4 +1,4 @@
- dn: uid=operator,ou=People,dc=cgcs,dc=local
- changetype: modify
- replace: loginShell
--loginShell: /usr/local/bin/cgcs_cli
-+loginShell: /usr/bin/cgcs_cli
-diff --git a/puppet-manifests/src/modules/platform/manifests/collectd.pp b/puppet-manifests/src/modules/platform/manifests/collectd.pp
-index 99e1d2d..a35bc6f 100644
---- a/puppet-manifests/src/modules/platform/manifests/collectd.pp
-+++ b/puppet-manifests/src/modules/platform/manifests/collectd.pp
-@@ -58,6 +58,6 @@ class platform::collectd::runtime {
- class platform::collectd::restart {
- include ::platform::collectd
- exec { 'collectd-restart':
-- command => '/usr/local/sbin/pmon-restart collectd'
-+ command => '/usr/sbin/pmon-restart collectd'
- }
- }
-diff --git a/puppet-manifests/src/modules/platform/manifests/drbd.pp b/puppet-manifests/src/modules/platform/manifests/drbd.pp
-index f7dc3bc..bb20b82 100644
---- a/puppet-manifests/src/modules/platform/manifests/drbd.pp
-+++ b/puppet-manifests/src/modules/platform/manifests/drbd.pp
-@@ -79,9 +79,9 @@ define platform::drbd::filesystem (
- mountpoint => $mountpoint,
- handlers => {
- before-resync-target =>
-- "/usr/local/sbin/sm-notify -s ${sm_service} -e sync-start",
-+ "/usr/sbin/sm-notify -s ${sm_service} -e sync-start",
- after-resync-target =>
-- "/usr/local/sbin/sm-notify -s ${sm_service} -e sync-end",
-+ "/usr/sbin/sm-notify -s ${sm_service} -e sync-end",
- },
- host1 => $::platform::drbd::params::host1,
- host2 => $::platform::drbd::params::host2,
-diff --git a/puppet-manifests/src/modules/platform/manifests/ldap.pp b/puppet-manifests/src/modules/platform/manifests/ldap.pp
-index b3d6ee7..8770bff 100644
---- a/puppet-manifests/src/modules/platform/manifests/ldap.pp
-+++ b/puppet-manifests/src/modules/platform/manifests/ldap.pp
-@@ -60,7 +60,7 @@ class platform::ldap::server::local
-
- # don't populate the adminpw if binding anonymously
- if ! $bind_anonymous {
-- file { '/usr/local/etc/ldapscripts/ldapscripts.passwd':
-+ file { '/etc/ldapscripts/ldapscripts.passwd':
- content => $admin_pw,
- }
- }
-@@ -104,7 +104,7 @@ class platform::ldap::client
- }
-
- if $::personality == 'controller' {
-- file { '/usr/local/etc/ldapscripts/ldapscripts.conf':
-+ file { '/etc/ldapscripts/ldapscripts.conf':
- ensure => 'present',
- replace => true,
- content => template('platform/ldapscripts.conf.erb'),
-diff --git a/puppet-manifests/src/modules/platform/manifests/network.pp b/puppet-manifests/src/modules/platform/manifests/network.pp
-index 5b94521..dbeb6d2 100644
---- a/puppet-manifests/src/modules/platform/manifests/network.pp
-+++ b/puppet-manifests/src/modules/platform/manifests/network.pp
-@@ -225,7 +225,7 @@ class platform::network (
-
- $management_interface = $::platform::network::mgmt::params::interface_name
-
-- $testcmd = '/usr/local/bin/connectivity_test'
-+ $testcmd = '/usr/bin/connectivity_test'
-
- if $::personality != 'controller' {
- if $management_interface {
-diff --git a/puppet-manifests/src/modules/platform/manifests/remotelogging.pp b/puppet-manifests/src/modules/platform/manifests/remotelogging.pp
-index acf1dfd..b30163e 100644
---- a/puppet-manifests/src/modules/platform/manifests/remotelogging.pp
-+++ b/puppet-manifests/src/modules/platform/manifests/remotelogging.pp
-@@ -42,7 +42,7 @@ class platform::remotelogging
- content => template('platform/remotelogging.conf.erb'),
- }
- -> exec { 'remotelogging-update-tc':
-- command => "/usr/local/bin/remotelogging_tc_setup.sh ${port}"
-+ command => "/usr/bin/remotelogging_tc_setup.sh ${port}"
- }
- -> Exec['syslog-ng-reload']
-
-diff --git a/puppet-manifests/src/modules/platform/templates/ldapscripts.conf.erb b/puppet-manifests/src/modules/platform/templates/ldapscripts.conf.erb
-index e3bc6e0..89d6d6c 100644
---- a/puppet-manifests/src/modules/platform/templates/ldapscripts.conf.erb
-+++ b/puppet-manifests/src/modules/platform/templates/ldapscripts.conf.erb
-@@ -46,7 +46,7 @@ SASLAUTH=""
-
- <%- if @bind_anonymous != true -%>
- BINDDN="cn=ldapadmin,dc=cgcs,dc=local"
--BINDPWDFILE="/usr/local/etc/ldapscripts/ldapscripts.passwd"
-+BINDPWDFILE="/etc/ldapscripts/ldapscripts.passwd"
- <%- end -%>
-
- # For older versions of OpenLDAP, it is still possible to use
-@@ -155,9 +155,9 @@ GETENTGRCMD="getent group"
- #GTEMPLATE="/path/to/ldapaddgroup.template"
- #UTEMPLATE="/path/to/ldapadduser.template"
- #MTEMPLATE="/path/to/ldapaddmachine.template"
--GTEMPLATE="/usr/local/etc/ldapscripts/ldapaddgroup.template.cgcs"
--UTEMPLATE="/usr/local/etc/ldapscripts/ldapadduser.template.cgcs"
--UMTEMPLATE="/usr/local/etc/ldapscripts/ldapmoduser.template.cgcs"
--STEMPLATE="/usr/local/etc/ldapscripts/ldapaddsudo.template.cgcs"
--SMTEMPLATE="/usr/local/etc/ldapscripts/ldapmodsudo.template.cgcs"
-+GTEMPLATE="/etc/ldapscripts/ldapaddgroup.template.cgcs"
-+UTEMPLATE="/etc/ldapscripts/ldapadduser.template.cgcs"
-+UMTEMPLATE="/etc/ldapscripts/ldapmoduser.template.cgcs"
-+STEMPLATE="/etc/ldapscripts/ldapaddsudo.template.cgcs"
-+SMTEMPLATE="/etc/ldapscripts/ldapmodsudo.template.cgcs"
- MTEMPLATE=""
---
-2.23.0
-
+++ /dev/null
-diff --git a/modules/puppet-dcmanager/src/dcmanager/manifests/params.pp b/modules/puppet-dcmanager/src/dcmanager/manifests/params.pp
-index 5cbfb50..0a4d91b 100644
---- a/modules/puppet-dcmanager/src/dcmanager/manifests/params.pp
-+++ b/modules/puppet-dcmanager/src/dcmanager/manifests/params.pp
-@@ -13,13 +13,28 @@ class dcmanager::params {
- $dcmanager_conf = '/etc/dcmanager/dcmanager.conf'
-
- if $::osfamily == 'Debian' {
-- $package_name = 'distributedcloud-dcmanager'
-- $client_package = 'distributedcloud-client-dcmanagerclient'
-- $api_package = 'distributedcloud-dcmanager'
-- $api_service = 'dcmanager-api'
-- $manager_package = 'distributedcloud-dcmanager'
-- $manager_service = 'dcmanager-manager'
-- $db_sync_command = 'dcmanager-manage db_sync'
-+
-+ if $::operatingsystem == 'poky-stx' {
-+
-+ $package_name = 'distributedcloud-dcmanager'
-+ $client_package = 'distributedcloud-client-dcmanager'
-+ $api_package = false
-+ $api_service = 'dcmanager-api'
-+ $manager_package = false
-+ $manager_service = 'dcmanager-manager'
-+ $db_sync_command = 'dcmanager-manage db_sync'
-+
-+ } else {
-+
-+ $package_name = 'distributedcloud-dcmanager'
-+ $client_package = 'distributedcloud-client-dcmanagerclient'
-+ $api_package = 'distributedcloud-dcmanager'
-+ $api_service = 'dcmanager-api'
-+ $manager_package = 'distributedcloud-dcmanager'
-+ $manager_service = 'dcmanager-manager'
-+ $db_sync_command = 'dcmanager-manage db_sync'
-+
-+ }
-
- } elsif($::osfamily == 'RedHat') {
-
+++ /dev/null
-diff --git a/modules/puppet-dcorch/src/dcorch/manifests/params.pp b/modules/puppet-dcorch/src/dcorch/manifests/params.pp
-index 76d5fa1..334cfeb 100644
---- a/modules/puppet-dcorch/src/dcorch/manifests/params.pp
-+++ b/modules/puppet-dcorch/src/dcorch/manifests/params.pp
-@@ -14,18 +14,37 @@ class dcorch::params {
- $dcorch_paste_api_ini = '/etc/dcorch/api-paste.ini'
-
- if $::osfamily == 'Debian' {
-- $package_name = 'distributedcloud-dcorch'
-- $client_package = 'distributedcloud-client-dcorchclient'
-- $api_package = 'distributedcloud-dcorch'
-- $api_service = 'dcorch-api'
-- $engine_package = 'distributedcloud-dcorch'
-- $engine_service = 'dcorch-engine'
-- $snmp_package = 'distributedcloud-dcorch'
-- $snmp_service = 'dcorch-snmp'
-- $api_proxy_package = 'distributedcloud-dcorch'
-- $api_proxy_service = 'dcorch-api-proxy'
-
-- $db_sync_command = 'dcorch-manage db_sync'
-+ if $::operatingsystem == 'poky-stx' {
-+
-+ $package_name = 'dcorch'
-+ $client_package = 'distributedcloud-client-dcorchclient'
-+ $api_package = false
-+ $api_service = 'dcorch-api'
-+ $snmp_package = false
-+ $snmp_service = 'dcorch-snmp'
-+ $engine_package = false
-+ $engine_service = 'dcorch-engine'
-+ $api_proxy_package = false
-+ $api_proxy_service = 'dcorch-api-proxy'
-+ $db_sync_command = 'dcorch-manage db_sync'
-+
-+ } else {
-+
-+ $package_name = 'distributedcloud-dcorch'
-+ $client_package = 'distributedcloud-client-dcorchclient'
-+ $api_package = 'distributedcloud-dcorch'
-+ $api_service = 'dcorch-api'
-+ $engine_package = 'distributedcloud-dcorch'
-+ $engine_service = 'dcorch-engine'
-+ $snmp_package = 'distributedcloud-dcorch'
-+ $snmp_service = 'dcorch-snmp'
-+ $api_proxy_package = 'distributedcloud-dcorch'
-+ $api_proxy_service = 'dcorch-api-proxy'
-+
-+ $db_sync_command = 'dcorch-manage db_sync'
-+
-+ }
-
- } elsif($::osfamily == 'RedHat') {
-
+++ /dev/null
-diff --git a/modules/puppet-sysinv/src/sysinv/manifests/params.pp b/modules/puppet-sysinv/src/sysinv/manifests/params.pp
-index 438aa37..9fc72e9 100644
---- a/modules/puppet-sysinv/src/sysinv/manifests/params.pp
-+++ b/modules/puppet-sysinv/src/sysinv/manifests/params.pp
-@@ -21,15 +21,30 @@ class sysinv::params {
- $sysinv_paste_api_ini = '/etc/sysinv/api-paste.ini'
-
- if $::osfamily == 'Debian' {
-- $package_name = 'sysinv'
-- $client_package = 'cgtsclient'
-- $api_package = 'sysinv'
-- $api_service = 'sysinv-api'
-- $conductor_package = 'sysinv'
-- $conductor_service = 'sysinv-conductor'
-- $agent_package = 'sysinv'
-- $agent_service = 'sysinv-agent'
-- $db_sync_command = 'sysinv-dbsync'
-+ if $::operatingsystem == 'poky-stx' {
-+
-+ $package_name = 'sysinv'
-+ $client_package = 'cgts-client'
-+ $api_package = false
-+ $api_service = 'sysinv-api'
-+ $conductor_package = false
-+ $conductor_service = 'sysinv-conductor'
-+ $agent_package = 'sysinv-agent'
-+ $agent_service = 'sysinv-agent'
-+ $db_sync_command = 'sysinv-dbsync'
-+
-+ } else {
-+
-+ $package_name = 'sysinv'
-+ $client_package = 'cgtsclient'
-+ $api_package = 'sysinv'
-+ $api_service = 'sysinv-api'
-+ $conductor_package = 'sysinv'
-+ $conductor_service = 'sysinv-conductor'
-+ $agent_package = 'sysinv'
-+ $agent_service = 'sysinv-agent'
-+ $db_sync_command = 'sysinv-dbsync'
-+ }
-
- } elsif($::osfamily == 'RedHat') {
-
+++ /dev/null
-From f027236dd57ca3ba20b6f827026a639c6fb373d8 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Fri, 20 Mar 2020 13:16:35 +0800
-Subject: [PATCH] puppet-manifest-apply: do not treat warnings as blocker issue
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- puppet-manifests/src/bin/puppet-manifest-apply.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/puppet-manifests/src/bin/puppet-manifest-apply.sh b/puppet-manifests/src/bin/puppet-manifest-apply.sh
-index 4d36059..18eec2c 100755
---- a/puppet-manifests/src/bin/puppet-manifest-apply.sh
-+++ b/puppet-manifests/src/bin/puppet-manifest-apply.sh
-@@ -105,10 +105,10 @@ if [ $? -ne 0 ]; then
- echo "See ${LOGFILE} for details"
- exit 1
- else
-- grep -qE '^(.......)?Warning|^....-..-..T..:..:..([.]...)?(.......)?.Warning|^(.......)?Error|^....-..-..T..:..:..([.]...)?(.......)?.Error' ${LOGFILE}
-+ grep -qE '^(.......)?Error|^....-..-..T..:..:..([.]...)?(.......)?.Error' ${LOGFILE}
- if [ $? -eq 0 ]; then
-- echo "[WARNING]"
-- echo "Warnings found. See ${LOGFILE} for details"
-+ echo "[ERROR]"
-+ echo "Errors found. See ${LOGFILE} for details"
- exit 1
- fi
- echo "[DONE]"
---
-2.7.4
-
+++ /dev/null
-From 804d05b0e188b8e694def2abcd0d9b0979b40b6f Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Tue, 7 Jan 2020 16:08:24 -0800
-Subject: [PATCH] puppet-manifests:etcd-override typo and journalctl
-
----
- .../src/modules/platform/files/etcd-override.conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/puppet-manifests/src/modules/platform/files/etcd-override.conf b/puppet-manifests/src/modules/platform/files/etcd-override.conf
-index 09d2ed47..5860aab4 100644
---- a/puppet-manifests/src/modules/platform/files/etcd-override.conf
-+++ b/puppet-manifests/src/modules/platform/files/etcd-override.conf
-@@ -4,6 +4,6 @@ User=root
- NotifyAccess=all
- Type=notify
- ExecStart=
--ExecStart=-/bin/bash -c "GOMAXPROCS=$(nproc) /usr/bin/etcd --name=\"${ETCD_NAME}\" --data-dir=\"${ETCD_DATA_DIR}\" --listen-client-urls=\"${ETCD_LISTEN_CLIENT_URLS}\" 2>&1 | /usr/bin/forward-journald -tag etcd"
-+ExecStart=-/bin/bash -c "GOMAXPROCS=$(nproc) /usr/bin/etcd --name=\"${ETCD_NAME}\" --data-dir=\"${ETCD_DATA_DIR}\" --listen-client-urls=\"${ETCD_LISTEN_CLIENT_URLS}\" 2>&1"
- ExecStartPost=/bin/bash -c 'echo $MAINPID >/var/run/etcd.pid'
--ExecStopPost=/bin/bash/rm -f /var/run/etcd.pid
-+ExecStopPost=/bin/bash -c 'rm -f /var/run/etcd.pid'
---
-2.23.0
-
+++ /dev/null
-From 27eefdede1dc6e45704a14480c79585e66b7939e Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Thu, 26 Mar 2020 10:17:20 +0800
-Subject: [PATCH] keystone: include ::platform::client
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- puppet-manifests/src/modules/openstack/manifests/keystone.pp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/puppet-manifests/src/modules/openstack/manifests/keystone.pp b/puppet-manifests/src/modules/openstack/manifests/keystone.pp
-index 1cb65bc..837e551 100644
---- a/puppet-manifests/src/modules/openstack/manifests/keystone.pp
-+++ b/puppet-manifests/src/modules/openstack/manifests/keystone.pp
-@@ -333,6 +333,7 @@ class openstack::keystone::server::runtime {
- class openstack::keystone::endpoint::runtime {
-
- if str2bool($::is_controller_active) {
-+ include ::platform::client
- include ::keystone::endpoint
-
- include ::sysinv::keystone::auth
---
-2.7.4
-
+++ /dev/null
-From af1da8e54d08caa065243077f601801bbc8eb8e0 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Fri, 3 Apr 2020 17:03:53 +0800
-Subject: [PATCH] lvm.pp: remove lvmetad
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- puppet-manifests/src/modules/platform/manifests/lvm.pp | 18 +-----------------
- 1 file changed, 1 insertion(+), 17 deletions(-)
-
-diff --git a/puppet-manifests/src/modules/platform/manifests/lvm.pp b/puppet-manifests/src/modules/platform/manifests/lvm.pp
-index cf16e54..64533b9 100644
---- a/puppet-manifests/src/modules/platform/manifests/lvm.pp
-+++ b/puppet-manifests/src/modules/platform/manifests/lvm.pp
-@@ -7,23 +7,7 @@ class platform::lvm::params (
- class platform::lvm
- inherits platform::lvm::params {
-
-- # Mask socket unit as well to make sure
-- # systemd socket activation does not happen
-- service { 'lvm2-lvmetad.socket':
-- ensure => 'stopped',
-- enable => mask,
-- }
-- # Masking service unit ensures that it is not started again
-- -> service { 'lvm2-lvmetad':
-- ensure => 'stopped',
-- enable => mask,
-- }
-- # Since masking is changing unit symlinks to point to /dev/null,
-- # we need to reload systemd configuration
-- -> exec { 'lvmetad-systemd-daemon-reload':
-- command => 'systemctl daemon-reload',
-- }
-- -> file_line { 'use_lvmetad':
-+ file_line { 'use_lvmetad':
- path => '/etc/lvm/lvm.conf',
- match => '^[^#]*use_lvmetad = 1',
- line => ' use_lvmetad = 0',
---
-2.7.4
-
+++ /dev/null
-From 1735d6504b319c2d05ffbd2ae8ff6a4515982aed Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Sun, 19 Apr 2020 21:38:59 +0800
-Subject: [PATCH] puppet-manifest-apply: workaround to ignore known errors
-
-puppet-manifest-apply.sh will exit if there is any ERROR message in the
-puppet log, but the "remount /scratch" error is known to be harmless
-and the mount point is actually mounted succesfully, so add a workaround
-to ignore known errors in the log so the puppet manifest can complete.
-
-Upstream-Status: Inappropriate [workaround]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- puppet-manifests/src/bin/puppet-manifest-apply.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/puppet-manifests/src/bin/puppet-manifest-apply.sh b/puppet-manifests/src/bin/puppet-manifest-apply.sh
-index 18eec2c..3ac6cfc 100755
---- a/puppet-manifests/src/bin/puppet-manifest-apply.sh
-+++ b/puppet-manifests/src/bin/puppet-manifest-apply.sh
-@@ -89,6 +89,8 @@ function finish {
- }
- trap finish EXIT
-
-+# Pattern for know errors, will be ignored when checking errors
-+KNOWN_ERRORS="Error.*remount /scratch"
-
- # Set Keystone endpoint type to internal to prevent SSL cert failures during config
- export OS_ENDPOINT_TYPE=internalURL
-@@ -105,7 +107,7 @@ if [ $? -ne 0 ]; then
- echo "See ${LOGFILE} for details"
- exit 1
- else
-- grep -qE '^(.......)?Error|^....-..-..T..:..:..([.]...)?(.......)?.Error' ${LOGFILE}
-+ grep -E -v "${KNOWN_ERRORS}" ${LOGFILE} | grep -qE '^(.......)?Error|^....-..-..T..:..:..([.]...)?(.......)?.Error'
- if [ $? -eq 0 ]; then
- echo "[ERROR]"
- echo "Errors found. See ${LOGFILE} for details"
---
-2.7.4
-
+++ /dev/null
-From 3d8cce4420f84bac979e9b10384fddb4d7c810d9 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Wed, 18 Nov 2020 09:45:54 +0800
-Subject: [PATCH] kubernetes.pp: add re-tries for docker login
-
-The docker login to local registry may sometimes fail:
-Error: docker login registry.local:9001 -u admin -p St8rlingX* returned 1 instead of one of [0]
-
-It's rare and the root cause is not found yet, but a re-try will always succeed,
-so add re-tries and a try sleep between re-tries to workaround it for now.
-
-Upstream-Status: Inappropriate [workaround]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- puppet-manifests/src/modules/platform/manifests/kubernetes.pp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp
-index 3fa1c8a..af69373 100644
---- a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp
-+++ b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp
-@@ -269,6 +269,8 @@ class platform::kubernetes::master::init
- -> exec { 'login local registry':
- command => "docker login registry.local:9001 -u ${::platform::dockerdistribution::params::registry_username} -p ${::platform::dockerdistribution::params::registry_password}", # lint:ignore:140chars
- logoutput => true,
-+ tries => 3,
-+ try_sleep => 1,
- }
-
- -> exec { 'kubeadm to pre pull images':
-@@ -384,6 +386,8 @@ class platform::kubernetes::worker::init
- exec { 'login local registry':
- command => "docker login registry.local:9001 -u ${::platform::dockerdistribution::params::registry_username} -p ${::platform::dockerdistribution::params::registry_password}", # lint:ignore:140chars
- logoutput => true,
-+ tries => 3,
-+ try_sleep => 1,
- }
-
- -> exec { 'load k8s pause image':
---
-2.7.4
-
+++ /dev/null
-#!/bin/bash
-
-################################################################################
-# Copyright (c) 2016 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-################################################################################
-
-#
-# Purpose of this script is to copy the puppet-built
-# network config file from the puppet dir to the /etc/network/interfaces
-# Only copied when difference detected
-#
-# Please note: function is_eq_ifcfg() is used to determine if
-# cfg files are different
-#
-
-ACQUIRE_LOCK=1
-RELEASE_LOCK=0
-
-if [ ! -f /var/run/interfaces.puppet ] ; then
- # No puppet file? Nothing to do!
- exit 1
-fi
-
-function log_it {
- logger "${0} ${1}"
-}
-
-function do_if_up {
- local iface=$1
- log_it "Bringing $iface up"
- /sbin/ifup $iface
-}
-
-function do_if_down {
- local iface=$1
- log_it "Bringing $iface down"
- /sbin/ifdown $iface
-}
-
-function do_rm {
- local theFile=$1
- log_it "Removing $theFile"
- /bin/rm $theFile
-}
-
-function do_cp {
- local srcFile=$1
- local dstFile=$2
- log_it "copying network cfg $srcFile to $dstFile"
- cp $srcFile $dstFile
-}
-
-function do_mv {
- local srcFile=$1
- local dstFile=$2
- log_it "Moving network cfg $srcFile to $dstFile"
- mv $srcFile $dstFile
-}
-
-# Return items in list1 that are not in list2
-array_diff () {
- list1=${!1}
- list2=${!2}
-
- result=()
- l2=" ${list2[*]} "
- for item in ${list1[@]}; do
- if [[ ! $l2 =~ " $item " ]] ; then
- result+=($item)
- fi
- done
-
- echo ${result[@]}
-}
-
-function normalized_cfg_attr_value {
- local cfg=$1
- local attr_name=$2
- local attr_value
- attr_value=$(cat $cfg | grep $attr_name= | awk -F "=" {'print $2'})
-
-
- #
- # Special case BONDING_OPTS attribute.
- #
- # The BONDING_OPTS attribute contains '=' characters, so is not correctly
- # parsed by splitting on '=' as done above. This results in changes to
- # BONDING_OPTS not causing the interface to be restarted, so the old
- # BONDING_OPTS still be used. Because this is only checking for changes,
- # rather than actually using the returned value, we can return the whole
- # line.
- #
- if [[ "${attr_name}" == "BONDING_OPTS" ]]; then
- echo "$(cat $cfg | grep $attr_name=)"
- return $(true)
- fi
-
- if [[ "${attr_name}" != "BOOTPROTO" ]]; then
- echo "${attr_value}"
- return $(true)
- fi
- #
- # Special case BOOTPROTO attribute.
- #
- # The BOOTPROTO attribute is not populated consistently by various aspects
- # of the system. Different values are used to indicate a manually
- # configured interfaces (i.e., one that does not expect to have an IP
- # address) and so to avoid reconfiguring an interface that has different
- # values with the same meaning we normalize them here before making any
- # decisions.
- #
- # From a user perspective the values "manual", "none", and "" all have the
- # same meaning - an interface without an IP address while "dhcp" and
- # "static" are distinct values with a separate meaning. In practice
- # however, the only value that matters from a ifup/ifdown script point of
- # view is "dhcp". All other values are ignored.
- #
- # In our system we set BOOTPROTO to "static" to indicate that IP address
- # attributes exist and to "manual"/"none" to indicate that no IP address
- # attributes exist. These are not needed by ifup/ifdown as it looks for
- # the "IPADDR" attribute whenever BOOTPROTO is set to anything other than
- # "dhcp".
- #
- if [[ "${attr_value}" == "none" ]]; then
- attr_value="none"
- fi
- if [[ "${attr_value}" == "manual" ]]; then
- attr_value="none"
- fi
- if [[ "${attr_value}" == "" ]]; then
- attr_value="none"
- fi
- echo "${attr_value}"
- return $(true)
-}
-
-#
-# returns $(true) if cfg file ( $1 ) has property propName ( $2 ) with a value of propValue ( $3 )
-#
-function cfg_has_property_with_value {
- local cfg=$1
- local propname=$2
- local propvalue=$3
- if [ -f $cfg ]; then
- if [[ "$(normalized_cfg_attr_value $cfg $propname)" == "${propvalue}" ]]; then
- return $(true)
- fi
- fi
- return $(false)
-}
-
-#
-# returns $(true) if cfg file is configured as a slave
-#
-function is_slave {
- cfg_has_property_with_value $1 "SLAVE" "yes"
- return $?
-}
-
-#
-# returns $(true) if cfg file is configured for DHCP
-#
-function is_dhcp {
- cfg_has_property_with_value $1 "BOOTPROTO" "dhcp"
-}
-
-#
-# returns $(true) if cfg file is configured as a VLAN interface
-#
-function is_vlan {
- cfg_has_property_with_value $1 "VLAN" "yes"
- return $?
-}
-
-#
-# returns $(true) if cfg file is configured as an ethernet interface. For the
-# purposes of this script "ethernet" is considered as any interface that is not
-# a vlan or a slave. This includes both regular ethernet interfaces and bonded
-# interfaces.
-#
-function is_ethernet {
- if ! is_vlan $1; then
- if ! is_slave $1; then
- return $(true)
- fi
- fi
- return $(false)
-}
-
-#
-# returns $(true) if cfg file represents an interface of the specified type.
-#
-function iftype_filter {
- local iftype=$1
-
- return $(is_$iftype $2)
-}
-
-#
-# returns $(true) if ifcfg files have the same number of VFs
-#
-#
-function is_eq_sriov_numvfs {
- local cfg_1=$1
- local cfg_2=$2
- local sriov_numvfs_1
- sriov_numvfs_1=$(grep -o 'echo *[1-9].*sriov_numvfs' $cfg_1 | awk {'print $2'})
- local sriov_numvfs_2
- sriov_numvfs_2=$(grep -o 'echo *[1-9].*sriov_numvfs' $cfg_2 | awk {'print $2'})
-
- sriov_numvfs_1=${sriov_numvfs_1:-0}
- sriov_numvfs_2=${sriov_numvfs_2:-0}
-
- if [[ "${sriov_numvfs_1}" != "${sriov_numvfs_2}" ]]; then
- log_it "$cfg_1 and $cfg_2 differ on attribute sriov_numvfs [${sriov_numvfs_1}:${sriov_numvfs_2}]"
- return $(false)
- fi
-
- return $(true)
-}
-
-#
-# returns $(true) if ifcfg files are equal
-#
-# Warning: Only compares against cfg file attributes:
-# BOOTPROTO DEVICE IPADDR NETMASK GATEWAY MTU BONDING_OPTS SRIOV_NUMVFS
-#
-function is_eq_ifcfg {
- local cfg_1=$1
- local cfg_2=$2
-
- for attr in BOOTPROTO DEVICE IPADDR NETMASK GATEWAY MTU BONDING_OPTS; do
- local attr_value1
- attr_value1=$(normalized_cfg_attr_value $cfg_1 $attr)
- local attr_value2
- attr_value2=$(normalized_cfg_attr_value $cfg_2 $attr)
- if [[ "${attr_value1}" != "${attr_value2}" ]]; then
- log_it "$cfg_1 and $cfg_2 differ on attribute $attr"
- return $(false)
- fi
- done
-
- is_eq_sriov_numvfs $1 $2
- return $?
-}
-
-# Synchronize with sysinv-agent audit (ifup/down to query link speed).
-function sysinv_agent_lock {
- case $1 in
- $ACQUIRE_LOCK)
- local lock_file="/var/run/apply_network_config.lock"
- # Lock file should be the same as defined in sysinv agent code
- local lock_timeout=5
- local max=15
- local n=1
- LOCK_FD=0
- exec {LOCK_FD}>$lock_file
- while [[ $n -le $max ]]; do
-
- flock -w $lock_timeout $LOCK_FD && break
- log_it "Failed to get lock($LOCK_FD) after $lock_timeout seconds ($n/$max), will retry"
- sleep 1
- n=$(($n+1))
- done
- if [[ $n -gt $max ]]; then
- log_it "Failed to acquire lock($LOCK_FD) even after $max retries"
- exit 1
- fi
- ;;
- $RELEASE_LOCK)
- [[ $LOCK_FD -gt 0 ]] && flock -u $LOCK_FD
- ;;
- esac
-}
-
-
-# synchronize with sysinv-agent audit
-sysinv_agent_lock $ACQUIRE_LOCK
-
-# check if this is a duplicated configuration
-if ! diff -I '^#' "/var/run/interfaces.puppet" "/etc/network/interfaces" > /dev/null; then
- # now copy the puppet changed interfaces to /etc/network/interfaces
- do_mv /var/run/interfaces.puppet /etc/network/interfaces
-
- # now restart networking service
- /etc/init.d/networking restart
-
- sleep 5
-else
- # need to remove this file also
- do_rm /var/run/interfaces.puppet
-fi
-
-
-# workaround the loopback label addresses cannot be configured as scope of host
-ip addr show lo | egrep "inet.*global.*lo:" > /tmp/loop$$
-
-while read addr_info; do
- echo $addr_info
- log_it "replace $addr_info with scope host"
- addr=`echo $addr_info | cut -d' ' -f 2`
- ifname=`echo $addr_info | cut -d' ' -f 5`
- ip addr del $addr dev lo label $ifname
- ip addr add $addr dev lo scope host label $ifname
-done < /tmp/loop$$
-
-
-# unlock: synchronize with sysinv-agent audit
-sysinv_agent_lock $RELEASE_LOCK
+++ /dev/null
-diff --git a/puppet-manifests/src/modules/platform/lib/facter/is_primary_disk_rotational.rb b/puppet-manifests/src/modules/platform/lib/facter/is_primary_disk_rotational.rb
-index d80896f..599fcd8 100644
---- a/puppet-manifests/src/modules/platform/lib/facter/is_primary_disk_rotational.rb
-+++ b/puppet-manifests/src/modules/platform/lib/facter/is_primary_disk_rotational.rb
-@@ -1,6 +1,6 @@
- require 'facter'
- Facter.add(:is_primary_disk_rotational) do
-- rootfs_partition = Facter::Core::Execution.exec("df --output=source / | tail -1")
-+ rootfs_partition = Facter::Core::Execution.exec('sed -e "s/^.*\(root=\)\(.* \).*$/\2/g" /proc/cmdline')
- rootfs_device = Facter::Core::Execution.exec("basename #{rootfs_partition} | sed 's/[0-9]*$//;s/p[0-9]*$//'")
- setcode "cat /sys/block/#{rootfs_device}/queue/rotational"
- end
+++ /dev/null
-diff -ru a/puppet-manifests/src/modules/platform/manifests/network.pp b/puppet-manifests/src/modules/platform/manifests/network.pp
---- a/puppet-manifests/src/modules/platform/manifests/network.pp 2020-04-08 19:10:04.478548420 +0800
-+++ b/puppet-manifests/src/modules/platform/manifests/network.pp 2020-04-08 19:10:22.674548916 +0800
-@@ -208,8 +208,14 @@
- -> Network_route6 <| |>
- -> Exec['apply-network-config']
-
-- exec {'apply-network-config':
-- command => 'apply_network_config.sh',
-+ if($::operatingsystem == 'poky-stx') {
-+ exec {'apply-network-config':
-+ command => 'apply_network_config_poky.sh',
-+ }
-+ } else {
-+ exec {'apply-network-config':
-+ command => 'apply_network_config.sh',
-+ }
- }
- }
-
+++ /dev/null
-
-SUMMARY = "Puppet module for OpenStack Barbican"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fce88ac1cd1315adf28a52502c9f7f6b"
-
-RDEPENDS_${PN} += " \
- puppetlabs-inifile \
- "
-
-PV = "11.3.0"
-SRCREV = "8241a1d13be6c3ee6344fa46dcfc045439044e76"
-PROTOCOL = "https"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/openstack/puppet-barbican.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
- file://puppet-barbican/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppet-barbican-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/barbican
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/barbican
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += " \
- file://${BPN}/puppet-barbican-fix-the-pkg-and-service-names-for-poky-stx.patch \
- file://${BPN}/puppet-barbican-do-not-fail-for-poky-stx.patch \
- "
-inherit openssl10
+++ /dev/null
-
-DESCRIPTION = "Logical Resource Management (LVM) features for Puppet."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8cbd44f4ffbc81632df22fdd4ae87811"
-
-PV = "1.0.1"
-SRCREV = "22b726dd78b0a60a224cc7054aebbf28e9306f62"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/adrienthebo/puppet-boolean;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- "
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
-
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/boolean
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/boolean/
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-SUMMARY = "Community Developed Ceph Module."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0e5ccf641e613489e66aa98271dbe798"
-
-PV = "2.4.1"
-SRCREV = "ebea4b703d002d64d0b623cc51d42890b187ab97"
-PROTOCOL = "https"
-BRANCH = "stable/jewel"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/openstack/puppet-ceph.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://puppet-ceph/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppet-ceph-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/ceph
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/ceph
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches"
-
-SRC_URI_STX += " \
- file://0001-Roll-up-TIS-patches.patch \
- file://0002-Newton-rebase-fixes.patch \
- file://0003-Ceph-Jewel-rebase.patch \
- file://0004-US92424-Add-OSD-support-for-persistent-naming.patch \
- file://0006-ceph-disk-prepare-invalid-data-disk-value.patch \
- file://0007-Add-StarlingX-specific-restart-command-for-Ceph-moni.patch \
- file://0008-ceph-mimic-prepare-activate-osd.patch \
- file://0009-fix-ceph-osd-disk-partition-for-nvme-disks.patch \
- file://0010-wipe-unprepared-disks.patch \
- "
-
-SRC_URI += " \
- file://${BPN}/0005-Remove-puppetlabs-apt-as-ceph-requirement.patch \
- file://${BPN}/0011-puppet-ceph-changes-for-poky-stx.patch \
- "
-
-inherit openssl10
+++ /dev/null
-
-SUMMARY = "Deprecated: Use saltedsignal/puppet-certmonger instead."
-DESCRIPTION = " \
- This puppet module allows you to request and manage certificates using certmonger. \
- "
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5e8f921d6b978d3605270db1f39e199f"
-
-PV = "1.1.1"
-SRCREV = "1157a7e552d87696e80ed4ab54bf0608a1c5ffff"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/earsdown/puppet-certmonger.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://puppet-certmonger/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppet-certmonger-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/certmonger
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/certmonger
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://${PN}/0001-puppet-certmonger-adjust-path-to-poky-rootfs.patch"
-
-inherit openssl10
+++ /dev/null
-
-SUMMARY = "Puppet module for configuring collectd and plugins."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=03ff50a0bc4a15eb462d4129e89f9656"
-
-PV = "5.1.0"
-SRCREV = "f5a44db033c7cea9990c405519f70d18fc2b05c0"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/voxpupuli/puppet-collectd;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
-
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/collectd
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/collectd
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-DESCRIPTION = "puppet module for dnsmasq"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://README.md;md5=71e3bfa9ffc5e93324727bbffae917f5"
-
-PV = "1.1.0"
-STABLE = "master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "cff07e90890662972c97684a2baee964f68ff3ed"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/netmanagers/puppet-dnsmasq;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- file://${PN}/metadata.json.patch \
- "
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
-
-do_install_append () {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/dnsmasq
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/dnsmasq/
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "config/puppet-modules/${BPN}/centos/files"
-
-SRC_URI_STX += " \
- file://0001-puppet-dnsmasq-Kilo-quilt-patches.patch;striplevel=5 \
- file://0002-Fixing-mismatched-permission-on-dnsmasq-conf.patch;striplevel=5 \
- file://0003-Support-management-of-tftp_max-option.patch;striplevel=5 \
- file://0004-Enable-clear-DNS-cache-on-reload.patch;striplevel=5 \
- "
-
-SRC_URI += " \
- file://${BPN}/0005-puppet-dnsmasq-updates-for-poky-stx.patch;striplevel=5 \
- "
-
-inherit openssl10
+++ /dev/null
-
-DESCRIPTION = "puppet-drbd"
-
-PV = "0.3.1"
-SRCREV = "496b3ba9cd74a2d12636f9e90a718739a5451169"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=6089b6bd1f0d807edb8bdfd76da0b038 "
-
-SRC_URI = " \
- git://github.com/voxpupuli/puppet-drbd;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- "
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/drbd
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/drbd
-}
-
-FILES_${PN} += "${datadir}"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "config/puppet-modules/${BP}/centos/files"
-
-SRC_URI_STX += " \
- file://0001-TIS-Patches.patch \
- file://0002-Disable-timeout-for-mkfs-command.patch \
- file://0003-drbd-parallel-to-serial-synchronization.patch \
- file://0004-US-96914-reuse-existing-drbd-cinder-resource.patch \
- file://0005-Add-PausedSync-states-to-acceptable-cstate.patch \
- file://0006-CGTS-7164-Add-resource-options-cpu-mask-to-affine-drbd-kernel-threads.patch \
- file://0007-Add-disk-by-path-test.patch \
- file://0008-CGTS-7953-support-for-new-drbd-resources.patch \
- file://0009-drbd-slow-before-swact.patch \
- file://0010-Format-DRBD-resource-cpu-mask-to-support-64-or-larger-cpus.patch \
- "
-
-inherit openssl10
+++ /dev/null
-
-SUMMARY = "Installs and configures etcd"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-
-PV = "1.11.0"
-SRCREV = "f43e1292a9554766f799cd5a14b67cc19ce5b00e"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/cristifalcas/puppet-etcd;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://puppet-etcd/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppet-etcd-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/etcd
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/etcd
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += " \
- file://${BPN}/puppet-etcd-changes-for-poky-stx.patch \
- "
-inherit openssl10
+++ /dev/null
-
-DESCRIPTION = "A Puppet module to map files to resources and back."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b43880e14353cbc12cf3981fb93a0944"
-
-PV = "1.1.3"
-SRCREV = "9b53310278e76827bbe12a36cc6470d77071abb2"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = " \
- git://github.com/adrienthebo/puppet-filemapper;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- file://${PN}/metadata.json.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_BUILD_GEMS = "adrien-filemapper.gemspec"
-RUBY_INSTALL_GEMS = "adrien-filemapper-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/filemapper
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/filemapper
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-SUMMARY = "Intended managing the entirety of horizon."
-DESCRIPTION = " \
- The horizon module is a thorough attempt to make Puppet capable of \
- managing the entirety of horizon. Horizon is a fairly classic django \
- application, which results in a fairly simply Puppet module.\
- "
-
-# HOMEPAGE = "https://github.com/openstack/puppet-horizon"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=12a15a9ebddda7d856c783f745e5ee47"
-
-PV = "11.5.0"
-SRCREV = "d75706e38fdf63f9c3174a526a7d07799390dfeb"
-PROTOCOL = "https"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/openstack/puppet-horizon.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
- file://${PN}/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppet-horizon-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/horizon
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/horizon
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += " \
- file://${BPN}/0001-Update-memcached-dependency.patch \
- file://${BPN}/0002-puppet-horizon-changes-for-poky-stx.patch \
- "
-inherit openssl10
+++ /dev/null
-
-SUMMARY = "Puppet module for OpenStack Keystone"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=12a15a9ebddda7d856c783f745e5ee47"
-
-PV = "11.3.0"
-SRCREV = "305c91cac00f720ad6461b442e71b52b12f9ae57"
-PROTOCOL = "https"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/openstack/puppet-keystone.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
- file://puppet-keystone/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppet-keystone-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/keystone
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/keystone
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "config/puppet-modules/openstack/${BP}/centos"
-
-SRC_URI_STX += " \
- file://patches/0001-pike-rebase-squash-titanium-patches.patch \
- file://patches/0002-remove-the-Keystone-admin-app.patch \
- file://patches/0003-remove-eventlet_bindhost-from-Keystoneconf.patch \
- file://patches/0004-escape-special-characters-in-bootstrap.patch \
- file://patches/0005-Add-support-for-fernet-receipts.patch \
- file://patches/0006-update-Barbican-admin-secret-s-user-project-IDs-duri.patch \
- file://patches/0007-update-for-openstackclient-Train-upgrade.patch \
- "
-
-SRC_URI += " \
- file://${BPN}/puppet-keystone-specify-full-path-to-openrc.patch \
- file://${BPN}/puppet-keystone-params.pp-fix-the-service-name.patch \
- "
-
-do_install_append () {
- # fix the name of python-memcached
- sed -i -e 's/python-memcache\b/python-memcached/' ${D}/${datadir}/puppet/modules/keystone/manifests/params.pp
-}
-
-RDEPENDS_${PN} += " \
- python-memcached \
- python-ldappool \
- "
-
-inherit openssl10
+++ /dev/null
-
-SUMMARY = "Manage Linux kernel modules with Puppet"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0e5ccf641e613489e66aa98271dbe798"
-
-PV = "2.1.0"
-SRCREV = "0d69a96e8d0d3a08da0d5f476c733134df4fb9ee"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/camptocamp/puppet-kmod;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- file://${PN}/persistent-module-load-poky.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_BUILD_GEMS = "camptocamp-kmod.gemspec"
-RUBY_INSTALL_GEMS = "camptocamp-kmod-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/kmod
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/kmod
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-SUMMARY = "OpenLDAP module for Puppet."
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://metadata.json;md5=4244fe391bee02e9ee7259aa7f8dda8b"
-
-PV = "0.2.4"
-SRCREV = "480f13af6d17d1d3fcf0dc7b4bd04b49fa4099e1"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = " \
- git://github.com/torian/puppet-ldap;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://puppet-ldap/Add-gemspec.patch \
- "
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/ldap
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/ldap
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += " \
- file://${BPN}/0001-puppet-ldap-add-os-poky-stx.patch \
- file://${BPN}/0002-puppet-ldap-poky-stx-fix-pkg-name.patch \
- "
-
-inherit openssl10
+++ /dev/null
-
-SUMMARY = "Intended managing the entirety of horizon."
-DESCRIPTION = " \
- The horizon module is a thorough attempt to make Puppet capable of \
- managing the entirety of horizon. Horizon is a fairly classic django \
- application, which results in a fairly simply Puppet module.\
- "
-
-HOMEPAGE = "https://github.com/saz/puppet-memcached.git"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1322039bbc8e3ff4e74252ec65303861"
-
-PV = "3.0.2"
-SRCREV = "c2a0b543dc28f34ab68e905ede3173b00246ddca"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = " \
- git://github.com/saz/puppet-memcached.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://puppet-memcached/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppet-memcached-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/memcached
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/memcached
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-SUMMARY = "A Puppet module to manage non volatile network and route configuration."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b43880e14353cbc12cf3981fb93a0944"
-
-
-PV = "0.5.0"
-SRCREV = "7deacd5fdc22c0543455878a8d1872f2f5417c1d"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = " \
- git://github.com/voxpupuli/puppet-network;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://puppet-network/Add-gemspec.patch \
- file://puppet-network/metadata.json.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
-
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/network
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/network
- # Remove broken symlinks for now
- rm -f ${D}/${libdir}/ruby/gems/2.5.0/gems/puppet-network-0.5.0/spec/fixtures/modules/network/manifests
- rm -f ${D}/${libdir}/ruby/gems/2.5.0/gems/puppet-network-0.5.0/spec/fixtures/modules/network/templates
- rm -f ${D}/${libdir}/ruby/gems/2.5.0/gems/puppet-network-0.5.0/spec/fixtures/modules/network/files
- rm -f ${D}/${libdir}/ruby/gems/2.5.0/gems/puppet-network-0.5.0/spec/fixtures/modules/network/lib
- rm -f ${D}/${datadir}/puppet/modules/network/spec/fixtures/modules/network/files
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "config/puppet-modules/${BPN}/centos/files"
-
-SRC_URI_STX += " \
- file://puppet-network-Kilo-quilt-changes.patch;striplevel=5 \
- file://puppet-network-support-ipv6.patch;striplevel=5 \
- file://Don-t-write-absent-to-redhat-route-files-and-test-fo.patch;striplevel=5 \
- file://fix-absent-options.patch;striplevel=5 \
- file://permit-inservice-update-of-static-routes.patch;striplevel=5 \
- file://ipv6-static-route-support.patch;striplevel=5 \
- file://route-options-support.patch;striplevel=5 \
- "
-
-SRC_URI += " \
- file://${BPN}/0001-Stx-uses-puppet-boolean-instead-of-adrien-boolean.patch \
- file://${BPN}/puppet-network-updates-for-poky-stx.patch \
- file://${BPN}/puppet-network-config-poky-provider.patch \
- file://${BPN}/puppet-network-poky-stx.rb-add-vlan-support.patch \
- "
-
-inherit openssl10
-
-do_configure_append() {
- rm -f spec/fixtures/modules/network/files
-}
-
-RDEPENDS_${PN} += "\
- vlan \
-"
+++ /dev/null
-
-SUMMARY = "A Puppet module to manage the nslcd daemon which provides authentication via LDAP"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://Modulefile;md5=674f57ad12dfafcf6c3943f34d459ded"
-
-PV = "0.0.1"
-SRCREV = "b8c19b1ada89865f2e50758e054583798ad8011a"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = " \
- git://github.com/jlyheden/puppet-nslcd;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- file://${PN}/metadata.json.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/nslcd
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/nslcd
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += " \
- file://${BPN}/puppet-nslcd-updates-for-poky-stx.patch \
- "
-
-RDEPENDS_${PN} += "nss-pam-ldapd"
-
-inherit openssl10
+++ /dev/null
-
-SUMMARY = "NSS database Puppet Module"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0409d65ae3bec182108fd45c64bd0ef2"
-
-PV = "1.0.1"
-SRCREV = "2e163a21fb80d828afede2d4be6214f1171c4887"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/rcritten/puppet-nssdb.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- file://${PN}/metadata.json.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppet-nssdb-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/nssdb
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/nssdb
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-SUMMARY = "Puppet OpenStack Libraries."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=12a15a9ebddda7d856c783f745e5ee47"
-
-PV = "11.3.0"
-SRCREV = "79a799f5d78667b5eee81e71782e8591f2e62ecc"
-PROTOCOL = "https"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/openstack/puppet-openstacklib.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
- file://puppet-openstacklib/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppet-openstacklib-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/openstacklib
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/openstacklib
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "config/puppet-modules/openstack/${BP}/centos"
-
-SRC_URI_STX += " \
- file://patches/0001-Roll-up-TIS-patches.patch \
- file://patches/0002-update-for-openstackclient-Train.patch \
- "
-
-SRC_URI += " \
- file://${BPN}/puppet-openstacklib-updates-for-poky-stx.patch \
- "
-
-inherit openssl10
+++ /dev/null
-
-SUMMARY = "The oslo module is a part of OpenStack intended to provide continuous integration testing and code review."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86e96afa80a52eedda5dccc1af36b4f2"
-
-PV = "11.3.0"
-SRCREV = "5ad200e9d8af200a8f50f86a2db4cf3f36ab2a4c"
-PROTOCOL = "https"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/openstack/puppet-oslo.git;protocol=${PROTOCOL};rev=${SRCREV};nobranch=1 \
- file://puppet-oslo/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppet-oslo-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/oslo
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/oslo
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "config/puppet-modules/openstack/${BP}/centos/patches"
-
-SRC_URI_STX += " \
- file://0001-Remove-log_dir-from-conf-files.patch \
- file://0002-add-psycopg2-drivername-to-postgresql-settings.patch \
- "
-
-do_install_append () {
- # fix the name of python-memcached
- sed -i -e 's/python-memcache\b/python-memcached/' ${D}/${datadir}/puppet/modules/oslo/manifests/params.pp
-}
-
-RDEPENDS_${PN} += "python-memcached"
-
-inherit openssl10
+++ /dev/null
-
-SUMMARY = "Installs and configures Puppi."
-DESCRIPTION = " \
- This module provides the Puppi libraries required by Example42 modules and, if explicitely included, the \
- puppi command, its working environment, the defines and procedures to deploy applications.\
- "
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a300b604c66de62cf6e923cca89c9d83"
-
-PV = "2.2.3"
-SRCREV = "c1c47f4edfd761d1bbde32a75da0c3fa7cc93a81"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = " \
- git://github.com/example42/puppi;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/puppi
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/puppi
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += " \
- file://${BPN}/puppet-puppi-updates-for-poky-stx.patch \
- file://${BPN}/puppet-puppi-adjust-path.patch \
- "
-
-inherit openssl10
+++ /dev/null
-
-SUMMARY = "Manages staging directory, along with download/extraction of compressed files."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=cdbf8d74b765504fbdf8e154bb4458a1"
-
-PV = "1.0.4"
-SRCREV = "bc434a71e19aae54223d57c274e2e1a7f9546d5e"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = " \
- git://github.com/nanliu/puppet-staging;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://puppet-staging/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_BUILD_GEMS = "nanliu-staging.gemspec"
-RUBY_INSTALL_GEMS = "nanliu-staging-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/staging
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/staging
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-SUMMARY = "This modules allows you to configure sysctl."
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://README.md;md5=b5335702ab6b120493cf88faaf9be346"
-
-PV = "0.0.11"
-SRCREV = "65ffe839a4ce785bc3901452488197a0ef158cd8"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/duritong/puppet-sysctl;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_BUILD_GEMS = "duritong-sysctl.gemspec"
-RUBY_INSTALL_GEMS = "duritong-sysctl-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/sysctl
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/sysctl
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-SUMMARY = "Puppet module for OpenStack Barbican"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f05b73a1f91c0e30dece85ed11819aca"
-
-PV = "0.1.0"
-SRCREV = "c937de75c28e63fba8d8738ad6a5f2ede517e53d"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/derekhiggins/puppet-vlan.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- file://${PN}/metadata.json.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/vlan
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/vlan
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/vswitch
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/vswitch
-}
-
-FILES_${PN} += " ${datadir}"
-
-inherit openssl10
-RDEPENDS_${PN}_append = " perl"
+++ /dev/null
-
-SUMMARY = "Open source Puppet is a configuration management system"
-HOMEPAGE = "https://puppetlabs.com/puppet/puppet-open-source"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7c9045ec00cc0d6b6e0e09ee811da4a0"
-
-SRC_URI = " \
- https://downloads.puppetlabs.com/puppet/puppet-${PV}.tar.gz \
- file://${BPN}/${PV}/add_puppet_gemspec.patch \
- file://${BPN}/${PV}/puppet-updates-for-poky-stx.patch \
- file://${BPN}/${PV}/puppet-poky-dnf.patch \
- file://${BPN}/${PV}/puppet.conf \
- file://${BPN}/${PV}/puppet.init \
- file://${BPN}/${PV}/puppet.service \
-"
-SRC_URI[md5sum] = "095ef8bddd94dd1ee0562a3c816ab05f"
-SRC_URI[sha256sum] = "fc71ca0be64b4b1282e0064b8fbf115c547cb87ca6b209da56e1b9569567404a"
-
-inherit ruby update-rc.d systemd
-inherit openssl10
-
-DEPENDS += " \
- ruby \
- facter \
- libffi \
-"
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- ruby-shadow \
- bash \
-"
-
-RUBY_INSTALL_GEMS = "puppet-${PV}.gem"
-
-INITSCRIPT_NAME = "${BPN}"
-INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
-
-SYSTEMD_AUTO_ENABLE = "enable"
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "${BPN}.service"
-
-do_install_append() {
- install -d ${D}${sysconfdir}/puppet
- install -d ${D}${sysconfdir}/puppet/manifests
- install -d ${D}${sysconfdir}/puppet/modules
-
- install -m 655 ${S}/conf/auth.conf ${D}${sysconfdir}/puppet/
- install -m 655 ${S}/conf/fileserver.conf ${D}${sysconfdir}/puppet/
- install -m 655 ${S}/conf/environment.conf ${D}${sysconfdir}/puppet/
- install -m 655 ${WORKDIR}/${BPN}/${PV}/puppet.conf ${D}${sysconfdir}/puppet/
-
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/${BPN}/${PV}/puppet.service ${D}${systemd_unitdir}/system
-
- install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/${BPN}/${PV}/puppet.init ${D}${sysconfdir}/init.d/puppet
-
- # Install puppet environment and moudlepath
-
- install -m 0755 -d ${D}/${sysconfdir}/puppetlabs/code/environments/production
- echo "modulepath = /usr/share/puppet/modules:/usr/share/openstack-puppet/modules" > \
- ${D}/${sysconfdir}/puppetlabs/code/environments/production/environment.conf
-}
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += " \
- file://${BPN}/puppet-updates-for-poky-stx.patch \
- file://${BPN}/puppet-poky-yum.patch \
- "
+++ /dev/null
-
-SUMMARY = "Installs, configures, and manages Apache virtual hosts, web services, and modules."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV = "1.10.0"
-SRCREV = "410309f5facd0df7d836ea66c27ca9514031b6e3"
-PROTOCOL = "https"
-BRANCH = "main"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/puppetlabs/puppetlabs-apache.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppetlabs-apache-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/apache
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/apache
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += " \
- file://${BPN}/puppetlabs-apache-updates-for-poky-stx.patch \
- "
-#SRC_URI += " \
-# file://${BPN}/0001-maint-Fix-conditional-in-vhost-ssl-template.patch \
-# file://${BPN}/0002-maint-Fix-the-vhost-ssl-template-correctly-this-time.patch \
-# "
-
-RDEPENDS_${PN} += " \
- apache2 \
- mod-wsgi \
- "
-
-inherit openssl10
+++ /dev/null
-
-DESCRIPTION = "Construct files from multiple fragments."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV = "2.2.0"
-SRCREV = "fdf4a84534ccb1b9ae8ffb654c7e160a31e294ee"
-PROTOCOL = "https"
-BRANCH = "main"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/puppetlabs/puppetlabs-concat.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://puppetlabs-concat/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppetlabs-concat-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/concat
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/concat
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-SUMMARY = "Function to dynamically create resources from hashes."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=6089b6bd1f0d807edb8bdfd76da0b038 "
-
-PV = "0.0.1"
-STABLE = "master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "4639819a7f3a4fa9310d2ba583c63e467df7e2c3"
-S = "${WORKDIR}/git"
-
-
-SRC_URI = " \
- git://github.com/puppetlabs/puppetlabs-create_resources.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- file://${PN}/metadata.json.patch \
- "
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
-
-do_install_append () {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/create_resources
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/create_resources
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-SUMMARY = "Manages Firewalls such as iptables"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV = "1.8.2"
-SRCREV = "23016934d23c5c2f3f3edbc2ec8279f8faac2457"
-PROTOCOL = "https"
-BRANCH = "main"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/puppetlabs/puppetlabs-firewall;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://puppetlabs-firewall/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppetlabs-firewall-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/firewall
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/firewall
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += " \
- file://${BPN}/puppet-firewall-updates-for-poky-stx.patch \
- file://${BPN}/puppet-firewall-random-fully-support.patch \
- "
-
-inherit openssl10
+++ /dev/null
-
-SUMMARY = "Configures HAProxy servers and manages the configuration of backend member servers."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV = "1.5.0"
-SRCREV = "3ac513c0ceb3bcfe35dd2936875189ccfc991a34"
-PROTOCOL = "https"
-BRANCH = "main"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/puppetlabs/puppetlabs-haproxy;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://puppetlabs-haproxy/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppetlabs-haproxy-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/haproxy
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/haproxy
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "config/puppet-modules/puppet-haproxy-${PV}/centos/patches"
-
-SRC_URI_STX += " \
- file://0001-Roll-up-TIS-patches.patch \
- file://0002-disable-config-validation-prechecks.patch \
- file://0003-Fix-global_options-log-default-value.patch \
- file://0004-Stop-invalid-warning-message \
- "
-
-inherit openssl10
+++ /dev/null
-
-SUMMARY = "Resource types for managing settings in INI files"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV = "1.6.0"
-SRCREV = "88bf9868b532ddf556bdb617f67eda9de0b8dc0f"
-PROTOCOL = "https"
-BRANCH = "main"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/puppetlabs/puppetlabs-inifile;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://puppetlabs-inifile/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppetlabs-inifile-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/inifile
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/inifile
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-SUMMARY = "Provides Puppet types and providers to manage Logical Resource Management (LVM) features."
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
-
-PV = "0.5.0"
-SRCREV = "d0283da637ae24550fb4ba109a48ef8d5d8c8b84"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/puppetlabs/puppetlabs-lvm;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
-
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/lvm
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/lvm/
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "config/puppet-modules/puppet-lvm/centos/files"
-
-SRC_URI_STX += " \
- file://0001-puppet-lvm-kilo-quilt-changes.patch;striplevel=5 \
- file://0002-UEFI-pvcreate-fix.patch;striplevel=5 \
- file://0003-US94222-Persistent-Dev-Naming.patch;striplevel=5 \
- file://0004-extendind-nuke_fs_on_resize_failure-functionality.patch;striplevel=5 \
- file://Fix-the-logical-statement-for-nuke_fs_on_resize.patch;striplevel=5 \
- "
-
-RDEPENDS_${PN} += " \
- lvm2 \
- lvm2-scripts \
- lvm2-udevrules \
- "
-
-inherit openssl10
+++ /dev/null
-
-SUMMARY = "The mysql module installs, configures, and manages the MySQL service."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV = "3.11.0"
-SRCREV = "920dd76214d87d9b26f0db105886ee89ac266c4e"
-PROTOCOL = "https"
-BRANCH = "main"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/puppetlabs/puppetlabs-mysql.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://puppetlabs-mysql/Add-gemspec.patch \
- "
-# file://puppetlabs-mysql/0001-Fix-ruby-path.patch
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppetlabs-mysql-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/mysql
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/mysql
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += " \
- file://${BPN}/0001-Stx-uses-nanliu-staging-module.patch \
- file://${BPN}/0002-puppet-mysql-changes-for-poky-stx.patch \
- file://${BPN}/0003-puppet-mysqltuner-adjust-path.patch \
- "
-
-inherit openssl10
+++ /dev/null
-
-DESCRIPTION = "A Puppet module for managing PostgreSQL databases."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV = "4.8.0"
-SRCREV = "d022a56b28b2174456fc0f6adc51a4b54493afad"
-PROTOCOL = "https"
-BRANCH = "main"
-S = "${WORKDIR}/git"
-
-SRC_URI = " \
- git://github.com/puppetlabs/puppetlabs-postgresql;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- "
-
-RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/postgresql
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/postgresql
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "config/puppet-modules/puppet-postgresql-${PV}/centos/files"
-
-SRC_URI_STX += " \
- file://0001-Roll-up-TIS-patches.patch \
- file://0002-remove-puppetlabs-apt-as-a-requirement.patch \
- "
-
-SRC_URI += " \
- file://${BPN}/0003-puppetlabs-postgresql-account-for-naming-diffs.patch \
- file://${BPN}/0004-poky-postgresql-updates.patch \
- file://${BPN}/0005-puppetlabs-postgresql-poky.patch \
- file://${BPN}/0006-adjust_path-remove-refs-to-local-bin.patch \
- file://${BPN}/postgresql.service \
- "
-
-RDEPENDS_${PN}_append = " \
- postgresql \
- postgresql-contrib \
- postgresql-client \
- postgresql-timezone \
- postgresql-plperl \
- postgresql-plpython \
- "
-#postgresql-dev
-#postgresql-pltcl
-#postgresql-setup
-
-
-do_install_append() {
- install -d -m0755 ${D}/usr/lib/systemd/system
- install -m0644 ${WORKDIR}/${BPN}/postgresql.service ${D}/usr/lib/systemd/system
-}
-
-FILES_${PN}_append = " /usr/lib/systemd/system/postgresql.service"
-
-inherit openssl10
+++ /dev/null
-
-SUMMARY = "Installs, configures, and manages RabbitMQ."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PV = "5.6.0"
-SRCREV = "5ac45dedd9b409c9efac654724bc74867cb9233b"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/puppetlabs/puppetlabs-rabbitmq;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/Add-gemspec.patch \
- "
-
-inherit ruby
-
-DEPENDS += " \
- ruby \
- facter \
- "
-
-RDEPENDS_${PN} += " \
- ruby \
- facter \
- puppet \
- perl \
- "
-
-RUBY_INSTALL_GEMS = "puppetlabs-rabbitmq-${PV}.gem"
-
-do_install_append() {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/rabbitmq
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/rabbitmq
-}
-
-FILES_${PN} += " ${datadir}"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "config/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches"
-
-SRC_URI_STX += " \
- file://0001-Roll-up-TIS-patches.patch \
- file://0002-Changed-cipher-specification-to-openssl-format.patch \
- file://0004-Partially-revert-upstream-commit-f7c3a4a637d59f3065d.patch \
- file://0005-Remove-the-rabbitmq_nodename-fact.patch \
- "
-
-SRC_URI += " \
- file://${BPN}/0007-init.pp-do-not-check-the-apt-resource.patch \
- file://${BPN}/0008-puppet-rabbitmq-poky.patch \
- file://${BPN}/0009-remove-apt-requirement.patch \
- "
-
-inherit openssl10
-
-DEPENDS_append = " puppet-staging"
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRCREV = "b89d5f388ca701e38a0e0337408f5ccb7e68565f"
-PROTOCOL = "https"
-BRANCH = "main"
-PV = "4.18.0"
-
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "config/puppet-modules/puppet-stdlib-4.12.0/centos/patches"
-
-SRC_URI_STX += " \
- file://0001-Filter-password-in-logs.patch \
- "
-
-SRC_URI = " \
- git://github.com/puppetlabs/puppetlabs-stdlib.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://puppetlabs-stdlib/Add-gemspec.patch \
- "
-
-S = "${WORKDIR}/git"
-
-RUBY_INSTALL_GEMS = "puppetlabs-stdlib-${PV}.gem"
-
-do_install_append () {
- install -d -m 0755 ${D}/${datadir}/puppet/modules/stdlib
- tar -C ${S} -cf - --exclude "patches" --exclude "*.gem*" . | tar --no-same-owner -xf - -C ${D}/${datadir}/puppet/modules/stdlib
-}
-
-FILES_${PN} += " ${datadir}"
-
-RDEPENDS_${PN}_append = " perl"
+++ /dev/null
-
-DESCRIPTION = "stx-puppet modules"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-SRCNAME = "stx-puppet"
-BRANCH = "r/stx.3.0"
-SRCREV = "678fe78b72b70e213eae32b1932afe97cc8c16b4"
-S = "${WORKDIR}/git"
-PV = "1.0.0"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = " \
- file://modules/puppet-dcdbsync/src/LICENSE;md5=0e5ccf641e613489e66aa98271dbe798 \
- file://modules/puppet-dcmanager/src/LICENSE;md5=0e5ccf641e613489e66aa98271dbe798 \
- file://modules/puppet-dcorch/src/LICENSE;md5=0e5ccf641e613489e66aa98271dbe798 \
- file://modules/puppet-fm/src/LICENSE;md5=0e5ccf641e613489e66aa98271dbe798 \
- file://modules/puppet-mtce/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- file://modules/puppet-nfv/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- file://modules/puppet-patching/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- file://modules/puppet-smapi/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- file://modules/puppet-sshd/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- file://modules/puppet-sysinv/src/LICENSE;md5=0e5ccf641e613489e66aa98271dbe798 \
- file://puppet-manifests/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- "
-
-# file://${BPN}/use-cast-operator.patch
-SRC_URI = " \
- git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${BPN}/0001-puppet-manifest-apply-rebase-adjust-path.patch \
- file://${BPN}/0002-puppet-manifests-port-Adjust-path-default-bindir.patch \
- file://${BPN}/0003-puppet-dcmanager-updates-for-poky-stx.patch \
- file://${BPN}/0004-puppet-dcorch-updates-for-poky-stx.patch \
- file://${BPN}/0005-puppet-sysinv-updates-for-poky-stx.patch \
- file://${BPN}/0006-puppet-manifest-apply-do-not-treat-warnings-as-block.patch \
- file://${BPN}/0007-puppet-manifests-etcd-override-typo-and-journalctl.patch \
- file://${BPN}/0008-puppet-manifests-keystone-include-platform-client.patch \
- file://${BPN}/0009-puppet-manifests-lvm-remove-lvmetad.patch \
- file://${BPN}/0010-puppet-manifest-apply-workaround-to-ignore-known-err.patch \
- file://${BPN}/0011-puppet-manifest-kubernetes.pp-add-re-tries-for-docker-login.patch \
- file://${BPN}/get-boot-device-from-cmdline.patch \
- file://${BPN}/poky-specific-apply-network-config-script.patch \
- file://${BPN}/apply_network_config_poky.sh \
- "
-
-RDEPENDS_${PN} += " \
- bash puppet \
- e2fsprogs-resize2fs \
- hiera \
- kpartx \
- multipath-tools \
- multipath-tools-libs \
- ntpdate \
- puppet-staging \
- puppet-oslo \
- puppetlabs-apache \
- puppetlabs-mysql \
- "
-
-# WRS puppet modules
-RDEPENDS_puppet-manifests += " \
- puppet-dcorch \
- puppet-dcmanager \
- puppet-mtce \
- puppet-nfv \
- puppet-patching \
- puppet-sysinv \
- puppet-sshd \
- puppet-smapi \
- puppet-fm \
- puppet-dcdbsync \
- "
-# Openstack puppet modules
-RDEPENDS_puppet-manifests += " \
- puppet-barbican \
- puppet-ceph \
- puppet-horizon \
- puppet-keystone \
- puppet-openstacklib \
- puppet-vswitch \
- puppet-memcached \
- "
-
-# Puppetlabs puppet modules
-RDEPENDS_puppet-manifests += " \
- puppetlabs-concat \
- puppetlabs-create-resources \
- puppet-drbd \
- puppetlabs-firewall \
- puppetlabs-haproxy \
- puppetlabs-inifile \
- puppetlabs-lvm \
- puppetlabs-postgresql \
- puppetlabs-rabbitmq \
- puppetlabs-stdlib \
- puppet-sysctl \
- puppet-etcd \
- "
-
-# 3rd party puppet modules
-RDEPENDS_puppet-manifests += " \
- puppet-boolean \
- puppet-certmonger \
- puppet-dnsmasq \
- puppet-filemapper \
- puppet-kmod \
- puppet-ldap \
- puppet-network \
- puppet-nslcd \
- puppet-nssdb \
- puppet-puppi \
- puppet-vlan \
- puppet-collectd \
- "
-
-
-
-RDEPENDS_puppet-mtce += " puppet"
-RDEPENDS_puppet-dcdbsync += " puppet"
-RDEPENDS_puppet-dcmanager += " puppet"
-RDEPENDS_puppet-dcorch += " puppet"
-RDEPENDS_puppet-fm += " puppet"
-RDEPENDS_puppet-nfv += " puppet"
-RDEPENDS_puppet-patching += " puppet"
-RDEPENDS_puppet-smapi += " puppet"
-RDEPENDS_puppet-sshd += " puppet"
-RDEPENDS_puppet-sysinv += " puppet"
-
-PACKAGES += " puppet-dcdbsync"
-PACKAGES += " puppet-dcmanager"
-PACKAGES += " puppet-dcorch"
-PACKAGES += " puppet-fm"
-PACKAGES += " puppet-mtce"
-PACKAGES += " puppet-nfv"
-PACKAGES += " puppet-patching"
-PACKAGES += " puppet-smapi"
-PACKAGES += " puppet-sshd"
-PACKAGES += " puppet-sysinv"
-PACKAGES += " puppet-manifests"
-
-do_install() {
-
- install -d -m 0755 ${D}/${datadir}/puppet/modules/dcdbsync
- cp -R ${S}/modules/puppet-dcdbsync/src/dcdbsync ${D}/${datadir}/puppet/modules
-
- install -d -m 0755 ${D}/${datadir}/puppet/modules/dcmanager
- cp -R ${S}/modules/puppet-dcmanager/src/dcmanager ${D}/${datadir}/puppet/modules
-
- install -d -m 0755 ${D}/${datadir}/puppet/modules/dcorch
- cp -R ${S}/modules/puppet-dcorch/src/dcorch/ ${D}/${datadir}/puppet/modules/
-
- install -d -m 0755 ${D}/${datadir}/puppet/modules/fm
- cp -R ${S}/modules/puppet-fm/src/fm ${D}/${datadir}/puppet/modules
-
- install -d -m 0755 ${D}/${datadir}/puppet/modules/mtce
- cp -R ${S}/modules/puppet-mtce/src/mtce ${D}/${datadir}/puppet/modules
-
- install -d -m 0755 ${D}/${datadir}/puppet/modules/nfv
- cp -R ${S}/modules/puppet-nfv/src/nfv ${D}/${datadir}/puppet/modules
-
- install -d -m 0755 ${D}/${datadir}/puppet/modules/patching
- cp -R ${S}/modules/puppet-patching/src/patching ${D}/${datadir}/puppet/modules
-
- install -d -m 0755 ${D}/${datadir}/puppet/modules/smapi
- cp -R ${S}/modules/puppet-smapi/src/smapi ${D}/${datadir}/puppet/modules
-
- install -d -m 0755 ${D}/${datadir}/puppet/modules/sshd
- cp -R ${S}/modules/puppet-sshd/src/sshd ${D}/${datadir}/puppet/modules
-
- install -d -m 0755 ${D}/${datadir}/puppet/modules/sysinv
- cp -R ${S}/modules/puppet-sysinv/src/sysinv ${D}/${datadir}/puppet/modules
-
- cd ${S}/puppet-manifests/src
- oe_runmake BINDIR=${D}/${bindir} \
- CONFIGDIR=${D}/${sysconfdir}/puppet/ \
- MODULEDIR=${D}/${datadir}/puppet/modules -f Makefile install
-
- # fix the path for systemctl
- sed -i -e 's|${bindir}/systemctl|${base_bindir}/systemctl|' ${D}/${datadir}/puppet/modules/platform/manifests/*.pp
- sed -i -e 's|${bindir}|${bindir}:${base_bindir}|' ${D}/${datadir}/puppet/modules/sysinv/manifests/api.pp
-
- # fix the path for mount and awk
- sed -i -e 's|${bindir}|${bindir}:${base_bindir}|' ${D}/${datadir}/puppet/modules/platform/manifests/filesystem.pp
-
- # fix the path for slapd.conf
- sed -i -e '/\/usr\/lib64\/openldap/d' ${D}/${datadir}/puppet/modules/platform/manifests/ldap.pp
-
- # fix the libdir for collectd
- sed -i -e 's|/usr/lib64|${libdir}|' ${D}/${datadir}/puppet/modules/platform/templates/collectd.conf.erb
-
- install -m 0755 ${WORKDIR}/${PN}/apply_network_config_poky.sh ${D}/${bindir}/apply_network_config_poky.sh
-}
-
-FILES_puppet-sysinv += " \
- ${datadir}/puppet/modules/sysinv \
- "
-
-FILES_puppet-sshd += " \
- ${datadir}/puppet/modules/sshd \
- "
-
-FILES_puppet-smapi += " \
- ${datadir}/puppet/modules/smapi \
- "
-FILES_puppet-patching += " \
- ${datadir}/puppet/modules/patching \
- "
-
-FILES_puppet-nfv += " \
- ${datadir}/puppet/modules/nfv \
- "
-
-FILES_puppet-mtce = "\
- ${datadir}/puppet/modules/mtce \
- "
-
-FILES_puppet-manifests = "\
- ${sysconfdir}/puppet/hiera.yaml \
- ${sysconfdir}/puppet/hieradata \
- ${sysconfdir}/puppet/hieradata/worker.yaml \
- ${sysconfdir}/puppet/hieradata/storage.yaml \
- ${sysconfdir}/puppet/hieradata/global.yaml \
- ${sysconfdir}/puppet/hieradata/controller.yaml \
- ${sysconfdir}/puppet/manifests/worker.pp \
- ${sysconfdir}/puppet/manifests/ansible_bootstrap.pp \
- ${sysconfdir}/puppet/manifests/bootstrap.pp \
- ${sysconfdir}/puppet/manifests/runtime.pp \
- ${sysconfdir}/puppet/manifests/storage.pp \
- ${sysconfdir}/puppet/manifests/upgrade.pp \
- ${sysconfdir}/puppet/manifests/controller.pp \
- ${datadir}/puppet/modules/openstack/manifests \
- ${datadir}/puppet/modules/openstack/templates \
- ${datadir}/puppet/modules/platform/manifests \
- ${datadir}/puppet/modules/platform/templates \
- ${datadir}/puppet/modules/platform/files \
- ${datadir}/puppet/modules/platform/lib/facter \
- ${datadir}/puppet/modules/platform/lib/puppet \
- ${bindir}/puppet-manifest-apply.sh \
- ${bindir}/apply_network_config.sh \
- ${bindir}/apply_network_config_poky.sh \
- "
-FILES_puppet-fm += " \
- ${datadir}/puppet/modules/fm \
- "
-
-FILES_puppet-dcorch += " \
- ${datadir}/puppet/modules/dcorch \
- "
-
-FILES_puppet-dcmanager += " \
- ${datadir}/puppet/modules/dcmanager \
- "
-
-FILES_puppet-dcdbsync += " \
- ${datadir}/puppet/modules/dcdbsync \
- "
-
-inherit openssl10
+++ /dev/null
-
-# This bbclass creates users based on EXTRA_USER_PARAMS through
-# extrausers bbclass and is intended to take config options for
-# configuring users uniq environment.
-
-inherit extrausers
-
-
-PACKAGE_INSTALL_append = " ${@['', 'base-passwd shadow'][bool(d.getVar('EXTRA_USERS_PARAMS_CONFIG'))]}"
-
-ROOTFS_POSTPROCESS_COMMAND_append = " set_user_group_config;"
-
-set_user_group_config () {
-
-# FIXME: parse EXTRA_USERS_PARAMS_CONFIG for options
-
- EXTRA_USERS_PARAMS=" ${EXTRA_USERS_PARAMS_CONFIG}"
- set_user_group
-
- #Extend path variable for sysadmin
- echo 'PATH=/sbin:/usr/sbin:$PATH' >> ${IMAGE_ROOTFS}/home/sysadmin/.bashrc
- chown sysadmin:sys_protected ${IMAGE_ROOTFS}/home/sysadmin/.bashrc
-}
+++ /dev/null
-
-python __anonymous() {
- if bb.utils.contains('DEPENDS', 'openssl', True, False, d) or \
- bb.utils.contains('DEPENDS', 'openssl-native', True, False, d):
- d.setVar('DEPENDS', d.getVar('DEPENDS').replace('openssl', 'openssl10'))
- d.setVar('DEPENDS', d.getVar('DEPENDS').replace('openssl-native', 'openssl10-native'))
-}
-
-
-python do_ssl10_mk_symlink() {
-
- import shutil
- l = d.getVar("STAGING_INCDIR") + "/openssl"
-
- if os.path.islink(l):
- os.unlink(l)
- elif os.path.isdir(l):
- shutil.rmtree(l)
-
- os.symlink("openssl10/openssl",l)
-
- l = d.getVar("STAGING_LIBDIR")
- if os.path.islink(l + "/libssl.so"):
- os.unlink(l + "/libssl.so")
- os.unlink(l + "/libcrypto.so")
-
- os.symlink("libssl.so.1.0.2", l + "/libssl.so")
- os.symlink("libcrypto.so.1.0.2", l + "/libcrypto.so")
-}
-
-addtask ssl10_mk_symlink before do_configure after do_prepare_recipe_sysroot
+++ /dev/null
-
-inherit python-dir
-
-RDEPENDS_${PN} += "python-backports-init"
-
-do_install_prepend() {
- rm -rf $(find . -path "*/backports/__init__.py" -type f)
-}
+++ /dev/null
-
-RPM_POSTPROCESS_COMMANDS_append = "wrl_installer;"
-do_rootfs[vardeps] += "INSTALLER_TARGET_BUILD INSTALLER_TARGET_IMAGE"
-
-# Fix system-shutdown hang at ratelimiting
-APPEND_append = " printk.devkmsg=on"
-
-INSTPRODUCT ?= "${DISTRO_NAME}"
-INSTVER ?= "${DISTRO_VERSION}"
-INSTBUGURL ?= "http://www.windriver.com/"
-
-# NOTE: Please update anaconda-init when you change INSTALLER_CONFDIR, use "="
-# but not "?=" since this is not configurable.
-INSTALLER_CONFDIR = "${IMAGE_ROOTFS}/installer-config"
-KICKSTART_FILE ??= ""
-KICKSTART_FILE_EXTRA ??= ""
-WRL_INSTALLER_CONF ?= ""
-
-# Extra packages that will be added in the rpm repo in anaconda installer ISO image
-REPO_EXTRA_PKG = "\
- xfsprogs-* \
- glibc-binary-localedata-* \
-"
-
-build_iso_prepend() {
- install -d ${ISODIR}
- ln -snf /.discinfo ${ISODIR}/.discinfo
- ln -snf /.buildstamp ${ISODIR}/.buildstamp
- ln -snf /Packages ${ISODIR}/Packages
-}
-
-build_iso_append() {
- implantisomd5 ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso
-}
-
-# Check WRL_INSTALLER_CONF and copy it to
-# ${IMAGE_ROOTFS}/.buildstamp.$prj_name when exists
-wrl_installer_copy_buildstamp() {
- prj_name=$1
- buildstamp=$2
- if [ -f $buildstamp ]; then
- bbnote "Using $buildstamp as the buildstamp"
- cp $buildstamp ${IMAGE_ROOTFS}/.buildstamp.$prj_name
- else
- bbfatal "Can't find WRL_INSTALLER_CONF: $buildstamp"
- fi
-}
-
-# Hardlink when possible, otherwise copy.
-# $1: src
-# $2: target
-wrl_installer_hardlinktree() {
- src_dev="`stat -c %d $1`"
- if [ -e "$2" ]; then
- tgt_dev="`stat -c %d $2`"
- else
- tgt_dev="`stat -c %d $(dirname $2)`"
- fi
- hdlink=""
- if [ "$src_dev" = "$tgt_dev" ]; then
- hdlink="--link"
- fi
- cp -rvf $hdlink $1 $2
-}
-
-wrl_installer_copy_local_repos() {
- deploy_dir_rpm=$1
- target_build="$2"
- target_image="$3"
-
- target_image_input_pkglist=$(sed -n 's/^IMAGE_LIST="\(.*\)"/\1/p' ${target_build}/installersupport_${target_image})
- if [ ! -f ${target_image_input_pkglist} ]; then
- bberror "The target image pkglist '${target_image_input_pkglist}' doesn't exist!"
- fi
-
- target_image_output_pkglist="${IMGDEPLOYDIR}/${IMAGE_NAME}.${target_image}.pkglist"
- target_image_output_pkglist_link="${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${target_image}.pkglist"
-
-
- if [ -d "$deploy_dir_rpm" ]; then
- echo "Copy rpms from target build to installer image."
- mkdir -p ${IMAGE_ROOTFS}/Packages.$prj_name
-
- : > ${IMAGE_ROOTFS}/Packages.$prj_name/.treeinfo
- echo "[general]" >> ${IMAGE_ROOTFS}/Packages.$prj_name/.treeinfo
- echo "version = ${DISTRO_VERSION}" >> ${IMAGE_ROOTFS}/Packages.$prj_name/.treeinfo
-
- # Determine the max channel priority
- channel_priority=5
- for pt in $installer_target_archs ; do
- channel_priority=$(expr $channel_priority + 5)
- done
-
- : > ${IMAGE_ROOTFS}/Packages.$prj_name/.feedpriority
- for arch in $installer_target_archs; do
- if [ -d "$deploy_dir_rpm/"$arch -a ! -d "${IMAGE_ROOTFS}/Packages.$prj_name/"$arch ]; then
- channel_priority=$(expr $channel_priority - 5)
- echo "$channel_priority $arch" >> ${IMAGE_ROOTFS}/Packages.$prj_name/.feedpriority
- fi
- done
-
- cd ${deploy_dir_rpm}
- set -x
- # Add the packages in target image pkglist
- cat ${target_image_input_pkglist} > ${target_image_output_pkglist}.tmp
-
- # Add the extra packages required by anaconda
- for pkgs in ${REPO_EXTRA_PKG}; do
- pkg_files=$(find . -type f -name ${pkgs})
- if [ -z "${pkg_files}" ]; then
- bbwarn "Package ${pkgs} not found, please check if there is anything wrong or just remove it from the list."
- else
- for pkg_file in ${pkg_files}; do
- basename ${pkg_file} >> ${target_image_output_pkglist}.tmp
- done
- fi
- done
-
- cat ${target_image_output_pkglist}.tmp|sort|uniq > ${target_image_output_pkglist}
- ln -s ${IMAGE_NAME}.${target_image}.pkglist ${target_image_output_pkglist_link}
- rm -f ${target_image_output_pkglist}.tmp
-
- for pkg in $(cat ${target_image_output_pkglist}); do
- pkg_file=$(find . -type f -name ${pkg})
- if [ -z "${pkg_file}" ]; then
- bbwarn "Package ${pkg} not found, please check if there is anything wrong or just remove it from the list."
- else
- cp --parents -vf ${pkg_file} ${IMAGE_ROOTFS}/Packages.$prj_name/
- fi
- done
- cd -
-
- createrepo_c --update -q ${IMAGE_ROOTFS}/Packages.$prj_name/
- fi
-}
-
-# Update .buildstamp and copy rpm packages to IMAGE_ROOTFS
-wrl_installer_copy_pkgs() {
-
- target_build="$1"
- target_image="$2"
- prj_name="$3"
- if [ -n "$4" ]; then
- installer_conf="$4"
- else
- installer_conf=""
- fi
-
- common_grep="-e '^ALL_MULTILIB_PACKAGE_ARCHS=.*' \
- -e '^MULTILIB_VARIANTS=.*' -e '^PACKAGE_ARCHS=.*'\
- -e '^PACKAGE_ARCH=.*' -e '^PACKAGE_INSTALL_ATTEMPTONLY=.*' \
- -e '^DISTRO=.*' -e '^DISTRO_NAME=.*' -e '^DISTRO_VERSION=.*' \
- "
-
- if [ -f "$installer_conf" ]; then
- eval "grep -e \"^PACKAGE_INSTALL=.*\" $common_grep $installer_conf \
- | sed -e 's/=/=\"/' -e 's/$/\"/' > ${BB_LOGFILE}.distro_vals"
-
- eval "cat $target_build/installersupport_$target_image | \
- grep -e '^WORKDIR=.*' >> ${BB_LOGFILE}.distro_vals"
-
- eval `cat ${BB_LOGFILE}.distro_vals`
- if [ $? -ne 0 ]; then
- bbfatal "Something is wrong in $installer_conf, please correct it"
- fi
- if [ -z "$PACKAGE_ARCHS" -o -z "$PACKAGE_INSTALL" ]; then
- bbfatal "PACKAGE_ARCHS or PACKAGE_INSTALL is null, please check $installer_conf"
- fi
- else
- eval "cat $target_build/installersupport_$target_image | \
- grep $common_grep -e '^PN=.*' -e '^SUMMARY=.*' -e '^WORKDIR=.*'\
- -e '^DESCRIPTION=.*' -e '^export PACKAGE_INSTALL=.*' > ${BB_LOGFILE}.distro_vals"
-
- eval `cat ${BB_LOGFILE}.distro_vals`
- fi
-
- export installer_default_arch="$PACKAGE_ARCH"
- # Reverse it for priority
- export installer_default_archs="`for arch in $PACKAGE_ARCHS; do echo $arch; done | tac | tr - _`"
- installer_target_archs="$installer_default_archs"
- if [ -n "$MULTILIB_VARIANTS" ]; then
- export MULTILIB_VARIANTS
- mlarchs_reversed="`for mlarch in $ALL_MULTILIB_PACKAGE_ARCHS; do echo $mlarch; \
- done | tac | tr - _`"
- for arch in $mlarchs_reversed; do
- if [ "$arch" != "noarch" -a "$arch" != "all" -a "$arch" != "any" ]; then
- installer_target_archs="$installer_target_archs $arch"
- fi
- done
- fi
- export installer_target_archs
-
- # Save the vars to .buildstamp when no installer_conf
- if [ ! -f "$installer_conf" ]; then
- cat >> ${IMAGE_ROOTFS}/.buildstamp.$prj_name <<_EOF
-DISTRO=$DISTRO
-DISTRO_NAME=$DISTRO_NAME
-DISTRO_VERSION=$DISTRO_VERSION
-
-[Rootfs]
-LIST=$PN
-
-[$PN]
-SUMMARY=$SUMMARY
-DESCRIPTION=$DESCRIPTION
-
-PACKAGE_INSTALL=$PACKAGE_INSTALL
-PACKAGE_INSTALL_ATTEMPTONLY=$PACKAGE_INSTALL_ATTEMPTONLY
-ALL_MULTILIB_PACKAGE_ARCHS=$ALL_MULTILIB_PACKAGE_ARCHS
-MULTILIB_VARIANTS=$MULTILIB_VARIANTS
-PACKAGE_ARCHS=$PACKAGE_ARCHS
-PACKAGE_ARCH=$PACKAGE_ARCH
-IMAGE_LINGUAS=${IMAGE_LINGUAS}
-_EOF
- fi
-
- if [ -d "$WORKDIR/oe-rootfs-repo/rpm" ]; then
- # Copy local repos while the image is not initramfs
- bpn=${BPN}
- if [ "${bpn##*initramfs}" = "${bpn%%initramfs*}" ]; then
- wrl_installer_copy_local_repos $WORKDIR/oe-rootfs-repo/rpm $target_build $target_image
- fi
- echo "$DISTRO::$prj_name::$DISTRO_NAME::$DISTRO_VERSION" >> ${IMAGE_ROOTFS}/.target_build_list
- fi
-}
-
-wrl_installer_get_count() {
- sum=0
- for i in $*; do
- sum=$(expr $sum + 1)
- done
- echo $sum
-}
-
-wrl_installer[vardepsexclude] = "DATETIME"
-wrl_installer() {
- cat >${IMAGE_ROOTFS}/.discinfo <<_EOF
-${DATETIME}
-${DISTRO_NAME} ${DISTRO_VERSION}
-${TARGET_ARCH}
-_EOF
-
- : > ${IMAGE_ROOTFS}/.target_build_list
- counter=0
- targetimage_counter=0
- for target_build in ${INSTALLER_TARGET_BUILD}; do
- target_build="`readlink -f $target_build`"
- echo "Installer Target Build: $target_build"
- counter=$(expr $counter + 1)
- prj_name="`echo $target_build | sed -e 's#/ *$##g' -e 's#.*/##'`"
- prj_name="$prj_name-$counter"
-
- # Generate .buildstamp
- if [ -n "${WRL_INSTALLER_CONF}" ]; then
- installer_conf="`echo ${WRL_INSTALLER_CONF} | awk '{print $'"$counter"'}'`"
- wrl_installer_copy_buildstamp $prj_name $installer_conf
- else
- cat >${IMAGE_ROOTFS}/.buildstamp.$prj_name <<_EOF
-[Main]
-Product=${INSTPRODUCT}
-Version=${INSTVER}
-BugURL=${INSTBUGURL}
-IsFinal=True
-UUID=${DATETIME}.${TARGET_ARCH}
-_EOF
- fi
-
- if [ -f "$target_build" ]; then
- filename=$(basename "$target_build")
- extension="${filename##*.}"
- bpn=${BPN}
- # Do not copy image for initramfs
- if [ "${bpn##*initramfs}" != "${bpn%%initramfs*}" ]; then
- continue
- elif [ "x$extension" = "xext2" -o "x$extension" = "xext3" -o "x$extension" = "xext4" ]; then
- echo "Image based target install selected."
- mkdir -p "${IMAGE_ROOTFS}/LiveOS.$prj_name"
- wrl_installer_hardlinktree "$target_build" "${IMAGE_ROOTFS}/LiveOS.$prj_name/rootfs.img"
- echo "::$prj_name::" >> ${IMAGE_ROOTFS}/.target_build_list
- else
- bberror "Unsupported image: $target_build."
- bberror "The image must be ext2, ext3 or ext4"
- exit 1
- fi
- elif [ -d "$target_build" ]; then
- targetimage_counter=$(expr $targetimage_counter + 1)
- target_image="`echo ${INSTALLER_TARGET_IMAGE} | awk '{print $'"$targetimage_counter"'}'`"
- echo "Target Image: $target_image"
- wrl_installer_copy_pkgs $target_build $target_image $prj_name $installer_conf
- else
- bberror "Invalid configuration of INSTALLER_TARGET_BUILD: $target_build."
- bberror "It must either point to an image (ext2, ext3 or ext4) or to the root of another build directory"
- exit 1
- fi
-
- ks_cfg="${INSTALLER_CONFDIR}/ks.cfg.$prj_name"
- if [ -n "${KICKSTART_FILE}" ]; then
- ks_file="`echo ${KICKSTART_FILE} | awk '{print $'"$counter"'}'`"
- bbnote "Copying kickstart file $ks_file to $ks_cfg ..."
- mkdir -p ${INSTALLER_CONFDIR}
- cp $ks_file $ks_cfg
- fi
- if [ -n "${KICKSTART_FILE_EXTRA}" ]; then
- for ks_file in ${KICKSTART_FILE_EXTRA}; do
- if [ -f $ks_file ]; then
- cp $ks_file ${INSTALLER_CONFDIR}
- else
- bbwarn "The kickstart file $ks_file in KICKSTART_FILE_EXTRA doesn't exist!"
- fi
- done
- fi
- done
-
- # Setup the symlink if only one target build dir.
- if [ "$counter" = "1" ]; then
- prj_name="`awk -F:: '{print $2}' ${IMAGE_ROOTFS}/.target_build_list`"
- entries=".buildstamp LiveOS Packages installer-config/ks.cfg"
- for i in $entries; do
- if [ -e ${IMAGE_ROOTFS}/$i.$prj_name ]; then
- ln -sf `basename $i.$prj_name` ${IMAGE_ROOTFS}/$i
- fi
- done
- fi
-}
-
-python __anonymous() {
- if "selinux" in d.getVar("DISTRO_FEATURES", True).split():
- raise bb.parse.SkipPackage("Unable to build the installer when selinux is enabled.")
-
- if bb.data.inherits_class('image', d):
- if d.getVar("DISTRO", True) != "anaconda":
- raise bb.parse.SkipPackage("Set DISTRO = 'anaconda' in local.conf")
-
- target_builds = d.getVar('INSTALLER_TARGET_BUILD', True)
- if not target_builds:
- errmsg = "No INSTALLER_TARGET_BUILD is found,\n"
- errmsg += "set INSTALLER_TARGET_BUILD = '<target-build-topdir>' and\n"
- errmsg += "INSTALLER_TARGET_IMAGE = '<target-image-pn>' to do RPMs\n"
- errmsg += "install, or\n"
- errmsg += "set INSTALLER_TARGET_BUILD = '<target-build-image>' to do\n"
- errmsg += "image copy install"
- raise bb.parse.SkipPackage(errmsg)
-
- count = 0
- for target_build in target_builds.split():
- if not os.path.exists(target_build):
- raise bb.parse.SkipPackage("The %s of INSTALLER_TARGET_BUILD does not exist" % target_build)
-
- if os.path.isdir(target_build):
- count += 1
-
- # While do package management install
- if count > 0:
- target_images = d.getVar('INSTALLER_TARGET_IMAGE', True)
- if not target_images:
- errmsg = "The INSTALLER_TARGET_BUILD is a dir, but not found INSTALLER_TARGET_IMAGE,\n"
- errmsg += "set INSTALLER_TARGET_IMAGE = '<target-image-pn>' to do RPMs install"
- raise bb.parse.SkipPackage(errmsg)
-
- elif count != len(target_images.split()):
- errmsg = "The INSTALLER_TARGET_BUILD has %s build dirs: %s\n" % (count, target_builds)
- errmsg += "But INSTALLER_TARGET_IMAGE has %s build images: %s\n" % (len(target_images.split()), target_images)
- raise bb.parse.SkipPackage(errmsg)
-
- # The count of INSTALLER_TARGET_BUILD and WRL_INSTALLER_CONF must match when set.
- wrlinstaller_confs = d.getVar('WRL_INSTALLER_CONF', True)
- if wrlinstaller_confs:
- if len(wrlinstaller_confs.split()) != len(target_builds.split()):
- raise bb.parse.SkipPackage("The count of INSTALLER_TARGET_BUILD and WRL_INSTALLER_CONF not match!")
- for wrlinstaller_conf in wrlinstaller_confs.split():
- if not os.path.exists(wrlinstaller_conf):
- raise bb.parse.SkipPackage("The installer conf %s in WRL_INSTALLER_CONF doesn't exist!" % wrlinstaller_conf)
-
- # The count of INSTALLER_TARGET_BUILD and KICKSTART_FILE must match when set.
- kickstart_files = d.getVar('KICKSTART_FILE', True)
- if kickstart_files:
- if len(kickstart_files.split()) != len(target_builds.split()):
- raise bb.parse.SkipPackage("The count of INSTALLER_TARGET_BUILD and KICKSTART_FILE not match!")
- for kickstart_file in kickstart_files.split():
- if not os.path.exists(kickstart_file):
- bb.warn("The kickstart file %s in KICKSTART_FILE doesn't exist!" % kickstart_file)
-
-}
-
-python build_syslinux_cfg () {
- import copy
- import sys
-
- workdir = d.getVar('WORKDIR')
- if not workdir:
- bb.error("WORKDIR not defined, unable to package")
- return
-
- cfile = d.getVar('SYSLINUX_CFG')
- if not cfile:
- bb.fatal('Unable to read SYSLINUX_CFG')
-}
+++ /dev/null
-#
-## Copyright (C) 2019 Wind River Systems, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-IMAGE_LIST = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.pkglist"
-
-ROOTFS_POSTPROCESS_COMMAND_append = " write_image_list;"
-
-python write_image_list () {
- from oe.rootfs import image_list_installed_packages
-
- deploy_dir = d.getVar('IMGDEPLOYDIR')
- link_name = d.getVar('IMAGE_LINK_NAME')
- image_list_file = d.getVar('IMAGE_LIST')
-
- pkg_dict = image_list_installed_packages(d)
- output = []
- for pkg in sorted(pkg_dict):
- output.append(pkg_dict[pkg]["filename"])
- output_str = '\n'.join(output) + '\n'
-
- with open(image_list_file, 'w+') as image_pkglist:
- image_pkglist.write(output_str)
-
- if os.path.exists(image_list_file):
- pkglist_link = deploy_dir + "/" + link_name + ".pkglist"
- if os.path.lexists(pkglist_link):
- os.remove(pkglist_link)
- os.symlink(os.path.basename(image_list_file), pkglist_link)
-}
+++ /dev/null
-# This class is intended to help apply the patches and install
-# config files fetched from stx git repo defined in STX_REPO so to
-# avoid maintaining a local copy in the recipe's metadata.
-#
-# This adds dependency on stx-${STX_REPO}-source which
-# fetches the stx source code and is used as a shared work
-# directory, and the search path of patches and config files
-# for the recipe will be added in FILESEXTRAPATHS so the
-# patches will be found and applied in do_patch, and STX_METADATA_PATH
-# can be used to locate config files to be installed.
-#
-# Please set the following variables correctly after inherit
-# this bbclass:
-# - STX_REPO: the StarlingX repo name, default is 'integ'
-# - STX_SUBPATH: the subpath for the patches in the work-shard
-# directory of stx-${STX_REPO}-source
-# - SRC_URI_STX: the patch list in stx-${STX_REPO}-source
-#
-# e.g.
-# STX_REPO = "integ"
-# STX_SUBPATH = "config/puppet-modules/openstack/${BP}/centos/patches"
-# SRC_URI_STX = "file://0001-Remove-log_dir-from-conf-files.patch"
-
-STX_REPO ?= "integ"
-STX_SUBPATH ?= ""
-SRC_URI_STX ?= ""
-
-STX_METADATA_PATH = "${TMPDIR}/work-shared/stx-${STX_REPO}-source/git/${STX_SUBPATH}"
-FILESEXTRAPATHS_prepend = "${STX_METADATA_PATH}:"
-
-do_patch[depends] += "stx-${STX_REPO}-source:do_patch"
-
-do_patch_prepend() {
- bb.build.exec_func('add_stx_patch', d)
-}
-
-python add_stx_patch() {
- src_uri = d.getVar('SRC_URI', False)
- src_uri_stx = d.getVar('SRC_URI_STX', False)
- d.setVar('SRC_URI', src_uri_stx + " " + src_uri)
-}
+++ /dev/null
-
-# This class is intended to include workarounds and finetuning of the rootfs
-# Most of the stuff in here needs to go else where.
-
-ROOTFS_POSTPROCESS_COMMAND_append = " stx_postprocess_rootfs;"
-# ETHDEV = "enp0s5"
-
-stx_postprocess_rootfs() {
-
- # Issue: #83 /dev/root does not exist
- # This workaround is to be removed once initramfs is added
-
- cat > ${IMAGE_ROOTFS}/etc/udev/rules.d/99-dev-root-symlink.rules << \EOF
-KERNEL=="sda3", SYMLINK+="root"
-EOF
-}
+++ /dev/null
-# This class is usd for creating source recipe for StarlingX repos,
-# which will be used as a shared work directory with other recipes
-
-STX_REPO ?= "integ"
-OVERRIDES .= ":${STX_REPO}"
-
-PROTOCOL = "https"
-STX_URI = "git://opendev.org/starlingx/${STX_REPO}.git"
-
-S = "${WORKDIR}/git"
-PV = "1.0.0+git${SRCPV}"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "${STX_URI};protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-deltask do_configure
-deltask do_compile
-deltask do_install
-deltask do_populate_sysroot
-deltask do_populate_lic
-
-inherit nopackages
-
-WORKDIR = "${TMPDIR}/work-shared/${PN}"
-
-STAMP = "${STAMPS_DIR}/work-shared/${PN}"
-STAMPCLEAN = "${STAMPS_DIR}/work-shared/${PN}-*"
-
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = ""
-PACKAGES = ""
-
-EXCLUDE_FROM_WORLD = "1"
-RM_WORK_EXCLUDE += "${PN}"
+++ /dev/null
-display splash.cfg
-timeout 0
-F1 help.txt
-F2 devices.txt
-F3 splash.cfg
-serial 0 115200
-
-# Pull in the menu User Interface
-ui vesamenu.c32
-
-menu title Select kernel options and boot kernel
-menu tabmsg Press [Tab] to edit, [Return] to select, [ESC] to return to previous menu
-
-# Dark grey
-menu background #ff555555
-
-# ----------------- NOTE -----------------
-# If you are updating label numbers, make sure that controllerconfig/clone.py
-# is in sync with your changes (only serial console entries).
-# STANDARD_STANDARD = '0'
-# STANDARD_EXTENDED = 'S0'
-# AIO_STANDARD = '2'
-# AIO_EXTENDED = 'S2'
-# AIO_LL_STANDARD = '4'
-# AIO_LL_EXTENDED = 'S4'
-# ----------------------------------------
-
-
-# AIO Controller - Serial Console menu
-label 2
- menu label All-in-one Controller Configuration - Serial Console
- kernel /bzImage
- append initrd=/initrd rootwait console=ttyS0,115200 inst.text serial inst.stage2=hd:LABEL=oe_iso_boot boot_device=sda rootfs_device=sda biosdevname=0 usbcore.autosuspend=-1 inst.gpt security_profile=standard user_namespace.enable=1 ks=/installer-config/smallsystem_lowlatency_ks.cfg
-
-# AIO Controller - Graphical Console menu
-label 3
- menu label All-in-one Controller Configuration - Graphical Console
- kernel /bzImage
- append initrd=/initrd rootwait console=tty0 inst.text inst.stage2=hd:LABEL=oe_iso_boot boot_device=sda rootfs_device=sda biosdevname=0 usbcore.autosuspend=-1 inst.gpt security_profile=standard user_namespace.enable=1 ks=/installer-config/smallsystem_lowlatency_ks.cfg
+++ /dev/null
-
-EXTRA_IMAGE_FEATURES += " empty-root-password"
-EXTRA_IMAGE_FEATURES += " allow-empty-password"
-EXTRA_IMAGE_FEATURES += " allow-root-login"
-
-#Systemd system
-VIRTUAL-RUNTIME_init_manager = "systemd"
-DISTRO_FEATURES_NATIVE_append = "systemd"
-DISTRO_FEATURES_append = " systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_append = "sysvinit"
-
-#Security
-# INITRAMFS_IMAGE = "secure-core-image-initramfs"
-# DISTRO_FEATURES_append = " selinux"
-#DISTRO_FEATURES_NATIVE_append = "ima tpm tpm2 efi-secure-boot luks"
-#DISTRO_FEATURES_append += "ima tpm tpm2 efi-secure-boot luks modsign"
-#MACHINE_FEATURES_NATIVE_append = "efi"
-#MACHINE_FEATURES_append = "efi"
-#INITRAMFS_SCRIPTS = "initramfs-live-boot \
-# initramfs-live-install \
-# initramfs-live-install-efi \
-# "
-
-#SECURE_CORE_IMAGE_EXTRA_INSTALL ?= "\
-# packagegroup-efi-secure-boot \
-# packagegroup-tpm \
-# packagegroup-tpm2 \
-# packagegroup-ima \
-# packagegroup-luks \
-# "
-
-
-# virtualization and cloud stuff
-DISTRO_FEATURES_append = " virtualization"
-DISTRO_FEATURES_append = " kvm"
-DISTRO_FEATURES_append = " openstack"
-PREFERRED_PROVIDER_virtual/containerd = "containerd-opencontainers"
-
-# packagegroup-base-zeroconf depends on libnss-mdns which breaks
-# the dns resolution for StarlingX
-DISTRO_FEATURES_remove = "zeroconf"
-
-#Graphics and misc
-#DISTRO_FEATURES_append = " x11 opengl"
-#EXTRA_IMAGE_FEATURES_append = " x11-base"
-#VIRTUAL-RUNTIME_graphical_init_manager = "lxdm"
-
-PACKAGE_CLASSES = "package_rpm"
-DISTRO_FEATURES_append = " bluez pam largefile opengl"
-
-#misc
-PREFERRED_PROVIDER_virtual/containerd = "containerd-opencontainers"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-
-VIRTUAL-RUNTIME_syslog = "syslog-ng"
-VIRTUAL-RUNTIME_vim = "vim"
-
-DISTRO_FEATURES_append = " selinux"
-PREFERRED_PROVIDER_virtual/refpolicy ?= "refpolicy-mls"
+++ /dev/null
-
-PREFERRED_VERSION_keyutils = "1.6"
-PREFERRED_VERSION_python-voluptuous = "0.8.9"
-PREFERRED_VERSION_python3-cherrypy = "18.2.0"
-PREFERRED_VERSION_python-cheroot = "7.0.0"
-PREFERRED_VERSION_python3-cheroot = "7.0.0"
-PREFERRED_VERSION_python-cherrypy = "3.2.2"
-PREFERRED_VERSION_pythonkeystoneauth1 = "3.17.1"
-PREFERRED_VERSION_drbd-utils = "8.4.3rc1"
-PREFERRED_VERSION_python-pyyaml = "3.13"
-PREFERRED_VERSION_python-cmd2 = "0.6.8"
-PREFERRED_VERSION_python-expect = "4.6.0"
-PREFERRED_VERSION_python-pika = "0.10.0%"
-PREFERRED_VERSION_python-keyring = "5.3"
-PREFERRED_VERSION_python-barbican = "8.0.%"
-PREFERRED_VERSION_python-keystone = "16.0.%"
-PREFERRED_VERSION_python-flask = "1.0.2"
-PREFERRED_VERSION_python-keystonemiddleware = "7.0.%"
-PREFERRED_VERSION_python-oslo.cache= "1.26.%"
-PREFERRED_VERSION_python-oslo.concurrency= "3.26.%"
-PREFERRED_VERSION_python-oslo.log= "3.44.%"
-PREFERRED_VERSION_python-oslo.middleware = "3.31.%"
-PREFERRED_VERSION_python-oslo.serialization = "2.23.%"
-PREFERRED_VERSION_python-oslo.policy = "1.43.%"
-PREFERRED_VERSION_python-pysaml2 = "4.5.%"
-PREFERRED_VERSION_python-sqlalchemy = "1.1.17"
-PREFERRED_VERSION_python-werkzeug = "0.14.%"
-PREFERRED_VERSION_python-neutronclient = "6.14.%"
-PREFERRED_VERSION_python-oslo.i18n = "3.20.%"
-PREFERRED_VERSION_python-iso8601 = "0.1.12"
-PREFERRED_VERSION_python-six = "1.11.%"
-PREFERRED_VERSION_python-docker = "3.3.0"
-PREFERRED_VERSION_python-pyudev = "0.16.1"
-PREFERRED_VERSION_python-django = "1.11.20+%"
-PREFERRED_VERSION_python-django-babel = "0.6.2+%"
-PREFERRED_VERSION_python-pysnmp = "4.2.5"
-PREFERRED_VERSION_python-dateutil = "2.8.1"
-PREFERRED_VERSION_python-adal = "1.0.2"
-PREFERRED_VERSION_python-osprofiler = "2.3.0+%"
-PREFERRED_VERSION_python-amqp = "2.5.2"
-PREFERRED_VERSION_python-ryu = "4.24+%"
-PREFERRED_VERSION_docker-distribution = "v2.6.2"
-PREFERRED_VERSION_kuberenetes = "1.16.%"
-PREFERRED_VERSION_ruby = "2.0.0-p648"
-PREFERRED_VERSION_ruby-native = "2.0.0-p648"
-PREFERRED_VERSION_puppet = "4.8.2"
-PREFERRED_VERSION_dnsmasq = "2.76"
-PREFERRED_VERSION_ceph = "13.2.2"
-PREFERRED_VERSION_python-eventlet = "0.18.4"
-PREFERRED_VERSION_lldpd = "0.9.0"
-PREFERRED_VERSION_json-c = "0.11"
-PREFERRED_VERSION_libevent = "2.0.21"
+++ /dev/null
-
-require conf/distro/poky.conf
-DISTRO = "poky-stx"
-DISTRO_NAME = "Stx (Poky Starlingx Distro)"
-DISTRO_VERSION = "2.7.3"
-DISTRO_CODENAME = "warrior"
-
-MAINTAINER = "zbsarashki <zbsarashki@gmail.com>"
-
-require conf/distro/include/stx-features.inc
-require conf/distro/include/stx-preferred-vers.inc
-
-# For packagegroup-basic
-TASK_BASIC_SSHDAEMON = "openssh-sshd openssh-sftp openssh-sftp-server"
-
-# For iso image
-#KERNEL_FEATURES += "features/overlayfs/overlayfs.scc"
-
-
-# Disable services by default
-SYSTEMD_AUTO_ENABLE_pn-haproxy = "disable"
-SYSTEMD_AUTO_ENABLE_pn-lighttpd = "disable"
-SYSTEMD_AUTO_ENABLE_pn-postgresql = "disable"
-
-# Defines the serial consoles (TTYs) to enable using getty
-SERIAL_CONSOLES = "115200;ttyS0"
-
-# /var/log is mounted as a logical volume for stx,
-# so do not link to /var/volatile/log.
-VOLATILE_LOG_DIR = "no"
-
-# We don't need extra space for iso image
-IMAGE_OVERHEAD_FACTOR = "1.05"
-
-# Add extra users and groups for stx
-SYSADMIN_P = "4SuW8cnXFyxsk"
-
-EXTRA_USERS_PARAMS_CONFIG = "\
- groupadd -f -g 345 sys_protected; \
- useradd -m -g sys_protected -G root \
- -d /home/sysadmin -p ${SYSADMIN_P} \
- -s /bin/sh sysadmin; \
- useradd -p '' haproxy; \
- groupadd haproxy; \
- usermod -a -G haproxy haproxy; \
- useradd -p '' patching; \
- groupadd patching; \
- usermod -a -G patching patching; \
- useradd -p '' nfv; \
- groupadd nfv; \
- usermod -a -G nfv nfv; \
- useradd -p '' www; \
- groupadd www; \
- usermod -a -G www www; \
- usermod -a -G sys_protected sysadmin; \
- usermod -a -G sys_protected sysinv; \
- usermod -a -G sys_protected www; \
- usermod -a -G sys_protected nfv; \
- usermod -a -G sys_protected patching; \
- usermod -a -G sys_protected haproxy; \
- usermod -a -G snmpd fm; \
- usermod -P root root; \
- \
- groupadd -r -g 128 nscd; \
- useradd -M -o -r -d / -s /sbin/nologin -c 'NSCD Daemon' -u 28 -g nscd nscd; \
- "
-
-# Used by:
-# neutron-init
-# glance-init
-CONTROLLER_IP = "127.0.0.1"
-HELM_TOOL_KIT_VERSION = "0.1.0"
-TIS_PATCH_VER = "7"
-HELM_REPO = "stx-platform"
-STX_REL = "19.12"
-
-# For the stx /etc/build.info
-STX_ID = "3.0"
-STX_BUILD_DATE := "${@time.strftime('%Y-%m-%d %H:%M:%S',time.gmtime())}"
-
-DISTRO_FEATURES_NATIVE_append += " pam systemd "
-DISTRO_FEATURES_append += " pam systemd "
+++ /dev/null
-
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
- ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "stx-distro-layer"
-BBFILE_PATTERN_stx-distro-layer := "^${LAYERDIR}/"
-BBFILE_PRIORITY_stx-distro-layer = "5"
-
-LAYERDEPENDS_STX = "\
- core \
- dpdk \
- networking-layer \
- openembedded-layer \
- networking-layer \
- filesystems-layer \
- perl-layer \
- meta-python \
- webserver \
- virtualization-layer \
- cloud-services-layer \
- openstack-layer \
-"
-
-LAYERDEPENDS_STX_ANACONDA = "\
- core \
- filesystems-layer \
- meta-python \
- networking-layer \
- openembedded-layer \
-"
-
-LAYERDEPENDS_stx-distro-layer = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-anaconda', '${LAYERDEPENDS_STX_ANACONDA}', '${LAYERDEPENDS_STX}', d)}"
-
-# This should only be incremented on significant changes that will
-# cause compatibility issues with other layers
-LAYERVERSION_stx-distro-version = "1"
-LAYERSERIES_COMPAT_stx-distro-layer = "thud warrior"
-
-LAYER_PATH_meta-stx-distro = "${LAYERDIR}"
-
-# Masked recipes:
-BBMASK += "/meta-python2/recipes-core/images/meta-python-ptest-image.bb"
-BBMASK += "/meta-python2/recipes-core/images/meta-python-image-base.bb"
-BBMASK += "/meta-python2/recipes-core/images/meta-python-image.bb"
-BBMASK += "/meta-stak-common/recipes-containers/kubernetes/kubernetes_git.bbappend"
-BBMASK += "/meta-cloud-services/meta-openstack/recipes-devtools/python/python-cephclient_0.1.0.5.bb"
-BBMASK += "/meta-openstack/recipes-devtools/qemu/qemu_2.%.bbappend"
-BBMASK += "/meta-cloud-services/meta-openstack/recipes-kernel/linux/linux-yocto_4.18.bbappend"
-BBMASK += "/meta-selinux/recipes-graphics/mesa/mesa_%.bbappend"
-BBMASK += "/meta-virtualization/recipes-containers/docker-distribution/docker-distribution_git.bb"
-BBMASK += "/meta-starlingX/recipes-containers/docker-distribution/docker-distribution_git.bbappend"
-BBMASK += "/meta-starlingX/recipes-support/puppet/puppetlabs-stdlib_git.bbappend"
+++ /dev/null
-
-DESCRIPTION = "An image with Anaconda to do installation for StarlingX"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-# Support installation from initrd boot
-do_image_complete[depends] += "core-image-anaconda-initramfs:do_image_complete"
-
-DEPENDS += "isomd5sum-native"
-
-CUSTOMIZE_LOGOS ??= "yocto-compat-logos"
-
-# We override what gets set in core-image.bbclass
-IMAGE_INSTALL = "\
- packagegroup-core-boot \
- packagegroup-core-ssh-openssh \
- ${@['', 'packagegroup-installer-x11-anaconda'][bool(d.getVar('XSERVER', True))]} \
- python3-anaconda \
- anaconda-init \
- kernel-modules \
- ${CUSTOMIZE_LOGOS} \
- dhcp-client \
- ldd \
- rng-tools \
- gptfdisk \
- pxe-installer-initramfs \
-"
-
-IMAGE_LINGUAS = "en-us en-gb"
-
-# Generate live image
-IMAGE_FSTYPES_remove = "wic wic.bmap"
-IMAGE_FSTYPES_append = " iso"
-
-IMAGE_ROOTFS_EXTRA_SPACE =" + 102400"
-
-inherit core-image stx-anaconda-image
-
-DEFAULT_KICKSTART ?= "smallsystem_lowlatency_ks.cfg"
-STX_KICKSTART_DIR ?= "${INSTALLER_TARGET_BUILD}/tmp/deploy/images/${MACHINE}/stx-kickstarts/"
-KICKSTART_FILE ?= "${STX_KICKSTART_DIR}/${DEFAULT_KICKSTART}"
-
-KICKSTART_FILE_EXTRA ?= " \
- ${STX_KICKSTART_DIR}/smallsystem_ks.cfg \
- ${STX_KICKSTART_DIR}/smallsystem_lowlatency_ks.cfg \
- ${STX_KICKSTART_DIR}/controller_ks.cfg \
- ${STX_KICKSTART_DIR}/net_controller_ks.cfg \
- ${STX_KICKSTART_DIR}/net_smallsystem_ks.cfg \
- ${STX_KICKSTART_DIR}/net_smallsystem_lowlatency_ks.cfg \
- ${STX_KICKSTART_DIR}/net_storage_ks.cfg \
- ${STX_KICKSTART_DIR}/net_worker_ks.cfg \
- ${STX_KICKSTART_DIR}/net_worker_lowlatency_ks.cfg \
-"
-
-SYSLINUX_CFG_LIVE = "${LAYER_PATH_meta-stx-distro}/conf/distro/files/syslinux.cfg"
+++ /dev/null
-
-SUMMARY = " StarlingX Single Server"
-
-LICENSE = "MIT"
-
-CORE_IMAGE_EXTRA_INSTALL = " \
- packagegroup-basic \
- packagegroup-core-base-utils \
- "
-
-IMAGE_INSTALL_append = " \
- ${CORE_IMAGE_BASE_INSTALL} \
- packagegroup-core-full-cmdline \
- packagegroup-core-lsb \
- packagegroup-stx-upstream \
- packagegroup-stx-puppet \
- packagegroup-stx-fault \
- packagegroup-stx-metal \
- packagegroup-stx-nfv \
- packagegroup-stx-monitoring \
- packagegroup-stx-ha \
- packagegroup-stx-config-files \
- packagegroup-stx-update \
- packagegroup-stx-integ \
- packagegroup-stx-config \
- packagegroup-stx-distributedcloud \
- packagegroup-stx-utilities \
- packagegroup-stx-armada-app \
- starlingx-dashboard \
- playbookconfig \
- distributedcloud-client-dcmanager \
- registry-token-server \
- rt-tests \
- kernel-dev \
- "
-
-IMAGE_FEATURES += " \
- package-management \
- ssh-server-openssh \
- "
-
-inherit stx-image-list
-inherit stx-postrun
-inherit extrausers-config
-inherit core-image
-inherit distro_features_check
-inherit openstack-base
-inherit identity
-inherit monitor
-
-# We need docker-ce
-PACKAGE_EXCLUDE += " docker"
+++ /dev/null
-
-SUMMARY = "StarlingX stx packages"
-
-PR = "r0"
-
-#
-# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
-#
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-inherit packagegroup
-
-PROVIDES = "${PACKAGES}"
-PACKAGES = " \
- packagegroup-stx-upstream \
- packagegroup-stx-puppet \
- packagegroup-stx-fault \
- packagegroup-stx-metal \
- packagegroup-stx-nfv \
- packagegroup-stx-monitoring \
- packagegroup-stx-ha \
- packagegroup-stx-config \
- packagegroup-stx-config-files \
- packagegroup-stx-distributedcloud \
- packagegroup-stx-update \
- packagegroup-stx-integ \
- packagegroup-stx-utilities \
- packagegroup-stx-armada-app \
- "
-
-RDEPENDS_packagegroup-stx-puppet = "\
- stx-puppet \
- puppet-dcdbsync \
- puppet-dcmanager \
- puppet-dcorch \
- puppet-fm \
- puppet-mtce \
- puppet-nfv \
- puppet-patching \
- puppet-smapi \
- puppet-sshd \
- puppet-sysinv \
- puppet-manifests \
- "
-
-RDEPENDS_packagegroup-stx-config = " \
- config-gate-worker \
- config-gate \
- controllerconfig \
- cgts-client \
- sysinv-agent \
- sysinv \
- workerconfig-subfunction \
- tsconfig \
- "
-
-RDEPENDS_packagegroup-stx-config-files = " \
- lighttpd \
- lighttpd-module-proxy \
- lighttpd-module-setenv \
- dnsmasq \
- shadow \
- openldap \
- ntp \
- haproxy \
- syslog-ng \
- sudo \
- docker-ce \
- openvswitch \
- systemd \
- nfs-utils \
- nfs-utils-config \
- iptables \
- logrotate \
- mlx4-init \
- initscripts \
- procps \
- iscsi-initiator-utils \
- memcached \
- net-snmp \
- net-snmp-server-snmpd \
- net-snmp-server-snmptrapd \
- libpam-runtime \
- rabbitmq-server \
- rsync \
- base-files \
- audit \
- auditd \
- audit-python \
- "
-
-RDEPENDS_packagegroup-stx-fault = " \
- fm-api \
- fm-common \
- fm-doc \
- fm-mgr \
- fm-rest-api \
- python-fmclient \
- snmp-audittrail \
- snmp-ext \
- "
-
-RDEPENDS_packagegroup-stx-ha = " \
- sm-common-libs \
- libsm-common \
- sm \
- sm-db \
- sm-api \
- sm-client \
- sm-tools \
- sm-eru \
- stx-ocf-scripts \
- "
-
-RDEPENDS_packagegroup-stx-metal = " \
- mtce \
- mtce-pmon \
- mtce-hwmon \
- mtce-hostw \
- mtce-lmon \
- mtce-compute \
- mtce-control \
- mtce-storage \
- pxe-network-installer \
- platform-kickstarts \
- "
-
-RDEPENDS_packagegroup-stx-monitoring = " \
- collectd-extensions \
- influxdb-extensions \
- monitor-tools \
- vm-topology \
- "
-
-RDEPENDS_packagegroup-stx-distributedcloud = " \
- distributedcloud-dcmanager \
- distributedcloud-dcorch \
- distributedcloud-dcdbsync \
- distributedcloud-ocf \
- "
-
-RDEPENDS_packagegroup-stx-nfv = " \
- nfv-common \
- nfv-plugins \
- nfv-tools \
- nfv-vim \
- nfv-client \
- mtce-guest\
- "
-
-RDEPENDS_packagegroup-stx-upstream = " \
- barbican \
- python-neutronclient \
- python-aodhclient \
- python-barbican \
- python-barbicanclient \
- python-cinderclient \
- python-glanceclient \
- python-gnocchiclient \
- python-django-horizon \
- python-heatclient \
- python-ironicclient \
- python-keystoneauth1 \
- python-keystoneclient \
- python-novaclient \
- python-openstackclient \
- python-openstacksdk \
- python-pankoclient \
- openstack-ras \
- "
-
-RDEPENDS_packagegroup-stx-update = " \
- cgcs-patch \
- cgcs-patch-agent \
- cgcs-patch-controller \
- enable-dev-patch \
- patch-alarm \
- "
-
-RDEPENDS_packagegroup-stx-integ = " \
- dpkg \
- dtc \
- ibsh \
- python-redfishtool \
- puppet-boolean \
- puppetlabs-create-resources \
- puppet-dnsmasq \
- puppet-drbd \
- puppet-filemapper \
- puppet-ldap \
- puppetlabs-lvm \
- puppet-network \
- puppet-nslcd \
- puppetlabs-postgresql \
- puppet-puppi \
- mariadb \
- drbd-utils \
- docker-distribution \
- docker-forward-journald \
- etcd \
- kubernetes \
- ldapscripts \
- python-3parclient \
- python-cherrypy \
- python-lefthandclient \
- python-setuptools \
- python-ryu \
- spectre-meltdown-checker \
- kvm-timer-advance-setup \
- ceph \
- lldpd \
- lvm2 \
- tzdata \
- "
-
-RDEPENDS_packagegroup-stx-utilities = " \
- build-info \
- python-cephclient \
- ceph-manager \
- stx-ssl \
- collector \
- collect-engtools \
- logmgmt \
- namespace-utils \
- nfscheck \
- stx-extensions \
- worker-utils \
- update-motd \
- platform-util \
- pci-irq-affinity \
- "
-
-RDEPENDS_packagegroup-stx-armada-app = "\
- monitor-helm \
- monitor-helm-elastic \
- openstack-helm \
- openstack-helm-infra \
- stx-monitor-helm \
- stx-openstack-helm \
- stx-platform-helm \
- "
+++ /dev/null
-SUMMARY = "Provides initramfs used for pxe installer"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-do_install[depends] += "core-image-anaconda-initramfs:do_image_complete"
-
-do_install() {
- install -d ${D}/boot
- install -m 0644 ${DEPLOY_DIR_IMAGE}/core-image-anaconda-initramfs-${MACHINE}.cpio.gz ${D}/boot/installer-initrd_1.0
- ln -s installer-initrd_1.0 ${D}/boot/installer-initrd
-}
-
-FILES_${PN} = "/boot"
+++ /dev/null
-
-
-APACHE_PORT_NUM ?= "81"
-
-do_install_append () {
- sed -i -e 's/80/${APACHE_PORT_NUM}/' ${D}/${sysconfdir}/${BPN}/httpd.conf
-}
-
-inherit useradd
-
-USERADD_PACKAGES = "${PN}"
-
-USERADD_PARAM_${PN} = "-c 'Apache' -u 48 -g apache -s /sbin/nologin -r -d /usr/share/httpd apache"
-GROUPADD_PARAM_${PN} = "-g 48 -r apache"
-
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "lighttpd-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- "
-
-do_install_append () {
- # remove the symlinks
- rm ${D}/www/logs
- rm ${D}/www/var
-
- # use tmpfile to create dirs
- install -d ${D}${sysconfdir}/tmpfiles.d/
- echo "d /www/var 0755 www root -" > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
- echo "d /www/var/log 0755 www root -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
-
-
- install -d -m 1777 ${D}/www/tmp
- install -d ${D}/${sysconfdir}/lighttpd/ssl
- install -d ${D}/www/pages/dav
-
- install -d -m755 ${D}/${sysconfdir}/logrotate.d
-
- install -m755 ${STX_METADATA_PATH}/files/lighttpd.init ${D}/${sysconfdir}/init.d/lighttpd
-
- install -m640 ${STX_METADATA_PATH}/files/lighttpd.conf ${D}/${sysconfdir}/lighttpd/lighttpd.conf
- install -m644 ${STX_METADATA_PATH}/files/lighttpd-inc.conf ${D}/${sysconfdir}/lighttpd/lighttpd-inc.conf
- install -m644 ${STX_METADATA_PATH}/files/index.html.lighttpd ${D}/www/pages/index.html
- install -m644 ${STX_METADATA_PATH}/files/lighttpd.logrotate ${D}/${sysconfdir}/logrotate.d/lighttpd
-
-}
-
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
+++ /dev/null
-From 20ddb6f200f61332ff43aca7ad9421303d0a3138 Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Thu, 25 May 2017 15:22:37 -0400
-Subject: [PATCH] Add Client ID to debug messages
-
-This allows to sort out which debug message belongs to which client when
-multiple clients are preforming operations at the same time.
-
-Signed-off-by: Simo Sorce <simo@redhat.com>
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-
-Resolves: #189
-Merges: #191
-(cherry picked from commit 2f158fe4d39c11589d214d3d602c6d10411052dc)
----
- proxy/src/gp_debug.c | 28 +++++++++++++++++++++++++++-
- proxy/src/gp_debug.h | 1 +
- proxy/src/gp_proxy.h | 1 +
- proxy/src/gp_socket.c | 5 +++++
- proxy/src/gp_workers.c | 6 ++++++
- proxy/src/gssproxy.c | 4 ++++
- 6 files changed, 44 insertions(+), 1 deletion(-)
-
-diff --git a/proxy/src/gp_debug.c b/proxy/src/gp_debug.c
-index 3029574..4a141fc 100644
---- a/proxy/src/gp_debug.c
-+++ b/proxy/src/gp_debug.c
-@@ -64,6 +64,32 @@ const char *gp_debug_timestamp(void)
- return buffer;
- }
-
-+/* thread local connection/client id */
-+static __thread int cid;
-+
-+void gp_debug_set_conn_id(int id)
-+{
-+ cid = id;
-+}
-+
-+static const char*gp_debug_conn_id(void)
-+{
-+ static __thread char buffer[18];
-+ static __thread int last_cid = 0;
-+
-+ if (cid == 0) {
-+ buffer[0] = '\0';
-+ return buffer;
-+ }
-+
-+ if (last_cid == cid) return buffer;
-+
-+ (void)snprintf(buffer, 17, "[CID %d]", cid);
-+ buffer[17] = '\0';
-+ last_cid = cid;
-+ return buffer;
-+}
-+
- void gp_debug_printf(const char *format, ...)
- {
- va_list varargs;
-@@ -76,7 +102,7 @@ void gp_debug_time_printf(const char *format, ...)
- {
- va_list varargs;
-
-- fprintf(stderr, "%s", gp_debug_timestamp());
-+ fprintf(stderr, "%s%s", gp_debug_conn_id(), gp_debug_timestamp());
-
- va_start(varargs, format);
- vfprintf(stderr, format, varargs);
-diff --git a/proxy/src/gp_debug.h b/proxy/src/gp_debug.h
-index d3420b0..1c2f8a3 100644
---- a/proxy/src/gp_debug.h
-+++ b/proxy/src/gp_debug.h
-@@ -14,6 +14,7 @@ int gp_debug_args(int level);
- void gp_debug_toggle(int);
- void gp_debug_printf(const char *format, ...);
- void gp_debug_time_printf(const char *format, ...);
-+void gp_debug_set_conn_id(int id);
-
- #define GPDEBUG(...) do { \
- if (gp_debug) { \
-diff --git a/proxy/src/gp_proxy.h b/proxy/src/gp_proxy.h
-index 971a7b6..55ab83c 100644
---- a/proxy/src/gp_proxy.h
-+++ b/proxy/src/gp_proxy.h
-@@ -113,6 +113,7 @@ void gp_socket_send_data(verto_ctx *vctx, struct gp_conn *conn,
- struct gp_creds *gp_conn_get_creds(struct gp_conn *conn);
- uid_t gp_conn_get_uid(struct gp_conn *conn);
- const char *gp_conn_get_socket(struct gp_conn *conn);
-+int gp_conn_get_cid(struct gp_conn *conn);
- bool gp_selinux_ctx_equal(SELINUX_CTX ctx1, SELINUX_CTX ctx2);
- bool gp_conn_check_selinux(struct gp_conn *conn, SELINUX_CTX ctx);
-
-diff --git a/proxy/src/gp_socket.c b/proxy/src/gp_socket.c
-index 29b6a44..5064e51 100644
---- a/proxy/src/gp_socket.c
-+++ b/proxy/src/gp_socket.c
-@@ -103,6 +103,11 @@ const char *gp_conn_get_socket(struct gp_conn *conn)
- return conn->sock_ctx->socket;
- }
-
-+int gp_conn_get_cid(struct gp_conn *conn)
-+{
-+ return conn->us.sd;
-+}
-+
- void gp_conn_free(struct gp_conn *conn)
- {
- if (!conn) return;
-diff --git a/proxy/src/gp_workers.c b/proxy/src/gp_workers.c
-index c089b54..d37e57c 100644
---- a/proxy/src/gp_workers.c
-+++ b/proxy/src/gp_workers.c
-@@ -357,6 +357,9 @@ static void *gp_worker_main(void *pvt)
-
- while (!t->pool->shutdown) {
-
-+ /* initialize debug client id to 0 until work is scheduled */
-+ gp_debug_set_conn_id(0);
-+
- /* ======> COND_MUTEX */
- pthread_mutex_lock(&t->cond_mutex);
- while (t->query == NULL) {
-@@ -374,6 +377,9 @@ static void *gp_worker_main(void *pvt)
- /* <====== COND_MUTEX */
- pthread_mutex_unlock(&t->cond_mutex);
-
-+ /* set client id before hndling requests */
-+ gp_debug_set_conn_id(gp_conn_get_cid(q->conn));
-+
- /* handle the client request */
- gp_handle_query(t->pool, q);
-
-diff --git a/proxy/src/gssproxy.c b/proxy/src/gssproxy.c
-index 5c5937d..94a6a61 100644
---- a/proxy/src/gssproxy.c
-+++ b/proxy/src/gssproxy.c
-@@ -159,6 +159,10 @@ int main(int argc, const char *argv[])
- int wait_fd;
- int ret = -1;
-
-+ /* initialize debug client id to 0 in the main thread */
-+ /* we do this early, before any code starts using debug statements */
-+ gp_debug_set_conn_id(0);
-+
- struct poptOption long_options[] = {
- POPT_AUTOHELP
- {"daemon", 'D', POPT_ARG_NONE, &opt_daemon, 0, \
+++ /dev/null
-From 0e04be2c1398dac40c50910a59157eed0ad5a7e4 Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Tue, 14 Mar 2017 10:43:17 -0400
-Subject: [PATCH] Allow connection to self when impersonator set
-
-If the target of a context establishment is the impersonator itself,
-then allow it. This kind of context establishment is used by tools like
-mod_auth_gssapi to be able to inspect the ticket just obtained via
-impersonation and it is basically a noop as the acceptor and the
-impersonator are the same entitiy.
-
-Signed-off-by: Simo Sorce <simo@redhat.com>
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-Merges: #172
-(cherry picked from commit eada55e831d12b42d3be3a555ff4e133bed7f594)
----
- proxy/src/gp_creds.c | 57 +++++++++++++++++++++++++----
- proxy/src/gp_rpc_creds.h | 3 +-
- proxy/src/gp_rpc_init_sec_context.c | 2 +-
- proxy/tests/t_impersonate.py | 35 +++++++++++++-----
- 4 files changed, 78 insertions(+), 19 deletions(-)
-
-diff --git a/proxy/src/gp_creds.c b/proxy/src/gp_creds.c
-index 95a1c48..7d89b06 100644
---- a/proxy/src/gp_creds.c
-+++ b/proxy/src/gp_creds.c
-@@ -883,7 +883,8 @@ static uint32_t get_impersonator_name(uint32_t *min, gss_cred_id_t cred,
- }
- } else if (ret_maj == GSS_S_UNAVAILABLE) {
- /* Not supported by krb5 library yet, fallback to raw krb5 calls */
-- /* TODO: Remove once we set a required dependency on MIT 1.15+ */
-+ /* TODO: Remove once we set a minimum required dependency on a
-+ * release that supports this call */
- ret_maj = get_impersonator_fallback(&ret_min, cred, impersonator);
- if (ret_maj == GSS_S_FAILURE) {
- if (ret_min == KRB5_CC_NOTFOUND) {
-@@ -899,9 +900,47 @@ done:
- return ret_maj;
- }
-
-+static uint32_t check_impersonator_name(uint32_t *min,
-+ gss_name_t target_name,
-+ const char *impersonator)
-+{
-+ gss_name_t canon_name = NULL;
-+ gss_buffer_desc buf;
-+ uint32_t ret_maj = 0;
-+ uint32_t ret_min = 0;
-+ uint32_t discard;
-+ bool match;
-+
-+ ret_maj = gss_canonicalize_name(&discard, target_name, &gp_mech_krb5,
-+ &canon_name);
-+ if (ret_maj != GSS_S_COMPLETE) {
-+ *min = ret_min;
-+ return ret_maj;
-+ }
-+
-+ ret_maj = gss_display_name(&discard, canon_name, &buf, NULL);
-+ gss_release_name(&discard, &canon_name);
-+ if (ret_maj != GSS_S_COMPLETE) {
-+ *min = ret_min;
-+ return ret_maj;
-+ }
-+
-+ match = (strncmp(impersonator, buf.value, buf.length) == 0) &&
-+ (strlen(impersonator) == buf.length);
-+ gss_release_buffer(&discard, &buf);
-+
-+ *min = 0;
-+ if (match) {
-+ return GSS_S_COMPLETE;
-+ } else {
-+ return GSS_S_UNAUTHORIZED;
-+ }
-+}
-+
- uint32_t gp_cred_allowed(uint32_t *min,
- struct gp_call_ctx *gpcall,
-- gss_cred_id_t cred)
-+ gss_cred_id_t cred,
-+ gss_name_t target_name)
- {
- char *impersonator = NULL;
- uint32_t ret_maj = 0;
-@@ -924,11 +963,11 @@ uint32_t gp_cred_allowed(uint32_t *min,
- if (ret_maj) goto done;
-
- /* if we find an impersonator entry we bail as that is not authorized,
-- * if it were then gpcall->service->allow_const_deleg would have caused
-- * the ealier check to return GSS_S_COMPLETE already */
-+ * *unless* the target is the impersonator itself! If the operation
-+ * were authorized then gpcall->service->allow_const_deleg would have
-+ * caused the ealier check to return GSS_S_COMPLETE already */
- if (impersonator != NULL) {
-- ret_min = 0;
-- ret_maj = GSS_S_UNAUTHORIZED;
-+ ret_maj = check_impersonator_name(&ret_min, target_name, impersonator);
- }
-
- done:
-@@ -937,7 +976,11 @@ done:
- GPDEBUGN(2, "Unauthorized impersonator credentials detected\n");
- break;
- case GSS_S_COMPLETE:
-- GPDEBUGN(2, "No impersonator credentials detected\n");
-+ if (impersonator) {
-+ GPDEBUGN(2, "Credentials allowed for 'self'\n");
-+ } else {
-+ GPDEBUGN(2, "No impersonator credentials detected\n");
-+ }
- break;
- default:
- GPDEBUG("Failure while checking credentials\n");
-diff --git a/proxy/src/gp_rpc_creds.h b/proxy/src/gp_rpc_creds.h
-index 54fe482..c116e53 100644
---- a/proxy/src/gp_rpc_creds.h
-+++ b/proxy/src/gp_rpc_creds.h
-@@ -34,7 +34,8 @@ uint32_t gp_add_krb5_creds(uint32_t *min,
-
- uint32_t gp_cred_allowed(uint32_t *min,
- struct gp_call_ctx *gpcall,
-- gss_cred_id_t cred);
-+ gss_cred_id_t cred,
-+ gss_name_t target_name);
-
- void gp_filter_flags(struct gp_call_ctx *gpcall, uint32_t *flags);
-
-diff --git a/proxy/src/gp_rpc_init_sec_context.c b/proxy/src/gp_rpc_init_sec_context.c
-index 767a3ff..413e2ec 100644
---- a/proxy/src/gp_rpc_init_sec_context.c
-+++ b/proxy/src/gp_rpc_init_sec_context.c
-@@ -108,7 +108,7 @@ int gp_init_sec_context(struct gp_call_ctx *gpcall,
- }
- }
-
-- ret_maj = gp_cred_allowed(&ret_min, gpcall, ich);
-+ ret_maj = gp_cred_allowed(&ret_min, gpcall, ich, target_name);
- if (ret_maj) {
- goto done;
- }
-diff --git a/proxy/tests/t_impersonate.py b/proxy/tests/t_impersonate.py
-index 3e25962..29f9a41 100755
---- a/proxy/tests/t_impersonate.py
-+++ b/proxy/tests/t_impersonate.py
-@@ -34,19 +34,20 @@ IMPERSONATE_CONF_TEMPLATE = '''
-
- '''
-
--def run_cmd(testdir, env, conf, name, socket, cmd, expected_failure):
-+def run_cmd(testdir, env, conf, name, socket, cmd, keytab, expected_failure):
-
- logfile = conf['logfile']
- testenv = env.copy()
- testenv.update({'KRB5CCNAME': os.path.join(testdir, 't' + conf['prefix'] +
- '_impersonate.ccache'),
-- 'KRB5_KTNAME': os.path.join(testdir, PROXY_KTNAME),
-+ 'KRB5_KTNAME': os.path.join(testdir, keytab),
- 'KRB5_TRACE': os.path.join(testdir, 't' + conf['prefix'] +
- '_impersonate.trace'),
- 'GSS_USE_PROXY': 'yes',
- 'GSSPROXY_SOCKET': socket,
- 'GSSPROXY_BEHAVIOR': 'REMOTE_FIRST'})
-
-+ print("\nTesting: [%s]" % (name,), file=logfile)
- print("[COMMAND]\n%s\n[ENVIRONMENT]\n%s\n" % (cmd, testenv), file=logfile)
- logfile.flush()
-
-@@ -74,45 +75,59 @@ def run(testdir, env, conf):
- rets = []
-
- # Test all permitted
-+ msg = "Impersonate"
- socket = os.path.join(testdir, 'impersonate.socket')
- cmd = ["./tests/t_impersonate", USR_NAME, HOST_GSS, PROXY_GSS,
- path_prefix + 'impersonate.cache']
-- r = run_cmd(testdir, env, conf, "Impersonate", socket, cmd, False)
-+ r = run_cmd(testdir, env, conf, msg, socket, cmd, PROXY_KTNAME, False)
- rets.append(r)
-
-- #Test fail
-+ #Test self fail
-+ msg = "Impersonate fail self"
- socket = os.path.join(testdir, 'impersonate-proxyonly.socket')
- cmd = ["./tests/t_impersonate", USR_NAME, HOST_GSS, PROXY_GSS,
- path_prefix + 'impersonate.cache']
-- r = run_cmd(testdir, env, conf, "Impersonate fail self", socket, cmd, True)
-+ r = run_cmd(testdir, env, conf, msg, socket, cmd, PROXY_KTNAME, True)
- rets.append(r)
-
-- #Test fail
-+ #Test proxy fail
-+ msg = "Impersonate fail proxy"
- socket = os.path.join(testdir, 'impersonate-selfonly.socket')
- cmd = ["./tests/t_impersonate", USR_NAME, HOST_GSS, PROXY_GSS,
- path_prefix + 'impersonate.cache']
-- r = run_cmd(testdir, env, conf, "Impersonate fail proxy", socket, cmd, True)
-+ r = run_cmd(testdir, env, conf, msg, socket, cmd, PROXY_KTNAME, True)
- rets.append(r)
-
- #Test s4u2self half succeed
-+ msg = "s4u2self delegation"
- socket = os.path.join(testdir, 'impersonate-selfonly.socket')
- cmd = ["./tests/t_impersonate", USR_NAME, HOST_GSS, PROXY_GSS,
- path_prefix + 'impersonate.cache', 's4u2self']
-- r = run_cmd(testdir, env, conf, "s4u2self delegation", socket, cmd, False)
-+ r = run_cmd(testdir, env, conf, msg, socket, cmd, PROXY_KTNAME, False)
-+ rets.append(r)
-+
-+ #Test proxy to self succeed
-+ msg = "Impersonate to self"
-+ socket = os.path.join(testdir, 'impersonate-selfonly.socket')
-+ cmd = ["./tests/t_impersonate", USR_NAME, HOST_GSS, HOST_GSS,
-+ path_prefix + 'impersonate.cache', 's4u2proxy']
-+ r = run_cmd(testdir, env, conf, msg, socket, cmd, SVC_KTNAME, False)
- rets.append(r)
-
- #Test s4u2proxy half fail
-+ msg = "s4u2proxy fail"
- socket = os.path.join(testdir, 'impersonate-selfonly.socket')
- cmd = ["./tests/t_impersonate", USR_NAME, HOST_GSS, PROXY_GSS,
- path_prefix + 'impersonate.cache', 's4u2proxy']
-- r = run_cmd(testdir, env, conf, "s4u2proxy fail", socket, cmd, True)
-+ r = run_cmd(testdir, env, conf, msg, socket, cmd, PROXY_KTNAME, True)
- rets.append(r)
-
- #Test s4u2proxy half succeed
-+ msg = "s4u2proxy"
- socket = os.path.join(testdir, 'impersonate-proxyonly.socket')
- cmd = ["./tests/t_impersonate", USR_NAME, HOST_GSS, PROXY_GSS,
- path_prefix + 'impersonate.cache', 's4u2proxy']
-- r = run_cmd(testdir, env, conf, "s4u2proxy", socket, cmd, False)
-+ r = run_cmd(testdir, env, conf, msg, socket, cmd, PROXY_KTNAME, False)
- rets.append(r)
-
- # Reset back gssproxy conf
+++ /dev/null
-From 08fab6898a9937fbc39de6222cd33167707cd763 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 11 Apr 2018 16:15:00 -0400
-Subject: [PATCH] Always choose highest requested debug level
-
-Allowing the CLI to lower the debug level specified in a config file
-is dubious, and previously broken since we don't distinguish "default
-value" from "explicitly requested value of 0" in popt. This resulted
-in "Debug Enabled (level: 0)" even when the log level was not actually
-0, which is confusing for users.
-
-Remove the gp_debug_args() function since it is no longer used.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #229
-(cherry picked from commit 5a714768aec776dc875237dd729c85389932a688)
----
- proxy/src/gp_debug.c | 34 ++++++++--------------------------
- proxy/src/gp_debug.h | 3 +--
- proxy/src/gssproxy.c | 2 +-
- 3 files changed, 10 insertions(+), 29 deletions(-)
-
-diff --git a/proxy/src/gp_debug.c b/proxy/src/gp_debug.c
-index 4a141fc..a0f51f0 100644
---- a/proxy/src/gp_debug.c
-+++ b/proxy/src/gp_debug.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 the GSS-PROXY contributors, see COPYING for license */
-+/* Copyright (C) 2011,2018 the GSS-PROXY contributors, see COPYING for license */
-
- #include "config.h"
- #include <stdbool.h>
-@@ -7,35 +7,17 @@
- #include "gp_log.h"
-
- /* global debug switch */
--int gp_debug;
--
--int gp_debug_args(int level) {
-- static int args_level = 0;
--
-- if (level != 0) {
-- args_level = level;
-- }
-- return args_level;
--}
-+int gp_debug = 0;
-
- void gp_debug_toggle(int level)
- {
-- static bool krb5_trace_set = false;
-+ if (level <= gp_debug)
-+ return;
-
-- /* Command line and environment options override config file */
-- gp_debug = gp_debug_args(0);
-- if (gp_debug == 0) {
-- gp_debug = level;
-- }
-- if (level >= 3) {
-- if (!getenv("KRB5_TRACE")) {
-- setenv("KRB5_TRACE", "/dev/stderr", 1);
-- krb5_trace_set = true;
-- }
-- } else if (krb5_trace_set) {
-- unsetenv("KRB5_TRACE");
-- krb5_trace_set = false;
-- }
-+ if (level >= 3 && !getenv("KRB5_TRACE"))
-+ setenv("KRB5_TRACE", "/dev/stderr", 1);
-+
-+ gp_debug = level;
- GPDEBUG("Debug Enabled (level: %d)\n", level);
- }
-
-diff --git a/proxy/src/gp_debug.h b/proxy/src/gp_debug.h
-index 1c2f8a3..4932bfd 100644
---- a/proxy/src/gp_debug.h
-+++ b/proxy/src/gp_debug.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 the GSS-PROXY contributors, see COPYING for license */
-+/* Copyright (C) 2011,2018 the GSS-PROXY contributors, see COPYING for license */
-
- #ifndef _GP_DEBUG_H_
- #define _GP_DEBUG_H_
-@@ -10,7 +10,6 @@
-
- extern int gp_debug;
-
--int gp_debug_args(int level);
- void gp_debug_toggle(int);
- void gp_debug_printf(const char *format, ...);
- void gp_debug_time_printf(const char *format, ...);
-diff --git a/proxy/src/gssproxy.c b/proxy/src/gssproxy.c
-index 5fc4f8d..3b6a16e 100644
---- a/proxy/src/gssproxy.c
-+++ b/proxy/src/gssproxy.c
-@@ -209,7 +209,7 @@ int main(int argc, const char *argv[])
-
- if (opt_debug || opt_debug_level > 0) {
- if (opt_debug_level == 0) opt_debug_level = 1;
-- gp_debug_args(opt_debug_level);
-+ gp_debug_toggle(opt_debug_level);
- }
-
- if (opt_daemon && opt_interactive) {
+++ /dev/null
-From d8166808a98fd1c3772de5d75e27656ed2ab124d Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Tue, 27 Feb 2018 11:59:25 -0500
-Subject: [PATCH] Always use the encype we selected
-
-The enctype is selected from the keytab or from the fallback code.
-Either way make sure to use the enctype stored in the key block.
-
-Signed-off-by: Simo Sorce <simo@redhat.com>
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-Merges: #226
-(cherry picked from commit d73c96d658059ce64ecd41ff2924071d86f2b54f)
----
- proxy/src/gp_export.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/proxy/src/gp_export.c b/proxy/src/gp_export.c
-index c9f5fd4..5e8e160 100644
---- a/proxy/src/gp_export.c
-+++ b/proxy/src/gp_export.c
-@@ -168,11 +168,10 @@ uint32_t gp_init_creds_handle(uint32_t *min, const char *svc_name,
- GP_CREDS_HANDLE_KEY_ENCTYPE, 0,
- &handle->key);
- if (ret == 0) {
-- ret = krb5_c_make_random_key(handle->context,
-- GP_CREDS_HANDLE_KEY_ENCTYPE,
-+ ret = krb5_c_make_random_key(handle->context, handle->key->enctype,
- handle->key);
- GPDEBUG("Service: %s, Enckey: [ephemeral], Enctype: %d\n",
-- svc_name, GP_CREDS_HANDLE_KEY_ENCTYPE);
-+ svc_name, handle->key->enctype);
- }
- if (ret) {
- ret_min = ret;
-@@ -254,7 +253,7 @@ static int gp_decrypt_buffer(krb5_context context, krb5_keyblock *key,
-
- memset(&enc_handle, '\0', sizeof(krb5_enc_data));
-
-- enc_handle.enctype = GP_CREDS_HANDLE_KEY_ENCTYPE;
-+ enc_handle.enctype = key->enctype;
- enc_handle.ciphertext.data = in->octet_string_val;
- enc_handle.ciphertext.length = in->octet_string_len;
-
+++ /dev/null
-From f62ece3a9655c6507f40e03a36e28ecbba16f744 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Fri, 19 May 2017 12:18:03 -0400
-Subject: [PATCH] Appease gcc-7's fallthrough detection
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #188
-(cherry picked from commit fdb56f8a0b6a5fd6a2072a525e228596c264883e)
----
- proxy/src/gp_export.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/proxy/src/gp_export.c b/proxy/src/gp_export.c
-index 3a927c9..f44da50 100644
---- a/proxy/src/gp_export.c
-+++ b/proxy/src/gp_export.c
-@@ -888,7 +888,8 @@ static uint32_t gp_export_creds_linux(uint32_t *min, gss_name_t name,
- if (res != NULL) {
- break;
- }
-- /* fall through as ret == NULL is equivalent to ENOENT */
-+ /* ret == NULL is equivalent to ENOENT */
-+ /* fall through */
- case ENOENT:
- case ESRCH:
- free(pwbuf);
+++ /dev/null
-From 37d1667ad0cc91f46a493281e62775cc8bbe3b5b Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Tue, 14 Mar 2017 10:20:08 -0400
-Subject: [PATCH] Change impersonator check code
-
-In MIT 1.15 we now have a native way to check for an impersonator,
-implement the use of that function but still keep the fallback for
-earlier krb5 versions that do not support this method for now.
-
-Signed-off-by: Simo Sorce <simo@redhat.com>
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-Merges: #172
-(cherry picked from commit 73b50c0b2799f0aed53337a6516b8e1a27279ebf)
----
- proxy/configure.ac | 3 +
- proxy/src/gp_creds.c | 147 ++++++++++++++++++++++++++++++++-----------
- 2 files changed, 112 insertions(+), 38 deletions(-)
-
-diff --git a/proxy/configure.ac b/proxy/configure.ac
-index 63c0edf..c52dbb6 100644
---- a/proxy/configure.ac
-+++ b/proxy/configure.ac
-@@ -131,6 +131,9 @@ AC_CHECK_LIB(gssapi_krb5, gss_export_cred,,
- [AC_MSG_ERROR([GSSAPI library does not support gss_export_cred])],
- [$GSSAPI_LIBS])
-
-+AC_CHECK_DECLS([GSS_KRB5_GET_CRED_IMPERSONATOR], [], [],
-+ [[#include <gssapi/gssapi_krb5.h>]])
-+
- AC_SUBST([KRB5_CFLAGS])
- AC_SUBST([KRB5_LIBS])
- AC_SUBST([GSSAPI_CFLAGS])
-diff --git a/proxy/src/gp_creds.c b/proxy/src/gp_creds.c
-index 171a724..95a1c48 100644
---- a/proxy/src/gp_creds.c
-+++ b/proxy/src/gp_creds.c
-@@ -773,9 +773,9 @@ void gp_filter_flags(struct gp_call_ctx *gpcall, uint32_t *flags)
- *flags &= ~gpcall->service->filter_flags;
- }
-
--uint32_t gp_cred_allowed(uint32_t *min,
-- struct gp_call_ctx *gpcall,
-- gss_cred_id_t cred)
-+
-+static uint32_t get_impersonator_fallback(uint32_t *min, gss_cred_id_t cred,
-+ char **impersonator)
- {
- uint32_t ret_maj = 0;
- uint32_t ret_min = 0;
-@@ -785,22 +785,6 @@ uint32_t gp_cred_allowed(uint32_t *min,
- krb5_data config;
- int err;
-
-- if (cred == GSS_C_NO_CREDENTIAL) {
-- return GSS_S_CRED_UNAVAIL;
-- }
--
-- if (gpcall->service->trusted ||
-- gpcall->service->impersonate ||
-- gpcall->service->allow_const_deleg) {
--
-- GPDEBUGN(2, "Credentials allowed by configuration\n");
-- *min = 0;
-- return GSS_S_COMPLETE;
-- }
--
-- /* FIXME: krb5 specific code, should get an oid registerd to query the
-- * cred with gss_inquire_cred_by_oid() or similar instead */
--
- err = krb5_init_context(&context);
- if (err) {
- ret_min = err;
-@@ -835,21 +819,116 @@ uint32_t gp_cred_allowed(uint32_t *min,
- goto done;
- }
-
-+ err = krb5_cc_get_config(context, ccache, NULL, "proxy_impersonator",
-+ &config);
-+ if (err == 0) {
-+ *impersonator = strndup(config.data, config.length);
-+ if (!*impersonator) {
-+ ret_min = ENOMEM;
-+ ret_maj = GSS_S_FAILURE;
-+ } else {
-+ ret_min = 0;
-+ ret_maj = GSS_S_COMPLETE;
-+ }
-+ krb5_free_data_contents(context, &config);
-+ } else {
-+ ret_min = err;
-+ ret_maj = GSS_S_FAILURE;
-+ }
-+
-+done:
-+ if (context) {
-+ if (ccache) {
-+ krb5_cc_destroy(context, ccache);
-+ }
-+ krb5_free_context(context);
-+ }
-+ free(memcache);
-+
-+ *min = ret_min;
-+ return ret_maj;
-+}
-+
-+#if !HAVE_DECL_GSS_KRB5_GET_CRED_IMPERSONATOR
-+gss_OID_desc impersonator_oid = {
-+ 11, discard_const("\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x0e")
-+};
-+const gss_OID GSS_KRB5_GET_CRED_IMPERSONATOR = &impersonator_oid;
-+#endif
-+
-+static uint32_t get_impersonator_name(uint32_t *min, gss_cred_id_t cred,
-+ char **impersonator)
-+{
-+ gss_buffer_set_t bufset = GSS_C_NO_BUFFER_SET;
-+ uint32_t ret_maj = 0;
-+ uint32_t ret_min = 0;
-+ uint32_t discard;
-+
-+ *impersonator = NULL;
-+
-+ ret_maj = gss_inquire_cred_by_oid(&ret_min, cred,
-+ GSS_KRB5_GET_CRED_IMPERSONATOR,
-+ &bufset);
-+ if (ret_maj == GSS_S_COMPLETE) {
-+ if (bufset->count == 0) {
-+ ret_min = ENOENT;
-+ ret_maj = GSS_S_COMPLETE;
-+ goto done;
-+ }
-+ *impersonator = strndup(bufset->elements[0].value,
-+ bufset->elements[0].length);
-+ if (!*impersonator) {
-+ ret_min = ENOMEM;
-+ ret_maj = GSS_S_FAILURE;
-+ }
-+ } else if (ret_maj == GSS_S_UNAVAILABLE) {
-+ /* Not supported by krb5 library yet, fallback to raw krb5 calls */
-+ /* TODO: Remove once we set a required dependency on MIT 1.15+ */
-+ ret_maj = get_impersonator_fallback(&ret_min, cred, impersonator);
-+ if (ret_maj == GSS_S_FAILURE) {
-+ if (ret_min == KRB5_CC_NOTFOUND) {
-+ ret_min = ENOENT;
-+ ret_maj = GSS_S_COMPLETE;
-+ }
-+ }
-+ }
-+
-+done:
-+ (void)gss_release_buffer_set(&discard, &bufset);
-+ *min = ret_min;
-+ return ret_maj;
-+}
-+
-+uint32_t gp_cred_allowed(uint32_t *min,
-+ struct gp_call_ctx *gpcall,
-+ gss_cred_id_t cred)
-+{
-+ char *impersonator = NULL;
-+ uint32_t ret_maj = 0;
-+ uint32_t ret_min = 0;
-+
-+ if (cred == GSS_C_NO_CREDENTIAL) {
-+ return GSS_S_CRED_UNAVAIL;
-+ }
-+
-+ if (gpcall->service->trusted ||
-+ gpcall->service->impersonate ||
-+ gpcall->service->allow_const_deleg) {
-+
-+ GPDEBUGN(2, "Credentials allowed by configuration\n");
-+ *min = 0;
-+ return GSS_S_COMPLETE;
-+ }
-+
-+ ret_maj = get_impersonator_name(&ret_min, cred, &impersonator);
-+ if (ret_maj) goto done;
-+
- /* if we find an impersonator entry we bail as that is not authorized,
- * if it were then gpcall->service->allow_const_deleg would have caused
- * the ealier check to return GSS_S_COMPLETE already */
-- err = krb5_cc_get_config(context, ccache, NULL, "proxy_impersonator",
-- &config);
-- if (!err) {
-- krb5_free_data_contents(context, &config);
-+ if (impersonator != NULL) {
- ret_min = 0;
- ret_maj = GSS_S_UNAUTHORIZED;
-- } else if (err != KRB5_CC_NOTFOUND) {
-- ret_min = err;
-- ret_maj = GSS_S_FAILURE;
-- } else {
-- ret_min = 0;
-- ret_maj = GSS_S_COMPLETE;
- }
-
- done:
-@@ -864,15 +943,7 @@ done:
- GPDEBUG("Failure while checking credentials\n");
- break;
- }
-- if (context) {
-- /* NOTE: destroy only if we created a MEMORY ccache */
-- if (ccache) {
-- if (memcache) krb5_cc_destroy(context, ccache);
-- else krb5_cc_close(context, ccache);
-- }
-- krb5_free_context(context);
-- }
-- free(memcache);
-+ free(impersonator);
- *min = ret_min;
- return ret_maj;
- }
+++ /dev/null
-From 384a1cff4855ad612ca71d3831a0c2c19a355c49 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 11 Apr 2018 16:01:21 -0400
-Subject: [PATCH] Clarify debug and debug_level in man pages
-
-In particular, add debug_level to gssproxy(5) since it was previously
-accepted but not documented.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #229
-(cherry picked from commit e0e96e46be03102903533a9816b4deefe1adfaf8)
----
- proxy/man/gssproxy.8.xml | 24 +++++++++++++++++++++++-
- proxy/man/gssproxy.conf.5.xml | 5 ++++-
- 2 files changed, 27 insertions(+), 2 deletions(-)
-
-diff --git a/proxy/man/gssproxy.8.xml b/proxy/man/gssproxy.8.xml
-index 1df4b0d..21f7e6a 100644
---- a/proxy/man/gssproxy.8.xml
-+++ b/proxy/man/gssproxy.8.xml
-@@ -118,13 +118,35 @@
- </para>
- </listitem>
- </varlistentry>
-+
- <varlistentry>
- <term>
- <option>-d</option>,<option>--debug</option>
- </term>
- <listitem>
- <para>
-- Turn on debugging.
-+ Turn on debugging. This option is identical to
-+ --debug-level=1.
-+ </para>
-+ </listitem>
-+ </varlistentry>
-+
-+ <varlistentry>
-+ <term>
-+ <option>--debug-level=</option>
-+ </term>
-+ <listitem>
-+ <para>
-+ Turn on debugging at the specified level. 0
-+ corresponds to no logging, while 1 turns on basic
-+ debug logging. Level 2 increases verbosity, including
-+ more detailed credential verification.
-+ </para>
-+ <para>
-+ At level 3 and above, KRB5_TRACE output is logged. If
-+ KRB5_TRACE was already set in the execution
-+ environment, trace output is sent to its value
-+ instead.
- </para>
- </listitem>
- </varlistentry>
-diff --git a/proxy/man/gssproxy.conf.5.xml b/proxy/man/gssproxy.conf.5.xml
-index ad9d96f..abb6745 100644
---- a/proxy/man/gssproxy.conf.5.xml
-+++ b/proxy/man/gssproxy.conf.5.xml
-@@ -191,7 +191,10 @@
- <varlistentry>
- <term>debug (boolean)</term>
- <listitem>
-- <para>Enable debugging to syslog.</para>
-+ <para>
-+ Enable debugging to syslog. Setting to true is
-+ identical to setting debug_level to 1.
-+ </para>
- <para>Default: debug = false</para>
- </listitem>
- </varlistentry>
+++ /dev/null
-From 8a5ba5feb98ecc3c57ee865604799fc4e4a90c61 Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <ascheel@redhat.com>
-Date: Mon, 26 Jun 2017 17:04:16 -0400
-Subject: [PATCH] Conditionally reload kernel interface on SIGHUP
-
-Signed-off-by: Alexander Scheel <ascheel@redhat.com>
-[rharwood@redhat.com: Simplified logic, rewrote commit message]
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-Resolves: #193
-Merges: #201
-(cherry picked from commit 938af94b8f33c227dcdd6a53ed42de418578d29d)
----
- proxy/src/gp_init.c | 4 +++-
- proxy/src/gssproxy.c | 3 +++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/proxy/src/gp_init.c b/proxy/src/gp_init.c
-index e69934d..6a2b047 100644
---- a/proxy/src/gp_init.c
-+++ b/proxy/src/gp_init.c
-@@ -145,6 +145,7 @@ void init_proc_nfsd(struct gp_config *cfg)
- char buf[] = "1";
- bool enabled = false;
- int fd, ret;
-+ static int poked = 0;
-
- /* check first if any service enabled kernel support */
- for (int i = 0; i < cfg->num_svcs; i++) {
-@@ -154,7 +155,7 @@ void init_proc_nfsd(struct gp_config *cfg)
- }
- }
-
-- if (!enabled) {
-+ if (!enabled || poked) {
- return;
- }
-
-@@ -173,6 +174,7 @@ void init_proc_nfsd(struct gp_config *cfg)
- LINUX_PROC_USE_GSS_PROXY_FILE, ret, gp_strerror(ret));
- }
-
-+ poked = 1;
- close(fd);
- if (ret != 0) {
- goto fail;
-diff --git a/proxy/src/gssproxy.c b/proxy/src/gssproxy.c
-index 94a6a61..5fc4f8d 100644
---- a/proxy/src/gssproxy.c
-+++ b/proxy/src/gssproxy.c
-@@ -140,6 +140,9 @@ static void hup_handler(verto_ctx *vctx, verto_ev *ev UNUSED)
- exit(ret);
- }
-
-+ /* conditionally reload kernel interface */
-+ init_proc_nfsd(gpctx->config);
-+
- free_config(&old_config);
-
- GPDEBUG("New config loaded successfully.\n");
+++ /dev/null
-From 32578afb817f20446d888326814b52a8f3d6c0fe Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Thu, 26 Oct 2017 16:59:18 -0400
-Subject: [PATCH] Do not call gpm_grab_sock() twice
-
-In the gpm_get_ctx() call, we unnecessarily call gpm_grab_sock() which
-would cause the lock to be held by one thread and never released. We
-already call gpm_grab_sock() as the first thing after gpm_get_ctx() in
-gpm_make_call(), plus gpm_make_call() properly releases the socket
-once done.
-
-This corrects the deadlock fix in
-461a5fa9f91a2753ebeef6323a64239c35e2f250, which incorrectly released
-the lock we wanted to grab. This caused the socket to not be locked
-to our thread. Another thread could come along and change the global
-ctx while we were still using the socket from another thread, causing
-concurrency issues as only one request can be in flight on any given
-socket at the same time.
-
-In special cases where the "thread" uid/gid changes (like in
-rpc.gssd), we end up closing the socket while we are still waiting for
-an answer from the server, causing additional issues and confusion.
-
-[rharwood@redhat.com: squashed 2 commits; minor edits accordingly]
-Signed-off-by: Simo Sorce <simo@redhat.com>
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-Merges: #218
-(cherry picked from commit 8590c5dbc6fa07d0c366df23b982a4b6b9ffc259)
----
- proxy/src/client/gpm_common.c | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/proxy/src/client/gpm_common.c b/proxy/src/client/gpm_common.c
-index 69f4741..2133618 100644
---- a/proxy/src/client/gpm_common.c
-+++ b/proxy/src/client/gpm_common.c
-@@ -152,7 +152,9 @@ static int gpm_grab_sock(struct gpm_ctx *gpmctx)
- ret = gpm_open_socket(gpmctx);
- }
-
-- pthread_mutex_unlock(&gpmctx->lock);
-+ if (ret) {
-+ pthread_mutex_unlock(&gpmctx->lock);
-+ }
- return ret;
- }
-
-@@ -304,11 +306,6 @@ static struct gpm_ctx *gpm_get_ctx(void)
-
- pthread_once(&gpm_init_once_control, gpm_init_once);
-
-- ret = gpm_grab_sock(&gpm_global_ctx);
-- if (ret) {
-- return NULL;
-- }
--
- return &gpm_global_ctx;
- }
-
+++ /dev/null
-From dd1699810efe933858badce463bece239d19e886 Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <ascheel@redhat.com>
-Date: Tue, 8 Aug 2017 11:36:56 -0400
-Subject: [PATCH] Don't leak mech_type when CONTINUE_NEEDED from
- init_sec_context
-
-Signed-off-by: Alexander Scheel <ascheel@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-Merges: #207
-(cherry picked from commit ca26c0f58ac961a16b06c3fb93b985d574116b2c)
----
- proxy/src/gp_export.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/proxy/src/gp_export.c b/proxy/src/gp_export.c
-index 0c39045..c9f5fd4 100644
---- a/proxy/src/gp_export.c
-+++ b/proxy/src/gp_export.c
-@@ -687,6 +687,7 @@ export:
- case EXP_CTX_PARTIAL:
- /* this happens only when a init_sec_context call returns a partially
- * initialized context so we return only what we have, not much */
-+ xdr_free((xdrproc_t)xdr_gssx_OID, (char *)&out->mech);
- ret = gp_conv_oid_to_gssx(mech, &out->mech);
- if (ret) {
- ret_maj = GSS_S_FAILURE;
+++ /dev/null
-From f1f89ef85b65b95f568d46fea85c7e7834e3a101 Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Thu, 26 Oct 2017 11:47:54 -0400
-Subject: [PATCH] Emit debug on queue errors
-
-Signed-off-by: Simo Sorce <simo@redhat.com>
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-Merges: #218
-(cherry picked from commit af666affbd4735ba437e3d89d9e22984a556ed16)
----
- proxy/src/gp_workers.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/proxy/src/gp_workers.c b/proxy/src/gp_workers.c
-index 2a33c21..18f38f6 100644
---- a/proxy/src/gp_workers.c
-+++ b/proxy/src/gp_workers.c
-@@ -314,6 +314,8 @@ static void gp_handle_reply(verto_ctx *vctx, verto_ev *ev)
- case GP_QUERY_IN:
- /* ?! fallback and kill client conn */
- case GP_QUERY_ERR:
-+ GPDEBUGN(3, "[status] Handling query error, terminating CID %d.\n",
-+ gp_conn_get_cid(q->conn));
- gp_conn_free(q->conn);
- gp_query_free(q, true);
- break;
+++ /dev/null
-From f21071fb3662824698b61d384b1144657a508043 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 15 Mar 2017 14:57:57 -0400
-Subject: [PATCH] Fix error checking on get_impersonator_fallback()
-
-Separate commit to ease backporting.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #173
-(cherry picked from commit 25e31ebccde7f0d98480b6a99962fef61dd251b4)
----
- proxy/src/gp_creds.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/proxy/src/gp_creds.c b/proxy/src/gp_creds.c
-index e05ad01..fdc6bdf 100644
---- a/proxy/src/gp_creds.c
-+++ b/proxy/src/gp_creds.c
-@@ -885,7 +885,7 @@ static uint32_t get_impersonator_name(uint32_t *min, gss_cred_id_t cred,
- * release that supports this call */
- ret_maj = get_impersonator_fallback(&ret_min, cred, impersonator);
- if (ret_maj == GSS_S_FAILURE) {
-- if (ret_min == KRB5_CC_NOTFOUND) {
-+ if (ret_min == (uint32_t)KRB5_CC_NOTFOUND) {
- ret_min = ENOENT;
- ret_maj = GSS_S_COMPLETE;
- }
+++ /dev/null
-From 8603c619ca9bc923534d83ee432ddd756f285d4c Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <ascheel@redhat.com>
-Date: Wed, 12 Jul 2017 09:26:52 -0400
-Subject: [PATCH] Fix error handling in gp_config_from_dir
-
-Signed-off-by: Alexander Scheel <ascheel@redhat.com>
-[rharwood@redhat.com: c99, refactor some existing code]
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-Merges: #204
-(cherry picked from commit eb880e93ed4a48c67ac27b4d5194f0f7786da83e)
----
- proxy/src/gp_config.c | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c
-index 8fd60a3..07f7c8d 100644
---- a/proxy/src/gp_config.c
-+++ b/proxy/src/gp_config.c
-@@ -798,17 +798,21 @@ static int gp_config_from_dir(const char *config_dir,
- &error_list,
- NULL);
- if (ret) {
-- if (error_list) {
-- uint32_t i;
-- uint32_t len = ref_array_getlen(error_list, &i);
-- for (i = 0; i < len; i++) {
-- GPDEBUG("Error when reading config directory: %s\n",
-- (const char *) ref_array_get(error_list, i, NULL));
-- }
-- ref_array_destroy(error_list);
-- } else {
-- GPDEBUG("Error when reading config directory number: %d\n", ret);
-+ uint32_t len;
-+
-+ if (!error_list) {
-+ GPAUDIT("Error when reading config directory number: %d\n", ret);
-+ return ret;
- }
-+
-+ len = ref_array_len(error_list);
-+ for (uint32_t i = 0; i < len; i++) {
-+ /* libini has an unfixable bug where error strings are (char **) */
-+ GPAUDIT("Error when reading config directory: %s\n",
-+ *(char **)ref_array_get(error_list, i, NULL));
-+ }
-+
-+ ref_array_destroy(error_list);
- return ret;
- }
-
+++ /dev/null
-From 027596a3df85d11948f4fb3a28d27d6523645589 Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <alexander.m.scheel@gmail.com>
-Date: Thu, 14 Sep 2017 11:24:39 -0500
-Subject: [PATCH] Fix error handling in gpm_send_buffer/gpm_recv_buffer
-
-Signed-off-by: Alexander Scheel <alexander.m.scheel@gmail.com>
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-Merges: #213
-[rharwood@redhat.com: commit message formatting, copyright update]
-(cherry picked from commit f2530fc280dd84e6abc0f5475e261aa0d2ee2a21)
----
- proxy/src/client/gpm_common.c | 18 ++++++------------
- 1 file changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/proxy/src/client/gpm_common.c b/proxy/src/client/gpm_common.c
-index b14e846..0d314fa 100644
---- a/proxy/src/client/gpm_common.c
-+++ b/proxy/src/client/gpm_common.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 the GSS-PROXY contributors, see COPYING for license */
-+/* Copyright (C) 2011,2017 the GSS-PROXY contributors, see COPYING for license */
-
- #include "gssapi_gpm.h"
- #include <sys/types.h>
-@@ -415,10 +415,7 @@ static int gpm_send_buffer(struct gpm_ctx *gpmctx,
- ret = 0;
-
- done:
-- if (ret) {
-- /* on errors we can only close the fd and return */
-- gpm_close_socket(gpmctx);
-- }
-+ /* we only need to return as gpm_retry_socket closes the socket */
- return ret;
- }
-
-@@ -488,9 +485,10 @@ static int gpm_recv_buffer(struct gpm_ctx *gpmctx,
-
- done:
- if (ret) {
-- /* on errors we can only close the fd and return */
-- gpm_close_socket(gpmctx);
-- gpm_epoll_close(gpmctx);
-+ /* on errors, free the buffer to prevent calling
-+ * xdr_destroy(&xdr_reply_ctx); */
-+ free(*buffer);
-+ *buffer = NULL;
- }
- return ret;
- }
-@@ -560,10 +558,6 @@ static int gpm_send_recv_loop(struct gpm_ctx *gpmctx, char *send_buffer,
- /* Close and reopen socket before trying again */
- ret = gpm_retry_socket(gpmctx);
-
-- /* Free buffer and set it to NULL to prevent free(xdr_reply_ctx) */
-- free(*recv_buffer);
-- *recv_buffer = NULL;
--
- if (ret != 0)
- return ret;
- ret = ETIMEDOUT;
+++ /dev/null
-From a2a5789d6410e12469ea0f81c9a31ce70bac9ede Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <alexander.m.scheel@gmail.com>
-Date: Thu, 14 Sep 2017 11:16:42 -0500
-Subject: [PATCH] Fix handling of non-EPOLLIN/EPOLLOUT events
-
-Signed-off-by: Alexander Scheel <alexander.m.scheel@gmail.com>
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-Merges: #213
-(cherry picked from commit b8f5b2f75612a11753cf742ee0477b98df8e6b02)
----
- proxy/src/client/gpm_common.c | 49 +++++++++++++++++++++++++----------
- 1 file changed, 35 insertions(+), 14 deletions(-)
-
-diff --git a/proxy/src/client/gpm_common.c b/proxy/src/client/gpm_common.c
-index 7d1158e..b14e846 100644
---- a/proxy/src/client/gpm_common.c
-+++ b/proxy/src/client/gpm_common.c
-@@ -283,26 +283,47 @@ static int gpm_epoll_wait(struct gpm_ctx *gpmctx, uint32_t event_flags) {
- gpm_epoll_close(gpmctx);
- } else if (epoll_ret == 1 && events[0].data.fd == gpmctx->timerfd) {
- /* Got an event which is only our timer */
-- ret = read(gpmctx->timerfd, &timer_read, sizeof(uint64_t));
-- if (ret == -1 && errno != EAGAIN && errno != EWOULDBLOCK) {
-- /* In the case when reading from the timer failed, don't hide the
-- * timer error behind ETIMEDOUT such that it isn't retried */
-- ret = errno;
-+ if ((events[0].events & EPOLLIN) == 0) {
-+ /* We got an event which was not EPOLLIN; assume this is an error,
-+ * and exit with EBADF: epoll_wait said timerfd had an event,
-+ * but that event is not an EPOLIN event. */
-+ ret = EBADF;
- } else {
-- /* If ret == 0, then we definitely timed out. Else, if ret == -1
-- * and errno == EAGAIN or errno == EWOULDBLOCK, we're in a weird
-- * edge case where epoll thinks the timer can be read, but it
-- * is blocking more; treat it like a TIMEOUT and retry, as
-- * nothing around us would handle EAGAIN from timer and retry
-- * it. */
-- ret = ETIMEDOUT;
-+ ret = read(gpmctx->timerfd, &timer_read, sizeof(uint64_t));
-+ if (ret == -1 && errno != EAGAIN && errno != EWOULDBLOCK) {
-+ /* In the case when reading from the timer failed, don't hide the
-+ * timer error behind ETIMEDOUT such that it isn't retried */
-+ ret = errno;
-+ } else {
-+ /* If ret == 0, then we definitely timed out. Else, if ret == -1
-+ * and errno == EAGAIN or errno == EWOULDBLOCK, we're in a weird
-+ * edge case where epoll thinks the timer can be read, but it
-+ * is blocking more; treat it like a TIMEOUT and retry, as
-+ * nothing around us would handle EAGAIN from timer and retry
-+ * it. */
-+ ret = ETIMEDOUT;
-+ }
- }
- gpm_epoll_close(gpmctx);
- } else {
- /* If ret == 2, then we ignore the timerfd; that way if the next
- * operation cannot be performed immediately, we timeout and retry.
-- * If ret == 1 and data.fd == gpmctx->fd, return 0. */
-- ret = 0;
-+ * Always check the returned event of the socket fd. */
-+ int fd_index = 0;
-+ if (epoll_ret == 2 && events[fd_index].data.fd != gpmctx->fd) {
-+ fd_index = 1;
-+ }
-+
-+ if ((events[fd_index].events & event_flags) == 0) {
-+ /* We cannot call EPOLLIN/EPOLLOUT at this time; assume that this
-+ * is a fatal error; return with EBADFD to distinguish from
-+ * EBADF in timer_fd case. */
-+ ret = EBADFD;
-+ gpm_epoll_close(gpmctx);
-+ } else {
-+ /* We definintely got a EPOLLIN/EPOLLOUT event; return success. */
-+ ret = 0;
-+ }
- }
-
- epoll_ret = epoll_ctl(gpmctx->epollfd, EPOLL_CTL_DEL, gpmctx->fd, NULL);
+++ /dev/null
-From abcd9ae04b1c3f9f0ebb72bd48737b08d5d7fe65 Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Thu, 25 May 2017 21:35:37 -0400
-Subject: [PATCH] Fix memory leak
-
-Signed-off-by: Simo Sorce <simo@redhat.com>
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-Related-to: #176
-(cherry picked from commit 69a73d85eb3e70fdc7501794d5fd11a73a1d20fa)
----
- proxy/src/gp_export.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/proxy/src/gp_export.c b/proxy/src/gp_export.c
-index f44da50..4e081df 100644
---- a/proxy/src/gp_export.c
-+++ b/proxy/src/gp_export.c
-@@ -381,6 +381,7 @@ uint32_t gp_export_gssx_cred(uint32_t *min, struct gp_call_ctx *gpcall,
-
- done:
- *min = ret_min;
-+ gss_release_buffer(&ret_min, &token);
- gss_release_name(&ret_min, &name);
- gss_release_oid_set(&ret_min, &mechanisms);
- return ret_maj;
+++ /dev/null
-From a68b8b418bfc42c628fee605cc52dca92ab410c9 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 15 Mar 2017 14:52:08 -0400
-Subject: [PATCH] Fix mismatched sign comparisons
-
-We are c99, so also migrate to `for`-loop initializers where possible for
-clarity.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #173
-(cherry picked from commit 377e92c7ead312c530b233a1e023493ecde033d6)
----
- proxy/src/client/gpm_acquire_cred.c | 11 ++-----
- proxy/src/client/gpm_common.c | 4 +--
- proxy/src/client/gpm_import_and_canon_name.c | 7 ++---
- proxy/src/client/gpm_indicate_mechs.c | 33 +++++++++-----------
- proxy/src/gp_common.h | 3 +-
- proxy/src/gp_config.c | 9 ++----
- proxy/src/gp_conv.c | 6 ++--
- proxy/src/gp_creds.c | 3 +-
- proxy/src/gp_export.c | 9 ++----
- proxy/src/gp_rpc_acquire_cred.c | 5 ++-
- proxy/src/gp_rpc_debug.c | 26 +++++++--------
- proxy/src/gp_rpc_indicate_mechs.c | 15 +++------
- proxy/src/gp_socket.c | 4 +--
- proxy/src/gp_util.c | 4 +--
- proxy/tests/t_utils.c | 4 +--
- 15 files changed, 58 insertions(+), 85 deletions(-)
-
-diff --git a/proxy/src/client/gpm_acquire_cred.c b/proxy/src/client/gpm_acquire_cred.c
-index 632973d..8e30e1d 100644
---- a/proxy/src/client/gpm_acquire_cred.c
-+++ b/proxy/src/client/gpm_acquire_cred.c
-@@ -6,8 +6,6 @@ static int gpmint_cred_to_actual_mechs(gssx_cred *c, gss_OID_set *a)
- {
- gssx_cred_element *e;
- gss_OID_set m = GSS_C_NO_OID_SET;
-- int i;
--
-
- if (c->elements.elements_len) {
-
-@@ -22,7 +20,7 @@ static int gpmint_cred_to_actual_mechs(gssx_cred *c, gss_OID_set *a)
- return ENOMEM;
- }
-
-- for (i = 0; i < c->elements.elements_len; i++) {
-+ for (unsigned i = 0; i < c->elements.elements_len; i++) {
- e = &c->elements.elements_val[i];
-
- m->elements[i].elements = gp_memdup(e->mech.octet_string_val,
-@@ -280,7 +278,6 @@ OM_uint32 gpm_inquire_cred(OM_uint32 *minor_status,
- uint32_t ret_maj = GSS_S_COMPLETE;
- uint32_t life;
- int cu;
-- int i;
-
- if (!cred) {
- *minor_status = 0;
-@@ -308,8 +305,7 @@ OM_uint32 gpm_inquire_cred(OM_uint32 *minor_status,
- life = GSS_C_INDEFINITE;
- cu = -1;
-
-- for (i = 0; i < cred->elements.elements_len; i++) {
--
-+ for (unsigned i = 0; i < cred->elements.elements_len; i++) {
- e = &cred->elements.elements_val[i];
-
- switch (e->cred_usage) {
-@@ -402,7 +398,7 @@ OM_uint32 gpm_inquire_cred_by_mech(OM_uint32 *minor_status,
- gss_OID_desc tmp_oid;
- uint32_t ret_min = 0;
- uint32_t ret_maj = GSS_S_COMPLETE;
-- int i;
-+ unsigned i;
-
- if (!cred) {
- *minor_status = 0;
-@@ -414,7 +410,6 @@ OM_uint32 gpm_inquire_cred_by_mech(OM_uint32 *minor_status,
- }
-
- for (i = 0; i < cred->elements.elements_len; i++) {
--
- e = &cred->elements.elements_val[i];
- gp_conv_gssx_to_oid(&e->mech, &tmp_oid);
- if (!gss_oid_equal(&tmp_oid, mech_type)) {
-diff --git a/proxy/src/client/gpm_common.c b/proxy/src/client/gpm_common.c
-index 030765a..8c96986 100644
---- a/proxy/src/client/gpm_common.c
-+++ b/proxy/src/client/gpm_common.c
-@@ -166,7 +166,7 @@ static int gpm_send_buffer(struct gpm_ctx *gpmctx,
- char *buffer, uint32_t length)
- {
- uint32_t size;
-- size_t wn;
-+ ssize_t wn;
- size_t pos;
- bool retry;
- int ret;
-@@ -232,7 +232,7 @@ static int gpm_recv_buffer(struct gpm_ctx *gpmctx,
- char *buffer, uint32_t *length)
- {
- uint32_t size;
-- size_t rn;
-+ ssize_t rn;
- size_t pos;
- int ret;
-
-diff --git a/proxy/src/client/gpm_import_and_canon_name.c b/proxy/src/client/gpm_import_and_canon_name.c
-index 83d0736..70149a3 100644
---- a/proxy/src/client/gpm_import_and_canon_name.c
-+++ b/proxy/src/client/gpm_import_and_canon_name.c
-@@ -275,7 +275,6 @@ OM_uint32 gpm_inquire_name(OM_uint32 *minor_status,
- {
- gss_buffer_set_t xattrs = GSS_C_NO_BUFFER_SET;
- int ret;
-- int i;
-
- *minor_status = 0;
-
-@@ -306,13 +305,13 @@ OM_uint32 gpm_inquire_name(OM_uint32 *minor_status,
- *minor_status = ENOMEM;
- return GSS_S_FAILURE;
- }
-- for (i = 0; i < xattrs->count; i++) {
-+ for (unsigned i = 0; i < xattrs->count; i++) {
- ret = gp_copy_gssx_to_buffer(
- &name->name_attributes.name_attributes_val[i].attr,
- &xattrs->elements[i]);
- if (ret) {
-- for (--i; i >= 0; i--) {
-- free(xattrs->elements[i].value);
-+ for (; i > 0; i--) {
-+ free(xattrs->elements[i-1].value);
- }
- free(xattrs->elements);
- free(xattrs);
-diff --git a/proxy/src/client/gpm_indicate_mechs.c b/proxy/src/client/gpm_indicate_mechs.c
-index d4df923..b019a96 100644
---- a/proxy/src/client/gpm_indicate_mechs.c
-+++ b/proxy/src/client/gpm_indicate_mechs.c
-@@ -51,7 +51,6 @@ static uint32_t gpm_copy_gss_OID_set(uint32_t *minor_status,
- gss_OID_set n;
- uint32_t ret_maj;
- uint32_t ret_min;
-- int i;
-
- ret_maj = gss_create_empty_oid_set(&ret_min, &n);
- if (ret_maj) {
-@@ -59,7 +58,7 @@ static uint32_t gpm_copy_gss_OID_set(uint32_t *minor_status,
- return ret_maj;
- }
-
-- for (i = 0; i < oldset->count; i++) {
-+ for (size_t i = 0; i < oldset->count; i++) {
- ret_maj = gss_add_oid_set_member(&ret_min, &oldset->elements[i], &n);
- if (ret_maj) {
- *minor_status = ret_min;
-@@ -124,7 +123,6 @@ static void gpmint_indicate_mechs(void)
- uint32_t ret_min;
- uint32_t ret_maj = 0;
- int ret = 0;
-- int i;
-
- memset(arg, 0, sizeof(gssx_arg_indicate_mechs));
- memset(res, 0, sizeof(gssx_res_indicate_mechs));
-@@ -158,7 +156,7 @@ static void gpmint_indicate_mechs(void)
- goto done;
- }
-
-- for (i = 0; i < res->mechs.mechs_len; i++) {
-+ for (unsigned i = 0; i < res->mechs.mechs_len; i++) {
- mi = &res->mechs.mechs_val[i];
- gi = &global_mechs.info[i];
-
-@@ -222,7 +220,7 @@ static void gpmint_indicate_mechs(void)
- goto done;
- }
-
-- for (i = 0; i < res->mech_attr_descs.mech_attr_descs_len; i++) {
-+ for (unsigned i = 0; i < res->mech_attr_descs.mech_attr_descs_len; i++) {
- ma = &res->mech_attr_descs.mech_attr_descs_val[i];
- ga = &global_mechs.desc[i];
-
-@@ -249,7 +247,7 @@ static void gpmint_indicate_mechs(void)
-
- done:
- if (ret || ret_maj) {
-- for (i = 0; i < global_mechs.desc_len; i++) {
-+ for (unsigned i = 0; i < global_mechs.desc_len; i++) {
- ga = &global_mechs.desc[i];
- gss_release_oid(&discard, &ga->attr);
- gss_release_buffer(&discard, ga->name);
-@@ -258,7 +256,7 @@ done:
- }
- free(global_mechs.desc);
- global_mechs.desc = NULL;
-- for (i = 0; i < global_mechs.info_len; i++) {
-+ for (unsigned i = 0; i < global_mechs.info_len; i++) {
- gi = &global_mechs.info[i];
- gss_release_oid(&discard, &gi->mech);
- gss_release_oid_set(&discard, &gi->name_types);
-@@ -335,7 +333,6 @@ OM_uint32 gpm_inquire_names_for_mech(OM_uint32 *minor_status,
- {
- uint32_t ret_min;
- uint32_t ret_maj;
-- int i;
-
- if (!minor_status) {
- return GSS_S_CALL_INACCESSIBLE_WRITE;
-@@ -351,7 +348,7 @@ OM_uint32 gpm_inquire_names_for_mech(OM_uint32 *minor_status,
- return GSS_S_FAILURE;
- }
-
-- for (i = 0; i < global_mechs.info_len; i++) {
-+ for (unsigned i = 0; i < global_mechs.info_len; i++) {
- if (!gpm_equal_oids(global_mechs.info[i].mech, mech_type)) {
- continue;
- }
-@@ -375,7 +372,6 @@ OM_uint32 gpm_inquire_mechs_for_name(OM_uint32 *minor_status,
- uint32_t discard;
- gss_OID name_type = GSS_C_NO_OID;
- int present;
-- int i;
-
- if (!minor_status) {
- return GSS_S_CALL_INACCESSIBLE_WRITE;
-@@ -402,7 +398,7 @@ OM_uint32 gpm_inquire_mechs_for_name(OM_uint32 *minor_status,
- goto done;
- }
-
-- for (i = 0; i < global_mechs.info_len; i++) {
-+ for (unsigned i = 0; i < global_mechs.info_len; i++) {
- ret_maj = gss_test_oid_set_member(&ret_min, name_type,
- global_mechs.info[i].name_types,
- &present);
-@@ -439,7 +435,6 @@ OM_uint32 gpm_inquire_attrs_for_mech(OM_uint32 *minor_status,
- uint32_t ret_min;
- uint32_t ret_maj;
- uint32_t discard;
-- int i;
-
- if (!minor_status) {
- return GSS_S_CALL_INACCESSIBLE_WRITE;
-@@ -451,7 +446,7 @@ OM_uint32 gpm_inquire_attrs_for_mech(OM_uint32 *minor_status,
- return GSS_S_FAILURE;
- }
-
-- for (i = 0; i < global_mechs.info_len; i++) {
-+ for (unsigned i = 0; i < global_mechs.info_len; i++) {
- if (!gpm_equal_oids(global_mechs.info[i].mech, mech)) {
- continue;
- }
-@@ -495,7 +490,6 @@ OM_uint32 gpm_inquire_saslname_for_mech(OM_uint32 *minor_status,
- uint32_t ret_min;
- uint32_t ret_maj;
- uint32_t discard;
-- int i;
-
- if (!minor_status) {
- return GSS_S_CALL_INACCESSIBLE_WRITE;
-@@ -511,7 +505,7 @@ OM_uint32 gpm_inquire_saslname_for_mech(OM_uint32 *minor_status,
- return GSS_S_FAILURE;
- }
-
-- for (i = 0; i < global_mechs.info_len; i++) {
-+ for (unsigned i = 0; i < global_mechs.info_len; i++) {
- if (!gpm_equal_oids(global_mechs.info[i].mech, desired_mech)) {
- continue;
- }
-@@ -554,7 +548,6 @@ OM_uint32 gpm_display_mech_attr(OM_uint32 *minor_status,
- uint32_t ret_min;
- uint32_t ret_maj;
- uint32_t discard;
-- int i;
-
- if (!minor_status) {
- return GSS_S_CALL_INACCESSIBLE_WRITE;
-@@ -570,7 +563,7 @@ OM_uint32 gpm_display_mech_attr(OM_uint32 *minor_status,
- return GSS_S_FAILURE;
- }
-
-- for (i = 0; i < global_mechs.desc_len; i++) {
-+ for (unsigned i = 0; i < global_mechs.desc_len; i++) {
- if (!gpm_equal_oids(global_mechs.desc[i].attr, mech_attr)) {
- continue;
- }
-@@ -614,7 +607,6 @@ OM_uint32 gpm_indicate_mechs_by_attrs(OM_uint32 *minor_status,
- uint32_t ret_maj;
- uint32_t discard;
- int present;
-- int i, j;
-
- if (!minor_status) {
- return GSS_S_CALL_INACCESSIBLE_WRITE;
-@@ -636,8 +628,9 @@ OM_uint32 gpm_indicate_mechs_by_attrs(OM_uint32 *minor_status,
- return ret_maj;
- }
-
-- for (i = 0; i < global_mechs.info_len; i++) {
-+ for (unsigned i = 0; i < global_mechs.info_len; i++) {
- if (desired_mech_attrs != GSS_C_NO_OID_SET) {
-+ unsigned j;
- for (j = 0; j < desired_mech_attrs->count; j++) {
- ret_maj = gss_test_oid_set_member(&ret_min,
- &desired_mech_attrs->elements[j],
-@@ -657,6 +650,7 @@ OM_uint32 gpm_indicate_mechs_by_attrs(OM_uint32 *minor_status,
- }
- }
- if (except_mech_attrs != GSS_C_NO_OID_SET) {
-+ unsigned j;
- for (j = 0; j < except_mech_attrs->count; j++) {
- ret_maj = gss_test_oid_set_member(&ret_min,
- &except_mech_attrs->elements[j],
-@@ -676,6 +670,7 @@ OM_uint32 gpm_indicate_mechs_by_attrs(OM_uint32 *minor_status,
- }
- }
- if (critical_mech_attrs != GSS_C_NO_OID_SET) {
-+ unsigned j;
- for (j = 0; j < critical_mech_attrs->count; j++) {
- ret_maj = gss_test_oid_set_member(&ret_min,
- &critical_mech_attrs->elements[j],
-diff --git a/proxy/src/gp_common.h b/proxy/src/gp_common.h
-index edc23b4..4f76e58 100644
---- a/proxy/src/gp_common.h
-+++ b/proxy/src/gp_common.h
-@@ -104,9 +104,8 @@ union gp_rpc_res {
- #define gp_options_find(res, opts, name, len) \
- do { \
- struct gssx_option *_v; \
-- int _o; \
- res = NULL; \
-- for (_o = 0; _o < opts.options_len; _o++) { \
-+ for (unsigned _o = 0; _o < opts.options_len; _o++) { \
- _v = &opts.options_val[_o]; \
- if (gp_option_name_match(_v, name, len)) { \
- res = _v; \
-diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c
-index 5c1ca02..a671333 100644
---- a/proxy/src/gp_config.c
-+++ b/proxy/src/gp_config.c
-@@ -57,11 +57,9 @@ static void free_str_array(const char ***a, int *count)
-
- void free_cred_store_elements(gss_key_value_set_desc *cs)
- {
-- int i;
--
- if (!cs->elements) return;
-
-- for (i = 0; i < cs->count; i++) {
-+ for (unsigned i = 0; i < cs->count; i++) {
- safefree(cs->elements[i].key);
- safefree(cs->elements[i].value);
- }
-@@ -146,7 +144,7 @@ static int get_krb5_mech_cfg(struct gp_service *svc,
- &count, &strings);
- if (ret == 0) {
- const char *p;
-- size_t len;
-+ ssize_t len;
- char *key;
-
- svc->krb5.store.elements =
-@@ -698,7 +696,6 @@ struct gp_creds_handle *gp_service_get_creds_handle(struct gp_service *svc)
- void free_config(struct gp_config **cfg)
- {
- struct gp_config *config = *cfg;
-- uint32_t i;
-
- if (!config) {
- return;
-@@ -709,7 +706,7 @@ void free_config(struct gp_config **cfg)
- free(config->socket_name);
- free(config->proxy_user);
-
-- for (i=0; i < config->num_svcs; i++) {
-+ for (int i = 0; i < config->num_svcs; i++) {
- gp_service_free(config->svcs[i]);
- safefree(config->svcs[i]);
- }
-diff --git a/proxy/src/gp_conv.c b/proxy/src/gp_conv.c
-index 71d6d9d..b874b06 100644
---- a/proxy/src/gp_conv.c
-+++ b/proxy/src/gp_conv.c
-@@ -599,7 +599,6 @@ done:
- int gp_conv_gssx_to_oid_set(gssx_OID_set *in, gss_OID_set *out)
- {
- gss_OID_set o;
-- int i;
-
- if (in->gssx_OID_set_len == 0) {
- *out = GSS_C_NO_OID_SET;
-@@ -618,7 +617,7 @@ int gp_conv_gssx_to_oid_set(gssx_OID_set *in, gss_OID_set *out)
- return ENOMEM;
- }
-
-- for (i = 0; i < o->count; i++) {
-+ for (size_t i = 0; i < o->count; i++) {
- o->elements[i].elements =
- gp_memdup(in->gssx_OID_set_val[i].octet_string_val,
- in->gssx_OID_set_val[i].octet_string_len);
-@@ -641,7 +640,6 @@ int gp_conv_gssx_to_oid_set(gssx_OID_set *in, gss_OID_set *out)
- int gp_conv_oid_set_to_gssx(gss_OID_set in, gssx_OID_set *out)
- {
- int ret;
-- int i;
-
- if (in->count == 0) {
- return 0;
-@@ -653,7 +651,7 @@ int gp_conv_oid_set_to_gssx(gss_OID_set in, gssx_OID_set *out)
- return ENOMEM;
- }
-
-- for (i = 0; i < in->count; i++) {
-+ for (size_t i = 0; i < in->count; i++) {
- ret = gp_conv_octet_string(in->elements[i].length,
- in->elements[i].elements,
- &out->gssx_OID_set_val[i]);
-diff --git a/proxy/src/gp_creds.c b/proxy/src/gp_creds.c
-index 6570b06..e05ad01 100644
---- a/proxy/src/gp_creds.c
-+++ b/proxy/src/gp_creds.c
-@@ -312,7 +312,6 @@ static int gp_get_cred_environment(struct gp_call_ctx *gpcall,
- int k_num = -1;
- int ck_num = -1;
- int cc_num = -1;
-- int d;
-
- memset(cs, 0, sizeof(gss_key_value_set_desc));
-
-@@ -419,7 +418,7 @@ static int gp_get_cred_environment(struct gp_call_ctx *gpcall,
- ret = ENOMEM;
- goto done;
- }
-- for (d = 0; d < svc->krb5.store.count; d++) {
-+ for (unsigned d = 0; d < svc->krb5.store.count; d++) {
- if (strcmp(svc->krb5.store.elements[d].key, "client_keytab") == 0) {
- ck_num = cs->count;
- } else if (strcmp(svc->krb5.store.elements[d].key, "keytab") == 0) {
-diff --git a/proxy/src/gp_export.c b/proxy/src/gp_export.c
-index 12b8d5f..3a927c9 100644
---- a/proxy/src/gp_export.c
-+++ b/proxy/src/gp_export.c
-@@ -288,7 +288,6 @@ uint32_t gp_export_gssx_cred(uint32_t *min, struct gp_call_ctx *gpcall,
- uint32_t acceptor_lifetime = 0;
- struct gssx_cred_element *el;
- int ret;
-- int i, j;
- struct gp_creds_handle *handle = NULL;
- gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
-
-@@ -314,8 +313,7 @@ uint32_t gp_export_gssx_cred(uint32_t *min, struct gp_call_ctx *gpcall,
- }
- out->elements.elements_len = mechanisms->count;
-
-- for (i = 0, j = 0; i < mechanisms->count; i++, j++) {
--
-+ for (unsigned i = 0, j = 0; i < mechanisms->count; i++, j++) {
- el = &out->elements.elements_val[j];
-
- ret_maj = gss_inquire_cred_by_mech(&ret_min, *in,
-@@ -399,11 +397,10 @@ static void gp_set_cred_options(gssx_cred *cred, gss_cred_id_t gss_cred)
- krb5_enctype *ktypes;
- bool no_ci_flags = false;
- uint32_t maj, min;
-- int i, j;
-
-- for (i = 0; i < cred->elements.elements_len; i++) {
-+ for (unsigned i = 0; i < cred->elements.elements_len; i++) {
- ce = &cred->elements.elements_val[i];
-- for (j = 0; j < ce->options.options_len; j++) {
-+ for (unsigned j = 0; j < ce->options.options_len; j++) {
- op = &ce->options.options_val[j];
- if ((op->option.octet_string_len ==
- sizeof(KRB5_SET_ALLOWED_ENCTYPE)) &&
-diff --git a/proxy/src/gp_rpc_acquire_cred.c b/proxy/src/gp_rpc_acquire_cred.c
-index e9c7d56..fcb4fbe 100644
---- a/proxy/src/gp_rpc_acquire_cred.c
-+++ b/proxy/src/gp_rpc_acquire_cred.c
-@@ -20,7 +20,6 @@ int gp_acquire_cred(struct gp_call_ctx *gpcall,
- gss_cred_id_t *add_out_cred = NULL;
- int acquire_type = ACQ_NORMAL;
- int ret;
-- int i;
-
- aca = &arg->acquire_cred;
- acr = &res->acquire_cred;
-@@ -63,7 +62,7 @@ int gp_acquire_cred(struct gp_call_ctx *gpcall,
- goto done;
- }
-
-- for (i = 0; i < desired_mechs->count; i++) {
-+ for (unsigned i = 0; i < desired_mechs->count; i++) {
- desired_mech = &desired_mechs->elements[i];
-
- if (!gp_creds_allowed_mech(gpcall, desired_mech)) {
-@@ -93,7 +92,7 @@ int gp_acquire_cred(struct gp_call_ctx *gpcall,
-
- cred_usage = gp_conv_gssx_to_cred_usage(aca->cred_usage);
-
-- for (i = 0; i < use_mechs->count; i++) {
-+ for (unsigned i = 0; i < use_mechs->count; i++) {
- desired_mech = &use_mechs->elements[i];
- /* this should really be folded into an extended
- * gss_add_cred in gssapi that can accept a set of URIs
-diff --git a/proxy/src/gp_rpc_debug.c b/proxy/src/gp_rpc_debug.c
-index 2e2c050..a814448 100644
---- a/proxy/src/gp_rpc_debug.c
-+++ b/proxy/src/gp_rpc_debug.c
-@@ -19,7 +19,7 @@ void gpdbg_octet_string(octet_string *x)
- }
- fprintf(stderr, "... ] ");
- } else {
-- for (int i = 0; i < x->octet_string_len; i++) {
-+ for (unsigned i = 0; i < x->octet_string_len; i++) {
- fprintf(stderr, "%x", x->octet_string_val[i]);
- }
- fprintf(stderr, " ] ");
-@@ -55,7 +55,7 @@ void gpdbg_gssx_OID(gssx_OID *x)
- void gpdbg_gssx_OID_set(gssx_OID_set *x)
- {
- gp_debug_printf("{ ");
-- for (int i = 0; i < x->gssx_OID_set_len; i++) {
-+ for (unsigned i = 0; i < x->gssx_OID_set_len; i++) {
- gpdbg_gssx_OID(&x->gssx_OID_set_val[i]);
- }
- gp_debug_printf("} ");
-@@ -90,7 +90,7 @@ void gpdbg_gssx_option(gssx_option *x)
- #define gpdbg_extensions(x) do { \
- if ((x)->extensions.extensions_len > 0) { \
- gp_debug_printf("[ "); \
-- for (int i = 0; i < (x)->extensions.extensions_len; i++) { \
-+ for (unsigned i = 0; i < (x)->extensions.extensions_len; i++) { \
- gpdbg_gssx_option(&(x)->extensions.extensions_val[i]); \
- } \
- gp_debug_printf("] "); \
-@@ -100,7 +100,7 @@ void gpdbg_gssx_option(gssx_option *x)
- #define gpdbg_options(x) do { \
- if ((x)->options.options_len > 0) { \
- gp_debug_printf("[ "); \
-- for (int i = 0; i < (x)->options.options_len; i++) { \
-+ for (unsigned i = 0; i < (x)->options.options_len; i++) { \
- gpdbg_gssx_option(&(x)->options.options_val[i]); \
- } \
- gp_debug_printf("] "); \
-@@ -168,7 +168,7 @@ void gpdbg_gssx_call_ctx(gssx_call_ctx *x)
- #define gpdbg_name_attributes(X) do { \
- gp_debug_printf("[ "); \
- if (x->name_attributes.name_attributes_len > 0) { \
-- for (int i = 0; i < x->name_attributes.name_attributes_len; i++) { \
-+ for (unsigned i = 0; i < x->name_attributes.name_attributes_len; i++) { \
- gpdbg_gssx_name_attr( \
- &x->name_attributes.name_attributes_val[i]); \
- } \
-@@ -209,7 +209,7 @@ void gpdbg_gssx_cred(gssx_cred *x)
- gp_debug_printf("{ ");
- gpdbg_gssx_name(&x->desired_name);
- gp_debug_printf("[ ");
-- for (int i = 0; i < x->elements.elements_len; i++) {
-+ for (unsigned i = 0; i < x->elements.elements_len; i++) {
- gpdbg_gssx_cred_element(&x->elements.elements_val[i]);
- }
- gp_debug_printf("] ");
-@@ -289,17 +289,17 @@ void gpdbg_gssx_res_indicate_mechs(gssx_res_indicate_mechs *x)
- gp_debug_printf(" GSSX_RES_INDICATE_MECHS( status: ");
- gpdbg_gssx_status(&x->status);
- gp_debug_printf("mechs: [ ");
-- for (int i = 0; i < x->mechs.mechs_len; i++) {
-+ for (unsigned i = 0; i < x->mechs.mechs_len; i++) {
- gpdbg_gssx_mech_info(&x->mechs.mechs_val[i]);
- }
- gp_debug_printf("] ");
- gp_debug_printf("mech_attr_descs: [ ");
-- for (int i = 0; i < x->mech_attr_descs.mech_attr_descs_len; i++) {
-+ for (unsigned i = 0; i < x->mech_attr_descs.mech_attr_descs_len; i++) {
- gpdbg_gssx_mech_attr(&x->mech_attr_descs.mech_attr_descs_val[i]);
- }
- gp_debug_printf("] ");
- gp_debug_printf("supported_extensions: [ ");
-- for (int i = 0;
-+ for (unsigned i = 0;
- i < x->supported_extensions.supported_extensions_len; i++) {
- gpdbg_gssx_buffer(
- &x->supported_extensions.supported_extensions_val[i]);
-@@ -602,7 +602,7 @@ void gpdbg_gssx_arg_wrap(gssx_arg_wrap *x)
- gp_debug_printf("conf_req: ");
- gp_debug_printf("%d ", (int)x->conf_req);
- gp_debug_printf("message_buffer: [ ");
-- for (int i = 0; i < x->message_buffer.message_buffer_len; i++) {
-+ for (unsigned i = 0; i < x->message_buffer.message_buffer_len; i++) {
- gpdbg_octet_string(&x->message_buffer.message_buffer_val[i]);
- }
- gp_debug_printf("] ");
-@@ -618,7 +618,7 @@ void gpdbg_gssx_res_wrap(gssx_res_wrap *x)
- gp_debug_printf("context_handle: ");
- GPRPCDEBUG(gssx_ctx, x->context_handle);
- gp_debug_printf("token_buffer: [ ");
-- for (int i = 0; i < x->token_buffer.token_buffer_len; i++) {
-+ for (unsigned i = 0; i < x->token_buffer.token_buffer_len; i++) {
- gpdbg_octet_string(&x->token_buffer.token_buffer_val[i]);
- }
- gp_debug_printf("] ");
-@@ -640,7 +640,7 @@ void gpdbg_gssx_arg_unwrap(gssx_arg_unwrap *x)
- gp_debug_printf("context_handle: ");
- gpdbg_gssx_ctx(&x->context_handle);
- gp_debug_printf("token_buffer: [ ");
-- for (int i = 0; i < x->token_buffer.token_buffer_len; i++) {
-+ for (unsigned i = 0; i < x->token_buffer.token_buffer_len; i++) {
- gpdbg_octet_string(&x->token_buffer.token_buffer_val[i]);
- }
- gp_debug_printf("] ");
-@@ -656,7 +656,7 @@ void gpdbg_gssx_res_unwrap(gssx_res_unwrap *x)
- gp_debug_printf("context_handle: ");
- GPRPCDEBUG(gssx_ctx, x->context_handle);
- gp_debug_printf("message_buffer: [ ");
-- for (int i = 0; i < x->message_buffer.message_buffer_len; i++) {
-+ for (unsigned i = 0; i < x->message_buffer.message_buffer_len; i++) {
- gpdbg_octet_string(&x->message_buffer.message_buffer_val[i]);
- }
- gp_debug_printf("] ");
-diff --git a/proxy/src/gp_rpc_indicate_mechs.c b/proxy/src/gp_rpc_indicate_mechs.c
-index 8abbc7f..6ae6756 100644
---- a/proxy/src/gp_rpc_indicate_mechs.c
-+++ b/proxy/src/gp_rpc_indicate_mechs.c
-@@ -25,8 +25,7 @@ int gp_indicate_mechs(struct gp_call_ctx *gpcall UNUSED,
- uint32_t ret_maj;
- uint32_t ret_min;
- int present;
-- int h, i, j;
-- int ret;
-+ int ret;
-
- ima = &arg->indicate_mechs;
- imr = &res->indicate_mechs;
-@@ -53,8 +52,7 @@ int gp_indicate_mechs(struct gp_call_ctx *gpcall UNUSED,
- }
- imr->mechs.mechs_len = mech_set->count;
-
-- for (i = 0, h = 0; i < mech_set->count; i++, h++) {
--
-+ for (unsigned i = 0, h = 0; i < mech_set->count; i++, h++) {
- mi = &imr->mechs.mechs_val[h];
-
- ret = gp_conv_oid_to_gssx(&mech_set->elements[i], &mi->mech);
-@@ -104,8 +102,7 @@ int gp_indicate_mechs(struct gp_call_ctx *gpcall UNUSED,
- ret_min = ret;
- goto done;
- }
-- for (j = 0; j < mech_attrs->count; j++) {
--
-+ for (unsigned j = 0; j < mech_attrs->count; j++) {
- ret_maj = gss_test_oid_set_member(&ret_min,
- &mech_attrs->elements[j],
- attr_set,
-@@ -136,8 +133,7 @@ int gp_indicate_mechs(struct gp_call_ctx *gpcall UNUSED,
- goto done;
- }
-
-- for (j = 0; j < known_mech_attrs->count; j++) {
--
-+ for (unsigned j = 0; j < known_mech_attrs->count; j++) {
- ret_maj = gss_test_oid_set_member(&ret_min,
- &known_mech_attrs->elements[j],
- attr_set,
-@@ -205,8 +201,7 @@ int gp_indicate_mechs(struct gp_call_ctx *gpcall UNUSED,
- }
- imr->mech_attr_descs.mech_attr_descs_len = attr_set->count;
-
-- for (i = 0; i < attr_set->count; i++) {
--
-+ for (unsigned i = 0; i < attr_set->count; i++) {
- ma = &imr->mech_attr_descs.mech_attr_descs_val[i];
-
- ret = gp_conv_oid_to_gssx(&attr_set->elements[i], &ma->attr);
-diff --git a/proxy/src/gp_socket.c b/proxy/src/gp_socket.c
-index 829ff21..17ecf7c 100644
---- a/proxy/src/gp_socket.c
-+++ b/proxy/src/gp_socket.c
-@@ -303,7 +303,7 @@ static void gp_socket_read(verto_ctx *vctx, verto_ev *ev)
- struct gp_buffer *rbuf;
- uint32_t size;
- bool header = false;
-- size_t rn;
-+ ssize_t rn;
- int ret;
- int fd;
-
-@@ -487,7 +487,7 @@ static void gp_socket_write(verto_ctx *vctx, verto_ev *ev)
- return;
- }
- if (vecs == 2) {
-- if (wn < sizeof(size)) {
-+ if (wn < (ssize_t) sizeof(size)) {
- /* don't bother trying to handle sockets that can't
- * buffer even 4 bytes */
- gp_conn_free(wbuf->conn);
-diff --git a/proxy/src/gp_util.c b/proxy/src/gp_util.c
-index ca83eb3..f158b84 100644
---- a/proxy/src/gp_util.c
-+++ b/proxy/src/gp_util.c
-@@ -109,7 +109,7 @@ char *gp_strerror(int errnum)
- ssize_t gp_safe_read(int fd, void *buf, size_t count)
- {
- char *b = (char *)buf;
-- ssize_t len = 0;
-+ size_t len = 0;
- ssize_t ret;
-
- do {
-@@ -128,7 +128,7 @@ ssize_t gp_safe_read(int fd, void *buf, size_t count)
- ssize_t gp_safe_write(int fd, const void *buf, size_t count)
- {
- const char *b = (const char *)buf;
-- ssize_t len = 0;
-+ size_t len = 0;
- ssize_t ret;
-
- do {
-diff --git a/proxy/tests/t_utils.c b/proxy/tests/t_utils.c
-index 6af9a16..36f7bd1 100644
---- a/proxy/tests/t_utils.c
-+++ b/proxy/tests/t_utils.c
-@@ -8,7 +8,7 @@
- int t_send_buffer(int fd, char *buf, uint32_t len)
- {
- uint32_t size;
-- size_t wn;
-+ ssize_t wn;
- size_t pos;
-
- size = htonl(len);
-@@ -36,7 +36,7 @@ int t_send_buffer(int fd, char *buf, uint32_t len)
- int t_recv_buffer(int fd, char *buf, uint32_t *len)
- {
- uint32_t size;
-- size_t rn;
-+ ssize_t rn;
- size_t pos;
-
- rn = read(fd, &size, sizeof(uint32_t));
+++ /dev/null
-From 9f9ab1e13c72b7c1fd06b6ba085ba2853bb9c3ca Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <ascheel@redhat.com>
-Date: Thu, 29 Jun 2017 10:59:46 -0400
-Subject: [PATCH] Fix most memory leaks
-
-Signed-off-by: Alexander Scheel <ascheel@redhat.com>
-[rharwood@redhat.com: commit message, whitespace]
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-Merges: #203
-Related: #176
-(cherry picked from commit 470cf4d745d57f0597124a35b2faf86ba1107bb5)
-[rharwood@redhat.com: backport around missing program support]
----
- proxy/src/gp_config.c | 1 +
- proxy/src/gp_creds.c | 2 ++
- proxy/src/gp_export.c | 3 ++-
- proxy/src/gp_rpc_acquire_cred.c | 17 ++++++++-----
- proxy/src/gssproxy.c | 42 +++++++++++++++++++++++---------
- proxy/src/mechglue/gpp_context.c | 2 ++
- proxy/tests/t_acquire.c | 3 +++
- 7 files changed, 51 insertions(+), 19 deletions(-)
-
-diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c
-index a671333..b4ab90c 100644
---- a/proxy/src/gp_config.c
-+++ b/proxy/src/gp_config.c
-@@ -75,6 +75,7 @@ static void gp_service_free(struct gp_service *svc)
- free_cred_store_elements(&svc->krb5.store);
- gp_free_creds_handle(&svc->krb5.creds_handle);
- }
-+ free(svc->socket);
- SELINUX_context_free(svc->selinux_ctx);
- memset(svc, 0, sizeof(struct gp_service));
- }
-diff --git a/proxy/src/gp_creds.c b/proxy/src/gp_creds.c
-index fdc6bdf..2cb4ce7 100644
---- a/proxy/src/gp_creds.c
-+++ b/proxy/src/gp_creds.c
-@@ -1049,6 +1049,8 @@ uint32_t gp_count_tickets(uint32_t *min, gss_cred_id_t cred, uint32_t *ccsum)
- goto done;
- }
-
-+ krb5_free_cred_contents(context, &creds);
-+
- /* TODO: Should we do a real checksum over all creds->ticket data and
- * flags in future ? */
- (*ccsum)++;
-diff --git a/proxy/src/gp_export.c b/proxy/src/gp_export.c
-index 4e081df..ab08bb7 100644
---- a/proxy/src/gp_export.c
-+++ b/proxy/src/gp_export.c
-@@ -47,7 +47,7 @@ uint32_t gp_init_creds_with_keytab(uint32_t *min, const char *svc_name,
- krb5_keytab ktid = NULL;
- krb5_kt_cursor cursor;
- krb5_keytab_entry entry;
-- krb5_enctype *permitted;
-+ krb5_enctype *permitted = NULL;
- uint32_t ret_maj = 0;
- uint32_t ret_min = 0;
- int ret;
-@@ -127,6 +127,7 @@ uint32_t gp_init_creds_with_keytab(uint32_t *min, const char *svc_name,
- ret_maj = GSS_S_COMPLETE;
-
- done:
-+ krb5_free_enctypes(handle->context, permitted);
- if (ktid) {
- (void)krb5_kt_close(handle->context, ktid);
- }
-diff --git a/proxy/src/gp_rpc_acquire_cred.c b/proxy/src/gp_rpc_acquire_cred.c
-index fcb4fbe..7ddb427 100644
---- a/proxy/src/gp_rpc_acquire_cred.c
-+++ b/proxy/src/gp_rpc_acquire_cred.c
-@@ -130,17 +130,18 @@ int gp_acquire_cred(struct gp_call_ctx *gpcall,
- }
- }
-
-- acr->output_cred_handle = calloc(1, sizeof(gssx_cred));
-- if (!acr->output_cred_handle) {
-- ret_maj = GSS_S_FAILURE;
-- ret_min = ENOMEM;
-- goto done;
-- }
-
- if (out_cred == in_cred) {
- acr->output_cred_handle = aca->input_cred_handle;
- aca->input_cred_handle = NULL;
- } else {
-+ acr->output_cred_handle = calloc(1, sizeof(gssx_cred));
-+ if (!acr->output_cred_handle) {
-+ ret_maj = GSS_S_FAILURE;
-+ ret_min = ENOMEM;
-+ goto done;
-+ }
-+
- ret_maj = gp_export_gssx_cred(&ret_min, gpcall,
- &out_cred, acr->output_cred_handle);
- if (ret_maj) {
-@@ -154,6 +155,10 @@ done:
-
- GPRPCDEBUG(gssx_res_acquire_cred, acr);
-
-+ if (add_out_cred != &in_cred && add_out_cred != &out_cred)
-+ gss_release_cred(&ret_min, add_out_cred);
-+ if (in_cred != out_cred)
-+ gss_release_cred(&ret_min, &in_cred);
- gss_release_cred(&ret_min, &out_cred);
- gss_release_oid_set(&ret_min, &use_mechs);
- gss_release_oid_set(&ret_min, &desired_mechs);
-diff --git a/proxy/src/gssproxy.c b/proxy/src/gssproxy.c
-index a020218..5c5937d 100644
---- a/proxy/src/gssproxy.c
-+++ b/proxy/src/gssproxy.c
-@@ -157,7 +157,7 @@ int main(int argc, const char *argv[])
- verto_ctx *vctx;
- verto_ev *ev;
- int wait_fd;
-- int ret;
-+ int ret = -1;
-
- struct poptOption long_options[] = {
- POPT_AUTOHELP
-@@ -187,13 +187,17 @@ int main(int argc, const char *argv[])
- fprintf(stderr, "\nInvalid option %s: %s\n\n",
- poptBadOption(pc, 0), poptStrerror(opt));
- poptPrintUsage(pc, stderr, 0);
-- return 1;
-+
-+ ret = 1;
-+ goto cleanup;
- }
- }
-
- if (opt_version) {
- puts(VERSION""DISTRO_VERSION""PRERELEASE_VERSION);
-- return 0;
-+ poptFreeContext(pc);
-+ ret = 0;
-+ goto cleanup;
- }
-
- if (opt_debug || opt_debug_level > 0) {
-@@ -204,7 +208,8 @@ int main(int argc, const char *argv[])
- if (opt_daemon && opt_interactive) {
- fprintf(stderr, "Option -i|--interactive is not allowed together with -D|--daemon\n");
- poptPrintUsage(pc, stderr, 0);
-- return 1;
-+ ret = 0;
-+ goto cleanup;
- }
-
- if (opt_interactive) {
-@@ -218,7 +223,8 @@ int main(int argc, const char *argv[])
- opt_config_socket,
- opt_daemon);
- if (!gpctx->config) {
-- exit(EXIT_FAILURE);
-+ ret = EXIT_FAILURE;
-+ goto cleanup;
- }
-
- init_server(gpctx->config->daemonize, &wait_fd);
-@@ -229,7 +235,8 @@ int main(int argc, const char *argv[])
- if (!vctx) {
- fprintf(stderr, "Failed to initialize event loop. "
- "Is there at least one libverto backend installed?\n");
-- return 1;
-+ ret = 1;
-+ goto cleanup;
- }
- gpctx->vctx = vctx;
-
-@@ -237,12 +244,13 @@ int main(int argc, const char *argv[])
- ev = verto_add_signal(vctx, VERTO_EV_FLAG_PERSIST, hup_handler, SIGHUP);
- if (!ev) {
- fprintf(stderr, "Failed to register SIGHUP handler with verto!\n");
-- return 1;
-+ ret = 1;
-+ goto cleanup;
- }
-
- ret = init_sockets(vctx, NULL);
- if (ret != 0) {
-- return ret;
-+ goto cleanup;
- }
-
- /* We need to tell nfsd that GSS-Proxy is available before it starts,
-@@ -256,12 +264,14 @@ int main(int argc, const char *argv[])
-
- ret = drop_privs(gpctx->config);
- if (ret) {
-- exit(EXIT_FAILURE);
-+ ret = EXIT_FAILURE;
-+ goto cleanup;
- }
-
- ret = gp_workers_init(gpctx);
- if (ret) {
-- exit(EXIT_FAILURE);
-+ ret = EXIT_FAILURE;
-+ goto cleanup;
- }
-
- verto_run(vctx);
-@@ -271,9 +281,17 @@ int main(int argc, const char *argv[])
-
- fini_server();
-
-- poptFreeContext(pc);
-
- free_config(&gpctx->config);
-+ free(gpctx);
-
-- return 0;
-+ ret = 0;
-+
-+cleanup:
-+ poptFreeContext(pc);
-+ free(opt_config_file);
-+ free(opt_config_dir);
-+ free(opt_config_socket);
-+
-+ return ret;
- }
-diff --git a/proxy/src/mechglue/gpp_context.c b/proxy/src/mechglue/gpp_context.c
-index 2f41e4f..69e69e0 100644
---- a/proxy/src/mechglue/gpp_context.c
-+++ b/proxy/src/mechglue/gpp_context.c
-@@ -362,6 +362,8 @@ OM_uint32 gssi_delete_sec_context(OM_uint32 *minor_status,
- }
- }
-
-+ free(ctx);
-+
- return rmaj;
- }
-
-diff --git a/proxy/tests/t_acquire.c b/proxy/tests/t_acquire.c
-index 2bb7706..5334565 100644
---- a/proxy/tests/t_acquire.c
-+++ b/proxy/tests/t_acquire.c
-@@ -132,5 +132,8 @@ done:
- gss_release_buffer(&ret_min, &in_token);
- gss_release_buffer(&ret_min, &out_token);
- gss_release_cred(&ret_min, &cred_handle);
-+ gss_release_name(&ret_min, &target_name);
-+ gss_delete_sec_context(&ret_min, &init_ctx, GSS_C_NO_BUFFER);
-+ gss_delete_sec_context(&ret_min, &accept_ctx, GSS_C_NO_BUFFER);
- return ret;
- }
+++ /dev/null
-From e087470af1a51b58fbac434ff2e30bc3f2a1f9ac Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Mon, 11 Sep 2017 10:52:03 -0400
-Subject: [PATCH] Fix potential free of non-heap address
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #211
-(cherry picked from commit 068f4174001c3ea4ae7913fb37210fec84abf1df)
----
- proxy/src/client/gpm_common.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/proxy/src/client/gpm_common.c b/proxy/src/client/gpm_common.c
-index dba23a6..c65c69d 100644
---- a/proxy/src/client/gpm_common.c
-+++ b/proxy/src/client/gpm_common.c
-@@ -553,8 +553,8 @@ static int gpm_send_recv_loop(struct gpm_ctx *gpmctx, char *send_buffer,
- ret = gpm_retry_socket(gpmctx);
-
- /* Free buffer and set it to NULL to prevent free(xdr_reply_ctx) */
-- free(recv_buffer);
-- recv_buffer = NULL;
-+ free(*recv_buffer);
-+ *recv_buffer = NULL;
-
- if (ret != 0)
- return ret;
+++ /dev/null
-From 76954aa028a897021a9bdcb0a1b5249e2652f7b6 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 16 May 2017 14:16:23 -0400
-Subject: [PATCH] Fix segfault when no config files are present
-
-Resolves: rhbz#1451255
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #185
-(cherry picked from commit df434333de34a13440857b511a4c60fbc6a71a5c)
----
- proxy/src/gp_config.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c
-index b4ab90c..8fd60a3 100644
---- a/proxy/src/gp_config.c
-+++ b/proxy/src/gp_config.c
-@@ -844,16 +844,17 @@ int gp_config_init(const char *config_file, const char *config_dir,
-
- if (config_file) {
- ret = gp_config_from_file(config_file, ini_config, collision_flags);
-- if (ret == ENOENT) {
-- GPDEBUG("Expected config file %s but did not find it.\n",
-+ if (ret) {
-+ GPDEBUG("Error when trying to read config file %s.\n",
- config_file);
-- } else if (ret) {
- return ret;
- }
- }
- if (config_dir) {
- ret = gp_config_from_dir(config_dir, &ini_config, collision_flags);
- if (ret) {
-+ GPDEBUG("Error when trying to read config directory %s.\n",
-+ config_dir);
- return ret;
- }
- }
+++ /dev/null
-From caec174b203206185b6075c0e822c6f45070dd87 Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <ascheel@redhat.com>
-Date: Wed, 9 Aug 2017 15:00:26 -0400
-Subject: [PATCH] Fix silent crash with duplicate config sections
-
-Signed-off-by: Alexander Scheel <ascheel@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Resolves: #194
-Merges: #202
-(cherry picked from commit c0d85387fc38f9554d601ec2ddb111031a694387)
----
- proxy/configure.ac | 125 ++++++++++++++++++++++++++++++++++++++++++
- proxy/src/gp_config.c | 27 ++++-----
- 2 files changed, 137 insertions(+), 15 deletions(-)
-
-diff --git a/proxy/configure.ac b/proxy/configure.ac
-index c52dbb6..9e01f7d 100644
---- a/proxy/configure.ac
-+++ b/proxy/configure.ac
-@@ -107,6 +107,131 @@ fi
- AC_SUBST(INI_LIBS)
- AC_SUBST(INI_CFLAGS)
-
-+AC_CHECK_LIB(ref_array, ref_array_destroy, [],
-+ [AC_MSG_WARN([ref_array library must support ref_array_destroy])],
-+ [$INI_CONFIG_LIBS])
-+
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+/* See: https://pagure.io/SSSD/ding-libs/pull-request/3172 */
-+#include <linux/limits.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include <ini_configobj.h>
-+#include <ini_config.h>
-+
-+static int write_to_file(char *path, char *text)
-+{
-+ FILE *f = fopen(path, "w");
-+ int bytes = 0;
-+ if (f == NULL)
-+ return 1;
-+
-+ bytes = fprintf(f, "%s", text);
-+ if (bytes != strlen(text))
-+ return 1;
-+
-+ return fclose(f);
-+}
-+
-+int main(void)
-+{
-+ char base_path[PATH_MAX];
-+ char augment_path[PATH_MAX];
-+
-+ char config_base[] =
-+ "[section]\n"
-+ "key1 = first\n"
-+ "key2 = exists\n";
-+
-+ char config_augment[] =
-+ "[section]\n"
-+ "key1 = augment\n"
-+ "key3 = exists\n";
-+
-+ char *builddir;
-+
-+ struct ini_cfgobj *in_cfg, *result_cfg;
-+ struct ini_cfgfile *file_ctx;
-+
-+ uint32_t merge_flags = INI_MS_DETECT | INI_MS_PRESERVE;
-+
-+ int ret;
-+
-+ builddir = getenv("builddir");
-+ if (builddir == NULL) {
-+ builddir = strdup(".");
-+ }
-+
-+ snprintf(base_path, PATH_MAX, "%s/tmp_augment_base.conf", builddir);
-+ snprintf(augment_path, PATH_MAX, "%s/tmp_augment_augment.conf", builddir);
-+
-+ ret = write_to_file(base_path, config_base);
-+ if (ret != 0) {
-+ ret = 1;
-+ goto cleanup;
-+ }
-+
-+ ret = write_to_file(augment_path, config_augment);
-+ if (ret != 0) {
-+ goto cleanup;
-+ }
-+
-+ /* Match only augment.conf */
-+ const char *m_patterns[] = { "^tmp_augment_augment.conf$", NULL };
-+
-+ /* Match all sections */
-+ const char *m_sections[] = { ".*", NULL };
-+
-+ /* Create config collection */
-+ ret = ini_config_create(&in_cfg);
-+ if (ret != EOK)
-+ goto cleanup;
-+
-+ /* Open base.conf */
-+ ret = ini_config_file_open(base_path, 0, &file_ctx);
-+ if (ret != EOK)
-+ goto cleanup;
-+
-+ /* Seed in_cfg with base.conf */
-+ ret = ini_config_parse(file_ctx, 1, 0, 0, in_cfg);
-+ if (ret != EOK)
-+ goto cleanup;
-+
-+ /* Update base.conf with augment.conf */
-+ ret = ini_config_augment(in_cfg,
-+ builddir,
-+ m_patterns,
-+ m_sections,
-+ NULL,
-+ INI_STOP_ON_NONE,
-+ 0,
-+ INI_PARSE_NOSPACE|INI_PARSE_NOTAB,
-+ merge_flags,
-+ &result_cfg,
-+ NULL,
-+ NULL);
-+ /* We always expect EEXIST due to DETECT being set. */
-+ if (ret != EEXIST)
-+ goto cleanup;
-+
-+ ret = 0;
-+
-+cleanup:
-+ remove(base_path);
-+ remove(augment_path);
-+
-+ /* Per autoconf guidelines */
-+ if (ret != 0)
-+ ret = 1;
-+
-+ return ret;
-+}
-+]])]
-+,, [AC_MSG_ERROR(["ini_config library must support extended INI_MS_DETECT. See: https://pagure.io/SSSD/ding-libs/pull-request/3172"])])
-+
- AX_PTHREAD(,[AC_MSG_ERROR([Could not find Pthreads support])])
-
- LIBS="$PTHREAD_LIBS $LIBS"
-diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c
-index 07f7c8d..cd057a0 100644
---- a/proxy/src/gp_config.c
-+++ b/proxy/src/gp_config.c
-@@ -728,7 +728,7 @@ static int gp_config_from_file(const char *config_file,
- 0, /* metadata_flags, FIXME */
- &file_ctx);
- if (ret) {
-- GPDEBUG("Failed to open config file: %d (%s)\n",
-+ GPERROR("Failed to open config file: %d (%s)\n",
- ret, gp_strerror(ret));
- ini_config_destroy(ini_config);
- return ret;
-@@ -742,7 +742,7 @@ static int gp_config_from_file(const char *config_file,
- if (ret) {
- char **errors = NULL;
- /* we had a parsing failure */
-- GPDEBUG("Failed to parse config file: %d (%s)\n",
-+ GPERROR("Failed to parse config file: %d (%s)\n",
- ret, gp_strerror(ret));
- if (ini_config_error_count(ini_config)) {
- ini_config_get_errors(ini_config, &errors);
-@@ -791,26 +791,25 @@ static int gp_config_from_dir(const char *config_dir,
- INI_STOP_ON_ANY, /* error_level */
- collision_flags,
- INI_PARSE_NOWRAP,
-- /* do not allow colliding sections with the same
-- * name in different files */
-- INI_MS_ERROR,
-+ /* allow sections with the same name in
-+ * different files, but log warnings */
-+ INI_MS_DETECT | INI_MS_PRESERVE,
- &result_cfg,
- &error_list,
- NULL);
-- if (ret) {
-+ if (error_list) {
- uint32_t len;
--
-- if (!error_list) {
-- GPAUDIT("Error when reading config directory number: %d\n", ret);
-- return ret;
-- }
--
- len = ref_array_len(error_list);
- for (uint32_t i = 0; i < len; i++) {
- /* libini has an unfixable bug where error strings are (char **) */
- GPAUDIT("Error when reading config directory: %s\n",
- *(char **)ref_array_get(error_list, i, NULL));
- }
-+ ref_array_destroy(error_list);
-+ }
-+
-+ if (ret && ret != EEXIST) {
-+ GPERROR("Error when reading config directory number: %d\n", ret);
-
- ref_array_destroy(error_list);
- return ret;
-@@ -821,9 +820,7 @@ static int gp_config_from_dir(const char *config_dir,
- ini_config_destroy(*ini_config);
- *ini_config = result_cfg;
- }
-- if (error_list) {
-- ref_array_destroy(error_list);
-- }
-+
- return 0;
- }
-
+++ /dev/null
-From a3c9d87924455448cf3bcb20d34f1bd4e6b915d8 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 15 Mar 2017 13:52:36 -0400
-Subject: [PATCH] Fix unused variables
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #173
-(cherry picked from commit e72d1fa53df8af55b47639ed01f9f0bafa7a2ca8)
----
- proxy/src/client/gpm_common.c | 1 +
- proxy/src/client/gpm_display_status.c | 2 +-
- proxy/src/client/gpm_release_handle.c | 2 +-
- proxy/src/gp_common.h | 1 +
- proxy/src/gp_config.c | 8 ++------
- proxy/src/gp_conv.c | 4 ++--
- proxy/src/gp_conv.h | 3 +--
- proxy/src/gp_creds.c | 7 +++----
- proxy/src/gp_init.c | 2 +-
- proxy/src/gp_rpc_accept_sec_context.c | 3 +--
- proxy/src/gp_rpc_acquire_cred.c | 3 +--
- proxy/src/gp_rpc_get_mic.c | 4 ++--
- proxy/src/gp_rpc_import_and_canon_name.c | 5 ++---
- proxy/src/gp_rpc_indicate_mechs.c | 5 ++---
- proxy/src/gp_rpc_init_sec_context.c | 3 +--
- proxy/src/gp_rpc_process.c | 21 ++++-----------------
- proxy/src/gp_rpc_process.h | 6 ++++++
- proxy/src/gp_rpc_release_handle.c | 5 ++---
- proxy/src/gp_rpc_unwrap.c | 5 ++---
- proxy/src/gp_rpc_verify_mic.c | 5 ++---
- proxy/src/gp_rpc_wrap.c | 4 ++--
- proxy/src/gp_rpc_wrap_size_limit.c | 5 ++---
- proxy/src/gp_socket.c | 2 +-
- proxy/src/gssproxy.c | 2 +-
- 24 files changed, 44 insertions(+), 64 deletions(-)
-
-diff --git a/proxy/src/client/gpm_common.c b/proxy/src/client/gpm_common.c
-index 0a54dbc..030765a 100644
---- a/proxy/src/client/gpm_common.c
-+++ b/proxy/src/client/gpm_common.c
-@@ -320,6 +320,7 @@ static void gpm_release_ctx(struct gpm_ctx *gpmctx)
- OM_uint32 gpm_release_buffer(OM_uint32 *minor_status,
- gss_buffer_t buffer)
- {
-+ *minor_status = 0;
- if (buffer != GSS_C_NO_BUFFER) {
- if (buffer->value) {
- free(buffer->value);
-diff --git a/proxy/src/client/gpm_display_status.c b/proxy/src/client/gpm_display_status.c
-index 1f8d755..bbb546f 100644
---- a/proxy/src/client/gpm_display_status.c
-+++ b/proxy/src/client/gpm_display_status.c
-@@ -43,7 +43,7 @@ void gpm_save_internal_status(uint32_t err, char *err_str)
- OM_uint32 gpm_display_status(OM_uint32 *minor_status,
- OM_uint32 status_value,
- int status_type,
-- const gss_OID mech_type,
-+ const gss_OID mech_type UNUSED,
- OM_uint32 *message_context,
- gss_buffer_t status_string)
- {
-diff --git a/proxy/src/client/gpm_release_handle.c b/proxy/src/client/gpm_release_handle.c
-index 7a6aaed..8f49ee9 100644
---- a/proxy/src/client/gpm_release_handle.c
-+++ b/proxy/src/client/gpm_release_handle.c
-@@ -58,7 +58,7 @@ done:
-
- OM_uint32 gpm_delete_sec_context(OM_uint32 *minor_status,
- gssx_ctx **context_handle,
-- gss_buffer_t output_token)
-+ gss_buffer_t output_token UNUSED)
- {
- union gp_rpc_arg uarg;
- union gp_rpc_res ures;
-diff --git a/proxy/src/gp_common.h b/proxy/src/gp_common.h
-index 36fd843..edc23b4 100644
---- a/proxy/src/gp_common.h
-+++ b/proxy/src/gp_common.h
-@@ -8,6 +8,7 @@
- #include "gp_log.h"
-
- #define no_const(ptr) ((void *)((uintptr_t)(ptr)))
-+#define UNUSED __attribute__((unused))
-
- /* add element to list head */
- #define LIST_ADD(list, elem) do { \
-diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c
-index 1b833fd..5c1ca02 100644
---- a/proxy/src/gp_config.c
-+++ b/proxy/src/gp_config.c
-@@ -720,7 +720,6 @@ void free_config(struct gp_config **cfg)
- }
-
- static int gp_config_from_file(const char *config_file,
-- struct gp_ini_context *ctx,
- struct ini_cfgobj *ini_config,
- const uint32_t collision_flags)
- {
-@@ -764,7 +763,6 @@ static int gp_config_from_file(const char *config_file,
- }
-
- static int gp_config_from_dir(const char *config_dir,
-- struct gp_ini_context *ctx,
- struct ini_cfgobj **ini_config,
- const uint32_t collision_flags)
- {
-@@ -847,8 +845,7 @@ int gp_config_init(const char *config_file, const char *config_dir,
- }
-
- if (config_file) {
-- ret = gp_config_from_file(config_file, ctx, ini_config,
-- collision_flags);
-+ ret = gp_config_from_file(config_file, ini_config, collision_flags);
- if (ret == ENOENT) {
- GPDEBUG("Expected config file %s but did not find it.\n",
- config_file);
-@@ -857,8 +854,7 @@ int gp_config_init(const char *config_file, const char *config_dir,
- }
- }
- if (config_dir) {
-- ret = gp_config_from_dir(config_dir, ctx, &ini_config,
-- collision_flags);
-+ ret = gp_config_from_dir(config_dir, &ini_config, collision_flags);
- if (ret) {
- return ret;
- }
-diff --git a/proxy/src/gp_conv.c b/proxy/src/gp_conv.c
-index 6aa66a8..71d6d9d 100644
---- a/proxy/src/gp_conv.c
-+++ b/proxy/src/gp_conv.c
-@@ -6,6 +6,7 @@
- #include <stdbool.h>
- #include <errno.h>
- #include "gp_conv.h"
-+#include "src/gp_common.h"
-
- void *gp_memdup(void *in, size_t len)
- {
-@@ -488,8 +489,7 @@ done:
- return ret_maj;
- }
-
--int gp_conv_status_to_gssx(struct gssx_call_ctx *call_ctx,
-- uint32_t ret_maj, uint32_t ret_min,
-+int gp_conv_status_to_gssx(uint32_t ret_maj, uint32_t ret_min,
- gss_OID mech, struct gssx_status *status)
- {
- int ret;
-diff --git a/proxy/src/gp_conv.h b/proxy/src/gp_conv.h
-index e247dbd..699b301 100644
---- a/proxy/src/gp_conv.h
-+++ b/proxy/src/gp_conv.h
-@@ -39,8 +39,7 @@ uint32_t gp_conv_name_to_gssx_alloc(uint32_t *min,
- gss_name_t in, gssx_name **out);
- uint32_t gp_conv_gssx_to_name(uint32_t *min, gssx_name *in, gss_name_t *out);
-
--int gp_conv_status_to_gssx(struct gssx_call_ctx *call_ctx,
-- uint32_t ret_maj, uint32_t ret_min,
-+int gp_conv_status_to_gssx(uint32_t ret_maj, uint32_t ret_min,
- gss_OID mech, struct gssx_status *status);
-
- int gp_copy_utf8string(utf8string *in, utf8string *out);
-diff --git a/proxy/src/gp_creds.c b/proxy/src/gp_creds.c
-index 7d89b06..6570b06 100644
---- a/proxy/src/gp_creds.c
-+++ b/proxy/src/gp_creds.c
-@@ -252,7 +252,6 @@ done:
-
- static int ensure_segregated_ccache(struct gp_call_ctx *gpcall,
- int cc_num,
-- struct gp_service *svc,
- gss_key_value_set_desc *cs)
- {
- int ret;
-@@ -482,7 +481,7 @@ static int gp_get_cred_environment(struct gp_call_ctx *gpcall,
- }
- }
-
-- ret = ensure_segregated_ccache(gpcall, cc_num, svc, cs);
-+ ret = ensure_segregated_ccache(gpcall, cc_num, cs);
- if (ret != 0) {
- goto done;
- }
-@@ -587,8 +586,8 @@ uint32_t gp_add_krb5_creds(uint32_t *min,
- gss_cred_id_t in_cred,
- gssx_name *desired_name,
- gss_cred_usage_t cred_usage,
-- uint32_t initiator_time_req,
-- uint32_t acceptor_time_req,
-+ uint32_t initiator_time_req UNUSED,
-+ uint32_t acceptor_time_req UNUSED,
- gss_cred_id_t *output_cred_handle,
- gss_OID_set *actual_mechs,
- uint32_t *initiator_time_rec,
-diff --git a/proxy/src/gp_init.c b/proxy/src/gp_init.c
-index d367f92..e69934d 100644
---- a/proxy/src/gp_init.c
-+++ b/proxy/src/gp_init.c
-@@ -96,7 +96,7 @@ void fini_server(void)
- closelog();
- }
-
--static void break_loop(verto_ctx *vctx, verto_ev *ev)
-+static void break_loop(verto_ctx *vctx, verto_ev *ev UNUSED)
- {
- GPDEBUG("Exiting after receiving a signal\n");
- verto_break(vctx);
-diff --git a/proxy/src/gp_rpc_accept_sec_context.c b/proxy/src/gp_rpc_accept_sec_context.c
-index 22a4cf7..ae4de55 100644
---- a/proxy/src/gp_rpc_accept_sec_context.c
-+++ b/proxy/src/gp_rpc_accept_sec_context.c
-@@ -152,8 +152,7 @@ done:
- ret_maj = acpt_maj;
- ret_min = acpt_min;
- }
-- ret = gp_conv_status_to_gssx(&asca->call_ctx,
-- ret_maj, ret_min, oid,
-+ ret = gp_conv_status_to_gssx(ret_maj, ret_min, oid,
- &ascr->status);
- GPRPCDEBUG(gssx_res_accept_sec_context, ascr);
-
-diff --git a/proxy/src/gp_rpc_acquire_cred.c b/proxy/src/gp_rpc_acquire_cred.c
-index 9a55937..e9c7d56 100644
---- a/proxy/src/gp_rpc_acquire_cred.c
-+++ b/proxy/src/gp_rpc_acquire_cred.c
-@@ -150,8 +150,7 @@ int gp_acquire_cred(struct gp_call_ctx *gpcall,
- }
-
- done:
-- ret = gp_conv_status_to_gssx(&aca->call_ctx,
-- ret_maj, ret_min, desired_mech,
-+ ret = gp_conv_status_to_gssx(ret_maj, ret_min, desired_mech,
- &acr->status);
-
- GPRPCDEBUG(gssx_res_acquire_cred, acr);
-diff --git a/proxy/src/gp_rpc_get_mic.c b/proxy/src/gp_rpc_get_mic.c
-index 1d9a1fe..dfba77e 100644
---- a/proxy/src/gp_rpc_get_mic.c
-+++ b/proxy/src/gp_rpc_get_mic.c
-@@ -3,7 +3,7 @@
- #include "gp_rpc_process.h"
- #include <gssapi/gssapi.h>
-
--int gp_get_mic(struct gp_call_ctx *gpcall,
-+int gp_get_mic(struct gp_call_ctx *gpcall UNUSED,
- union gp_rpc_arg *arg,
- union gp_rpc_res *res)
- {
-@@ -79,7 +79,7 @@ int gp_get_mic(struct gp_call_ctx *gpcall,
- ret_min = 0;
-
- done:
-- ret = gp_conv_status_to_gssx(&gma->call_ctx, ret_maj, ret_min,
-+ ret = gp_conv_status_to_gssx(ret_maj, ret_min,
- GSS_C_NO_OID, &gmr->status);
- GPRPCDEBUG(gssx_res_get_mic, gmr);
- gss_release_buffer(&ret_min, &message_token);
-diff --git a/proxy/src/gp_rpc_import_and_canon_name.c b/proxy/src/gp_rpc_import_and_canon_name.c
-index 3d67f40..e7b8e63 100644
---- a/proxy/src/gp_rpc_import_and_canon_name.c
-+++ b/proxy/src/gp_rpc_import_and_canon_name.c
-@@ -8,7 +8,7 @@
- * I am not kidding, if you hav not read it, go back and do it now, or do not
- * touch this function */
-
--int gp_import_and_canon_name(struct gp_call_ctx *gpcall,
-+int gp_import_and_canon_name(struct gp_call_ctx *gpcall UNUSED,
- union gp_rpc_arg *arg,
- union gp_rpc_res *res)
- {
-@@ -64,8 +64,7 @@ int gp_import_and_canon_name(struct gp_call_ctx *gpcall,
- /* TODO: icna->name_attributes */
-
- done:
-- ret = gp_conv_status_to_gssx(&icna->call_ctx,
-- ret_maj, ret_min, mech,
-+ ret = gp_conv_status_to_gssx(ret_maj, ret_min, mech,
- &icnr->status);
- GPRPCDEBUG(gssx_res_import_and_canon_name, icnr);
-
-diff --git a/proxy/src/gp_rpc_indicate_mechs.c b/proxy/src/gp_rpc_indicate_mechs.c
-index c24b926..8abbc7f 100644
---- a/proxy/src/gp_rpc_indicate_mechs.c
-+++ b/proxy/src/gp_rpc_indicate_mechs.c
-@@ -3,7 +3,7 @@
- #include "gp_rpc_process.h"
- #include "gp_debug.h"
-
--int gp_indicate_mechs(struct gp_call_ctx *gpcall,
-+int gp_indicate_mechs(struct gp_call_ctx *gpcall UNUSED,
- union gp_rpc_arg *arg,
- union gp_rpc_res *res)
- {
-@@ -251,8 +251,7 @@ int gp_indicate_mechs(struct gp_call_ctx *gpcall,
- }
-
- done:
-- ret = gp_conv_status_to_gssx(&ima->call_ctx,
-- ret_maj, ret_min, GSS_C_NO_OID,
-+ ret = gp_conv_status_to_gssx(ret_maj, ret_min, GSS_C_NO_OID,
- &imr->status);
- GPRPCDEBUG(gssx_res_indicate_mechs, imr);
-
-diff --git a/proxy/src/gp_rpc_init_sec_context.c b/proxy/src/gp_rpc_init_sec_context.c
-index 413e2ec..e4af495 100644
---- a/proxy/src/gp_rpc_init_sec_context.c
-+++ b/proxy/src/gp_rpc_init_sec_context.c
-@@ -187,8 +187,7 @@ done:
- ret_maj = init_maj;
- ret_min = init_min;
- }
-- ret = gp_conv_status_to_gssx(&isca->call_ctx,
-- ret_maj, ret_min, mech_type,
-+ ret = gp_conv_status_to_gssx(ret_maj, ret_min, mech_type,
- &iscr->status);
-
- GPRPCDEBUG(gssx_res_init_sec_context, iscr);
-diff --git a/proxy/src/gp_rpc_process.c b/proxy/src/gp_rpc_process.c
-index d1a0232..0ea17f0 100644
---- a/proxy/src/gp_rpc_process.c
-+++ b/proxy/src/gp_rpc_process.c
-@@ -396,20 +396,7 @@ int gp_rpc_process_call(struct gp_call_ctx *gpcall,
- return ret;
- }
-
--int gp_get_call_context(gp_exec_std_args)
--{
-- return 0;
--}
--int gp_export_cred(gp_exec_std_args)
--{
-- return 0;
--}
--int gp_import_cred(gp_exec_std_args)
--{
-- return 0;
--}
--
--int gp_store_cred(gp_exec_std_args)
--{
-- return 0;
--}
-+GP_EXEC_UNUSED_FUNC(gp_get_call_context);
-+GP_EXEC_UNUSED_FUNC(gp_export_cred);
-+GP_EXEC_UNUSED_FUNC(gp_import_cred);
-+GP_EXEC_UNUSED_FUNC(gp_store_cred);
-diff --git a/proxy/src/gp_rpc_process.h b/proxy/src/gp_rpc_process.h
-index eb02c95..da27795 100644
---- a/proxy/src/gp_rpc_process.h
-+++ b/proxy/src/gp_rpc_process.h
-@@ -24,6 +24,12 @@ struct gp_service;
- union gp_rpc_arg *arg, \
- union gp_rpc_res *res
-
-+#define GP_EXEC_UNUSED_FUNC(name) \
-+ int name(struct gp_call_ctx *gpcall UNUSED, \
-+ union gp_rpc_arg *arg UNUSED, \
-+ union gp_rpc_res *res UNUSED) \
-+ { return 0; }
-+
- int gp_indicate_mechs(gp_exec_std_args);
- int gp_get_call_context(gp_exec_std_args);
- int gp_import_and_canon_name(gp_exec_std_args);
-diff --git a/proxy/src/gp_rpc_release_handle.c b/proxy/src/gp_rpc_release_handle.c
-index 4ffdfb9..c8ba8f2 100644
---- a/proxy/src/gp_rpc_release_handle.c
-+++ b/proxy/src/gp_rpc_release_handle.c
-@@ -2,7 +2,7 @@
-
- #include "gp_rpc_process.h"
-
--int gp_release_handle(struct gp_call_ctx *gpcall,
-+int gp_release_handle(struct gp_call_ctx *gpcall UNUSED,
- union gp_rpc_arg *arg,
- union gp_rpc_res *res)
- {
-@@ -35,8 +35,7 @@ int gp_release_handle(struct gp_call_ctx *gpcall,
- break;
- }
-
-- ret = gp_conv_status_to_gssx(&rha->call_ctx,
-- ret_maj, ret_min, GSS_C_NO_OID,
-+ ret = gp_conv_status_to_gssx(ret_maj, ret_min, GSS_C_NO_OID,
- &rhr->status);
- GPRPCDEBUG(gssx_res_release_handle, rhr);
-
-diff --git a/proxy/src/gp_rpc_unwrap.c b/proxy/src/gp_rpc_unwrap.c
-index bc052cb..fad8cfe 100644
---- a/proxy/src/gp_rpc_unwrap.c
-+++ b/proxy/src/gp_rpc_unwrap.c
-@@ -3,7 +3,7 @@
- #include "gp_rpc_process.h"
- #include <gssapi/gssapi.h>
-
--int gp_unwrap(struct gp_call_ctx *gpcall,
-+int gp_unwrap(struct gp_call_ctx *gpcall UNUSED,
- union gp_rpc_arg *arg,
- union gp_rpc_res *res)
- {
-@@ -106,8 +106,7 @@ int gp_unwrap(struct gp_call_ctx *gpcall,
- ret_min = 0;
-
- done:
-- ret = gp_conv_status_to_gssx(&uwa->call_ctx,
-- ret_maj, ret_min,
-+ ret = gp_conv_status_to_gssx(ret_maj, ret_min,
- GSS_C_NO_OID,
- &uwr->status);
- GPRPCDEBUG(gssx_res_unwrap, uwr);
-diff --git a/proxy/src/gp_rpc_verify_mic.c b/proxy/src/gp_rpc_verify_mic.c
-index d2920d2..6da6dac 100644
---- a/proxy/src/gp_rpc_verify_mic.c
-+++ b/proxy/src/gp_rpc_verify_mic.c
-@@ -3,7 +3,7 @@
- #include "gp_rpc_process.h"
- #include <gssapi/gssapi.h>
-
--int gp_verify_mic(struct gp_call_ctx *gpcall,
-+int gp_verify_mic(struct gp_call_ctx *gpcall UNUSED,
- union gp_rpc_arg *arg,
- union gp_rpc_res *res)
- {
-@@ -74,8 +74,7 @@ int gp_verify_mic(struct gp_call_ctx *gpcall,
- ret_min = 0;
-
- done:
-- ret = gp_conv_status_to_gssx(&vma->call_ctx,
-- ret_maj, ret_min,
-+ ret = gp_conv_status_to_gssx(ret_maj, ret_min,
- GSS_C_NO_OID,
- &vmr->status);
- GPRPCDEBUG(gssx_res_verify_mic, vmr);
-diff --git a/proxy/src/gp_rpc_wrap.c b/proxy/src/gp_rpc_wrap.c
-index d5c950e..ae20bdb 100644
---- a/proxy/src/gp_rpc_wrap.c
-+++ b/proxy/src/gp_rpc_wrap.c
-@@ -3,7 +3,7 @@
- #include "gp_rpc_process.h"
- #include <gssapi/gssapi.h>
-
--int gp_wrap(struct gp_call_ctx *gpcall,
-+int gp_wrap(struct gp_call_ctx *gpcall UNUSED,
- union gp_rpc_arg *arg,
- union gp_rpc_res *res)
- {
-@@ -105,7 +105,7 @@ int gp_wrap(struct gp_call_ctx *gpcall,
- ret_min = 0;
-
- done:
-- ret = gp_conv_status_to_gssx(&wa->call_ctx, ret_maj, ret_min,
-+ ret = gp_conv_status_to_gssx(ret_maj, ret_min,
- GSS_C_NO_OID, &wr->status);
- GPRPCDEBUG(gssx_res_wrap, wr);
- gss_release_buffer(&ret_min, &output_message_buffer);
-diff --git a/proxy/src/gp_rpc_wrap_size_limit.c b/proxy/src/gp_rpc_wrap_size_limit.c
-index 355113c..cab6826 100644
---- a/proxy/src/gp_rpc_wrap_size_limit.c
-+++ b/proxy/src/gp_rpc_wrap_size_limit.c
-@@ -3,7 +3,7 @@
- #include "gp_rpc_process.h"
- #include <gssapi/gssapi.h>
-
--int gp_wrap_size_limit(struct gp_call_ctx *gpcall,
-+int gp_wrap_size_limit(struct gp_call_ctx *gpcall UNUSED,
- union gp_rpc_arg *arg,
- union gp_rpc_res *res)
- {
-@@ -51,8 +51,7 @@ int gp_wrap_size_limit(struct gp_call_ctx *gpcall,
- ret_min = 0;
-
- done:
-- ret = gp_conv_status_to_gssx(&wsla->call_ctx,
-- ret_maj, ret_min,
-+ ret = gp_conv_status_to_gssx(ret_maj, ret_min,
- GSS_C_NO_OID,
- &wslr->status);
- GPRPCDEBUG(gssx_res_wrap_size_limit, wslr);
-diff --git a/proxy/src/gp_socket.c b/proxy/src/gp_socket.c
-index 62d7dbc..829ff21 100644
---- a/proxy/src/gp_socket.c
-+++ b/proxy/src/gp_socket.c
-@@ -146,7 +146,7 @@ static int set_fd_flags(int fd, int flags)
- return 0;
- }
-
--void free_unix_socket(verto_ctx *ctx, verto_ev *ev)
-+void free_unix_socket(verto_ctx *ctx UNUSED, verto_ev *ev)
- {
- struct gp_sock_ctx *sock_ctx = NULL;
- sock_ctx = verto_get_private(ev);
-diff --git a/proxy/src/gssproxy.c b/proxy/src/gssproxy.c
-index 561188e..a020218 100644
---- a/proxy/src/gssproxy.c
-+++ b/proxy/src/gssproxy.c
-@@ -119,7 +119,7 @@ static int init_sockets(verto_ctx *vctx, struct gp_config *old_config)
- return 0;
- }
-
--static void hup_handler(verto_ctx *vctx, verto_ev *ev)
-+static void hup_handler(verto_ctx *vctx, verto_ev *ev UNUSED)
- {
- int ret;
- struct gp_config *new_config, *old_config;
+++ /dev/null
-From 24d776205605f3c113fdc2cb356d4c28b8033676 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Fri, 15 Sep 2017 18:07:28 -0400
-Subject: [PATCH] Handle outdated encrypted ccaches
-
-When the encrypting keytab changes, all credentials that it was used
-to encrypt must be re-created. Otherwise, we log obtuse messages and
-fail to do what the user wants.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #214
-(cherry picked from commit 657d3c8339309dd8e2bfa4ee10f005e0f0c055e8)
----
- proxy/src/gp_export.c | 11 ++++++-----
- proxy/src/gp_rpc_accept_sec_context.c | 28 +++++++++++++++++++++++++++
- proxy/src/gp_rpc_init_sec_context.c | 2 +-
- 3 files changed, 35 insertions(+), 6 deletions(-)
-
-diff --git a/proxy/src/gp_export.c b/proxy/src/gp_export.c
-index ab08bb7..0c39045 100644
---- a/proxy/src/gp_export.c
-+++ b/proxy/src/gp_export.c
-@@ -268,7 +268,7 @@ static int gp_decrypt_buffer(krb5_context context, krb5_keyblock *key,
- &enc_handle,
- &data_out);
- if (ret) {
-- return EINVAL;
-+ return ret;
- }
-
- *len = data_out.length;
-@@ -446,8 +446,8 @@ uint32_t gp_import_gssx_cred(uint32_t *min, struct gp_call_ctx *gpcall,
- {
- gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
- struct gp_creds_handle *handle = NULL;
-- uint32_t ret_maj;
-- uint32_t ret_min;
-+ uint32_t ret_maj = GSS_S_COMPLETE;
-+ uint32_t ret_min = 0;
- int ret;
-
- handle = gp_service_get_creds_handle(gpcall->service);
-@@ -469,8 +469,9 @@ uint32_t gp_import_gssx_cred(uint32_t *min, struct gp_call_ctx *gpcall,
- &cred->cred_handle_reference,
- &token.length, token.value);
- if (ret) {
-- ret_maj = GSS_S_FAILURE;
-- ret_min = ENOENT;
-+ /* Allow for re-issuance of the keytab. */
-+ GPDEBUG("Stored ccache failed to decrypt; treating as empty\n");
-+ *out = GSS_C_NO_CREDENTIAL;
- goto done;
- }
-
-diff --git a/proxy/src/gp_rpc_accept_sec_context.c b/proxy/src/gp_rpc_accept_sec_context.c
-index ae4de55..2cdc94b 100644
---- a/proxy/src/gp_rpc_accept_sec_context.c
-+++ b/proxy/src/gp_rpc_accept_sec_context.c
-@@ -25,6 +25,13 @@ int gp_accept_sec_context(struct gp_call_ctx *gpcall,
- int exp_creds_type;
- uint32_t acpt_maj;
- uint32_t acpt_min;
-+ struct gp_cred_check_handle gcch = {
-+ .ctx = gpcall,
-+ .options.options_len = arg->accept_sec_context.options.options_len,
-+ .options.options_val = arg->accept_sec_context.options.options_val,
-+ };
-+ uint32_t gccn_before = 0;
-+ uint32_t gccn_after = 0;
- int ret;
-
- asca = &arg->accept_sec_context;
-@@ -52,6 +59,8 @@ int gp_accept_sec_context(struct gp_call_ctx *gpcall,
- if (ret_maj) {
- goto done;
- }
-+
-+ gccn_before = gp_check_sync_creds(&gcch, ach);
- }
-
- if (ach == GSS_C_NO_CREDENTIAL) {
-@@ -146,6 +155,25 @@ int gp_accept_sec_context(struct gp_call_ctx *gpcall,
- src_name, oid,
- &ascr->options.options_len,
- &ascr->options.options_val);
-+ if (ret_maj) {
-+ goto done;
-+ }
-+
-+ gccn_after = gp_check_sync_creds(&gcch, ach);
-+
-+ if (gccn_before != gccn_after) {
-+ /* export creds back to client for sync up */
-+ ret_maj = gp_export_sync_creds(&ret_min, gpcall, &ach,
-+ &ascr->options.options_val,
-+ &ascr->options.options_len);
-+ if (ret_maj) {
-+ /* not fatal, log and continue */
-+ GPDEBUG("Failed to export sync creds (%d: %d)",
-+ (int)ret_maj, (int)ret_min);
-+ }
-+ }
-+
-+ ret_maj = GSS_S_COMPLETE;
-
- done:
- if (ret_maj == GSS_S_COMPLETE) {
-diff --git a/proxy/src/gp_rpc_init_sec_context.c b/proxy/src/gp_rpc_init_sec_context.c
-index e4af495..f362dbc 100644
---- a/proxy/src/gp_rpc_init_sec_context.c
-+++ b/proxy/src/gp_rpc_init_sec_context.c
-@@ -91,7 +91,7 @@ int gp_init_sec_context(struct gp_call_ctx *gpcall,
- gp_conv_gssx_to_buffer(isca->input_token, &ibuf);
- }
-
-- if (!isca->cred_handle) {
-+ if (!ich) {
- if (gss_oid_equal(mech_type, gss_mech_krb5)) {
- ret_maj = gp_add_krb5_creds(&ret_min, gpcall,
- ACQ_NORMAL, NULL, NULL,
+++ /dev/null
-From 26b5ff6b802b6a24b23ea774b0305f6f2031d4da Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 17 May 2017 12:21:37 -0400
-Subject: [PATCH] Include header for writev()
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #186
-(cherry picked from commit c8c5e8d2b2154d1006633634478a24bfa0b04b4d)
----
- proxy/src/gp_socket.c | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/proxy/src/gp_socket.c b/proxy/src/gp_socket.c
-index 17ecf7c..29b6a44 100644
---- a/proxy/src/gp_socket.c
-+++ b/proxy/src/gp_socket.c
-@@ -1,19 +1,22 @@
- /* Copyright (C) 2011,2015 the GSS-PROXY contributors, see COPYING for license */
-
- #include "config.h"
--#include <stdlib.h>
--#include <unistd.h>
--#include <fcntl.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--#include <sys/socket.h>
--#include <sys/un.h>
--#include <errno.h>
--#include <netinet/in.h>
-+
- #include "gp_proxy.h"
- #include "gp_creds.h"
- #include "gp_selinux.h"
-
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <netinet/in.h>
-+#include <stdlib.h>
-+#include <sys/socket.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#include <sys/uio.h>
-+#include <sys/un.h>
-+#include <unistd.h>
-+
- #define FRAGMENT_BIT (1 << 31)
-
- struct unix_sock_conn {
+++ /dev/null
-From 938bd1adc15342e8ebed3d4e135d862e362a619e Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Thu, 25 May 2017 13:06:17 -0400
-Subject: [PATCH] Make proc file failure loud but nonfatal
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Resolves: #190
-(cherry picked from commit 4f60bf02a1a68cbb26251e764357b753f80790f3)
----
- proxy/src/gp_init.c | 34 +++++++++++++++-------------------
- 1 file changed, 15 insertions(+), 19 deletions(-)
-
-diff --git a/proxy/src/gp_init.c b/proxy/src/gp_init.c
-index bb7ba6b..d367f92 100644
---- a/proxy/src/gp_init.c
-+++ b/proxy/src/gp_init.c
-@@ -144,11 +144,11 @@ void init_proc_nfsd(struct gp_config *cfg)
- {
- char buf[] = "1";
- bool enabled = false;
-- int fd, i, ret;
-+ int fd, ret;
-
- /* check first if any service enabled kernel support */
-- for (i = 0; i < cfg->num_svcs; i++) {
-- if (cfg->svcs[i]->kernel_nfsd == true) {
-+ for (int i = 0; i < cfg->num_svcs; i++) {
-+ if (cfg->svcs[i]->kernel_nfsd) {
- enabled = true;
- break;
- }
-@@ -161,30 +161,26 @@ void init_proc_nfsd(struct gp_config *cfg)
- fd = open(LINUX_PROC_USE_GSS_PROXY_FILE, O_RDWR);
- if (fd == -1) {
- ret = errno;
-- fprintf(stderr, "GSS-Proxy is not supported by this kernel since "
-- "file %s could not be found: %d (%s)\n",
-- LINUX_PROC_USE_GSS_PROXY_FILE,
-- ret, gp_strerror(ret));
-- exit(1);
-+ GPDEBUG("Kernel doesn't support GSS-Proxy (can't open %s: %d (%s))\n",
-+ LINUX_PROC_USE_GSS_PROXY_FILE, ret, gp_strerror(ret));
-+ goto fail;
- }
-
- ret = write(fd, buf, 1);
- if (ret != 1) {
- ret = errno;
-- fprintf(stderr, "Failed to write to %s: %d (%s)\n",
-- LINUX_PROC_USE_GSS_PROXY_FILE,
-- ret, gp_strerror(ret));
-- exit(1);
-+ GPDEBUG("Failed to write to %s: %d (%s)\n",
-+ LINUX_PROC_USE_GSS_PROXY_FILE, ret, gp_strerror(ret));
- }
-
-- ret = close(fd);
-- if (ret == -1) {
-- ret = errno;
-- fprintf(stderr, "Failed to close %s: %d (%s)\n",
-- LINUX_PROC_USE_GSS_PROXY_FILE,
-- ret, gp_strerror(ret));
-- exit(1);
-+ close(fd);
-+ if (ret != 0) {
-+ goto fail;
- }
-+
-+ return;
-+fail:
-+ GPDEBUG("Problem with kernel communication! NFS server will not work\n");
- }
-
- void write_pid(void)
+++ /dev/null
-From 1fa33903be640f8d22757d21da294e70f0812698 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 10 Oct 2017 18:00:45 -0400
-Subject: [PATCH] Only empty FILE ccaches when storing remote creds
-
-This mitigates issues when services share a ccache between two
-processes. We cannot fix this for FILE ccaches without introducing
-other issues.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #216
-(cherry picked from commit d09e87f47a21dd250bfd7a9c59a5932b5c995057)
----
- proxy/src/mechglue/gpp_creds.c | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/proxy/src/mechglue/gpp_creds.c b/proxy/src/mechglue/gpp_creds.c
-index 9fe9bd1..6bdff45 100644
---- a/proxy/src/mechglue/gpp_creds.c
-+++ b/proxy/src/mechglue/gpp_creds.c
-@@ -147,6 +147,7 @@ uint32_t gpp_store_remote_creds(uint32_t *min, bool default_creds,
- char cred_name[creds->desired_name.display_name.octet_string_len + 1];
- XDR xdrctx;
- bool xdrok;
-+ const char *cc_type;
-
- *min = 0;
-
-@@ -193,13 +194,20 @@ uint32_t gpp_store_remote_creds(uint32_t *min, bool default_creds,
- }
- cred.ticket.length = xdr_getpos(&xdrctx);
-
-- /* Always initialize and destroy any existing contents to avoid pileup of
-- * entries */
-- ret = krb5_cc_initialize(ctx, ccache, cred.client);
-- if (ret == 0) {
-- ret = krb5_cc_store_cred(ctx, ccache, &cred);
-+ cc_type = krb5_cc_get_type(ctx, ccache);
-+ if (strcmp(cc_type, "FILE") == 0) {
-+ /* FILE ccaches don't handle updates properly: if they have the same
-+ * principal name, they are blackholed. We either have to change the
-+ * name (at which point the file grows forever) or flash the cache on
-+ * every update. */
-+ ret = krb5_cc_initialize(ctx, ccache, cred.client);
-+ if (ret != 0) {
-+ goto done;
-+ }
- }
-
-+ ret = krb5_cc_store_cred(ctx, ccache, &cred);
-+
- done:
- if (ctx) {
- krb5_free_cred_contents(ctx, &cred);
+++ /dev/null
-From 8a7fc8e280e31fd8c277adc4f74cc26c341a71b4 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 12 Sep 2017 12:40:27 -0400
-Subject: [PATCH] Prevent uninitialized read in error path of XDR contexts
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #211
-(cherry picked from commit 8ba0f42f06bc7d0ed68cb2eb3ef2794fc860ac2d)
----
- proxy/src/client/gpm_common.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/proxy/src/client/gpm_common.c b/proxy/src/client/gpm_common.c
-index c65c69d..d0f99d6 100644
---- a/proxy/src/client/gpm_common.c
-+++ b/proxy/src/client/gpm_common.c
-@@ -656,8 +656,8 @@ int gpm_make_call(int proc, union gp_rpc_arg *arg, union gp_rpc_res *res)
- {
- struct gpm_ctx *gpmctx;
- gp_rpc_msg msg;
-- XDR xdr_call_ctx;
-- XDR xdr_reply_ctx;
-+ XDR xdr_call_ctx = {0};
-+ XDR xdr_reply_ctx = {0};
- char *send_buffer = NULL;
- char *recv_buffer = NULL;
- uint32_t send_length;
+++ /dev/null
-From 2d91093925c8546d68f9314546353226b4f41569 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 5 Dec 2017 13:14:29 -0500
-Subject: [PATCH] Properly initialize ccaches before storing into them
-
-krb5_cc_new_unique() doesn't initialize ccaches, which results in the
-krb5 libraries being aware of their presence within the collection but
-being unable to manipulate them.
-
-This is transparent to most gssproxy consumers because we just
-re-fetch the ccache on error.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #223
-(cherry picked from commit be7df45b6a56631033de387d28a2c06b7658c36a)
----
- proxy/src/mechglue/gpp_creds.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/proxy/src/mechglue/gpp_creds.c b/proxy/src/mechglue/gpp_creds.c
-index 187ada7..f8ab320 100644
---- a/proxy/src/mechglue/gpp_creds.c
-+++ b/proxy/src/mechglue/gpp_creds.c
-@@ -247,6 +247,13 @@ uint32_t gpp_store_remote_creds(uint32_t *min, bool store_as_default_cred,
-
- ret = krb5_cc_new_unique(ctx, cc_type, NULL, &ccache);
- free(cc_type);
-+ if (ret)
-+ goto done;
-+
-+ /* krb5_cc_new_unique() doesn't initialize, and we need to initialize
-+ * before storing into the ccache. Note that this will only clobber
-+ * the ccache handle, not the whole collection. */
-+ ret = krb5_cc_initialize(ctx, ccache, cred.client);
- }
- if (ret)
- goto done;
+++ /dev/null
-From 5fa4e2d5d484df17ebd9a585a6dfdf4522320426 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Mon, 20 Nov 2017 14:09:04 -0500
-Subject: [PATCH] Properly locate credentials in collection caches in mechglue
-
-Previously, we would just put the credentials in the default cache for
-a collection type, which lead to some mysterious failures.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #221
-(cherry picked from commit 670240a6cd4d5e2ecf13e481621098693cdbaa89)
----
- proxy/src/mechglue/gpp_creds.c | 81 +++++++++++++++++++++++----------
- proxy/src/mechglue/gss_plugin.h | 2 +-
- 2 files changed, 59 insertions(+), 24 deletions(-)
-
-diff --git a/proxy/src/mechglue/gpp_creds.c b/proxy/src/mechglue/gpp_creds.c
-index 3ebd726..187ada7 100644
---- a/proxy/src/mechglue/gpp_creds.c
-+++ b/proxy/src/mechglue/gpp_creds.c
-@@ -170,7 +170,16 @@ static krb5_error_code gpp_construct_cred(gssx_cred *creds, krb5_context ctx,
- return 0;
- }
-
--uint32_t gpp_store_remote_creds(uint32_t *min, bool default_creds,
-+/* Store creds from remote in a local ccache, updating where possible.
-+ *
-+ * If store_as_default_cred is true, the cred is made default for its
-+ * collection, if there is one. Note that if the ccache is not of a
-+ * collection type, the creds will overwrite the ccache.
-+ *
-+ * If no "ccache" entry is specified in cred_store, the default ccache for a
-+ * new context will be used.
-+ */
-+uint32_t gpp_store_remote_creds(uint32_t *min, bool store_as_default_cred,
- gss_const_key_value_set_t cred_store,
- gssx_cred *creds)
- {
-@@ -179,7 +188,7 @@ uint32_t gpp_store_remote_creds(uint32_t *min, bool default_creds,
- krb5_creds cred;
- krb5_error_code ret;
- char cred_name[creds->desired_name.display_name.octet_string_len + 1];
-- const char *cc_type;
-+ const char *cc_name;
-
- *min = 0;
-
-@@ -191,38 +200,64 @@ uint32_t gpp_store_remote_creds(uint32_t *min, bool default_creds,
- goto done;
- }
-
-- if (cred_store) {
-- for (unsigned i = 0; i < cred_store->count; i++) {
-- if (strcmp(cred_store->elements[i].key, "ccache") == 0) {
-- ret = krb5_cc_resolve(ctx, cred_store->elements[i].value,
-- &ccache);
-- if (ret) goto done;
-- break;
-- }
-+ for (unsigned i = 0; cred_store && i < cred_store->count; i++) {
-+ if (strcmp(cred_store->elements[i].key, "ccache") == 0) {
-+ /* krb5 creates new ccaches based off the default name. */
-+ ret = krb5_cc_set_default_name(ctx,
-+ cred_store->elements[i].value);
-+ if (ret)
-+ goto done;
-+
-+ break;
- }
- }
-- if (!ccache) {
-- if (!default_creds) {
-- ret = ENOMEDIUM;
-- goto done;
-- }
-- ret = krb5_cc_default(ctx, &ccache);
-- if (ret) goto done;
-- }
-
-- cc_type = krb5_cc_get_type(ctx, ccache);
-- if (strcmp(cc_type, "FILE") == 0) {
-+ cc_name = krb5_cc_default_name(ctx);
-+ if (strncmp(cc_name, "FILE:", 5) == 0 || !strchr(cc_name, ':')) {
- /* FILE ccaches don't handle updates properly: if they have the same
- * principal name, they are blackholed. We either have to change the
- * name (at which point the file grows forever) or flash the cache on
- * every update. */
-- ret = krb5_cc_initialize(ctx, ccache, cred.client);
-- if (ret != 0) {
-+ ret = krb5_cc_default(ctx, &ccache);
-+ if (ret)
- goto done;
-- }
-+
-+ ret = krb5_cc_initialize(ctx, ccache, cred.client);
-+ if (ret != 0)
-+ goto done;
-+
-+ ret = krb5_cc_store_cred(ctx, ccache, &cred);
-+ goto done;
- }
-
-+ ret = krb5_cc_cache_match(ctx, cred.client, &ccache);
-+ if (ret == KRB5_CC_NOTFOUND) {
-+ /* A new ccache within the collection whose name is based off the
-+ * default_name for the context. krb5_cc_new_unique only accepts the
-+ * leading component of a name as a type. */
-+ char *cc_type;
-+ const char *p;
-+
-+ p = strchr(cc_name, ':'); /* can't be FILE here */
-+ cc_type = strndup(cc_name, p - cc_name);
-+ if (!cc_type) {
-+ ret = ENOMEM;
-+ goto done;
-+ }
-+
-+ ret = krb5_cc_new_unique(ctx, cc_type, NULL, &ccache);
-+ free(cc_type);
-+ }
-+ if (ret)
-+ goto done;
-+
- ret = krb5_cc_store_cred(ctx, ccache, &cred);
-+ if (ret)
-+ goto done;
-+
-+ if (store_as_default_cred) {
-+ ret = krb5_cc_switch(ctx, ccache);
-+ }
-
- done:
- if (ctx) {
-diff --git a/proxy/src/mechglue/gss_plugin.h b/proxy/src/mechglue/gss_plugin.h
-index 333d63c..c0e8870 100644
---- a/proxy/src/mechglue/gss_plugin.h
-+++ b/proxy/src/mechglue/gss_plugin.h
-@@ -76,7 +76,7 @@ uint32_t gpp_cred_handle_init(uint32_t *min, bool defcred, const char *ccache,
- struct gpp_cred_handle **out_handle);
- uint32_t gpp_cred_handle_free(uint32_t *min, struct gpp_cred_handle *handle);
- bool gpp_creds_are_equal(gssx_cred *a, gssx_cred *b);
--uint32_t gpp_store_remote_creds(uint32_t *min, bool default_creds,
-+uint32_t gpp_store_remote_creds(uint32_t *min, bool store_as_default_cred,
- gss_const_key_value_set_t cred_store,
- gssx_cred *creds);
-
+++ /dev/null
-From fc748ba83eb29f10fd44b6572b04709fa27dc587 Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Mon, 13 Mar 2017 08:06:12 -0400
-Subject: [PATCH] Properly renew expired credentials
-
-When a caller imports expired credentials, we aim to actually renew them
-if we can. However due to incorrect checks and not clearing of the
-ret_maj variable after checks we end up returning an error instead.
-
-Also fix mechglue to also save and properly report the first call errors
-when both remote and local fail.
-
-Resolves: #170
-
-Signed-off-by: Simo Sorce <simo@redhat.com>
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-(cherry picked from commit dc462321226f59ceaab0d3db47446a694a8ecba2)
----
- proxy/src/gp_creds.c | 14 +++++++++-----
- proxy/src/mechglue/gpp_acquire_cred.c | 5 +++++
- 2 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/proxy/src/gp_creds.c b/proxy/src/gp_creds.c
-index 5d84904..171a724 100644
---- a/proxy/src/gp_creds.c
-+++ b/proxy/src/gp_creds.c
-@@ -629,8 +629,12 @@ uint32_t gp_add_krb5_creds(uint32_t *min,
- ret_maj = gp_check_cred(&ret_min, in_cred, desired_name, cred_usage);
- if (ret_maj == GSS_S_COMPLETE) {
- return GSS_S_COMPLETE;
-- } else if (ret_maj != GSS_S_CREDENTIALS_EXPIRED &&
-- ret_maj != GSS_S_NO_CRED) {
-+ } else if (ret_maj == GSS_S_CREDENTIALS_EXPIRED ||
-+ ret_maj == GSS_S_NO_CRED) {
-+ /* continue and try to obtain new creds */
-+ ret_maj = 0;
-+ ret_min = 0;
-+ } else {
- *min = ret_min;
- return GSS_S_CRED_UNAVAIL;
- }
-@@ -639,14 +643,14 @@ uint32_t gp_add_krb5_creds(uint32_t *min,
- if (acquire_type == ACQ_NORMAL) {
- ret_min = gp_get_cred_environment(gpcall, desired_name, &req_name,
- &cred_usage, &cred_store);
-+ if (ret_min) {
-+ ret_maj = GSS_S_CRED_UNAVAIL;
-+ }
- } else if (desired_name) {
- ret_maj = gp_conv_gssx_to_name(&ret_min, desired_name, &req_name);
- }
- if (ret_maj) {
- goto done;
-- } else if (ret_min) {
-- ret_maj = GSS_S_CRED_UNAVAIL;
-- goto done;
- }
-
- if (!try_impersonate(gpcall->service, cred_usage, acquire_type)) {
-diff --git a/proxy/src/mechglue/gpp_acquire_cred.c b/proxy/src/mechglue/gpp_acquire_cred.c
-index d876699..514fdd1 100644
---- a/proxy/src/mechglue/gpp_acquire_cred.c
-+++ b/proxy/src/mechglue/gpp_acquire_cred.c
-@@ -186,6 +186,11 @@ OM_uint32 gssi_acquire_cred_from(OM_uint32 *minor_status,
- }
-
- if (behavior == GPP_REMOTE_FIRST) {
-+ if (maj != GSS_S_COMPLETE) {
-+ /* save errors */
-+ tmaj = maj;
-+ tmin = min;
-+ }
- /* So remote failed, but we can fallback to local, try that */
- maj = acquire_local(&min, NULL, name,
- time_req, desired_mechs, cred_usage, cred_store,
+++ /dev/null
-From 9e2bdfeee30331254d21eaf9e9c000fb9e642fe9 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Thu, 23 Mar 2017 13:42:55 -0400
-Subject: [PATCH] Remove gpm_release_ctx() to fix double unlock
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #173
-(cherry picked from commit b50a863b20649b80cc44c88aa325c6c3220af61b)
----
- proxy/src/client/gpm_common.c | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/proxy/src/client/gpm_common.c b/proxy/src/client/gpm_common.c
-index 8c96986..69f4741 100644
---- a/proxy/src/client/gpm_common.c
-+++ b/proxy/src/client/gpm_common.c
-@@ -312,11 +312,6 @@ static struct gpm_ctx *gpm_get_ctx(void)
- return &gpm_global_ctx;
- }
-
--static void gpm_release_ctx(struct gpm_ctx *gpmctx)
--{
-- gpm_release_sock(gpmctx);
--}
--
- OM_uint32 gpm_release_buffer(OM_uint32 *minor_status,
- gss_buffer_t buffer)
- {
-@@ -503,7 +498,6 @@ done:
- xdr_free((xdrproc_t)xdr_gp_rpc_msg, (char *)&msg);
- xdr_destroy(&xdr_call_ctx);
- xdr_destroy(&xdr_reply_ctx);
-- gpm_release_ctx(gpmctx);
- return ret;
- }
-
+++ /dev/null
-From 1451b65fec69ff35e029b4770dcb4927ba57060a Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Fri, 17 Nov 2017 13:53:37 -0500
-Subject: [PATCH] Separate cred and ccache manipulation in
- gpp_store_remote_creds()
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-(cherry picked from commit 221b553bfb4082085d05b40da9a04c1f7e4af533)
----
- proxy/src/mechglue/gpp_creds.c | 62 +++++++++++++++++++++-------------
- 1 file changed, 39 insertions(+), 23 deletions(-)
-
-diff --git a/proxy/src/mechglue/gpp_creds.c b/proxy/src/mechglue/gpp_creds.c
-index 6bdff45..3ebd726 100644
---- a/proxy/src/mechglue/gpp_creds.c
-+++ b/proxy/src/mechglue/gpp_creds.c
-@@ -136,6 +136,40 @@ bool gpp_creds_are_equal(gssx_cred *a, gssx_cred *b)
- return true;
- }
-
-+static krb5_error_code gpp_construct_cred(gssx_cred *creds, krb5_context ctx,
-+ krb5_creds *cred, char *cred_name)
-+{
-+ XDR xdrctx;
-+ bool xdrok;
-+ krb5_error_code ret = 0;
-+
-+ memset(cred, 0, sizeof(*cred));
-+
-+ memcpy(cred_name, creds->desired_name.display_name.octet_string_val,
-+ creds->desired_name.display_name.octet_string_len);
-+ cred_name[creds->desired_name.display_name.octet_string_len] = '\0';
-+
-+ ret = krb5_parse_name(ctx, cred_name, &cred->client);
-+ if (ret) {
-+ return ret;
-+ }
-+
-+ ret = krb5_parse_name(ctx, GPKRB_SRV_NAME, &cred->server);
-+ if (ret) {
-+ return ret;
-+ }
-+
-+ cred->ticket.data = malloc(GPKRB_MAX_CRED_SIZE);
-+ xdrmem_create(&xdrctx, cred->ticket.data, GPKRB_MAX_CRED_SIZE,
-+ XDR_ENCODE);
-+ xdrok = xdr_gssx_cred(&xdrctx, creds);
-+ if (!xdrok) {
-+ return ENOSPC;
-+ }
-+ cred->ticket.length = xdr_getpos(&xdrctx);
-+ return 0;
-+}
-+
- uint32_t gpp_store_remote_creds(uint32_t *min, bool default_creds,
- gss_const_key_value_set_t cred_store,
- gssx_cred *creds)
-@@ -145,17 +179,18 @@ uint32_t gpp_store_remote_creds(uint32_t *min, bool default_creds,
- krb5_creds cred;
- krb5_error_code ret;
- char cred_name[creds->desired_name.display_name.octet_string_len + 1];
-- XDR xdrctx;
-- bool xdrok;
- const char *cc_type;
-
- *min = 0;
-
-- memset(&cred, 0, sizeof(cred));
--
- ret = krb5_init_context(&ctx);
- if (ret) return ret;
-
-+ ret = gpp_construct_cred(creds, ctx, &cred, cred_name);
-+ if (ret) {
-+ goto done;
-+ }
-+
- if (cred_store) {
- for (unsigned i = 0; i < cred_store->count; i++) {
- if (strcmp(cred_store->elements[i].key, "ccache") == 0) {
-@@ -175,25 +210,6 @@ uint32_t gpp_store_remote_creds(uint32_t *min, bool default_creds,
- if (ret) goto done;
- }
-
-- memcpy(cred_name, creds->desired_name.display_name.octet_string_val,
-- creds->desired_name.display_name.octet_string_len);
-- cred_name[creds->desired_name.display_name.octet_string_len] = '\0';
--
-- ret = krb5_parse_name(ctx, cred_name, &cred.client);
-- if (ret) goto done;
--
-- ret = krb5_parse_name(ctx, GPKRB_SRV_NAME, &cred.server);
-- if (ret) goto done;
--
-- cred.ticket.data = malloc(GPKRB_MAX_CRED_SIZE);
-- xdrmem_create(&xdrctx, cred.ticket.data, GPKRB_MAX_CRED_SIZE, XDR_ENCODE);
-- xdrok = xdr_gssx_cred(&xdrctx, creds);
-- if (!xdrok) {
-- ret = ENOSPC;
-- goto done;
-- }
-- cred.ticket.length = xdr_getpos(&xdrctx);
--
- cc_type = krb5_cc_get_type(ctx, ccache);
- if (strcmp(cc_type, "FILE") == 0) {
- /* FILE ccaches don't handle updates properly: if they have the same
+++ /dev/null
-From 6d12deeb19cc2e231463427db27f8755649450d1 Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <alexander.m.scheel@gmail.com>
-Date: Thu, 14 Sep 2017 10:57:12 -0500
-Subject: [PATCH] Simplify setting NONBLOCK on socket
-
-Signed-off-by: Alexander Scheel <alexander.m.scheel@gmail.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-Merges: #213
-[rharwood@redhat.com: fixup commit message]
-(cherry picked from commit ec808ee6a5e6746ed35acc865f253425701be352)
----
- proxy/src/client/gpm_common.c | 15 +--------------
- 1 file changed, 1 insertion(+), 14 deletions(-)
-
-diff --git a/proxy/src/client/gpm_common.c b/proxy/src/client/gpm_common.c
-index d0f99d6..7d1158e 100644
---- a/proxy/src/client/gpm_common.c
-+++ b/proxy/src/client/gpm_common.c
-@@ -80,7 +80,6 @@ static int gpm_open_socket(struct gpm_ctx *gpmctx)
- struct sockaddr_un addr = {0};
- char name[PATH_MAX];
- int ret;
-- unsigned flags;
- int fd = -1;
-
- ret = get_pipe_name(name);
-@@ -92,24 +91,12 @@ static int gpm_open_socket(struct gpm_ctx *gpmctx)
- strncpy(addr.sun_path, name, sizeof(addr.sun_path)-1);
- addr.sun_path[sizeof(addr.sun_path)-1] = '\0';
-
-- fd = socket(AF_UNIX, SOCK_STREAM, 0);
-+ fd = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0);
- if (fd == -1) {
- ret = errno;
- goto done;
- }
-
-- ret = fcntl(fd, F_GETFD, &flags);
-- if (ret != 0) {
-- ret = errno;
-- goto done;
-- }
--
-- ret = fcntl(fd, F_SETFD, flags | O_NONBLOCK);
-- if (ret != 0) {
-- ret = errno;
-- goto done;
-- }
--
- ret = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
- if (ret == -1) {
- ret = errno;
+++ /dev/null
-From 05a2677920f0240ea302e67d699546665687dd14 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 13 Jun 2017 14:22:44 -0400
-Subject: [PATCH] Tolerate NULL pointers in gp_same
-
-Fixes potential NULL derefs of program names
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #195
-(cherry picked from commit afe4c2fe6f7f939df914959dda11131bd80ccec6)
----
- proxy/src/gp_util.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/proxy/src/gp_util.c b/proxy/src/gp_util.c
-index f158b84..5442992 100644
---- a/proxy/src/gp_util.c
-+++ b/proxy/src/gp_util.c
-@@ -12,10 +12,9 @@
-
- bool gp_same(const char *a, const char *b)
- {
-- if ((a == b) || strcmp(a, b) == 0) {
-+ if (a == b || (a && b && strcmp(a, b) == 0)) {
- return true;
- }
--
- return false;
- }
-
+++ /dev/null
-From a50ea0aa3dfd39ab4a3c39dde35c12fc51fe40d5 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 15 Mar 2017 13:28:26 -0400
-Subject: [PATCH] Turn on -Wextra
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-Merges: #173
-(cherry picked from commit 85bc3d794efa52aba4c32f6109e7e7741521ec5f)
----
- proxy/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/proxy/Makefile.am b/proxy/Makefile.am
-index e1fbac1..5cd2255 100644
---- a/proxy/Makefile.am
-+++ b/proxy/Makefile.am
-@@ -44,7 +44,7 @@ AM_CFLAGS += -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith \
- -Wcast-qual -Wcast-align -Wwrite-strings \
- -fstrict-aliasing -Wstrict-aliasing -Werror=strict-aliasing \
- -Werror-implicit-function-declaration \
-- -Werror=format-security
-+ -Werror=format-security -Wextra
- if BUILD_HARDENING
- AM_CPPFLAGS += -D_FORTIFY_SOURCE=2 -Wdate-time
- AM_CFLAGS += -fPIE -fstack-protector-strong
+++ /dev/null
-From 90d7a614b3eb451f0067dfacf0f0b6f41eb00180 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 26 Apr 2017 21:02:47 -0400
-Subject: [PATCH] Update systemd file
-
-Add `reload` capability, and remove dependency on nfs-utils.
-
-Closes: #127
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-(cherry picked from commit c7e8b4066575508a91a38bb6a44694c8a171f0c5)
----
- proxy/systemd/gssproxy.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/proxy/systemd/gssproxy.service.in b/proxy/systemd/gssproxy.service.in
-index dae39ee..f50f526 100644
---- a/proxy/systemd/gssproxy.service.in
-+++ b/proxy/systemd/gssproxy.service.in
-@@ -3,7 +3,6 @@ Description=GSSAPI Proxy Daemon
- # GSSPROXY will not be started until syslog is
- After=syslog.target
- Before=nfs-secure.service nfs-secure-server.service
--Requires=proc-fs-nfsd.mount
-
- [Service]
- Environment=KRB5RCACHEDIR=/var/lib/gssproxy/rcache
-@@ -12,6 +11,7 @@ ExecStart=@sbindir@/gssproxy -D
- # consult systemd.service(5) for more details
- Type=forking
- PIDFile=@localstatedir@/run/gssproxy.pid
-+ExecReload=/bin/kill -HUP $MAINPID
-
- [Install]
- WantedBy=multi-user.target
+++ /dev/null
-From 1962e6128a4d86a7c54977577e1e4224cadbb5f7 Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <ascheel@redhat.com>
-Date: Wed, 2 Aug 2017 15:11:49 -0400
-Subject: [PATCH] [client] Switch to non-blocking sockets
-
-Switch the gssproxy client library to non-blocking sockets, allowing
-for timeout and retry operations. The client will automatically retry
-both send() and recv() operations three times on ETIMEDOUT. If the
-combined send() and recv() hit the three time limit, ETIMEDOUT will be
-exposed to the caller in the minor status.
-
-Signed-off-by: Alexander Scheel <ascheel@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-[rharwood@redhat.com: commit message cleanups, rebased]
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-(cherry picked from commit d035646c8feb0b78f0c157580ca02c46cd00dd7e)
----
- proxy/src/client/gpm_common.c | 317 +++++++++++++++++++++++++++++++---
- 1 file changed, 295 insertions(+), 22 deletions(-)
-
-diff --git a/proxy/src/client/gpm_common.c b/proxy/src/client/gpm_common.c
-index 2133618..dba23a6 100644
---- a/proxy/src/client/gpm_common.c
-+++ b/proxy/src/client/gpm_common.c
-@@ -7,9 +7,15 @@
- #include <stdlib.h>
- #include <time.h>
- #include <pthread.h>
-+#include <sys/epoll.h>
-+#include <fcntl.h>
-+#include <sys/timerfd.h>
-
- #define FRAGMENT_BIT (1 << 31)
-
-+#define RESPONSE_TIMEOUT 15
-+#define MAX_TIMEOUT_RETRY 3
-+
- struct gpm_ctx {
- pthread_mutex_t lock;
- int fd;
-@@ -20,6 +26,9 @@ struct gpm_ctx {
- gid_t gid;
-
- int next_xid;
-+
-+ int epollfd;
-+ int timerfd;
- };
-
- /* a single global struct is not particularly efficient,
-@@ -39,6 +48,8 @@ static void gpm_init_once(void)
- pthread_mutex_init(&gpm_global_ctx.lock, &attr);
-
- gpm_global_ctx.fd = -1;
-+ gpm_global_ctx.epollfd = -1;
-+ gpm_global_ctx.timerfd = -1;
-
- seedp = time(NULL) + getpid() + pthread_self();
- gpm_global_ctx.next_xid = rand_r(&seedp);
-@@ -69,6 +80,7 @@ static int gpm_open_socket(struct gpm_ctx *gpmctx)
- struct sockaddr_un addr = {0};
- char name[PATH_MAX];
- int ret;
-+ unsigned flags;
- int fd = -1;
-
- ret = get_pipe_name(name);
-@@ -86,6 +98,18 @@ static int gpm_open_socket(struct gpm_ctx *gpmctx)
- goto done;
- }
-
-+ ret = fcntl(fd, F_GETFD, &flags);
-+ if (ret != 0) {
-+ ret = errno;
-+ goto done;
-+ }
-+
-+ ret = fcntl(fd, F_SETFD, flags | O_NONBLOCK);
-+ if (ret != 0) {
-+ ret = errno;
-+ goto done;
-+ }
-+
- ret = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
- if (ret == -1) {
- ret = errno;
-@@ -163,6 +187,158 @@ static int gpm_release_sock(struct gpm_ctx *gpmctx)
- return pthread_mutex_unlock(&gpmctx->lock);
- }
-
-+static void gpm_timer_close(struct gpm_ctx *gpmctx) {
-+ if (gpmctx->timerfd < 0) {
-+ return;
-+ }
-+
-+ close(gpmctx->timerfd);
-+ gpmctx->timerfd = -1;
-+}
-+
-+static int gpm_timer_setup(struct gpm_ctx *gpmctx, int timeout_seconds) {
-+ int ret;
-+ struct itimerspec its;
-+
-+ if (gpmctx->timerfd >= 0) {
-+ gpm_timer_close(gpmctx);
-+ }
-+
-+ gpmctx->timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK | TFD_CLOEXEC);
-+ if (gpmctx->timerfd < 0) {
-+ return errno;
-+ }
-+
-+ its.it_interval.tv_sec = timeout_seconds;
-+ its.it_interval.tv_nsec = 0;
-+ its.it_value.tv_sec = timeout_seconds;
-+ its.it_value.tv_nsec = 0;
-+
-+ ret = timerfd_settime(gpmctx->timerfd, 0, &its, NULL);
-+ if (ret) {
-+ ret = errno;
-+ gpm_timer_close(gpmctx);
-+ return ret;
-+ }
-+
-+ return 0;
-+}
-+
-+static void gpm_epoll_close(struct gpm_ctx *gpmctx) {
-+ if (gpmctx->epollfd < 0) {
-+ return;
-+ }
-+
-+ close(gpmctx->epollfd);
-+ gpmctx->epollfd = -1;
-+}
-+
-+static int gpm_epoll_setup(struct gpm_ctx *gpmctx) {
-+ struct epoll_event ev;
-+ int ret;
-+
-+ if (gpmctx->epollfd >= 0) {
-+ gpm_epoll_close(gpmctx);
-+ }
-+
-+ gpmctx->epollfd = epoll_create1(EPOLL_CLOEXEC);
-+ if (gpmctx->epollfd == -1) {
-+ return errno;
-+ }
-+
-+ /* Add timer */
-+ ev.events = EPOLLIN;
-+ ev.data.fd = gpmctx->timerfd;
-+ ret = epoll_ctl(gpmctx->epollfd, EPOLL_CTL_ADD, gpmctx->timerfd, &ev);
-+ if (ret == -1) {
-+ ret = errno;
-+ gpm_epoll_close(gpmctx);
-+ return ret;
-+ }
-+
-+ return ret;
-+}
-+
-+static int gpm_epoll_wait(struct gpm_ctx *gpmctx, uint32_t event_flags) {
-+ int ret;
-+ int epoll_ret;
-+ struct epoll_event ev;
-+ struct epoll_event events[2];
-+ uint64_t timer_read;
-+
-+ if (gpmctx->epollfd < 0) {
-+ ret = gpm_epoll_setup(gpmctx);
-+ if (ret)
-+ return ret;
-+ }
-+
-+ ev.events = event_flags;
-+ ev.data.fd = gpmctx->fd;
-+ epoll_ret = epoll_ctl(gpmctx->epollfd, EPOLL_CTL_ADD, gpmctx->fd, &ev);
-+ if (epoll_ret == -1) {
-+ ret = errno;
-+ gpm_epoll_close(gpmctx);
-+ return ret;
-+ }
-+
-+ do {
-+ epoll_ret = epoll_wait(gpmctx->epollfd, events, 2, -1);
-+ } while (epoll_ret < 0 && errno == EINTR);
-+
-+ if (epoll_ret < 0) {
-+ /* Error while waiting that isn't EINTR */
-+ ret = errno;
-+ gpm_epoll_close(gpmctx);
-+ } else if (epoll_ret == 0) {
-+ /* Shouldn't happen as timeout == -1; treat it like a timeout
-+ * occurred. */
-+ ret = ETIMEDOUT;
-+ gpm_epoll_close(gpmctx);
-+ } else if (epoll_ret == 1 && events[0].data.fd == gpmctx->timerfd) {
-+ /* Got an event which is only our timer */
-+ ret = read(gpmctx->timerfd, &timer_read, sizeof(uint64_t));
-+ if (ret == -1 && errno != EAGAIN && errno != EWOULDBLOCK) {
-+ /* In the case when reading from the timer failed, don't hide the
-+ * timer error behind ETIMEDOUT such that it isn't retried */
-+ ret = errno;
-+ } else {
-+ /* If ret == 0, then we definitely timed out. Else, if ret == -1
-+ * and errno == EAGAIN or errno == EWOULDBLOCK, we're in a weird
-+ * edge case where epoll thinks the timer can be read, but it
-+ * is blocking more; treat it like a TIMEOUT and retry, as
-+ * nothing around us would handle EAGAIN from timer and retry
-+ * it. */
-+ ret = ETIMEDOUT;
-+ }
-+ gpm_epoll_close(gpmctx);
-+ } else {
-+ /* If ret == 2, then we ignore the timerfd; that way if the next
-+ * operation cannot be performed immediately, we timeout and retry.
-+ * If ret == 1 and data.fd == gpmctx->fd, return 0. */
-+ ret = 0;
-+ }
-+
-+ epoll_ret = epoll_ctl(gpmctx->epollfd, EPOLL_CTL_DEL, gpmctx->fd, NULL);
-+ if (epoll_ret == -1) {
-+ /* If we previously had an error, expose that error instead of
-+ * clobbering it with errno; else if no error, then assume it is
-+ * better to notify of the error deleting the event than it is
-+ * to continue. */
-+ if (ret == 0)
-+ ret = errno;
-+ gpm_epoll_close(gpmctx);
-+ }
-+
-+ return ret;
-+}
-+
-+static int gpm_retry_socket(struct gpm_ctx *gpmctx)
-+{
-+ gpm_epoll_close(gpmctx);
-+ gpm_close_socket(gpmctx);
-+ return gpm_open_socket(gpmctx);
-+}
-+
- /* must be called after the lock has been grabbed */
- static int gpm_send_buffer(struct gpm_ctx *gpmctx,
- char *buffer, uint32_t length)
-@@ -183,8 +359,13 @@ static int gpm_send_buffer(struct gpm_ctx *gpmctx,
- retry = false;
- do {
- do {
-+ ret = gpm_epoll_wait(gpmctx, EPOLLOUT);
-+ if (ret != 0) {
-+ goto done;
-+ }
-+
- ret = 0;
-- wn = send(gpmctx->fd, &size, sizeof(uint32_t), MSG_NOSIGNAL);
-+ wn = write(gpmctx->fd, &size, sizeof(uint32_t));
- if (wn == -1) {
- ret = errno;
- }
-@@ -192,8 +373,7 @@ static int gpm_send_buffer(struct gpm_ctx *gpmctx,
- if (wn != 4) {
- /* reopen and retry once */
- if (retry == false) {
-- gpm_close_socket(gpmctx);
-- ret = gpm_open_socket(gpmctx);
-+ ret = gpm_retry_socket(gpmctx);
- if (ret == 0) {
- retry = true;
- continue;
-@@ -208,9 +388,14 @@ static int gpm_send_buffer(struct gpm_ctx *gpmctx,
-
- pos = 0;
- while (length > pos) {
-- wn = send(gpmctx->fd, buffer + pos, length - pos, MSG_NOSIGNAL);
-+ ret = gpm_epoll_wait(gpmctx, EPOLLOUT);
-+ if (ret) {
-+ goto done;
-+ }
-+
-+ wn = write(gpmctx->fd, buffer + pos, length - pos);
- if (wn == -1) {
-- if (errno == EINTR) {
-+ if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) {
- continue;
- }
- ret = errno;
-@@ -231,7 +416,7 @@ done:
-
- /* must be called after the lock has been grabbed */
- static int gpm_recv_buffer(struct gpm_ctx *gpmctx,
-- char *buffer, uint32_t *length)
-+ char **buffer, uint32_t *length)
- {
- uint32_t size;
- ssize_t rn;
-@@ -239,6 +424,11 @@ static int gpm_recv_buffer(struct gpm_ctx *gpmctx,
- int ret;
-
- do {
-+ ret = gpm_epoll_wait(gpmctx, EPOLLIN);
-+ if (ret) {
-+ goto done;
-+ }
-+
- ret = 0;
- rn = read(gpmctx->fd, &size, sizeof(uint32_t));
- if (rn == -1) {
-@@ -258,11 +448,22 @@ static int gpm_recv_buffer(struct gpm_ctx *gpmctx,
- goto done;
- }
-
-+ *buffer = malloc(*length);
-+ if (*buffer == NULL) {
-+ ret = ENOMEM;
-+ goto done;
-+ }
-+
- pos = 0;
- while (*length > pos) {
-- rn = read(gpmctx->fd, buffer + pos, *length - pos);
-+ ret = gpm_epoll_wait(gpmctx, EPOLLIN);
-+ if (ret) {
-+ goto done;
-+ }
-+
-+ rn = read(gpmctx->fd, *buffer + pos, *length - pos);
- if (rn == -1) {
-- if (errno == EINTR) {
-+ if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) {
- continue;
- }
- ret = errno;
-@@ -281,6 +482,7 @@ done:
- if (ret) {
- /* on errors we can only close the fd and return */
- gpm_close_socket(gpmctx);
-+ gpm_epoll_close(gpmctx);
- }
- return ret;
- }
-@@ -309,6 +511,63 @@ static struct gpm_ctx *gpm_get_ctx(void)
- return &gpm_global_ctx;
- }
-
-+static int gpm_send_recv_loop(struct gpm_ctx *gpmctx, char *send_buffer,
-+ uint32_t send_length, char** recv_buffer,
-+ uint32_t *recv_length)
-+{
-+ int ret;
-+ int retry_count;
-+
-+ /* setup timer */
-+ ret = gpm_timer_setup(gpmctx, RESPONSE_TIMEOUT);
-+ if (ret)
-+ return ret;
-+
-+ for (retry_count = 0; retry_count < MAX_TIMEOUT_RETRY; retry_count++) {
-+ /* send to proxy */
-+ ret = gpm_send_buffer(gpmctx, send_buffer, send_length);
-+
-+ if (ret == 0) {
-+ /* No error, continue to recv */
-+ } else if (ret == ETIMEDOUT) {
-+ /* Close and reopen socket before trying again */
-+ ret = gpm_retry_socket(gpmctx);
-+ if (ret != 0)
-+ return ret;
-+ ret = ETIMEDOUT;
-+
-+ /* RETRY entire send */
-+ continue;
-+ } else {
-+ /* Other error */
-+ return ret;
-+ }
-+
-+ /* receive answer */
-+ ret = gpm_recv_buffer(gpmctx, recv_buffer, recv_length);
-+ if (ret == 0) {
-+ /* No error */
-+ break;
-+ } else if (ret == ETIMEDOUT) {
-+ /* Close and reopen socket before trying again */
-+ ret = gpm_retry_socket(gpmctx);
-+
-+ /* Free buffer and set it to NULL to prevent free(xdr_reply_ctx) */
-+ free(recv_buffer);
-+ recv_buffer = NULL;
-+
-+ if (ret != 0)
-+ return ret;
-+ ret = ETIMEDOUT;
-+ } else {
-+ /* Other error */
-+ return ret;
-+ }
-+ }
-+
-+ return ret;
-+}
-+
- OM_uint32 gpm_release_buffer(OM_uint32 *minor_status,
- gss_buffer_t buffer)
- {
-@@ -399,15 +658,20 @@ int gpm_make_call(int proc, union gp_rpc_arg *arg, union gp_rpc_res *res)
- gp_rpc_msg msg;
- XDR xdr_call_ctx;
- XDR xdr_reply_ctx;
-- char buffer[MAX_RPC_SIZE];
-- uint32_t length;
-+ char *send_buffer = NULL;
-+ char *recv_buffer = NULL;
-+ uint32_t send_length;
-+ uint32_t recv_length;
- uint32_t xid;
- bool xdrok;
- bool sockgrab = false;
- int ret;
-
-- xdrmem_create(&xdr_call_ctx, buffer, MAX_RPC_SIZE, XDR_ENCODE);
-- xdrmem_create(&xdr_reply_ctx, buffer, MAX_RPC_SIZE, XDR_DECODE);
-+ send_buffer = malloc(MAX_RPC_SIZE);
-+ if (send_buffer == NULL)
-+ return ENOMEM;
-+
-+ xdrmem_create(&xdr_call_ctx, send_buffer, MAX_RPC_SIZE, XDR_ENCODE);
-
- memset(&msg, 0, sizeof(gp_rpc_msg));
- msg.header.type = GP_RPC_CALL;
-@@ -450,22 +714,22 @@ int gpm_make_call(int proc, union gp_rpc_arg *arg, union gp_rpc_res *res)
- goto done;
- }
-
-- /* send to proxy */
-- ret = gpm_send_buffer(gpmctx, buffer, xdr_getpos(&xdr_call_ctx));
-- if (ret) {
-- goto done;
-- }
-+ /* set send_length */
-+ send_length = xdr_getpos(&xdr_call_ctx);
-
-- /* receive answer */
-- ret = gpm_recv_buffer(gpmctx, buffer, &length);
-- if (ret) {
-+ /* Send request, receive response with timeout */
-+ ret = gpm_send_recv_loop(gpmctx, send_buffer, send_length, &recv_buffer,
-+ &recv_length);
-+ if (ret)
- goto done;
-- }
-
- /* release the lock */
- gpm_release_sock(gpmctx);
- sockgrab = false;
-
-+ /* Create the reply context */
-+ xdrmem_create(&xdr_reply_ctx, recv_buffer, recv_length, XDR_DECODE);
-+
- /* decode header */
- memset(&msg, 0, sizeof(gp_rpc_msg));
- xdrok = xdr_gp_rpc_msg(&xdr_reply_ctx, &msg);
-@@ -489,12 +753,21 @@ int gpm_make_call(int proc, union gp_rpc_arg *arg, union gp_rpc_res *res)
- }
-
- done:
-+ gpm_timer_close(gpmctx);
-+ gpm_epoll_close(gpmctx);
-+
- if (sockgrab) {
- gpm_release_sock(gpmctx);
- }
- xdr_free((xdrproc_t)xdr_gp_rpc_msg, (char *)&msg);
- xdr_destroy(&xdr_call_ctx);
-- xdr_destroy(&xdr_reply_ctx);
-+
-+ if (recv_buffer != NULL)
-+ xdr_destroy(&xdr_reply_ctx);
-+
-+ free(send_buffer);
-+ free(recv_buffer);
-+
- return ret;
- }
-
+++ /dev/null
-From f413cc257c6c1e60090c72163152ae7fd2180c41 Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <ascheel@redhat.com>
-Date: Fri, 4 Aug 2017 16:09:20 -0400
-Subject: [PATCH] [server] Add detailed request logging
-
-Add request logging to track requests through gssproxy. Requests are
-logged as they are read, processed, handled, and replies sent. These
-are identified by buffer memory address and size.
-
-Signed-off-by: Alexander Scheel <ascheel@redhat.com>
-Reviewed-by: Simo Sorce <simo@redhat.com>
-[rharwood@redhat.com: commit message cleanups, rebase]
-Reviewed-by: Robbie Harwood <rharwood@redhat.com>
-Merges: #205
-(cherry picked from commit 4097dafad3f276c3cf7b1255fe0540e16d59ae03)
----
- proxy/src/gp_rpc_process.c | 6 ++++++
- proxy/src/gp_socket.c | 12 ++++++++++++
- proxy/src/gp_workers.c | 5 +++++
- 3 files changed, 23 insertions(+)
-
-diff --git a/proxy/src/gp_rpc_process.c b/proxy/src/gp_rpc_process.c
-index 0ea17f0..eaffc55 100644
---- a/proxy/src/gp_rpc_process.c
-+++ b/proxy/src/gp_rpc_process.c
-@@ -372,9 +372,12 @@ int gp_rpc_process_call(struct gp_call_ctx *gpcall,
- xdrmem_create(&xdr_reply_ctx, reply_buffer, MAX_RPC_SIZE, XDR_ENCODE);
-
- /* decode request */
-+ GPDEBUGN(3, "[status] Processing request [%p (%zu)]\n", inbuf, inlen);
- ret = gp_rpc_decode_call(&xdr_call_ctx, &xid, &proc, &arg, &acc, &rej);
- if (!ret) {
- /* execute request */
-+ GPDEBUGN(3, "[status] Executing request %d (%s) from [%p (%zu)]\n",
-+ proc, gp_rpc_procname(proc), inbuf, inlen);
- ret = gp_rpc_execute(gpcall, proc, &arg, &res);
- if (ret) {
- acc = GP_RPC_SYSTEM_ERR;
-@@ -388,6 +391,9 @@ int gp_rpc_process_call(struct gp_call_ctx *gpcall,
- /* return encoded buffer */
- ret = gp_rpc_return_buffer(&xdr_reply_ctx,
- reply_buffer, outbuf, outlen);
-+ GPDEBUGN(3, "[status] Returned buffer %d (%s) from [%p (%zu)]: "
-+ "[%p (%zu)]\n", proc, gp_rpc_procname(proc), inbuf, inlen,
-+ *outbuf, *outlen);
- }
- /* free resources */
- gp_rpc_free_xdrs(proc, &arg, &res);
-diff --git a/proxy/src/gp_socket.c b/proxy/src/gp_socket.c
-index 5064e51..8675a0e 100644
---- a/proxy/src/gp_socket.c
-+++ b/proxy/src/gp_socket.c
-@@ -441,6 +441,8 @@ void gp_socket_send_data(verto_ctx *vctx, struct gp_conn *conn,
-
- wbuf = calloc(1, sizeof(struct gp_buffer));
- if (!wbuf) {
-+ GPDEBUGN(3, "[status] OOM in gp_socket_send_data: %p (%zu)\n",
-+ buffer, buflen);
- /* too bad, must kill the client connection now */
- gp_conn_free(conn);
- return;
-@@ -467,6 +469,8 @@ static void gp_socket_write(verto_ctx *vctx, verto_ev *ev)
-
- vecs = 0;
-
-+ GPDEBUGN(3, "[status] Sending data: %p (%zu)\n", wbuf->data, wbuf->size);
-+
- if (wbuf->pos == 0) {
- /* first write, send the buffer size as packet header */
- size = wbuf->size | FRAGMENT_BIT;
-@@ -489,6 +493,9 @@ static void gp_socket_write(verto_ctx *vctx, verto_ev *ev)
- gp_socket_schedule_write(vctx, wbuf);
- } else {
- /* error on socket, close and release it */
-+ GPDEBUGN(3, "[status] Error %d in gp_socket_write on writing for "
-+ "[%p (%zu:%zu)]\n", errno, wbuf->data, wbuf->pos,
-+ wbuf->size);
- gp_conn_free(wbuf->conn);
- gp_buffer_free(wbuf);
- }
-@@ -498,6 +505,8 @@ static void gp_socket_write(verto_ctx *vctx, verto_ev *ev)
- if (wn < (ssize_t) sizeof(size)) {
- /* don't bother trying to handle sockets that can't
- * buffer even 4 bytes */
-+ GPDEBUGN(3, "[status] Sending data [%p (%zu)]: failed with short "
-+ "write of %d\n", wbuf->data, wbuf->size, wn);
- gp_conn_free(wbuf->conn);
- gp_buffer_free(wbuf);
- return;
-@@ -505,6 +514,9 @@ static void gp_socket_write(verto_ctx *vctx, verto_ev *ev)
- wn -= sizeof(size);
- }
-
-+ GPDEBUGN(3, "[status] Sending data [%p (%zu)]: successful write of %d\n",
-+ wbuf->data, wbuf->size, wn);
-+
- wbuf->pos += wn;
- if (wbuf->size > wbuf->pos) {
- /* short write, reschedule */
-diff --git a/proxy/src/gp_workers.c b/proxy/src/gp_workers.c
-index d37e57c..2a33c21 100644
---- a/proxy/src/gp_workers.c
-+++ b/proxy/src/gp_workers.c
-@@ -319,6 +319,7 @@ static void gp_handle_reply(verto_ctx *vctx, verto_ev *ev)
- break;
-
- case GP_QUERY_OUT:
-+ GPDEBUGN(3, "[status] Handling query reply: %p (%zu)\n", q->buffer, q->buflen);
- gp_socket_send_data(vctx, q->conn, q->buffer, q->buflen);
- gp_query_free(q, false);
- break;
-@@ -381,7 +382,11 @@ static void *gp_worker_main(void *pvt)
- gp_debug_set_conn_id(gp_conn_get_cid(q->conn));
-
- /* handle the client request */
-+ GPDEBUGN(3, "[status] Handling query input: %p (%zu)\n", q->buffer,
-+ q->buflen);
- gp_handle_query(t->pool, q);
-+ GPDEBUGN(3 ,"[status] Handling query output: %p (%zu)\n", q->buffer,
-+ q->buflen);
-
- /* now get lock on main queue, to play with the reply list */
- /* ======> POOL LOCK */
+++ /dev/null
-
-SUMMARY = "provides a daemon to manage access to GSSAPI credentials"
-HOMEPAGE = "https://pagure.io/gssproxy"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a9ac3d0a983ebc781f7aa7173499e2e5"
-
-DEPENDS += "popt ding-libs keyutils libverto krb5 libxslt-native libxml2-native \
- libselinux libpthread-stubs gettext-native \
- "
-RDEPENDS_${PN} += "libinih popt libverto-libevent libverto-tevent keyutils \
- libgssapi-krb5 libgssrpc libk5crypto libkadm5clnt-mit \
- libkadm5srv-mit libkdb5 libkrad libkrb5 libkrb5support \
- libxslt libxslt-bin libxml2-utils libxml2 \
- "
-
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI = "https://releases.pagure.org/gssproxy/gssproxy-${PV}.tar.gz \
- file://Properly-renew-expired-credentials.patch;striplevel=2 \
- file://Change-impersonator-check-code.patch;striplevel=2 \
- file://Allow-connection-to-self-when-impersonator-set.patch;striplevel=2 \
- file://Make-proc-file-failure-loud-but-nonfatal.patch;striplevel=2 \
- file://Turn-on-Wextra.patch;striplevel=2 \
- file://Fix-unused-variables.patch;striplevel=2 \
- file://Fix-mismatched-sign-comparisons.patch;striplevel=2 \
- file://Fix-error-checking-on-get_impersonator_fallback.patch;striplevel=2 \
- file://Remove-gpm_release_ctx-to-fix-double-unlock.patch;striplevel=2 \
- file://Appease-gcc-7-s-fallthrough-detection.patch;striplevel=2 \
- file://Fix-memory-leak.patch;striplevel=2 \
- file://Fix-most-memory-leaks.patch;striplevel=2 \
- file://Fix-segfault-when-no-config-files-are-present.patch;striplevel=2 \
- file://Update-systemd-file.patch;striplevel=2 \
- file://Fix-error-handling-in-gp_config_from_dir.patch;striplevel=2 \
- file://Do-not-call-gpm_grab_sock-twice.patch;striplevel=2 \
- file://Only-empty-FILE-ccaches-when-storing-remote-creds.patch;striplevel=2 \
- file://Handle-outdated-encrypted-ccaches.patch;striplevel=2 \
- file://Separate-cred-and-ccache-manipulation-in-gpp_store_r.patch;striplevel=2 \
- file://Properly-locate-credentials-in-collection-caches-in-.patch;striplevel=2 \
- file://Properly-initialize-ccaches-before-storing-into-them.patch;striplevel=2 \
- file://Include-header-for-writev.patch;striplevel=2 \
- file://Tolerate-NULL-pointers-in-gp_same.patch;striplevel=2 \
- file://Add-Client-ID-to-debug-messages.patch;striplevel=2 \
- file://client-Switch-to-non-blocking-sockets.patch;striplevel=2 \
- file://server-Add-detailed-request-logging.patch;striplevel=2 \
- file://Fix-potential-free-of-non-heap-address.patch;striplevel=2 \
- file://Prevent-uninitialized-read-in-error-path-of-XDR-cont.patch;striplevel=2 \
- file://Simplify-setting-NONBLOCK-on-socket.patch;striplevel=2 \
- file://Fix-handling-of-non-EPOLLIN-EPOLLOUT-events.patch;striplevel=2 \
- file://Fix-error-handling-in-gpm_send_buffer-gpm_recv_buffe.patch;striplevel=2 \
- file://Emit-debug-on-queue-errors.patch;striplevel=2 \
- file://Conditionally-reload-kernel-interface-on-SIGHUP.patch;striplevel=2 \
- file://Don-t-leak-mech_type-when-CONTINUE_NEEDED-from-init_.patch;striplevel=2 \
- file://Always-use-the-encype-we-selected.patch;striplevel=2 \
- file://Clarify-debug-and-debug_level-in-man-pages.patch;striplevel=2 \
- file://Always-choose-highest-requested-debug-level.patch;striplevel=2 \
- "
-
-SRC_URI[md5sum] = "1837acb5766ffbc6fcc70ecaa72e285f"
-
-inherit autotools systemd pkgconfig
-
-SYSTEMD_SERVICE_${PN} = "gssproxy.service"
-
-EXTRA_OECONF="--with-pubconf-path=${sysconfdir}/gssproxy \
- --with-initscript=systemd --disable-static \
- --disable-rpath --with-gpp-default-behavior=REMOTE_FIRST \
- --with-systemdunitdir=${systemd_system_unitdir} \
- --with-manpages=no \
- "
-
-CFLAGS += "-fPIE -fstack-protector-all"
-LDFLAGS += "-fPIE -pie -Wl,-z,now"
-
+++ /dev/null
-
-do_install_append () {
- cp ${B}/examples/24-nfs-server.conf \
- ${B}/examples/99-nfs-client.conf \
- ${B}/examples/gssproxy.conf ${D}/etc/gssproxy
-}
+++ /dev/null
-
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/stx-*/*.bb \
- ${LAYERDIR}/stx-*/*.bbappend \
- ${LAYERDIR}/stx-*/*/*.bb \
- ${LAYERDIR}/stx-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "stx-flock-layer"
-BBFILE_PATTERN_stx-flock-layer := "^${LAYERDIR}/"
-BBFILE_PRIORITY_stx-flock-layer = "5"
-
-LAYERDEPENDS_STX_FLOCK = "\
- core \
- dpdk \
- networking-layer \
- openembedded-layer \
- networking-layer \
- filesystems-layer \
- perl-layer \
- meta-python \
- webserver \
- virtualization-layer \
- cloud-services-layer \
- openstack-layer \
-"
-
-# This should only be incremented on significant changes that will
-# cause compatibility issues with other layers
-LAYERVERSION_stx-flock-version = "1"
-LAYERSERIES_COMPAT_stx-flock-layer = "thud warrior"
-
-LAYER_PATH_meta-stx-flock = "${LAYERDIR}"
-
-# Masked recipes:
-BBMASK += "/meta-python2/recipes-core/images/meta-python-ptest-image.bb"
-BBMASK += "/meta-python2/recipes-core/images/meta-python-image-base.bb"
-BBMASK += "/meta-python2/recipes-core/images/meta-python-image.bb"
-BBMASK += "/meta-stak-common/recipes-containers/kubernetes/kubernetes_git.bbappend"
-BBMASK += "/meta-cloud-services/meta-openstack/recipes-devtools/python/python-cephclient_0.1.0.5.bb"
-BBMASK += "/meta-openstack/recipes-devtools/qemu/qemu_2.%.bbappend"
-BBMASK += "/meta-cloud-services/meta-openstack/recipes-kernel/linux/linux-yocto_4.18.bbappend"
-BBMASK += "/meta-selinux/recipes-graphics/mesa/mesa_%.bbappend"
-BBMASK += "/meta-virtualization/recipes-containers/docker-distribution/docker-distribution_git.bb"
-BBMASK += "/meta-starlingX/recipes-containers/docker-distribution/docker-distribution_git.bbappend"
-BBMASK += "/meta-starlingX/recipes-support/puppet/puppetlabs-stdlib_git.bbappend"
+++ /dev/null
-From 91da8b2956e346916f092fe2ce3a18e2422023e7 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Fri, 6 Mar 2020 22:43:25 -0800
-Subject: [PATCH] stx.3.0 rebase: adjust path
-
----
- .../roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml | 2 +-
- .../src/playbooks/roles/recover-ceph-data/tasks/main.yml | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/playbookconfig/src/playbooks/roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml
-index 23591c8..e4c905c 100644
---- a/playbookconfig/src/playbooks/roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml
-+++ b/playbookconfig/src/playbooks/roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml
-@@ -90,7 +90,7 @@
-
- - name: Applying puppet bootstrap manifest
- command: >
-- /usr/local/bin/puppet-manifest-apply.sh
-+ /usr/bin/puppet-manifest-apply.sh
- {{ hieradata_workdir }}
- {{ derived_network_params.controller_0_address }}
- controller ansible_bootstrap > {{ manifest_apply_log }}
-diff --git a/playbookconfig/src/playbooks/roles/recover-ceph-data/tasks/main.yml b/playbookconfig/src/playbooks/roles/recover-ceph-data/tasks/main.yml
-index d92021f..a01a3f6 100644
---- a/playbookconfig/src/playbooks/roles/recover-ceph-data/tasks/main.yml
-+++ b/playbookconfig/src/playbooks/roles/recover-ceph-data/tasks/main.yml
-@@ -45,7 +45,7 @@
-
- - name: Applying puppet ceph-mon DRBD manifest
- command: >
-- /usr/local/bin/puppet-manifest-apply.sh
-+ /usr/bin/puppet-manifest-apply.sh
- {{ puppet_permdir }}/hieradata/
- {{ derived_network_params.controller_0_address }}
- controller runtime /tmp/ceph-mon.yml
---
-2.23.0
-
+++ /dev/null
-From 6193c304ae187327fadaaa8c4f780135f0f07aa0 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 30 Mar 2020 12:03:13 +0800
-Subject: [PATCH] update_sysinv_database: do not fail if ceph monitor already
- configured
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- .../roles/bootstrap/persist-config/tasks/update_sysinv_database.yml | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml
-index e321710..f4d2185 100644
---- a/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml
-+++ b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml
-@@ -73,7 +73,9 @@
- - name: Fail if populate config script throws an exception
- fail:
- msg: "Failed to provision initial system configuration."
-- when: populate_result.rc != 0
-+ when:
-+ - populate_result.rc != 0
-+ - '"Ceph monitor already configured" not in populate_result.stderr'
-
- # If this is initial play or replay with management and/or oam network
- # config change, must wait for the keystone endpoint runtime manifest
---
-2.7.4
-
+++ /dev/null
-From a8310826a3939c1726f7e20ab51e3c8fb970cdc9 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Tue, 31 Mar 2020 17:15:29 +0800
-Subject: [PATCH] update_sysinv_database: wait after provision
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- .../roles/bootstrap/persist-config/tasks/update_sysinv_database.yml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml
-index f4d2185..105e6ef 100644
---- a/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml
-+++ b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml
-@@ -77,6 +77,9 @@
- - populate_result.rc != 0
- - '"Ceph monitor already configured" not in populate_result.stderr'
-
-+- name: Wait 30s after provision initial system configuration.
-+ wait_for: timeout=30
-+
- # If this is initial play or replay with management and/or oam network
- # config change, must wait for the keystone endpoint runtime manifest
- # to complete
---
-2.7.4
-
+++ /dev/null
-From e83427fbd1cca8f03adb9769c8c2ac260c5f6996 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Wed, 15 Apr 2020 09:49:34 +0800
-Subject: [PATCH] bringup_flock_services: use systmd for fminit and add retry
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- .../tasks/bringup_flock_services.yml | 30 ++++++++++++++++++----
- 1 file changed, 25 insertions(+), 5 deletions(-)
-
-diff --git a/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_flock_services.yml b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_flock_services.yml
-index 462e1c2..cc239ef 100644
---- a/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_flock_services.yml
-+++ b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_flock_services.yml
-@@ -36,11 +36,31 @@
- regexp: "bind_host=.*$"
- replace: "bind_host={{ controller_floating_address }}"
-
-- - name: Restart FM API and bring up FM Manager
-- command: "{{ item }}"
-- with_items:
-- - /etc/init.d/fm-api restart
-- - /etc/init.d/fminit start
-+ - name: Restart FM API
-+ systemd:
-+ name: fm-api
-+ state: restarted
-+
-+ - name: Wait 10s after Restart FM API
-+ wait_for: timeout=10
-+
-+ - block:
-+ - name: Bring up FM Manager
-+ systemd:
-+ name: fminit
-+ state: started
-+
-+ rescue:
-+ - name: FM Manager failed to start, wait 10s then retry
-+ wait_for: timeout=10
-+ - name: Retry to restart FM Manager
-+ systemd:
-+ name: fminit
-+ state: restarted
-+ register: result
-+ until: result is not failed
-+ retries: 5
-+ delay: 10
-
- - name: Bring up Maintenance Agent
- command: /usr/lib/ocf/resource.d/platform/mtcAgent start
---
-2.7.4
-
+++ /dev/null
-From 6722f2ec0b7044cbdeb2e67cfd317375fa54c46d Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Wed, 15 Apr 2020 10:52:15 +0800
-Subject: [PATCH] persist-config: add retry for etcd
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- .../roles/bootstrap/persist-config/tasks/shutdown_services.yml | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/shutdown_services.yml b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/shutdown_services.yml
-index 4edd295..0e5fb3b 100644
---- a/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/shutdown_services.yml
-+++ b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/shutdown_services.yml
-@@ -60,11 +60,16 @@
- state: restarted
-
- rescue:
-- - name: Etcd failed to restart, try one more time
-+ - name: Etcd failed to restart, wait 10s then retry
-+ wait_for: timeout=10
-+ - name: Retry to restart etcd
- systemd:
- name: etcd
- state: restarted
--
-+ register: result
-+ until: result is not failed
-+ retries: 5
-+ delay: 10
-
- - block: # Revert configuration to loopback interface
- - name: Set facts derived from previous network configurations
---
-2.7.4
-
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/patches:${THISDIR}/files:"
-DESCRIPTION = " stx-ansible-playbooks"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCREV = "0ad01cd4cae7d5c85e1022b816ed465b334bb2e5"
-S = "${WORKDIR}/git"
-PV = "1.0.0"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-# The patch 0001-Treat-the-failure-as-expected-result-if-resize-using.patch
-# need to be removed if updating to stx 2.0.0 or above.
-SRC_URI = " \
- git://opendev.org/starlingx/ansible-playbooks.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://0001-stx.3.0-rebase-adjust-path.patch \
- file://0002-update_sysinv_database-do-not-fail-if-ceph-monitor-a.patch \
- file://0003-update_sysinv_database-wait-after-provision.patch \
- file://0004-bringup_flock_services-use-systmd-for-fminit-and-add.patch \
- file://0005-persist-config-add-retry-for-etcd.patch \
- "
-
-RDEPENDS_playbookconfig = " \
- nscd \
- python \
- python-netaddr \
- python-ptyprocess \
- python-pexpect \
- python-ansible \
- sysinv \
- grub \
- grubby \
- dracut \
- openssl-bin \
- ipset \
- "
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install () {
- cd ${S}/playbookconfig/src
- oe_runmake -e \
- DESTDIR=${D}/${datadir}/ansible/stx-ansible
-}
-
-ANSIBLE_SSH_TIMEOUT = "60"
-ANSIBLE_SSH_RETRY = "3"
-
-pkg_postinst_ontarget_${PN}() {
- cp $D${sysconfdir}/ansible/ansible.cfg $D${sysconfdir}/ansible/ansible.cfg.orig
- cp $D${sysconfdir}/ansible/hosts $D${sysconfdir}/ansible/hosts.orig
- cp $D${datadir}/ansible/stx-ansible/playbooks/ansible.cfg $D${sysconfdir}/ansible
- cp $D${datadir}/ansible/stx-ansible/playbooks/hosts $D${sysconfdir}/ansible
-
- sed -i -e 's/#timeout = .*/timeout = ${ANSIBLE_SSH_TIMEOUT}/' \
- -e 's/#retries = .*/retries = ${ANSIBLE_SSH_RETRY}/' \
- $D${sysconfdir}/ansible/ansible.cfg
-}
-
-FILES_${PN}_append = " \
- ${datadir} \
- "
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "mlx4-config"
-
-DSTSUFX0 = "stx-configfiles"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/centos/mlx4-config.spec;beginline=1;endline=10;md5=b791daf2e53077e3acb71428524a356d \
- file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- "
-
-RDEPENDS_${PN}_append = " bash"
-
-inherit systemd
-SYSTEMD_PACKAGES += "${PN}"
-SYSETMD_SERVICE_${PN}_append = "mlx4-config.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-
-do_configure[noexec] = "1"
-do_patch[noexec] = "1"
-
-do_install() {
- install -d -m 0755 ${D}/${sysconfdir}/init.d/
- install -d -m 0755 ${D}/${systemd_system_unitdir}/
- install -d -m 0755 ${D}/${sysconfdir}/goenabled.d/
- install -d -m 0755 ${D}/${bindir}/
-
- install -m 755 ${STX_METADATA_PATH}/files/mlx4-configure.sh ${D}/${sysconfdir}/init.d/
- install -m 644 ${STX_METADATA_PATH}/files/mlx4-config.service ${D}/${systemd_system_unitdir}/
- install -m 555 ${STX_METADATA_PATH}/files/mlx4_core_goenabled.sh ${D}/${sysconfdir}/goenabled.d/
- install -m 755 ${STX_METADATA_PATH}/files/mlx4_core_config.sh ${D}/${bindir}/
-}
-
-FILES_${PN}_append = " ${systemd_system_unitdir}"
-
+++ /dev/null
-Upstream-Status: Inappropriate [poky-stx specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
-
-diff -ru a/lighttpd-config/files/lighttpd.init b/lighttpd-config/files/lighttpd.init
---- a/lighttpd-config/files/lighttpd.init 2020-04-29 07:07:49.040288478 +0000
-+++ b/lighttpd-config/files/lighttpd.init 2020-04-29 07:09:35.332285981 +0000
-@@ -59,6 +59,10 @@
- mkdir -p /scratch/lighttpd
- mount --bind /scratch/lighttpd /www/tmp/
- chown www /www/tmp/
-+ # /dev/null is required in chroot env
-+ mkdir -p /www/dev
-+ cp /dev/null /www/dev
-+ chmod 777 /www/dev/null
-
- echo -n "Starting $DESC..."
-
+++ /dev/null
-From 20359d646c6003b6056aea6cbe81d8b393084de1 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Thu, 18 Jun 2020 21:42:03 +0800
-Subject: [PATCH] nfsserver: remove the -f option for rpc.mountd
-
-The -f option is not supported any more on newer version of nfs-utils.
-
-Upstream-Status: Inappropriate [poky-stx specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- nfs-utils-config/files/nfsserver | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nfs-utils-config/files/nfsserver b/nfs-utils-config/files/nfsserver
-index 6449537..58642f1 100644
---- a/nfs-utils-config/files/nfsserver
-+++ b/nfs-utils-config/files/nfsserver
-@@ -46,7 +46,7 @@ test "$NFS_SERVERS" != "" && test "$NFS_SERVERS" -gt 0 && test "$NFS_SERVERS" -l
- #mountd
- start_mountd(){
- echo -n 'starting mountd: '
-- start-stop-daemon --start --exec "$NFS_MOUNTD" -- "-f /etc/exports $@"
-+ start-stop-daemon --start --exec "$NFS_MOUNTD"
- echo done
- }
- stop_mountd(){
---
-2.7.4
+++ /dev/null
-DESCRIPTION = "The source recipe for StarlingX Config-Files repo"
-
-inherit stx-source
-
-STX_REPO = "config-files"
-
-BRANCH = "r/stx.5.0"
-SRCREV = "237737bbd2488bcae6822dfadc4977d86ea642d7"
-
-SRC_URI += "\
- file://nfs-utils-config-remove-the-f-option-for-rpc.mountd.patch \
- file://lighttpd-config-init-script-chroot.patch \
- "
+++ /dev/null
-require config-common.inc
-
-SUBPATH0 = "sysinv/cgts-client/cgts-client"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-DEPENDS += " \
- python-pbr-native \
- "
-
-RDEPENDS_${PN}_append = " \
- python-prettytable \
- bash-completion \
- python-neutronclient \
- python-keystoneclient \
- python-six \
- python-httplib2 \
- "
-
-inherit setuptools
-
-do_install_append() {
- install -d -m 755 ${D}/${sysconfdir}/bash_completion.d
- install -p -D -m 664 tools/system.bash_completion ${D}/${sysconfdir}/bash_completion.d/system.bash_completion
-}
+++ /dev/null
-DESCRIPTION = "stx-config"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCREV = "b51e4ef738e0020f11f164fd3f86399872caf3c6"
-SRCREV_opendev = "b51e4ef738e0020f11f164fd3f86399872caf3c6"
-DESTSUFFIX = "${PN}-${PV}"
-PV = "1.0.0"
-
-SRC_URI = "\
- git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH};destsuffix=${DESTSUFFIX};subpath=${SUBPATH0};name=opendev \
- "
-
-DEPENDS = "\
- puppet \
- python \
- python-pbr-native \
- "
-
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
+++ /dev/null
-PACKAGES += " config-gate-worker"
-
-require config-common.inc
-
-SUBPATH0 = "config-gate/files"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_config-gate-worker_append = " bash"
-RDEPENDS_${PN}_append = " bash"
-
-
-inherit systemd
-SYSTEMD_PACKAGES += "${PN}"
-SYSTEMD_PACKAGES += "${PN}-worker"
-SYSTEMD_SERVICE_${PN} = "config.service"
-SYSTEMD_SERVICE_config-gate-worker = "worker-config-gate.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-SYSTEMD_AUTO_ENABLE_${PN}-worker = "enable"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install() {
- oe_runmake -e \
- SBINDIR=${D}/${sbindir} SYSTEMDDIR=${D}/${systemd_system_unitdir} \
- install
-}
+++ /dev/null
-require config-common.inc
-
-SUBPATH0 = "controllerconfig/controllerconfig"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN}_append = " \
- bash \
- fm-api \
- systemd \
- tsconfig \
- python-iso8601 \
- python-keyring \
- python-netaddr \
- python-netifaces \
- python-pyudev \
- python-six \
- python-cryptography \
- python-oslo.utils \
- python-pysnmp \
- python-ruamel.yaml \
- "
-
-inherit setuptools python-dir systemd
-SYSTEMD_PACKAGES += "controllerconfig"
-SYSTEMD_SERVICE_controllerconfig = "controllerconfig.service"
-SYSTEMD_AUTO_ENABLE_controllerconfig = "enable"
-
-do_install_append() {
-
- install -p -D -m 700 scripts/keyringstaging ${D}/${bindir}
- install -p -D -m 700 scripts/openstack_update_admin_password ${D}/${bindir}
- install -p -D -m 700 scripts/install_clone.py ${D}/${bindir}
- install -p -D -m 700 scripts/finish_install_clone.sh ${D}/${bindir}
-
- install -d -m 755 ${D}/${sysconfdir}/goenabled.d
- install -d -m 755 ${D}/${sysconfdir}/init.d
- install -p -D -m 700 scripts/config_goenabled_check.sh ${D}/${sysconfdir}/goenabled.d
- install -p -D -m 755 scripts/controller_config ${D}/${sysconfdir}/init.d/controller_config
-
- ## Install Upgrade scripts
- install -d -m 755 ${D}/${sysconfdir}/upgrade.d
- install -p -m 755 upgrade-scripts/16-neutron-move-bindings-off-controller-1.py ${D}/${sysconfdir}/upgrade.d
- install -p -m 755 upgrade-scripts/20-sysinv-retire-ceph-cache-tier-sp.py ${D}/${sysconfdir}/upgrade.d
-
-
- install -p -D -m 664 scripts/controllerconfig.service ${D}/${sysconfdir}/systemd/system/controllerconfig.service
- sed -i -e 's/network.target/networking.target/g' \
- ${D}/${sysconfdir}/systemd/system/controllerconfig.service
-
- sed -i -e 's|/usr/local/bin|${bindir}|' \
- ${D}${libdir}/python2.7/site-packages/controllerconfig/utils.py \
- ${D}${libdir}/python2.7/site-packages/controllerconfig/upgrades/utils.py \
- ${D}${sysconfdir}/init.d/controller_config
-}
+++ /dev/null
-From 06a156e04df427f51b42b1093577823c558166ad Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Tue, 25 Feb 2020 13:50:37 -0800
-Subject: [PATCH] stx-config: remove argparse requirement from sysinv.
-
-argparse is part of stdlib
----
- requirements.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/requirements.txt b/requirements.txt
-index fb4ef6a1..12a341c7 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -2,7 +2,6 @@ pbr>=0.5
- SQLAlchemy
- amqplib>=0.6.1
- anyjson>=0.3.3
--argparse
- boto3
- botocore>=1.11.0
- cryptography!=2.0 # BSD/Apache-2.0
---
-2.23.0
-
+++ /dev/null
-From 7ed620de2987bebfb41fe5506c1296e8d03560d5 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Tue, 28 Apr 2020 17:24:01 +0800
-Subject: [PATCH] pci.py: handle exceptions other than CalledProcessError
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- sysinv/sysinv/sysinv/sysinv/agent/pci.py | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/sysinv/sysinv/sysinv/sysinv/agent/pci.py b/sysinv/sysinv/sysinv/sysinv/agent/pci.py
-index 5d3a2fd..14fb0c5 100644
---- a/sysinv/sysinv/sysinv/sysinv/agent/pci.py
-+++ b/sysinv/sysinv/sysinv/sysinv/agent/pci.py
-@@ -539,6 +539,12 @@ class PCIOperator(object):
- LOG.info("Could not determine DPDK support for "
- "NIC (vendor %s device: %s), defaulting "
- "to False", vendor, device)
-+ except Exception as e:
-+ dpdksupport = False
-+ LOG.debug("An exception of type %s occurred:\n%s" % (type(e), e))
-+ LOG.info("Could not determine DPDK support for "
-+ "NIC (vendor %s device: %s), defaulting "
-+ "to False", vendor, device)
-
- # determine the net directory for this device
- dirpcinet = self.get_pci_net_directory(a)
---
-2.7.4
-
+++ /dev/null
-diff --git a/sysinv/sysinv-agent/sysinv-agent.conf b/sysinv/sysinv-agent/sysinv-agent.conf
-index 46afac67b..aad37576c 100644
---- a/sysinv/sysinv-agent/sysinv-agent.conf
-+++ b/sysinv/sysinv-agent/sysinv-agent.conf
-@@ -1,6 +1,6 @@
- [process]
- process = sysinv-agent
--pidfile = /var/run/sysinv-agent.pid
-+pidfile = /run/sysinv-agent.pid
- script = /etc/init.d/sysinv-agent
- style = lsb ; ocf or lsb
- severity = major ; minor, major, critical
-diff --git a/sysinv/sysinv-agent/sysinv-agent.service b/sysinv/sysinv-agent/sysinv-agent.service
-index cb8663f68..37c2c221e 100644
---- a/sysinv/sysinv-agent/sysinv-agent.service
-+++ b/sysinv/sysinv-agent/sysinv-agent.service
-@@ -9,7 +9,7 @@ Type=forking
- RemainAfterExit=yes
- ExecStart=/etc/init.d/sysinv-agent start
- ExecStop=/etc/init.d/sysinv-agent stop
--PIDFile=/var/run/sysinv-agent.pid
-+PIDFile=/run/sysinv-agent.pid
-
- [Install]
- WantedBy=multi-user.target
+++ /dev/null
-diff -ruN a/sysinv/sysinv/sysinv/sysinv/puppet/interface.py b/sysinv/sysinv/sysinv/sysinv/puppet/interface.py
---- a/sysinv/sysinv/sysinv/sysinv/puppet/interface.py 2020-05-19 09:09:32.685727476 +0000
-+++ b/sysinv/sysinv/sysinv/sysinv/puppet/interface.py 2020-05-19 09:10:34.225727195 +0000
-@@ -938,8 +938,10 @@
- # others share the same pci-sriov sysfs enabling mechanism
- sriovfs_path = ("/sys/class/net/%s/device/sriov_numvfs" %
- get_interface_port_name(context, iface))
-- options['pre_up'] = "echo 0 > %s; echo %s > %s" % (
-- sriovfs_path, iface['sriov_numvfs'], sriovfs_path)
-+ sriovpf_up_cmd = ("ifconfig %s up" %
-+ get_interface_port_name(context, iface))
-+ options['pre_up'] = "echo 0 > %s; echo %s > %s; %s" % (
-+ sriovfs_path, iface['sriov_numvfs'], sriovfs_path, sriovpf_up_cmd)
- elif interface_class == constants.INTERFACE_CLASS_PCI_PASSTHROUGH:
- sriovfs_path = ("/sys/class/net/%s/device/sriov_numvfs" %
- get_interface_port_name(context, iface))
+++ /dev/null
-require config-common.inc
-
-SUBPATH0 = "storageconfig/storageconfig/"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN}_append = " bash"
-
-inherit systemd
-SYSTEMD_PACKAGES += "storageconfig"
-SYSTEMD_SERVICE_storageconfig = "storageconfig.service"
-SYSTEMD_AUTO_ENABLE_storageconfig = "enable"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install_append() {
- oe_runmake GOENABLEDDIR=${D}/${sysconfdir}/goenabled.d INITDDIR=${D}/${sysconfdir}/init.d \
- SYSTEMDDIR=${D}/${systemd_system_unitdir} install
- sed -i -e 's:/usr/local/bin/:/usr/bin/:g' ${D}/${sysconfdir}/init.d/storage_config
-}
-
+++ /dev/null
-require config-common.inc
-
-SUBPATH0 = "sysinv/sysinv-agent"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI += "file://0003-sysinv-agent-remove-legacy-pid-directory.patch;striplevel=3"
-
-RDEPENDS_sysinv-agent += " python"
-
-inherit systemd
-SYSTEMD_PACKAGES += "sysinv-agent"
-SYSTEMD_SERVICE_sysinv-agent = "sysinv-agent.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install_append() {
-
-
- install -d -m 755 ${D}${sysconfdir}/init.d
- install -p -D -m 755 ${S}/sysinv-agent ${D}/${sysconfdir}/init.d/sysinv-agent
-
- install -d -m 755 ${D}${sysconfdir}/pmon.d
- install -p -D -m 644 ${S}/sysinv-agent.conf ${D}/${sysconfdir}/pmon.d/sysinv-agent.conf
- install -p -D -m 644 ${S}/sysinv-agent.service ${D}/${systemd_system_unitdir}/sysinv-agent.service
-
-}
-
+++ /dev/null
-require config-common.inc
-
-SUBPATH0 = "sysinv/sysinv/sysinv"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRC_URI += "file://0001-stx-config-remove-argparse-requirement-from-sysinv.patch \
- file://0002-cgts-client-handle-exceptions-other-than-CalledProcessErr.patch;striplevel=4 \
- file://sriovph-bring-up.patch;striplevel=4 \
- "
-
-RDEPENDS_${PN}_append = " python bash"
-DEPENDS += " \
- python-pbr-native \
- "
-RDEPENDS_${PN}_append = " \
- python-anyjson \
- python-amqp \
- python-amqplib \
- python-passlib \
- python-websockify \
- python-pyparted \
- python-boto3 \
- python-botocore \
- python-coverage \
- python-docker \
- python-eventlet \
- python-ipaddr \
- python-keyring \
- python-kubernetes \
- python-netaddr \
- python-pyudev \
- python-pbr \
- python-webtest \
- python-wsme \
- python-six \
- python-django \
- python-mox3 \
- python-oslo.i18n \
- python-oslo.config \
- python-oslo.concurrency \
- python-oslo.db \
- python-oslo.log \
- python-oslo.utils \
- python-pecan \
- python2-rpm \
- python-pyghmi \
- python-paramiko \
- tsconfig \
- resource-agents \
- gptfdisk \
- "
-
-inherit setuptools python-dir systemd useradd
-SYSTEMD_PACKAGES += "${PN}"
-SYSTEMD_SERVICE_${PN} = "sysinv-api.service sysinv-conductor.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-
-USERADD_PACKAGES = "sysinv"
-USERADD_PARAM_sysinv = "-r -g sysinv -u 168 -d /var/lib/sysinv -s /sbin/nologin -c 'sysinv Daemons' sysinv"
-GROUPADD_PARAM_sysinv = "-r -g 168 sysinv"
-
-do_install_append() {
-
- install -d -m 755 ${D}${sysconfdir}/goenabled.d
- install -p -D -m 755 etc/sysinv/sysinv_goenabled_check.sh ${D}${sysconfdir}/goenabled.d/sysinv_goenabled_check.sh
-
- install -d -m 755 ${D}${sysconfdir}/sysinv
- install -p -D -m 755 etc/sysinv/policy.json ${D}${sysconfdir}/sysinv/policy.json
- install -p -D -m 640 etc/sysinv/profileSchema.xsd ${D}${sysconfdir}/sysinv/profileSchema.xsd
-
- install -p -D -m 644 etc/sysinv/crushmap-storage-model.txt ${D}${sysconfdir}/sysinv/crushmap-storage-model.txt
- install -p -D -m 644 etc/sysinv/crushmap-controller-model.txt ${D}${sysconfdir}/sysinv/crushmap-controller-model.txt
- install -p -D -m 644 etc/sysinv/crushmap-aio-sx.txt ${D}${sysconfdir}/sysinv/crushmap-aio-sx.txt
-
- install -d -m 755 ${D}${sysconfdir}/motd.d
- install -p -D -m 755 etc/sysinv/motd-system ${D}${sysconfdir}/motd.d/10-system
-
- install -d -m 755 ${D}${sysconfdir}/sysinv/upgrades
- install -p -D -m 755 etc/sysinv/delete_load.sh ${D}${sysconfdir}/sysinv/upgrades/delete_load.sh
-
- install -m 755 -p -D scripts/sysinv-api ${D}/usr/lib/ocf/resource.d/platform/sysinv-api
- install -m 755 -p -D scripts/sysinv-conductor ${D}/usr/lib/ocf/resource.d/platform/sysinv-conductor
-
- install -m 644 -p -D scripts/sysinv-api.service ${D}${systemd_system_unitdir}/sysinv-api.service
- install -m 644 -p -D scripts/sysinv-conductor.service ${D}${systemd_system_unitdir}/sysinv-conductor.service
-
- #install -p -D -m 755 ${D}/usr/bin/sysinv-api ${D}/usr/bin/sysinv-api
- #install -p -D -m 755 ${D}/usr/bin/sysinv-agent ${D}/usr/bin/sysinv-agent
- #install -p -D -m 755 ${D}/usr/bin/sysinv-conductor ${D}/usr/bin/sysinv-conductor
-
- install -d -m 755 ${D}${bindir}/
- install -p -D -m 755 sysinv/cmd/partition_info.sh ${D}${bindir}/partition_info.sh
- install -p -D -m 755 sysinv/cmd/manage-partitions ${D}${bindir}/manage-partitions
- install -p -D -m 755 sysinv/cmd/query_pci_id ${D}${bindir}/query_pci_id
-
- sed -i -e 's|/usr/local/bin|${bindir}|' \
- ${D}${libdir}/python2.7/site-packages/sysinv/common/constants.py \
- ${D}${libdir}/python2.7/site-packages/sysinv/puppet/common.py
-}
-
+++ /dev/null
-require config-common.inc
-
-SUBPATH0 = "tsconfig/tsconfig"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-inherit setuptools
-
-RDEPENDS_${PN} = " bash"
-
-do_install_append () {
-
- install -m 755 -d ${D}/${bindir}
- install -m 500 scripts/tsconfig ${D}/${bindir}/
-
-}
+++ /dev/null
-PACKAGES += " \
- workerconfig-standalone \
- workerconfig-subfunction \
- "
-
-require config-common.inc
-
-SUBPATH0 = "workerconfig/workerconfig"
-
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN}_append = "bash"
-RDEPENDS_workerconfig-standalone += "workerconfig"
-RDEPENDS_workerconfig-subfunction += "workerconfig"
-
-systemddir = "${sysconfdir}/systemd/system"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install() {
- oe_runmake -e GOENABLEDDIR=${D}/${sysconfdir}/goenabled.d INITDDIR=${D}/${sysconfdir}/init.d \
- SYSTEMDDIR=${D}/${systemddir} install
-
- sed -i -e 's|/usr/local/bin|${bindir}|' \
- ${D}${sysconfdir}/init.d/worker_config
-}
-
-FILES_${PN} = " \
- ${sysconfdir}/init.d/worker_config \
- "
-
-FILES_workerconfig-standalone = " \
- ${systemddir}/config/workerconfig-standalone.service \
- ${sysconfdir}/goenabled.d/config_goenabled_check.sh \
- "
-
-FILES_workerconfig-subfunction = " \
- ${sysconfdir}/systemd/system/config/workerconfig-combined.service \
- "
-
-pkg_postinst_workerconfig-standalone () {
- if [ ! -e $D${systemddir}/workerconfig.service ]; then
- cp $D${systemddir}/config/workerconfig-standalone.service $D${systemddir}/workerconfig.service
- else
- rm -f $D${systemddir}/workerconfig.service
- cp $D${systemddir}/config/workerconfig-standalone.service $D${systemddir}/workerconfig.service
- fi
-
- # enable workerconfig service by default
- OPTS=""
- if [ -n "$D" ]; then
- OPTS="--root=$D"
- fi
- if [ -z "$D" ]; then
- systemctl daemon-reload
- fi
-
- systemctl $OPTS enable workerconfig.service
-
- if [ -z "$D" ]; then
- systemctl --no-block restart workerconfig.service
- fi
-}
-
-
-pkg_postinst_workerconfig-subfunction () {
- if [ ! -e $D${systemddir}/workerconfig.service ]; then
- cp $D${systemddir}/config/workerconfig-combined.service $D${systemddir}/workerconfig.service
- else
- rm -f $D${systemddir}/workerconfig.service
- cp $D${systemddir}/config/workerconfig-combined.service $D${systemddir}/workerconfig.service
- fi
-
- # enable workerconfig service by default
- OPTS=""
- if [ -n "$D" ]; then
- OPTS="--root=$D"
- fi
- if [ -z "$D" ]; then
- systemctl daemon-reload
- fi
-
- systemctl $OPTS enable workerconfig.service
-
- if [ -z "$D" ]; then
- systemctl --no-block restart workerconfig.service
- fi
-}
+++ /dev/null
-DESCRIPTION = " \
- Client library for Distributed Cloud built on the Distributed Cloud API. \
- It provides a command-line tool (dcmanager). \
- Distributed Cloud provides configuration and management of distributed clouds \
- "
-
-HOMEPAGE = "https://opendev.org/starlingx"
-SECTION = "network"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://distributedcloud-client/LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCNAME = "distcloud-client"
-SRCREV = "8a8f01dd3701d4793dd8cbc0147e4dca49cd7c03"
-PV = "1.0.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = " \
- git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- "
-
-inherit distutils python-dir
-
-DEPENDS += " \
- python-pbr-native \
- "
-
-do_configure() {
- cd ${S}/distributedcloud-client
- distutils_do_configure
-}
-
-do_compile() {
- cd ${S}/distributedcloud-client
- distutils_do_compile
-}
-
-do_install() {
- cd ${S}/distributedcloud-client
- distutils_do_install
-}
+++ /dev/null
-DESCRIPTION = "StarlingX distributedcloud packages collection"
-HOMEPAGE = "https://opendev.org/starlingx"
-SECTION = "network"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://distributedcloud/LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCNAME = "distcloud"
-SRCREV = "8329259704a5becd036663fc7de9b7a61f4bc27e"
-PV = "1.0.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = " \
- git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- "
-
-PACKAGES += "distributedcloud-dcmanager"
-PACKAGES += "distributedcloud-dcorch"
-PACKAGES += "distributedcloud-dcdbsync"
-PACKAGES += "distributedcloud-ocf"
-DESCRIPTION_distributedcloud-dcmanager = "Distributed Cloud Manager"
-DESCRIPTION_distributedcloud-dcorch = "Distributed Cloud Orchestrator"
-DESCRIPTION_distributedcloud-dcdbsync = "DC DCorch DBsync Agent"
-
-DEPENDS += " \
- python-pbr-native \
- "
-
-ALL_RDEPENDS = " \
- python-pycrypto \
- python-cryptography \
- python-eventlet \
- python-setuptools \
- python-jsonschema \
- python-keyring \
- python-keystonemiddleware \
- python-keystoneauth1 \
- python-netaddr \
- python-oslo.concurrency \
- python-oslo.config \
- python-oslo.context \
- python-oslo.db \
- python-oslo.i18n \
- python-oslo.log \
- python-oslo.messaging \
- python-oslo.middleware \
- python-oslo.policy \
- python-oslo.rootwrap \
- python-oslo.serialization \
- python-oslo.service \
- python-oslo.utils \
- python-oslo.versionedobjects \
- python-pbr \
- python-pecan \
- python-routes \
- python-sphinx \
- python-pyopenssl \
- systemd \
- python-babel \
- distributedcloud-ocf \
- "
-# TODO:
-# Check dependencies
-# python-sphinxcontrib-httpdomain
-
-RDEPENDS_distributedcloud-dcmanager += " ${ALL_RDEPENDS}"
-RDEPENDS_distributedcloud-dcorch += " ${ALL_RDEPENDS}"
-RDEPENDS_distributedcloud-dcdbsync+= " ${ALL_RDEPENDS}"
-
-
-inherit distutils python-dir
-
-do_configure() {
- cd ${S}/distributedcloud
- distutils_do_configure
-}
-
-do_compile() {
- cd ${S}/distributedcloud
- distutils_do_compile
-}
-
-do_install() {
- cd ${S}/distributedcloud
- distutils_do_install
-
- SRCPATH=${datadir}/starlingx/distrbutedcloud-config-files/
-
- # dcmanager
- install -d -m 0755 ${D}/var/log/dcmanager
- install -d -m 0755 ${D}/var/cache/dcmanager
- install -d -m 0755 ${D}/${sysconfdir}/dcmanager
- install -d -m 0755 ${D}/${sysconfdir}/tempfiles.d
- install -d -m 0755 ${D}/${datadir}/starlingx/distrbutedcloud-config-files/
- install -d -m 0755 ${D}/${systemd_system_unitdir}
- install -d -m 0755 ${D}/opt/dc/ansible
-
- # Install systemd unit files
- install -p -D -m 0644 centos/files/dcmanager-api.service ${D}/${systemd_system_unitdir}/
- install -p -D -m 0644 centos/files/dcmanager-manager.service ${D}/${systemd_system_unitdir}/
- install -p -D -m 0755 centos/files/dcmanager.conf ${D}/${sysconfdir}/tempfiles.d
-
- # Install default config files
- # defer postinst_ontarget
- install -p -m 0644 dcmanager//config-generator.conf ${D}/${SRCPATH}/dcmanager-config-generator.conf
-
- # dcorch
- install -d -m 0755 ${D}/var/log/dcorch
- install -d -m 0755 ${D}/var/cache/dcorch
- install -d -m 0755 ${D}/${sysconfdir}/dcorch
-
- # Install systemd unit files
- install -p -D -m0644 centos/files/dcorch-api.service ${D}/${systemd_system_unitdir}/
- install -p -D -m0644 centos/files/dcorch-engine.service ${D}/${systemd_system_unitdir}/
- install -p -D -m0644 centos/files/dcorch-sysinv-api-proxy.service ${D}/${systemd_system_unitdir}/
- install -p -D -m0644 centos/files/dcorch-snmp.service ${D}/${systemd_system_unitdir}/
- install -p -D -m0644 centos/files/dcorch-identity-api-proxy.service ${D}/${systemd_system_unitdir}/
- install -p -D -m0644 centos/files/dcorch.conf ${D}/${sysconfdir}/tempfiles.d
-
- # Install ocf scripts
- install -d -m 0755 ${D}/${libdir}/ocf/resource.d/openstack/ocf
- install -m 0644 \
- ocf/dcdbsync-api \
- ocf/dcmanager-api \
- ocf/dcmanager-manager \
- ocf/dcorch-cinder-api-proxy \
- ocf/dcorch-engine \
- ocf/dcorch-identity-api-proxy \
- ocf/dcorch-neutron-api-proxy \
- ocf/dcorch-nova-api-proxy \
- ocf/dcorch-patch-api-proxy \
- ocf/dcorch-snmp \
- ocf/dcorch-sysinv-api-proxy ${D}/${libdir}/ocf/resource.d/openstack/
-
- # Install default config files
- # defer postinst_ontarget
- install -p -m 0644 dcorch/config-generator.conf ${D}/${SRCPATH}/dcorch-config-generator.conf
-
- # dc dbsync agent
- install -d -m 755 ${D}/var/log/dcdbsync
- install -d -m 755 ${D}/var/cache/dcdbsync
- install -d -m 755 ${D}/${sysconfdir}/dcdbsync/
-
- # Install systemd unit files
- install -p -D -m 644 centos/files/dcdbsync-api.service ${D}/${systemd_system_unitdir}/dcdbsync-api.service
- # ???? CheckInstall systemd unit files for optional second instance
- install -p -D -m 644 centos/files/dcdbsync-openstack-api.service ${D}/${systemd_system_unitdir}/dcdbsync-openstack-api.service
- install -p -D -m 644 centos/files/dcdbsync.conf ${D}/${sysconfdir}/tmpfiles.d
-
- # Install default config files
- # defer postinst_ontarget
- install -p -m 0644 dcdbsync/config-generator.conf ${D}/${SRCPATH}/dcdbsync-config-generator.conf
-}
-
-
-pkg_postinst_ontarget_distributedcloud-dcmanager() {
- SRCPATH=${datadir}/starlingx/distrbutedcloud-config-files/
- oslo-config-generator --config-file ${SRCPATH}/dcmanager-config-generator.conf \
- --output-file ${sysconfdir}/dcmanager/dcmanager.conf.sample
-}
-
-pkg_postinst_ontarget_distributedcloud-dcorch() {
- SRCPATH=${datadir}/starlingx/distrbutedcloud-config-files/
- oslo-config-generator --config-file ${SRCPATH}/dcorch-config-generator.conf \
- --output-file ${sysconfdir}/dcorch/dcorch.conf.sample
-}
-
-
-pkg_postinst_ontarget_distributedcloud-dcdbsync() {
- SRCPATH=${datadir}/starlingx/distrbutedcloud-config-files/
- oslo-config-generator --config-file ${SRCPATH}/dcdbsync-config-generator.conf \
- --output-file ${sysconfdir}/dcdbsync/dcdbsync.conf.sample
-}
-
-FILES_${PN} = " \
- /var/volatile \
- /var/log \
- /var/volatile/log \
- /etc/tmpfiles.d \
- "
-
-FILES_distributedcloud-ocf = " \
- ${libdir}/ocf/resource.d/openstack \
- "
-
-FILES_distributedcloud-dcdbsync = " \
- ${PYTHON_SITEPACKAGES_DIR}/dcdbsync \
- ${PYTHON_SITEPACKAGES_DIR}/dcdbsync-*.egg.info \
- /var/cache/dcdbsync \
- /var/volatile/log/dcdbsync \
- ${bindir}/dcdbsync-api \
- ${systemd_system_unitdir}/dcdbsync-api.service \
- ${systemd_system_unitdir}/dcdbsync-openstack-api.service \
- ${sysconfdir}/dcdbsync/ \
- ${datadir}/starlingx/distrbutedcloud-config-files/dcdbsync-config-generator.conf \
- "
-
-FILES_distributedcloud-dcorch = " \
- ${PYTHON_SITEPACKAGES_DIR}/dcorch \
- ${PYTHON_SITEPACKAGES_DIR}/distributedcloud-*.egg-info \
- ${bindir}/dcorch-api \
- ${systemd_system_unitdir}/dcorch-api.service \
- ${bindir}/dcorch-engine \
- ${systemd_system_unitdir}/dcorch-engine.service \
- ${bindir}/dcorch-api-proxy \
- ${systemd_system_unitdir}/dcorch-sysinv-api-proxy.service \
- ${systemd_system_unitdir}/dcorch-identity-api-proxy.service \
- ${bindir}/dcorch-manage \
- ${bindir}/dcorch-snmp \
- ${systemd_system_unitdir}/dcorch-snmp.service \
- ${sysconfdir}/tempfiles.d/dcorch.conf \
- /var/cache/dcorch \
- ${sysconfdir}/dcorch \
- ${datadir}/starlingx/distrbutedcloud-config-files/dcorch-config-generator.conf \
- "
-
-FILES_distributedcloud-dcmanager = " \
- ${PYTHON_SITEPACKAGES_DIR}/dcmanager \
- ${PYTHON_SITEPACKAGES_DIR}/distributedcloud-*.egg-info \
- ${bindir}/dcmanager-api \
- ${systemd_system_unitdir}/dcmanager-api.service \
- ${bindir}/dcmanager-manager \
- ${systemd_system_unitdir}/dcmanager-manager.service \
- ${bindir}/dcmanager-manage \
- ${sysconfdir}/tmpfiles.d/dcmanager.conf \
- /var/cache/dcmanager \
- ${sysconfdir}/dcmanager \
- ${sysconfdir}/tempfiles.d/dcmanager.conf \
- /opt/dc/ansible \
- ${datadir}/starlingx/distrbutedcloud-config-files/dcmanager-config-generator.conf \
- "
+++ /dev/null
-DESCRIPTION = "stx-fault"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCREV_opendev = "2025f585c5b92890c8cb32c480b0151c7c1cb545"
-DESTSUFFIX = "${PN}-${PV}"
-SRCREV = "2025f585c5b92890c8cb32c480b0151c7c1cb545"
-PV = "1.0.0"
-
-LICENSE = "Apache-2.0"
-
-DEPENDS = " \
- util-linux \
- postgresql \
- python \
- python-pbr-native \
- python-six \
- python-oslo.i18n \
- python-oslo.utils \
- python-requests \
- bash \
- net-snmp \
-"
-
-RDEPENDS_${PN} += " bash"
-
-
-SRC_URI = " \
- git://opendev.org/starlingx/fault.git;protocol=${PROTOCOL};rev=${SRCREV};destsuffix=${DESTSUFFIX};branch=${BRANCH};subpath=${SUBPATH0};name=opendev \
- "
+++ /dev/null
-From 78585fade2d47fc0aa98b7e2fb494385466007da Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Thu, 27 Jun 2019 14:36:59 -0700
-Subject: [PATCH 1/2] Honor the build system LDFLAGS
-
----
- Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 7b1ea03..7c7e4c7 100755
---- a/Makefile
-+++ b/Makefile
-@@ -25,12 +25,13 @@ build: lib fmClientCli
- $(CXX) $(CCFLAGS) $(INCLUDES) $(EXTRACCFLAGS) -c $< -o $@
-
- lib: $(OBJS)
-- $(CXX) -Wl,-soname,$(LIBFMCOMMON_SO).$(MAJOR) -o $(LIBFMCOMMON_SO).$(MAJOR).$(MINOR) -shared $(OBJS) $(EXTRAARFLAGS) ${LDLIBS}
-+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIBFMCOMMON_SO).$(MAJOR) \
-+ -o $(LIBFMCOMMON_SO).$(MAJOR).$(MINOR) $(OBJS) $(EXTRAARFLAGS) ${LDLIBS}
- ln -sf $(LIBFMCOMMON_SO).$(MAJOR).$(MINOR) $(LIBFMCOMMON_SO).$(MAJOR)
- ln -sf $(LIBFMCOMMON_SO).$(MAJOR).$(MINOR) $(LIBFMCOMMON_SO)
-
- fmClientCli: $(CLI_OBJS) lib
-- $(CXX) -o $@ $(CLI_OBJS) -L./ -lfmcommon
-+ $(CXX) $(LDFLAGS) -o $@ $(CLI_OBJS) -L./ -lfmcommon
-
- clean:
- @rm -f $(OBJ) *.o *.so fmClientCli
---
-2.17.1
-
+++ /dev/null
-From 665d2fa1e06e91db0a2a72fcbb2aa823e02b0a3d Mon Sep 17 00:00:00 2001
-From: Saul Wold <sgw@linux.intel.com>
-Date: Mon, 4 May 2020 11:57:46 -0700
-Subject: [PATCH] fm-mgr: Fix install target
-
-Remove hardcoded UNITDIR in favor of variable
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 0d683c3..9bca4ab 100755
---- a/Makefile
-+++ b/Makefile
-@@ -27,7 +27,7 @@ clean:
- @rm -f $(OBJS)
-
- install:
-- mkdir -p $(DESTDIR)/usr/lib/systemd/system
-+ mkdir -p $(DESTDIR)/$(UNITDIR)
- install -m 755 -d $(DESTDIR)$(SYSCONFDIR)
- install -m 755 -d $(DESTDIR)$(SYSCONFDIR)/init.d
- install -m 755 -d $(DESTDIR)$(SYSCONFDIR)/logrotate.d
---
-2.17.1
-
+++ /dev/null
-From ee51474dd6756492d1487304ce83b878b8867f6b Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Mon, 8 Jul 2019 21:50:24 -0700
-Subject: [PATCH] Use build systems LDFLAGS
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 6f7469c..bb55765 100644
---- a/Makefile
-+++ b/Makefile
-@@ -16,7 +16,7 @@ build: lib
- $(CXX) $(CCFLAGS) $(INCLUDES) -c $< -o $@
-
- lib: $(OBJS)
-- $(CXX) $(OBJS) $(LDLIBS) -o $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) -shared
-+ $(CXX) $(OBJS) $(LDFLAGS) $(LDLIBS) -o $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH)
- ln -sf $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(LIBCGTSAGENT_SO).$(MAJOR)
- ln -sf $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(LIBCGTSAGENT_SO)
-
---
-2.17.1
-
+++ /dev/null
-From e452f7eaf630f7ab5de240c51ddce14c9329d580 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Mon, 8 Jul 2019 21:56:11 -0700
-Subject: [PATCH] snmp-ext use build systems LDFLAGS
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 408ea34..c00febe 100644
---- a/Makefile
-+++ b/Makefile
-@@ -23,7 +23,7 @@ LIBCGTSAGENT_SO := libcgtsAgentPlugin.so
- $(CXX) $(CCFLAGS) $(INCLUDES) -c $< -o $@
-
- lib: $(OBJS)
-- $(CXX) $(OBJS) $(LDLIBS) -o $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) -shared
-+ $(CXX) $(OBJS) $(LDFLAGS) $(LDLIBS) -o $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH)
- ln -sf $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(LIBCGTSAGENT_SO).$(MAJOR)
- ln -sf $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(LIBCGTSAGENT_SO)
-
---
-2.17.1
-
+++ /dev/null
-inherit setuptools
-
-require fault-common.inc
-
-SUBPATH0 = "fm-api"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+++ /dev/null
-inherit autotools
-inherit setuptools
-
-require fault-common.inc
-
-SRC_URI += "file://0001-fm-common-add-LDFLAGS.patch"
-
-SUBPATH0 = "fm-common/sources"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-EXTRA_OEMAKE = '-e INCLUDES="-I./ " \
- EXTRACCFLAGS=" " \
- CCFLAGS="${CXXFLAGS} ${CCSHARED}" \
- LDFLAGS="${LDFLAGS} -shared" \
- LIBDIR=${libdir} \
- INCDIR=${includedir} \
- CGCS_DOC_DEPLOY=${docdir} \
- DESTDIR=${D} \
- BINDIR=${bindir} \
- '
-
-do_configure_prepend () {
- sed -i -e 's|/usr/local/bin|${bindir}|' ${S}/fmConstants.h
- cd ${S}
-}
-
-
-# need to build fm-common library first then setup.py can run
-do_compile_prepend() {
- cd ${S}
- autotools_do_compile
-}
-
-do_install_prepend() {
- cd ${S}
- autotools_do_install
-}
+++ /dev/null
-require fault-common.inc
-
-SUBPATH0 = "fm-doc/fm_doc"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-do_configure () {
- :
-}
-
-do_compile () {
- :
-}
-
-do_install () {
- install -d -m 755 ${D}/${docdir}
- install -d -m 755 ${D}/${sysconfdir}/fm
- install -m 744 events.yaml ${D}/${sysconfdir}/fm/
- install -m 644 events.yaml ${D}/${docdir}
- install -m 755 checkEventYaml ${D}/${docdir}
- install -m 644 parseEventYaml.py ${D}/${docdir}
- install -m 644 check_missing_alarms.py ${D}/${docdir}
-}
+++ /dev/null
-inherit systemd
-require fault-common.inc
-
-SRC_URI += "file://0001-fm-mgr-Fix-install-target.patch"
-
-SUBPATH0 = "fm-mgr/sources"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-DEPENDS += "fm-common"
-
-EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS} -L${S}/fm-common/sources" \
- CCFLAGS="${CXXFLAGS}" \
- INCLUDES="-I. -I${S}/fm-common/sources" \
- BINDIR="${bindir}" \
- LIBDIR="${libdir}" \
- UNITDIR="${systemd_system_unitdir}" \
- DESTDIR="${D}" \
- '
-do_install () {
- oe_runmake install
- # fix the path for init scripts
- sed -i -e 's|rc.d/||' ${D}/${systemd_system_unitdir}/*.service
-
- # fix the path for binaries
- sed -i -e 's|/usr/local/bin/|${bindir}/|' ${D}${sysconfdir}/init.d/fminit
-}
-
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "fminit.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-inherit useradd
-
-USERADD_PACKAGES = "fm-mgr"
-USERADD_PARAM_fm-mgr = "-r -g fm -u 195 -d /var/lib/fm -s /sbin/nologin -c 'fm-mgr' fm"
-GROUPADD_PARAM_fm-mgr = "-r -g 195 fm"
-
-RDEPENDS_${PN}_append = " net-snmp-server-snmpd"
+++ /dev/null
-inherit setuptools
-
-require fault-common.inc
-SUBPATH0 = "fm-rest-api/fm"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-
-do_install_append() {
- install -d -m 755 ${D}/${systemd_system_unitdir}
- install -p -D -m 644 scripts/fm-api.service ${D}/${systemd_system_unitdir}
- install -p -D -m 755 scripts/fm-api ${D}/${sysconfdir}/init.d/fm-api
- install -p -D -m 644 fm-api-pmond.conf ${D}/${sysconfdir}/pmon.d/fm-api.conf
-
- # fix the path for init scripts
- sed -i -e 's|rc.d/||' ${D}/${systemd_system_unitdir}/*.service
-}
-
-inherit systemd
-SYSTEMD_PACKAGES += "fm-rest-api"
-SYSTEMD_SERVICE_${PN} = "fm-api.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-
-# For fm.conf
-RDEPENDS_${PN} += " python-oslo.config"
-
-pkg_postinst_ontarget_${PN}() {
-
-cat > /etc/fm/config-generator.conf << EOF
-[DEFAULT]
-output_file = fm.conf.sample
-wrap_width = 79
-namespace = fm.api.conf
-namespace = keystonemiddleware.auth_token
-namespace = oslo.middleware
-namespace = oslo.log
-namespace = oslo.policy
-namespace = oslo.db
-EOF
-
- oslo-config-generator --config-file /etc/fm/config-generator.conf --output-file /etc/fm/fm.conf.sample
- mv /etc/fm/fm.conf.sample /etc/fm/fm.conf
- rm /etc/fm/config-generator.conf
-}
-
+++ /dev/null
-inherit setuptools
-
-require fault-common.inc
-
-SUBPATH0 = "python-fmclient/fmclient"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
+++ /dev/null
-require fault-common.inc
-
-DEPENDS += "fm-common net-snmp"
-
-SRC_URI += "file://0001-snmp-audittrail-add-LDFLAGS.patch"
-
-SUBPATH0 = "snmp-audittrail/sources"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-EXTRA_OEMAKE = '-e PATCH=0 \
- INCLUDES="-I. -I${S}/fm-common/sources" \
- LDFLAGS="${LDFLAGS} -shared -L${S}/fm-common/sources" \
- CCFLAGS="${CXXFLAGS} -fPIC" \
- DEST_DIR="${D}" LIB_DIR="${libdir}" \
- MIBVER=0'
-
-do_install() {
- cd ${S}
- oe_runmake -e DESTDIR=${D} BIN_DIR=${bindir} UNIT_DIR=${systemd_system_unitdir} \
- LIB_DIR=${libdir} INC_DIR=${includedir} DATA_DIR=${datadir} install
-}
+++ /dev/null
-require fault-common.inc
-
-DEPENDS += "fm-common snmp-audittrail"
-
-SRC_URI += "file://0001-snmp-ext-add-LDFLAGS.patch"
-
-SUBPATH0 = "snmp-ext/sources"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-EXTRA_OEMAKE = '-e PATCH=0 \
- INCLUDES="-I. -I${S}/fm-common/sources" \
- LDFLAGS="${LDFLAGS} -shared -L${S}/fm-common/sources" \
- CCFLAGS="${CXXFLAGS} -fPIC" \
- DEST_DIR="${D}" LIB_DIR="${libdir}" \
- MIBVER=0 \
- '
-
-do_install() {
- cd ${S}
- oe_runmake -e DEST_DIR=${D} BIN_DIR=${bindir} UNIT_DIR=${systemd_system_unitdir} \
- LIB_DIR=${libdir} INC_DIR=${includedir} DATA_DIR=${datadir} install
-}
-
-FILES_${PN}_append = " ${datadir}/"
+++ /dev/null
-DESCRIPTION = "stx-gui"
-
-PACKAGES = "starlingx-dashboard"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCREV = "d1c22e49a95f92e91049b96f44e685f46785977c"
-S = "${WORKDIR}/git"
-PV = "1.0.0"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-
-
-SRC_URI = "git://opendev.org/starlingx/gui.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit distutils python-dir
-
-DEPENDS = "\
- python \
- python-pbr-native \
- "
-
-RDEPENDS_starlingx-dashboard += " \
- python-django-horizon \
- "
-
-RDEPENDS_starlingx-dashboard_append = " \
- ${PYTHON_PN}-cephclient \
- "
-
-do_configure () {
- cd ${S}/starlingx-dashboard/starlingx-dashboard
- distutils_do_configure
-}
-
-
-do_compile () {
- cd ${S}/starlingx-dashboard/starlingx-dashboard
- distutils_do_compile
-}
-
-
-do_install () {
- cd ${S}/starlingx-dashboard/starlingx-dashboard
- distutils_do_install
-
- install -d -m 0755 ${D}/${datadir}/openstack-dashboard/openstack_dashboard/enabled/
- install -d -m 0755 ${D}/${datadir}/openstack-dashboard/openstack_dashboard/themes/starlingx/
- install -d -m 0755 ${D}/${datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.d
- cp -ra ${D}${PYTHON_SITEPACKAGES_DIR}/starlingx_dashboard/enabled/* \
- ${D}/${datadir}/openstack-dashboard/openstack_dashboard/enabled/
- cp -ra ${D}${PYTHON_SITEPACKAGES_DIR}/starlingx_dashboard/themes/starlingx/* \
- ${D}/${datadir}/openstack-dashboard/openstack_dashboard/themes/starlingx/
- cp -ra ${D}${PYTHON_SITEPACKAGES_DIR}/starlingx_dashboard/local/local_settings.d/* \
- ${D}/${datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.d
- # comment out this line with syntax error
- sed -i -e 's|^OPENSTACK_NEUTRON_NETWORK|# &|' \
- ${D}/${datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.d/_30_stx_local_settings.py
-}
-
-FILES_starlingx-dashboard = " \
- ${PYTHON_SITEPACKAGES_DIR} \
- ${datadir}/openstack-dashboard/openstack_dashboard \
- "
+++ /dev/null
-From 0374eb585bc3e47e914c7f523f904923a447d2f7 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Sat, 27 Jun 2020 10:26:58 +0800
-Subject: [PATCH] libsm_watchdog_nfs: add missing dependency on libsm_common.so
-
-Add missing dependency on libsm_common.so in Makefile for libsm_watchdog_nfs
-to avoid race condition issue:
-
-| ../../libexec/x86_64-poky-linux/gcc/x86_64-poky-linux/8.3.0/ld: cannot
-| find -lsm_common
-| collect2: error: ld returned 1 exit status
-| make: *** [libsm_watchdog_nfs.so.0] Error 1
-
-Upstream-Status: Submitted [https://review.opendev.org/759787]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- service-mgmt/sm-common/src/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/service-mgmt/sm-common/src/Makefile b/service-mgmt/sm-common/src/Makefile
-index 7d138f9..487dfa0 100644
---- a/service-mgmt/sm-common/src/Makefile
-+++ b/service-mgmt/sm-common/src/Makefile
-@@ -53,7 +53,7 @@ libsm_watchdog_nfs.so: libsm_watchdog_nfs.so.$(VER_MJR)
- libsm_watchdog_nfs.so.$(VER_MJR): libsm_watchdog_nfs.so.$(VER)
- ln -sf $^ $@
-
--libsm_watchdog_nfs.so.$(VER): libsm_common.so.$(VER)
-+libsm_watchdog_nfs.so.$(VER): libsm_common.so.$(VER) libsm_common.so
- $(CXX) $(INCLUDES) $(CCFLAGS) $(EXTRACCFLAGS) sm_watchdog_nfs.c ${LDFLAGS} $(LDLIBS) -L./ -lsm_common -Wl,-soname,libsm_watchdog_nfs.so.$(VER_MJR) -o $@
-
- sm_watchdog: libsm_common.so
---
-2.7.4
+++ /dev/null
-From 128062759147c9a903d14ad7edbe6ead04f95812 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Fri, 24 Jan 2020 13:10:02 -0800
-Subject: [PATCH 1/2] Allow user to define destination libdir
-
----
- service-mgmt/sm-db/src/Makefile | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index a29b1ac..379ea00 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -33,6 +33,10 @@ EXTRACCFLAGS= -D__STDC_FORMAT_MACROS
- LDLIBS= -lsqlite3 -lglib-2.0 -luuid -lrt -lsm_common
- LDFLAGS = -shared -rdynamic
-
-+LIB_DIR = /usr/lib64
-+BIN_DIR = /usr/bin
-+INC_DIR = /usr/include
-+
- build: libsm_db.so sm_db_build
-
- .c.o:
-@@ -51,12 +55,13 @@ sm_db_build: ${OBJS}
- $(CXX) $(INCLUDES) $(CCFLAGS) $(EXTRACCFLAGS) $(OBJS) $(LDLIBS) -o sm_db_build
-
- install:
-- install -d ${DEST_DIR}/usr/lib64
-- install libsm_db.so.${VER} $(DEST_DIR)/usr/lib64
-- cp -P libsm_db.so libsm_db.so.$(VER_MJR) $(DEST_DIR)/usr/lib64
-- install -d ${DEST_DIR}/usr/include
-- install -m 0644 *.h ${DEST_DIR}/usr/include
-- install -d 755 ${DEST_DIR}/usr/bin
-+ install -d ${DEST_DIR}/${LIB_DIR}
-+ install libsm_db.so.${VER} $(DEST_DIR)/${LIB_DIR}
-+ cp -P libsm_db.so libsm_db.so.$(VER_MJR) $(DEST_DIR)/${LIB_DIR}
-+ install -d ${DEST_DIR}/${INC_DIR}
-+ install -m 0644 *.h ${DEST_DIR}/${INC_DIR}
-+ install -d 755 ${DEST_DIR}/${BIN_DIR}
-+ install -m 0744 sm_db_build ${DEST_DIR}/${BIN_DIR}
-
- clean:
- @rm -f *.o *.a *.so *.so.*
---
-2.23.0
-
+++ /dev/null
-From 652fda776827b527844bd61864a3b163d5f56a53 Mon Sep 17 00:00:00 2001
-From: Babak Sarashki <Babak.SarAshki@windriver.com>
-Date: Tue, 9 Jun 2020 11:18:24 -0700
-Subject: [PATCH] stx-ha: fix hardcoded path for sm
-
-From commit af44c87f in master branch.
----
- service-mgmt/sm-common/src/sm_types.h | 4 ++--
- service-mgmt/sm-common/src/sm_watchdog_nfs.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/service-mgmt/sm-common/src/sm_types.h b/service-mgmt/sm-common/src/sm_types.h
-index b71d306..6d85d31 100644
---- a/service-mgmt/sm-common/src/sm_types.h
-+++ b/service-mgmt/sm-common/src/sm_types.h
-@@ -89,9 +89,9 @@ extern "C" {
- #define SM_DUMP_DATA_FILE "/tmp/sm_data_dump.txt"
-
- #define SM_TROUBLESHOOT_LOG_FILE "/var/log/sm-troubleshoot.log"
--#define SM_TROUBLESHOOT_SCRIPT "/usr/local/sbin/sm-troubleshoot"
-+#define SM_TROUBLESHOOT_SCRIPT "/usr/sbin/sm-troubleshoot"
-
--#define SM_NOTIFICATION_SCRIPT "/usr/local/sbin/sm-notification"
-+#define SM_NOTIFICATION_SCRIPT "/usr/sbin/sm-notification"
-
- #define SM_SERVICE_DOMAIN_WEIGHT_MINIMUM 0
- #define SM_SERVICE_DOMAIN_WEIGHT_UNSELECTABLE_ACTIVE -1
-diff --git a/service-mgmt/sm-common/src/sm_watchdog_nfs.c b/service-mgmt/sm-common/src/sm_watchdog_nfs.c
-index db08599..987d017 100644
---- a/service-mgmt/sm-common/src/sm_watchdog_nfs.c
-+++ b/service-mgmt/sm-common/src/sm_watchdog_nfs.c
-@@ -329,7 +329,7 @@ static void sm_watchdog_nfs_do_reboot( void )
- open( "/dev/null", O_WRONLY ); // stderr
- }
-
-- execve( "/usr/local/sbin/collect", argv, env );
-+ execve( "/usr/sbin/collect", argv, env );
-
- // Shouldn't get this far, else there was an error.
- exit(-1);
---
-2.23.0
-
+++ /dev/null
-DESCRIPTION = "stx-ha"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCNAME = "ha"
-SRCREV = "a7b7d35b9922a3f2a8462492b7f1958f135a612d"
-SRCREV_opendev = "a7b7d35b9922a3f2a8462492b7f1958f135a612d"
-DESTSUFFIX = "${PN}-${PV}"
-PV = "1.0.0"
-
-SRC_URI = " \
- git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH};destsuffix=${DESTSUFFIX};subpath=${SUBPATH0};name=opendev \
- "
-
-inherit systemd
-
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-DEPENDS += " \
- fm-common \
- sqlite3 \
- python \
- python-pbr-native \
- "
+++ /dev/null
-PACKAGES += " sm-common-libs"
-PACKAGES += " sm-eru"
-
-require ha-common.inc
-SUBPATH0 = "service-mgmt/sm-common"
-
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI += " \
- file://0001-stx-ha-fix-hardcoded-path-for-sm.patch;striplevel=3 \
- file://0001-libsm_watchdog_nfs-add-missing-dependency-on-libsm_c.patch;striplevel=3 \
- "
-
-DEPENDS_append = " \
- glib-2.0 \
- "
-
-inherit pkgconfig
-
-RDEPENDS_sm-common-libs += " \
- bash \
- util-linux \
- systemd \
- "
-RDEPENDS_sm-eru = " sm-common-libs"
-RDEPENDS_libsm-common = " sm-common-libs"
-
-inherit systemd
-SYSTEMD_PACKAGES += "sm-eru"
-SYSTEMD_SERVICE_sm-eru = "sm-eru.service sm-watchdog.service"
-SYSTEMD_AUTO_ENABLE_sm-eru = "enable"
-
-EXTRA_OEMAKE = ' -e VER=0 VER_MJR=1 \
- INCLUDES="-I. $(pkg-config --cflags glib-2.0)" \
- CCFLAGS="${CXXFLAGS} -fPIC" LDFLAGS="${LDFLAGS} -shared -rdynamic" \
- EXTRACCFLAGS="${LDFLAGS}" \
- '
-
-do_install_append () {
- oe_runmake -e BUILDSUBDIR=${B} DEST_DIR=${D} BIN_DIR=${bindir} \
- UNIT_DIR=${systemd_system_unitdir} LIB_DIR=${libdir} \
- INC_DIR=${includedir} ETC_DIR=${sysconfdir} VER=0 VER_MJR=1 install
- if [ -d ${D}/etc/pmon.d ] ; then
- chmod 0755 ${D}/etc/pmon.d
- fi
-}
-
-FILES_${PN}-dev_append = " \
- var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so \
- "
-
-FILES_${PN} = " \
- ${libdir}/libsm_common.so.0 \
- ${libdir}/libsm_common.so.1 \
- ${libdir}/libsm_common.so \
- "
-
-FILES_sm-common-libs = " \
- var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so.0 \
- var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so.1 \
- "
-
-FILES_sm-eru = " \
- ${bindir}/sm-eru \
- ${bindir}/sm-eru-dump \
- ${bindir}/sm-watchdog \
- ${systemd_system_unitdir}/sm-eru.service \
- ${systemd_system_unitdir}/sm-watchdog.service \
- ${sysconfdir}/init.d/sm-eru \
- ${sysconfdir}/pmon.d/sm-eru.conf \
- ${sysconfdir}/init.d/sm-watchdog \
- ${sysconfdir}/pmon.d/sm-watchdog.conf \
- "
+++ /dev/null
-require ha-common.inc
-SUBPATH0 = "service-mgmt-api/sm-api"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN}_append = " \
- bash \
- python-six \
- chkconfig \
- mtce-pmon \
- "
-inherit setuptools
-SYSTEMD_PACKAGES += "sm-api"
-SYSTEMD_SERVICE_sm-api = "sm-api.service"
-SYSTEMD_AUTO_ENABLE_sm-api = "enable"
-
-do_install_append () {
- install -d -m 0755 ${D}/${sysconfdir}/sm
- install -d -m 0755 ${D}/${sysconfdir}/init.d
- install -d -m 0755 ${D}/${sysconfdir}/pmon.d
- install -d -m 0755 ${D}/${sysconfdir}/sm-api
- install -d -m 0755 ${D}/${systemd_system_unitdir}
- install -m 644 scripts/sm_api.ini ${D}/${sysconfdir}/sm
- install -m 755 scripts/sm-api ${D}/${sysconfdir}/init.d
- install -m 644 scripts/sm-api.service ${D}/${systemd_system_unitdir}
- install -m 644 scripts/sm-api.conf ${D}/${sysconfdir}/pmon.d
- install -m 644 etc/sm-api/policy.json ${D}/${sysconfdir}/sm-api
-}
+++ /dev/null
-require ha-common.inc
-SUBPATH0 = "service-mgmt-client/sm-client"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = " \
- file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2 \
- "
-
-RDEPENDS_${PN}_append = " \
- python \
- python-six \
- "
-
-inherit setuptools
+++ /dev/null
-require ha-common.inc
-SUBPATH0 = "service-mgmt/sm-db"
-
-DEPENDS_append = " \
- sqlite3-native \
- libsm-common \
- "
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI += "file://0001-sm-db-Fix-dest-libdir.patch"
-
-EXTRA_OEMAKE = ' -e VER=0 VER_MJR=1 \
- INCLUDES="-I." \
- CCFLAGS="${CXXFLAGS} -fPIC" \
- LDFLAGS="${LDFLAGS} -shared -rdynamic -L${S}/service-mgmt/sm-common/src " \
- EXTRACCFLAGS="${LDFLAGS} -L${S}/service-mgmt/sm-common/src " \
- '
-
-do_compile_prepend() {
- cd ${S}
- if [ ! -f database/sm.db ]; then
- sqlite3 database/sm.db < database/create_sm_db.sql
- fi
- if [ ! -f database/sm.hb.db ]; then
- sqlite3 database/sm.hb.db < database/create_sm_hb_db.sql
- fi
-}
-
-do_install() {
- cd ${S}
- oe_runmake -e DEST_DIR=${D} BIN_DIR=${bindir} UNIT_DIR=${systemd_system_unitdir} \
- LIB_DIR=${libdir} INC_DIR=${includedir} VER=0 VER_MJR=1 install
-}
+++ /dev/null
-require ha-common.inc
-SUBPATH0 = "service-mgmt-tools/sm-tools"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN}_append = " python"
-
-inherit setuptools
+++ /dev/null
-require ha-common.inc
-SUBPATH0 = "service-mgmt/sm"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_sm += " \
- bash \
- python \
- logrotate \
- time \
- systemd \
- chkconfig \
- mtce-pmon \
- "
-
-DEPENDS_append = " \
- libsm-common \
- mtce \
- sm-db \
- "
-
-EXTRA_OEMAKE = ' \
- -e -j1 VER=0 VER_MJR=1 \
- INCLUDES="-I. $(pkg-config --cflags glib-2.0)" \
- EXTRACCFLAGS="-I. $(pkg-config --cflags glib-2.0) $(pkg-config --ldflags glib-2.0) -lsqlite3" \
- CCFLAGS="${CXXFLAGS} -std=c++11" LDFLAGS="${LDFLAGS} -rdynamic" \
- '
-do_install() {
- cd ${S}/src
- oe_runmake -e DEST_DIR=${D} BIN_DIR=${bindir} UNIT_DIR=${systemd_system_unitdir} \
- LIB_DIR=${libdir} INC_DIR=${includedir} VER=0 VER_MJR=1 install
-
- cd ${S}/scripts
- install -d ${D}/${sysconfdir}/init.d
- install sm ${D}/${sysconfdir}/init.d/sm
- install sm.shutdown ${D}/${sysconfdir}/init.d/sm-shutdown
- install -d -m0755 ${D}/${sysconfdir}/pmon.d
- install -m 644 sm.conf ${D}/${sysconfdir}/pmon.d/sm.conf
- install -d ${D}/${sysconfdir}/logrotate.d
- install -m 644 sm.logrotate ${D}/${sysconfdir}/logrotate.d/sm.logrotate
- install -d -m 755 ${D}/${sbindir}
- install sm.notify ${D}/${sbindir}/stx-ha-sm-notify
- install sm.troubleshoot ${D}/${sbindir}/sm-troubleshoot
- install sm.notification ${D}/${sbindir}/sm-notification
- install -d -m0755 ${D}/${systemd_system_unitdir}
- install -m 644 *.service ${D}/${systemd_system_unitdir}
-}
-
-pkg_postinst_ontarget_sm_append () {
- /usr/bin/update-alternatives --install /usr/sbin/sm-notify sm-notify /usr/sbin/stx-ha-sm-notify 5
-}
-
-SYSTEMD_PACKAGES += "sm"
-SYSTEMD_SERVICE_sm = "sm.service sm-shutdown.service"
-SYSTEMD_AUTO_ENABLE_sm = "enable"
+++ /dev/null
-require ha-common.inc
-SUBPATH0 = "stx-ocf-scripts/src/ocf"
-
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN} = " \
- bash \
- openstack-ras \
- "
-
-do_unpack_append() {
- bb.build.exec_func('do_restore_license_file', d)
-}
-
-do_restore_license_file () {
- cd ${S}
- git reset HEAD LICENSE
- git checkout LICENSE
-}
-
-do_install_append () {
- install -d -m 755 ${D}/usr/lib/ocf/resource.d/openstack
- install -p -D -m 755 $(find . -type f -not -path './.git/*') ${D}/usr/lib/ocf/resource.d/openstack/
-}
-
-FILES_${PN}_append = " \
- ${libdir}/ocf/resource.d/openstack/ \
- "
+++ /dev/null
-DESCRIPTION = "cloud-provider-openstack"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4"
-S = "${WORKDIR}/git"
-PV = "19.05"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-RDEPENDS_${PN} += " bash"
-
-inherit systemd
-SYSTEMD_PACKAGES += "${PN}"
-SYSTEMD_SERVICE_${PN} = "${PN}.service"
-# SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install () {
-
- cd ${S}/filesystem/cloud-provider-openstack/
- install -d -m755 ${D}/${bindir}
- install -d -m755 ${D}/${systemd_system_unitdir}
-
- install -D -m644 files/cloud-provider-openstack.sh ${D}/${bindir}
- install -D -m644 files/cloud-provider-openstack.service ${D}/${systemd_system_unitdir}
-
-
-}
+++ /dev/null
-GNU GENERAL PUBLIC LICENSE
-Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
- General Public License applies to most of the Free Software
- Foundation's software and to any other program whose authors commit to
- using it. (Some other Free Software Foundation software is covered by
- the GNU Library General Public License instead.) You can apply it to
- your programs, too.
-
- When we speak of free software, we are referring to freedom, not
- price. Our General Public Licenses are designed to make sure that you
- have the freedom to distribute copies of free software (and charge for
- this service if you wish), that you receive source code or can get it
- if you want it, that you can change the software or use pieces of it
- in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
- anyone to deny you these rights or to ask you to surrender the rights.
- These restrictions translate to certain responsibilities for you if you
- distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
- gratis or for a fee, you must give the recipients all the rights that
- you have. You must make sure that they, too, receive or can get the
- source code. And you must show them these terms so they know their
- rights.
-
- We protect your rights with two steps: (1) copyright the software, and
- (2) offer you this license which gives you legal permission to copy,
- distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
- that everyone understands that there is no warranty for this free
- software. If the software is modified by someone else and passed on, we
- want its recipients to know that what they have is not the original, so
- that any problems introduced by others will not reflect on the original
- authors' reputations.
-
- Finally, any free program is threatened constantly by software
- patents. We wish to avoid the danger that redistributors of a free
- program will individually obtain patent licenses, in effect making the
- program proprietary. To prevent this, we have made it clear that any
- patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
- modification follow.
- \f
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
- a notice placed by the copyright holder saying it may be distributed
- under the terms of this General Public License. The "Program", below,
- refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
- that is to say, a work containing the Program or a portion of it,
- either verbatim or with modifications and/or translated into another
- language. (Hereinafter, translation is included without limitation in
- the term "modification".) Each licensee is addressed as "you".
-
- Activities other than copying, distribution and modification are not
- covered by this License;
-they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
- Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
- source code as you receive it, in any medium, provided that you
- conspicuously and appropriately publish on each copy an appropriate
- copyright notice and disclaimer of warranty; keep intact all the
- notices that refer to this License and to the absence of any warranty;
- and give any other recipients of the Program a copy of this License
- along with the Program.
-
- You may charge a fee for the physical act of transferring a copy, and
- you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
- of it, thus forming a work based on the Program, and copy and
- distribute such modifications or work under the terms of Section 1
- above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
- \f
- These requirements apply to the modified work as a whole. If
- identifiable sections of that work are not derived from the Program,
- and can be reasonably considered independent and separate works in
- themselves, then this License, and its terms, do not apply to those
- sections when you distribute them as separate works. But when you
- distribute the same sections as part of a whole which is a work based
- on the Program, the distribution of the whole must be on the terms of
- this License, whose permissions for other licensees extend to the
- entire whole, and thus to each and every part regardless of who wrote it.
-
- Thus, it is not the intent of this section to claim rights or contest
- your rights to work written entirely by you; rather, the intent is to
- exercise the right to control the distribution of derivative or
- collective works based on the Program.
-
- In addition, mere aggregation of another work not based on the Program
- with the Program (or with a work based on the Program) on a volume of
- a storage or distribution medium does not bring the other work under
- the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
- under Section 2) in object code or executable form under the terms of
- Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
- The source code for a work means the preferred form of the work for
- making modifications to it. For an executable work, complete source
- code means all the source code for all modules it contains, plus any
- associated interface definition files, plus the scripts used to
- control compilation and installation of the executable. However, as a
- special exception, the source code distributed need not include
- anything that is normally distributed (in either source or binary
- form) with the major components (compiler, kernel, and so on) of the
- operating system on which the executable runs, unless that component
- itself accompanies the executable.
-
- If distribution of executable or object code is made by offering
- access to copy from a designated place, then offering equivalent
- access to copy the source code from the same place counts as
- distribution of the source code, even though third parties are not
- compelled to copy the source along with the object code.
- \f
- 4. You may not copy, modify, sublicense, or distribute the Program
- except as expressly provided under this License. Any attempt
- otherwise to copy, modify, sublicense or distribute the Program is
- void, and will automatically terminate your rights under this License.
- However, parties who have received copies, or rights, from you under
- this License will not have their licenses terminated so long as such
- parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
- signed it. However, nothing else grants you permission to modify or
- distribute the Program or its derivative works. These actions are
- prohibited by law if you do not accept this License. Therefore, by
- modifying or distributing the Program (or any work based on the
- Program), you indicate your acceptance of this License to do so, and
- all its terms and conditions for copying, distributing or modifying
- the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
- Program), the recipient automatically receives a license from the
- original licensor to copy, distribute or modify the Program subject to
- these terms and conditions. You may not impose any further
- restrictions on the recipients' exercise of the rights granted herein.
- You are not responsible for enforcing compliance by third parties to
- this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
- infringement or for any other reason (not limited to patent issues),
- conditions are imposed on you (whether by court order, agreement or
- otherwise) that contradict the conditions of this License, they do not
- excuse you from the conditions of this License. If you cannot
- distribute so as to satisfy simultaneously your obligations under this
- License and any other pertinent obligations, then as a consequence you
- may not distribute the Program at all. For example, if a patent
- license would not permit royalty-free redistribution of the Program by
- all those who receive copies directly or indirectly through you, then
- the only way you could satisfy both it and this License would be to
- refrain entirely from distribution of the Program.
-
- If any portion of this section is held invalid or unenforceable under
- any particular circumstance, the balance of the section is intended to
- apply and the section as a whole is intended to apply in other
- circumstances.
-
- It is not the purpose of this section to induce you to infringe any
- patents or other property right claims or to contest validity of any
- such claims;
-this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system;
-it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-\f
-8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
- of the General Public License from time to time. Such new versions will
- be similar in spirit to the present version, but may differ in detail to
- address new problems or concerns.
-
- Each version is given a distinguishing version number. If the Program
- specifies a version number of this License which applies to it and "any
- later version", you have the option of following the terms and conditions
- either of that version or of any later version published by the Free
- Software Foundation. If the Program does not specify a version number of
- this License, you may choose any version ever published by the Free Software
- Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
- programs whose distribution conditions are different, write to the author
- to ask for permission. For software which is copyrighted by the Free
- Software Foundation, write to the Free Software Foundation;
-we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
- TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
- YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
- PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
- \f
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
- possible use to the public, the best way to achieve this is to make it
- free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
- to attach them to the start of each source file to most effectively
- convey the exclusion of warranty;
-and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-<one line to give the program's name and a brief idea of what it does.>
-Copyright (C) <year> <name of author>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-Gnomovision version 69, Copyright (C) year name of author
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-This is free software, and you are welcome to redistribute it
-under certain conditions;
-type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
-Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-`Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-<signature of Ty Coon>, 1 April 1989
-Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+++ /dev/null
-# Add any commands the user may execute. Even shell commands.
-# You have to allow logout and/or exit, so the user can logout!
-# cd and pwd should also be allowed. Note: other shell builtin
-# commands are not yet implemented!
-nova
-system
-neutron
-cinder
-glance
-ceilometer
-heat
+++ /dev/null
-# Add any extension the user may use.
-.doc
-.txt
-.tgz
-.tar
-
+++ /dev/null
-diff --git a/config.c b/config.c
-index c1087a5..add7c53 100644
---- a/config.c
-+++ b/config.c
-@@ -6,6 +6,8 @@
- This file is part of IBSH (Iron Bars Shell) , a restricted Unix shell
- Copyright (C) 2005 Attila Nagyidai
-
-+ Copyright(c) 2013-2017 Wind River Systems, Inc. All rights reserved.
-+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
-diff --git a/main.c b/main.c
-index cf3ae9e..6cda04e 100644
---- a/main.c
-+++ b/main.c
-@@ -6,6 +6,8 @@
- This file is part of IBSH (Iron Bars Shell) , a restricted Unix shell
- Copyright (C) 2005 Attila Nagyidai
-
-+ Copyright(c) 2013-2017 Wind River Systems, Inc. All rights reserved.
-+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
+++ /dev/null
-Index: cgcs-users-1.0-r0/main.c
-===================================================================
---- cgcs-users-1.0-r0.orig/main.c
-+++ cgcs-users-1.0-r0/main.c
-@@ -37,6 +37,7 @@
-
- /* Header files */
- #include "ibsh.h"
-+#include "stdlib.h"
-
- /* Main: */
- /* Handle arguments, read config files, start command processing. */
-@@ -57,13 +58,28 @@
- /* use our builtin code, otherwise use execve. After execve, check if the user didnt */
- /* use the last command to create some illegal content. If yes, erase that. Give the */
- /* notice only afterwards. */
-+
-+void ALRMhandler(int sig) {
-+ OPENLOG;
-+ syslog(LOG_INFO, "CLI timeout, user %s has logged out.", loggedin.uname);
-+ CLOSELOG;
-+ exit(0);
-+}
-+
- int main(int argc, char **argv)
- {
- char temp[STRING_SIZE], *buf;
- struct stat info;
- uid_t ruid, euid;
- gid_t rgid, egid;
-+ unsigned int tout_cli = 0;
-
-+ const char* tout = getenv("TMOUT");
-+ if (tout)
-+ tout_cli = atoi(tout);
-+ else
-+ //default to 5 mins
-+ tout_cli = 300;
-
- /* setuid protection */
- ruid = getuid();
-@@ -107,6 +123,7 @@ int main(int argc, char **argv)
- signal( SIGQUIT, SIG_IGN );
- signal( SIGTERM, SIG_IGN );
- signal( SIGTSTP, SIG_IGN );
-+ signal( SIGALRM, ALRMhandler );
- LoadConfig();
-
- /* Command mode */
-@@ -144,6 +161,7 @@ int main(int argc, char **argv)
- /* will be allowed to run, unless it is mentioned in the */
- /* config files. Files that are created with an extension */
- /* that is listed in the other config file, must be deleted! */
-+ alarm(tout_cli);
- for ( ; ; ) {
- /* Where is he ? */
- getcwd(real_path, STRING_SIZE);
-@@ -153,12 +171,12 @@ int main(int argc, char **argv)
- }
- /* We don't want the user to know where he actually is. */
- /* This is the prompt! */
-- printf("[%s]%% ", jail_path);
-+ printf("[%s]%% ", loggedin.uname);
- /* scanf("%s", user_command); */
- myscanf(user_command, real_path);
-+ alarm(tout_cli);
- /* Command interpretation and execution. */
- if ( (CommandOK(user_command, loggedin.udir, jail_path, filtered_command)) == 0 ) {
-- printf("Sorry, can't let you do that!\n");
- log_attempt(loggedin.uname); /* v0.2a */
- continue;
- }
-Index: cgcs-users-1.0-r0/config.c
-===================================================================
---- cgcs-users-1.0-r0.orig/config.c
-+++ cgcs-users-1.0-r0/config.c
-@@ -166,7 +166,6 @@ int LoadConfig( void )
- // Delete '\n'
- tmp2[i][strlen(tmp2[i]) - 1] = '\0';
- strncpy(extensions[i],tmp2[i],strlen(tmp2[i]));
-- printf("EXTENSIONS %s\n",extensions[i]);
- i++;
- }
- }
+++ /dev/null
-Index: cgcs-users-1.0-r0/AUTHORS.orig
-===================================================================
---- /dev/null
-+++ cgcs-users-1.0-r0/AUTHORS.orig
-@@ -0,0 +1,15 @@
-+AUTHORS OF PROJECT IBSH
-+
-+Attila Nagyidai <attila at ibsh.net>
-+ * Original program author, project admin, developer.
-+
-+Shy <shy at ibsh.net>
-+ * Developer, debugger, tester, and many more.
-+
-+Witzy <witzy at ibsh.net>
-+ * Developer, debugger, tester, and many more.
-+
-+http://www.ibsh.net
-+irc:
-+irc.freenode.net #ibsh
-+irc.geek-power.org #ibsh
-Index: cgcs-users-1.0-r0/BUGS.orig
-===================================================================
---- /dev/null
-+++ cgcs-users-1.0-r0/BUGS.orig
-@@ -0,0 +1,19 @@
-+** Open BUGS **
-+None, so far.
-+
-+** Fixed BUGS **
-+- Input length checking on all inputs, string copies, etc. is fixed.
-+- The myscanf function will no longer accept more then 80 chars at once,
-+so ibsh hopefully wont crash on a too long input.
-+- Added signal.h in the header file, the lack of it caused compilation
-+problems on some systems.
-+- Fixed the infinite loop in DelBadFiles. This function is temporarily
-+taken out of the project
-+- Removed the involvment of /bin/sh from system. Added path checking.
-+- In jail root, not only ../ is not allowed, but .. too.
-+- Fixed a bug, that happened on bsd, when the user pressed ^D.
-+- Fixed a bug with opendir
-+- Fixed a format string vulnerability in logprintbadfile(). Thanks to
-+Kim Streich for the report.
-+
-+2005.05.23
-Index: cgcs-users-1.0-r0/ChangeLog.orig
-===================================================================
---- /dev/null
-+++ cgcs-users-1.0-r0/ChangeLog.orig
-@@ -0,0 +1,34 @@
-+0.3e - a buffer overflow and a string bug, both found by RazoR (Nikolay Alexandrov), fixed.
-+0.3d - a format string vulnerability, found by Kim Streich, is fixed.
-+0.3b-0.3c - bugfixes.
-+0.3a - The admin has the opportunity, to create separate cmds file for each user.
-+ This way the sysadmin has complete control over sensitive applications, which
-+ should only be allowed to a selected few.
-+ - The admin has the opportunity, to create separate xtns file for each user.
-+ - The extensions policy has been changed. Now both globals.xtns and the user
-+ extension files will list the extensions, that are _allowed_ ! In earlier versions,
-+ the forbidden extensions were listed, that is allow everything, except to deny a few.
-+ From this version on, it's deny everything, except allow the ones, listed in these files.
-+ - While the code for the search of illegal/dangerous material stored in user space is
-+ back, it will not erase any files any more. Instead, it will remove all
-+ rights from that file, so it can not be executed, or read. Files, with the +x bit set,
-+ will be chmodded to -x. This is another "defense line" to stop the user to execute
-+ programs, stored in user space.
-+ - The access to all linux binaries, and source code files, stored in user space, if any,
-+ will be blocked.
-+ - Absolute path for restricted users can not be longer then 255 characters. All files,
-+ that are longer (with full path), will be renamed.
-+ - Minor bug fixes.
-+
-+0.2a - Major bug fixes.
-+ - User activities are logged with syslog.
-+ - hhsytem revised, hardened. /bin/sh isnt involved anymore into program starting.
-+ If the home directory is in the PATH, it's ignored.
-+ - erasing illegal content is temporarily suspended and removed.
-+
-+0.1b - Major bug fixes.
-+ - The config files are accidentally missing from this release!
-+
-+0.1a - The first version of the program.
-+
-+2005.05.23.
-Index: cgcs-users-1.0-r0/CONTRIBUTORS.orig
-===================================================================
---- /dev/null
-+++ cgcs-users-1.0-r0/CONTRIBUTORS.orig
-@@ -0,0 +1,7 @@
-+CONTRIBUTORS TO PROJECT IBSH
-+
-+Kim Streich <kstreich at gmail.com>
-+ * bug finder, debugger, tester.
-+
-+RazoR (Nikolay Alexandrov) <Nikolay@Alexandrov.ws>
-+ * bug finder, debugger, tester.
-Index: cgcs-users-1.0-r0/COPYING.orig
-===================================================================
---- /dev/null
-+++ cgcs-users-1.0-r0/COPYING.orig
-@@ -0,0 +1,340 @@
-+ GNU GENERAL PUBLIC LICENSE
-+ Version 2, June 1991
-+
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+ Preamble
-+
-+ The licenses for most software are designed to take away your
-+freedom to share and change it. By contrast, the GNU General Public
-+License is intended to guarantee your freedom to share and change free
-+software--to make sure the software is free for all its users. This
-+General Public License applies to most of the Free Software
-+Foundation's software and to any other program whose authors commit to
-+using it. (Some other Free Software Foundation software is covered by
-+the GNU Library General Public License instead.) You can apply it to
-+your programs, too.
-+
-+ When we speak of free software, we are referring to freedom, not
-+price. Our General Public Licenses are designed to make sure that you
-+have the freedom to distribute copies of free software (and charge for
-+this service if you wish), that you receive source code or can get it
-+if you want it, that you can change the software or use pieces of it
-+in new free programs; and that you know you can do these things.
-+
-+ To protect your rights, we need to make restrictions that forbid
-+anyone to deny you these rights or to ask you to surrender the rights.
-+These restrictions translate to certain responsibilities for you if you
-+distribute copies of the software, or if you modify it.
-+
-+ For example, if you distribute copies of such a program, whether
-+gratis or for a fee, you must give the recipients all the rights that
-+you have. You must make sure that they, too, receive or can get the
-+source code. And you must show them these terms so they know their
-+rights.
-+
-+ We protect your rights with two steps: (1) copyright the software, and
-+(2) offer you this license which gives you legal permission to copy,
-+distribute and/or modify the software.
-+
-+ Also, for each author's protection and ours, we want to make certain
-+that everyone understands that there is no warranty for this free
-+software. If the software is modified by someone else and passed on, we
-+want its recipients to know that what they have is not the original, so
-+that any problems introduced by others will not reflect on the original
-+authors' reputations.
-+
-+ Finally, any free program is threatened constantly by software
-+patents. We wish to avoid the danger that redistributors of a free
-+program will individually obtain patent licenses, in effect making the
-+program proprietary. To prevent this, we have made it clear that any
-+patent must be licensed for everyone's free use or not licensed at all.
-+
-+ The precise terms and conditions for copying, distribution and
-+modification follow.
-+\f
-+ GNU GENERAL PUBLIC LICENSE
-+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-+
-+ 0. This License applies to any program or other work which contains
-+a notice placed by the copyright holder saying it may be distributed
-+under the terms of this General Public License. The "Program", below,
-+refers to any such program or work, and a "work based on the Program"
-+means either the Program or any derivative work under copyright law:
-+that is to say, a work containing the Program or a portion of it,
-+either verbatim or with modifications and/or translated into another
-+language. (Hereinafter, translation is included without limitation in
-+the term "modification".) Each licensee is addressed as "you".
-+
-+Activities other than copying, distribution and modification are not
-+covered by this License; they are outside its scope. The act of
-+running the Program is not restricted, and the output from the Program
-+is covered only if its contents constitute a work based on the
-+Program (independent of having been made by running the Program).
-+Whether that is true depends on what the Program does.
-+
-+ 1. You may copy and distribute verbatim copies of the Program's
-+source code as you receive it, in any medium, provided that you
-+conspicuously and appropriately publish on each copy an appropriate
-+copyright notice and disclaimer of warranty; keep intact all the
-+notices that refer to this License and to the absence of any warranty;
-+and give any other recipients of the Program a copy of this License
-+along with the Program.
-+
-+You may charge a fee for the physical act of transferring a copy, and
-+you may at your option offer warranty protection in exchange for a fee.
-+
-+ 2. You may modify your copy or copies of the Program or any portion
-+of it, thus forming a work based on the Program, and copy and
-+distribute such modifications or work under the terms of Section 1
-+above, provided that you also meet all of these conditions:
-+
-+ a) You must cause the modified files to carry prominent notices
-+ stating that you changed the files and the date of any change.
-+
-+ b) You must cause any work that you distribute or publish, that in
-+ whole or in part contains or is derived from the Program or any
-+ part thereof, to be licensed as a whole at no charge to all third
-+ parties under the terms of this License.
-+
-+ c) If the modified program normally reads commands interactively
-+ when run, you must cause it, when started running for such
-+ interactive use in the most ordinary way, to print or display an
-+ announcement including an appropriate copyright notice and a
-+ notice that there is no warranty (or else, saying that you provide
-+ a warranty) and that users may redistribute the program under
-+ these conditions, and telling the user how to view a copy of this
-+ License. (Exception: if the Program itself is interactive but
-+ does not normally print such an announcement, your work based on
-+ the Program is not required to print an announcement.)
-+\f
-+These requirements apply to the modified work as a whole. If
-+identifiable sections of that work are not derived from the Program,
-+and can be reasonably considered independent and separate works in
-+themselves, then this License, and its terms, do not apply to those
-+sections when you distribute them as separate works. But when you
-+distribute the same sections as part of a whole which is a work based
-+on the Program, the distribution of the whole must be on the terms of
-+this License, whose permissions for other licensees extend to the
-+entire whole, and thus to each and every part regardless of who wrote it.
-+
-+Thus, it is not the intent of this section to claim rights or contest
-+your rights to work written entirely by you; rather, the intent is to
-+exercise the right to control the distribution of derivative or
-+collective works based on the Program.
-+
-+In addition, mere aggregation of another work not based on the Program
-+with the Program (or with a work based on the Program) on a volume of
-+a storage or distribution medium does not bring the other work under
-+the scope of this License.
-+
-+ 3. You may copy and distribute the Program (or a work based on it,
-+under Section 2) in object code or executable form under the terms of
-+Sections 1 and 2 above provided that you also do one of the following:
-+
-+ a) Accompany it with the complete corresponding machine-readable
-+ source code, which must be distributed under the terms of Sections
-+ 1 and 2 above on a medium customarily used for software interchange; or,
-+
-+ b) Accompany it with a written offer, valid for at least three
-+ years, to give any third party, for a charge no more than your
-+ cost of physically performing source distribution, a complete
-+ machine-readable copy of the corresponding source code, to be
-+ distributed under the terms of Sections 1 and 2 above on a medium
-+ customarily used for software interchange; or,
-+
-+ c) Accompany it with the information you received as to the offer
-+ to distribute corresponding source code. (This alternative is
-+ allowed only for noncommercial distribution and only if you
-+ received the program in object code or executable form with such
-+ an offer, in accord with Subsection b above.)
-+
-+The source code for a work means the preferred form of the work for
-+making modifications to it. For an executable work, complete source
-+code means all the source code for all modules it contains, plus any
-+associated interface definition files, plus the scripts used to
-+control compilation and installation of the executable. However, as a
-+special exception, the source code distributed need not include
-+anything that is normally distributed (in either source or binary
-+form) with the major components (compiler, kernel, and so on) of the
-+operating system on which the executable runs, unless that component
-+itself accompanies the executable.
-+
-+If distribution of executable or object code is made by offering
-+access to copy from a designated place, then offering equivalent
-+access to copy the source code from the same place counts as
-+distribution of the source code, even though third parties are not
-+compelled to copy the source along with the object code.
-+\f
-+ 4. You may not copy, modify, sublicense, or distribute the Program
-+except as expressly provided under this License. Any attempt
-+otherwise to copy, modify, sublicense or distribute the Program is
-+void, and will automatically terminate your rights under this License.
-+However, parties who have received copies, or rights, from you under
-+this License will not have their licenses terminated so long as such
-+parties remain in full compliance.
-+
-+ 5. You are not required to accept this License, since you have not
-+signed it. However, nothing else grants you permission to modify or
-+distribute the Program or its derivative works. These actions are
-+prohibited by law if you do not accept this License. Therefore, by
-+modifying or distributing the Program (or any work based on the
-+Program), you indicate your acceptance of this License to do so, and
-+all its terms and conditions for copying, distributing or modifying
-+the Program or works based on it.
-+
-+ 6. Each time you redistribute the Program (or any work based on the
-+Program), the recipient automatically receives a license from the
-+original licensor to copy, distribute or modify the Program subject to
-+these terms and conditions. You may not impose any further
-+restrictions on the recipients' exercise of the rights granted herein.
-+You are not responsible for enforcing compliance by third parties to
-+this License.
-+
-+ 7. If, as a consequence of a court judgment or allegation of patent
-+infringement or for any other reason (not limited to patent issues),
-+conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License. If you cannot
-+distribute so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you
-+may not distribute the Program at all. For example, if a patent
-+license would not permit royalty-free redistribution of the Program by
-+all those who receive copies directly or indirectly through you, then
-+the only way you could satisfy both it and this License would be to
-+refrain entirely from distribution of the Program.
-+
-+If any portion of this section is held invalid or unenforceable under
-+any particular circumstance, the balance of the section is intended to
-+apply and the section as a whole is intended to apply in other
-+circumstances.
-+
-+It is not the purpose of this section to induce you to infringe any
-+patents or other property right claims or to contest validity of any
-+such claims; this section has the sole purpose of protecting the
-+integrity of the free software distribution system, which is
-+implemented by public license practices. Many people have made
-+generous contributions to the wide range of software distributed
-+through that system in reliance on consistent application of that
-+system; it is up to the author/donor to decide if he or she is willing
-+to distribute software through any other system and a licensee cannot
-+impose that choice.
-+
-+This section is intended to make thoroughly clear what is believed to
-+be a consequence of the rest of this License.
-+\f
-+ 8. If the distribution and/or use of the Program is restricted in
-+certain countries either by patents or by copyrighted interfaces, the
-+original copyright holder who places the Program under this License
-+may add an explicit geographical distribution limitation excluding
-+those countries, so that distribution is permitted only in or among
-+countries not thus excluded. In such case, this License incorporates
-+the limitation as if written in the body of this License.
-+
-+ 9. The Free Software Foundation may publish revised and/or new versions
-+of the General Public License from time to time. Such new versions will
-+be similar in spirit to the present version, but may differ in detail to
-+address new problems or concerns.
-+
-+Each version is given a distinguishing version number. If the Program
-+specifies a version number of this License which applies to it and "any
-+later version", you have the option of following the terms and conditions
-+either of that version or of any later version published by the Free
-+Software Foundation. If the Program does not specify a version number of
-+this License, you may choose any version ever published by the Free Software
-+Foundation.
-+
-+ 10. If you wish to incorporate parts of the Program into other free
-+programs whose distribution conditions are different, write to the author
-+to ask for permission. For software which is copyrighted by the Free
-+Software Foundation, write to the Free Software Foundation; we sometimes
-+make exceptions for this. Our decision will be guided by the two goals
-+of preserving the free status of all derivatives of our free software and
-+of promoting the sharing and reuse of software generally.
-+
-+ NO WARRANTY
-+
-+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-+REPAIR OR CORRECTION.
-+
-+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGES.
-+
-+ END OF TERMS AND CONDITIONS
-+\f
-+ How to Apply These Terms to Your New Programs
-+
-+ If you develop a new program, and you want it to be of the greatest
-+possible use to the public, the best way to achieve this is to make it
-+free software which everyone can redistribute and change under these terms.
-+
-+ To do so, attach the following notices to the program. It is safest
-+to attach them to the start of each source file to most effectively
-+convey the exclusion of warranty; and each file should have at least
-+the "copyright" line and a pointer to where the full notice is found.
-+
-+ <one line to give the program's name and a brief idea of what it does.>
-+ Copyright (C) <year> <name of author>
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+If the program is interactive, make it output a short notice like this
-+when it starts in an interactive mode:
-+
-+ Gnomovision version 69, Copyright (C) year name of author
-+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-+ This is free software, and you are welcome to redistribute it
-+ under certain conditions; type `show c' for details.
-+
-+The hypothetical commands `show w' and `show c' should show the appropriate
-+parts of the General Public License. Of course, the commands you use may
-+be called something other than `show w' and `show c'; they could even be
-+mouse-clicks or menu items--whatever suits your program.
-+
-+You should also get your employer (if you work as a programmer) or your
-+school, if any, to sign a "copyright disclaimer" for the program, if
-+necessary. Here is a sample; alter the names:
-+
-+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
-+
-+ <signature of Ty Coon>, 1 April 1989
-+ Ty Coon, President of Vice
-+
-+This General Public License does not permit incorporating your program into
-+proprietary programs. If your program is a subroutine library, you may
-+consider it more useful to permit linking proprietary applications with the
-+library. If this is what you want to do, use the GNU Library General
-+Public License instead of this License.
-Index: cgcs-users-1.0-r0/COPYRIGHT.orig
-===================================================================
---- /dev/null
-+++ cgcs-users-1.0-r0/COPYRIGHT.orig
-@@ -0,0 +1,17 @@
-+This file is part of IBSH (Iron Bars Shell) , a restricted Unix shell
-+Copyright (C) 2005 Attila Nagyidai
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License
-+as published by the Free Software Foundation; either version 2
-+of the License, or (at your option) any later version.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program; if not, write to the Free Software
-+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-Index: cgcs-users-1.0-r0/INSTALL.orig
-===================================================================
---- /dev/null
-+++ cgcs-users-1.0-r0/INSTALL.orig
-@@ -0,0 +1,23 @@
-+Installing ibsh is really easy, so no need for the usual sections
-+in this document. There is no configure script either, so if
-+something wrong, make will fail.
-+
-+# make ibsh
-+# make ibsh_install
-+
-+Optionally:
-+
-+# make clean
-+
-+
-+To uninstall ibsh:
-+
-+# make ibsh_uninstall
-+
-+
-+Of course you will have to enable this shell by:
-+# echo /bin/ibsh >> /etc/shells
-+or however you like it.
-+And make sure the permissions read 0755 !
-+
-+2005.03.24.
-Index: cgcs-users-1.0-r0/main.c.orig
-===================================================================
---- /dev/null
-+++ cgcs-users-1.0-r0/main.c.orig
-@@ -0,0 +1,233 @@
-+/*
-+ Created: 03.19.05 11:34:57 by Attila Nagyidai
-+
-+ $Id: C\040Console.c,v 1.1.2.1 2003/08/13 00:38:46 neum Exp $
-+
-+ This file is part of IBSH (Iron Bars Shell) , a restricted Unix shell
-+ Copyright (C) 2005 Attila Nagyidai
-+
-+ This program is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU General Public License
-+ as published by the Free Software Foundation; either version 2
-+ of the License, or (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+ Author: Attila Nagyidai
-+ Email: na@ent.hu
-+
-+ Co-Author: Shy
-+ Email: shy@cpan.org
-+
-+ Co-Author: Witzy
-+ Email: stazzz@altern.org
-+
-+ URL: http://ibsh.sourceforge.net
-+ IRC: irc.freenode.net #ibsh
-+ RSS, Statistics, etc: http://sourceforge.net/projects/ibsh/
-+
-+*/
-+
-+/* Header files */
-+#include "ibsh.h"
-+
-+/* Main: */
-+/* Handle arguments, read config files, start command processing. */
-+/* IBSH doesnt use any command line arguments, but my text editor */
-+/* uses this code in all new c files to create. And i didnt have the */
-+/* heart to remove it. ;p */
-+/* Technical Description: */
-+/* Get the passwd entry for the user. The uid is easily aquired, since */
-+/* it is the real user id. After that, grab the passwd file entry upon */
-+/* the id, and copy the information to the loggedin struct. */
-+/* Add some signal handlers too. */
-+/* The infinite loop: */
-+/* Get the current directory, the full path. Compute the jailpath from that, */
-+/* that is the directories below the users homedir, which is the jail root. */
-+/* The jail ceiling if you like. Print some prompt to the user with the jailpath, */
-+/* and read stdin for incoming commands. Filter out the bad commands, typos, the */
-+/* not allowed commands. It the command is ok, execute it. If it is a shell builtin, */
-+/* use our builtin code, otherwise use execve. After execve, check if the user didnt */
-+/* use the last command to create some illegal content. If yes, erase that. Give the */
-+/* notice only afterwards. */
-+int main(int argc, char **argv)
-+{
-+ char temp[STRING_SIZE], *buf;
-+ struct stat info;
-+ uid_t ruid, euid;
-+ gid_t rgid, egid;
-+
-+
-+ /* setuid protection */
-+ ruid = getuid();
-+ euid = geteuid();
-+ rgid = getgid();
-+ egid = getegid();
-+ if ( (ruid!=euid) || (ruid==0) || (euid==0) || (rgid!=egid) || (rgid==0) || (egid==0) ) {
-+ OPENLOG;
-+ syslog(LOG_ERR, "setuid/setgid violation!");
-+ CLOSELOG;
-+ printf("ibsh: setuid/setgid violation!! exiting...\n");
-+#ifdef DEBUG
-+ printf("ruid: %d;euid: %d;rgid: %d;egid: %d\n", ruid,euid,rgid,egid);
-+#endif
-+ exit(0);
-+ }
-+
-+ /* To Do: The code of your application goes here */
-+ /* First part: */
-+ /* Get essential information about the user who got this shell: */
-+ /* first the username, then the user id. Upon this, retrieve the */
-+ /* user's record in the passwd file. */
-+ bzero(&loggedin, sizeof(loggedin));
-+ loggedin.uid = getuid();
-+ loggedin.record = getpwuid(loggedin.uid);
-+ if ( loggedin.record == NULL ) {
-+ loggedin.record = getpwnam(loggedin.uname);
-+ if ( loggedin.record == NULL ) {
-+ openlog(loggedin.uname, LOG_PID, LOG_AUTH);
-+ syslog(LOG_ERR, "Can not obtain user information");
-+ printf("Can not obtain user information\n");
-+ closelog();
-+ exit(0);
-+ }
-+ }
-+ strncpy(loggedin.uname, loggedin.record->pw_name, PAM_SIZE);
-+ strncpy(loggedin.udir, loggedin.record->pw_dir, STRING_SIZE);
-+
-+ /* Second part: */
-+ /* Handle some signal catching. Read the configuration files. */
-+ signal( SIGINT, SIG_IGN );
-+ signal( SIGQUIT, SIG_IGN );
-+ signal( SIGTERM, SIG_IGN );
-+ signal( SIGTSTP, SIG_IGN );
-+ LoadConfig();
-+
-+ /* Command mode */
-+ if(argc == 3) {
-+ if ( argv[1][1] == 'c' ) {
-+ if ( CommandOK(argv[2], loggedin.udir, "/", filtered_command) == 1) {
-+ exitcode = hhsystem(filtered_command);
-+ OPENLOG;
-+ syslog(LOG_INFO, "command %s ordered, command %s has been executed.",
-+ argv[2], filtered_command);
-+ printf("command %s ordered, command %s has been executed.\n",
-+ argv[2], filtered_command);
-+ CLOSELOG;
-+ exit(exitcode);
-+ }
-+ printf("CommandOK failed (%s/%s)\n", loggedin.udir, filtered_command);
-+ exit(0);
-+ }
-+ else {
-+ printf("Invalid are (%s)\n", argv[1]);
-+ exit(0);
-+ }
-+ }
-+
-+ OPENLOG;
-+ syslog(LOG_INFO, "user %s has logged in.", loggedin.uname);
-+ CLOSELOG;
-+
-+
-+#ifdef INCLUDE_DELETE_BAD_FILES
-+ DelBadFiles(loggedin.udir);
-+#endif
-+ if ( chdir (loggedin.udir) < 0 )
-+ return -1;
-+
-+
-+ /* Third part: */
-+ /* Start reading and processing the user issued commands. */
-+ /* Split the command by the spaces, filter out anything, */
-+ /* that would allow the user to access files outside the */
-+ /* jail. Filter out multiples and pipes as well. No program */
-+ /* will be allowed to run, unless it is mentioned in the */
-+ /* config files. Files that are created with an extension */
-+ /* that is listed in the other config file, must be deleted! */
-+ for ( ; ; ) {
-+ /* Where is he ? */
-+ if ( getcwd(real_path, STRING_SIZE) == NULL )
-+ return -1;
-+ GetPositionInJail(real_path, loggedin.udir, jail_path);
-+ if ( (strlen(jail_path)) == 0 ) {
-+ strncpy(jail_path, "/", 2);
-+ }
-+ /* We don't want the user to know where he actually is. */
-+ /* This is the prompt! */
-+ printf("[%s]%% ", jail_path);
-+ /* scanf("%s", user_command); */
-+ myscanf(user_command, real_path);
-+ /* Command interpretation and execution. */
-+ if ( (CommandOK(user_command, loggedin.udir, jail_path, filtered_command)) == 0 ) {
-+ printf("Sorry, can't let you do that!\n");
-+ log_attempt(loggedin.uname); /* v0.2a */
-+ continue;
-+ }
-+ /* If the user issued command starts with a shell builtin. */
-+ bzero(temp, strlen(temp));
-+ if ( (buf = strstr(filtered_command, "cd")) != NULL ) {
-+ if ( (strcmp(buf, filtered_command)) == 0 ) {
-+ LTrim3(filtered_command, temp);
-+ if ( (strcmp(temp, real_path)) != 0 ) {
-+ if ( (strcmp(temp, "..")) == 0 ) {
-+ PathMinusOne(jail_path, temp, 1,sizeof(temp));
-+ }
-+ if ( (strcmp(temp, "/")) == 0 ) {
-+ strncpy(temp, loggedin.udir, LINE_SIZE);
-+ }
-+ exitcode = chdir(temp);
-+ if ( exitcode == -1 ) {
-+ printf("ibsh: cd: %s: No such file or directory\n", temp);
-+ }
-+ }
-+ continue;
-+ }
-+ }
-+ else if ( (buf = strstr(filtered_command, "pwd")) != NULL ) {
-+ if ( (strcmp(buf, filtered_command)) == 0 ) {
-+ printf("%s\n", jail_path);
-+ continue;
-+ }
-+ }
-+ else if ( (buf = strstr(filtered_command, "logout")) != NULL ) {
-+ if ( (strcmp(buf, filtered_command)) == 0 ) {
-+ OPENLOG;
-+ syslog(LOG_INFO, "user %s has logged out.", loggedin.uname);
-+ CLOSELOG;
-+ break;
-+ }
-+ }
-+ else if ( (buf = strstr(filtered_command, "exit")) != NULL ) {
-+ if ( (strcmp(buf, filtered_command)) == 0 ) {
-+ OPENLOG;
-+ syslog(LOG_INFO, "user %s has logged out.", loggedin.uname);
-+ printf("user %s has logged out\n", loggedin.uname);
-+ CLOSELOG;
-+ break;
-+ }
-+ }
-+ else {
-+ exitcode = hhsystem(filtered_command);
-+ if ( exitcode < 0 ) {
-+ printf("%s\n", strerror(errno));
-+ }
-+ }
-+ if ( getcwd(real_path, STRING_SIZE) == NULL )
-+ return -1;
-+#ifdef INCLUDE_BAD_FILES
-+ DelBadFiles(loggedin.udir);
-+#endif
-+ if ( chdir (real_path) < 0 )
-+ return 1;
-+ }
-+ return 0;
-+}
-+
-Index: cgcs-users-1.0-r0/Makefile.orig
-===================================================================
---- /dev/null
-+++ cgcs-users-1.0-r0/Makefile.orig
-@@ -0,0 +1,56 @@
-+# This is the makefile for ibsh 0.3e
-+CC = gcc -g -O3
-+OBJECTS = main.o command.o jail.o execute.o config.o misc.o antixploit.o delbadfiles.o
-+
-+all ibsh: ${OBJECTS} ibsh.h
-+ ${CC} -o ibsh ${OBJECTS}
-+
-+main.o: main.c ibsh.h
-+ ${CC} -c main.c
-+
-+command.o: command.c ibsh.h
-+ ${CC} -c command.c
-+
-+jail.o: jail.c ibsh.h
-+ ${CC} -c jail.c
-+
-+execute.o: execute.c ibsh.h
-+ ${CC} -c execute.c
-+
-+config.o: config.c ibsh.h
-+ ${CC} -c config.c
-+
-+misc.o: misc.c ibsh.h
-+ ${CC} -c misc.c
-+
-+antixploit.o: antixploit.c ibsh.h
-+ ${CC} -c antixploit.c
-+
-+delbadfiles.o: delbadfiles.c ibsh.h
-+ ${CC} -c delbadfiles.c
-+
-+ibsh_install:
-+ cp ./ibsh /bin/
-+ mkdir /etc/ibsh
-+ mkdir /etc/ibsh/cmds
-+ mkdir /etc/ibsh/xtns
-+ cp ./globals.cmds /etc/ibsh/
-+ cp ./globals.xtns /etc/ibsh/
-+
-+ibsh_uninstall:
-+ rm -rf /etc/ibsh/globals.cmds
-+ rm -rf /etc/ibsh/globals.xtns
-+ rm -rf /etc/ibsh/cmds/*.*
-+ rm -rf /etc/ibsh/xtns/*.*
-+ rmdir /etc/ibsh/cmds
-+ rmdir /etc/ibsh/xtns
-+ rmdir /etc/ibsh
-+ rm -rf /bin/ibsh
-+
-+clean:
-+ rm -rf ibsh
-+ rm -rf *.o
-+
-+
-+# 13:49 2005.04.06.
-+
-Index: cgcs-users-1.0-r0/README.orig
-===================================================================
---- /dev/null
-+++ cgcs-users-1.0-r0/README.orig
-@@ -0,0 +1,29 @@
-+ Iron Bars SHell - a restricted interactive shell.
-+
-+Overview
-+
-+ For long i have been in the search of a decent restricted shell, but in vain.
-+ The few i found, were really easy to hack, and there were quite a few docs
-+ around on the web about hacking restricted shells with a menu interface.
-+ For my definitions, a restricted shell must not only prevent the user to
-+ escape her jail, but also not to access any files outside the jail.
-+ The system administrator must have total control over the restricted shell.
-+ These are the major features incorporated and realized by ibsh.
-+
-+
-+Features
-+
-+ Please read the changelog.
-+
-+
-+Installation
-+
-+ Read the INSTALL file.
-+
-+
-+Contact
-+ See Authors file.
-+
-+
-+Attila Nagyidai
-+2005.05.23.
-Index: cgcs-users-1.0-r0/Release.orig
-===================================================================
---- /dev/null
-+++ cgcs-users-1.0-r0/Release.orig
-@@ -0,0 +1,17 @@
-+This release introduces minor bugfixes, and important new and renewed features.
-+Erasing evil files in the home directory of the user is incorporated again, with
-+many improvements. First of all: no file will be erased! Only the access to them
-+will be blocked. The extension policy has changed, now ibsh blocks those extensions,
-+that are NOT listed. This goes in sync with the usual method of operation of ibsh.
-+The execute permission of files in the user space, will be removed.
-+New customizing features were added: each user now can have her own commands and
-+extensions file, created and maintained by the system administrator. Some users
-+(employees) may require access to special programs. User configuration files allow
-+this access only those, who need it, not for everybody.
-+Ibsh now scans not only the extensions of files, but the content too! Whatever the permission
-+for a certain file exists, if that contains source code, or is a linux binary, access
-+will be blocked.
-+The absolute path for the users is now limited to 255 characters. Longer, already
-+existing filenames will be renamed.
-+
-+06/04/2005
-Index: cgcs-users-1.0-r0/TODO.orig
-===================================================================
---- /dev/null
-+++ cgcs-users-1.0-r0/TODO.orig
-@@ -0,0 +1,10 @@
-+TODO
-+
-+ - tab completion.
-+ - shell variables.
-+ - some changes to the prompt, maybe variable prompt.
-+ - history
-+ - to be able to use corporate, or other large/complicated programs in a safe
-+ working environment, yet be able to share files/work with others.
-+
-+2005.05.23.
+++ /dev/null
-# Add any commands the user may execute. Even shell commands.
-# You have to allow logout and/or exit, so the user can logout!
-# cd and pwd should also be allowed. Note: other shell builtin
-# commands are not yet implemented!
-touch
-vi
-
+++ /dev/null
-# Add any extension the user may use.
-.doc
-.txt
-
+++ /dev/null
-# Add any commands the user may execute. Even shell commands.
-# You have to allow logout and/or exit, so the user can logout!
-# cd and pwd should also be allowed. Note: other shell builtin
-# commands are not yet implemented!
-#
-touch
-tar
-scp
-sftp
-ssh
-vi
-
+++ /dev/null
-# Add any extension the user may use.
-.doc
-.txt
-.tgz
-.tar
-
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += " \
- file://${PN}/ibsh-0.3e.patch \
- file://${PN}/ibsh-0.3e-cgcs.patch \
- file://${PN}/ibsh-0.3e-cgcs-copyright.patch \
- file://${PN}/admin.cmds \
- file://${PN}/admin.xtns \
- file://${PN}/LICENSE \
- file://${PN}/operator.cmds \
- file://${PN}/operator.xtns \
- file://${PN}/secadmin.cmds \
- file://${PN}/secadmin.xtns \
- "
-
-do_install_append() {
- cp ${WORKDIR}/${PN}/admin.cmds ${D}/${sysconfdir}/ibsh/cmds/
- cp ${WORKDIR}/${PN}/admin.xtns ${D}/${sysconfdir}/ibsh/xtns/
- cp ${WORKDIR}/${PN}/operator.cmds ${D}/${sysconfdir}/ibsh/cmds/
- cp ${WORKDIR}/${PN}/operator.xtns ${D}/${sysconfdir}/ibsh/xtns/
- cp ${WORKDIR}/${PN}/secadmin.cmds ${D}/${sysconfdir}/ibsh/cmds/
- cp ${WORKDIR}/${PN}/secadmin.xtns ${D}/${sysconfdir}/ibsh/xtns/
-}
-
+++ /dev/null
-DESCRIPTION = "StarlingX KVM Timer Advance Package"
-
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "virt/kvm-timer-advance"
-
-PV = "1.0.0"
-
-LICENSE = "Apache-2.0 & GPL-2.0"
-LIC_FILES_CHKSUM = "file://${STX_METADATA_PATH}/files/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-RDEPENDS_${PN}_append = " \
- systemd \
- bash \
- "
-
-inherit setuptools systemd
-SYSTEMD_PACKAGES += " ${PN}"
-SYSTEMD_SERVICE_${PN} = "kvm_timer_advance_setup.service"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install () {
- install -p -D -m 0755 ${STX_METADATA_PATH}/files/setup_kvm_timer_advance.sh \
- ${D}/${bindir}/setup_kvm_timer_advance.sh
- install -p -D -m 444 ${STX_METADATA_PATH}/files/kvm_timer_advance_setup.service \
- ${D}/${systemd_system_unitdir}/kvm_timer_advance_setup.service
-}
+++ /dev/null
-DESCRIPTION = " \
-A shell script to tell if your system is vulnerable against the several \
-\"speculative execution\" CVEs that were made public since 2018. \
-"
-
-SUMMARY = "Spectre and Meltdown Checker"
-HOMEPAGE = "https://github.com/speed47/spectre-meltdown-checker"
-LICENSE = "GPL-3.0"
-LIC_FILES_CHKSUM = "file://spectre-meltdown-checker.sh;beginline=1;endline=5;md5=0113e62a200ec9a5f5ebdd7ad4329133"
-
-SRCREV = "3d21dae16864f8e8262d7a35bd4de300452b274d"
-SRCNAME = "spectre-meltdown-checker"
-BRANCH = "master"
-PROTOCOL = "https"
-PV = "v0.43+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/speed47/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-do_install() {
- install -d -p -m 0755 ${D}/${sbindir}
- install -m 0644 ${S}/${SRCNAME}.sh ${D}/${sbindir}/${SRCNAME}.sh
-}
+++ /dev/null
-DESCRIPTION = "The source recipe for StarlingX Integration repo"
-
-inherit stx-source
-
-STX_REPO = "integ"
-
-BRANCH = "r/stx.5.0"
-SRCREV = "821de96615cb6f93fbc39f4baaa769029328d34d"
+++ /dev/null
-From 0db72ac0c57a9f15ae6999e4ccf85a9db1e752fd Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Thu, 27 Jun 2019 22:25:15 -0700
-Subject: [PATCH] Use LDFLAGS when linking and pass flags down to submakes
-
----
- Makefile | 27 +++++++++++++++------------
- alarm/Makefile | 2 +-
- fsmon/Makefile | 2 +-
- fsync/Makefile | 2 +-
- heartbeat/Makefile | 7 +++++--
- hostw/Makefile | 2 +-
- hwmon/Makefile | 2 +-
- lmon/Makefile | 2 +-
- maintenance/Makefile | 4 ++--
- mtclog/Makefile | 2 +-
- pmon/Makefile | 2 +-
- 11 files changed, 30 insertions(+), 24 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index a9ec0e2..8c256f1 100755
---- a/Makefile
-+++ b/Makefile
-@@ -8,18 +8,21 @@ VER=1
- VER_MJR=1
-
- build:
-- (cd public ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
-- (cd common ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
-- (cd alarm ; make build VER=$(VER) VER_MJR=$(VER_MJR))
-- (cd heartbeat ; make build VER=$(VER) VER_MJR=$(VER_MJR))
-- (cd maintenance ; make build VER=$(VER) VER_MJR=$(VER_MJR))
-- (cd hwmon ; make build VER=$(VER) VER_MJR=$(VER_MJR))
-- (cd mtclog ; make build VER=$(VER) VER_MJR=$(VER_MJR))
-- (cd lmon ; make build VER=$(VER) VER_MJR=$(VER_MJR))
-- (cd pmon ; make build VER=$(VER) VER_MJR=$(VER_MJR))
-- (cd fsmon ; make build VER=$(VER) VER_MJR=$(VER_MJR))
-- (cd hostw ; make build VER=$(VER) VER_MJR=$(VER_MJR))
-- (cd fsync ; make build VER=$(VER) VER_MJR=$(VER_MJR))
-+ ( \
-+ cd public;\
-+ make -e CCFLAGS="$(CCFLAGS) -fPIC" LDFLAGS="$(LDFLAGS) -shared" INCLUDES="$(INCLUDES)" lib VER=$(VER) VER_MJR=$(VER_MJR) \
-+ )
-+ (cd common ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" lib VER=$(VER) VER_MJR=$(VER_MJR))
-+ (cd alarm ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
-+ (cd heartbeat ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
-+ (cd maintenance ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
-+ (cd hwmon ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
-+ (cd mtclog ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
-+ (cd lmon ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
-+ (cd pmon ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
-+ (cd fsmon ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
-+ (cd hostw ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
-+ (cd fsync ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
-
- clean:
- @( cd common ; make clean )
-diff --git a/alarm/Makefile b/alarm/Makefile
-index a27b0fb..cff233c 100755
---- a/alarm/Makefile
-+++ b/alarm/Makefile
-@@ -43,7 +43,7 @@ library:
- ar rcs libalarm.a alarm.o $(EXTRAARFLAGS)
-
- process: $(OBJS)
-- $(CXX) $(CCFLAGS) ${OBJS} -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o mtcalarmd
-+ $(CXX) $(CCFLAGS) $(LDFLAGS) ${OBJS} -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o mtcalarmd
-
- clean_bins:
- @rm -v -f $(BINS)
-diff --git a/fsmon/Makefile b/fsmon/Makefile
-index b53cce0..33256ab 100644
---- a/fsmon/Makefile
-+++ b/fsmon/Makefile
-@@ -28,7 +28,7 @@ else
- endif
-
- build: clean static_analysis $(OBJS)
-- $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o fsmond
-+ $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o fsmond
-
- common:
- ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
-diff --git a/fsync/Makefile b/fsync/Makefile
-index b041f15..85c1543 100644
---- a/fsync/Makefile
-+++ b/fsync/Makefile
-@@ -16,7 +16,7 @@ all: build
- $(CC) $(INCLUDES) $(CCFLAGS) $(EXTRACCFLAGS) -c $< -o $@
-
- build: $(OBJS)
-- $(CC) $(OBJS) $(LDLIBS) -o fsync
-+ $(CC) $(CCFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) -o fsync
-
- clean:
- @rm -v -f $(OBJS) fsync
-diff --git a/heartbeat/Makefile b/heartbeat/Makefile
-index a625f20..b8deda7 100755
---- a/heartbeat/Makefile
-+++ b/heartbeat/Makefile
-@@ -33,8 +33,11 @@ endif
- all: static_analysis common agent client
-
- build: static_analysis $(OBJS)
-- $(CXX) $(CCFLAGS) hbsAlarm.o hbsAgent.o hbsUtil.o hbsCluster.o hbsStubs.o ../common/nodeClass.o -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o hbsAgent
-- $(CXX) $(CCFLAGS) hbsClient.o hbsPmon.o hbsUtil.o -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o hbsClient
-+ $(CXX) $(CCFLAGS) $(LDFLAGS) \
-+ hbsAlarm.o hbsAgent.o hbsUtil.o hbsCluster.o hbsStubs.o ../common/nodeClass.o -L../public -L../alarm \
-+ $(LDLIBS) $(EXTRALDFLAGS) -o hbsAgent
-+
-+ $(CXX) $(CCFLAGS) $(LDFLAGS) hbsClient.o hbsPmon.o hbsUtil.o -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o hbsClient
-
- common:
- ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
-diff --git a//hostw/Makefile b/hostw/Makefile
-index d72708c..af18059 100755
---- a/hostw/Makefile
-+++ b/hostw/Makefile
-@@ -28,7 +28,7 @@ else
- endif
-
- build: clean static_analysis $(OBJS)
-- $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o hostwd
-+ $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o hostwd
-
- common:
- ( cd ../common ; make clean ; make -j1 lib VER=$(VER) VER_MJR=$(VER_MJR))
-diff --git a/hwmon/Makefile b/hwmon/Makefile
-index 6d7cee3..c168c43 100644
---- a/hwmon/Makefile
-+++ b/hwmon/Makefile
-@@ -45,7 +45,7 @@ else
- endif
-
- build: clean static_analysis $(OBJS)
-- $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o $(BIN)
-+ $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o $(BIN)
-
- common:
- ( cd ../common ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
-diff --git a/lmon/Makefile b/lmon/Makefile
-index 9e328a4..a1a8519 100755
---- a/lmon/Makefile
-+++ b/lmon/Makefile
-@@ -29,7 +29,7 @@ else
- endif
-
- build: clean static_analysis $(OBJS)
-- $(CXX) $(CCFLAGS) $(OBJS) $(LDPATH) $(LDLIBS) $(EXTRALDFLAGS) -o lmond
-+ $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) $(LDPATH) $(LDLIBS) $(EXTRALDFLAGS) -o lmond
-
- clean:
- @rm -v -f $(OBJ) lmond *.o *.a
-diff --git a/maintenance/Makefile b/maintenance/Makefile
-index 85c2db6..e6a8892 100755
---- a/maintenance/Makefile
-+++ b/maintenance/Makefile
-@@ -77,10 +77,10 @@ common:
- ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
-
- mtcAgent: $(OBJS)
-- $(CXX) $(CONTROL_OBJS) -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o mtcAgent
-+ $(CXX) $(CCFLAGS) $(LDFLAGS) $(CONTROL_OBJS) -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o mtcAgent
-
- mtcClient: $(OBJS)
-- $(CXX) $(COMPUTE_OBJS) -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o mtcClient
-+ $(CXX) $(CCFLAGS) $(LDFLAGS) $(COMPUTE_OBJS) -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o mtcClient
-
- remove_bins:
- @rm -v -f $(BINS)
-diff --git a/mtclog/Makefile b/mtclog/Makefile
-index 1d49aa4..fb513d9 100644
---- a/mtclog/Makefile
-+++ b/mtclog/Makefile
-@@ -30,7 +30,7 @@ else
- endif
-
- build: clean static_analysis $(OBJS)
-- $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o mtclogd
-+ $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o mtclogd
-
- common:
- ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
-diff --git a/pmon/Makefile b/pmon/Makefile
-index f75f2be..c34e204 100755
---- a/pmon/Makefile
-+++ b/pmon/Makefile
-@@ -29,7 +29,7 @@ else
- endif
-
- build: clean static_analysis $(OBJS)
-- $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o pmond
-+ $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o pmond
-
- common:
- ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
---
-2.17.1
-
+++ /dev/null
-From 3060369f60b2dc9e6d138cabd18d7f206c7bb0f5 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Thu, 27 Jun 2019 21:40:34 -0700
-Subject: [PATCH] Use snprintf to avoid overflowing amon.tx_buf
-
----
- public/amon.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/public/amon.c b/public/amon.c
-index b9146a2..941f905 100644
---- a/public/amon.c
-+++ b/public/amon.c
-@@ -257,7 +257,8 @@ int active_monitor_dispatch ( void )
- }
-
- memset ( amon.tx_buf, 0 , AMON_MAX_LEN );
-- sprintf( amon.tx_buf, "%s %8x %d%c", str, magic, seq, '\0' );
-+ if (snprintf( amon.tx_buf, AMON_MAX_LEN, "%s %8x %d%c", str, magic, seq, '\0' ) < 0)
-+ fprintf(stderr,"%s:%d amon.txbuf overflow detected!\n", __func__, __LINE__);
-
- if ( strcmp ( str, amon.name ) )
- {
---
-2.17.1
-
+++ /dev/null
-From 90d95ca75997a935587ff3c774d0f5375c3f505a Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Tue, 9 Jul 2019 12:42:53 -0700
-Subject: [PATCH] mtce-compute dont install empty directory unless needed
-
----
- mtce-compute/src/Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/mtce-compute/src/Makefile b/mtce-compute/src/Makefile
-index 9aea4b0..ed9a8a9 100755
---- a/mtce-compute/src/Makefile
-+++ b/mtce-compute/src/Makefile
-@@ -16,7 +16,6 @@ install:
- # # Compute-Only Init Scripts (source group x)
- install -m 755 -p -D scripts/$(SOURCE1) $(buildroot)/$(_sysconfdir)/init.d/goenabledWorker
- # # Compute-Only Process Monitor Config files (source group 1x)
-- install -m 755 -d $(buildroot)/$(local_etc_pmond)
- # # Compute-Only Go Enabled Test (source group 2x)
- install -m 755 -d $(buildroot)/$(local_etc_goenabledd)
- install -m 755 -p -D scripts/$(SOURCE22) $(buildroot)/$(local_etc_goenabledd)/virt-support-goenabled.sh
---
-2.17.1
-
+++ /dev/null
-From e00a8a4ad31c696d2f5dc866f178af0a9f987c12 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Tue, 9 Jul 2019 13:35:35 -0700
-Subject: [PATCH] mtce-control dont install empty directory unless needed
-
----
- mtce-control/src/Makefile | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/mtce-control/src/Makefile b/mtce-control/src/Makefile
-index aaa3de7..cb225ce 100755
---- a/mtce-control/src/Makefile
-+++ b/mtce-control/src/Makefile
-@@ -27,6 +27,3 @@ install:
- # Controller-Only Heartbeat Service file
- install -m 644 -p -D scripts/$(SOURCE5) $(buildroot)/$(_unitdir)/hbsAgent.service
-
-- # Controller-Only Go Enabled Test
-- install -m 755 -d $(buildroot)/$(local_etc_goenabledd)
--
---
-2.17.1
-
+++ /dev/null
-From 5d180eb6a5b60d75b4b8ba5af265fc973b6776ca Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Tue, 9 Jul 2019 13:51:46 -0700
-Subject: [PATCH] mtce-storage dont install empty directory unless needed
-
----
- mtce-storage/src/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mtce-storage/src/Makefile b/mtce-storage/src/Makefile
-index 842a76c..85c14e0 100755
---- a/mtce-storage/src/Makefile
-+++ b/mtce-storage/src/Makefile
-@@ -12,11 +12,11 @@ install:
- # Storage-Only Init Scripts
- install -m 755 -p -D scripts/$(SOURCE1) $(buildroot)/$(_sysconfdir)/init.d/goenabledStorage
- # Storage-Only Process Monitor Config files
-- install -m 755 -d $(buildroot)/$(local_etc_pmond)
-+ # install -m 755 -d $(buildroot)/$(local_etc_pmond)
- # Storage-Only Go Enabled Tests
-- install -m 755 -d $(buildroot)/$(local_etc_goenabledd)
-+ # install -m 755 -d $(buildroot)/$(local_etc_goenabledd)
- # Storage-Only Services
-- install -m 755 -d $(buildroot)/$(local_etc_servicesd)/storage
-+ # install -m 755 -d $(buildroot)/$(local_etc_servicesd)/storage
- # Install systemd dir
- install -m 644 -p -D scripts/$(SOURCE2) $(buildroot)/$(_unitdir)/goenabled-storage.service
- # for license
---
-2.17.1
-
+++ /dev/null
-diff --git a/alarm/scripts/mtcalarm.init b/alarm/scripts/mtcalarm.init
-index 57f348f..419da8a 100644
---- a/alarm/scripts/mtcalarm.init
-+++ b/alarm/scripts/mtcalarm.init
-@@ -20,7 +20,7 @@
- . /etc/init.d/functions
-
- DAEMON_NAME="mtcalarmd"
--DAEMON="/usr/local/bin/${DAEMON_NAME}"
-+DAEMON="/usr/bin/${DAEMON_NAME}"
- PIDFILE="/var/run/${DAEMON_NAME}.pid"
- PLATFORM_CONF="/etc/platform/platform.conf"
-
-diff --git a/fsmon/scripts/fsmon b/fsmon/scripts/fsmon
-index 6d8abcc..de9da01 100644
---- a/fsmon/scripts/fsmon
-+++ b/fsmon/scripts/fsmon
-@@ -20,7 +20,7 @@
- . /etc/init.d/functions
-
- DAEMON_NAME="fsmond"
--DAEMON="/usr/local/bin/${DAEMON_NAME}"
-+DAEMON="/usr/bin/${DAEMON_NAME}"
- PIDFILE="/var/run/${DAEMON_NAME}.pid"
-
- # Linux Standard Base (LSB) Error Codes
-diff --git a/hostw/scripts/hostw b/hostw/scripts/hostw
-index 82a4aaf..4946092 100644
---- a/hostw/scripts/hostw
-+++ b/hostw/scripts/hostw
-@@ -17,12 +17,12 @@
- # Short-Description: host watchdog daemon
- ### END INIT INFO
-
--# echo "7:3:respawn:/usr/local/bin/hostwd" >> /etc/inittab
-+# echo "7:3:respawn:/usr/bin/hostwd" >> /etc/inittab
-
- . /etc/init.d/functions
-
- DAEMON_NAME="hostwd"
--DAEMON="/usr/local/bin/${DAEMON_NAME}"
-+DAEMON="/usr/bin/${DAEMON_NAME}"
- IFACE=""
-
- if [ ! -e "$DAEMON" ] ; then
-diff --git a/hwmon/scripts/lsb/hwmon b/hwmon/scripts/lsb/hwmon
-index 4596a36..ba459c1 100644
---- a/hwmon/scripts/lsb/hwmon
-+++ b/hwmon/scripts/lsb/hwmon
-@@ -20,7 +20,7 @@
- . /etc/init.d/functions
-
- DAEMON_NAME="hwmond"
--DAEMON="/usr/local/bin/${DAEMON_NAME}"
-+DAEMON="/usr/bin/${DAEMON_NAME}"
- PIDFILE="/var/run/${DAEMON_NAME}.pid"
-
- # Linux Standard Base (LSB) Error Codes
-diff --git a/hwmon/scripts/ocf/hwmon b/hwmon/scripts/ocf/hwmon
-index 14f52a2..b71a77f 100644
---- a/hwmon/scripts/ocf/hwmon
-+++ b/hwmon/scripts/ocf/hwmon
-@@ -45,7 +45,7 @@ OCF_RESKEY_state_default="standby"
- : ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
- : ${OCF_RESKEY_state=${OCF_RESKEY_state_default}}
-
--mydaemon="/usr/local/bin/${OCF_RESKEY_binary}"
-+mydaemon="/usr/bin/${OCF_RESKEY_binary}"
- statusfile="/var/run/${OCF_RESKEY_binary}.info"
-
- #######################################################################
-@@ -157,9 +157,9 @@ hwmond_validate() {
- ocf_log info "hwmond:validate"
- fi
-
-- check_binary "/usr/local/bin/${OCF_RESKEY_binary}"
-- check_binary "/usr/local/bin/mtcAgent"
-- check_binary "/usr/local/bin/mtcClient"
-+ check_binary "/usr/bin/${OCF_RESKEY_binary}"
-+ check_binary "/usr/bin/mtcAgent"
-+ check_binary "/usr/bin/mtcClient"
- check_binary sysinv-api
- check_binary pidof
-
-diff --git a/lmon/scripts/lmon b/lmon/scripts/lmon
-index 6024e16..21538ee 100644
---- a/lmon/scripts/lmon
-+++ b/lmon/scripts/lmon
-@@ -20,7 +20,7 @@
- . /etc/init.d/functions
-
- DAEMON_NAME="lmond"
--DAEMON="/usr/local/bin/${DAEMON_NAME}"
-+DAEMON="/usr/bin/${DAEMON_NAME}"
- IFACE=""
-
- if [ ! -e "$DAEMON" ] ; then
-diff --git a/maintenance/mtcCompMsg.cpp b/maintenance/mtcCompMsg.cpp
-index b5b221e..daaea9b 100755
---- a/maintenance/mtcCompMsg.cpp
-+++ b/maintenance/mtcCompMsg.cpp
-@@ -541,7 +541,7 @@ int mtc_service_command ( mtc_socket_type * sock_ptr, int interface )
- {
- ilog ("Disk wipe in progress (%s)\n", interface_name.c_str());
- daemon_log ( NODE_RESET_FILE, "wipedisk command" );
-- rc = system("/usr/local/bin/wipedisk --force");
-+ rc = system("/usr/bin/wipedisk --force");
- ilog ("Disk wipe complete - Forcing Reboot ...\n");
- rc = system("/usr/bin/systemctl reboot --force");
- exit (0);
-diff --git a/pmon/scripts/pmon b/pmon/scripts/pmon
-index bdc3ab7..4cb813e 100644
---- a/pmon/scripts/pmon
-+++ b/pmon/scripts/pmon
-@@ -17,12 +17,12 @@
- # Short-Description: process Monitor daemon
- ### END INIT INFO
-
--# echo "7:3:respawn:/usr/local/bin/pmond" >> /etc/inittab
-+# echo "7:3:respawn:/usr/bin/pmond" >> /etc/inittab
-
- . /etc/init.d/functions
-
- DAEMON_NAME="pmond"
--DAEMON="/usr/local/bin/${DAEMON_NAME}"
-+DAEMON="/usr/bin/${DAEMON_NAME}"
- IFACE=""
-
- if [ ! -e "$DAEMON" ] ; then
-diff --git a/scripts/hbsAgent b/scripts/hbsAgent
-index d1a2f4f..e8157f0 100755
---- a/scripts/hbsAgent
-+++ b/scripts/hbsAgent
-@@ -43,7 +43,7 @@ OCF_RESKEY_state_default="active"
- : ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
- : ${OCF_RESKEY_state=${OCF_RESKEY_state_default}}
-
--mydaemon="/usr/local/bin/${OCF_RESKEY_binary}"
-+mydaemon="/usr/bin/${OCF_RESKEY_binary}"
- statusfile="/var/run/${OCF_RESKEY_binary}.info"
- virtualhostfile="/var/run/virtual.host"
- facterexec="/usr/bin/facter"
-@@ -148,8 +148,8 @@ hbsAgent_validate() {
- ocf_log info "hbsAgent:validate"
- fi
-
-- check_binary "/usr/local/bin/${OCF_RESKEY_binary}"
-- check_binary "/usr/local/bin/mtcAgent"
-+ check_binary "/usr/bin/${OCF_RESKEY_binary}"
-+ check_binary "/usr/bin/mtcAgent"
- check_binary pidof
-
- if [ ! -f ${OCF_RESKEY_config} ] ; then
-diff --git a/scripts/hbsClient b/scripts/hbsClient
-index 67d7e84..7c412b1 100644
---- a/scripts/hbsClient
-+++ b/scripts/hbsClient
-@@ -20,7 +20,7 @@
- . /etc/init.d/functions
-
- DAEMON_NAME="hbsClient"
--DAEMON="/usr/local/bin/${DAEMON_NAME}"
-+DAEMON="/usr/bin/${DAEMON_NAME}"
- PIDFILE="/var/run/${DAEMON_NAME}.pid"
- IFACE=""
-
-diff --git a/scripts/mtcAgent b/scripts/mtcAgent
-index 6e75ace..885bd3d 100755
---- a/scripts/mtcAgent
-+++ b/scripts/mtcAgent
-@@ -45,7 +45,7 @@ OCF_RESKEY_state_default="standby"
- : ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
- : ${OCF_RESKEY_state=${OCF_RESKEY_state_default}}
-
--mydaemon="/usr/local/bin/${OCF_RESKEY_binary}"
-+mydaemon="/usr/bin/${OCF_RESKEY_binary}"
- statusfile="/var/run/${OCF_RESKEY_binary}.info"
-
- #######################################################################
-@@ -157,10 +157,10 @@ mtcAgent_validate() {
- ocf_log info "mtcAgent:validate"
- fi
-
-- check_binary "/usr/local/bin/${OCF_RESKEY_binary}"
-- check_binary "/usr/local/bin/hbsAgent"
-- check_binary "/usr/local/bin/mtcClient"
-- check_binary "/usr/local/bin/hbsClient"
-+ check_binary "/usr/bin/${OCF_RESKEY_binary}"
-+ check_binary "/usr/bin/hbsAgent"
-+ check_binary "/usr/bin/mtcClient"
-+ check_binary "/usr/bin/hbsClient"
- check_binary sysinv-api
- check_binary pidof
-
-diff --git a/scripts/mtcClient b/scripts/mtcClient
-index 1113689..de4f407 100644
---- a/scripts/mtcClient
-+++ b/scripts/mtcClient
-@@ -20,7 +20,7 @@
- . /etc/init.d/functions
-
- DAEMON_NAME="mtcClient"
--DAEMON="/usr/local/bin/${DAEMON_NAME}"
-+DAEMON="/usr/bin/${DAEMON_NAME}"
- PIDFILE="/var/run/${DAEMON_NAME}.pid"
- PLATFORM_CONF="/etc/platform/platform.conf"
-
-diff --git a/scripts/mtcinit b/scripts/mtcinit
-index 8ff9bbb..4672e2f 100755
---- a/scripts/mtcinit
-+++ b/scripts/mtcinit
-@@ -9,10 +9,10 @@
- . /etc/init.d/functions
-
- MTCCLIENT_NAME="mtcClient"
--MTCCLIENT="/usr/local/bin/${MTCCLIENT_NAME}"
-+MTCCLIENT="/usr/bin/${MTCCLIENT_NAME}"
-
- HBSCLIENT_NAME="hbsClient"
--HBSCLIENT="/usr/local/bin/${HBSCLIENT_NAME}"
-+HBSCLIENT="/usr/bin/${HBSCLIENT_NAME}"
-
- IFACE=""
-
-diff --git a/scripts/mtclog b/scripts/mtclog
-index 80db22a..f904c4d 100644
---- a/scripts/mtclog
-+++ b/scripts/mtclog
-@@ -22,7 +22,7 @@
- . /etc/init.d/functions
-
- DAEMON_NAME="mtclogd"
--DAEMON="/usr/local/bin/${DAEMON_NAME}"
-+DAEMON="/usr/bin/${DAEMON_NAME}"
- PIDFILE="/var/run/${DAEMON_NAME}.pid"
- PLATFORM_CONF="/etc/platform/platform.conf"
-
+++ /dev/null
-From 45298bf5951677433417eb1befc990ba7a70301a Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Thu, 18 Jun 2020 09:53:00 +0800
-Subject: [PATCH] kickstarts: add setting for debain style networking
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- bsp-files/kickstarts/post_net_common.cfg | 6 ++++++
- bsp-files/kickstarts/post_pxeboot_controller.cfg | 6 ++++++
- 2 files changed, 12 insertions(+)
-
-diff --git a/bsp-files/kickstarts/post_net_common.cfg b/bsp-files/kickstarts/post_net_common.cfg
-index 8b854ff..46cdeeb 100755
---- a/bsp-files/kickstarts/post_net_common.cfg
-+++ b/bsp-files/kickstarts/post_net_common.cfg
-@@ -75,6 +75,12 @@ IPV6_AUTOCONF=no
- LINKDELAY=20
- EOF
-
-+ # For Debian style networking settings
-+ cat << EOF >> /etc/network/interfaces
-+auto $mgmt_dev
-+iface $mgmt_dev inet dhcp
-+EOF
-+
- else
-
- # Check whether to use inet or inet6
-diff --git a/bsp-files/kickstarts/post_pxeboot_controller.cfg b/bsp-files/kickstarts/post_pxeboot_controller.cfg
-index 54f7046..2b29a64 100644
---- a/bsp-files/kickstarts/post_pxeboot_controller.cfg
-+++ b/bsp-files/kickstarts/post_pxeboot_controller.cfg
-@@ -64,6 +64,12 @@ ONBOOT=yes
- IPV6_AUTOCONF=no
- EOF
-
-+# For Debian style networking settings
-+cat << EOF >> /etc/network/interfaces
-+auto $mgmt_dev
-+iface $mgmt_dev inet dhcp
-+EOF
-+
- %end
-
- %post --erroronfail
---
-2.7.4
+++ /dev/null
-From 97228a9287bec2049767d175f97226d90b4be943 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Sun, 22 Nov 2020 22:00:58 +0800
-Subject: [PATCH] kickstarts: add vlan setting for debain style networking
-
-Yocto uses debain style for networking, the previous patch
-kickstarts-add-setting-for-debain-style-networking.patch
-has fixed the non-vlan scenario but not for vlan scenario,
-so add vlan settings as well.
-
-Upstream-Status: Inappropriate [poky-stx specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- bsp-files/kickstarts/post_net_common.cfg | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/bsp-files/kickstarts/post_net_common.cfg b/bsp-files/kickstarts/post_net_common.cfg
-index 46cdeeb..c000348 100755
---- a/bsp-files/kickstarts/post_net_common.cfg
-+++ b/bsp-files/kickstarts/post_net_common.cfg
-@@ -135,6 +135,18 @@ VLAN=yes
- LINKDELAY=20
- EOF
-
-+ # For Debian style networking settings
-+ cat << EOF >> /etc/network/interfaces
-+auto $mgmt_dev vlan$mgmt_vlan
-+
-+iface $mgmt_dev inet dhcp
-+
-+iface vlan$mgmt_vlan inet dhcp
-+ vlan-raw-device $mgmt_dev
-+ pre-up /sbin/modprobe -q 8021q
-+EOF
-+
-+
- # Reject DHCPOFFER from DHCP server that doesn't send
- # wrs-install-uuid option
- echo "require wrs-install-uuid;" >>/etc/dhcp/dhclient.conf
---
-2.7.4
-
+++ /dev/null
-From 0b620c4f4936af27d915b0ec809dd2f214f4daa9 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Wed, 10 Jun 2020 10:36:18 +0800
-Subject: [PATCH] kickstarts: adjustment fnd fixes or poky-stx
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- bsp-files/kickstarts/post_common.cfg | 87 +++++++++++++++++-----
- .../kickstarts/post_kernel_aio_and_worker.cfg | 4 +-
- bsp-files/kickstarts/post_kernel_controller.cfg | 4 +-
- bsp-files/kickstarts/post_kernel_storage.cfg | 4 +-
- bsp-files/kickstarts/post_usb_controller.cfg | 3 +-
- bsp-files/kickstarts/pre_common_head.cfg | 33 +++++++-
- bsp-files/kickstarts/pre_pkglist.cfg | 19 +----
- bsp-files/kickstarts/pre_pkglist_lowlatency.cfg | 18 +----
- 8 files changed, 110 insertions(+), 62 deletions(-)
-
-diff --git a/bsp-files/kickstarts/post_common.cfg b/bsp-files/kickstarts/post_common.cfg
-index 48abb74..a166c54 100644
---- a/bsp-files/kickstarts/post_common.cfg
-+++ b/bsp-files/kickstarts/post_common.cfg
-@@ -1,3 +1,55 @@
-+######################################
-+# workarounds or fixes for poky-stx
-+######################################
-+%post --erroronfail
-+
-+# Add extra users and groups
-+SYSADMIN_P="4SuW8cnXFyxsk"
-+groupadd -f -g 345 sys_protected
-+useradd -m -g sys_protected -G root -d /home/sysadmin -p ${SYSADMIN_P} -s /bin/sh sysadmin
-+
-+groupadd -r -g 128 nscd
-+useradd -M -o -r -d / -s /sbin/nologin -c 'NSCD Daemon' -u 28 -g nscd nscd
-+
-+useradd -p '' patching
-+groupadd patching
-+usermod -a -G patching patching
-+
-+useradd -p '' nfv
-+groupadd nfv
-+usermod -a -G nfv nfv
-+
-+usermod -a -G sys_protected sysadmin
-+usermod -a -G sys_protected sysinv
-+usermod -a -G sys_protected www
-+usermod -a -G sys_protected nfv
-+usermod -a -G sys_protected patching
-+usermod -a -G sys_protected haproxy
-+usermod -a -G snmpd fm
-+usermod -P root root
-+
-+# Extend path variable for sysadmin
-+echo 'PATH=/sbin:/usr/sbin:$PATH' >> /home/sysadmin/.bashrc
-+chown sysadmin:sys_protected /home/sysadmin/.bashrc
-+
-+# Avoid duplicate with systemd-fstab-generator
-+sed -i "s|\(^.*/dev/root\)|#\1|" /etc/fstab
-+
-+%end
-+
-+%post --nochroot
-+# installer images for pxe-network-installer
-+mkdir -p /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx
-+cp -P /boot/installer-initrd* /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx/
-+cp /boot/bzImage /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx/installer-bzImage_1.0
-+ln -s installer-bzImage_1.0 /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx/installer-bzImage
-+
-+if [ -f /media/realroot/efi.img ]; then
-+ cp /media/realroot/efi.img /mnt/sysimage/pxeboot/rel-xxxPLATFORM_RELEASExxx/efiboot.img
-+fi
-+
-+%end
-+
- %post --erroronfail
-
- # Source common functions
-@@ -31,25 +83,26 @@ else
- fi
-
- . /etc/platform/platform.conf
--# Configure smart package manager channels
--rm -rf /var/lib/smart
--mkdir /var/lib/smart
--/usr/bin/smart channel -y \
-- --add rpmdb type=rpm-sys name="RPM Database"
--/usr/bin/smart channel -y \
-- --add base type=rpm-md name="Base" baseurl=http://controller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx
--/usr/bin/smart channel -y \
-- --add updates type=rpm-md name="Patches" baseurl=http://controller:${http_port:-8080}/updates/rel-xxxPLATFORM_RELEASExxx
--
--# Configure smart to use rpm --nolinktos option
--/usr/bin/smart config --set rpm-nolinktos=true
--
--# Configure smart to use rpm --nosignature option
--/usr/bin/smart config --set rpm-check-signatures=false
-
- # Delete the CentOS yum repo files
- rm -f /etc/yum.repos.d/CentOS-*
-
-+# Create platform yum repo file
-+mkdir -p /etc/yum.repos.d
-+cat >/etc/yum.repos.d/platform.repo <<EOF
-+[platform-base]
-+name=platform-base
-+baseurl=http://controller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx
-+gpgcheck=0
-+enabled=1
-+
-+[platform-updates]
-+name=platform-updates
-+baseurl=http://controller:${http_port:-8080}/updates/rel-xxxPLATFORM_RELEASExxx
-+gpgcheck=0
-+enabled=1
-+EOF
-+
- # Persist the boot device naming as UDEV rules so that if the network device
- # order changes post-install that we will still be able to DHCP from the
- # correct interface to reach the active controller. For most nodes only the
-@@ -73,7 +126,7 @@ done
- chage -d 0 sysadmin
-
- # Lock the root password
--passwd -l root
-+#passwd -l root
-
- # Enable tmpfs mount for /tmp
- # delete /var/tmp so that it can similinked in
-@@ -81,7 +134,7 @@ rm -rf /var/tmp
- systemctl enable tmp.mount
-
- # Disable automount of /dev/hugepages
--systemctl mask dev-hugepages.mount
-+#systemctl mask dev-hugepages.mount
-
- # Disable firewall
- systemctl disable firewalld
-diff --git a/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg b/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg
-index f228110..f4037fa 100644
---- a/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg
-+++ b/bsp-files/kickstarts/post_kernel_aio_and_worker.cfg
-@@ -95,9 +95,9 @@ fi
- perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub
-
- if [ -d /sys/firmware/efi ] ; then
-- grub2-mkconfig -o /boot/efi/EFI/centos/grub.cfg
-+ grub-mkconfig -o /boot/efi/EFI/centos/grub.cfg
- else
-- grub2-mkconfig -o /boot/grub2/grub.cfg
-+ grub-mkconfig -o /boot/grub/grub.cfg
- fi
-
- %end
-diff --git a/bsp-files/kickstarts/post_kernel_controller.cfg b/bsp-files/kickstarts/post_kernel_controller.cfg
-index a49f835..c076fdc 100644
---- a/bsp-files/kickstarts/post_kernel_controller.cfg
-+++ b/bsp-files/kickstarts/post_kernel_controller.cfg
-@@ -42,9 +42,9 @@ fi
- perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub
-
- if [ -d /sys/firmware/efi ] ; then
-- grub2-mkconfig -o /boot/efi/EFI/centos/grub.cfg
-+ grub-mkconfig -o /boot/efi/EFI/centos/grub.cfg
- else
-- grub2-mkconfig -o /boot/grub2/grub.cfg
-+ grub-mkconfig -o /boot/grub/grub.cfg
- fi
-
- %end
-diff --git a/bsp-files/kickstarts/post_kernel_storage.cfg b/bsp-files/kickstarts/post_kernel_storage.cfg
-index 53bff1b..fb8eac4 100644
---- a/bsp-files/kickstarts/post_kernel_storage.cfg
-+++ b/bsp-files/kickstarts/post_kernel_storage.cfg
-@@ -36,9 +36,9 @@ fi
- perl -pi -e 's/(GRUB_CMDLINE_LINUX=.*)\"/\1'"$KERN_OPTS"'\"/g' /etc/default/grub
-
- if [ -d /sys/firmware/efi ] ; then
-- grub2-mkconfig -o /boot/efi/EFI/centos/grub.cfg
-+ grub-mkconfig -o /boot/efi/EFI/centos/grub.cfg
- else
-- grub2-mkconfig -o /boot/grub2/grub.cfg
-+ grub-mkconfig -o /boot/grub/grub.cfg
- fi
-
- %end
-diff --git a/bsp-files/kickstarts/post_usb_controller.cfg b/bsp-files/kickstarts/post_usb_controller.cfg
-index 788aee5..85ac641 100644
---- a/bsp-files/kickstarts/post_usb_controller.cfg
-+++ b/bsp-files/kickstarts/post_usb_controller.cfg
-@@ -61,8 +61,7 @@ fi
-
- if [ -d $srcdir/Packages ] ; then
- mkdir -p /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx
-- cp -r $srcdir/Packages /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx/Packages
-- cp -r $srcdir/repodata /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx/repodata
-+ cp -r $srcdir/Packages/* /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx/
- cp $srcdir/*.cfg /mnt/sysimage/www/pages/feed/rel-xxxPLATFORM_RELEASExxx
- fi
-
-diff --git a/bsp-files/kickstarts/pre_common_head.cfg b/bsp-files/kickstarts/pre_common_head.cfg
-index 88edab4..d3c1ba9 100644
---- a/bsp-files/kickstarts/pre_common_head.cfg
-+++ b/bsp-files/kickstarts/pre_common_head.cfg
-@@ -46,17 +46,46 @@ echo "bootloader --location=mbr $boot_device_arg --timeout=5 --append=\"$append\
- echo "timezone --nontp --utc UTC" >/tmp/timezone-include
- %end
-
-+##############################################################
-+# pre script for poky-stx
-+##############################################################
-+%pre
-+mkdir -p /run/install/repo
-+cp installer-config/* /run/install/repo/
-+rm -f /run/install/repo/Packages
-+ln -sf /Packages /run/install/repo/Packages
-+%end
-+
-+##############################################################
-+# Main kickstart
-+##############################################################
- #version=DEVEL
- install
- lang en_US.UTF-8
- keyboard us
- %include /tmp/timezone-include
--# set to 'x' so we can use shadow password
--rootpw --iscrypted x
-+# Root password:
-+rootpw --iscrypted $6$ArDcm/wSNLJLT2OP$QdWX6kMUgBVsiibukLBLtLfRDVz0n49BQ1svT7hPEQJASvKnqkEL5zc5kqUMMzXzLrj80z6YX9DmYTD0Ysxn.1
-+
- selinux --disabled
- authconfig --enableshadow --passalgo=sha512
- firewall --service=ssh
-
-+# Use text mode install
-+text
-+
-+# Use CDROM installation media
-+cdrom
-+
-+# Run the Setup Agent on first boot
-+firstboot --enable
-+
-+# System services
-+services --enabled="lvm2-monitor.service"
-+
-+# Do not configure the X Window System
-+skipx
-+
- # The following is the partition information you requested
- # Note that any partitions you deleted are not expressed
- # here so unless you clear all partitions first, this is
-diff --git a/bsp-files/kickstarts/pre_pkglist.cfg b/bsp-files/kickstarts/pre_pkglist.cfg
-index 37fe023..16e4dcf 100644
---- a/bsp-files/kickstarts/pre_pkglist.cfg
-+++ b/bsp-files/kickstarts/pre_pkglist.cfg
-@@ -1,21 +1,4 @@
- %packages
--@core
--@base
---kernel-module-igb-uio-rt
---kernel-module-wrs-avp-rt
---kernel-rt
---kernel-rt-kvm
---kernel-rt-tools
---kernel-rt-tools-libs
---kmod-drbd-rt
---kmod-e1000e-rt
---kmod-i40e-rt
---kmod-ixgbe-rt
---kmod-tpm-rt
---mlnx-ofa_kernel
---mlnx-ofa_kernel-rt
---mlnx-ofa_kernel-rt-modules
---qat16-rt
--xxxPACKAGE_LISTxxx
-+#@^stx-image-aio
- %end
-
-diff --git a/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg b/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg
-index 3af6a39..16e4dcf 100644
---- a/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg
-+++ b/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg
-@@ -1,20 +1,4 @@
- %packages
--@core
--@base
---kernel-module-igb-uio
---kernel-module-wrs-avp
---kernel
---kernel-tools
---kernel-tools-libs
---kmod-drbd
---kmod-e1000e
---kmod-i40e
---kmod-ixgbe
---kmod-tpm
---mlnx-ofa_kernel
---mlnx-ofa_kernel-rt
---mlnx-ofa_kernel-modules
---qat16
--xxxPACKAGE_LISTxxx
-+#@^stx-image-aio
- %end
-
---
-2.7.4
+++ /dev/null
-From 840f382ee691596474966f74bd1be37722bbc91c Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Tue, 9 Jun 2020 20:52:31 +0800
-Subject: [PATCH] mtce-common: do not use which to check CC
-
-Upstream-Status: Inappropriate [OE cross-compile specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- common/Makefile | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/common/Makefile b/common/Makefile
-index e0a5574..d44eef6 100755
---- a/common/Makefile
-+++ b/common/Makefile
-@@ -54,9 +54,7 @@ CCFLAGS = -g -O2 -Wall -Wextra -Werror -std=c++11
- STATIC_ANALYSIS_TOOL = cppcheck
- STATIC_ANALYSIS_TOOL_EXISTS = $(shell [[ -e `which $(STATIC_ANALYSIS_TOOL)` ]] && echo 1 || echo 0)
-
--ifeq (,$(shell which ${CC}))
--CC=g++
--endif
-+CC ?= g++
-
- .cpp.o:
- $(CXX) $(CCFLAGS) $(INCLUDES) $(EXTRACCFLAGS) -c $< -o $@
---
-2.7.4
+++ /dev/null
-diff --git a/mtce-control/src/scripts/hbsAgent.service b/mtce-control/src/scripts/hbsAgent.service
-index de3cb8d..b26690d 100644
---- a/mtce-control/src/scripts/hbsAgent.service
-+++ b/mtce-control/src/scripts/hbsAgent.service
-@@ -5,9 +5,9 @@ Before=pmon.service
-
- [Service]
- Type=forking
--ExecStart=/etc/rc.d/init.d/hbsAgent start
--ExecStop=/etc/rc.d/init.d/hbsAgent start
--PIDFile=/var/run/hbsAgent.pid
-+ExecStart=/etc/init.d/hbsAgent start
-+ExecStop=/etc/init.d/hbsAgent start
-+PIDFile=/run/hbsAgent.pid
- KillMode=process
- SendSIGKILL=no
-
+++ /dev/null
-diff --git a/mtce-control/src/scripts/hbsAgent b/mtce-control/src/scripts/hbsAgent
-index d05177d..13443d0 100644
---- a/mtce-control/src/scripts/hbsAgent
-+++ b/mtce-control/src/scripts/hbsAgent
-@@ -20,7 +20,7 @@
- . /etc/init.d/functions
-
- DAEMON_NAME="hbsAgent"
--DAEMON="/usr/local/bin/${DAEMON_NAME}"
-+DAEMON="/usr/bin/${DAEMON_NAME}"
- PIDFILE="/var/run/${DAEMON_NAME}.pid"
-
- VIRT_TOOL='virt-what'
+++ /dev/null
-From 840f382ee691596474966f74bd1be37722bbc91c Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Tue, 9 Jun 2020 20:52:31 +0800
-Subject: [PATCH] mtce: do not use which to check CC
-
-Upstream-Status: Inappropriate [OE cross-compile specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- common/Makefile | 4 +---
- public/Makefile | 4 +---
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/common/Makefile b/common/Makefile
-index 229a1a3..f797724 100755
---- a/common/Makefile
-+++ b/common/Makefile
-@@ -17,9 +17,7 @@ CCFLAGS = -g -O2 -Wall -Wextra -Werror -std=c++11
- STATIC_ANALYSIS_TOOL = cppcheck
- STATIC_ANALYSIS_TOOL_EXISTS = $(shell [[ -e `which $(STATIC_ANALYSIS_TOOL)` ]] && echo 1 || echo 0)
-
--ifeq (,$(shell which ${CC}))
--CC=g++
--endif
-+CC ?= g++
-
- .cpp.o:
- $(CXX) $(CCFLAGS) $(INCLUDES) $(EXTRACCFLAGS) -c $< -o $@
-diff --git a/public/Makefile b/public/Makefile
-index 403638f..7dd80e4 100644
---- a/public/Makefile
-+++ b/public/Makefile
-@@ -13,9 +13,7 @@ LDFLAGS = -shared
- CFLAGS = -fPIC -g -O2 -Wall -Wextra -Werror
- TARGET_LIB = libamon.so
- lib: build
--ifeq (,$(shell which ${CC}))
--CC=gcc
--endif
-+CC ?= gcc
-
- STATIC_ANALYSIS_TOOL = cppcheck
- STATIC_ANALYSIS_TOOL_EXISTS = $(shell [[ -e `which $(STATIC_ANALYSIS_TOOL)` ]] && echo 1 || echo 0)
---
-2.7.4
+++ /dev/null
-From d233ae2930996102bbdd16085b29058a4d01179c Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Tue, 9 Jun 2020 22:49:56 +0800
-Subject: [PATCH] libamon: add shared option
-
-The -shared option is set in the parent Makefile, but somehow
-it's lost on CentOS, so add it diretly in the target command.
-
-Upstream-Status: Inappropriate [OE cross-compile specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- public/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/public/Makefile b/public/Makefile
-index 7dd80e4..1967a90 100644
---- a/public/Makefile
-+++ b/public/Makefile
-@@ -37,7 +37,7 @@ ${TARGET_LIB}.${VER_MJR}: ${TARGET_LIB}.${VER}
- ln -sf $^ $@
-
- ${TARGET_LIB}.${VER}: $(OBJS)
-- $(CC) ${LDFLAGS} -Wl,-soname,${TARGET_LIB}.${VER_MJR} -o $@ $^
-+ $(CC) ${LDFLAGS} -shared -Wl,-soname,${TARGET_LIB}.${VER_MJR} -o $@ $^
-
- $(SRCS:.c=.d):%.d:%.c
- $(CC) $(CFLAGS) -MM $< >$@
---
-2.7.4
+++ /dev/null
-diff --git a/pmon/pmonHdlr.cpp b/pmon/pmonHdlr.cpp
-index 7b5977d..c1d01b5 100644
---- a/pmon/pmonHdlr.cpp
-+++ b/pmon/pmonHdlr.cpp
-@@ -1245,7 +1245,7 @@ int respawn_process ( process_config_type * ptr )
-
- ilog ("Service:%s\n", ptr->service ? ptr->service : "unknown");
-
-- #define SYSTEMCTL_CMD "/usr/bin/systemctl"
-+ #define SYSTEMCTL_CMD "/bin/systemctl"
- #define RESTART_CMD "restart"
- #define START_CMD "start"
- if ( get_ctrl_ptr()->recovery_method == PMOND_RECOVERY_METHOD__SYSTEMD )
+++ /dev/null
-diff -ruN a/mtce/src/pmon/pmonHdlr.cpp b/mtce/src/pmon/pmonHdlr.cpp
---- a/mtce/src/pmon/pmonHdlr.cpp 2020-05-15 14:41:42.271215598 +0000
-+++ b/mtce/src/pmon/pmonHdlr.cpp 2020-05-18 07:11:16.126154700 +0000
-@@ -1881,10 +1881,7 @@
- * we can turn this into a customer alarm/log.
- * Degrade is acheived by not sending the pulses to the watcher.
- */
-- if ( ctrl_ptr->event_mode == true )
-- {
-- pmon_send_pulse ( );
-- }
-+ pmon_send_pulse ( );
- }
-
- /* Avoid pmond thrashing trying to recover processes during
-@@ -1930,11 +1927,9 @@
- {
- hostwd_port_init();
- }
-- if ( ctrl_ptr->event_mode == true )
-- {
-- pmon_send_hostwd ( );
-- pmonTimer_hostwd.ring = false;
-- }
-+
-+ pmon_send_hostwd ( );
-+ pmonTimer_hostwd.ring = false;
- }
-
- /* Run Get Events by audit timer */
+++ /dev/null
-DESCRIPTION = "stx-metal"
-
-STABLE = "starlingx/master"
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCNAME = "metal"
-SRCREV = "be3cf4eeb50eef55910cf9c73ea47c168005ad64"
-SRCREV_opendev = "be3cf4eeb50eef55910cf9c73ea47c168005ad64"
-DESTSUFFIX = "${PN}-${PV}"
-PV = "1.0.0"
-
-SRC_URI = " \
- git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH};destsuffix=${DESTSUFFIX};subpath=${SUBPATH0};name=opendev \
- "
-
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
+++ /dev/null
-require metal-common.inc
-
-SUBPATH0 = "mtce-common/src/"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI += " \
- file://mtce-common-do-not-use-which-to-check-CC.patch \
- "
-
-RDEPENDS_${PN}_append = " \
- util-linux \
- bash \
- systemd \
- dpkg \
- time \
- libevent \
- expect \
- json-c \
- python-rtslib-fb \
- fm-common \
- "
-
-DEPENDS_append = " \
- fm-common \
- libevent \
- openssl \
- json-c \
- "
-
-EXTRA_OEMAKE = ' -e build VER=0 VER_MJR=1 CCFLAGS="${CXXFLAGS} -DBUILDINFO=\"\\\"\$\$(date)\\\"\"" '
-
-do_install_append() {
-
- cd ${S}/
-
- install -m 755 -d ${D}/${libdir}
-
- install -m 644 -p -D daemon/libdaemon.a ${D}/${libdir}
- install -m 644 -p -D common/libcommon.a ${D}/${libdir}
- install -m 644 -p -D common/libthreadUtil.a ${D}/${libdir}
- install -m 644 -p -D common/libbmcUtils.a ${D}/${libdir}
- install -m 644 -p -D common/libpingUtil.a ${D}/${libdir}
- install -m 644 -p -D common/libnodeBase.a ${D}/${libdir}
- install -m 644 -p -D common/libregexUtil.a ${D}/${libdir}
- install -m 644 -p -D common/libhostUtil.a ${D}/${libdir}
-
- # mtce-common headers required to bring in nodeBase.h
- install -m 755 -d ${D}/${includedir}
- install -m 755 -d ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/fitCodes.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/logMacros.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/returnCodes.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/nodeTimers.h ${D}/${includedir}/mtce-common
-
- # mtce-common headers required to build mtce-guest
- install -m 644 -p -D common/hostClass.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/httpUtil.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/jsonUtil.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/msgClass.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/nodeBase.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/nodeEvent.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/nodeMacro.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/nodeUtil.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/timeUtil.h ${D}/${includedir}/mtce-common
-
- # mtce-daemon headers required to build mtce-guest
- install -m 755 -d ${D}/${includedir}/mtce-daemon
- install -m 644 -p -D daemon/daemon_ini.h ${D}/${includedir}/mtce-daemon
- install -m 644 -p -D daemon/daemon_common.h ${D}/${includedir}/mtce-daemon
- install -m 644 -p -D daemon/daemon_option.h ${D}/${includedir}/mtce-daemon
-
- # remaining mtce-common headers required to build mtce
- install -m 644 -p -D common/alarmUtil.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/hostUtil.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/ipmiUtil.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/redfishUtil.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/bmcUtil.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/nlEvent.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/pingUtil.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/regexUtil.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/threadUtil.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/tokenUtil.h ${D}/${includedir}/mtce-common
- install -m 644 -p -D common/secretUtil.h ${D}/${includedir}/mtce-common
-}
+++ /dev/null
-require metal-common.inc
-
-SUBPATH0 = "mtce-compute/src/"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI += "file://0001-mtce-compute-dont-install-empty-directory-unless-nee.patch;striplevel=3"
-
-RDEPENDS_${PN}_append += " \
- bash \
- systemd \
- qemu \
- "
-
-inherit systemd
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "goenabled-worker.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install() {
- cd ${S}/
- oe_runmake -e buildroot=${D} \
- _sysconfdir=${sysconfdir} _unitdir=${systemd_system_unitdir} _datarootdir=${datadir} \
- install
-}
-
-FILES_${PN}_append = " ${datadir}/licenses/mtce-compute-1.0/LICENSE"
+++ /dev/null
-require metal-common.inc
-
-SUBPATH0 = "mtce-control/src/"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI += "file://0001-mtce-control-dont-install-empty-directory-unless-nee.patch;striplevel=3 \
- file://mtce-control-fix-hardcoded-path-for-hbsAgent.patch;striplevel=3 \
- file://mtce-control-adjust-unit-file-paths.patch;striplevel=3 \
- "
-
-RDEPENDS_${PN}_append = " \
- bash \
- systemd \
- lighttpd \
- qemu \
- "
-
-inherit systemd
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "hbsAgent.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install() {
- cd ${S}
- oe_runmake buildroot=${D} \
- _sysconfdir=${sysconfdir} _unitdir=${systemd_system_unitdir} _datarootdir=${datadir} \
- install
-}
-
-FILES_${PN}_append = " ${datadir}/licenses/mtce-control-1.0/LICENSE"
-
+++ /dev/null
-require metal-common.inc
-
-SUBPATH0 = "mtce-storage/src/"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI += "file://0001-mtce-storage-dont-install-empty-directory-unless-nee.patch;striplevel=3"
-
-RDEPENDS_${PN}_append = " \
- bash \
- systemd \
- "
-
-inherit systemd
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "goenabled-storage.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install() {
- cd ${S}
- oe_runmake buildroot=${D} \
- _sysconfdir=${sysconfdir} _unitdir=${systemd_system_unitdir} _datarootdir=${datadir} \
- install
-}
-
-
-FILES_${PN}_append = " ${datadir}/licenses/mtce-storage-1.0/LICENSE"
-
+++ /dev/null
-require metal-common.inc
-
-SUBPATH0 = "mtce/src/"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-
-SRC_URI += " \
- file://0001-mtce-avoid-overflowing-amon.tx_buf.patch \
- file://0001-mtce-Use-LDFLAGS-when-linking.patch \
- file://0002-mtce-Adjust-paths.patch \
- file://mtce-set-systemctl-path.patch \
- file://pmon_send_pulse.patch;striplevel=3 \
- file://mtce-do-not-use-which-to-check-CC.patch \
- file://mtce-libamon-add-shared-option.patch \
- "
-
-PACKAGES += " ${PN}-pmon"
-PACKAGES += " ${PN}-hwmon"
-PACKAGES += " ${PN}-hostw"
-PACKAGES += " ${PN}-lmon"
-
-DEPENDS_append = " mtce-common"
-
-RDEPENDS_${PN}-pmon_append = " \
- bash \
- systemd \
- dpkg \
- fm-common \
- libevent \
- json-c \
- python-rtslib-fb \
- expect \
- util-linux \
- ipmitool \
- "
-
-RDEPENDS_${PN}_append = " \
- mtce-pmon \
- python-redfishtool \
- "
-
-inherit systemd
-SYSTEMD_PACKAGES += "${PN}-pmon"
-SYSTEMD_SERVICE_${PN}-pmon = "pmon.service"
-SYSTEMD_AUTO_ENABLE_${PN}-pmon = "enable"
-
-SYSTEMD_PACKAGES += "${PN}-hwmon"
-SYSTEMD_SERVICE_${PN}-hwmon = "hwmon.service"
-SYSTEMD_AUTO_ENABLE_${PN}-hwmon = "disable"
-
-SYSTEMD_PACKAGES += "${PN}-hostw"
-SYSTEMD_SERVICE_${PN}-hostw = "hostw.service"
-SYSTEMD_AUTO_ENABLE_${PN}-hostw = "enable"
-
-
-SYSTEMD_PACKAGES += "${PN}-lmon"
-SYSTEMD_SERVICE_${PN}-hostw = "lmon.service"
-SYSTEMD_AUTO_ENABLE_${PN}-lmon = "enable"
-
-SYSTEMD_PACKAGES += "${PN}"
-SYSTEMD_SERVICE_${PN} = " \
- hwclock.service \
- fsmon.service \
- mtcClient.service \
- hbsClient.service \
- mtclog.service \
- goenabled.service \
- mtcalarm.service \
- runservices.service \
- "
-SYSTEMD_AUTO_ENABLE_${PN}-hostw= "enable"
-
-EXTRA_OEMAKE = ' -e VER=1 VER_MJR=1 INCLUDES=" -I. -I../alarm -I../heartbeat -I../maintenance \
- -I../hostw -I../public -I../smash -I../common -I../hwmon \
- -I${STAGING_INCDIR}/mtce-common/ -I${STAGING_INCDIR}/mtce-daemon" \
- CCFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" '
-
-
-
-MAJOR = "${@d.getVar('PV').split('.')[0]}"
-MINOR = "${@d.getVar('PV').split('.')[1]}"
-do_install() {
-
- cd ${S}/
- install -m 755 -d ${D}/${bindir}
- install -m 755 -d ${D}/${sbindir}
- install -m 755 -d ${D}/${libdir}
- install -m 755 -d ${D}/${libdir}/ocf/resource.d/platform
- install -m 755 -d ${D}/${systemd_system_unitdir}
-
- install -m 755 -d ${D}/${sysconfdir}
- install -m 755 -d ${D}/${sysconfdir}/mtc/tmp
- install -m 755 -d ${D}/${sysconfdir}/bmc/server_profiles.d
- install -m 755 -d ${D}/${sysconfdir}/init.d
- install -m 755 -d ${D}/${sysconfdir}/pmon.d
- install -m 755 -d ${D}/${sysconfdir}/logrotate.d
-
- install -m 755 -d ${D}/${sysconfdir}/services.d
- install -m 750 -d ${D}/${sysconfdir}/services.d/controller
- install -m 750 -d ${D}/${sysconfdir}/services.d/worker
- install -m 750 -d ${D}/${sysconfdir}/services.d/storage
-
- install -m 755 -p -D scripts/mtcAgent ${D}/${libdir}/ocf/resource.d/platform
- install -m 755 -p -D hwmon/scripts/ocf/hwmon ${D}/${libdir}/ocf/resource.d/platform
-
- # Config files
- install -m 644 -p -D scripts/mtc.ini ${D}/${sysconfdir}/mtc.ini
- install -m 644 -p -D scripts/mtc.conf ${D}/${sysconfdir}/mtc.conf
- install -m 644 -p -D fsmon/scripts/fsmond.conf ${D}/${sysconfdir}/mtc/fsmond.conf
- install -m 644 -p -D hwmon/scripts/hwmond.conf ${D}/${sysconfdir}/mtc/hwmond.conf
- install -m 644 -p -D pmon/scripts/pmond.conf ${D}/${sysconfdir}/mtc/pmond.conf
- install -m 644 -p -D lmon/scripts/lmond.conf ${D}/${sysconfdir}/mtc/lmond.conf
- install -m 644 -p -D hostw/scripts/hostwd.conf ${D}/${sysconfdir}/mtc/hostwd.conf
-
- install -m 644 -p -D scripts/sensor_hp360_v1_ilo_v4.profile ${D}/${sysconfdir}/bmc/server_profiles.d/
- install -m 644 -p -D scripts/sensor_hp380_v1_ilo_v4.profile ${D}/${sysconfdir}/bmc/server_profiles.d/
- install -m 644 -p -D scripts/sensor_quanta_v1_ilo_v4.profile ${D}/${sysconfdir}/bmc/server_profiles.d/
-
-
- # binaries
- install -m 755 -p -D maintenance/mtcAgent ${D}/${bindir}/mtcAgent
- install -m 755 -p -D maintenance/mtcClient ${D}/${bindir}/mtcClient
- install -m 755 -p -D heartbeat/hbsAgent ${D}/${bindir}/hbsAgent
- install -m 755 -p -D heartbeat/hbsClient ${D}/${bindir}/hbsClient
- install -m 755 -p -D pmon/pmond ${D}/${bindir}/pmond
- install -m 755 -p -D lmon/lmond ${D}/${bindir}/lmond
- install -m 755 -p -D pmon/pmond ${D}/${bindir}/pmond
- install -m 755 -p -D lmon/lmond ${D}/${bindir}/lmond
- install -m 755 -p -D hostw/hostwd ${D}/${bindir}/hostwd
- install -m 755 -p -D fsmon/fsmond ${D}/${bindir}/fsmond
- install -m 755 -p -D hwmon/hwmond ${D}/${bindir}/hwmond
- install -m 755 -p -D mtclog/mtclogd ${D}/${bindir}/mtclogd
- install -m 755 -p -D alarm/mtcalarmd ${D}/${bindir}/mtcalarmd
- install -m 755 -p -D scripts/wipedisk ${D}/${bindir}/wipedisk
- install -m 755 -p -D fsync/fsync ${D}/${sbindir}/fsync
- install -m 700 -p -D pmon/scripts/pmon-restart ${D}/${sbindir}/pmon-restart
- install -m 700 -p -D pmon/scripts/pmon-start ${D}/${sbindir}/pmon-start
- install -m 700 -p -D pmon/scripts/pmon-stop ${D}/${sbindir}/pmon-stop
-
- # init script files
- install -m 755 -p -D scripts/mtcClient ${D}/${sysconfdir}/init.d/mtcClient
- install -m 755 -p -D scripts/hbsClient ${D}/${sysconfdir}/init.d/hbsClient
- install -m 755 -p -D hwmon/scripts/lsb/hwmon ${D}/${sysconfdir}/init.d/hwmon
- install -m 755 -p -D fsmon/scripts/fsmon ${D}/${sysconfdir}/init.d/fsmon
- install -m 755 -p -D scripts/mtclog ${D}/${sysconfdir}/init.d/mtclog
- install -m 755 -p -D pmon/scripts/pmon ${D}/${sysconfdir}/init.d/pmon
- install -m 755 -p -D lmon/scripts/lmon ${D}/${sysconfdir}/init.d/lmon
- install -m 755 -p -D hostw/scripts/hostw ${D}/${sysconfdir}/init.d/hostw
- install -m 755 -p -D alarm/scripts/mtcalarm.init ${D}/${sysconfdir}/init.d/mtcalarm
- # install -m 755 -p -D scripts/config ${D}/${sysconfdir}/init.d/config
-
- # TODO: Init hack. Should move to proper module
- install -m 755 -p -D scripts/hwclock.sh ${D}/${sysconfdir}/init.d/hwclock.sh
- install -m 644 -p -D scripts/hwclock.service ${D}/${systemd_system_unitdir}/hwclock.service
-
-
- # systemd service files
- install -m 644 -p -D fsmon/scripts/fsmon.service ${D}/${systemd_system_unitdir}/fsmon.service
- install -m 644 -p -D hwmon/scripts/hwmon.service ${D}/${systemd_system_unitdir}/hwmon.service
- install -m 644 -p -D pmon/scripts/pmon.service ${D}/${systemd_system_unitdir}/pmon.service
- install -m 644 -p -D hostw/scripts/hostw.service ${D}/${systemd_system_unitdir}/hostw.service
- install -m 644 -p -D scripts/mtcClient.service ${D}/${systemd_system_unitdir}/mtcClient.service
- install -m 644 -p -D scripts/hbsClient.service ${D}/${systemd_system_unitdir}/hbsClient.service
- install -m 644 -p -D scripts/mtclog.service ${D}/${systemd_system_unitdir}/mtclog.service
- install -m 644 -p -D scripts/hbsClient.service ${D}/${systemd_system_unitdir}/hbsClient.service
- install -m 644 -p -D scripts/mtclog.service ${D}/${systemd_system_unitdir}/mtclog.service
- install -m 644 -p -D scripts/goenabled.service ${D}/${systemd_system_unitdir}/goenabled.service
- install -m 644 -p -D scripts/runservices.service ${D}/${systemd_system_unitdir}/runservices.service
- install -m 644 -p -D alarm/scripts/mtcalarm.service ${D}/${systemd_system_unitdir}/mtcalarm.service
- install -m 644 -p -D lmon/scripts/lmon.service ${D}/${systemd_system_unitdir}/lmon.service
-
- # fix the path for init scripts
- sed -i -e 's|rc.d/||' ${D}/${systemd_system_unitdir}/*.service
-
- # go enabled stuff
- install -m 755 -p -D scripts/goenabled ${D}/${sysconfdir}/init.d/goenabled
-
- # start or stop services test script
- install -m 755 -p -D scripts/mtcTest ${D}/${sysconfdir}/services.d/worker
- install -m 755 -p -D scripts/mtcTest ${D}/${sysconfdir}/services.d/controller
- install -m 755 -p -D scripts/mtcTest ${D}/${sysconfdir}/services.d/storage
- install -m 755 -p -D scripts/runservices ${D}/${sysconfdir}/init.d/runservices
-
-
- # test tools
- install -m 755 -p -D scripts/dmemchk.sh ${D}/${sbindir}
-
- # process monitor config files
- install -m 644 -p -D scripts/mtcClient.conf ${D}/${sysconfdir}/pmon.d/mtcClient.conf
- install -m 644 -p -D scripts/hbsClient.conf ${D}/${sysconfdir}/pmon.d/hbsClient.conf
- install -m 644 -p -D pmon/scripts/acpid.conf ${D}/${sysconfdir}/pmon.d/acpid.conf
- install -m 644 -p -D pmon/scripts/sshd.conf ${D}/${sysconfdir}/pmon.d/sshd.conf
- install -m 644 -p -D pmon/scripts/syslog-ng.conf ${D}/${sysconfdir}/pmon.d/syslog-ng.conf
- install -m 644 -p -D pmon/scripts/nslcd.conf ${D}/${sysconfdir}/pmon.d/nslcd.conf
- install -m 644 -p -D pmon/scripts/syslog-ng.conf ${D}/${sysconfdir}/pmon.d/syslog-ng.conf
- install -m 644 -p -D pmon/scripts/nslcd.conf ${D}/${sysconfdir}/pmon.d/nslcd.conf
- install -m 644 -p -D fsmon/scripts/fsmon.conf ${D}/${sysconfdir}/pmon.d/fsmon.conf
- install -m 644 -p -D scripts/mtclogd.conf ${D}/${sysconfdir}/pmon.d/mtclogd.conf
- install -m 644 -p -D alarm/scripts/mtcalarm.pmon.conf ${D}/${sysconfdir}/pmon.d/mtcalarm.conf
- install -m 644 -p -D lmon/scripts/lmon.pmon.conf ${D}/${sysconfdir}/pmon.d/lmon.conf
-
- # log rotation
- install -m 644 -p -D scripts/mtce.logrotate ${D}/${sysconfdir}/logrotate.d/mtce.logrotate
- install -m 644 -p -D hostw/scripts/hostw.logrotate ${D}/${sysconfdir}/logrotate.d/hostw.logrotate
- install -m 644 -p -D pmon/scripts/pmon.logrotate ${D}/${sysconfdir}/logrotate.d/pmon.logrotate
- install -m 644 -p -D lmon/scripts/lmon.logrotate ${D}/${sysconfdir}/logrotate.d/lmon.logrotate
- install -m 644 -p -D fsmon/scripts/fsmon.logrotate ${D}/${sysconfdir}/logrotate.d/fsmon.logrotate
- install -m 644 -p -D hwmon/scripts/hwmon.logrotate ${D}/${sysconfdir}/logrotate.d/hwmon.logrotate
- install -m 644 -p -D alarm/scripts/mtcalarm.logrotate ${D}/${sysconfdir}/logrotate.d/mtcalarm.logrotate
-
- # software development files
- install -m 644 -p -D heartbeat/mtceHbsCluster.h ${D}/${includedir}/mtceHbsCluster.h
- install -m 755 -p -D public/libamon.so.1 ${D}/${libdir}/
- cd ${D}/${libdir} ; ln -s libamon.so.${MAJOR} libamon.so.${MAJOR}.${MINOR}
- cd ${D}/${libdir} ; ln -s libamon.so.${MAJOR} libamon.so
-}
-
-FILES_${PN}-pmon = " \
- ${sbindir}/pmon-restart \
- ${sbindir}/pmon-start \
- ${sbindir}/pmon-stop \
- ${bindir}/pmond \
- ${systemd_system_unitdir}/pmon.service \
- ${sysconfdir}/mtc/pmond.conf \
- ${sysconfdir}/init.d/pmon \
- ${sysconfdir}/logrotate.d/pmon.logrotate \
- "
-
-FILES_${PN}-hwmon = " \
- ${bindir}/hwmond \
- ${sysconfdir}/init.d/hwmon \
- ${libdir}/ocf/resource.d/platform/hwmon \
- ${sysconfdir}/logrotate.d/hwmon.logrotate \
- ${systemd_system_unitdir}/hwmon.service \
- ${sysconfdir}/mtc/hwmond.conf \
- "
-
-FILES_${PN}-hostw = " \
- ${sysconfdir}/mtc/hostwd.conf \
- ${sysconfdir}/logrotate.d/hostw.logrotate \
- ${systemd_system_unitdir}/hostw.service \
- ${sysconfdir}/init.d/hostw \
- ${bindir}/hostwd \
- "
-
-FILES_${PN}-lmon = " \
- ${bindir}/lmond \
- ${sysconfdir}/mtc/lmond.conf \
- ${sysconfdir}/logrotate.d/lmon.logrotate \
- ${sysconfdir}/pmon.d/lmon.conf \
- ${sysconfdir}/init.d/lmon \
- ${systemd_system_unitdir}/lmon.service \
- "
-
-FILES_${PN} = " \
- ${bindir}/mtcAgent \
- ${bindir}/mtcClient \
- ${bindir}/fsmond \
- ${bindir}/hbsAgent \
- ${bindir}/wipedisk \
- ${bindir}/hbsClient \
- ${bindir}/mtcalarmd \
- ${bindir}/mtclogd \
- ${sbindir}/fsync \
- ${sbindir}/dmemchk.sh \
- ${libdir}/ocf/resource.d/platform/mtcAgent \
- ${libdir}/libamon${SOLIBS} \
- ${systemd_system_unitdir}/mtcalarm.service \
- ${systemd_system_unitdir}/goenabled.service \
- ${systemd_system_unitdir}/mtclog.service \
- ${systemd_system_unitdir}/mtcClient.service \
- ${systemd_system_unitdir}/fsmon.service \
- ${systemd_system_unitdir}/hbsClient.service \
- ${systemd_system_unitdir}/hwclock.service \
- ${systemd_system_unitdir}/runservices.service \
- ${sysconfdir}/pmon.d/nslcd.conf \
- ${sysconfdir}/pmon.d/mtclogd.conf \
- ${sysconfdir}/pmon.d/mtcalarm.conf \
- ${sysconfdir}/pmon.d/syslog-ng.conf \
- ${sysconfdir}/pmon.d/acpid.conf \
- ${sysconfdir}/pmon.d/sshd.conf \
- ${sysconfdir}/pmon.d/fsmon.conf \
- ${sysconfdir}/pmon.d/hbsClient.conf \
- ${sysconfdir}/pmon.d/mtcClient.conf \
- ${sysconfdir}/init.d/runservices \
- ${sysconfdir}/init.d/goenabled \
- ${sysconfdir}/init.d/mtcClient \
- ${sysconfdir}/init.d/hwclock.sh \
- ${sysconfdir}/init.d/mtclog \
- ${sysconfdir}/init.d/mtcalarm \
- ${sysconfdir}/init.d/hbsClient \
- ${sysconfdir}/init.d/fsmon \
- ${sysconfdir}/mtc.conf \
- ${sysconfdir}/bmc/server_profiles.d/sensor_hp380_v1_ilo_v4.profile \
- ${sysconfdir}/bmc/server_profiles.d/sensor_hp360_v1_ilo_v4.profile \
- ${sysconfdir}/bmc/server_profiles.d/sensor_quanta_v1_ilo_v4.profile \
- ${sysconfdir}/services.d/worker/mtcTest \
- ${sysconfdir}/services.d/controller/mtcTest \
- ${sysconfdir}/services.d/storage/mtcTest \
- ${sysconfdir}/mtc/fsmond.conf \
- ${sysconfdir}/mtc/tmp/ \
- ${sysconfdir}/mtc.ini \
- ${sysconfdir}/mtc/tmp/ \
- ${sysconfdir}/mtc.ini \
- ${sysconfdir}/logrotate.d/fsmon.logrotate \
- ${sysconfdir}/logrotate.d/mtcalarm.logrotate \
- ${sysconfdir}/logrotate.d/mtce.logrotate \
- "
+++ /dev/null
-require metal-common.inc
-SUBPATH0 = "bsp-files/"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://kickstart/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI += " \
- file://kickstarts-adjustment-and-fixes-or-poky-stx.patch;striplevel=2 \
- file://kickstarts-add-setting-for-debain-style-networking.patch;striplevel=2 \
- file://kickstarts-add-vlan-setting-for-debain-style-network.patch;striplevel=2 \
- "
-
-PACKAGES += " \
- ${PN}-pxeboot \
- ${PN}-extracfgs \
- "
-
-feed_dir = "/www/pages/feed/rel-${STX_REL}"
-
-DEPENDS += "perl-native"
-
-inherit deploy
-
-do_unpack_append() {
- bb.build.exec_func('do_restore_files', d)
-}
-
-do_restore_files() {
- cd ${S}
- git reset ${SRCREV} kickstart/LICENSE
- git checkout kickstart/LICENSE
-}
-
-do_compile () {
- cd ${S}
- ./centos-ks-gen.pl --release ${STX_REL}
-}
-
-do_install_prepend () {
- cd ${S}
- install -d -m 0755 ${D}${feed_dir}
- install -m 0444 generated/* ${D}${feed_dir}/
-
- install -d -m 0755 ${D}/pxeboot
- install -D -m 0444 pxeboot/* ${D}/pxeboot
-
- install -d -m 0755 ${D}/extra_cfgs
- install -D -m 0444 extra_cfgs/* ${D}/extra_cfgs
-}
-
-do_deploy () {
- mkdir -p ${DEPLOYDIR}/stx-kickstarts
- cp -f ${S}/generated/* ${DEPLOYDIR}/stx-kickstarts
-}
-
-addtask do_deploy after do_compile before do_build
-
-FILES_${PN} = "${feed_dir}"
-FILES_${PN}-pxeboot = "/pxeboot"
-FILES_${PN}-extracfgs = "/extra_cfgs"
+++ /dev/null
-require metal-common.inc
-SUBPATH0 = "installer/pxe-network-installer/pxe-network-installer"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-DEPENDS += " syslinux"
-
-RDEPENDS_${PN}_append += " \
- bash \
- syslinux \
- syslinux-chain \
- syslinux-misc \
- syslinux-pxelinux \
- "
-
-do_compile[noexec] = "1"
-
-do_unpack_append() {
- bb.build.exec_func('do_restore_files', d)
-}
-
-do_restore_files() {
- cd ${S}
- git reset ${SRCREV} bsp-files/
- git checkout bsp-files
-}
-
-do_install() {
- install -d -m 0755 ${D}/pxeboot
- install -d -m 0755 ${D}/pxeboot/pxelinux.cfg.files
- install -d -m 0755 ${D}/pxeboot/rel-${STX_REL}
- install -d -m 0755 ${D}/pxeboot/EFI
-
- install -d -m 0755 ${D}/pxeboot/EFI/poky-stx
- ln -fs poky-stx ${D}/pxeboot/EFI/centos
- ln -fs ${libdir}/grub/x86_64-efi ${D}/pxeboot/EFI/poky-stx/
-
- install -d -m 0755 ${D}/${sbindir}
- install -m 755 pxeboot-update.sh ${D}/${sbindir}/pxeboot-update-${STX_REL}.sh
-
- install -m 644 bsp-files/kickstarts/post_clone_iso_ks.cfg ${D}/pxeboot/post_clone_iso_ks.cfg
-
- install -m 644 default ${D}/pxeboot/pxelinux.cfg.files/default
- install -m 644 default.static ${D}/pxeboot/pxelinux.cfg.files/default.static
- install -m 644 centos-pxe-controller-install ${D}/pxeboot/pxelinux.cfg.files/pxe-controller-install-${STX_REL}
- install -m 644 centos-pxe-worker-install ${D}/pxeboot/pxelinux.cfg.files/pxe-worker-install-${STX_REL}
- install -m 644 centos-pxe-smallsystem-install ${D}/pxeboot/pxelinux.cfg.files/pxe-smallsystem-install-${STX_REL}
- install -m 644 centos-pxe-storage-install ${D}/pxeboot/pxelinux.cfg.files/pxe-storage-install-${STX_REL}
- install -m 644 centos-pxe-worker_lowlatency-install ${D}/pxeboot/pxelinux.cfg.files/pxe-worker_lowlatency-install-${STX_REL}
- install -m 644 centos-pxe-smallsystem_lowlatency-install ${D}/pxeboot/pxelinux.cfg.files/pxe-smallsystem_lowlatency-install-${STX_REL}
-
- # UEFI support
- install -m 644 pxe-grub.cfg ${D}/pxeboot/pxelinux.cfg.files/grub.cfg
- install -m 644 pxe-grub.cfg.static ${D}/pxeboot/pxelinux.cfg.files/grub.cfg.static
-
- install -m 644 efi-centos-pxe-controller-install ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-controller-install-${STX_REL}
- install -m 644 efi-centos-pxe-worker-install ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-worker-install-${STX_REL}
- install -m 644 efi-centos-pxe-smallsystem-install ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-smallsystem-install-${STX_REL}
- install -m 644 efi-centos-pxe-storage-install ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-storage-install-${STX_REL}
- install -m 644 efi-centos-pxe-worker_lowlatency-install ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-worker_lowlatency-install-${STX_REL}
- install -m 644 efi-centos-pxe-smallsystem_lowlatency-install ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-smallsystem_lowlatency-install-${STX_REL}
-
- sed -i -e "s/xxxSW_VERSIONxxx/${STX_REL}/g" \
- -e "s/inst.ks/ks/g" \
- -e "s/\(xxxAPPEND_OPTIONSxxx\)/LABEL=initrd-install \1/" \
- ${D}/pxeboot/pxelinux.cfg.files/pxe-* ${D}/pxeboot/pxelinux.cfg.files/efi-pxe-*
-
- # Copy Titanium grub.cfg. It will be used to create ISO on the Controller.
- install -m 0644 bsp-files/grub.cfg ${D}/pxeboot/EFI/
-
- # UEFI bootloader expect the grub.cfg file to be in /pxeboot/ so create a symlink for it
- ln -fs pxelinux.cfg/grub.cfg ${D}/pxeboot/grub.cfg
-}
-
-pkg_postinst_pxe-network-installer() {
- install -m 0644 $D${datadir}/syslinux/menu.c32 $D/pxeboot
- install -m 0644 $D${datadir}/syslinux/vesamenu.c32 $D/pxeboot
- install -m 0644 $D${datadir}/syslinux/chain.c32 $D/pxeboot
- install -m 0644 $D${datadir}/syslinux/ldlinux.c32 $D/pxeboot
- install -m 0644 $D${datadir}/syslinux/linux.c32 $D/pxeboot
- install -m 0644 $D${datadir}/syslinux/libutil.c32 $D/pxeboot
- install -m 0644 $D${datadir}/syslinux/reboot.c32 $D/pxeboot
- install -m 0644 $D${datadir}/syslinux/pxechn.c32 $D/pxeboot
- install -m 0644 $D${datadir}/syslinux/pxelinux.0 $D/pxeboot
-}
-
-FILES_${PN}_append = " \
- /pxeboot \
- ${sbindir}/pxeboot-update-${STX_REL}.sh \
- "
+++ /dev/null
-From c9c3e8ff214360eb2e5d9e7728b7bee8fe771eea Mon Sep 17 00:00:00 2001
-From: Kevin Smith <kevin.smith@windriver.com>
-Date: Tue, 1 Oct 2019 15:25:32 -0400
-Subject: [PATCH 1/1] add makefile
-
----
- Makefile | 43 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 43 insertions(+)
- create mode 100644 Makefile
-
-diff --git a/Makefile b/Makefile
-new file mode 100644
-index 0000000..5cf4447
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,43 @@
-+#
-+# Copyright 2017 The Openstack-Helm Authors.
-+#
-+# Copyright (c) 2018 Wind River Systems, Inc.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+# It's necessary to set this because some environments don't link sh -> bash.
-+SHELL := /bin/bash
-+TASK := build
-+
-+EXCLUDES := helm-toolkit doc tests tools logs tmp
-+CHARTS := helm-toolkit $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
-+
-+.PHONY: $(EXCLUDES) $(CHARTS)
-+
-+all: $(CHARTS)
-+
-+$(CHARTS):
-+ @if [ -d $@ ]; then \
-+ echo; \
-+ echo "===== Processing [$@] chart ====="; \
-+ make $(TASK)-$@; \
-+ fi
-+
-+init-%:
-+ if [ -f $*/Makefile ]; then make -C $*; fi
-+ if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
-+
-+lint-%: init-%
-+ if [ -d $* ]; then helm lint $*; fi
-+
-+build-%: lint-%
-+ if [ -d $* ]; then helm package $*; fi
-+
-+clean:
-+ @echo "Clean all build artifacts"
-+ rm -f */templates/_partials.tpl */templates/_globals.tpl
-+ rm -f *tgz */charts/*tgz */requirements.lock
-+ rm -rf */charts */tmpcharts
-+
-+%:
-+ @:
---
-1.8.3.1
-
+++ /dev/null
-From f79169b8e6a57881952ca4d2c338eeda179471e9 Mon Sep 17 00:00:00 2001
-From: Kevin Smith <kevin.smith@windriver.com>
-Date: Mon, 7 Oct 2019 11:18:05 -0400
-Subject: [PATCH 1/1] Add compatibility for k8s 1.16
-
----
- elasticsearch/templates/_helpers.tpl | 22 ++++++++++++++++++++++
- elasticsearch/templates/ingress.yaml | 2 +-
- elasticsearch/templates/statefulset.yaml | 2 +-
- 3 files changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/elasticsearch/templates/_helpers.tpl b/elasticsearch/templates/_helpers.tpl
-index d651d56..ccfd8c3 100755
---- a/elasticsearch/templates/_helpers.tpl
-+++ b/elasticsearch/templates/_helpers.tpl
-@@ -47,3 +47,25 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
- {{- end -}}
- {{- end -}}
- {{- end -}}
-+
-+{{/*
-+Return the appropriate apiVersion for statefulset.
-+*/}}
-+{{- define "elasticsearch.statefulset.apiVersion" -}}
-+{{- if semverCompare "<1.9-0" .Capabilities.KubeVersion.GitVersion -}}
-+{{- print "apps/v1beta2" -}}
-+{{- else -}}
-+{{- print "apps/v1" -}}
-+{{- end -}}
-+{{- end -}}
-+
-+{{/*
-+Return the appropriate apiVersion for ingress.
-+*/}}
-+{{- define "elasticsearch.ingress.apiVersion" -}}
-+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-+{{- print "extensions/v1beta1" -}}
-+{{- else -}}
-+{{- print "networking.k8s.io/v1beta1" -}}
-+{{- end -}}
-+{{- end -}}
-diff --git a/elasticsearch/templates/ingress.yaml b/elasticsearch/templates/ingress.yaml
-index 39167ca..1715b97 100644
---- a/elasticsearch/templates/ingress.yaml
-+++ b/elasticsearch/templates/ingress.yaml
-@@ -2,7 +2,7 @@
- {{- $fullName := include "uname" . -}}
- {{- $servicePort := .Values.httpPort -}}
- {{- $ingressPath := .Values.ingress.path -}}
--apiVersion: extensions/v1beta1
-+apiVersion: {{ template "elasticsearch.ingress.apiVersion" . }}
- kind: Ingress
- metadata:
- name: {{ $fullName }}
-diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml
-index 004578f..36c7af6 100644
---- a/elasticsearch/templates/statefulset.yaml
-+++ b/elasticsearch/templates/statefulset.yaml
-@@ -1,5 +1,5 @@
- ---
--apiVersion: apps/v1beta1
-+apiVersion: {{ template "elasticsearch.statefulset.apiVersion" . }}
- kind: StatefulSet
- metadata:
- name: {{ template "uname" . }}
---
-1.8.3.1
-
+++ /dev/null
-From a1ea0a2f488660f9cfbab44a4fb8b163e135ebf5 Mon Sep 17 00:00:00 2001
-From: Kevin Smith <kevin.smith@windriver.com>
-Date: Tue, 8 Oct 2019 13:35:57 -0400
-Subject: [PATCH 1/1] use oss image
-
----
- elasticsearch/values.yaml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
-index ccab462..f4fca1f 100755
---- a/elasticsearch/values.yaml
-+++ b/elasticsearch/values.yaml
-@@ -42,7 +42,7 @@ secretMounts: []
- # secretName: elastic-certificates
- # path: /usr/share/elasticsearch/config/certs
-
--image: "docker.elastic.co/elasticsearch/elasticsearch"
-+image: "docker.elastic.co/elasticsearch/elasticsearch-oss"
- imageTag: "7.3.2"
- imagePullPolicy: "IfNotPresent"
-
---
-1.8.3.1
-
+++ /dev/null
-From 560555d13b524eb5209ab42144a3d40989cc2ac7 Mon Sep 17 00:00:00 2001
-From: John Kung <john.kung@windriver.com>
-Date: Tue, 15 Oct 2019 12:56:39 -0400
-Subject: [PATCH 1/1] Update to Elastic 7.4.0 Release
-
----
- CHANGELOG.md | 45 ++++++++++++++++++++--
- elasticsearch/Chart.yaml | 4 +-
- elasticsearch/README.md | 8 ++--
- elasticsearch/examples/default/test/goss.yaml | 2 +-
- elasticsearch/examples/openshift/test/goss.yaml | 2 +-
- elasticsearch/examples/oss/test/goss.yaml | 2 +-
- elasticsearch/examples/upgrade/test/goss.yaml | 2 +-
- elasticsearch/values.yaml | 2 +-
- filebeat/Chart.yaml | 4 +-
- filebeat/README.md | 8 ++--
- filebeat/examples/default/test/goss.yaml | 4 +-
- filebeat/examples/oss/test/goss.yaml | 2 +-
- filebeat/examples/security/test/goss.yaml | 2 +-
- filebeat/values.yaml | 2 +-
- helpers/bumper.py | 4 +-
- helpers/examples.mk | 2 +-
- kibana/Chart.yaml | 4 +-
- kibana/README.md | 8 ++--
- kibana/examples/default/test/goss.yaml | 2 +-
- kibana/values.yaml | 2 +-
- metricbeat/Chart.yaml | 4 +-
- metricbeat/README.md | 8 ++--
- metricbeat/examples/default/test/goss-metrics.yaml | 6 +--
- metricbeat/examples/default/test/goss.yaml | 6 +--
- metricbeat/examples/oss/test/goss-metrics.yaml | 6 +--
- metricbeat/examples/oss/test/goss.yaml | 6 +--
- .../examples/security/test/goss-metrics.yaml | 6 +--
- metricbeat/examples/security/test/goss.yaml | 6 +--
- metricbeat/values.yaml | 2 +-
- 29 files changed, 99 insertions(+), 62 deletions(-)
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index 250d11a..bb2fc24 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -1,9 +1,46 @@
- # Changelog
-
-+## 7.4.0 - 2019/10/01
-+
-+* 7.4.0 as the default stack version
-+* Helm-tester Docker image migrated to Python 3 in [#297](https://github.com/elastic/helm-charts/pull/297) [@jmlrt](https://github.com/jmlrt)
-+* Helm-tester Python dependencies freeze in [#309](https://github.com/elastic/helm-charts/pull/309) [@jmlrt](https://github.com/jmlrt)
-+
-+### Elasticsearch
-+
-+| PR | Author | Title |
-+| ------------------------------------------------------- | -------------------------------------------------- | ----------------------------------------------------------------------------------- |
-+|[#296](https://github.com/elastic/helm-charts/pull/296) | [@jmlrt](https://github.com/jmlrt) | Fix "; \" when there is no additional command in the Makefiles |
-+|[#298](https://github.com/elastic/helm-charts/pull/298) | [@floretan](https://github.com/floretan) | Make it possible to override the endpoint template. |
-+|[#263](https://github.com/elastic/helm-charts/pull/263) | [@Crazybus](https://github.com/Crazybus) | Add working examples for running Elasticsearch and Kibana on OpenShift |
-+|[#301](https://github.com/elastic/helm-charts/pull/301) | [@ravishivt](https://github.com/ravishivt) | Fix bug in keystore initContainer |
-+
-+### Kibana
-+
-+| PR | Author | Title |
-+| ------------------------------------------------------- | -------------------------------------------------- | ----------------------------------------------------------------------------------- |
-+|[#295](https://github.com/elastic/helm-charts/pull/295) | [@karlbohlmark](https://github.com/karlbohlmark) | Allow configuring lifecycle events |
-+|[#263](https://github.com/elastic/helm-charts/pull/263) | [@Crazybus](https://github.com/Crazybus) | Add working examples for running Elasticsearch and Kibana on OpenShift |
-+|[#303](https://github.com/elastic/helm-charts/pull/303) | [@code-chris](https://github.com/code-chris) | Add compatibility for k8s 1.16 and change min k8s version due to ingress apiVersion |
-+
-+
-+### Filebeat
-+
-+| PR | Author | Title |
-+| ------------------------------------------------------- | -------------------------------------------------- | ----------------------------------------------------------------------------------- |
-+|[#304](https://github.com/elastic/helm-charts/pull/304) | [@code-chris](https://github.com/code-chris) | Change min k8s version due to daemonset apiVersion |
-+
-+### Metricbeat
-+
-+| PR | Author | Title |
-+| ------------------------------------------------------- | -------------------------------------------------- | ----------------------------------------------------------------------------------- |
-+|[#305](https://github.com/elastic/helm-charts/pull/305) | [@code-chris](https://github.com/code-chris) | Change min k8s version due to used apiVersions |
-+
-+
- ## 7.3.2 - 2019/09/19
-
- * 7.3.2 as the default stack version
--* Testing of GKE for 1.11 dropped and 1.14 added [#287](https://github.com/elastic/helm-charts/pull/287))
-+* Testing of GKE for 1.11 dropped and 1.14 added [#287](https://github.com/elastic/helm-charts/pull/287)
- * Make helper scripts python3 compatible [#255](https://github.com/elastic/helm-charts/pull/255) [@cclauss](https://github.com/cclauss)
-
- ### Elasticsearch
-@@ -176,14 +213,14 @@
-
- ### Elasticsearch
-
--* [#100](https://github.com/elastic/helm-charts/pull/100) - @kuisathaverat - Remove deprecated zen ping unicast hosts setting
-+* [#100](https://github.com/elastic/helm-charts/pull/100) - @kuisathaverat - Remove deprecated zen ping unicast hosts setting
- * [#114](https://github.com/elastic/helm-charts/pull/114) - @Crazybus - Make persistent volumes optional
- * [#115](https://github.com/elastic/helm-charts/pull/115) - @Crazybus - Added an integration test for upgrading from the previous release and testing rolling upgrades
-
-
- ### Kibana
-
--* [#107](https://github.com/elastic/helm-charts/pull/107) - @Crazybus - Make the health check path configurable to support webroots and other customizations.
-+* [#107](https://github.com/elastic/helm-charts/pull/107) - @Crazybus - Make the health check path configurable to support webroots and other customizations.
-
- ---
- ## 7.0.0-alpha1 - 2019/04/17
-@@ -203,7 +240,7 @@ esMajorVersion: 6
- imageTag: 6.7.1
- ```
-
--If you are upgrading an existing cluster that did not override the default `storageClassName` you will now need to specify the `storageClassName`. This only affects existing clusters and was changed in https://github.com/elastic/helm-charts/pull/94. The advantage of this is that now the helm chart will just use the default storageClassName rather than needing to override it for any providers where it is not called `standard`.
-+If you are upgrading an existing cluster that did not override the default `storageClassName` you will now need to specify the `storageClassName`. This only affects existing clusters and was changed in https://github.com/elastic/helm-charts/pull/94. The advantage of this is that now the helm chart will just use the default storageClassName rather than needing to override it for any providers where it is not called `standard`.
-
- ```
- volumeClaimTemplate:
-diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml
-index cfb40d8..e9d5d24 100755
---- a/elasticsearch/Chart.yaml
-+++ b/elasticsearch/Chart.yaml
-@@ -4,8 +4,8 @@ maintainers:
- - email: helm-charts@elastic.co
- name: Elastic
- name: elasticsearch
--version: 7.3.2
--appVersion: 7.3.2
-+version: 7.4.0
-+appVersion: 7.4.0
- sources:
- - https://github.com/elastic/elasticsearch
- icon: https://helm.elastic.co/icons/elasticsearch.png
-diff --git a/elasticsearch/README.md b/elasticsearch/README.md
-index ff90f09..ab9fe7f 100644
---- a/elasticsearch/README.md
-+++ b/elasticsearch/README.md
-@@ -43,14 +43,14 @@ This chart is tested with the latest supported versions. The currently tested ve
-
- | 6.x | 7.x |
- | ----- | ----- |
--| 6.8.3 | 7.3.2 |
-+| 6.8.3 | 7.4.0 |
-
- Examples of installing older major versions can be found in the [examples](./examples) directory.
-
--While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.3.2` of Elasticsearch it would look like this:
-+While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.4.0` of Elasticsearch it would look like this:
-
- ```
--helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.3.2
-+helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.4.0
- ```
-
- ## Configuration
-@@ -71,7 +71,7 @@ helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.3.2
- | `extraInitContainers` | Templatable string of additional init containers to be passed to the `tpl` function | `""` |
- | `secretMounts` | Allows you easily mount a secret as a file inside the statefulset. Useful for mounting certificates and other secrets. See [values.yaml](./values.yaml) for an example | `[]` |
- | `image` | The Elasticsearch docker image | `docker.elastic.co/elasticsearch/elasticsearch` |
--| `imageTag` | The Elasticsearch docker image tag | `7.3.2` |
-+| `imageTag` | The Elasticsearch docker image tag | `7.4.0` |
- | `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` |
- | `podAnnotations` | Configurable [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) applied to all Elasticsearch pods | `{}` |
- | `labels` | Configurable [label](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) applied to all Elasticsearch pods | `{}` |
-diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml
-index 182981d..49b1994 100644
---- a/elasticsearch/examples/default/test/goss.yaml
-+++ b/elasticsearch/examples/default/test/goss.yaml
-@@ -15,7 +15,7 @@ http:
- status: 200
- timeout: 2000
- body:
-- - '"number" : "7.3.2"'
-+ - '"number" : "7.4.0"'
- - '"cluster_name" : "elasticsearch"'
- - '"name" : "elasticsearch-master-0"'
- - 'You Know, for Search'
-diff --git a/elasticsearch/examples/openshift/test/goss.yaml b/elasticsearch/examples/openshift/test/goss.yaml
-index 275754b..3a7a1b0 100644
---- a/elasticsearch/examples/openshift/test/goss.yaml
-+++ b/elasticsearch/examples/openshift/test/goss.yaml
-@@ -11,7 +11,7 @@ http:
- status: 200
- timeout: 2000
- body:
-- - '"number" : "7.3.0"'
-+ - '"number" : "7.4.0"'
- - '"cluster_name" : "elasticsearch"'
- - '"name" : "elasticsearch-master-0"'
- - 'You Know, for Search'
-diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml
-index 21e268b..1eec5a8 100644
---- a/elasticsearch/examples/oss/test/goss.yaml
-+++ b/elasticsearch/examples/oss/test/goss.yaml
-@@ -11,7 +11,7 @@ http:
- status: 200
- timeout: 2000
- body:
-- - '"number" : "7.3.2"'
-+ - '"number" : "7.4.0"'
- - '"cluster_name" : "oss"'
- - '"name" : "oss-master-0"'
- - 'You Know, for Search'
-diff --git a/elasticsearch/examples/upgrade/test/goss.yaml b/elasticsearch/examples/upgrade/test/goss.yaml
-index 5e20f7f..f7dbf10 100644
---- a/elasticsearch/examples/upgrade/test/goss.yaml
-+++ b/elasticsearch/examples/upgrade/test/goss.yaml
-@@ -11,7 +11,7 @@ http:
- status: 200
- timeout: 2000
- body:
-- - '"number" : "7.3.2"'
-+ - '"number" : "7.4.0"'
- - '"cluster_name" : "upgrade"'
- - '"name" : "upgrade-master-0"'
- - 'You Know, for Search'
-diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
-index f4fca1f..6175540 100755
---- a/elasticsearch/values.yaml
-+++ b/elasticsearch/values.yaml
-@@ -43,7 +43,7 @@ secretMounts: []
- # path: /usr/share/elasticsearch/config/certs
-
- image: "docker.elastic.co/elasticsearch/elasticsearch-oss"
--imageTag: "7.3.2"
-+imageTag: "7.4.0"
- imagePullPolicy: "IfNotPresent"
-
- podAnnotations: {}
-diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml
-index 59d7ebe..42cffb3 100755
---- a/filebeat/Chart.yaml
-+++ b/filebeat/Chart.yaml
-@@ -4,8 +4,8 @@ maintainers:
- - email: helm-charts@elastic.co
- name: Elastic
- name: filebeat
--version: 7.3.2
--appVersion: 7.3.2
-+version: 7.4.0
-+appVersion: 7.4.0
- sources:
- - https://github.com/elastic/beats
- icon: https://helm.elastic.co/icons/filebeat.png
-diff --git a/filebeat/README.md b/filebeat/README.md
-index 901515d..5b56ca1 100644
---- a/filebeat/README.md
-+++ b/filebeat/README.md
-@@ -30,14 +30,14 @@ This chart is tested with the latest supported versions. The currently tested ve
-
- | 6.x | 7.x |
- | ----- | ----- |
--| 6.8.3 | 7.3.2 |
-+| 6.8.3 | 7.4.0 |
-
- Examples of installing older major versions can be found in the [examples](./examples) directory.
-
--While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.3.2` of Filebeat it would look like this:
-+While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.4.0` of Filebeat it would look like this:
-
- ```
--helm install --name filebeat elastic/filebeat --set imageTag=7.3.2
-+helm install --name filebeat elastic/filebeat --set imageTag=7.4.0
- ```
-
-
-@@ -50,7 +50,7 @@ helm install --name filebeat elastic/filebeat --set imageTag=7.3.2
- | `extraVolumes` | Templatable string of additional volumes to be passed to the `tpl` function | `""` |
- | `hostPathRoot` | Fully-qualified [hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath) that will be used to persist Filebeat registry data | `/var/lib` |
- | `image` | The Filebeat docker image | `docker.elastic.co/beats/filebeat` |
--| `imageTag` | The Filebeat docker image tag | `7.3.2` |
-+| `imageTag` | The Filebeat docker image tag | `7.4.0` |
- | `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` |
- | `imagePullSecrets` | Configuration for [imagePullSecrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret) so that you can use a private registry for your image | `[]` |
- | `managedServiceAccount` | Whether the `serviceAccount` should be managed by this helm chart. Set this to `false` in order to manage your own service account and related roles. | `true` |
-diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml
-index ea0ca18..6713348 100644
---- a/filebeat/examples/default/test/goss.yaml
-+++ b/filebeat/examples/default/test/goss.yaml
-@@ -29,7 +29,7 @@ http:
- status: 200
- timeout: 2000
- body:
-- - 'filebeat-7.3.2'
-+ - 'filebeat-7.4.0'
-
- file:
- /usr/share/filebeat/filebeat.yml:
-@@ -44,4 +44,4 @@ command:
- exit-status: 0
- stdout:
- - 'elasticsearch: http://elasticsearch-master:9200'
-- - 'version: 7.3.2'
-+ - 'version: 7.4.0'
-diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml
-index cf9d0a9..f38cbfe 100644
---- a/filebeat/examples/oss/test/goss.yaml
-+++ b/filebeat/examples/oss/test/goss.yaml
-@@ -19,4 +19,4 @@ http:
- status: 200
- timeout: 2000
- body:
-- - 'filebeat-7.3.2'
-+ - 'filebeat-7.4.0'
-diff --git a/filebeat/examples/security/test/goss.yaml b/filebeat/examples/security/test/goss.yaml
-index f5efc42..a7ef6c3 100644
---- a/filebeat/examples/security/test/goss.yaml
-+++ b/filebeat/examples/security/test/goss.yaml
-@@ -3,7 +3,7 @@ http:
- status: 200
- timeout: 2000
- body:
-- - 'filebeat-7.3.2'
-+ - 'filebeat-7.4.0'
- allow-insecure: true
- username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
- password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
-diff --git a/filebeat/values.yaml b/filebeat/values.yaml
-index 284185a..1e6af75 100755
---- a/filebeat/values.yaml
-+++ b/filebeat/values.yaml
-@@ -34,7 +34,7 @@ extraVolumes: ""
- hostPathRoot: /var/lib
-
- image: "docker.elastic.co/beats/filebeat"
--imageTag: "7.3.2"
-+imageTag: "7.4.0"
- imagePullPolicy: "IfNotPresent"
- imagePullSecrets: []
-
-diff --git a/helpers/bumper.py b/helpers/bumper.py
-index c1cf2a8..5d4f0d6 100755
---- a/helpers/bumper.py
-+++ b/helpers/bumper.py
-@@ -7,11 +7,11 @@ import fileinput
-
- os.chdir(os.path.join(os.path.dirname(__file__), '..'))
-
--chart_version = '7.3.2'
-+chart_version = '7.4.0'
-
- versions = {
- 6: '6.8.3',
-- 7: '7.3.2',
-+ 7: '7.4.0',
- }
-
- file_patterns = [
-diff --git a/helpers/examples.mk b/helpers/examples.mk
-index 9a429f8..56f749c 100644
---- a/helpers/examples.mk
-+++ b/helpers/examples.mk
-@@ -1,7 +1,7 @@
- GOSS_VERSION := v0.3.6
- GOSS_FILE ?= goss.yaml
- GOSS_SELECTOR ?= release=$(RELEASE)
--STACK_VERSION := 7.3.2
-+STACK_VERSION := 7.4.0
-
- goss:
- GOSS_CONTAINER=$$(kubectl get --no-headers=true pods -l $(GOSS_SELECTOR) -o custom-columns=:metadata.name | sed -n 1p ) && \
-diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml
-index 2754b57..d858b0a 100755
---- a/kibana/Chart.yaml
-+++ b/kibana/Chart.yaml
-@@ -4,8 +4,8 @@ maintainers:
- - email: helm-charts@elastic.co
- name: Elastic
- name: kibana
--version: 7.3.2
--appVersion: 7.3.2
-+version: 7.4.0
-+appVersion: 7.4.0
- sources:
- - https://github.com/elastic/kibana
- icon: https://helm.elastic.co/icons/kibana.png
-diff --git a/kibana/README.md b/kibana/README.md
-index ef30957..6f2cf2e 100644
---- a/kibana/README.md
-+++ b/kibana/README.md
-@@ -26,14 +26,14 @@ This chart is tested with the latest supported versions. The currently tested ve
-
- | 6.x | 7.x |
- | ----- | ----- |
--| 6.8.3 | 7.3.2 |
-+| 6.8.3 | 7.4.0 |
-
- Examples of installing older major versions can be found in the [examples](./examples) directory.
-
--While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.3.2` of Kibana it would look like this:
-+While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.4.0` of Kibana it would look like this:
-
- ```
--helm install --name kibana elastic/kibana --set imageTag=7.3.2
-+helm install --name kibana elastic/kibana --set imageTag=7.4.0
- ```
-
- ## Configuration
-@@ -46,7 +46,7 @@ helm install --name kibana elastic/kibana --set imageTag=7.3.2
- | `extraEnvs` | Extra [environment variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#using-environment-variables-inside-of-your-config) which will be appended to the `env:` definition for the container | `[]` |
- | `secretMounts` | Allows you easily mount a secret as a file inside the deployment. Useful for mounting certificates and other secrets. See [values.yaml](./values.yaml) for an example | `[]` |
- | `image` | The Kibana docker image | `docker.elastic.co/kibana/kibana` |
--| `imageTag` | The Kibana docker image tag | `7.3.2` |
-+| `imageTag` | The Kibana docker image tag | `7.4.0` |
- | `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` |
- | `podAnnotations` | Configurable [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) applied to all Kibana pods | `{}` |
- | `resources` | Allows you to set the [resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) for the statefulset | `requests.cpu: 100m`<br>`requests.memory: 500Mi`<br>`limits.cpu: 1000m`<br>`limits.memory: 2Gi` |
-diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml
-index 760d38a..2bafc00 100644
---- a/kibana/examples/default/test/goss.yaml
-+++ b/kibana/examples/default/test/goss.yaml
-@@ -3,7 +3,7 @@ http:
- status: 200
- timeout: 2000
- body:
-- - '"number":"7.3.2"'
-+ - '"number":"7.4.0"'
-
- http://localhost:5601/app/kibana:
- status: 200
-diff --git a/kibana/values.yaml b/kibana/values.yaml
-index 1af52b8..4e3668c 100755
---- a/kibana/values.yaml
-+++ b/kibana/values.yaml
-@@ -22,7 +22,7 @@ secretMounts: []
- # subPath: kibana.keystore # optional
-
- image: "docker.elastic.co/kibana/kibana"
--imageTag: "7.3.2"
-+imageTag: "7.4.0"
- imagePullPolicy: "IfNotPresent"
-
- # additionals labels
-diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml
-index 569d47c..d6f0f4b 100755
---- a/metricbeat/Chart.yaml
-+++ b/metricbeat/Chart.yaml
-@@ -4,8 +4,8 @@ maintainers:
- - email: helm-charts@elastic.co
- name: Elastic
- name: metricbeat
--version: 7.3.2
--appVersion: 7.3.2
-+version: 7.4.0
-+appVersion: 7.4.0
- sources:
- - https://github.com/elastic/beats
- icon: https://helm.elastic.co/icons/metricbeat.png
-diff --git a/metricbeat/README.md b/metricbeat/README.md
-index 1e53f47..ecca6f4 100644
---- a/metricbeat/README.md
-+++ b/metricbeat/README.md
-@@ -26,14 +26,14 @@ This chart is tested with the latest supported versions. The currently tested ve
-
- | 6.x | 7.x |
- | ----- | ----- |
--| 6.8.3 | 7.3.2 |
-+| 6.8.3 | 7.4.0 |
-
- Examples of installing older major versions can be found in the [examples](./examples) directory.
-
--While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.3.2` of metricbeat it would look like this:
-+While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.4.0` of metricbeat it would look like this:
-
- ```
--helm install --name metricbeat elastic/metricbeat --set imageTag=7.3.2
-+helm install --name metricbeat elastic/metricbeat --set imageTag=7.4.0
- ```
-
-
-@@ -46,7 +46,7 @@ helm install --name metricbeat elastic/metricbeat --set imageTag=7.3.2
- | `extraVolumes` | Templatable string of additional volumes to be passed to the `tpl` function | `""` |
- | `hostPathRoot` | Fully-qualified [hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath) that will be used to persist Metricbeat registry data | `/var/lib` |
- | `image` | The Metricbeat docker image | `docker.elastic.co/beats/metricbeat` |
--| `imageTag` | The Metricbeat docker image tag | `7.3.2` |
-+| `imageTag` | The Metricbeat docker image tag | `7.4.0` |
- | `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` |
- | `imagePullSecrets` | Configuration for [imagePullSecrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret) so that you can use a private registry for your image | `[]` |
- | `managedServiceAccount` | Whether the `serviceAccount` should be managed by this helm chart. Set this to `false` in order to manage your own service account and related roles. | `true` |
-diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml
-index 3e0304d..b4e5163 100644
---- a/metricbeat/examples/default/test/goss-metrics.yaml
-+++ b/metricbeat/examples/default/test/goss-metrics.yaml
-@@ -21,13 +21,13 @@ http:
- status: 200
- timeout: 2000
- body:
-- - 'metricbeat-7.3.2'
-+ - 'metricbeat-7.4.0'
-
- 'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat':
- status: 200
- timeout: 2000
- body:
-- - 'metricbeat-7.3.2'
-+ - 'metricbeat-7.4.0'
-
- file:
- /usr/share/metricbeat/metricbeat.yml:
-@@ -42,4 +42,4 @@ command:
- exit-status: 0
- stdout:
- - 'elasticsearch: http://elasticsearch-master:9200'
-- - 'version: 7.3.2'
-+ - 'version: 7.4.0'
-diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml
-index edb4e13..c1614ab 100644
---- a/metricbeat/examples/default/test/goss.yaml
-+++ b/metricbeat/examples/default/test/goss.yaml
-@@ -29,12 +29,12 @@ http:
- status: 200
- timeout: 2000
- body:
-- - 'metricbeat-7.3.2'
-+ - 'metricbeat-7.4.0'
- 'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat':
- status: 200
- timeout: 2000
- body:
-- - 'metricbeat-7.3.2'
-+ - 'metricbeat-7.4.0'
-
- file:
- /usr/share/metricbeat/metricbeat.yml:
-@@ -49,4 +49,4 @@ command:
- exit-status: 0
- stdout:
- - 'elasticsearch: http://elasticsearch-master:9200'
-- - 'version: 7.3.2'
-+ - 'version: 7.4.0'
-diff --git a/metricbeat/examples/oss/test/goss-metrics.yaml b/metricbeat/examples/oss/test/goss-metrics.yaml
-index 947a71d..ea98e76 100644
---- a/metricbeat/examples/oss/test/goss-metrics.yaml
-+++ b/metricbeat/examples/oss/test/goss-metrics.yaml
-@@ -21,12 +21,12 @@ http:
- status: 200
- timeout: 2000
- body:
-- - 'metricbeat-7.3.2'
-+ - 'metricbeat-7.4.0'
- http://oss-master:9200/_search?q=metricset.name:state_deployment:
- status: 200
- timeout: 2000
- body:
-- - 'metricbeat-7.3.2'
-+ - 'metricbeat-7.4.0'
-
- file:
- /usr/share/metricbeat/metricbeat.yml:
-@@ -40,4 +40,4 @@ command:
- exit-status: 0
- stdout:
- - 'elasticsearch: http://oss-master:9200'
-- - 'version: 7.3.2'
-+ - 'version: 7.4.0'
-diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml
-index d39d1b2..3b5c523 100644
---- a/metricbeat/examples/oss/test/goss.yaml
-+++ b/metricbeat/examples/oss/test/goss.yaml
-@@ -29,12 +29,12 @@ http:
- status: 200
- timeout: 2000
- body:
-- - 'metricbeat-7.3.2'
-+ - 'metricbeat-7.4.0'
- http://oss-master:9200/_search?q=metricset.name:container:
- status: 200
- timeout: 2000
- body:
-- - 'metricbeat-7.3.2'
-+ - 'metricbeat-7.4.0'
-
- file:
- /usr/share/metricbeat/metricbeat.yml:
-@@ -48,4 +48,4 @@ command:
- exit-status: 0
- stdout:
- - 'elasticsearch: http://oss-master:9200'
-- - 'version: 7.3.2'
-+ - 'version: 7.4.0'
-diff --git a/metricbeat/examples/security/test/goss-metrics.yaml b/metricbeat/examples/security/test/goss-metrics.yaml
-index 80d57a8..ecb788f 100644
---- a/metricbeat/examples/security/test/goss-metrics.yaml
-+++ b/metricbeat/examples/security/test/goss-metrics.yaml
-@@ -21,7 +21,7 @@ http:
- status: 200
- timeout: 2000
- body:
-- - 'metricbeat-7.3.2'
-+ - 'metricbeat-7.4.0'
- allow-insecure: true
- username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
- password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
-@@ -29,7 +29,7 @@ http:
- status: 200
- timeout: 2000
- body:
-- - 'metricbeat-7.3.2'
-+ - 'metricbeat-7.4.0'
- allow-insecure: true
- username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
- password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
-@@ -46,4 +46,4 @@ command:
- exit-status: 0
- stdout:
- - 'elasticsearch: https://security-master:9200'
-- - 'version: 7.3.2'
-+ - 'version: 7.4.0'
-diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml
-index d25b9de..0e2f04c 100644
---- a/metricbeat/examples/security/test/goss.yaml
-+++ b/metricbeat/examples/security/test/goss.yaml
-@@ -29,7 +29,7 @@ http:
- status: 200
- timeout: 2000
- body:
-- - 'metricbeat-7.3.2'
-+ - 'metricbeat-7.4.0'
- allow-insecure: true
- username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
- password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
-@@ -37,7 +37,7 @@ http:
- status: 200
- timeout: 2000
- body:
-- - 'metricbeat-7.3.2'
-+ - 'metricbeat-7.4.0'
- allow-insecure: true
- username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
- password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
-@@ -54,4 +54,4 @@ command:
- exit-status: 0
- stdout:
- - 'elasticsearch: https://security-master:9200'
-- - 'version: 7.3.2'
-+ - 'version: 7.4.0'
-diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml
-index 5c85249..3f9f0b1 100755
---- a/metricbeat/values.yaml
-+++ b/metricbeat/values.yaml
-@@ -86,7 +86,7 @@ extraVolumes: ""
- hostPathRoot: /var/lib
-
- image: "docker.elastic.co/beats/metricbeat"
--imageTag: "7.3.2"
-+imageTag: "7.4.0"
- imagePullPolicy: "IfNotPresent"
- imagePullSecrets: []
-
---
-1.8.3.1
-
+++ /dev/null
-From 066b7c9996d9bdee56857eca8a1af72bbbaaafff Mon Sep 17 00:00:00 2001
-From: Kevin Smith <kevin.smith@windriver.com>
-Date: Thu, 24 Oct 2019 11:06:30 -0400
-Subject: [PATCH 1/1] set initial masters to master-0
-
----
- elasticsearch/templates/statefulset.yaml | 2 +-
- elasticsearch/values.yaml | 3 +++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml
-index 36c7af6..e17d39e 100644
---- a/elasticsearch/templates/statefulset.yaml
-+++ b/elasticsearch/templates/statefulset.yaml
-@@ -233,7 +233,7 @@ spec:
- {{- if eq .Values.roles.master "true" }}
- {{- if ge (int (include "esMajorVersion" .)) 7 }}
- - name: cluster.initial_master_nodes
-- value: "{{ template "endpoints" . }}"
-+ value: "{{ .Values.initialMasterNodes }}"
- {{- else }}
- - name: discovery.zen.minimum_master_nodes
- value: "{{ .Values.minimumMasterNodes }}"
-diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
-index 6175540..0d983eb 100755
---- a/elasticsearch/values.yaml
-+++ b/elasticsearch/values.yaml
-@@ -6,6 +6,9 @@ nodeGroup: "master"
- # This should be set to clusterName + "-" + nodeGroup for your master group
- masterService: ""
-
-+# On initial cluster formation, the initial set of masters.
-+initialMasterNodes: "mon-elasticsearch-master-0"
-+
- # Elasticsearch roles that will be applied to this nodeGroup
- # These will be set as environment variables. E.g. node.master=true
- roles:
---
-1.8.3.1
-
+++ /dev/null
----
-apiVersion: v1
-entries: {}
-generated: 2019-01-07T12:33:46.098166523-06:00
+++ /dev/null
----
-apiVersion: v1
-generated: 2019-01-02T15:19:36.215111369-06:00
-repositories:
- - caFile: ""
- cache: /builddir/.helm/repository/cache/local-index.yaml
- certFile: ""
- keyFile: ""
- name: local
- password: ""
- url: http://127.0.0.1:8879/charts
- username: ""
+++ /dev/null
-
-SUMMARY = "Monitor Helm Elastic charts"
-DESCRIPTION = "Monitor Helm Elastic charts"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-DEPENDS += " \
- helm-native \
- stx-openstack-helm \
-"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCREV_helm-charts-elastic = "2bd7616ceddbdf2eee88965e2028ee37d304c79c"
-
-# Patches pulled from:
-# SRCREV_monitor-armada-app = "e5ee6b3a07b74479b93fe90eff0662cf81890f73"
-# git://opendev.org/starlingx/monitor-armada-app.git
-
-SRC_URI = " \
- git://github.com/elastic/helm-charts;protocol=${PROTOCOL};name=helm-charts-elastic \
- file://0001-add-makefile.patch \
- file://0002-Add-compatibility-for-k8s-1.16.patch \
- file://0003-use-oss-image.patch \
- file://0004-Update-to-Elastic-7.4.0-Release.patch \
- file://0005-set-initial-masters-to-master-0.patch \
- file://index.yaml \
- file://repositories.yaml \
- "
-
-PATCHTOOL = "git"
-PATCH_COMMIT_FUNCTIONS = "1"
-
-S = "${WORKDIR}/git"
-
-inherit allarch
-
-helm_folder = "${nonarch_libdir}/helm"
-helmchart_version = "0.1.0"
-
-do_configure[noexec] = "1"
-
-do_compile () {
- # initialize helm and build the toolkit
- # helm init --client-only does not work if there is no networking
- # The following commands do essentially the same as: helm init
- export HOME="${B}/${USER}"
- export helm_home="${B}/${USER}/.helm"
- rm -rf ${helm_home}
-
- mkdir -p ${helm_home}
- mkdir ${helm_home}/repository
- mkdir ${helm_home}/repository/cache
- mkdir ${helm_home}/repository/local
- mkdir ${helm_home}/plugins
- mkdir ${helm_home}/starters
- mkdir ${helm_home}/cache
- mkdir ${helm_home}/cache/archive
-
- # Stage a repository file that only has a local repo
- install -m 0644 ${WORKDIR}/repositories.yaml \
- ${helm_home}/repository/repositories.yaml
-
- # Stage a local repo index that can be updated by the build
- install -m 0644 ${WORKDIR}/index.yaml ${helm_home}/repository/local/index.yaml
-
- # Host a server for the charts
- helm serve --repo-path . &
- sleep 1
- helm repo rm local
- helm repo add local http://localhost:8879/charts
-
- # Create the tgz files
- rm -f elasticsearch/Makefile
- make elasticsearch
-
- # terminate helm server (the last backgrounded task)
- kill $!
- rm -rf ${helm_home}
-}
-
-do_install () {
- install -d -m 755 ${D}${helm_folder}
- install -p -D -m 755 ${B}/*.tgz ${D}${helm_folder}
-}
-
-FILES_${PN} = "${helm_folder}"
-
-RDEPENDS_${PN} = " \
- helm \
- stx-platform-helm \
- stx-openstack-helm \
-"
+++ /dev/null
-From c116dce67296baa7b31cf59a68102b88e008db30 Mon Sep 17 00:00:00 2001
-From: John Kung <john.kung@windriver.com>
-Date: Thu, 9 May 2019 11:08:48 -0400
-Subject: [PATCH 1/1] Add Makefile for helm charts
-
----
- stable/Makefile | 43 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 43 insertions(+)
- create mode 100644 stable/Makefile
-
-diff --git a/stable/Makefile b/stable/Makefile
-new file mode 100644
-index 0000000..5cf4447
---- /dev/null
-+++ b/stable/Makefile
-@@ -0,0 +1,43 @@
-+#
-+# Copyright 2017 The Openstack-Helm Authors.
-+#
-+# Copyright (c) 2018 Wind River Systems, Inc.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+# It's necessary to set this because some environments don't link sh -> bash.
-+SHELL := /bin/bash
-+TASK := build
-+
-+EXCLUDES := helm-toolkit doc tests tools logs tmp
-+CHARTS := helm-toolkit $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
-+
-+.PHONY: $(EXCLUDES) $(CHARTS)
-+
-+all: $(CHARTS)
-+
-+$(CHARTS):
-+ @if [ -d $@ ]; then \
-+ echo; \
-+ echo "===== Processing [$@] chart ====="; \
-+ make $(TASK)-$@; \
-+ fi
-+
-+init-%:
-+ if [ -f $*/Makefile ]; then make -C $*; fi
-+ if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
-+
-+lint-%: init-%
-+ if [ -d $* ]; then helm lint $*; fi
-+
-+build-%: lint-%
-+ if [ -d $* ]; then helm package $*; fi
-+
-+clean:
-+ @echo "Clean all build artifacts"
-+ rm -f */templates/_partials.tpl */templates/_globals.tpl
-+ rm -f *tgz */charts/*tgz */requirements.lock
-+ rm -rf */charts */tmpcharts
-+
-+%:
-+ @:
---
-1.8.3.1
-
+++ /dev/null
-From 2315765024f82510212604d16eed37dfd69ff24c Mon Sep 17 00:00:00 2001
-From: John Kung <john.kung@windriver.com>
-Date: Thu, 2 May 2019 14:48:20 -0400
-Subject: [PATCH 1/1] kibana: workaround checksum for configmap.yaml
-
----
- stable/kibana/templates/deployment.yaml | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/stable/kibana/templates/deployment.yaml b/stable/kibana/templates/deployment.yaml
-index 33208ea..33fc6f0 100644
---- a/stable/kibana/templates/deployment.yaml
-+++ b/stable/kibana/templates/deployment.yaml
-@@ -16,11 +16,6 @@ spec:
- revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
- template:
- metadata:
-- annotations:
-- checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
--{{- if .Values.podAnnotations }}
--{{ toYaml .Values.podAnnotations | indent 8 }}
--{{- end }}
- labels:
- app: {{ template "kibana.name" . }}
- release: "{{ .Release.Name }}"
---
-1.8.3.1
-
+++ /dev/null
-From d22ad4870b78f74298189e383697ae6163ef49d7 Mon Sep 17 00:00:00 2001
-From: Kevin Smith <kevin.smith@windriver.com>
-Date: Wed, 17 Jul 2019 15:13:44 -0400
-Subject: [PATCH 1/1] helm chart changes for stx monitor
-
----
- stable/elasticsearch/values.yaml | 2 +-
- stable/filebeat/templates/configmap.yaml | 34 ++++++++++++++++++++++++++++++
- stable/filebeat/templates/daemonset.yaml | 15 +++++++++++++
- stable/filebeat/values.yaml | 9 ++------
- stable/kibana/values.yaml | 4 ++--
- stable/logstash/templates/ingress.yaml | 2 +-
- stable/logstash/templates/statefulset.yaml | 7 +++---
- stable/logstash/values.yaml | 3 ++-
- stable/metricbeat/templates/configmap.yaml | 34 ++++++++++++++++++++++++++++++
- stable/metricbeat/templates/daemonset.yaml | 26 +++++++++++++++++++++++
- stable/metricbeat/values.yaml | 4 ++--
- 11 files changed, 122 insertions(+), 18 deletions(-)
- create mode 100755 stable/filebeat/templates/configmap.yaml
- create mode 100755 stable/metricbeat/templates/configmap.yaml
-
-diff --git a/stable/elasticsearch/values.yaml b/stable/elasticsearch/values.yaml
-index bbc03dd..6dcd9b0 100644
---- a/stable/elasticsearch/values.yaml
-+++ b/stable/elasticsearch/values.yaml
-@@ -33,7 +33,7 @@ podSecurityPolicy:
-
- image:
- repository: "docker.elastic.co/elasticsearch/elasticsearch-oss"
-- tag: "6.7.0"
-+ tag: "7.2.0"
- pullPolicy: "IfNotPresent"
- # If specified, use these secrets to access the image
- # pullSecrets:
-diff --git a/stable/filebeat/templates/configmap.yaml b/stable/filebeat/templates/configmap.yaml
-new file mode 100755
-index 0000000..c895965
---- /dev/null
-+++ b/stable/filebeat/templates/configmap.yaml
-@@ -0,0 +1,34 @@
-+apiVersion: v1
-+kind: ConfigMap
-+metadata:
-+ name: {{ template "filebeat.fullname" . }}
-+ labels:
-+ app: {{ template "filebeat.fullname" . }}
-+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-+ release: "{{ .Release.Name }}"
-+ heritage: "{{ .Release.Service }}"
-+data:
-+ setup-script.sh: |-
-+ #!/bin/bash
-+ BEAT='filebeat'
-+ BEAT_VER=$($BEAT version | awk '{print $3}')
-+ # check if logstash output is enabled, via crude parsing of the .yml file.
-+ sed -e '/output.logstash/,/enabled:/!d' ${BEAT}.yml | grep -i true
-+ if [[ $? -eq 0 ]]; then
-+ echo "logstash configured, exporting template to elasticsearch"
-+ $BEAT export template > /tmp/beat.template.json
-+ # remove the lifecycle section of the yaml, as elasticsearch will choke
-+ # on it as oss version does not support ilm.
-+ sed -i '/lifecycle/,+3d' /tmp/beat.template.json
-+ curl -XPUT -H "Content-Type: application/json" http://{$STX_ELASTICSEARCH_CLIENT_SERVICE_HOST}:{$STX_ELASTICSEARCH_CLIENT_SERVICE_PORT_HTTP}/_template/{$BEAT}-{$BEAT_VER} -d@/tmp/beat.template.json
-+ # prime the index as a write index
-+ curl -XPUT -H "Content-Type: application/json" -d "{
-+ \"aliases\": {
-+ \"{BEAT}-{$BEAT_VER}\": {
-+ \"is_write_index\": \"true\"
-+ }
-+ }
-+ }" http://{$STX_ELASTICSEARCH_CLIENT_SERVICE_HOST}:{$STX_ELASTICSEARCH_CLIENT_SERVICE_PORT_HTTP}/{$BEAT}-{$BEAT_VER}-000001
-+ else
-+ echo "logstash not configured, not exporting template, should be done for us."
-+ fi
-diff --git a/stable/filebeat/templates/daemonset.yaml b/stable/filebeat/templates/daemonset.yaml
-index 2b8e265..00a5519 100644
---- a/stable/filebeat/templates/daemonset.yaml
-+++ b/stable/filebeat/templates/daemonset.yaml
-@@ -38,6 +38,21 @@ spec:
- priorityClassName: "{{ .Values.priorityClassName }}"
- {{- end }}
- initContainers:
-+ - name: "setup-script"
-+ image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-+ imagePullPolicy: {{ .Values.image.pullPolicy }}
-+ command:
-+ - /bin/bash
-+ - -c
-+ - /usr/share/filebeat/setup-script.sh
-+ volumeMounts:
-+ - mountPath: /usr/share/filebeat/setup-script.sh
-+ name: setupscript
-+ subPath: setup-script.sh
-+ - name: filebeat-config
-+ mountPath: /usr/share/filebeat/filebeat.yml
-+ readOnly: true
-+ subPath: filebeat.yml
- {{- if .Values.indexTemplateLoad }}
- - name: "load-es-template"
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-diff --git a/stable/filebeat/values.yaml b/stable/filebeat/values.yaml
-index 1907ffa..b4b766f 100644
---- a/stable/filebeat/values.yaml
-+++ b/stable/filebeat/values.yaml
-@@ -1,15 +1,10 @@
- image:
- repository: docker.elastic.co/beats/filebeat-oss
-- tag: 6.7.0
-+ tag: 7.2.0
- pullPolicy: IfNotPresent
-
- config:
- filebeat.config:
-- prospectors:
-- # Mounted `filebeat-prospectors` configmap:
-- path: ${path.config}/prospectors.d/*.yml
-- # Reload prospectors configs as they change:
-- reload.enabled: false
- modules:
- path: ${path.config}/modules.d/*.yml
- # Reload module configs as they change:
-@@ -18,7 +13,7 @@ config:
- processors:
- - add_cloud_metadata:
-
-- filebeat.prospectors:
-+ filebeat.inputs:
- - type: log
- enabled: true
- paths:
-diff --git a/stable/kibana/values.yaml b/stable/kibana/values.yaml
-index a3310f9..4ce4b2a 100644
---- a/stable/kibana/values.yaml
-+++ b/stable/kibana/values.yaml
-@@ -1,6 +1,6 @@
- image:
- repository: "docker.elastic.co/kibana/kibana-oss"
-- tag: "6.7.0"
-+ tag: "7.2.0"
- pullPolicy: "IfNotPresent"
-
- testFramework:
-@@ -25,7 +25,7 @@ files:
- ## Default Kibana configuration from kibana-docker.
- server.name: kibana
- server.host: "0"
-- elasticsearch.url: http://elasticsearch:9200
-+ elasticsearch.hosts: http://elasticsearch:9200
-
- ## Custom config properties below
- ## Ref: https://www.elastic.co/guide/en/kibana/current/settings.html
-diff --git a/stable/logstash/templates/ingress.yaml b/stable/logstash/templates/ingress.yaml
-index d924504..0e26f89 100644
---- a/stable/logstash/templates/ingress.yaml
-+++ b/stable/logstash/templates/ingress.yaml
-@@ -33,6 +33,6 @@ spec:
- - path: {{ $ingressPath }}
- backend:
- serviceName: {{ $fullName }}
-- servicePort: http
-+ servicePort: 9600
- {{- end }}
- {{- end }}
-diff --git a/stable/logstash/templates/statefulset.yaml b/stable/logstash/templates/statefulset.yaml
-index d2bbc32..cca0050 100644
---- a/stable/logstash/templates/statefulset.yaml
-+++ b/stable/logstash/templates/statefulset.yaml
-@@ -25,11 +25,8 @@ spec:
- {{ $key }}: {{ $value | quote }}
- {{- end }}
- {{- end }}
-- annotations:
-- checksum/patterns: {{ include (print $.Template.BasePath "/patterns-config.yaml") . | sha256sum }}
-- checksum/templates: {{ include (print $.Template.BasePath "/files-config.yaml") . | sha256sum }}
-- checksum/pipeline: {{ include (print $.Template.BasePath "/pipeline-config.yaml") . | sha256sum }}
- {{- if .Values.podAnnotations }}
-+ annotations:
- ## Custom pod annotations
- {{- range $key, $value := .Values.podAnnotations }}
- {{ $key }}: {{ $value | quote }}
-@@ -46,6 +43,8 @@ spec:
- imagePullSecrets:
- {{ toYaml .Values.image.pullSecrets | indent 8 }}
- {{- end }}
-+ hostNetwork: true
-+ dnsPolicy: ClusterFirstWithHostNet
- containers:
-
- ## logstash
-diff --git a/stable/logstash/values.yaml b/stable/logstash/values.yaml
-index a9eb158..9a452b1 100644
---- a/stable/logstash/values.yaml
-+++ b/stable/logstash/values.yaml
-@@ -10,7 +10,7 @@ terminationGracePeriodSeconds: 30
-
- image:
- repository: docker.elastic.co/logstash/logstash-oss
-- tag: 6.7.0
-+ tag: 7.2.0
- pullPolicy: IfNotPresent
- ## Add secrets manually via kubectl on kubernetes cluster and reference here
- # pullSecrets:
-@@ -67,6 +67,7 @@ ingress:
- path: /
- hosts:
- - logstash.cluster.local
-+ servicePort: 5044
- tls: []
- # - secretName: logstash-tls
- # hosts:
-diff --git a/stable/metricbeat/templates/configmap.yaml b/stable/metricbeat/templates/configmap.yaml
-new file mode 100755
-index 0000000..21890b4
---- /dev/null
-+++ b/stable/metricbeat/templates/configmap.yaml
-@@ -0,0 +1,34 @@
-+apiVersion: v1
-+kind: ConfigMap
-+metadata:
-+ name: {{ template "metricbeat.fullname" . }}
-+ labels:
-+ app: {{ template "metricbeat.fullname" . }}
-+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-+ release: "{{ .Release.Name }}"
-+ heritage: "{{ .Release.Service }}"
-+data:
-+ setup-script.sh: |-
-+ #!/bin/bash
-+ BEAT='metricbeat'
-+ BEAT_VER=$($BEAT version | awk '{print $3}')
-+ # check if logstash output is enabled, via crude parsing of the .yml file.
-+ sed -e '/output.logstash/,/enabled:/!d' ${BEAT}.yml | grep -i true
-+ if [[ $? -eq 0 ]]; then
-+ echo "logstash configured, exporting template to elasticsearch"
-+ $BEAT export template > /tmp/beat.template.json
-+ # remove the lifecycle section of the yaml, as elasticsearch will choke
-+ # on it as oss version does not support ilm.
-+ sed -i '/lifecycle/,+3d' /tmp/beat.template.json
-+ curl -XPUT -H "Content-Type: application/json" http://{$STX_ELASTICSEARCH_CLIENT_SERVICE_HOST}:{$STX_ELASTICSEARCH_CLIENT_SERVICE_PORT_HTTP}/_template/{$BEAT}-{$BEAT_VER} -d@/tmp/beat.template.json
-+ # prime the index as a write index
-+ curl -XPUT -H "Content-Type: application/json" -d "{
-+ \"aliases\": {
-+ \"{BEAT}-{$BEAT_VER}\": {
-+ \"is_write_index\": \"true\"
-+ }
-+ }
-+ }" http://{$STX_ELASTICSEARCH_CLIENT_SERVICE_HOST}:{$STX_ELASTICSEARCH_CLIENT_SERVICE_PORT_HTTP}/{$BEAT}-{$BEAT_VER}-000001
-+ else
-+ echo "logstash not configured, not exporting template, should be done for us."
-+ fi
-diff --git a/stable/metricbeat/templates/daemonset.yaml b/stable/metricbeat/templates/daemonset.yaml
-index eadfb96..e3d7437 100644
---- a/stable/metricbeat/templates/daemonset.yaml
-+++ b/stable/metricbeat/templates/daemonset.yaml
-@@ -32,6 +32,23 @@ spec:
- {{- end }}
- {{- end }}
- spec:
-+ initContainers:
-+ - name: "setup-script"
-+ image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-+ imagePullPolicy: {{ .Values.image.pullPolicy }}
-+ command:
-+ - /bin/bash
-+ - -c
-+ - /usr/share/metricbeat/setup-script.sh
-+ volumeMounts:
-+ - mountPath: /usr/share/metricbeat/setup-script.sh
-+ name: setupscript
-+ subPath: setup-script.sh
-+ - name: config
-+ mountPath: /usr/share/metricbeat/metricbeat.yml
-+ readOnly: true
-+ subPath: metricbeat.yml
-+ env:
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-@@ -62,6 +79,7 @@ spec:
- securityContext:
- runAsUser: 0
- resources:
-+
- {{- if .Values.daemonset.resources }}
- {{ toYaml .Values.daemonset.resources | indent 10 }}
- {{- else if .Values.resources }}
-@@ -85,6 +103,10 @@ spec:
- readOnly: true
- - name: dockersock
- mountPath: /var/run/docker.sock
-+#Mount the script so we can see it from running containter
-+ - mountPath: /usr/share/metricbeat/setup-script.sh
-+ name: setupscript
-+ subPath: setup-script.sh
- {{- if .Values.extraVolumeMounts }}
- {{ toYaml .Values.extraVolumeMounts | indent 8 }}
- {{- end }}
-@@ -108,6 +130,10 @@ spec:
- - name: dockersock
- hostPath:
- path: /var/run/docker.sock
-+ - name: setupscript
-+ configMap:
-+ name: {{ template "metricbeat.fullname" . }}
-+ defaultMode: 0755
- {{- if .Values.extraVolumes }}
- {{ toYaml .Values.extraVolumes | indent 6 }}
- {{- end }}
-diff --git a/stable/metricbeat/values.yaml b/stable/metricbeat/values.yaml
-index 5094639..2908a1b 100644
---- a/stable/metricbeat/values.yaml
-+++ b/stable/metricbeat/values.yaml
-@@ -1,6 +1,6 @@
- image:
-- repository: docker.elastic.co/beats/metricbeat
-- tag: 6.7.0
-+ repository: docker.elastic.co/beats/metricbeat-oss
-+ tag: 7.2.0
- pullPolicy: IfNotPresent
-
- # The instances created by daemonset retrieve most metrics from the host
---
-1.8.3.1
-
+++ /dev/null
-From 33fc3cb13670c8e76e7a93455865c81b9f13b0e0 Mon Sep 17 00:00:00 2001
-From: Kevin Smith <kevin.smith@windriver.com>
-Date: Tue, 3 Sep 2019 10:43:50 -0400
-Subject: [PATCH 1/1] ipv6 helm chart changes
-
----
- .../elasticsearch/templates/client-deployment.yaml | 2 +-
- .../elasticsearch/templates/data-statefulset.yaml | 2 +-
- .../templates/master-statefulset.yaml | 2 +-
- stable/filebeat/templates/configmap.yaml | 47 +++++++++++++++++-----
- stable/filebeat/templates/daemonset.yaml | 21 ++++++++++
- stable/metricbeat/templates/configmap.yaml | 47 +++++++++++++++++-----
- stable/metricbeat/templates/daemonset.yaml | 21 ++++++++++
- 7 files changed, 119 insertions(+), 23 deletions(-)
-
-diff --git a/stable/elasticsearch/templates/client-deployment.yaml b/stable/elasticsearch/templates/client-deployment.yaml
-index 047e3c8..5625ee0 100644
---- a/stable/elasticsearch/templates/client-deployment.yaml
-+++ b/stable/elasticsearch/templates/client-deployment.yaml
-@@ -102,7 +102,7 @@ spec:
- resourceFieldRef:
- resource: limits.cpu
- - name: ES_JAVA_OPTS
-- value: "-Djava.net.preferIPv4Stack=true -Xms{{ .Values.client.heapSize }} -Xmx{{ .Values.client.heapSize }} {{ .Values.cluster.additionalJavaOpts }} {{ .Values.client.additionalJavaOpts }}"
-+ value: "-Djava.net.preferIPv6Addresses=true -Xms{{ .Values.client.heapSize }} -Xmx{{ .Values.client.heapSize }} {{ .Values.cluster.additionalJavaOpts }} {{ .Values.client.additionalJavaOpts }}"
- {{- range $key, $value := .Values.cluster.env }}
- - name: {{ $key }}
- value: {{ $value | quote }}
-diff --git a/stable/elasticsearch/templates/data-statefulset.yaml b/stable/elasticsearch/templates/data-statefulset.yaml
-index a407803..44b6be1 100644
---- a/stable/elasticsearch/templates/data-statefulset.yaml
-+++ b/stable/elasticsearch/templates/data-statefulset.yaml
-@@ -120,7 +120,7 @@ spec:
- resourceFieldRef:
- resource: limits.cpu
- - name: ES_JAVA_OPTS
-- value: "-Djava.net.preferIPv4Stack=true -Xms{{ .Values.data.heapSize }} -Xmx{{ .Values.data.heapSize }} {{ .Values.cluster.additionalJavaOpts }} {{ .Values.data.additionalJavaOpts }}"
-+ value: "-Djava.net.preferIPv6Addresses=true -Xms{{ .Values.data.heapSize }} -Xmx{{ .Values.data.heapSize }} {{ .Values.cluster.additionalJavaOpts }} {{ .Values.data.additionalJavaOpts }}"
- {{- range $key, $value := .Values.cluster.env }}
- - name: {{ $key }}
- value: {{ $value | quote }}
-diff --git a/stable/elasticsearch/templates/master-statefulset.yaml b/stable/elasticsearch/templates/master-statefulset.yaml
-index 048535c..7c48fe3 100644
---- a/stable/elasticsearch/templates/master-statefulset.yaml
-+++ b/stable/elasticsearch/templates/master-statefulset.yaml
-@@ -124,7 +124,7 @@ spec:
- resourceFieldRef:
- resource: limits.cpu
- - name: ES_JAVA_OPTS
-- value: "-Djava.net.preferIPv4Stack=true -Xms{{ .Values.master.heapSize }} -Xmx{{ .Values.master.heapSize }} {{ .Values.cluster.additionalJavaOpts }} {{ .Values.master.additionalJavaOpts }}"
-+ value: "-Djava.net.preferIPv6Addresses=true -Xms{{ .Values.master.heapSize }} -Xmx{{ .Values.master.heapSize }} {{ .Values.cluster.additionalJavaOpts }} {{ .Values.master.additionalJavaOpts }}"
- {{- range $key, $value := .Values.cluster.env }}
- - name: {{ $key }}
- value: {{ $value | quote }}
-diff --git a/stable/filebeat/templates/configmap.yaml b/stable/filebeat/templates/configmap.yaml
-index c895965..9433176 100644
---- a/stable/filebeat/templates/configmap.yaml
-+++ b/stable/filebeat/templates/configmap.yaml
-@@ -10,8 +10,41 @@ metadata:
- data:
- setup-script.sh: |-
- #!/bin/bash
-+ #
-+ # This is best effort to load the template into elasticsearch
-+ # if beats are going to elasticsearch via logstash.
-+ #
- BEAT='filebeat'
- BEAT_VER=$($BEAT version | awk '{print $3}')
-+
-+ ADDR=$OUTPUT_ELASTICSEARCH_HOSTS
-+ echo $ADDR
-+
-+ # Check if this is a map of entries. If so, we'll only export the template
-+ # to the first address
-+ if [[ ${ADDR:0:1} == [ ]]; then
-+ # Remove the square brackets
-+ ADDR=${ADDR:1:-1}
-+ # Take the first entry in case there are more than one
-+ ADDR=${ADDR%%,*}
-+ fi
-+ echo $ADDR
-+
-+ # Check if user has formatted with http:// on front, if not we need to add
-+ HTTP='http://'
-+ if [[ ${ADDR} == http* ]]; then
-+ HTTP=''
-+ fi
-+ echo $HTTP
-+
-+ # Check for ip address containing special characters where -g must be used in curl command
-+ # IPV6 Addresses should come in with square braces around the address.
-+ CURL_G=''
-+ if [[ ${ADDR} == *[* ]]; then
-+ CURL_G=' -g '
-+ fi
-+ echo $CURL_G
-+
- # check if logstash output is enabled, via crude parsing of the .yml file.
- sed -e '/output.logstash/,/enabled:/!d' ${BEAT}.yml | grep -i true
- if [[ $? -eq 0 ]]; then
-@@ -20,15 +53,9 @@ data:
- # remove the lifecycle section of the yaml, as elasticsearch will choke
- # on it as oss version does not support ilm.
- sed -i '/lifecycle/,+3d' /tmp/beat.template.json
-- curl -XPUT -H "Content-Type: application/json" http://{$STX_ELASTICSEARCH_CLIENT_SERVICE_HOST}:{$STX_ELASTICSEARCH_CLIENT_SERVICE_PORT_HTTP}/_template/{$BEAT}-{$BEAT_VER} -d@/tmp/beat.template.json
-- # prime the index as a write index
-- curl -XPUT -H "Content-Type: application/json" -d "{
-- \"aliases\": {
-- \"{BEAT}-{$BEAT_VER}\": {
-- \"is_write_index\": \"true\"
-- }
-- }
-- }" http://{$STX_ELASTICSEARCH_CLIENT_SERVICE_HOST}:{$STX_ELASTICSEARCH_CLIENT_SERVICE_PORT_HTTP}/{$BEAT}-{$BEAT_VER}-000001
-+ curl -v $CURL_G -XPUT -H "Content-Type: application/json" $HTTP$ADDR/_template/$BEAT-$BEAT_VER -d@/tmp/beat.template.json
- else
-- echo "logstash not configured, not exporting template, should be done for us."
-+ echo "logstash not configured, not exporting template, should be done for us."
- fi
-+ # Above is non-fatal if there is a problem. Always pass.
-+ exit 0
-diff --git a/stable/filebeat/templates/daemonset.yaml b/stable/filebeat/templates/daemonset.yaml
-index 00a5519..b8536fb 100644
---- a/stable/filebeat/templates/daemonset.yaml
-+++ b/stable/filebeat/templates/daemonset.yaml
-@@ -53,6 +53,17 @@ spec:
- mountPath: /usr/share/filebeat/filebeat.yml
- readOnly: true
- subPath: filebeat.yml
-+ env:
-+ ## make output.elasticsearch parms visible
-+ {{- range $key, $value := .Values.config}}
-+ {{- $configname := $key | upper | replace "." "_" -}}
-+ {{ if eq $configname "OUTPUT_ELASTICSEARCH" -}}
-+ {{- range $key2, $value2 := $value}}
-+ - name: "{{ $configname }}_{{ $key2 | upper }}"
-+ value: {{ $value2 | quote }}
-+ {{- end }}
-+ {{- end }}
-+ {{- end }}
- {{- if .Values.indexTemplateLoad }}
- - name: "load-es-template"
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-@@ -95,6 +106,16 @@ spec:
- valueFrom:
- fieldRef:
- fieldPath: spec.nodeName
-+ ## make output.elasticsearch parms visible
-+ {{- range $key, $value := .Values.config}}
-+ {{- $configname := $key | upper | replace "." "_" -}}
-+ {{ if eq $configname "OUTPUT_ELASTICSEARCH" -}}
-+ {{- range $key2, $value2 := $value}}
-+ - name: "{{ $configname }}_{{ $key2 | upper }}"
-+ value: {{ $value2 | quote }}
-+ {{- end }}
-+ {{- end }}
-+ {{- end }}
- {{- if .Values.extraVars }}
- {{ toYaml .Values.extraVars | indent 8 }}
- {{- end }}
-diff --git a/stable/metricbeat/templates/configmap.yaml b/stable/metricbeat/templates/configmap.yaml
-index 21890b4..f990f0c 100644
---- a/stable/metricbeat/templates/configmap.yaml
-+++ b/stable/metricbeat/templates/configmap.yaml
-@@ -10,8 +10,41 @@ metadata:
- data:
- setup-script.sh: |-
- #!/bin/bash
-+ #
-+ # This is best effort to load the template into elasticsearch
-+ # if beats are going to elasticsearch via logstash.
-+ #
- BEAT='metricbeat'
- BEAT_VER=$($BEAT version | awk '{print $3}')
-+
-+ ADDR=$OUTPUT_ELASTICSEARCH_HOSTS
-+ echo $ADDR
-+
-+ # Check if this is a map of entries. If so, we'll only export the template
-+ # to the first address
-+ if [[ ${ADDR:0:1} == [ ]]; then
-+ # Remove the square brackets
-+ ADDR=${ADDR:1:-1}
-+ # Take the first entry in case there are more than one
-+ ADDR=${ADDR%%,*}
-+ fi
-+ echo $ADDR
-+
-+ # Check if user has formatted with http:// on front, if not we need to add
-+ HTTP='http://'
-+ if [[ ${ADDR} == http* ]]; then
-+ HTTP=''
-+ fi
-+ echo $HTTP
-+
-+ # Check for ip address containing special characters where -g must be used in curl command
-+ # IPV6 Addresses should come in with square braces around the address.
-+ CURL_G=''
-+ if [[ ${ADDR} == *[* ]]; then
-+ CURL_G=' -g '
-+ fi
-+ echo $CURL_G
-+
- # check if logstash output is enabled, via crude parsing of the .yml file.
- sed -e '/output.logstash/,/enabled:/!d' ${BEAT}.yml | grep -i true
- if [[ $? -eq 0 ]]; then
-@@ -20,15 +53,9 @@ data:
- # remove the lifecycle section of the yaml, as elasticsearch will choke
- # on it as oss version does not support ilm.
- sed -i '/lifecycle/,+3d' /tmp/beat.template.json
-- curl -XPUT -H "Content-Type: application/json" http://{$STX_ELASTICSEARCH_CLIENT_SERVICE_HOST}:{$STX_ELASTICSEARCH_CLIENT_SERVICE_PORT_HTTP}/_template/{$BEAT}-{$BEAT_VER} -d@/tmp/beat.template.json
-- # prime the index as a write index
-- curl -XPUT -H "Content-Type: application/json" -d "{
-- \"aliases\": {
-- \"{BEAT}-{$BEAT_VER}\": {
-- \"is_write_index\": \"true\"
-- }
-- }
-- }" http://{$STX_ELASTICSEARCH_CLIENT_SERVICE_HOST}:{$STX_ELASTICSEARCH_CLIENT_SERVICE_PORT_HTTP}/{$BEAT}-{$BEAT_VER}-000001
-+ curl -v $CURL_G -XPUT -H "Content-Type: application/json" $HTTP$ADDR/_template/$BEAT-$BEAT_VER -d@/tmp/beat.template.json
- else
-- echo "logstash not configured, not exporting template, should be done for us."
-+ echo "logstash not configured, not exporting template, should be done for us."
- fi
-+ # Above is non-fatal if there is a problem. Always pass.
-+ exit 0
-diff --git a/stable/metricbeat/templates/daemonset.yaml b/stable/metricbeat/templates/daemonset.yaml
-index e3d7437..1ae3a34 100644
---- a/stable/metricbeat/templates/daemonset.yaml
-+++ b/stable/metricbeat/templates/daemonset.yaml
-@@ -49,6 +49,17 @@ spec:
- readOnly: true
- subPath: metricbeat.yml
- env:
-+ ## make output.elasticsearch parms visible
-+ {{- range $key, $value := .Values.daemonset.config}}
-+ {{- $configname := $key | upper | replace "." "_" -}}
-+ {{ if eq $configname "OUTPUT_ELASTICSEARCH" -}}
-+ {{- range $key2, $value2 := $value}}
-+ - name: "{{ $configname }}_{{ $key2 | upper }}"
-+ value: {{ $value2 | quote }}
-+ {{- end }}
-+ {{- end }}
-+ {{- end }}
-+
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-@@ -73,6 +84,16 @@ spec:
- valueFrom:
- fieldRef:
- fieldPath: spec.nodeName
-+ ## make output.elasticsearch parms visible
-+ {{- range $key, $value := .Values.daemonset.config}}
-+ {{- $configname := $key | upper | replace "." "_" -}}
-+ {{ if eq $configname "OUTPUT_ELASTICSEARCH" -}}
-+ {{- range $key2, $value2 := $value}}
-+ - name: "{{ $configname }}_{{ $key2 | upper }}"
-+ value: {{ $value2 | quote }}
-+ {{- end }}
-+ {{- end }}
-+ {{- end }}
- {{- if .Values.extraEnv }}
- {{ toYaml .Values.extraEnv | indent 8 }}
- {{- end }}
---
-1.8.3.1
-
+++ /dev/null
-From ac9bce2e01870d8623dc7910cd68079d56f917ca Mon Sep 17 00:00:00 2001
-From: Kevin Smith <kevin.smith@windriver.com>
-Date: Wed, 11 Sep 2019 18:07:50 -0400
-Subject: [PATCH 1/1] decouple config
-
----
- stable/elasticsearch/templates/configmap.yaml | 8 ++++++++
- stable/elasticsearch/values.yaml | 1 +
- stable/filebeat/templates/configmap.yaml | 2 +-
- stable/metricbeat/templates/configmap.yaml | 2 +-
- stable/metricbeat/values.yaml | 6 ++++--
- 5 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/stable/elasticsearch/templates/configmap.yaml b/stable/elasticsearch/templates/configmap.yaml
-index 977ee9a..6bc2065 100644
---- a/stable/elasticsearch/templates/configmap.yaml
-+++ b/stable/elasticsearch/templates/configmap.yaml
-@@ -87,6 +87,14 @@ data:
- gateway.recover_after_time: ${RECOVER_AFTER_TIME:5m}
- gateway.recover_after_master_nodes: ${RECOVER_AFTER_MASTER_NODES:2}
- gateway.recover_after_data_nodes: ${RECOVER_AFTER_DATA_NODES:1}
-+
-+{{- if .Values.cluster.auto_config_initial_masters }}
-+ cluster.initial_master_nodes:
-+ {{- range $i := until (.Values.master.replicas|int) }}
-+ - {{template "elasticsearch.master.fullname" $ }}-{{ $i }}
-+ {{- end }}
-+{{- end }}
-+
- {{- with .Values.cluster.config }}
- {{ toYaml . | indent 4 }}
- {{- end }}
-diff --git a/stable/elasticsearch/values.yaml b/stable/elasticsearch/values.yaml
-index 6dcd9b0..37321dc 100644
---- a/stable/elasticsearch/values.yaml
-+++ b/stable/elasticsearch/values.yaml
-@@ -70,6 +70,7 @@ cluster:
- plugins: []
- # - ingest-attachment
- # - mapper-size
-+ auto_config_initial_masters: true
-
- client:
- name: client
-diff --git a/stable/filebeat/templates/configmap.yaml b/stable/filebeat/templates/configmap.yaml
-index 9433176..8377e5a 100644
---- a/stable/filebeat/templates/configmap.yaml
-+++ b/stable/filebeat/templates/configmap.yaml
-@@ -22,7 +22,7 @@ data:
-
- # Check if this is a map of entries. If so, we'll only export the template
- # to the first address
-- if [[ ${ADDR:0:1} == [ ]]; then
-+ if [ ${ADDR: 0:1} == [ ] && [ ${ADDR: -1} == ] ]; then
- # Remove the square brackets
- ADDR=${ADDR:1:-1}
- # Take the first entry in case there are more than one
-diff --git a/stable/metricbeat/templates/configmap.yaml b/stable/metricbeat/templates/configmap.yaml
-index f990f0c..4249e7f 100644
---- a/stable/metricbeat/templates/configmap.yaml
-+++ b/stable/metricbeat/templates/configmap.yaml
-@@ -22,7 +22,7 @@ data:
-
- # Check if this is a map of entries. If so, we'll only export the template
- # to the first address
-- if [[ ${ADDR:0:1} == [ ]]; then
-+ if [ ${ADDR: 0:1} == [ ] && [ ${ADDR: -1} == ] ]; then
- # Remove the square brackets
- ADDR=${ADDR:1:-1}
- # Take the first entry in case there are more than one
-diff --git a/stable/metricbeat/values.yaml b/stable/metricbeat/values.yaml
-index 2908a1b..c8f758c 100644
---- a/stable/metricbeat/values.yaml
-+++ b/stable/metricbeat/values.yaml
-@@ -113,7 +113,7 @@ deployment:
- # Uncomment this to get k8s events:
- # - event
- period: 10s
-- hosts: ["kube-state-metrics:8080"]
-+ hosts: ["${KUBE_STATE_METRICS_HOST}:8080"]
- # If overrideModules is not empty, metricbeat chart's default modules won't be used at all.
- overrideModules: {}
-
-@@ -122,7 +122,9 @@ plugins: []
- # - kinesis.so
-
- # additional environment
--# extraEnv:
-+extraEnv:
-+ - name: KUBE_STATE_METRICS_HOST
-+ value: "mon-kube-state-metrics"
- # - name: test1
- # value: "test1"
- # - name: test2
---
-1.8.3.1
-
+++ /dev/null
-From 4f42518e2e15a65e340e15029c50b53b20e119e9 Mon Sep 17 00:00:00 2001
-From: Kevin Smith <kevin.smith@windriver.com>
-Date: Sat, 14 Sep 2019 12:10:44 -0400
-Subject: [PATCH 1/1] add system info
-
----
- stable/filebeat/templates/configmap.yaml | 22 ++++++++++++++---
- stable/filebeat/templates/daemonset.yaml | 36 ++++++++++++++++++++++++++++
- stable/filebeat/values.yaml | 4 ++++
- stable/logstash/templates/statefulset.yaml | 10 ++++++++
- stable/logstash/values.yaml | 3 +++
- stable/metricbeat/templates/configmap.yaml | 22 ++++++++++++++---
- stable/metricbeat/templates/daemonset.yaml | 37 ++++++++++++++++++++++++++++-
- stable/metricbeat/templates/deployment.yaml | 18 ++++++++++++++
- stable/metricbeat/values.yaml | 4 ++++
- 9 files changed, 149 insertions(+), 7 deletions(-)
-
-diff --git a/stable/filebeat/templates/configmap.yaml b/stable/filebeat/templates/configmap.yaml
-index 8377e5a..c08a4bc 100644
---- a/stable/filebeat/templates/configmap.yaml
-+++ b/stable/filebeat/templates/configmap.yaml
-@@ -18,7 +18,9 @@ data:
- BEAT_VER=$($BEAT version | awk '{print $3}')
-
- ADDR=$OUTPUT_ELASTICSEARCH_HOSTS
-- echo $ADDR
-+ ESPATH=$OUTPUT_ELASTICSEARCH_PATH
-+
-+ echo $ADDR$ESPATH
-
- # Check if this is a map of entries. If so, we'll only export the template
- # to the first address
-@@ -28,7 +30,7 @@ data:
- # Take the first entry in case there are more than one
- ADDR=${ADDR%%,*}
- fi
-- echo $ADDR
-+ echo $ADDR$ESPATH
-
- # Check if user has formatted with http:// on front, if not we need to add
- HTTP='http://'
-@@ -53,7 +55,21 @@ data:
- # remove the lifecycle section of the yaml, as elasticsearch will choke
- # on it as oss version does not support ilm.
- sed -i '/lifecycle/,+3d' /tmp/beat.template.json
-- curl -v $CURL_G -XPUT -H "Content-Type: application/json" $HTTP$ADDR/_template/$BEAT-$BEAT_VER -d@/tmp/beat.template.json
-+
-+ # "unset" is the special system name when none has been set through
-+ # overrides.. We key on that to know what template name and index pattern to set
-+ if [[ $SYSTEM_NAME_FOR_INDEX != unset ]]; then
-+ # replace the standard index pattern with one including our system name,
-+ # which will match our created indices
-+ sed -i "s/$BEAT-$BEAT_VER/$BEAT-$BEAT_VER$SYSTEM_NAME_FOR_INDEX/g" /tmp/beat.template.json
-+ # give the template a name with the system name appended.
-+ curl -v $CURL_G -XPUT -H "Content-Type: application/json" $HTTP$ADDR$ESPATH/_template/$BEAT-$BEAT_VER$SYSTEM_NAME_FOR_INDEX -d@/tmp/beat.template.json
-+ else
-+ # apply a higher order to this template in case there are templates with system names
-+ # which should be applied first
-+ sed -i "s/\"order\": 1/\"order\": 2/g" /tmp/beat.template.json
-+ curl -v $CURL_G -XPUT -H "Content-Type: application/json" $HTTP$ADDR$ESPATH/_template/$BEAT-$BEAT_VER -d@/tmp/beat.template.json
-+ fi
- else
- echo "logstash not configured, not exporting template, should be done for us."
- fi
-diff --git a/stable/filebeat/templates/daemonset.yaml b/stable/filebeat/templates/daemonset.yaml
-index b8536fb..b1833a9 100644
---- a/stable/filebeat/templates/daemonset.yaml
-+++ b/stable/filebeat/templates/daemonset.yaml
-@@ -64,6 +64,24 @@ spec:
- {{- end }}
- {{- end }}
- {{- end }}
-+ ## make system name and index parms visible
-+ {{- if .Values.systemNameForIndex}}
-+ {{ $systemNameNoSpecial := regexReplaceAll "[^A-Za-z0-9-]+" .Values.systemNameForIndex "" }}
-+ {{ $systemNameFormatted := $systemNameNoSpecial | lower | trunc 200 }}
-+ - name: SYSTEM_NAME_FOR_INDEX
-+ value: {{ printf "-%s" $systemNameFormatted | quote }}
-+ - name: INDEX_PATTERN
-+ value: "{{ .Values.indexNamePrefix }}-{{$systemNameFormatted}}-*"
-+ - name: INDEX_NAME
-+ value: "{{ .Values.indexNamePrefix }}-{{$systemNameFormatted}}"
-+ {{- else }}
-+ - name: SYSTEM_NAME_FOR_INDEX
-+ value: "unset"
-+ - name: INDEX_PATTERN
-+ value: "{{ .Values.indexNamePrefix }}-*"
-+ - name: INDEX_NAME
-+ value: "{{ .Values.indexNamePrefix }}"
-+ {{- end }}
- {{- if .Values.indexTemplateLoad }}
- - name: "load-es-template"
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-@@ -116,6 +134,24 @@ spec:
- {{- end }}
- {{- end }}
- {{- end }}
-+ ## make system name and index parms visible
-+ {{- if .Values.systemNameForIndex}}
-+ {{ $systemNameNoSpecial := regexReplaceAll "[^A-Za-z0-9-]+" .Values.systemNameForIndex "" }}
-+ {{ $systemNameFormatted := $systemNameNoSpecial | lower | trunc 200 }}
-+ - name: SYSTEM_NAME_FOR_INDEX
-+ value: {{ printf "-%s" $systemNameFormatted | quote }}
-+ - name: INDEX_PATTERN
-+ value: "{{ .Values.indexNamePrefix }}-{{$systemNameFormatted}}-*"
-+ - name: INDEX_NAME
-+ value: "{{ .Values.indexNamePrefix }}-{{$systemNameFormatted}}"
-+ {{- else }}
-+ - name: SYSTEM_NAME_FOR_INDEX
-+ value: "unset"
-+ - name: INDEX_PATTERN
-+ value: "{{ .Values.indexNamePrefix }}-*"
-+ - name: INDEX_NAME
-+ value: "{{ .Values.indexNamePrefix }}"
-+ {{- end }}
- {{- if .Values.extraVars }}
- {{ toYaml .Values.extraVars | indent 8 }}
- {{- end }}
-diff --git a/stable/filebeat/values.yaml b/stable/filebeat/values.yaml
-index b4b766f..3897c82 100644
---- a/stable/filebeat/values.yaml
-+++ b/stable/filebeat/values.yaml
-@@ -68,6 +68,10 @@ extraVars: []
- # name: configmap
- # key: config.key
-
-+# Will be used in index name
-+systemNameForIndex: ""
-+indexNamePrefix: filebeat-%{[agent.version]}
-+
- # Add additional volumes and mounts, for example to read other log files on the host
- extraVolumes: []
- # - hostPath:
-diff --git a/stable/logstash/templates/statefulset.yaml b/stable/logstash/templates/statefulset.yaml
-index cca0050..070ef56 100644
---- a/stable/logstash/templates/statefulset.yaml
-+++ b/stable/logstash/templates/statefulset.yaml
-@@ -71,6 +71,16 @@ spec:
- value: {{ .Values.elasticsearch.host | quote }}
- - name: ELASTICSEARCH_PORT
- value: {{ .Values.elasticsearch.port | quote }}
-+ ## make system name visible for in setting index.
-+ {{- if .Values.systemNameForIndex}}
-+ {{ $systemNameNoSpecial := regexReplaceAll "[^A-Za-z0-9-]+" .Values.systemNameForIndex "" }}
-+ {{ $systemNameFormatted := $systemNameNoSpecial | lower | trunc 200 }}
-+ - name: SYSTEM_NAME_FOR_INDEX
-+ value: {{ printf "-%s" $systemNameFormatted | quote }}
-+ {{- else }}
-+ - name: SYSTEM_NAME_FOR_INDEX
-+ value: ""
-+ {{- end }}
- ## Additional env vars
- {{- range $key, $value := .Values.config }}
- - name: {{ $key | upper | replace "." "_" }}
-diff --git a/stable/logstash/values.yaml b/stable/logstash/values.yaml
-index 9a452b1..9ba80c9 100644
---- a/stable/logstash/values.yaml
-+++ b/stable/logstash/values.yaml
-@@ -220,6 +220,9 @@ patterns:
- # main: |-
- # TESTING {"foo":.*}$
-
-+# Will be used in index names
-+systemNameForIndex: ""
-+
- ## Custom files that can be referenced by plugins.
- ## Each YAML heredoc will become located in the logstash home directory under
- ## the files subdirectory.
-diff --git a/stable/metricbeat/templates/configmap.yaml b/stable/metricbeat/templates/configmap.yaml
-index 4249e7f..9ae276d 100644
---- a/stable/metricbeat/templates/configmap.yaml
-+++ b/stable/metricbeat/templates/configmap.yaml
-@@ -18,7 +18,9 @@ data:
- BEAT_VER=$($BEAT version | awk '{print $3}')
-
- ADDR=$OUTPUT_ELASTICSEARCH_HOSTS
-- echo $ADDR
-+ ESPATH=$OUTPUT_ELASTICSEARCH_PATH
-+
-+ echo $ADDR$ESPATH
-
- # Check if this is a map of entries. If so, we'll only export the template
- # to the first address
-@@ -28,7 +30,7 @@ data:
- # Take the first entry in case there are more than one
- ADDR=${ADDR%%,*}
- fi
-- echo $ADDR
-+ echo $ADDR$ESPATH
-
- # Check if user has formatted with http:// on front, if not we need to add
- HTTP='http://'
-@@ -53,7 +55,21 @@ data:
- # remove the lifecycle section of the yaml, as elasticsearch will choke
- # on it as oss version does not support ilm.
- sed -i '/lifecycle/,+3d' /tmp/beat.template.json
-- curl -v $CURL_G -XPUT -H "Content-Type: application/json" $HTTP$ADDR/_template/$BEAT-$BEAT_VER -d@/tmp/beat.template.json
-+
-+ # "unset" is the special system name when none has been set through
-+ # overrides.. We key on that to know what template name and index pattern to set
-+ if [[ $SYSTEM_NAME_FOR_INDEX != unset ]]; then
-+ # replace the standard index pattern with one including our system name,
-+ # which will match our created indices
-+ sed -i "s/$BEAT-$BEAT_VER/$BEAT-$BEAT_VER$SYSTEM_NAME_FOR_INDEX/g" /tmp/beat.template.json
-+ # give the template a name with the system name appended.
-+ curl -v $CURL_G -XPUT -H "Content-Type: application/json" $HTTP$ADDR$ESPATH/_template/$BEAT-$BEAT_VER$SYSTEM_NAME_FOR_INDEX -d@/tmp/beat.template.json
-+ else
-+ # apply a higher order to this template in case there are templates with system names
-+ # which should be applied first
-+ sed -i "s/\"order\": 1/\"order\": 2/g" /tmp/beat.template.json
-+ curl -v $CURL_G -XPUT -H "Content-Type: application/json" $HTTP$ADDR$ESPATH/_template/$BEAT-$BEAT_VER -d@/tmp/beat.template.json
-+ fi
- else
- echo "logstash not configured, not exporting template, should be done for us."
- fi
-diff --git a/stable/metricbeat/templates/daemonset.yaml b/stable/metricbeat/templates/daemonset.yaml
-index 1ae3a34..947e501 100644
---- a/stable/metricbeat/templates/daemonset.yaml
-+++ b/stable/metricbeat/templates/daemonset.yaml
-@@ -59,7 +59,24 @@ spec:
- {{- end }}
- {{- end }}
- {{- end }}
--
-+ ## make system name and index parms visible
-+ {{- if .Values.systemNameForIndex}}
-+ {{ $systemNameNoSpecial := regexReplaceAll "[^A-Za-z0-9-]+" .Values.systemNameForIndex "" }}
-+ {{ $systemNameFormatted := $systemNameNoSpecial | lower | trunc 200 }}
-+ - name: SYSTEM_NAME_FOR_INDEX
-+ value: {{ printf "-%s" $systemNameFormatted | quote }}
-+ - name: INDEX_PATTERN
-+ value: "{{ .Values.indexNamePrefix }}-{{$systemNameFormatted}}-*"
-+ - name: INDEX_NAME
-+ value: "{{ .Values.indexNamePrefix }}-{{$systemNameFormatted}}"
-+ {{- else }}
-+ - name: SYSTEM_NAME_FOR_INDEX
-+ value: "unset"
-+ - name: INDEX_PATTERN
-+ value: "{{ .Values.indexNamePrefix }}-*"
-+ - name: INDEX_NAME
-+ value: "{{ .Values.indexNamePrefix }}"
-+ {{- end }}
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-@@ -94,6 +111,24 @@ spec:
- {{- end }}
- {{- end }}
- {{- end }}
-+ ## make system name and index parms visible
-+ {{- if .Values.systemNameForIndex}}
-+ {{ $systemNameNoSpecial := regexReplaceAll "[^A-Za-z0-9-]+" .Values.systemNameForIndex "" }}
-+ {{ $systemNameFormatted := $systemNameNoSpecial | lower | trunc 200 }}
-+ - name: SYSTEM_NAME_FOR_INDEX
-+ value: {{ printf "-%s" $systemNameFormatted | quote }}
-+ - name: INDEX_PATTERN
-+ value: "{{ .Values.indexNamePrefix }}-{{$systemNameFormatted}}-*"
-+ - name: INDEX_NAME
-+ value: "{{ .Values.indexNamePrefix }}-{{$systemNameFormatted}}"
-+ {{- else }}
-+ - name: SYSTEM_NAME_FOR_INDEX
-+ value: "unset"
-+ - name: INDEX_PATTERN
-+ value: "{{ .Values.indexNamePrefix }}-*"
-+ - name: INDEX_NAME
-+ value: "{{ .Values.indexNamePrefix }}"
-+ {{- end }}
- {{- if .Values.extraEnv }}
- {{ toYaml .Values.extraEnv | indent 8 }}
- {{- end }}
-diff --git a/stable/metricbeat/templates/deployment.yaml b/stable/metricbeat/templates/deployment.yaml
-index 47ada04..d1d08e3 100644
---- a/stable/metricbeat/templates/deployment.yaml
-+++ b/stable/metricbeat/templates/deployment.yaml
-@@ -55,6 +55,24 @@ spec:
- valueFrom:
- fieldRef:
- fieldPath: spec.nodeName
-+ ## make system name and index parms visible
-+ {{- if .Values.systemNameForIndex}}
-+ {{ $systemNameNoSpecial := regexReplaceAll "[^A-Za-z0-9-]+" .Values.systemNameForIndex "" }}
-+ {{ $systemNameFormatted := $systemNameNoSpecial | lower | trunc 200 }}
-+ - name: SYSTEM_NAME_FOR_INDEX
-+ value: {{ printf "-%s" $systemNameFormatted | quote }}
-+ - name: INDEX_PATTERN
-+ value: "{{ .Values.indexNamePrefix }}-{{$systemNameFormatted}}-*"
-+ - name: INDEX_NAME
-+ value: "{{ .Values.indexNamePrefix }}-{{$systemNameFormatted}}"
-+ {{- else }}
-+ - name: SYSTEM_NAME_FOR_INDEX
-+ value: "unset"
-+ - name: INDEX_PATTERN
-+ value: "{{ .Values.indexNamePrefix }}-*"
-+ - name: INDEX_NAME
-+ value: "{{ .Values.indexNamePrefix }}"
-+ {{- end }}
- {{- if .Values.extraEnv }}
- {{ toYaml .Values.extraEnv | indent 8 }}
- {{- end }}
-diff --git a/stable/metricbeat/values.yaml b/stable/metricbeat/values.yaml
-index c8f758c..b59c428 100644
---- a/stable/metricbeat/values.yaml
-+++ b/stable/metricbeat/values.yaml
-@@ -130,6 +130,10 @@ extraEnv:
- # - name: test2
- # value: "test2"
-
-+# Will be used in index name
-+systemNameForIndex: ""
-+indexNamePrefix: metricbeat-%{[agent.version]}
-+
- # Add additional volumes and mounts, for example to read other log files on the host
- extraVolumes: []
- # - hostPath:
---
-1.8.3.1
-
+++ /dev/null
-From 876e674e26400dcbbee5ee52b6cd7c9b430063f7 Mon Sep 17 00:00:00 2001
-From: Kevin Smith <kevin.smith@windriver.com>
-Date: Mon, 23 Sep 2019 13:29:06 -0400
-Subject: [PATCH 1/1] three masters
-
----
- stable/elasticsearch/templates/data-statefulset.yaml | 2 +-
- stable/elasticsearch/values.yaml | 3 +++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/stable/elasticsearch/templates/data-statefulset.yaml b/stable/elasticsearch/templates/data-statefulset.yaml
-index 44b6be1..69b54cd 100644
---- a/stable/elasticsearch/templates/data-statefulset.yaml
-+++ b/stable/elasticsearch/templates/data-statefulset.yaml
-@@ -114,7 +114,7 @@ spec:
- - name: DISCOVERY_SERVICE
- value: {{ template "elasticsearch.fullname" . }}-discovery
- - name: NODE_MASTER
-- value: "false"
-+ value: {{ .Values.data.combinedDataAndMaster | quote }}
- - name: PROCESSORS
- valueFrom:
- resourceFieldRef:
-diff --git a/stable/elasticsearch/values.yaml b/stable/elasticsearch/values.yaml
-index 37321dc..a4b65b7 100644
---- a/stable/elasticsearch/values.yaml
-+++ b/stable/elasticsearch/values.yaml
-@@ -222,6 +222,9 @@ data:
- drain: # drain the node before stopping it and re-integrate it into the cluster after start
- enabled: true
-
-+ # If below is true, data nodes will also be master capable
-+ combinedDataAndMaster: false
-+
- ## Sysctl init container to setup vm.max_map_count
- # see https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html
- # and https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-configuration-memory.html#mlockall
---
-1.8.3.1
-
+++ /dev/null
-From f82b9b85ac03f59fd1ce9b7eb0a9ed2afac47995 Mon Sep 17 00:00:00 2001
-From: John Kung <john.kung@windriver.com>
-Date: Sun, 6 Oct 2019 12:50:45 -0400
-Subject: [PATCH 1/1] 0008-Update-stx-monitor-for-kubernetes-API-1.16
-
----
- stable/elasticsearch/templates/client-deployment.yaml | 6 +++++-
- stable/elasticsearch/templates/client-ingress.yaml | 2 +-
- stable/elasticsearch/templates/data-statefulset.yaml | 7 ++++++-
- stable/elasticsearch/templates/master-statefulset.yaml | 7 ++++++-
- stable/elasticsearch/templates/podsecuritypolicy.yaml | 2 +-
- stable/filebeat/templates/daemonset.yaml | 2 +-
- stable/filebeat/templates/podsecuritypolicy.yaml | 2 +-
- stable/kibana/templates/deployment.yaml | 6 +++++-
- stable/kibana/templates/ingress.yaml | 2 +-
- stable/kube-state-metrics/templates/deployment.yaml | 5 ++++-
- stable/kube-state-metrics/templates/podsecuritypolicy.yaml | 2 +-
- stable/logstash/templates/ingress.yaml | 2 +-
- stable/logstash/templates/statefulset.yaml | 2 +-
- stable/metricbeat/templates/podsecuritypolicy.yaml | 2 +-
- stable/nginx-ingress/templates/controller-daemonset.yaml | 6 +++++-
- stable/nginx-ingress/templates/controller-deployment.yaml | 6 +++++-
- stable/nginx-ingress/templates/default-backend-deployment.yaml | 6 +++++-
- stable/nginx-ingress/templates/podsecuritypolicy.yaml | 2 +-
- 18 files changed, 51 insertions(+), 18 deletions(-)
-
-diff --git a/stable/elasticsearch/templates/client-deployment.yaml b/stable/elasticsearch/templates/client-deployment.yaml
-index 5625ee0..8bd1b15 100644
---- a/stable/elasticsearch/templates/client-deployment.yaml
-+++ b/stable/elasticsearch/templates/client-deployment.yaml
-@@ -1,4 +1,4 @@
--apiVersion: apps/v1beta1
-+apiVersion: apps/v1
- kind: Deployment
- metadata:
- labels:
-@@ -9,6 +9,10 @@ metadata:
- release: {{ .Release.Name }}
- name: {{ template "elasticsearch.client.fullname" . }}
- spec:
-+ selector:
-+ matchLabels:
-+ app: {{ template "elasticsearch.name" . }}
-+ release: {{ .Release.Name }}
- replicas: {{ .Values.client.replicas }}
- template:
- metadata:
-diff --git a/stable/elasticsearch/templates/client-ingress.yaml b/stable/elasticsearch/templates/client-ingress.yaml
-index 9070cdd..8eb4b9a 100644
---- a/stable/elasticsearch/templates/client-ingress.yaml
-+++ b/stable/elasticsearch/templates/client-ingress.yaml
-@@ -1,7 +1,7 @@
- {{- if .Values.client.ingress.enabled -}}
- {{- $fullName := include "elasticsearch.client.fullname" . -}}
- {{- $ingressPath := .Values.client.ingress.path -}}
--apiVersion: extensions/v1beta1
-+apiVersion: networking.k8s.io/v1beta1
- kind: Ingress
- metadata:
- name: {{ $fullName }}
-diff --git a/stable/elasticsearch/templates/data-statefulset.yaml b/stable/elasticsearch/templates/data-statefulset.yaml
-index 69b54cd..ccf7ad2 100644
---- a/stable/elasticsearch/templates/data-statefulset.yaml
-+++ b/stable/elasticsearch/templates/data-statefulset.yaml
-@@ -1,4 +1,4 @@
--apiVersion: apps/v1beta1
-+apiVersion: apps/v1
- kind: StatefulSet
- metadata:
- labels:
-@@ -11,6 +11,11 @@ metadata:
- spec:
- serviceName: {{ template "elasticsearch.data.fullname" . }}
- replicas: {{ .Values.data.replicas }}
-+ selector:
-+ matchLabels:
-+ app: {{ template "elasticsearch.name" . }}
-+ component: "{{ .Values.data.name }}"
-+ release: {{ .Release.Name }}
- template:
- metadata:
- labels:
-diff --git a/stable/elasticsearch/templates/master-statefulset.yaml b/stable/elasticsearch/templates/master-statefulset.yaml
-index 7c48fe3..aa7014d 100644
---- a/stable/elasticsearch/templates/master-statefulset.yaml
-+++ b/stable/elasticsearch/templates/master-statefulset.yaml
-@@ -1,4 +1,4 @@
--apiVersion: apps/v1beta1
-+apiVersion: apps/v1
- kind: StatefulSet
- metadata:
- labels:
-@@ -11,6 +11,11 @@ metadata:
- spec:
- serviceName: {{ template "elasticsearch.master.fullname" . }}
- replicas: {{ .Values.master.replicas }}
-+ selector:
-+ matchLabels:
-+ app: {{ template "elasticsearch.name" . }}
-+ component: "{{ .Values.master.name }}"
-+ release: {{ .Release.Name }}
- template:
- metadata:
- labels:
-diff --git a/stable/elasticsearch/templates/podsecuritypolicy.yaml b/stable/elasticsearch/templates/podsecuritypolicy.yaml
-index ee38e35..fd5f663 100644
---- a/stable/elasticsearch/templates/podsecuritypolicy.yaml
-+++ b/stable/elasticsearch/templates/podsecuritypolicy.yaml
-@@ -1,5 +1,5 @@
- {{- if .Values.podSecurityPolicy.enabled }}
--apiVersion: extensions/v1beta1
-+apiVersion: policy/v1beta1
- kind: PodSecurityPolicy
- metadata:
- name: {{ template "elasticsearch.fullname" . }}
-diff --git a/stable/filebeat/templates/daemonset.yaml b/stable/filebeat/templates/daemonset.yaml
-index b1833a9..22b46df 100644
---- a/stable/filebeat/templates/daemonset.yaml
-+++ b/stable/filebeat/templates/daemonset.yaml
-@@ -1,4 +1,4 @@
--apiVersion: apps/v1beta2
-+apiVersion: apps/v1
- kind: DaemonSet
- metadata:
- name: {{ template "filebeat.fullname" . }}
-diff --git a/stable/filebeat/templates/podsecuritypolicy.yaml b/stable/filebeat/templates/podsecuritypolicy.yaml
-index 3a11b38..25a0f06 100644
---- a/stable/filebeat/templates/podsecuritypolicy.yaml
-+++ b/stable/filebeat/templates/podsecuritypolicy.yaml
-@@ -1,6 +1,6 @@
- {{- if .Values.rbac.create -}}
- {{- if .Values.podSecurityPolicy.enabled }}
--apiVersion: extensions/v1beta1
-+apiVersion: policy/v1beta1
- kind: PodSecurityPolicy
- metadata:
- name: {{ template "filebeat.fullname" . }}
-diff --git a/stable/kibana/templates/deployment.yaml b/stable/kibana/templates/deployment.yaml
-index 33fc6f0..c5229ae 100644
---- a/stable/kibana/templates/deployment.yaml
-+++ b/stable/kibana/templates/deployment.yaml
-@@ -1,4 +1,4 @@
--apiVersion: apps/v1beta1
-+apiVersion: apps/v1
- kind: Deployment
- metadata:
- labels:
-@@ -13,6 +13,10 @@ metadata:
- {{- end }}
- spec:
- replicas: {{ .Values.replicaCount }}
-+ selector:
-+ matchLabels:
-+ app: {{ template "kibana.name" . }}
-+ release: {{ .Release.Name }}
- revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
- template:
- metadata:
-diff --git a/stable/kibana/templates/ingress.yaml b/stable/kibana/templates/ingress.yaml
-index de14ae9..9d97e26 100644
---- a/stable/kibana/templates/ingress.yaml
-+++ b/stable/kibana/templates/ingress.yaml
-@@ -1,7 +1,7 @@
- {{- if .Values.ingress.enabled -}}
- {{- $serviceName := include "kibana.fullname" . -}}
- {{- $servicePort := .Values.service.externalPort -}}
--apiVersion: extensions/v1beta1
-+apiVersion: networking.k8s.io/v1beta1
- kind: Ingress
- metadata:
- labels:
-diff --git a/stable/kube-state-metrics/templates/deployment.yaml b/stable/kube-state-metrics/templates/deployment.yaml
-index b251758..ce02f8e 100644
---- a/stable/kube-state-metrics/templates/deployment.yaml
-+++ b/stable/kube-state-metrics/templates/deployment.yaml
-@@ -1,4 +1,4 @@
--apiVersion: extensions/v1beta1
-+apiVersion: apps/v1
- kind: Deployment
- metadata:
- name: {{ template "kube-state-metrics.fullname" . }}
-@@ -8,6 +8,9 @@ metadata:
- release: "{{ .Release.Name }}"
- heritage: "{{ .Release.Service }}"
- spec:
-+ selector:
-+ matchLabels:
-+ app: {{ template "kube-state-metrics.name" . }}
- replicas: {{ .Values.replicas }}
- template:
- metadata:
-diff --git a/stable/kube-state-metrics/templates/podsecuritypolicy.yaml b/stable/kube-state-metrics/templates/podsecuritypolicy.yaml
-index d195a5f..4ca46ac 100644
---- a/stable/kube-state-metrics/templates/podsecuritypolicy.yaml
-+++ b/stable/kube-state-metrics/templates/podsecuritypolicy.yaml
-@@ -1,5 +1,5 @@
- {{- if .Values.podSecurityPolicy.enabled }}
--apiVersion: extensions/v1beta1
-+apiVersion: policy/v1beta1
- kind: PodSecurityPolicy
- metadata:
- name: {{ template "kube-state-metrics.fullname" . }}
-diff --git a/stable/logstash/templates/ingress.yaml b/stable/logstash/templates/ingress.yaml
-index 0e26f89..d107a32 100644
---- a/stable/logstash/templates/ingress.yaml
-+++ b/stable/logstash/templates/ingress.yaml
-@@ -1,7 +1,7 @@
- {{- if .Values.ingress.enabled -}}
- {{- $fullName := include "logstash.fullname" . -}}
- {{- $ingressPath := .Values.ingress.path -}}
--apiVersion: extensions/v1beta1
-+apiVersion: networking.k8s.io/v1beta1
- kind: Ingress
- metadata:
- name: {{ $fullName }}
-diff --git a/stable/logstash/templates/statefulset.yaml b/stable/logstash/templates/statefulset.yaml
-index 070ef56..1a1a3ef 100644
---- a/stable/logstash/templates/statefulset.yaml
-+++ b/stable/logstash/templates/statefulset.yaml
-@@ -1,4 +1,4 @@
--apiVersion: apps/v1beta2
-+apiVersion: apps/v1
- kind: StatefulSet
- metadata:
- name: {{ template "logstash.fullname" . }}
-diff --git a/stable/metricbeat/templates/podsecuritypolicy.yaml b/stable/metricbeat/templates/podsecuritypolicy.yaml
-index 29fb2a9..90231e2 100644
---- a/stable/metricbeat/templates/podsecuritypolicy.yaml
-+++ b/stable/metricbeat/templates/podsecuritypolicy.yaml
-@@ -1,5 +1,5 @@
- {{- if .Values.rbac.pspEnabled }}
--apiVersion: extensions/v1beta1
-+apiVersion: policy/v1beta1
- kind: PodSecurityPolicy
- metadata:
- name: {{ template "metricbeat.fullname" . }}
-diff --git a/stable/nginx-ingress/templates/controller-daemonset.yaml b/stable/nginx-ingress/templates/controller-daemonset.yaml
-index a05062e..c6e8271 100644
---- a/stable/nginx-ingress/templates/controller-daemonset.yaml
-+++ b/stable/nginx-ingress/templates/controller-daemonset.yaml
-@@ -1,5 +1,5 @@
- {{- if eq .Values.controller.kind "DaemonSet" }}
--apiVersion: extensions/v1beta1
-+apiVersion: apps/v1
- kind: DaemonSet
- metadata:
- labels:
-@@ -10,6 +10,10 @@ metadata:
- release: {{ .Release.Name }}
- name: {{ template "nginx-ingress.controller.fullname" . }}
- spec:
-+ selector:
-+ matchLabels:
-+ app: {{ template "nginx-ingress.name" . }}
-+ release: {{ .Release.Name }}
- revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
- updateStrategy:
- {{ toYaml .Values.controller.updateStrategy | indent 4 }}
-diff --git a/stable/nginx-ingress/templates/controller-deployment.yaml b/stable/nginx-ingress/templates/controller-deployment.yaml
-index 7d78507..f653c8a 100644
---- a/stable/nginx-ingress/templates/controller-deployment.yaml
-+++ b/stable/nginx-ingress/templates/controller-deployment.yaml
-@@ -1,5 +1,5 @@
- {{- if eq .Values.controller.kind "Deployment" }}
--apiVersion: extensions/v1beta1
-+apiVersion: apps/v1
- kind: Deployment
- metadata:
- labels:
-@@ -10,6 +10,10 @@ metadata:
- release: {{ .Release.Name }}
- name: {{ template "nginx-ingress.controller.fullname" . }}
- spec:
-+ selector:
-+ matchLabels:
-+ app: {{ template "nginx-ingress.name" . }}
-+ release: {{ .Release.Name }}
- replicas: {{ .Values.controller.replicaCount }}
- revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
- strategy:
-diff --git a/stable/nginx-ingress/templates/default-backend-deployment.yaml b/stable/nginx-ingress/templates/default-backend-deployment.yaml
-index 93ea613..399b798 100644
---- a/stable/nginx-ingress/templates/default-backend-deployment.yaml
-+++ b/stable/nginx-ingress/templates/default-backend-deployment.yaml
-@@ -1,5 +1,5 @@
- {{- if .Values.defaultBackend.enabled }}
--apiVersion: extensions/v1beta1
-+apiVersion: apps/v1
- kind: Deployment
- metadata:
- labels:
-@@ -10,6 +10,10 @@ metadata:
- release: {{ .Release.Name }}
- name: {{ template "nginx-ingress.defaultBackend.fullname" . }}
- spec:
-+ selector:
-+ matchLabels:
-+ app: {{ template "nginx-ingress.name" . }}
-+ release: {{ .Release.Name }}
- replicas: {{ .Values.defaultBackend.replicaCount }}
- revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
- template:
-diff --git a/stable/nginx-ingress/templates/podsecuritypolicy.yaml b/stable/nginx-ingress/templates/podsecuritypolicy.yaml
-index 9222daf..b99aee8 100644
---- a/stable/nginx-ingress/templates/podsecuritypolicy.yaml
-+++ b/stable/nginx-ingress/templates/podsecuritypolicy.yaml
-@@ -1,5 +1,5 @@
- {{- if .Values.podSecurityPolicy.enabled}}
--apiVersion: extensions/v1beta1
-+apiVersion: policy/v1beta1
- kind: PodSecurityPolicy
- metadata:
- name: {{ template "nginx-ingress.fullname" . }}
---
-1.8.3.1
-
+++ /dev/null
-From 21cd4d9720064f89843551e7da4c1e0528b6cbf5 Mon Sep 17 00:00:00 2001
-From: Kevin Smith <kevin.smith@windriver.com>
-Date: Thu, 10 Oct 2019 15:43:20 -0400
-Subject: [PATCH 1/1] add curator as of 2019-10-10
-
----
- stable/elasticsearch-curator/Chart.yaml | 6 +--
- stable/elasticsearch-curator/OWNERS | 6 +--
- stable/elasticsearch-curator/README.md | 34 ++++++++++---
- .../ci/initcontainer-values.yaml | 9 ++++
- .../elasticsearch-curator/templates/_helpers.tpl | 22 +++++++++
- .../elasticsearch-curator/templates/cronjob.yaml | 10 ++++
- stable/elasticsearch-curator/templates/psp.yml | 35 +++++++++++++
- stable/elasticsearch-curator/templates/role.yaml | 23 +++++++++
- .../templates/rolebinding.yaml | 21 ++++++++
- .../templates/serviceaccount.yaml | 12 +++++
- stable/elasticsearch-curator/values.yaml | 57 ++++++++++++++++++++--
- 11 files changed, 218 insertions(+), 17 deletions(-)
- create mode 100644 stable/elasticsearch-curator/ci/initcontainer-values.yaml
- create mode 100644 stable/elasticsearch-curator/templates/psp.yml
- create mode 100644 stable/elasticsearch-curator/templates/role.yaml
- create mode 100644 stable/elasticsearch-curator/templates/rolebinding.yaml
- create mode 100644 stable/elasticsearch-curator/templates/serviceaccount.yaml
-
-diff --git a/stable/elasticsearch-curator/Chart.yaml b/stable/elasticsearch-curator/Chart.yaml
-index 24a37ce..7a8e0a7 100644
---- a/stable/elasticsearch-curator/Chart.yaml
-+++ b/stable/elasticsearch-curator/Chart.yaml
-@@ -2,7 +2,7 @@ apiVersion: v1
- appVersion: "5.5.4"
- description: A Helm chart for Elasticsearch Curator
- name: elasticsearch-curator
--version: 1.3.2
-+version: 2.0.2
- home: https://github.com/elastic/curator
- keywords:
- - curator
-@@ -12,7 +12,7 @@ sources:
- - https://github.com/kubernetes/charts/elasticsearch-curator
- - https://github.com/pires/docker-elasticsearch-curator
- maintainers:
-- - name: tmestdagh
-- email: mestdagh.tom@gmail.com
-+ - name: desaintmartin
-+ email: cedric.dsm@gmail.com
- - name: gianrubio
- email: gianrubio@gmail.com
-diff --git a/stable/elasticsearch-curator/OWNERS b/stable/elasticsearch-curator/OWNERS
-index d8c0ba0..89df1c0 100644
---- a/stable/elasticsearch-curator/OWNERS
-+++ b/stable/elasticsearch-curator/OWNERS
-@@ -1,6 +1,6 @@
- approvers:
-- - tmestdagh
-+ - desaintmartin
- - gianrubio
- reviewers:
-- - tmestdagh
-- - gianrubio
-\ No newline at end of file
-+ - desaintmartin
-+ - gianrubio
-diff --git a/stable/elasticsearch-curator/README.md b/stable/elasticsearch-curator/README.md
-index 0a9f311..2057b85 100644
---- a/stable/elasticsearch-curator/README.md
-+++ b/stable/elasticsearch-curator/README.md
-@@ -23,6 +23,17 @@ To install the chart, use the following:
- $ helm install stable/elasticsearch-curator
- ```
-
-+## Upgrading an existing Release to a new major version
-+
-+A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an
-+incompatible breaking change needing manual actions.
-+
-+### To 2.0.0
-+
-+v2.0.0 uses docker image from `elasticsearch-curator` author, which differs in its way to install curator.
-+
-+If you have a hardcoded `command` value, please update it to follow the new `curator` executable path: `/curator/curator` (which is not in PATH).
-+
- ## Configuration
-
- The following table lists the configurable parameters of the docker-registry chart and
-@@ -31,8 +42,8 @@ their default values.
- | Parameter | Description | Default |
- | :----------------------------------- | :---------------------------------------------------------- | :------------------------------------------- |
- | `image.pullPolicy` | Container pull policy | `IfNotPresent` |
--| `image.repository` | Container image to use | `quay.io/pires/docker-elasticsearch-curator` |
--| `image.tag` | Container image tag to deploy | `5.5.4` |
-+| `image.repository` | Container image to use | `untergeek/curator` |
-+| `image.tag` | Container image tag to deploy | `5.7.6` |
- | `hooks` | Whether to run job on selected hooks | `{ "install": false, "upgrade": false }` |
- | `cronjob.schedule` | Schedule for the CronJob | `0 1 * * *` |
- | `cronjob.annotations` | Annotations to add to the cronjob | {} |
-@@ -43,15 +54,22 @@ their default values.
- | `dryrun` | Run Curator in dry-run mode | `false` |
- | `env` | Environment variables to add to the cronjob container | {} |
- | `envFromSecrets` | Environment variables from secrets to the cronjob container | {} |
--| `envFromSecrets.*.from.secret` | - `secretKeyRef.name` used for environment variable | |
--| `envFromSecrets.*.from.key` | - `secretKeyRef.key` used for environment variable | |
--| `command` | Command to execute | ["curator"] |
--| `configMaps.action_file_yml` | Contents of the Curator action_file.yml | See values.yaml |
--| `configMaps.config_yml` | Contents of the Curator config.yml (overrides config) | See values.yaml |
-+| `envFromSecrets.*.from.secret` | - `secretKeyRef.name` used for environment variable | |
-+| `envFromSecrets.*.from.key` | - `secretKeyRef.key` used for environment variable | |
-+| `command` | Command to execute | ["/curator/curator"] |
-+| `configMaps.action_file_yml` | Contents of the Curator action_file.yml | See values.yaml |
-+| `configMaps.config_yml` | Contents of the Curator config.yml (overrides config) | See values.yaml |
- | `resources` | Resource requests and limits | {} |
- | `priorityClassName` | priorityClassName | `nil` |
- | `extraVolumeMounts` | Mount extra volume(s), | |
- | `extraVolumes` | Extra volumes | |
--| `securityContext` | Configure PodSecurityContext |
-+| `extraInitContainers` | Init containers to add to the cronjob container | {} |
-+| `securityContext` | Configure PodSecurityContext | `false` |
-+| `rbac.enabled` | Enable RBAC resources | `false` |
-+| `psp.create` | Create pod security policy resources | `false` |
-+| `serviceAccount.create` | Create a default serviceaccount for elasticsearch curator | `true` |
-+| `serviceAccount.name` | Name for elasticsearch curator serviceaccount | `""` |
-+
-+
- Specify each parameter using the `--set key=value[,key=value]` argument to
- `helm install`.
-diff --git a/stable/elasticsearch-curator/ci/initcontainer-values.yaml b/stable/elasticsearch-curator/ci/initcontainer-values.yaml
-new file mode 100644
-index 0000000..578becf
---- /dev/null
-+++ b/stable/elasticsearch-curator/ci/initcontainer-values.yaml
-@@ -0,0 +1,9 @@
-+extraInitContainers:
-+ test:
-+ image: alpine:latest
-+ command:
-+ - "/bin/sh"
-+ - "-c"
-+ args:
-+ - |
-+ true
-diff --git a/stable/elasticsearch-curator/templates/_helpers.tpl b/stable/elasticsearch-curator/templates/_helpers.tpl
-index c786fb5..8018c5d 100644
---- a/stable/elasticsearch-curator/templates/_helpers.tpl
-+++ b/stable/elasticsearch-curator/templates/_helpers.tpl
-@@ -12,6 +12,17 @@ Return the appropriate apiVersion for cronjob APIs.
- {{- end -}}
-
- {{/*
-+Return the appropriate apiVersion for podsecuritypolicy.
-+*/}}
-+{{- define "podsecuritypolicy.apiVersion" -}}
-+{{- if semverCompare "<1.10-0" .Capabilities.KubeVersion.GitVersion -}}
-+{{- print "extensions/v1beta1" -}}
-+{{- else -}}
-+{{- print "policy/v1beta1" -}}
-+{{- end -}}
-+{{- end -}}
-+
-+{{/*
- Expand the name of the chart.
- */}}
- {{- define "elasticsearch-curator.name" -}}
-@@ -42,3 +53,14 @@ Create chart name and version as used by the chart label.
- {{- define "elasticsearch-curator.chart" -}}
- {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
- {{- end -}}
-+
-+{{/*
-+Create the name of the service account to use
-+*/}}
-+{{- define "elasticsearch-curator.serviceAccountName" -}}
-+{{- if .Values.serviceAccount.create -}}
-+ {{ default (include "elasticsearch-curator.fullname" .) .Values.serviceAccount.name }}
-+{{- else -}}
-+ {{ default "default" .Values.serviceAccount.name }}
-+{{- end -}}
-+{{- end -}}
-diff --git a/stable/elasticsearch-curator/templates/cronjob.yaml b/stable/elasticsearch-curator/templates/cronjob.yaml
-index d0388f4..37274f6 100644
---- a/stable/elasticsearch-curator/templates/cronjob.yaml
-+++ b/stable/elasticsearch-curator/templates/cronjob.yaml
-@@ -53,6 +53,16 @@ spec:
- imagePullSecrets:
- - name: {{ .Values.image.pullSecret }}
- {{- end }}
-+{{- if .Values.extraInitContainers }}
-+ initContainers:
-+{{- range $key, $value := .Values.extraInitContainers }}
-+ - name: "{{ $key }}"
-+{{ toYaml $value | indent 12 }}
-+{{- end }}
-+{{- end }}
-+ {{- if .Values.rbac.enabled }}
-+ serviceAccountName: {{ template "elasticsearch-curator.serviceAccountName" .}}
-+ {{- end }}
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-diff --git a/stable/elasticsearch-curator/templates/psp.yml b/stable/elasticsearch-curator/templates/psp.yml
-new file mode 100644
-index 0000000..5f62985
---- /dev/null
-+++ b/stable/elasticsearch-curator/templates/psp.yml
-@@ -0,0 +1,35 @@
-+{{- if .Values.psp.create }}
-+apiVersion: {{ template "podsecuritypolicy.apiVersion" . }}
-+kind: PodSecurityPolicy
-+metadata:
-+ labels:
-+ app: {{ template "elasticsearch-curator.name" . }}
-+ chart: {{ template "elasticsearch-curator.chart" . }}
-+ release: {{ .Release.Name }}
-+ heritage: {{ .Release.Service }}
-+ name: {{ template "elasticsearch-curator.fullname" . }}-psp
-+spec:
-+ privileged: true
-+ #requiredDropCapabilities:
-+ volumes:
-+ - 'configMap'
-+ - 'secret'
-+ hostNetwork: false
-+ hostIPC: false
-+ hostPID: false
-+ runAsUser:
-+ rule: 'RunAsAny'
-+ seLinux:
-+ rule: 'RunAsAny'
-+ supplementalGroups:
-+ rule: 'MustRunAs'
-+ ranges:
-+ - min: 1
-+ max: 65535
-+ fsGroup:
-+ rule: 'MustRunAs'
-+ ranges:
-+ - min: 1
-+ max: 65535
-+ readOnlyRootFilesystem: false
-+{{- end }}
-diff --git a/stable/elasticsearch-curator/templates/role.yaml b/stable/elasticsearch-curator/templates/role.yaml
-new file mode 100644
-index 0000000..8867f67
---- /dev/null
-+++ b/stable/elasticsearch-curator/templates/role.yaml
-@@ -0,0 +1,23 @@
-+{{- if .Values.rbac.enabled }}
-+kind: Role
-+apiVersion: rbac.authorization.k8s.io/v1
-+metadata:
-+ labels:
-+ app: {{ template "elasticsearch-curator.name" . }}
-+ chart: {{ template "elasticsearch-curator.chart" . }}
-+ heritage: {{ .Release.Service }}
-+ release: {{ .Release.Name }}
-+ component: elasticsearch-curator-configmap
-+ name: {{ template "elasticsearch-curator.name" . }}-role
-+rules:
-+- apiGroups: [""]
-+ resources: ["configmaps"]
-+ verbs: ["update", "patch"]
-+{{- if .Values.psp.create }}
-+- apiGroups: ["extensions"]
-+ resources: ["podsecuritypolicies"]
-+ verbs: ["use"]
-+ resourceNames:
-+ - {{ template "elasticsearch-curator.fullname" . }}-psp
-+{{- end -}}
-+{{- end -}}
-diff --git a/stable/elasticsearch-curator/templates/rolebinding.yaml b/stable/elasticsearch-curator/templates/rolebinding.yaml
-new file mode 100644
-index 0000000..d25d2e1
---- /dev/null
-+++ b/stable/elasticsearch-curator/templates/rolebinding.yaml
-@@ -0,0 +1,21 @@
-+{{- if .Values.rbac.enabled -}}
-+kind: RoleBinding
-+apiVersion: rbac.authorization.k8s.io/v1
-+metadata:
-+ labels:
-+ app: {{ template "elasticsearch-curator.name" . }}
-+ chart: {{ template "elasticsearch-curator.chart" . }}
-+ heritage: {{ .Release.Service }}
-+ release: {{ .Release.Name }}
-+ component: elasticsearch-curator-configmap
-+ name: {{ template "elasticsearch-curator.name" . }}-rolebinding
-+roleRef:
-+ kind: Role
-+ name: {{ template "elasticsearch-curator.name" . }}-role
-+ apiGroup: rbac.authorization.k8s.io
-+subjects:
-+ - kind: ServiceAccount
-+ name: {{ template "elasticsearch-curator.serviceAccountName" . }}
-+ namespace: {{ .Release.Namespace }}
-+{{- end -}}
-+
-diff --git a/stable/elasticsearch-curator/templates/serviceaccount.yaml b/stable/elasticsearch-curator/templates/serviceaccount.yaml
-new file mode 100644
-index 0000000..ad9c5c9
---- /dev/null
-+++ b/stable/elasticsearch-curator/templates/serviceaccount.yaml
-@@ -0,0 +1,12 @@
-+{{- if and .Values.serviceAccount.create .Values.rbac.enabled }}
-+apiVersion: v1
-+kind: ServiceAccount
-+metadata:
-+ name: {{ template "elasticsearch-curator.serviceAccountName" .}}
-+ labels:
-+ app: {{ template "elasticsearch-curator.fullname" . }}
-+ chart: {{ template "elasticsearch-curator.chart" . }}
-+ release: "{{ .Release.Name }}"
-+ heritage: "{{ .Release.Service }}"
-+{{- end }}
-+
-diff --git a/stable/elasticsearch-curator/values.yaml b/stable/elasticsearch-curator/values.yaml
-index 3779be1..460f2a4 100644
---- a/stable/elasticsearch-curator/values.yaml
-+++ b/stable/elasticsearch-curator/values.yaml
-@@ -13,9 +13,25 @@ cronjob:
- pod:
- annotations: {}
-
-+rbac:
-+ # Specifies whether RBAC should be enabled
-+ enabled: false
-+
-+serviceAccount:
-+ # Specifies whether a ServiceAccount should be created
-+ create: true
-+ # The name of the ServiceAccount to use.
-+ # If not set and create is true, a name is generated using the fullname template
-+ name:
-+
-+
-+psp:
-+ # Specifies whether a podsecuritypolicy should be created
-+ create: false
-+
- image:
-- repository: quay.io/pires/docker-elasticsearch-curator
-- tag: 5.5.4
-+ repository: untergeek/curator
-+ tag: 5.7.6
- pullPolicy: IfNotPresent
-
- hooks:
-@@ -25,7 +41,7 @@ hooks:
- # run curator in dry-run mode
- dryrun: false
-
--command: ["curator"]
-+command: ["/curator/curator"]
- env: {}
-
- configMaps:
-@@ -101,5 +117,40 @@ priorityClassName: ""
- # mountPath: /certs
- # readOnly: true
-
-+# Add your own init container or uncomment and modify the given example.
-+extraInitContainers: {}
-+ ## Don't configure S3 repository till Elasticsearch is reachable.
-+ ## Ensure that it is available at http://elasticsearch:9200
-+ ##
-+ # elasticsearch-s3-repository:
-+ # image: jwilder/dockerize:latest
-+ # imagePullPolicy: "IfNotPresent"
-+ # command:
-+ # - "/bin/sh"
-+ # - "-c"
-+ # args:
-+ # - |
-+ # ES_HOST=elasticsearch
-+ # ES_PORT=9200
-+ # ES_REPOSITORY=backup
-+ # S3_REGION=us-east-1
-+ # S3_BUCKET=bucket
-+ # S3_BASE_PATH=backup
-+ # S3_COMPRESS=true
-+ # S3_STORAGE_CLASS=standard
-+ # apk add curl --no-cache && \
-+ # dockerize -wait http://${ES_HOST}:${ES_PORT} --timeout 120s && \
-+ # cat <<EOF | curl -sS -XPUT -H "Content-Type: application/json" -d @- http://${ES_HOST}:${ES_PORT}/_snapshot/${ES_REPOSITORY} \
-+ # {
-+ # "type": "s3",
-+ # "settings": {
-+ # "bucket": "${S3_BUCKET}",
-+ # "base_path": "${S3_BASE_PATH}",
-+ # "region": "${S3_REGION}",
-+ # "compress": "${S3_COMPRESS}",
-+ # "storage_class": "${S3_STORAGE_CLASS}"
-+ # }
-+ # }
-+
- securityContext:
- runAsUser: 16 # run as cron user instead of root
---
-1.8.3.1
-
+++ /dev/null
-From 3f950814b953c6806100404f5e43bd16ce86f6fd Mon Sep 17 00:00:00 2001
-From: John Kung <john.kung@windriver.com>
-Date: Fri, 18 Oct 2019 17:01:14 -0400
-Subject: [PATCH 1/1] Update kube-state-metrics 1.8.0, to commit 09daf19
-
----
- stable/kube-state-metrics/Chart.yaml | 7 +-
- stable/kube-state-metrics/OWNERS | 8 ++
- stable/kube-state-metrics/README.md | 96 ++++++++++++----------
- stable/kube-state-metrics/templates/NOTES.txt | 2 +-
- .../kube-state-metrics/templates/clusterrole.yaml | 38 +++++++--
- .../templates/clusterrolebinding.yaml | 8 +-
- .../kube-state-metrics/templates/deployment.yaml | 52 +++++++++---
- .../templates/podsecuritypolicy.yaml | 10 +--
- .../templates/psp-clusterrole.yaml | 8 +-
- .../templates/psp-clusterrolebinding.yaml | 8 +-
- stable/kube-state-metrics/templates/service.yaml | 22 +++--
- .../templates/serviceaccount.yaml | 10 +--
- .../templates/servicemonitor.yaml | 24 ++++++
- stable/kube-state-metrics/values.yaml | 24 +++++-
- 14 files changed, 220 insertions(+), 97 deletions(-)
- create mode 100644 stable/kube-state-metrics/OWNERS
- create mode 100644 stable/kube-state-metrics/templates/servicemonitor.yaml
-
-diff --git a/stable/kube-state-metrics/Chart.yaml b/stable/kube-state-metrics/Chart.yaml
-index 2f0f39d..283e1ac 100644
---- a/stable/kube-state-metrics/Chart.yaml
-+++ b/stable/kube-state-metrics/Chart.yaml
-@@ -5,11 +5,14 @@ keywords:
- - metric
- - monitoring
- - prometheus
--version: 0.16.0
--appVersion: 1.5.0
-+- kubernetes
-+version: 2.4.1
-+appVersion: 1.8.0
- home: https://github.com/kubernetes/kube-state-metrics/
- sources:
- - https://github.com/kubernetes/kube-state-metrics/
- maintainers:
- - name: fiunchinho
- email: jose@armesto.net
-+- name: tariq1890
-+ email: tariq.ibrahim@mulesoft.com
-diff --git a/stable/kube-state-metrics/OWNERS b/stable/kube-state-metrics/OWNERS
-new file mode 100644
-index 0000000..6ffd97d
---- /dev/null
-+++ b/stable/kube-state-metrics/OWNERS
-@@ -0,0 +1,8 @@
-+approvers:
-+- fiunchinho
-+- tariq1890
-+- mrueg
-+reviewers:
-+- fiunchinho
-+- tariq1890
-+- mrueg
-diff --git a/stable/kube-state-metrics/README.md b/stable/kube-state-metrics/README.md
-index 94ad049..6c7f364 100644
---- a/stable/kube-state-metrics/README.md
-+++ b/stable/kube-state-metrics/README.md
-@@ -12,45 +12,57 @@ $ helm install stable/kube-state-metrics
-
- ## Configuration
-
--| Parameter | Description | Default |
--|---------------------------------------|---------------------------------------------------------|---------------------------------------------|
--| `image.repository` | The image repository to pull from | k8s.gcr.io/kube-state-metrics |
--| `image.tag` | The image tag to pull from | `v1.5.0` |
--| `image.pullPolicy` | Image pull policy | IfNotPresent |
--| `replicas` | Number of replicas | 1 |
--| `service.port` | The port of the container | 8080 |
--| `prometheusScrape` | Whether or not enable prom scrape | true |
--| `rbac.create` | If true, create & use RBAC resources | true |
--| `serviceAccount.create` | If true, and rbac true, create & use serviceAccount | true |
--| `serviceAccount.name` | If not set & create is true, use template fullname | |
--| `serviceAccount.imagePullSecrets` | Specify image pull secrets field | `[]` |
--| `podSecurityPolicy.enabled` | If true, create & use PodSecurityPolicy resources | false |
--| `podSecurityPolicy.annotations` | Specify pod annotations in the pod security policy | {} |
--| `securityContext.enabled` | Enable security context | `true` |
--| `securityContext.fsGroup` | Group ID for the container | `65534` |
--| `securityContext.runAsUser` | User ID for the container | `65534` |
--| `priorityClassName` | Name of Priority Class to assign pods | `nil` |
--| `nodeSelector` | Node labels for pod assignment | {} |
--| `tolerations` | Tolerations for pod assignment | [] |
--| `podAnnotations` | Annotations to be added to the pod | {} |
--| `resources` | kube-state-metrics resource requests and limits | {} |
--| `collectors.configmaps` | Enable the configmaps collector. | true |
--| `collectors.cronjobs` | Enable the cronjobs collector. | true |
--| `collectors.daemonsets` | Enable the daemonsets collector. | true |
--| `collectors.deployments` | Enable the deployments collector. | true |
--| `collectors.endpoints` | Enable the endpoints collector. | true |
--| `collectors.horizontalpodautoscalers` | Enable the horizontalpodautoscalers collector. | true |
--| `collectors.jobs` | Enable the jobs collector. | true |
--| `collectors.limitranges` | Enable the limitranges collector. | true |
--| `collectors.namespaces` | Enable the namespaces collector. | true |
--| `collectors.nodes` | Enable the nodes collector. | true |
--| `collectors.persistentvolumeclaims` | Enable the persistentvolumeclaims collector. | true |
--| `collectors.persistentvolumes` | Enable the persistentvolumes collector. | true |
--| `collectors.poddisruptionbudgets` | Enable the poddisruptionbudgets collector. | true |
--| `collectors.pods` | Enable the pods collector. | true |
--| `collectors.replicasets` | Enable the replicasets collector. | true |
--| `collectors.replicationcontrollers` | Enable the replicationcontrollers collector. | true |
--| `collectors.resourcequotas` | Enable the resourcequotas collector. | true |
--| `collectors.secrets` | Enable the secrets collector. | true |
--| `collectors.services` | Enable the services collector. | true |
--| `collectors.statefulsets` | Enable the statefulsets collector. | true |
-+| Parameter | Description | Default |
-+|:----------------------------------------|:--------------------------------------------------------------------------------------|:-------------------------------------------|
-+| `image.repository` | The image repository to pull from | quay.io/coreos/kube-state-metrics |
-+| `image.tag` | The image tag to pull from | `v1.8.0` |
-+| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
-+| `replicas` | Number of replicas | `1` |
-+| `service.port` | The port of the container | `8080` |
-+| `service.annotations` | Annotations to be added to the service | `{}`
-+| `customLabels` | Custom labels to apply to service, deployment and pods | `{}` |
-+| `hostNetwork` | Whether or not to use the host network | `false` |
-+| `prometheusScrape` | Whether or not enable prom scrape | `true` |
-+| `rbac.create` | If true, create & use RBAC resources | `true` |
-+| `serviceAccount.create` | If true, create & use serviceAccount | `true` |
-+| `serviceAccount.name` | If not set & create is true, use template fullname | |
-+| `serviceAccount.imagePullSecrets` | Specify image pull secrets field | `[]` |
-+| `podSecurityPolicy.enabled` | If true, create & use PodSecurityPolicy resources | `false` |
-+| `podSecurityPolicy.annotations` | Specify pod annotations in the pod security policy | {} |
-+| `securityContext.enabled` | Enable security context | `true` |
-+| `securityContext.fsGroup` | Group ID for the container | `65534` |
-+| `securityContext.runAsUser` | User ID for the container | `65534` |
-+| `priorityClassName` | Name of Priority Class to assign pods | `nil` |
-+| `nodeSelector` | Node labels for pod assignment | {} |
-+| `affinity` | Affinity settings for pod assignment | {} |
-+| `tolerations` | Tolerations for pod assignment | [] |
-+| `podAnnotations` | Annotations to be added to the pod | {} |
-+| `resources` | kube-state-metrics resource requests and limits | {} |
-+| `collectors.certificatesigningrequests` | Enable the certificatesigningrequests collector. | `true` |
-+| `collectors.configmaps` | Enable the configmaps collector. | `true` |
-+| `collectors.cronjobs` | Enable the cronjobs collector. | `true` |
-+| `collectors.daemonsets` | Enable the daemonsets collector. | `true` |
-+| `collectors.deployments` | Enable the deployments collector. | `true` |
-+| `collectors.endpoints` | Enable the endpoints collector. | `true` |
-+| `collectors.horizontalpodautoscalers` | Enable the horizontalpodautoscalers collector. | `true` |
-+| `collectors.ingresses` | Enable the ingresses collector. | `true` |
-+| `collectors.jobs` | Enable the jobs collector. | `true` |
-+| `collectors.limitranges` | Enable the limitranges collector. | `true` |
-+| `collectors.namespaces` | Enable the namespaces collector. | `true` |
-+| `collectors.nodes` | Enable the nodes collector. | `true` |
-+| `collectors.persistentvolumeclaims` | Enable the persistentvolumeclaims collector. | `true` |
-+| `collectors.persistentvolumes` | Enable the persistentvolumes collector. | `true` |
-+| `collectors.poddisruptionbudgets` | Enable the poddisruptionbudgets collector. | `true` |
-+| `collectors.pods` | Enable the pods collector. | `true` |
-+| `collectors.replicasets` | Enable the replicasets collector. | `true` |
-+| `collectors.replicationcontrollers` | Enable the replicationcontrollers collector. | `true` |
-+| `collectors.resourcequotas` | Enable the resourcequotas collector. | `true` |
-+| `collectors.secrets` | Enable the secrets collector. | `true` |
-+| `collectors.services` | Enable the services collector. | `true` |
-+| `collectors.statefulsets` | Enable the statefulsets collector. | `true` |
-+| `collectors.storageclasses` | Enable the storageclasses collector. | `true` |
-+| `collectors.verticalpodautoscalers` | Enable the verticalpodautoscalers collector. | `false` |
-+| `prometheus.monitor.enabled` | Set this to `true` to create ServiceMonitor for Prometheus operator | `false` |
-+| `prometheus.monitor.additionalLabels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `{}` |
-+| `prometheus.monitor.namespace` | Namespace where servicemonitor resource should be created | `the same namespace as kube-state-metrics` |
-+| `prometheus.monitor.honorLabels` | Honor metric labels | `false` |
-diff --git a/stable/kube-state-metrics/templates/NOTES.txt b/stable/kube-state-metrics/templates/NOTES.txt
-index 8e8d9fe..d804011 100644
---- a/stable/kube-state-metrics/templates/NOTES.txt
-+++ b/stable/kube-state-metrics/templates/NOTES.txt
-@@ -1,6 +1,6 @@
- kube-state-metrics is a simple service that listens to the Kubernetes API server and generates metrics about the state of the objects.
- The exposed metrics can be found here:
--https://github.com/kubernetes/kube-state-metrics/tree/master/Documentation#documentation.
-+https://github.com/kubernetes/kube-state-metrics/blob/master/docs/README.md#exposed-metrics
-
- The metrics are exported on the HTTP endpoint /metrics on the listening port.
- In your case, {{ template "kube-state-metrics.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }}/metrics
-diff --git a/stable/kube-state-metrics/templates/clusterrole.yaml b/stable/kube-state-metrics/templates/clusterrole.yaml
-index 803b73b..4f68a1f 100644
---- a/stable/kube-state-metrics/templates/clusterrole.yaml
-+++ b/stable/kube-state-metrics/templates/clusterrole.yaml
-@@ -3,12 +3,18 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
- kind: ClusterRole
- metadata:
- labels:
-- app: {{ template "kube-state-metrics.name" . }}
-- chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-- heritage: {{ .Release.Service }}
-- release: {{ .Release.Name }}
-+ app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
-+ helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-+ app.kubernetes.io/managed-by: {{ .Release.Service }}
-+ app.kubernetes.io/instance: {{ .Release.Name }}
- name: {{ template "kube-state-metrics.fullname" . }}
- rules:
-+{{ if .Values.collectors.certificatesigningrequests }}
-+- apiGroups: ["certificates.k8s.io"]
-+ resources:
-+ - certificatesigningrequests
-+ verbs: ["list", "watch"]
-+{{ end -}}
- {{ if .Values.collectors.configmaps }}
- - apiGroups: [""]
- resources:
-@@ -22,13 +28,13 @@ rules:
- verbs: ["list", "watch"]
- {{ end -}}
- {{ if .Values.collectors.daemonsets }}
--- apiGroups: ["extensions"]
-+- apiGroups: ["extensions", "apps"]
- resources:
- - daemonsets
- verbs: ["list", "watch"]
- {{ end -}}
- {{ if .Values.collectors.deployments }}
--- apiGroups: ["extensions"]
-+- apiGroups: ["extensions", "apps"]
- resources:
- - deployments
- verbs: ["list", "watch"]
-@@ -45,6 +51,12 @@ rules:
- - horizontalpodautoscalers
- verbs: ["list", "watch"]
- {{ end -}}
-+{{ if .Values.collectors.ingresses }}
-+- apiGroups: ["extensions", "networking.k8s.io"]
-+ resources:
-+ - ingresses
-+ verbs: ["list", "watch"]
-+{{ end -}}
- {{ if .Values.collectors.jobs }}
- - apiGroups: ["batch"]
- resources:
-@@ -94,7 +106,7 @@ rules:
- verbs: ["list", "watch"]
- {{ end -}}
- {{ if .Values.collectors.replicasets }}
--- apiGroups: ["extensions"]
-+- apiGroups: ["extensions", "apps"]
- resources:
- - replicasets
- verbs: ["list", "watch"]
-@@ -129,4 +141,16 @@ rules:
- - statefulsets
- verbs: ["list", "watch"]
- {{ end -}}
-+{{ if .Values.collectors.storageclasses }}
-+- apiGroups: ["storage.k8s.io"]
-+ resources:
-+ - storageclasses
-+ verbs: ["list", "watch"]
-+{{ end -}}
-+{{ if .Values.collectors.verticalpodautoscalers }}
-+- apiGroups: ["autoscaling.k8s.io"]
-+ resources:
-+ - verticalpodautoscalers
-+ verbs: ["list", "watch"]
-+{{ end -}}
- {{- end -}}
-diff --git a/stable/kube-state-metrics/templates/clusterrolebinding.yaml b/stable/kube-state-metrics/templates/clusterrolebinding.yaml
-index e57b051..b4586fb 100644
---- a/stable/kube-state-metrics/templates/clusterrolebinding.yaml
-+++ b/stable/kube-state-metrics/templates/clusterrolebinding.yaml
-@@ -3,10 +3,10 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
- kind: ClusterRoleBinding
- metadata:
- labels:
-- app: {{ template "kube-state-metrics.name" . }}
-- chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-- heritage: {{ .Release.Service }}
-- release: {{ .Release.Name }}
-+ app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
-+ helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-+ app.kubernetes.io/managed-by: {{ .Release.Service }}
-+ app.kubernetes.io/instance: {{ .Release.Name }}
- name: {{ template "kube-state-metrics.fullname" . }}
- roleRef:
- apiGroup: rbac.authorization.k8s.io
-diff --git a/stable/kube-state-metrics/templates/deployment.yaml b/stable/kube-state-metrics/templates/deployment.yaml
-index ce02f8e..492df24 100644
---- a/stable/kube-state-metrics/templates/deployment.yaml
-+++ b/stable/kube-state-metrics/templates/deployment.yaml
-@@ -3,28 +3,33 @@ kind: Deployment
- metadata:
- name: {{ template "kube-state-metrics.fullname" . }}
- labels:
-- app: {{ template "kube-state-metrics.name" . }}
-- chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-- release: "{{ .Release.Name }}"
-- heritage: "{{ .Release.Service }}"
-+ app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
-+ helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-+ app.kubernetes.io/instance: "{{ .Release.Name }}"
-+ app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-+{{- if .Values.customLabels }}
-+{{ toYaml .Values.customLabels | indent 4 }}
-+{{- end }}
- spec:
- selector:
- matchLabels:
-- app: {{ template "kube-state-metrics.name" . }}
-+ app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
- replicas: {{ .Values.replicas }}
- template:
- metadata:
- labels:
-- app: {{ template "kube-state-metrics.name" . }}
-- release: "{{ .Release.Name }}"
-+ app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
-+ app.kubernetes.io/instance: "{{ .Release.Name }}"
-+{{- if .Values.customLabels }}
-+{{ toYaml .Values.customLabels | indent 8 }}
-+{{- end }}
- {{- if .Values.podAnnotations }}
- annotations:
- {{ toYaml .Values.podAnnotations | indent 8 }}
- {{- end }}
- spec:
--{{ if .Values.rbac.create }}
-+ hostNetwork: {{ .Values.hostNetwork }}
- serviceAccountName: {{ template "kube-state-metrics.serviceAccountName" . }}
--{{ end }}
- {{- if .Values.securityContext.enabled }}
- securityContext:
- fsGroup: {{ .Values.securityContext.fsGroup }}
-@@ -36,6 +41,9 @@ spec:
- containers:
- - name: {{ .Chart.Name }}
- args:
-+{{ if .Values.collectors.certificatesigningrequests }}
-+ - --collectors=certificatesigningrequests
-+{{ end }}
- {{ if .Values.collectors.configmaps }}
- - --collectors=configmaps
- {{ end }}
-@@ -54,6 +62,9 @@ spec:
- {{ if .Values.collectors.horizontalpodautoscalers }}
- - --collectors=horizontalpodautoscalers
- {{ end }}
-+{{ if .Values.collectors.ingresses }}
-+ - --collectors=ingresses
-+{{ end }}
- {{ if .Values.collectors.jobs }}
- - --collectors=jobs
- {{ end }}
-@@ -96,6 +107,12 @@ spec:
- {{ if .Values.collectors.statefulsets }}
- - --collectors=statefulsets
- {{ end }}
-+{{ if .Values.collectors.storageclasses }}
-+ - --collectors=storageclasses
-+{{ end }}
-+{{ if .Values.collectors.verticalpodautoscalers }}
-+ - --collectors=verticalpodautoscalers
-+{{ end }}
- {{ if .Values.namespace }}
- - --namespace={{ .Values.namespace }}
- {{ end }}
-@@ -103,14 +120,26 @@ spec:
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- ports:
- - containerPort: 8080
-- readinessProbe:
-+ livenessProbe:
- httpGet:
- path: /healthz
- port: 8080
- initialDelaySeconds: 5
- timeoutSeconds: 5
-+ readinessProbe:
-+ httpGet:
-+ path: /
-+ port: 8080
-+ initialDelaySeconds: 5
-+ timeoutSeconds: 5
-+{{- if .Values.resources }}
- resources:
--{{ toYaml .Values.resources | indent 12 }}
-+{{ toYaml .Values.resources | indent 10 }}
-+{{- end }}
-+{{- if .Values.affinity }}
-+ affinity:
-+{{ toYaml .Values.affinity | indent 8 }}
-+{{- end }}
- {{- if .Values.nodeSelector }}
- nodeSelector:
- {{ toYaml .Values.nodeSelector | indent 8 }}
-@@ -119,4 +148,3 @@ spec:
- tolerations:
- {{ toYaml .Values.tolerations | indent 8 }}
- {{- end }}
--
-diff --git a/stable/kube-state-metrics/templates/podsecuritypolicy.yaml b/stable/kube-state-metrics/templates/podsecuritypolicy.yaml
-index 4ca46ac..aeff117 100644
---- a/stable/kube-state-metrics/templates/podsecuritypolicy.yaml
-+++ b/stable/kube-state-metrics/templates/podsecuritypolicy.yaml
-@@ -4,12 +4,12 @@ kind: PodSecurityPolicy
- metadata:
- name: {{ template "kube-state-metrics.fullname" . }}
- labels:
-- app: {{ template "kube-state-metrics.name" . }}
-- chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-- heritage: {{ .Release.Service }}
-- release: {{ .Release.Name }}
-- annotations:
-+ app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
-+ helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-+ app.kubernetes.io/managed-by: {{ .Release.Service }}
-+ app.kubernetes.io/instance: {{ .Release.Name }}
- {{- if .Values.podSecurityPolicy.annotations }}
-+ annotations:
- {{ toYaml .Values.podSecurityPolicy.annotations | indent 4 }}
- {{- end }}
- spec:
-diff --git a/stable/kube-state-metrics/templates/psp-clusterrole.yaml b/stable/kube-state-metrics/templates/psp-clusterrole.yaml
-index c43f90d..dcd65e1 100644
---- a/stable/kube-state-metrics/templates/psp-clusterrole.yaml
-+++ b/stable/kube-state-metrics/templates/psp-clusterrole.yaml
-@@ -3,10 +3,10 @@ apiVersion: rbac.authorization.k8s.io/v1
- kind: ClusterRole
- metadata:
- labels:
-- app: {{ template "kube-state-metrics.name" . }}
-- chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-- heritage: {{ .Release.Service }}
-- release: {{ .Release.Name }}
-+ app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
-+ helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-+ app.kubernetes.io/managed-by: {{ .Release.Service }}
-+ app.kubernetes.io/instance: {{ .Release.Name }}
- name: psp-{{ template "kube-state-metrics.fullname" . }}
- rules:
- - apiGroups: ['extensions']
-diff --git a/stable/kube-state-metrics/templates/psp-clusterrolebinding.yaml b/stable/kube-state-metrics/templates/psp-clusterrolebinding.yaml
-index bfca12c..7418618 100644
---- a/stable/kube-state-metrics/templates/psp-clusterrolebinding.yaml
-+++ b/stable/kube-state-metrics/templates/psp-clusterrolebinding.yaml
-@@ -3,10 +3,10 @@ apiVersion: rbac.authorization.k8s.io/v1
- kind: ClusterRoleBinding
- metadata:
- labels:
-- app: {{ template "kube-state-metrics.name" . }}
-- chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-- heritage: {{ .Release.Service }}
-- release: {{ .Release.Name }}
-+ app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
-+ helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-+ app.kubernetes.io/managed-by: {{ .Release.Service }}
-+ app.kubernetes.io/instance: {{ .Release.Name }}
- name: psp-{{ template "kube-state-metrics.fullname" . }}
- roleRef:
- apiGroup: rbac.authorization.k8s.io
-diff --git a/stable/kube-state-metrics/templates/service.yaml b/stable/kube-state-metrics/templates/service.yaml
-index b6daacd..a880bf9 100644
---- a/stable/kube-state-metrics/templates/service.yaml
-+++ b/stable/kube-state-metrics/templates/service.yaml
-@@ -3,14 +3,20 @@ kind: Service
- metadata:
- name: {{ template "kube-state-metrics.fullname" . }}
- labels:
-- app: {{ template "kube-state-metrics.name" . }}
-- chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-- release: "{{ .Release.Name }}"
-- heritage: "{{ .Release.Service }}"
-- {{- if .Values.prometheusScrape }}
-+ app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
-+ helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-+ app.kubernetes.io/instance: "{{ .Release.Name }}"
-+ app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-+{{- if .Values.customLabels }}
-+{{ toYaml .Values.customLabels | indent 4 }}
-+{{- end }}
- annotations:
-+ {{- if .Values.prometheusScrape }}
- prometheus.io/scrape: '{{ .Values.prometheusScrape }}'
-- {{- end }}
-+ {{- end }}
-+ {{- if .Values.service.annotations }}
-+ {{- toYaml .Values.service.annotations | nindent 4 }}
-+ {{- end }}
- spec:
- type: "{{ .Values.service.type }}"
- ports:
-@@ -25,5 +31,5 @@ spec:
- loadBalancerIP: "{{ .Values.service.loadBalancerIP }}"
- {{- end }}
- selector:
-- app: {{ template "kube-state-metrics.name" . }}
-- release: {{ .Release.Name }}
-+ app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
-+ app.kubernetes.io/instance: {{ .Release.Name }}
-diff --git a/stable/kube-state-metrics/templates/serviceaccount.yaml b/stable/kube-state-metrics/templates/serviceaccount.yaml
-index edac3b9..e2bf7c0 100644
---- a/stable/kube-state-metrics/templates/serviceaccount.yaml
-+++ b/stable/kube-state-metrics/templates/serviceaccount.yaml
-@@ -1,15 +1,13 @@
--{{- if .Values.rbac.create -}}
- {{- if .Values.serviceAccount.create -}}
- apiVersion: v1
- kind: ServiceAccount
- metadata:
- labels:
-- app: {{ template "kube-state-metrics.name" . }}
-- chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-- heritage: {{ .Release.Service }}
-- release: {{ .Release.Name }}
-+ app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
-+ helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-+ app.kubernetes.io/managed-by: {{ .Release.Service }}
-+ app.kubernetes.io/instance: {{ .Release.Name }}
- name: {{ template "kube-state-metrics.fullname" . }}
- imagePullSecrets:
- {{ toYaml .Values.serviceAccount.imagePullSecrets | indent 2 }}
- {{- end -}}
--{{- end -}}
-diff --git a/stable/kube-state-metrics/templates/servicemonitor.yaml b/stable/kube-state-metrics/templates/servicemonitor.yaml
-new file mode 100644
-index 0000000..6405bd4
---- /dev/null
-+++ b/stable/kube-state-metrics/templates/servicemonitor.yaml
-@@ -0,0 +1,24 @@
-+{{- if .Values.prometheus.monitor.enabled }}
-+apiVersion: monitoring.coreos.com/v1
-+kind: ServiceMonitor
-+metadata:
-+ name: {{ template "kube-state-metrics.fullname" . }}
-+ labels:
-+ app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
-+ helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-+ app.kubernetes.io/instance: "{{ .Release.Name }}"
-+ app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-+ {{- if .Values.prometheus.monitor.additionalLabels }}
-+{{ toYaml .Values.prometheus.monitor.additionalLabels | indent 4 }}
-+ {{- end }}
-+spec:
-+ selector:
-+ matchLabels:
-+ app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
-+ app.kubernetes.io/instance: {{ .Release.Name }}
-+ endpoints:
-+ - port: http
-+ {{- if .Values.prometheus.monitor.honorLabels }}
-+ honorLabels: true
-+ {{- end }}
-+{{- end }}
-diff --git a/stable/kube-state-metrics/values.yaml b/stable/kube-state-metrics/values.yaml
-index 86aab9b..2bf5b30 100644
---- a/stable/kube-state-metrics/values.yaml
-+++ b/stable/kube-state-metrics/values.yaml
-@@ -1,8 +1,8 @@
- # Default values for kube-state-metrics.
- prometheusScrape: true
- image:
-- repository: k8s.gcr.io/kube-state-metrics
-- tag: v1.5.0
-+ repository: quay.io/coreos/kube-state-metrics
-+ tag: v1.8.0
- pullPolicy: IfNotPresent
-
- replicas: 1
-@@ -13,6 +13,11 @@ service:
- type: ClusterIP
- nodePort: 0
- loadBalancerIP: ""
-+ annotations: {}
-+
-+customLabels: {}
-+
-+hostNetwork: false
-
- rbac:
- # If true, create & use RBAC resources
-@@ -28,6 +33,13 @@ serviceAccount:
- # ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
- imagePullSecrets: []
-
-+prometheus:
-+ monitor:
-+ enabled: false
-+ additionalLabels: {}
-+ namespace: ""
-+ honorLabels: false
-+
- ## Specify if a Pod Security Policy for kube-state-metrics must be created
- ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/
- ##
-@@ -53,6 +65,10 @@ securityContext:
- ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
- nodeSelector: {}
-
-+## Affinity settings for pod assignment
-+## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-+affinity: {}
-+
- ## Tolerations for pod assignment
- ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
- tolerations: []
-@@ -66,12 +82,14 @@ podAnnotations: {}
- # Available collectors for kube-state-metrics. By default all available
- # collectors are enabled.
- collectors:
-+ certificatesigningrequests: true
- configmaps: true
- cronjobs: true
- daemonsets: true
- deployments: true
- endpoints: true
- horizontalpodautoscalers: true
-+ ingresses: true
- jobs: true
- limitranges: true
- namespaces: true
-@@ -86,6 +104,8 @@ collectors:
- secrets: true
- services: true
- statefulsets: true
-+ storageclasses: true
-+ verticalpodautoscalers: false
-
- # Namespace to be enabled for collecting resources. By default all namespaces are collected.
- # namespace: ""
---
-1.8.3.1
-
+++ /dev/null
-From 35a6b56e47710ea306608f44382b76022e236be0 Mon Sep 17 00:00:00 2001
-From: Matt Peters <matt.peters@windriver.com>
-Date: Fri, 25 Oct 2019 11:20:37 -0500
-Subject: [PATCH] update init container env to include node name
-
-Update the init containers to have access to the same set of
-environment variables as the runtime containers. Specifically
-NODE_NAME is required to ensure the name parameter is set
-properly.
----
- stable/filebeat/templates/daemonset.yaml | 8 ++++++++
- stable/metricbeat/templates/daemonset.yaml | 8 ++++++++
- 2 files changed, 16 insertions(+)
-
-diff --git a/stable/filebeat/templates/daemonset.yaml b/stable/filebeat/templates/daemonset.yaml
-index 22b46df..2429892 100644
---- a/stable/filebeat/templates/daemonset.yaml
-+++ b/stable/filebeat/templates/daemonset.yaml
-@@ -54,6 +54,14 @@ spec:
- readOnly: true
- subPath: filebeat.yml
- env:
-+ - name: POD_NAMESPACE
-+ valueFrom:
-+ fieldRef:
-+ fieldPath: metadata.namespace
-+ - name: NODE_NAME
-+ valueFrom:
-+ fieldRef:
-+ fieldPath: spec.nodeName
- ## make output.elasticsearch parms visible
- {{- range $key, $value := .Values.config}}
- {{- $configname := $key | upper | replace "." "_" -}}
-diff --git a/stable/metricbeat/templates/daemonset.yaml b/stable/metricbeat/templates/daemonset.yaml
-index 947e501..247304e 100644
---- a/stable/metricbeat/templates/daemonset.yaml
-+++ b/stable/metricbeat/templates/daemonset.yaml
-@@ -49,6 +49,14 @@ spec:
- readOnly: true
- subPath: metricbeat.yml
- env:
-+ - name: POD_NAMESPACE
-+ valueFrom:
-+ fieldRef:
-+ fieldPath: metadata.namespace
-+ - name: NODE_NAME
-+ valueFrom:
-+ fieldRef:
-+ fieldPath: spec.nodeName
- ## make output.elasticsearch parms visible
- {{- range $key, $value := .Values.daemonset.config}}
- {{- $configname := $key | upper | replace "." "_" -}}
---
-1.8.3.1
-
+++ /dev/null
-From 440cae178989bf161276be0099691e9b7e5d211f Mon Sep 17 00:00:00 2001
-From: John Kung <john.kung@windriver.com>
-Date: Tue, 5 Nov 2019 07:42:36 -0500
-Subject: [PATCH 1/1] Add imagePullSecrets
-
----
- stable/elasticsearch-curator/templates/serviceaccount.yaml | 2 ++
- stable/filebeat/templates/serviceaccount.yaml | 2 ++
- stable/kibana/templates/serviceaccount.yaml | 2 ++
- stable/kube-state-metrics/values.yaml | 2 +-
- stable/metricbeat/templates/serviceaccount.yaml | 2 ++
- 5 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/stable/elasticsearch-curator/templates/serviceaccount.yaml b/stable/elasticsearch-curator/templates/serviceaccount.yaml
-index ad9c5c9..a64b426 100644
---- a/stable/elasticsearch-curator/templates/serviceaccount.yaml
-+++ b/stable/elasticsearch-curator/templates/serviceaccount.yaml
-@@ -8,5 +8,7 @@ metadata:
- chart: {{ template "elasticsearch-curator.chart" . }}
- release: "{{ .Release.Name }}"
- heritage: "{{ .Release.Service }}"
-+imagePullSecrets:
-+ - name: default-registry-key
- {{- end }}
-
-diff --git a/stable/filebeat/templates/serviceaccount.yaml b/stable/filebeat/templates/serviceaccount.yaml
-index 7de907b..19a4d34 100644
---- a/stable/filebeat/templates/serviceaccount.yaml
-+++ b/stable/filebeat/templates/serviceaccount.yaml
-@@ -8,4 +8,6 @@ metadata:
- chart: {{ template "filebeat.chart" . }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
-+imagePullSecrets:
-+ - name: default-registry-key
- {{- end -}}
-diff --git a/stable/kibana/templates/serviceaccount.yaml b/stable/kibana/templates/serviceaccount.yaml
-index 948390a..edc0122 100644
---- a/stable/kibana/templates/serviceaccount.yaml
-+++ b/stable/kibana/templates/serviceaccount.yaml
-@@ -8,4 +8,6 @@ metadata:
- chart: {{ .Chart.Name }}-{{ .Chart.Version }}
- heritage: {{ .Release.Service }}
- release: {{ .Release.Name }}
-+imagePullSecrets:
-+ - name: default-registry-key
- {{- end -}}
-diff --git a/stable/kube-state-metrics/values.yaml b/stable/kube-state-metrics/values.yaml
-index 2bf5b30..bab7a30 100644
---- a/stable/kube-state-metrics/values.yaml
-+++ b/stable/kube-state-metrics/values.yaml
-@@ -31,7 +31,7 @@ serviceAccount:
- name:
- # Reference to one or more secrets to be used when pulling images
- # ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
-- imagePullSecrets: []
-+ imagePullSecrets: [{"name": "default-registry-key"}]
-
- prometheus:
- monitor:
-diff --git a/stable/metricbeat/templates/serviceaccount.yaml b/stable/metricbeat/templates/serviceaccount.yaml
-index c53fc5a..a4c7659 100644
---- a/stable/metricbeat/templates/serviceaccount.yaml
-+++ b/stable/metricbeat/templates/serviceaccount.yaml
-@@ -8,4 +8,6 @@ metadata:
- chart: {{ template "metricbeat.chart" . }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
-+imagePullSecrets:
-+ - name: default-registry-key
- {{- end -}}
---
-1.8.3.1
-
+++ /dev/null
-From 2d54de3ae3858aa6c67ba1de25860c440f5be8a2 Mon Sep 17 00:00:00 2001
-From: Kevin Smith <kevin.smith@windriver.com>
-Date: Thu, 12 Dec 2019 09:40:13 -0500
-Subject: [PATCH 1/1] removed unused images
-
----
- stable/kibana/templates/tests/test-configmap.yaml | 35 -------------------
- stable/kibana/templates/tests/test.yaml | 42 -----------------------
- stable/kibana/values.yaml | 4 ---
- stable/logstash/templates/statefulset.yaml | 32 -----------------
- stable/logstash/values.yaml | 5 ---
- 5 files changed, 118 deletions(-)
- delete mode 100644 stable/kibana/templates/tests/test-configmap.yaml
- delete mode 100644 stable/kibana/templates/tests/test.yaml
-
-diff --git a/stable/kibana/templates/tests/test-configmap.yaml b/stable/kibana/templates/tests/test-configmap.yaml
-deleted file mode 100644
-index 912755e..0000000
---- a/stable/kibana/templates/tests/test-configmap.yaml
-+++ /dev/null
-@@ -1,35 +0,0 @@
--apiVersion: v1
--kind: ConfigMap
--metadata:
-- name: {{ template "kibana.fullname" . }}-test
-- labels:
-- app: {{ template "kibana.fullname" . }}
-- chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-- heritage: "{{ .Release.Service }}"
-- release: "{{ .Release.Name }}"
--data:
-- run.sh: |-
-- @test "Test Status" {
-- {{- if .Values.service.selector }}
-- skip "Can't guarentee pod names with selector"
-- {{- else }}
-- {{- $port := .Values.service.externalPort }}
-- url="http://{{ template "kibana.fullname" . }}{{ if $port }}:{{ $port }}{{ end }}/api{{ .Values.livenessProbe.path }}"
--
-- # retry for 1 minute
-- run curl -s -o /dev/null -I -w "%{http_code}" --retry 30 --retry-delay 2 $url
--
-- code=$(curl -s -o /dev/null -I -w "%{http_code}" $url)
-- body=$(curl $url)
-- if [ "$code" == "503" ]
-- then
-- skip "Kibana Unavailable (503), can't get status - see pod logs: $body"
-- fi
--
-- result=$(echo $body | jq -cr '.status.statuses[]')
-- [ "$result" != "" ]
--
-- result=$(echo $body | jq -cr '.status.statuses[] | select(.state != "green")')
-- [ "$result" == "" ]
-- {{- end }}
-- }
-diff --git a/stable/kibana/templates/tests/test.yaml b/stable/kibana/templates/tests/test.yaml
-deleted file mode 100644
-index 8a518fd..0000000
---- a/stable/kibana/templates/tests/test.yaml
-+++ /dev/null
-@@ -1,42 +0,0 @@
--apiVersion: v1
--kind: Pod
--metadata:
-- name: {{ template "kibana.fullname" . }}-test
-- labels:
-- app: {{ template "kibana.fullname" . }}
-- chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-- heritage: "{{ .Release.Service }}"
-- release: "{{ .Release.Name }}"
-- annotations:
-- "helm.sh/hook": test-success
--spec:
-- initContainers:
-- - name: test-framework
-- image: "{{ .Values.testFramework.image}}:{{ .Values.testFramework.tag }}"
-- command:
-- - "bash"
-- - "-c"
-- - |
-- set -ex
-- # copy bats to tools dir
-- cp -R /usr/local/libexec/ /tools/bats/
-- volumeMounts:
-- - mountPath: /tools
-- name: tools
-- containers:
-- - name: {{ .Release.Name }}-test
-- image: "dwdraju/alpine-curl-jq"
-- command: ["/tools/bats/bats", "-t", "/tests/run.sh"]
-- volumeMounts:
-- - mountPath: /tests
-- name: tests
-- readOnly: true
-- - mountPath: /tools
-- name: tools
-- volumes:
-- - name: tests
-- configMap:
-- name: {{ template "kibana.fullname" . }}-test
-- - name: tools
-- emptyDir: {}
-- restartPolicy: Never
-diff --git a/stable/kibana/values.yaml b/stable/kibana/values.yaml
-index 4ce4b2a..7bc9cf5 100644
---- a/stable/kibana/values.yaml
-+++ b/stable/kibana/values.yaml
-@@ -3,10 +3,6 @@ image:
- tag: "7.2.0"
- pullPolicy: "IfNotPresent"
-
--testFramework:
-- image: "dduportal/bats"
-- tag: "0.4.0"
--
- commandline:
- args: []
-
-diff --git a/stable/logstash/templates/statefulset.yaml b/stable/logstash/templates/statefulset.yaml
-index 1a1a3ef..4749bb1 100644
---- a/stable/logstash/templates/statefulset.yaml
-+++ b/stable/logstash/templates/statefulset.yaml
-@@ -91,38 +91,6 @@ spec:
- volumeMounts:
- {{ toYaml .Values.volumeMounts | indent 12 }}
-
--{{- if .Values.exporter.logstash.enabled }}
-- ## logstash-exporter
-- - name: {{ .Chart.Name }}-exporter
-- image: "{{ .Values.exporter.logstash.image.repository }}:{{ .Values.exporter.logstash.image.tag }}"
-- imagePullPolicy: {{ .Values.exporter.logstash.image.pullPolicy }}
-- command: ["/bin/sh", "-c"]
-- ## Delay start of logstash-exporter to give logstash more time to come online.
-- args:
-- - >-
-- sleep 60;
-- exec /logstash_exporter
-- --logstash.endpoint=http://localhost:{{ .Values.exporter.logstash.target.port }}
-- --web.listen-address=:{{ .Values.exporter.logstash.port }}
-- ports:
-- - name: ls-exporter
-- containerPort: {{ .Values.exporter.logstash.port }}
-- protocol: TCP
-- livenessProbe:
--{{ toYaml .Values.exporter.logstash.livenessProbe | indent 12 }}
-- readinessProbe:
--{{ toYaml .Values.exporter.logstash.readinessProbe | indent 12 }}
-- {{- with .Values.exporter.logstash.config }}
-- env:
-- {{- range $key, $value := . }}
-- - name: {{ $key | upper | replace "." "_" }}
-- value: {{ $value | quote }}
-- {{- end }}
-- {{- end }}
-- resources:
--{{ toYaml .Values.exporter.logstash.resources | indent 12 }}
--{{- end }}
--
- {{- with .Values.nodeSelector }}
- nodeSelector:
- {{ toYaml . | indent 8 }}
-diff --git a/stable/logstash/values.yaml b/stable/logstash/values.yaml
-index 9ba80c9..b8b8de2 100644
---- a/stable/logstash/values.yaml
-+++ b/stable/logstash/values.yaml
-@@ -169,11 +169,6 @@ volumes: []
-
- exporter:
- logstash:
-- enabled: false
-- image:
-- repository: bonniernews/logstash_exporter
-- tag: v0.1.2
-- pullPolicy: IfNotPresent
- env: {}
- resources: {}
- path: /metrics
---
-1.8.3.1
-
+++ /dev/null
----
-apiVersion: v1
-entries: {}
-generated: 2019-01-07T12:33:46.098166523-06:00
+++ /dev/null
----
-apiVersion: v1
-generated: 2019-01-02T15:19:36.215111369-06:00
-repositories:
- - caFile: ""
- cache: /builddir/.helm/repository/cache/local-index.yaml
- certFile: ""
- keyFile: ""
- name: local
- password: ""
- url: http://127.0.0.1:8879/charts
- username: ""
+++ /dev/null
-
-SUMMARY = "Monitor Helm charts"
-DESCRIPTION = "Monitor Helm charts"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-DEPENDS += " \
- helm-native \
- monitor-helm-elastic \
-"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCREV_helm-charts = "92b6289ae93816717a8453cfe62bad51cbdb8ad0"
-SRCREV_monitor-armada-app = "e5ee6b3a07b74479b93fe90eff0662cf81890f73"
-
-SRC_URI = " \
- git://github.com/helm/charts;protocol=${PROTOCOL};name=helm-charts \
- git://opendev.org/starlingx/monitor-armada-app.git;protocol=${PROTOCOL};branch=${BRANCH};name=monitor-armada-app;destsuffix=monitor-armada-app \
- file://0001-Add-Makefile-for-helm-charts.patch \
- file://0002-kibana-workaround-checksum-for-configmap.yaml.patch \
- file://0003-helm-chart-changes-for-stx-monitor.patch \
- file://0004-ipv6-helm-chart-changes.patch \
- file://0005-decouple-config.patch \
- file://0006-add-system-info.patch \
- file://0007-three-masters.patch \
- file://0008-Update-stx-monitor-for-kubernetes-API-1.16.patch \
- file://0009-add-curator-as-of-2019-10-10.patch \
- file://0010-Update-kube-state-metrics-1.8.0-to-commit-09daf19.patch \
- file://0011-update-init-container-env-to-include-node-name.patch \
- file://0012-Add-imagePullSecrets.patch \
- file://0013-removed-unused-images.patch \
- file://index.yaml \
- file://repositories.yaml \
- "
-
-PATCHTOOL = "git"
-PATCH_COMMIT_FUNCTIONS = "1"
-
-S = "${WORKDIR}/git"
-
-inherit allarch
-
-helm_folder = "${nonarch_libdir}/helm"
-helmchart_version = "0.1.0"
-
-do_configure[noexec] = "1"
-
-do_compile () {
- # initialize helm and build the toolkit
- # helm init --client-only does not work if there is no networking
- # The following commands do essentially the same as: helm init
- export HOME="${B}/${USER}"
- export helm_home="${B}/${USER}/.helm"
- rm -rf ${helm_home}
-
- mkdir -p ${helm_home}
- mkdir ${helm_home}/repository
- mkdir ${helm_home}/repository/cache
- mkdir ${helm_home}/repository/local
- mkdir ${helm_home}/plugins
- mkdir ${helm_home}/starters
- mkdir ${helm_home}/cache
- mkdir ${helm_home}/cache/archive
-
- # Stage a repository file that only has a local repo
- install -m 0644 ${WORKDIR}/repositories.yaml ${helm_home}/repository/repositories.yaml
-
- # Stage a local repo index that can be updated by the build
- install -m 0644 ${WORKDIR}/index.yaml ${helm_home}/repository/local/index.yaml
-
- # Host a server for the charts
- helm serve --repo-path . &
- sleep 1
- helm repo rm local
- helm repo add local http://localhost:8879/charts
-
- # Create the tgz files
- cd stable
- make filebeat
- make metricbeat
- make kube-state-metrics
- make kibana
- make nginx-ingress
- make logstash
- make elasticsearch-curator
-
- # terminate helm server (the last backgrounded task)
- kill $!
- rm -rf ${helm_home}
-}
-
-do_install () {
- install -d -m 755 ${D}${helm_folder}
- install -p -D -m 755 ${S}/stable/*.tgz ${D}${helm_folder}
-}
-
-FILES_${PN} = "${helm_folder}"
-
-RDEPENDS_${PN} = " \
- helm \
- monitor-helm-elastic \
-"
+++ /dev/null
-SUMMARY = "StarlingX Monitor Application Armada Helm Charts"
-DESCRIPTION = "StarlingX Monitor Application Armada Helm Charts"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-DEPENDS += " \
- monitor-helm \
- monitor-helm-elastic \
-"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCNAME = "monitor-armada-app"
-SRCREV = "e5ee6b3a07b74479b93fe90eff0662cf81890f73"
-SRCREV_opendev = "e5ee6b3a07b74479b93fe90eff0662cf81890f73"
-DESTSUFFIX = "${PN}-${PV}"
-SUBPATH0 = "stx-monitor-helm/stx-monitor-helm"
-
-SRC_URI = " \
- git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH};destsuffix=${DESTSUFFIX};subpath=${SUBPATH0};name=opendev \
- "
-
-inherit allarch
-
-helm_folder = "${nonarch_libdir}/helm"
-armada_folder = "${nonarch_libdir}/armada"
-app_folder = "${nonarch_libdir}/application"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install () {
- install -d -m 755 ${D}${armada_folder}
- install -p -D -m 755 ${S}/manifests/*.yaml ${D}${armada_folder}
- install -d -m 755 ${D}${app_folder}
- install -p -D -m 755 ${S}/files/metadata.yaml ${D}${app_folder}/monitor_metadata.yaml
-}
-
-FILES_${PN} = " \
- ${app_folder} \
- ${armada_folder} \
-"
-
-RDEPENDS_${PN} = " \
- helm \
- monitor-helm \
- monitor-helm-elastic \
-"
+++ /dev/null
-require monitoring-common.inc
-
-SUBPATH0 = "collectd-extensions/src"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN}_append += " \
- systemd \
- collectd \
- fm-api \
- ntpq \
- python-influxdb \
- python-oslo.concurrency \
- python-httplib2 \
- tsconfig \
- "
-
-
-local_unit_dir = "${sysconfdir}/systemd/system"
-local_plugin_dir = "${sysconfdir}/collectd.d"
-local_python_extensions_dir = "/opt/collectd/extensions/python"
-local_config_extensions_dir = "/opt/collectd/extensions/config"
-
-
-do_install_append() {
-
- install -m 755 -d ${D}/${sysconfdir}
- install -m 755 -d ${D}/${local_unit_dir}
- install -m 755 -d ${D}/${local_plugin_dir}
- install -m 755 -d ${D}/${local_config_extensions_dir}
- install -m 755 -d ${D}/${local_python_extensions_dir}
-
- # support files ; service and pmon conf
- install -m 644 collectd.service ${D}/${local_unit_dir}
- install -m 600 collectd.conf.pmon ${D}/${local_config_extensions_dir}
-
- # collectd python plugin files - notifiers
- install -m 700 fm_notifier.py ${D}/${local_python_extensions_dir}
- install -m 700 plugin_common.py ${D}/${local_python_extensions_dir}
-
- # collectd python plugin files - resource plugins
- install -m 700 cpu.py ${D}/${local_python_extensions_dir}
- install -m 700 memory.py ${D}/${local_python_extensions_dir}
- install -m 700 example.py ${D}/${local_python_extensions_dir}
- install -m 700 ntpq.py ${D}/${local_python_extensions_dir}
- install -m 700 interface.py ${D}/${local_python_extensions_dir}
- install -m 700 remotels.py ${D}/${local_python_extensions_dir}
- install -m 700 ptp.py ${D}/${local_python_extensions_dir}
- install -m 700 ovs_interface.py ${D}/${local_python_extensions_dir}
-
-
- # collectd plugin conf files into /etc/collectd.d
- install -m 600 python_plugins.conf ${D}/${local_plugin_dir}
- install -m 600 cpu.conf ${D}/${local_plugin_dir}
- install -m 600 memory.conf ${D}/${local_plugin_dir}
- install -m 600 df.conf ${D}/${local_plugin_dir}
- install -m 600 example.conf ${D}/${local_plugin_dir}
- install -m 600 ntpq.conf ${D}/${local_plugin_dir}
- install -m 600 interface.conf ${D}/${local_plugin_dir}
- install -m 600 remotels.conf ${D}/${local_plugin_dir}
- install -m 600 ptp.conf ${D}/${local_plugin_dir}
- install -m 600 ovs_interface.conf ${D}/${local_plugin_dir}
-
-}
-
-FILES_${PN}_append = " \
- ${local_python_extensions_dir} \
- ${local_config_extensions_dir} \
- "
+++ /dev/null
-require monitoring-common.inc
-
-SUBPATH0 = "influxdb-extensions/src"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN} += " \
- influxdb \
- systemd \
- python-influxdb \
- "
-
-
-local_unit_dir = "${sysconfdir}/systemd/system"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install() {
-
- install -m 755 -d ${D}/${sysconfdir}
- install -m 755 -d ${D}/${local_unit_dir}
- install -m 755 -d ${D}/${sysconfdir}/influxdb
-
- # support files ; service and pmon conf
- install -m 644 influxdb.service ${D}/${local_unit_dir}
- install -m 600 influxdb.conf.pmon ${D}/${sysconfdir}/influxdb
-}
+++ /dev/null
-require monitoring-common.inc
-
-SUBPATH0 = "monitor-tools/scripts"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-do_install_append() {
-
- install -m 755 -d ${D}/${bindir}
- # support files ; service and pmon conf
- install -m 644 memtop ${D}/${bindir}
- install -m 600 schedtop ${D}/${bindir}
- install -m 600 occtop ${D}/${bindir}
-}
+++ /dev/null
-DESCRIPTION = "stx-monitoring"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCNAME = "monitoring"
-SRCREV = "8befe1720b02c5e1e3ddf637947643b9b0a0f96f"
-SRCREV_opendev = "8befe1720b02c5e1e3ddf637947643b9b0a0f96f"
-DESTSUFFIX = "${PN}-${PV}"
-PV = "1.0.0"
-
-SRC_URI = " \
- git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH};destsuffix=${DESTSUFFIX};subpath=${SUBPATH0};name=opendev \
- "
-
-DEPENDS += " \
- python \
- python-pbr-native \
- mtce \
- fm-common \
- json-c \
- openssl \
- libevent \
- libgcc \
- "
+++ /dev/null
-require monitoring-common.inc
-
-SUBPATH0 = "vm-topology/vm-topology"
-
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN}_append = " \
- python \
- libvirt \
- python-keyring \
- "
-
-DEPENDS += " \
- python-keyring \
- libvirt \
- "
-
-inherit setuptools python-dir
+++ /dev/null
-diff --git a/Makefile b/Makefile
-index 40dd933..ba6e029 100644
---- a/Makefile
-+++ b/Makefile
-@@ -31,8 +31,8 @@ LDLIBS = $(EXTRALDFLAGS) -lstdc++ -ldaemon -lcommon -lfmcommon -ljson-c -levent
- INCLUDES = -I. -I/usr/include/mtce-common -I/usr/include/mtce-daemon
-
- build: $(OBJS)
-- $(CXX) $(CCPFLAGS) $(AGENT_OBJS) $(LDLIBS) -L. -o guestAgent
-- $(CXX) $(CCPFLAGS) $(SERVER_OBJS) $(LDLIBS) -L. -o guestServer
-+ $(CXX) $(CCPFLAGS) $(LDFLAGS) $(AGENT_OBJS) $(LDLIBS) -L. -o guestAgent
-+ $(CXX) $(CCPFLAGS) $(LDFLAGS) $(SERVER_OBJS) $(LDLIBS) -L. -o guestServer
-
- .cpp.o:
- $(CXX) $(INCLUDES) $(CCPFLAGS) $(EXTRACCFLAGS) -c $< -o $@
+++ /dev/null
-diff --git a/mtce-guest/src/scripts/guestAgent.service b/mtce-guest/src/scripts/guestAgent.service
-index e88a965..5a54ba7 100644
---- a/mtce-guest/src/scripts/guestAgent.service
-+++ b/mtce-guest/src/scripts/guestAgent.service
-@@ -4,9 +4,9 @@ After=network.target syslog.service
-
- [Service]
- Type=forking
--ExecStart=/etc/rc.d/init.d/guestAgent start
--ExecStop=/etc/rc.d/init.d/guestAgent stop
--ExecReload=/etc/rc.d/init.d/guestAgent reload
-+ExecStart=/etc/init.d/guestAgent start
-+ExecStop=/etc/init.d/guestAgent stop
-+ExecReload=/etc/init.d/guestAgent reload
- PIDFile=/var/run/guestAgent.pid
-
- Restart=no
-diff --git a/mtce-guest/src/scripts/guestServer.service b/mtce-guest/src/scripts/guestServer.service
-index 6e2dd3a..1feb327 100644
---- a/mtce-guest/src/scripts/guestServer.service
-+++ b/mtce-guest/src/scripts/guestServer.service
-@@ -5,9 +5,9 @@ Before=pmon.service
-
- [Service]
- Type=forking
--ExecStart=/etc/rc.d/init.d/guestServer start
--ExecStop=/etc/rc.d/init.d/guestServer stop
--ExecReload=/etc/rc.d/init.d/guestServer reload
-+ExecStart=/etc/init.d/guestServer start
-+ExecStop=/etc/init.d/guestServer stop
-+ExecReload=/etc/init.d/guestServer reload
- PIDFile=/var/run/guestServer.pid
-
- # Failure handling
+++ /dev/null
-diff --git a/mtce-guest/src/scripts/guestAgent b/mtce-guest/src/scripts/guestAgent
-index a0a7b0e..41b5559 100644
---- a/mtce-guest/src/scripts/guestAgent
-+++ b/mtce-guest/src/scripts/guestAgent
-@@ -20,7 +20,7 @@
- . /etc/init.d/functions
-
- DAEMON_NAME="guestAgent"
--DAEMON="/usr/local/bin/${DAEMON_NAME}"
-+DAEMON="/usr/bin/${DAEMON_NAME}"
- PIDFILE="/var/run/${DAEMON_NAME}.pid"
- PLATFORM_CONF="/etc/platform/platform.conf"
-
-diff --git a/mtce-guest/src/scripts/guestAgent.service b/mtce-guest/src/scripts/guestAgent.service
-index 5a54ba7..c447305 100644
---- a/mtce-guest/src/scripts/guestAgent.service
-+++ b/mtce-guest/src/scripts/guestAgent.service
-@@ -7,7 +7,7 @@ Type=forking
- ExecStart=/etc/init.d/guestAgent start
- ExecStop=/etc/init.d/guestAgent stop
- ExecReload=/etc/init.d/guestAgent reload
--PIDFile=/var/run/guestAgent.pid
-+PIDFile=/run/guestAgent.pid
-
- Restart=no
-
-diff --git a/mtce-guest/src/scripts/guestServer b/mtce-guest/src/scripts/guestServer
-index ace6a41..1008ad5 100644
---- a/mtce-guest/src/scripts/guestServer
-+++ b/mtce-guest/src/scripts/guestServer
-@@ -20,7 +20,7 @@
- . /etc/init.d/functions
-
- DAEMON_NAME="guestServer"
--DAEMON="/usr/local/bin/${DAEMON_NAME}"
-+DAEMON="/usr/bin/${DAEMON_NAME}"
- PIDFILE="/var/run/${DAEMON_NAME}.pid"
- PLATFORM_CONF="/etc/platform/platform.conf"
-
-diff --git a/mtce-guest/src/scripts/guestServer.service b/mtce-guest/src/scripts/guestServer.service
-index 1feb327..7a63e6a 100644
---- a/mtce-guest/src/scripts/guestServer.service
-+++ b/mtce-guest/src/scripts/guestServer.service
-@@ -8,7 +8,7 @@ Type=forking
- ExecStart=/etc/init.d/guestServer start
- ExecStop=/etc/init.d/guestServer stop
- ExecReload=/etc/init.d/guestServer reload
--PIDFile=/var/run/guestServer.pid
-+PIDFile=/run/guestServer.pid
-
- # Failure handling
- TimeoutStartSec=10s
+++ /dev/null
-PACKAGES += " mtce-guestagent"
-PACKAGES += " mtce-guestserver"
-
-require nfv-common.inc
-
-SUBPATH0 = "mtce-guest/src"
-
-SRC_URI += " \
- file://0001-mtce-guest-Fix-ldflags-usage.patch \
- file://0002-mtce-guest-agent-server-fix-script-path.patch;striplevel=3 \
- file://0003-guest-agent-server-fix-daemon-paths.patch;striplevel=3 \
- "
-
-inherit systemd
-SYSTEMD_PACKAGES += "mtce-guestagent"
-SYSTEMD_PACKAGES += "mtce-guestserver"
-SYSTEMD_SERVICE_mtce-guestagent = "guestAgent.service"
-SYSTEMD_SERVICE_mtce-guestserver= "guestServer.service"
-SYSTEMD_AUTO_ENABLE_mtce-guestagent = "disable"
-SYSTEMD_AUTO_ENABLE_mtce-geustserver = "enable"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-RDEPENDS_${PN} += " mtce-guestagent mtce-guestserver"
-
-EXTRA_OEMAKE = '-e MAJOR="1" MINONR="0" \
- INCLUDES=" -I. -I${STAGING_INCDIR}/mtce-common/ -I${STAGING_INCDIR}/mtce-daemon/ " \
- CPPFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"'
-
-do_install() {
-
- oe_runmake -e install DESTDIR=${D} PREFIX=${D}/usr/ \
- SYSCONFDIR=${D}/${sysconfdir} \
- LOCALBINDIR=${D}/${bindir} \
- UNITDIR=${D}/${systemd_system_unitdir}
-
- rm -rf ${D}/var
- rm -rf ${D}/var/run
-}
-
-FILES_mtce-guestserver = " \
- ${sysconfdir}/logrotate.d/guestServer.logrotate \
- ${systemd_system_unitdir}/guestServer.service \
- "
-
-FILES_mtce-guestagent = " \
- ${systemd_system_unitdir}/guestAgent.service \
- ${sysconfdir}/logrotate.d/guestAgent.logrotate \
- ${libdir}/ocf/resource.d/platform/guestAgent \
-"
-
-FILE_${PN} = " \
- ${sysconfdir}/mtc/tmp \
- ${sysconfdir}/mtc/guestAgent.ini \
- ${sysconfdir}/mtc/guestServer.ini \
- ${sysconfdir}/init.d/guestServer \
- ${sysconfdir}/init.d/guestAgent \
- ${sysconfdir}/pmon.d/guestServer.conf \
- ${bindir}/guestServer \
- ${bindir}/guestAgent \
- "
-
+++ /dev/null
-require nfv-common.inc
-
-SUBPATH0 = "nfv/nfv-client"
-
-inherit setuptools
-
-
-do_install_append() {
-
- install -d -m 755 ${D}/${sysconfdir}/bash_completion.d
- install -m 444 scripts/sw-manager.completion ${D}/${sysconfdir}/bash_completion.d/sw-manager
-
-}
-
-FILES_${PN}_append = " \
- ${sysconfdir}/bash_completion.d/sw-manager \
- "
+++ /dev/null
-require nfv-common.inc
-
-SUBPATH0 = "nfv/nfv-common"
-
-inherit setuptools
+++ /dev/null
-DESCRIPTION = "stx-nfv"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCNAME = "nfv"
-SRCREV = "aaa932c00e028dcbaf0eed6843c4d3e51f09b2c1"
-SRCREV_opendev = "aaa932c00e028dcbaf0eed6843c4d3e51f09b2c1"
-DESTSUFFIX = "${PN}-${PV}"
-PV = "1.0.0"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = " \
- git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH};destsuffix=${DESTSUFFIX};subpath=${SUBPATH0};name=opendev \
- "
-
-DEPENDS += " \
- python \
- python-pbr-native \
- mtce \
- fm-common \
- json-c \
- openssl \
- libevent \
- libgcc \
- "
+++ /dev/null
-require nfv-common.inc
-
-SUBPATH0 = "nfv/nfv-plugins"
-
-inherit setuptools
-
-do_install_append () {
-
- install -d -m 755 ${D}/${sysconfdir}/nfv/
- install -d -m 755 ${D}/${sysconfdir}/nfv/nfv_plugins/
- install -d -m 755 ${D}/${sysconfdir}/nfv/nfv_plugins/alarm_handlers/
-
- install -p -D -m 600 nfv_plugins/alarm_handlers/config.ini \
- ${D}/${sysconfdir}/nfv/nfv_plugins/alarm_handlers/config.ini
-
- install -d -m 755 ${D}/${sysconfdir}/nfv/nfv_plugins/event_log_handlers/
-
- install -p -D -m 600 nfv_plugins/event_log_handlers/config.ini \
- ${D}/${sysconfdir}/nfv/nfv_plugins/event_log_handlers/config.ini
- \
- install -d -m 755 ${D}/${sysconfdir}/nfv/nfv_plugins/nfvi_plugins/
-
- install -p -D -m 600 nfv_plugins/nfvi_plugins/config.ini \
- ${D}/${sysconfdir}/nfv/nfv_plugins/nfvi_plugins/config.ini
-
- install -d -m 755 ${D}/
- install -p -D -m 644 scripts/nfvi-plugins.logrotate \
- ${D}/${sysconfdir}/logrotate.d/nfvi-plugins.logrotate
-
-}
+++ /dev/null
-require nfv-common.inc
-
-SUBPATH0 = "nfv/nfv-tools"
-
-inherit setuptools
+++ /dev/null
-require nfv-common.inc
-
-SUBPATH0 = "nfv/nfv-vim"
-
-inherit setuptools
-
-do_configure_prepend() {
- sed -i -e 's|@SYSCONFDIR@|${sysconfdir}|g' \
- scripts/vim \
- scripts/vim-api \
- scripts/vim-webserver \
- nfv_vim/config.ini
- sed -i -e 's|@PYTHONROOT@|${libdir}/python2.7/site-packages|g' nfv_vim/config.ini
-}
-
-do_install_append() {
- install -d -m 755 ${D}/usr/lib/ocf/resource.d/nfv
- install -p -D -m 755 scripts/vim ${D}/usr/lib/ocf/resource.d/nfv/vim
- install -p -D -m 755 scripts/vim-api ${D}/usr/lib/ocf/resource.d/nfv/vim-api
- install -p -D -m 755 scripts/vim-webserver ${D}/usr/lib/ocf/resource.d/nfv/vim-webserver
- install -d -m 755 ${D}/${sysconfdir}/nfv/
- install -d -m 755 ${D}/${sysconfdir}/nfv/vim/
- install -p -D -m 600 nfv_vim/config.ini ${D}/${sysconfdir}/nfv/vim/config.ini
- install -p -D -m 600 nfv_vim/debug.ini ${D}/${sysconfdir}/nfv/vim/debug.ini
-
-}
-
-FILES_${PN}_append = " \
- ${libdir}/ocf/resource.d/nfv/vim \
- ${libdir}/ocf/resource.d/nfv/vim-api \
- ${libdir}/ocf/resource.d/nfv/vim-webserver \
- "
+++ /dev/null
-require nfv-common.inc
-SUBPATH0 = "nova-api-proxy/nova-api-proxy"
-
-inherit setuptools systemd
-SYSTEMD_PACKAGES += "nova-api-proxy"
-SYSTEMD_SERVICE_${PN} = "api-proxy.service"
-
-do_install_append () {
-
- install -d -m 755 ${D}/${systemd_system_unitdir}
- install -p -D -m 644 nova_api_proxy/scripts/api-proxy.service ${D}/${systemd_system_unitdir}/api-proxy.service
- install -d -m 755 ${D}/${sysconfdir}/rc.d/init.d
- install -p -D -m 755 nova_api_proxy/scripts/api-proxy ${D}/${sysconfdir}/rc.d/init.d/api-proxy
-
- install -d -m 755 ${D}/${sysconfdir}/proxy
- install -p -D -m 700 nova_api_proxy/nova-api-proxy.conf ${D}${sysconfdir}/proxy/nova-api-proxy.conf
- install -p -D -m 700 nova_api_proxy/api-proxy-paste.ini ${D}${sysconfdir}/proxy/api-proxy-paste.ini
-
-
-}
+++ /dev/null
-From 47315e28d44cff586f6fff026dd00e61c2c77bcd Mon Sep 17 00:00:00 2001
-From: Gerry Kopec <Gerry.Kopec@windriver.com>
-Date: Wed, 9 Jan 2019 20:11:33 -0500
-Subject: [PATCH 1/4] Allow multiple containers per daemonset pod
-
-Remove code that restricted daemonset pods to single containers.
-Container names will default to name from helm chart template.
-Required for nova cold migrations to work.
-
-Story: 2003876
-Task: 26735
-Change-Id: Icce660415d43baefbbf768a785c5dedf04ea2930
-Signed-off-by: Gerry Kopec <Gerry.Kopec@windriver.com>
-(cherry picked from commit 7ca30319f418cd39db5ecf44cce5fb5fe39c458e)
-Signed-off-by: Robert Church <robert.church@windriver.com>
----
- helm-toolkit/templates/utils/_daemonset_overrides.tpl | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
-index e352bc9..10ab166 100644
---- a/helm-toolkit/templates/utils/_daemonset_overrides.tpl
-+++ b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
-@@ -225,13 +225,6 @@ limitations under the License.
- {{- if not $context.Values.__daemonset_yaml.metadata.name }}{{- $_ := set $context.Values.__daemonset_yaml.metadata "name" dict }}{{- end }}
- {{- $_ := set $context.Values.__daemonset_yaml.metadata "name" $current_dict.dns_1123_name }}
-
-- {{/* set container name
-- assume not more than one container is defined */}}
-- {{- $container := first $context.Values.__daemonset_yaml.spec.template.spec.containers }}
-- {{- $_ := set $container "name" $current_dict.dns_1123_name }}
-- {{- $cont_list := list $container }}
-- {{- $_ := set $context.Values.__daemonset_yaml.spec.template.spec "containers" $cont_list }}
--
- {{/* cross-reference configmap name to container volume definitions */}}
- {{- $_ := set $context.Values "__volume_list" list }}
- {{- range $current_volume := $context.Values.__daemonset_yaml.spec.template.spec.volumes }}
---
-2.7.4
-
+++ /dev/null
-From ac3f9db5ac1a19af71136752f5709ba1da55d201 Mon Sep 17 00:00:00 2001
-From: Angie Wang <angie.wang@windriver.com>
-Date: Mon, 11 Feb 2019 11:29:03 -0500
-Subject: [PATCH 2/4] Add imagePullSecrets in service account
-
-Signed-off-by: Robert Church <robert.church@windriver.com>
----
- helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl b/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl
-index b4cf1a6..2f4113b 100644
---- a/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl
-+++ b/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl
-@@ -44,6 +44,8 @@ kind: ServiceAccount
- metadata:
- name: {{ $saName }}
- namespace: {{ $saNamespace }}
-+imagePullSecrets:
-+ - name: default-registry-key
- {{- range $k, $v := $deps -}}
- {{- if eq $k "services" }}
- {{- range $serv := $v }}
---
-2.16.5
-
+++ /dev/null
-From 93ec2454cba41bf3de1419bada1f145f1ca9dbd9 Mon Sep 17 00:00:00 2001
-From: Al Bailey <Al.Bailey@windriver.com>
-Date: Wed, 20 Feb 2019 13:56:27 -0600
-Subject: [PATCH 3/4] Set Min NGINX handles
-
-Signed-off-by: Robert Church <robert.church@windriver.com>
----
- mariadb/files/nginx.tmpl | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/mariadb/files/nginx.tmpl b/mariadb/files/nginx.tmpl
-index 5ec3d0d..07b7cc5 100644
---- a/mariadb/files/nginx.tmpl
-+++ b/mariadb/files/nginx.tmpl
-@@ -23,7 +23,9 @@ daemon off;
-
- worker_processes {{ $cfg.WorkerProcesses }};
- pid /run/nginx.pid;
--{{ if ne .MaxOpenFiles 0 }}
-+{{ if lt .MaxOpenFiles 2048 }}
-+worker_rlimit_nofile 2048;
-+{{else}}
- worker_rlimit_nofile {{ .MaxOpenFiles }};
- {{ end }}
-
---
-2.16.5
-
+++ /dev/null
-From b3829fef30e76fdf498fa1d0d35185f642dce5f6 Mon Sep 17 00:00:00 2001
-From: Robert Church <robert.church@windriver.com>
-Date: Mon, 8 Apr 2019 02:12:39 -0400
-Subject: [PATCH 4/4] Partial revert of
- 31e3469d28858d7b5eb6355e88b6f49fd62032be
-
-Suspect that new use of mergeOverwrite vs. merge is breaking the
-per-host DaemonSet overrides.
-
-Signed-off-by: Robert Church <robert.church@windriver.com>
----
- helm-toolkit/templates/utils/_daemonset_overrides.tpl | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
-index 10ab166..ab1177a 100644
---- a/helm-toolkit/templates/utils/_daemonset_overrides.tpl
-+++ b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
-@@ -49,10 +49,10 @@ limitations under the License.
- {{- $override_conf_copy := $host_data.conf }}
- {{/* Deep copy to prevent https://storyboard.openstack.org/#!/story/2005936 */}}
- {{- $root_conf_copy := omit ($context.Values.conf | toYaml | fromYaml) "overrides" }}
-- {{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
-+ {{- $merged_dict := merge $override_conf_copy $root_conf_copy }}
- {{- $root_conf_copy2 := dict "conf" $merged_dict }}
- {{- $context_values := omit (omit ($context.Values | toYaml | fromYaml) "conf") "__daemonset_list" }}
-- {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
-+ {{- $root_conf_copy3 := merge $context_values $root_conf_copy2 }}
- {{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
- {{- $_ := set $current_dict "nodeData" $root_conf_copy4 }}
-
-@@ -89,10 +89,10 @@ limitations under the License.
- {{- $override_conf_copy := $label_data.conf }}
- {{/* Deep copy to prevent https://storyboard.openstack.org/#!/story/2005936 */}}
- {{- $root_conf_copy := omit ($context.Values.conf | toYaml | fromYaml) "overrides" }}
-- {{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
-+ {{- $merged_dict := merge $override_conf_copy $root_conf_copy }}
- {{- $root_conf_copy2 := dict "conf" $merged_dict }}
- {{- $context_values := omit (omit ($context.Values | toYaml | fromYaml) "conf") "__daemonset_list" }}
-- {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
-+ {{- $root_conf_copy3 := merge $context_values $root_conf_copy2 }}
- {{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
- {{- $_ := set $context.Values.__current_label "nodeData" $root_conf_copy4 }}
-
-@@ -187,7 +187,7 @@ limitations under the License.
- {{- $root_conf_copy1 := omit $context.Values.conf "overrides" }}
- {{- $root_conf_copy2 := dict "conf" $root_conf_copy1 }}
- {{- $context_values := omit $context.Values "conf" }}
-- {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
-+ {{- $root_conf_copy3 := merge $context_values $root_conf_copy2 }}
- {{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
- {{- $_ := set $context.Values.__default "nodeData" $root_conf_copy4 }}
-
-@@ -198,7 +198,7 @@ limitations under the License.
- {{- range $current_dict := $context.Values.__daemonset_list }}
-
- {{- $context_novalues := omit $context "Values" }}
-- {{- $merged_dict := mergeOverwrite $context_novalues $current_dict.nodeData }}
-+ {{- $merged_dict := merge $current_dict.nodeData $context_novalues }}
- {{- $_ := set $current_dict "nodeData" $merged_dict }}
- {{/* Deep copy original daemonset_yaml */}}
- {{- $_ := set $context.Values "__daemonset_yaml" ($daemonset_yaml | toYaml | fromYaml) }}
---
-2.7.4
-
+++ /dev/null
-From e2e9b3c707599b4074ebf504f6a2fa5c185481e2 Mon Sep 17 00:00:00 2001
-From: Angie Wang <angie.wang@windriver.com>
-Date: Tue, 9 Jul 2019 13:37:29 -0400
-Subject: [PATCH 1/1] Add TLS support for Gnocchi public endpoint
-
-Signed-off-by: Angie Wang <angie.wang@windriver.com>
----
- gnocchi/templates/secret-ingress-tls.yaml | 19 +++++++++++++++++++
- gnocchi/values.yaml | 12 ++++++++++++
- 2 files changed, 31 insertions(+)
- create mode 100644 gnocchi/templates/secret-ingress-tls.yaml
-
-diff --git a/gnocchi/templates/secret-ingress-tls.yaml b/gnocchi/templates/secret-ingress-tls.yaml
-new file mode 100644
-index 0000000..fc279cd
---- /dev/null
-+++ b/gnocchi/templates/secret-ingress-tls.yaml
-@@ -0,0 +1,19 @@
-+{{/*
-+Copyright 2019 Wind River Systems, Inc.
-+
-+Licensed under the Apache License, Version 2.0 (the "License");
-+you may not use this file except in compliance with the License.
-+You may obtain a copy of the License at
-+
-+ http://www.apache.org/licenses/LICENSE-2.0
-+
-+Unless required by applicable law or agreed to in writing, software
-+distributed under the License is distributed on an "AS IS" BASIS,
-+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+See the License for the specific language governing permissions and
-+limitations under the License.
-+*/}}
-+
-+{{- if .Values.manifests.secret_ingress_tls }}
-+{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "metric" ) }}
-+{{- end }}
-diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml
-index a4496b7..394e82a 100644
---- a/gnocchi/values.yaml
-+++ b/gnocchi/values.yaml
-@@ -472,6 +472,10 @@ secrets:
- admin: gnocchi-db-indexer-admin
- gnocchi: gnocchi-db-indexer-user
- rbd: gnocchi-rbd-keyring
-+ tls:
-+ metric:
-+ api:
-+ public: gnocchi-tls-public
-
- bootstrap:
- enabled: false
-@@ -538,6 +542,13 @@ endpoints:
- public: gnocchi
- host_fqdn_override:
- default: null
-+ # NOTE: this chart supports TLS for fqdn over-ridden public
-+ # endpoints using the following format:
-+ # public:
-+ # host: null
-+ # tls:
-+ # crt: null
-+ # key: null
- path:
- default: null
- scheme:
-@@ -633,6 +644,7 @@ manifests:
- pod_gnocchi_test: true
- secret_db: true
- secret_keystone: true
-+ secret_ingress_tls: true
- service_api: true
- service_ingress_api: true
- service_statsd: true
---
-2.7.4
-
+++ /dev/null
-From 326fcd76f54d7c099f4c3da6c31eefe0eef2e236 Mon Sep 17 00:00:00 2001
-From: Ovidiu Poncea <ovidiu.poncea@windriver.com>
-Date: Mon, 29 Jul 2019 08:00:01 -0400
-Subject: [PATCH] Fix pod restarts on all workers when worker added/removed
-
----
- helm-toolkit/templates/utils/_daemonset_overrides.tpl | 4 ++--
- helm-toolkit/templates/utils/_hash.tpl | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
-index ab1177a..e564869 100644
---- a/helm-toolkit/templates/utils/_daemonset_overrides.tpl
-+++ b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
-@@ -215,7 +215,7 @@ limitations under the License.
- name uniqueness */}}
- {{- $_ := set $current_dict "dns_1123_name" dict }}
- {{- if hasKey $current_dict "matchExpressions" }}
-- {{- $_ := set $current_dict "dns_1123_name" (printf (print $name_format2 "-" ($current_dict.matchExpressions | quote | sha256sum | trunc 8))) }}
-+ {{- $_ := set $current_dict "dns_1123_name" (printf (print $name_format2 "-" ($current_dict.matchExpressions | toJson | sha256sum | trunc 8))) }}
- {{- else }}
- {{- $_ := set $current_dict "dns_1123_name" $name_format2 }}
- {{- end }}
-@@ -258,7 +258,7 @@ limitations under the License.
- {{- if not $context.Values.__daemonset_yaml.spec.template.metadata }}{{- $_ := set $context.Values.__daemonset_yaml.spec.template "metadata" dict }}{{- end }}
- {{- if not $context.Values.__daemonset_yaml.spec.template.metadata.annotations }}{{- $_ := set $context.Values.__daemonset_yaml.spec.template.metadata "annotations" dict }}{{- end }}
- {{- $cmap := list $current_dict.dns_1123_name $current_dict.nodeData | include $configmap_include }}
-- {{- $values_hash := $cmap | quote | sha256sum }}
-+ {{- $values_hash := $cmap | toJson | sha256sum }}
- {{- $_ := set $context.Values.__daemonset_yaml.spec.template.metadata.annotations "configmap-etc-hash" $values_hash }}
-
- {{/* generate configmap */}}
-diff --git a/helm-toolkit/templates/utils/_hash.tpl b/helm-toolkit/templates/utils/_hash.tpl
-index 1041ec0..e419e3b 100644
---- a/helm-toolkit/templates/utils/_hash.tpl
-+++ b/helm-toolkit/templates/utils/_hash.tpl
-@@ -19,5 +19,5 @@ limitations under the License.
- {{- $context := index . 1 -}}
- {{- $last := base $context.Template.Name }}
- {{- $wtf := $context.Template.Name | replace $last $name -}}
--{{- include $wtf $context | sha256sum | quote -}}
-+{{- include $wtf $context | toJson | sha256sum | quote -}}
- {{- end -}}
---
-2.7.4
-
+++ /dev/null
-From f4c56def0797f093f626720871bd5e525227685e Mon Sep 17 00:00:00 2001
-From: Bin Yang <bin.yang@intel.com>
-Date: Tue, 13 Aug 2019 10:15:14 +0800
-Subject: [PATCH] add io_thread_pool for rabbitmq
-
-Signed-off-by: Bin Yang <bin.yang@intel.com>
----
- rabbitmq/templates/statefulset.yaml | 8 ++++++++
- rabbitmq/values.yaml | 4 ++++
- 2 files changed, 12 insertions(+)
-
-diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
-index 41dc198..e0e61e6 100644
---- a/rabbitmq/templates/statefulset.yaml
-+++ b/rabbitmq/templates/statefulset.yaml
-@@ -105,6 +105,10 @@ spec:
- key: RABBITMQ_ADMIN_PASSWORD
- - name: RABBITMQ_DEFINITION_FILE
- value: "{{ index $envAll.Values.conf.rabbitmq "management.load_definitions" }}"
-+{{- if $envAll.Values.io_thread_pool.enabled }}
-+ - name: RABBITMQ_IO_THREAD_POOL_SIZE
-+ value: {{ $envAll.Values.io_thread_pool.size | quote }}
-+{{- end }}
- volumeMounts:
- - name: pod-tmp
- mountPath: /tmp
-@@ -191,6 +195,10 @@ spec:
- value: "{{ tuple "oslo_messaging" "internal" "amqp" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}"
- - name: PORT_CLUSTERING
- value: "{{ add (tuple "oslo_messaging" "internal" "amqp" . | include "helm-toolkit.endpoints.endpoint_port_lookup") 20000 }}"
-+{{- if $envAll.Values.io_thread_pool.enabled }}
-+ - name: RABBITMQ_IO_THREAD_POOL_SIZE
-+ value: {{ $envAll.Values.io_thread_pool.size | quote }}
-+{{- end }}
- readinessProbe:
- initialDelaySeconds: 10
- timeoutSeconds: 10
-diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
-index 6c95787..9cd3a91 100644
---- a/rabbitmq/values.yaml
-+++ b/rabbitmq/values.yaml
-@@ -334,6 +334,10 @@ volume:
- class_name: general
- size: 256Mi
-
-+io_thread_pool:
-+ enabled: false
-+ size: 64
-+
- manifests:
- configmap_bin: true
- configmap_etc: true
---
-2.7.4
-
+++ /dev/null
-From 132df9829fa4c697e0b9701871888708973f9123 Mon Sep 17 00:00:00 2001
-From: Gerry Kopec <Gerry.Kopec@windriver.com>
-Date: Fri, 16 Aug 2019 14:29:46 -0400
-Subject: [PATCH] Enable override of rabbitmq probe parameters
-
-Add variables for initial delay, period and timeout for rabbitmq
-liveness and readiness probes.
-
-Change-Id: I8d2685118eb4ce3b8c27952892f7ad553fc5de77
-Signed-off-by: Gerry Kopec <Gerry.Kopec@windriver.com>
----
- rabbitmq/templates/statefulset.yaml | 10 ++++++----
- rabbitmq/values.yaml | 9 +++++++++
- 2 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
-index e0e61e6..f71dc3e 100644
---- a/rabbitmq/templates/statefulset.yaml
-+++ b/rabbitmq/templates/statefulset.yaml
-@@ -200,14 +200,16 @@ spec:
- value: {{ $envAll.Values.io_thread_pool.size | quote }}
- {{- end }}
- readinessProbe:
-- initialDelaySeconds: 10
-- timeoutSeconds: 10
-+ initialDelaySeconds: {{ $envAll.Values.pod.probes.readiness.initialDelaySeconds }}
-+ periodSeconds: {{ $envAll.Values.pod.probes.readiness.periodSeconds }}
-+ timeoutSeconds: {{ $envAll.Values.pod.probes.readiness.timeoutSeconds }}
- exec:
- command:
- - /tmp/rabbitmq-readiness.sh
- livenessProbe:
-- initialDelaySeconds: 30
-- timeoutSeconds: 10
-+ initialDelaySeconds: {{ $envAll.Values.pod.probes.liveness.initialDelaySeconds }}
-+ periodSeconds: {{ $envAll.Values.pod.probes.liveness.periodSeconds }}
-+ timeoutSeconds: {{ $envAll.Values.pod.probes.liveness.timeoutSeconds }}
- exec:
- command:
- - /tmp/rabbitmq-liveness.sh
-diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
-index 9cd3a91..2bae4cb 100644
---- a/rabbitmq/values.yaml
-+++ b/rabbitmq/values.yaml
-@@ -145,6 +145,15 @@ pod:
- limits:
- memory: "1024Mi"
- cpu: "2000m"
-+ probes:
-+ readiness:
-+ initialDelaySeconds: 10
-+ periodSeconds: 10
-+ timeoutSeconds: 10
-+ liveness:
-+ initialDelaySeconds: 30
-+ periodSeconds: 10
-+ timeoutSeconds: 10
-
- conf:
- enabled_plugins:
---
-2.7.4
-
+++ /dev/null
----
-apiVersion: v1
-generated: 2019-01-02T15:19:36.215111369-06:00
-repositories:
- - caFile: ""
- cache: /builddir/.helm/repository/cache/local-index.yaml
- certFile: ""
- keyFile: ""
- name: local
- password: ""
- url: http://127.0.0.1:8879/charts
- username: ""
+++ /dev/null
-
-SUMMARY = "Openstack-Helm-Infra charts"
-DESCRIPTION = "Openstack-Helm-Infra charts"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-DEPENDS += "helm-native"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCREV_openstack-helm-infra = "c9d6676bf9a5aceb311dc31dadd07cba6a3d6392"
-SRCREV_openstack-armada-app = "863f4b9733d3d4f4fd490606a94b84cfdaf2df2c"
-
-# Patches pulled from:
-# SRCREV_openstack-armada-app = "863f4b9733d3d4f4fd490606a94b84cfdaf2df2c"
-# git://opendev.org/starlingx/openstack-armada-app
-
-SRC_URI = " \
- git://github.com/openstack/openstack-helm-infra;protocol=${PROTOCOL};name=openstack-helm-infra \
- file://0001-Allow-multiple-containers-per-daemonset-pod.patch \
- file://0002-Add-imagePullSecrets-in-service-account.patch \
- file://0003-Set-Min-NGINX-handles.patch \
- file://0004-Partial-revert-of-31e3469d28858d7b5eb6355e88b6f49fd6.patch \
- file://0005-Add-TLS-support-for-Gnocchi-public-endpoint.patch \
- file://0006-Fix-pod-restarts-on-all-workers-when-worker-added-re.patch \
- file://0007-Add-io_thread_pool-for-rabbitmq.patch \
- file://0008-Enable-override-of-rabbitmq-probe-parameters.patch \
- file://repositories.yaml \
- "
-
-PATCHTOOL = "git"
-PATCH_COMMIT_FUNCTIONS = "1"
-
-S = "${WORKDIR}/git"
-
-inherit allarch
-
-helm_folder = "${nonarch_libdir}/helm"
-
-do_configure[noexec] = "1"
-
-do_compile () {
- # initialize helm and build the toolkit
- # helm init --client-only does not work if there is no networking
- # The following commands do essentially the same as: helm init
- export HOME="${B}/${USER}"
- export helm_home="${B}/${USER}/.helm"
- rm -rf ${helm_home}
-
- mkdir -p ${helm_home}
- mkdir ${helm_home}/repository
- mkdir ${helm_home}/repository/cache
- mkdir ${helm_home}/repository/local
- mkdir ${helm_home}/plugins
- mkdir ${helm_home}/starters
- mkdir ${helm_home}/cache
- mkdir ${helm_home}/cache/archive
-
- # Stage a repository file that only has a local repo
- install -m 0644 ${WORKDIR}/repositories.yaml \
- ${helm_home}/repository/repositories.yaml
-
- # Host a server for the charts
- tmpdir=`mktemp -d ${B}/charts-XXXXXX`
- helm serve ${tmpdir} --address localhost:8879 --url http://localhost:8879/charts &
- sleep 1
- helm repo rm local
- helm repo add local http://localhost:8879/charts
-
- # Make the charts. These produce tgz files
- make helm-toolkit
- make gnocchi
- make ingress
- make libvirt
- make mariadb
- make memcached
- make openvswitch
- make rabbitmq
- make ceph-rgw
-
- # terminate helm server (the last backgrounded task)
- kill $!
- rm -rf ${helm_home}
-}
-
-do_install () {
- install -d -m 755 ${D}${helm_folder}
- install -p -D -m 755 ${B}/*.tgz ${D}${helm_folder}
-}
-
-FILES_${PN} = "${helm_folder}"
-
-RDEPENDS_${PN} = "helm"
+++ /dev/null
-From 5302aa4e87694e96cc3dfc56ae494a1a8211cc37 Mon Sep 17 00:00:00 2001
-From: Angie Wang <angie.wang@windriver.com>
-Date: Wed, 6 Mar 2019 18:06:06 -0500
-Subject: [PATCH 01] Ceilometer chart: add the ability to publish events to
- panko
-
-Ceilometer notification agent sends the events to panko via panko
-dispatcher/publisher which requires the db connection information
-in /etc/panko/panko.conf.
-This commit updates to mount the configuration file for panko in
-ceilometer notification pod.
-
-Change-Id: I4ca524ed7462f945a245e9dbe1d69493dbc4211d
-Story: 2005019
-Task: 29498
-Depends-On: https://review.openstack.org/#/c/641144/
-Signed-off-by: Angie Wang <angie.wang@windriver.com>
-(cherry picked from commit 507bc47f1447808c57c1c8aa82b0639543083656)
-Signed-off-by: Robert Church <robert.church@windriver.com>
----
- ceilometer/values.yaml | 29 +++++++++++++++++++++++++++++
- 1 file changed, 29 insertions(+)
-
-diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml
-index 44dda74..1343670 100644
---- a/ceilometer/values.yaml
-+++ b/ceilometer/values.yaml
-@@ -1706,6 +1706,8 @@ dependencies:
- service: mongodb
- - endpoint: internal
- service: metric
-+ - endpoint: internal
-+ service: event
- tests:
- services:
- - endpoint: internal
-@@ -1827,6 +1829,21 @@ endpoints:
- api:
- default: 8041
- public: 80
-+ event:
-+ name: panko
-+ hosts:
-+ default: panko-api
-+ public: panko
-+ host_fqdn_override:
-+ default: null
-+ path:
-+ default: null
-+ scheme:
-+ default: 'http'
-+ port:
-+ api:
-+ default: 8977
-+ public: 80
- alarming:
- name: aodh
- hosts:
-@@ -1958,7 +1975,19 @@ pod:
- init_container: null
- ceilometer_notification:
- volumeMounts:
-+ - name: etcpanko
-+ mountPath: /etc/panko
-+ - name: panko-etc
-+ mountPath: /etc/panko/panko.conf
-+ subPath: panko.conf
-+ readOnly: true
- volumes:
-+ - name: etcpanko
-+ emptyDir: {}
-+ - name: panko-etc
-+ secret:
-+ secretName: panko-etc
-+ defaultMode: 0444
- ceilometer_db_sync:
- ceilometer_db_sync:
- volumeMounts:
---
-2.7.4
-
+++ /dev/null
-From a0e8c7e3764b168eaaa82d17d965f62d34766573 Mon Sep 17 00:00:00 2001
-From: Chris Friesen <chris.friesen@windriver.com>
-Date: Wed, 28 Nov 2018 01:33:39 -0500
-Subject: [PATCH 02] Remove stale Apache2 service pids when a POD starts.
-
-Stale Apache2 pids will prevent Apache2 from starting and will leave
-the POD in a crashed state.
-
-Note: the pid file is somewhat confusingly called
-/var/run/httpd/httpd.pid and /var/run/apache2 is just a symlink to
-/var/run/httpd.
-
-This is loosely based off the in-review upstream commit at
-https://review.openstack.org/#/c/619747
-
-Signed-off-by: Robert Church <robert.church@windriver.com>
----
- ceilometer/templates/bin/_ceilometer-api.sh.tpl | 3 +++
- keystone/templates/bin/_keystone-api.sh.tpl | 6 ++----
- nova/templates/bin/_nova-placement-api.sh.tpl | 3 +++
- 3 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/ceilometer/templates/bin/_ceilometer-api.sh.tpl b/ceilometer/templates/bin/_ceilometer-api.sh.tpl
-index 25b2f9e..3870b4e 100644
---- a/ceilometer/templates/bin/_ceilometer-api.sh.tpl
-+++ b/ceilometer/templates/bin/_ceilometer-api.sh.tpl
-@@ -42,6 +42,9 @@ function start () {
- fi
- fi
-
-+ # Get rid of stale pid file if present.
-+ rm -f /var/run/apache2/*.pid
-+
- # Start Apache2
- exec {{ .Values.conf.software.apache2.binary }} {{ .Values.conf.software.apache2.start_parameters }}
- }
-diff --git a/keystone/templates/bin/_keystone-api.sh.tpl b/keystone/templates/bin/_keystone-api.sh.tpl
-index 384ee8b..4c72310 100644
---- a/keystone/templates/bin/_keystone-api.sh.tpl
-+++ b/keystone/templates/bin/_keystone-api.sh.tpl
-@@ -43,10 +43,8 @@ function start () {
- source /etc/apache2/envvars
- fi
-
-- if [ -f /var/run/apache2/apache2.pid ]; then
-- # Remove the stale pid for debian/ubuntu images
-- rm -f /var/run/apache2/apache2.pid
-- fi
-+ # Get rid of stale pid, shared memory segment and wsgi sock files if present.
-+ rm -f /var/run/apache2/*
-
- # Start Apache2
- exec {{ .Values.conf.software.apache2.binary }} {{ .Values.conf.software.apache2.start_parameters }}
-diff --git a/nova/templates/bin/_nova-placement-api.sh.tpl b/nova/templates/bin/_nova-placement-api.sh.tpl
-index bc15a37..055d079 100644
---- a/nova/templates/bin/_nova-placement-api.sh.tpl
-+++ b/nova/templates/bin/_nova-placement-api.sh.tpl
-@@ -33,6 +33,9 @@ function start () {
- fi
- fi
-
-+ # Get rid of stale pid file if present.
-+ rm -f /var/run/apache2/*.pid
-+
- # Start Apache2
- {{- if .Values.conf.software.apache2.a2enmod }}
- {{- range .Values.conf.software.apache2.a2enmod }}
---
-2.7.4
-
+++ /dev/null
-From 64b22037b53e6423c465367c26a6d7255768ae17 Mon Sep 17 00:00:00 2001
-From: Gerry Kopec <Gerry.Kopec@windriver.com>
-Date: Wed, 27 Mar 2019 00:35:57 -0400
-Subject: [PATCH 03] Nova console/ip address search optionality
-
-Add options to nova to enable/disable the use of:
-1. the vnc or spice server proxyclient address found by the console
- compute init container
-2. my_ip hypervisor address found by compute init container
-
-These options can be used to prevent cases where the found addresses
-overwrite what has already been defined in nova.conf by per host nova
-compute daemonset overrides.
-
-Story: 2005259
-Task: 30066
-Change-Id: Idf490f8b19dcd1e71a9b5fa8934461f1198a8af8
-Signed-off-by: Gerry Kopec <Gerry.Kopec@windriver.com>
-(cherry picked from commit f5e8ad20e35b770e5967f75f6f93f0a4dc6e3b41)
-Signed-off-by: Robert Church <robert.church@windriver.com>
----
- nova/templates/bin/_nova-compute.sh.tpl | 6 +++++-
- nova/values.yaml | 3 ++-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/nova/templates/bin/_nova-compute.sh.tpl b/nova/templates/bin/_nova-compute.sh.tpl
-index c80da6d..4927908 100644
---- a/nova/templates/bin/_nova-compute.sh.tpl
-+++ b/nova/templates/bin/_nova-compute.sh.tpl
-@@ -20,6 +20,10 @@ set -ex
-
- exec nova-compute \
- --config-file /etc/nova/nova.conf \
-+{{- if .Values.console.address_search_enabled }}
- --config-file /tmp/pod-shared/nova-console.conf \
-+{{- end }}
- --config-file /tmp/pod-shared/nova-libvirt.conf \
-- --config-file /tmp/pod-shared/nova-hypervisor.conf
-\ No newline at end of file
-+{{- if .Values.conf.hypervisor.address_search_enabled }}
-+ --config-file /tmp/pod-shared/nova-hypervisor.conf
-+{{- end }}
-diff --git a/nova/values.yaml b/nova/values.yaml
-index 29512ca..7ba2925 100644
---- a/nova/values.yaml
-+++ b/nova/values.yaml
-@@ -461,7 +461,7 @@ console:
- vncproxy:
- # IF blank, search default routing interface
- vncserver_proxyclient_interface:
--
-+ address_search_enabled: true
- ssh:
- key_types:
- - rsa
-@@ -1598,6 +1598,7 @@ conf:
- # If this option is set to None, the hostname of the migration target compute node will be used.
- live_migration_interface:
- hypervisor:
-+ address_search_enabled: true
- # my_ip can be set automatically through this interface name.
- host_interface:
- # This list is the keys to exclude from the config file ingested by nova-compute
---
-2.7.4
-
+++ /dev/null
-From 4f6701c4cab07d9f54012e2a143173803f97ff3d Mon Sep 17 00:00:00 2001
-From: Irina Mihai <irina.mihai@windriver.com>
-Date: Tue, 26 Feb 2019 17:43:53 +0000
-Subject: [PATCH 04] Nova chart: Support ephemeral pool creation
-
-If libvirt images_type is rbd, then we need to have the
-images_rbd_pool present. These changes add a new job
-to make sure this pool exists.
-
-Change-Id: Iee307cb54384d1c4583d00a8d28f7b1a0676d7d8
-Story: 2004922
-Task: 29285
-Signed-off-by: Irina Mihai <irina.mihai@windriver.com>
-(cherry picked from commit 0afcb0b37cdcf57436e44867bac9242d8684ce81)
-Signed-off-by: Robert Church <robert.church@windriver.com>
----
- nova/templates/bin/_nova-storage-init.sh.tpl | 75 +++++++++++++
- nova/templates/configmap-bin.yaml | 4 +-
- nova/templates/job-storage-init.yaml | 155 +++++++++++++++++++++++++++
- nova/values.yaml | 19 +++-
- 4 files changed, 251 insertions(+), 2 deletions(-)
- create mode 100644 nova/templates/bin/_nova-storage-init.sh.tpl
- create mode 100644 nova/templates/job-storage-init.yaml
-
-diff --git a/nova/templates/bin/_nova-storage-init.sh.tpl b/nova/templates/bin/_nova-storage-init.sh.tpl
-new file mode 100644
-index 0000000..f79fcff
---- /dev/null
-+++ b/nova/templates/bin/_nova-storage-init.sh.tpl
-@@ -0,0 +1,75 @@
-+#!/bin/bash
-+
-+{{/*
-+Copyright 2019 The Openstack-Helm Authors.
-+
-+Licensed under the Apache License, Version 2.0 (the "License");
-+you may not use this file except in compliance with the License.
-+You may obtain a copy of the License at
-+
-+ http://www.apache.org/licenses/LICENSE-2.0
-+
-+Unless required by applicable law or agreed to in writing, software
-+distributed under the License is distributed on an "AS IS" BASIS,
-+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+See the License for the specific language governing permissions and
-+limitations under the License.
-+*/}}
-+
-+set -x
-+if [ "x$STORAGE_BACKEND" == "xrbd" ]; then
-+ SECRET=$(mktemp --suffix .yaml)
-+ KEYRING=$(mktemp --suffix .keyring)
-+ function cleanup {
-+ rm -f ${SECRET} ${KEYRING}
-+ }
-+ trap cleanup EXIT
-+fi
-+
-+set -ex
-+if [ "x$STORAGE_BACKEND" == "xrbd" ]; then
-+ ceph -s
-+ function ensure_pool () {
-+ ceph osd pool stats $1 || ceph osd pool create $1 $2
-+ local test_version=$(ceph tell osd.* version | egrep -c "mimic|luminous" | xargs echo)
-+ if [[ ${test_version} -gt 0 ]]; then
-+ ceph osd pool application enable $1 $3
-+ fi
-+ size_protection=$(ceph osd pool get $1 nosizechange | cut -f2 -d: | tr -d '[:space:]')
-+ ceph osd pool set $1 nosizechange 0
-+ ceph osd pool set $1 size ${RBD_POOL_REPLICATION}
-+ ceph osd pool set $1 nosizechange ${size_protection}
-+ ceph osd pool set $1 crush_rule "${RBD_POOL_CRUSH_RULE}"
-+ }
-+ ensure_pool ${RBD_POOL_NAME} ${RBD_POOL_CHUNK_SIZE} "nova-ephemeral"
-+
-+ if USERINFO=$(ceph auth get client.${RBD_POOL_USER}); then
-+ echo "Cephx user client.${RBD_POOL_USER} already exist."
-+ echo "Update its cephx caps"
-+ ceph auth caps client.${RBD_POOL_USER} \
-+ mon "profile rbd" \
-+ osd "profile rbd"
-+ ceph auth get client.${RBD_POOL_USER} -o ${KEYRING}
-+ else
-+ # NOTE: Restrict Nova permissions to what is needed.
-+ # MON Read only and RBD access to the Nova ephemeral pool only.
-+ ceph auth get-or-create client.${RBD_POOL_USER} \
-+ mon "profile rbd" \
-+ osd "profile rbd" \
-+ -o ${KEYRING}
-+ fi
-+
-+ ENCODED_KEYRING=$(sed -n 's/^[[:blank:]]*key[[:blank:]]\+=[[:blank:]]\(.*\)/\1/p' ${KEYRING} | base64 -w0)
-+ cat > ${SECRET} <<EOF
-+apiVersion: v1
-+kind: Secret
-+metadata:
-+ name: "${RBD_POOL_SECRET}"
-+type: kubernetes.io/rbd
-+data:
-+ key: $( echo ${ENCODED_KEYRING} )
-+EOF
-+ kubectl apply --namespace ${NAMESPACE} -f ${SECRET}
-+
-+fi
-+
-diff --git a/nova/templates/configmap-bin.yaml b/nova/templates/configmap-bin.yaml
-index c58b90b..268434f 100644
---- a/nova/templates/configmap-bin.yaml
-+++ b/nova/templates/configmap-bin.yaml
-@@ -1,5 +1,5 @@
- {{/*
--Copyright 2017 The Openstack-Helm Authors.
-+Copyright 2017-2019 The Openstack-Helm Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
-@@ -83,6 +83,8 @@ data:
- {{ tuple "bin/_nova-console-proxy-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
- nova-console-proxy-init-assets.sh: |
- {{ tuple "bin/_nova-console-proxy-init-assets.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-+ nova-storage-init.sh: |
-+{{ tuple "bin/_nova-storage-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
- ssh-start.sh: |
- {{ tuple "bin/_ssh-start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
- cell-setup.sh: |
-diff --git a/nova/templates/job-storage-init.yaml b/nova/templates/job-storage-init.yaml
-new file mode 100644
-index 0000000..7d057fb
---- /dev/null
-+++ b/nova/templates/job-storage-init.yaml
-@@ -0,0 +1,155 @@
-+{{/*
-+Copyright 2019 The Openstack-Helm Authors.
-+
-+Licensed under the Apache License, Version 2.0 (the "License");
-+you may not use this file except in compliance with the License.
-+You may obtain a copy of the License at
-+
-+ http://www.apache.org/licenses/LICENSE-2.0
-+
-+Unless required by applicable law or agreed to in writing, software
-+distributed under the License is distributed on an "AS IS" BASIS,
-+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+See the License for the specific language governing permissions and
-+limitations under the License.
-+*/}}
-+
-+{{- if .Values.manifests.job_storage_init }}
-+{{- $envAll := . }}
-+
-+{{- $serviceAccountName := "nova-storage-init" }}
-+{{ tuple $envAll "storage_init" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
-+---
-+apiVersion: rbac.authorization.k8s.io/v1beta1
-+kind: Role
-+metadata:
-+ name: {{ $serviceAccountName }}
-+rules:
-+ - apiGroups:
-+ - ""
-+ resources:
-+ - secrets
-+ verbs:
-+ - get
-+ - create
-+ - update
-+ - patch
-+---
-+apiVersion: rbac.authorization.k8s.io/v1beta1
-+kind: RoleBinding
-+metadata:
-+ name: {{ $serviceAccountName }}
-+roleRef:
-+ apiGroup: rbac.authorization.k8s.io
-+ kind: Role
-+ name: {{ $serviceAccountName }}
-+subjects:
-+ - kind: ServiceAccount
-+ name: {{ $serviceAccountName }}
-+ namespace: {{ $envAll.Release.Namespace }}
-+---
-+apiVersion: batch/v1
-+kind: Job
-+metadata:
-+ name: nova-storage-init
-+spec:
-+ template:
-+ metadata:
-+ labels:
-+{{ tuple $envAll "nova" "storage-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
-+ spec:
-+ serviceAccountName: {{ $serviceAccountName }}
-+ restartPolicy: OnFailure
-+ nodeSelector:
-+ {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
-+ initContainers:
-+{{ tuple $envAll "storage_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
-+ {{ if or .Values.conf.ceph.enabled }}
-+ - name: ceph-keyring-placement
-+{{ tuple $envAll "nova_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }}
-+ securityContext:
-+ runAsUser: 0
-+ command:
-+ - /tmp/ceph-admin-keyring.sh
-+ volumeMounts:
-+ - name: etcceph
-+ mountPath: /etc/ceph
-+ - name: nova-bin
-+ mountPath: /tmp/ceph-admin-keyring.sh
-+ subPath: ceph-admin-keyring.sh
-+ readOnly: true
-+ {{- if empty .Values.conf.ceph.admin_keyring }}
-+ - name: ceph-keyring
-+ mountPath: /tmp/client-keyring
-+ subPath: key
-+ readOnly: true
-+ {{ end }}
-+ {{ end }}
-+ containers:
-+ {{- range $ephemeralPool := .Values.conf.ceph.ephemeral_storage.rbd_pools }}
-+ - name: nova-storage-init-{{- $ephemeralPool.rbd_pool_name }}
-+{{ tuple $envAll "nova_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }}
-+{{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-+ env:
-+ - name: NAMESPACE
-+ valueFrom:
-+ fieldRef:
-+ fieldPath: metadata.namespace
-+ {{ if and (eq $envAll.Values.conf.ceph.ephemeral_storage.type "rbd") $envAll.Values.conf.ceph.enabled }}
-+ - name: STORAGE_BACKEND
-+ value: {{ $envAll.Values.conf.ceph.ephemeral_storage.type }}
-+ - name: RBD_POOL_NAME
-+ value: {{ $ephemeralPool.rbd_pool_name | quote }}
-+ - name: RBD_POOL_USER
-+ value: {{ $ephemeralPool.rbd_user | quote }}
-+ - name: RBD_POOL_CRUSH_RULE
-+ value: {{ $ephemeralPool.rbd_crush_rule | quote }}
-+ - name: RBD_POOL_REPLICATION
-+ value: {{ $ephemeralPool.rbd_replication | quote }}
-+ - name: RBD_POOL_CHUNK_SIZE
-+ value: {{ $ephemeralPool.rbd_chunk_size | quote }}
-+ - name: RBD_POOL_SECRET
-+ value: {{ $envAll.Values.secrets.ephemeral | quote }}
-+ {{- end }}
-+ command:
-+ - /tmp/nova-storage-init.sh
-+ volumeMounts:
-+ - name: nova-bin
-+ mountPath: /tmp/nova-storage-init.sh
-+ subPath: nova-storage-init.sh
-+ readOnly: true
-+ {{ if or $envAll.Values.conf.ceph.enabled }}
-+ - name: etcceph
-+ mountPath: /etc/ceph
-+ - name: ceph-etc
-+ mountPath: /etc/ceph/ceph.conf
-+ subPath: ceph.conf
-+ readOnly: true
-+ {{- if empty $envAll.Values.conf.ceph.admin_keyring }}
-+ - name: ceph-keyring
-+ mountPath: /tmp/client-keyring
-+ subPath: key
-+ readOnly: true
-+ {{- end }}
-+ {{- end }}
-+ {{- end }}
-+ volumes:
-+ - name: nova-bin
-+ configMap:
-+ name: nova-bin
-+ defaultMode: 0555
-+ {{ if or .Values.conf.ceph.enabled }}
-+ - name: etcceph
-+ emptyDir: {}
-+ - name: ceph-etc
-+ configMap:
-+ name: {{ .Values.ceph_client.configmap }}
-+ defaultMode: 0444
-+ {{- if empty .Values.conf.ceph.admin_keyring }}
-+ - name: ceph-keyring
-+ secret:
-+ secretName: {{ .Values.ceph_client.user_secret_name }}
-+ {{- end }}
-+ {{- end }}
-+{{- end }}
-+
-diff --git a/nova/values.yaml b/nova/values.yaml
-index 7ba2925..97ef1b5 100644
---- a/nova/values.yaml
-+++ b/nova/values.yaml
-@@ -87,6 +87,7 @@ images:
- nova_service_cleaner: 'docker.io/port/ceph-config-helper:v1.10.3'
- nova_spiceproxy: docker.io/openstackhelm/nova:ocata-ubuntu_xenial
- nova_spiceproxy_assets: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:ocata'
-+ nova_storage_init: 'docker.io/port/ceph-config-helper:v1.10.3'
- test: docker.io/xrally/xrally-openstack:1.3.0
- image_repo_sync: docker.io/docker:17.07.0
- local_registry:
-@@ -556,6 +557,14 @@ conf:
- user: "cinder"
- keyring: null
- secret_uuid: 457eb676-33da-42ec-9a8c-9293d545c337
-+ ephemeral_storage:
-+ type: rbd
-+ rbd_pools:
-+ - rbd_pool_name: ephemeral
-+ rbd_user: ephemeral
-+ rbd_crush_rule: 0
-+ rbd_replication: 3
-+ rbd_chunk_size: 64
- ssh: |
- Host *
- StrictHostKeyChecking no
-@@ -1797,6 +1806,7 @@ secrets:
- placement:
- placement:
- public: placement-tls-public
-+ ephemeral: nova-ephemeral
-
- # typically overridden by environmental
- # values, but should include all endpoints
-@@ -2482,7 +2492,13 @@ pod:
- limits:
- memory: "1024Mi"
- cpu: "2000m"
--
-+ storage_init:
-+ requests:
-+ memory: "128Mi"
-+ cpu: "100m"
-+ limits:
-+ memory: "1024Mi"
-+ cpu: "2000m"
- network_policy:
- nova:
- # TODO(lamt): Need to tighten this ingress for security.
-@@ -2545,6 +2561,7 @@ manifests:
- job_ks_placement_service: true
- job_ks_placement_user: true
- job_cell_setup: true
-+ job_storage_init: true
- pdb_metadata: true
- pdb_placement: true
- pdb_osapi: true
---
-2.7.4
-
+++ /dev/null
-From af94c98eee44769a2c1e8f211029f8346a13ebc2 Mon Sep 17 00:00:00 2001
-From: Robert Church <robert.church@windriver.com>
-Date: Fri, 22 Mar 2019 03:42:08 -0400
-Subject: [PATCH 05] Nova: Add support for disabling Readiness/Liveness
- probes
-
-With the introduction of Readiness/Liveness probes in
-Ib8e4b93486588320fd2d562c3bc90b65844e52e5, some probes are failing and
-preventing successful armada manifest applies.
-
-Add support to disable the probes.
-
-Change-Id: Iebe7327055f58fa78ce3fcac968c1fa617c30c2f
-Signed-off-by: Robert Church <robert.church@windriver.com>
----
- nova/templates/daemonset-compute.yaml | 4 ++++
- nova/templates/deployment-conductor.yaml | 4 ++++
- nova/templates/deployment-consoleauth.yaml | 4 ++++
- nova/templates/deployment-novncproxy.yaml | 4 ++++
- nova/templates/deployment-scheduler.yaml | 4 ++++
- nova/templates/deployment-spiceproxy.yaml | 4 ++++
- nova/values.yaml | 28 ++++++++++++++++++++++++++++
- 7 files changed, 52 insertions(+)
-
-diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml
-index feea6ab..86dc2b9 100644
---- a/nova/templates/daemonset-compute.yaml
-+++ b/nova/templates/daemonset-compute.yaml
-@@ -190,6 +190,7 @@ spec:
- - name: LIBVIRT_CEPH_SECRET_UUID
- value: "{{ .Values.conf.ceph.secret_uuid }}"
- {{ end }}
-+ {{- if .Values.pod.probes.readiness.nova_compute.enabled }}
- readinessProbe:
- exec:
- command:
-@@ -202,6 +203,8 @@ spec:
- initialDelaySeconds: 80
- periodSeconds: 90
- timeoutSeconds: 70
-+ {{- end }}
-+ {{- if .Values.pod.probes.liveness.nova_compute.enabled }}
- livenessProbe:
- exec:
- command:
-@@ -215,6 +218,7 @@ spec:
- initialDelaySeconds: 120
- periodSeconds: 90
- timeoutSeconds: 70
-+ {{- end }}
- command:
- - /tmp/nova-compute.sh
- volumeMounts:
-diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml
-index f927afa..0caa006 100644
---- a/nova/templates/deployment-conductor.yaml
-+++ b/nova/templates/deployment-conductor.yaml
-@@ -59,6 +59,7 @@ spec:
- {{ tuple $envAll "nova_conductor" | include "helm-toolkit.snippets.image" | indent 10 }}
- {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
- {{ dict "envAll" $envAll "application" "nova" "container" "nova_conductor" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
-+ {{- if .Values.pod.probes.readiness.nova_conductor.enabled }}
- readinessProbe:
- exec:
- command:
-@@ -71,6 +72,8 @@ spec:
- initialDelaySeconds: 80
- periodSeconds: 90
- timeoutSeconds: 70
-+ {{- end }}
-+ {{- if .Values.pod.probes.liveness.nova_conductor.enabled }}
- livenessProbe:
- exec:
- command:
-@@ -84,6 +87,7 @@ spec:
- initialDelaySeconds: 120
- periodSeconds: 90
- timeoutSeconds: 70
-+ {{- end }}
- command:
- - /tmp/nova-conductor.sh
- volumeMounts:
-diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml
-index b9cb717..0f590e0 100644
---- a/nova/templates/deployment-consoleauth.yaml
-+++ b/nova/templates/deployment-consoleauth.yaml
-@@ -59,6 +59,7 @@ spec:
- {{ tuple $envAll "nova_consoleauth" | include "helm-toolkit.snippets.image" | indent 10 }}
- {{ tuple $envAll $envAll.Values.pod.resources.consoleauth | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
- {{ dict "envAll" $envAll "application" "nova" "container" "nova_consoleauth" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
-+ {{- if .Values.pod.probes.readiness.nova_consoleauth.enabled }}
- readinessProbe:
- exec:
- command:
-@@ -71,6 +72,8 @@ spec:
- initialDelaySeconds: 80
- periodSeconds: 90
- timeoutSeconds: 70
-+ {{- end }}
-+ {{- if .Values.pod.probes.liveness.nova_consoleauth.enabled }}
- livenessProbe:
- exec:
- command:
-@@ -84,6 +87,7 @@ spec:
- initialDelaySeconds: 120
- periodSeconds: 90
- timeoutSeconds: 70
-+ {{- end }}
- command:
- - /tmp/nova-consoleauth.sh
- volumeMounts:
-diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml
-index 42a52af..495c1ac 100644
---- a/nova/templates/deployment-novncproxy.yaml
-+++ b/nova/templates/deployment-novncproxy.yaml
-@@ -103,14 +103,18 @@ spec:
- {{ tuple $envAll "nova_novncproxy" | include "helm-toolkit.snippets.image" | indent 10 }}
- {{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
- {{ dict "envAll" $envAll "application" "nova" "container" "nova_novncproxy" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
-+ {{- if .Values.pod.probes.readiness.nova_novcnproxy.enabled }}
- readinessProbe:
- tcpSocket:
- port: {{ tuple "compute_novnc_proxy" "internal" "novnc_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
- initialDelaySeconds: 30
-+ {{- end }}
-+ {{- if .Values.pod.probes.liveness.nova_novcnproxy.enabled }}
- livenessProbe:
- tcpSocket:
- port: {{ tuple "compute_novnc_proxy" "internal" "novnc_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
- initialDelaySeconds: 30
-+ {{- end }}
- command:
- - /tmp/nova-console-proxy.sh
- ports:
-diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml
-index 05ee949..9a30fa6 100644
---- a/nova/templates/deployment-scheduler.yaml
-+++ b/nova/templates/deployment-scheduler.yaml
-@@ -59,6 +59,7 @@ spec:
- {{ tuple $envAll "nova_scheduler" | include "helm-toolkit.snippets.image" | indent 10 }}
- {{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
- {{ dict "envAll" $envAll "application" "nova" "container" "nova_scheduler" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
-+ {{- if .Values.pod.probes.readiness.nova_scheduler.enabled }}
- readinessProbe:
- exec:
- command:
-@@ -72,6 +73,8 @@ spec:
- initialDelaySeconds: 80
- periodSeconds: 90
- timeoutSeconds: 70
-+ {{- end }}
-+ {{- if .Values.pod.probes.liveness.nova_scheduler.enabled }}
- livenessProbe:
- exec:
- command:
-@@ -86,6 +89,7 @@ spec:
- initialDelaySeconds: 120
- periodSeconds: 90
- timeoutSeconds: 70
-+ {{- end }}
- command:
- - /tmp/nova-scheduler.sh
- volumeMounts:
-diff --git a/nova/templates/deployment-spiceproxy.yaml b/nova/templates/deployment-spiceproxy.yaml
-index a221656..038c85c 100644
---- a/nova/templates/deployment-spiceproxy.yaml
-+++ b/nova/templates/deployment-spiceproxy.yaml
-@@ -101,14 +101,18 @@ spec:
- {{ tuple $envAll "nova_spiceproxy" | include "helm-toolkit.snippets.image" | indent 10 }}
- {{ tuple $envAll $envAll.Values.pod.resources.spiceproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
- {{ dict "envAll" $envAll "application" "nova" "container" "nova_spiceproxy" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
-+ {{- if .Values.pod.probes.readiness.nova_spiceproxy.enabled }}
- readinessProbe:
- tcpSocket:
- port: {{ tuple "compute_spice_proxy" "internal" "spice_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
- initialDelaySeconds: 30
-+ {{- end }}
-+ {{- if .Values.pod.probes.liveness.nova_spiceproxy.enabled }}
- livenessProbe:
- tcpSocket:
- port: {{ tuple "compute_spice_proxy" "internal" "spice_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
- initialDelaySeconds: 30
-+ {{- end }}
- command:
- - /tmp/nova-console-proxy.sh
- ports:
-diff --git a/nova/values.yaml b/nova/values.yaml
-index 97ef1b5..4092329 100644
---- a/nova/values.yaml
-+++ b/nova/values.yaml
-@@ -2499,6 +2499,34 @@ pod:
- limits:
- memory: "1024Mi"
- cpu: "2000m"
-+ probes:
-+ readiness:
-+ nova_compute:
-+ enabled: true
-+ nova_conductor:
-+ enabled: true
-+ nova_consoleauth:
-+ enabled: true
-+ nova_novcnproxy:
-+ enabled: true
-+ nova_scheduler:
-+ enabled: true
-+ nova_spiceproxy:
-+ enabled: true
-+ liveness:
-+ nova_compute:
-+ enabled: true
-+ nova_conductor:
-+ enabled: true
-+ nova_consoleauth:
-+ enabled: true
-+ nova_novcnproxy:
-+ enabled: true
-+ nova_scheduler:
-+ enabled: true
-+ nova_spiceproxy:
-+ enabled: true
-+
- network_policy:
- nova:
- # TODO(lamt): Need to tighten this ingress for security.
---
-2.7.4
-
+++ /dev/null
-From 374b61d70c593694f850bd6f6a74842c12ecf5f8 Mon Sep 17 00:00:00 2001
-From: zhipengl <zhipengs.liu@intel.com>
-Date: Fri, 31 May 2019 06:49:51 +0800
-Subject: [PATCH] Add placement chart
-
-This commit adds a helm chart to deploy placement.
-
-Related test pass on simplex and multi-node setup
-
-Story: 2005799
-Task: 33532
-
-Change-Id: Ife908628c6379d2d39d15f72073da3018cc26950
-Signed-off-by: zhipengl <zhipengs.liu@intel.com>
----
- placement/Chart.yaml | 9 +
- placement/requirements.yaml | 10 +
- placement/templates/bin/_db-sync.sh.tpl | 13 +
- placement/templates/bin/_placement-api.sh.tpl | 34 +++
- placement/templates/configmap-bin.yaml | 31 ++
- placement/templates/configmap-etc.yaml | 58 ++++
- placement/templates/deployment.yaml | 116 ++++++++
- placement/templates/ingress.yaml | 12 +
- placement/templates/job-db-drop.yaml | 13 +
- placement/templates/job-db-init.yaml | 15 +
- placement/templates/job-db-sync.yaml | 12 +
- placement/templates/job-image-repo-sync.yaml | 12 +
- placement/templates/job-ks-endpoints.yaml | 12 +
- placement/templates/job-ks-service.yaml | 12 +
- placement/templates/job-ks-user.yaml | 12 +
- placement/templates/network_policy.yaml | 12 +
- placement/templates/pdb.yaml | 21 ++
- placement/templates/secret-db.yaml | 22 ++
- placement/templates/secret-ingress-tls.yaml | 11 +
- placement/templates/secret-keystone.yaml | 22 ++
- placement/templates/service-ingress.yaml | 12 +
- placement/templates/service.yaml | 26 ++
- placement/values.yaml | 413 ++++++++++++++++++++++++++
- 23 files changed, 910 insertions(+)
- create mode 100644 placement/Chart.yaml
- create mode 100644 placement/requirements.yaml
- create mode 100644 placement/templates/bin/_db-sync.sh.tpl
- create mode 100644 placement/templates/bin/_placement-api.sh.tpl
- create mode 100644 placement/templates/configmap-bin.yaml
- create mode 100644 placement/templates/configmap-etc.yaml
- create mode 100644 placement/templates/deployment.yaml
- create mode 100644 placement/templates/ingress.yaml
- create mode 100644 placement/templates/job-db-drop.yaml
- create mode 100644 placement/templates/job-db-init.yaml
- create mode 100644 placement/templates/job-db-sync.yaml
- create mode 100644 placement/templates/job-image-repo-sync.yaml
- create mode 100644 placement/templates/job-ks-endpoints.yaml
- create mode 100644 placement/templates/job-ks-service.yaml
- create mode 100644 placement/templates/job-ks-user.yaml
- create mode 100644 placement/templates/network_policy.yaml
- create mode 100644 placement/templates/pdb.yaml
- create mode 100644 placement/templates/secret-db.yaml
- create mode 100644 placement/templates/secret-ingress-tls.yaml
- create mode 100644 placement/templates/secret-keystone.yaml
- create mode 100644 placement/templates/service-ingress.yaml
- create mode 100644 placement/templates/service.yaml
- create mode 100644 placement/values.yaml
-
-diff --git a/placement/Chart.yaml b/placement/Chart.yaml
-new file mode 100644
-index 0000000..e8eb058
---- /dev/null
-+++ b/placement/Chart.yaml
-@@ -0,0 +1,9 @@
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+
-+apiVersion: v1
-+appVersion: "1.0"
-+description: OpenStack Placement Service
-+name: placement
-+version: 0.1.0
-diff --git a/placement/requirements.yaml b/placement/requirements.yaml
-new file mode 100644
-index 0000000..3a162a6
---- /dev/null
-+++ b/placement/requirements.yaml
-@@ -0,0 +1,10 @@
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+
-+dependencies:
-+ - name: helm-toolkit
-+ repository: http://localhost:8879/charts
-+ version: 0.1.0
-diff --git a/placement/templates/bin/_db-sync.sh.tpl b/placement/templates/bin/_db-sync.sh.tpl
-new file mode 100644
-index 0000000..4a36848
---- /dev/null
-+++ b/placement/templates/bin/_db-sync.sh.tpl
-@@ -0,0 +1,13 @@
-+#!/bin/bash
-+
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+set -ex
-+
-+su -s /bin/sh -c "placement-manage db sync" placement
-diff --git a/placement/templates/bin/_placement-api.sh.tpl b/placement/templates/bin/_placement-api.sh.tpl
-new file mode 100644
-index 0000000..4f82970
---- /dev/null
-+++ b/placement/templates/bin/_placement-api.sh.tpl
-@@ -0,0 +1,34 @@
-+#!/bin/bash
-+
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+set -ex
-+COMMAND="${@:-start}"
-+
-+function start () {
-+
-+ cp -a $(type -p placement-api) /var/www/cgi-bin/placement/
-+
-+ if [ -f /etc/apache2/envvars ]; then
-+ # Loading Apache2 ENV variables
-+ source /etc/apache2/envvars
-+ fi
-+
-+ # Get rid of stale pid file if present.
-+ rm -f /var/run/apache2/*.pid
-+
-+ # Start Apache2
-+ exec apache2 -DFOREGROUND
-+}
-+
-+function stop () {
-+ apachectl -k graceful-stop
-+}
-+
-+$COMMAND
-diff --git a/placement/templates/configmap-bin.yaml b/placement/templates/configmap-bin.yaml
-new file mode 100644
-index 0000000..3e98ea9
---- /dev/null
-+++ b/placement/templates/configmap-bin.yaml
-@@ -0,0 +1,31 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.configmap_bin }}
-+{{- $envAll := . }}
-+---
-+apiVersion: v1
-+kind: ConfigMap
-+metadata:
-+ name: placement-bin
-+data:
-+ placement-api.sh: |
-+{{ tuple "bin/_placement-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-+ db-sync.sh: |
-+{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-+ db-init.py: |
-+{{- include "helm-toolkit.scripts.db_init" . | indent 4 }}
-+ db-drop.py: |
-+{{- include "helm-toolkit.scripts.db_drop" . | indent 4 }}
-+ ks-service.sh: |
-+{{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }}
-+ ks-endpoints.sh: |
-+{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }}
-+ ks-user.sh: |
-+{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }}
-+{{- end }}
-diff --git a/placement/templates/configmap-etc.yaml b/placement/templates/configmap-etc.yaml
-new file mode 100644
-index 0000000..62834cc
---- /dev/null
-+++ b/placement/templates/configmap-etc.yaml
-@@ -0,0 +1,58 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.configmap_etc }}
-+{{- $envAll := . }}
-+
-+{{- if empty .Values.conf.placement.placement_database.connection -}}
-+{{- $_ := tuple "oslo_db" "internal" "placement" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.placement.placement_database "connection" -}}
-+{{- end -}}
-+
-+{{- if empty .Values.conf.placement.keystone_authtoken.auth_uri -}}
-+{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.placement.keystone_authtoken "auth_uri" -}}
-+{{- end -}}
-+{{- if empty .Values.conf.placement.keystone_authtoken.auth_url -}}
-+{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.placement.keystone_authtoken "auth_url" -}}
-+{{- end -}}
-+
-+{{- if empty .Values.conf.placement.keystone_authtoken.os_region_name -}}
-+{{- $_ := set .Values.conf.placement.keystone_authtoken "os_region_name" .Values.endpoints.identity.auth.placement.region_name -}}
-+{{- end -}}
-+{{- if empty .Values.conf.placement.keystone_authtoken.project_name -}}
-+{{- $_ := set .Values.conf.placement.keystone_authtoken "project_name" .Values.endpoints.identity.auth.placement.project_name -}}
-+{{- end -}}
-+{{- if empty .Values.conf.placement.keystone_authtoken.project_domain_name -}}
-+{{- $_ := set .Values.conf.placement.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.placement.project_domain_name -}}
-+{{- end -}}
-+{{- if empty .Values.conf.placement.keystone_authtoken.user_domain_name -}}
-+{{- $_ := set .Values.conf.placement.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.placement.user_domain_name -}}
-+{{- end -}}
-+{{- if empty .Values.conf.placement.keystone_authtoken.username -}}
-+{{- $_ := set .Values.conf.placement.keystone_authtoken "username" .Values.endpoints.identity.auth.placement.username -}}
-+{{- end -}}
-+{{- if empty .Values.conf.placement.keystone_authtoken.password -}}
-+{{- $_ := set .Values.conf.placement.keystone_authtoken "password" .Values.endpoints.identity.auth.placement.password -}}
-+{{- end -}}
-+{{- if empty .Values.conf.placement.keystone_authtoken.memcached_servers -}}
-+{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.placement.keystone_authtoken "memcached_servers" -}}
-+{{- end -}}
-+{{- if empty .Values.conf.placement.keystone_authtoken.memcache_secret_key -}}
-+{{- $_ := set .Values.conf.placement.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}}
-+{{- end -}}
-+---
-+apiVersion: v1
-+kind: Secret
-+metadata:
-+ name: placement-etc
-+type: Opaque
-+data:
-+ policy.yaml: {{ toYaml .Values.conf.policy | b64enc }}
-+ placement.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.placement | b64enc }}
-+ logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
-+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_placement "key" "wsgi-placement.conf" "format" "Secret" ) | indent 2 }}
-+{{- end }}
-diff --git a/placement/templates/deployment.yaml b/placement/templates/deployment.yaml
-new file mode 100644
-index 0000000..922bbcf
---- /dev/null
-+++ b/placement/templates/deployment.yaml
-@@ -0,0 +1,116 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.deployment }}
-+{{- $envAll := . }}
-+
-+{{- $mounts_placement := .Values.pod.mounts.placement.placement }}
-+{{- $mounts_placement_init := .Values.pod.mounts.placement.init_container }}
-+
-+{{- $serviceAccountName := "placement-api" }}
-+{{ tuple $envAll "api" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
-+---
-+apiVersion: apps/v1
-+kind: Deployment
-+metadata:
-+ name: placement-api
-+ annotations:
-+ {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
-+ labels:
-+{{ tuple $envAll "placement" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
-+spec:
-+ replicas: {{ .Values.pod.replicas.api }}
-+ selector:
-+ matchLabels:
-+{{ tuple $envAll "placement" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
-+{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
-+ template:
-+ metadata:
-+ labels:
-+{{ tuple $envAll "placement" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
-+ annotations:
-+{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
-+ configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
-+ configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
-+ spec:
-+ serviceAccountName: {{ $serviceAccountName }}
-+ affinity:
-+{{ tuple $envAll "placement" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
-+ nodeSelector:
-+ {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }}
-+ terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }}
-+ initContainers:
-+{{ tuple $envAll "api" $mounts_placement_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
-+ containers:
-+ - name: placement-api
-+{{ tuple $envAll "placement" | include "helm-toolkit.snippets.image" | indent 10 }}
-+{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-+ command:
-+ - /tmp/placement-api.sh
-+ - start
-+ lifecycle:
-+ preStop:
-+ exec:
-+ command:
-+ - /tmp/placement-api.sh
-+ - stop
-+ ports:
-+ - name: p-api
-+ containerPort: {{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-+ readinessProbe:
-+ #NOTE(portdirect): use tcpSocket check as HTTP will return 401
-+ tcpSocket:
-+ port: {{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-+ initialDelaySeconds: 15
-+ periodSeconds: 10
-+ livenessProbe:
-+ tcpSocket:
-+ port: {{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-+ initialDelaySeconds: 50
-+ periodSeconds: 10
-+ volumeMounts:
-+ - name: pod-tmp
-+ mountPath: /tmp
-+ - name: wsgi-placement
-+ mountPath: /var/www/cgi-bin/placement
-+ - name: placement-bin
-+ mountPath: /tmp/placement-api.sh
-+ subPath: placement-api.sh
-+ readOnly: true
-+ - name: placement-etc
-+ mountPath: /etc/placement/placement.conf
-+ subPath: placement.conf
-+ readOnly: true
-+ - name: placement-etc
-+ mountPath: {{ .Values.conf.placement.DEFAULT.log_config_append }}
-+ subPath: {{ base .Values.conf.placement.DEFAULT.log_config_append }}
-+ readOnly: true
-+ - name: placement-etc
-+ mountPath: /etc/placement/policy.yaml
-+ subPath: policy.yaml
-+ readOnly: true
-+ - name: placement-etc
-+ mountPath: /etc/apache2/conf-enabled/wsgi-placement.conf
-+ subPath: wsgi-placement.conf
-+ readOnly: true
-+{{ if $mounts_placement.volumeMounts }}{{ toYaml $mounts_placement.volumeMounts | indent 12 }}{{ end }}
-+ volumes:
-+ - name: pod-tmp
-+ emptyDir: {}
-+ - name: wsgi-placement
-+ emptyDir: {}
-+ - name: placement-bin
-+ configMap:
-+ name: placement-bin
-+ defaultMode: 0555
-+ - name: placement-etc
-+ secret:
-+ secretName: placement-etc
-+ defaultMode: 0444
-+{{ if $mounts_placement.volumes }}{{ toYaml $mounts_placement.volumes | indent 8 }}{{ end }}
-+{{- end }}
-diff --git a/placement/templates/ingress.yaml b/placement/templates/ingress.yaml
-new file mode 100644
-index 0000000..5dcced8
---- /dev/null
-+++ b/placement/templates/ingress.yaml
-@@ -0,0 +1,12 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if and .Values.manifests.ingress .Values.network.api.ingress.public }}
-+{{- $ingressOpts := dict "envAll" . "backendServiceType" "placement" "backendPort" "p-api" -}}
-+{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
-+{{- end }}
-diff --git a/placement/templates/job-db-drop.yaml b/placement/templates/job-db-drop.yaml
-new file mode 100644
-index 0000000..1cdb753
---- /dev/null
-+++ b/placement/templates/job-db-drop.yaml
-@@ -0,0 +1,13 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.job_db_drop }}
-+{{- $serviceName := "placement" -}}
-+{{- $dbDropJob := dict "envAll" . "serviceName" $serviceName -}}
-+{{ $dbDropJob | include "helm-toolkit.manifests.job_db_drop_mysql" }}
-+{{- end }}
-diff --git a/placement/templates/job-db-init.yaml b/placement/templates/job-db-init.yaml
-new file mode 100644
-index 0000000..4c9d450
---- /dev/null
-+++ b/placement/templates/job-db-init.yaml
-@@ -0,0 +1,15 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.job_db_init }}
-+{{- $serviceName := "placement" -}}
-+{{- $dbApi := dict "adminSecret" .Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "configDbSection" "placement_database" "configDbKey" "connection" -}}
-+{{- $dbsToInit := list $dbApi }}
-+{{- $dbInitJob := dict "envAll" . "serviceName" $serviceName "dbsToInit" $dbsToInit -}}
-+{{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }}
-+{{- end }}
-diff --git a/placement/templates/job-db-sync.yaml b/placement/templates/job-db-sync.yaml
-new file mode 100644
-index 0000000..5aeefba
---- /dev/null
-+++ b/placement/templates/job-db-sync.yaml
-@@ -0,0 +1,12 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.job_db_sync }}
-+{{- $dbSyncJob := dict "envAll" . "serviceName" "placement" -}}
-+{{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
-+{{- end }}
-diff --git a/placement/templates/job-image-repo-sync.yaml b/placement/templates/job-image-repo-sync.yaml
-new file mode 100644
-index 0000000..022b160
---- /dev/null
-+++ b/placement/templates/job-image-repo-sync.yaml
-@@ -0,0 +1,12 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }}
-+{{- $imageRepoSyncJob := dict "envAll" . "serviceName" "placement" -}}
-+{{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }}
-+{{- end }}
-diff --git a/placement/templates/job-ks-endpoints.yaml b/placement/templates/job-ks-endpoints.yaml
-new file mode 100644
-index 0000000..d3a43fc
---- /dev/null
-+++ b/placement/templates/job-ks-endpoints.yaml
-@@ -0,0 +1,12 @@
-+{{/*
-+#
-+# Copyright (c) 2018 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.job_ks_endpoints }}
-+{{- $ksServiceJob := dict "envAll" . "serviceName" "placement" "serviceTypes" ( tuple "placement" ) -}}
-+{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }}
-+{{- end }}
-diff --git a/placement/templates/job-ks-service.yaml b/placement/templates/job-ks-service.yaml
-new file mode 100644
-index 0000000..0dd6d6e
---- /dev/null
-+++ b/placement/templates/job-ks-service.yaml
-@@ -0,0 +1,12 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.job_ks_service }}
-+{{- $ksServiceJob := dict "envAll" . "serviceName" "placement" "serviceTypes" ( tuple "placement" ) -}}
-+{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }}
-+{{- end }}
-diff --git a/placement/templates/job-ks-user.yaml b/placement/templates/job-ks-user.yaml
-new file mode 100644
-index 0000000..b0f7799
---- /dev/null
-+++ b/placement/templates/job-ks-user.yaml
-@@ -0,0 +1,12 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.job_ks_user }}
-+{{- $ksUserJob := dict "envAll" . "serviceName" "placement" -}}
-+{{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }}
-+{{- end }}
-diff --git a/placement/templates/network_policy.yaml b/placement/templates/network_policy.yaml
-new file mode 100644
-index 0000000..6355f90
---- /dev/null
-+++ b/placement/templates/network_policy.yaml
-@@ -0,0 +1,12 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.network_policy -}}
-+{{- $netpol_opts := dict "envAll" . "name" "application" "label" "placement" }}
-+{{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }}
-+{{- end -}}
-diff --git a/placement/templates/pdb.yaml b/placement/templates/pdb.yaml
-new file mode 100644
-index 0000000..a61fe58
---- /dev/null
-+++ b/placement/templates/pdb.yaml
-@@ -0,0 +1,21 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.pdb }}
-+{{- $envAll := . }}
-+---
-+apiVersion: policy/v1beta1
-+kind: PodDisruptionBudget
-+metadata:
-+ name: placement-api
-+spec:
-+ minAvailable: {{ .Values.pod.lifecycle.disruption_budget.api.min_available }}
-+ selector:
-+ matchLabels:
-+{{ tuple $envAll "placement" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
-+{{- end }}
-diff --git a/placement/templates/secret-db.yaml b/placement/templates/secret-db.yaml
-new file mode 100644
-index 0000000..5c7321e
---- /dev/null
-+++ b/placement/templates/secret-db.yaml
-@@ -0,0 +1,22 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.secret_db }}
-+{{- $envAll := . }}
-+{{- range $key1, $userClass := tuple "admin" "placement" }}
-+{{- $secretName := index $envAll.Values.secrets.oslo_db $userClass }}
-+---
-+apiVersion: v1
-+kind: Secret
-+metadata:
-+ name: {{ $secretName }}
-+type: Opaque
-+data:
-+ DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}}
-+{{- end }}
-+{{- end }}
-diff --git a/placement/templates/secret-ingress-tls.yaml b/placement/templates/secret-ingress-tls.yaml
-new file mode 100644
-index 0000000..3413b5b
---- /dev/null
-+++ b/placement/templates/secret-ingress-tls.yaml
-@@ -0,0 +1,11 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.secret_ingress_tls }}
-+{{ include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "placement" ) }}
-+{{- end }}
-diff --git a/placement/templates/secret-keystone.yaml b/placement/templates/secret-keystone.yaml
-new file mode 100644
-index 0000000..efc1a17
---- /dev/null
-+++ b/placement/templates/secret-keystone.yaml
-@@ -0,0 +1,22 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.secret_keystone }}
-+{{- $envAll := . }}
-+{{- range $key1, $userClass := tuple "admin" "placement" }}
-+{{- $secretName := index $envAll.Values.secrets.identity $userClass }}
-+---
-+apiVersion: v1
-+kind: Secret
-+metadata:
-+ name: {{ $secretName }}
-+type: Opaque
-+data:
-+{{- tuple $userClass "internal" $envAll | include "helm-toolkit.snippets.keystone_secret_openrc" | indent 2 -}}
-+{{- end }}
-+{{- end }}
-diff --git a/placement/templates/service-ingress.yaml b/placement/templates/service-ingress.yaml
-new file mode 100644
-index 0000000..75fcd61
---- /dev/null
-+++ b/placement/templates/service-ingress.yaml
-@@ -0,0 +1,12 @@
-+{{/*
-+#
-+# Copyright (c) 2019 StarlingX.
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if and .Values.manifests.service_ingress .Values.network.api.ingress.public }}
-+{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "placement" -}}
-+{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
-+{{- end }}
-diff --git a/placement/templates/service.yaml b/placement/templates/service.yaml
-new file mode 100644
-index 0000000..0bda157
---- /dev/null
-+++ b/placement/templates/service.yaml
-@@ -0,0 +1,26 @@
-+{{/*
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+*/}}
-+
-+{{- if .Values.manifests.service }}
-+{{- $envAll := . }}
-+---
-+apiVersion: v1
-+kind: Service
-+metadata:
-+ name: {{ tuple "placement" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-+spec:
-+ ports:
-+ - name: p-api
-+ port: {{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-+ {{ if .Values.network.api.node_port.enabled }}
-+ nodePort: {{ .Values.network.api.node_port.port }}
-+ {{ end }}
-+ selector:
-+{{ tuple $envAll "placement" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
-+ {{ if .Values.network.api.node_port.enabled }}
-+ type: NodePort
-+ {{ end }}
-+{{- end }}
-diff --git a/placement/values.yaml b/placement/values.yaml
-new file mode 100644
-index 0000000..33139f0
---- /dev/null
-+++ b/placement/values.yaml
-@@ -0,0 +1,413 @@
-+#
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+
-+# Default values for openstack-placement.
-+# This is a YAML-formatted file.
-+# Declare variables to be passed into your templates.
-+
-+release_group: null
-+
-+labels:
-+ api:
-+ node_selector_key: openstack-control-plane
-+ node_selector_value: enabled
-+ job:
-+ node_selector_key: openstack-control-plane
-+ node_selector_value: enabled
-+
-+images:
-+ pull_policy: IfNotPresent
-+ tags:
-+ placement: docker.io/openstackhelm/placement:ocata-ubuntu_xenial
-+ ks_user: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-+ ks_service: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-+ ks_endpoints: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-+ db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-+ db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-+ placement_db_sync: docker.io/openstackhelm/placement:ocata-ubuntu_xenial
-+ dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-+ image_repo_sync: docker.io/docker:17.07.0
-+ local_registry:
-+ active: false
-+ exclude:
-+ - dep_check
-+ - image_repo_sync
-+
-+network:
-+ api:
-+ port: 8778
-+ ingress:
-+ public: true
-+ classes:
-+ namespace: "nginx"
-+ cluster: "nginx-cluster"
-+ annotations:
-+ nginx.ingress.kubernetes.io/rewrite-target: /
-+ external_policy_local: false
-+ node_port:
-+ enabled: false
-+ port: 30778
-+
-+conf:
-+ policy:
-+ context_is_admin: 'role:admin'
-+ segregation: 'rule:context_is_admin'
-+ admin_or_owner: 'rule:context_is_admin or project_id:%(project_id)s'
-+ default: 'rule:admin_or_owner'
-+ placement:
-+ DEFAULT:
-+ debug: false
-+ use_syslog: false
-+ log_config_append: /etc/placement/logging.conf
-+ placement_database:
-+ connection: null
-+ keystone_authtoken:
-+ auth_version: v3
-+ auth_type: password
-+ memcache_security_strategy: ENCRYPT
-+ logging:
-+ loggers:
-+ keys:
-+ - root
-+ - placement
-+ handlers:
-+ keys:
-+ - stdout
-+ - stderr
-+ - "null"
-+ formatters:
-+ keys:
-+ - context
-+ - default
-+ logger_root:
-+ level: WARNING
-+ handlers: stdout
-+ logger_placement:
-+ level: INFO
-+ handlers:
-+ - stdout
-+ qualname: placement
-+ logger_amqp:
-+ level: WARNING
-+ handlers: stderr
-+ qualname: amqp
-+ logger_amqplib:
-+ level: WARNING
-+ handlers: stderr
-+ qualname: amqplib
-+ logger_eventletwsgi:
-+ level: WARNING
-+ handlers: stderr
-+ qualname: eventlet.wsgi.server
-+ logger_sqlalchemy:
-+ level: WARNING
-+ handlers: stderr
-+ qualname: sqlalchemy
-+ logger_boto:
-+ level: WARNING
-+ handlers: stderr
-+ qualname: boto
-+ handler_null:
-+ class: logging.NullHandler
-+ formatter: default
-+ args: ()
-+ handler_stdout:
-+ class: StreamHandler
-+ args: (sys.stdout,)
-+ formatter: context
-+ handler_stderr:
-+ class: StreamHandler
-+ args: (sys.stderr,)
-+ formatter: context
-+ formatter_context:
-+ class: oslo_log.formatters.ContextFormatter
-+ datefmt: "%Y-%m-%d %H:%M:%S"
-+ formatter_default:
-+ format: "%(message)s"
-+ datefmt: "%Y-%m-%d %H:%M:%S"
-+ wsgi_placement: |
-+ Listen 0.0.0.0:{{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-+ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-+ LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
-+ SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
-+ CustomLog /dev/stdout combined env=!forwarded
-+ CustomLog /dev/stdout proxy env=forwarded
-+ <VirtualHost *:{{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
-+ WSGIDaemonProcess placement-api processes=1 threads=4 user=placement group=placement display-name=%{GROUP}
-+ WSGIProcessGroup placement-api
-+ WSGIScriptAlias / /var/www/cgi-bin/placement/placement-api
-+ WSGIApplicationGroup %{GLOBAL}
-+ WSGIPassAuthorization On
-+ <IfVersion >= 2.4>
-+ ErrorLogFormat "%{cu}t %M"
-+ </IfVersion>
-+ ErrorLog /dev/stdout
-+ SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
-+ CustomLog /dev/stdout combined env=!forwarded
-+ CustomLog /dev/stdout proxy env=forwarded
-+ </VirtualHost>
-+ Alias /placement /var/www/cgi-bin/placement/placement-api
-+ <Location /placement>
-+ SetHandler wsgi-script
-+ Options +ExecCGI
-+ WSGIProcessGroup placement-api
-+ WSGIApplicationGroup %{GLOBAL}
-+ WSGIPassAuthorization On
-+ </Location>
-+
-+endpoints:
-+ cluster_domain_suffix: cluster.local
-+ local_image_registry:
-+ name: docker-registry
-+ namespace: docker-registry
-+ hosts:
-+ default: localhost
-+ internal: docker-registry
-+ node: localhost
-+ host_fqdn_override:
-+ default: null
-+ port:
-+ registry:
-+ node: 5000
-+ oslo_db:
-+ auth:
-+ admin:
-+ username: root
-+ password: password
-+ placement:
-+ username: placement
-+ password: password
-+ hosts:
-+ default: mariadb
-+ host_fqdn_override:
-+ default: null
-+ path: /placement
-+ scheme: mysql+pymysql
-+ port:
-+ mysql:
-+ default: 3306
-+ oslo_cache:
-+ auth:
-+ # NOTE(portdirect): this is used to define the value for keystone
-+ # authtoken cache encryption key, if not set it will be populated
-+ # automatically with a random value, but to take advantage of
-+ # this feature all services should be set to use the same key,
-+ # and memcache service.
-+ memcache_secret_key: null
-+ hosts:
-+ default: memcached
-+ host_fqdn_override:
-+ default: null
-+ port:
-+ memcache:
-+ default: 11211
-+ identity:
-+ name: keystone
-+ auth:
-+ admin:
-+ region_name: RegionOne
-+ username: admin
-+ password: password
-+ project_name: admin
-+ user_domain_name: default
-+ project_domain_name: default
-+ placement:
-+ role: admin
-+ region_name: RegionOne
-+ username: placement
-+ password: password
-+ project_name: service
-+ user_domain_name: service
-+ project_domain_name: service
-+ hosts:
-+ default: keystone
-+ internal: keystone-api
-+ host_fqdn_override:
-+ default: null
-+ path:
-+ default: /v3
-+ scheme:
-+ default: http
-+ port:
-+ api:
-+ default: 80
-+ internal: 5000
-+ placement:
-+ name: placement
-+ hosts:
-+ default: placement-api
-+ public: placement
-+ host_fqdn_override:
-+ default: null
-+ path:
-+ default: /
-+ scheme:
-+ default: 'http'
-+ port:
-+ api:
-+ default: 8778
-+ public: 80
-+
-+pod:
-+ user:
-+ placement:
-+ uid: 42424
-+ affinity:
-+ anti:
-+ type:
-+ default: preferredDuringSchedulingIgnoredDuringExecution
-+ topologyKey:
-+ default: kubernetes.io/hostname
-+ mounts:
-+ placement:
-+ init_container: null
-+ placement:
-+ volumeMounts:
-+ volumes:
-+ replicas:
-+ api: 1
-+ lifecycle:
-+ upgrades:
-+ deployments:
-+ revision_history: 3
-+ pod_replacement_strategy: RollingUpdate
-+ rolling_update:
-+ max_unavailable: 1
-+ max_surge: 3
-+ disruption_budget:
-+ api:
-+ min_available: 0
-+ termination_grace_period:
-+ api:
-+ timeout: 30
-+ resources:
-+ enabled: false
-+ api:
-+ requests:
-+ memory: "128Mi"
-+ cpu: "100m"
-+ limits:
-+ memory: "1024Mi"
-+ cpu: "2000m"
-+ jobs:
-+ db_init:
-+ requests:
-+ memory: "128Mi"
-+ cpu: "100m"
-+ limits:
-+ memory: "1024Mi"
-+ cpu: "2000m"
-+ db_sync:
-+ requests:
-+ memory: "128Mi"
-+ cpu: "100m"
-+ limits:
-+ memory: "1024Mi"
-+ cpu: "2000m"
-+ db_drop:
-+ requests:
-+ memory: "128Mi"
-+ cpu: "100m"
-+ limits:
-+ memory: "1024Mi"
-+ cpu: "2000m"
-+ ks_endpoints:
-+ requests:
-+ memory: "128Mi"
-+ cpu: "100m"
-+ limits:
-+ memory: "1024Mi"
-+ cpu: "2000m"
-+ ks_service:
-+ requests:
-+ memory: "128Mi"
-+ cpu: "100m"
-+ limits:
-+ memory: "1024Mi"
-+ cpu: "2000m"
-+ ks_user:
-+ requests:
-+ memory: "128Mi"
-+ cpu: "100m"
-+ limits:
-+ memory: "1024Mi"
-+ cpu: "2000m"
-+
-+secrets:
-+ identity:
-+ admin: placement-keystone-admin
-+ placement: placement-keystone-user
-+ oslo_db:
-+ admin: placement-db-admin
-+ placement: placement-db-user
-+ tls:
-+ placement:
-+ api:
-+ public: placement-tls-public
-+
-+dependencies:
-+ dynamic:
-+ common:
-+ local_image_registry:
-+ jobs:
-+ - image-repo-sync
-+ services:
-+ - endpoint: node
-+ service: local_image_registry
-+ static:
-+ api:
-+ jobs:
-+ - placement-db-sync
-+ - placement-ks-service
-+ - placement-ks-user
-+ - placement-ks-endpoints
-+ ks_endpoints:
-+ jobs:
-+ - placement-ks-user
-+ - placement-ks-service
-+ services:
-+ - endpoint: internal
-+ service: identity
-+ ks_service:
-+ services:
-+ - endpoint: internal
-+ service: identity
-+ ks_user:
-+ services:
-+ - endpoint: internal
-+ service: identity
-+ db_drop:
-+ services:
-+ - endpoint: internal
-+ service: oslo_db
-+ db_init:
-+ services:
-+ - endpoint: internal
-+ service: oslo_db
-+ db_sync:
-+ jobs:
-+ - placement-db-init
-+ services:
-+ - endpoint: internal
-+ service: oslo_db
-+
-+manifests:
-+ configmap_bin: true
-+ configmap_etc: true
-+ deployment: true
-+ job_image_repo_sync: true
-+ job_db_init: true
-+ job_db_sync: true
-+ job_db_drop: false
-+ job_ks_endpoints: true
-+ job_ks_service: true
-+ job_ks_user: true
-+ network_policy: false
-+ secret_db: true
-+ secret_ingress_tls: true
-+ pdb: true
-+ ingress: true
-+ secret_keystone: true
-+ service_ingress: true
-+ service: true
---
-2.7.4
-
+++ /dev/null
----
-apiVersion: v1
-entries: {}
-generated: 2019-01-07T12:33:46.098166523-06:00
+++ /dev/null
----
-apiVersion: v1
-generated: 2019-01-02T15:19:36.215111369-06:00
-repositories:
- - caFile: ""
- cache: /builddir/.helm/repository/cache/local-index.yaml
- certFile: ""
- keyFile: ""
- name: local
- password: ""
- url: http://127.0.0.1:8879/charts
- username: ""
+++ /dev/null
-
-SUMMARY = "Openstack Helm charts"
-DESCRIPTION = "Openstack Helm charts"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-DEPENDS += " \
- helm-native \
- openstack-helm-infra \
-"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCREV_openstack-helm = "82c72367c85ca94270f702661c7b984899c1ae38"
-SRCREV_openstack-armada-app = "863f4b9733d3d4f4fd490606a94b84cfdaf2df2c"
-
-SRC_URI = " \
- git://github.com/openstack/openstack-helm;protocol=${PROTOCOL};name=openstack-helm \
- file://0001-Ceilometer-chart-add-the-ability-to-publish-events-t.patch \
- file://0002-Remove-stale-Apache2-service-pids-when-a-POD-starts.patch \
- file://0003-Nova-console-ip-address-search-optionality.patch \
- file://0004-Nova-chart-Support-ephemeral-pool-creation.patch \
- file://0005-Nova-Add-support-for-disabling-Readiness-Liveness-pr.patch \
- file://0006-Add-Placement-Chart.patch \
- file://repositories.yaml \
- file://index.yaml \
- "
-
-PATCHTOOL = "git"
-PATCH_COMMIT_FUNCTIONS = "1"
-
-S = "${WORKDIR}/git"
-
-inherit allarch
-
-helm_folder = "${nonarch_libdir}/helm"
-toolkit_version = "0.1.0"
-helmchart_version = "0.1.0"
-
-do_configure[noexec] = "1"
-
-do_compile () {
- # initialize helm and build the toolkit
- # helm init --client-only does not work if there is no networking
- # The following commands do essentially the same as: helm init
- export HOME="${B}/${USER}"
- export helm_home="${B}/${USER}/.helm"
- rm -rf ${helm_home}
-
- mkdir -p ${helm_home}
- mkdir ${helm_home}/repository
- mkdir ${helm_home}/repository/cache
- mkdir ${helm_home}/repository/local
- mkdir ${helm_home}/plugins
- mkdir ${helm_home}/starters
- mkdir ${helm_home}/cache
- mkdir ${helm_home}/cache/archive
-
- # Stage a repository file that only has a local repo
- install -m 0644 ${WORKDIR}/repositories.yaml ${helm_home}/repository/repositories.yaml
-
- # Stage a local repo index that can be updated by the build
- install -m 0644 ${WORKDIR}/index.yaml ${helm_home}/repository/local/index.yaml
-
- # Stage helm-toolkit in the local repo
- cp ${RECIPE_SYSROOT}${helm_folder}/helm-toolkit-${toolkit_version}.tgz .
-
- # Host a server for the charts
- helm serve --repo-path . &
- sleep 1
- helm repo rm local
- helm repo add local http://localhost:8879/charts
-
- # Make the charts. These produce a tgz file
- make aodh
- make barbican
- make ceilometer
- make cinder
- make glance
- make heat
- make horizon
- make ironic
- make keystone
- make magnum
- make neutron
- make nova
- make panko
- make placement
-
- # terminate helm server (the last backgrounded task)
- kill $!
- rm -rf ${helm_home}
-
- # Remove the helm-toolkit tarball
- rm helm-toolkit-${toolkit_version}.tgz
-}
-
-do_install () {
- install -d -m 755 ${D}${helm_folder}
- install -p -D -m 755 ${B}/*.tgz ${D}${helm_folder}
-}
-
-FILES_${PN} = "${helm_folder}"
-
-RDEPENDS_${PN} = " \
- helm \
- openstack-helm-infra \
-"
+++ /dev/null
-
-SUMMARY = "StarlingX Openstack Application Helm charts"
-DESCRIPTION = "StarlingX Openstack Application Helm charts"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-DEPENDS += " \
- helm-native \
- openstack-helm \
- openstack-helm-infra \
- stx-platform-helm \
-"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCREV = "863f4b9733d3d4f4fd490606a94b84cfdaf2df2c"
-
-SRC_URI = "git://opendev.org/starlingx/openstack-armada-app;protocol=${PROTOCOL};branch=${BRANCH}"
-
-S = "${WORKDIR}/git/stx-openstack-helm/stx-openstack-helm"
-
-inherit allarch
-
-helm_folder = "${nonarch_libdir}/helm"
-armada_folder = "${nonarch_libdir}/armada"
-app_folder = "${nonarch_libdir}/application"
-toolkit_version = "0.1.0"
-helmchart_version = "0.1.0"
-
-do_configure[noexec] = "1"
-
-do_compile () {
- # initialize helm and build the toolkit
- # helm init --client-only does not work if there is no networking
- # The following commands do essentially the same as: helm init
- export HOME="${B}/${USER}"
- export helm_home="${B}/${USER}/.helm"
- rm -rf ${helm_home}
-
- mkdir -p ${helm_home}
- mkdir ${helm_home}/repository
- mkdir ${helm_home}/repository/cache
- mkdir ${helm_home}/repository/local
- mkdir ${helm_home}/plugins
- mkdir ${helm_home}/starters
- mkdir ${helm_home}/cache
- mkdir ${helm_home}/cache/archive
-
- # Stage a repository file that only has a local repo
- cp ${S}/files/repositories.yaml ${helm_home}/repository/repositories.yaml
-
- # Stage a local repo index that can be updated by the build
- cp ${S}/files/index.yaml ${helm_home}/repository/local/index.yaml
-
- # Stage helm-toolkit in the local repo
- cp ${RECIPE_SYSROOT}${helm_folder}/helm-toolkit-${toolkit_version}.tgz .
-
- # Host a server for the charts
- helm serve --repo-path . &
- sleep 1
- helm repo rm local
- helm repo add local http://localhost:8879/charts
-
- # Make the charts. These produce a tgz file
- cd ${S}/helm-charts
- make nova-api-proxy
- make garbd
- make keystone-api-proxy
- make fm-rest-api
- make nginx-ports-control
- make dcdbsync
- cd -
-
- # terminate helm server (the last backgrounded task)
- kill $!
- rm -rf ${helm_home}
-
- # Remove the helm-toolkit tarball
- rm helm-toolkit-${toolkit_version}.tgz
-}
-
-do_install () {
- install -d -m 755 ${D}${app_folder}
- install -p -D -m 755 ${S}/files/metadata.yaml ${D}${app_folder}
- install -d -m 755 ${D}${helm_folder}
- install -p -D -m 755 ${S}/helm-charts/*.tgz ${D}${helm_folder}
- install -d -m 755 ${D}${armada_folder}
- install -p -D -m 755 ${S}/manifests/*.yaml ${D}${armada_folder}
-}
-
-FILES_${PN} = " \
- ${app_folder} \
- ${helm_folder} \
- ${armada_folder} \
-"
-
-RDEPENDS_${PN} = " \
- helm \
- openstack-helm \
- openstack-helm-infra \
-"
+++ /dev/null
-
-SUMMARY = "StarlingX Platform Helm charts"
-DESCRIPTION = "StarlingX Platform Helm charts"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-DEPENDS += " \
- helm-native \
- openstack-helm \
- openstack-helm-infra \
-"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCREV_platform-armada-app = "c67d1eeb605ea1da4ebb2a1219a6f54f05e3eb5e"
-SRCREV_helm-charts = "c01426a2500269fbf1a781214a361de0796297d1"
-
-SRC_URI = " \
- git://opendev.org/starlingx/platform-armada-app.git;protocol=${PROTOCOL};branch=${BRANCH};name=platform-armada-app \
- git://opendev.org/starlingx/helm-charts.git;protocol=${PROTOCOL};branch=${BRANCH};name=helm-charts;destsuffix=helm-charts \
-"
-
-S = "${WORKDIR}/git/stx-platform-helm/stx-platform-helm"
-
-inherit allarch
-
-toolkit_version = "0.1.0"
-helm_folder = "${RECIPE_SYSROOT}${nonarch_libdir}/helm"
-helm_repo = "stx-platform"
-
-app_name = "platform-integ-apps"
-app_staging = "${B}/staging"
-app_tarball = "${app_name}.tgz"
-app_folder = "/usr/local/share/applications/helm"
-
-do_configure[noexec] = "1"
-
-do_compile () {
- # initialize helm and build the toolkit
- # helm init --client-only does not work if there is no networking
- # The following commands do essentially the same as: helm init
- export HOME="${B}/${USER}"
- export helm_home="${B}/${USER}/.helm"
- rm -rf ${helm_home}
-
- mkdir -p ${helm_home}
- mkdir ${helm_home}/repository
- mkdir ${helm_home}/repository/cache
- mkdir ${helm_home}/repository/local
- mkdir ${helm_home}/plugins
- mkdir ${helm_home}/starters
- mkdir ${helm_home}/cache
- mkdir ${helm_home}/cache/archive
-
- # Stage a repository file that only has a local repo
- cp ${S}/files/repositories.yaml ${helm_home}/repository/repositories.yaml
-
- # Stage a local repo index that can be updated by the build
- cp ${S}/files/index.yaml ${helm_home}/repository/local/index.yaml
-
- # Stage helm-toolkit in the local repo
- cp ${helm_folder}/helm-toolkit-${toolkit_version}.tgz ${S}/helm-charts/
-
- # Host a server for the charts
- helm serve --repo-path . &
- sleep 1
- helm repo rm local
- helm repo add local http://localhost:8879/charts
-
- # Make the charts. These produce a tgz file
- cp -rf ${WORKDIR}/helm-charts/node-feature-discovery/node-feature-discovery/helm-charts/node-feature-discovery/ \
- ${S}/helm-charts/
- cd ${S}/helm-charts
- make rbd-provisioner
- make ceph-pools-audit
- make node-feature-discovery
- cd -
-
- # Terminate helm server (the last backgrounded task)
- kill $!
- rm -rf ${helm_home}
-
- # Create a chart tarball compliant with sysinv kube-app.py
- # Setup staging
- mkdir -p ${app_staging}
- cp ${S}/files/metadata.yaml ${app_staging}
- cp ${S}/manifests/manifest.yaml ${app_staging}
-
- mkdir -p ${app_staging}/charts
- cp ${S}/helm-charts/*.tgz ${app_staging}/charts
- cd ${app_staging}
-
- # Populate metadata
- sed -i 's/@APP_NAME@/${app_name}/g' ${app_staging}/metadata.yaml
- sed -i 's/@APP_VERSION@/${version}-${tis_patch_ver}/g' ${app_staging}/metadata.yaml
- sed -i 's/@HELM_REPO@/${helm_repo}/g' ${app_staging}/metadata.yaml
-
- # package it up
- find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
- tar -zcf ${B}/${app_tarball} -C ${app_staging}/ .
-
- # Cleanup staging
- rm -fr ${app_staging}
-}
-
-do_install () {
- install -d -m 755 ${D}/${app_folder}
- install -p -D -m 755 ${B}/${app_tarball} ${D}/${app_folder}
- install -d -m 755 ${D}/opt/extracharts
- install -p -D -m 755 ${S}/helm-charts/node-feature-discovery-*.tgz ${D}/opt/extracharts
-}
-
-FILES_${PN} = " \
- /opt/extracharts \
- ${app_folder} \
-"
-
-RDEPENDS_${PN} = " \
- helm \
- openstack-helm \
- openstack-helm-infra \
-"
+++ /dev/null
-PACKAGES += " ${PN}-agent"
-PACKAGES += " ${PN}-controller"
-
-require update-common.inc
-
-SUBPATH0 = "cgcs-patch/cgcs-patch"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI += "file://0001-Remove-use-of-rpmUtils.miscutils-from-cgcs-patch.patch;striplevel=3 \
- file://0003-Cleaning-up-pylint-settings-for-cgcs-patch.patch;striplevel=3 \
- file://0004-Address-python3-pylint-errors-and-warnings.patch;striplevel=3 \
- file://0005-Clean-up-pylint-W1201-logging-not-lazy-in-cgcs-patch.patch;striplevel=3 \
- file://0006-Migrate-patch-agent-to-use-DNF-for-swmgmt.patch;striplevel=3 \
- file://0007-patch_agent-do-not-do-the-packages_iter-if-pkggrp-is.patch;striplevel=3 \
- "
-
-RDEPENDS_${PN}_append = " \
- bash \
- "
-RDEPENDS_${PN}-agent_append = " \
- bash \
- python \
- "
-
-RDEPENDS_${PN}-controller_append = " \
- bash \
- python-requests-toolbelt \
- createrepo-c \
- "
-
-inherit setuptools systemd
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-SYSTEMD_PACKAGES += " ${PN}-controller"
-SYSTEMD_SERVICE_${PN}-controller = "sw-patch-controller.service sw-patch-controller-daemon.service "
-SYSTEMD_PACKAGES += " ${PN}-agent"
-SYSTEMD_SERVICE_${PN}-agent = " sw-patch-agent.service"
-SYSTEMD_PACKAGES += " ${PN}"
-SYSTEMD_SERVICE_${PN} = "sw-patch.service"
-
-
-do_unpack_append() {
- bb.build.exec_func('do_restore_files', d)
-}
-
-do_restore_files() {
- cd ${S}
- git reset ${SRCREV} cgcs-patch/bin
- git checkout cgcs-patch/bin
-}
-
-do_install_append () {
-
- cd ${S}/cgcs-patch/bin
- install -m 755 -d ${D}/${sbindir}
- install -m 755 -d ${D}/${sysconfdir}/bash_completion.d
- install -m 755 -d ${D}/${sysconfdir}/goenabled.d
- install -m 755 -d ${D}/${sysconfdir}/init.d
- install -m 755 -d ${D}/${sysconfdir}/logrotate.d
- install -m 755 -d ${D}/${sysconfdir}/patching
- install -m 700 -d ${D}/${sysconfdir}/patching/patch-scripts
- install -m 755 -d ${D}/${sysconfdir}/pmon.d
- install -m 755 -d ${D}/${systemd_system_unitdir}
-
- install -m 500 sw-patch-agent ${D}/${sbindir}/sw-patch-agent
- install -m 500 sw-patch-controller-daemon ${D}/${sbindir}/sw-patch-controller-daemon
- install -m 555 sw-patch ${D}/${sbindir}/sw-patch
- install -m 555 rpm-audit ${D}/${sbindir}/rpm-audit
-
- install -m 500 sw-patch-controller-daemon-init.sh ${D}/${sysconfdir}/init.d/sw-patch-controller-daemon
- install -m 500 sw-patch-agent-init.sh ${D}/${sysconfdir}/init.d/sw-patch-agent
-
- install -m 600 patching.conf ${D}/${sysconfdir}/patching/patching.conf
-
- install -m 644 policy.json ${D}/${sysconfdir}/patching/policy.json
-
- install -m 444 pmon-sw-patch-controller-daemon.conf ${D}/${sysconfdir}/pmon.d/sw-patch-controller-daemon.conf
- install -m 444 pmon-sw-patch-agent.conf ${D}/${sysconfdir}/pmon.d/sw-patch-agent.conf
- install -m 444 *.service ${D}/${systemd_system_unitdir}
- install -m 444 sw-patch.completion ${D}/${sysconfdir}/bash_completion.d/sw-patch
- install -m 400 patch-functions ${D}/${sysconfdir}/patching/patch-functions
-
- install -D -m 444 patch-tmpdirs.conf ${D}/${sysconfdir}/tempfiles.d/patch-tmpdirs.conf
-
- install -m 500 run-patch-scripts ${D}/${sbindir}/run-patch-scripts
- install -m 500 sw-patch-controller-daemon-restart ${D}/${sbindir}/sw-patch-controller-daemon-restart
- install -m 500 sw-patch-agent-restart ${D}/${sbindir}/sw-patch-agent-restart
-
-
- install -m 500 run-patch-scripts ${D}/${sbindir}/run-patch-scripts
- install -m 500 sw-patch-controller-daemon-restart ${D}/${sbindir}/sw-patch-controller-daemon-restart
- install -m 500 sw-patch-agent-restart ${D}/${sbindir}/sw-patch-agent-restart
- install -m 500 sw-patch-init.sh ${D}/${sysconfdir}/init.d/sw-patch
- install -m 500 sw-patch-controller-init.sh ${D}/${sysconfdir}/init.d/sw-patch-controller
- install -m 555 patch_check_goenabled.sh ${D}/${sysconfdir}/goenabled.d/patch_check_goenabled.sh
- install -m 444 patching.logrotate ${D}/${sysconfdir}/logrotate.d/patching
-
- install -m 500 upgrade-start-pkg-extract ${D}/${sbindir}/upgrade-start-pkg-extract
-
- sed -i -e 's/createrepo/createrepo_c/' ${D}/${sysconfdir}/init.d/sw-patch-controller
-
-}
-
-FILES_${PN} = " \
- ${libdir}/python2.7/site-packages/cgcs_patch \
- ${libdir}/python2.7/site-packages/cgcs_patch-1.0-py2.7.egg-info \
- ${libdir}/python2.7/site-packages/cgcs_make_patch \
- ${libdir}/python2.7/site-packages/cgcs_patch-1.0-py2.7.egg-info/top_level.txt \
- ${sbindir}/rpm-audit \
- ${sysconfdir}/patching/policy.json \
- ${sysconfdir}/patching/patching.conf \
- ${sysconfdir}/patching/patch-scripts \
- ${sysconfdir}/init.d/sw-patch \
- ${systemd_system_unitdir}/sw-patch.service \
- ${sysconfdir}/goenabled.d/patch_check_goenabled.sh \
- ${sysconfdir}/logrotate.d/patching \
- ${sysconfdir}/tempfiles.d/patch-tmpdirs.conf \
- ${sysconfdir}/patching/patch-functions \
-"
-
-FILES_${PN}-agent = " \
- ${sbindir}/sw-patch-agent \
- ${sbindir}/sw-patch-agent-restart \
- ${sysconfdir}/pmon.d/sw-patch-agent.conf \
- ${sbindir}/run-patch-scripts \
- ${sysconfdir}/init.d/sw-patch-agent \
- ${systemd_system_unitdir}/sw-patch-agent.service \
- ${sysconfdir}/bash_completion.d/sw-patch \
- "
-
-FILES_${PN}-controller = " \
- ${sbindir}/sw-patch-controller-daemon-restart \
- ${sysconfdir}/init.d/sw-patch-controller-daemon \
- ${sbindir}/sw-patch-controller-daemon \
- ${sbindir}/upgrade-start-pkg-extract \
- ${sysconfdir}/pmon.d/sw-patch-controller-daemon.conf \
- ${systemd_system_unitdir}/sw-patch-controller-daemon.service \
- ${sbindir}/sw-patch \
- ${sysconfdir}/init.d/sw-patch-controller \
- ${systemd_system_unitdir}/sw-patch-controller.service \
- "
+++ /dev/null
-require update-common.inc
-
-SUBPATH0 = "enable-dev-patch"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_unpack_append() {
- bb.build.exec_func('do_restore_license_file', d)
-}
-
-do_restore_license_file () {
- cd ${S}
- git reset HEAD LICENSE
- git checkout LICENSE
-}
-
-do_install () {
- install -m 755 -d ${D}/${sysconfdir}/pki/wrs
- install -m 444 enable-dev-patch/dev_certificate_enable.bin ${D}/${sysconfdir}/pki/wrs
-}
+++ /dev/null
-From 80ee2e342d1854f439a1ec25c2f6a3a3625a0720 Mon Sep 17 00:00:00 2001
-From: Don Penney <don.penney@windriver.com>
-Date: Sun, 22 Dec 2019 22:45:18 -0500
-Subject: [PATCH] Remove use of rpmUtils.miscutils from cgcs-patch
-
-The rpmUtils.miscutils.stringToVersion function will not be available
-in CentOS8, as it is not currently provided for python3. A similar
-function exists in cgcs_patch.patch_functions, using regex to parse
-the version from an RPM filename. This update adds a new function,
-expand_pkgver, implemented in a similar fashion using regex, providing
-the same capability as rpmUtils.miscutils.stringToVersion.
-
-Change-Id: I2a04f3dbf85d62c87ca1afcf988b672aafceb642
-Story: 2006228
-Task: 37871
-Signed-off-by: Don Penney <don.penney@windriver.com>
-
----
- cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py | 11 +++++------
- cgcs-patch/cgcs-patch/cgcs_patch/patch_controller.py | 6 +++---
- cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py | 18 ++++++++++++++++++
- .../cgcs-patch/cgcs_patch/tests/test_patch_agent.py | 2 --
- .../cgcs_patch/tests/test_patch_controller.py | 2 --
- .../cgcs-patch/cgcs_patch/tests/test_patch_utils.py | 14 ++++++++++++++
- 6 files changed, 40 insertions(+), 13 deletions(-)
-
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-index b95b79d..77930d7 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-@@ -19,9 +19,8 @@ import sys
- import yaml
- import shutil
-
--from rpmUtils.miscutils import stringToVersion # pylint: disable=import-error
--
- from cgcs_patch.patch_functions import configure_logging
-+from cgcs_patch.patch_functions import parse_pkgver
- from cgcs_patch.patch_functions import LOG
- import cgcs_patch.config as cfg
- from cgcs_patch.base import PatchService
-@@ -519,8 +518,8 @@ class PatchAgent(PatchService):
- # 1, if first arg is higher version
- # 0, if versions are same
- # -1, if first arg is lower version
-- rc = rpm.labelCompare(stringToVersion(version),
-- stringToVersion(stored_ver))
-+ rc = rpm.labelCompare(parse_pkgver(version),
-+ parse_pkgver(stored_ver))
-
- if rc > 0:
- # Update version
-@@ -709,8 +708,8 @@ class PatchAgent(PatchService):
- compare_version = base_version
-
- # Compare the installed version to what's in the repo
-- rc = rpm.labelCompare(stringToVersion(installed_version),
-- stringToVersion(compare_version))
-+ rc = rpm.labelCompare(parse_pkgver(installed_version),
-+ parse_pkgver(compare_version))
- if rc == 0:
- # Versions match, nothing to do.
- continue
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_controller.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_controller.py
-index 1ba8f5e..4b94a5f 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_controller.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_controller.py
-@@ -17,7 +17,7 @@ import rpm
- import os
- import gc
-
--from rpmUtils.miscutils import stringToVersion # pylint: disable=import-error
-+from cgcs_patch.patch_functions import parse_pkgver
-
- from wsgiref import simple_server
- from cgcs_patch.api import app
-@@ -776,8 +776,8 @@ class PatchController(PatchService):
- # Ignore epoch
- patch_ver = patch_ver.split(':')[1]
-
-- rc = rpm.labelCompare(stringToVersion(installed_ver),
-- stringToVersion(patch_ver))
-+ rc = rpm.labelCompare(parse_pkgver(installed_ver),
-+ parse_pkgver(patch_ver))
-
- if self.patch_data.metadata[patch_id]["repostate"] == constants.AVAILABLE:
- # The RPM is not expected to be installed.
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py
-index 832e4e9..281a286 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py
-@@ -176,6 +176,24 @@ def parse_rpm_filename(filename):
- return (pkgname, arch, PackageVersion(epoch, version, release))
-
-
-+def parse_pkgver(pkgver):
-+ # Version format is:
-+ # [<epoch>:]<version>-<release>
-+ #
-+ pattern = re.compile(r'((([^:]):)?)([^-]+)((-(.*))?)$')
-+
-+ m = pattern.match(pkgver)
-+
-+ if m is None:
-+ raise ValueError("Package version does not match expected format: %s" % pkgver)
-+
-+ epoch = m.group(3)
-+ version = m.group(4)
-+ release = m.group(7)
-+
-+ return (epoch, version, release)
-+
-+
- class PackageVersion(object):
- """
- The PackageVersion class provides a structure for RPM version information,
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_agent.py b/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_agent.py
-index c953e4f..bd1eef9 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_agent.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_agent.py
-@@ -10,8 +10,6 @@ import sys
- import testtools
-
- sys.modules['rpm'] = mock.Mock()
--sys.modules['rpmUtils'] = mock.Mock()
--sys.modules['rpmUtils.miscutils'] = mock.Mock()
-
- import cgcs_patch.patch_agent # noqa: E402
-
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_controller.py b/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_controller.py
-index d11623f..e2b02c0 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_controller.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_controller.py
-@@ -10,8 +10,6 @@ import sys
- import testtools
-
- sys.modules['rpm'] = mock.Mock()
--sys.modules['rpmUtils'] = mock.Mock()
--sys.modules['rpmUtils.miscutils'] = mock.Mock()
-
- import cgcs_patch.patch_controller # noqa: E402
-
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_utils.py b/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_utils.py
-index a5eb8d4..653c65a 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_utils.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_utils.py
-@@ -9,6 +9,7 @@ import socket
- import testtools
-
- import cgcs_patch.constants
-+import cgcs_patch.patch_functions
- import cgcs_patch.utils
-
-
-@@ -130,3 +131,16 @@ class CgcsPatchUtilsTestCase(testtools.TestCase):
-
- result = cgcs_patch.utils.ip_to_versioned_localhost(ip)
- self.assertEqual(expected_result, result)
-+
-+ def test_parse_pkgver(self):
-+ versions = {
-+ '0:1.2.3-r4': ('0', '1.2.3', 'r4'),
-+ '4.3.2-1': (None, '4.3.2', '1'),
-+ '8.1.4': (None, '8.1.4', None),
-+ '5:7.5.3': ('5', '7.5.3', None),
-+ 'This is a weird version string': (None, 'This is a weird version string', None),
-+ }
-+
-+ for ver, expected in versions.items():
-+ result = cgcs_patch.patch_functions.parse_pkgver(ver)
-+ self.assertEqual(result, expected)
+++ /dev/null
-From de774c85653692b2a901123b5653d0e2101c5353 Mon Sep 17 00:00:00 2001
-From: Al Bailey <Al.Bailey@windriver.com>
-Date: Fri, 4 Oct 2019 12:29:03 -0500
-Subject: [PATCH] Cleaning up pylint settings for cgcs patch
-
-This also adds cgcs_make_patch folder for pylint
-
-pylint is invoked with two different pylint.rc files
-so that different codes can be suppressed for the
-two different code structures.
-
-Change-Id: I0d7a87ed435ed716a3c1ea98f5d7badfd2adac7d
-Story: 2004515
-Task: 37701
-Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
-
----
- cgcs-patch/cgcs-patch/pylint.rc | 14 +-
- cgcs-patch/cgcs-patch/pylint_make_patch.rc | 352 +++++++++++++++++++++++++++++
- cgcs-patch/cgcs-patch/tox.ini | 6 +-
- 3 files changed, 365 insertions(+), 7 deletions(-)
- create mode 100644 cgcs-patch/cgcs-patch/pylint_make_patch.rc
-
-diff --git a/cgcs-patch/cgcs-patch/pylint.rc b/cgcs-patch/cgcs-patch/pylint.rc
-index dc20bb0..812b6b5 100644
---- a/cgcs-patch/cgcs-patch/pylint.rc
-+++ b/cgcs-patch/cgcs-patch/pylint.rc
-@@ -44,8 +44,16 @@ symbols=no
- # --enable=similarities". If you want to run only the classes checker, but have
- # no Warning level messages displayed, use"--disable=all --enable=classes
- # --disable=W"
--#disable=
--disable=C, R, W0603, W0613, W0702, W0703, W1201
-+# E1111 assignment-from-no-return
-+# W0107 unnecessary-pass
-+# W0603 global-statement
-+# W0612 unused-variable
-+# W0613 unused-argument
-+# W0703 broad-except
-+# W0705 duplicate-except
-+# W1201 logging-not-lazy
-+# W1505, deprecated-method
-+disable=C, R, E1111, W0107, W0603, W0612, W0613, W0703, W0705, W1201, W1505
-
-
- [REPORTS]
-@@ -61,7 +69,7 @@ output-format=text
- files-output=no
-
- # Tells whether to display a full report or only the messages
--reports=yes
-+reports=no
-
- # Python expression which should return a note less than 10 (10 is the highest
- # note). You have access to the variables errors warning, statement which
-diff --git a/cgcs-patch/cgcs-patch/pylint_make_patch.rc b/cgcs-patch/cgcs-patch/pylint_make_patch.rc
-new file mode 100644
-index 0000000..ef4e838
---- /dev/null
-+++ b/cgcs-patch/cgcs-patch/pylint_make_patch.rc
-@@ -0,0 +1,352 @@
-+[MASTER]
-+
-+# Specify a configuration file.
-+#rcfile=
-+
-+# Python code to execute, usually for sys.path manipulation such as
-+# pygtk.require().
-+#init-hook=
-+
-+# Profiled execution.
-+profile=no
-+
-+# Add files or directories to the blacklist. They should be base names, not
-+# paths.
-+ignore=CVS
-+
-+# Pickle collected data for later comparisons.
-+persistent=yes
-+
-+# List of plugins (as comma separated values of python modules names) to load,
-+# usually to register additional checkers.
-+load-plugins=
-+
-+# DEPRECATED
-+include-ids=no
-+
-+# DEPRECATED
-+symbols=no
-+
-+
-+[MESSAGES CONTROL]
-+
-+# Enable the message, report, category or checker with the given id(s). You can
-+# either give multiple identifier separated by comma (,) or put this option
-+# multiple time. See also the "--disable" option for examples.
-+#enable=
-+
-+# Disable the message, report, category or checker with the given id(s). You
-+# can either give multiple identifiers separated by comma (,) or put this
-+# option multiple times (only on the command line, not in the configuration
-+# file where it should appear only once).You can also use "--disable=all" to
-+# disable everything first and then reenable specific checks. For example, if
-+# you want to run only the similarities checker, you can use "--disable=all
-+# --enable=similarities". If you want to run only the classes checker, but have
-+# no Warning level messages displayed, use"--disable=all --enable=classes
-+# --disable=W"
-+# The following are suppressed due to pylint warnings in cgcs_make_patch
-+# fixme Use of fixme, todo, etc..
-+# E1101 no-member
-+# W0101 unreachable
-+# W0104 pointless-statement
-+# W0107 unnecessary-pass
-+# W0212 protected-access
-+# W0231 super-init-not-called
-+# W0603 global-statement
-+# W0612 unused-variable
-+# W0613 unused-argument
-+# W0622 redefined-builtin
-+# W0703 broad-except
-+# W1401 anomalous-backslash-in-string
-+# W1505, deprecated-method
-+disable=C, R, fixme, E1101,
-+ W0101, W0104, W0107, W0212, W0231, W0603, W0612, W0613, W0622, W0703,
-+ W1401, W1505
-+
-+[REPORTS]
-+
-+# Set the output format. Available formats are text, parseable, colorized, msvs
-+# (visual studio) and html. You can also give a reporter class, eg
-+# mypackage.mymodule.MyReporterClass.
-+output-format=text
-+
-+# Put messages in a separate file for each module / package specified on the
-+# command line instead of printing them on stdout. Reports (if any) will be
-+# written in a file name "pylint_global.[txt|html]".
-+files-output=no
-+
-+# Tells whether to display a full report or only the messages
-+reports=no
-+
-+# Python expression which should return a note less than 10 (10 is the highest
-+# note). You have access to the variables errors warning, statement which
-+# respectively contain the number of errors / warnings messages and the total
-+# number of statements analyzed. This is used by the global evaluation report
-+# (RP0004).
-+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
-+
-+# Add a comment according to your evaluation note. This is used by the global
-+# evaluation report (RP0004).
-+comment=no
-+
-+# Template used to display messages. This is a python new-style format string
-+# used to format the message information. See doc for all details
-+#msg-template=
-+
-+
-+[BASIC]
-+
-+# Required attributes for module, separated by a comma
-+required-attributes=
-+
-+# List of builtins function names that should not be used, separated by a comma
-+bad-functions=map,filter,apply,input,file
-+
-+# Good variable names which should always be accepted, separated by a comma
-+good-names=i,j,k,ex,Run,_
-+
-+# Bad variable names which should always be refused, separated by a comma
-+bad-names=foo,bar,baz,toto,tutu,tata
-+
-+# Colon-delimited sets of names that determine each other's naming style when
-+# the name regexes allow several styles.
-+name-group=
-+
-+# Include a hint for the correct naming format with invalid-name
-+include-naming-hint=no
-+
-+# Regular expression matching correct function names
-+function-rgx=[a-z_][a-z0-9_]{2,30}$
-+
-+# Naming hint for function names
-+function-name-hint=[a-z_][a-z0-9_]{2,30}$
-+
-+# Regular expression matching correct variable names
-+variable-rgx=[a-z_][a-z0-9_]{2,30}$
-+
-+# Naming hint for variable names
-+variable-name-hint=[a-z_][a-z0-9_]{2,30}$
-+
-+# Regular expression matching correct constant names
-+const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-+
-+# Naming hint for constant names
-+const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-+
-+# Regular expression matching correct attribute names
-+attr-rgx=[a-z_][a-z0-9_]{2,30}$
-+
-+# Naming hint for attribute names
-+attr-name-hint=[a-z_][a-z0-9_]{2,30}$
-+
-+# Regular expression matching correct argument names
-+argument-rgx=[a-z_][a-z0-9_]{2,30}$
-+
-+# Naming hint for argument names
-+argument-name-hint=[a-z_][a-z0-9_]{2,30}$
-+
-+# Regular expression matching correct class attribute names
-+class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
-+
-+# Naming hint for class attribute names
-+class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
-+
-+# Regular expression matching correct inline iteration names
-+inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
-+
-+# Naming hint for inline iteration names
-+inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
-+
-+# Regular expression matching correct class names
-+class-rgx=[A-Z_][a-zA-Z0-9]+$
-+
-+# Naming hint for class names
-+class-name-hint=[A-Z_][a-zA-Z0-9]+$
-+
-+# Regular expression matching correct module names
-+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-+
-+# Naming hint for module names
-+module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-+
-+# Regular expression matching correct method names
-+method-rgx=[a-z_][a-z0-9_]{2,30}$
-+
-+# Naming hint for method names
-+method-name-hint=[a-z_][a-z0-9_]{2,30}$
-+
-+# Regular expression which should only match function or class names that do
-+# not require a docstring.
-+no-docstring-rgx=__.*__
-+
-+# Minimum line length for functions/classes that require docstrings, shorter
-+# ones are exempt.
-+docstring-min-length=-1
-+
-+
-+[FORMAT]
-+
-+# Maximum number of characters on a single line.
-+max-line-length=80
-+
-+# Regexp for a line that is allowed to be longer than the limit.
-+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
-+
-+# Allow the body of an if to be on the same line as the test if there is no
-+# else.
-+single-line-if-stmt=no
-+
-+# List of optional constructs for which whitespace checking is disabled
-+no-space-check=trailing-comma,dict-separator
-+
-+# Maximum number of lines in a module
-+max-module-lines=1000
-+
-+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
-+# tab).
-+indent-string=' '
-+
-+# Number of spaces of indent required inside a hanging or continued line.
-+indent-after-paren=4
-+
-+
-+[LOGGING]
-+
-+# Logging modules to check that the string format arguments are in logging
-+# function parameter format
-+logging-modules=logging
-+
-+
-+[MISCELLANEOUS]
-+
-+# List of note tags to take in consideration, separated by a comma.
-+notes=FIXME,XXX,TODO
-+
-+
-+[SIMILARITIES]
-+
-+# Minimum lines number of a similarity.
-+min-similarity-lines=4
-+
-+# Ignore comments when computing similarities.
-+ignore-comments=yes
-+
-+# Ignore docstrings when computing similarities.
-+ignore-docstrings=yes
-+
-+# Ignore imports when computing similarities.
-+ignore-imports=no
-+
-+
-+[TYPECHECK]
-+
-+# Tells whether missing members accessed in mixin class should be ignored. A
-+# mixin class is detected if its name ends with "mixin" (case insensitive).
-+ignore-mixin-members=yes
-+
-+# List of module names for which member attributes should not be checked
-+# (useful for modules/projects where namespaces are manipulated during runtime
-+# and thus existing member attributes cannot be deduced by static analysis
-+ignored-modules=
-+
-+# List of classes names for which member attributes should not be checked
-+# (useful for classes with attributes dynamically set).
-+ignored-classes=rpm,PKCS1_PSS
-+
-+# When zope mode is activated, add a predefined set of Zope acquired attributes
-+# to generated-members.
-+zope=no
-+
-+# List of members which are set dynamically and missed by pylint inference
-+# system, and so shouldn't trigger E0201 when accessed. Python regular
-+# expressions are accepted.
-+generated-members=REQUEST,acl_users,aq_parent
-+
-+
-+[VARIABLES]
-+
-+# Tells whether we should check for unused import in __init__ files.
-+init-import=no
-+
-+# A regular expression matching the name of dummy variables (i.e. expectedly
-+# not used).
-+dummy-variables-rgx=_$|dummy
-+
-+# List of additional names supposed to be defined in builtins. Remember that
-+# you should avoid to define new builtins when possible.
-+additional-builtins=
-+
-+
-+[CLASSES]
-+
-+# List of interface methods to ignore, separated by a comma. This is used for
-+# instance to not check methods defines in Zope's Interface base class.
-+ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
-+
-+# List of method names used to declare (i.e. assign) instance attributes.
-+defining-attr-methods=__init__,__new__,setUp
-+
-+# List of valid names for the first argument in a class method.
-+valid-classmethod-first-arg=cls
-+
-+# List of valid names for the first argument in a metaclass class method.
-+valid-metaclass-classmethod-first-arg=mcs
-+
-+
-+[DESIGN]
-+
-+# Maximum number of arguments for function / method
-+max-args=5
-+
-+# Argument names that match this expression will be ignored. Default to name
-+# with leading underscore
-+ignored-argument-names=_.*
-+
-+# Maximum number of locals for function / method body
-+max-locals=15
-+
-+# Maximum number of return / yield for function / method body
-+max-returns=6
-+
-+# Maximum number of branch for function / method body
-+max-branches=12
-+
-+# Maximum number of statements in function / method body
-+max-statements=50
-+
-+# Maximum number of parents for a class (see R0901).
-+max-parents=7
-+
-+# Maximum number of attributes for a class (see R0902).
-+max-attributes=7
-+
-+# Minimum number of public methods for a class (see R0903).
-+min-public-methods=2
-+
-+# Maximum number of public methods for a class (see R0904).
-+max-public-methods=20
-+
-+
-+[IMPORTS]
-+
-+# Deprecated modules which should not be used, separated by a comma
-+deprecated-modules=regsub,TERMIOS,Bastion,rexec
-+
-+# Create a graph of every (i.e. internal and external) dependencies in the
-+# given file (report RP0402 must not be disabled)
-+import-graph=
-+
-+# Create a graph of external dependencies in the given file (report RP0402 must
-+# not be disabled)
-+ext-import-graph=
-+
-+# Create a graph of internal dependencies in the given file (report RP0402 must
-+# not be disabled)
-+int-import-graph=
-+
-+
-+[EXCEPTIONS]
-+
-+# Exceptions that will emit a warning when being caught. Defaults to
-+# "Exception"
-+overgeneral-exceptions=Exception
-diff --git a/cgcs-patch/cgcs-patch/tox.ini b/cgcs-patch/cgcs-patch/tox.ini
-index ba9c568..88e5723 100644
---- a/cgcs-patch/cgcs-patch/tox.ini
-+++ b/cgcs-patch/cgcs-patch/tox.ini
-@@ -76,7 +76,6 @@ exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,release-tag-*
- enable-extensions = H106 H203 H904
- max-line-length = 120
-
--
- [testenv:flake8]
- basepython = python3
- usedevelop = False
-@@ -85,13 +84,12 @@ commands =
- flake8 {posargs} .
-
- [testenv:pylint]
-+basepython = python3
- deps = {[testenv]deps}
- pylint
--
--basepython = python2.7
- sitepackages = False
--
- commands = pylint cgcs_patch --rcfile=./pylint.rc
-+ pylint cgcs_make_patch --rcfile=./pylint_make_patch.rc
-
- [testenv:cover]
- setenv =
+++ /dev/null
-From d6675196199ddcefccba0d5d745ac4e93aaecd0f Mon Sep 17 00:00:00 2001
-From: Don Penney <don.penney@windriver.com>
-Date: Wed, 4 Dec 2019 22:26:52 -0500
-Subject: [PATCH] Address python3 pylint errors and warnings
-
-This commit addresses issues detected by the updated python3 pylint:
-- Added a return code to the report_app_dependencies function to
-satisfy the E1111 error reported.
-- Added line-specific pylint disable for unused-argument for cases
-where the inclusion of such arguments in the function signature was
-intentional.
-- Added line-specific pylint disable for the duplicate-except case
-found, as python3 has merged IOError into OSError, while these are
-separate exceptions in python2. Once we're running solely on python3,
-this duplicate exception handling can be dropped.
-
-Change-Id: I96a521288e71948f06ad0c88a12c8f475ed8bc99
-Closes-Bug: 1855180
-Signed-off-by: Don Penney <don.penney@windriver.com>
-
----
- cgcs-patch/cgcs-patch/cgcs_patch/api/controllers/root.py | 4 ++--
- cgcs-patch/cgcs-patch/cgcs_patch/messages.py | 2 +-
- cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py | 6 +++---
- cgcs-patch/cgcs-patch/cgcs_patch/patch_client.py | 6 +++---
- cgcs-patch/cgcs-patch/cgcs_patch/patch_controller.py | 8 +++++---
- cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py | 2 +-
- cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_controller.py | 2 +-
- cgcs-patch/cgcs-patch/pylint.rc | 6 +-----
- 8 files changed, 17 insertions(+), 19 deletions(-)
-
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/api/controllers/root.py b/cgcs-patch/cgcs-patch/cgcs_patch/api/controllers/root.py
-index f1e0262..4c7bd7f 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/api/controllers/root.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/api/controllers/root.py
-@@ -182,7 +182,7 @@ class PatchAPIController(object):
-
- @expose('json')
- @expose('query_hosts.xml', content_type='application/xml')
-- def query_hosts(self, *args):
-+ def query_hosts(self, *args): # pylint: disable=unused-argument
- return dict(data=pc.query_host_cache())
-
- @expose('json')
-@@ -197,7 +197,7 @@ class PatchAPIController(object):
-
- @expose('json')
- @expose('query.xml', content_type='application/xml')
-- def host_install(self, *args):
-+ def host_install(self, *args): # pylint: disable=unused-argument
- return dict(error="Deprecated: Use host_install_async")
-
- @expose('json')
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/messages.py b/cgcs-patch/cgcs-patch/cgcs_patch/messages.py
-index a57ea28..6abc29d 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/messages.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/messages.py
-@@ -60,5 +60,5 @@ class PatchMessage(object):
- return PATCHMSG_STR[self.msgtype]
- return "invalid-type"
-
-- def handle(self, sock, addr):
-+ def handle(self, sock, addr): # pylint: disable=unused-argument
- LOG.info("Unhandled message type: %s" % self.msgtype)
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-index 77930d7..547db52 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-@@ -150,7 +150,7 @@ class PatchMessageHelloAgent(messages.PatchMessage):
- resp = PatchMessageHelloAgentAck()
- resp.send(sock)
-
-- def send(self, sock):
-+ def send(self, sock): # pylint: disable=unused-argument
- LOG.error("Should not get here")
-
-
-@@ -196,7 +196,7 @@ class PatchMessageQueryDetailed(messages.PatchMessage):
- resp = PatchMessageQueryDetailedResp()
- resp.send(sock)
-
-- def send(self, sock):
-+ def send(self, sock): # pylint: disable=unused-argument
- LOG.error("Should not get here")
-
-
-@@ -258,7 +258,7 @@ class PatchMessageAgentInstallReq(messages.PatchMessage):
- resp.status = pa.handle_install()
- resp.send(sock, addr)
-
-- def send(self, sock):
-+ def send(self, sock): # pylint: disable=unused-argument
- LOG.error("Should not get here")
-
-
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_client.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_client.py
-index 705590c..af189fc 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_client.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_client.py
-@@ -960,7 +960,7 @@ def wait_for_install_complete(agent_ip):
- return rc
-
-
--def host_install(debug, args):
-+def host_install(debug, args): # pylint: disable=unused-argument
- force = False
- rc = 0
-
-@@ -1072,7 +1072,7 @@ def patch_upload_dir_req(debug, args):
- return check_rc(req)
-
-
--def patch_install_local(debug, args):
-+def patch_install_local(debug, args): # pylint: disable=unused-argument
- """ This function is used to trigger patch installation prior to configuration """
- # Check to see if initial configuration has completed
- if os.path.isfile(INITIAL_CONTROLLER_CONFIG_COMPLETE):
-@@ -1214,7 +1214,7 @@ def patch_is_available_req(args):
- return rc
-
-
--def patch_report_app_dependencies_req(debug, args):
-+def patch_report_app_dependencies_req(debug, args): # pylint: disable=unused-argument
- if len(args) < 2:
- print_help()
-
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_controller.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_controller.py
-index 4b94a5f..79a6401 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_controller.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_controller.py
-@@ -392,7 +392,7 @@ class PatchMessageHelloAgentAck(messages.PatchMessage):
- self.agent_state)
- pc.hosts_lock.release()
-
-- def send(self, sock):
-+ def send(self, sock): # pylint: disable=unused-argument
- LOG.error("Should not get here")
-
-
-@@ -469,7 +469,7 @@ class PatchMessageQueryDetailedResp(messages.PatchMessage):
- else:
- pc.hosts_lock.release()
-
-- def send(self, sock):
-+ def send(self, sock): # pylint: disable=unused-argument
- LOG.error("Should not get here")
-
-
-@@ -525,7 +525,7 @@ class PatchMessageAgentInstallResp(messages.PatchMessage):
- pc.hosts[addr[0]].install_reject_reason = self.reject_reason
- pc.hosts_lock.release()
-
-- def send(self, sock):
-+ def send(self, sock): # pylint: disable=unused-argument
- LOG.error("Should not get here")
-
-
-@@ -2298,6 +2298,8 @@ class PatchController(PatchService):
- finally:
- self.patch_data_lock.release()
-
-+ return True
-+
- def query_app_dependencies(self):
- """
- Query application dependencies
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py
-index 281a286..e9017f2 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py
-@@ -1253,7 +1253,7 @@ class PatchFile(object):
- msg = "Failed during patch extraction"
- LOG.exception(msg)
- raise PatchFail(msg)
-- except IOError:
-+ except IOError: # pylint: disable=duplicate-except
- msg = "Failed during patch extraction"
- LOG.exception(msg)
- raise PatchFail(msg)
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_controller.py b/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_controller.py
-index e2b02c0..1db4b68 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_controller.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_controller.py
-@@ -17,6 +17,6 @@ import cgcs_patch.patch_controller # noqa: E402
- class CgcsPatchControllerTestCase(testtools.TestCase):
-
- @mock.patch('six.moves.builtins.open')
-- def test_cgcs_patch_controller_instantiate(self, mock_open):
-+ def test_cgcs_patch_controller_instantiate(self, mock_open): # pylint: disable=unused-argument
- # pylint: disable=unused-variable
- pc = cgcs_patch.patch_controller.PatchController() # noqa: F841
-diff --git a/cgcs-patch/cgcs-patch/pylint.rc b/cgcs-patch/cgcs-patch/pylint.rc
-index 812b6b5..a2d888b 100644
---- a/cgcs-patch/cgcs-patch/pylint.rc
-+++ b/cgcs-patch/cgcs-patch/pylint.rc
-@@ -44,16 +44,12 @@ symbols=no
- # --enable=similarities". If you want to run only the classes checker, but have
- # no Warning level messages displayed, use"--disable=all --enable=classes
- # --disable=W"
--# E1111 assignment-from-no-return
- # W0107 unnecessary-pass
- # W0603 global-statement
--# W0612 unused-variable
--# W0613 unused-argument
- # W0703 broad-except
--# W0705 duplicate-except
- # W1201 logging-not-lazy
- # W1505, deprecated-method
--disable=C, R, E1111, W0107, W0603, W0612, W0613, W0703, W0705, W1201, W1505
-+disable=C, R, W0107, W0603, W0703, W1201, W1505
-
-
- [REPORTS]
+++ /dev/null
-From b206b6574a75dfc3793886529064e3d938759be8 Mon Sep 17 00:00:00 2001
-From: Don Penney <don.penney@windriver.com>
-Date: Mon, 23 Dec 2019 14:36:08 -0500
-Subject: [PATCH] Clean up pylint W1201 logging-not-lazy in cgcs-patch
-
-Change-Id: Ib461890ddf7635645d42660dc07a153e2449b09e
-Story: 2007050
-Task: 37874
-Signed-off-by: Don Penney <don.penney@windriver.com>
-
----
- .../cgcs-patch/cgcs_patch/api/controllers/root.py | 2 +-
- cgcs-patch/cgcs-patch/cgcs_patch/base.py | 4 +-
- cgcs-patch/cgcs-patch/cgcs_patch/messages.py | 2 +-
- cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py | 76 +++++++++----------
- .../cgcs-patch/cgcs_patch/patch_controller.py | 86 +++++++++++-----------
- cgcs-patch/cgcs-patch/pylint.rc | 3 +-
- 6 files changed, 86 insertions(+), 87 deletions(-)
-
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/api/controllers/root.py b/cgcs-patch/cgcs-patch/cgcs_patch/api/controllers/root.py
-index 4c7bd7f..883b58d 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/api/controllers/root.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/api/controllers/root.py
-@@ -135,7 +135,7 @@ class PatchAPIController(object):
- def upload_dir(self, **kwargs):
- files = []
- for path in kwargs.values():
-- LOG.info("upload-dir: Retrieving patches from %s" % path)
-+ LOG.info("upload-dir: Retrieving patches from %s", path)
- for f in glob.glob(path + '/*.patch'):
- if os.path.isfile(f):
- files.append(f)
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/base.py b/cgcs-patch/cgcs-patch/cgcs_patch/base.py
-index 8e47905..e12e26c 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/base.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/base.py
-@@ -160,11 +160,11 @@ class PatchService(object):
- if result == self.mcast_addr:
- return
- except subprocess.CalledProcessError as e:
-- LOG.error("Command output: %s" % e.output)
-+ LOG.error("Command output: %s", e.output)
- return
-
- # Close the socket and set it up again
-- LOG.info("Detected missing multicast addr (%s). Reconfiguring" % self.mcast_addr)
-+ LOG.info("Detected missing multicast addr (%s). Reconfiguring", self.mcast_addr)
- while self.setup_socket() is None:
- LOG.info("Unable to setup sockets. Waiting to retry")
- time.sleep(5)
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/messages.py b/cgcs-patch/cgcs-patch/cgcs_patch/messages.py
-index 6abc29d..86ff99f 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/messages.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/messages.py
-@@ -61,4 +61,4 @@ class PatchMessage(object):
- return "invalid-type"
-
- def handle(self, sock, addr): # pylint: disable=unused-argument
-- LOG.info("Unhandled message type: %s" % self.msgtype)
-+ LOG.info("Unhandled message type: %s", self.msgtype)
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-index 547db52..3abd891 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-@@ -70,7 +70,7 @@ def setflag(fname):
- with open(fname, "w") as f:
- f.write("%d\n" % os.getpid())
- except Exception:
-- LOG.exception("Failed to update %s flag" % fname)
-+ LOG.exception("Failed to update %s flag", fname)
-
-
- def clearflag(fname):
-@@ -78,7 +78,7 @@ def clearflag(fname):
- try:
- os.remove(fname)
- except Exception:
-- LOG.exception("Failed to clear %s flag" % fname)
-+ LOG.exception("Failed to clear %s flag", fname)
-
-
- def check_install_uuid():
-@@ -101,7 +101,7 @@ def check_install_uuid():
- controller_install_uuid = str(req.text).rstrip()
-
- if install_uuid != controller_install_uuid:
-- LOG.error("Local install_uuid=%s doesn't match controller=%s" % (install_uuid, controller_install_uuid))
-+ LOG.error("Local install_uuid=%s doesn't match controller=%s", install_uuid, controller_install_uuid)
- return False
-
- return True
-@@ -239,7 +239,7 @@ class PatchMessageAgentInstallReq(messages.PatchMessage):
- messages.PatchMessage.encode(self)
-
- def handle(self, sock, addr):
-- LOG.info("Handling host install request, force=%s" % self.force)
-+ LOG.info("Handling host install request, force=%s", self.force)
- global pa
- resp = PatchMessageAgentInstallResp()
-
-@@ -354,7 +354,7 @@ class PatchAgent(PatchService):
- config = yaml.load(output)
- except subprocess.CalledProcessError as e:
- LOG.exception("Failed to query channels")
-- LOG.error("Command output: %s" % e.output)
-+ LOG.error("Command output: %s", e.output)
- return False
- except Exception:
- LOG.exception("Failed to query channels")
-@@ -390,23 +390,23 @@ class PatchAgent(PatchService):
- config[channel].get('baseurl') != ch_baseurl):
- # Config is invalid
- add_channel = True
-- LOG.warning("Invalid smart config found for %s" % channel)
-+ LOG.warning("Invalid smart config found for %s", channel)
- try:
- output = subprocess.check_output(smart_cmd +
- ["channel", "--yes",
- "--remove", channel],
- stderr=subprocess.STDOUT)
- except subprocess.CalledProcessError as e:
-- LOG.exception("Failed to configure %s channel" % channel)
-- LOG.error("Command output: %s" % e.output)
-+ LOG.exception("Failed to configure %s channel", channel)
-+ LOG.error("Command output: %s", e.output)
- return False
- else:
- # Channel is missing
- add_channel = True
-- LOG.warning("Channel %s is missing from config" % channel)
-+ LOG.warning("Channel %s is missing from config", channel)
-
- if add_channel:
-- LOG.info("Adding channel %s" % channel)
-+ LOG.info("Adding channel %s", channel)
- cmd_args = ["channel", "--yes", "--add", channel,
- "type=%s" % ch_type,
- "name=%s" % ch_name]
-@@ -417,8 +417,8 @@ class PatchAgent(PatchService):
- output = subprocess.check_output(smart_cmd + cmd_args,
- stderr=subprocess.STDOUT)
- except subprocess.CalledProcessError as e:
-- LOG.exception("Failed to configure %s channel" % channel)
-- LOG.error("Command output: %s" % e.output)
-+ LOG.exception("Failed to configure %s channel", channel)
-+ LOG.error("Command output: %s", e.output)
- return False
-
- updated = True
-@@ -431,7 +431,7 @@ class PatchAgent(PatchService):
- config = yaml.load(output)
- except subprocess.CalledProcessError as e:
- LOG.exception("Failed to query smart config")
-- LOG.error("Command output: %s" % e.output)
-+ LOG.error("Command output: %s", e.output)
- return False
- except Exception:
- LOG.exception("Failed to query smart config")
-@@ -441,15 +441,15 @@ class PatchAgent(PatchService):
- nolinktos = 'rpm-nolinktos'
- if config.get(nolinktos) is not True:
- # Set the flag
-- LOG.warning("Setting %s option" % nolinktos)
-+ LOG.warning("Setting %s option", nolinktos)
- try:
- output = subprocess.check_output(smart_cmd +
- ["config", "--set",
- "%s=true" % nolinktos],
- stderr=subprocess.STDOUT)
- except subprocess.CalledProcessError as e:
-- LOG.exception("Failed to configure %s option" % nolinktos)
-- LOG.error("Command output: %s" % e.output)
-+ LOG.exception("Failed to configure %s option", nolinktos)
-+ LOG.error("Command output: %s", e.output)
- return False
-
- updated = True
-@@ -458,15 +458,15 @@ class PatchAgent(PatchService):
- nosignature = 'rpm-check-signatures'
- if config.get(nosignature) is not False:
- # Set the flag
-- LOG.warning("Setting %s option" % nosignature)
-+ LOG.warning("Setting %s option", nosignature)
- try:
- output = subprocess.check_output(smart_cmd +
- ["config", "--set",
- "%s=false" % nosignature],
- stderr=subprocess.STDOUT)
- except subprocess.CalledProcessError as e:
-- LOG.exception("Failed to configure %s option" % nosignature)
-- LOG.error("Command output: %s" % e.output)
-+ LOG.exception("Failed to configure %s option", nosignature)
-+ LOG.error("Command output: %s", e.output)
- return False
-
- updated = True
-@@ -476,7 +476,7 @@ class PatchAgent(PatchService):
- subprocess.check_output(smart_update, stderr=subprocess.STDOUT)
- except subprocess.CalledProcessError as e:
- LOG.exception("Failed to update smartpm")
-- LOG.error("Command output: %s" % e.output)
-+ LOG.error("Command output: %s", e.output)
- return False
-
- # Reset the patch op counter to force a detailed query
-@@ -584,7 +584,7 @@ class PatchAgent(PatchService):
- self.installed[pkgname] = version.split('@')[0]
- break
- except subprocess.CalledProcessError:
-- LOG.error("Failed to query installed version of %s" % pkgname)
-+ LOG.error("Failed to query installed version of %s", pkgname)
-
- self.changes = True
-
-@@ -641,7 +641,7 @@ class PatchAgent(PatchService):
- subprocess.check_output(smart_update, stderr=subprocess.STDOUT)
- except subprocess.CalledProcessError as e:
- LOG.error("Failed to update smartpm")
-- LOG.error("Command output: %s" % e.output)
-+ LOG.error("Command output: %s", e.output)
- # Set a state to "unknown"?
- return False
-
-@@ -663,7 +663,7 @@ class PatchAgent(PatchService):
- output = subprocess.check_output(smart_query_installed)
- pkgs_installed = self.parse_smart_pkglist(output)
- except subprocess.CalledProcessError as e:
-- LOG.error("Failed to query installed pkgs: %s" % e.output)
-+ LOG.error("Failed to query installed pkgs: %s", e.output)
- # Set a state to "unknown"?
- return False
-
-@@ -671,7 +671,7 @@ class PatchAgent(PatchService):
- output = subprocess.check_output(smart_query_base)
- pkgs_base = self.parse_smart_pkglist(output)
- except subprocess.CalledProcessError as e:
-- LOG.error("Failed to query base pkgs: %s" % e.output)
-+ LOG.error("Failed to query base pkgs: %s", e.output)
- # Set a state to "unknown"?
- return False
-
-@@ -679,7 +679,7 @@ class PatchAgent(PatchService):
- output = subprocess.check_output(smart_query_updates)
- pkgs_updates = self.parse_smart_pkglist(output)
- except subprocess.CalledProcessError as e:
-- LOG.error("Failed to query patched pkgs: %s" % e.output)
-+ LOG.error("Failed to query patched pkgs: %s", e.output)
- # Set a state to "unknown"?
- return False
-
-@@ -722,11 +722,11 @@ class PatchAgent(PatchService):
- # Look for new packages
- self.check_groups()
-
-- LOG.info("Patch state query returns %s" % self.changes)
-- LOG.info("Installed: %s" % self.installed)
-- LOG.info("To install: %s" % self.to_install)
-- LOG.info("To remove: %s" % self.to_remove)
-- LOG.info("Missing: %s" % self.missing_pkgs)
-+ LOG.info("Patch state query returns %s", self.changes)
-+ LOG.info("Installed: %s", self.installed)
-+ LOG.info("To install: %s", self.to_install)
-+ LOG.info("To remove: %s", self.to_remove)
-+ LOG.info("Missing: %s", self.missing_pkgs)
-
- return True
-
-@@ -794,16 +794,16 @@ class PatchAgent(PatchService):
- try:
- if verbose_to_stdout:
- print("Installing software updates...")
-- LOG.info("Installing: %s" % ", ".join(install_set))
-+ LOG.info("Installing: %s", ", ".join(install_set))
- output = subprocess.check_output(smart_install_cmd + install_set, stderr=subprocess.STDOUT)
- changed = True
- for line in output.split('\n'):
-- LOG.info("INSTALL: %s" % line)
-+ LOG.info("INSTALL: %s", line)
- if verbose_to_stdout:
- print("Software updated.")
- except subprocess.CalledProcessError as e:
- LOG.exception("Failed to install RPMs")
-- LOG.error("Command output: %s" % e.output)
-+ LOG.error("Command output: %s", e.output)
- rc = False
- if verbose_to_stdout:
- print("WARNING: Software update failed.")
-@@ -820,16 +820,16 @@ class PatchAgent(PatchService):
- try:
- if verbose_to_stdout:
- print("Handling patch removal...")
-- LOG.info("Removing: %s" % ", ".join(remove_set))
-+ LOG.info("Removing: %s", ", ".join(remove_set))
- output = subprocess.check_output(smart_remove_cmd + remove_set, stderr=subprocess.STDOUT)
- changed = True
- for line in output.split('\n'):
-- LOG.info("REMOVE: %s" % line)
-+ LOG.info("REMOVE: %s", line)
- if verbose_to_stdout:
- print("Patch removal complete.")
- except subprocess.CalledProcessError as e:
- LOG.exception("Failed to remove RPMs")
-- LOG.error("Command output: %s" % e.output)
-+ LOG.error("Command output: %s", e.output)
- rc = False
- if verbose_to_stdout:
- print("WARNING: Patch removal failed.")
-@@ -862,7 +862,7 @@ class PatchAgent(PatchService):
- self.node_is_patched = False
- except subprocess.CalledProcessError as e:
- LOG.exception("In-Service patch scripts failed")
-- LOG.error("Command output: %s" % e.output)
-+ LOG.error("Command output: %s", e.output)
- # Fail the patching operation
- rc = False
-
-@@ -1071,7 +1071,7 @@ def main():
- # In certain cases, the lighttpd server could still be running using
- # its default port 80, as opposed to the port configured in platform.conf
- global http_port_real
-- LOG.info("Failed install_uuid check via http_port=%s. Trying with default port 80" % http_port_real)
-+ LOG.info("Failed install_uuid check via http_port=%s. Trying with default port 80", http_port_real)
- http_port_real = 80
-
- pa.handle_install(verbose_to_stdout=True, disallow_insvc_patch=True)
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_controller.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_controller.py
-index 79a6401..f2b24c8 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_controller.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_controller.py
-@@ -137,11 +137,11 @@ class AgentNeighbour(object):
- if out_of_date != self.out_of_date or requires_reboot != self.requires_reboot:
- self.out_of_date = out_of_date
- self.requires_reboot = requires_reboot
-- LOG.info("Agent %s (%s) reporting out_of_date=%s, requires_reboot=%s" % (
-- self.hostname,
-- self.ip,
-- self.out_of_date,
-- self.requires_reboot))
-+ LOG.info("Agent %s (%s) reporting out_of_date=%s, requires_reboot=%s",
-+ self.hostname,
-+ self.ip,
-+ self.out_of_date,
-+ self.requires_reboot)
-
- if self.last_query_id != query_id:
- self.last_query_id = query_id
-@@ -488,7 +488,7 @@ class PatchMessageAgentInstallReq(messages.PatchMessage):
- LOG.error("Should not get here")
-
- def send(self, sock):
-- LOG.info("sending install request to node: %s" % self.ip)
-+ LOG.info("sending install request to node: %s", self.ip)
- self.encode()
- message = json.dumps(self.message)
- sock.sendto(message, (self.ip, cfg.agent_port))
-@@ -512,7 +512,7 @@ class PatchMessageAgentInstallResp(messages.PatchMessage):
- messages.PatchMessage.encode(self)
-
- def handle(self, sock, addr):
-- LOG.info("Handling install resp from %s" % addr[0])
-+ LOG.info("Handling install resp from %s", addr[0])
- global pc
- # LOG.info("Handling hello ack")
-
-@@ -551,7 +551,7 @@ class PatchMessageDropHostReq(messages.PatchMessage):
- return
-
- if self.ip is None:
-- LOG.error("Received PATCHMSG_DROP_HOST_REQ with no ip: %s" % json.dumps(self.data))
-+ LOG.error("Received PATCHMSG_DROP_HOST_REQ with no ip: %s", json.dumps(self.data))
- return
-
- pc.drop_host(self.ip, sync_nbr=False)
-@@ -602,7 +602,7 @@ class PatchController(PatchService):
- with open(app_dependency_filename, 'r') as f:
- self.app_dependencies = json.loads(f.read())
- except Exception:
-- LOG.exception("Failed to read app dependencies: %s" % app_dependency_filename)
-+ LOG.exception("Failed to read app dependencies: %s", app_dependency_filename)
- else:
- self.app_dependencies = {}
-
-@@ -658,7 +658,7 @@ class PatchController(PatchService):
- counter = config.getint('runtime', 'patch_op_counter')
- self.patch_op_counter = counter
-
-- LOG.info("patch_op_counter is: %d" % self.patch_op_counter)
-+ LOG.info("patch_op_counter is: %d", self.patch_op_counter)
- except configparser.Error:
- LOG.exception("Failed to read state info")
-
-@@ -679,9 +679,9 @@ class PatchController(PatchService):
- "rsync://%s/patching/" % host_url,
- "%s/" % patch_dir],
- stderr=subprocess.STDOUT)
-- LOG.info("Synced to mate patching via rsync: %s" % output)
-+ LOG.info("Synced to mate patching via rsync: %s", output)
- except subprocess.CalledProcessError as e:
-- LOG.error("Failed to rsync: %s" % e.output)
-+ LOG.error("Failed to rsync: %s", e.output)
- return False
-
- try:
-@@ -691,9 +691,9 @@ class PatchController(PatchService):
- "rsync://%s/repo/" % host_url,
- "%s/" % repo_root_dir],
- stderr=subprocess.STDOUT)
-- LOG.info("Synced to mate repo via rsync: %s" % output)
-+ LOG.info("Synced to mate repo via rsync: %s", output)
- except subprocess.CalledProcessError:
-- LOG.error("Failed to rsync: %s" % output)
-+ LOG.error("Failed to rsync: %s", output)
- return False
-
- self.read_state_file()
-@@ -710,7 +710,7 @@ class PatchController(PatchService):
- with open(app_dependency_filename, 'r') as f:
- self.app_dependencies = json.loads(f.read())
- except Exception:
-- LOG.exception("Failed to read app dependencies: %s" % app_dependency_filename)
-+ LOG.exception("Failed to read app dependencies: %s", app_dependency_filename)
- else:
- self.app_dependencies = {}
-
-@@ -757,7 +757,7 @@ class PatchController(PatchService):
- continue
-
- if patch_id not in self.patch_data.metadata:
-- LOG.error("Patch data missing for %s" % patch_id)
-+ LOG.error("Patch data missing for %s", patch_id)
- continue
-
- # If the patch is on a different release than the host, skip it.
-@@ -811,7 +811,7 @@ class PatchController(PatchService):
- continue
-
- if patch_id not in self.patch_data.metadata:
-- LOG.error("Patch data missing for %s" % patch_id)
-+ LOG.error("Patch data missing for %s", patch_id)
- continue
-
- if personality not in self.patch_data.metadata[patch_id]:
-@@ -835,7 +835,7 @@ class PatchController(PatchService):
- continue
-
- if patch_id not in self.patch_data.metadata:
-- LOG.error("Patch data missing for %s" % patch_id)
-+ LOG.error("Patch data missing for %s", patch_id)
- continue
-
- if personality not in self.patch_data.metadata[patch_id]:
-@@ -902,10 +902,10 @@ class PatchController(PatchService):
-
- if os.path.exists(semchk):
- try:
-- LOG.info("Running semantic check: %s" % semchk)
-+ LOG.info("Running semantic check: %s", semchk)
- subprocess.check_output([semchk] + patch_state_args,
- stderr=subprocess.STDOUT)
-- LOG.info("Semantic check %s passed" % semchk)
-+ LOG.info("Semantic check %s passed", semchk)
- except subprocess.CalledProcessError as e:
- msg = "Semantic check failed for %s:\n%s" % (patch_id, e.output)
- LOG.exception(msg)
-@@ -1158,7 +1158,7 @@ class PatchController(PatchService):
- # Copy the RPMs. If a failure occurs, clean up copied files.
- copied = []
- for rpmfile in rpmlist:
-- LOG.info("Copy %s to %s" % (rpmfile, rpmlist[rpmfile]))
-+ LOG.info("Copy %s to %s", rpmfile, rpmlist[rpmfile])
- try:
- shutil.copy(rpmfile, rpmlist[rpmfile])
- copied.append(rpmlist[rpmfile])
-@@ -1167,7 +1167,7 @@ class PatchController(PatchService):
- LOG.exception(msg)
- # Clean up files
- for filename in copied:
-- LOG.info("Cleaning up %s" % filename)
-+ LOG.info("Cleaning up %s", filename)
- os.remove(filename)
-
- raise RpmFail(msg)
-@@ -1206,7 +1206,7 @@ class PatchController(PatchService):
- "comps.xml",
- rdir],
- stderr=subprocess.STDOUT)
-- LOG.info("Repo[%s] updated:\n%s" % (ver, output))
-+ LOG.info("Repo[%s] updated:\n%s", ver, output)
- except subprocess.CalledProcessError:
- msg = "Failed to update the repo for %s" % ver
- LOG.exception(msg)
-@@ -1387,7 +1387,7 @@ class PatchController(PatchService):
- "comps.xml",
- rdir],
- stderr=subprocess.STDOUT)
-- LOG.info("Repo[%s] updated:\n%s" % (ver, output))
-+ LOG.info("Repo[%s] updated:\n%s", ver, output)
- except subprocess.CalledProcessError:
- msg = "Failed to update the repo for %s" % ver
- LOG.exception(msg)
-@@ -1529,7 +1529,7 @@ class PatchController(PatchService):
- "comps.xml",
- repo_dir[release]],
- stderr=subprocess.STDOUT)
-- LOG.info("Repo[%s] updated:\n%s" % (release, output))
-+ LOG.info("Repo[%s] updated:\n%s", release, output)
- except subprocess.CalledProcessError:
- msg = "Failed to update the repo for %s" % release
- LOG.exception(msg)
-@@ -1844,7 +1844,7 @@ class PatchController(PatchService):
- for patch_id in sorted(patch_ids):
- if patch_id not in self.patch_data.metadata.keys():
- errormsg = "%s is unrecognized\n" % patch_id
-- LOG.info("patch_query_dependencies: %s" % errormsg)
-+ LOG.info("patch_query_dependencies: %s", errormsg)
- results["error"] += errormsg
- failure = True
- self.patch_data_lock.release()
-@@ -1892,7 +1892,7 @@ class PatchController(PatchService):
- errormsg = "A commit cannot be performed with non-REL status patches in the system:\n"
- for patch_id in non_rel_list:
- errormsg += " %s\n" % patch_id
-- LOG.info("patch_commit rejected: %s" % errormsg)
-+ LOG.info("patch_commit rejected: %s", errormsg)
- results["error"] += errormsg
- return results
-
-@@ -1901,7 +1901,7 @@ class PatchController(PatchService):
- for patch_id in sorted(patch_ids):
- if patch_id not in self.patch_data.metadata.keys():
- errormsg = "%s is unrecognized\n" % patch_id
-- LOG.info("patch_commit: %s" % errormsg)
-+ LOG.info("patch_commit: %s", errormsg)
- results["error"] += errormsg
- failure = True
- self.patch_data_lock.release()
-@@ -1925,7 +1925,7 @@ class PatchController(PatchService):
- errormsg = "The following patches are not applied and cannot be committed:\n"
- for patch_id in avail_list:
- errormsg += " %s\n" % patch_id
-- LOG.info("patch_commit rejected: %s" % errormsg)
-+ LOG.info("patch_commit rejected: %s", errormsg)
- results["error"] += errormsg
- return results
-
-@@ -2039,7 +2039,7 @@ class PatchController(PatchService):
- "comps.xml",
- rdir],
- stderr=subprocess.STDOUT)
-- LOG.info("Repo[%s] updated:\n%s" % (ver, output))
-+ LOG.info("Repo[%s] updated:\n%s", ver, output)
- except subprocess.CalledProcessError:
- msg = "Failed to update the repo for %s" % ver
- LOG.exception(msg)
-@@ -2100,7 +2100,7 @@ class PatchController(PatchService):
- self.hosts_lock.release()
- msg = "Unknown host specified: %s" % host_ip
- msg_error += msg + "\n"
-- LOG.error("Error in host-install: " + msg)
-+ LOG.error("Error in host-install: %s", msg)
- return dict(info=msg_info, warning=msg_warning, error=msg_error)
-
- msg = "Running host-install for %s (%s), force=%s, async_req=%s" % (host_ip, ip, force, async_req)
-@@ -2128,7 +2128,7 @@ class PatchController(PatchService):
- # async_req install requested, so return now
- msg = "Patch installation request sent to %s." % self.hosts[ip].hostname
- msg_info += msg + "\n"
-- LOG.info("host-install async_req: " + msg)
-+ LOG.info("host-install async_req: %s", msg)
- return dict(info=msg_info, warning=msg_warning, error=msg_error)
-
- # Now we wait, up to ten mins... TODO: Wait on a condition
-@@ -2141,7 +2141,7 @@ class PatchController(PatchService):
- self.hosts_lock.release()
- msg = "Agent expired while waiting: %s" % ip
- msg_error += msg + "\n"
-- LOG.error("Error in host-install: " + msg)
-+ LOG.error("Error in host-install: %s", msg)
- break
-
- if not self.hosts[ip].install_pending:
-@@ -2150,17 +2150,17 @@ class PatchController(PatchService):
- if self.hosts[ip].install_status:
- msg = "Patch installation was successful on %s." % self.hosts[ip].hostname
- msg_info += msg + "\n"
-- LOG.info("host-install: " + msg)
-+ LOG.info("host-install: %s", msg)
- elif self.hosts[ip].install_reject_reason:
- msg = "Patch installation rejected by %s. %s" % (
- self.hosts[ip].hostname,
- self.hosts[ip].install_reject_reason)
- msg_error += msg + "\n"
-- LOG.error("Error in host-install: " + msg)
-+ LOG.error("Error in host-install: %s", msg)
- else:
- msg = "Patch installation failed on %s." % self.hosts[ip].hostname
- msg_error += msg + "\n"
-- LOG.error("Error in host-install: " + msg)
-+ LOG.error("Error in host-install: %s", msg)
-
- self.hosts_lock.release()
- break
-@@ -2172,7 +2172,7 @@ class PatchController(PatchService):
- if not resp_rx:
- msg = "Timeout occurred while waiting response from %s." % ip
- msg_error += msg + "\n"
-- LOG.error("Error in host-install: " + msg)
-+ LOG.error("Error in host-install: %s", msg)
-
- return dict(info=msg_info, warning=msg_warning, error=msg_error)
-
-@@ -2203,7 +2203,7 @@ class PatchController(PatchService):
- self.hosts_lock.release()
- msg = "Unknown host specified: %s" % host_ip
- msg_error += msg + "\n"
-- LOG.error("Error in drop-host: " + msg)
-+ LOG.error("Error in drop-host: %s", msg)
- return dict(info=msg_info, warning=msg_warning, error=msg_error)
-
- msg = "Running drop-host for %s (%s)" % (host_ip, ip)
-@@ -2272,8 +2272,8 @@ class PatchController(PatchService):
-
- appname = kwargs.get("app")
-
-- LOG.info("Handling app dependencies report: app=%s, patch_ids=%s" %
-- (appname, ','.join(patch_ids)))
-+ LOG.info("Handling app dependencies report: app=%s, patch_ids=%s",
-+ appname, ','.join(patch_ids))
-
- self.patch_data_lock.acquire()
-
-@@ -2516,7 +2516,7 @@ class PatchControllerMainThread(threading.Thread):
- inputs = [pc.sock_in] + agent_query_conns
- outputs = []
-
-- # LOG.info("Running select, remaining=%d" % remaining)
-+ # LOG.info("Running select, remaining=%d", remaining)
- rlist, wlist, xlist = select.select(inputs, outputs, inputs, remaining)
-
- if (len(rlist) == 0 and
-@@ -2641,7 +2641,7 @@ class PatchControllerMainThread(threading.Thread):
- for n in nbrs:
- # Age out controllers after 2 minutes
- if pc.controller_neighbours[n].get_age() >= 120:
-- LOG.info("Aging out controller %s from table" % n)
-+ LOG.info("Aging out controller %s from table", n)
- del pc.controller_neighbours[n]
- pc.controller_neighbours_lock.release()
-
-@@ -2650,7 +2650,7 @@ class PatchControllerMainThread(threading.Thread):
- for n in nbrs:
- # Age out hosts after 1 hour
- if pc.hosts[n].get_age() >= 3600:
-- LOG.info("Aging out host %s from table" % n)
-+ LOG.info("Aging out host %s from table", n)
- del pc.hosts[n]
- for patch_id in pc.interim_state.keys():
- if n in pc.interim_state[patch_id]:
-diff --git a/cgcs-patch/cgcs-patch/pylint.rc b/cgcs-patch/cgcs-patch/pylint.rc
-index a2d888b..57a9829 100644
---- a/cgcs-patch/cgcs-patch/pylint.rc
-+++ b/cgcs-patch/cgcs-patch/pylint.rc
-@@ -47,9 +47,8 @@ symbols=no
- # W0107 unnecessary-pass
- # W0603 global-statement
- # W0703 broad-except
--# W1201 logging-not-lazy
- # W1505, deprecated-method
--disable=C, R, W0107, W0603, W0703, W1201, W1505
-+disable=C, R, W0107, W0603, W0703, W1505
-
-
- [REPORTS]
+++ /dev/null
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-index 3abd891..d8bc375 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-@@ -5,22 +5,26 @@ SPDX-License-Identifier: Apache-2.0
-
- """
-
--import os
--import time
--import socket
-+import dnf
-+import dnf.callback
-+import dnf.comps
-+import dnf.exceptions
-+import dnf.rpm
-+import dnf.sack
-+import dnf.transaction
- import json
--import select
--import subprocess
-+import libdnf.transaction
-+import os
- import random
- import requests
--import xml.etree.ElementTree as ElementTree
--import rpm
--import sys
--import yaml
-+import select
- import shutil
-+import socket
-+import subprocess
-+import sys
-+import time
-
- from cgcs_patch.patch_functions import configure_logging
--from cgcs_patch.patch_functions import parse_pkgver
- from cgcs_patch.patch_functions import LOG
- import cgcs_patch.config as cfg
- from cgcs_patch.base import PatchService
-@@ -50,19 +54,13 @@ pa = None
-
- http_port_real = http_port
-
--# Smart commands
--smart_cmd = ["/usr/bin/smart"]
--smart_quiet = smart_cmd + ["--quiet"]
--smart_update = smart_quiet + ["update"]
--smart_newer = smart_quiet + ["newer"]
--smart_orphans = smart_quiet + ["query", "--orphans", "--show-format", "$name\n"]
--smart_query = smart_quiet + ["query"]
--smart_query_repos = smart_quiet + ["query", "--channel=base", "--channel=updates"]
--smart_install_cmd = smart_cmd + ["install", "--yes", "--explain"]
--smart_remove_cmd = smart_cmd + ["remove", "--yes", "--explain"]
--smart_query_installed = smart_quiet + ["query", "--installed", "--show-format", "$name $version\n"]
--smart_query_base = smart_quiet + ["query", "--channel=base", "--show-format", "$name $version\n"]
--smart_query_updates = smart_quiet + ["query", "--channel=updates", "--show-format", "$name $version\n"]
-+# DNF commands
-+dnf_cmd = ['/usr/bin/dnf']
-+dnf_quiet = dnf_cmd + ['--quiet']
-+dnf_makecache = dnf_quiet + ['makecache',
-+ '--disablerepo="*"',
-+ '--enablerepo', 'platform-base',
-+ '--enablerepo', 'platform-updates']
-
-
- def setflag(fname):
-@@ -123,10 +121,6 @@ class PatchMessageHelloAgent(messages.PatchMessage):
- def handle(self, sock, addr):
- # Send response
-
-- # Run the smart config audit
-- global pa
-- pa.timed_audit_smart_config()
--
- #
- # If a user tries to do a host-install on an unlocked node,
- # without bypassing the lock check (either via in-service
-@@ -289,6 +283,46 @@ class PatchMessageAgentInstallResp(messages.PatchMessage):
- resp.send(sock)
-
-
-+class PatchAgentDnfTransLogCB(dnf.callback.TransactionProgress):
-+ def __init__(self):
-+ dnf.callback.TransactionProgress.__init__(self)
-+
-+ self.log_prefix = 'dnf trans'
-+
-+ def progress(self, package, action, ti_done, ti_total, ts_done, ts_total):
-+ if action in dnf.transaction.ACTIONS:
-+ action_str = dnf.transaction.ACTIONS[action]
-+ elif action == dnf.transaction.TRANS_POST:
-+ action_str = 'Post transaction'
-+ else:
-+ action_str = 'unknown(%d)' % action
-+
-+ if ti_done is not None:
-+ # To reduce the volume of logs, only log 0% and 100%
-+ if ti_done == 0 or ti_done == ti_total:
-+ LOG.info('%s PROGRESS %s: %s %0.1f%% [%s/%s]',
-+ self.log_prefix, action_str, package,
-+ (ti_done * 100 / ti_total),
-+ ts_done, ts_total)
-+ else:
-+ LOG.info('%s PROGRESS %s: %s [%s/%s]',
-+ self.log_prefix, action_str, package, ts_done, ts_total)
-+
-+ def filelog(self, package, action):
-+ if action in dnf.transaction.FILE_ACTIONS:
-+ msg = '%s: %s' % (dnf.transaction.FILE_ACTIONS[action], package)
-+ else:
-+ msg = '%s: %s' % (package, action)
-+ LOG.info('%s FILELOG %s', self.log_prefix, msg)
-+
-+ def scriptout(self, msgs):
-+ if msgs:
-+ LOG.info("%s SCRIPTOUT :\n%s", self.log_prefix, msgs)
-+
-+ def error(self, message):
-+ LOG.error("%s ERROR: %s", self.log_prefix, message)
-+
-+
- class PatchAgent(PatchService):
- def __init__(self):
- PatchService.__init__(self)
-@@ -298,9 +332,14 @@ class PatchAgent(PatchService):
- self.listener = None
- self.changes = False
- self.installed = {}
-+ self.installed_dnf = []
- self.to_install = {}
-+ self.to_install_dnf = []
-+ self.to_downgrade_dnf = []
- self.to_remove = []
-+ self.to_remove_dnf = []
- self.missing_pkgs = []
-+ self.missing_pkgs_dnf = []
- self.patch_op_counter = 0
- self.node_is_patched = os.path.exists(node_is_patched_file)
- self.node_is_patched_timestamp = 0
-@@ -308,6 +347,7 @@ class PatchAgent(PatchService):
- self.state = constants.PATCH_AGENT_STATE_IDLE
- self.last_config_audit = 0
- self.rejection_timestamp = 0
-+ self.dnfb = None
-
- # Check state flags
- if os.path.exists(patch_installing_file):
-@@ -343,289 +383,40 @@ class PatchAgent(PatchService):
- self.listener.bind(('', self.port))
- self.listener.listen(2) # Allow two connections, for two controllers
-
-- def audit_smart_config(self):
-- LOG.info("Auditing smart configuration")
--
-- # Get the current channel config
-- try:
-- output = subprocess.check_output(smart_cmd +
-- ["channel", "--yaml"],
-- stderr=subprocess.STDOUT)
-- config = yaml.load(output)
-- except subprocess.CalledProcessError as e:
-- LOG.exception("Failed to query channels")
-- LOG.error("Command output: %s", e.output)
-- return False
-- except Exception:
-- LOG.exception("Failed to query channels")
-- return False
--
-- expected = [{'channel': 'rpmdb',
-- 'type': 'rpm-sys',
-- 'name': 'RPM Database',
-- 'baseurl': None},
-- {'channel': 'base',
-- 'type': 'rpm-md',
-- 'name': 'Base',
-- 'baseurl': "http://controller:%s/feed/rel-%s" % (http_port_real, SW_VERSION)},
-- {'channel': 'updates',
-- 'type': 'rpm-md',
-- 'name': 'Patches',
-- 'baseurl': "http://controller:%s/updates/rel-%s" % (http_port_real, SW_VERSION)}]
--
-- updated = False
--
-- for item in expected:
-- channel = item['channel']
-- ch_type = item['type']
-- ch_name = item['name']
-- ch_baseurl = item['baseurl']
--
-- add_channel = False
--
-- if channel in config:
-- # Verify existing channel config
-- if (config[channel].get('type') != ch_type or
-- config[channel].get('name') != ch_name or
-- config[channel].get('baseurl') != ch_baseurl):
-- # Config is invalid
-- add_channel = True
-- LOG.warning("Invalid smart config found for %s", channel)
-- try:
-- output = subprocess.check_output(smart_cmd +
-- ["channel", "--yes",
-- "--remove", channel],
-- stderr=subprocess.STDOUT)
-- except subprocess.CalledProcessError as e:
-- LOG.exception("Failed to configure %s channel", channel)
-- LOG.error("Command output: %s", e.output)
-- return False
-- else:
-- # Channel is missing
-- add_channel = True
-- LOG.warning("Channel %s is missing from config", channel)
--
-- if add_channel:
-- LOG.info("Adding channel %s", channel)
-- cmd_args = ["channel", "--yes", "--add", channel,
-- "type=%s" % ch_type,
-- "name=%s" % ch_name]
-- if ch_baseurl is not None:
-- cmd_args += ["baseurl=%s" % ch_baseurl]
--
-- try:
-- output = subprocess.check_output(smart_cmd + cmd_args,
-- stderr=subprocess.STDOUT)
-- except subprocess.CalledProcessError as e:
-- LOG.exception("Failed to configure %s channel", channel)
-- LOG.error("Command output: %s", e.output)
-- return False
--
-- updated = True
--
-- # Validate the smart config
-- try:
-- output = subprocess.check_output(smart_cmd +
-- ["config", "--yaml"],
-- stderr=subprocess.STDOUT)
-- config = yaml.load(output)
-- except subprocess.CalledProcessError as e:
-- LOG.exception("Failed to query smart config")
-- LOG.error("Command output: %s", e.output)
-- return False
-- except Exception:
-- LOG.exception("Failed to query smart config")
-- return False
--
-- # Check for the rpm-nolinktos flag
-- nolinktos = 'rpm-nolinktos'
-- if config.get(nolinktos) is not True:
-- # Set the flag
-- LOG.warning("Setting %s option", nolinktos)
-- try:
-- output = subprocess.check_output(smart_cmd +
-- ["config", "--set",
-- "%s=true" % nolinktos],
-- stderr=subprocess.STDOUT)
-- except subprocess.CalledProcessError as e:
-- LOG.exception("Failed to configure %s option", nolinktos)
-- LOG.error("Command output: %s", e.output)
-- return False
--
-- updated = True
--
-- # Check for the rpm-check-signatures flag
-- nosignature = 'rpm-check-signatures'
-- if config.get(nosignature) is not False:
-- # Set the flag
-- LOG.warning("Setting %s option", nosignature)
-- try:
-- output = subprocess.check_output(smart_cmd +
-- ["config", "--set",
-- "%s=false" % nosignature],
-- stderr=subprocess.STDOUT)
-- except subprocess.CalledProcessError as e:
-- LOG.exception("Failed to configure %s option", nosignature)
-- LOG.error("Command output: %s", e.output)
-- return False
--
-- updated = True
--
-- if updated:
-- try:
-- subprocess.check_output(smart_update, stderr=subprocess.STDOUT)
-- except subprocess.CalledProcessError as e:
-- LOG.exception("Failed to update smartpm")
-- LOG.error("Command output: %s", e.output)
-- return False
--
-- # Reset the patch op counter to force a detailed query
-- self.patch_op_counter = 0
--
-- self.last_config_audit = time.time()
-- return True
--
-- def timed_audit_smart_config(self):
-- rc = True
-- if (time.time() - self.last_config_audit) > 1800:
-- # It's been 30 minutes since the last completed audit
-- LOG.info("Kicking timed audit")
-- rc = self.audit_smart_config()
--
-- return rc
--
- @staticmethod
-- def parse_smart_pkglist(output):
-- pkglist = {}
-- for line in output.splitlines():
-- if line == '':
-- continue
--
-- fields = line.split()
-- pkgname = fields[0]
-- (version, arch) = fields[1].split('@')
--
-- if pkgname not in pkglist:
-- pkglist[pkgname] = {}
-- pkglist[pkgname][arch] = version
-- elif arch not in pkglist[pkgname]:
-- pkglist[pkgname][arch] = version
-+ def pkgobjs_to_list(pkgobjs):
-+ # Transform pkgobj list to format used by patch-controller
-+ output = {}
-+ for pkg in pkgobjs:
-+ if pkg.epoch != 0:
-+ output[pkg.name] = "%s:%s-%s@%s" % (pkg.epoch, pkg.version, pkg.release, pkg.arch)
- else:
-- stored_ver = pkglist[pkgname][arch]
--
-- # The rpm.labelCompare takes version broken into 3 components
-- # It returns:
-- # 1, if first arg is higher version
-- # 0, if versions are same
-- # -1, if first arg is lower version
-- rc = rpm.labelCompare(parse_pkgver(version),
-- parse_pkgver(stored_ver))
-+ output[pkg.name] = "%s-%s@%s" % (pkg.version, pkg.release, pkg.arch)
-
-- if rc > 0:
-- # Update version
-- pkglist[pkgname][arch] = version
-+ return output
-
-- return pkglist
-+ def dnf_reset_client(self):
-+ if self.dnfb is not None:
-+ self.dnfb.close()
-+ self.dnfb = None
-
-- @staticmethod
-- def get_pkg_version(pkglist, pkg, arch):
-- if pkg not in pkglist:
-- return None
-- if arch not in pkglist[pkg]:
-- return None
-- return pkglist[pkg][arch]
--
-- def parse_smart_newer(self, output):
-- # Skip the first two lines, which are headers
-- for line in output.splitlines()[2:]:
-- if line == '':
-- continue
--
-- fields = line.split()
-- pkgname = fields[0]
-- installedver = fields[2]
-- newver = fields[5]
-+ self.dnfb = dnf.Base()
-+ self.dnfb.conf.substitutions['infra'] = 'stock'
-
-- self.installed[pkgname] = installedver
-- self.to_install[pkgname] = newver
--
-- def parse_smart_orphans(self, output):
-- for pkgname in output.splitlines():
-- if pkgname == '':
-- continue
-+ # Reset default installonlypkgs list
-+ self.dnfb.conf.installonlypkgs = []
-
-- highest_version = None
-+ self.dnfb.read_all_repos()
-
-- try:
-- query = subprocess.check_output(smart_query_repos + ["--show-format", '$version\n', pkgname])
-- # The last non-blank version is the highest
-- for version in query.splitlines():
-- if version == '':
-- continue
-- highest_version = version.split('@')[0]
--
-- except subprocess.CalledProcessError:
-- # Package is not in the repo
-- highest_version = None
--
-- if highest_version is None:
-- # Package is to be removed
-- self.to_remove.append(pkgname)
-+ # Ensure only platform repos are enabled for transaction
-+ for repo in self.dnfb.repos.all():
-+ if repo.id == 'platform-base' or repo.id == 'platform-updates':
-+ repo.enable()
- else:
-- # Rollback to the highest version
-- self.to_install[pkgname] = highest_version
-+ repo.disable()
-
-- # Get the installed version
-- try:
-- query = subprocess.check_output(smart_query + ["--installed", "--show-format", '$version\n', pkgname])
-- for version in query.splitlines():
-- if version == '':
-- continue
-- self.installed[pkgname] = version.split('@')[0]
-- break
-- except subprocess.CalledProcessError:
-- LOG.error("Failed to query installed version of %s", pkgname)
--
-- self.changes = True
--
-- def check_groups(self):
-- # Get the groups file
-- mygroup = "updates-%s" % "-".join(subfunctions)
-- self.missing_pkgs = []
-- installed_pkgs = []
--
-- groups_url = "http://controller:%s/updates/rel-%s/comps.xml" % (http_port_real, SW_VERSION)
-- try:
-- req = requests.get(groups_url)
-- if req.status_code != 200:
-- LOG.error("Failed to get groups list from server")
-- return False
-- except requests.ConnectionError:
-- LOG.error("Failed to connect to server")
-- return False
--
-- # Get list of installed packages
-- try:
-- query = subprocess.check_output(["rpm", "-qa", "--queryformat", "%{NAME}\n"])
-- installed_pkgs = query.split()
-- except subprocess.CalledProcessError:
-- LOG.exception("Failed to query RPMs")
-- return False
--
-- root = ElementTree.fromstring(req.text)
-- for child in root:
-- group_id = child.find('id')
-- if group_id is None or group_id.text != mygroup:
-- continue
--
-- pkglist = child.find('packagelist')
-- if pkglist is None:
-- continue
--
-- for pkg in pkglist.findall('packagereq'):
-- if pkg.text not in installed_pkgs and pkg.text not in self.missing_pkgs:
-- self.missing_pkgs.append(pkg.text)
-- self.changes = True
-+ # Read repo info
-+ self.dnfb.fill_sack()
-
- def query(self):
- """ Check current patch state """
-@@ -633,14 +424,15 @@ class PatchAgent(PatchService):
- LOG.info("Failed install_uuid check. Skipping query")
- return False
-
-- if not self.audit_smart_config():
-- # Set a state to "unknown"?
-- return False
-+ if self.dnfb is not None:
-+ self.dnfb.close()
-+ self.dnfb = None
-
-+ # TODO(dpenney): Use python APIs for makecache
- try:
-- subprocess.check_output(smart_update, stderr=subprocess.STDOUT)
-+ subprocess.check_output(dnf_makecache, stderr=subprocess.STDOUT)
- except subprocess.CalledProcessError as e:
-- LOG.error("Failed to update smartpm")
-+ LOG.error("Failed to run dnf makecache")
- LOG.error("Command output: %s", e.output)
- # Set a state to "unknown"?
- return False
-@@ -649,78 +441,72 @@ class PatchAgent(PatchService):
- self.query_id = random.random()
-
- self.changes = False
-+ self.installed_dnf = []
- self.installed = {}
-- self.to_install = {}
-+ self.to_install_dnf = []
-+ self.to_downgrade_dnf = []
- self.to_remove = []
-+ self.to_remove_dnf = []
- self.missing_pkgs = []
-+ self.missing_pkgs_dnf = []
-
-- # Get the repo data
-- pkgs_installed = {}
-- pkgs_base = {}
-- pkgs_updates = {}
--
-- try:
-- output = subprocess.check_output(smart_query_installed)
-- pkgs_installed = self.parse_smart_pkglist(output)
-- except subprocess.CalledProcessError as e:
-- LOG.error("Failed to query installed pkgs: %s", e.output)
-- # Set a state to "unknown"?
-- return False
--
-- try:
-- output = subprocess.check_output(smart_query_base)
-- pkgs_base = self.parse_smart_pkglist(output)
-- except subprocess.CalledProcessError as e:
-- LOG.error("Failed to query base pkgs: %s", e.output)
-- # Set a state to "unknown"?
-- return False
-+ self.dnf_reset_client()
-
-- try:
-- output = subprocess.check_output(smart_query_updates)
-- pkgs_updates = self.parse_smart_pkglist(output)
-- except subprocess.CalledProcessError as e:
-- LOG.error("Failed to query patched pkgs: %s", e.output)
-- # Set a state to "unknown"?
-- return False
-+ # Get the repo data
-+ pkgs_installed = dnf.sack._rpmdb_sack(self.dnfb).query().installed() # pylint: disable=protected-access
-+ avail = self.dnfb.sack.query().available().latest()
-
-- # There are four possible actions:
-- # 1. If installed pkg is not in base or updates, remove it.
-- # 2. If installed pkg version is higher than highest in base
-- # or updates, downgrade it.
-- # 3. If installed pkg version is lower than highest in updates,
-- # upgrade it.
-- # 4. If pkg in grouplist is not in installed, install it.
-+ # There are three possible actions:
-+ # 1. If installed pkg is not in a repo, remove it.
-+ # 2. If installed pkg version does not match newest repo version, update it.
-+ # 3. If a package in the grouplist is not installed, install it.
-
- for pkg in pkgs_installed:
-- for arch in pkgs_installed[pkg]:
-- installed_version = pkgs_installed[pkg][arch]
-- updates_version = self.get_pkg_version(pkgs_updates, pkg, arch)
-- base_version = self.get_pkg_version(pkgs_base, pkg, arch)
--
-- if updates_version is None and base_version is None:
-- # Remove it
-- self.to_remove.append(pkg)
-- self.changes = True
-- continue
-+ highest = avail.filter(name=pkg.name, arch=pkg.arch)
-+ if highest:
-+ highest_pkg = highest[0]
-
-- compare_version = updates_version
-- if compare_version is None:
-- compare_version = base_version
--
-- # Compare the installed version to what's in the repo
-- rc = rpm.labelCompare(parse_pkgver(installed_version),
-- parse_pkgver(compare_version))
-- if rc == 0:
-- # Versions match, nothing to do.
-+ if pkg.evr_eq(highest_pkg):
- continue
-+
-+ if pkg.evr_gt(highest_pkg):
-+ self.to_downgrade_dnf.append(highest_pkg)
- else:
-- # Install the version from the repo
-- self.to_install[pkg] = "@".join([compare_version, arch])
-- self.installed[pkg] = "@".join([installed_version, arch])
-- self.changes = True
-+ self.to_install_dnf.append(highest_pkg)
-+ else:
-+ self.to_remove_dnf.append(pkg)
-+ self.to_remove.append(pkg.name)
-+
-+ self.installed_dnf.append(pkg)
-+ self.changes = True
-
- # Look for new packages
-- self.check_groups()
-+ self.dnfb.read_comps()
-+ grp_id = 'updates-%s' % '-'.join(subfunctions)
-+ pkggrp = None
-+ for grp in self.dnfb.comps.groups_iter():
-+ if grp.id == grp_id:
-+ pkggrp = grp
-+ break
-+
-+ if pkggrp is None:
-+ LOG.error("Could not find software group: %s", grp_id)
-+
-+ for pkg in pkggrp.packages_iter():
-+ try:
-+ res = pkgs_installed.filter(name=pkg.name)
-+ if len(res) == 0:
-+ found_pkg = avail.filter(name=pkg.name)
-+ self.missing_pkgs_dnf.append(found_pkg[0])
-+ self.missing_pkgs.append(found_pkg[0].name)
-+ self.changes = True
-+ except dnf.exceptions.PackageNotFoundError:
-+ self.missing_pkgs_dnf.append(pkg)
-+ self.missing_pkgs.append(pkg.name)
-+ self.changes = True
-+
-+ self.installed = self.pkgobjs_to_list(self.installed_dnf)
-+ self.to_install = self.pkgobjs_to_list(self.to_install_dnf + self.to_downgrade_dnf)
-
- LOG.info("Patch state query returns %s", self.changes)
- LOG.info("Installed: %s", self.installed)
-@@ -730,6 +516,35 @@ class PatchAgent(PatchService):
-
- return True
-
-+ def resolve_dnf_transaction(self, undo_failure=True):
-+ LOG.info("Starting to process transaction: undo_failure=%s", undo_failure)
-+ self.dnfb.resolve()
-+ self.dnfb.download_packages(self.dnfb.transaction.install_set)
-+
-+ tid = self.dnfb.do_transaction(display=PatchAgentDnfTransLogCB())
-+
-+ transaction_rc = True
-+ for t in self.dnfb.transaction:
-+ if t.state != libdnf.transaction.TransactionItemState_DONE:
-+ transaction_rc = False
-+ break
-+
-+ self.dnf_reset_client()
-+
-+ if not transaction_rc:
-+ if undo_failure:
-+ LOG.error("Failure occurred... Undoing last transaction (%s)", tid)
-+ old = self.dnfb.history.old((tid,))[0]
-+ mobj = dnf.db.history.MergedTransactionWrapper(old)
-+
-+ self.dnfb._history_undo_operations(mobj, old.tid, True) # pylint: disable=protected-access
-+
-+ if not self.resolve_dnf_transaction(undo_failure=False):
-+ LOG.error("Failed to undo transaction")
-+
-+ LOG.info("Transaction complete: undo_failure=%s, success=%s", undo_failure, transaction_rc)
-+ return transaction_rc
-+
- def handle_install(self, verbose_to_stdout=False, disallow_insvc_patch=False):
- #
- # The disallow_insvc_patch parameter is set when we're installing
-@@ -781,64 +596,54 @@ class PatchAgent(PatchService):
- if verbose_to_stdout:
- print("Checking for software updates...")
- self.query()
-- install_set = []
-- for pkg, version in self.to_install.items():
-- install_set.append("%s-%s" % (pkg, version))
--
-- install_set += self.missing_pkgs
-
- changed = False
- rc = True
-
-- if len(install_set) > 0:
-+ if len(self.to_install_dnf) > 0 or len(self.to_downgrade_dnf) > 0:
-+ LOG.info("Adding pkgs to installation set: %s", self.to_install)
-+ for pkg in self.to_install_dnf:
-+ self.dnfb.package_install(pkg)
-+
-+ for pkg in self.to_downgrade_dnf:
-+ self.dnfb.package_downgrade(pkg)
-+
-+ changed = True
-+
-+ if len(self.missing_pkgs_dnf) > 0:
-+ LOG.info("Adding missing pkgs to installation set: %s", self.missing_pkgs)
-+ for pkg in self.missing_pkgs_dnf:
-+ self.dnfb.package_install(pkg)
-+ changed = True
-+
-+ if len(self.to_remove_dnf) > 0:
-+ LOG.info("Adding pkgs to be removed: %s", self.to_remove)
-+ for pkg in self.to_remove_dnf:
-+ self.dnfb.package_remove(pkg)
-+ changed = True
-+
-+ if changed:
-+ # Run the transaction set
-+ transaction_rc = False
- try:
-- if verbose_to_stdout:
-- print("Installing software updates...")
-- LOG.info("Installing: %s", ", ".join(install_set))
-- output = subprocess.check_output(smart_install_cmd + install_set, stderr=subprocess.STDOUT)
-- changed = True
-- for line in output.split('\n'):
-- LOG.info("INSTALL: %s", line)
-- if verbose_to_stdout:
-- print("Software updated.")
-- except subprocess.CalledProcessError as e:
-- LOG.exception("Failed to install RPMs")
-- LOG.error("Command output: %s", e.output)
-+ transaction_rc = self.resolve_dnf_transaction()
-+ except dnf.exceptions.DepsolveError:
-+ LOG.error("Failures resolving dependencies in transaction")
-+ except dnf.exceptions.DownloadError:
-+ LOG.error("Failures downloading in transaction")
-+
-+ if not transaction_rc:
-+ LOG.error("Failures occurred during transaction")
- rc = False
- if verbose_to_stdout:
- print("WARNING: Software update failed.")
-+
- else:
- if verbose_to_stdout:
- print("Nothing to install.")
- LOG.info("Nothing to install")
-
-- if rc:
-- self.query()
-- remove_set = self.to_remove
--
-- if len(remove_set) > 0:
-- try:
-- if verbose_to_stdout:
-- print("Handling patch removal...")
-- LOG.info("Removing: %s", ", ".join(remove_set))
-- output = subprocess.check_output(smart_remove_cmd + remove_set, stderr=subprocess.STDOUT)
-- changed = True
-- for line in output.split('\n'):
-- LOG.info("REMOVE: %s", line)
-- if verbose_to_stdout:
-- print("Patch removal complete.")
-- except subprocess.CalledProcessError as e:
-- LOG.exception("Failed to remove RPMs")
-- LOG.error("Command output: %s", e.output)
-- rc = False
-- if verbose_to_stdout:
-- print("WARNING: Patch removal failed.")
-- else:
-- if verbose_to_stdout:
-- print("Nothing to remove.")
-- LOG.info("Nothing to remove")
--
-- if changed:
-+ if changed and rc:
- # Update the node_is_patched flag
- setflag(node_is_patched_file)
-
-@@ -1057,7 +862,7 @@ class PatchAgent(PatchService):
- def main():
- global pa
-
-- configure_logging()
-+ configure_logging(dnf_log=True)
-
- cfg.read_config()
-
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py
-index e9017f2..2ee9fce 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py
-@@ -69,7 +69,7 @@ def handle_exception(exc_type, exc_value, exc_traceback):
- sys.__excepthook__(exc_type, exc_value, exc_traceback)
-
-
--def configure_logging(logtofile=True, level=logging.INFO):
-+def configure_logging(logtofile=True, level=logging.INFO, dnf_log=False):
- if logtofile:
- my_exec = os.path.basename(sys.argv[0])
-
-@@ -84,6 +84,11 @@ def configure_logging(logtofile=True, level=logging.INFO):
- main_log_handler = logging.FileHandler(logfile)
- main_log_handler.setFormatter(formatter)
- LOG.addHandler(main_log_handler)
-+
-+ if dnf_log:
-+ dnf_logger = logging.getLogger('dnf')
-+ dnf_logger.addHandler(main_log_handler)
-+
- try:
- os.chmod(logfile, 0o640)
- except Exception:
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_agent.py b/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_agent.py
-index bd1eef9..7e30fc5 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_agent.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/tests/test_patch_agent.py
-@@ -10,6 +10,15 @@ import sys
- import testtools
-
- sys.modules['rpm'] = mock.Mock()
-+sys.modules['dnf'] = mock.Mock()
-+sys.modules['dnf.callback'] = mock.Mock()
-+sys.modules['dnf.comps'] = mock.Mock()
-+sys.modules['dnf.exceptions'] = mock.Mock()
-+sys.modules['dnf.rpm'] = mock.Mock()
-+sys.modules['dnf.sack'] = mock.Mock()
-+sys.modules['dnf.transaction'] = mock.Mock()
-+sys.modules['libdnf'] = mock.Mock()
-+sys.modules['libdnf.transaction'] = mock.Mock()
-
- import cgcs_patch.patch_agent # noqa: E402
-
-diff --git a/cgcs-patch/cgcs-patch/pylint.rc b/cgcs-patch/cgcs-patch/pylint.rc
-index 57a9829..f511718 100644
---- a/cgcs-patch/cgcs-patch/pylint.rc
-+++ b/cgcs-patch/cgcs-patch/pylint.rc
-@@ -45,10 +45,11 @@ symbols=no
- # no Warning level messages displayed, use"--disable=all --enable=classes
- # --disable=W"
- # W0107 unnecessary-pass
-+# W0511 fixme
- # W0603 global-statement
- # W0703 broad-except
- # W1505, deprecated-method
--disable=C, R, W0107, W0603, W0703, W1505
-+disable=C, R, W0107, W0511, W0603, W0703, W1505
-
-
- [REPORTS]
-@@ -235,7 +236,7 @@ ignore-mixin-members=yes
- # List of module names for which member attributes should not be checked
- # (useful for modules/projects where namespaces are manipulated during runtime
- # and thus existing member attributes cannot be deduced by static analysis
--ignored-modules=
-+ignored-modules=dnf,libdnf
-
- # List of classes names for which member attributes should not be checked
- # (useful for classes with attributes dynamically set).
-diff --git a/cgcs-patch/cgcs-patch/test-requirements.txt b/cgcs-patch/cgcs-patch/test-requirements.txt
-index 3f4e581..56e4806 100644
---- a/cgcs-patch/cgcs-patch/test-requirements.txt
-+++ b/cgcs-patch/cgcs-patch/test-requirements.txt
-@@ -8,4 +8,3 @@ coverage!=4.4,>=4.0 # Apache-2.0
- mock>=2.0.0 # BSD
- stestr>=1.0.0 # Apache-2.0
- testtools>=2.2.0 # MIT
--
+++ /dev/null
-From 059984de897fe2c8c48811ceb76a0331f94b3557 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Wed, 13 May 2020 22:10:01 +0800
-Subject: [PATCH] patch_agent: do not do the packages_iter if pkggrp is None
-
-Addn the handling of packages_iter to the else block to avoid:
-AttributeError: 'NoneType' object has no attribute 'packages_iter'
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py | 44 ++++++++++++-------------
- 1 file changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-index d8bc375..489d484 100644
---- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-+++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_agent.py
-@@ -490,29 +490,29 @@ class PatchAgent(PatchService):
- break
-
- if pkggrp is None:
-- LOG.error("Could not find software group: %s", grp_id)
--
-- for pkg in pkggrp.packages_iter():
-- try:
-- res = pkgs_installed.filter(name=pkg.name)
-- if len(res) == 0:
-- found_pkg = avail.filter(name=pkg.name)
-- self.missing_pkgs_dnf.append(found_pkg[0])
-- self.missing_pkgs.append(found_pkg[0].name)
-+ LOG.warning("Could not find software group: %s", grp_id)
-+ else:
-+ for pkg in pkggrp.packages_iter():
-+ try:
-+ res = pkgs_installed.filter(name=pkg.name)
-+ if len(res) == 0:
-+ found_pkg = avail.filter(name=pkg.name)
-+ self.missing_pkgs_dnf.append(found_pkg[0])
-+ self.missing_pkgs.append(found_pkg[0].name)
-+ self.changes = True
-+ except dnf.exceptions.PackageNotFoundError:
-+ self.missing_pkgs_dnf.append(pkg)
-+ self.missing_pkgs.append(pkg.name)
- self.changes = True
-- except dnf.exceptions.PackageNotFoundError:
-- self.missing_pkgs_dnf.append(pkg)
-- self.missing_pkgs.append(pkg.name)
-- self.changes = True
--
-- self.installed = self.pkgobjs_to_list(self.installed_dnf)
-- self.to_install = self.pkgobjs_to_list(self.to_install_dnf + self.to_downgrade_dnf)
--
-- LOG.info("Patch state query returns %s", self.changes)
-- LOG.info("Installed: %s", self.installed)
-- LOG.info("To install: %s", self.to_install)
-- LOG.info("To remove: %s", self.to_remove)
-- LOG.info("Missing: %s", self.missing_pkgs)
-+
-+ self.installed = self.pkgobjs_to_list(self.installed_dnf)
-+ self.to_install = self.pkgobjs_to_list(self.to_install_dnf + self.to_downgrade_dnf)
-+
-+ LOG.info("Patch state query returns %s", self.changes)
-+ LOG.info("Installed: %s", self.installed)
-+ LOG.info("To install: %s", self.to_install)
-+ LOG.info("To remove: %s", self.to_remove)
-+ LOG.info("Missing: %s", self.missing_pkgs)
-
- return True
-
---
-2.7.4
-
+++ /dev/null
-DESCRIPTION = "TIS Platform Patching"
-SUMMARY = "Patch alarm management"
-
-require update-common.inc
-
-SUBPATH0 = "patch-alarm/patch-alarm"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN}_append = " \
- bash \
- python \
- python-requests-toolbelt \
- "
-
-inherit setuptools
-
-do_unpack_append() {
- bb.build.exec_func('do_restore_files', d)
-}
-
-do_restore_files() {
- cd ${S}
- git reset ${SRCREV} patch-alarm/scripts
- git checkout patch-alarm/scripts
-}
-
-
-do_install_append () {
-
- cd ${S}/patch-alarm/
-
- install -m 755 -d ${D}/${bindir}
- install -m 755 -d ${D}/${sysconfdir}/init.d
-
- install -m 700 scripts/bin/patch-alarm-manager ${D}/${bindir}/
- install -m 700 scripts/init.d/patch-alarm-manager ${D}/${sysconfdir}/init.d/
-}
+++ /dev/null
-require update-common.inc
-
-SUBPATH0 = "tsconfig/tsconfig"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN}_append = " bash"
-
-inherit setuptools
-do_install_append () {
- install -m 755 -d ${D}/${bindir}
- install -m 500 scripts/tsconfig ${D}/${bindir}/
-
-}
+++ /dev/null
-
-DESCRIPTION = "stx-update"
-
-PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
-SRCNAME = "update"
-SRCREV = "2542c5539bab060830009d02cbb257cc8bf4a376"
-SRCREV_opendev = "2542c5539bab060830009d02cbb257cc8bf4a376"
-DESTSUFFIX = "${PN}-${PV}"
-PV = "1.0.0"
-
-
-SRC_URI = " \
- git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH};destsuffix=${DESTSUFFIX};subpath=${SUBPATH0};name=opendev \
- "
-
-DEPENDS = " \
- python \
- python-pbr-native \
- "
+++ /dev/null
-DESCRIPTION = "Pacemaker High Availability resource agents for OpenStack"
-SUMMARY = "Openstack Resource Agents from Madkiss"
-
-PROTOCOL = "https"
-BRANCH = "master"
-SRCNAME = "stx-openstack-ras"
-SRCREV = "cc6f677570b4f0e7ba44a91d5dff33164b8b76bc"
-S = "${WORKDIR}/git"
-PV = "1.0.0"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://github.com/starlingx-staging/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-
-do_install() {
- make DESTDIR=${D} install
- rm -rf ${D}/usr/lib/ocf/resource.d/openstack/ceilometer-agent-central
- rm -rf ${D}/usr/lib/ocf/resource.d/openstack/ceilometer-alarm-evaluator
- rm -rf ${D}/usr/lib/ocf/resource.d/openstack/ceilometer-alarm-notifier
-}
-
-FILES_${PN} += " ${libdir}"
+++ /dev/null
-DESCRIPTION = "The source recipe for StarlingX Upstream Packages repo"
-
-inherit stx-source
-
-STX_REPO = "upstream"
-
-BRANCH = "r/stx.5.0"
-SRCREV = "1eff6b5ab36a814debb6ed563a3999548a2643e6"
+++ /dev/null
-DESCRIPTION = "Build Info"
-SUMMARY = "Build Info"
-
-SRC_URI += " \
- file://build.info \
- file://0001-build_info_license.patch \
- "
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install_append() {
- install -d ${D}/${sysconfdir}
- install -m 644 ${WORKDIR}/build.info ${D}/${sysconfdir}
- sed -i -e "s/@OS@/${DISTRO}/" \
- -e "s/@STX_RELEASE@/${STX_REL}/" \
- -e "s/@STX_ID@/${STX_ID}/" \
- -e "s/@BUILD_DATE@/${STX_BUILD_DATE}/" \
- ${D}/${sysconfdir}/build.info
-
-}
-
-do_install[vardepsexclude] += "STX_BUILD_DATE"
+++ /dev/null
-DESCRIPTION_ceph-manager = " \
-Handle Ceph API calls and provide status updates via alarms. \
-Handle sysinv RPC calls for long running Ceph API operations: \
- - cache tiering enable \
- - cache tiering disable \
-"
-
-
-require utilities-common.inc
-
-SUBPATH0 = "ceph/ceph-manager/ceph-manager"
-
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN}_append = " sysinv"
-
-inherit setuptools systemd
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-SYSTEMD_PACKAGES += "${PN}"
-SYSTEMD_SERVICE_${PN} = " ceph-manager.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-
-do_unpack_append() {
- bb.build.exec_func('do_restore_files', d)
-}
-
-do_restore_files() {
- cd ${S}
- git reset ${SRCREV} ceph/ceph-manager/scripts
- git reset ${SRCREV} ceph/ceph-manager/files
- git checkout ceph/ceph-manager/scripts
- git checkout ceph/ceph-manager/files
-}
-
-do_install_append() {
-
- install -d -m0755 ${D}/${bindir}
- install -d -m0755 ${D}/${sysconfdir}/init.d
- install -d -m0755 ${D}/${sysconfdir}/logrotate.d
- install -d -m0755 ${D}/${systemd_system_unitdir}
-
- install -p -m0700 ${S}/ceph/ceph-manager/scripts/bin/ceph-manager ${D}/${bindir}
- install -p -m0700 ${S}/ceph/ceph-manager/scripts/init.d/ceph-manager ${D}/${sysconfdir}/init.d
- install -p -m0700 ${S}/ceph/ceph-manager/files/ceph-manager.logrotate ${D}/${sysconfdir}/logrotate.d
- install -p -m0700 ${S}/ceph/ceph-manager/files/ceph-manager.service ${D}/${systemd_system_unitdir}
-}
+++ /dev/null
-DESCRIPTION = " \
-This package contains data collection tools to monitor host performance. \
-Tools are general purpose engineering and debugging related. Includes \
-overall memory, cpu occupancy, per-task cpu, per-task scheduling, per-task \
-io. \
-"
-SUMMARY = "Host performance data collection tools package"
-
-require utilities-common.inc
-SUBPATH0 = "tools/engtools/hostdata-collectors/scripts"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI += "file://collect-engtools-fix-service-name-binary-path.patch;striplevel=5"
-
-RDEPENDS_collect-engtools += " \
- iperf3 \
- bash \
- perl \
- python \
- "
-
-inherit systemd
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-SYSTEMD_PACKAGES += "${PN}"
-SYSTEMD_SERVICE_${PN} = " ${PN}.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install_append() {
-
- install -d -m0755 ${D}/${bindir}
- install -m 755 buddyinfo.py ${D}/${bindir}
- install -m 755 chewmem ${D}/${bindir}
- install -m 755 ceph.sh ${D}/${bindir}
- install -m 755 cleanup-engtools.sh ${D}/${bindir}
- install -m 755 collect-engtools.sh ${D}/${bindir}
- install -m 755 diskstats.sh ${D}/${bindir}
- install -m 755 engtools_util.sh ${D}/${bindir}
- install -m 755 filestats.sh ${D}/${bindir}
- install -m 755 iostat.sh ${D}/${bindir}
- install -m 755 linux_benchmark.sh ${D}/${bindir}
- install -m 755 memstats.sh ${D}/${bindir}
- install -m 755 netstats.sh ${D}/${bindir}
- install -m 755 postgres.sh ${D}/${bindir}
- install -m 755 rabbitmq.sh ${D}/${bindir}
- install -m 755 remote/rbzip2-engtools.sh ${D}/${bindir}
- install -m 755 remote/rstart-engtools.sh ${D}/${bindir}
- install -m 755 remote/rstop-engtools.sh ${D}/${bindir}
- install -m 755 remote/rsync-engtools-data.sh ${D}/${bindir}
- install -m 755 slab.sh ${D}/${bindir}
- install -m 755 ticker.sh ${D}/${bindir}
- install -m 755 top.sh ${D}/${bindir}
- install -m 755 vswitch.sh ${D}/${bindir}
- install -m 755 live_stream.py ${D}/${bindir}
-
- install -p -d -m0755 ${D}/${sysconfdir}/engtools/
- install -m0644 -p cfg/engtools.conf ${D}/${sysconfdir}/engtools
- install -d -m0755 ${D}/${sysconfdir}/init.d
- install -m0755 init.d/collect-engtools.sh ${D}/${sysconfdir}/init.d
-
- install -d -m0755 ${D}/${systemd_system_unitdir}
- install -m0644 -p -D collect-engtools.service ${D}/${systemd_system_unitdir}
-
- sed -i -e 's|/local/bin|/bin|g' ${D}/${sysconfdir}/init.d/collect-engtools.sh
-}
+++ /dev/null
-DESCRIPTION = " \
-This packages scripts that implement data and log collection that field \
-support can execute to gather current state and runtime history for off \
-platform analysis and debug. \
-"
-
-require utilities-common.inc
-SUBPATH0 = "tools/collector/scripts"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI += "file://collector-fix-service-name-binary-path.patch;striplevel=4"
-
-RDEPENDS_${PN}_append += " bash"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install() {
-
- install -m0755 -d ${D}/${sysconfdir}/collect.d
- install -m0755 -d ${D}/${sysconfdir}/collect
- install -m0755 -d ${D}/${sbindir}
- install -m0755 -d ${D}/${bindir}
- install -m0755 -d ${D}/${sbindir}
-
- install -m 755 collect ${D}/${sbindir}/collect
- install -m 755 collect_host ${D}/${sbindir}/collect_host
- install -m 755 collect_date ${D}/${sbindir}/collect_date
- install -m 755 collect_utils ${D}/${sbindir}/collect_utils
- install -m 755 collect_parms ${D}/${sbindir}/collect_parms
- install -m 755 collect_mask_passwords ${D}/${sbindir}/collect_mask_passwords
- install -m 755 expect_done ${D}/${sbindir}/expect_done
-
- install -m 755 collect_sysinv.sh ${D}/${sysconfdir}/collect.d/collect_sysinv
- install -m 755 collect_psqldb.sh ${D}/${sysconfdir}/collect.d/collect_psqldb
- install -m 755 collect_openstack.sh ${D}/${sysconfdir}/collect.d/collect_openstack
- install -m 755 collect_networking.sh ${D}/${sysconfdir}/collect.d/collect_networking
- install -m 755 collect_ceph.sh ${D}/${sysconfdir}/collect.d/collect_ceph
- install -m 755 collect_sm.sh ${D}/${sysconfdir}/collect.d/collect_sm
- install -m 755 collect_tc.sh ${D}/${sysconfdir}/collect.d/collect_tc
- install -m 755 collect_nfv_vim.sh ${D}/${sysconfdir}/collect.d/collect_nfv_vim
- install -m 755 collect_ovs.sh ${D}/${sysconfdir}/collect.d/collect_ovs
- install -m 755 collect_patching.sh ${D}/${sysconfdir}/collect.d/collect_patching
- install -m 755 collect_coredump.sh ${D}/${sysconfdir}/collect.d/collect_coredump
- install -m 755 collect_crash.sh ${D}/${sysconfdir}/collect.d/collect_crash
- install -m 755 collect_ima.sh ${D}/${sysconfdir}/collect.d/collect_ima
- install -m 755 collect_fm.sh ${D}/${sysconfdir}/collect.d/collect_fm
- install -m 755 collect_containerization.sh ${D}/${sysconfdir}/collect.d/collect_containerization
-
- install -m 755 etc.exclude ${D}/${sysconfdir}/collect/etc.exclude
- install -m 755 run.exclude ${D}/${sysconfdir}/collect/run.exclude
-
- ln -sf ${sbindir}/collect ${D}/${bindir}/collect
-}
+++ /dev/null
---- /dev/null 2020-03-09 15:17:21.628000278 -0700
-+++ a/LICENSE 2020-05-11 17:39:30.227649927 -0700
-@@ -0,0 +1,204 @@
-+
-+
-+ Apache License
-+ Version 2.0, January 2004
-+ http://www.apache.org/licenses/
-+
-+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-+
-+ 1. Definitions.
-+
-+ "License" shall mean the terms and conditions for use, reproduction,
-+ and distribution as defined by Sections 1 through 9 of this document.
-+
-+ "Licensor" shall mean the copyright owner or entity authorized by
-+ the copyright owner that is granting the License.
-+
-+ "Legal Entity" shall mean the union of the acting entity and all
-+ other entities that control, are controlled by, or are under common
-+ control with that entity. For the purposes of this definition,
-+ "control" means (i) the power, direct or indirect, to cause the
-+ direction or management of such entity, whether by contract or
-+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
-+ outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+ "You" (or "Your") shall mean an individual or Legal Entity
-+ exercising permissions granted by this License.
-+
-+ "Source" form shall mean the preferred form for making modifications,
-+ including but not limited to software source code, documentation
-+ source, and configuration files.
-+
-+ "Object" form shall mean any form resulting from mechanical
-+ transformation or translation of a Source form, including but
-+ not limited to compiled object code, generated documentation,
-+ and conversions to other media types.
-+
-+ "Work" shall mean the work of authorship, whether in Source or
-+ Object form, made available under the License, as indicated by a
-+ copyright notice that is included in or attached to the work
-+ (an example is provided in the Appendix below).
-+
-+ "Derivative Works" shall mean any work, whether in Source or Object
-+ form, that is based on (or derived from) the Work and for which the
-+ editorial revisions, annotations, elaborations, or other modifications
-+ represent, as a whole, an original work of authorship. For the purposes
-+ of this License, Derivative Works shall not include works that remain
-+ separable from, or merely link (or bind by name) to the interfaces of,
-+ the Work and Derivative Works thereof.
-+
-+ "Contribution" shall mean any work of authorship, including
-+ the original version of the Work and any modifications or additions
-+ to that Work or Derivative Works thereof, that is intentionally
-+ submitted to Licensor for inclusion in the Work by the copyright owner
-+ or by an individual or Legal Entity authorized to submit on behalf of
-+ the copyright owner. For the purposes of this definition, "submitted"
-+ means any form of electronic, verbal, or written communication sent
-+ to the Licensor or its representatives, including but not limited to
-+ communication on electronic mailing lists, source code control systems,
-+ and issue tracking systems that are managed by, or on behalf of, the
-+ Licensor for the purpose of discussing and improving the Work, but
-+ excluding communication that is conspicuously marked or otherwise
-+ designated in writing by the copyright owner as "Not a Contribution."
-+
-+ "Contributor" shall mean Licensor and any individual or Legal Entity
-+ on behalf of whom a Contribution has been received by Licensor and
-+ subsequently incorporated within the Work.
-+
-+ 2. Grant of Copyright License. Subject to the terms and conditions of
-+ this License, each Contributor hereby grants to You a perpetual,
-+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+ copyright license to reproduce, prepare Derivative Works of,
-+ publicly display, publicly perform, sublicense, and distribute the
-+ Work and such Derivative Works in Source or Object form.
-+
-+ 3. Grant of Patent License. Subject to the terms and conditions of
-+ this License, each Contributor hereby grants to You a perpetual,
-+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+ (except as stated in this section) patent license to make, have made,
-+ use, offer to sell, sell, import, and otherwise transfer the Work,
-+ where such license applies only to those patent claims licensable
-+ by such Contributor that are necessarily infringed by their
-+ Contribution(s) alone or by combination of their Contribution(s)
-+ with the Work to which such Contribution(s) was submitted. If You
-+ institute patent litigation against any entity (including a
-+ cross-claim or counterclaim in a lawsuit) alleging that the Work
-+ or a Contribution incorporated within the Work constitutes direct
-+ or contributory patent infringement, then any patent licenses
-+ granted to You under this License for that Work shall terminate
-+ as of the date such litigation is filed.
-+
-+ 4. Redistribution. You may reproduce and distribute copies of the
-+ Work or Derivative Works thereof in any medium, with or without
-+ modifications, and in Source or Object form, provided that You
-+ meet the following conditions:
-+
-+ (a) You must give any other recipients of the Work or
-+ Derivative Works a copy of this License; and
-+
-+ (b) You must cause any modified files to carry prominent notices
-+ stating that You changed the files; and
-+
-+ (c) You must retain, in the Source form of any Derivative Works
-+ that You distribute, all copyright, patent, trademark, and
-+ attribution notices from the Source form of the Work,
-+ excluding those notices that do not pertain to any part of
-+ the Derivative Works; and
-+
-+ (d) If the Work includes a "NOTICE" text file as part of its
-+ distribution, then any Derivative Works that You distribute must
-+ include a readable copy of the attribution notices contained
-+ within such NOTICE file, excluding those notices that do not
-+ pertain to any part of the Derivative Works, in at least one
-+ of the following places: within a NOTICE text file distributed
-+ as part of the Derivative Works; within the Source form or
-+ documentation, if provided along with the Derivative Works; or,
-+ within a display generated by the Derivative Works, if and
-+ wherever such third-party notices normally appear. The contents
-+ of the NOTICE file are for informational purposes only and
-+ do not modify the License. You may add Your own attribution
-+ notices within Derivative Works that You distribute, alongside
-+ or as an addendum to the NOTICE text from the Work, provided
-+ that such additional attribution notices cannot be construed
-+ as modifying the License.
-+
-+ You may add Your own copyright statement to Your modifications and
-+ may provide additional or different license terms and conditions
-+ for use, reproduction, or distribution of Your modifications, or
-+ for any such Derivative Works as a whole, provided Your use,
-+ reproduction, and distribution of the Work otherwise complies with
-+ the conditions stated in this License.
-+
-+ 5. Submission of Contributions. Unless You explicitly state otherwise,
-+ any Contribution intentionally submitted for inclusion in the Work
-+ by You to the Licensor shall be under the terms and conditions of
-+ this License, without any additional terms or conditions.
-+ Notwithstanding the above, nothing herein shall supersede or modify
-+ the terms of any separate license agreement you may have executed
-+ with Licensor regarding such Contributions.
-+
-+ 6. Trademarks. This License does not grant permission to use the trade
-+ names, trademarks, service marks, or product names of the Licensor,
-+ except as required for reasonable and customary use in describing the
-+ origin of the Work and reproducing the content of the NOTICE file.
-+
-+ 7. Disclaimer of Warranty. Unless required by applicable law or
-+ agreed to in writing, Licensor provides the Work (and each
-+ Contributor provides its Contributions) on an "AS IS" BASIS,
-+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-+ implied, including, without limitation, any warranties or conditions
-+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-+ PARTICULAR PURPOSE. You are solely responsible for determining the
-+ appropriateness of using or redistributing the Work and assume any
-+ risks associated with Your exercise of permissions under this License.
-+
-+ 8. Limitation of Liability. In no event and under no legal theory,
-+ whether in tort (including negligence), contract, or otherwise,
-+ unless required by applicable law (such as deliberate and grossly
-+ negligent acts) or agreed to in writing, shall any Contributor be
-+ liable to You for damages, including any direct, indirect, special,
-+ incidental, or consequential damages of any character arising as a
-+ result of this License or out of the use or inability to use the
-+ Work (including but not limited to damages for loss of goodwill,
-+ work stoppage, computer failure or malfunction, or any and all
-+ other commercial damages or losses), even if such Contributor
-+ has been advised of the possibility of such damages.
-+
-+ 9. Accepting Warranty or Additional Liability. While redistributing
-+ the Work or Derivative Works thereof, You may choose to offer,
-+ and charge a fee for, acceptance of support, warranty, indemnity,
-+ or other liability obligations and/or rights consistent with this
-+ License. However, in accepting such obligations, You may act only
-+ on Your own behalf and on Your sole responsibility, not on behalf
-+ of any other Contributor, and only if You agree to indemnify,
-+ defend, and hold each Contributor harmless for any liability
-+ incurred by, or claims asserted against, such Contributor by reason
-+ of your accepting any such warranty or additional liability.
-+
-+ END OF TERMS AND CONDITIONS
-+
-+ APPENDIX: How to apply the Apache License to your work.
-+
-+ To apply the Apache License to your work, attach the following
-+ boilerplate notice, with the fields enclosed by brackets "[]"
-+ replaced with your own identifying information. (Don`t include
-+ the brackets!) The text should be enclosed in the appropriate
-+ comment syntax for the file format. We also recommend that a
-+ file or class name and description of purpose be included on the
-+ same "printed page" as the copyright notice for easier
-+ identification within third-party archives.
-+
-+ Copyright [yyyy] [name of copyright owner]
-+
-+ Licensed under the Apache License, Version 2.0 (the "License");
-+ you may not use this file except in compliance with the License.
-+ You may obtain a copy of the License at
-+
-+ http://www.apache.org/licenses/LICENSE-2.0
-+
-+ Unless required by applicable law or agreed to in writing, software
-+ distributed under the License is distributed on an "AS IS" BASIS,
-+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ See the License for the specific language governing permissions and
-+ limitations under the License.
-+
+++ /dev/null
-From e2dcf93685e6947540119fd5caff0e440857801c Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Thu, 11 Jun 2020 22:41:00 +0800
-Subject: [PATCH] cpumap_functions.sh: fix perl experimental feature issue
-
-An experimental feature added in Perl 5.14 allowed each, keys, push,
-pop, shift, splice, unshift, and values to be called with a scalar
-argument. This experiment is considered unsuccessful, and has been
-removed in 5.23 and later releases. So don't use this feature to
-avoid failure:
-localhost:~# platform_expanded_cpu_list
-Experimental keys on scalar is now forbidden at -e line 13.
-
-Upstream-Status: Submitted [https://review.opendev.org/759783]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- utilities/worker-utils/worker-utils/cpumap_functions.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utilities/worker-utils/worker-utils/cpumap_functions.sh b/utilities/worker-utils/worker-utils/cpumap_functions.sh
-index ab961f4..ecbbb05 100644
---- a/utilities/worker-utils/worker-utils/cpumap_functions.sh
-+++ b/utilities/worker-utils/worker-utils/cpumap_functions.sh
-@@ -389,7 +389,7 @@ function topology_to_cpulist {
- }
- }
- END {
-- @cores = sort { $a <=> $b } keys $T{$socket};
-+ @cores = sort { $a <=> $b } keys %{ $T{$socket} };
- @sel_cores = splice @cores, $core_start, $num_cores;
- @lcpus = ();
- for $C (@sel_cores) {
---
-2.7.4
+++ /dev/null
-From ecc947cb8bddde6bbedb426152cb898be71eea32 Mon Sep 17 00:00:00 2001
-From: Babak Sarashki <Babak.SarAshki@windriver.com>
-Date: Sat, 13 Jun 2020 08:06:44 -0700
-Subject: [PATCH] worker-utils: account for distro PATH differeces
-
-The PATH variable in the worker-utils' scripts expect
-system utilities under /usr/sbin. This is not true for
-all distros. Extending PATH to /sbin.
-
-Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
----
- utilities/worker-utils/worker-utils/affine-interrupts.sh | 2 +-
- utilities/worker-utils/worker-utils/affine-platform.sh | 2 +-
- utilities/worker-utils/worker-utils/affine-tasks.sh | 2 +-
- utilities/worker-utils/worker-utils/set-cpu-wakeup-latency.sh | 2 +-
- utilities/worker-utils/worker-utils/task_affinity_functions.sh | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/utilities/worker-utils/worker-utils/affine-interrupts.sh b/utilities/worker-utils/worker-utils/affine-interrupts.sh
-index 6a7c228..d3dc4f8 100644
---- a/utilities/worker-utils/worker-utils/affine-interrupts.sh
-+++ b/utilities/worker-utils/worker-utils/affine-interrupts.sh
-@@ -12,7 +12,7 @@
- # Usage: /usr/bin/affine-interrupts.sh interface cpulist
- #
- # Define minimal path
--PATH=/bin:/usr/bin:/usr/local/bin
-+PATH=/bin:/sbin:/usr/bin:/usr/local/bin
-
- # logger setup
- WHOAMI=`basename $0`
-diff --git a/utilities/worker-utils/worker-utils/affine-platform.sh b/utilities/worker-utils/worker-utils/affine-platform.sh
-index 72a7d63..2bcc2e8 100755
---- a/utilities/worker-utils/worker-utils/affine-platform.sh
-+++ b/utilities/worker-utils/worker-utils/affine-platform.sh
-@@ -16,7 +16,7 @@
- ### END INIT INFO
-
- # Define minimal path
--PATH=/bin:/usr/bin:/usr/local/bin
-+PATH=/bin:/sbin:/usr/bin:/usr/local/bin
-
- LOG_FUNCTIONS=${LOG_FUNCTIONS:-"/etc/init.d/log_functions.sh"}
- CPUMAP_FUNCTIONS=${CPUMAP_FUNCTIONS:-"/etc/init.d/cpumap_functions.sh"}
-diff --git a/utilities/worker-utils/worker-utils/affine-tasks.sh b/utilities/worker-utils/worker-utils/affine-tasks.sh
-index 3f6d294..9603804 100644
---- a/utilities/worker-utils/worker-utils/affine-tasks.sh
-+++ b/utilities/worker-utils/worker-utils/affine-tasks.sh
-@@ -44,7 +44,7 @@
- #
- ################################################################################
- # Define minimal path
--PATH=/bin:/usr/bin:/usr/sbin:/usr/local/bin
-+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin
-
- CPUMAP_FUNCTIONS=${CPUMAP_FUNCTIONS:-"/etc/init.d/cpumap_functions.sh"}
- [[ -e ${CPUMAP_FUNCTIONS} ]] && source ${CPUMAP_FUNCTIONS}
-diff --git a/utilities/worker-utils/worker-utils/set-cpu-wakeup-latency.sh b/utilities/worker-utils/worker-utils/set-cpu-wakeup-latency.sh
-index 0efa13e..b6fbddf 100644
---- a/utilities/worker-utils/worker-utils/set-cpu-wakeup-latency.sh
-+++ b/utilities/worker-utils/worker-utils/set-cpu-wakeup-latency.sh
-@@ -15,7 +15,7 @@
- # For example, 0,5,7,9-11.
-
- # Define minimal path
--PATH=/bin:/usr/bin:/usr/local/bin
-+PATH=/bin:/sbin:/usr/bin:/usr/local/bin
-
- LOG_FUNCTIONS=${LOG_FUNCTIONS:-"/etc/init.d/log_functions.sh"}
- CPUMAP_FUNCTIONS=${CPUMAP_FUNCTIONS:-"/etc/init.d/cpumap_functions.sh"}
-diff --git a/utilities/worker-utils/worker-utils/task_affinity_functions.sh b/utilities/worker-utils/worker-utils/task_affinity_functions.sh
-index 4b18431..0cd6764 100755
---- a/utilities/worker-utils/worker-utils/task_affinity_functions.sh
-+++ b/utilities/worker-utils/worker-utils/task_affinity_functions.sh
-@@ -16,7 +16,7 @@
- ### END INIT INFO
-
- # Define minimal path
--PATH=/bin:/usr/bin:/usr/local/bin
-+PATH=/bin:/sbin:/usr/bin:/usr/local/bin
-
- . /etc/platform/platform.conf
- LOG_FUNCTIONS=${LOG_FUNCTIONS:-"/etc/init.d/log_functions.sh"}
---
-2.24.1
-
+++ /dev/null
-###
-### StarlingX
-### Release @STX_RELEASE@
-###
-
-OS="@OS@"
-SW_VERSION="@STX_RELEASE@"
-BUILD_TARGET="Host Installer"
-BUILD_TYPE="Formal"
-BUILD_ID="r/stx.@STX_ID@"
-
-JOB="STX_BUILD_@STX_ID@"
-BUILD_BY="starlingx.build@cengn.ca"
-BUILD_NUMBER="40"
-BUILD_HOST="starlingx_mirror"
-BUILD_DATE="@BUILD_DATE@ +0000"
+++ /dev/null
-diff --git a/tools/engtools/hostdata-collectors/scripts/cleanup-engtools.sh b/tools/engtools/hostdata-collectors/scripts/cleanup-engtools.sh
-index 5d5701b..a81ecab 100644
---- a/tools/engtools/hostdata-collectors/scripts/cleanup-engtools.sh
-+++ b/tools/engtools/hostdata-collectors/scripts/cleanup-engtools.sh
-@@ -31,7 +31,7 @@ LOG "Cleanup engtools:"
- # Brute force methods (assume trouble with: service collect-engtools.sh stop)
- # ( be sure not to clobber /etc/init.d/collect-engtools.sh )
- LOG "kill processes brute force"
--pids=( $(pidof -x /usr/local/bin/collect-engtools.sh) )
-+pids=( $(pidof -x /usr/bin//collect-engtools.sh) )
- if [ ${#pids[@]} -ne 0 ]; then
- LOG "killing: ${pids[@]}"
- for pid in ${pids[@]}; do
-diff --git a/tools/engtools/hostdata-collectors/scripts/collect-engtools.service b/tools/engtools/hostdata-collectors/scripts/collect-engtools.service
-index e00e1cd..6d4ae65 100644
---- a/tools/engtools/hostdata-collectors/scripts/collect-engtools.service
-+++ b/tools/engtools/hostdata-collectors/scripts/collect-engtools.service
-@@ -1,7 +1,7 @@
- [Unit]
- Description=Engineering data collection tools to monitor host performance
--Requires=network.service
--After=network.service getty.target
-+Requires=networking.service
-+After=networking.service getty.target
-
- [Service]
- Type=forking
-diff --git a/tools/engtools/hostdata-collectors/scripts/collect-engtools.sh b/tools/engtools/hostdata-collectors/scripts/collect-engtools.sh
-index e59f382..3140297 100644
---- a/tools/engtools/hostdata-collectors/scripts/collect-engtools.sh
-+++ b/tools/engtools/hostdata-collectors/scripts/collect-engtools.sh
-@@ -263,7 +263,7 @@ OPT_USE_INTERVALS=0
- # Define parallel engtools configuration
- # - tool name, filename, and collection interval attributes
- BINDIR=/usr/bin
--LBINDIR=/usr/local/bin
-+LBINDIR=/usr/bin/
-
- . /etc/engtools/engtools.conf
-
+++ /dev/null
-diff --git a/tools/collector/scripts/collect b/tools/collector/scripts/collect
-index 88e373e..666df9e 100755
---- a/tools/collector/scripts/collect
-+++ b/tools/collector/scripts/collect
-@@ -83,7 +83,7 @@ if [ ${UID} -eq 0 ]; then
- fi
-
- # pull in common utils and environment
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_utils
- source_openrc_if_needed
-
- function clean_up()
-@@ -121,7 +121,7 @@ SCP_TIMEOUT="600"
- SSH_CMD="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PreferredAuthentications=password -o PubkeyAuthentication=no"
- NOWDATE=`date +"%Y%m%d.%H%M%S"`
- COLLECT_BASE_DIR="/scratch"
--collect_host="/usr/local/sbin/collect_host"
-+collect_host="/usr/sbin/collect_host"
- CURR_DIR=`pwd`
-
-
-diff --git a/tools/collector/scripts/collect_ceph.sh b/tools/collector/scripts/collect_ceph.sh
-index 1a5863e..d4dbcfc 100755
---- a/tools/collector/scripts/collect_ceph.sh
-+++ b/tools/collector/scripts/collect_ceph.sh
-@@ -7,8 +7,8 @@
-
-
- # Loads Up Utilities and Commands Variables
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- SERVICE="ceph"
- LOGFILE="${extradir}/ceph.info"
-diff --git a/tools/collector/scripts/collect_containerization.sh b/tools/collector/scripts/collect_containerization.sh
-index d2e5a92..fb2fa7a 100755
---- a/tools/collector/scripts/collect_containerization.sh
-+++ b/tools/collector/scripts/collect_containerization.sh
-@@ -8,8 +8,8 @@
-
- # Loads Up Utilities and Commands Variables
-
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- SERVICE="containerization"
- LOGFILE="${extradir}/${SERVICE}.info"
-diff --git a/tools/collector/scripts/collect_coredump.sh b/tools/collector/scripts/collect_coredump.sh
-index 7614909..7702ef2 100644
---- a/tools/collector/scripts/collect_coredump.sh
-+++ b/tools/collector/scripts/collect_coredump.sh
-@@ -8,8 +8,8 @@
-
- # Loads Up Utilities and Commands Variables
-
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- SERVICE="coredump"
- LOGFILE="${extradir}/${SERVICE}.info"
-diff --git a/tools/collector/scripts/collect_crash.sh b/tools/collector/scripts/collect_crash.sh
-index fc8c798..c768306 100644
---- a/tools/collector/scripts/collect_crash.sh
-+++ b/tools/collector/scripts/collect_crash.sh
-@@ -8,8 +8,8 @@
-
- # Loads Up Utilities and Commands Variables
-
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- SERVICE="crash"
- LOGFILE="${extradir}/${SERVICE}.info"
-diff --git a/tools/collector/scripts/collect_date b/tools/collector/scripts/collect_date
-index 22c62fb..60724b8 100755
---- a/tools/collector/scripts/collect_date
-+++ b/tools/collector/scripts/collect_date
-@@ -34,8 +34,8 @@
- #
- # Calling sequence:
- #
--# /usr/local/sbin/collect_date <start_date> <end_date> <include_list> <debug>
--# /usr/local/sbin/collect_date 20170701 20170901 /tmp/file.list true
-+# /usr/sbin/collect_date <start_date> <end_date> <include_list> <debug>
-+# /usr/sbin/collect_date 20170701 20170901 /tmp/file.list true
- #
- ########################################################################
-
-@@ -43,7 +43,7 @@
- # Import commands, variables and convenience functions available to
- # all collectors ; common and user defined.
- #
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_utils
-
- # where to find the logs
- declare -r baselogdir="/var/log"
-diff --git a/tools/collector/scripts/collect_fm.sh b/tools/collector/scripts/collect_fm.sh
-index 4ef489a..9ea432b 100644
---- a/tools/collector/scripts/collect_fm.sh
-+++ b/tools/collector/scripts/collect_fm.sh
-@@ -6,8 +6,8 @@
-
- # Loads Up Utilities and Commands Variables
-
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- SERVICE="alarms"
- LOGFILE="${extradir}/${SERVICE}.info"
-diff --git a/tools/collector/scripts/collect_host b/tools/collector/scripts/collect_host
-index e94177a..9a47763 100755
---- a/tools/collector/scripts/collect_host
-+++ b/tools/collector/scripts/collect_host
-@@ -26,7 +26,7 @@ export ACTIVE=false
- # Import commands, variables and convenience functions available to
- # all collectors ; common and user defined.
- #
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_utils
- source_openrc_if_needed
-
- #
-@@ -83,7 +83,7 @@ FLIGHT_RECORDER_FILE="sm.eru.v1"
- VAR_LOG_INCLUDE_LIST="/tmp/${COLLECT_NAME}.lst"
- COLLECT_DIR_PCENT_CMD="df --output=pcent ${COLLECT_BASE_DIR}"
- COLLECT_DIR_USAGE_CMD="df -h ${COLLECT_BASE_DIR}"
--COLLECT_DATE="/usr/local/sbin/collect_date"
-+COLLECT_DATE="/usr/sbin/collect_date"
-
- function log_space()
- {
-@@ -440,8 +440,8 @@ log_space "after delete tar ....:"
-
- if [ "${SKIP_MASK}" != "true" ]; then
- # Run password masking before final tar
-- dlog "running /usr/local/sbin/collect_mask_passwords ${COLLECT_NAME_DIR} ${EXTRA_DIR}"
-- /usr/local/sbin/collect_mask_passwords ${COLLECT_NAME_DIR} ${EXTRA_DIR}
-+ dlog "running /usr/sbin/collect_mask_passwords ${COLLECT_NAME_DIR} ${EXTRA_DIR}"
-+ /usr/sbin/collect_mask_passwords ${COLLECT_NAME_DIR} ${EXTRA_DIR}
- log_space "after passwd masking :"
- fi
-
-diff --git a/tools/collector/scripts/collect_ima.sh b/tools/collector/scripts/collect_ima.sh
-index 14c751e..0ac63b3 100755
---- a/tools/collector/scripts/collect_ima.sh
-+++ b/tools/collector/scripts/collect_ima.sh
-@@ -7,8 +7,8 @@
-
-
- # Loads Up Utilities and Commands Variables
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- function is_extended_profile {
- if [ ! -n "${security_profile}" ] || [ "${security_profile}" != "extended" ]; then
-diff --git a/tools/collector/scripts/collect_networking.sh b/tools/collector/scripts/collect_networking.sh
-index 98f4136..140e85d 100755
---- a/tools/collector/scripts/collect_networking.sh
-+++ b/tools/collector/scripts/collect_networking.sh
-@@ -8,8 +8,8 @@
-
- # Loads Up Utilities and Commands Variables
-
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- SERVICE="networking"
- LOGFILE="${extradir}/${SERVICE}.info"
-diff --git a/tools/collector/scripts/collect_nfv_vim.sh b/tools/collector/scripts/collect_nfv_vim.sh
-index c5ccbc7..37189c5 100644
---- a/tools/collector/scripts/collect_nfv_vim.sh
-+++ b/tools/collector/scripts/collect_nfv_vim.sh
-@@ -6,8 +6,8 @@
- #
-
- # Loads Up Utilities and Commands Variables
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- LOGFILE="${extradir}/nfv-vim.info"
- echo "${hostname}: NFV-Vim Info ......: ${LOGFILE}"
-diff --git a/tools/collector/scripts/collect_openstack.sh b/tools/collector/scripts/collect_openstack.sh
-index e03eca8..a14c8f3 100755
---- a/tools/collector/scripts/collect_openstack.sh
-+++ b/tools/collector/scripts/collect_openstack.sh
-@@ -7,8 +7,8 @@
-
-
- # Loads Up Utilities and Commands Variables
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- function is_service_active {
- active=`sm-query service rabbit-fs | grep "enabled-active"`
-diff --git a/tools/collector/scripts/collect_ovs.sh b/tools/collector/scripts/collect_ovs.sh
-index 94e98e6..cdf4680 100644
---- a/tools/collector/scripts/collect_ovs.sh
-+++ b/tools/collector/scripts/collect_ovs.sh
-@@ -9,8 +9,8 @@
-
- # Loads Up Utilities and Commands Variables
-
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- SERVICE="ovs"
- LOGFILE="${extradir}/${SERVICE}.info"
-diff --git a/tools/collector/scripts/collect_patching.sh b/tools/collector/scripts/collect_patching.sh
-index 3d696d2..05ba41e 100755
---- a/tools/collector/scripts/collect_patching.sh
-+++ b/tools/collector/scripts/collect_patching.sh
-@@ -7,8 +7,8 @@
-
-
- # Loads Up Utilities and Commands Variables
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- SERVICE="patching"
- LOGFILE="${extradir}/${SERVICE}.info"
-diff --git a/tools/collector/scripts/collect_psqldb.sh b/tools/collector/scripts/collect_psqldb.sh
-index d223b1b..dc45169 100755
---- a/tools/collector/scripts/collect_psqldb.sh
-+++ b/tools/collector/scripts/collect_psqldb.sh
-@@ -7,8 +7,8 @@
-
-
- # Loads Up Utilities and Commands Variables
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- # postgres database commands
- PSQL_CMD="sudo -u postgres psql --pset pager=off -q"
-diff --git a/tools/collector/scripts/collect_sm.sh b/tools/collector/scripts/collect_sm.sh
-index 5f0f3c9..6de18fe 100644
---- a/tools/collector/scripts/collect_sm.sh
-+++ b/tools/collector/scripts/collect_sm.sh
-@@ -7,8 +7,8 @@
-
-
- # Loads Up Utilities and Commands Variables
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- SERVICE="sm"
- LOGFILE="${extradir}/sm.info"
-diff --git a/tools/collector/scripts/collect_sysinv.sh b/tools/collector/scripts/collect_sysinv.sh
-index 3f27a28..6a9f4ae 100755
---- a/tools/collector/scripts/collect_sysinv.sh
-+++ b/tools/collector/scripts/collect_sysinv.sh
-@@ -7,8 +7,8 @@
-
-
- # Loads Up Utilities and Commands Variables
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- SERVICE="inventory"
- LOGFILE="${extradir}/${SERVICE}.info"
-diff --git a/tools/collector/scripts/collect_tc.sh b/tools/collector/scripts/collect_tc.sh
-index 95cd0fe..0ee6bd8 100755
---- a/tools/collector/scripts/collect_tc.sh
-+++ b/tools/collector/scripts/collect_tc.sh
-@@ -7,8 +7,8 @@
-
-
- # Loads Up Utilities and Commands Variables
--source /usr/local/sbin/collect_parms
--source /usr/local/sbin/collect_utils
-+source /usr/sbin/collect_parms
-+source /usr/sbin/collect_utils
-
- SERVICE="tc"
- LOGFILE="${extradir}/tc.info"
-@@ -40,13 +40,13 @@ for i in $(ip link | grep mtu | grep eth |awk '{print $2}' | sed 's#:##g'); do
- done
-
- ###############################################################################
--# TC Configuration Script (/usr/local/bin/tc_setup.sh)
-+# TC Configuration Script (/usr/bin/tc_setup.sh)
- ###############################################################################
--delimiter ${LOGFILE} "cat /usr/local/bin/tc_setup.sh"
--if [ -f /usr/local/bin/tc_setup.sh ]; then
-- cat /usr/local/bin/tc_setup.sh >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
-+delimiter ${LOGFILE} "cat /usr/bin/tc_setup.sh"
-+if [ -f /usr/bin/tc_setup.sh ]; then
-+ cat /usr/bin/tc_setup.sh >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
- else
-- echo "/usr/local/bin/tc_setup.sh NOT FOUND" >> ${LOGFILE}
-+ echo "/usr/bin/tc_setup.sh NOT FOUND" >> ${LOGFILE}
- fi
-
- ###############################################################################
-diff --git a/tools/collector/scripts/collect_utils b/tools/collector/scripts/collect_utils
-index 739e161..53ad5c3 100755
---- a/tools/collector/scripts/collect_utils
-+++ b/tools/collector/scripts/collect_utils
-@@ -90,7 +90,7 @@ function source_openrc_if_needed
- # sequences and highlight command completion
- collect_done="collect done"
- cmd_done_sig="expect done"
--cmd_done_file="/usr/local/sbin/expect_done"
-+cmd_done_file="/usr/sbin/expect_done"
-
- # Compression Commands
- TAR_ZIP_CMD="tar -cvzf"
+++ /dev/null
-DESCRIPTION = "Management of /var/log filesystem"
-
-require utilities-common.inc
-SUBPATH0 = "utilities/logmgmt/logmgmt/"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN}_append = " \
- systemd \
- python-daemon \
- "
-
-inherit setuptools systemd
-SYSTEMD_PACKAGES += "logmgmt"
-SYSTEMD_SERVICE_${PN} = "logmgmt.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-do_unpack_append() {
- bb.build.exec_func('do_restore_files', d)
-}
-
-do_restore_files() {
- cd ${S}
- git reset ${SRCREV} utilities/logmgmt/scripts
- git checkout utilities/logmgmt/scripts
-}
-
-do_install_append() {
-
- cd ${S}/utilities/logmgmt/scripts
- install -d -m0755 ${D}/${bindir}
- install -m0700 bin/logmgmt ${D}/${bindir}
- install -m0700 bin/logmgmt_postrotate ${D}/${bindir}
- install -m0700 bin/logmgmt_prerotate ${D}/${bindir}
-
- install -d -m0755 ${D}/${sysconfdir}/init.d
- install -m0700 init.d/logmgmt ${D}/${sysconfdir}/init.d
-
- install -d -m0755 ${D}/${sysconfdir}/pmon.d
- install -m0700 pmon.d/logmgmt ${D}/${sysconfdir}/pmon.d
-
- install -d -m0755 ${D}/${systemd_system_unitdir}
- install -m0664 etc/systemd/system/logmgmt.service ${D}/${systemd_system_unitdir}
-}
-
+++ /dev/null
-DESCRIPTION = "Titanium Cloud namespace utilities"
-SUMMARY = "namespace utils"
-
-require utilities-common.inc
-SUBPATH0 = "utilities/namespace-utils/namespace-utils"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN}_append = " bash"
-
-do_configure[noexec] = "1"
-
-do_compile() {
- $CC ${LDFLAGS} ${CFLAGS} -o bashns bashns.c
-}
-
-do_install() {
-
- install -d -m0755 ${D}/${sbindir}
- install -m0500 bashns ${D}/${sbindir}
- install -m0500 umount-in-namespace ${D}/${sbindir}
-}
+++ /dev/null
-DESCRIPTION = "NFS Audit"
-SUMMARY = "NFS Audit"
-
-require utilities-common.inc
-SUBPATH0 = "utilities/nfscheck/files/"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN}_append = " bash systemd"
-
-inherit systemd
-SYSTEMD_PACKAGES += " nfscheck"
-SYSTEMD_SERVICE_${PN} = "nfscheck.service"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install() {
-
- install -d -m0755 ${D}/${bindir}
- install -m0755 nfscheck.sh ${D}/${bindir}
-
- install -d -m0755 ${D}/${systemd_system_unitdir}
- install -m0644 nfscheck.service ${D}/${systemd_system_unitdir}
-}
+++ /dev/null
-DESCRIPTION = "StarlingX PCI Interrupt Affinity Agent Package"
-SUMMARY = "StarlingX PCI Interrupt Affinity Agent Package"
-
-require utilities-common.inc
-
-SUBPATH0 = "utilities/pci-irq-affinity-agent/pci_irq_affinity"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://setup.py;md5=6980f60051ba4d376975eefc777fb8ae"
-
-RDEPENDS_${PN}_append = " python-novaclient libvirt libvirt-python"
-
-inherit setuptools systemd
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-SYSTEMD_PACKAGES += "${PN}"
-SYSTEMD_SERVICE_${PN} = "${PN}-agent.service"
-
-do_unpack_append() {
- bb.build.exec_func('do_restore_files', d)
-}
-
-do_restore_files() {
- cd ${S}
- git reset ${SRCREV} utilities/pci-irq-affinity-agent/files
- git checkout utilities/pci-irq-affinity-agent/files
-}
-
-
-do_install_append() {
-
- cd ${S}/utilities/pci-irq-affinity-agent/files
-
- install -p -d -m0755 ${D}/${sysconfdir}/init.d
- install -p -d -m0755 ${D}/${sysconfdir}/pmon.d
- install -p -d -m0755 ${D}/${sysconfdir}/pci_irq_affinity
- install -p -d -m0755 ${D}/${systemd_system_unitdir}
- install -p -d -m0755 ${D}/${bindir}
-
- install -m0755 pci-irq-affinity-agent ${D}/${sysconfdir}/init.d/pci-irq-affinity-agent
- install -m0644 pci-irq-affinity-agent.service ${D}/${systemd_system_unitdir}/pci-irq-affinity-agent.service
-
- install -m0755 nova-sriov ${D}/${bindir}/nova-sriov
- install -m0755 config.ini ${D}/${sysconfdir}/pci_irq_affinity/config.ini
-}
+++ /dev/null
-DESCRIPTION = "platform-util"
-SUMMARY = "StarlingX Platform utilities installed only on controllers"
-
-require utilities-common.inc
-
-SUBPATH0 = "utilities/platform-util/platform-util"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN}_append = " bash"
-
-inherit setuptools systemd
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-SYSTEMD_PACKAGES += " ${PN}"
-SYSTEMD_SERVICE_${PN} = "opt-platform.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-
-do_unpack_append() {
- bb.build.exec_func('do_restore_files', d)
-}
-
-do_restore_files() {
- cd ${S}
- git reset ${SRCREV} utilities/platform-util/scripts
- git checkout utilities/platform-util/scripts
-}
-
-do_install_append() {
-
- cd ${S}/utilities/platform-util/scripts
-
- install -d -m0755 ${D}/${bindir}
- install -m0755 tc_setup.sh ${D}/${bindir}/tc_setup.sh
- install -m0755 remotelogging_tc_setup.sh ${D}/${bindir}/remotelogging_tc_setup.sh
- install -m0755 connectivity_test ${D}/${bindir}/connectivity_test
- install -m0755 update-iso.sh ${D}/${bindir}/update-iso.sh
-
- install -p -d -m0755 ${D}/${sysconfdir}/init.d
- install -m0755 log_functions.sh ${D}/${sysconfdir}/init.d/log_functions.sh
-
- install -p -d -m0755 ${D}/${sbindir}
- install -m0755 patch-restart-mtce ${D}/${sbindir}/patch-restart-mtce
- install -m0755 patch-restart-processes ${D}/${sbindir}/patch-restart-processes
- install -m0755 patch-restart-haproxy ${D}/${sbindir}/patch-restart-haproxy
-
-
-
- install -p -d -m0755 ${D}/${systemd_system_unitdir}
-
- install -m0644 opt-platform.mount ${D}/${systemd_system_unitdir}/opt-platform.mount
- install -m0644 opt-platform.service ${D}/${systemd_system_unitdir}/opt-platform.service
-
-}
-
-FILES_${PN}_append = " ${systemd_system_unitdir}/opt-platform.mount"
+++ /dev/null
-DESCRIPTION = " \
-A client library in Python for Ceph Mgr RESTful plugin providing REST API \
-access to the cluster over an SSL-secured connection. Python API is compatible \
-with the old Python Ceph client at \
-https://github.com/dmsimard/python-cephclient that no longer works in Ceph \
-mimic because Ceph REST API component was removed. \
-"
-
-require utilities-common.inc
-SUBPATH0 = "ceph/python-cephclient/python-cephclient"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=41687b590435621fc0676ac02c51154f"
-
-RDEPENDS_${PN}_append = " \
- python \
- python-ipaddress \
- python-six \
- python-requests \
- "
-
-inherit setuptools
-
-do_configure_prepend() {
- rm -rf .pytest_cache
- rm -rf python_cephclient.egg-info
- rm -f requirements.txt
-}
+++ /dev/null
-DESCRIPTION = "TIS Extensions to thirdparty pkgs"
-SUMMARY = "TIS Extensions to thirdparty pkgs"
-
-require utilities-common.inc
-
-SUBPATH0 = "utilities/stx-extensions/files"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_${PN} += " systemd"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install() {
-
- install -p -d -m 0755 ${D}/${sysconfdir}/sysctl.d
- install -m 0644 coredump-sysctl.conf ${D}/${sysconfdir}/sysctl.d/50-coredump.conf
-
- # Fix the systemd unitdir and the arguments for kernel.core_pattern
- sed -i -e 's|${nonarch_libdir}/systemd|${systemd_unitdir}|' \
- -e 's/%p/%P/' -e 's/%e/%c %h %e/' \
- ${D}/${sysconfdir}/sysctl.d/50-coredump.conf
-
- install -p -d -m 0755 ${D}/${sysconfdir}/systemd/coredump.conf.d
- install -m 0644 coredump.conf ${D}/${sysconfdir}/systemd/coredump.conf.d/coredump.conf
-
- install -p -d -m 0755 ${D}/${sysconfdir}/modules-load.d
- install -m 0644 modules-load-vfio.conf ${D}/${sysconfdir}/modules-load.d/vfio.conf
-
-}
+++ /dev/null
-DESCRIPTION = " Wind River Security"
-
-require utilities-common.inc
-SUBPATH0 = "security/stx-ssl/"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-RDEPENDS_${PN}_append = " bash"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install() {
-
- openssl req -new -x509 -sha256 \
- -keyout self-signed-server-cert.pem \
- -out self-signed-server-cert.pem \
- -days 365 -nodes \
- -config server-csr.conf
-
- install -p -d -m0755 ${D}/${sysconfdir}/ssl/private/
- install -m0400 self-signed-server-cert.pem \
- ${D}/${sysconfdir}/ssl/private/self-signed-server-cert.pem
-
- install -p -d -m0755 ${D}/${sbindir}
- install -m0700 ${S}/files/tpmdevice-setup ${D}/${sbindir}/tpmdevice-setup
-
-}
+++ /dev/null
-DESCRIPTION = "dynamic MOTD generation"
-SUMMARY = "dynamic MOTD generation"
-
-require utilities-common.inc
-SUBPATH0 = "utilities/update-motd/files"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-RDEPENDS_update-motd += " cronie bash"
-
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install() {
-
- install -d ${D}/${sbindir}
- install -m 700 motd-update ${D}/${sbindir}/motd-update
-
- install -m0755 -d ${D}/${sysconfdir}
- install -m0755 -d ${D}/${sysconfdir}/motd.d
-
- install -m 755 motd-header ${D}/${sysconfdir}/motd.d/00-header
- install -m 755 motd-footer ${D}/${sysconfdir}/motd.d/99-footer
- install -m 644 motd.head ${D}/${sysconfdir}/motd.d/motd.head
-
- install -m0755 -d ${D}/${sysconfdir}/cron.d
- install -m 600 motd-update.cron ${D}/${sysconfdir}/cron.d/motd-update
- install -m 700 customize-banner ${D}/${sbindir}/customize-banner
- install -m 700 apply_banner_customization ${D}/${sbindir}/apply_banner_customization
- install -m 700 install_banner_customization ${D}/${sbindir}/install_banner_customization
-
-}
+++ /dev/null
-
-DESCRIPTION = "stx-utilities"
-
-PROTOCOL = "https"
-SRCNAME = "utilities"
-BRANCH = "r/stx.3.0"
-SRCREV = "cbad6b792157d066dd601f0f9ce62dc177d4c848"
-SRCREV_opendev = "cbad6b792157d066dd601f0f9ce62dc177d4c848"
-DESTSUFFIX = "${PN}-${PV}"
-PV = "1.0.0"
-
-SRC_URI = " \
- git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH};destsuffix=${DESTSUFFIX};subpath=${SUBPATH0};name=opendev \
- "
-
-#git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-DEPENDS = " \
- python-pip \
- python-pbr-native \
- systemd \
-"
-
-## Skip tpm2-openssl-engine2
+++ /dev/null
-DESCRIPTION = "Initial worker node resource reservation and misc. utilities"
-SUMMARY = "dynamic MOTD generation"
-
-require utilities-common.inc
-SUBPATH0 = "utilities/worker-utils/worker-utils"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI += " \
- file://0001-worker-utils-account-for-distro-PATH-differeces.patch;striplevel=4 \
- file://0001-cpumap_functions.sh-fix-perl-experimental-feature-is.patch;striplevel=4 \
- "
-
-RDEPENDS_${PN}_append = " perl systemd python bash"
-DEPENDS += " python"
-
-inherit python-dir systemd
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-SYSTEMD_PACKAGES += "${PN}"
-SYSTEMD_SERVICE_${PN} = " affine-tasks.service affine-platform.sh.service"
-
-do_configure[noexec] = "1"
-
-do_install() {
-
- oe_runmake install \
- BINDIR=${D}/${bindir} \
- INITDDIR=${D}/${sysconfdir}/init.d \
- GOENABLEDDIR=${D}/${sysconfdir}/goenabled.d \
- PLATFORMCONFDIR=${D}/${sysconfdir}/platform \
- SYSTEMDDIR=${D}/${systemd_system_unitdir}
-}
+++ /dev/null
-
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
- ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "stx-integ-layer"
-BBFILE_PATTERN_stx-integ-layer := "^${LAYERDIR}/"
-BBFILE_PRIORITY_stx-integ-layer = "5"
-
-LAYERDEPENDS_STX_INTEG = "\
- core \
- dpdk \
- networking-layer \
- openembedded-layer \
- networking-layer \
- filesystems-layer \
- perl-layer \
- meta-python \
- webserver \
- virtualization-layer \
- cloud-services-layer \
- openstack-layer \
-"
-
-# This should only be incremented on significant changes that will
-# cause compatibility issues with other layers
-LAYERVERSION_stx-integ-version = "1"
-LAYERSERIES_COMPAT_stx-integ-layer = "thud warrior"
-
-LAYER_PATH_meta-stx-integ = "${LAYERDIR}"
-
-# Masked recipes:
-BBMASK += "/meta-python2/recipes-core/images/meta-python-ptest-image.bb"
-BBMASK += "/meta-python2/recipes-core/images/meta-python-image-base.bb"
-BBMASK += "/meta-python2/recipes-core/images/meta-python-image.bb"
-BBMASK += "/meta-stak-common/recipes-containers/kubernetes/kubernetes_git.bbappend"
-BBMASK += "/meta-cloud-services/meta-openstack/recipes-devtools/python/python-cephclient_0.1.0.5.bb"
-BBMASK += "/meta-openstack/recipes-devtools/qemu/qemu_2.%.bbappend"
-BBMASK += "/meta-cloud-services/meta-openstack/recipes-kernel/linux/linux-yocto_4.18.bbappend"
-BBMASK += "/meta-selinux/recipes-graphics/mesa/mesa_%.bbappend"
-BBMASK += "/meta-virtualization/recipes-containers/docker-distribution/docker-distribution_git.bb"
-BBMASK += "/meta-starlingX/recipes-containers/docker-distribution/docker-distribution_git.bbappend"
-BBMASK += "/meta-starlingX/recipes-support/puppet/puppetlabs-stdlib_git.bbappend"
-BBMASK += "/meta-cloud-services/meta-openstack/recipes-dbs/postgresql/postgresql_%.bbappend"
+++ /dev/null
-
-TRANSFORM_NAME = "s,grub,grub2,"
-EXTRA_OECONF += "--program-transform-name=${TRANSFORM_NAME} \
- "
+++ /dev/null
-
-TRANSFORM_NAME = "s,grub,grub2,"
-EXTRA_OECONF += "--program-transform-name=${TRANSFORM_NAME}"
-
-do_install_append() {
- for file in ${D}${bindir}/grub2-* ${D}${sbindir}/grub2-*; do
- ln -sf $(basename ${file}) $(echo ${file}|sed 's/grub2/grub/')
- done
-
- sed -i -e 's/ ro / rw /' ${D}${sysconfdir}/grub.d/10_linux
-}
-
-FILES_${PN}-editenv = "${bindir}/grub2-editenv"
+++ /dev/null
-RRECOMMENDS_${PN}_remove_libc-glibc = "libnss-mdns"
-RRECOMMENDS_${PN}-daemon_remove_libc-glibc = "libnss-mdns"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "dhcp-config"
-
-
-do_install_append () {
- install -m 0755 ${STX_METADATA_PATH}/files/dhclient-enter-hooks ${D}/${sysconfdir}/dhcp/dhclient-enter-hooks
- install -m 0755 ${STX_METADATA_PATH}/files/dhclient.conf ${D}/${sysconfdir}/dhcp/dhclient.conf
- ln -rs ${D}/${sysconfdir}/dhcp/dhclient-enter-hooks ${D}/${sysconfdir}/dhclient-enter-hooks
-}
-
-FILES_${PN}-client_append = " \
- /etc/dhclient-enter-hooks \
- /etc/dhcp/dhclient-enter-hooks \
- "
-
-RDEPENDS_${PN}-client_append = " bash"
+++ /dev/null
-# this config needs haproxy-1.1.28 or haproxy-1.2.1
-
-global
- log 127.0.0.1 local0
- log 127.0.0.1 local1 notice
- #log loghost local0 info
- maxconn 4096
- chroot /usr/share/haproxy
- uid 99
- gid 99
- daemon
- #debug
- #quiet
-
-defaults
- log global
- mode http
- option httplog
- option dontlognull
- retries 3
- option redispatch
- maxconn 2000
- timeout connect 5000
- timeout client 50000
- timeout server 50000
-
-listen appli1-rewrite
-bind 0.0.0.0:10001
- cookie SERVERID rewrite
- balance roundrobin
- server app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
- server app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
- server app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
- server app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5
-
-listen appli2-insert
-bind 0.0.0.0:10002
- option httpchk
- balance roundrobin
- cookie SERVERID insert indirect nocache
- server inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
- server inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
- capture cookie vgnvisitor= len 32
-
- option httpclose # disable keep-alive
- rspidel ^Set-cookie:\ IP= # do not let this cookie tell our internal IP address
-
-listen appli3-relais
-bind 0.0.0.0:10003
- dispatch 192.168.135.17:80
-
-listen appli4-backup
-bind 0.0.0.0:10004
- option httpchk /index.html
- option persist
- balance roundrobin
- server inst1 192.168.114.56:80 check inter 2000 fall 3
- server inst2 192.168.114.56:81 check inter 2000 fall 3 backup
-
-listen ssl-relay
-bind 0.0.0.0:8443
- option ssl-hello-chk
- balance source
- server inst1 192.168.110.56:443 check inter 2000 fall 3
- server inst2 192.168.110.57:443 check inter 2000 fall 3
- server back1 192.168.120.58:443 backup
-
-listen appli5-backup
-bind 0.0.0.0:10005
- option httpchk *
- balance roundrobin
- cookie SERVERID insert indirect nocache
- server inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
- server inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
- server inst3 192.168.114.57:80 backup check inter 2000 fall 3
- capture cookie ASPSESSION len 32
- timeout server 20000
-
- option httpclose # disable keep-alive
- option checkcache # block response if set-cookie & cacheable
-
- rspidel ^Set-cookie:\ IP= # do not let this cookie tell our internal IP address
-
- errorloc 502 http://192.168.114.58/error502.html
- errorfile 503 /etc/haproxy/errors/503.http
-
+++ /dev/null
-[Unit]
-Description=HAProxy Load Balancer
-After=network.target
-
-[Service]
-ExecStartPre=/usr/sbin/haproxy_gencert.sh
-ExecStartPre=/usr/bin/haproxy -f /etc/haproxy/haproxy.cfg -c -q
-ExecStart=/usr/bin/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid
-ExecReload=/bin/kill -USR2 $MAINPID
-KillMode=mixed
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-From 2fa8fedba0968d1c6d21d2c7fa33c903f8984815 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Thu, 25 Jul 2019 15:22:49 +0800
-Subject: [PATCH] haproxy tpm support
-
-original author: Kam Nasim <kam.nasim@windriver.com>
-
-rebased for 1.7.11
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- include/types/global.h | 13 +++++
- src/cfgparse.c | 28 ++++++++++
- src/haproxy.c | 26 ++++++++-
- src/ssl_sock.c | 147 +++++++++++++++++++++++++++++++++++++++++++------
- 4 files changed, 197 insertions(+), 17 deletions(-)
-
-diff --git a/include/types/global.h b/include/types/global.h
-index 10f3a3c..68f2138 100644
---- a/include/types/global.h
-+++ b/include/types/global.h
-@@ -37,6 +37,10 @@
- #include <import/51d.h>
- #endif
-
-+#ifdef USE_OPENSSL
-+#include <openssl/engine.h>
-+#endif
-+
- #ifndef UNIX_MAX_PATH
- #define UNIX_MAX_PATH 108
- #endif
-@@ -79,6 +83,14 @@ enum {
- SSL_SERVER_VERIFY_REQUIRED = 1,
- };
-
-+// WRS: Define a new TPM configuration structure
-+struct tpm_conf {
-+ char *tpm_object;
-+ char *tpm_engine;
-+ EVP_PKEY *tpm_key;
-+ ENGINE *tpm_engine_ref;
-+};
-+
- /* FIXME : this will have to be redefined correctly */
- struct global {
- #ifdef USE_OPENSSL
-@@ -101,6 +113,7 @@ struct global {
- char *connect_default_ciphers;
- int listen_default_ssloptions;
- int connect_default_ssloptions;
-+ struct tpm_conf tpm; // tpm configuration
- #endif
- unsigned int ssl_server_verify; /* default verify mode on servers side */
- struct freq_ctr conn_per_sec;
-diff --git a/src/cfgparse.c b/src/cfgparse.c
-index 3489f7e..0209874 100644
---- a/src/cfgparse.c
-+++ b/src/cfgparse.c
-@@ -1923,6 +1923,34 @@ int cfg_parse_global(const char *file, int linenum, char **args, int kwm)
- env++;
- }
- }
-+ else if (!strcmp(args[0], "tpm-object")) {
-+ if (global.tpm.tpm_object) {
-+ free(global.tpm.tpm_object);
-+ }
-+#ifdef USE_OPENSSL
-+ if (*(args[1]) && (access(args[1], F_OK) != -1)) {
-+ global.tpm.tpm_object = strdup(args[1]);
-+ }
-+#else
-+ Alert("parsing [%s:%d] : '%s' is not implemented.\n", file, linenum, args[0]);
-+ err_code |= ERR_ALERT | ERR_FATAL;
-+ goto out;
-+#endif
-+ }
-+ else if (!strcmp(args[0], "tpm-engine")) {
-+ if (global.tpm.tpm_engine) {
-+ free(global.tpm.tpm_engine);
-+ }
-+#ifdef USE_OPENSSL
-+ if (*(args[1]) && (access(args[1], F_OK) != -1)) {
-+ global.tpm.tpm_engine = strdup(args[1]);
-+ }
-+#else
-+ Alert("parsing [%s:%d] : '%s' is not implemented.\n", file, linenum, args[0]);
-+ err_code |= ERR_ALERT | ERR_FATAL;
-+ goto out;
-+#endif
-+ }
- else {
- struct cfg_kw_list *kwl;
- int index;
-diff --git a/src/haproxy.c b/src/haproxy.c
-index f8a0912..f61dacf 100644
---- a/src/haproxy.c
-+++ b/src/haproxy.c
-@@ -1370,6 +1370,24 @@ static void deinit_stick_rules(struct list *rules)
- }
- }
-
-+static void deinit_tpm_engine()
-+{
-+ /*
-+ * if the tpm engine is present then
-+ * deinit it, this is needed to
-+ * flush the TPM key handle from TPM memory
-+ */
-+ if (global.tpm.tpm_engine_ref) {
-+ ENGINE_finish(global.tpm.tpm_engine_ref);
-+ }
-+
-+ if (global.tpm.tpm_key) {
-+ EVP_PKEY_free(global.tpm.tpm_key);
-+ }
-+ free(global.tpm.tpm_engine); global.tpm.tpm_engine = NULL;
-+ free(global.tpm.tpm_object); global.tpm.tpm_object = NULL;
-+}
-+
- void deinit(void)
- {
- struct proxy *p = proxy, *p0;
-@@ -1646,7 +1664,13 @@ void deinit(void)
-
- free(uap);
- }
--
-+
-+ /* if HAProxy was in TPM mode then deinit
-+ * that configuration as well.
-+ */
-+ if (global.tpm.tpm_object && global.tpm.tpm_object != '\0')
-+ deinit_tpm_engine();
-+
- userlist_free(userlist);
-
- cfg_unregister_sections();
-diff --git a/src/ssl_sock.c b/src/ssl_sock.c
-index 87b2584..44d0b48 100644
---- a/src/ssl_sock.c
-+++ b/src/ssl_sock.c
-@@ -51,6 +51,7 @@
- #ifndef OPENSSL_NO_DH
- #include <openssl/dh.h>
- #endif
-+#include <openssl/engine.h>
-
- #include <import/lru.h>
- #include <import/xxhash.h>
-@@ -2360,6 +2361,80 @@ end:
- return ret;
- }
-
-+/*
-+ * initialize the TPM engine and load the
-+ * TPM object as private key within the Engine.
-+ * Only do this for the first bind since TPM can
-+ * only load 3-4 contexes before it runs out of memory
-+ */
-+static int ssl_sock_load_tpm_key(SSL_CTX *ctx, char **err) {
-+ if (!global.tpm.tpm_object || global.tpm.tpm_object[0] == '\0') {
-+ /* not in TPM mode */
-+ return -1;
-+ }
-+ if (!global.tpm.tpm_key) {
-+ Warning ("Could not find tpm_key; initializing engine\n");
-+ /* no key present; load the dynamic TPM engine */
-+ if (global.tpm.tpm_engine && global.tpm.tpm_engine[0]) {
-+ ENGINE_load_dynamic();
-+ ENGINE *engine = ENGINE_by_id("dynamic");
-+ if (!engine) {
-+ memprintf(err, "%s Unable to load the dynamic engine "
-+ "(needed for loading custom TPM engine)\n",
-+ err && *err ? *err : "");
-+ return 1;
-+ }
-+
-+ ENGINE_ctrl_cmd_string(engine, "SO_PATH", global.tpm.tpm_engine, 0);
-+ ENGINE_ctrl_cmd_string(engine, "LOAD", NULL, 0);
-+ /* stow away for ENGINE cleanup */
-+ global.tpm.tpm_engine_ref = engine;
-+
-+ if (ENGINE_init(engine) != 1) {
-+ const char *error_str = ERR_error_string(ERR_get_error(), NULL);
-+ memprintf(err, "%s Unable to init the TPM engine (%s). Err: %s\n",
-+ err && *err ? *err : "",
-+ global.tpm.tpm_engine, error_str);
-+ goto tpm_err;
-+ }
-+ EVP_PKEY *pkey = ENGINE_load_private_key(engine,
-+ global.tpm.tpm_object,
-+ NULL, NULL);
-+ if (!pkey) {
-+ const char *error_str = ERR_error_string(ERR_get_error(), NULL);
-+ memprintf(err, "%s Unable to load TPM object (%s). Err: %s\n",
-+ err && *err ? *err : "",
-+ global.tpm.tpm_object, error_str);
-+ goto tpm_err;
-+ }
-+ global.tpm.tpm_key = pkey;
-+ }
-+ else { /* no TPM engine found */
-+ memprintf(err, "%s TPM engine option not set when TPM mode expected\n",
-+ err && *err ? *err : "");
-+ goto tpm_err;
-+ }
-+ }
-+
-+ if (SSL_CTX_use_PrivateKey(ctx, global.tpm.tpm_key) <= 0){
-+ const char *error_str = ERR_error_string(ERR_get_error(),
-+ NULL);
-+ memprintf(err, "%s Invalid private key provided from TPM engine(%s). Err: %s\n",
-+ err && *err ? *err : "",
-+ global.tpm.tpm_object, error_str);
-+ goto tpm_err;
-+ }
-+
-+ return 0;
-+
-+tpm_err:
-+ ENGINE_finish(global.tpm.tpm_engine_ref);
-+ global.tpm.tpm_engine_ref = NULL;
-+ EVP_PKEY_free(global.tpm.tpm_key);
-+ global.tpm.tpm_key = NULL;
-+ return 1;
-+}
-+
- static int ssl_sock_load_cert_file(const char *path, struct bind_conf *bind_conf, struct proxy *curproxy, char **sni_filter, int fcount, char **err)
- {
- int ret;
-@@ -2372,26 +2447,54 @@ static int ssl_sock_load_cert_file(const char *path, struct bind_conf *bind_conf
- return 1;
- }
-
-- if (SSL_CTX_use_PrivateKey_file(ctx, path, SSL_FILETYPE_PEM) <= 0) {
-- memprintf(err, "%sunable to load SSL private key from PEM file '%s'.\n",
-- err && *err ? *err : "", path);
-- SSL_CTX_free(ctx);
-- return 1;
-+ /* NOTE (knasim-wrs): US93721: TPM support
-+ * This SSL context applies to SSL frontends only.
-+ * If the TPM option is set then the Private key
-+ * is stored in TPM.
-+ *
-+ * Launch the OpenSSL TPM engine and load the TPM
-+ * Private Key. The Public key will still be located
-+ * at the provided path and needs to be loaded as
-+ * per usual.
-+ */
-+ if (global.tpm.tpm_object) {
-+ ret = ssl_sock_load_tpm_key(ctx, err);
-+ if (ret > 0) {
-+ /* tpm configuration failed */
-+ SSL_CTX_free(ctx);
-+ return 1;
-+ }
- }
--
-- ret = ssl_sock_load_cert_chain_file(ctx, path, bind_conf, sni_filter, fcount);
-- if (ret <= 0) {
-- memprintf(err, "%sunable to load SSL certificate from PEM file '%s'.\n",
-- err && *err ? *err : "", path);
-- if (ret < 0) /* serious error, must do that ourselves */
-+ else { /* non TPM mode */
-+ if (SSL_CTX_use_PrivateKey_file(ctx, path, SSL_FILETYPE_PEM) <= 0) {
-+ memprintf(err, "%sunable to load SSL private key from PEM file '%s'.\n",
-+ err && *err ? *err : "", path);
- SSL_CTX_free(ctx);
-- return 1;
-+ return 1;
-+ }
- }
-
-- if (SSL_CTX_check_private_key(ctx) <= 0) {
-- memprintf(err, "%sinconsistencies between private key and certificate loaded from PEM file '%s'.\n",
-- err && *err ? *err : "", path);
-- return 1;
-+ ret = ssl_sock_load_cert_chain_file(ctx, path, bind_conf, sni_filter, fcount);
-+ if (ret <= 0) {
-+ memprintf(err, "%sunable to load SSL certificate from PEM file '%s'.\n",
-+ err && *err ? *err : "", path);
-+ if (ret < 0) /* serious error, must do that ourselves */
-+ SSL_CTX_free(ctx);
-+ return 1;
-+ }
-+
-+ /*
-+ * only match the private key to the public key
-+ * for non TPM mode. This op would never work for
-+ * TPM since the private key has been wrapped, whereas
-+ * the public key is still the original one.
-+ */
-+ if (!global.tpm.tpm_object) {
-+ if (SSL_CTX_check_private_key(ctx) <= 0) {
-+ memprintf(err, "%sinconsistencies between private key and certificate loaded from PEM file '%s'.\n",
-+ err && *err ? *err : "", path);
-+ return 1;
-+ }
- }
-
- /* we must not free the SSL_CTX anymore below, since it's already in
-@@ -3068,6 +3171,18 @@ int ssl_sock_prepare_srv_ctx(struct server *srv, struct proxy *curproxy)
- cfgerr++;
- return cfgerr;
- }
-+
-+ /* NOTE (knasim-wrs): US93721: TPM support
-+ * This SSL context applies to SSL backends only.
-+ * Since Titanium backends don't support SSL, there
-+ * is no need to offload these keys in TPM or reuse the
-+ * same TPM key for the frontend engine.
-+ *
-+ * If SSL backends are to be supported in the future,
-+ * over TPM, then create a new TPM Engine context and
-+ * load the backend key in TPM, in a similar fashion to
-+ * the frontend key.
-+ */
- if (srv->ssl_ctx.client_crt) {
- if (SSL_CTX_use_PrivateKey_file(srv->ssl_ctx.ctx, srv->ssl_ctx.client_crt, SSL_FILETYPE_PEM) <= 0) {
- Alert("config : %s '%s', server '%s': unable to load SSL private key from PEM file '%s'.\n",
---
-2.7.4
-
+++ /dev/null
-SUMMARY = "TCP/HTTP proxy and load balancer for high availability environments"
-DESCRIPTION = " \
-HAProxy is a TCP/HTTP reverse proxy which is particularly suited for high \
-availability environments. Indeed, it can: \
- - route HTTP requests depending on statically assigned cookies \
- - spread load among several servers while assuring server persistence \
- through the use of HTTP cookies \
- - switch to backup servers in the event a main server fails \
- - accept connections to special ports dedicated to service monitoring \
- - stop accepting connections without breaking existing ones \
- - add, modify, and delete HTTP headers in both directions \
- - block requests matching particular patterns \
- - report detailed status to authenticated users from a URI \
- intercepted by the application \
-"
-HOMEPAGE = "http://www.haproxy.org/"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2d862e836f92129cdc0ecccc54eed5e0"
-
-DEPENDS = "libpcre openssl zlib"
-
-MAJOR_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "haproxy-config"
-
-SRC_URI = "\
- https://www.haproxy.org/download/${MAJOR_VER}/src/haproxy-${PV}.tar.gz \
- file://haproxy.service \
- file://haproxy.cfg \
- "
-
-inherit systemd useradd
-
-# create a user for running haproxy
-HAP_USER_HOME = "${libdir}/haproxy"
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--system --home ${HAP_USER_HOME} --shell /sbin/nologin \
- --groups haproxy --gid haproxy haproxy"
-GROUPADD_PARAM_${PN} = "haproxy"
-
-# for haproxy 1.x
-HAP_TARGET = "linux2628"
-
-EXTRA_OEMAKE = " \
- 'CPU=generic' \
- 'TARGET=${HAP_TARGET}' \
- 'USE_GETADDRINFO=1' \
- 'USE_OPENSSL=1' \
- 'USE_PCRE=1' 'USE_PCRE_JIT=1' \
- 'USE_ZLIB=1' \
- 'USE_LINUX_TPROXY=1' \
- "
-
-EXTRA_OEMAKE_append_x86 = " USE_REGPARM=1"
-EXTRA_OEMAKE_append_x86-64 = " USE_REGPARM=1"
-
-
-do_configure() {
- :
-}
-
-do_compile() {
- oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" SBINDIR="${sbindir}" \
- PREFIX="${prefix}" \
- ZLIB_INC=${STAGING_INCDIR} \
- ZLIB_LIB=${STAGING_LIBDIR} \
- PCRE_INC=${STAGING_INCDIR} \
- PCRE_LIB=${STAGING_LIBDIR} \
- SSL_INC=${STAGING_INCDIR} \
- SSL_LIB=${STAGING_LIBDIR}
- oe_runmake -C contrib/halog halog
- oe_runmake -C contrib/iprange iprange
-}
-
-do_install() {
- oe_runmake install-bin \
- PREFIX="${prefix}" \
- SBINDIR="${sbindir}" \
- DESTDIR=${D} \
- INCLUDEDIR=${includedir}
-
- install -D -m 0644 ${WORKDIR}/haproxy.service ${D}${systemd_system_unitdir}/haproxy.service
- sed -i -e 's#/usr/bin/haproxy#/usr/sbin/haproxy#g' ${D}${systemd_system_unitdir}/haproxy.service
-
- install -D -m 0644 ${WORKDIR}/haproxy.cfg ${D}${sysconfdir}/haproxy/haproxy.cfg
-
- # install ssl folder for certificate
- install -m 700 -d ${D}/${sysconfdir}/ssl/haproxy
- chown haproxy:haproxy ${D}/${sysconfdir}/ssl/haproxy
-
- # install halog and iprange
- install -D -m 755 contrib/halog/halog ${D}${bindir}/halog
- install -D -m 755 contrib/iprange/iprange ${D}${bindir}/iprange
-
- install -d -m 755 ${D}/${sysconfdir}/haproxy/errors/
- install -m 755 ${STX_METADATA_PATH}/files/503.http ${D}/${sysconfdir}/haproxy/errors/503.http
-
- install -p -D -m 0755 ${STX_METADATA_PATH}/files/haproxy.sh ${D}/${sysconfdir}/init.d/haproxy
-}
-
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-FILES_${PN} = " \
- ${bindir} \
- ${sbindir} \
- ${sysconfdir} \
- ${systemd_system_unitdir} \
- "
-RDEPENDS_${PN} = "openssl"
-
-SYSTEMD_SERVICE_${PN} = "haproxy.service"
-
-INSANE_SKIP_${PN} += "already-stripped"
+++ /dev/null
-
-include haproxy.inc
-
-SRC_URI += "file://haproxy-${PV}-tpm-support.patch"
-
-SRC_URI[md5sum] = "25be5ad717a71da89a65c3c24250e2eb"
-SRC_URI[sha256sum] = "d564b8e9429d1e8e13cb648bf4694926b472e36da1079df946bb732927b232ea"
+++ /dev/null
-From a5e95a42e7bceddc9ecad06694c1a0588f4bafc8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 14 Apr 2015 07:22:47 -0700
-Subject: [PATCH] include sys/types.h for getting u_* typedefs
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- cfg.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cfg.h b/cfg.h
-index d4d4cab..fe49e8f 100644
---- a/cfg.h
-+++ b/cfg.h
-@@ -33,6 +33,7 @@
- #ifndef _CONF_H_
- #define _CONF_H_
-
-+#include <sys/types.h>
- #include "queue.h"
-
- struct conf_list_node {
---
-2.1.4
-
+++ /dev/null
-Set nobody user and group
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Roy.Li <rongqing.li@windriver.com>
---- a/idmapd.conf
-+++ b/idmapd.conf
-@@ -17,8 +17,8 @@
-
- [Mapping]
-
--#Nobody-User = nobody
--#Nobody-Group = nobody
-+Nobody-User = nobody
-+Nobody-Group = nogroup
-
- [Translation]
-
+++ /dev/null
-Upstream-Status: Inappropriate [configuration]
-
---- a/configure.in
-+++ b/configure.in
-@@ -1,7 +1,7 @@
- # -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
-
--AC_PREREQ([2.68])
-+AC_PREREQ([2.65])
- AC_INIT([libnfsidmap],[0.25],[linux-nfs@vger.kernel.org])
- AC_CONFIG_SRCDIR([nfsidmap.h])
- AC_CONFIG_MACRO_DIR([m4])
+++ /dev/null
-
-SUMMARY = "NFS id mapping library"
-HOMEPAGE = "http://www.citi.umich.edu/projects/nfsv4/linux/"
-SECTION = "libs"
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d9c6a2a0ca6017fda7cd905ed2739b37"
-
-SRC_URI = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${BPN}-${PV}.tar.gz \
- file://fix-ac-prereq.patch \
- file://Set_nobody_user_group.patch \
- file://0001-include-sys-types.h-for-getting-u_-typedefs.patch \
- "
-
-SRC_URI[md5sum] = "2ac4893c92716add1a1447ae01df77ab"
-SRC_URI[sha256sum] = "656d245d84400e1030f8f40a5a27da76370690c4a932baf249110f047fe7efcf"
-
-UPSTREAM_CHECK_URI = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-ldap"
-
-do_install_append () {
- install -d ${D}${sysconfdir}/
- install -m 0644 ${WORKDIR}/${BPN}-${PV}/idmapd.conf ${D}${sysconfdir}/idmapd.conf
-}
-
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH0 = "filesystem-scripts"
-STX_SUBPATH1 = "nfs-utils-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/${STX_SUBPATH0}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- file://${STX_METADATA_PATH}/${STX_SUBPATH0}/filesystem-scripts-1.0/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- file://${STX_METADATA_PATH}/${STX_SUBPATH1}/centos/nfs-utils-config.spec;beginline=1;endline=10;md5=bbfb66ff81fec36fc2b2c9d98e01b1d8 \
- "
-
-inherit systemd
-
-PACKAGES =+ "${PN}-config"
-SYSTEMD_PACKAGES += "${PN}-config"
-SYSTEMD_SERVICE_${PN}-config = "uexportfs.service nfscommon.service nfsserver.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-SYSTEMD_AUTO_ENABLE_${PN}-config = "enable"
-
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-do_install_append() {
- mv ${D}/${sbindir}/sm-notify ${D}/${sbindir}/nfs-utils-client_sm-notify
- install -D -m 755 ${STX_METADATA_PATH}/${STX_SUBPATH0}/filesystem-scripts-1.0/uexportfs ${D}/${sysconfdir}/init.d/uexportfs
-
- # install nfs.conf and enable udp proto
- install -m 0755 ${S}/nfs.conf ${D}${sysconfdir}
- sed -i -e 's/#\(\[nfsd\]\)/\1/' -e 's/#\( udp=\).*/\1y/' ${D}${sysconfdir}/nfs.conf
-
- # add initial exports file
- echo "# Initial exports for nfs" > ${D}${sysconfdir}/exports
-
- # Libdir here is hardcoded in other scripts.
- install -d -m 0755 ${D}/usr/lib/ocf/resource.d/platform/
- install -D -m 755 ${STX_METADATA_PATH}/${STX_SUBPATH0}/filesystem-scripts-1.0/nfsserver-mgmt \
- ${D}/usr/lib/ocf/resource.d/platform/nfsserver-mgmt
-
- install -p -D -m 755 ${STX_METADATA_PATH}/${STX_SUBPATH0}/filesystem-scripts-1.0/nfs-mount ${D}/${bindir}/nfs-mount
- install -D -m 755 ${STX_METADATA_PATH}/${STX_SUBPATH0}/filesystem-scripts-1.0/uexportfs.service \
- ${D}/${systemd_system_unitdir}/uexportfs.service
-
-
- install -d ${D}/${sysconfdir}/init.d
- install -d ${D}/${systemd_system_unitdir}
-
- install -m 755 -p -D ${STX_METADATA_PATH}/${STX_SUBPATH1}/files/nfscommon ${D}/${sysconfdir}/init.d
- install -m 644 -p -D ${STX_METADATA_PATH}/${STX_SUBPATH1}/files/nfscommon.service ${D}/${systemd_system_unitdir}/
-
- install -m 755 -p -D ${STX_METADATA_PATH}/${STX_SUBPATH1}/files/nfsserver ${D}/${sysconfdir}/init.d
- install -m 644 -p -D ${STX_METADATA_PATH}/${STX_SUBPATH1}/files/nfsserver.service ${D}/${systemd_system_unitdir}
- install -m 644 -p -D ${STX_METADATA_PATH}/${STX_SUBPATH1}/files/nfsmount.conf ${D}/${sysconfdir}/nfsmount.conf
-
-}
-
-FILES_${PN}-config = "\
- ${systemd_system_unitdir}/nfscommon.service \
- ${systemd_system_unitdir}/nfsserver.service \
- ${systemd_system_unitdir}/uexportfs.service \
- ${sysconfdir}/nfsmount.conf \
- "
-FILES_${PN}_append = " usr/lib/ocf/resource.d"
+++ /dev/null
-diff --git a/sshd_config b/sshd_config
-index 0dfc0e2..b767509 100644
---- a/sshd_config
-+++ b/sshd_config
-@@ -144,5 +144,5 @@ DenyUsers admin secadmin operator
- # TODO (aning): once openssh is updated to 7.5, an explicit exclusion list
- # using "-" should be used for cipher, MAC and kex excluded suites.
- Ciphers aes128-ctr,aes192-ctr,aes256-ctr,aes128-gcm@openssh.com,aes256-gcm@openssh.com,chacha20-poly1305@openssh.com
--MACs hmac-sha1,hmac-sha2-256,hmac-sha2-512,hmac-ripemd160,hmac-ripemd160@openssh.com,umac-64@openssh.com,umac-128@openssh.com,hmac-sha1-etm@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-ripemd160-etm@openssh.com,umac-64-etm@openssh.com,umac-128-etm@openssh.com
-+MACs hmac-sha1,hmac-sha2-256,hmac-sha2-512,umac-64@openssh.com,umac-128@openssh.com,hmac-sha1-etm@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,umac-64-etm@openssh.com,umac-128-etm@openssh.com
- KexAlgorithms curve25519-sha256,curve25519-sha256@libssh.org,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,diffie-hellman-group14-sha256
+++ /dev/null
-#!/bin/bash
-
-# Create the host keys for the OpenSSH server.
-#
-# The creation is controlled by the $AUTOCREATE_SERVER_KEYS environment
-# variable.
-AUTOCREATE_SERVER_KEYS="RSA ECDSA ED25519"
-
-# source function library
-. /etc/init.d/functions
-
-# Some functions to make the below more readable
-KEYGEN=/usr/bin/ssh-keygen
-RSA1_KEY=/etc/ssh/ssh_host_key
-RSA_KEY=/etc/ssh/ssh_host_rsa_key
-DSA_KEY=/etc/ssh/ssh_host_dsa_key
-ECDSA_KEY=/etc/ssh/ssh_host_ecdsa_key
-ED25519_KEY=/etc/ssh/ssh_host_ed25519_key
-
-# pull in sysconfig settings
-[ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd
-
-fips_enabled() {
- if [ -r /proc/sys/crypto/fips_enabled ]; then
- cat /proc/sys/crypto/fips_enabled
- else
- echo 0
- fi
-}
-
-do_rsa1_keygen() {
- if [ ! -s $RSA1_KEY -a `fips_enabled` -eq 0 ]; then
- echo -n $"Generating SSH1 RSA host key: "
- rm -f $RSA1_KEY
- if test ! -f $RSA1_KEY && $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then
- chgrp ssh_keys $RSA1_KEY
- chmod 600 $RSA1_KEY
- chmod 644 $RSA1_KEY.pub
- if [ -x /sbin/restorecon ]; then
- /sbin/restorecon $RSA1_KEY{,.pub}
- fi
- success $"RSA1 key generation"
- echo
- else
- failure $"RSA1 key generation"
- echo
- exit 1
- fi
- fi
-}
-
-do_rsa_keygen() {
- if [ ! -s $RSA_KEY ]; then
- echo -n $"Generating SSH2 RSA host key: "
- rm -f $RSA_KEY
- if test ! -f $RSA_KEY && $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then
- chgrp ssh_keys $RSA_KEY
- chmod 600 $RSA_KEY
- chmod 644 $RSA_KEY.pub
- if [ -x /sbin/restorecon ]; then
- /sbin/restorecon $RSA_KEY{,.pub}
- fi
- success $"RSA key generation"
- echo
- else
- failure $"RSA key generation"
- echo
- exit 1
- fi
- fi
-}
-
-do_dsa_keygen() {
- if [ ! -s $DSA_KEY -a `fips_enabled` -eq 0 ]; then
- echo -n $"Generating SSH2 DSA host key: "
- rm -f $DSA_KEY
- if test ! -f $DSA_KEY && $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then
- chgrp ssh_keys $DSA_KEY
- chmod 600 $DSA_KEY
- chmod 644 $DSA_KEY.pub
- if [ -x /sbin/restorecon ]; then
- /sbin/restorecon $DSA_KEY{,.pub}
- fi
- success $"DSA key generation"
- echo
- else
- failure $"DSA key generation"
- echo
- exit 1
- fi
- fi
-}
-
-do_ecdsa_keygen() {
- if [ ! -s $ECDSA_KEY ]; then
- echo -n $"Generating SSH2 ECDSA host key: "
- rm -f $ECDSA_KEY
- if test ! -f $ECDSA_KEY && $KEYGEN -q -t ecdsa -f $ECDSA_KEY -C '' -N '' >&/dev/null; then
- chgrp ssh_keys $ECDSA_KEY
- chmod 600 $ECDSA_KEY
- chmod 644 $ECDSA_KEY.pub
- if [ -x /sbin/restorecon ]; then
- /sbin/restorecon $ECDSA_KEY{,.pub}
- fi
- success $"ECDSA key generation"
- echo
- else
- failure $"ECDSA key generation"
- echo
- exit 1
- fi
- fi
-}
-
-do_ed25519_keygen() {
- if [ ! -s $ED25519_KEY -a `fips_enabled` -eq 0 ]; then
- echo -n $"Generating SSH2 ED25519 host key: "
- rm -f $ED25519_KEY
- if test ! -f $ED25519_KEY && $KEYGEN -q -t ed25519 -f $ED25519_KEY -C '' -N '' >&/dev/null; then
- chgrp ssh_keys $ED25519_KEY
- chmod 600 $ED25519_KEY
- chmod 644 $ED25519_KEY.pub
- if [ -x /sbin/restorecon ]; then
- /sbin/restorecon $ED25519_KEY{,.pub}
- fi
- success $"ED25519 key generation"
- echo
- else
- failure $"ED25519 key generation"
- echo
- exit 1
- fi
- fi
-}
-
-if [ "x${AUTOCREATE_SERVER_KEYS}" == "xNO" ]; then
- exit 0
-fi
-
-# legacy options
-case $AUTOCREATE_SERVER_KEYS in
- NODSA) AUTOCREATE_SERVER_KEYS="RSA ECDSA ED25519";;
- RSAONLY) AUTOCREATE_SERVER_KEYS="RSA";;
- YES) AUTOCREATE_SERVER_KEYS="DSA RSA ECDSA ED25519";;
-esac
-
-for KEY in $AUTOCREATE_SERVER_KEYS; do
- case $KEY in
- DSA) do_dsa_keygen;;
- RSA) do_rsa_keygen;;
- ECDSA) do_ecdsa_keygen;;
- ED25519) do_ed25519_keygen;;
- esac
-done
+++ /dev/null
-[Unit]
-Description=OpenSSH Server Key Generation
-ConditionFileNotEmpty=|!/etc/ssh/ssh_host_rsa_key
-ConditionFileNotEmpty=|!/etc/ssh/ssh_host_ecdsa_key
-ConditionFileNotEmpty=|!/etc/ssh/ssh_host_ed25519_key
-PartOf=sshd.service sshd.socket
-
-[Service]
-ExecStart=/usr/sbin/sshd-keygen
-Type=oneshot
-RemainAfterExit=yes
+++ /dev/null
-#!/bin/bash
-#
-# sshd Start up the OpenSSH server daemon
-#
-# chkconfig: 2345 55 25
-# description: SSH is a protocol for secure remote shell access. \
-# This service starts up the OpenSSH server daemon.
-#
-# processname: sshd
-# config: /etc/ssh/ssh_host_key
-# config: /etc/ssh/ssh_host_key.pub
-# config: /etc/ssh/ssh_random_seed
-# config: /etc/ssh/sshd_config
-# pidfile: /var/run/sshd.pid
-
-### BEGIN INIT INFO
-# Provides: sshd
-# Required-Start: $local_fs $network $syslog
-# Required-Stop: $local_fs $syslog
-# Should-Start: $syslog
-# Should-Stop: $network $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start up the OpenSSH server daemon
-# Description: SSH is a protocol for secure remote shell access.
-# This service starts up the OpenSSH server daemon.
-### END INIT INFO
-
-# source function library
-. /etc/init.d/functions
-
-# pull in sysconfig settings
-[ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd
-
-RETVAL=0
-prog="sshd"
-lockfile=/var/lock/subsys/$prog
-
-# Some functions to make the below more readable
-SSHD=/usr/sbin/sshd
-XPID_FILE=/var/run/sshd.pid
-PID_FILE=/var/run/sshd-s.pid
-
-runlevel=$(set -- $(runlevel); eval "echo \$$#" )
-
-do_restart_sanity_check()
-{
- $SSHD -t
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
- failure $"Configuration file or keys are invalid"
- echo
- fi
-}
-
-start()
-{
- [ -x $SSHD ] || exit 5
- [ -f /etc/ssh/sshd_config ] || exit 6
- # Create keys if necessary
- /usr/sbin/sshd-keygen
-
- # In rare instances, sshd may be started but a pid
- # file is not generated. This is seen usually during
- # system reboot scenarios. A subsequent attempt to start
- # sshd here will trigger a port bind error. As a sanity
- # check attempt a kill call (mostly redundant) to any
- # previously running sshd instance
- /bin/kill `/bin/pidof "$SSHD"` >/dev/null 2>&1
-
- echo -n $"Starting $prog: "
- $SSHD $OPTIONS && success || failure
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch $lockfile
- [ $RETVAL -eq 0 ] && cp -f $XPID_FILE $PID_FILE
- echo
- return $RETVAL
-}
-
-stop()
-{
-
- echo -n $"Stopping $prog: "
- if [ ! -f "$PID_FILE" ]; then
- # not running; per LSB standards this is "ok"
- action $"Stopping $prog: " /bin/true
- return 0
- fi
- PID=`cat "$PID_FILE"`
- if [ -n "$PID" ]; then
- /bin/kill "$PID" >/dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -eq 0 ]; then
- RETVAL=1
- action $"Stopping $prog: " /bin/false
- else
- action $"Stopping $prog: " /bin/true
- fi
- else
- # failed to read pidfile
- action $"Stopping $prog: " /bin/false
- RETVAL=4
- fi
- # if we are in halt or reboot runlevel kill all running sessions
- # so the TCP connections are closed cleanly
- if [ "x$runlevel" = x0 -o "x$runlevel" = x6 ] ; then
- trap '' TERM
- killall $prog 2>/dev/null
- trap TERM
- fi
- [ $RETVAL -eq 0 ] && rm -f $lockfile
- rm -f "$PID_FILE"
- return $RETVAL
-}
-
-reload()
-{
- echo -n $"Reloading $prog: "
- if [ -n "`pidfileofproc $SSHD`" ] ; then
- killproc $SSHD -HUP
- else
- failure $"Reloading $prog"
- fi
- RETVAL=$?
- echo
-}
-
-restart() {
- stop
- start
-}
-
-force_reload() {
- restart
-}
-
-rh_status() {
- status -p $PID_FILE openssh-daemon
-}
-
-rh_status_q() {
- rh_status >/dev/null 2>&1
-}
-
-case "$1" in
- start)
- rh_status_q && exit 0
- start
- ;;
- stop)
- if ! rh_status_q; then
- rm -f $lockfile
- exit 0
- fi
- stop
- ;;
- restart)
- restart
- ;;
- reload)
- rh_status_q || exit 7
- reload
- ;;
- force-reload)
- force_reload
- ;;
- condrestart|try-restart)
- rh_status_q || exit 0
- if [ -f $lockfile ] ; then
- do_restart_sanity_check
- if [ $RETVAL -eq 0 ] ; then
- stop
- # avoid race
- sleep 3
- start
- else
- RETVAL=6
- fi
- fi
- ;;
- status)
- rh_status
- RETVAL=$?
- if [ $RETVAL -eq 3 -a -f $lockfile ] ; then
- RETVAL=2
- fi
- ;;
- *)
- echo $"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status}"
- RETVAL=2
-esac
-exit $RETVAL
+++ /dev/null
-[Unit]
-Description=OpenSSH server daemon
-Documentation=man:sshd(8) man:sshd_config(5)
-After=network.target sshd-keygen.service
-Wants=sshd-keygen.service
-
-[Service]
-Type=notify
-EnvironmentFile=/etc/sysconfig/sshd
-ExecStart=/usr/sbin/sshd -D $OPTIONS
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-Restart=on-failure
-RestartSec=42s
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-# Configuration file for the sshd service.
-
-# The server keys are automatically generated if they are missing.
-# To change the automatic creation uncomment and change the appropriate
-# line. Accepted key types are: DSA RSA ECDSA ED25519.
-# The default is "RSA ECDSA ED25519"
-
-# AUTOCREATE_SERVER_KEYS=""
-# AUTOCREATE_SERVER_KEYS="RSA ECDSA ED25519"
-
-# Do not change this option unless you have hardware random
-# generator and you REALLY know what you are doing
-
-SSH_USE_STRONG_RNG=0
-# SSH_USE_STRONG_RNG=1
+++ /dev/null
-#
-## Copyright (C) 2019 Wind River Systems, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "openssh-config"
-
-SRC_URI += "\
- file://stx/sshd.init \
- file://stx/sshd-keygen \
- file://stx/sshd-keygen.service \
- file://stx/sshd.sysconfig \
- file://openssh-config-rm-hmac-ripemd160.patch \
-"
-
-do_unpack_append() {
- bb.build.exec_func('do_copy_config_files', d)
-}
-
-do_copy_config_files () {
- cp -f ${STX_METADATA_PATH}/files/sshd_config ${S}
- # remove the unsupported and deprecated options
- sed -i -e 's/^\(GSSAPIAuthentication.*\)/#\1/' \
- -e 's/^\(GSSAPICleanupCredentials.*\)/#\1/' \
- -e 's/^\(UsePrivilegeSeparation.*\)/#\1/' \
- ${S}/sshd_config
- cp -f ${STX_METADATA_PATH}/files/ssh_config ${S}
-}
-
-SYSTEMD_SERVICE_${PN}-sshd = "sshd.service"
-
-do_install_append () {
- rm -f ${D}${systemd_system_unitdir}/sshd.socket
- rm -f ${D}${systemd_system_unitdir}/sshd@service.socket
- rm -f ${D}${systemd_system_unitdir}/sshdgenkeys.service
-
- install -d ${D}/${sysconfdir}/init.d/
- install -m 755 ${WORKDIR}/stx/sshd.init ${D}/${sysconfdir}/init.d/sshd
-
- install -d ${D}/${sysconfdir}/sysconfig/
- install -m 644 ${WORKDIR}/stx/sshd.sysconfig ${D}/${sysconfdir}/sysconfig/sshd
-
- install -m 755 ${WORKDIR}/stx/sshd-keygen ${D}/${sbindir}/sshd-keygen
- install -m644 ${STX_METADATA_PATH}/files/sshd.service ${D}/${systemd_system_unitdir}/sshd.service
- install -m644 ${WORKDIR}/stx/sshd-keygen.service ${D}/${systemd_system_unitdir}/sshd-keygen.service
-
- install -d ${D}/${sysconfdir}/tmpfiles.d
- echo "d ${localstatedir}/run/sshd 0755 root root -" >> ${D}/${sysconfdir}/tmpfiles.d/sshd.conf
-
-}
-
-RDEPENDS_${PN} += "bash"
-RDEPENDS_${PN}-sshd += "bash"
-
-# allow both systemd service and sysvinit scripts are installed
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-USERADD_PARAM_${PN}-sshd = "-r -d /var/empty/sshd -s /sbin/nologin -g sshd -c 'Privilege-separated SSH' sshd"
-GROUPADD_PARAM_${PN}-sshd = "-r ssh_keys; -r sshd"
+++ /dev/null
-
-SYSROOT_DIRS_BLACKLIST = " ${bindir} ${sysconfdir}"
-
-SYSROOT_PREPROCESS_FUNCS += "openssl10_avoid_conflict"
-
-openssl10_avoid_conflict () {
-
- # For libaries remove statics and symlinks to avoid conflict
-
- rm ${SYSROOT_DESTDIR}${libdir}/libssl.so
- rm ${SYSROOT_DESTDIR}${libdir}/libcrypto.so
- rm ${SYSROOT_DESTDIR}${libdir}/libssl.a
- rm ${SYSROOT_DESTDIR}${libdir}/libcrypto.a
- #mv ${SYSROOT_DESTDIR}${libdir}/pkgconfig/libcrypto.pc ${SYSROOT_DESTDIR}${libdir}/pkgconfig/libcrypto10.pc
- #mv ${SYSROOT_DESTDIR}${libdir}/pkgconfig/libssl.pc ${SYSROOT_DESTDIR}${libdir}/pkgconfig/libcrypto10.pc
- #mv ${SYSROOT_DESTDIR}${libdir}/pkgconfig/openssl.pc ${SYSROOT_DESTDIR}${libdir}/pkgconfig/openssl10.pc
- rm -rf ${SYSROOT_DESTDIR}${libdir}/pkgconfig
- rm -rf ${SYSROOT_DESTDIR}${libdir}/engines
- # For headers
- mkdir -p ${SYSROOT_DESTDIR}${includedir}/openssl10
- mv ${SYSROOT_DESTDIR}${includedir}/openssl ${SYSROOT_DESTDIR}${includedir}/openssl10
-}
+++ /dev/null
-
-DESCRIPTION = "Non-interactive ssh password auth"
-HOMEPAGE = "http://sshpass.sourceforge.net/"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-
-# SRC_URI = "${SOURCEFORGE_MIRROR}/sshpass/sshpass-${PV}.tar.gz"
-SRC_URI = "https://fossies.org/linux/privat/sshpass-${PV}.tar.gz"
-
-INC_PR = "r0"
-
-inherit autotools
+++ /dev/null
-
-PR = "${INC_PR}.0"
-
-require sshpass.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-SRC_URI[md5sum] = "f59695e3b9761fb51be7d795819421f9"
-SRC_URI[sha256sum] = "c6324fcee608b99a58f9870157dfa754837f8c48be3df0f5e2f3accf145dee60"
-
+++ /dev/null
-
-SUMMARY = "ifupdown integration for vlan configuration"
-HOMEPAGE = "https://salsa.debian.org/debian/vlan"
-SECTION = "misc"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://debian/copyright;;md5=a99f1f04fc1d4f5d723231f8937bdc2b"
-
-SRC_URI = "https://deb.debian.org/debian/pool/main/v/vlan/vlan_2.0.5.tar.xz"
-
-SRC_URI[md5sum] = "e6994250748fa3ee6d99f3ac292b7eb9"
-SRC_URI[sha256sum] = "ccf261839b79247be8dae93074e1c5fcbce3807787a0ff7aed4e1f7a9095c465"
-
-do_install () {
- install -d ${D}${base_sbindir}
- install -m 0755 ${S}/vconfig ${D}${base_sbindir}/
-
- install -d ${D}${sysconfdir}
- cp -av --no-preserve=ownership ${S}/debian/network ${D}${sysconfdir}
-}
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH0 = "setup-config"
-STX_SUBPATH1 = "centos-release-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/${STX_SUBPATH0}/centos/setup-config.spec;beginline=1;endline=10;md5=0ba4936433e3eb7acdd7d236af0d2496 \
- "
-
-do_install_append() {
-
- install -d ${D}/${sysconfdir}/profile.d
- install -m 644 ${STX_METADATA_PATH}/${STX_SUBPATH0}/files/motd ${D}/${sysconfdir}/motd
- install -m 644 ${STX_METADATA_PATH}/${STX_SUBPATH0}/files/prompt.sh ${D}/${sysconfdir}/profile.d/prompt.sh
- install -m 644 ${STX_METADATA_PATH}/${STX_SUBPATH0}/files/custom.sh ${D}/${sysconfdir}/profile.d/custom.sh
-
- install -m 644 ${STX_METADATA_PATH}/${STX_SUBPATH1}/files/issue ${D}/${sysconfdir}/issue
- install -m 644 ${STX_METADATA_PATH}/${STX_SUBPATH1}/files/issue.net ${D}/${sysconfdir}/issue.net
- sed -i -e 's/@PLATFORM_RELEASE@/${STX_REL}/' ${D}${sysconfdir}/issue*
-}
+++ /dev/null
-do_install_append() {
- rm -f ${D}/etc/network/interfaces
- touch ${D}/etc/network/interfaces
- cat > ${D}/etc/network/interfaces << EOF
-auto lo
-iface lo inet loopback
-EOF
-}
-
-RDEPENDS_${PN} += "ifupdown"
+++ /dev/null
-#!/bin/sh -e
-#
-# install.sh [device_name] [rootfs_name] [video_mode] [vga_mode]
-#
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-# Get a list of hard drives
-hdnamelist=""
-live_dev_name=`cat /proc/mounts | grep ${1%/} | awk '{print $1}'`
-live_dev_name=${live_dev_name#\/dev/}
-# Only strip the digit identifier if the device is not an mmc
-case $live_dev_name in
- mmcblk*)
- ;;
- nvme*)
- ;;
- *)
- live_dev_name=${live_dev_name%%[0-9]*}
- ;;
-esac
-
-echo "Searching for hard drives ..."
-
-# Some eMMC devices have special sub devices such as mmcblk0boot0 etc
-# we're currently only interested in the root device so pick them wisely
-devices=`ls /sys/block/ | grep -v mmcblk` || true
-mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` || true
-devices="$devices $mmc_devices"
-
-for device in $devices; do
- case $device in
- loop*)
- # skip loop device
- ;;
- sr*)
- # skip CDROM device
- ;;
- ram*)
- # skip ram device
- ;;
- *)
- # skip the device LiveOS is on
- # Add valid hard drive name to the list
- case $device in
- $live_dev_name*)
- # skip the device we are running from
- ;;
- *)
- hdnamelist="$hdnamelist $device"
- ;;
- esac
- ;;
- esac
-done
-
-TARGET_DEVICE_NAME=""
-for hdname in $hdnamelist; do
- # Display found hard drives and their basic info
- echo "-------------------------------"
- echo /dev/$hdname
- if [ -r /sys/block/$hdname/device/vendor ]; then
- echo -n "VENDOR="
- cat /sys/block/$hdname/device/vendor
- fi
- if [ -r /sys/block/$hdname/device/model ]; then
- echo -n "MODEL="
- cat /sys/block/$hdname/device/model
- fi
- if [ -r /sys/block/$hdname/device/uevent ]; then
- echo -n "UEVENT="
- cat /sys/block/$hdname/device/uevent
- fi
- echo
-done
-
-# use the first one found
-for hdname in $hdnamelist; do
- TARGET_DEVICE_NAME=$hdname
- break
-done
-
-if [ -n "$TARGET_DEVICE_NAME" ]; then
- echo "Installing image on /dev/$TARGET_DEVICE_NAME ..."
-else
- echo "No hard drive found. Installation aborted."
- exit 1
-fi
-
-device=/dev/$TARGET_DEVICE_NAME
-
-#
-# Unmount anything the automounter had mounted
-#
-
-for dir in `awk '/\/dev.* \/run\/media/{print $2}' /proc/mounts | grep $TARGET_DEVICE_NAME`; do
- umount $dir
-done
-
-if [ ! -b /dev/loop0 ] ; then
- mknod /dev/loop0 b 7 0
-fi
-
-mkdir -p /tmp
-if [ ! -L /etc/mtab ] && [ -e /proc/mounts ]; then
- ln -sf /proc/mounts /etc/mtab
-fi
-
-disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//")
-
-grub_version=$(grub-install -V|sed 's/.* \([0-9]\).*/\1/')
-
-if [ $grub_version -eq 0 ] ; then
- bios_boot_size=0
-else
- # For GRUB 2 we need separate parition to store stage2 grub image
- # 2Mb value is chosen to align partition for best performance.
- bios_boot_size=2
-fi
-
-boot_size=512
-rootfs_size=20000
-log_vol_size=8000
-scratch_vol_size=8000
-
-data_size=$((disk_size-bios_boot_size-boot_size-rootfs_size))
-boot_start=$((bios_boot_size))
-rootfs_start=$((bios_boot_size+boot_size))
-rootfs_end=$((rootfs_start+rootfs_size))
-data_start=$((rootfs_end))
-
-# MMC devices are special in a couple of ways
-# 1) they use a partition prefix character 'p'
-# 2) they are detected asynchronously (need rootwait)
-rootwait=""
-part_prefix=""
-if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \
- [ ! "${device#/dev/nvme}" = "${device}" ]; then
- part_prefix="p"
- rootwait="rootwait"
-fi
-
-# USB devices also require rootwait
-if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then
- rootwait="rootwait"
-fi
-
-if [ $grub_version -eq 0 ] ; then
- bios_boot=''
- bootfs=${device}${part_prefix}1
- rootfs=${device}${part_prefix}2
- data=${device}${part_prefix}3
-else
- bios_boot=${device}${part_prefix}1
- bootfs=${device}${part_prefix}2
- rootfs=${device}${part_prefix}3
- data=${device}${part_prefix}4
-fi
-
-echo "*********************************************"
-[ $grub_version -ne 0 ] && echo "BIOS boot partition size: $bios_boot_size MB ($bios_boot)"
-echo "Boot partition size: $boot_size MB ($bootfs)"
-echo "Rootfs partition size: $rootfs_size MB ($rootfs)"
-echo "Data partition size: $data_size MB ($data)"
-echo "*********************************************"
-echo "Deleting partition table on ${device} ..."
-dd if=/dev/zero of=${device} bs=512 count=35
-
-echo "Creating new partition table on ${device} ..."
-if [ $grub_version -eq 0 ] ; then
- parted ${device} mktable msdos
- echo "Creating boot partition on $bootfs"
- parted ${device} mkpart primary ext3 0% $boot_size
-else
- parted ${device} mktable gpt
- echo "Creating BIOS boot partition on $bios_boot"
- parted ${device} mkpart bios_boot 0% $bios_boot_size
- parted ${device} set 1 bios_grub on
- echo "Creating boot partition on $bootfs"
- parted ${device} mkpart boot ext3 $boot_start $boot_size
-fi
-
-echo "Creating rootfs partition on $rootfs"
-[ $grub_version -eq 0 ] && pname='primary' || pname='root'
-parted ${device} -s mkpart $pname ext4 $rootfs_start $rootfs_end
-
-echo "Creating data partition on $data"
-[ $grub_version -eq 0 ] && pname='primary' || pname='data'
-parted ${device} -s mkpart $pname $data_start 100%
-parted ${device} -s set 4 lvm on
-
-parted ${device} print
-
-echo "Waiting for device nodes..."
-C=0
-while [ $C -ne 3 ] && [ ! -e $bootfs -o ! -e $rootfs -o ! -e $data ]; do
- C=$(( C + 1 ))
- sleep 1
-done
-
-echo "Formatting $bootfs to ext3..."
-mkfs.ext3 -F $bootfs
-
-echo "Formatting $rootfs to ext4..."
-mkfs.ext4 -F $rootfs
-
-echo "Create LVM for $data..."
-vg_name="cgts-vg"
-
-# Disable udev scan in lvm.conf
-sed -i 's/\(md_component_detection =\).*/\1 0/' /etc/lvm/lvm.conf
-
-pvcreate -y -ff $data
-vgcreate -y -ff $vg_name $data
-
-udevd -d
-
-lvcreate -y -n log-lv --size $log_vol_size $vg_name
-lvcreate -y -n scratch-lv --size $scratch_vol_size $vg_name
-
-mkfs.ext4 -F /dev/$vg_name/log-lv
-mkfs.ext4 -F /dev/$vg_name/scratch-lv
-
-mkdir /tgt_root
-mkdir /tgt_log
-mkdir /src_root
-mkdir -p /boot
-
-if [ ! -f /run/media/$1/$2 ]; then
- mkdir -p /run/media/$1
- mount /dev/$1 /run/media/$1
-fi
-
-# Handling of the target root partition
-mount $rootfs /tgt_root
-mount /dev/$vg_name/log-lv /tgt_log
-mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root
-echo "Copying rootfs files..."
-cp -a /src_root/* /tgt_root
-if [ -d /tgt_root/etc/ ] ; then
- if [ $grub_version -ne 0 ] ; then
- boot_uuid=$(blkid -o value -s UUID ${bootfs})
- bootdev="UUID=$boot_uuid"
- else
- bootdev=${bootfs}
- fi
- sed -i '/vfat/d' /tgt_root/etc/fstab
- echo "$bootdev /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab
- echo "/dev/$vg_name/log-lv /var/log ext4 defaults 1 2" >> /tgt_root/etc/fstab
- echo "/dev/$vg_name/scratch-lv /scratch ext4 defaults 1 2" >> /tgt_root/etc/fstab
-
- # We dont want udev to mount our root device while we're booting...
- if [ -d /tgt_root/etc/udev/ ] ; then
- echo "${device}" >> /tgt_root/etc/udev/mount.blacklist
- fi
-fi
-
-INSTALL_UUID=`uuidgen`
-cat << _EOF > /tgt_root/etc/platform/platform.conf
-nodetype=controller
-subfunction=controller,worker
-system_type=All-in-one
-security_profile=standard
-management_interface=lo
-http_port=8080
-INSTALL_UUID=${INSTALL_UUID}
-_EOF
-
-# Create first_boot flag
-touch /tgt_root/etc/platform/.first_boot
-
-# The grub.cfg is created by installer, so the postinsts script is not needed.
-rm -f /tgt_root/etc/rpm-postinsts/*-grub
-
-# /var/log will be mounted to the log-lv
-# so move the all files to log-lv
-cp -rf /tgt_root/var/log/* /tgt_log
-rm -rf /tgt_root/var/log
-
-# Fake as anaconda to add info needed by stx 3.0
-cat << _EOF > /tgt_root/etc/rpm-postinsts/999-anaconda
-# anaconda - postinst
-#!/bin/sh
-set -e
-mkdir -p /var/log/anaconda/
-echo "Display mode = t" > /var/log/anaconda/anaconda.log
-_EOF
-chmod 0755 /tgt_root/etc/rpm-postinsts/999-anaconda
-
-umount /tgt_root
-umount /src_root
-
-echo "Looking for kernels to use as boot target.."
-# Find kernel to boot to
-# Give user options if multiple are found
-kernels="$(find /run/media/$1/ -type f \
- -name bzImage* -o -name zImage* \
- -o -name vmlinux* -o -name vmlinuz* \
- -o -name fitImage* \
- | sed s:.*/::)"
-if [ -n "$(echo $kernels)" ]; then
- # only one kernel entry if no space
- if [ -z "$(echo $kernels | grep " ")" ]; then
- kernel=$kernels
- echo "$kernel will be used as the boot target"
- else
- echo "Which kernel do we want to boot by default? The following kernels were found:"
- echo $kernels
- read answer
- kernel=$answer
- fi
-else
- echo "No kernels found, exiting..."
- exit 1
-fi
-
-# Handling of the target boot partition
-mount $bootfs /boot
-echo "Preparing boot partition..."
-
-if [ -f /etc/grub.d/00_header -a $grub_version -ne 0 ] ; then
- echo "Preparing custom grub2 menu..."
- root_part_uuid=$(blkid -o value -s PARTUUID ${rootfs})
- boot_uuid=$(blkid -o value -s UUID ${bootfs})
- GRUBCFG="/boot/grub/grub.cfg"
- mkdir -p $(dirname $GRUBCFG)
- cat >$GRUBCFG <<_EOF
-timeout=5
-default=0
-menuentry "Yocto Linux with StarlingX @STX_ID@" {
- search --no-floppy --fs-uuid $boot_uuid --set root
- linux /$kernel root=$rootfs $rootwait rw console=tty0 console=ttyS0,115200 $5 $3 $4
-}
-_EOF
- chmod 0444 $GRUBCFG
-fi
-grub-install ${device}
-
-if [ $grub_version -eq 0 ] ; then
- echo "(hd0) ${device}" > /boot/grub/device.map
- echo "Preparing custom grub menu..."
- echo "default 0" > /boot/grub/menu.lst
- echo "timeout 30" >> /boot/grub/menu.lst
- echo "title Live Boot/Install-Image" >> /boot/grub/menu.lst
- echo "root (hd0,0)" >> /boot/grub/menu.lst
- echo "kernel /$kernel root=$rootfs rw $3 $4 quiet" >> /boot/grub/menu.lst
-fi
-
-# Copy kernel artifacts. To add more artifacts just add to types
-# For now just support kernel types already being used by something in OE-core
-for types in bzImage zImage vmlinux vmlinuz fitImage; do
- for kernel in `find /run/media/$1/ -name $types*`; do
- cp $kernel /boot
- done
-done
-
-umount /boot
-
-sync
-
-echo "Remove your installation media, and press ENTER"
-
-read enter
-
-echo "Rebooting..."
-reboot -f
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-do_install_append () {
- sed -i -e 's/@STX_ID@/${STX_ID}/' ${D}/init.d/install.sh
-}
-
-RDEPENDS_${PN} += "\
- util-linux-mount \
- util-linux-uuidgen \
- lvm2 \
-"
+++ /dev/null
-#/bin/sh
-
-_UDEV_DAEMON=`udev_daemon`
-
-setup_enabled() {
- return 0
-}
-
-setup_run() {
-ROOT_IMAGE="rootfs.img"
-ISOLINUX=""
-ROOT_DISK=""
-shelltimeout=60
-
- if [ -z "$bootparam_root" -o "$bootparam_root" = "/dev/ram0" ]; then
- echo "Waiting for removable media..."
- udevadm trigger --action=add
- udevadm settle
- echo "Mounted filesystems"
- mount |grep media
- C=0
- while true
- do
- for i in `ls /run/media 2>/dev/null`; do
- if [ -f /run/media/$i/$ROOT_IMAGE ] ; then
- found="yes"
- ROOT_DISK="$i"
- break
- elif [ -f /run/media/$i/isolinux/$ROOT_IMAGE ]; then
- found="yes"
- ISOLINUX="isolinux"
- ROOT_DISK="$i"
- break
- fi
- done
- if [ "$found" = "yes" ]; then
- break;
- fi
- # don't wait for more than $shelltimeout seconds, if it's set
- if [ -n "$shelltimeout" ]; then
- echo " " $(( $shelltimeout - $C ))
- if [ $C -ge $shelltimeout ]; then
- echo "..."
- echo "Mounted filesystems"
- mount | grep media
- echo "Available block devices"
- cat /proc/partitions
- msg "Cannot find $ROOT_IMAGE file in /run/media/* , dropping to a shell "
- /bin/sh
- fi
- udevadm trigger --action=add
- udevadm settle
- echo "Mounted filesystems"
- mount |grep media
- C=$(( C + 1 ))
- fi
- sleep 1
- done
- killall -9 "${_UDEV_DAEMON##*/}" 2>/dev/null
- # The existing rootfs module has no support for rootfs images. Assign the rootfs image.
- bootparam_root="/run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE"
- fi
-
- if [ "$bootparam_LABEL" != "boot" -a -f /init.d/$bootparam_LABEL.sh ] ; then
- if [ -f /run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE ] ; then
- ./init.d/$bootparam_LABEL.sh $ROOT_DISK/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params
- else
- msg "Could not find $bootparam_LABEL script"
- /bin/sh
- fi
-
- # If we're getting here, we failed...
- msg "Target $bootparam_LABEL failed"
- /bin/sh
- fi
-}
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-module-setup-live:"
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "initscripts-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += " \
- file://${STX_METADATA_PATH}/centos/initscripts-config.spec;beginline=1;endline=10;md5=5c43895c2c3756125227c74209b8b791 \
- "
-
-inherit systemd
-SYSTEMD_PACKAGES += "${PN}"
-SYSTEMD_SERVICE_${PN}_append = "mountnfs.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-do_install_append () {
- install -d -m 755 ${D}/${sysconfdir}/sysconfig
- install -d -m 755 ${D}/${sysconfdir}/init.d
- install -d -m 755 ${D}/${systemd_system_unitdir}
-
- install -m 644 ${STX_METADATA_PATH}/files/sysconfig-network.conf ${D}/${sysconfdir}/sysconfig/network
- install -m 755 ${STX_METADATA_PATH}/files/mountnfs.sh ${D}/${sysconfdir}/init.d/mountnfs
- install -m 644 ${STX_METADATA_PATH}/files/mountnfs.service ${D}/${systemd_system_unitdir}/mountnfs.service
-}
+++ /dev/null
-From 5ef6dbb951246912ba021f9e2edacd0f9e7619e6 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Sat, 29 Feb 2020 12:48:57 -0800
-Subject: [PATCH] inject milisec in syslog date
-
-From stx.3.0: 0231aba5cdcb96b15106591acfff280159050366
----
- src/journal/journald-syslog.c | 45 +++++++++++++++++++++++++++++++----
- 1 file changed, 40 insertions(+), 5 deletions(-)
-
-diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
-index a60a259bc4..0036750353 100644
---- a/src/journal/journald-syslog.c
-+++ b/src/journal/journald-syslog.c
-@@ -25,6 +25,44 @@
- /* Warn once every 30s if we missed syslog message */
- #define WARN_FORWARD_SYSLOG_MISSED_USEC (30 * USEC_PER_SEC)
-
-+/* internal function that builds a formatted time str of the
-+ * tv parameter into the passed buffer. (ie Nov 7 16:28:38.109)
-+ * If tv is NULL, then the clock function is used to build the formatted time
-+ * returns (same as snprintf) - number of characters written to buffer.
-+ */
-+static int formatSyslogDate(char * buffer, int bufLen, const struct timeval *tv) {
-+ struct timeval tv_tmp;
-+ long int millisec;
-+ char tmpbuf[64];
-+ struct tm *tm;
-+ time_t t;
-+
-+ if (!tv) {
-+ // no timeval input so get time data from clock
-+ usec_t now_usec = now(CLOCK_REALTIME);
-+ time_t now_sec = ((time_t) now_usec / USEC_PER_SEC);
-+ long int now_fraction_secs = now_usec % USEC_PER_SEC;
-+ tv_tmp.tv_sec = now_sec;
-+ tv_tmp.tv_usec = now_fraction_secs;
-+ tv = &tv_tmp;
-+ }
-+
-+ t = tv->tv_sec;
-+ tm = localtime(&t);
-+ if (!tm)
-+ return 0;
-+
-+ // format time to the second granularity - ie Nov 7 16:28:38
-+ if (strftime(tmpbuf,sizeof(tmpbuf),"%h %e %T", tm) <= 0)
-+ return 0;
-+
-+ millisec = tv->tv_usec / 1000;
-+ // now append millisecond granularity (ie Nov 7 16:28:38.109) to
-+ // the formatted string.
-+ return snprintf(buffer, bufLen, "%s.%03lu", tmpbuf, millisec);
-+}
-+
-+
- static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned n_iovec, const struct ucred *ucred, const struct timeval *tv) {
-
- static const union sockaddr_union sa = {
-@@ -133,11 +171,8 @@ void server_forward_syslog(Server *s, int priority, const char *identifier, cons
- iovec[n++] = IOVEC_MAKE_STRING(header_priority);
-
- /* Second: timestamp */
-- t = tv ? tv->tv_sec : ((time_t) (now(CLOCK_REALTIME) / USEC_PER_SEC));
-- if (!localtime_r(&t, &tm))
-- return;
-- if (strftime(header_time, sizeof(header_time), "%h %e %T ", &tm) <= 0)
-- return;
-+ if (formatSyslogDate(header_time, sizeof(header_time), tv) <=0 )
-+ return;
- iovec[n++] = IOVEC_MAKE_STRING(header_time);
-
- /* Third: identifier and PID */
---
-2.23.0
-
+++ /dev/null
-SYSTEMD_DISABLED_SYSV_SERVICES_remove += " networking"
-
-pkg_postinst_${PN}_append () {
-
- if [ -n "$D" ]; then
- OPT="-f -r $D"
- else
- OPT="-f"
- fi
-
- if [ -f "$D${sysconfdir}/init.d/networking" ]; then
- update-rc.d $OPT networking defaults
- fi
-}
-
-RDEPENDS_${PN} += "update-rc.d"
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "systemd-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- "
-
-do_install_append () {
- install -d -m 0755 ${D}/${sysconfdir}/systemd
- install -m644 ${STX_METADATA_PATH}/files/journald.conf ${D}/${sysconfdir}/systemd/journald.conf
- chmod 644 ${D}/${sysconfdir}/systemd/journald.conf
-}
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH0 = "systemd-config"
-STX_SUBPATH1 = "io-scheduler"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/${STX_SUBPATH0}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- file://${STX_METADATA_PATH}/${STX_SUBPATH1}/centos/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- "
-
-STX_DEFAULT_LOCALE ?= "en_US.UTF-8"
-
-do_install_append () {
- install -d ${D}${sysconfdir}
- echo LANG=${STX_DEFAULT_LOCALE} >> ${D}${sysconfdir}/locale.conf
-
- install -d -m 0755 ${D}/${sysconfdir}/udev/rules.d
- install -d -m 0755 ${D}/${sysconfdir}/tmpfiles.d
- install -d -m 0755 ${D}/${sysconfdir}/systemd
-
- install -m644 ${STX_METADATA_PATH}/${STX_SUBPATH0}/files/60-persistent-storage.rules \
- ${D}/${sysconfdir}/udev/rules.d/60-persistent-storage.rules
-
- install -m644 ${STX_METADATA_PATH}/${STX_SUBPATH0}/files/systemd.conf.tmpfiles.d ${D}/${sysconfdir}/tmpfiles.d/systemd.conf
- install -m644 ${STX_METADATA_PATH}/${STX_SUBPATH0}/files/tmp.conf.tmpfiles.d ${D}/${sysconfdir}/tmpfiles.d/tmp.conf
- install -m644 ${STX_METADATA_PATH}/${STX_SUBPATH0}/files/tmp.mount ${D}/${sysconfdir}/systemd/system/tmp.mount
- install -m644 ${STX_METADATA_PATH}/${STX_SUBPATH1}/centos/files/60-io-scheduler.rules \
- ${D}/${sysconfdir}/udev/rules.d/60-io-scheduler.rules
-
-}
-
-
-FILES_${PN} += "${sysconfdir}/locale.conf"
-
-PACKAGECONFIG_append = " \
- coredump \
-"
+++ /dev/null
-
-# Increase su.util-linux update-alternative priortiy
-
-ALTERNATIVE_PRIORITY[su] = "300"
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "iscsi-initiator-utils-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/centos/iscsi-initiator-utils-config.spec;beginline=1;endline=10;md5=4f3e541126551bf6458a8a6557b1e171 \
- "
-
-inherit systemd
-SYSTEMD_PACKAGES += "${PN}"
-SYSTEMD_SERVICE_${PN}_append = "iscsi-shutdown.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-do_install_append() {
- install -d ${D}/${libdir}/tmpfiles.d
- install -d ${D}/${sysconfdir}/systemd/system
-
- install -m 0644 ${STX_METADATA_PATH}/files/iscsi-cache.volatiles ${D}/${libdir}/tmpfiles.d/iscsi-cache.conf
- install -m 0644 ${STX_METADATA_PATH}/files/iscsi-shutdown.service ${D}/${sysconfdir}/systemd/system
- install -m 0644 ${STX_METADATA_PATH}/files/iscsid.conf ${D}/${sysconfdir}/iscsi/iscsid.conf
-
- rm -rf ${D}/${nonarch_base_libdir}/
-}
-
-FILES_${PN}_append = " \
- ${libdir}/tmpfiles.d \
- "
+++ /dev/null
-#
-# Copyright (C) 2019 Wind River Systems, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-SUMMARY = "A 802.1ab implementation (LLDP) to help you locate neighbors of all your equipments"
-SECTION = "net/misc"
-LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d"
-
-DEPENDS = "libbsd libevent json-c"
-
-SRC_URI = "\
- http://media.luffy.cx/files/${BPN}/${BPN}-${PV}.tar.gz \
- "
-
-SRC_URI[md5sum] = "ed0226129b0c90b3a45c273fe1aba8de"
-SRC_URI[sha256sum] = "300e4a590f7bf21c79d5ff94c2d6a69d0b2c34dbc21e17281496462a04ca80bc"
-
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "networking/lldpd"
-
-SRC_URI_STX = " \
- file://centos/files/lldpd-create-run-dir.patch \
- file://centos/files/lldpd-i40e-disable.patch \
- file://centos/files/lldpd-clear-station.patch \
- file://${BP}/lldpd-interface-show.patch \
- "
-
-SOURCE1 = "${STX_METADATA_PATH}/${BP}/lldpd.init"
-SOURCE2 = "${STX_METADATA_PATH}/${BP}/lldpd.default"
-SOURCE3 = "${STX_METADATA_PATH}/centos/files/i40e-lldp-configure.sh"
-
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-inherit autotools update-rc.d useradd systemd pkgconfig bash-completion
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--system -g lldpd --shell /bin/false lldpd"
-GROUPADD_PARAM_${PN} = "--system lldpd"
-
-EXTRA_OECONF += "--without-embedded-libevent \
- --disable-oldies \
- --with-privsep-user=lldpd \
- --with-privsep-group=lldpd \
- --with-systemdsystemunitdir=${systemd_system_unitdir} \
- --without-sysusersdir \
-"
-
-PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3"
-PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxm2"
-PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp"
-PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
-PACKAGECONFIG[seccomp] = "--with-seccomp,--without-seccomp,libseccomp"
-PACKAGECONFIG[cdp] = "--enable-cdp,--disable-cdp"
-PACKAGECONFIG[fdp] = "--enable-fdp,--disable-fdp"
-PACKAGECONFIG[edp] = "--enable-edp,--disable-edp"
-PACKAGECONFIG[sonmp] = "--enable-sonmp,--disable-sonmp"
-PACKAGECONFIG[lldpmed] = "--enable-lldpmed,--disable-lldpmed"
-PACKAGECONFIG[dot1] = "--enable-dot1,--disable-dot1"
-PACKAGECONFIG[dot3] = "--enable-dot3,--disable-dot3"
-PACKAGECONFIG[custom] = "--enable-custom,--disable-custom"
-
-INITSCRIPT_NAME = "lldpd"
-INITSCRIPT_PARAMS = "defaults"
-
-SYSTEMD_SERVICE_${PN} = "lldpd.service"
-
-do_install_append() {
- install -d -m 0755 ${D}/${sysconfdir}/init.d
- install -Dm 0755 ${SOURCE1} ${D}${sysconfdir}/init.d/lldpd
- install -Dm 0644 ${SOURCE2} ${D}${sysconfdir}/default/lldpd
- install -Dm 0755 ${SOURCE3} ${D}${sysconfdir}/init.d/
- # Make an empty configuration file
- touch ${D}${sysconfdir}/lldpd.conf
-}
-
-PACKAGES =+ "${PN}-zsh-completion"
-
-FILES_${PN} += "${libdir}/sysusers.d"
-RDEPENDS_${PN} += "os-release bash"
-
-FILES_${PN}-zsh-completion += "${datadir}/zsh/"
-# FIXME: zsh is broken in meta-oe so this cannot be enabled for now
-#RDEPENDS_${PN}-zsh-completion += "zsh"
+++ /dev/null
-#
-## Copyright (C) 2019 Wind River Systems, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-SUMMARY = "InfluxDB is an open source time series platform"
-DESCRIPTION = "\
-InfluxDB is an open source time series platform. \
-This includes APIs for storing and querying data, \
-processing it in the background for ETL or monitoring \
-and alerting purposes, user dashboards, and visualizing \
-and exploring the data and more. \
-"
-HOMEPAGE = "https://www.influxdata.com/products/influxdb-overview/"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-SRC_URI = "https://s3.amazonaws.com/influxdb/${BPN}_${PV}_x86_64.tar.gz"
-SRC_URI[md5sum] = "da0cbcc5a521adc0e588327550441fbf"
-SRC_URI[sha256sum] = "6d660007ca207f98eb847f4abf7f3060d1e6d239deeca9beaf833455a670fdb8"
-
-S = "${WORKDIR}//${BPN}_${PV}_x86_64"
-
-do_install() {
- cp -av --no-preserve=ownership ${S}/* ${D}/
-}
-
-INSANE_SKIP_${PN}_append = "already-stripped ldflags"
+++ /dev/null
-From 45436592aa64308b2ab46f84c6107c6d7de0a3ec Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Wed, 6 Mar 2019 00:16:17 -0800
-Subject: [PATCH] _mysql.c: fix compilation with MariaDB 10.3.13
-
-Use standard API function MYSQL_OPT_RECONNECT
-instead of direct modification of internal structures
-which does not work for MariaDB.
-
-Upstream-Status: Pending
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- _mysql.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
---- a/_mysql.c
-+++ b/_mysql.c
-@@ -2002,7 +2002,14 @@ _mysql_ConnectionObject_ping(
- int r, reconnect = -1;
- if (!PyArg_ParseTuple(args, "|I", &reconnect)) return NULL;
- check_connection(self);
-- if ( reconnect != -1 ) self->connection.reconnect = reconnect;
-+ if ( reconnect != -1 ) {
-+#if MYSQL_VERSION_ID >= 50013
-+ my_bool recon = reconnect;
-+ mysql_options(&self->connection, MYSQL_OPT_RECONNECT, &recon);
-+#else
-+ self->connection.reconnect = reconnect;
-+#endif
-+ }
- Py_BEGIN_ALLOW_THREADS
- r = mysql_ping(&(self->connection));
- Py_END_ALLOW_THREADS
+++ /dev/null
-
-SUMMARY = "Python interface to MySQL"
-HOMEPAGE = "https://github.com/farcepest/MySQLdb1"
-SECTION = "devel/python"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-DEPENDS = "mysql5"
-
-SRCNAME = "MySQL-python"
-
-SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip \
- file://0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch \
-"
-SRC_URI[md5sum] = "654f75b302db6ed8dc5a898c625e030c"
-SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+++ /dev/null
-#!/bin/sh
-# set -x
-
-PN=postgresql
-CONTROLLER_IP=%CONTROLLER_IP%
-COMPUTE_IP=%COMPUTE_IP%
-DB_USER=%DB_USER%
-DB_PASSWORD=%DB_PASSWORD%
-DATA_DIR=%DB_DATADIR%
-
-initdb(){
- if [ ! -e $DATA_DIR ]; then
- mkdir -p $DATA_DIR
- chown postgres $DATA_DIR
- fi
-
- if [ -e $DATA_DIR/PG_VERSION ]; then
- # the database has already been initialized, return
- exit 0
- fi
-
- # Create the DB
- sudo -u postgres initdb -D $DATA_DIR
-
- # Allow readers/writers by IP
- echo "listen_addresses = '*'" >> $DATA_DIR/postgresql.conf
- echo "host all all ${CONTROLLER_IP}/32 trust" >> $DATA_DIR/pg_hba.conf
- echo "host all all ${COMPUTE_IP}/32 trust" >> $DATA_DIR/pg_hba.conf
- }
-
-if [ "$1" == "initdb" ]; then
- initdb
- exit 0
-fi
-
-count=0
-done=0
-while [ $count -le 10 ] && [ $done -eq 0 ]; do
- sudo -u postgres psql -c "CREATE ROLE ${DB_USER} WITH SUPERUSER LOGIN PASSWORD '${DB_PASSWORD}'" 2> /dev/null
- if [ $? -ne 0 ]; then
- echo "[INFO] postgres: failed to create account for ${DB_USER}, trying again"
- systemctl stop postresql
- sleep 3
- systemctl start postgresql
- sleep 3
- else
- echo "[INFO] postgres: created account for ${DB_USER}, continuing .. "
- done=1
- fi
- count=`expr $count + 1`
-done
-
-if [ $done -eq 0 ]; then
- echo "[ERROR] postgres: unable to create admin account"
- exit 1
-fi
-
-ln -s /usr/share/zoneinfo /usr/share/postgresql/timezone || true
+++ /dev/null
-[Unit]
-Description=Postgresql setup for OpenStack
-After=postgresql.service
-
-[Service]
-Type=oneshot
-ExecStart=%SYSCONFIGDIR%/postgresql/postgresql-init
-ExecStartPost=/bin/systemctl --no-reload disable postgresql-init.service
-RemainAfterExit=No
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-[Unit]
-Description=PostgreSQL database server
-After=network.target
-
-[Service]
-Type=forking
-User=postgres
-Group=postgres
-
-# Port number for server to listen on
-Environment=PGPORT=5432
-
-# Location of database directory
-Environment=PGDATA=/var/lib/postgresql/19.12
-
-# Disable OOM kill on the postmaster
-OOMScoreAdjust=-17
-
-PermissionsStartOnly=true
-ExecStart=/usr/bin/pg_ctl start -D ${PGDATA} -s -o "-p ${PGPORT}" -w -t 300
-ExecStop=/usr/bin/pg_ctl stop -D ${PGDATA} -s -m fast
-ExecReload=/usr/bin/pg_ctl reload -D ${PGDATA} -s
-
-# Give a reasonable amount of time for the server to start up/shut down
-TimeoutSec=300
-
-[Install]
-WantedBy=multi-user.target
-""
+++ /dev/null
-COMPUTE_IP="127.0.0.1"
-CONTROLLER_IP="127.0.0.1"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/postgresql:"
-
-require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)}
-
-SRC_URI += " \
- file://postgresql.service.update \
- "
-
-do_install_append() {
- install -d ${D}${systemd_unitdir}/system
- install -m 0755 ${WORKDIR}/postgresql.service.update ${D}${systemd_unitdir}/system/postgresql.service
-}
-
-FILES_${PN} += "${systemd_unitdir}/system/postgresql.service"
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/postgresql:"
-
-SRC_URI += " \
- file://postgresql-init \
- file://postgresql-init.service \
- "
-
-inherit identity hosts
-
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-
-# default
-DB_DATADIR ?= "/var/lib/postgres/data"
-
-do_install_append() {
- D_DEST_DIR=${D}${sysconfdir}/postgresql
-
- install -d ${D_DEST_DIR}
- install -m 0755 ${WORKDIR}/postgresql-init ${D_DEST_DIR}/postgresql-init
-
- sed -e "s:%DB_DATADIR%:${DB_DATADIR}:g" -i ${D_DEST_DIR}/postgresql-init
-
- sed -e "s:%DB_USER%:${DB_USER}:g" -i ${D_DEST_DIR}/postgresql-init
- sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${D_DEST_DIR}/postgresql-init
-
- sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${D_DEST_DIR}/postgresql-init
- sed -e "s:%CONTROLLER_HOST%:${CONTROLLER_HOST}:g" -i ${D_DEST_DIR}/postgresql-init
-
- sed -e "s:%COMPUTE_IP%:${COMPUTE_IP}:g" -i ${D_DEST_DIR}/postgresql-init
- sed -e "s:%COMPUTE_HOST%:${COMPUTE_HOST}:g" -i ${D_DEST_DIR}/postgresql-init
-
- install -d ${D}${systemd_unitdir}/system/
- PG_INIT_SERVICE_FILE=${D}${systemd_unitdir}/system/postgresql-init.service
- install -m 644 ${WORKDIR}/postgresql-init.service ${PG_INIT_SERVICE_FILE}
- sed -e "s:%SYSCONFIGDIR%:${sysconfdir}:g" -i ${PG_INIT_SERVICE_FILE}
-
- # Update PGDATA throughout
- files="${D}${localstatedir}/lib/${BPN}/.profile"
- files="$files ${D}${systemd_unitdir}/system/postgresql.service"
- files="$files ${D}${bindir}/${BPN}-setup"
- files="$files ${D}${sysconfdir}/init.d/${BPN}-server"
- for f in $files
- do
- sed -e "s:\(PGDATA=\).*$:\1${DB_DATADIR}:g" -i $f
- done
-
- # Ensure DB is initialize before we attempt to start the service
- FILE=${D}${systemd_unitdir}/system/postgresql.service
- sed -e '/ExecStart=.*/i ExecStartPre=-${sysconfdir}/postgresql/postgresql-init initdb' -i $FILE
- sed -e '/ExecStartPre=.*/i PermissionsStartOnly=true' -i $FILE
-}
-
-PACKAGES += " ${PN}-setup"
-
-SYSTEMD_PACKAGES += "${PN}-setup"
-SYSTEMD_SERVICE_${PN}-setup = "postgresql-init.service"
-
-FILES_${PN}-setup = " \
- ${systemd_unitdir}/system \
-"
+++ /dev/null
-From b3e40ea4aa3b890d3df6b10bb7ef0ddb3efb89a4 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Wed, 13 May 2020 22:48:04 +0800
-Subject: [PATCH] const: add os-release and lsb-release into the search list
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- dnf/const.py.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dnf/const.py.in b/dnf/const.py.in
-index 44a204a..a795098 100644
---- a/dnf/const.py.in
-+++ b/dnf/const.py.in
-@@ -25,7 +25,7 @@ CONF_FILENAME='/etc/dnf/dnf.conf' # :api
- CONF_AUTOMATIC_FILENAME='/etc/dnf/automatic.conf'
- DISTROVERPKG=('system-release(releasever)', 'system-release',
- 'distribution-release(releasever)', 'distribution-release',
-- 'redhat-release', 'suse-release')
-+ 'redhat-release', 'suse-release', 'os-release', 'lsb-release')
- GROUP_PACKAGE_TYPES = ('mandatory', 'default', 'conditional') # :api
- INSTALLONLYPKGS=['kernel', 'kernel-PAE',
- 'installonlypkg(kernel)',
---
-2.7.4
-
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
-
-SRC_URI += "\
- file://0001-const-add-os-release-and-lsb-release-into-the-search.patch \
- "
-
-DEPENDS += "\
- python-native \
- "
-
-EXTRA_OECMAKE_PY2 = " \
- -DWITH_MAN=0 \
- -DPYTHON_INSTALL_DIR=${libdir}/python2.7/site-packages \
- -DPYTHON_DESIRED:FILEPATH=${STAGING_BINDIR_NATIVE}/python-native/python \
- "
-
-RDEPENDS_${PN}_class-target += " \
- python-codecs \
- python-compression \
- python-core \
- python-curses \
- python-distutils \
- python-email \
- python-fcntl \
- python-iniparse \
- python-json \
- python-logging \
- python-misc \
- python-netclient \
- python-pygpgme \
- python-pyliblzma \
- python-shell \
- python-sqlite3 \
- python-threading \
- python2-rpm \
- "
-
-do_configure_append() {
- rm -rf ${B}/build-py2
- mkdir -p ${B}/build-py2
- cd ${B}/build-py2
-
- cmake \
- ${OECMAKE_GENERATOR_ARGS} \
- $oecmake_sitefile \
- ${OECMAKE_SOURCEPATH} \
- -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
- -DCMAKE_INSTALL_SYSCONFDIR:PATH=${sysconfdir} \
- -DCMAKE_INSTALL_SO_NO_EXE=0 \
- -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
- -DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \
- ${EXTRA_OECMAKE_PY2} \
- -Wno-dev
-}
-
-cmake_runcmake_build_py2() {
- bbnote ${DESTDIR:+DESTDIR=${DESTDIR} }VERBOSE=1 cmake --build '${B}/build-py2' "$@" -- ${EXTRA_OECMAKE_BUILD}
- eval ${DESTDIR:+DESTDIR=${DESTDIR} }VERBOSE=1 cmake --build '${B}/build-py2' "$@" -- ${EXTRA_OECMAKE_BUILD}
-}
-
-do_compile_append() {
- cd ${B}/build-py2
- cmake_runcmake_build_py2 --target ${OECMAKE_TARGET_COMPILE}
-}
-
-do_install_append() {
- cd ${B}/build-py2
- DESTDIR='${D}' cmake_runcmake_build_py2 --target ${OECMAKE_TARGET_INSTALL}
-
- # add a symlink for yum
- lnr ${D}/${bindir}/dnf-2 ${D}/${bindir}/yum
-}
-
+++ /dev/null
-
-DESCRIPTION = "an OpenStack SDK for Go"
-HOMEPAGE = "https://github.com/gophercloud/gophercloud"
-SECTION = "devel/go"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=dd19699707373c2ca31531a659130416"
-
-SRCNAME = "gophercloud"
-
-PKG_NAME = "github.com/gophercloud/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git"
-
-SRCREV = "aa00757ee3ab58e53520b6cb910ca0543116400a"
-PV = "0.3.0+git${SRCREV}"
-RDEPENDS_${PN} = "bash"
-S = "${WORKDIR}/git"
-
-do_install() {
- install -d ${D}${prefix}/local/go/src/${PKG_NAME}
- cp -r ${S}/* ${D}${prefix}/local/go/src/${PKG_NAME}/
-}
-
-SYSROOT_PREPROCESS_FUNCS += "go_phercloud_sysroot_preprocess"
-
-go_phercloud_sysroot_preprocess () {
- install -d ${SYSROOT_DESTDIR}${prefix}/local/go/src/${PKG_NAME}
- cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
-}
-
-FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
+++ /dev/null
-From 7d3bd33be8b2c9924a2987710f54f5c62853d86c Mon Sep 17 00:00:00 2001
-From: jmckenna <jason.mckenna@windriver.com>
-Date: Wed, 5 Apr 2017 09:35:06 -0400
-Subject: [PATCH] Use generic OS title for Titanium
-
----
- new-kernel-pkg | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/new-kernel-pkg b/new-kernel-pkg
-index 847e959..977ef2d 100755
---- a/new-kernel-pkg
-+++ b/new-kernel-pkg
-@@ -166,6 +166,8 @@ set_title() {
- fi
- elif [ $ARCH = 's390' -o $ARCH = 's390x' ]; then
- title=$(echo $version | sed 's/ /_/g')
-+ elif [ -f /etc/build.info ]; then
-+ title="Linux ($version)"
- elif [ -f /etc/os-release ]; then
- . /etc/os-release
- title="$NAME ($version) $VERSION"
---
-1.9.1
-
+++ /dev/null
-From b2fc58bcd1f18cbc3e0b3d303e9f2132d0e36cd8 Mon Sep 17 00:00:00 2001
-From: Bin Qian <bin.qian@windriver.com>
-Date: Tue, 13 Feb 2018 22:48:54 -0500
-Subject: [PATCH 1/1] Add support for updating grub.cfg with multiboot 2
-
----
- Makefile | 5 +++
- __init__.py | 8 ++++
- grub-cfg-update | 17 ++++++++
- grub_cfg_update.py | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- new-kernel-pkg | 33 ++++++++++----
- 5 files changed, 181 insertions(+), 8 deletions(-)
- create mode 100644 __init__.py
- create mode 100644 grub-cfg-update
- create mode 100644 grub_cfg_update.py
-
-diff --git a/Makefile b/Makefile
-index e021f35..93fa41b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -56,6 +56,11 @@ install: all
- install -m 755 grubby $(DESTDIR)$(PREFIX)/sbin ; \
- install -m 644 grubby.8 $(DESTDIR)/$(mandir)/man8 ; \
- fi
-+ mkdir -p $(DESTDIR)/usr/lib64/python2.7/site-packages/grubby
-+ install -m 644 grub_cfg_update.py $(DESTDIR)/usr/lib64/python2.7/site-packages/grubby/grub_cfg_update.py
-+ install -m 644 __init__.py $(DESTDIR)/usr/lib64/python2.7/site-packages/grubby/__init__.py
-+ install -m 500 grub-cfg-update $(DESTDIR)$(PREFIX)/sbin/grub-cfg-update
-+
-
- grubby:: $(OBJECTS)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(grubby_LIBS)
-diff --git a/__init__.py b/__init__.py
-new file mode 100644
-index 0000000..5f30af6
---- /dev/null
-+++ b/__init__.py
-@@ -0,0 +1,8 @@
-+#!/usr/bin/env python
-+#
-+# Copyright (c) 2018 Wind River Systems, Inc.
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+#
-+#
-+#
-\ No newline at end of file
-diff --git a/grub-cfg-update b/grub-cfg-update
-new file mode 100644
-index 0000000..5e457e9
---- /dev/null
-+++ b/grub-cfg-update
-@@ -0,0 +1,17 @@
-+#!/usr/bin/env python
-+
-+"""
-+Copyright (c) 2018 Wind River Systems, Inc.
-+ SPDX-License-Identifier: Apache-2.0
-+
-+
-+
-+"""
-+
-+import sys
-+
-+from grubby.grub_cfg_update import main
-+
-+if __name__ == "__main__":
-+ main()
-+
-diff --git a/grub_cfg_update.py b/grub_cfg_update.py
-new file mode 100644
-index 0000000..f5cd174
---- /dev/null
-+++ b/grub_cfg_update.py
-@@ -0,0 +1,126 @@
-+#!/usr/bin/env python
-+#
-+# Copyright (c) 2018 Wind River Systems, Inc.
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+#
-+#
-+#
-+import sys
-+import argparse
-+import os.path
-+import re
-+import ntpath
-+
-+
-+LINUX_KERNEL_RE = "^[ \t]*module2[ \t]{1,}/vmlinuz-[^ \n\t]*"
-+INITRD_RE = "^[ \t]*module2[ \t]{1,}/initramfs-[^ \n\t]*"
-+
-+
-+def is_title(line):
-+ m = re.search('^[ ]*menuentry ', line)
-+ if m:
-+ return True
-+ return False
-+
-+
-+def update_title(line, ver):
-+ m = re.search("Linux [^ \n\t']*", line)
-+ if not m:
-+ print "Title pattern not understandable, not updated"
-+ return line
-+ new_line = re.sub("Linux [^ \n\t']*", "Linux %s" % ver, line)
-+ return new_line
-+
-+
-+def is_kernel(line):
-+ m = re.search(LINUX_KERNEL_RE, line)
-+ if m:
-+ return True
-+ return False
-+
-+
-+def update_kernel(line, kernel):
-+ kernel_name = ntpath.basename(kernel)
-+ new_line = re.sub(LINUX_KERNEL_RE,
-+ " module2 /%s" % kernel_name,
-+ line)
-+ return new_line
-+
-+
-+def is_initrd(line):
-+ m = re.search(INITRD_RE, line)
-+ if m:
-+ return True
-+ return False
-+
-+
-+def update_initrd(line, initrd):
-+ initrd_name = ntpath.basename(initrd)
-+ new_line = re.sub(INITRD_RE,
-+ " module2 /%s" % initrd_name,
-+ line)
-+ return new_line
-+
-+
-+def convert_line(line, version):
-+ pattern = "^[ \t]*echo[ \t]*['\"]Loading Linux [^ \n\t]*"
-+ m = re.search(pattern, line)
-+ if not m:
-+ return line
-+
-+ return " echo 'Loading Linux %s ...'\n" % version
-+
-+
-+def update_cfg(cfg, kernel, initramfs, ver, cfg_out):
-+ if not os.path.isfile(cfg):
-+ print "grub config file %s not found\n" % cfg
-+ sys.exit(-1)
-+
-+ if not os.path.isfile(kernel):
-+ print "specified kernel file %s not found\n" % kernel
-+ sys.exit(-1)
-+
-+ if not os.path.isfile(initramfs):
-+ print "specified initrd file %s not found\n" % initramfs
-+ sys.exit(-1)
-+
-+ new_file_content = []
-+ with open(cfg) as f:
-+ for line in f:
-+ if is_title(line):
-+ new_line = update_title(line, ver)
-+ print new_line
-+ elif is_kernel(line):
-+ new_line = update_kernel(line, kernel)
-+ print new_line
-+ elif is_initrd(line):
-+ new_line = update_initrd(line, initramfs)
-+ print new_line
-+ else:
-+ new_line = convert_line(line, ver)
-+ print new_line
-+
-+ new_file_content.append(new_line)
-+ with open(cfg_out, 'w') as f:
-+ for line in new_file_content:
-+ f.write("%s" % line)
-+
-+
-+def main():
-+ try:
-+ parser = argparse.ArgumentParser(description='Update tboot enabled grub config')
-+ parser.add_argument('cfg', help='original grub.cfg file path')
-+ parser.add_argument('kernel', help='kernel file path')
-+ parser.add_argument('initramfs', help='initramfs file path')
-+ parser.add_argument('version', help='new version of kernel')
-+ parser.add_argument('--cfg-out', help='updated grub.cfg target file path')
-+ args = parser.parse_args()
-+ cfg_out = args.cfg_out
-+ if cfg_out is None:
-+ cfg_out = args.cfg
-+
-+ update_cfg(args.cfg, args.kernel, args.initramfs, args.version, cfg_out)
-+ except Exception as e:
-+ print e
-+ sys.exit(-1)
-diff --git a/new-kernel-pkg b/new-kernel-pkg
-index 977ef2d..1bb0a64 100755
---- a/new-kernel-pkg
-+++ b/new-kernel-pkg
-@@ -185,6 +185,11 @@ install() {
- return
- fi
-
-+ grep -q 'tboot=true' /proc/cmdline 2>/dev/null
-+ if [ $? == 0 ] ; then
-+ return
-+ fi
-+
- INITRD=""
- if [ -f $initrdfile ]; then
- [ -n "$verbose" ] && echo "found $initrdfile and using it with grubby"
-@@ -334,6 +339,11 @@ remove() {
- return
- fi
-
-+ grep -q 'tboot=true' /proc/cmdline 2>/dev/null
-+ if [ $? == 0 ] ; then
-+ return
-+ fi
-+
- local files
- local f
- files="/etc/kernel/prerm.d/*[^~] /etc/kernel/prerm.d/$version/*[^~]"
-@@ -483,14 +493,21 @@ update() {
- fi
-
- if [ -n "$cfgGrub2Efi" ]; then
-- [ -n "$verbose" ] && echo "updating $version from $grub2EfiConfig"
-- ARGS="--grub2 -c $grub2EfiConfig --efi --update-kernel=$kernelImage \
-- $INITRD ${kernargs:+--args=\"$kernargs\"} \
-- ${removeargs:+--remove-args=\"$removeargs\"} \
-- --title=\"$title\$debugtitle\""
--
-- rungrubby ${ARGS}
-- rungrubby --debug ${ARGS}
-+ grep -q 'tboot=true' /proc/cmdline 2>/dev/null
-+ if [ $? == 0 ] ; then
-+ [ -n "$verbose" ] && echo "calling grub-cfg-update $grub2EfiConfig $kernelImage $initrdfile $version"
-+ grub-cfg-update $grub2EfiConfig $kernelImage $initrdfile $version
-+ return
-+ else
-+ [ -n "$verbose" ] && echo "updating $version from $grub2EfiConfig"
-+ ARGS="--grub2 -c $grub2EfiConfig --efi --update-kernel=$kernelImage \
-+ $INITRD ${kernargs:+--args=\"$kernargs\"} \
-+ ${removeargs:+--remove-args=\"$removeargs\"} \
-+ --title=\"$title\$debugtitle\""
-+
-+ rungrubby ${ARGS}
-+ rungrubby --debug ${ARGS}
-+ fi
- else
- [ -n "$verbose" ] && echo "$grub2EfiConfig does not exist, not running grubby"
- fi
---
-1.8.3.1
-
+++ /dev/null
-diff --git a/Makefile b/Makefile
-index 7436c1c..91a4fd1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -56,9 +56,9 @@ install: all
- install -m 755 grubby $(DESTDIR)$(PREFIX)/sbin ; \
- install -m 644 grubby.8 $(DESTDIR)/$(mandir)/man8 ; \
- fi
-- mkdir -p $(DESTDIR)/usr/lib64/python2.7/site-packages/grubby
-- install -m 644 grub_cfg_update.py $(DESTDIR)/usr/lib64/python2.7/site-packages/grubby/grub_cfg_update.py
-- install -m 644 __init__.py $(DESTDIR)/usr/lib64/python2.7/site-packages/grubby/__init__.py
-+ mkdir -p $(DESTDIR)/$(libdir)/python2.7/site-packages/grubby
-+ install -m 644 grub_cfg_update.py $(DESTDIR)/$(libdir)/python2.7/site-packages/grubby/grub_cfg_update.py
-+ install -m 644 __init__.py $(DESTDIR)/$(libdir)/python2.7/site-packages/grubby/__init__.py
- install -m 500 grub-cfg-update $(DESTDIR)$(PREFIX)/sbin/grub-cfg-update
-
-
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += " \
- file://1000-Generic-name-for-Titanium.patch \
- file://1001-Add-support-for-updating-grub-cfg-with-multiboot-2.patch \
- file://1002-Install-into-libdir-instead-of-hard-coding.patch \
- "
-
-FILES_${PN}_append = " ${libdir}"
+++ /dev/null
-From 54e03b8693ccac182fd5d05473e01ecb37c281c8 Mon Sep 17 00:00:00 2001
-From: marxin <mliska@suse.cz>
-Date: Mon, 6 Jul 2020 20:09:15 +0800
-Subject: [PATCH] Add FALLTHRU comment to handle GCC7 warnings.
-
-Upstream-Status: Backport [1]
-
-[1] https://github.com/json-c/json-c/commit/014924ba899f659917bb64392bbff7d3c803afc2
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- json_object.c | 4 +++-
- json_tokener.c | 1 +
- linkhash.c | 22 +++++++++++-----------
- 3 files changed, 15 insertions(+), 12 deletions(-)
-
-diff --git a/json_object.c b/json_object.c
-index f2b5ce0..5e867d0 100644
---- a/json_object.c
-+++ b/json_object.c
-@@ -545,7 +545,8 @@ int64_t json_object_get_int64(struct json_object *jso)
- case json_type_boolean:
- return jso->o.c_boolean;
- case json_type_string:
-- if (json_parse_int64(jso->o.c_string.str, &cint) == 0) return cint;
-+ if (json_parse_int64(jso->o.c_string.str, &cint) == 0) return cint;
-+ /* FALLTHRU */
- default:
- return 0;
- }
-@@ -606,6 +607,7 @@ double json_object_get_double(struct json_object *jso)
- return jso->o.c_boolean;
- case json_type_string:
- if(sscanf(jso->o.c_string.str, "%lf", &cdouble) == 1) return cdouble;
-+ /* FALLTHRU */
- default:
- return 0.0;
- }
-diff --git a/json_tokener.c b/json_tokener.c
-index 7b3f3ec..54aa4f7 100644
---- a/json_tokener.c
-+++ b/json_tokener.c
-@@ -341,6 +341,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
- tok->err = json_tokener_error_parse_unexpected;
- goto out;
- }
-+ /* FALLTHRU */
- break;
-
- case json_tokener_state_finish:
-diff --git a/linkhash.c b/linkhash.c
-index 712c387..74e3b0f 100644
---- a/linkhash.c
-+++ b/linkhash.c
-@@ -376,17 +376,17 @@ static uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
- /*-------------------------------- last block: affect all 32 bits of (c) */
- switch(length) /* all the case statements fall through */
- {
-- case 12: c+=((uint32_t)k[11])<<24;
-- case 11: c+=((uint32_t)k[10])<<16;
-- case 10: c+=((uint32_t)k[9])<<8;
-- case 9 : c+=k[8];
-- case 8 : b+=((uint32_t)k[7])<<24;
-- case 7 : b+=((uint32_t)k[6])<<16;
-- case 6 : b+=((uint32_t)k[5])<<8;
-- case 5 : b+=k[4];
-- case 4 : a+=((uint32_t)k[3])<<24;
-- case 3 : a+=((uint32_t)k[2])<<16;
-- case 2 : a+=((uint32_t)k[1])<<8;
-+ case 12: c+=((uint32_t)k[11])<<24; /* FALLTHRU */
-+ case 11: c+=((uint32_t)k[10])<<16; /* FALLTHRU */
-+ case 10: c+=((uint32_t)k[9])<<8; /* FALLTHRU */
-+ case 9 : c+=k[8]; /* FALLTHRU */
-+ case 8 : b+=((uint32_t)k[7])<<24; /* FALLTHRU */
-+ case 7 : b+=((uint32_t)k[6])<<16; /* FALLTHRU */
-+ case 6 : b+=((uint32_t)k[5])<<8; /* FALLTHRU */
-+ case 5 : b+=k[4]; /* FALLTHRU */
-+ case 4 : a+=((uint32_t)k[3])<<24; /* FALLTHRU */
-+ case 3 : a+=((uint32_t)k[2])<<16; /* FALLTHRU */
-+ case 2 : a+=((uint32_t)k[1])<<8; /* FALLTHRU */
- case 1 : a+=k[0];
- break;
- case 0 : return c;
---
-2.7.4
+++ /dev/null
-json-c: fix CVE-2013-6371 and CVE-2013-6370
-
-* CVE-2013-6371: hash collision denial of service
-* CVE-2013-6370: buffer overflow if size_t is larger than int
-
-Upstream-Status: Backport [1]
-
-[1] https://github.com/json-c/json-c/commit/64e36901a0614bf64a19bc3396469c66dcd0b015
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
-
-diff --git a/Makefile.am b/Makefile.am
-index 24b9bdf..26ced27 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -23,7 +23,8 @@ libjson_cinclude_HEADERS = \
- json_tokener.h \
- json_util.h \
- linkhash.h \
-- printbuf.h
-+ printbuf.h \
-+ random_seed.h
-
- #libjsonx_includedir = $(libdir)/json-c-@VERSION@
- #
-@@ -41,7 +42,8 @@ libjson_c_la_SOURCES = \
- json_tokener.c \
- json_util.c \
- linkhash.c \
-- printbuf.c
-+ printbuf.c \
-+ random_seed.c
-
-
- distclean-local:
-diff --git a/Makefile.am.inc b/Makefile.am.inc
-index fd68a25..fec591b 100644
---- a/Makefile.am.inc
-+++ b/Makefile.am.inc
-@@ -1,2 +1,2 @@
--AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
-+AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
-
-diff --git a/json_object.h b/json_object.h
-index 1005734..200ac40 100644
---- a/json_object.h
-+++ b/json_object.h
-@@ -13,6 +13,14 @@
- #ifndef _json_object_h_
- #define _json_object_h_
-
-+#ifdef __GNUC__
-+#define THIS_FUNCTION_IS_DEPRECATED(func) func __attribute__ ((deprecated))
-+#elif defined(_MSC_VER)
-+#define THIS_FUNCTION_IS_DEPRECATED(func) __declspec(deprecated) func
-+#else
-+#define THIS_FUNCTION_IS_DEPRECATED(func) func
-+#endif
-+
- #include "json_inttypes.h"
-
- #ifdef __cplusplus
-@@ -279,8 +287,8 @@ extern void json_object_object_add(struct json_object* obj, const char *key,
- * @returns the json_object associated with the given field name
- * @deprecated Please use json_object_object_get_ex
- */
--extern struct json_object* json_object_object_get(struct json_object* obj,
-- const char *key);
-+THIS_FUNCTION_IS_DEPRECATED(extern struct json_object* json_object_object_get(struct json_object* obj,
-+ const char *key));
-
- /** Get the json_object associated with a given object field.
- *
-diff --git a/json_tokener.c b/json_tokener.c
-index a1019c0..19de8ef 100644
---- a/json_tokener.c
-+++ b/json_tokener.c
-@@ -81,6 +81,7 @@ static const char* json_tokener_errors[] = {
- "object value separator ',' expected",
- "invalid string sequence",
- "expected comment",
-+ "buffer size overflow"
- };
-
- const char *json_tokener_error_desc(enum json_tokener_error jerr)
-@@ -243,6 +244,16 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
- tok->char_offset = 0;
- tok->err = json_tokener_success;
-
-+ /* this interface is presently not 64-bit clean due to the int len argument
-+ and the internal printbuf interface that takes 32-bit int len arguments
-+ so the function limits the maximum string size to INT32_MAX (2GB).
-+ If the function is called with len == -1 then strlen is called to check
-+ the string length is less than INT32_MAX (2GB) */
-+ if ((len < -1) || (len == -1 && strlen(str) > INT32_MAX)) {
-+ tok->err = json_tokener_error_size;
-+ return NULL;
-+ }
-+
- while (PEEK_CHAR(c, tok)) {
-
- redo_char:
-diff --git a/json_tokener.h b/json_tokener.h
-index 5471d97..a72d2bd 100644
---- a/json_tokener.h
-+++ b/json_tokener.h
-@@ -33,7 +33,8 @@ enum json_tokener_error {
- json_tokener_error_parse_object_key_sep,
- json_tokener_error_parse_object_value_sep,
- json_tokener_error_parse_string,
-- json_tokener_error_parse_comment
-+ json_tokener_error_parse_comment,
-+ json_tokener_error_size
- };
-
- enum json_tokener_state {
-@@ -163,6 +164,11 @@ extern void json_tokener_set_flags(struct json_tokener *tok, int flags);
- * responsible for calling json_tokener_parse_ex with an appropriate str
- * parameter starting with the extra characters.
- *
-+ * This interface is presently not 64-bit clean due to the int len argument
-+ * so the function limits the maximum string size to INT32_MAX (2GB).
-+ * If the function is called with len == -1 then strlen is called to check
-+ * the string length is less than INT32_MAX (2GB)
-+ *
- * Example:
- * @code
- json_object *jobj = NULL;
-diff --git a/linkhash.c b/linkhash.c
-index 5043148..712c387 100644
---- a/linkhash.c
-+++ b/linkhash.c
-@@ -17,6 +17,11 @@
- #include <stddef.h>
- #include <limits.h>
-
-+#ifdef HAVE_ENDIAN_H
-+# include <endian.h> /* attempt to define endianness */
-+#endif
-+
-+#include "random_seed.h"
- #include "linkhash.h"
-
- void lh_abort(const char *msg, ...)
-@@ -39,14 +44,378 @@ int lh_ptr_equal(const void *k1, const void *k2)
- return (k1 == k2);
- }
-
-+/*
-+ * hashlittle from lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-+ * http://burtleburtle.net/bob/c/lookup3.c
-+ * minor modifications to make functions static so no symbols are exported
-+ * minor mofifications to compile with -Werror
-+ */
-+
-+/*
-+-------------------------------------------------------------------------------
-+lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-+
-+These are functions for producing 32-bit hashes for hash table lookup.
-+hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final()
-+are externally useful functions. Routines to test the hash are included
-+if SELF_TEST is defined. You can use this free for any purpose. It's in
-+the public domain. It has no warranty.
-+
-+You probably want to use hashlittle(). hashlittle() and hashbig()
-+hash byte arrays. hashlittle() is is faster than hashbig() on
-+little-endian machines. Intel and AMD are little-endian machines.
-+On second thought, you probably want hashlittle2(), which is identical to
-+hashlittle() except it returns two 32-bit hashes for the price of one.
-+You could implement hashbig2() if you wanted but I haven't bothered here.
-+
-+If you want to find a hash of, say, exactly 7 integers, do
-+ a = i1; b = i2; c = i3;
-+ mix(a,b,c);
-+ a += i4; b += i5; c += i6;
-+ mix(a,b,c);
-+ a += i7;
-+ final(a,b,c);
-+then use c as the hash value. If you have a variable length array of
-+4-byte integers to hash, use hashword(). If you have a byte array (like
-+a character string), use hashlittle(). If you have several byte arrays, or
-+a mix of things, see the comments above hashlittle().
-+
-+Why is this so big? I read 12 bytes at a time into 3 4-byte integers,
-+then mix those integers. This is fast (you can do a lot more thorough
-+mixing with 12*3 instructions on 3 integers than you can with 3 instructions
-+on 1 byte), but shoehorning those bytes into integers efficiently is messy.
-+-------------------------------------------------------------------------------
-+*/
-+
-+/*
-+ * My best guess at if you are big-endian or little-endian. This may
-+ * need adjustment.
-+ */
-+#if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
-+ __BYTE_ORDER == __LITTLE_ENDIAN) || \
-+ (defined(i386) || defined(__i386__) || defined(__i486__) || \
-+ defined(__i586__) || defined(__i686__) || defined(vax) || defined(MIPSEL))
-+# define HASH_LITTLE_ENDIAN 1
-+# define HASH_BIG_ENDIAN 0
-+#elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
-+ __BYTE_ORDER == __BIG_ENDIAN) || \
-+ (defined(sparc) || defined(POWERPC) || defined(mc68000) || defined(sel))
-+# define HASH_LITTLE_ENDIAN 0
-+# define HASH_BIG_ENDIAN 1
-+#else
-+# define HASH_LITTLE_ENDIAN 0
-+# define HASH_BIG_ENDIAN 0
-+#endif
-+
-+#define hashsize(n) ((uint32_t)1<<(n))
-+#define hashmask(n) (hashsize(n)-1)
-+#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-+
-+/*
-+-------------------------------------------------------------------------------
-+mix -- mix 3 32-bit values reversibly.
-+
-+This is reversible, so any information in (a,b,c) before mix() is
-+still in (a,b,c) after mix().
-+
-+If four pairs of (a,b,c) inputs are run through mix(), or through
-+mix() in reverse, there are at least 32 bits of the output that
-+are sometimes the same for one pair and different for another pair.
-+This was tested for:
-+* pairs that differed by one bit, by two bits, in any combination
-+ of top bits of (a,b,c), or in any combination of bottom bits of
-+ (a,b,c).
-+* "differ" is defined as +, -, ^, or ~^. For + and -, I transformed
-+ the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
-+ is commonly produced by subtraction) look like a single 1-bit
-+ difference.
-+* the base values were pseudorandom, all zero but one bit set, or
-+ all zero plus a counter that starts at zero.
-+
-+Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
-+satisfy this are
-+ 4 6 8 16 19 4
-+ 9 15 3 18 27 15
-+ 14 9 3 7 17 3
-+Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
-+for "differ" defined as + with a one-bit base and a two-bit delta. I
-+used http://burtleburtle.net/bob/hash/avalanche.html to choose
-+the operations, constants, and arrangements of the variables.
-+
-+This does not achieve avalanche. There are input bits of (a,b,c)
-+that fail to affect some output bits of (a,b,c), especially of a. The
-+most thoroughly mixed value is c, but it doesn't really even achieve
-+avalanche in c.
-+
-+This allows some parallelism. Read-after-writes are good at doubling
-+the number of bits affected, so the goal of mixing pulls in the opposite
-+direction as the goal of parallelism. I did what I could. Rotates
-+seem to cost as much as shifts on every machine I could lay my hands
-+on, and rotates are much kinder to the top and bottom bits, so I used
-+rotates.
-+-------------------------------------------------------------------------------
-+*/
-+#define mix(a,b,c) \
-+{ \
-+ a -= c; a ^= rot(c, 4); c += b; \
-+ b -= a; b ^= rot(a, 6); a += c; \
-+ c -= b; c ^= rot(b, 8); b += a; \
-+ a -= c; a ^= rot(c,16); c += b; \
-+ b -= a; b ^= rot(a,19); a += c; \
-+ c -= b; c ^= rot(b, 4); b += a; \
-+}
-+
-+/*
-+-------------------------------------------------------------------------------
-+final -- final mixing of 3 32-bit values (a,b,c) into c
-+
-+Pairs of (a,b,c) values differing in only a few bits will usually
-+produce values of c that look totally different. This was tested for
-+* pairs that differed by one bit, by two bits, in any combination
-+ of top bits of (a,b,c), or in any combination of bottom bits of
-+ (a,b,c).
-+* "differ" is defined as +, -, ^, or ~^. For + and -, I transformed
-+ the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
-+ is commonly produced by subtraction) look like a single 1-bit
-+ difference.
-+* the base values were pseudorandom, all zero but one bit set, or
-+ all zero plus a counter that starts at zero.
-+
-+These constants passed:
-+ 14 11 25 16 4 14 24
-+ 12 14 25 16 4 14 24
-+and these came close:
-+ 4 8 15 26 3 22 24
-+ 10 8 15 26 3 22 24
-+ 11 8 15 26 3 22 24
-+-------------------------------------------------------------------------------
-+*/
-+#define final(a,b,c) \
-+{ \
-+ c ^= b; c -= rot(b,14); \
-+ a ^= c; a -= rot(c,11); \
-+ b ^= a; b -= rot(a,25); \
-+ c ^= b; c -= rot(b,16); \
-+ a ^= c; a -= rot(c,4); \
-+ b ^= a; b -= rot(a,14); \
-+ c ^= b; c -= rot(b,24); \
-+}
-+
-+
-+/*
-+-------------------------------------------------------------------------------
-+hashlittle() -- hash a variable-length key into a 32-bit value
-+ k : the key (the unaligned variable-length array of bytes)
-+ length : the length of the key, counting by bytes
-+ initval : can be any 4-byte value
-+Returns a 32-bit value. Every bit of the key affects every bit of
-+the return value. Two keys differing by one or two bits will have
-+totally different hash values.
-+
-+The best hash table sizes are powers of 2. There is no need to do
-+mod a prime (mod is sooo slow!). If you need less than 32 bits,
-+use a bitmask. For example, if you need only 10 bits, do
-+ h = (h & hashmask(10));
-+In which case, the hash table should have hashsize(10) elements.
-+
-+If you are hashing n strings (uint8_t **)k, do it like this:
-+ for (i=0, h=0; i<n; ++i) h = hashlittle( k[i], len[i], h);
-+
-+By Bob Jenkins, 2006. bob_jenkins@burtleburtle.net. You may use this
-+code any way you wish, private, educational, or commercial. It's free.
-+
-+Use for hash table lookup, or anything where one collision in 2^^32 is
-+acceptable. Do NOT use for cryptographic purposes.
-+-------------------------------------------------------------------------------
-+*/
-+
-+static uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
-+{
-+ uint32_t a,b,c; /* internal state */
-+ union { const void *ptr; size_t i; } u; /* needed for Mac Powerbook G4 */
-+
-+ /* Set up the internal state */
-+ a = b = c = 0xdeadbeef + ((uint32_t)length) + initval;
-+
-+ u.ptr = key;
-+ if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
-+ const uint32_t *k = (const uint32_t *)key; /* read 32-bit chunks */
-+
-+ /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
-+ while (length > 12)
-+ {
-+ a += k[0];
-+ b += k[1];
-+ c += k[2];
-+ mix(a,b,c);
-+ length -= 12;
-+ k += 3;
-+ }
-+
-+ /*----------------------------- handle the last (probably partial) block */
-+ /*
-+ * "k[2]&0xffffff" actually reads beyond the end of the string, but
-+ * then masks off the part it's not allowed to read. Because the
-+ * string is aligned, the masked-off tail is in the same word as the
-+ * rest of the string. Every machine with memory protection I've seen
-+ * does it on word boundaries, so is OK with this. But VALGRIND will
-+ * still catch it and complain. The masking trick does make the hash
-+ * noticably faster for short strings (like English words).
-+ */
-+#ifndef VALGRIND
-+
-+ switch(length)
-+ {
-+ case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-+ case 11: c+=k[2]&0xffffff; b+=k[1]; a+=k[0]; break;
-+ case 10: c+=k[2]&0xffff; b+=k[1]; a+=k[0]; break;
-+ case 9 : c+=k[2]&0xff; b+=k[1]; a+=k[0]; break;
-+ case 8 : b+=k[1]; a+=k[0]; break;
-+ case 7 : b+=k[1]&0xffffff; a+=k[0]; break;
-+ case 6 : b+=k[1]&0xffff; a+=k[0]; break;
-+ case 5 : b+=k[1]&0xff; a+=k[0]; break;
-+ case 4 : a+=k[0]; break;
-+ case 3 : a+=k[0]&0xffffff; break;
-+ case 2 : a+=k[0]&0xffff; break;
-+ case 1 : a+=k[0]&0xff; break;
-+ case 0 : return c; /* zero length strings require no mixing */
-+ }
-+
-+#else /* make valgrind happy */
-+
-+ const uint8_t *k8 = (const uint8_t *)k;
-+ switch(length)
-+ {
-+ case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-+ case 11: c+=((uint32_t)k8[10])<<16; /* fall through */
-+ case 10: c+=((uint32_t)k8[9])<<8; /* fall through */
-+ case 9 : c+=k8[8]; /* fall through */
-+ case 8 : b+=k[1]; a+=k[0]; break;
-+ case 7 : b+=((uint32_t)k8[6])<<16; /* fall through */
-+ case 6 : b+=((uint32_t)k8[5])<<8; /* fall through */
-+ case 5 : b+=k8[4]; /* fall through */
-+ case 4 : a+=k[0]; break;
-+ case 3 : a+=((uint32_t)k8[2])<<16; /* fall through */
-+ case 2 : a+=((uint32_t)k8[1])<<8; /* fall through */
-+ case 1 : a+=k8[0]; break;
-+ case 0 : return c;
-+ }
-+
-+#endif /* !valgrind */
-+
-+ } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
-+ const uint16_t *k = (const uint16_t *)key; /* read 16-bit chunks */
-+ const uint8_t *k8;
-+
-+ /*--------------- all but last block: aligned reads and different mixing */
-+ while (length > 12)
-+ {
-+ a += k[0] + (((uint32_t)k[1])<<16);
-+ b += k[2] + (((uint32_t)k[3])<<16);
-+ c += k[4] + (((uint32_t)k[5])<<16);
-+ mix(a,b,c);
-+ length -= 12;
-+ k += 6;
-+ }
-+
-+ /*----------------------------- handle the last (probably partial) block */
-+ k8 = (const uint8_t *)k;
-+ switch(length)
-+ {
-+ case 12: c+=k[4]+(((uint32_t)k[5])<<16);
-+ b+=k[2]+(((uint32_t)k[3])<<16);
-+ a+=k[0]+(((uint32_t)k[1])<<16);
-+ break;
-+ case 11: c+=((uint32_t)k8[10])<<16; /* fall through */
-+ case 10: c+=k[4];
-+ b+=k[2]+(((uint32_t)k[3])<<16);
-+ a+=k[0]+(((uint32_t)k[1])<<16);
-+ break;
-+ case 9 : c+=k8[8]; /* fall through */
-+ case 8 : b+=k[2]+(((uint32_t)k[3])<<16);
-+ a+=k[0]+(((uint32_t)k[1])<<16);
-+ break;
-+ case 7 : b+=((uint32_t)k8[6])<<16; /* fall through */
-+ case 6 : b+=k[2];
-+ a+=k[0]+(((uint32_t)k[1])<<16);
-+ break;
-+ case 5 : b+=k8[4]; /* fall through */
-+ case 4 : a+=k[0]+(((uint32_t)k[1])<<16);
-+ break;
-+ case 3 : a+=((uint32_t)k8[2])<<16; /* fall through */
-+ case 2 : a+=k[0];
-+ break;
-+ case 1 : a+=k8[0];
-+ break;
-+ case 0 : return c; /* zero length requires no mixing */
-+ }
-+
-+ } else { /* need to read the key one byte at a time */
-+ const uint8_t *k = (const uint8_t *)key;
-+
-+ /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-+ while (length > 12)
-+ {
-+ a += k[0];
-+ a += ((uint32_t)k[1])<<8;
-+ a += ((uint32_t)k[2])<<16;
-+ a += ((uint32_t)k[3])<<24;
-+ b += k[4];
-+ b += ((uint32_t)k[5])<<8;
-+ b += ((uint32_t)k[6])<<16;
-+ b += ((uint32_t)k[7])<<24;
-+ c += k[8];
-+ c += ((uint32_t)k[9])<<8;
-+ c += ((uint32_t)k[10])<<16;
-+ c += ((uint32_t)k[11])<<24;
-+ mix(a,b,c);
-+ length -= 12;
-+ k += 12;
-+ }
-+
-+ /*-------------------------------- last block: affect all 32 bits of (c) */
-+ switch(length) /* all the case statements fall through */
-+ {
-+ case 12: c+=((uint32_t)k[11])<<24;
-+ case 11: c+=((uint32_t)k[10])<<16;
-+ case 10: c+=((uint32_t)k[9])<<8;
-+ case 9 : c+=k[8];
-+ case 8 : b+=((uint32_t)k[7])<<24;
-+ case 7 : b+=((uint32_t)k[6])<<16;
-+ case 6 : b+=((uint32_t)k[5])<<8;
-+ case 5 : b+=k[4];
-+ case 4 : a+=((uint32_t)k[3])<<24;
-+ case 3 : a+=((uint32_t)k[2])<<16;
-+ case 2 : a+=((uint32_t)k[1])<<8;
-+ case 1 : a+=k[0];
-+ break;
-+ case 0 : return c;
-+ }
-+ }
-+
-+ final(a,b,c);
-+ return c;
-+}
-+
- unsigned long lh_char_hash(const void *k)
- {
-- unsigned int h = 0;
-- const char* data = (const char*)k;
--
-- while( *data!=0 ) h = h*129 + (unsigned int)(*data++) + LH_PRIME;
-+ static volatile int random_seed = -1;
-+
-+ if (random_seed == -1) {
-+ int seed;
-+ /* we can't use -1 as it is the unitialized sentinel */
-+ while ((seed = json_c_get_random_seed()) == -1);
-+#if defined __GNUC__
-+ __sync_val_compare_and_swap(&random_seed, -1, seed);
-+#elif defined _MSC_VER
-+ InterlockedCompareExchange(&random_seed, seed, -1);
-+#else
-+#warning "racy random seed initializtion if used by multiple threads"
-+ random_seed = seed; /* potentially racy */
-+#endif
-+ }
-
-- return h;
-+ return hashlittle((const char*)k, strlen((const char*)k), random_seed);
- }
-
- int lh_char_equal(const void *k1, const void *k2)
-diff --git a/linkhash.h b/linkhash.h
-index 378de0b..950d09f 100644
---- a/linkhash.h
-+++ b/linkhash.h
-@@ -246,7 +246,7 @@ extern struct lh_entry* lh_table_lookup_entry(struct lh_table *t, const void *k)
- * @return a pointer to the found value or NULL if it does not exist.
- * @deprecated Use lh_table_lookup_ex instead.
- */
--extern const void* lh_table_lookup(struct lh_table *t, const void *k);
-+THIS_FUNCTION_IS_DEPRECATED(extern const void* lh_table_lookup(struct lh_table *t, const void *k));
-
- /**
- * Lookup a record in the table
-diff --git a/random_seed.c b/random_seed.c
-new file mode 100644
-index 0000000..3b520d4
---- /dev/null
-+++ b/random_seed.c
-@@ -0,0 +1,237 @@
-+/*
-+ * random_seed.c
-+ *
-+ * Copyright (c) 2013 Metaparadigm Pte. Ltd.
-+ * Michael Clark <michael@metaparadigm.com>
-+ *
-+ * This library is free software; you can redistribute it and/or modify
-+ * it under the terms of the MIT license. See COPYING for details.
-+ *
-+ */
-+
-+#include <stdio.h>
-+#include "config.h"
-+
-+#define DEBUG_SEED(s)
-+
-+
-+#if defined ENABLE_RDRAND
-+
-+/* cpuid */
-+
-+#if defined __GNUC__ && (defined __i386__ || defined __x86_64__)
-+#define HAS_X86_CPUID 1
-+
-+static void do_cpuid(int regs[], int h)
-+{
-+ __asm__ __volatile__(
-+#if defined __x86_64__
-+ "pushq %%rbx;\n"
-+#else
-+ "pushl %%ebx;\n"
-+#endif
-+ "cpuid;\n"
-+#if defined __x86_64__
-+ "popq %%rbx;\n"
-+#else
-+ "popl %%ebx;\n"
-+#endif
-+ : "=a"(regs[0]), [ebx] "=r"(regs[1]), "=c"(regs[2]), "=d"(regs[3])
-+ : "a"(h));
-+}
-+
-+#elif defined _MSC_VER
-+
-+#define HAS_X86_CPUID 1
-+#define do_cpuid __cpuid
-+
-+#endif
-+
-+/* has_rdrand */
-+
-+#if HAS_X86_CPUID
-+
-+static int has_rdrand()
-+{
-+ // CPUID.01H:ECX.RDRAND[bit 30] == 1
-+ int regs[4];
-+ do_cpuid(regs, 1);
-+ return (regs[2] & (1 << 30)) != 0;
-+}
-+
-+#endif
-+
-+/* get_rdrand_seed - GCC x86 and X64 */
-+
-+#if defined __GNUC__ && (defined __i386__ || defined __x86_64__)
-+
-+#define HAVE_RDRAND 1
-+
-+static int get_rdrand_seed()
-+{
-+ DEBUG_SEED("get_rdrand_seed");
-+ int _eax;
-+ // rdrand eax
-+ __asm__ __volatile__("1: .byte 0x0F\n"
-+ " .byte 0xC7\n"
-+ " .byte 0xF0\n"
-+ " jnc 1b;\n"
-+ : "=a" (_eax));
-+ return _eax;
-+}
-+
-+#endif
-+
-+#if defined _MSC_VER
-+
-+#if _MSC_VER >= 1700
-+#define HAVE_RDRAND 1
-+
-+/* get_rdrand_seed - Visual Studio 2012 and above */
-+
-+static int get_rdrand_seed()
-+{
-+ DEBUG_SEED("get_rdrand_seed");
-+ int r;
-+ while (_rdrand32_step(&r) == 0);
-+ return r;
-+}
-+
-+#elif defined _M_IX86
-+#define HAVE_RDRAND 1
-+
-+/* get_rdrand_seed - Visual Studio 2010 and below - x86 only */
-+
-+static int get_rdrand_seed()
-+{
-+ DEBUG_SEED("get_rdrand_seed");
-+ int _eax;
-+retry:
-+ // rdrand eax
-+ __asm _emit 0x0F __asm _emit 0xC7 __asm _emit 0xF0
-+ __asm jnc retry
-+ __asm mov _eax, eax
-+ return _eax;
-+}
-+
-+#endif
-+#endif
-+
-+#endif /* defined ENABLE_RDRAND */
-+
-+
-+/* has_dev_urandom */
-+
-+#if defined (__APPLE__) || defined(__unix__) || defined(__linux__)
-+
-+#include <string.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <sys/stat.h>
-+
-+#define HAVE_DEV_RANDOM 1
-+
-+static const char *dev_random_file = "/dev/urandom";
-+
-+static int has_dev_urandom()
-+{
-+ struct stat buf;
-+ if (stat(dev_random_file, &buf)) {
-+ return 0;
-+ }
-+ return ((buf.st_mode & S_IFCHR) != 0);
-+}
-+
-+
-+/* get_dev_random_seed */
-+
-+static int get_dev_random_seed()
-+{
-+ DEBUG_SEED("get_dev_random_seed");
-+
-+ int fd = open(dev_random_file, O_RDONLY);
-+ if (fd < 0) {
-+ fprintf(stderr, "error opening %s: %s", dev_random_file, strerror(errno));
-+ exit(1);
-+ }
-+
-+ int r;
-+ ssize_t nread = read(fd, &r, sizeof(r));
-+ if (nread != sizeof(r)) {
-+ fprintf(stderr, "error read %s: %s", dev_random_file, strerror(errno));
-+ exit(1);
-+ }
-+ else if (nread != sizeof(r)) {
-+ fprintf(stderr, "error short read %s", dev_random_file);
-+ exit(1);
-+ }
-+ close(fd);
-+ return r;
-+}
-+
-+#endif
-+
-+
-+/* get_cryptgenrandom_seed */
-+
-+#ifdef WIN32
-+
-+#define HAVE_CRYPTGENRANDOM 1
-+
-+#include <windows.h>
-+#pragma comment(lib, "advapi32.lib")
-+
-+static int get_cryptgenrandom_seed()
-+{
-+ DEBUG_SEED("get_cryptgenrandom_seed");
-+
-+ HCRYPTPROV hProvider = 0;
-+ int r;
-+
-+ if (!CryptAcquireContextW(&hProvider, 0, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
-+ fprintf(stderr, "error CryptAcquireContextW");
-+ exit(1);
-+ }
-+
-+ if (!CryptGenRandom(hProvider, sizeof(r), (BYTE*)&r)) {
-+ fprintf(stderr, "error CryptGenRandom");
-+ exit(1);
-+ }
-+
-+ CryptReleaseContext(hProvider, 0);
-+
-+ return r;
-+}
-+
-+#endif
-+
-+
-+/* get_time_seed */
-+
-+#include <time.h>
-+
-+static int get_time_seed()
-+{
-+ DEBUG_SEED("get_time_seed");
-+
-+ return (int)time(NULL) * 433494437;
-+}
-+
-+
-+/* json_c_get_random_seed */
-+
-+int json_c_get_random_seed()
-+{
-+#if HAVE_RDRAND
-+ if (has_rdrand()) return get_rdrand_seed();
-+#endif
-+#if HAVE_DEV_RANDOM
-+ if (has_dev_urandom()) return get_dev_random_seed();
-+#endif
-+#if HAVE_CRYPTGENRANDOM
-+ return get_cryptgenrandom_seed();
-+#endif
-+ return get_time_seed();
-+}
-diff --git a/random_seed.h b/random_seed.h
-new file mode 100644
-index 0000000..7362d67
---- /dev/null
-+++ b/random_seed.h
-@@ -0,0 +1,25 @@
-+/*
-+ * random_seed.h
-+ *
-+ * Copyright (c) 2013 Metaparadigm Pte. Ltd.
-+ * Michael Clark <michael@metaparadigm.com>
-+ *
-+ * This library is free software; you can redistribute it and/or modify
-+ * it under the terms of the MIT license. See COPYING for details.
-+ *
-+ */
-+
-+#ifndef seed_h
-+#define seed_h
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+extern int json_c_get_random_seed();
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---
-1.9.1
-
---- a/config.h.in 2013-04-03 04:04:18.000000000 +0200
-+++ b/config.h.in 2014-04-10 10:32:09.318409377 +0200
-@@ -3,12 +3,18 @@
- /* Define if .gnu.warning accepts long strings. */
- #undef HAS_GNU_WARNING_LONG
-
-+/* Enable RDRANR Hardware RNG Hash Seed */
-+#undef ENABLE_RDRAND
-+
- /* Define to 1 if you have the <dlfcn.h> header file. */
- #undef HAVE_DLFCN_H
-
- /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
- #undef HAVE_DOPRNT
-
-+/* Define to 1 if you have the <endian.h> header file. */
-+#undef HAVE_ENDIAN_H
-+
- /* Define to 1 if you have the <fcntl.h> header file. */
- #undef HAVE_FCNTL_H
-
---- a/configure.in 2014-04-10 10:32:56.443006786 +0200
-+++ b/configure.in 2014-04-10 10:34:26.480080755 +0200
-@@ -15,6 +15,20 @@
- )
- AM_CONDITIONAL(ENABLE_OLDNAME_COMPAT, [test "x${enable_oldname_compat}" != "xno"])
-
-+AC_ARG_ENABLE(rdrand,
-+ AS_HELP_STRING([--enable-rdrand],
-+ [Enable RDRAND Hardware RNG Hash Seed generation on supported x86/x64 platforms.]),
-+ [if test x$enableval = xyes; then
-+ enable_rdrand=yes
-+ AC_DEFINE(ENABLE_RDRAND, 1, [Enable RDRANR Hardware RNG Hash Seed])
-+ fi])
-+
-+if test "x$enable_rdrand" = "xyes"; then
-+ AC_MSG_RESULT([RDRAND Hardware RNG Hash Seed enabled on supported x86/x64 platforms])
-+else
-+ AC_MSG_RESULT([RDRAND Hardware RNG Hash Seed disabled. Use --enable-rdrand to enable])
-+fi
-+
- # Checks for programs.
-
- # Checks for libraries.
-@@ -23,7 +37,7 @@
- AC_CONFIG_HEADER(config.h)
- AC_CONFIG_HEADER(json_config.h)
- AC_HEADER_STDC
--AC_CHECK_HEADERS(fcntl.h limits.h strings.h syslog.h unistd.h [sys/cdefs.h] [sys/param.h] stdarg.h locale.h)
-+AC_CHECK_HEADERS(fcntl.h limits.h strings.h syslog.h unistd.h [sys/cdefs.h] [sys/param.h] stdarg.h locale.h endian.h)
- AC_CHECK_HEADER(inttypes.h,[AC_DEFINE([JSON_C_HAVE_INTTYPES_H],[1],[Public define for json_inttypes.h])])
-
- # Checks for typedefs, structures, and compiler characteristics.
+++ /dev/null
-SUMMARY = "C bindings for apps which will manipulate JSON data"
-DESCRIPTION = "JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C."
-HOMEPAGE = "https://github.com/json-c/json-c/wiki"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2"
-
-SRC_URI = "\
- https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \
- file://json-c-CVE-2013-6371.patch \
- file://json-c-Add-FALLTHRU-comment-to-handle-GCC7-warnings.patch \
-"
-SRC_URI[md5sum] = "aa02367d2f7a830bf1e3376f77881e98"
-SRC_URI[sha256sum] = "28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c"
-
-RPROVIDES_${PN} = "libjson"
-
-PARALLEL_MAKE = ""
-
-inherit autotools
-
-do_configure_prepend() {
- # Clean up autoconf cruft that should not be in the tarball
- rm -f ${S}/config.status
-}
-
-BBCLASSEXTEND = "native nativesdk"
+++ /dev/null
-DEPENDS += "\
- python-native \
- "
-
-EXTRA_OECMAKE_PY2 = " \
- -DPYTHON_DESIRED=2 \
- -DPYTHON_INSTALL_DIR=${libdir}/python2.7/site-packages \
- -DPYTHON_EXECUTABLE=${STAGING_BINDIR_NATIVE}/python-native/python \
- "
-
-do_configure_append() {
- rm -rf ${B}/build-py2
- mkdir -p ${B}/build-py2
- cd ${B}/build-py2
-
- cmake \
- ${OECMAKE_GENERATOR_ARGS} \
- $oecmake_sitefile \
- ${OECMAKE_SOURCEPATH} \
- -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
- -DCMAKE_INSTALL_SO_NO_EXE=0 \
- -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
- -DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \
- ${EXTRA_OECMAKE_PY2} \
- -Wno-dev
-}
-
-cmake_runcmake_build_py2() {
- bbnote ${DESTDIR:+DESTDIR=${DESTDIR} }VERBOSE=1 cmake --build '${B}/build-py2' "$@" -- ${EXTRA_OECMAKE_BUILD}
- eval ${DESTDIR:+DESTDIR=${DESTDIR} }VERBOSE=1 cmake --build '${B}/build-py2' "$@" -- ${EXTRA_OECMAKE_BUILD}
-}
-
-do_compile_append() {
- cd ${B}/build-py2
- cmake_runcmake_build_py2 --target ${OECMAKE_TARGET_COMPILE}
-}
-
-do_install_append() {
- cd ${B}/build-py2
- DESTDIR='${D}' cmake_runcmake_build_py2 --target ${OECMAKE_TARGET_INSTALL}
-}
-
+++ /dev/null
-DEPENDS += "\
- python-native \
- "
-
-EXTRA_OECMAKE_PY2 = " \
- -DPYTHON_INSTALL_DIR=${libdir}/python2.7/site-packages \
- -DPYTHON_DESIRED:FILEPATH=${STAGING_BINDIR_NATIVE}/python-native/python \
- -DWITH_MAN=OFF \
- ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DWITH_GIR=ON', '-DWITH_GIR=OFF', d)} \
- -DWITH_TESTS=OFF \
- "
-
-do_configure_append() {
- rm -rf ${B}/build-py2
- mkdir -p ${B}/build-py2
- cd ${B}/build-py2
-
- cmake \
- ${OECMAKE_GENERATOR_ARGS} \
- $oecmake_sitefile \
- ${OECMAKE_SOURCEPATH} \
- -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
- -DCMAKE_INSTALL_SYSCONFDIR:PATH=${sysconfdir} \
- -DCMAKE_INSTALL_SO_NO_EXE=0 \
- -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
- -DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \
- ${EXTRA_OECMAKE_PY2} \
- -Wno-dev
-}
-
-cmake_runcmake_build_py2() {
- bbnote ${DESTDIR:+DESTDIR=${DESTDIR} }VERBOSE=1 cmake --build '${B}/build-py2' "$@" -- ${EXTRA_OECMAKE_BUILD}
- eval ${DESTDIR:+DESTDIR=${DESTDIR} }VERBOSE=1 cmake --build '${B}/build-py2' "$@" -- ${EXTRA_OECMAKE_BUILD}
-}
-
-do_compile_append() {
- cd ${B}/build-py2
- cmake_runcmake_build_py2 --target ${OECMAKE_TARGET_COMPILE}
-}
-
-do_install_append() {
- cd ${B}/build-py2
- DESTDIR='${D}' cmake_runcmake_build_py2 --target ${OECMAKE_TARGET_INSTALL}
-}
-
+++ /dev/null
-
-SUMMARY = "perlfilter - Source Filters"
-DESCRIPTION = "\
- perlfilter - Source Filters \
- Modules included: \
- - Filter::Util::Call - Perl Source Filter Utility Module \
- - Filter::Util::Exec - exec source filter \
- - Filter::decrypt - template for a decrypt source filter \
- - Filter::cpp - cpp source filter \
- - Filter::exec - exec source filter \
- - Filter::m4 - M4 source filter \
- - Filter::sh - sh source filter \
- - Filter::tee - tee source filter \
-"
-HOMEPAGE = "https://metacpan.org/release/Filter"
-
-SECTION = "libs"
-
-LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=11;md5=963ce28228347875ace682de56eef8e8"
-
-CPAN_PACKAGE = "Filter"
-
-SRC_URI = "${CPAN_MIRROR}/authors/id/R/RU/RURBAN/${CPAN_PACKAGE}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "54e08a158bff1f35e0a93b3993dcf52f"
-SRC_URI[sha256sum] = "b4babfad4e0566a9a61199735f6e622a60d3274122752304f18f623412bf4e5a"
-
-S = "${WORKDIR}/${CPAN_PACKAGE}-${PV}"
-
-inherit cpan
-
-BBCLASSEXTEND = "native nativesdk"
+++ /dev/null
-
-DESCRIPTION = "HTML Tagset bits."
-HOMEPAGE = "http://search.cpan.org/dist/HTML-Tagset/"
-SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM = "file://README;beginline=60;md5=16ddda2d845a5546f615e6b122d1dbad"
-
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-${PV}.tar.gz"
-
-S = "${WORKDIR}/HTML-Tagset-${PV}"
-
-inherit cpan
-
-BBCLASSEXTEND="native"
-
-
-SRC_URI[md5sum] = "d2bfa18fe1904df7f683e96611e87437"
-SRC_URI[sha256sum] = "adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2"
+++ /dev/null
-
-DESCRIPTION = "MailTools is a set of Perl modules related to mail applications"
-HOMEPAGE = "http://search.cpan.org/dist/MailTools/"
-SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM = "file://lib/Mail/Mailer.pod;beginline=144;md5=93c9027e72612b3555f857c4fc17b953"
-DEPENDS = " \
- libtest-pod-perl-native \
- libtimedate-perl-native \
- "
-RDEPENDS_${PN} += " \
- libtest-pod-perl \
- libtimedate-perl \
- perl-module-io-handle \
- perl-module-net-smtp \
- perl-module-test-more \
- "
-BBCLASSEXTEND = "native"
-
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/MailTools-${PV}.tar.gz"
-SRC_URI[md5sum] = "972468ab5207b90398d77bed4ffc361d"
-SRC_URI[sha256sum] = "dfee9e770257371112f20d978e637759e81bc4f19e97b083585c71ecab37b527"
-
-S = "${WORKDIR}/MailTools-${PV}"
-
-inherit cpan
-
+++ /dev/null
-
-DESCRIPTION = "MailTools is a set of Perl modules related to mail applications"
-HOMEPAGE = "http://search.cpan.org/dist/MailTools/"
-SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM = "file://lib/Mail/Mailer.pod;beginline=144;md5=641bd171b1aaabba1fc83ac0a98a2d30"
-DEPENDS = " \
- libtest-pod-perl-native \
- libtimedate-perl-native \
- "
-RDEPENDS_${PN} += " \
- libtest-pod-perl \
- libtimedate-perl \
- perl-module-io-handle \
- perl-module-net-smtp \
- perl-module-test-more \
- "
-BBCLASSEXTEND = "native"
-
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/MailTools-${PV}.tar.gz"
-SRC_URI[md5sum] = "53e9d35256c3fd7cef0e4a24b15e9512"
-SRC_URI[sha256sum] = "f55606f7a9cc342ee9d5f996e2b6a4c0047e2ee47cd88c3250ecf0d0c5fb3196"
-
-S = "${WORKDIR}/MailTools-${PV}"
-
-inherit cpan
+++ /dev/null
-From b33a6a83687fc58cd5f662d44ba8819498cb80a4 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Thu, 9 Aug 2018 14:10:32 +0800
-Subject: [PATCH] socket6-perl: fix configure error
-
-only do IPv6_CHECK_INET_NTOP when not cross compile to fix below
-error: checking for working inet_ntop..., configure: error:
-cannot run test program while cross compiling
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- configure.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 1fe22e1..1a7cf94 100644
---- a/configure.in
-+++ b/configure.in
-@@ -63,7 +63,9 @@ if test $ac_cv_lib_inet6_getaddrinfo = yes; then
- INET6LIBS="-L$ipv6_cv_dir/lib -linet6"
- fi
-
--IPv6_CHECK_INET_NTOP()
-+if test "$cross_compiling" != yes; then
-+ IPv6_CHECK_INET_NTOP()
-+fi
- IPv6_CHECK_SA_LEN()
- IPv6_CHECK_SIN6_SCOPE_ID()
- IPv6_CHECK_SOCKLEN_T()
---
-2.7.4
-
+++ /dev/null
-
-DESCRIPTION = "Perl extensions for IPv6"
-HOMEPAGE = "https://metacpan.org/release/Socket6"
-SECTION = "libs"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://README;beginline=31;md5=ad207d410de6d8ca6b4655469baa1ab4"
-
-BBCLASSEXTEND = "native"
-
-CFLAGS += "-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-BUILD_CFLAGS += "-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-${PV}.tar.gz;name=socket6-perl-${PV}"
-SRC_URI[socket6-perl-0.23.md5sum] = "2c02adb13c449d48d232bb704ddbd492"
-SRC_URI[socket6-perl-0.23.sha256sum] = "eda753f0197e8c3c8d4ab20a634561ce84011fa51aa5ff40d4dbcb326ace0833"
-
-S = "${WORKDIR}/Socket6-${PV}"
-
-do_configure_prepend () {
- mkdir -p m4
- autoreconf -Wcross --verbose --install --force || oefatal "autoreconf execution failed."
- sed -i 's:\./configure\(.[^-]\):./configure --build=${BUILD_SYS} --host=${HOST_SYS} --target=${TARGET_SYS} --prefix=${prefix} --exec_prefix=${exec_prefix} --bindir=${bindir} --sbindir=${sbindir} --libexecdir=${libexecdir} --datadir=${datadir} --sysconfdir=${sysconfdir} --sharedstatedir=${sharedstatedir} --localstatedir=${localstatedir} --libdir=${libdir} --includedir=${includedir} --oldincludedir=${oldincludedir} --infodir=${infodir} --mandir=${mandir}\1:' Makefile.PL
-}
-
-inherit cpan
+++ /dev/null
-
-DESCRIPTION = "Perl extensions for IPv6"
-HOMEPAGE = "https://metacpan.org/release/Socket6"
-SECTION = "libs"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://README;beginline=31;md5=aa15b0e3744ac40eaada8738eccd24df"
-
-BBCLASSEXTEND = "native"
-
-CFLAGS += "-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-BUILD_CFLAGS += "-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-${PV}.tar.gz;name=socket6-perl-${PV} \
- file://0001-socket6-perl-fix-configure-error.patch \
-"
-SRC_URI[socket6-perl-0.28.md5sum] = "aa8489135a3dbcec6233396e1aeb043b"
-SRC_URI[socket6-perl-0.28.sha256sum] = "bfd49ab99f3197c99285fed4683c4edc06277c1e4453f593e694d7bff0974586"
-
-S = "${WORKDIR}/Socket6-${PV}"
-
-do_configure_prepend () {
- mkdir -p m4
- autoreconf -Wcross --verbose --install --force || oefatal "autoreconf execution failed."
- sed -i 's:\./configure\(.[^-]\):./configure --build=${BUILD_SYS} --host=${HOST_SYS} --target=${TARGET_SYS} --prefix=${prefix} --exec_prefix=${exec_prefix} --bindir=${bindir} --sbindir=${sbindir} --libexecdir=${libexecdir} --datadir=${datadir} --sysconfdir=${sysconfdir} --sharedstatedir=${sharedstatedir} --localstatedir=${localstatedir} --libdir=${libdir} --includedir=${includedir} --oldincludedir=${oldincludedir} --infodir=${infodir} --mandir=${mandir}\1:' Makefile.PL
-}
-
-inherit cpan
+++ /dev/null
-
-DESCRIPTION = "Test::Pod - check for POD errors in files"
-SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM = "file://README;beginline=26;md5=ea81140c3f3b2937c6490fc732471cd0"
-HOMEPAGE = "https://github.com/perl-pod/test-pod/"
-BBCLASSEXTEND = "native"
-RDEPENDS_${PN} += " perl-module-test-more \
- perl-module-file-spec \
- perl-module-pod-simple \
- perl-module-test-builder-tester \
- "
-
-SRC_URI ="http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Test-Pod-${PV}.tar.gz;name=test-pod-perl-${PV}"
-SRC_URI[test-pod-perl-1.51.md5sum] = "f806aa84de2f0c0fba48b3a5a8a4aecf"
-SRC_URI[test-pod-perl-1.51.sha256sum] = "c1a1d3cedf4a579e3aad89c36f9878a8542b6656dbe71f1581420f49582d7efb"
-S = "${WORKDIR}/Test-Pod-${PV}"
-
-inherit cpan
-
+++ /dev/null
-
-DESCRIPTION = "Test::Pod - check for POD errors in files"
-SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM = "file://README;beginline=26;md5=ea81140c3f3b2937c6490fc732471cd0"
-HOMEPAGE = "https://github.com/perl-pod/test-pod/"
-BBCLASSEXTEND = "native"
-RDEPENDS_${PN} += " perl-module-test-more \
- perl-module-file-spec \
- perl-module-pod-simple \
- perl-module-test-builder-tester \
- "
-
-SRC_URI ="http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Test-Pod-${PV}.tar.gz;name=test-pod-perl-${PV}"
-SRC_URI[test-pod-perl-1.52.md5sum] = "472dda77746d48e6465bf62e47aeca81"
-SRC_URI[test-pod-perl-1.52.sha256sum] = "60a8dbcc60168bf1daa5cc2350236df9343e9878f4ab9830970a5dde6fe8e5fc"
-S = "${WORKDIR}/Test-Pod-${PV}"
-
-inherit cpan
+++ /dev/null
-
-DESCRIPTION = "libwww-perl provides a simple and consistent API to the World Wide Web"
-HOMEPAGE = "http://search.cpan.org/dist/libwww-perl/"
-SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM = "file://README;beginline=92;endline=98;md5=3da13bc02f8f17ed35ac5d192cae6fe4"
-DEPENDS = "liburi-perl-native libhtml-parser-perl-native libhtml-tagset-perl-native"
-RDEPENDS_${PN} += " \
- libhtml-parser-perl \
- libhtml-tagset-perl \
- liburi-perl \
- perl-module-digest-md5 \
- perl-module-net-ftp \
- "
-BBCLASSEXTEND = "native"
-
-
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz;name=libwww-perl-${PV}"
-SRC_URI[libwww-perl-6.05.md5sum] = "637d5f1eb61336ca2caa6e026b382f87"
-SRC_URI[libwww-perl-6.05.sha256sum] = "7b25799ff7eec18e8e4e97dc0cad7b2a5b433b50b13feb59d9179173bee78f23"
-
-S = "${WORKDIR}/libwww-perl-${PV}"
-
-inherit cpan
-
+++ /dev/null
-
-DESCRIPTION = "libwww-perl provides a simple and consistent API to the World Wide Web"
-HOMEPAGE = "https://metacpan.org/release/libwww-perl"
-SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=225d44a95fa3addb1da6d91187ab189f"
-DEPENDS = "liburi-perl-native libhtml-parser-perl-native libhtml-tagset-perl-native"
-RDEPENDS_${PN} += " \
- libhtml-parser-perl \
- libhtml-tagset-perl \
- liburi-perl \
- perl-module-digest-md5 \
- perl-module-net-ftp \
- "
-BBCLASSEXTEND = "native"
-
-
-SRC_URI = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/libwww-perl-${PV}.tar.gz;name=libwww-perl-${PV}"
-SRC_URI[libwww-perl-6.35.md5sum] = "19cd0f55f61359c973caa9301ec405bd"
-SRC_URI[libwww-perl-6.35.sha256sum] = "dda2578d7b32152c4afce834761a61d117de286c705a9f7972c7ac6032ca5953"
-
-S = "${WORKDIR}/libwww-perl-${PV}"
-
-inherit cpan
+++ /dev/null
-
-SUMMARY = "Tools for working with directory and file names"
-DESCRIPTION = "\
- Modules included: \
- - Cwd - get pathname of current working directory \
- - File::Spec - portably perform operations on file names \
- - File::Spec::AmigaOS - File::Spec for AmigaOS \
- - File::Spec::Cygwin - methods for Cygwin file specs \
- - File::Spec::Epoc - methods for Epoc file specs \
- - File::Spec::Functions - portably perform operations on file names \
- - File::Spec::Mac - File::Spec for Mac OS (Classic) \
- - File::Spec::OS2 - methods for OS/2 file specs \
- - File::Spec::Unix - File::Spec for Unix, base for other File::Spec modules \
- - File::Spec::VMS - methods for VMS file specs \
- - File::Spec::Win32 - methods for Win32 file specs \
-"
-HOMEPAGE = "https://metacpan.org/release/PathTools"
-
-SECTION = "libs"
-
-LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=11;md5=963ce28228347875ace682de56eef8e8"
-
-CPAN_PACKAGE = "PathTools"
-
-SRC_URI = "${CPAN_MIRROR}/authors/id/X/XS/XSAWYERX/${CPAN_PACKAGE}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "8f329058f74468a576442d841c62aa62"
-SRC_URI[sha256sum] = "a558503aa6b1f8c727c0073339081a77888606aa701ada1ad62dd9d8c3f945a2"
-
-S = "${WORKDIR}/${CPAN_PACKAGE}-${PV}"
-
-inherit cpan
-
-RDEPENDS_${PN} = " \
- perl-module-carp \
- perl-module-file-basename \
- perl-module-scalar-util \
- perl-module-test-more \
-"
-
-BBCLASSEXTEND = "native nativesdk"
+++ /dev/null
-
-SUMMARY = "format POD source into various output formats"
-DESCRIPTION = "\
- podlators contains Pod::Man and Pod::Text modules which convert POD input \
- to *roff source output, suitable for man pages, or plain text. It also \
- includes several subclasses of Pod::Text for formatted output to terminals \
- with various capabilities. It is the source package for the Pod::Man and \
- Pod::Text modules included with Perl. \
-"
-HOMEPAGE = "https://www.eyrie.org/~eagle/software/podlators"
-
-SECTION = "libs"
-
-LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a25b3c873fe34dc2909a5b1ca2de4048"
-
-CPAN_PACKAGE = "podlators"
-
-SRC_URI = "${CPAN_MIRROR}/authors/id/R/RR/RRA/${CPAN_PACKAGE}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "99d5b0c15d2f72c5218dce1a5a9448c5"
-SRC_URI[sha256sum] = "948717da19630a5f003da4406da90fe1cbdec9ae493671c90dfb6d8b3d63b7eb"
-
-S = "${WORKDIR}/${CPAN_PACKAGE}-${PV}"
-
-inherit cpan
-
-RDEPENDS_${PN} = " \
- perl-module-encode \
- perl-module-pod-simple \
-"
-
-BBCLASSEXTEND = "native nativesdk"
+++ /dev/null
-
-SUMMARY = "A selection of general-utility list subroutines"
-DESCRIPTION = "\
- List::Util contains a selection of subroutines that people have expressed \
- would be nice to have in the perl core, but the usage would not really be \
- high enough to warrant the use of a keyword, and the size so small such \
- that being individual extensions would be wasteful.\
-"
-HOMEPAGE= "https://metacpan.org/release/Scalar-List-Utils"
-
-SECTION = "libs"
-
-LICENSE = "Artistic-1.0 | GPL-1.0+"
-
-LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=11;md5=963ce28228347875ace682de56eef8e8"
-
-CPAN_PACKAGE = "Scalar-List-Utils"
-
-SRC_URI = "${CPAN_MIRROR}/authors/id/P/PE/PEVANS/${CPAN_PACKAGE}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "136313884d1afa2fb6840695a1034b2c"
-SRC_URI[sha256sum] = "06aab9c693380190e53be09be7daed20c5d6278f71956989c24cca7782013675"
-
-S = "${WORKDIR}/${CPAN_PACKAGE}-${PV}"
-
-inherit cpan
-
-BBCLASSEXTEND = "native nativesdk"
+++ /dev/null
-From 223013ada4792ab0d8f9b02c89aa139969f99a97 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Sun, 29 Dec 2019 21:41:38 -0800
-Subject: [PATCH] barbican: fix path to find configuration files
-
-From 3364915002aa2deaf63841e338375648e5dc8f24 Mon Sep 17 00:00:00 2001
-From: Keith Holman <Keith.Holman@windriver.com>
-Date: Fri, 13 Jun 2014 13:46:04 -0400
-
-Barbican attempts to find configuration files for tests based on where
-the files are located within the source tree. On deployment,
-configuration files are installed to a directory specified by a build
-recipe. This fix updates the location for the configuration files
-with an identifier that is replaced during deployment.
----
- barbican/tests/api/test_resources_policy.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/barbican/tests/api/test_resources_policy.py b/barbican/tests/api/test_resources_policy.py
-index 37a1630f..d9bd9d72 100644
---- a/barbican/tests/api/test_resources_policy.py
-+++ b/barbican/tests/api/test_resources_policy.py
-@@ -37,8 +37,7 @@ from barbican.tests import utils
-
-
- # Point to the policy.json file located in source control.
--TEST_VAR_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
-- '../../../etc', 'barbican'))
-+TEST_VAR_DIR = "%BARBICAN_CONF_DIR%"
-
- CONF = config.new_config()
-
---
-2.23.0
-
+++ /dev/null
-import multiprocessing
-
-bind = '0.0.0.0:9311'
-user = 'barbican'
-group = 'barbican'
-
-timeout = 30
-backlog = 2048
-keepalive = 2
-
-workers = multiprocessing.cpu_count() * 2
-
-loglevel = 'info'
-errorlog = '-'
-accesslog = '-'
-
+++ /dev/null
-[Unit]
-Description=Openstack Barbican API server
-After=syslog.target network.target
-Before=httpd.service
-
-[Service]
-PIDFile=/run/barbican/pid
-User=barbican
-Group=barbican
-RuntimeDirectory=barbican
-RuntimeDirectoryMode=770
-ExecStart=/usr/bin/gunicorn --pid /run/barbican/pid -c /etc/barbican/gunicorn-config.py --paste /etc/barbican/barbican-api-paste.ini
-ExecReload=/bin/kill -s HUP $MAINPID
-ExecStop=/bin/kill -s TERM $MAINPID
-StandardError=syslog
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-[Unit]
-Description=Openstack Barbican worker daemon
-After=syslog.target network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/barbican-keystone-listener
-User=barbican
-Group=barbican
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-[Unit]
-Description=Openstack Barbican worker daemon
-After=syslog.target network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/barbican-worker
-User=barbican
-Group=barbican
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-#
-# Matches bootstrap data in keystone-init
-#
-export OS_PROJECT_DOMAIN_NAME=Default
-export OS_USER_DOMAIN_NAME=Default
-export OS_PROJECT_NAME=admin
-export OS_USERNAME=%ADMIN_USER%
-export OS_PASSWORD=%ADMIN_PASSWORD%
-export OS_AUTH_URL=http://%CONTROLLER_IP%:35357/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_IMAGE_API_VERSION=2
-export OS_REGION_NAME=RegionOne
+++ /dev/null
-#!/usr/bin/python
-
-import sys
-import ConfigParser
-import shutil
-
-path = "/etc/keystone/keystone.conf"
-
-if len(sys.argv) != 2:
- sys.stderr.write("Usage: "+sys.argv[0]+" [sql|hybrid]\n")
- sys.exit(1)
-
-backend = sys.argv[1]
-if backend == "hybrid":
- identity_backend = 'keystone.identity.backends.hybrid_identity.Identity'
- assignment_backend = 'keystone.assignment.backends.hybrid_assignment.Assignment'
-elif backend == "sql":
- identity_backend = 'keystone.identity.backends.sql.Identity'
- assignment_backend = 'keystone.assignment.backends.sql.Assignment'
-else:
- sys.stderr.write("Usage: "+sys.argv[0]+" [sql|hybrid]\n")
- sys.exit(1)
-
-shutil.copyfile(path, path + ".bak")
-
-cfg = ConfigParser.ConfigParser()
-c = cfg.read(path)
-
-if not cfg.has_section("identity"):
- cfg.add_section("identity")
-
-cfg.set("identity", "driver", identity_backend)
-
-if not cfg.has_section("assignment"):
- cfg.add_section("assignment")
-
-cfg.set("assignment", "driver", assignment_backend)
-
-fp = open(path, "w")
-cfg.write(fp)
-fp.close()
-
-exit(0)
+++ /dev/null
-#!/bin/sh
-
-/etc/keystone/convert_keystone_backend.py hybrid
-
-/etc/init.d/openldap start
-/etc/init.d/keystone restart
+++ /dev/null
-#!/bin/bash
-
-#
-# Copyright (C) 2014 Wind River Systems, Inc.
-#
-# The identity.sh provides utilities for services to add tenant/role/users,
-# and service/endpoints into keystone database
-#
-
-# Use shared secret for authentication before any user created.
-export OS_SERVICE_TOKEN="password"
-export OS_SERVICE_ENDPOINT="http://localhost:35357/v2.0"
-
-declare -A PARAMS
-
-# Shortcut function to get a newly generated ID
-function get_field () {
- while read data; do
- if [ "$1" -lt 0 ]; then
- field="(\$(NF$1))"
- else
- field="\$$(($1 + 1))"
- fi
- echo "$data" | awk -F'[ \t]*\\|[ \t]*' "{print $field}"
- done
-}
-
-# Usage help
-help () {
- if [ $# -eq 0 ]; then
- echo "Usage: $0 <subcommand> ..."
- echo ""
- echo "Keystone CLI wrapper to create tenant/user/role, and service/endpoint."
- echo "It uses the default tenant, user and password from environment variables"
- echo "(OS_TENANT_NAME, OS_USERNAME, OS_PASSWORD) to authenticate with keystone."
- echo ""
- echo "Positional arguments:"
- echo " <subcommand>"
- echo " user-create"
- echo " service-create"
- echo ""
- echo "See \"identity.sh help COMMAND\" for help on a specific command."
- exit 0
- fi
-
- case "$2" in
- service-create)
- echo "Usage: $0 $2 [--name=<name>] [--type=<type>] [--description=<description>] [--region=<region>] [--publicurl=<public url>] [--adminurl=<admin url>] [--internalurl=<internal url>]"
- echo ""
- echo "Create service and endpoint in keystone."
- echo ""
- echo "Arguments:"
- echo " --name=<name>"
- echo " The name of the service"
- echo " --type=<type>"
- echo " The type of the service"
- echo " --description=<description>"
- echo " Description of the service"
- echo " --region=<region>"
- echo " The region of the service"
- echo " --publicurl=<public url>"
- echo " Public URL of the service endpoint"
- echo " --adminurl=<admin url>"
- echo " Admin URL of the service endpoint"
- echo " --internalurl=<internal url>"
- echo " Internal URL of the service endpoint"
- ;;
- user-create)
- echo "Usage: $0 $2 [--name=<name>] [--pass=<password>] [--tenant=<tenant>] [--role=<role>] [--email=<email>]"
- echo ""
- echo "Arguments:"
- echo " --name=<name>"
- echo " The name of the user"
- echo " --pass=<password>"
- echo " The password of the user"
- echo " --tenant=<tenant>"
- echo " The tenant of the user belongs to"
- echo " --role=<role>"
- echo " The role of the user in the <tenant>"
- echo " --email=<email>"
- echo " The email of the user"
- ;;
- *)
- echo "Usage: $0 help <subcommand> ..."
- echo ""
- exit 0
- ;;
- esac
-}
-
-# Parse the command line parameters in an map
-parse_param () {
- while [ $# -ne 0 ]; do
- param=$1
- shift
-
- key=`echo $param | cut -d '=' -f 1`
- key=`echo $key | tr -d '[-*2]'`
- PARAMS[$key]=`echo $param | cut -d '=' -f 2`
- done
-}
-
-# Create tenant/role/user, and add user to the tenant as role
-user-create () {
- # validation checking
- if [[ "$@" =~ ^--name=.*\ --pass=.*\ --tenant=.*\ --role=.*\ --email=.*$ ]]; then
- params=`echo "$@" | sed -e 's%--name=\(.*\) --pass=\(.*\) --tenant=\(.*\) --role=\(.*\) --email=\(.*\)%--name=\1|--pass=\2|--tenant=\3|--role=\4|--email=\5%g'`
- else
- help
- exit 1
- fi
-
- # parse the cmdline parameters
- IFS="|"
- parse_param $params
- unset IFS
-
- echo "Adding user in keystone ..."
-
- if [ "x${PARAMS["tenant"]}" != "x" ]; then
- # check if tenant exist, create it if not
- TENANT_ID=$(keystone tenant-get ${PARAMS["tenant"]} | grep " id " | get_field 2)
- if [ "x$TENANT_ID" == "x" ]; then
- echo "Creating tenant ${PARAMS["tenant"]} in keystone ..."
- TENANT_ID=$(keystone tenant-create --name=${PARAMS["tenant"]} | grep " id " | get_field 2)
- fi
- echo "Tenant list:"
- keystone tenant-list
- fi
-
- if [ "x${PARAMS["role"]}" != "x" ]; then
- # check if role exist, create it if not
- ROLE_ID=$(keystone role-get ${PARAMS["role"]} | grep " id " | get_field 2)
- if [ "x$ROLE_ID" == "x" ]; then
- echo "Creating role ${PARAMS["role"]} in keystone ..."
- ROLE_ID=$(keystone role-create --name=${PARAMS["role"]} | grep " id " | get_field 2)
- fi
- echo "Role list:"
- keystone role-list
- fi
-
- if [ "x${PARAMS["name"]}" != "x" ]; then
- # check if user exist, create it if not
- USER_ID=$(keystone user-get ${PARAMS["name"]} | grep " id " | get_field 2)
- if [ "x$USER_ID" == "x" ]; then
- echo "Creating user ${PARAMS["name"]} in keystone ..."
- USER_ID=$(keystone user-create --name=${PARAMS["name"]} --pass=${PARAMS["pass"]} --tenant-id $TENANT_ID --email=${PARAMS["email"]} | grep " id " | get_field 2)
- fi
- echo "User list:"
- keystone user-list
- fi
-
- if [ "x$USER_ID" != "x" ] && [ "x$TENANT_ID" != "x" ] && [ "x$ROLE_ID" != "x" ]; then
- # add the user to the tenant as role
- keystone user-role-list --user-id $USER_ID --tenant-id $TENANT_ID | grep $ROLE_ID &> /dev/null
- if [ $? -eq 1 ]; then
- echo "Adding user ${PARAMS["name"]} in tenant ${PARAMS["tenant"]} as ${PARAMS["role"]} ..."
- keystone user-role-add --tenant-id $TENANT_ID --user-id $USER_ID --role-id $ROLE_ID
- fi
- fi
-
- if [ "x$USER_ID" != "x" ] && [ "x$TENANT_ID" != "x" ]; then
- echo "User ${PARAMS["name"]} in Tenant ${PARAMS["tenant"]} role list:"
- keystone user-role-list --user-id $USER_ID --tenant-id $TENANT_ID
- fi
-}
-
-# Create service and its endpoint
-service-create () {
- # validation checking
- if [[ "$@" =~ ^--name=.*\ --type=.*\ --description=.*\ --region=.*\ --publicurl=.*\ --adminurl=.*\ --internalurl=.*$ ]]; then
- params=`echo "$@" | sed -e 's%--name=\(.*\) --type=\(.*\) --description=\(.*\) --region=\(.*\) --publicurl=\(.*\) --adminurl=\(.*\) --internalurl=\(.*\)%--name=\1|--type=\2|--description=\3|--region=\4|--publicurl=\5|--adminurl=\6|--internalurl=\7%g'`
- else
- help
- exit 1
- fi
-
- # parse the cmdline parameters
- IFS=$"|"
- parse_param $params
- unset IFS
-
- echo "Creating service in keystone ..."
-
- if [ "x${PARAMS["name"]}" != "x" ]; then
- # check if service already created, create it if not
- SERVICE_ID=$(keystone service-get ${PARAMS["name"]} | grep " id " | get_field 2)
- if [ "x$SERVICE_ID" == "x" ]; then
- echo "Adding service ${PARAMS["name"]} in keystone ..."
- SERVICE_ID=$(keystone service-create --name ${PARAMS["name"]} --type ${PARAMS["type"]} --description "${PARAMS["description"]}" | grep " id " | get_field 2)
- fi
- echo "Service list:"
- keystone service-list
- fi
-
- if [ "x$SERVICE_ID" != "x" ]; then
- # create its endpoint
- keystone endpoint-list | grep $SERVICE_ID | grep ${PARAMS["region"]} | grep ${PARAMS["publicurl"]} | grep ${PARAMS["adminurl"]} | grep ${PARAMS["internalurl"]}
- if [ $? -eq 1 ]; then
- echo "Creating endpoint for ${PARAMS["name"]} in keystone ..."
- keystone endpoint-create --region ${PARAMS["region"]} --service-id $SERVICE_ID --publicurl ${PARAMS["publicurl"]} --adminurl ${PARAMS["adminurl"]} --internalurl ${PARAMS["internalurl"]}
- fi
- echo "Endpoints list:"
- keystone endpoint-list
- fi
-}
-
-case "$1" in
- service-create)
- shift
- service-create $@
- ;;
- user-create)
- shift
- user-create $@
- ;;
- help)
- help $@
- ;;
- *)
- help
- exit 0
- ;;
-esac
-
-exit 0
+++ /dev/null
-From 0d6b66b2d5314b454a421bd22fcc8173baf0bc95 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Mon, 20 Oct 2014 15:59:33 -0400
-Subject: [PATCH] keystone: explicitly import localcontext from oslo.messaging
-
-When using apache as a front end to keystone, juno has a problem when
-authenticating clients due to a failure to import localcontext from
-oslo.
-
-We can work around this issue by doing the export explicitly in the
-entry routine versus in the library itself.
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- httpd/keystone.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/httpd/keystone.py b/httpd/keystone.py
-index f5ce498c5152..b2b9285ad2ab 100644
---- a/httpd/keystone.py
-+++ b/httpd/keystone.py
-@@ -32,6 +32,7 @@ from keystone.common import sql
- from keystone import config
- from keystone.openstack.common import log
- from keystone import service
-+from oslo.messaging import localcontext
-
-
- CONF = config.CONF
---
-1.9.1
-
+++ /dev/null
-From 205ee3cfa4c7efd39f5fe991b53327c1bd771f97 Mon Sep 17 00:00:00 2001
-From: Keith Holman <Keith.Holman@windriver.com>
-Date: Tue, 3 Jun 2014 16:19:54 -0400
-Subject: [PATCH] keystone: fix location of files for tests
-
-Keystone tests define the location of certificate files
-as the location of the files in the source tree. However,
-when installed on the system these files are put in a
-different location. This patch provides a symbol, which
-is replaced, for the base path of the location of the test
-files.
-
-Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
----
- keystone/tests/test_overrides.conf | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/keystone/tests/test_overrides.conf b/keystone/tests/test_overrides.conf
-index 801b0d2..ba35343 100644
---- a/keystone/tests/test_overrides.conf
-+++ b/keystone/tests/test_overrides.conf
-@@ -21,6 +21,6 @@ debug_cache_backend = True
- proxies = keystone.tests.test_cache.CacheIsolatingProxy
-
- [signing]
--certfile = ../../examples/pki/certs/signing_cert.pem
--keyfile = ../../examples/pki/private/signing_key.pem
--ca_certs = ../../examples/pki/certs/cacert.pem
-+certfile = %KEYSTONE_PACKAGE_DIR%/examples/pki/certs/signing_cert.pem
-+keyfile = %KEYSTONE_PACKAGE_DIR%/examples/pki/private/signing_key.pem
-+ca_certs = %KEYSTONE_PACKAGE_DIR%/examples/pki/certs/cacert.pem
---
-1.9.3
-
+++ /dev/null
-#!/bin/bash
-#
-# Basic keystone setup as described on:
-# https://docs.openstack.org/mitaka/install-guide-ubuntu/keystone-install.html
-# https://docs.openstack.org/keystone/pike/install/keystone-install-ubuntu.html
-#
-# Prerequisites: /etc/postgresql/postgresql-init must be run first to create the DB
-#
-# After complete you should be able to query keystone with something like the
-# following (https://docs.openstack.org/keystone/latest/api_curl_examples.html)
-#
-#curl -i \
-# -H "Content-Type: application/json" \
-# -d '
-#{ "auth": {
-# "identity": {
-# "methods": ["password"],
-# "password": {
-# "user": {
-# "name": "%ADMIN_USER%",
-# "domain": { "id": "default" },
-# "password": "%ADMIN_PASSWORD%"
-# }
-# }
-# }
-# }
-#}' \
-# "http://localhost:5000/v3/auth/tokens" ; echo
-
-
-# Substitutions setup at do_intall()
-DB_USER=%DB_USER%
-KEYSTONE_USER=%KEYSTONE_USER%
-KEYSTONE_GROUP=%KEYSTONE_GROUP%
-CONTROLLER_IP=%CONTROLLER_IP%
-ADMIN_USER=%ADMIN_USER%
-ADMIN_PASSWORD=%ADMIN_PASSWORD%
-ADMIN_ROLE=%ADMIN_ROLE%
-
-# Create the keystone DB and grant the necessary permissions
-sudo -u postgres psql -c "CREATE DATABASE keystone" 2> /dev/null
-sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE keystone TO ${DB_USER}" 2> /dev/null
-
-keystone-manage db_sync
-
-keystone-manage fernet_setup --keystone-user ${KEYSTONE_USER} --keystone-group ${KEYSTONE_GROUP}
-keystone-manage credential_setup --keystone-user ${KEYSTONE_USER} --keystone-group ${KEYSTONE_GROUP}
-
-keystone-manage bootstrap \
- --bootstrap-password ${ADMIN_PASSWORD} \
- --bootstrap-username ${ADMIN_USER} \
- --bootstrap-project-name admin \
- --bootstrap-role-name ${ADMIN_ROLE} \
- --bootstrap-service-name keystone \
- --bootstrap-region-id RegionOne \
- --bootstrap-admin-url http://${CONTROLLER_IP}:35357 \
- --bootstrap-internal-url http://${CONTROLLER_IP}:5000 \
- --bootstrap-public-url http://${CONTROLLER_IP}:5000
-
-#keystone-manage pki_setup --keystone-user=root --keystone-group=daemon
+++ /dev/null
-[Unit]
-Description=Barebones OpenStack keystone initialization
-After=postgresql-init.service
-
-[Service]
-Type=oneshot
-ExecStart=%SYSCONFIGDIR%/keystone/keystone-init
-ExecStartPost=/bin/systemctl --no-reload disable keystone-init.service
-RemainAfterExit=No
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-From d2ee135a3c97f714e6da59adf45a91a2f1632057 Mon Sep 17 00:00:00 2001
-From: Keith Holman <Keith.Holman@windriver.com>
-Date: Wed, 4 Jun 2014 11:30:53 -0400
-Subject: [PATCH] keystone: remove git commands in tests
-
-Keystone tests are designed to be used during development
-and will use git to download the latest keystoneclient from
-source to test against. However, on the system installation
-we install keystone-client as a separate package, and do not
-want to download an external version to test. In order to
-test against the version installed as a separate package,
-remove the git calls that clone the keystone-client repository
-and just returned the desired directory.
-
-Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
----
- keystone/tests/core.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-Index: git/keystone/tests/core.py
-===================================================================
---- git.orig/keystone/tests/core.py
-+++ git/keystone/tests/core.py
-@@ -125,6 +125,7 @@
-
- working_dir = os.getcwd()
- revdir = os.path.join(VENDOR, '%s-%s' % (name, rev.replace('/', '_')))
-+ """
- modcheck = os.path.join(VENDOR, '.%s-%s' % (name, rev.replace('/', '_')))
- try:
- if os.path.exists(modcheck):
-@@ -145,6 +146,7 @@
- fd.write('1')
- except environment.subprocess.CalledProcessError:
- LOG.warning(_('Failed to checkout %s'), repo)
-+ """
- os.chdir(working_dir)
- return revdir
-
+++ /dev/null
-From ed3c1f7c8eb90506eda1aafbc6d4de3b9e2abe71 Mon Sep 17 00:00:00 2001
-From: Keith Holman <Keith.Holman@windriver.com>
-Date: Tue, 3 Jun 2014 11:28:23 -0400
-Subject: [PATCH] keystone: search in etc directory for config files
-
-The core.py file in the tests directory is setup to find
-the file as they exist in the source code tree. When
-deployed some configuration files are moved to the /etc
-directory. This modification changes the test code to
-find the files in the new location.
-
-Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
----
- keystone/tests/core.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: git/keystone/tests/core.py
-===================================================================
---- git.orig/keystone/tests/core.py
-+++ git/keystone/tests/core.py
-@@ -68,9 +68,9 @@
- PID = six.text_type(os.getpid())
- TESTSDIR = os.path.dirname(os.path.abspath(__file__))
- TESTCONF = os.path.join(TESTSDIR, 'config_files')
--ROOTDIR = os.path.normpath(os.path.join(TESTSDIR, '..', '..'))
-+ROOTDIR = os.path.normpath(os.path.join(TESTSDIR, '..'))
- VENDOR = os.path.join(ROOTDIR, 'vendor')
--ETCDIR = os.path.join(ROOTDIR, 'etc')
-+ETCDIR = "/etc/keystone"
-
-
- def _calc_tmpdir():
-@@ -560,7 +560,7 @@
- def _paste_config(self, config):
- if not config.startswith('config:'):
- test_path = os.path.join(TESTSDIR, config)
-- etc_path = os.path.join(ROOTDIR, 'etc', config)
-+ etc_path = os.path.join(ETCDIR, config)
- for path in [test_path, etc_path]:
- if os.path.exists('%s-paste.ini' % path):
- return 'config:%s-paste.ini' % path
+++ /dev/null
-
-[DEFAULT]
-
-#
-# From keystone
-#
-
-# Using this feature is *NOT* recommended. Instead, use the `keystone-manage
-# bootstrap` command. The value of this option is treated as a "shared secret"
-# that can be used to bootstrap Keystone through the API. This "token" does not
-# represent a user (it has no identity), and carries no explicit authorization
-# (it effectively bypasses most authorization checks). If set to `None`, the
-# value is ignored and the `admin_token` middleware is effectively disabled.
-# (string value)
-#admin_token = <None>
-
-# The base public endpoint URL for Keystone that is advertised to clients
-# (NOTE: this does NOT affect how Keystone listens for connections). Defaults
-# to the base host URL of the request. For example, if keystone receives a
-# request to `http://server:5000/v3/users`, then this will option will be
-# automatically treated as `http://server:5000`. You should only need to set
-# option if either the value of the base URL contains a path that keystone does
-# not automatically infer (`/prefix/v3`), or if the endpoint should be found on
-# a different host. (uri value)
-#public_endpoint = <None>
-
-# DEPRECATED: The base admin endpoint URL for Keystone that is advertised to
-# clients (NOTE: this does NOT affect how Keystone listens for connections).
-# Defaults to the base host URL of the request. For example, if keystone
-# receives a request to `http://server:35357/v3/users`, then this will option
-# will be automatically treated as `http://server:35357`. You should only need
-# to set option if either the value of the base URL contains a path that
-# keystone does not automatically infer (`/prefix/v3`), or if the endpoint
-# should be found on a different host. (uri value)
-# This option is deprecated for removal since R.
-# Its value may be silently ignored in the future.
-# Reason: With the removal of the 2.0 API keystone does not distinguish between
-# admin and public endpoints.
-#admin_endpoint = <None>
-
-# Maximum depth of the project hierarchy, excluding the project acting as a
-# domain at the top of the hierarchy. WARNING: Setting it to a large value may
-# adversely impact performance. (integer value)
-#max_project_tree_depth = 5
-
-# Limit the sizes of user & project ID/names. (integer value)
-#max_param_size = 64
-
-# Similar to `[DEFAULT] max_param_size`, but provides an exception for token
-# values. With Fernet tokens, this can be set as low as 255. With UUID tokens,
-# this should be set to 32). (integer value)
-#max_token_size = 255
-
-# The maximum number of entities that will be returned in a collection. This
-# global limit may be then overridden for a specific driver, by specifying a
-# list_limit in the appropriate section (for example, `[assignment]`). No limit
-# is set by default. In larger deployments, it is recommended that you set this
-# to a reasonable number to prevent operations like listing all users and
-# projects from placing an unnecessary load on the system. (integer value)
-#list_limit = <None>
-
-# If set to true, strict password length checking is performed for password
-# manipulation. If a password exceeds the maximum length, the operation will
-# fail with an HTTP 403 Forbidden error. If set to false, passwords are
-# automatically truncated to the maximum length. (boolean value)
-#strict_password_check = false
-
-# If set to true, then the server will return information in HTTP responses
-# that may allow an unauthenticated or authenticated user to get more
-# information than normal, such as additional details about why authentication
-# failed. This may be useful for debugging but is insecure. (boolean value)
-#insecure_debug = false
-
-# Default `publisher_id` for outgoing notifications. If left undefined,
-# Keystone will default to using the server's host name. (string value)
-#default_publisher_id = <None>
-
-# Define the notification format for identity service events. A `basic`
-# notification only has information about the resource being operated on. A
-# `cadf` notification has the same information, as well as information about
-# the initiator of the event. The `cadf` option is entirely backwards
-# compatible with the `basic` option, but is fully CADF-compliant, and is
-# recommended for auditing use cases. (string value)
-# Possible values:
-# basic - <No description provided>
-# cadf - <No description provided>
-#notification_format = cadf
-
-# You can reduce the number of notifications keystone emits by explicitly
-# opting out. Keystone will not emit notifications that match the patterns
-# expressed in this list. Values are expected to be in the form of
-# `identity.<resource_type>.<operation>`. By default, all notifications related
-# to authentication are automatically suppressed. This field can be set
-# multiple times in order to opt-out of multiple notification topics. For
-# example, the following suppresses notifications describing user creation or
-# successful authentication events: notification_opt_out=identity.user.create
-# notification_opt_out=identity.authenticate.success (multi valued)
-#notification_opt_out = identity.authenticate.success
-#notification_opt_out = identity.authenticate.pending
-#notification_opt_out = identity.authenticate.failed
-
-#
-# From oslo.log
-#
-
-# If set to true, the logging level will be set to DEBUG instead of the default
-# INFO level. (boolean value)
-# Note: This option can be changed without restarting.
-#debug = false
-
-# The name of a logging configuration file. This file is appended to any
-# existing logging configuration files. For details about logging configuration
-# files, see the Python logging module documentation. Note that when logging
-# configuration files are used then all logging configuration is set in the
-# configuration file and other logging configuration options are ignored (for
-# example, logging_context_format_string). (string value)
-# Note: This option can be changed without restarting.
-# Deprecated group/name - [DEFAULT]/log_config
-#log_config_append = <None>
-
-# Defines the format string for %%(asctime)s in log records. Default:
-# %(default)s . This option is ignored if log_config_append is set. (string
-# value)
-#log_date_format = %Y-%m-%d %H:%M:%S
-
-# (Optional) Name of log file to send logging output to. If no default is set,
-# logging will go to stderr as defined by use_stderr. This option is ignored if
-# log_config_append is set. (string value)
-# Deprecated group/name - [DEFAULT]/logfile
-#log_file = <None>
-
-# (Optional) The base directory used for relative log_file paths. This option
-# is ignored if log_config_append is set. (string value)
-# Deprecated group/name - [DEFAULT]/logdir
-#log_dir = <None>
-
-# Uses logging handler designed to watch file system. When log file is moved or
-# removed this handler will open a new log file with specified path
-# instantaneously. It makes sense only if log_file option is specified and
-# Linux platform is used. This option is ignored if log_config_append is set.
-# (boolean value)
-#watch_log_file = false
-
-# Use syslog for logging. Existing syslog format is DEPRECATED and will be
-# changed later to honor RFC5424. This option is ignored if log_config_append
-# is set. (boolean value)
-#use_syslog = false
-
-# Enable journald for logging. If running in a systemd environment you may wish
-# to enable journal support. Doing so will use the journal native protocol
-# which includes structured metadata in addition to log messages.This option is
-# ignored if log_config_append is set. (boolean value)
-#use_journal = false
-
-# Syslog facility to receive log lines. This option is ignored if
-# log_config_append is set. (string value)
-#syslog_log_facility = LOG_USER
-
-# Use JSON formatting for logging. This option is ignored if log_config_append
-# is set. (boolean value)
-#use_json = false
-
-# Log output to standard error. This option is ignored if log_config_append is
-# set. (boolean value)
-#use_stderr = false
-
-# Format string to use for log messages with context. (string value)
-#logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
-
-# Format string to use for log messages when context is undefined. (string
-# value)
-#logging_default_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
-
-# Additional data to append to log message when logging level for the message
-# is DEBUG. (string value)
-#logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d
-
-# Prefix each line of exception output with this format. (string value)
-#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s
-
-# Defines the format string for %(user_identity)s that is used in
-# logging_context_format_string. (string value)
-#logging_user_identity_format = %(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s
-
-# List of package logging levels in logger=LEVEL pairs. This option is ignored
-# if log_config_append is set. (list value)
-#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,oslo_messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN,keystoneauth=WARN,oslo.cache=INFO,dogpile.core.dogpile=INFO
-
-# Enables or disables publication of error events. (boolean value)
-#publish_errors = false
-
-# The format for an instance that is passed with the log message. (string
-# value)
-#instance_format = "[instance: %(uuid)s] "
-
-# The format for an instance UUID that is passed with the log message. (string
-# value)
-#instance_uuid_format = "[instance: %(uuid)s] "
-
-# Interval, number of seconds, of log rate limiting. (integer value)
-#rate_limit_interval = 0
-
-# Maximum number of logged messages per rate_limit_interval. (integer value)
-#rate_limit_burst = 0
-
-# Log level name used by rate limiting: CRITICAL, ERROR, INFO, WARNING, DEBUG
-# or empty string. Logs with level greater or equal to rate_limit_except_level
-# are not filtered. An empty string means that all levels are filtered. (string
-# value)
-#rate_limit_except_level = CRITICAL
-
-# Enables or disables fatal status of deprecations. (boolean value)
-#fatal_deprecations = false
-
-#
-# From oslo.messaging
-#
-
-# Size of RPC connection pool. (integer value)
-#rpc_conn_pool_size = 30
-
-# The pool size limit for connections expiration policy (integer value)
-#conn_pool_min_size = 2
-
-# The time-to-live in sec of idle connections in the pool (integer value)
-#conn_pool_ttl = 1200
-
-# ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP.
-# The "host" option should point or resolve to this address. (string value)
-#rpc_zmq_bind_address = *
-
-# MatchMaker driver. (string value)
-# Possible values:
-# redis - <No description provided>
-# sentinel - <No description provided>
-# dummy - <No description provided>
-#rpc_zmq_matchmaker = redis
-
-# Number of ZeroMQ contexts, defaults to 1. (integer value)
-#rpc_zmq_contexts = 1
-
-# Maximum number of ingress messages to locally buffer per topic. Default is
-# unlimited. (integer value)
-#rpc_zmq_topic_backlog = <None>
-
-# Directory for holding IPC sockets. (string value)
-#rpc_zmq_ipc_dir = /var/run/openstack
-
-# Name of this node. Must be a valid hostname, FQDN, or IP address. Must match
-# "host" option, if running Nova. (string value)
-#rpc_zmq_host = localhost
-
-# Number of seconds to wait before all pending messages will be sent after
-# closing a socket. The default value of -1 specifies an infinite linger
-# period. The value of 0 specifies no linger period. Pending messages shall be
-# discarded immediately when the socket is closed. Positive values specify an
-# upper bound for the linger period. (integer value)
-# Deprecated group/name - [DEFAULT]/rpc_cast_timeout
-#zmq_linger = -1
-
-# The default number of seconds that poll should wait. Poll raises timeout
-# exception when timeout expired. (integer value)
-#rpc_poll_timeout = 1
-
-# Expiration timeout in seconds of a name service record about existing target
-# ( < 0 means no timeout). (integer value)
-#zmq_target_expire = 300
-
-# Update period in seconds of a name service record about existing target.
-# (integer value)
-#zmq_target_update = 180
-
-# Use PUB/SUB pattern for fanout methods. PUB/SUB always uses proxy. (boolean
-# value)
-#use_pub_sub = false
-
-# Use ROUTER remote proxy. (boolean value)
-#use_router_proxy = false
-
-# This option makes direct connections dynamic or static. It makes sense only
-# with use_router_proxy=False which means to use direct connections for direct
-# message types (ignored otherwise). (boolean value)
-#use_dynamic_connections = false
-
-# How many additional connections to a host will be made for failover reasons.
-# This option is actual only in dynamic connections mode. (integer value)
-#zmq_failover_connections = 2
-
-# Minimal port number for random ports range. (port value)
-# Minimum value: 0
-# Maximum value: 65535
-#rpc_zmq_min_port = 49153
-
-# Maximal port number for random ports range. (integer value)
-# Minimum value: 1
-# Maximum value: 65536
-#rpc_zmq_max_port = 65536
-
-# Number of retries to find free port number before fail with ZMQBindError.
-# (integer value)
-#rpc_zmq_bind_port_retries = 100
-
-# Default serialization mechanism for serializing/deserializing
-# outgoing/incoming messages (string value)
-# Possible values:
-# json - <No description provided>
-# msgpack - <No description provided>
-#rpc_zmq_serialization = json
-
-# This option configures round-robin mode in zmq socket. True means not keeping
-# a queue when server side disconnects. False means to keep queue and messages
-# even if server is disconnected, when the server appears we send all
-# accumulated messages to it. (boolean value)
-#zmq_immediate = true
-
-# Enable/disable TCP keepalive (KA) mechanism. The default value of -1 (or any
-# other negative value) means to skip any overrides and leave it to OS default;
-# 0 and 1 (or any other positive value) mean to disable and enable the option
-# respectively. (integer value)
-#zmq_tcp_keepalive = -1
-
-# The duration between two keepalive transmissions in idle condition. The unit
-# is platform dependent, for example, seconds in Linux, milliseconds in Windows
-# etc. The default value of -1 (or any other negative value and 0) means to
-# skip any overrides and leave it to OS default. (integer value)
-#zmq_tcp_keepalive_idle = -1
-
-# The number of retransmissions to be carried out before declaring that remote
-# end is not available. The default value of -1 (or any other negative value
-# and 0) means to skip any overrides and leave it to OS default. (integer
-# value)
-#zmq_tcp_keepalive_cnt = -1
-
-# The duration between two successive keepalive retransmissions, if
-# acknowledgement to the previous keepalive transmission is not received. The
-# unit is platform dependent, for example, seconds in Linux, milliseconds in
-# Windows etc. The default value of -1 (or any other negative value and 0)
-# means to skip any overrides and leave it to OS default. (integer value)
-#zmq_tcp_keepalive_intvl = -1
-
-# Maximum number of (green) threads to work concurrently. (integer value)
-#rpc_thread_pool_size = 100
-
-# Expiration timeout in seconds of a sent/received message after which it is
-# not tracked anymore by a client/server. (integer value)
-#rpc_message_ttl = 300
-
-# Wait for message acknowledgements from receivers. This mechanism works only
-# via proxy without PUB/SUB. (boolean value)
-#rpc_use_acks = false
-
-# Number of seconds to wait for an ack from a cast/call. After each retry
-# attempt this timeout is multiplied by some specified multiplier. (integer
-# value)
-#rpc_ack_timeout_base = 15
-
-# Number to multiply base ack timeout by after each retry attempt. (integer
-# value)
-#rpc_ack_timeout_multiplier = 2
-
-# Default number of message sending attempts in case of any problems occurred:
-# positive value N means at most N retries, 0 means no retries, None or -1 (or
-# any other negative values) mean to retry forever. This option is used only if
-# acknowledgments are enabled. (integer value)
-#rpc_retry_attempts = 3
-
-# List of publisher hosts SubConsumer can subscribe on. This option has higher
-# priority then the default publishers list taken from the matchmaker. (list
-# value)
-#subscribe_on =
-
-# Size of executor thread pool when executor is threading or eventlet. (integer
-# value)
-# Deprecated group/name - [DEFAULT]/rpc_thread_pool_size
-#executor_thread_pool_size = 64
-
-# Seconds to wait for a response from a call. (integer value)
-#rpc_response_timeout = 60
-
-# A URL representing the messaging driver to use and its full configuration.
-# (string value)
-#transport_url = <None>
-
-# DEPRECATED: The messaging driver to use, defaults to rabbit. Other drivers
-# include amqp and zmq. (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Replaced by [DEFAULT]/transport_url
-#rpc_backend = rabbit
-
-# The default exchange under which topics are scoped. May be overridden by an
-# exchange name specified in the transport_url option. (string value)
-#control_exchange = keystone
-
-
-[access_rules_config]
-
-#
-# From keystone
-#
-
-# Entry point for the access rules config backend driver in the
-# `keystone.access_rules_config` namespace. Keystone only provides a `json`
-# driver, so there is no reason to change this unless you are providing a
-# custom entry point. (string value)
-#driver = json
-
-# Toggle for access rules caching. This has no effect unless global caching is
-# enabled. (boolean value)
-#caching = true
-
-# Time to cache access rule data in seconds. This has no effect unless global
-# caching is enabled. (integer value)
-#cache_time = <None>
-
-# Path to access rules configuration. If not present, no access rule
-# configuration will be loaded and application credential access rules will be
-# unavailable. (string value)
-#rules_file = /etc/keystone/access_rules.json
-
-# Toggles permissive mode for access rules. When enabled, application
-# credentials can be created with any access rules regardless of operator's
-# configuration. (boolean value)
-#permissive = false
-
-
-[application_credential]
-
-#
-# From keystone
-#
-
-# Entry point for the application credential backend driver in the
-# `keystone.application_credential` namespace. Keystone only provides a `sql`
-# driver, so there is no reason to change this unless you are providing a
-# custom entry point. (string value)
-#driver = sql
-
-# Toggle for application credential caching. This has no effect unless global
-# caching is enabled. (boolean value)
-#caching = true
-
-# Time to cache application credential data in seconds. This has no effect
-# unless global caching is enabled. (integer value)
-#cache_time = <None>
-
-# Maximum number of application credentials a user is permitted to create. A
-# value of -1 means unlimited. If a limit is not set, users are permitted to
-# create application credentials at will, which could lead to bloat in the
-# keystone database or open keystone to a DoS attack. (integer value)
-#user_limit = -1
-
-
-[assignment]
-
-#
-# From keystone
-#
-
-# Entry point for the assignment backend driver (where role assignments are
-# stored) in the `keystone.assignment` namespace. Only a SQL driver is supplied
-# by keystone itself. Unless you are writing proprietary drivers for keystone,
-# you do not need to set this option. (string value)
-#driver = sql
-
-# A list of role names which are prohibited from being an implied role. (list
-# value)
-#prohibited_implied_role = admin
-
-
-[auth]
-
-#
-# From keystone
-#
-
-# Allowed authentication methods. Note: You should disable the `external` auth
-# method if you are currently using federation. External auth and federation
-# both use the REMOTE_USER variable. Since both the mapped and external plugin
-# are being invoked to validate attributes in the request environment, it can
-# cause conflicts. (list value)
-#methods = external,password,token,oauth1,mapped,application_credential
-
-# Entry point for the password auth plugin module in the
-# `keystone.auth.password` namespace. You do not need to set this unless you
-# are overriding keystone's own password authentication plugin. (string value)
-#password = <None>
-
-# Entry point for the token auth plugin module in the `keystone.auth.token`
-# namespace. You do not need to set this unless you are overriding keystone's
-# own token authentication plugin. (string value)
-#token = <None>
-
-# Entry point for the external (`REMOTE_USER`) auth plugin module in the
-# `keystone.auth.external` namespace. Supplied drivers are `DefaultDomain` and
-# `Domain`. The default driver is `DefaultDomain`, which assumes that all users
-# identified by the username specified to keystone in the `REMOTE_USER`
-# variable exist within the context of the default domain. The `Domain` option
-# expects an additional environment variable be presented to keystone,
-# `REMOTE_DOMAIN`, containing the domain name of the `REMOTE_USER` (if
-# `REMOTE_DOMAIN` is not set, then the default domain will be used instead).
-# You do not need to set this unless you are taking advantage of "external
-# authentication", where the application server (such as Apache) is handling
-# authentication instead of keystone. (string value)
-#external = <None>
-
-# Entry point for the OAuth 1.0a auth plugin module in the
-# `keystone.auth.oauth1` namespace. You do not need to set this unless you are
-# overriding keystone's own `oauth1` authentication plugin. (string value)
-#oauth1 = <None>
-
-# Entry point for the mapped auth plugin module in the `keystone.auth.mapped`
-# namespace. You do not need to set this unless you are overriding keystone's
-# own `mapped` authentication plugin. (string value)
-#mapped = <None>
-
-# Entry point for the application_credential auth plugin module in the
-# `keystone.auth.application_credential` namespace. You do not need to set this
-# unless you are overriding keystone's own `application_credential`
-# authentication plugin. (string value)
-#application_credential = <None>
-
-
-[cache]
-
-#
-# From oslo.cache
-#
-
-# Prefix for building the configuration dictionary for the cache region. This
-# should not need to be changed unless there is another dogpile.cache region
-# with the same configuration name. (string value)
-#config_prefix = cache.oslo
-
-# Default TTL, in seconds, for any cached item in the dogpile.cache region.
-# This applies to any cached method that doesn't have an explicit cache
-# expiration time defined for it. (integer value)
-#expiration_time = 600
-
-# Cache backend module. For eventlet-based or environments with hundreds of
-# threaded servers, Memcache with pooling (oslo_cache.memcache_pool) is
-# recommended. For environments with less than 100 threaded servers, Memcached
-# (dogpile.cache.memcached) or Redis (dogpile.cache.redis) is recommended. Test
-# environments with a single instance of the server can use the
-# dogpile.cache.memory backend. (string value)
-# Possible values:
-# oslo_cache.memcache_pool - <No description provided>
-# oslo_cache.dict - <No description provided>
-# dogpile.cache.memcached - <No description provided>
-# dogpile.cache.redis - <No description provided>
-# dogpile.cache.memory - <No description provided>
-# dogpile.cache.null - <No description provided>
-#backend = dogpile.cache.null
-
-# Arguments supplied to the backend module. Specify this option once per
-# argument to be passed to the dogpile.cache backend. Example format:
-# "<argname>:<value>". (multi valued)
-#backend_argument =
-
-# Proxy classes to import that will affect the way the dogpile.cache backend
-# functions. See the dogpile.cache documentation on changing-backend-behavior.
-# (list value)
-#proxies =
-
-# Global toggle for caching. (boolean value)
-#enabled = true
-
-# Extra debugging from the cache backend (cache keys, get/set/delete/etc
-# calls). This is only really useful if you need to see the specific cache-
-# backend get/set/delete calls with the keys/values. Typically this should be
-# left set to false. (boolean value)
-#debug_cache_backend = false
-
-# Memcache servers in the format of "host:port". (dogpile.cache.memcache and
-# oslo_cache.memcache_pool backends only). (list value)
-#memcache_servers = localhost:11211
-
-# Number of seconds memcached server is considered dead before it is tried
-# again. (dogpile.cache.memcache and oslo_cache.memcache_pool backends only).
-# (integer value)
-#memcache_dead_retry = 300
-
-# Timeout in seconds for every call to a server. (dogpile.cache.memcache and
-# oslo_cache.memcache_pool backends only). (integer value)
-#memcache_socket_timeout = 3
-
-# Max total number of open connections to every memcached server.
-# (oslo_cache.memcache_pool backend only). (integer value)
-#memcache_pool_maxsize = 10
-
-# Number of seconds a connection to memcached is held unused in the pool before
-# it is closed. (oslo_cache.memcache_pool backend only). (integer value)
-#memcache_pool_unused_timeout = 60
-
-# Number of seconds that an operation will wait to get a memcache client
-# connection. (integer value)
-#memcache_pool_connection_get_timeout = 10
-
-
-[catalog]
-
-#
-# From keystone
-#
-
-# Absolute path to the file used for the templated catalog backend. This option
-# is only used if the `[catalog] driver` is set to `templated`. (string value)
-#template_file = default_catalog.templates
-
-# Entry point for the catalog driver in the `keystone.catalog` namespace.
-# Keystone provides a `sql` option (which supports basic CRUD operations
-# through SQL), a `templated` option (which loads the catalog from a templated
-# catalog file on disk), and a `endpoint_filter.sql` option (which supports
-# arbitrary service catalogs per project). (string value)
-#driver = sql
-
-# Toggle for catalog caching. This has no effect unless global caching is
-# enabled. In a typical deployment, there is no reason to disable this.
-# (boolean value)
-#caching = true
-
-# Time to cache catalog data (in seconds). This has no effect unless global and
-# catalog caching are both enabled. Catalog data (services, endpoints, etc.)
-# typically does not change frequently, and so a longer duration than the
-# global default may be desirable. (integer value)
-#cache_time = <None>
-
-# Maximum number of entities that will be returned in a catalog collection.
-# There is typically no reason to set this, as it would be unusual for a
-# deployment to have enough services or endpoints to exceed a reasonable limit.
-# (integer value)
-#list_limit = <None>
-
-
-[cors]
-
-#
-# From oslo.middleware
-#
-
-# Indicate whether this resource may be shared with the domain received in the
-# requests "origin" header. Format: "<protocol>://<host>[:<port>]", no trailing
-# slash. Example: https://horizon.example.com (list value)
-#allowed_origin = <None>
-
-# Indicate that the actual request can include user credentials (boolean value)
-#allow_credentials = true
-
-# Indicate which headers are safe to expose to the API. Defaults to HTTP Simple
-# Headers. (list value)
-#expose_headers = X-Auth-Token,X-Openstack-Request-Id,X-Subject-Token,Openstack-Auth-Receipt
-
-# Maximum cache age of CORS preflight requests. (integer value)
-#max_age = 3600
-
-# Indicate which methods can be used during the actual request. (list value)
-#allow_methods = GET,PUT,POST,DELETE,PATCH
-
-# Indicate which header field names may be used during the actual request.
-# (list value)
-#allow_headers = X-Auth-Token,X-Openstack-Request-Id,X-Subject-Token,X-Project-Id,X-Project-Name,X-Project-Domain-Id,X-Project-Domain-Name,X-Domain-Id,X-Domain-Name,Openstack-Auth-Receipt
-
-
-[credential]
-
-#
-# From keystone
-#
-
-# Entry point for the credential backend driver in the `keystone.credential`
-# namespace. Keystone only provides a `sql` driver, so there's no reason to
-# change this unless you are providing a custom entry point. (string value)
-#driver = sql
-
-# Entry point for credential encryption and decryption operations in the
-# `keystone.credential.provider` namespace. Keystone only provides a `fernet`
-# driver, so there's no reason to change this unless you are providing a custom
-# entry point to encrypt and decrypt credentials. (string value)
-#provider = fernet
-
-# Directory containing Fernet keys used to encrypt and decrypt credentials
-# stored in the credential backend. Fernet keys used to encrypt credentials
-# have no relationship to Fernet keys used to encrypt Fernet tokens. Both sets
-# of keys should be managed separately and require different rotation policies.
-# Do not share this repository with the repository used to manage keys for
-# Fernet tokens. (string value)
-#key_repository = /etc/keystone/credential-keys/
-
-
-[database]
-
-#
-# From oslo.db
-#
-
-# If True, SQLite uses synchronous mode. (boolean value)
-#sqlite_synchronous = true
-
-# The back end to use for the database. (string value)
-# Deprecated group/name - [DEFAULT]/db_backend
-#backend = sqlalchemy
-
-# The SQLAlchemy connection string to use to connect to the database. (string
-# value)
-# Deprecated group/name - [DEFAULT]/sql_connection
-# Deprecated group/name - [DATABASE]/sql_connection
-# Deprecated group/name - [sql]/connection
-#connection = <None>
-
-# The SQLAlchemy connection string to use to connect to the slave database.
-# (string value)
-#slave_connection = <None>
-
-# The SQL mode to be used for MySQL sessions. This option, including the
-# default, overrides any server-set SQL mode. To use whatever SQL mode is set
-# by the server configuration, set this to no value. Example: mysql_sql_mode=
-# (string value)
-#mysql_sql_mode = TRADITIONAL
-
-# If True, transparently enables support for handling MySQL Cluster (NDB).
-# (boolean value)
-#mysql_enable_ndb = false
-
-# Connections which have been present in the connection pool longer than this
-# number of seconds will be replaced with a new one the next time they are
-# checked out from the pool. (integer value)
-# Deprecated group/name - [DATABASE]/idle_timeout
-# Deprecated group/name - [database]/idle_timeout
-# Deprecated group/name - [DEFAULT]/sql_idle_timeout
-# Deprecated group/name - [DATABASE]/sql_idle_timeout
-# Deprecated group/name - [sql]/idle_timeout
-#connection_recycle_time = 3600
-
-# Minimum number of SQL connections to keep open in a pool. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_min_pool_size
-# Deprecated group/name - [DATABASE]/sql_min_pool_size
-#min_pool_size = 1
-
-# Maximum number of SQL connections to keep open in a pool. Setting a value of
-# 0 indicates no limit. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_pool_size
-# Deprecated group/name - [DATABASE]/sql_max_pool_size
-#max_pool_size = 5
-
-# Maximum number of database connection retries during startup. Set to -1 to
-# specify an infinite retry count. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_retries
-# Deprecated group/name - [DATABASE]/sql_max_retries
-#max_retries = 10
-
-# Interval between retries of opening a SQL connection. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_retry_interval
-# Deprecated group/name - [DATABASE]/reconnect_interval
-#retry_interval = 10
-
-# If set, use this value for max_overflow with SQLAlchemy. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_overflow
-# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow
-#max_overflow = 50
-
-# Verbosity of SQL debugging information: 0=None, 100=Everything. (integer
-# value)
-# Minimum value: 0
-# Maximum value: 100
-# Deprecated group/name - [DEFAULT]/sql_connection_debug
-#connection_debug = 0
-
-# Add Python stack traces to SQL as comment strings. (boolean value)
-# Deprecated group/name - [DEFAULT]/sql_connection_trace
-#connection_trace = false
-
-# If set, use this value for pool_timeout with SQLAlchemy. (integer value)
-# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout
-#pool_timeout = <None>
-
-# Enable the experimental use of database reconnect on connection lost.
-# (boolean value)
-#use_db_reconnect = false
-
-# Seconds between retries of a database transaction. (integer value)
-#db_retry_interval = 1
-
-# If True, increases the interval between retries of a database operation up to
-# db_max_retry_interval. (boolean value)
-#db_inc_retry_interval = true
-
-# If db_inc_retry_interval is set, the maximum seconds between retries of a
-# database operation. (integer value)
-#db_max_retry_interval = 10
-
-# Maximum retries in case of connection error or deadlock error before error is
-# raised. Set to -1 to specify an infinite retry count. (integer value)
-#db_max_retries = 20
-
-
-[domain_config]
-
-#
-# From keystone
-#
-
-# Entry point for the domain-specific configuration driver in the
-# `keystone.resource.domain_config` namespace. Only a `sql` option is provided
-# by keystone, so there is no reason to set this unless you are providing a
-# custom entry point. (string value)
-#driver = sql
-
-# Toggle for caching of the domain-specific configuration backend. This has no
-# effect unless global caching is enabled. There is normally no reason to
-# disable this. (boolean value)
-#caching = true
-
-# Time-to-live (TTL, in seconds) to cache domain-specific configuration data.
-# This has no effect unless `[domain_config] caching` is enabled. (integer
-# value)
-#cache_time = 300
-
-
-[endpoint_filter]
-
-#
-# From keystone
-#
-
-# Entry point for the endpoint filter driver in the `keystone.endpoint_filter`
-# namespace. Only a `sql` option is provided by keystone, so there is no reason
-# to set this unless you are providing a custom entry point. (string value)
-#driver = sql
-
-# This controls keystone's behavior if the configured endpoint filters do not
-# result in any endpoints for a user + project pair (and therefore a
-# potentially empty service catalog). If set to true, keystone will return the
-# entire service catalog. If set to false, keystone will return an empty
-# service catalog. (boolean value)
-#return_all_endpoints_if_no_filter = true
-
-
-[endpoint_policy]
-
-#
-# From keystone
-#
-
-# Entry point for the endpoint policy driver in the `keystone.endpoint_policy`
-# namespace. Only a `sql` driver is provided by keystone, so there is no reason
-# to set this unless you are providing a custom entry point. (string value)
-#driver = sql
-
-
-[eventlet_server]
-
-#
-# From keystone
-#
-
-# DEPRECATED: The IP address of the network interface for the public service to
-# listen on. (unknown value)
-# Deprecated group/name - [DEFAULT]/bind_host
-# Deprecated group/name - [DEFAULT]/public_bind_host
-# This option is deprecated for removal since K.
-# Its value may be silently ignored in the future.
-# Reason: Support for running keystone under eventlet has been removed in the
-# Newton release. These options remain for backwards compatibility because they
-# are used for URL substitutions.
-#public_bind_host = 0.0.0.0
-
-# DEPRECATED: The port number for the public service to listen on. (port value)
-# Minimum value: 0
-# Maximum value: 65535
-# Deprecated group/name - [DEFAULT]/public_port
-# This option is deprecated for removal since K.
-# Its value may be silently ignored in the future.
-# Reason: Support for running keystone under eventlet has been removed in the
-# Newton release. These options remain for backwards compatibility because they
-# are used for URL substitutions.
-#public_port = 5000
-
-# DEPRECATED: The IP address of the network interface for the admin service to
-# listen on. (unknown value)
-# Deprecated group/name - [DEFAULT]/bind_host
-# Deprecated group/name - [DEFAULT]/admin_bind_host
-# This option is deprecated for removal since K.
-# Its value may be silently ignored in the future.
-# Reason: Support for running keystone under eventlet has been removed in the
-# Newton release. These options remain for backwards compatibility because they
-# are used for URL substitutions.
-#admin_bind_host = 0.0.0.0
-
-# DEPRECATED: The port number for the admin service to listen on. (port value)
-# Minimum value: 0
-# Maximum value: 65535
-# Deprecated group/name - [DEFAULT]/admin_port
-# This option is deprecated for removal since K.
-# Its value may be silently ignored in the future.
-# Reason: Support for running keystone under eventlet has been removed in the
-# Newton release. These options remain for backwards compatibility because they
-# are used for URL substitutions.
-#admin_port = 35357
-
-
-[federation]
-
-#
-# From keystone
-#
-
-# Entry point for the federation backend driver in the `keystone.federation`
-# namespace. Keystone only provides a `sql` driver, so there is no reason to
-# set this option unless you are providing a custom entry point. (string value)
-#driver = sql
-
-# Prefix to use when filtering environment variable names for federated
-# assertions. Matched variables are passed into the federated mapping engine.
-# (string value)
-#assertion_prefix =
-
-# Value to be used to obtain the entity ID of the Identity Provider from the
-# environment. For `mod_shib`, this would be `Shib-Identity-Provider`. For
-# `mod_auth_openidc`, this could be `HTTP_OIDC_ISS`. For `mod_auth_mellon`,
-# this could be `MELLON_IDP`. (string value)
-#remote_id_attribute = <None>
-
-# An arbitrary domain name that is reserved to allow federated ephemeral users
-# to have a domain concept. Note that an admin will not be able to create a
-# domain with this name or update an existing domain to this name. You are not
-# advised to change this value unless you really have to. (string value)
-#federated_domain_name = Federated
-
-# A list of trusted dashboard hosts. Before accepting a Single Sign-On request
-# to return a token, the origin host must be a member of this list. This
-# configuration option may be repeated for multiple values. You must set this
-# in order to use web-based SSO flows. For example:
-# trusted_dashboard=https://acme.example.com/auth/websso
-# trusted_dashboard=https://beta.example.com/auth/websso (multi valued)
-#trusted_dashboard =
-
-# Absolute path to an HTML file used as a Single Sign-On callback handler. This
-# page is expected to redirect the user from keystone back to a trusted
-# dashboard host, by form encoding a token in a POST request. Keystone's
-# default value should be sufficient for most deployments. (string value)
-#sso_callback_template = /etc/keystone/sso_callback_template.html
-
-# Toggle for federation caching. This has no effect unless global caching is
-# enabled. There is typically no reason to disable this. (boolean value)
-#caching = true
-
-
-[fernet_receipts]
-
-#
-# From keystone
-#
-
-# Directory containing Fernet receipt keys. This directory must exist before
-# using `keystone-manage fernet_setup` for the first time, must be writable by
-# the user running `keystone-manage fernet_setup` or `keystone-manage
-# fernet_rotate`, and of course must be readable by keystone's server process.
-# The repository may contain keys in one of three states: a single staged key
-# (always index 0) used for receipt validation, a single primary key (always
-# the highest index) used for receipt creation and validation, and any number
-# of secondary keys (all other index values) used for receipt validation. With
-# multiple keystone nodes, each node must share the same key repository
-# contents, with the exception of the staged key (index 0). It is safe to run
-# `keystone-manage fernet_rotate` once on any one node to promote a staged key
-# (index 0) to be the new primary (incremented from the previous highest
-# index), and produce a new staged key (a new key with index 0); the resulting
-# repository can then be atomically replicated to other nodes without any risk
-# of race conditions (for example, it is safe to run `keystone-manage
-# fernet_rotate` on host A, wait any amount of time, create a tarball of the
-# directory on host A, unpack it on host B to a temporary location, and
-# atomically move (`mv`) the directory into place on host B). Running
-# `keystone-manage fernet_rotate` *twice* on a key repository without syncing
-# other nodes will result in receipts that can not be validated by all nodes.
-# (string value)
-#key_repository = /etc/keystone/fernet-keys/
-
-# This controls how many keys are held in rotation by `keystone-manage
-# fernet_rotate` before they are discarded. The default value of 3 means that
-# keystone will maintain one staged key (always index 0), one primary key (the
-# highest numerical index), and one secondary key (every other index).
-# Increasing this value means that additional secondary keys will be kept in
-# the rotation. (integer value)
-# Minimum value: 1
-#max_active_keys = 3
-
-
-[fernet_tokens]
-
-#
-# From keystone
-#
-
-# Directory containing Fernet token keys. This directory must exist before
-# using `keystone-manage fernet_setup` for the first time, must be writable by
-# the user running `keystone-manage fernet_setup` or `keystone-manage
-# fernet_rotate`, and of course must be readable by keystone's server process.
-# The repository may contain keys in one of three states: a single staged key
-# (always index 0) used for token validation, a single primary key (always the
-# highest index) used for token creation and validation, and any number of
-# secondary keys (all other index values) used for token validation. With
-# multiple keystone nodes, each node must share the same key repository
-# contents, with the exception of the staged key (index 0). It is safe to run
-# `keystone-manage fernet_rotate` once on any one node to promote a staged key
-# (index 0) to be the new primary (incremented from the previous highest
-# index), and produce a new staged key (a new key with index 0); the resulting
-# repository can then be atomically replicated to other nodes without any risk
-# of race conditions (for example, it is safe to run `keystone-manage
-# fernet_rotate` on host A, wait any amount of time, create a tarball of the
-# directory on host A, unpack it on host B to a temporary location, and
-# atomically move (`mv`) the directory into place on host B). Running
-# `keystone-manage fernet_rotate` *twice* on a key repository without syncing
-# other nodes will result in tokens that can not be validated by all nodes.
-# (string value)
-#key_repository = /etc/keystone/fernet-keys/
-
-# This controls how many keys are held in rotation by `keystone-manage
-# fernet_rotate` before they are discarded. The default value of 3 means that
-# keystone will maintain one staged key (always index 0), one primary key (the
-# highest numerical index), and one secondary key (every other index).
-# Increasing this value means that additional secondary keys will be kept in
-# the rotation. (integer value)
-# Minimum value: 1
-#max_active_keys = 3
-
-
-[healthcheck]
-
-#
-# From oslo.middleware
-#
-
-# DEPRECATED: The path to respond to healtcheck requests on. (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-#path = /healthcheck
-
-# Show more detailed information as part of the response (boolean value)
-#detailed = false
-
-# Additional backends that can perform health checks and report that
-# information back as part of a request. (list value)
-#backends =
-
-# Check the presence of a file to determine if an application is running on a
-# port. Used by DisableByFileHealthcheck plugin. (string value)
-#disable_by_file_path = <None>
-
-# Check the presence of a file based on a port to determine if an application
-# is running on a port. Expects a "port:path" list of strings. Used by
-# DisableByFilesPortsHealthcheck plugin. (list value)
-#disable_by_file_paths =
-
-
-[identity]
-
-#
-# From keystone
-#
-
-# This references the domain to use for all Identity API v2 requests (which are
-# not aware of domains). A domain with this ID can optionally be created for
-# you by `keystone-manage bootstrap`. The domain referenced by this ID cannot
-# be deleted on the v3 API, to prevent accidentally breaking the v2 API. There
-# is nothing special about this domain, other than the fact that it must exist
-# to order to maintain support for your v2 clients. There is typically no
-# reason to change this value. (string value)
-#default_domain_id = default
-
-# A subset (or all) of domains can have their own identity driver, each with
-# their own partial configuration options, stored in either the resource
-# backend or in a file in a domain configuration directory (depending on the
-# setting of `[identity] domain_configurations_from_database`). Only values
-# specific to the domain need to be specified in this manner. This feature is
-# disabled by default, but may be enabled by default in a future release; set
-# to true to enable. (boolean value)
-#domain_specific_drivers_enabled = false
-
-# By default, domain-specific configuration data is read from files in the
-# directory identified by `[identity] domain_config_dir`. Enabling this
-# configuration option allows you to instead manage domain-specific
-# configurations through the API, which are then persisted in the backend
-# (typically, a SQL database), rather than using configuration files on disk.
-# (boolean value)
-#domain_configurations_from_database = false
-
-# Absolute path where keystone should locate domain-specific `[identity]`
-# configuration files. This option has no effect unless `[identity]
-# domain_specific_drivers_enabled` is set to true. There is typically no reason
-# to change this value. (string value)
-#domain_config_dir = /etc/keystone/domains
-
-# Entry point for the identity backend driver in the `keystone.identity`
-# namespace. Keystone provides a `sql` and `ldap` driver. This option is also
-# used as the default driver selection (along with the other configuration
-# variables in this section) in the event that `[identity]
-# domain_specific_drivers_enabled` is enabled, but no applicable domain-
-# specific configuration is defined for the domain in question. Unless your
-# deployment primarily relies on `ldap` AND is not using domain-specific
-# configuration, you should typically leave this set to `sql`. (string value)
-#driver = sql
-
-# Toggle for identity caching. This has no effect unless global caching is
-# enabled. There is typically no reason to disable this. (boolean value)
-#caching = true
-
-# Time to cache identity data (in seconds). This has no effect unless global
-# and identity caching are enabled. (integer value)
-#cache_time = 600
-
-# Maximum allowed length for user passwords. Decrease this value to improve
-# performance. Changing this value does not effect existing passwords. (integer
-# value)
-# Maximum value: 4096
-#max_password_length = 4096
-
-# Maximum number of entities that will be returned in an identity collection.
-# (integer value)
-#list_limit = <None>
-
-# The password hashing algorithm to use for passwords stored within keystone.
-# (string value)
-# Possible values:
-# bcrypt - <No description provided>
-# scrypt - <No description provided>
-# pbkdf2_sha512 - <No description provided>
-#password_hash_algorithm = bcrypt
-
-# This option represents a trade off between security and performance. Higher
-# values lead to slower performance, but higher security. Changing this option
-# will only affect newly created passwords as existing password hashes already
-# have a fixed number of rounds applied, so it is safe to tune this option in a
-# running cluster. The default for bcrypt is 12, must be between 4 and 31,
-# inclusive. The default for scrypt is 16, must be within `range(1,32)`. The
-# default for pbkdf_sha512 is 60000, must be within `range(1,1<<32)` WARNING:
-# If using scrypt, increasing this value increases BOTH time AND memory
-# requirements to hash a password. (integer value)
-#password_hash_rounds = <None>
-
-# Optional block size to pass to scrypt hash function (the `r` parameter).
-# Useful for tuning scrypt to optimal performance for your CPU architecture.
-# This option is only used when the `password_hash_algorithm` option is set to
-# `scrypt`. Defaults to 8. (integer value)
-#scrypt_block_size = <None>
-
-# Optional parallelism to pass to scrypt hash function (the `p` parameter).
-# This option is only used when the `password_hash_algorithm` option is set to
-# `scrypt`. Defaults to 1. (integer value)
-#scrypt_parallelism = <None>
-
-# Number of bytes to use in scrypt and pbkfd2_sha512 hashing salt. Default for
-# scrypt is 16 bytes. Default for pbkfd2_sha512 is 16 bytes. Limited to a
-# maximum of 96 bytes due to the size of the column used to store password
-# hashes. (integer value)
-# Minimum value: 0
-# Maximum value: 96
-#salt_bytesize = <None>
-
-
-[identity_mapping]
-
-#
-# From keystone
-#
-
-# Entry point for the identity mapping backend driver in the
-# `keystone.identity.id_mapping` namespace. Keystone only provides a `sql`
-# driver, so there is no reason to change this unless you are providing a
-# custom entry point. (string value)
-#driver = sql
-
-# Entry point for the public ID generator for user and group entities in the
-# `keystone.identity.id_generator` namespace. The Keystone identity mapper only
-# supports generators that produce 64 bytes or less. Keystone only provides a
-# `sha256` entry point, so there is no reason to change this value unless
-# you're providing a custom entry point. (string value)
-#generator = sha256
-
-# The format of user and group IDs changed in Juno for backends that do not
-# generate UUIDs (for example, LDAP), with keystone providing a hash mapping to
-# the underlying attribute in LDAP. By default this mapping is disabled, which
-# ensures that existing IDs will not change. Even when the mapping is enabled
-# by using domain-specific drivers (`[identity]
-# domain_specific_drivers_enabled`), any users and groups from the default
-# domain being handled by LDAP will still not be mapped to ensure their IDs
-# remain backward compatible. Setting this value to false will enable the new
-# mapping for all backends, including the default LDAP driver. It is only
-# guaranteed to be safe to enable this option if you do not already have
-# assignments for users and groups from the default LDAP domain, and you
-# consider it to be acceptable for Keystone to provide the different IDs to
-# clients than it did previously (existing IDs in the API will suddenly
-# change). Typically this means that the only time you can set this value to
-# false is when configuring a fresh installation, although that is the
-# recommended value. (boolean value)
-#backward_compatible_ids = true
-
-
-[jwt_tokens]
-
-#
-# From keystone
-#
-
-# Directory containing public keys for validating JWS token signatures. This
-# directory must exist in order for keystone's server process to start. It must
-# also be readable by keystone's server process. It must contain at least one
-# public key that corresponds to a private key in `keystone.conf [jwt_tokens]
-# jws_private_key_repository`. This option is only applicable in deployments
-# issuing JWS tokens and setting `keystone.conf [tokens] provider = jws`.
-# (string value)
-#jws_public_key_repository = /etc/keystone/jws-keys/public
-
-# Directory containing private keys for signing JWS tokens. This directory must
-# exist in order for keystone's server process to start. It must also be
-# readable by keystone's server process. It must contain at least one private
-# key that corresponds to a public key in `keystone.conf [jwt_tokens]
-# jws_public_key_repository`. In the event there are multiple private keys in
-# this directory, keystone will use a key named `private.pem` to sign tokens.
-# In the future, keystone may support the ability to sign tokens with multiple
-# private keys. For now, only a key named `private.pem` within this directory
-# is required to issue JWS tokens. This option is only applicable in
-# deployments issuing JWS tokens and setting `keystone.conf [tokens] provider =
-# jws`. (string value)
-#jws_private_key_repository = /etc/keystone/jws-keys/private
-
-
-[ldap]
-
-#
-# From keystone
-#
-
-# URL(s) for connecting to the LDAP server. Multiple LDAP URLs may be specified
-# as a comma separated string. The first URL to successfully bind is used for
-# the connection. (string value)
-#url = ldap://localhost
-
-# The user name of the administrator bind DN to use when querying the LDAP
-# server, if your LDAP server requires it. (string value)
-#user = <None>
-
-# The password of the administrator bind DN to use when querying the LDAP
-# server, if your LDAP server requires it. (string value)
-#password = <None>
-
-# The default LDAP server suffix to use, if a DN is not defined via either
-# `[ldap] user_tree_dn` or `[ldap] group_tree_dn`. (string value)
-#suffix = cn=example,cn=com
-
-# The search scope which defines how deep to search within the search base. A
-# value of `one` (representing `oneLevel` or `singleLevel`) indicates a search
-# of objects immediately below to the base object, but does not include the
-# base object itself. A value of `sub` (representing `subtree` or
-# `wholeSubtree`) indicates a search of both the base object itself and the
-# entire subtree below it. (string value)
-# Possible values:
-# one - <No description provided>
-# sub - <No description provided>
-#query_scope = one
-
-# Defines the maximum number of results per page that keystone should request
-# from the LDAP server when listing objects. A value of zero (`0`) disables
-# paging. (integer value)
-# Minimum value: 0
-#page_size = 0
-
-# The LDAP dereferencing option to use for queries involving aliases. A value
-# of `default` falls back to using default dereferencing behavior configured by
-# your `ldap.conf`. A value of `never` prevents aliases from being dereferenced
-# at all. A value of `searching` dereferences aliases only after name
-# resolution. A value of `finding` dereferences aliases only during name
-# resolution. A value of `always` dereferences aliases in all cases. (string
-# value)
-# Possible values:
-# never - <No description provided>
-# searching - <No description provided>
-# always - <No description provided>
-# finding - <No description provided>
-# default - <No description provided>
-#alias_dereferencing = default
-
-# Sets the LDAP debugging level for LDAP calls. A value of 0 means that
-# debugging is not enabled. This value is a bitmask, consult your LDAP
-# documentation for possible values. (integer value)
-# Minimum value: -1
-#debug_level = <None>
-
-# Sets keystone's referral chasing behavior across directory partitions. If
-# left unset, the system's default behavior will be used. (boolean value)
-#chase_referrals = <None>
-
-# The search base to use for users. Defaults to the `[ldap] suffix` value.
-# (string value)
-#user_tree_dn = <None>
-
-# The LDAP search filter to use for users. (string value)
-#user_filter = <None>
-
-# The LDAP object class to use for users. (string value)
-#user_objectclass = inetOrgPerson
-
-# The LDAP attribute mapped to user IDs in keystone. This must NOT be a
-# multivalued attribute. User IDs are expected to be globally unique across
-# keystone domains and URL-safe. (string value)
-#user_id_attribute = cn
-
-# The LDAP attribute mapped to user names in keystone. User names are expected
-# to be unique only within a keystone domain and are not expected to be URL-
-# safe. (string value)
-#user_name_attribute = sn
-
-# The LDAP attribute mapped to user descriptions in keystone. (string value)
-#user_description_attribute = description
-
-# The LDAP attribute mapped to user emails in keystone. (string value)
-#user_mail_attribute = mail
-
-# The LDAP attribute mapped to user passwords in keystone. (string value)
-#user_pass_attribute = userPassword
-
-# The LDAP attribute mapped to the user enabled attribute in keystone. If
-# setting this option to `userAccountControl`, then you may be interested in
-# setting `[ldap] user_enabled_mask` and `[ldap] user_enabled_default` as well.
-# (string value)
-#user_enabled_attribute = enabled
-
-# Logically negate the boolean value of the enabled attribute obtained from the
-# LDAP server. Some LDAP servers use a boolean lock attribute where "true"
-# means an account is disabled. Setting `[ldap] user_enabled_invert = true`
-# will allow these lock attributes to be used. This option will have no effect
-# if either the `[ldap] user_enabled_mask` or `[ldap] user_enabled_emulation`
-# options are in use. (boolean value)
-#user_enabled_invert = false
-
-# Bitmask integer to select which bit indicates the enabled value if the LDAP
-# server represents "enabled" as a bit on an integer rather than as a discrete
-# boolean. A value of `0` indicates that the mask is not used. If this is not
-# set to `0` the typical value is `2`. This is typically used when `[ldap]
-# user_enabled_attribute = userAccountControl`. Setting this option causes
-# keystone to ignore the value of `[ldap] user_enabled_invert`. (integer value)
-# Minimum value: 0
-#user_enabled_mask = 0
-
-# The default value to enable users. This should match an appropriate integer
-# value if the LDAP server uses non-boolean (bitmask) values to indicate if a
-# user is enabled or disabled. If this is not set to `True`, then the typical
-# value is `512`. This is typically used when `[ldap] user_enabled_attribute =
-# userAccountControl`. (string value)
-#user_enabled_default = True
-
-# List of user attributes to ignore on create and update, or whether a specific
-# user attribute should be filtered for list or show user. (list value)
-#user_attribute_ignore = default_project_id
-
-# The LDAP attribute mapped to a user's default_project_id in keystone. This is
-# most commonly used when keystone has write access to LDAP. (string value)
-#user_default_project_id_attribute = <None>
-
-# If enabled, keystone uses an alternative method to determine if a user is
-# enabled or not by checking if they are a member of the group defined by the
-# `[ldap] user_enabled_emulation_dn` option. Enabling this option causes
-# keystone to ignore the value of `[ldap] user_enabled_invert`. (boolean value)
-#user_enabled_emulation = false
-
-# DN of the group entry to hold enabled users when using enabled emulation.
-# Setting this option has no effect unless `[ldap] user_enabled_emulation` is
-# also enabled. (string value)
-#user_enabled_emulation_dn = <None>
-
-# Use the `[ldap] group_member_attribute` and `[ldap] group_objectclass`
-# settings to determine membership in the emulated enabled group. Enabling this
-# option has no effect unless `[ldap] user_enabled_emulation` is also enabled.
-# (boolean value)
-#user_enabled_emulation_use_group_config = false
-
-# A list of LDAP attribute to keystone user attribute pairs used for mapping
-# additional attributes to users in keystone. The expected format is
-# `<ldap_attr>:<user_attr>`, where `ldap_attr` is the attribute in the LDAP
-# object and `user_attr` is the attribute which should appear in the identity
-# API. (list value)
-#user_additional_attribute_mapping =
-
-# The search base to use for groups. Defaults to the `[ldap] suffix` value.
-# (string value)
-#group_tree_dn = <None>
-
-# The LDAP search filter to use for groups. (string value)
-#group_filter = <None>
-
-# The LDAP object class to use for groups. If setting this option to
-# `posixGroup`, you may also be interested in enabling the `[ldap]
-# group_members_are_ids` option. (string value)
-#group_objectclass = groupOfNames
-
-# The LDAP attribute mapped to group IDs in keystone. This must NOT be a
-# multivalued attribute. Group IDs are expected to be globally unique across
-# keystone domains and URL-safe. (string value)
-#group_id_attribute = cn
-
-# The LDAP attribute mapped to group names in keystone. Group names are
-# expected to be unique only within a keystone domain and are not expected to
-# be URL-safe. (string value)
-#group_name_attribute = ou
-
-# The LDAP attribute used to indicate that a user is a member of the group.
-# (string value)
-#group_member_attribute = member
-
-# Enable this option if the members of the group object class are keystone user
-# IDs rather than LDAP DNs. This is the case when using `posixGroup` as the
-# group object class in Open Directory. (boolean value)
-#group_members_are_ids = false
-
-# The LDAP attribute mapped to group descriptions in keystone. (string value)
-#group_desc_attribute = description
-
-# List of group attributes to ignore on create and update. or whether a
-# specific group attribute should be filtered for list or show group. (list
-# value)
-#group_attribute_ignore =
-
-# A list of LDAP attribute to keystone group attribute pairs used for mapping
-# additional attributes to groups in keystone. The expected format is
-# `<ldap_attr>:<group_attr>`, where `ldap_attr` is the attribute in the LDAP
-# object and `group_attr` is the attribute which should appear in the identity
-# API. (list value)
-#group_additional_attribute_mapping =
-
-# If enabled, group queries will use Active Directory specific filters for
-# nested groups. (boolean value)
-#group_ad_nesting = false
-
-# An absolute path to a CA certificate file to use when communicating with LDAP
-# servers. This option will take precedence over `[ldap] tls_cacertdir`, so
-# there is no reason to set both. (string value)
-#tls_cacertfile = <None>
-
-# An absolute path to a CA certificate directory to use when communicating with
-# LDAP servers. There is no reason to set this option if you've also set
-# `[ldap] tls_cacertfile`. (string value)
-#tls_cacertdir = <None>
-
-# Enable TLS when communicating with LDAP servers. You should also set the
-# `[ldap] tls_cacertfile` and `[ldap] tls_cacertdir` options when using this
-# option. Do not set this option if you are using LDAP over SSL (LDAPS) instead
-# of TLS. (boolean value)
-#use_tls = false
-
-# Specifies which checks to perform against client certificates on incoming TLS
-# sessions. If set to `demand`, then a certificate will always be requested and
-# required from the LDAP server. If set to `allow`, then a certificate will
-# always be requested but not required from the LDAP server. If set to `never`,
-# then a certificate will never be requested. (string value)
-# Possible values:
-# demand - <No description provided>
-# never - <No description provided>
-# allow - <No description provided>
-#tls_req_cert = demand
-
-# The connection timeout to use with the LDAP server. A value of `-1` means
-# that connections will never timeout. (integer value)
-# Minimum value: -1
-#connection_timeout = -1
-
-# Enable LDAP connection pooling for queries to the LDAP server. There is
-# typically no reason to disable this. (boolean value)
-#use_pool = true
-
-# The size of the LDAP connection pool. This option has no effect unless
-# `[ldap] use_pool` is also enabled. (integer value)
-# Minimum value: 1
-#pool_size = 10
-
-# The maximum number of times to attempt reconnecting to the LDAP server before
-# aborting. A value of zero prevents retries. This option has no effect unless
-# `[ldap] use_pool` is also enabled. (integer value)
-# Minimum value: 0
-#pool_retry_max = 3
-
-# The number of seconds to wait before attempting to reconnect to the LDAP
-# server. This option has no effect unless `[ldap] use_pool` is also enabled.
-# (floating point value)
-#pool_retry_delay = 0.1
-
-# The connection timeout to use when pooling LDAP connections. A value of `-1`
-# means that connections will never timeout. This option has no effect unless
-# `[ldap] use_pool` is also enabled. (integer value)
-# Minimum value: -1
-#pool_connection_timeout = -1
-
-# The maximum connection lifetime to the LDAP server in seconds. When this
-# lifetime is exceeded, the connection will be unbound and removed from the
-# connection pool. This option has no effect unless `[ldap] use_pool` is also
-# enabled. (integer value)
-# Minimum value: 1
-#pool_connection_lifetime = 600
-
-# Enable LDAP connection pooling for end user authentication. There is
-# typically no reason to disable this. (boolean value)
-#use_auth_pool = true
-
-# The size of the connection pool to use for end user authentication. This
-# option has no effect unless `[ldap] use_auth_pool` is also enabled. (integer
-# value)
-# Minimum value: 1
-#auth_pool_size = 100
-
-# The maximum end user authentication connection lifetime to the LDAP server in
-# seconds. When this lifetime is exceeded, the connection will be unbound and
-# removed from the connection pool. This option has no effect unless `[ldap]
-# use_auth_pool` is also enabled. (integer value)
-# Minimum value: 1
-#auth_pool_connection_lifetime = 60
-
-
-[matchmaker_redis]
-
-#
-# From oslo.messaging
-#
-
-# DEPRECATED: Host to locate redis. (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Replaced by [DEFAULT]/transport_url
-#host = 127.0.0.1
-
-# DEPRECATED: Use this port to connect to redis host. (port value)
-# Minimum value: 0
-# Maximum value: 65535
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Replaced by [DEFAULT]/transport_url
-#port = 6379
-
-# DEPRECATED: Password for Redis server (optional). (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Replaced by [DEFAULT]/transport_url
-#password =
-
-# DEPRECATED: List of Redis Sentinel hosts (fault tolerance mode), e.g.,
-# [host:port, host1:port ... ] (list value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Replaced by [DEFAULT]/transport_url
-#sentinel_hosts =
-
-# Redis replica set name. (string value)
-#sentinel_group_name = oslo-messaging-zeromq
-
-# Time in ms to wait between connection attempts. (integer value)
-#wait_timeout = 2000
-
-# Time in ms to wait before the transaction is killed. (integer value)
-#check_timeout = 20000
-
-# Timeout in ms on blocking socket operations. (integer value)
-#socket_timeout = 10000
-
-
-[memcache]
-
-#
-# From keystone
-#
-
-# Number of seconds memcached server is considered dead before it is tried
-# again. This is used by the key value store system. (integer value)
-#dead_retry = 300
-
-# Timeout in seconds for every call to a server. This is used by the key value
-# store system. (integer value)
-#socket_timeout = 3
-
-# Max total number of open connections to every memcached server. This is used
-# by the key value store system. (integer value)
-#pool_maxsize = 10
-
-# Number of seconds a connection to memcached is held unused in the pool before
-# it is closed. This is used by the key value store system. (integer value)
-#pool_unused_timeout = 60
-
-# Number of seconds that an operation will wait to get a memcache client
-# connection. This is used by the key value store system. (integer value)
-#pool_connection_get_timeout = 10
-
-
-[oauth1]
-
-#
-# From keystone
-#
-
-# Entry point for the OAuth backend driver in the `keystone.oauth1` namespace.
-# Typically, there is no reason to set this option unless you are providing a
-# custom entry point. (string value)
-#driver = sql
-
-# Number of seconds for the OAuth Request Token to remain valid after being
-# created. This is the amount of time the user has to authorize the token.
-# Setting this option to zero means that request tokens will last forever.
-# (integer value)
-# Minimum value: 0
-#request_token_duration = 28800
-
-# Number of seconds for the OAuth Access Token to remain valid after being
-# created. This is the amount of time the consumer has to interact with the
-# service provider (which is typically keystone). Setting this option to zero
-# means that access tokens will last forever. (integer value)
-# Minimum value: 0
-#access_token_duration = 86400
-
-
-[oslo_messaging_amqp]
-
-#
-# From oslo.messaging
-#
-
-# Name for the AMQP container. must be globally unique. Defaults to a generated
-# UUID (string value)
-#container_name = <None>
-
-# Timeout for inactive connections (in seconds) (integer value)
-#idle_timeout = 0
-
-# Debug: dump AMQP frames to stdout (boolean value)
-#trace = false
-
-# Attempt to connect via SSL. If no other ssl-related parameters are given, it
-# will use the system's CA-bundle to verify the server's certificate. (boolean
-# value)
-#ssl = false
-
-# CA certificate PEM file used to verify the server's certificate (string
-# value)
-#ssl_ca_file =
-
-# Self-identifying certificate PEM file for client authentication (string
-# value)
-#ssl_cert_file =
-
-# Private key PEM file used to sign ssl_cert_file certificate (optional)
-# (string value)
-#ssl_key_file =
-
-# Password for decrypting ssl_key_file (if encrypted) (string value)
-#ssl_key_password = <None>
-
-# By default SSL checks that the name in the server's certificate matches the
-# hostname in the transport_url. In some configurations it may be preferable to
-# use the virtual hostname instead, for example if the server uses the Server
-# Name Indication TLS extension (rfc6066) to provide a certificate per virtual
-# host. Set ssl_verify_vhost to True if the server's SSL certificate uses the
-# virtual host name instead of the DNS name. (boolean value)
-#ssl_verify_vhost = false
-
-# DEPRECATED: Accept clients using either SSL or plain TCP (boolean value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Not applicable - not a SSL server
-#allow_insecure_clients = false
-
-# Space separated list of acceptable SASL mechanisms (string value)
-#sasl_mechanisms =
-
-# Path to directory that contains the SASL configuration (string value)
-#sasl_config_dir =
-
-# Name of configuration file (without .conf suffix) (string value)
-#sasl_config_name =
-
-# SASL realm to use if no realm present in username (string value)
-#sasl_default_realm =
-
-# DEPRECATED: User name for message broker authentication (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Should use configuration option transport_url to provide the
-# username.
-#username =
-
-# DEPRECATED: Password for message broker authentication (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Should use configuration option transport_url to provide the
-# password.
-#password =
-
-# Seconds to pause before attempting to re-connect. (integer value)
-# Minimum value: 1
-#connection_retry_interval = 1
-
-# Increase the connection_retry_interval by this many seconds after each
-# unsuccessful failover attempt. (integer value)
-# Minimum value: 0
-#connection_retry_backoff = 2
-
-# Maximum limit for connection_retry_interval + connection_retry_backoff
-# (integer value)
-# Minimum value: 1
-#connection_retry_interval_max = 30
-
-# Time to pause between re-connecting an AMQP 1.0 link that failed due to a
-# recoverable error. (integer value)
-# Minimum value: 1
-#link_retry_delay = 10
-
-# The maximum number of attempts to re-send a reply message which failed due to
-# a recoverable error. (integer value)
-# Minimum value: -1
-#default_reply_retry = 0
-
-# The deadline for an rpc reply message delivery. (integer value)
-# Minimum value: 5
-#default_reply_timeout = 30
-
-# The deadline for an rpc cast or call message delivery. Only used when caller
-# does not provide a timeout expiry. (integer value)
-# Minimum value: 5
-#default_send_timeout = 30
-
-# The deadline for a sent notification message delivery. Only used when caller
-# does not provide a timeout expiry. (integer value)
-# Minimum value: 5
-#default_notify_timeout = 30
-
-# The duration to schedule a purge of idle sender links. Detach link after
-# expiry. (integer value)
-# Minimum value: 1
-#default_sender_link_timeout = 600
-
-# Indicates the addressing mode used by the driver.
-# Permitted values:
-# 'legacy' - use legacy non-routable addressing
-# 'routable' - use routable addresses
-# 'dynamic' - use legacy addresses if the message bus does not support routing
-# otherwise use routable addressing (string value)
-#addressing_mode = dynamic
-
-# Enable virtual host support for those message buses that do not natively
-# support virtual hosting (such as qpidd). When set to true the virtual host
-# name will be added to all message bus addresses, effectively creating a
-# private 'subnet' per virtual host. Set to False if the message bus supports
-# virtual hosting using the 'hostname' field in the AMQP 1.0 Open performative
-# as the name of the virtual host. (boolean value)
-#pseudo_vhost = true
-
-# address prefix used when sending to a specific server (string value)
-#server_request_prefix = exclusive
-
-# address prefix used when broadcasting to all servers (string value)
-#broadcast_prefix = broadcast
-
-# address prefix when sending to any server in group (string value)
-#group_request_prefix = unicast
-
-# Address prefix for all generated RPC addresses (string value)
-#rpc_address_prefix = openstack.org/om/rpc
-
-# Address prefix for all generated Notification addresses (string value)
-#notify_address_prefix = openstack.org/om/notify
-
-# Appended to the address prefix when sending a fanout message. Used by the
-# message bus to identify fanout messages. (string value)
-#multicast_address = multicast
-
-# Appended to the address prefix when sending to a particular RPC/Notification
-# server. Used by the message bus to identify messages sent to a single
-# destination. (string value)
-#unicast_address = unicast
-
-# Appended to the address prefix when sending to a group of consumers. Used by
-# the message bus to identify messages that should be delivered in a round-
-# robin fashion across consumers. (string value)
-#anycast_address = anycast
-
-# Exchange name used in notification addresses.
-# Exchange name resolution precedence:
-# Target.exchange if set
-# else default_notification_exchange if set
-# else control_exchange if set
-# else 'notify' (string value)
-#default_notification_exchange = <None>
-
-# Exchange name used in RPC addresses.
-# Exchange name resolution precedence:
-# Target.exchange if set
-# else default_rpc_exchange if set
-# else control_exchange if set
-# else 'rpc' (string value)
-#default_rpc_exchange = <None>
-
-# Window size for incoming RPC Reply messages. (integer value)
-# Minimum value: 1
-#reply_link_credit = 200
-
-# Window size for incoming RPC Request messages (integer value)
-# Minimum value: 1
-#rpc_server_credit = 100
-
-# Window size for incoming Notification messages (integer value)
-# Minimum value: 1
-#notify_server_credit = 100
-
-# Send messages of this type pre-settled.
-# Pre-settled messages will not receive acknowledgement
-# from the peer. Note well: pre-settled messages may be
-# silently discarded if the delivery fails.
-# Permitted values:
-# 'rpc-call' - send RPC Calls pre-settled
-# 'rpc-reply'- send RPC Replies pre-settled
-# 'rpc-cast' - Send RPC Casts pre-settled
-# 'notify' - Send Notifications pre-settled
-# (multi valued)
-#pre_settled = rpc-cast
-#pre_settled = rpc-reply
-
-
-[oslo_messaging_kafka]
-
-#
-# From oslo.messaging
-#
-
-# DEPRECATED: Default Kafka broker Host (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Replaced by [DEFAULT]/transport_url
-#kafka_default_host = localhost
-
-# DEPRECATED: Default Kafka broker Port (port value)
-# Minimum value: 0
-# Maximum value: 65535
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Replaced by [DEFAULT]/transport_url
-#kafka_default_port = 9092
-
-# Max fetch bytes of Kafka consumer (integer value)
-#kafka_max_fetch_bytes = 1048576
-
-# Default timeout(s) for Kafka consumers (floating point value)
-#kafka_consumer_timeout = 1.0
-
-# Pool Size for Kafka Consumers (integer value)
-#pool_size = 10
-
-# The pool size limit for connections expiration policy (integer value)
-#conn_pool_min_size = 2
-
-# The time-to-live in sec of idle connections in the pool (integer value)
-#conn_pool_ttl = 1200
-
-# Group id for Kafka consumer. Consumers in one group will coordinate message
-# consumption (string value)
-#consumer_group = oslo_messaging_consumer
-
-# Upper bound on the delay for KafkaProducer batching in seconds (floating
-# point value)
-#producer_batch_timeout = 0.0
-
-# Size of batch for the producer async send (integer value)
-#producer_batch_size = 16384
-
-
-[oslo_messaging_notifications]
-
-#
-# From oslo.messaging
-#
-
-# The Drivers(s) to handle sending notifications. Possible values are
-# messaging, messagingv2, routing, log, test, noop (multi valued)
-# Deprecated group/name - [DEFAULT]/notification_driver
-#driver =
-
-# A URL representing the messaging driver to use for notifications. If not set,
-# we fall back to the same configuration used for RPC. (string value)
-# Deprecated group/name - [DEFAULT]/notification_transport_url
-#transport_url = <None>
-
-# AMQP topic used for OpenStack notifications. (list value)
-# Deprecated group/name - [rpc_notifier2]/topics
-# Deprecated group/name - [DEFAULT]/notification_topics
-#topics = notifications
-
-# The maximum number of attempts to re-send a notification message which failed
-# to be delivered due to a recoverable error. 0 - No retry, -1 - indefinite
-# (integer value)
-#retry = -1
-
-
-[oslo_messaging_rabbit]
-
-#
-# From oslo.messaging
-#
-
-# Use durable queues in AMQP. (boolean value)
-# Deprecated group/name - [DEFAULT]/amqp_durable_queues
-# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
-#amqp_durable_queues = false
-
-# Auto-delete queues in AMQP. (boolean value)
-#amqp_auto_delete = false
-
-# Enable SSL (boolean value)
-#ssl = <None>
-
-# SSL version to use (valid only if SSL enabled). Valid values are TLSv1 and
-# SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 may be available on some
-# distributions. (string value)
-# Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_version
-#ssl_version =
-
-# SSL key file (valid only if SSL enabled). (string value)
-# Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_keyfile
-#ssl_key_file =
-
-# SSL cert file (valid only if SSL enabled). (string value)
-# Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_certfile
-#ssl_cert_file =
-
-# SSL certification authority file (valid only if SSL enabled). (string value)
-# Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_ca_certs
-#ssl_ca_file =
-
-# How long to wait before reconnecting in response to an AMQP consumer cancel
-# notification. (floating point value)
-#kombu_reconnect_delay = 1.0
-
-# EXPERIMENTAL: Possible values are: gzip, bz2. If not set compression will not
-# be used. This option may not be available in future versions. (string value)
-#kombu_compression = <None>
-
-# How long to wait a missing client before abandoning to send it its replies.
-# This value should not be longer than rpc_response_timeout. (integer value)
-# Deprecated group/name - [oslo_messaging_rabbit]/kombu_reconnect_timeout
-#kombu_missing_consumer_retry_timeout = 60
-
-# Determines how the next RabbitMQ node is chosen in case the one we are
-# currently connected to becomes unavailable. Takes effect only if more than
-# one RabbitMQ node is provided in config. (string value)
-# Possible values:
-# round-robin - <No description provided>
-# shuffle - <No description provided>
-#kombu_failover_strategy = round-robin
-
-# DEPRECATED: The RabbitMQ broker address where a single node is used. (string
-# value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Replaced by [DEFAULT]/transport_url
-#rabbit_host = localhost
-
-# DEPRECATED: The RabbitMQ broker port where a single node is used. (port
-# value)
-# Minimum value: 0
-# Maximum value: 65535
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Replaced by [DEFAULT]/transport_url
-#rabbit_port = 5672
-
-# DEPRECATED: RabbitMQ HA cluster host:port pairs. (list value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Replaced by [DEFAULT]/transport_url
-#rabbit_hosts = $rabbit_host:$rabbit_port
-
-# DEPRECATED: The RabbitMQ userid. (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Replaced by [DEFAULT]/transport_url
-#rabbit_userid = guest
-
-# DEPRECATED: The RabbitMQ password. (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Replaced by [DEFAULT]/transport_url
-#rabbit_password = guest
-
-# The RabbitMQ login method. (string value)
-# Possible values:
-# PLAIN - <No description provided>
-# AMQPLAIN - <No description provided>
-# RABBIT-CR-DEMO - <No description provided>
-#rabbit_login_method = AMQPLAIN
-
-# DEPRECATED: The RabbitMQ virtual host. (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-# Reason: Replaced by [DEFAULT]/transport_url
-#rabbit_virtual_host = /
-
-# How frequently to retry connecting with RabbitMQ. (integer value)
-#rabbit_retry_interval = 1
-
-# How long to backoff for between retries when connecting to RabbitMQ. (integer
-# value)
-#rabbit_retry_backoff = 2
-
-# Maximum interval of RabbitMQ connection retries. Default is 30 seconds.
-# (integer value)
-#rabbit_interval_max = 30
-
-# DEPRECATED: Maximum number of RabbitMQ connection retries. Default is 0
-# (infinite retry count). (integer value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-#rabbit_max_retries = 0
-
-# Try to use HA queues in RabbitMQ (x-ha-policy: all). If you change this
-# option, you must wipe the RabbitMQ database. In RabbitMQ 3.0, queue mirroring
-# is no longer controlled by the x-ha-policy argument when declaring a queue.
-# If you just want to make sure that all queues (except those with auto-
-# generated names) are mirrored across all nodes, run: "rabbitmqctl set_policy
-# HA '^(?!amq\.).*' '{"ha-mode": "all"}' " (boolean value)
-#rabbit_ha_queues = false
-
-# Positive integer representing duration in seconds for queue TTL (x-expires).
-# Queues which are unused for the duration of the TTL are automatically
-# deleted. The parameter affects only reply and fanout queues. (integer value)
-# Minimum value: 1
-#rabbit_transient_queues_ttl = 1800
-
-# Specifies the number of messages to prefetch. Setting to zero allows
-# unlimited messages. (integer value)
-#rabbit_qos_prefetch_count = 0
-
-# Number of seconds after which the Rabbit broker is considered down if
-# heartbeat's keep-alive fails (0 disable the heartbeat). EXPERIMENTAL (integer
-# value)
-#heartbeat_timeout_threshold = 60
-
-# How often times during the heartbeat_timeout_threshold we check the
-# heartbeat. (integer value)
-#heartbeat_rate = 2
-
-# Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake (boolean value)
-#fake_rabbit = false
-
-# Maximum number of channels to allow (integer value)
-#channel_max = <None>
-
-# The maximum byte size for an AMQP frame (integer value)
-#frame_max = <None>
-
-# How often to send heartbeats for consumer's connections (integer value)
-#heartbeat_interval = 3
-
-# Arguments passed to ssl.wrap_socket (dict value)
-#ssl_options = <None>
-
-# Set socket timeout in seconds for connection's socket (floating point value)
-#socket_timeout = 0.25
-
-# Set TCP_USER_TIMEOUT in seconds for connection's socket (floating point
-# value)
-#tcp_user_timeout = 0.25
-
-# Set delay for reconnection to some host which has connection error (floating
-# point value)
-#host_connection_reconnect_delay = 0.25
-
-# Connection factory implementation (string value)
-# Possible values:
-# new - <No description provided>
-# single - <No description provided>
-# read_write - <No description provided>
-#connection_factory = single
-
-# Maximum number of connections to keep queued. (integer value)
-#pool_max_size = 30
-
-# Maximum number of connections to create above `pool_max_size`. (integer
-# value)
-#pool_max_overflow = 0
-
-# Default number of seconds to wait for a connections to available (integer
-# value)
-#pool_timeout = 30
-
-# Lifetime of a connection (since creation) in seconds or None for no
-# recycling. Expired connections are closed on acquire. (integer value)
-#pool_recycle = 600
-
-# Threshold at which inactive (since release) connections are considered stale
-# in seconds or None for no staleness. Stale connections are closed on acquire.
-# (integer value)
-#pool_stale = 60
-
-# Default serialization mechanism for serializing/deserializing
-# outgoing/incoming messages (string value)
-# Possible values:
-# json - <No description provided>
-# msgpack - <No description provided>
-#default_serializer_type = json
-
-# Persist notification messages. (boolean value)
-#notification_persistence = false
-
-# Exchange name for sending notifications (string value)
-#default_notification_exchange = ${control_exchange}_notification
-
-# Max number of not acknowledged message which RabbitMQ can send to
-# notification listener. (integer value)
-#notification_listener_prefetch_count = 100
-
-# Reconnecting retry count in case of connectivity problem during sending
-# notification, -1 means infinite retry. (integer value)
-#default_notification_retry_attempts = -1
-
-# Reconnecting retry delay in case of connectivity problem during sending
-# notification message (floating point value)
-#notification_retry_delay = 0.25
-
-# Time to live for rpc queues without consumers in seconds. (integer value)
-#rpc_queue_expiration = 60
-
-# Exchange name for sending RPC messages (string value)
-#default_rpc_exchange = ${control_exchange}_rpc
-
-# Exchange name for receiving RPC replies (string value)
-#rpc_reply_exchange = ${control_exchange}_rpc_reply
-
-# Max number of not acknowledged message which RabbitMQ can send to rpc
-# listener. (integer value)
-#rpc_listener_prefetch_count = 100
-
-# Max number of not acknowledged message which RabbitMQ can send to rpc reply
-# listener. (integer value)
-#rpc_reply_listener_prefetch_count = 100
-
-# Reconnecting retry count in case of connectivity problem during sending
-# reply. -1 means infinite retry during rpc_timeout (integer value)
-#rpc_reply_retry_attempts = -1
-
-# Reconnecting retry delay in case of connectivity problem during sending
-# reply. (floating point value)
-#rpc_reply_retry_delay = 0.25
-
-# Reconnecting retry count in case of connectivity problem during sending RPC
-# message, -1 means infinite retry. If actual retry attempts in not 0 the rpc
-# request could be processed more than one time (integer value)
-#default_rpc_retry_attempts = -1
-
-# Reconnecting retry delay in case of connectivity problem during sending RPC
-# message (floating point value)
-#rpc_retry_delay = 0.25
-
-
-[oslo_messaging_zmq]
-
-#
-# From oslo.messaging
-#
-
-# ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP.
-# The "host" option should point or resolve to this address. (string value)
-#rpc_zmq_bind_address = *
-
-# MatchMaker driver. (string value)
-# Possible values:
-# redis - <No description provided>
-# sentinel - <No description provided>
-# dummy - <No description provided>
-#rpc_zmq_matchmaker = redis
-
-# Number of ZeroMQ contexts, defaults to 1. (integer value)
-#rpc_zmq_contexts = 1
-
-# Maximum number of ingress messages to locally buffer per topic. Default is
-# unlimited. (integer value)
-#rpc_zmq_topic_backlog = <None>
-
-# Directory for holding IPC sockets. (string value)
-#rpc_zmq_ipc_dir = /var/run/openstack
-
-# Name of this node. Must be a valid hostname, FQDN, or IP address. Must match
-# "host" option, if running Nova. (string value)
-#rpc_zmq_host = localhost
-
-# Number of seconds to wait before all pending messages will be sent after
-# closing a socket. The default value of -1 specifies an infinite linger
-# period. The value of 0 specifies no linger period. Pending messages shall be
-# discarded immediately when the socket is closed. Positive values specify an
-# upper bound for the linger period. (integer value)
-# Deprecated group/name - [DEFAULT]/rpc_cast_timeout
-#zmq_linger = -1
-
-# The default number of seconds that poll should wait. Poll raises timeout
-# exception when timeout expired. (integer value)
-#rpc_poll_timeout = 1
-
-# Expiration timeout in seconds of a name service record about existing target
-# ( < 0 means no timeout). (integer value)
-#zmq_target_expire = 300
-
-# Update period in seconds of a name service record about existing target.
-# (integer value)
-#zmq_target_update = 180
-
-# Use PUB/SUB pattern for fanout methods. PUB/SUB always uses proxy. (boolean
-# value)
-#use_pub_sub = false
-
-# Use ROUTER remote proxy. (boolean value)
-#use_router_proxy = false
-
-# This option makes direct connections dynamic or static. It makes sense only
-# with use_router_proxy=False which means to use direct connections for direct
-# message types (ignored otherwise). (boolean value)
-#use_dynamic_connections = false
-
-# How many additional connections to a host will be made for failover reasons.
-# This option is actual only in dynamic connections mode. (integer value)
-#zmq_failover_connections = 2
-
-# Minimal port number for random ports range. (port value)
-# Minimum value: 0
-# Maximum value: 65535
-#rpc_zmq_min_port = 49153
-
-# Maximal port number for random ports range. (integer value)
-# Minimum value: 1
-# Maximum value: 65536
-#rpc_zmq_max_port = 65536
-
-# Number of retries to find free port number before fail with ZMQBindError.
-# (integer value)
-#rpc_zmq_bind_port_retries = 100
-
-# Default serialization mechanism for serializing/deserializing
-# outgoing/incoming messages (string value)
-# Possible values:
-# json - <No description provided>
-# msgpack - <No description provided>
-#rpc_zmq_serialization = json
-
-# This option configures round-robin mode in zmq socket. True means not keeping
-# a queue when server side disconnects. False means to keep queue and messages
-# even if server is disconnected, when the server appears we send all
-# accumulated messages to it. (boolean value)
-#zmq_immediate = true
-
-# Enable/disable TCP keepalive (KA) mechanism. The default value of -1 (or any
-# other negative value) means to skip any overrides and leave it to OS default;
-# 0 and 1 (or any other positive value) mean to disable and enable the option
-# respectively. (integer value)
-#zmq_tcp_keepalive = -1
-
-# The duration between two keepalive transmissions in idle condition. The unit
-# is platform dependent, for example, seconds in Linux, milliseconds in Windows
-# etc. The default value of -1 (or any other negative value and 0) means to
-# skip any overrides and leave it to OS default. (integer value)
-#zmq_tcp_keepalive_idle = -1
-
-# The number of retransmissions to be carried out before declaring that remote
-# end is not available. The default value of -1 (or any other negative value
-# and 0) means to skip any overrides and leave it to OS default. (integer
-# value)
-#zmq_tcp_keepalive_cnt = -1
-
-# The duration between two successive keepalive retransmissions, if
-# acknowledgement to the previous keepalive transmission is not received. The
-# unit is platform dependent, for example, seconds in Linux, milliseconds in
-# Windows etc. The default value of -1 (or any other negative value and 0)
-# means to skip any overrides and leave it to OS default. (integer value)
-#zmq_tcp_keepalive_intvl = -1
-
-# Maximum number of (green) threads to work concurrently. (integer value)
-#rpc_thread_pool_size = 100
-
-# Expiration timeout in seconds of a sent/received message after which it is
-# not tracked anymore by a client/server. (integer value)
-#rpc_message_ttl = 300
-
-# Wait for message acknowledgements from receivers. This mechanism works only
-# via proxy without PUB/SUB. (boolean value)
-#rpc_use_acks = false
-
-# Number of seconds to wait for an ack from a cast/call. After each retry
-# attempt this timeout is multiplied by some specified multiplier. (integer
-# value)
-#rpc_ack_timeout_base = 15
-
-# Number to multiply base ack timeout by after each retry attempt. (integer
-# value)
-#rpc_ack_timeout_multiplier = 2
-
-# Default number of message sending attempts in case of any problems occurred:
-# positive value N means at most N retries, 0 means no retries, None or -1 (or
-# any other negative values) mean to retry forever. This option is used only if
-# acknowledgments are enabled. (integer value)
-#rpc_retry_attempts = 3
-
-# List of publisher hosts SubConsumer can subscribe on. This option has higher
-# priority then the default publishers list taken from the matchmaker. (list
-# value)
-#subscribe_on =
-
-
-[oslo_middleware]
-
-#
-# From oslo.middleware
-#
-
-# The maximum body size for each request, in bytes. (integer value)
-# Deprecated group/name - [DEFAULT]/osapi_max_request_body_size
-# Deprecated group/name - [DEFAULT]/max_request_body_size
-#max_request_body_size = 114688
-
-# DEPRECATED: The HTTP Header that will be used to determine what the original
-# request protocol scheme was, even if it was hidden by a SSL termination
-# proxy. (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-#secure_proxy_ssl_header = X-Forwarded-Proto
-
-# Whether the application is behind a proxy or not. This determines if the
-# middleware should parse the headers or not. (boolean value)
-#enable_proxy_headers_parsing = false
-
-
-[oslo_policy]
-
-#
-# From oslo.policy
-#
-
-# This option controls whether or not to enforce scope when evaluating
-# policies. If ``True``, the scope of the token used in the request is compared
-# to the ``scope_types`` of the policy being enforced. If the scopes do not
-# match, an ``InvalidScope`` exception will be raised. If ``False``, a message
-# will be logged informing operators that policies are being invoked with
-# mismatching scope. (boolean value)
-#enforce_scope = false
-
-# The file that defines policies. (string value)
-#policy_file = policy.json
-
-# Default rule. Enforced when a requested rule is not found. (string value)
-#policy_default_rule = default
-
-# Directories where policy configuration files are stored. They can be relative
-# to any directory in the search path defined by the config_dir option, or
-# absolute paths. The file defined by policy_file must exist for these
-# directories to be searched. Missing or empty directories are ignored. (multi
-# valued)
-#policy_dirs = policy.d
-
-# Content Type to send and receive data for REST based policy check (string
-# value)
-# Possible values:
-# application/x-www-form-urlencoded - <No description provided>
-# application/json - <No description provided>
-#remote_content_type = application/x-www-form-urlencoded
-
-# server identity verification for REST based policy check (boolean value)
-#remote_ssl_verify_server_crt = false
-
-# Absolute path to ca cert file for REST based policy check (string value)
-#remote_ssl_ca_crt_file = <None>
-
-# Absolute path to client cert for REST based policy check (string value)
-#remote_ssl_client_crt_file = <None>
-
-# Absolute path client key file REST based policy check (string value)
-#remote_ssl_client_key_file = <None>
-
-
-[policy]
-
-#
-# From keystone
-#
-
-# Entry point for the policy backend driver in the `keystone.policy` namespace.
-# Supplied drivers are `rules` (which does not support any CRUD operations for
-# the v3 policy API) and `sql`. Typically, there is no reason to set this
-# option unless you are providing a custom entry point. (string value)
-#driver = sql
-
-# Maximum number of entities that will be returned in a policy collection.
-# (integer value)
-#list_limit = <None>
-
-
-[profiler]
-
-#
-# From osprofiler
-#
-
-#
-# Enables the profiling for all services on this node. Default value is False
-# (fully disable the profiling feature).
-#
-# Possible values:
-#
-# * True: Enables the feature
-# * False: Disables the feature. The profiling cannot be started via this
-# project
-# operations. If the profiling is triggered by another project, this project
-# part
-# will be empty.
-# (boolean value)
-# Deprecated group/name - [profiler]/profiler_enabled
-#enabled = false
-
-#
-# Enables SQL requests profiling in services. Default value is False (SQL
-# requests won't be traced).
-#
-# Possible values:
-#
-# * True: Enables SQL requests profiling. Each SQL query will be part of the
-# trace and can the be analyzed by how much time was spent for that.
-# * False: Disables SQL requests profiling. The spent time is only shown on a
-# higher level of operations. Single SQL queries cannot be analyzed this
-# way.
-# (boolean value)
-#trace_sqlalchemy = false
-
-#
-# Secret key(s) to use for encrypting context data for performance profiling.
-# This string value should have the following format:
-# <key1>[,<key2>,...<keyn>],
-# where each key is some random string. A user who triggers the profiling via
-# the REST API has to set one of these keys in the headers of the REST API call
-# to include profiling results of this node for this particular project.
-#
-# Both "enabled" flag and "hmac_keys" config options should be set to enable
-# profiling. Also, to generate correct profiling information across all
-# services
-# at least one key needs to be consistent between OpenStack projects. This
-# ensures it can be used from client side to generate the trace, containing
-# information from all possible resources. (string value)
-#hmac_keys = SECRET_KEY
-
-#
-# Connection string for a notifier backend. Default value is messaging:// which
-# sets the notifier to oslo_messaging.
-#
-# Examples of possible values:
-#
-# * messaging://: use oslo_messaging driver for sending notifications.
-# * mongodb://127.0.0.1:27017 : use mongodb driver for sending notifications.
-# * elasticsearch://127.0.0.1:9200 : use elasticsearch driver for sending
-# notifications.
-# (string value)
-#connection_string = messaging://
-
-#
-# Document type for notification indexing in elasticsearch.
-# (string value)
-#es_doc_type = notification
-
-#
-# This parameter is a time value parameter (for example: es_scroll_time=2m),
-# indicating for how long the nodes that participate in the search will
-# maintain
-# relevant resources in order to continue and support it.
-# (string value)
-#es_scroll_time = 2m
-
-#
-# Elasticsearch splits large requests in batches. This parameter defines
-# maximum size of each batch (for example: es_scroll_size=10000).
-# (integer value)
-#es_scroll_size = 10000
-
-#
-# Redissentinel provides a timeout option on the connections.
-# This parameter defines that timeout (for example: socket_timeout=0.1).
-# (floating point value)
-#socket_timeout = 0.1
-
-#
-# Redissentinel uses a service name to identify a master redis service.
-# This parameter defines the name (for example:
-# sentinal_service_name=mymaster).
-# (string value)
-#sentinel_service_name = mymaster
-
-
-[receipt]
-
-#
-# From keystone
-#
-
-# The amount of time that a receipt should remain valid (in seconds). This
-# value should always be very short, as it represents how long a user has to
-# reattempt auth with the missing auth methods. (integer value)
-# Minimum value: 0
-# Maximum value: 86400
-#expiration = 300
-
-# Entry point for the receipt provider in the `keystone.receipt.provider`
-# namespace. The receipt provider controls the receipt construction and
-# validation operations. Keystone includes just the `fernet` receipt provider
-# for now. `fernet` receipts do not need to be persisted at all, but require
-# that you run `keystone-manage fernet_setup` (also see the `keystone-manage
-# fernet_rotate` command). (string value)
-#provider = fernet
-
-# Toggle for caching receipt creation and validation data. This has no effect
-# unless global caching is enabled, or if cache_on_issue is disabled as we only
-# cache receipts on issue. (boolean value)
-#caching = true
-
-# The number of seconds to cache receipt creation and validation data. This has
-# no effect unless both global and `[receipt] caching` are enabled. (integer
-# value)
-# Minimum value: 0
-#cache_time = 300
-
-# Enable storing issued receipt data to receipt validation cache so that first
-# receipt validation doesn't actually cause full validation cycle. This option
-# has no effect unless global caching and receipt caching are enabled. (boolean
-# value)
-#cache_on_issue = true
-
-
-[resource]
-
-#
-# From keystone
-#
-
-# DEPRECATED: Entry point for the resource driver in the `keystone.resource`
-# namespace. Only a `sql` driver is supplied by keystone. Unless you are
-# writing proprietary drivers for keystone, you do not need to set this option.
-# (string value)
-# This option is deprecated for removal since P.
-# Its value may be silently ignored in the future.
-# Reason: Non-SQL resource cannot be used with SQL Identity and has been unable
-# to be used since Ocata. SQL Resource backend is a requirement as of Pike.
-# Setting this option no longer has an effect on how Keystone operates.
-#driver = sql
-
-# Toggle for resource caching. This has no effect unless global caching is
-# enabled. (boolean value)
-# Deprecated group/name - [assignment]/caching
-#caching = true
-
-# Time to cache resource data in seconds. This has no effect unless global
-# caching is enabled. (integer value)
-# Deprecated group/name - [assignment]/cache_time
-#cache_time = <None>
-
-# Maximum number of entities that will be returned in a resource collection.
-# (integer value)
-# Deprecated group/name - [assignment]/list_limit
-#list_limit = <None>
-
-# Name of the domain that owns the `admin_project_name`. If left unset, then
-# there is no admin project. `[resource] admin_project_name` must also be set
-# to use this option. (string value)
-#admin_project_domain_name = <None>
-
-# This is a special project which represents cloud-level administrator
-# privileges across services. Tokens scoped to this project will contain a true
-# `is_admin_project` attribute to indicate to policy systems that the role
-# assignments on that specific project should apply equally across every
-# project. If left unset, then there is no admin project, and thus no explicit
-# means of cross-project role assignments. `[resource]
-# admin_project_domain_name` must also be set to use this option. (string
-# value)
-#admin_project_name = <None>
-
-# This controls whether the names of projects are restricted from containing
-# URL-reserved characters. If set to `new`, attempts to create or update a
-# project with a URL-unsafe name will fail. If set to `strict`, attempts to
-# scope a token with a URL-unsafe project name will fail, thereby forcing all
-# project names to be updated to be URL-safe. (string value)
-# Possible values:
-# off - <No description provided>
-# new - <No description provided>
-# strict - <No description provided>
-#project_name_url_safe = off
-
-# This controls whether the names of domains are restricted from containing
-# URL-reserved characters. If set to `new`, attempts to create or update a
-# domain with a URL-unsafe name will fail. If set to `strict`, attempts to
-# scope a token with a URL-unsafe domain name will fail, thereby forcing all
-# domain names to be updated to be URL-safe. (string value)
-# Possible values:
-# off - <No description provided>
-# new - <No description provided>
-# strict - <No description provided>
-#domain_name_url_safe = off
-
-
-[revoke]
-
-#
-# From keystone
-#
-
-# Entry point for the token revocation backend driver in the `keystone.revoke`
-# namespace. Keystone only provides a `sql` driver, so there is no reason to
-# set this option unless you are providing a custom entry point. (string value)
-#driver = sql
-
-# The number of seconds after a token has expired before a corresponding
-# revocation event may be purged from the backend. (integer value)
-# Minimum value: 0
-#expiration_buffer = 1800
-
-# Toggle for revocation event caching. This has no effect unless global caching
-# is enabled. (boolean value)
-#caching = true
-
-# Time to cache the revocation list and the revocation events (in seconds).
-# This has no effect unless global and `[revoke] caching` are both enabled.
-# (integer value)
-# Deprecated group/name - [token]/revocation_cache_time
-#cache_time = 3600
-
-
-[role]
-
-#
-# From keystone
-#
-
-# Entry point for the role backend driver in the `keystone.role` namespace.
-# Keystone only provides a `sql` driver, so there's no reason to change this
-# unless you are providing a custom entry point. (string value)
-#driver = <None>
-
-# Toggle for role caching. This has no effect unless global caching is enabled.
-# In a typical deployment, there is no reason to disable this. (boolean value)
-#caching = true
-
-# Time to cache role data, in seconds. This has no effect unless both global
-# caching and `[role] caching` are enabled. (integer value)
-#cache_time = <None>
-
-# Maximum number of entities that will be returned in a role collection. This
-# may be useful to tune if you have a large number of discrete roles in your
-# deployment. (integer value)
-#list_limit = <None>
-
-
-[saml]
-
-#
-# From keystone
-#
-
-# Determines the lifetime for any SAML assertions generated by keystone, using
-# `NotOnOrAfter` attributes. (integer value)
-#assertion_expiration_time = 3600
-
-# Name of, or absolute path to, the binary to be used for XML signing. Although
-# only the XML Security Library (`xmlsec1`) is supported, it may have a non-
-# standard name or path on your system. If keystone cannot find the binary
-# itself, you may need to install the appropriate package, use this option to
-# specify an absolute path, or adjust keystone's PATH environment variable.
-# (string value)
-#xmlsec1_binary = xmlsec1
-
-# Absolute path to the public certificate file to use for SAML signing. The
-# value cannot contain a comma (`,`). (string value)
-#certfile = /etc/keystone/ssl/certs/signing_cert.pem
-
-# Absolute path to the private key file to use for SAML signing. The value
-# cannot contain a comma (`,`). (string value)
-#keyfile = /etc/keystone/ssl/private/signing_key.pem
-
-# This is the unique entity identifier of the identity provider (keystone) to
-# use when generating SAML assertions. This value is required to generate
-# identity provider metadata and must be a URI (a URL is recommended). For
-# example: `https://keystone.example.com/v3/OS-FEDERATION/saml2/idp`. (uri
-# value)
-#idp_entity_id = <None>
-
-# This is the single sign-on (SSO) service location of the identity provider
-# which accepts HTTP POST requests. A value is required to generate identity
-# provider metadata. For example: `https://keystone.example.com/v3/OS-
-# FEDERATION/saml2/sso`. (uri value)
-#idp_sso_endpoint = <None>
-
-# This is the language used by the identity provider's organization. (string
-# value)
-#idp_lang = en
-
-# This is the name of the identity provider's organization. (string value)
-#idp_organization_name = SAML Identity Provider
-
-# This is the name of the identity provider's organization to be displayed.
-# (string value)
-#idp_organization_display_name = OpenStack SAML Identity Provider
-
-# This is the URL of the identity provider's organization. The URL referenced
-# here should be useful to humans. (uri value)
-#idp_organization_url = https://example.com/
-
-# This is the company name of the identity provider's contact person. (string
-# value)
-#idp_contact_company = Example, Inc.
-
-# This is the given name of the identity provider's contact person. (string
-# value)
-#idp_contact_name = SAML Identity Provider Support
-
-# This is the surname of the identity provider's contact person. (string value)
-#idp_contact_surname = Support
-
-# This is the email address of the identity provider's contact person. (string
-# value)
-#idp_contact_email = support@example.com
-
-# This is the telephone number of the identity provider's contact person.
-# (string value)
-#idp_contact_telephone = +1 800 555 0100
-
-# This is the type of contact that best describes the identity provider's
-# contact person. (string value)
-# Possible values:
-# technical - <No description provided>
-# support - <No description provided>
-# administrative - <No description provided>
-# billing - <No description provided>
-# other - <No description provided>
-#idp_contact_type = other
-
-# Absolute path to the identity provider metadata file. This file should be
-# generated with the `keystone-manage saml_idp_metadata` command. There is
-# typically no reason to change this value. (string value)
-#idp_metadata_path = /etc/keystone/saml2_idp_metadata.xml
-
-# The prefix of the RelayState SAML attribute to use when generating enhanced
-# client and proxy (ECP) assertions. In a typical deployment, there is no
-# reason to change this value. (string value)
-#relay_state_prefix = ss:mem:
-
-
-[security_compliance]
-
-#
-# From keystone
-#
-
-# The maximum number of days a user can go without authenticating before being
-# considered "inactive" and automatically disabled (locked). This feature is
-# disabled by default; set any value to enable it. This feature depends on the
-# `sql` backend for the `[identity] driver`. When a user exceeds this threshold
-# and is considered "inactive", the user's `enabled` attribute in the HTTP API
-# may not match the value of the user's `enabled` column in the user table.
-# (integer value)
-# Minimum value: 1
-#disable_user_account_days_inactive = <None>
-
-# The maximum number of times that a user can fail to authenticate before the
-# user account is locked for the number of seconds specified by
-# `[security_compliance] lockout_duration`. This feature is disabled by
-# default. If this feature is enabled and `[security_compliance]
-# lockout_duration` is not set, then users may be locked out indefinitely until
-# the user is explicitly enabled via the API. This feature depends on the `sql`
-# backend for the `[identity] driver`. (integer value)
-# Minimum value: 1
-#lockout_failure_attempts = <None>
-
-# The number of seconds a user account will be locked when the maximum number
-# of failed authentication attempts (as specified by `[security_compliance]
-# lockout_failure_attempts`) is exceeded. Setting this option will have no
-# effect unless you also set `[security_compliance] lockout_failure_attempts`
-# to a non-zero value. This feature depends on the `sql` backend for the
-# `[identity] driver`. (integer value)
-# Minimum value: 1
-#lockout_duration = 1800
-
-# The number of days for which a password will be considered valid before
-# requiring it to be changed. This feature is disabled by default. If enabled,
-# new password changes will have an expiration date, however existing passwords
-# would not be impacted. This feature depends on the `sql` backend for the
-# `[identity] driver`. (integer value)
-# Minimum value: 1
-#password_expires_days = <None>
-
-# This controls the number of previous user password iterations to keep in
-# history, in order to enforce that newly created passwords are unique. The
-# total number which includes the new password should not be greater or equal
-# to this value. Setting the value to zero (the default) disables this feature.
-# Thus, to enable this feature, values must be greater than 0. This feature
-# depends on the `sql` backend for the `[identity] driver`. (integer value)
-# Minimum value: 0
-#unique_last_password_count = 0
-
-# The number of days that a password must be used before the user can change
-# it. This prevents users from changing their passwords immediately in order to
-# wipe out their password history and reuse an old password. This feature does
-# not prevent administrators from manually resetting passwords. It is disabled
-# by default and allows for immediate password changes. This feature depends on
-# the `sql` backend for the `[identity] driver`. Note: If
-# `[security_compliance] password_expires_days` is set, then the value for this
-# option should be less than the `password_expires_days`. (integer value)
-# Minimum value: 0
-#minimum_password_age = 0
-
-# The regular expression used to validate password strength requirements. By
-# default, the regular expression will match any password. The following is an
-# example of a pattern which requires at least 1 letter, 1 digit, and have a
-# minimum length of 7 characters: ^(?=.*\d)(?=.*[a-zA-Z]).{7,}$ This feature
-# depends on the `sql` backend for the `[identity] driver`. (string value)
-#password_regex = <None>
-
-# Describe your password regular expression here in language for humans. If a
-# password fails to match the regular expression, the contents of this
-# configuration variable will be returned to users to explain why their
-# requested password was insufficient. (string value)
-#password_regex_description = <None>
-
-# Enabling this option requires users to change their password when the user is
-# created, or upon administrative reset. Before accessing any services,
-# affected users will have to change their password. To ignore this requirement
-# for specific users, such as service users, set the `options` attribute
-# `ignore_change_password_upon_first_use` to `True` for the desired user via
-# the update user API. This feature is disabled by default. This feature is
-# only applicable with the `sql` backend for the `[identity] driver`. (boolean
-# value)
-#change_password_upon_first_use = false
-
-
-[shadow_users]
-
-#
-# From keystone
-#
-
-# Entry point for the shadow users backend driver in the
-# `keystone.identity.shadow_users` namespace. This driver is used for
-# persisting local user references to externally-managed identities (via
-# federation, LDAP, etc). Keystone only provides a `sql` driver, so there is no
-# reason to change this option unless you are providing a custom entry point.
-# (string value)
-#driver = sql
-
-
-[signing]
-
-#
-# From keystone
-#
-
-# DEPRECATED: Absolute path to the public certificate file to use for signing
-# responses to revocation lists requests. Set this together with `[signing]
-# keyfile`. For non-production environments, you may be interested in using
-# `keystone-manage pki_setup` to generate self-signed certificates. (string
-# value)
-# This option is deprecated for removal since P.
-# Its value may be silently ignored in the future.
-# Reason: `keystone-manage pki_setup` was deprecated in Mitaka and removed in
-# Pike. These options remain for backwards compatibility.
-#certfile = /etc/keystone/ssl/certs/signing_cert.pem
-
-# DEPRECATED: Absolute path to the private key file to use for signing
-# responses to revocation lists requests. Set this together with `[signing]
-# certfile`. (string value)
-# This option is deprecated for removal since P.
-# Its value may be silently ignored in the future.
-# Reason: `keystone-manage pki_setup` was deprecated in Mitaka and removed in
-# Pike. These options remain for backwards compatibility.
-#keyfile = /etc/keystone/ssl/private/signing_key.pem
-
-# DEPRECATED: Absolute path to the public certificate authority (CA) file to
-# use when creating self-signed certificates with `keystone-manage pki_setup`.
-# Set this together with `[signing] ca_key`. There is no reason to set this
-# option unless you are requesting revocation lists in a non-production
-# environment. Use a `[signing] certfile` issued from a trusted certificate
-# authority instead. (string value)
-# This option is deprecated for removal since P.
-# Its value may be silently ignored in the future.
-# Reason: `keystone-manage pki_setup` was deprecated in Mitaka and removed in
-# Pike. These options remain for backwards compatibility.
-#ca_certs = /etc/keystone/ssl/certs/ca.pem
-
-# DEPRECATED: Absolute path to the private certificate authority (CA) key file
-# to use when creating self-signed certificates with `keystone-manage
-# pki_setup`. Set this together with `[signing] ca_certs`. There is no reason
-# to set this option unless you are requesting revocation lists in a non-
-# production environment. Use a `[signing] certfile` issued from a trusted
-# certificate authority instead. (string value)
-# This option is deprecated for removal since P.
-# Its value may be silently ignored in the future.
-# Reason: `keystone-manage pki_setup` was deprecated in Mitaka and removed in
-# Pike. These options remain for backwards compatibility.
-#ca_key = /etc/keystone/ssl/private/cakey.pem
-
-# DEPRECATED: Key size (in bits) to use when generating a self-signed token
-# signing certificate. There is no reason to set this option unless you are
-# requesting revocation lists in a non-production environment. Use a `[signing]
-# certfile` issued from a trusted certificate authority instead. (integer
-# value)
-# Minimum value: 1024
-# This option is deprecated for removal since P.
-# Its value may be silently ignored in the future.
-# Reason: `keystone-manage pki_setup` was deprecated in Mitaka and removed in
-# Pike. These options remain for backwards compatibility.
-#key_size = 2048
-
-# DEPRECATED: The validity period (in days) to use when generating a self-
-# signed token signing certificate. There is no reason to set this option
-# unless you are requesting revocation lists in a non-production environment.
-# Use a `[signing] certfile` issued from a trusted certificate authority
-# instead. (integer value)
-# This option is deprecated for removal since P.
-# Its value may be silently ignored in the future.
-# Reason: `keystone-manage pki_setup` was deprecated in Mitaka and removed in
-# Pike. These options remain for backwards compatibility.
-#valid_days = 3650
-
-# DEPRECATED: The certificate subject to use when generating a self-signed
-# token signing certificate. There is no reason to set this option unless you
-# are requesting revocation lists in a non-production environment. Use a
-# `[signing] certfile` issued from a trusted certificate authority instead.
-# (string value)
-# This option is deprecated for removal since P.
-# Its value may be silently ignored in the future.
-# Reason: `keystone-manage pki_setup` was deprecated in Mitaka and removed in
-# Pike. These options remain for backwards compatibility.
-#cert_subject = /C=US/ST=Unset/L=Unset/O=Unset/CN=www.example.com
-
-
-[token]
-
-#
-# From keystone
-#
-
-# The amount of time that a token should remain valid (in seconds). Drastically
-# reducing this value may break "long-running" operations that involve multiple
-# services to coordinate together, and will force users to authenticate with
-# keystone more frequently. Drastically increasing this value will increase the
-# number of tokens that will be simultaneously valid. Keystone tokens are also
-# bearer tokens, so a shorter duration will also reduce the potential security
-# impact of a compromised token. (integer value)
-# Minimum value: 0
-# Maximum value: 9223372036854775807
-#expiration = 3600
-
-# Entry point for the token provider in the `keystone.token.provider`
-# namespace. The token provider controls the token construction, validation,
-# and revocation operations. Supported upstream providers are `fernet` and
-# `jws`. Neither `fernet` or `jws` tokens require persistence and both require
-# additional setup. If using `fernet`, you're required to run `keystone-manage
-# fernet_setup`, which creates symmetric keys used to encrypt tokens. If using
-# `jws`, you're required to generate an ECDSA keypair using a SHA-256 hash
-# algorithm for signing and validating token, which can be done with `keystone-
-# manage create_jws_keypair`. Note that `fernet` tokens are encrypted and `jws`
-# tokens are only signed. Please be sure to consider this if your deployment
-# has security requirements regarding payload contents used to generate token
-# IDs. (string value)
-#provider = fernet
-
-# Toggle for caching token creation and validation data. This has no effect
-# unless global caching is enabled. (boolean value)
-#caching = true
-
-# The number of seconds to cache token creation and validation data. This has
-# no effect unless both global and `[token] caching` are enabled. (integer
-# value)
-# Minimum value: 0
-# Maximum value: 9223372036854775807
-#cache_time = <None>
-
-# This toggles support for revoking individual tokens by the token identifier
-# and thus various token enumeration operations (such as listing all tokens
-# issued to a specific user). These operations are used to determine the list
-# of tokens to consider revoked. Do not disable this option if you're using the
-# `kvs` `[revoke] driver`. (boolean value)
-#revoke_by_id = true
-
-# This toggles whether scoped tokens may be re-scoped to a new project or
-# domain, thereby preventing users from exchanging a scoped token (including
-# those with a default project scope) for any other token. This forces users to
-# either authenticate for unscoped tokens (and later exchange that unscoped
-# token for tokens with a more specific scope) or to provide their credentials
-# in every request for a scoped token to avoid re-scoping altogether. (boolean
-# value)
-#allow_rescope_scoped_token = true
-
-# DEPRECATED: This controls whether roles should be included with tokens that
-# are not directly assigned to the token's scope, but are instead linked
-# implicitly to other role assignments. (boolean value)
-# This option is deprecated for removal since R.
-# Its value may be silently ignored in the future.
-# Reason: Default roles depend on a chain of implied role assignments. Ex: an
-# admin user will also have the reader and member role. By ensuring that all
-# these roles will always appear on the token validation response, we can
-# improve the simplicity and readability of policy files.
-#infer_roles = true
-
-# DEPRECATED: Enable storing issued token data to token validation cache so
-# that first token validation doesn't actually cause full validation cycle.
-# This option has no effect unless global caching is enabled and will still
-# cache tokens even if `[token] caching = False`. (boolean value)
-# This option is deprecated for removal since S.
-# Its value may be silently ignored in the future.
-# Reason: Keystone already exposes a configuration option for caching tokens.
-# Having a separate configuration option to cache tokens when they are issued
-# is redundant, unnecessarily complicated, and is misleading if token caching
-# is disabled because tokens will still be pre-cached by default when they are
-# issued. The ability to pre-cache tokens when they are issued is going to rely
-# exclusively on the ``keystone.conf [token] caching`` option in the future.
-#cache_on_issue = true
-
-# This controls the number of seconds that a token can be retrieved for beyond
-# the built-in expiry time. This allows long running operations to succeed.
-# Defaults to two days. (integer value)
-#allow_expired_window = 172800
-
-
-[tokenless_auth]
-
-#
-# From keystone
-#
-
-# The list of distinguished names which identify trusted issuers of client
-# certificates allowed to use X.509 tokenless authorization. If the option is
-# absent then no certificates will be allowed. The format for the values of a
-# distinguished name (DN) must be separated by a comma and contain no spaces.
-# Furthermore, because an individual DN may contain commas, this configuration
-# option may be repeated multiple times to represent multiple values. For
-# example, keystone.conf would include two consecutive lines in order to trust
-# two different DNs, such as `trusted_issuer = CN=john,OU=keystone,O=openstack`
-# and `trusted_issuer = CN=mary,OU=eng,O=abc`. (multi valued)
-#trusted_issuer =
-
-# The federated protocol ID used to represent X.509 tokenless authorization.
-# This is used in combination with the value of `[tokenless_auth]
-# issuer_attribute` to find a corresponding federated mapping. In a typical
-# deployment, there is no reason to change this value. (string value)
-#protocol = x509
-
-# The name of the WSGI environment variable used to pass the issuer of the
-# client certificate to keystone. This attribute is used as an identity
-# provider ID for the X.509 tokenless authorization along with the protocol to
-# look up its corresponding mapping. In a typical deployment, there is no
-# reason to change this value. (string value)
-#issuer_attribute = SSL_CLIENT_I_DN
-
-
-[trust]
-
-#
-# From keystone
-#
-
-# Allows authorization to be redelegated from one user to another, effectively
-# chaining trusts together. When disabled, the `remaining_uses` attribute of a
-# trust is constrained to be zero. (boolean value)
-#allow_redelegation = false
-
-# Maximum number of times that authorization can be redelegated from one user
-# to another in a chain of trusts. This number may be reduced further for a
-# specific trust. (integer value)
-#max_redelegation_count = 3
-
-# Entry point for the trust backend driver in the `keystone.trust` namespace.
-# Keystone only provides a `sql` driver, so there is no reason to change this
-# unless you are providing a custom entry point. (string value)
-#driver = sql
-
-
-[unified_limit]
-
-#
-# From keystone
-#
-
-# Entry point for the unified limit backend driver in the
-# `keystone.unified_limit` namespace. Keystone only provides a `sql` driver, so
-# there's no reason to change this unless you are providing a custom entry
-# point. (string value)
-#driver = sql
-
-# Toggle for unified limit caching. This has no effect unless global caching is
-# enabled. In a typical deployment, there is no reason to disable this.
-# (boolean value)
-#caching = true
-
-# Time to cache unified limit data, in seconds. This has no effect unless both
-# global caching and `[unified_limit] caching` are enabled. (integer value)
-#cache_time = <None>
-
-# Maximum number of entities that will be returned in a role collection. This
-# may be useful to tune if you have a large number of unified limits in your
-# deployment. (integer value)
-#list_limit = <None>
-
-# The enforcement model to use when validating limits associated to projects.
-# Enforcement models will behave differently depending on the existing limits,
-# which may result in backwards incompatible changes if a model is switched in
-# a running deployment. (string value)
-# Possible values:
-# flat - <No description provided>
-# strict_two_level - <No description provided>
-#enforcement_model = flat
-
-
-[wsgi]
-
-#
-# From keystone
-#
-
-# If set to true, this enables the oslo debug middleware in Keystone. This
-# Middleware prints a lot of information about the request and the response. It
-# is useful for getting information about the data on the wire (decoded) and
-# passed to the WSGI application pipeline. This middleware has no effect on the
-# "debug" setting in the [DEFAULT] section of the config file or setting
-# Keystone's log-level to "DEBUG"; it is specific to debugging the WSGI data as
-# it enters and leaves Keystone (specific request-related data). This option is
-# used for introspection on the request and response data between the web
-# server (apache, nginx, etc) and Keystone. This middleware is inserted as the
-# first element in the middleware chain and will show the data closest to the
-# wire. WARNING: NOT INTENDED FOR USE IN PRODUCTION. THIS MIDDLEWARE CAN AND
-# WILL EMIT SENSITIVE/PRIVILEGED DATA. (boolean value)
-#debug_middleware = false
+++ /dev/null
-
-Listen 5000
-Listen 35357
-
-<VirtualHost *:5000>
- WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP}
- WSGIProcessGroup keystone-public
- WSGIScriptAlias / /usr/bin/keystone-wsgi-public
- WSGIApplicationGroup %{GLOBAL}
- WSGIPassAuthorization On
- ErrorLogFormat "%{cu}t %M"
- ErrorLog /var/log/apache2/keystone.log
- CustomLog /var/log/apache2/keystone_access.log combined
-
- <Directory /usr/bin>
- Require all granted
- </Directory>
-</VirtualHost>
-
-<VirtualHost *:35357>
- WSGIDaemonProcess keystone-admin processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP}
- WSGIProcessGroup keystone-admin
- WSGIScriptAlias / /usr/bin/keystone-wsgi-admin
- WSGIApplicationGroup %{GLOBAL}
- WSGIPassAuthorization On
- ErrorLogFormat "%{cu}t %M"
- ErrorLog /var/log/apache2/keystone.log
- CustomLog /var/log/apache2/keystone_access.log combined
-
- <Directory /usr/bin>
- Require all granted
- </Directory>
-</VirtualHost>
-
-Alias /identity /usr/bin/keystone-wsgi-public
-<Location /identity>
- SetHandler wsgi-script
- Options +ExecCGI
-
- WSGIProcessGroup keystone-public
- WSGIApplicationGroup %{GLOBAL}
- WSGIPassAuthorization On
-</Location>
-
-Alias /identity_admin /usr/bin/keystone-wsgi-admin
-<Location /identity_admin>
- SetHandler wsgi-script
- Options +ExecCGI
-
- WSGIProcessGroup keystone-admin
- WSGIApplicationGroup %{GLOBAL}
- WSGIPassAuthorization On
-</Location>
+++ /dev/null
-From 97c9b5fdbffda65a7cacb2d0d7beac59c34f902c Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Thu, 10 Oct 2019 11:30:18 -0700
-Subject: [PATCH] Enable cross compile
-
----
- setup.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 747dc62..1eeb7bf 100644
---- a/setup.py
-+++ b/setup.py
-@@ -167,6 +167,9 @@ class build_clib(_build_clib):
- configure, "--disable-shared", "--enable-static",
- "--disable-debug", "--disable-dependency-tracking",
- "--with-pic", "--prefix", os.path.abspath(self.build_clib),
-+ os.environ.get('PYNACL_CROSS_TARGET'),
-+ os.environ.get('PYNACL_CROSS_HOST'),
-+ os.environ.get('PYNACL_CROSS_BUILD'),
- ],
- cwd=build_temp,
- )
-@@ -176,7 +179,7 @@ class build_clib(_build_clib):
- subprocess.check_call(["make"] + make_args, cwd=build_temp)
-
- # Check the build library
-- subprocess.check_call(["make", "check"] + make_args, cwd=build_temp)
-+ # subprocess.check_call(["make", "check"] + make_args, cwd=build_temp)
-
- # Install the built library
- subprocess.check_call(["make", "install"] + make_args, cwd=build_temp)
---
-2.17.1
-
+++ /dev/null
-From ecaf5c44da357e2ee5279a3f84a060f7af2c9dd1 Mon Sep 17 00:00:00 2001
-From: zhipengl <zhipengs.liu@intel.com>
-Date: Fri, 21 Jun 2019 01:50:14 +0800
-Subject: [PATCH] Adapt-redfishtool-to-python2
-
-Signed-off-by: zhipengl <zhipengs.liu@intel.com>
----
- redfishtool/AccountService.py | 18 +++++++++---------
- redfishtool/Chassis.py | 22 +++++++++++-----------
- redfishtool/Managers.py | 29 ++++++++++++++---------------
- redfishtool/ServiceRoot.py | 2 +-
- redfishtool/SessionService.py | 10 +++++-----
- redfishtool/Systems.py | 36 ++++++++++++++++++------------------
- redfishtool/raw.py | 2 +-
- redfishtool/redfishtoolTransport.py | 29 ++++++++++++++---------------
- setup.py | 1 +
- 9 files changed, 74 insertions(+), 75 deletions(-)
-
-diff --git a/redfishtool/AccountService.py b/redfishtool/AccountService.py
-index e0ec106..bfb17f8 100644
---- a/redfishtool/AccountService.py
-+++ b/redfishtool/AccountService.py
-@@ -34,7 +34,7 @@ import getopt
- import re
- import sys
- from .ServiceRoot import RfServiceRoot
--from urllib.parse import urljoin
-+from urlparse import urljoin
-
- class RfAccountServiceMain():
- def __init__(self):
-@@ -259,13 +259,13 @@ class RfAccountServiceOperations():
- #loop through the members and create the list sub-operation response
- rc,r,j,d=rft.listCollection(rft, r, d, prop="UserName")
- if(rc==0):
-- rft.printVerbose(1," list {} Collection member info: Id, URI, UserName".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," list {} Collection member info: Id, URI, UserName".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if no account was specified. If not, return the collection
- elif(rft.IdLevel2OptnCount==0):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=accountsLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection ".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if the -a (all) option is set. If not, return the session specific by -i or -m or -l
- # search collection to find path using getPath2
-@@ -287,14 +287,14 @@ class RfAccountServiceOperations():
- elif( r is None ):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', collUrl, relPath=path2, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection Member ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection Member ".format(collName), skip1=True, printV12=cmdTop)
-
- # else, return ALL of the Accounts members
- else:
- rft.printVerbose(4,"getting expanded Accounts Collection")
- rc,r,j,d=rft.getAllCollectionMembers(rft, r.url, relPath=accountsLink)
- if(rc==0):
-- rft.printVerbose(1," Get ALL {} Collection Members".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," Get ALL {} Collection Members".format(collName), skip1=True, printV12=cmdTop)
-
- return(rc,r,j,d)
-
-@@ -324,13 +324,13 @@ class RfAccountServiceOperations():
- #loop through the members and create the list sub-operation response
- rc,r,j,d=rft.listCollection(rft, r, d, prop="IsPredefined")
- if(rc==0):
-- rft.printVerbose(1," list {} Collection member info: Id, URI, IsPredefined".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," list {} Collection member info: Id, URI, IsPredefined".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if no account was specified. If not, return the collection
- elif(rft.IdLevel2OptnCount==0):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=rolesLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection ".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if the -a (all) option is set. If not, return the session specific by -i or -m or -l
- # search collection to find path using getPath2
-@@ -352,14 +352,14 @@ class RfAccountServiceOperations():
- elif( r is None ):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', collUrl, relPath=path2, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection Member ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection Member ".format(collName), skip1=True, printV12=cmdTop)
-
- # else, return ALL of the Accounts members
- else:
- rft.printVerbose(4,"getting expanded Roles Collection")
- rc,r,j,d=rft.getAllCollectionMembers(rft, r.url, relPath=rolesLink)
- if(rc==0):
-- rft.printVerbose(1," Get ALL {} Collection Members".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," Get ALL {} Collection Members".format(collName), skip1=True, printV12=cmdTop)
-
- return(rc,r,j,d)
-
-diff --git a/redfishtool/Chassis.py b/redfishtool/Chassis.py
-index d8f0bf5..0494bd9 100644
---- a/redfishtool/Chassis.py
-+++ b/redfishtool/Chassis.py
-@@ -37,7 +37,7 @@ import getopt
- import re
- import sys
- from .ServiceRoot import RfServiceRoot
--from urllib.parse import urljoin
-+from urlparse import urljoin
-
- class RfChassisMain():
- def __init__(self):
-@@ -208,7 +208,7 @@ class RfChassisOperations():
- rft.printVerbose(4,"Expand Chassis collection to return ALL Chassis collection members fully expanded in response")
- rc,r,j,d=rft.getAllCollectionMembers(rft, r.url, relPath=systemsLink)
- if(rc==0):
-- rft.printVerbose(1," Get ALL {} Collection Members".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," Get ALL {} Collection Members".format(collName), skip1=True, printV12=cmdTop)
-
- # otherwise, just return the collection
- # now read the /Chassis collection
-@@ -217,7 +217,7 @@ class RfChassisOperations():
- if cmdTop is True: prop=rft.prop
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=systemsLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," Chassis Collection:",skip1=True, printV12=cmdTop)
-+ rft.printVerbose(1," Chassis Collection:", skip1=True, printV12=cmdTop)
-
- return(rc,r,j,d)
-
-@@ -262,7 +262,7 @@ class RfChassisOperations():
- #loop through the members and create the list sub-operation response
- rc,r,j,d=rft.listCollection(rft, r, d, prop="AssetTag")
- if(rc==0):
-- rft.printVerbose(1," list {} Collection member info: Id, URI, AssetTag".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," list {} Collection member info: Id, URI, AssetTag".format(collName), skip1=True, printV12=cmdTop)
- return(rc,r,j,d)
-
-
-@@ -439,7 +439,7 @@ class RfChassisOperations():
-
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=resLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Resource ".format(resName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Resource ".format(resName), skip1=True, printV12=cmdTop)
-
- return(rc,r,j,d)
-
-@@ -464,7 +464,7 @@ class RfChassisOperations():
-
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=resLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Resource ".format(resName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Resource ".format(resName), skip1=True, printV12=cmdTop)
-
- return(rc,r,j,d)
-
-@@ -521,13 +521,13 @@ class RfChassisOperations():
- if( prop in powerControl[indx] ):
- respDataVal=powerControl[indx][prop]
- respData={prop: respDataVal}
-- rft.printVerbose(1," Get Current Power consumption (PowerConsumedWatts) of PowerControl[{}] resource".format(indx,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," Get Current Power consumption (PowerConsumedWatts) of PowerControl[{}] resource".format(indx), skip1=True, printV12=cmdTop)
- else:
- rft.printErr("Error: Property {} not not returned in PowerControl[{}] resource".format(prop,indx))
- return(4,r,j,d)
- else:
- respData=powerControl[indx] #return the full powerControl array
-- rft.printVerbose(1," Chassis PowerControl[{}] array:".format(indx,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," Chassis PowerControl[{}] array:".format(indx), skip1=True, printV12=cmdTop)
-
- return(rc,r,j,respData)
-
-@@ -684,13 +684,13 @@ class RfChassisOperations():
- #loop through the members and create the list sub-operation response
- rc,r,j,d=rft.listCollection(rft, r, d, prop="Name")
- if(rc==0):
-- rft.printVerbose(1," list {} Collection member info: Id, URI, Name".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," list {} Collection member info: Id, URI, Name".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if no Log was specified. If not, return the collection
- elif(rft.IdLevel2OptnCount==0):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=logLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection ".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if the -a (all) option is set. If not, return the proc specific by -i or -m
- # search collection to find path using getPath2
-@@ -712,7 +712,7 @@ class RfChassisOperations():
- elif( r is None ):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', collUrl, relPath=path2, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection Member ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection Member ".format(collName), skip1=True, printV12=cmdTop)
-
- # If '--Entries' specified, get "Entries" nav link and read it
- if rc == 0 and rft.gotEntriesOptn:
-diff --git a/redfishtool/Managers.py b/redfishtool/Managers.py
-index 586a871..400dad7 100644
---- a/redfishtool/Managers.py
-+++ b/redfishtool/Managers.py
-@@ -37,7 +37,7 @@ import getopt
- import re
- import sys
- from .ServiceRoot import RfServiceRoot
--from urllib.parse import urljoin
-+from urlparse import urljoin
-
- class RfManagersMain():
- def __init__(self):
-@@ -211,7 +211,7 @@ class RfManagersOperations():
- rft.printVerbose(4,"Expand Managers collection to return ALL Managers collection members fully expanded in response")
- rc,r,j,d=rft.getAllCollectionMembers(rft, r.url, relPath=systemsLink)
- if(rc==0):
-- rft.printVerbose(1," Get ALL {} Collection Members".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," Get ALL {} Collection Members".format(collName), skip1=True, printV12=cmdTop)
-
- # otherwise, just return the collection
- # now read the /Managers collection
-@@ -467,7 +467,7 @@ class RfManagersOperations():
-
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=resLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Resource ".format(resName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Resource ".format(resName), skip1=True, printV12=cmdTop)
-
- return(rc,r,j,d)
-
-@@ -503,13 +503,13 @@ class RfManagersOperations():
- #loop through the members and create the list sub-operation response
- rc,r,j,d=rft.listCollection(rft, r, d, prop="Name")
- if(rc==0):
-- rft.printVerbose(1," list {} Collection member info: Id, URI, Name".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," list {} Collection member info: Id, URI, Name".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if no NIC was specified. If not, return the collection
- elif(rft.IdLevel2OptnCount==0):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=nicLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection ".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if the -a (all) option is set. If not, return the proc specific by -i or -m
- # search collection to find path using getPath2
-@@ -531,14 +531,14 @@ class RfManagersOperations():
- elif( r is None ):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', collUrl, relPath=path2, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection Member ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection Member ".format(collName), skip1=True, printV12=cmdTop)
-
- # else, return ALL of the EthernetInterfaces members
- else:
- rft.printVerbose(4,"getting expanded EthernetInterfaces Collection")
- rc,r,j,d=rft.getAllCollectionMembers(rft, r.url, relPath=nicLink)
- if(rc==0):
-- rft.printVerbose(1," Get ALL {} Collection Members".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," Get ALL {} Collection Members".format(collName), skip1=True, printV12=cmdTop)
-
- return(rc,r,j,d)
-
-@@ -568,13 +568,13 @@ class RfManagersOperations():
- #loop through the members and create the list sub-operation response
- rc,r,j,d=rft.listCollection(rft, r, d, prop="Name" )
- if(rc==0):
-- rft.printVerbose(1," list {} Collection member info: Id, URI, Name".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," list {} Collection member info: Id, URI, Name".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if no SerialInterfaces controller was specified. If not, return the collection
- elif(rft.IdLevel2OptnCount==0):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=cntlrLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection ".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if the -a (all) option is set. If not, return the proc specific by -i or -m
- # search collection to find path using getPath2
-@@ -596,14 +596,14 @@ class RfManagersOperations():
- elif( r is None ):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', collUrl, relPath=path2, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection Member ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection Member ".format(collName), skip1=True, printV12=cmdTop)
-
- # else, return ALL of the SerialInterfaces members
- else:
- rft.printVerbose(4,"getting expanded SerialInterfaces Collection")
- rc,r,j,d=rft.getAllCollectionMembers(rft, r.url, relPath=cntlrLink)
- if(rc==0):
-- rft.printVerbose(1," Get ALL {} Collection Members".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," Get ALL {} Collection Members".format(collName), skip1=True, printV12=cmdTop)
-
- return(rc,r,j,d)
-
-@@ -633,13 +633,12 @@ class RfManagersOperations():
- #loop through the members and create the list sub-operation response
- rc,r,j,d=rft.listCollection(rft, r, d, prop="Name")
- if(rc==0):
-- rft.printVerbose(1," list {} Collection member info: Id, URI, Name".format(collName,skip1=True, printV12=cmdTop))
--
-+ rft.printVerbose(1," list {} Collection member info: Id, URI, Name".format(collName), skip1=True, printV12=cmdTop)
- # else: check if no Log was specified. If not, return the collection
- elif(rft.IdLevel2OptnCount==0):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=logLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection ".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if the -a (all) option is set. If not, return the proc specific by -i or -m
- # search collection to find path using getPath2
-@@ -661,7 +660,7 @@ class RfManagersOperations():
- elif( r is None ):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', collUrl, relPath=path2, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection Member ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection Member ".format(collName), skip1=True, printV12=cmdTop)
-
- # If '--Entries' specified, get "Entries" nav link and read it
- if rc == 0 and rft.gotEntriesOptn:
-diff --git a/redfishtool/ServiceRoot.py b/redfishtool/ServiceRoot.py
-index 5d85b5d..9395b83 100644
---- a/redfishtool/ServiceRoot.py
-+++ b/redfishtool/ServiceRoot.py
-@@ -12,7 +12,7 @@
- #
- import requests
- import json
--from urllib.parse import urljoin, urlparse, urlunparse
-+from urlparse import urljoin, urlparse, urlunparse
-
- class RfServiceRoot:
- def __init__(self):
-diff --git a/redfishtool/SessionService.py b/redfishtool/SessionService.py
-index 7a07811..c7a1624 100644
---- a/redfishtool/SessionService.py
-+++ b/redfishtool/SessionService.py
-@@ -30,7 +30,7 @@ import getopt
- import re
- import sys
- from .ServiceRoot import RfServiceRoot
--from urllib.parse import urljoin
-+from urlparse import urljoin
-
- class RfSessionServiceMain():
- def __init__(self):
-@@ -267,13 +267,13 @@ class RfSessionServiceOperations():
- #loop through the members and create the list sub-operation response
- rc,r,j,d=rft.listCollection(rft, r, d, prop="UserName")
- if(rc==0):
-- rft.printVerbose(1," list {} Collection member info: Id, URI, Socket".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," list {} Collection member info: Id, URI, Socket".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if no session was specified. If not, return the collection
- elif(rft.IdLevel2OptnCount==0):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=sessionsLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection ".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if the -a (all) option is set. If not, return the session specific by -i or -m or -l
- # search collection to find path using getPath2
-@@ -295,14 +295,14 @@ class RfSessionServiceOperations():
- elif( r is None ):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', collUrl, relPath=path2, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection Member ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection Member ".format(collName), skip1=True, printV12=cmdTop)
-
- # else, return ALL of the Sessions members
- else:
- rft.printVerbose(4,"getting expanded Sessions Collection")
- rc,r,j,d=rft.getAllCollectionMembers(rft, r.url, relPath=sessionsLink)
- if(rc==0):
-- rft.printVerbose(1," Get ALL {} Collection Members".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," Get ALL {} Collection Members".format(collName), skip1=True, printV12=cmdTop)
-
- return(rc,r,j,d)
-
-diff --git a/redfishtool/Systems.py b/redfishtool/Systems.py
-index 9a7dfbe..9a9148a 100644
---- a/redfishtool/Systems.py
-+++ b/redfishtool/Systems.py
-@@ -39,7 +39,7 @@ import getopt
- import re
- import sys
- from .ServiceRoot import RfServiceRoot
--from urllib.parse import urljoin
-+from urlparse import urljoin
-
- class RfSystemsMain():
- def __init__(self):
-@@ -216,7 +216,7 @@ class RfSystemsOperations():
- rft.printVerbose(4,"Expand Systems collection to return ALL Systems collection members fully expanded in response")
- rc,r,j,d=rft.getAllCollectionMembers(rft, r.url, relPath=systemsLink)
- if(rc==0):
-- rft.printVerbose(1," Get ALL {} Collection Members".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," Get ALL {} Collection Members".format(collName), skip1=True, printV12=cmdTop)
-
- # otherwise, just return the collection
- # now read the /Systems collection
-@@ -419,7 +419,7 @@ class RfSystemsOperations():
- reqData=reqPostData)
-
- if(rc==0):
-- rft.printVerbose(1," Systems reset: ", resetType, skip1=True, printV12=cmdTop)
-+ rft.printVerbose(1,(" Systems reset: {}").format(resetType), skip1=True, printV12=cmdTop)
- resetd=None
- return(rc,r,False,resetd)
- else: return(rc,r,False,None)
-@@ -623,13 +623,13 @@ class RfSystemsOperations():
- #loop through the members and create the list sub-operation response
- rc,r,j,d=rft.listCollection(rft, r, d, prop="Socket")
- if(rc==0):
-- rft.printVerbose(1," list {} Collection member info: Id, URI, Socket".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," list {} Collection member info: Id, URI, Socket".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if no proc was specified. If not, return the collection
- elif(rft.IdLevel2OptnCount==0):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=procsLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection ".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if the -a (all) option is set. If not, return the proc specific by -i or -m
- # search collection to find path using getPath2
-@@ -651,14 +651,14 @@ class RfSystemsOperations():
- elif( r is None ):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', collUrl, relPath=path2, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection Member ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection Member ".format(collName), skip1=True, printV12=cmdTop)
-
- # else, return ALL of the processor members
- else:
- rft.printVerbose(4,"getting expanded Processor Collection")
- rc,r,j,d=rft.getAllCollectionMembers(rft, r.url, relPath=procsLink)
- if(rc==0):
-- rft.printVerbose(1," Get ALL {} Collection Members".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," Get ALL {} Collection Members".format(collName), skip1=True, printV12=cmdTop)
-
- return(rc,r,j,d)
-
-@@ -688,13 +688,13 @@ class RfSystemsOperations():
- #loop through the members and create the list sub-operation response
- rc,r,j,d=rft.listCollection(rft, r, d, prop="Name")
- if(rc==0):
-- rft.printVerbose(1," list {} Collection member info: Id, URI, Name".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," list {} Collection member info: Id, URI, Name".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if no NIC was specified. If not, return the collection
- elif(rft.IdLevel2OptnCount==0):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=nicLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection ".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if the -a (all) option is set. If not, return the proc specific by -i or -m
- # search collection to find path using getPath2
-@@ -716,14 +716,14 @@ class RfSystemsOperations():
- elif( r is None ):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', collUrl, relPath=path2, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection Member ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection Member ".format(collName), skip1=True, printV12=cmdTop)
-
- # else, return ALL of the EthernetInterfaces members
- else:
- rft.printVerbose(4,"getting expanded EthernetInterfaces Collection")
- rc,r,j,d=rft.getAllCollectionMembers(rft, r.url, relPath=nicLink)
- if(rc==0):
-- rft.printVerbose(1," Get ALL {} Collection Members".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," Get ALL {} Collection Members".format(collName), skip1=True, printV12=cmdTop)
-
- return(rc,r,j,d)
-
-@@ -753,13 +753,13 @@ class RfSystemsOperations():
- #loop through the members and create the list sub-operation response
- rc,r,j,d=rft.listCollection(rft, r, d, prop="Name" )
- if(rc==0):
-- rft.printVerbose(1," list {} Collection member info: Id, URI, Name".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," list {} Collection member info: Id, URI, Name".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if no SimpleStorage controller was specified. If not, return the collection
- elif(rft.IdLevel2OptnCount==0):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=cntlrLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection ".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if the -a (all) option is set. If not, return the proc specific by -i or -m
- # search collection to find path using getPath2
-@@ -781,14 +781,14 @@ class RfSystemsOperations():
- elif( r is None ):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', collUrl, relPath=path2, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection Member ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection Member ".format(collName), skip1=True, printV12=cmdTop)
-
- # else, return ALL of the SimpleStorage members
- else:
- rft.printVerbose(4,"getting expanded SimpleStorage Collection")
- rc,r,j,d=rft.getAllCollectionMembers(rft, r.url, relPath=cntlrLink)
- if(rc==0):
-- rft.printVerbose(1," Get ALL {} Collection Members".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," Get ALL {} Collection Members".format(collName), skip1=True, printV12=cmdTop)
-
- return(rc,r,j,d)
-
-@@ -818,13 +818,13 @@ class RfSystemsOperations():
- #loop through the members and create the list sub-operation response
- rc,r,j,d=rft.listCollection(rft, r, d, prop="Name")
- if(rc==0):
-- rft.printVerbose(1," list {} Collection member info: Id, URI, Name".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," list {} Collection member info: Id, URI, Name".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if no Log was specified. If not, return the collection
- elif(rft.IdLevel2OptnCount==0):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', r.url, relPath=logLink, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection ".format(collName), skip1=True, printV12=cmdTop)
-
- # else: check if the -a (all) option is set. If not, return the proc specific by -i or -m
- # search collection to find path using getPath2
-@@ -846,7 +846,7 @@ class RfSystemsOperations():
- elif( r is None ):
- rc,r,j,d=rft.rftSendRecvRequest(rft.AUTHENTICATED_API, 'GET', collUrl, relPath=path2, prop=prop)
- if(rc==0):
-- rft.printVerbose(1," {} Collection Member ".format(collName,skip1=True, printV12=cmdTop))
-+ rft.printVerbose(1," {} Collection Member ".format(collName), skip1=True, printV12=cmdTop)
-
- # If '--Entries' specified, get "Entries" nav link and read it
- if rc == 0 and rft.gotEntriesOptn:
-diff --git a/redfishtool/raw.py b/redfishtool/raw.py
-index bfb617c..1b32d0b 100644
---- a/redfishtool/raw.py
-+++ b/redfishtool/raw.py
-@@ -30,7 +30,7 @@ import getopt
- import re
- import sys
- #from .ServiceRoot import RfServiceRoot
--from urllib.parse import urljoin, urlparse, urlunparse
-+from urlparse import urljoin, urlparse, urlunparse
-
- class RfRawMain():
- def __init__(self):
-diff --git a/redfishtool/redfishtoolTransport.py b/redfishtool/redfishtoolTransport.py
-index 017fa11..f157eff 100644
---- a/redfishtool/redfishtoolTransport.py
-+++ b/redfishtool/redfishtoolTransport.py
-@@ -39,7 +39,7 @@ import json
- import sys
- import socket
- import time
--from urllib.parse import urljoin, urlparse, urlunparse
-+from urlparse import urljoin, urlparse, urlunparse
- from requests.auth import HTTPBasicAuth, AuthBase
- from .ServiceRoot import RfServiceRoot
-
-@@ -730,31 +730,32 @@ class RfTransport():
- return(0)
-
-
-- def printVerbose(self,v,*argv, skip1=False, printV12=True,**kwargs):
-+ def printVerbose(self,v, argv, skip1=False, printV12=True):
- if(self.quiet):
- return(0)
- if( (v==1 or v==2) and (printV12 is True) and (self.verbose >= v )):
- if(skip1 is True): print("#")
-- print("#",*argv, **kwargs)
-+ print("#", argv)
- elif( (v==1 or v==2) and (self.verbose >4 )):
- if(skip1 is True): print("#")
-- print("#",*argv, **kwargs)
-+ print("#", argv)
- elif((v==3 ) and (printV12 is True) and (self.verbose >=v)):
- if(skip1 is True): print("#")
-- print("#REQUEST:",*argv,file=sys.stdout,**kwargs)
-+ sys.stdout.write("#REQUEST:",argv)
-+ # print("#REQUEST:",argv,file=sys.stdout)
- elif((v==4 or v==5) and (self.verbose >=v)):
- if(skip1 is True): print("#")
-- print("#DB{}:".format(v),*argv,file=sys.stdout,**kwargs)
-+ sys.stdout.write("#DB{}:".format(v),argv)
-+ # print("#DB{}:".format(v),argv,file=sys.stdout)
- elif( v==0): #print no mater value of verbose, but not if quiet=1
- if(skip1 is True): print("")
-- print(*argv, **kwargs)
-+ print(argv)
- else:
- pass
-
- sys.stdout.flush()
- #if you set v= anything except 0,1,2,3,4,5 it is ignored
-
--
- def printStatus(self, s, r=None, hdrs=None, authMsg=None, addSessionLoginInfo=False):
- if(self.quiet):
- return(0)
-@@ -785,22 +786,20 @@ class RfTransport():
- sys.stdout.flush()
-
-
--
--
-- def printErr(self,*argv,noprog=False,prepend="",**kwargs):
-+ def printErr(self,argv,noprog=False,prepend=""):
- if( self.quiet == False):
- if(noprog is True):
-- print(prepend,*argv, file=sys.stderr, **kwargs)
-+ sys.stderr.write("{}{}".format(prepend,argv))
- else:
-- print(prepend," {}:".format(self.program),*argv, file=sys.stderr, **kwargs)
-+ sys.stderr.write("{} {}:{}".format(prepend, self.program, argv))
- else:
- pass
--
-+
- sys.stderr.flush()
- return(0)
-
-
-- def printStatusErr4xx(self, status_code,*argv,noprog=False, prepend="",**kwargs):
-+ def printStatusErr4xx(self, status_code):
- if(self.quiet):
- return(0)
- if( status_code < 400 ):
-diff --git a/setup.py b/setup.py
-index d37d099..481f429 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,5 +1,6 @@
- from setuptools import setup
- from os import path
-+from io import open
-
- this_directory = path.abspath(path.dirname(__file__))
- with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
---
-2.7.4
-
+++ /dev/null
-
-DESCRIPTION = "HPE 3PAR HTTP REST Client"
-HOMEPAGE = "https://pythonhosted.org/python-3parclient/"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=c6f4d3b3208673edc0228bbc3ad053cc"
-
-SRC_URI[md5sum] = "845e688b5607a71fc307e8371daf5d40"
-SRC_URI[sha256sum] = "fcd1c5c7d9356f4244a6c0b2b6dd6c64366399642c348b02999ea8fbf79e3a8d"
-
-PYPI_PACKAGE = "python-3parclient"
-inherit setuptools pypi
+++ /dev/null
-
-DESCRIPTION = "Microsoft Azure Active Directory Authentication Library (ADAL) for Python"
-HOMEPAGE = "https://github.com/AzureAD/azure-activedirectory-library-for-python"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://setup.py;beginline=2;endline=27;md5=43b81fae9d7baa1f0b1c9774a68ca33a"
-
-
-inherit pypi setuptools
-
-PYPI_PACKAGE = "adal"
-
-SRC_URI[md5sum] = "895791621c696fbbb00dee975260f890"
-SRC_URI[sha256sum] = "4c020807b3f3cfd90f59203077dd5e1f59671833f8c3c5028ec029ed5072f9ce"
-
-RDEPENDS_${PN} += " \
- ${PYTHON_PN}-requests \
- ${PYTHON_PN}-dateutil \
- ${PYTHON_PN}-pyjwt \
- ${PYTHON_PN}-crypt \
- ${PYTHON_PN}-datetime \
- ${PYTHON_PN}-json \
- ${PYTHON_PN}-logging \
- ${PYTHON_PN}-netclient \
- ${PYTHON_PN}-threading \
- ${PYTHON_PN}-xml \
- "
+++ /dev/null
-
-DESCRIPTION = " \
- Alabaster is a visually (c)lean, responsive, configurable theme for the \
- Sphinx documentation system. It is Python 2+3 compatible. \
- "
-HOMEPAGE = "https://alabaster.readthedocs.io/en/latest/"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=da053683d66d543813a727e8a30c96ca"
-
-SRC_URI[md5sum] = "3591827fde96d1dd23970fb05410ed04"
-SRC_URI[sha256sum] = "a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"
-
-PYPI_PACKAGE = "alabaster"
-inherit setuptools pypi
+++ /dev/null
-
-DESCRIPTION = "Low-level AMQP client for Python"
-HOMEPAGE = "https://pypi.python.org/pypi/amqp/"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=9d6ba772ac59c08a25a12ce15bd5f27b"
-
-SRC_URI[md5sum] = "852ecff645c00f124c78915fcc8ea7c0"
-SRC_URI[sha256sum] = "77f1aef9410698d20eaeac5b73a87817365f457a507d82edf292e12cbb83b08d"
-
-PYPI_PACKAGE = "amqp"
-inherit setuptools pypi
-
-RDEPENDS_${PN} += " \
- python-vine \
- "
+++ /dev/null
-
-DESCRIPTION = "Another ISO 8601 parser for Python"
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=bf2bdb115b4d685026985cc189ca5375"
-
-SRCREV = "b5aad0fbef5664e624986a10bd1362e0ac05214c"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "7.0.0+git${SRCPV}"
-
-SRC_URI = "git://bitbucket.org/nielsenb/aniso8601.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "client library for Aodh built on the Aodh API"
-HOMEPAGE = "https://launchpad.net/python-aodhclient"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRCREV = "a8651ec642058a17cd7a6b3648d8250450a73efb"
-SRCNAME = "python-aodhclient"
-BRANCH = "stable/train"
-PROTOCOL = "https"
-PV = "1.3.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools monitor rmargparse
-
-DEPENDS += " \
- python-pip \
- python-pbr-native\
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- python-pbr \
- python-cliff \
- python-oslo.i18n \
- python-oslo.serialization \
- python-oslo.utils \
- python-keystoneauth1 \
- python-six \
- python-osc-lib \
- python-pyparsing \
- python-osprofiler \
- "
-
-
-do_install_append() {
- :
-}
-
-FILES_${PN} += " \
- "
+++ /dev/null
-# A Python "namespace package" http://www.python.org/dev/peps/pep-0382/
-# This always goes inside of a namespace package's __init__.py
-
-from pkgutil import extend_path
-__path__ = extend_path(__path__, __name__)
+++ /dev/null
-
-SUMMARY = "Helper package to avoid backports/__init__.py conflicts"
-DETAIL = "backports packages in python2 suffer from a flaw in the namespace \
-implementation and can conflict with each other. For OE purposes, at least \
-fix the conflicting install of .../site-packages/backports/__init__.py"
-AUTHOR = "Tim Orling <ticotimo@gmail.com>"
-SECTION = "devel/python"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-SRC_URI = "file://backports/__init__.py"
-
-inherit python-dir
-
-# provide to avoid warnings
-do_compile() {
- :
-}
-
-do_install() {
- install -d ${D}${PYTHON_SITEPACKAGES_DIR}/backports
- install ${WORKDIR}/backports/__init__.py ${D}${PYTHON_SITEPACKAGES_DIR}/backports/
-}
-
-FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/backports/__init__.py"
+++ /dev/null
-
-DESCRIPTION = "Barbican is a ReST API designed for the secure storage, provisioning and management of secrets."
-HOMEPAGE = "https://wiki.openstack.org/wiki/Barbican"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fc8be9e7dffe97390d1216b01fd0be01"
-
-PR = "r0"
-SRCNAME = "barbican"
-BARBICAN_MAX_PACKET_SIZE ?= "65535"
-
-SRC_URI = " \
- git://github.com/openstack/barbican.git;branch=${BRANCH} \
- file://${BPN}/barbican-fix-path-to-find-configuration-files.patch \
- file://${BPN}/openstack-barbican-api.service \
- file://${BPN}/openstack-barbican-worker.service \
- file://${BPN}/openstack-barbican-keystone-listener.service \
- file://${BPN}/gunicorn-config.py \
- "
-
-SRCREV = "4c0ddda941289fba8e5ec4341b5d02d155d46162"
-BRANCH = "stable/stein"
-PV = "8.0.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-inherit update-rc.d setuptools identity hosts useradd default_configs monitor systemd
-
-SYSTEMD_SERVICE_${SRCNAME} = " \
- openstack-barbican-api.service \
- openstack-barbican-worker.service \
- openstack-barbican-keystone-listener.service \
- "
-
-SYSTEMD_AUTO_ENABLE_${SRCNAME} = "disable"
-
-SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
-KEYSTONE_HOST="${CONTROLLER_IP}"
-
-# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set.
-# If the flag for a parameter in the list is not set here, the default value will be given to that parameter.
-# Parameters not in the list will be set to empty.
-
-USERCREATE_PARAM_${SRCNAME}-setup = "name pass tenant role email"
-SERVICECREATE_PARAM_${SRCNAME}-setup = "name type description region publicurl adminurl internalurl"
-python () {
- flags = {'type':'keystore',\
- 'description':'Barbican Key Management Service',\
- 'publicurl':"'http://${KEYSTONE_HOST}:9311/v1'",\
- 'adminurl':"'http://${KEYSTONE_HOST}:9312/v1'",\
- 'internalurl':"'http://${KEYSTONE_HOST}:9313/v1'"}
- d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
-}
-SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST"
-
-do_install_append() {
- TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
- BARBICAN_CONF_DIR=${D}${sysconfdir}/${SRCNAME}
-
- install -d ${BARBICAN_CONF_DIR}
- cp -r ${TEMPLATE_CONF_DIR}/* ${BARBICAN_CONF_DIR}
-
- install -d ${D}${localstatedir}/lib/barbican
-
- # Install the systemd service files
- install -d ${D}${systemd_system_unitdir}/
- install -m 644 ${WORKDIR}/${BPN}/*.service ${D}${systemd_system_unitdir}
-
- # python-gunicorn and gunicorn-config.py are required by openstack-barbican-api.service
- install -m 644 ${WORKDIR}/${PN}/gunicorn-config.py ${BARBICAN_CONF_DIR}
-
- # Modify barbican-api-paste.ini for gunicorn
- echo '[server:main]' >> ${BARBICAN_CONF_DIR}/barbican-api-paste.ini
- echo 'use = egg:gunicorn#main' >> ${BARBICAN_CONF_DIR}/barbican-api-paste.ini
-
- sed -e "s:%BARBICAN_CONF_DIR%:${sysconfdir}/${SRCNAME}:g" \
- -i ${D}/${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/tests/api/test_resources_policy.py
-
- install -m 0755 -d ${D}/${sysconfdir}/tmpfiles.d
- echo "d ${localstatedir}/log/barbican 0750 barbican barbican -" >> ${D}/${sysconfdir}/tmpfiles.d/barbican.conf
-}
-
-USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system barbican"
-USERADD_PARAM_${PN} = "--system --home /var/lib/barbican -g barbican \
- --no-create-home --shell /bin/false barbican"
-
-PACKAGES += "${SRCNAME} \
- ${SRCNAME}-setup "
-
-FILES_${PN} = "${libdir}/* \
-"
-FILES_${SRCNAME} = "${sysconfdir}/${SRCNAME}/* \
- ${sysconfdir}/init.d/barbican-api \
- ${bindir} \
- ${bindir}/* \
- ${localstatedir}/* \
- ${systemd_system_unitdir} \
-"
-
-ALLOW_EMPTY_${SRCNAME}-setup = "1"
-pkg_postinst_${SRCNAME}-setup () {
- if [ -z "$D" ]; then
- chown -R barbican:barbican ${sysconfdir}/${SRCNAME}
- chown -R barbican:barbican ${localstatedir}/lib/barbican
- fi
-}
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
- "
-
-RDEPENDS_${SRCNAME} = "${PN} \
- ${SRCNAME}-setup \
- uwsgi \
- python-falcon \
- python-oslo.messaging"
-
-RDEPENDS_${PN} += " \
- python-pip \
- python-pbr \
- python-alembic \
- python-babel \
- python-eventlet \
- python-falcon \
- python-iso8601 \
- python-jsonschema \
- python-kombu \
- python-netaddr \
- python-pastedeploy \
- python-paste \
- python-pycrypto \
- python-keystoneclient \
- python-sqlalchemy \
- python-stevedore \
- python-webob \
- python-wsgiref \
- python-barbicanclient \
- python-gunicorn \
- python-castellan \
- python-ldap3 \
- "
-
-INITSCRIPT_PACKAGES = "${SRCNAME}"
-INITSCRIPT_NAME_${SRCNAME} = "barbican-api"
-INITSCRIPT_PARAMS_${SRCNAME} = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-
-MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
-MONITOR_SERVICE_${SRCNAME} = "barbican"
-
-
-FILES_${PN}_append = " \
- ${datadir}/ \
- ${sysconfdir}/tmpfiles.d/barbican.conf \
- "
+++ /dev/null
-PV = "4.9.0+git${SRCPV}"
-SRCREV = "9c0e02d367b86eb5bdebda4e0ff1434d70db5f61"
-
-SRC_URI = " \
- git://github.com/openstack/python-barbicanclient.git;branch=stable/train \
- "
+++ /dev/null
-
-DESCRIPTION = "Beaker is a web session and general caching library that includes WSGI middleware for use in web applications."
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5297e0e46f5be6c86a87e35afe958cc7"
-
-SRCREV = "4a2cb747c16dc58af39b1ae56e1cf14dfeb9c9a7"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "1.10.1+git${SRCPV}"
-
-SRC_URI = "git://github.com/bbangert/beaker;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "Generic Key Manager interface for OpenStack"
-HOMEPAGE = "https://github.com/openstack/castellan"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRCREV = "8e2929b8779eaa03f15a25da5cf64ef8539a026b"
-SRCNAME = "castellan"
-PROTOCOL = "https"
-BRANCH = "stable/stein"
-S = "${WORKDIR}/git"
-PV = "0.17.0+git${SRCPV}"
-
-SRC_URI = "git://opendev.org/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- python-pbr \
- python-babel \
- python-cryptography \
- python-barbicanclient \
- python-oslo.config \
- python-oslo.context \
- python-oslo.i18n \
- python-oslo.log \
- python-oslo.utils \
- python-keystoneauth1 \
- "
+++ /dev/null
-SUMMARY = " CherryPy is a pythonic, object-oriented HTTP framework"
-DESCRIPTION = "\
-It allows building web applications in much the same way one would build any \
-other object-oriented program. This design results in less and more readable \
-code being developed faster. It's all just properties and methods. \
-It is now more than ten years old and has proven fast and very stable. \
-It is being used in production by many sites, from the simplest to the most \
-demanding. \
-"
-
-HOMEPAGE = "https://www.cherrypy.org/"
-AUTHOR = "CherryPy Team"
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://cherrypy/LICENSE.txt;md5=c187ff3653a0878075713adef2c545c3"
-
-SRC_URI = "https://pypi.python.org/packages/source/C/CherryPy/CherryPy-${PV}.tar.gz"
-SRC_URI[md5sum] = "c1b1e9577f65f9bb88bfd1b15b93b911"
-SRC_URI[sha256sum] = "dc5a88562795c2ee462dac5b37aba1cf4f34f3e27281ec11049227039308b691"
-
-S = "${WORKDIR}/CherryPy-${PV}"
-
-inherit setuptools
-
-FILES_${PN} += "\
- ${datadir}/cherrypy \
-"
+++ /dev/null
-#! /bin/bash
-
-CMD="cinder list"
-
-data=$($CMD 2>&1)
-res=$?
-if [ ${res} -eq 127 ]; then
- exit 0
-elif [ ${res} -ne 0 ]; then
- echo "OpenStack \"cinder api\" failed: "
- echo $data
- exit $res
-fi
-exit 0
+++ /dev/null
-
-DESCRIPTION = "Client for the OpenStack Cinder API"
-HOMEPAGE = "https://opendev.org/openstack/python-cinderclient"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3572962e13e5e739b30b0864365e0795"
-
-SRCREV = "a63d4d651ae2f7614224f716b3ef8ebf392a6b78"
-SRCNAME = "python-cinderclient"
-BRANCH = "stable/train"
-PROTOCOL = "https"
-PV = "5.0.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools
-
-DEPENDS += " \
- python-pip \
- python-pbr-native\
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- bash \
- python-pbr \
- python-prettytable \
- python-keystoneauth1 \
- python-oslo.i18n \
- python-oslo.utils \
- python-six \
- python-osc-lib \
- python-babel \
- python-requests \
- python-simplejson \
- "
-
-
-do_install_append() {
- install -d -m 755 ${D}/${sysconfdir}/bash_completion.d
- install -p -D -m 664 tools/cinder.bash_completion ${D}/${sysconfdir}/bash_completion.d/cinder.bash_completion
-
-}
+++ /dev/null
-
-DESCRIPTION = "Command Line Interface Formulation Framework"
-HOMEPAGE = "https://github.com/dreamhost/cliff"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI[md5sum] = "4c5d43d98970c79b091e25676cce2b10"
-SRC_URI[sha256sum] = "b47387a344898ccb28ca7f386f017ade9eb66dc1713e5c642a0bc09ec606cc67"
-
-inherit setuptools pypi
-
-DEPENDS += "\
- python-pbr \
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += "python-prettytable \
- python-cmd2 \
- python-pbr \
- python-pyparsing \
- python-prettytable \
- python-six \
- python-stevedore \
- python-unicodecsv \
- python-pyyaml \
-"
-
-CLEANBROKEN = "1"
+++ /dev/null
-
-DESCRIPTION = "ConfigObj is a simple but powerful config file reader and writer: an ini file round tripper. Its main feature is that it is very easy to use, with a straightforward programmer’s interface and a simple syntax for config files."
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=9a851af36881461de16b8fecf59a9e17"
-
-SRCREV = "45fbf1b85b181853caea4d251e6d4c0232735e85"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "5.0.6+git${SRCPV}"
-
-SRC_URI = "git://github.com/DiffSK/configobj;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = " \
-ConfigShell is a Python library that provides a framework for building simple but nice CLI-based applications running both as single-command tools and interactive shells providing a UNIX filesystem-like navigation interface, as well as full autocompletion support and interactive inline help. It is part of LIO. \
- "
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRCREV = "020d540850ca36f31af68e9b545a520f1122ea69"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "1.6+git${SRCPV}"
-
-SRC_URI = "git://github.com/Datera/configshell.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python python-pyparsing-native"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "Construct is a powerful declarative and symmetrical parser and builder for binary data"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3fd0f2c25089e629957285e6bc402a20"
-
-SRCREV = "a6a45f09da003b278cc5955486ad17d9144c136b"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "v2.9.46+git${SRCPV}"
-
-SRC_URI = "git://github.com/construct/construct.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python python-pbr-native"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "d2to1 (the ‘d’ is for ‘distutils’) allows using distutils2-like setup.cfg files for a package’s metadata with a distribute/setuptools setup.py script. It works by providing a distutils2-formatted setup.cfg file containing all of a package’s metadata, and a very minimal setup.py which will slurp its arguments from the setup.cfg."
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ec5c9882880dafb7f5a0b8d2642ea581"
-
-SRCREV = "d16d8fdcec77a6d3fcbd10ce23aa8810d8dd3bf2"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "0.2.12.post1+git${SRCREV}"
-
-SRC_URI = "git://github.com/embray/d2to1;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-SUMMARY = "Extensions to the standard Python datetime module"
-DESCRIPTION = "The dateutil module provides powerful extensions to the datetime module available in the Python standard library."
-HOMEPAGE = "https://dateutil.readthedocs.org"
-LICENSE = "BSD-3-Clause & Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3155c7bdc71f66e02678411d2abf996"
-
-SRC_URI[md5sum] = "f2a1d4b680b297b367a974664ca3a4f6"
-SRC_URI[sha256sum] = "73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"
-
-PYPI_PACKAGE = "python-dateutil"
-inherit pypi
-
-PACKAGES =+ "${PN}-zoneinfo"
-FILES_${PN}-zoneinfo = "${libdir}/${PYTHON_DIR}/site-packages/dateutil/zoneinfo"
-
-DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
-
-RDEPENDS_${PN}_class-target = "\
- ${PYTHON_PN}-datetime \
- ${PYTHON_PN}-numbers \
- ${PYTHON_PN}-six \
- ${PYTHON_PN}-stringold \
-"
+++ /dev/null
-
-inherit setuptools
-require python-dateutil.inc
+++ /dev/null
-
-SUMMARY = "defusedxml -- defusing XML bombs and other exploits"
-HOMEPAGE = "https://github.com/tiran/defusedxml"
-
-LICENSE = "Python-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=056fea6a4b395a24d0d278bf5c80249e"
-#a5c8025e305fb49e6d405769358851f6
-
-SRC_URI[md5sum] = "a59741f675c4cba649de40a99f732897"
-SRC_URI[sha256sum] = "f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5"
-
-inherit pypi setuptools
+++ /dev/null
-
-DESCRIPTION = "Tools for using Babel with Django"
-HOMEPAGE = "https://github.com/python-babel/django-babel"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5ae97ab65116b8d7890c59de57577b46"
-
-SRCREV = "1da5c0ba7ef3b12810154d9e64b3e847ecbb06cc"
-SRCNAME = "django-babel"
-BRANCH = "master"
-PROTOCOL = "https"
-PV = "0.6.2+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/python-babel/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools
-
-DEPENDS += " python-pip"
-
-RDEPENDS_${PN}_append = " \
- python-django \
- python-babel \
- "
-
+++ /dev/null
-
-DESCRIPTION = "Simple database sharding (horizontal partitioning) library for Django applications."
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=04c6b8f6ee56b21d30ecb172b066902c"
-
-
-SRCREV = "b425bb719ea5de583fae7db5b7419e5fed569cb0"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "1.5.2+git${SRCPV}"
-
-SRC_URI = "git://github.com/lpomfrey/django-debreach.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "Simple database sharding (horizontal partitioning) library for Django applications."
-HOMEPAGE = "http://horizon.openstack.org/"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-inherit setuptools
-
-SRC_URI[md5sum] = "21c32ba58806b351ede4eca6804e6d3e"
-SRC_URI[sha256sum] = "25cf663f8f9a0233edbd5ba322acc28805fca684df28290c3e62a79abf6724e9"
-
-S = "${WORKDIR}/horizon-${PV}"
-
-SRC_URI = "https://tarballs.openstack.org/horizon/horizon-${PV}.tar.gz"
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
- "
-
-
-RDEPENDS_${PN} = " \
- python-pbr \
- python-babel \
- python-django \
- python-django \
- python-django-babel \
- python-django-compressor \
- python-django-debreach \
- python-django-pyscss \
- python-futurist \
- python-iso8601 \
- python-keystoneauth1 \
- python-netaddr \
- python-oslo.concurrency \
- python-oslo.config \
- python-oslo.i18n \
- python-oslo.policy \
- python-oslo.serialization \
- python-oslo.upgradecheck \
- python-oslo.utils \
- python-osprofiler \
- python-pint \
- python-pymongo \
- python-pyscss \
- python-cinderclient \
- python-glanceclient \
- python-keystoneclient \
- python-neutronclient \
- python-novaclient \
- python-swiftclient \
- python-pytz \
- python-pyyaml \
- python-requests \
- python-semantic-version \
- python-six \
- python-xstatic \
- python-xstatic-angular \
- python-xstatic-angular-bootstrap \
- python-xstatic-angular-fileupload \
- python-xstatic-angular-gettext \
- python-xstatic-angular-lrdragndrop \
- python-xstatic-angular-schema-form \
- python-xstatic-bootstrap-datepicker \
- python-xstatic-bootstrap-scss \
- python-xstatic-bootswatch \
- python-xstatic-d3 \
- python-xstatic-hogan \
- python-xstatic-font-awesome \
- python-xstatic-jasmine \
- python-xstatic-jquery \
- python-xstatic-jquery-migrate \
- python-xstatic-jquery.quicksearch \
- python-xstatic-jquery.tablesorter \
- python-xstatic-jquery-ui \
- python-xstatic-jsencrypt \
- python-xstatic-mdi \
- python-xstatic-objectpath \
- python-xstatic-mdi \
- python-xstatic-objectpath \
- python-xstatic-rickshaw \
- python-xstatic-roboto-fontface \
- python-xstatic-smart-table \
- python-xstatic-spin \
- python-xstatic-term.js \
- python-xstatic-tv4 \
- "
+++ /dev/null
-
-DEPENDS += "\
- python-pbr-native \
- "
+++ /dev/null
-
-DESCRIPTION = "client library for Aodh built on the Aodh API"
-HOMEPAGE = "https://launchpad.net/python-aodhclient"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause & Python-2.0"
-LIC_FILES_CHKSUM = " \
- file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa\
- file://LICENSE.python;md5=6b60258130e4ed10d3101517eb5b9385 \
- "
-
-SRCREV = "1c9cb948d7b0c264d244763b6682ab790a6b90a0"
-SRCNAME = "django"
-BRANCH = "stable/1.11.x"
-PROTOCOL = "https"
-PV = "1.11.20+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/django/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools
-
-FILES_${PN} += "${datadir}/django/"
+++ /dev/null
-
-do_install_append() {
- install -d ${D}/${sysconfdir}/bash_completion.d
- install -m 755 ${S}/extras/django_bash_completion ${D}/${sysconfdir}/bash_completion.d
-}
-
-PACKAGES =+ "${PN}-bash-completion"
-
-FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
+++ /dev/null
-
-DESCRIPTION = "A Python library for the Docker Engine API"
-HOMEPAGE = "https://pypi.org/project/docker/3.3.0"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=34f3846f940453127309b920eeb89660"
-
-SRC_URI[md5sum] = "660c3c0c3776cb88f34fc549d7c89ed2"
-SRC_URI[sha256sum] = "dc5cc0971a0d36fe94c5ce89bd4adb6c892713500af7b0818708229c3199911a"
-
-inherit setuptools pypi
-
-RDEPENDS_${PN}_append = " \
- python-docker-pycreds \
- python-backports-ssl \
- "
+++ /dev/null
-
-DESCRIPTION = "Python bindings for the ethtool kernel interface"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-
-SRCREV = "b8b09b69ef6d4f8a6f12a6c441305790060dd829"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "0.14+git${SRCPV}"
-
-SRC_URI = "git://github.com/fedora-python/python-ethtool.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " libnl python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-DESCRIPTION = "Highly concurrent networking library"
-HOMEPAGE = "http://pypi.python.org/pypi/eventlet"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=56472ad6de4caf50e05332a34b66e778"
-
-SRC_URI[md5sum] = "8d1c646d8cc10a4958c92fe8a30f3676"
-SRC_URI[sha256sum] = "74ef11d67ee5e85e009b0fced733c907620bca1ab8e6b0489d9f247405ab2685"
-
-inherit setuptools pypi
-
-RDEPENDS_${PN} += " \
- python-enum34 \
- python-enum-compat \
- python-greenlet \
- "
+++ /dev/null
-
-DESCRIPTION = "Temporarily allow access to your current IP address into security groups, and automatically closes the hole when quitting. Convenient for SSH-ing into a box from a home or from any off-site location without worrying about leaving SSH open to the world or dealing with VPN."
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7f1e0f09645893c55fb92d53ccea0a57"
-
-SRCREV = "59b63088b8b791cc495d809240f94fddaa87dc55"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "0.2.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/mattrobenolt/firewall;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "Useful additions to futures, from the future"
-HOMEPAGE = "https://pypi.python.org/pypi/futurist"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRC_URI[md5sum] = "3e5a4b8254ded1624ec807cb7ae04ba5"
-SRC_URI[sha256sum] = "499ee57728a987028725f836ac22aa18899702162fa0a0f1bbe2ecd5c8daf1eb"
-
-inherit setuptools pypi
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- python-pbr \
- python-six \
- python-monotonic \
- python-futures \
- python-contextlib2 \
- python-prettytable \
- "
-
+++ /dev/null
-
-DESCRIPTION = "Client library for Glance built on the OpenStack Images API."
-HOMEPAGE = "https://opendev.org/openstack/python-glanceclient"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-
-SRCREV = "40c19aa44361e13ac997d325d357d3e4748fa063"
-SRCNAME = "python-glanceclient"
-BRANCH = "stable/train"
-PROTOCOL = "https"
-PV = "2.17.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools monitor rmargparse
-
-DEPENDS += " \
- python-pip \
- python-pbr-native\
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- bash \
- python-pbr \
- python-prettytable \
- python-keystoneauth1 \
- python-warlock \
- python-six \
- python-oslo.utils \
- python-oslo.i18n \
- python-wrapt \
- python-pyopenssl \
- "
-
-
-do_install_append() {
- install -d -m 755 ${D}/${sysconfdir}/bash_completion.d
- install -p -D -m 664 tools/glance.bash_completion ${D}/${sysconfdir}/bash_completion.d/glance
-}
+++ /dev/null
-
-DESCRIPTION = "python-gnocchiclient"
-STABLE = "master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "64814b9ace54e0151e9c28f4e57b87dafc984241"
-S = "${WORKDIR}/git"
-PV = "7.0.4"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRC_URI = "git://github.com/gnocchixyz/python-gnocchiclient.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-DEPENDS += " \
- python \
- python-pbr-native \
- "
-
-RDEPENDS_${PN}_append = " python-ujson"
-
-inherit setuptools
+++ /dev/null
-
-DESCRIPTION = "This library simplifies using Google’s various server-to-server authentication mechanisms to access Google APIs."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-SRCREV = "1322d896ba725b8d73fd7ac4793601d9f574a839"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "1.6.3+git${SRCPV}"
-
-SRC_URI = "git://github.com/googleapis/google-auth-library-python.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-DESCRIPTION = "Gunicorn 'Green Unicorn' is a Python WSGI HTTP Server for UNIX. \
-It's a pre-fork worker model ported from Ruby's Unicorn project. \
-The Gunicorn server is broadly compatible with various web frameworks, \
-simply implemented, light on server resource usage, and fairly speedy."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=03ccc2b0215ca2a4b1e5f3c5483807f9"
-
-
-SRCREV = "328e509260ae70de6c04c5ba885ee17960b3ced5"
-PROTOCOL = "https"
-BRANCH = "19.x"
-S = "${WORKDIR}/git"
-PV = "19.7.1+git${SRCPV}"
-
-SRC_URI = "git://github.com/benoitc/gunicorn.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-PV = "1.18.0+git${SRCPV}"
-SRCREV = "eca16376563c2b0249d5b2aba1f6283a5aebbe98"
-
-SRC_URI = " \
- git://github.com/openstack/python-heatclient.git;branch=stable/train \
- "
+++ /dev/null
-
-DEPENDS += "\
- python-pbr-native \
- "
+++ /dev/null
-
-DESCRIPTION = " \
- This module analyzes JPEG/JPEG 2000/PNG/GIF/TIFF/SVG image headers and returns image size. \
- "
-HOMEPAGE = "https://github.com/shibukawa/imagesize_py"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=0c128f0f7e8a02e1b83884c0b5a41cda"
-
-SRC_URI[md5sum] = "3a1e124594183778a8f87e4bcdb6dca9"
-SRC_URI[sha256sum] = "b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"
-
-PYPI_PACKAGE = "imagesize"
-inherit setuptools pypi
+++ /dev/null
-
-SUMMARY = "Read metadata from Python packages"
-DESCRIPTION = "Read metadata from Python packages"
-HOMEPAGE = "https://pypi.org/project/importlib-metadata/"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e88ae122f3925d8bde8319060f2ddb8e"
-
-SRC_URI[md5sum] = "80d677d744995336c9c22d21a85ddeb8"
-SRC_URI[sha256sum] = "aa18d7378b00b40847790e7c27e11673d7fed219354109d0e7b9e5b25dc3ad26"
-
-DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
-
-PYPI_PACKAGE = "importlib_metadata"
-
-inherit pypi setuptools
-
-S = "${WORKDIR}/importlib_metadata-${PV}"
-
-RDEPENDS_${PN} += "\
- ${PYTHON_PN}-zipp \
- ${PYTHON_PN}-pathlib2 \
- python-compression \
- python-configparser \
- python-contextlib2 \
- python-pathlib2 \
-"
-
-BBCLASSEXTEND = "native nativesdk"
+++ /dev/null
-
-SUMMARY = "InfluxDB is an open-source distributed time series database, find more about InfluxDB at https://docs.influxdata.com/influxdb/latest"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=046523829184aac3703a4c60c0ae2104"
-
-SRCREV = "dc83fc6576b6463dcc77a0c101475a2a71ed655a"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "5.2.2+git${SRCPV}"
-
-SRC_URI = "git://github.com/influxdata/influxdb-python.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "Iniparse is a INI parser for Python"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=52f28065af11d69382693b45b5a8eb54"
-
-SRCREV = "0305d08121461776222e515ae21a8405ee68eef4"
-PROTOCOL = "https"
-BRANCH = "main"
-S = "${WORKDIR}/git"
-PV = "0.4+git${SRCPV}"
-
-SRC_URI = "git://github.com/candlepin/python-iniparse.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-
-inherit setuptools distutils
+++ /dev/null
-
-DESCRIPTION = "python-ironicclient"
-SECTION = "devel/python"
-
-SRCREV = "04ef2d7b04caad162e299c52542b2cb581552ea3"
-SRCNAME = "python-ironicclient"
-PROTOCOL = "https"
-BRANCH = "stable/train"
-PV = "3.1.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-DEPENDS += " \
- python \
- python-pbr-native \
- "
-
-inherit setuptools
-
-RDEPENDS_${PN}_append = " \
- bash \
- python-dogpile.cache \
- python-oslo.config \
- "
+++ /dev/null
-
-DESCRIPTION = "JMESPath (pronounced “james path”) allows you to declaratively specify how to extract elements from a JSON document."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2683790f5fabb41a3f75b70558799eb4"
-
-PV = "0.9.4"
-
-SRCREV = "4a4f6dbd98549b2b8fc71bbc19860d317a6abfdb"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/jmespath/jmespath.py;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "An implementation of the JOSE Working Group documents: RFC 7515 - JSON Web Signature (JWS) RFC 7516 - JSON Web Encryption (JWE) RFC 7517 - JSON Web Key (JWK) RFC 7518 - JSON Web Algorithms (JWA) RFC 7519 - JSON Web Token (JWT) RFC 7520 - Examples of Protecting Content Using JSON Object Signing and Encryption (JOSE)"
-
-LICENSE = "LGPL-3.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02"
-
-SRCREV = "437ea86caef224cf769e30cafe30f1c0b4e0f3e2"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "0.6.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/latchset/jwcrypto.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools distutils
+++ /dev/null
-
-DESCRIPTION = "A messaging framework built on the QPID Proton engine. It provides a callback-based API for message passing. See the User Guide in the docs directory for more detail."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=54830c88a42666c6835a0f834f93a521"
-
-SRCREV = "39f0ee6fd6d71ee335b1229b91ab0bb47bdd71f0"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "0.6.1+git${SRCPV}"
-
-SRC_URI = "git://github.com/GehirnInc/python-jwt;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "Authentication service for OpenStack"
-HOMEPAGE = "http://www.openstack.org"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRCREV = "dc9e9e32dfbf9fd9c58f9f8e2b35f0bcfd62328e"
-SRCNAME = "keystone"
-PROTOCOL = "https"
-BRANCH = "stable/train"
-S = "${WORKDIR}/git"
-PV = "16.0.0+git${SRCPV}"
-
-SRC_URI = " \
- git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};branch=${BRANCH} \
- file://${BPN}/keystone.conf \
- file://${BPN}/identity.sh \
- file://${BPN}/convert_keystone_backend.py \
- file://${BPN}/wsgi-keystone.conf \
- file://${BPN}/admin-openrc \
- file://${BPN}/keystone-init.service \
- "
-inherit setuptools identity hosts default_configs monitor useradd systemd
-
-inherit stx-metadata
-
-STX_REPO = "upstream"
-STX_SUBPATH = "openstack/python-keystone/centos"
-
-SRC_URI_STX = " \
- file://patches/0001-Rebasing-Keyring-integration.patch \
- "
-
-SERVICE_TOKEN = "password"
-TOKEN_FORMAT ?= "PKI"
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--system -m -s /bin/false keystone"
-
-LDAP_DN ?= "dc=my-domain,dc=com"
-
-SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
-KEYSTONE_HOST="${CONTROLLER_IP}"
-
-# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be
-# set. If the flag for a parameter in the list is not set here, the default
-# value will be given to that parameter. Parameters not in the list will be set
-# to empty.
-
-USERCREATE_PARAM_${SRCNAME}-setup = "name pass tenant role email"
-python () {
- flags = {'name':'${ADMIN_USER}',\
- 'pass':'${ADMIN_PASSWORD}',\
- 'tenant':'${ADMIN_TENANT}',\
- 'role':'${ADMIN_ROLE}',\
- 'email':'${ADMIN_USER_EMAIL}',\
- }
- d.setVarFlags("USERCREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
-}
-
-SERVICECREATE_PARAM_${SRCNAME}-setup = "name type description region publicurl adminurl internalurl"
-python () {
- flags = {'type':'identity',\
- 'description':'OpenStack Identity',\
- 'publicurl':"'http://${KEYSTONE_HOST}:8081/keystone/main/v2.0'",\
- 'adminurl':"'http://${KEYSTONE_HOST}:8081/keystone/admin/v2.0'",\
- 'internalurl':"'http://${KEYSTONE_HOST}:8081/keystone/main/v2.0'"}
- d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
-}
-
-do_install_append() {
-
- KEYSTONE_CONF_DIR=${D}${sysconfdir}/keystone
- KEYSTONE_DATA_DIR=${D}${datadir}/keystone
- KEYSTONE_PACKAGE_DIR=${D}${PYTHON_SITEPACKAGES_DIR}/keystone
- APACHE_CONF_DIR=${D}${sysconfdir}/apache2/conf.d/
-
-
- # Create directories
- install -m 755 -d ${KEYSTONE_CONF_DIR}
- install -m 755 -d ${APACHE_CONF_DIR}
- install -d ${D}${localstatedir}/log/${SRCNAME}
-
- # Setup the systemd service file
- install -d ${D}${systemd_system_unitdir}/
- install -m 644 ${WORKDIR}/${BPN}/keystone-init.service ${D}${systemd_system_unitdir}/keystone-init.service
-
- mv ${D}/${datadir}/etc/keystone/sso_callback_template.html ${KEYSTONE_CONF_DIR}/
- rm -rf ${D}/${datadir}
-
- # Setup the admin-openrc file
- KS_OPENRC_FILE=${KEYSTONE_CONF_DIR}/admin-openrc
- install -m 600 ${WORKDIR}/${BPN}/admin-openrc ${KS_OPENRC_FILE}
- sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${KS_OPENRC_FILE}
- sed -e "s:%ADMIN_USER%:${ADMIN_USER}:g" -i ${KS_OPENRC_FILE}
- sed -e "s:%ADMIN_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${KS_OPENRC_FILE}
-
- # Install various configuration files. We have to select suitable
- # permissions as packages such as Apache require read access.
- #
- # Apache needs to read the keystone.conf
- install -m 644 ${WORKDIR}/${BPN}/keystone.conf ${KEYSTONE_CONF_DIR}/
- # Apache needs to read the wsgi-keystone.conf
- install -m 644 ${WORKDIR}/${BPN}/wsgi-keystone.conf ${APACHE_CONF_DIR}/keystone.conf
- install -m 600 ${S}${sysconfdir}/logging.conf.sample ${KEYSTONE_CONF_DIR}/logging.conf
-
- # Copy examples from upstream
- cp -r ${S}/examples ${KEYSTONE_PACKAGE_DIR}
-
- # Edit the configuration to allow it to work out of the box
- KEYSTONE_CONF_FILE=${KEYSTONE_CONF_DIR}/keystone.conf
- sed "/# admin_endpoint = .*/a \
- public_endpoint = http://%CONTROLLER_IP%:5000/ " \
- -i ${KEYSTONE_CONF_FILE}
-
- sed "/# admin_endpoint = .*/a \
- admin_endpoint = http://%CONTROLLER_IP%:35357/ " \
- -i ${KEYSTONE_CONF_FILE}
-
- sed -e "s:%SERVICE_TOKEN%:${SERVICE_TOKEN}:g" -i ${KEYSTONE_CONF_FILE}
- sed -e "s:%DB_USER%:${DB_USER}:g" -i ${KEYSTONE_CONF_FILE}
- sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${KEYSTONE_CONF_FILE}
- sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${KEYSTONE_CONF_FILE}
- sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${KEYSTONE_CONF_FILE}
- sed -e "s:%TOKEN_FORMAT%:${TOKEN_FORMAT}:g" -i ${KEYSTONE_CONF_FILE}
-
- install -d ${KEYSTONE_PACKAGE_DIR}/tests/tmp
- if [ -e "${KEYSTONE_PACKAGE_DIR}/tests/test_overrides.conf" ];then
- sed -e "s:%KEYSTONE_PACKAGE_DIR%:${PYTHON_SITEPACKAGES_DIR}/keystone:g" \
- -i ${KEYSTONE_PACKAGE_DIR}/tests/test_overrides.conf
- fi
-
- if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)};
- then
- sed -i -e '/^\[identity\]/a \
-driver = keystone.identity.backends.hybrid_identity.Identity \
-\
-[assignment]\
-driver = keystone.assignment.backends.hybrid_assignment.Assignment\
-' ${D}${sysconfdir}/keystone/keystone.conf
-
- sed -i -e '/^\[ldap\]/a \
-url = ldap://localhost \
-user = cn=Manager,${LDAP_DN} \
-password = secret \
-suffix = ${LDAP_DN} \
-use_dumb_member = True \
-\
-user_tree_dn = ou=Users,${LDAP_DN} \
-user_attribute_ignore = enabled,email,tenants,default_project_id \
-user_id_attribute = uid \
-user_name_attribute = uid \
-user_mail_attribute = email \
-user_pass_attribute = keystonePassword \
-\
-tenant_tree_dn = ou=Groups,${LDAP_DN} \
-tenant_desc_attribute = description \
-tenant_domain_id_attribute = businessCategory \
-tenant_attribute_ignore = enabled \
-tenant_objectclass = groupOfNames \
-tenant_id_attribute = cn \
-tenant_member_attribute = member \
-tenant_name_attribute = ou \
-\
-role_attribute_ignore = enabled \
-role_objectclass = groupOfNames \
-role_member_attribute = member \
-role_id_attribute = cn \
-role_name_attribute = ou \
-role_tree_dn = ou=Roles,${LDAP_DN} \
-' ${KEYSTONE_CONF_FILE}
-
- install -m 0755 ${WORKDIR}/${BPN}/convert_keystone_backend.py \
- ${D}${sysconfdir}/keystone/convert_keystone_backend.py
- fi
-
-
- install -m 755 ${STX_METADATA_PATH}/files/keystone-fernet-keys-rotate-active ${D}/${bindir}/keystone-fernet-keys-rotate-active
- install -m 440 ${STX_METADATA_PATH}/files/password-rules.conf ${KEYSTONE_CONF_DIR}/password-rules.conf
- install -m 755 -d ${KEYSTONE_DATA_DIR}
- install -m 755 ${STX_METADATA_PATH}/files/public.py ${KEYSTONE_DATA_DIR}/public.py
- install -m 644 ${STX_METADATA_PATH}/files/openstack-keystone.service ${D}${systemd_system_unitdir}/openstack-keystone.service
- install -m 755 ${STX_METADATA_PATH}/files/keystone-all ${D}${bindir}/keystone-all
-
-}
-
-# By default tokens are expired after 1 day so by default we can set
-# this token flush cronjob to run every 2 days
-KEYSTONE_TOKEN_FLUSH_TIME ??= "0 0 */2 * *"
-
-pkg_postinst_${SRCNAME}-cronjobs () {
- if [ -z "$D" ]; then
- # By default keystone expired tokens are not automatic removed out of the
- # database. So we create a cronjob for cleaning these expired tokens.
- echo "${KEYSTONE_TOKEN_FLUSH_TIME} root /usr/bin/keystone-manage token_flush" >> /etc/crontab
- fi
-}
-
-PACKAGES += " ${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-cronjobs"
-
-SYSTEMD_PACKAGES += "${SRCNAME}-setup"
-SYSTEMD_SERVICE_${SRCNAME}-setup = "keystone-init.service"
-SYSTEMD_SERVICE_${SRCNAME} = "openstack-keystone.service"
-
-SYSTEMD_AUTO_ENABLE_${SRCNAME}-setup = "disable"
-SYSTEMD_AUTO_ENABLE_${SRCNAME} = "disable"
-
-FILES_${SRCNAME}-setup = " \
- ${systemd_system_unitdir}/keystone-init.service \
- "
-
-ALLOW_EMPTY_${SRCNAME}-cronjobs = "1"
-
-FILES_${PN} = "${libdir}/* \
- "
-
-FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
-
-FILES_${SRCNAME} = "${bindir}/* \
- ${sysconfdir}/${SRCNAME}/* \
- ${localstatedir}/* \
- ${datadir}/openstack-dashboard/openstack_dashboard/api/keystone-httpd.py \
- ${sysconfdir}/apache2/conf.d/keystone.conf \
- ${systemd_system_unitdir}/openstack-keystone.service \
- ${datadir} \
- "
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- python-babel \
- python-pbr \
- python-webob \
- python-pastedeploy \
- python-paste \
- python-routes \
- python-cryptography \
- python-six \
- python-sqlalchemy \
- python-sqlalchemy-migrate \
- python-stevedore \
- python-passlib \
- python-keystoneclient \
- python-keystonemiddleware \
- python-bcrypt \
- python-scrypt \
- python-oslo.cache \
- python-oslo.concurrency \
- python-oslo.config \
- python-oslo.context \
- python-oslo.messaging \
- python-oslo.db \
- python-oslo.i18n \
- python-oslo.log \
- python-oslo.middleware \
- python-oslo.policy \
- python-oslo.serialization \
- python-oslo.utils \
- python-oauthlib \
- python-pysaml2 \
- python-dogpile.cache \
- python-jsonschema \
- python-pycadf \
- python-msgpack \
- python-osprofiler \
- python-flask \
- python-flask-restful \
- python-pytz \
- "
-
-RDEPENDS_${SRCNAME}-tests += " bash"
-
-PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}"
-PACKAGECONFIG[OpenLDAP] = ",,,python-ldap python-keystone-hybrid-backend"
-
-# TODO:
-# if DISTRO_FEATURE contains "tempest" then add *-tests to the main RDEPENDS
-
-RDEPENDS_${SRCNAME} = " \
- ${PN} \
- postgresql \
- postgresql-client \
- python-psycopg2 \
- apache2 \
- "
-
-RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}"
-RDEPENDS_${SRCNAME}-cronjobs = "cronie ${SRCNAME}"
-
-MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
-MONITOR_SERVICE_${SRCNAME} = "keystone"
+++ /dev/null
-
-DESCRIPTION = "Authentication Library for OpenStack Identity"
-HOMEPAGE = "https://pypi.python.org/pypi/keystoneauth1"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=96f840d59b245a1c817fbcb901afc574"
-
-SRC_URI[md5sum] = "0864f3485db8709d1dec0c8fa6073a31"
-SRC_URI[sha256sum] = "db91ccab5cc43dac4a25dc2c090642d7c31f9ceb28df2c685620d7c12335a8cd"
-
-inherit pypi
-
-DEPENDS += " \
- ${PYTHON_PN}-pbr \
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- ${PYTHON_PN}-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- ${PYTHON_PN}-pbr \
- ${PYTHON_PN}-iso8601 \
- ${PYTHON_PN}-requests \
- ${PYTHON_PN}-six \
- ${PYTHON_PN}-stevedore \
- python2-os-service-types \
- "
+++ /dev/null
-
-inherit setuptools
-require python-keystoneauth1.inc
+++ /dev/null
-
-DESCRIPTION = "Middleware for Openstack identity API"
-HOMEPAGE = "https://launchpad.net/keystonemiddleware"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4a4d0e932ffae1c0131528d30d419c55"
-
-SRCREV = "0a65b1420799e7c7f8736e9f6c234f755ab5ac6b"
-SRCNAME = "keystonemiddleware"
-BRANCH = "stable/train"
-PROTOCOL = "https"
-PV = "7.0.1+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://git.openstack.org/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-inherit setuptools
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- python-keystoneauth1 \
- python-oslo.cache \
- python-oslo.config \
- python-oslo.context \
- python-oslo.i18n \
- python-oslo.log \
- python-oslo.serialization \
- python-oslo.utils \
- python-pbr \
- python-positional \
- python-pycadf \
- python-keystoneclient \
- python-requests \
- python-six \
- python-webob \
- "
+++ /dev/null
-SUMMARY = "The aim of Kombu is to make messaging in Python as easy as possible by providing \
-an idiomatic high-level interface for the AMQ protocol, and also provide proven and tested \
-solutions to common messaging problems."
-
-DESCRIPTION = "A messaging framework for Python"
-BUGTRACKER = "http://github.com/celery/kombu/issues/"
-HOMEPAGE = "http://kombu.readthedocs.org"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=daea7c168428449fbee05e644df929f4"
-
-SRC_URI[md5sum] = "5f751ea817b1f6a4293d4e3a01040d4f"
-SRC_URI[sha256sum] = "1760b54b1d15a547c9a26d3598a1c8cdaf2436386ac1f5561934bc8a3cbbbd86"
-
-inherit setuptools pypi
-
-PYPI_PACKAGE = "kombu"
-
-FILES_${PN}-doc += "${datadir}/${SRCNAME}"
-
-RDEPENDS_${PN} = " \
- python-amqp \
- "
+++ /dev/null
-
-DESCRIPTION = "Kubernetes python client"
-HOMEPAGE = "https://pypi.org/project/kubernetes/8.0.0"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ad09685d909e7a9f763d2bb62d4bd6fb"
-
-SRC_URI[md5sum] = "c1d6d0ac57a8a49c5fd383a39ee9ab4b"
-SRC_URI[sha256sum] = "54f8e7bb1dd9a55cf416dff76a63c4ae441764280942d9913f2243676f29d02c"
-
-inherit setuptools pypi
-
-RDEPENDS_${PN}_append = " \
- ${PYTHON_PN}-adal \
- ${PYTHON_PN}-google-auth \
- ${PYTHON_PN}-requests-oauthlib \
- "
+++ /dev/null
-
-DESCRIPTION = "ldap3 is a strictly RFC 4510 conforming LDAP V3 pure Python client library. The same codebase runs in Python 2, Python 3, PyPy and PyPy3."
-
-LICENSE = "LGPL-3.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=32be5282b8f7cafe30b89d2980fbc7d0"
-
-SRCREV = "08810e435392a1f1a96d5e65bb444b9cb9e96ae3"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "2.6+git${SRCPV}"
-
-SRC_URI = "git://github.com/cannatag/ldap3;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-#
-# Copyright (C) 2012 Wind River Systems, Inc.
-#
-SUMMARY = "Provides a wrapper in Python to LDAP"
-DESCRIPTION = "This module provides access to the LDAP \
-(Lightweight Directory Access Protocol) through Python operations \
-instead of C API. The module mainly acts as a wrapper for the \
-OpenLDAP 2.x libraries. Errors will appear as exceptions."
-
-LICENSE = "PSF"
-HOMEPAGE = "http://www.python-ldap.org/"
-DEPENDS = "python openldap cyrus-sasl"
-
-PYPI_PACKAGE = "python-ldap"
-inherit pypi setuptools
-
-LIC_FILES_CHKSUM = "file://LICENCE;md5=36ce9d726d0321b73c1521704d07db1b"
-SRC_URI[md5sum] = "fe22522208dc9b06d16eb70f8553eaab"
-SRC_URI[sha256sum] = "7d1c4b15375a533564aad3d3deade789221e450052b21ebb9720fb822eccdb8e"
-
-do_configure_prepend() {
- sed -i -e 's:^library_dirs =.*::' setup.cfg
- sed -i -e 's:^include_dirs =.*:include_dirs = =/usr/include/sasl/:' setup.cfg
-}
-
-RDEPENDS_${PN} = " \
- ${PYTHON_PN}-pprint \
- ${PYTHON_PN}-threading \
- ${PYTHON_PN}-pyasn1 \
- ${PYTHON_PN}-pyasn1-modules \
-"
+++ /dev/null
-
-DESCRIPTION = "A simple connector pool for python-ldap."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://setup.py;md5=9c24605289b49ad77a51ba7986425158"
-
-
-SRCREV = "f75c1a8a34d4fbe6df7889205b5c6a4db6886c33"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "2.4.1+git${SRCPV}"
-
-SRC_URI = "git://opendev.org/openstack/ldappool.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python python-pbr-native"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "This is a Client library that can talk to the HPE LeftHand/StoreVirtual Storage array. The HPE LeftHand storage array has a REST web service interface as well as runs SSH. This client library implements a simple interface to talk with that REST interface using the python Requests http library and communicates via SSH using Pytohn’s paramiko library."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI[sha256sum] = "efdea5cdd2ecce20f9bb482dd0a6f55bcefc462df42eaef4d85258c04e991b20"
-
-SRCREV = "db9773f0f97c5af04da89fcb7dca2a6ddf8d5e4a"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/hpe-storage/python-lefthandclient.git;rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools distutils
+++ /dev/null
-
-BBCLASSEXTEND = "native"
+++ /dev/null
-
-DESCRIPTION = "A simple language agnostic database migration tool"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=123c58ff9658c9062dbe401889464492"
-
-SRCREV = "b53b7168f8ac27e4c557de6e62ad85fe00d99566"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "0.3.8+git${SRCPV}"
-
-SRC_URI = "git://github.com/kofrasa/migrate;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "Munch is a dictionary that supports attribute-style access, a la JavaScript."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f0291cd32b2d6a91d9b19970c94d0a46"
-
-SRCREV = "d0fbbce7b8205a243337faed0b61472dfe09706d"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "2.3.2+git${SRCPV}"
-
-SRC_URI = "git://github.com/Infinidat/munch.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "Murano package validator tool"
-
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-
-SRCREV = "18119f5e9d5a9d706c13188e057cb5b242c51f89"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "0.3.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/openstack/murano-pkg-check.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python python-pbr-native"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "CLI and python client library for OpenStack Neutron"
-HOMEPAGE = "https://launchpad.net/neutron"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRCREV = "115f60f0056899d536d5dd3e6491cd0f999cfd90"
-SRCNAME = "python-neutronclient"
-BRANCH = "stable/train"
-PROTOCOL = "https"
-PV = "6.14.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools monitor rmargparse
-
-DEPENDS += " \
- python-pip \
- python-pbr-native\
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- python-pbr \
- python-cliff \
- python-debtcollector \
- python-iso8601 \
- python-netaddr \
- python-osc-lib \
- python-oslo.i18n \
- python-oslo.log \
- python-oslo.serialization \
- python-oslo.utils \
- python-os-client-config \
- python-keystoneauth1 \
- python-keystoneclient \
- python-requests \
- python-simplejson \
- python-six \
- python-babel \
- "
-
-
-PACKAGECONFIG ?= "bash-completion"
-PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion"
-
-do_install_append() {
- install -d ${D}/${sysconfdir}/bash_completion.d
- install -m 664 ${S}/tools/neutron.bash_completion ${D}/${sysconfdir}/bash_completion.d
-}
-
-PACKAGES =+ "${BPN}-bash-completion"
-FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
-
-MONITOR_CHECKS_${PN} += "\
- neutron-api-check.sh \
-"
+++ /dev/null
-#! /bin/bash
-
-CMD="nova list"
-
-data=$($CMD 2>&1)
-res=$?
-if [ ${res} -eq 127 ]; then
- exit 0
-elif [ ${res} -ne 0 ]; then
- echo "OpenStack \"nova api\" failed: "
- echo $data
- exit $res
-fi
-exit 0
+++ /dev/null
-
-DESCRIPTION = "Client library for OpenStack Compute API"
-HOMEPAGE = "https://github.com/openstack/python-novaclient"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7cdb54622cacc9bc9b2883091e6dd669"
-
-SRC_URI = "git://github.com/openstack/python-novaclient.git;branch=stable/pike"
-
-SRCREV = "cd396b8b61ed7496f4166a2237b27aa0a138f6e5"
-SRCNAME = "python-novaclient"
-PROTOCOL = "https"
-BRANCH = "stable/train"
-S = "${WORKDIR}/git"
-PV = "15.1.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools python-dir
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- python-pbr \
- python-keystoneauth1 \
- python-iso8601 \
- python-oslo.i18n \
- python-oslo.serialization \
- python-oslo.utils \
- python-prettytable \
- python-simplejson \
- python-six \
- python-babel \
- "
-
-PACKAGECONFIG ?= "bash-completion"
-PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion"
-
-do_install_append() {
- install -d ${D}/${sysconfdir}/bash_completion.d
- install -m 664 ${S}/tools/nova.bash_completion ${D}/${sysconfdir}/bash_completion.d
-
- mv ${D}/${bindir}/nova ${D}/${bindir}/nova-${PYTHON_BASEVERSION}
- ln -s ./nova-${PYTHON_BASEVERSION} ${D}/${bindir}/nova-2
- ln -s ./nova-2 ${D}/${bindir}/nova
-
- if [ -e "${D}/${PYTHON_SITEPACKAGES_DIR}/novaclient/tests/v1_1/test_servers.py" ]; then
- sed -e "s:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g" \
- -i ${D}/${PYTHON_SITEPACKAGES_DIR}/novaclient/tests/v1_1/test_servers.py
- fi
-
-}
-
-PACKAGES =+ "${BPN}-bash-completion"
-FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
+++ /dev/null
-
-
-PV = "4.0.0+git${SRCPV}"
-SRCREV = "aa64eb6b0acc6e049c81fd856b75cda2f905c84c"
-
-SRC_URI = " \
- git://github.com/openstack/python-openstackclient.git;branch=stable/train \
- "
+++ /dev/null
-
-DESCRIPTION = "OpenStackClient Library"
-HOMEPAGE = "http://opensource.perlig.de/rcssmin/"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRC_URI[md5sum] = "240d3debc1b6eaadf5e8838f5f2d06fb"
-SRC_URI[sha256sum] = "3467a1edf62946f1b67724fa7f9c699b5e31d80b111ed9e4c7aec21633a3e30d"
-
-inherit setuptools pypi
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- python-pbr \
- python-six \
- python-babel \
- python-cliff \
- python-keystoneauth1 \
- python-os-client-config \
- python-oslo.i18n \
- python-oslo.utils \
- python-simplejson \
- python-stevedore \
- "
-
-CLEANBROKEN = "1"
+++ /dev/null
-
-DESCRIPTION = "oslo.config enabled dogpile cache"
-HOMEPAGE = "https://github.com/openstack/oslo.cache"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRCREV = "3b8d9c3f6c87d62e5502cf4a9ae89e4067180c1f"
-SRCNAME = "oslo.cache"
-PROTOCOL = "https"
-BRANCH = "stable/train"
-S = "${WORKDIR}/git"
-PV = "1.26.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools rmargparse
-
-DEPENDS += " \
- python-pbr \
- python-pip \
- "
-
-DEPENDS += " \
- python-pbr-native \
- "
-
-# RDEPENDS_default:
-RDEPENDS_${PN} += " \
- python-dogpile.cache \
- python-six \
- python-oslo.config \
- python-oslo.i18n \
- python-oslo.log \
- python-oslo.utils \
- "
+++ /dev/null
-
-DESCRIPTION = "oslo.concurrency library"
-HOMEPAGE = "https://github.com/openstack/oslo.concurrency"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-
-SRCREV = "5b42d276350666410a7d010a5152467ad509d3f9"
-SRCNAME = "oslo.concurrency"
-PROTOCOL = "https"
-BRANCH = "stable/train"
-S = "${WORKDIR}/git"
-PV = "3.26.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools rmargparse
-
-DEPENDS += " \
- python-pbr \
- python-pip \
- "
-
-DEPENDS += " \
- python-pbr-native \
- "
-
-# RDEPENDS_default:
-RDEPENDS_${PN} += " \
- python-pbr \
- python-fasteners \
- python-oslo.config \
- python-oslo.i18n \
- python-oslo.utils \
- python-six \
- python-enum34 \
- "
+++ /dev/null
-
-DESCRIPTION = "API supporting parsing command line arguments and .ini style configuration files."
-HOMEPAGE = "https://pypi.python.org/pypi/oslo.config/5.2.0"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8"
-
-SRCREV = "31c11ab4289efa1a91835f3daa928fe927ac4276"
-SRCNAME = "oslo.config"
-PROTOCOL = "https"
-BRANCH = "stable/queens"
-S = "${WORKDIR}/git"
-PV = "5.2.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools rmargparse
-
-DEPENDS += " \
- python-pbr \
- python-pip \
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- python-pbr \
- python-netaddr \
- python-six \
- python-stevedore \
- python-debtcollector \
- python-oslo.i18n \
- python-rfc3986 \
- python-pyyaml \
- python-importlib-metadata \
- "
-
+++ /dev/null
-
-DESCRIPTION = "Oslo Context Library"
-HOMEPAGE = "https://launchpad.net/oslo"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRCREV = "76a07f9022f0fa967707c9f6cb5a4a24aac6b3ef"
-SRCNAME = "oslo.context"
-PROTOCOL = "https"
-BRANCH = "stable/stein"
-S = "${WORKDIR}/git"
-PV = "2.22.1+git${SRCPV}"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
- "
-
-# RDEPENDS_default:
-RDEPENDS_${PN} += " \
- bash \
- python-pbr \
- python-debtcollector \
- python-positional \
- "
+++ /dev/null
-
-DESCRIPTION = "Oslo db library"
-HOMEPAGE = "http://launchpad.net/oslo"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-
-SRCREV = "4de33ebd504a2c3dbddc2492bdb96ae7bca77d66"
-SRCNAME = "oslo.db"
-PROTOCOL = "https"
-BRANCH = "stable/stein"
-S = "${WORKDIR}/git"
-PV = "4.27.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- python-oslo.config \
- python-oslo.i18n \
- python-oslo.serialization \
- python-oslo.utils \
- python-six \
- python-alembic \
- python-sqlalchemy \
- python-sqlalchemy-migrate \
- python-stevedore \
- python-pbr \
- python-debtcollector \
- "
+++ /dev/null
-
-DESCRIPTION = "Oslo Log Library"
-HOMEPAGE = "https://launchpad.net/oslo"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-
-SRCREV = "e19c4076b1f0d7fdbd6d68a09c973934029926a1"
-SRCNAME = "oslo.log"
-PROTOCOL = "https"
-BRANCH = "stable/train"
-S = "${WORKDIR}/git"
-PV = "3.44.3+git${SRCPV}"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools
-
-DEPENDS += " \
- python-pip \
- python-babel \
- python-pbr-native \
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
- "
-
-# RDEPENDS_default:
-RDEPENDS_${PN} += " \
- bash \
- python-pbr \
- python-six \
- python-oslo.config \
- python-oslo.context \
- python-oslo.i18n \
- python-oslo.utils \
- python-oslo.serialization \
- python-pyinotify \
- python-debtcollector \
- python-dateutil \
- python-monotonic \
- "
+++ /dev/null
-
-DESCRIPTION = "Oslo Middleware Library"
-HOMEPAGE = "https://launchpad.net/oslo"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-
-SRCREV = "8812bc3fc490f0db4977418eaedf58190a0df394"
-SRCNAME = "oslo.middleware"
-PROTOCOL = "https"
-BRANCH = "stable/train"
-S = "${WORKDIR}/git"
-PV = "3.31.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
- "
-
-# RDEPENDS_default:
-RDEPENDS_${PN} += " \
- python-pbr \
- python-jinja2 \
- python-oslo.config \
- python-oslo.context \
- python-oslo.i18n \
- python-oslo.utils \
- python-six \
- python-stevedore \
- python-webob \
- python-debtcollector \
- python-statsd \
- "
+++ /dev/null
-
-DESCRIPTION = "Oslo policy library"
-HOMEPAGE = "https://github.com/openstack/oslo.policy"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRCREV = "b9fd10e2612f26c93d49c168a0408aba6d20e5bf"
-SRCNAME = "oslo.policy"
-PROTOCOL = "https"
-BRANCH = "stable/train"
-S = "${WORKDIR}/git"
-PV = "1.43.1+git${SRCPV}"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- python-oslo.config \
- python-oslo.i18n \
- python-oslo.serialization \
- python-oslo.utils \
- python-six \
- python-pyyaml \
- python-requests \
- "
+++ /dev/null
-
-DESCRIPTION = "Oslo Serialization API"
-HOMEPAGE = "https://launchpad.net/oslo"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-
-SRCREV = "576b13ec26baa671da05df56a8d14aba6fa3e826"
-SRCNAME = "oslo.serialization"
-PROTOCOL = "https"
-BRANCH = "stable/train"
-S = "${WORKDIR}/git"
-PV = "2.23.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-inherit setuptools
-
-# DEPENDS_default: python-pip
-
-DEPENDS += " \
- python-pip \
- python-pbr-native\
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
- "
-
-# RDEPENDS_default:
-RDEPENDS_${PN} += " \
- python-pbr \
- python-six \
- python-oslo.utils \
- python-pytz \
- python-msgpack \
- "
+++ /dev/null
-
-SUMMARY = "Common code for writing OpenStack upgrade checks"
-DESCRIPTION = "\
- This project contains the common code necessary for writing upgrade checks \
- in OpenStack projects. It includes a module (oslo_upgradecheck.upgradecheck) \
- for the common code as well as an example (oslo_upgradecheck.__main__) of \
- integrating that code into a project. \
-"
-HOMEPAGE = "https://github.com/openstack/oslo.upgradecheck"
-SECTION = "devel/python"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-PV = "0.3.1+git${SRCPV}"
-SRCREV = "5f182fe19cdfe0bcf0d51bcf7be05e7a74f0a068"
-
-SRCNAME = "oslo.upgradecheck"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master"
-
-S = "${WORKDIR}/git"
-
-inherit setuptools
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
-"
-
-RDEPENDS_${PN} += " \
- python-oslo.config \
- python-oslo.i18n \
-"
+++ /dev/null
-
-DESCRIPTION = "Oslo versionedobjects library"
-HOMEPAGE = "https://wiki.openstack.org/wiki/Oslo"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRCREV = "c95f0c876840e36f37acb14d5eec5238d85e7dce"
-SRCNAME = "oslo.versionedobjects"
-PROTOCOL = "https"
-BRANCH = "stable/queens"
-S = "${WORKDIR}/git"
-PV = "1.31.2+git${SRCPV}"
-
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
- "
-
-RDEPENDS_${PN} += " \
- python-six \
- python-oslo.concurrency \
- python-oslo.config \
- python-oslo.context \
- python-oslo.messaging \
- python-oslo.serialization \
- python-oslo.utils \
- python-oslo.log \
- python-oslo.i18n \
- python-webob \
- python-iso8601 \
- python-netaddr \
- "
+++ /dev/null
-
-DESCRIPTION = "Library for cross-project profiling library"
-HOMEPAGE = "https://docs.openstack.org/osprofiler/latest/"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5"
-
-SRCREV = "6d68170f72ef303e6564e164aafb1ec53a8b8314"
-SRCNAME = "osprofiler"
-BRANCH = "master"
-PROTOCOL = "https"
-PV = "2.3.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://opendev.org/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools
-
-DEPENDS += " python-pbr-native"
-
-RDEPENDS_${PN}_append = " \
- python-pbr \
- python-six \
- python-oslo.messaging \
- python-oslo.log \
- python-oslo.utils \
- python-webob \
- python-requests \
- python-netaddr \
- python-oslo.concurrency \
- "
+++ /dev/null
-
-DESCRIPTION = " \
- Core utilities for Python packages. \
- The packaging project includes the following: version handling, specifiers, markers, requirements, tags, utilities. \
- "
-HOMEPAGE = "https://github.com/pypa/packaging"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91"
-
-SRC_URI[md5sum] = "a02ce566f10c701b4c42e39a4ce59c93"
-SRC_URI[sha256sum] = "e665345f9eef0c621aa0bf2f8d78cf6d21904eef16a93f020240b704a57f1334"
-
-PYPI_PACKAGE = "packaging"
-inherit setuptools pypi
+++ /dev/null
-
-DESCRIPTION = "python-pankoclient"
-PROTOCOL = "https"
-BRANCH = "stable/train"
-SRCREV = "28b55860a2e71fe1fd015d868d64500d3b36470c"
-S = "${WORKDIR}/git"
-PV = "0.7.0+git${SRCPV}"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-SRC_URI = "git://github.com/openstack/python-pankoclient.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-DEPENDS += " \
- python \
- python-pbr-native \
- "
-
-inherit setuptools
+++ /dev/null
-
-DESCRIPTION = "Pika is a pure-Python implementation of the AMQP 0-9-1 protocol including RabbitMQ’s extensions."
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=535836bf0a5de515a7bfee026075701d"
-HOMEPAGE = "https://pika.readthedocs.io/en/stable/"
-
-SRC_URI[sha256sum] = "9fa76ba4b65034b878b2b8de90ff8660a59d925b087c5bb88f8fdbb4b64a1dbf"
-
-
-PYPI_PACKAGE = "pika"
-inherit pypi setuptools
+++ /dev/null
-
-DESCRIPTION = "libcurl python bindings"
-LICENSE = "LGPLv2 | MIT"
-HOMEPAGE = "http://pycurl.io/"
-LIC_FILES_CHKSUM = " \
- file://COPYING-LGPL;md5=4fbd65380cdd255951079008b364516c \
- file://COPYING-MIT;md5=2df767ed35d8ea83de4a93feb55e7815 \
- "
-
-SRC_URI[sha256sum] = "6f08330c5cf79fa8ef68b9912b9901db7ffd34b63e225dce74db56bb21deda8e"
-
-
-PYPI_PACKAGE = "pycurl"
-inherit pypi setuptools
-
-export BUILD_SYS
-export HOST_SYS
-export STAGING_INCDIR
-export STAGING_LIBDIR
-
-DEPENDS = " curl python"
-
-BBCLASSEXTEND = " native"
+++ /dev/null
-
-DESCRIPTION = "pyelftools library for parsing and analyzing elf files"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5ce2a2b07fca326bc7c146d10105ccfc"
-HOMEPAGE = "https://github.com/eliben/pyelftools"
-
-SRC_URI[sha256sum] = "89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24"
-
-PYPI_PACKAGE = "pyelftools"
-inherit pypi setuptools
+++ /dev/null
-
-DESCRIPTION = "HPE 3PAR HTTP REST Client"
-HOMEPAGE = "https://pythonhosted.org/python-3parclient/"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=d3dfac7b0d23cb44b097e35518879438"
-
-SRC_URI[md5sum] = "b49dd03782fd5eda09cd9210ae979f6a"
-SRC_URI[sha256sum] = "4c2b0be4e3b8a517c1718e39e1eeb3e62f73810bb9910278000716f6074e5a69"
-
-PYPI_PACKAGE = "pyghmi"
-inherit setuptools pypi
-
-DEPENDS += " \
- python-pbr-native \
- "
-
-RDEPENDS_${PN}_append = " \
- python-dateutil \
- "
+++ /dev/null
-SUMMARY = "Python bindings for liblzma"
-DESCRIPTION = "\
-PylibLZMA provides a python interface for the liblzma library to read and write data \
-that has been compressed or can be decompressed by Lasse Collin’s xz / lzma utils. \
-"
-LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=58c39b26c0549f8e1bb4122173f474cd"
-
-SRC_URI[md5sum] = "500f61116ee1ab4063b49c121786863a"
-SRC_URI[sha256sum] = "08d762f36d5e59fb9bb0e22e000c300b21f97e35b713321ee504cfb442667957"
-
-DEPENDS = "xz"
-
-inherit pypi setuptools
-
-PYPI_PACKAGE = "pyliblzma"
-PYPI_PACKAGE_EXT = "tar.bz2"
-
-BBCLASSEXTEND = " native"
+++ /dev/null
-
-SUMMARY = "Python MySQL client library"
-DESCRIPTION = " This package contains a pure-Python MySQL client library, based on PEP 249."
-
-SECTION = "devel/python"
-HOMEPAGE = "https://github.com/PyMySQL/PyMySQL"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=528175c84163bb800d23ad835c7fa0fc"
-
-inherit pypi setuptools
-
-PYPI_PACKAGE = "PyMySQL"
-
-SRC_URI[md5sum] = "e5d9183cc0a775ac29f9e0365cca6556"
-SRC_URI[sha256sum] = "d8c059dcd81dedb85a9f034d5e22dcb4442c0b201908bede99e306d65ea7c8e7"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/python-pynacl:"
-DESCRIPTION = "Python binding to libsodiom"
-
-HOMEPAGE = "https://pypi.org/project/PyNaCl/"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8cc789b082b3d97e1ccc5261f8594d3f"
-
-SRCREV = "4881c878c9a33f4684337f650355bdf7f031d77d"
-PROTOCOL = "https"
-BRANCH = "main"
-S = "${WORKDIR}/git"
-
-PV = "1.3.0+git${SRCPV}"
-
-SRC_URI = " \
- git://github.com/pyca/pynacl.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/0001-Enable-cross-compile.patch \
- "
-
-
-inherit setuptools distutils
-
-DEPENDS += " libsodium python-cffi-native libsodium-native"
-RDEPENDS_${PN} = " libsodium"
-
-do_compile_prepend() {
- export PYNACL_CROSS_BUILD="--build=${BUILD_SYS}"
- export PYNACL_CROSS_HOST="--host=${HOST_SYS}"
- export PYNACL_CROSS_TARGET="--target=${TARGET_SYS}"
- export SODIUM_INSTALL="system"
-}
-
-do_install_prepend() {
- export SODIUM_INSTALL="system"
-}
+++ /dev/null
-
-DESCRIPTION = "A messaging framework built on the QPID Proton engine. It provides a callback-based API for message passing. See the User Guide in the docs directory for more detail."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
-
-SRCREV = "5392392046989f1bb84ba938c30e4d48311075f1"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-PV = "2.3.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/kgiusti/pyngus;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "The Python perf module is a toolkit to write, run and analyze benchmarks."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=78bc2e6e87c8c61272937b879e6dc2f8"
-
-SRCREV = "7febee0242ce8fd01f56bce2ec72ec536a41caed"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "1.6.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/vstinner/pyperf.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-# DEPENDS += " python python-pbr-native"
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "Python implementation of SAML Version 2 to be used in a WSGI environment"
-HOMEPAGE = "https://github.com/rohe/pysaml2"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=861cc9087857b5bea2e11356c3de95d9"
-
-SRCREV = "c740a3a270037d6fcb42a12112db594705d3878f"
-SRCNAME = "pysaml2"
-PROTOCOL = "git"
-BRANCH = "v4.9.0"
-S = "${WORKDIR}/git"
-PV = "4.5.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/rohe/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools
-
-DEPENDS += " \
- python-pip \
- "
-
-RDEPENDS_${PN} += " \
- python-zopeinterface \
- python-repoze.who \
- python-defusedxml \
- "
+++ /dev/null
-
-DESCRIPTION = "Client side API implementation of the Redfish RESTful API for Data Center Hardware Management."
-HOMEPAGE = "https://github.com/DMTF/Redfishtool"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=cee7a7694b5bf14bc9d3e0fbe78a64af"
-
-
-SRCREV = "2bdcd905e1ad227f40809ec298804d5401047612"
-SRCNAME = "Redfishtool"
-BRANCH = "master"
-PROTOCOL = "https"
-PV = "1.1.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = " \
- git://github.com/DMTF/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://${PN}/0001-Adapt-redfishtool-to-python2.patch \
- "
-
-inherit setuptools
-
-RDEPENDS_${PN} += " \
- python-requests \
-"
-
-do_install_append() {
- :
-}
-
-FILES_${PN} += " \
- "
+++ /dev/null
-
-DESCRIPTION = "This project provides first-class OAuth library support for Requests."
-
-LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=22d117a849df10d047ed9b792838e863"
-
-SRCREV = "e19ac082682ecf3ed06cdcc5538e3c4bb2aa7762"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "1.2.0"
-
-SRC_URI = "git://github.com/requests/requests-oauthlib;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "requests-toolbelt"
-
-STABLE = "master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "1e384626476f7afbff0f649fe41886d0f27473d6"
-S = "${WORKDIR}/git"
-PV = "0.9.1+${SRCPV}"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=71760e0f1dda8cff91b0bc9246caf571"
-
-SRC_URI = "git://github.com/requests/toolbelt.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-DEPENDS = " \
- python \
- python-pbr-native \
- "
-
-inherit setuptools
-
-RDEPENDS_${PN} += " bash"
+++ /dev/null
-
-DESCRIPTION = "The ordereddict module in short"
-HOMEPAGE = "https://pypi.org/project/ruamel.ordereddict/"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=0caf06c5d151e57e100341eb28dcb6f5"
-
-SRC_URI[md5sum] = "d160714193a0ec470cc26f614b1aa0e7"
-SRC_URI[sha256sum] = "7058c470f131487a3039fb9536dda9dd17004a7581bdeeafa836269a36a2b3f6"
-
-inherit setuptools pypi
+++ /dev/null
-
-DESCRIPTION = "YAML 1.2 loader/dumper package for Python"
-HOMEPAGE = "https://pypi.org/project/ruamel.yaml/"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=84e9d7d823d2abac052e70de2051ca1c"
-
-SRC_URI[md5sum] = "d53315f8ccb93748d00ccca39486ac78"
-SRC_URI[sha256sum] = "350496f6fdd8c2bb17a0fa3fd2ec98431280cf12d72dae498b19ac0119c2bbad"
-
-inherit setuptools pypi python-dir
-
-DEPENDS += " \
- ${PYTHON_PN}-native \
- ${PYTHON_PN}-cryptography-native \
- "
-RDEPENDS_${PN}_append = " \
- ${PYTHON_PN}-ruamel.ordereddict \
- "
-
-do_install_prepend() {
- export RUAMEL_NO_PIP_INSTALL_CHECK=1
-}
-
+++ /dev/null
-
-DESCRIPTION = "Ryu is a component-based software defined networking framework."
-HOMEPAGE = "https://github.com/osrg/ryu"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = " \
- file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57\
- "
-
-SRCREV = "1c008060fa3dab51c3a59c1485a7529b13cf0dd1"
-SRCNAME = "ryu"
-BRANCH = "master"
-PROTOCOL = "https"
-PV = "4.24+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/osrg/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools python-dir
-
-DEPENDS += " \
- python-pip \
- python-pbr-native \
- "
-
-RDEPENDS_${PN}_append = " \
- ${PYTHON_PN}-eventlet \
- ${PYTHON_PN}-msgpack \
- ${PYTHON_PN}-netaddr \
- ${PYTHON_PN}-oslo.config \
- ${PYTHON_PN}-ovs \
- ${PYTHON_PN}-routes \
- ${PYTHON_PN}-six \
- ${PYTHON_PN}-tinyrpc \
- ${PYTHON_PN}-webob \
- "
-
-FILES_${PN}_append = " \
- ${datadir}/etc/${SRCNAME} \
- "
+++ /dev/null
-
-DESCRIPTION = "CLI and python client library for OpenStack Sahara"
-HOMEPAGE = "https://launchpad.net/sahara"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-DEPENDS += " \
- python-pip \
- python-pbr \
- "
-
-# Satisfy setup.py 'setup_requires'
-DEPENDS += " \
- python-pbr-native \
-"
-
-RDEPENDS_${PN} += " \
- python-pbr \
- "
-
-SRCNAME = "saharaclient"
-
-SRC_URI = "git://github.com/openstack/python-saharaclient.git;branch=master"
-
-PV = "2.3.0+git${SRCPV}"
-SRCREV = "3107b452467537f4eef3d9ecfb5e35d110d19662"
-S = "${WORKDIR}/git"
-
-inherit setuptools
-
+++ /dev/null
-
-DESCRIPTION = "A simple language agnostic database migration tool"
-
-LICENSE = "LGPL-3.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02 "
-
-
-SRCREV = "34fe985e6b43caa9f9b9bcd0dc433be4b2a1fdec"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "0.8.73"
-
-SRC_URI = "git://github.com/klen/python-scss;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = " \
- Snowball is a small string processing language designed for creating stemming algorithms \
- for use in Information Retrieval. This site describes Snowball, and presents several useful \
- stemmers which have been implemented using it. \
- "
-HOMEPAGE = "https://github.com/snowballstem/snowball"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2750797da77c1d784e7626b3f7d7ff3e"
-
-SRC_URI[md5sum] = "c05ec4a897be3c953c8b8b844c4241d4"
-SRC_URI[sha256sum] = "df3bac3df4c2c01363f3dd2cfa78cce2840a79b9f1c2d2de9ce8d31683992f52"
-
-PYPI_PACKAGE = "snowballstemmer"
-inherit setuptools pypi
+++ /dev/null
-
-DESCRIPTION = " \
- sphinxcontrib-websupport provides a Python API to easily integrate Sphinx\
- documentation into your Web application. \
- "
-HOMEPAGE = "https://www.sphinx-doc.org/en/master/"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=819a10ab58e77e03e61a584de6339f7c"
-
-SRC_URI[md5sum] = "ca6435e7b4eb9408df4f54972361e9d3"
-SRC_URI[sha256sum] = "9de47f375baf1ea07cdb3436ff39d7a9c76042c10a769c52353ec46e4e8fc3b9"
-
-PYPI_PACKAGE = "sphinxcontrib-websupport"
-inherit setuptools pypi
+++ /dev/null
-
-BBCLASSEXTEND = "native"
+++ /dev/null
-
-DESCRIPTION = "A high-level cross-protocol url-grabber."
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=68ad62c64cc6c620126241fd429e68fe"
-HOMEPAGE = "http://urlgrabber.baseurl.org/"
-
-SRC_URI[sha256sum] = "79c5a01c5dd31906a7f38ef1f500030e137704804d585644693d3e474ed15f39"
-
-DEPENDS += "python-six python-six-native"
-PYPI_PACKAGE = "urlgrabber"
-inherit pypi setuptools
-
-FILES_${PN}_append = " ${datadir}"
+++ /dev/null
-
-DESCRIPTION = "Urwid is a console user interface library for Python."
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad"
-HOMEPAGE = "http://urwid.org/"
-
-SRC_URI[sha256sum] = "644d3e3900867161a2fc9287a9762753d66bd194754679adb26aede559bcccbc"
-
-
-PYPI_PACKAGE = "urwid"
-inherit pypi setuptools
+++ /dev/null
-
-SUMMARY = "Smart replacement for plain tuple used in __version__"
-SECTION = "devel/python"
-HOMEPAGE = "https://launchpad.net/versiontools"
-LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = "file://setup.py;beginline=3;endline=20;md5=02193721a38fd8a05a4ddeb7df8e294d"
-
-inherit pypi
-
-SRC_URI[md5sum] = "602b7db8eea30dd29a1d451997adf251"
-SRC_URI[sha256sum] = "a969332887a18a9c98b0df0ea4d4ca75972f24ca94f06fb87d591377e83414f6"
+++ /dev/null
-
-inherit setuptools
-require python-versiontools.inc
+++ /dev/null
-
-DESCRIPTION = "YAQL (Yet Another Query Language) is an embeddable and extensible query language, that allows performing complex queries against arbitrary objects. It has a vast and comprehensive standard library of frequently used querying functions and can be extend even further with user-specified functions. YAQL is written in python and is distributed via PyPI."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-
-SRCREV = "7385a31b9dbfc777a514ba28fe507fbf904cc779"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "1.1.3+git${SRCPV}"
-
-SRC_URI = "git://github.com/openstack/yaql.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python python-pbr-native"
-inherit setuptools distutils pkgconfig
+++ /dev/null
-
-DESCRIPTION = "Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE = "https://github.com/jaraco/zipp"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a33f38bbf47d48c70fe0d40e5f77498e"
-
-SRC_URI[md5sum] = "d4451a749d8a7c3c392a9edd1864a937"
-SRC_URI[sha256sum] = "3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e"
-
-DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
-RDEPENDS_${PN} += "${PYTHON_PN}-more-itertools"
-
-inherit pypi setuptools
-
-BBCLASSEXTEND = "native nativesdk"
+++ /dev/null
-
-SUMMARY = "Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=beeffd9dfcc746ed5a91921f1acc2746"
-
-SRCREV = "c7ca7ff0bcebb53e1bed783280a3bb5db35f900f"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "7.0.0"
-
-SRC_URI = "git://github.com/cherrypy/cheroot.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " \
- python3 \
- python3-setuptools-scm-native \
- python3-setuptools-scm-git-archive-native \
- "
-
-RDEPENDS_${PN} += " \
- python3-email \
- python3-fcntl \
- python3-io \
- python3-logging \
- python3-unixadmin \
- python3-pyopenssl \
- python3-six \
- "
-
-inherit setuptools3 distutils3 pkgconfig
+++ /dev/null
-DESCRIPTION = "Library to implement a well-behaved Unix daemon process"
-HOMEPAGE = "https://pagure.io/python-daemon/"
-SECTION = "devel/python"
-
-DEPENDS += "${PYTHON_PN}-docutils-native"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-inherit pypi setuptools3
-
-SRC_URI[md5sum] = "3ab10a93472201214cd95c05f1923af6"
-SRC_URI[sha256sum] = "affeca9e5adfce2666a63890af9d6aff79f670f7511899edaddca7f96593cc25"
-
-PYPI_PACKAGE = "python-daemon"
-
-RDEPENDS_${PN} = "\
- ${PYTHON_PN}-docutils \
- ${PYTHON_PN}-lockfile (>= 0.10) \
- ${PYTHON_PN}-resource \
-"
+++ /dev/null
-
-SUMMARY = " Lang - Python Language Constraints"
-DESCRIPTION = "\
- Lang is a Python module that allows enforcing programming language constraints. Lang was \
- built using a Java like mindset, so many of the constraints that are supported are mirrors \
- of constraints in the Java programming language. \
- "
-
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
-
-SRCREV = "feb4c638ebc581d9913f440965e83558fd10018c"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git/src"
-PV = "1.0.4+git${SRCPV}"
-
-SRC_URI = "git://github.com/amitassaraf/lang.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python3 python3-setuptools-scm-native"
-inherit setuptools3 distutils3 pkgconfig
+++ /dev/null
-
-DESCRIPTION = "Python classes to extract information from the Linux kernel /proc files"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-
-
-SRCREV = "d170839360edf3fbac4a31c7771c4ec5bb0b6121"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "0.6.1"
-
-SRC_URI = "git://git.kernel.org/pub/scm/libs/python/python-linux-procfs/python-linux-procfs.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-DEPENDS += " python"
-RDEPENDS_${PN} = "python3-core"
-
-inherit setuptools3 distutils3 pkgconfig
+++ /dev/null
-SUMMARY = "Platform-independent file locking module"
-HOMEPAGE = "https://pypi.org/project/lockfile/"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2340dffbbfea534b58f1349984eeef72"
-
-SRC_URI[md5sum] = "a6a1a82957a23afdf44cfdd039b65ff9"
-SRC_URI[sha256sum] = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"
-
-inherit pypi setuptools3
-
-DEPENDS += "python3-distutils-extra-native python3-pbr-native"
-RDEPENDS_${PN} += "python3-sqlite3"
-
-BBCLASSEXTEND = "native nativesdk"
+++ /dev/null
-
-DESCRIPTION = "Set of handlers for the Python standard library's logging package"
-HOMEPAGE = "https://pypi.python.org/pypi/logutils"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44c35f0b8e2a27a2f33a4e4a5c65d014"
-
-SRCREV = "66d55fae0cb3a94bc6a25af8e7c3dff2535a1b02"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "0.3.5"
-
-# SRC_URI = "hg://bitbucket.org/vinay.sajip/logutils;module=${PN}-${PV};proto=https;rev=8dcaf2a86257"
-SRC_URI = "git://bitbucket.org/vinay.sajip/logutils.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools3 distutils3
+++ /dev/null
-
-DESCRIPTION = "WSGI object-dispatching web framework"
-
-HOMEPAGE = "https://pypi.python.org/pypi/pecan/"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d846877d24bbb3d7a00a985c90378e8c"
-
-SRCREV = "da15e06d783e2cf569b39ba506e68e4e1e85568d"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "1.3.2+git${SRCPV}"
-
-SRC_URI = "git://github.com/pecan/pecan.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-inherit setuptools3 distutils3
-
-RDEPENDS_${PN} = "python3-mako \
- python3-six \
- python3-logutils \
- python3-webtest \
- "
-
-do_install_append() {
- mv ${D}/${bindir}/gunicorn_pecan ${D}/${bindir}/gunicorn_pecan3
- mv ${D}/${bindir}/pecan ${D}/${bindir}/pecan3
-}
+++ /dev/null
-
-# Update log with the message: adopted from upstream e1f2e1ae5f27d889e3d4bef1b23edcf8a6d804c0
-DESCRIPTION = " \
- PrettyTable is a simple Python library designed to make it quick and easy to represent tabular data \
- in visually appealing ASCII tables. It was inspired by the ASCII tables used in the PostgreSQL shell \
- psql. PrettyTable allows for selection of which columns are to be printed, independent alignment of \
- columns (left or right justified or centred) and printing of “sub-tables” by specifying a row range.\
- "
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3e73500ffa52de5071cff65990055282"
-
-SRC_URI[md5sum] = "0c1361104caff8b09f220748f9d69899"
-SRC_URI[sha256sum] = "a53da3b43d7a5c229b5e3ca2892ef982c46b7923b51e98f0db49956531211c4f"
-
-SRCNAME = "prettytable"
-
-SRC_URI = "https://pypi.python.org/packages/source/P/PrettyTable/${SRCNAME}-${PV}.zip"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools3
-do_install_append() {
- find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "*.txt" -o -name "PKG-INFO" -exec chmod 644 {} +
-}
-
-BBCLASSEXTEND = "native nativesdk"
+++ /dev/null
-
-SUMMARY = "A pure-Python MySQL client library"
-DESCRIPTION = " \
-This package contains a pure-Python MySQL client library, based on PEP 249 \
-Most public APIs are compatible with mysqlclient and MySQLdb.\
-"
-SECTION = "devel/python"
-HOMEPAGE = "https://github.com/PyMySQL/PyMySQL"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=528175c84163bb800d23ad835c7fa0fc"
-
-inherit pypi
-inherit setuptools3
-
-PYPI_PACKAGE = "PyMySQL"
-
-SRC_URI[md5sum] = "e5d9183cc0a775ac29f9e0365cca6556"
-SRC_URI[sha256sum] = "d8c059dcd81dedb85a9f034d5e22dcb4442c0b201908bede99e306d65ea7c8e7"
+++ /dev/null
-
-DESCRIPTION = "Client side API implementation of the Redfish RESTful API for Data Center Hardware Management."
-HOMEPAGE = "https://github.com/DMTF/Redfishtool"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=cee7a7694b5bf14bc9d3e0fbe78a64af"
-
-
-SRCREV = "2bdcd905e1ad227f40809ec298804d5401047612"
-SRCNAME = "Redfishtool"
-BRANCH = "master"
-PROTOCOL = "https"
-PV = "1.1.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/DMTF/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit setuptools3
-
-RDEPENDS_${PN} += " \
- python3-requests \
-"
-
-do_install_append() {
- :
-}
-
-FILES_${PN} += " \
- "
+++ /dev/null
-
-inherit setuptools3
-require python-versiontools.inc
+++ /dev/null
-
-DESCRIPTION = "This wraps any WSGI application and makes it easy to send test requests to that application, without starting up an HTTP server."
-HOMEPAGE = "https://pypi.python.org/pypi/WebTest/"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://license.rst;md5=64f013a9d7a2a8ffc8d016a2d4214bcd"
-
-PYPI_PACKAGE = "WebTest"
-
-RDEPENDS_${PN} += "${PYTHON_PN}-beautifulsoup4"
-
-SRC_URI[md5sum] = "dd0385c725b85ac1e8079f38d2acd7b1"
-SRC_URI[sha256sum] = "41348efe4323a647a239c31cde84e5e440d726ca4f449859264e538d39037fd0"
-inherit setuptools3 pypi
+++ /dev/null
-
-SUMMARY = " Web Services Made Easy (WSME)"
-DESCRIPTION = "\
- Web Services Made Easy (WSME) simplifies the writing of REST web services by providing simple yet \
- powerful typing, removing the need to directly manipulate the request and the response objects. \
- "
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5a9126e7f56a0cf3247050de7f10d0f4"
-
-SRCREV = "f36a607124355007d3a830ebe7e53efda777c58a"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git/"
-PV = "0.9.3+git${SRCPV}"
-
-SRC_URI = "git://opendev.org/x/wsme.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-DEPENDS += " python3 python3-pbr-native"
-inherit distutils3
+++ /dev/null
-pkg_postinst_${PN}-core () {
- # several scritps assume /bin/python is available
- ln -sf ${bindir}/python $D${base_bindir}/python
-}
-
-
-
+++ /dev/null
-From e3eff024826550aec4a6a5baef7210a29faf299d Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 9 Mar 2017 18:54:02 +0200
-Subject: [PATCH] Add a color setting for mips64_n32 binaries
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- build/rpmfc.c | 1 +
- rpmrc.in | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/build/rpmfc.c b/build/rpmfc.c
-index d38a10916..c8e2f876a 100644
---- a/build/rpmfc.c
-+++ b/build/rpmfc.c
-@@ -622,6 +622,7 @@ exit:
- static const struct rpmfcTokens_s rpmfcTokens[] = {
- { "directory", RPMFC_INCLUDE },
-
-+ { "N32 MIPS64", RPMFC_ELFMIPSN32|RPMFC_INCLUDE },
- { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE },
- { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE },
-
-diff --git a/rpmrc.in b/rpmrc.in
-index abc08fc31..f5bc820d8 100644
---- a/rpmrc.in
-+++ b/rpmrc.in
-@@ -133,6 +133,8 @@ archcolor: mipsr6el 1
- archcolor: mips64r6 2
- archcolor: mips64r6el 2
-
-+archcolor: mips64_n32 4
-+
- archcolor: m68k 1
-
- archcolor: m68kmint 1
---
-2.11.0
-
+++ /dev/null
-From 87cfc0db1ed6fe381a5ed5f0016d8c3344a31a11 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 9 Jan 2017 18:52:11 +0200
-Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in
- a short-circuited way.
-
-Upstream permits short-circuiting only for local testing; Yocto on the other
-hand produces rpms that way by design.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- build/pack.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/build/pack.c b/build/pack.c
-index 1261cdbba..bb2d6f4f6 100644
---- a/build/pack.c
-+++ b/build/pack.c
-@@ -595,10 +595,6 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)
- headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16);
- }
-
-- if (cheating) {
-- (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1");
-- }
--
- { char *binFormat = rpmGetPath("%{_rpmfilename}", NULL);
- char *binRpm, *binDir;
- binRpm = headerFormat(pkg->header, binFormat, &errorString);
---
-2.11.0
-
+++ /dev/null
-From bd08eb0ae1312f347f49949481daa7c923752df2 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 27 Feb 2017 09:43:30 +0200
-Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for
- default configuration and macros.
-
-Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- configure.ac | 2 +-
- macros.in | 2 +-
- rpm.am | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 09af7c4..9bd6903 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1055,7 +1055,7 @@ else
- usrprefix=$prefix
- fi
-
--RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
-+RPMCONFIGDIR="`echo ${libdir}/rpm`"
- AC_SUBST(RPMCONFIGDIR)
-
- AC_SUBST(OBJDUMP)
-diff --git a/macros.in b/macros.in
-index a3aa7a9..62cee5c 100644
---- a/macros.in
-+++ b/macros.in
-@@ -970,7 +970,7 @@ package or when debugging this package.\
- %_sharedstatedir %{_prefix}/com
- %_localstatedir %{_prefix}/var
- %_lib lib
--%_libdir %{_exec_prefix}/%{_lib}
-+%_libdir @libdir@
- %_includedir %{_prefix}/include
- %_infodir %{_datadir}/info
- %_mandir %{_datadir}/man
-diff --git a/rpm.am b/rpm.am
-index 82c2d7c..6341b51 100644
---- a/rpm.am
-+++ b/rpm.am
-@@ -1,10 +1,10 @@
- # Internal binaries
- ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
--rpmlibexecdir = $(prefix)/lib/rpm
-+rpmlibexecdir = $(libdir)/rpm
-
- # Host independent config files
- ## HACK: it probably should be $(datadir)/rpm
--rpmconfigdir = $(prefix)/lib/rpm
-+rpmconfigdir = $(libdir)/rpm
-
- # Libtool version (current-revision-age) for all our libraries
- rpm_version_info = 9:0:1
+++ /dev/null
-From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 10 Jan 2017 14:11:30 +0200
-Subject: [PATCH] Do not read config files from $HOME
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- lib/rpmrc.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/lib/rpmrc.c b/lib/rpmrc.c
-index 4ed991321..19fe80f98 100644
---- a/lib/rpmrc.c
-+++ b/lib/rpmrc.c
-@@ -458,8 +458,7 @@ static void setDefaults(void)
- if (!defrcfiles) {
- defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":",
- confdir, "/" RPMCANONVENDOR "/rpmrc", ":",
-- SYSCONFDIR "/rpmrc", ":",
-- "~/.rpmrc", NULL);
-+ SYSCONFDIR "/rpmrc", ":");
- }
-
- #ifndef MACROFILES
-@@ -471,8 +470,7 @@ static void setDefaults(void)
- confdir, "/" RPMCANONVENDOR "/macros", ":",
- SYSCONFDIR "/rpm/macros.*", ":",
- SYSCONFDIR "/rpm/macros", ":",
-- SYSCONFDIR "/rpm/%{_target}/macros", ":",
-- "~/.rpmmacros", NULL);
-+ SYSCONFDIR "/rpm/%{_target}/macros", ":");
- }
- #else
- macrofiles = MACROFILES;
---
-2.11.0
-
+++ /dev/null
-From a674b9cc7af448d7c6748bc163bf37dc14a57f09 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 20 Jan 2017 13:32:06 +0200
-Subject: [PATCH] Do not reset the PATH environment variable before running
- scriptlets.
-
-We add lots of native stuff into it and scriptlets rely on that.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- lib/rpmscript.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/rpmscript.c b/lib/rpmscript.c
-index 6a31e0d..2b0e438 100644
---- a/lib/rpmscript.c
-+++ b/lib/rpmscript.c
-@@ -184,7 +184,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes,
- if (ipath && ipath[5] != '%')
- path = ipath;
-
-- xx = setenv("PATH", path, 1);
-+ //xx = setenv("PATH", path, 1);
- free(ipath);
- }
-
+++ /dev/null
-From d076de030deb9cafd9b2e82be5d506cebdefad0b Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 27 Feb 2017 14:43:21 +0200
-Subject: [PATCH 1/9] Fix build with musl C library.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- configure.ac | 3 ++-
- rpmio/digest_nss.c | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c04a2e8d1..c9d9ac16d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -255,6 +255,7 @@ AC_SEARCH_LIBS(dlopen, [dl])
- # Check for libelf library. Prefer external, otherwise none.
- WITH_LIBELF_LIB=
- AC_CHECK_HEADER([libelf.h])
-+AC_CHECK_HEADERS([error.h], [WITH_ERROR_H=yes])
- AC_CHECK_HEADERS([gelf.h], [
- AC_CHECK_LIB(elf, gelf_getvernaux, [
- AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).])
-@@ -263,7 +264,7 @@ AC_CHECK_HEADERS([gelf.h], [
- ])
- ])
- AC_SUBST(WITH_LIBELF_LIB)
--AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes])
-+AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes && test "$WITH_ERROR_H" = yes])
-
- AC_CHECK_HEADERS([dwarf.h], [
- WITH_LIBDWARF=yes
-diff --git a/rpmio/digest_nss.c b/rpmio/digest_nss.c
-index 992d9acf6..e11920e3e 100644
---- a/rpmio/digest_nss.c
-+++ b/rpmio/digest_nss.c
-@@ -1,5 +1,6 @@
- #include "system.h"
-
-+#include <signal.h>
- #include <pthread.h>
- #include <nss.h>
- #include <sechash.h>
---
-2.14.2
-
+++ /dev/null
-From 721a660a507d6d062e7aecafad886c643970a5d5 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 25 May 2017 18:15:27 +0300
-Subject: [PATCH 1/4] Split binary package building into a separate function
-
-So that it can be run as a thread pool task.
-
-Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/226]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- build/pack.c | 33 +++++++++++++++++++++------------
- 1 file changed, 21 insertions(+), 12 deletions(-)
-
-diff --git a/build/pack.c b/build/pack.c
-index 518f4e92a..ccfd614cc 100644
---- a/build/pack.c
-+++ b/build/pack.c
-@@ -546,18 +546,13 @@ static rpmRC checkPackages(char *pkgcheck)
- return RPMRC_OK;
- }
-
--rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)
-+static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int cheating, char** filename)
- {
-- rpmRC rc;
-- const char *errorString;
-- Package pkg;
-- char *pkglist = NULL;
--
-- for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
-- char *fn;
-+ const char *errorString;
-+ rpmRC rc = RPMRC_OK;
-
- if (pkg->fileList == NULL)
-- continue;
-+ return rc;
-
- if ((rc = processScriptFiles(spec, pkg)))
- return rc;
-@@ -587,7 +582,7 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)
- headerGetString(pkg->header, RPMTAG_NAME), errorString);
- return RPMRC_FAIL;
- }
-- fn = rpmGetPath("%{_rpmdir}/", binRpm, NULL);
-+ *filename = rpmGetPath("%{_rpmdir}/", binRpm, NULL);
- if ((binDir = strchr(binRpm, '/')) != NULL) {
- struct stat st;
- char *dn;
-@@ -609,14 +604,28 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)
- free(binRpm);
- }
-
-- rc = writeRPM(pkg, NULL, fn, NULL);
-+ rc = writeRPM(pkg, NULL, *filename, NULL);
- if (rc == RPMRC_OK) {
- /* Do check each written package if enabled */
-- char *pkgcheck = rpmExpand("%{?_build_pkgcheck} ", fn, NULL);
-+ char *pkgcheck = rpmExpand("%{?_build_pkgcheck} ", *filename, NULL);
- if (pkgcheck[0] != ' ') {
- rc = checkPackages(pkgcheck);
- }
- free(pkgcheck);
-+ }
-+ return rc;
-+}
-+
-+rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)
-+{
-+ rpmRC rc;
-+ Package pkg;
-+ char *pkglist = NULL;
-+
-+ for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
-+ char *fn = NULL;
-+ rc = packageBinary(spec, pkg, cookie, cheating, &fn);
-+ if (rc == RPMRC_OK) {
- rstrcat(&pkglist, fn);
- rstrcat(&pkglist, " ");
- }
---
-2.11.0
-
+++ /dev/null
-From a89daa75ac970d8e247edc762d1181e9a5b0c5d0 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 17 Jan 2017 14:07:17 +0200
-Subject: [PATCH] When cross-installing, execute package scriptlets without
- chrooting into destination rootfs
-
-This is triggered only when RPM_NO_CHROOT_FOR_SCRIPTS environment variable is defined.
-Otherwise they will trigger an explosion of failures, obviously.
-
-Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>:
-
- Remove leaking temporary scriptlet files
-
- Since we tell dnf to run rpm with debug output, this will result in rpm not
- cleaning up written temporary scriptlet files (same flag controls both
- behaviors). This wouldn't have been a problem since we normally would use the
- target sysroot also for temporary files, but we need to chroot out to be able
- to actually run the rpm scriptlets (purpose of this patch), so the temporary
- files are written to the host's /var/tmp/ directory, causing a gradual
- resource leakage on the host system for every RPM based do_rootfs task
- executed.
-
- Signed-off-by: Olof Johansson <olofjn@axis.com>
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- lib/rpmscript.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/lib/rpmscript.c b/lib/rpmscript.c
-index cc98c4885..f8bd3df04 100644
---- a/lib/rpmscript.c
-+++ b/lib/rpmscript.c
-@@ -394,8 +394,7 @@ exit:
- Fclose(out); /* XXX dup'd STDOUT_FILENO */
-
- if (fn) {
-- if (!rpmIsDebug())
-- unlink(fn);
-+ unlink(fn);
- free(fn);
- }
- free(mline);
-@@ -428,7 +427,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd,
-
- if (rc != RPMRC_FAIL) {
- if (script_type & RPMSCRIPTLET_EXEC) {
-- rc = runExtScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, &script->nextFileFunc);
-+ if (getenv("RPM_NO_CHROOT_FOR_SCRIPTS") != NULL) {
-+ rpmChrootOut();
-+ rc = runExtScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, &script->nextFileFunc);
-+ rpmChrootIn();
-+ } else {
-+ rc = runExtScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, &script->nextFileFunc);
-+ }
- } else {
- rc = runLuaScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, &script->nextFileFunc);
- }
---
-2.11.0
-
+++ /dev/null
-perl: disable auto requires
-
-When generating automatic requirements, it's possible for perl scripts to
-declare 'optional' dependencies. These seem to often be incorrect and will
-cause installation failures in OE. Instead of fixing the perl scripts, it
-was decided it is better to simply disable the automatic dependency
-generation. This matches the behavior from the previous RPM5 implementation.
-
-Upstream-Status: Inappropriate [OE specific configuration]
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-Index: git/fileattrs/perl.attr
-===================================================================
---- git.orig/fileattrs/perl.attr
-+++ git/fileattrs/perl.attr
-@@ -1,3 +1,3 @@
--%__perl_requires %{_rpmconfigdir}/perl.req
-+#__perl_requires %{_rpmconfigdir}/perl.req
- %__perl_magic ^.*[Pp]erl .*$
- %__perl_flags exeonly
-Index: git/fileattrs/perllib.attr
-===================================================================
---- git.orig/fileattrs/perllib.attr
-+++ git/fileattrs/perllib.attr
-@@ -1,5 +1,5 @@
- %__perllib_provides %{_rpmconfigdir}/perl.prov
--%__perllib_requires %{_rpmconfigdir}/perl.req
-+#__perllib_requires %{_rpmconfigdir}/perl.req
- %__perllib_magic ^Perl[[:digit:]] module source.*
- %__perllib_path \\.pm$
- %__perllib_flags magic_and_path
+++ /dev/null
-From 0066b862bb3a09f39295abd5d972a53ac8dc1555 Mon Sep 17 00:00:00 2001
-From: Peter Bergin <peter@berginkonsult.se>
-Date: Wed, 19 Sep 2018 15:12:31 +0200
-Subject: [PATCH] rpm/rpmio.c: restrict virtual memory usage if limit set
-
-A solution to avoid OOM situation when the virtual memory is restricted
-for a user (ulimit -v). As the lzopen_internal function is run in parallel
-one instance per CPU thread the available virtual memory is limited per
-CPU thread.
-
-Upstream-Status: Pending [merge of multithreading patches to upstream]
-
-Signed-off-by: Peter Bergin <peter@berginkonsult.se>
----
- rpmio/rpmio.c | 34 ++++++++++++++++++++++++++++++++++
- 1 file changed, 34 insertions(+)
-
-diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
-index e051c98..b3c56b6 100644
---- a/rpmio/rpmio.c
-+++ b/rpmio/rpmio.c
-@@ -845,6 +845,40 @@ static LZFILE *lzopen_internal(const char *mode, int fd, int xz)
- }
- #endif
-
-+ struct rlimit virtual_memory;
-+ getrlimit(RLIMIT_AS, &virtual_memory);
-+ if (virtual_memory.rlim_cur != RLIM_INFINITY) {
-+ const uint64_t virtual_memlimit = virtual_memory.rlim_cur;
-+ const uint64_t virtual_memlimit_per_cpu_thread =
-+ virtual_memlimit / lzma_cputhreads();
-+ uint64_t memory_usage_virt;
-+ rpmlog(RPMLOG_NOTICE, "XZ: virtual memory restricted to %lu and "
-+ "per CPU thread %lu\n", virtual_memlimit, virtual_memlimit_per_cpu_thread);
-+ /* keep reducing the number of compression threads until memory
-+ usage falls below the limit per CPU thread*/
-+ while ((memory_usage_virt = lzma_stream_encoder_mt_memusage(&mt_options)) >
-+ virtual_memlimit_per_cpu_thread) {
-+ /* If number of threads goes down to zero lzma_stream_encoder will
-+ * will return UINT64_MAX. We must check here to avoid an infinite loop.
-+ * If we get into situation that one thread requires more virtual memory
-+ * than available we set one thread, print error message and try anyway. */
-+ if (--mt_options.threads == 0) {
-+ mt_options.threads = 1;
-+ rpmlog(RPMLOG_WARNING,
-+ "XZ: Could not adjust number of threads to get below "
-+ "virtual memory limit %lu. usage %lu\n",
-+ virtual_memlimit_per_cpu_thread, memory_usage_virt);
-+ break;
-+ }
-+ }
-+ if (threads != (int)mt_options.threads)
-+ rpmlog(RPMLOG_NOTICE,
-+ "XZ: Adjusted the number of threads from %d to %d to not "
-+ "exceed the memory usage limit of %lu bytes\n",
-+ threads, mt_options.threads, virtual_memlimit);
-+
-+ }
-+
- ret = lzma_stream_encoder_mt(&lzfile->strm, &mt_options);
- }
- #endif
---
-2.7.4
-
+++ /dev/null
-From 383c0b097b7eba16801a9e3c4b8e36a4b6de74ab Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 20 Jan 2017 13:33:05 +0200
-Subject: [PATCH 2/2] Add support for prefixing /etc from RPM_ETCCONFIGDIR
- environment variable
-
-This is needed so that rpm can pick up target-specific configuration
-from target rootfs instead of its own native sysroot.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- lib/rpmrc.c | 19 ++++++++++++++-----
- 1 file changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/lib/rpmrc.c b/lib/rpmrc.c
-index 19fe80f98..6b27b3941 100644
---- a/lib/rpmrc.c
-+++ b/lib/rpmrc.c
-@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const char * name,
- static void setDefaults(void)
- {
- const char *confdir = rpmConfigDir();
-+ const char *etcconfdir = getenv("RPM_ETCCONFIGDIR");
-+ if (etcconfdir == NULL)
-+ etcconfdir = "";
-+
- if (!defrcfiles) {
- defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":",
- confdir, "/" RPMCANONVENDOR "/rpmrc", ":",
-- SYSCONFDIR "/rpmrc", ":");
-+ etcconfdir, SYSCONFDIR "/rpmrc", ":", NULL);
- }
-
- #ifndef MACROFILES
-@@ -468,9 +472,9 @@ static void setDefaults(void)
- confdir, "/platform/%{_target}/macros", ":",
- confdir, "/fileattrs/*.attr", ":",
- confdir, "/" RPMCANONVENDOR "/macros", ":",
-- SYSCONFDIR "/rpm/macros.*", ":",
-- SYSCONFDIR "/rpm/macros", ":",
-- SYSCONFDIR "/rpm/%{_target}/macros", ":");
-+ etcconfdir, SYSCONFDIR "/rpm/macros.*", ":",
-+ etcconfdir, SYSCONFDIR "/rpm/macros", ":",
-+ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", ":", NULL);
- }
- #else
- macrofiles = MACROFILES;
-@@ -989,7 +993,11 @@ static void read_auxv(void)
- */
- static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os)
- {
-- const char * const platform_path = SYSCONFDIR "/rpm/platform";
-+ const char *etcconfdir = getenv("RPM_ETCCONFIGDIR");
-+ if (etcconfdir == NULL)
-+ etcconfdir = "";
-+
-+ const char * const platform_path = rstrscat(NULL, etcconfdir, SYSCONFDIR "/rpm/platform", NULL);
- static struct utsname un;
- char * chptr;
- canonEntry canon;
-@@ -1286,6 +1294,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os)
-
- if (arch) *arch = un.machine;
- if (os) *os = un.sysname;
-+ free(platform_path);
- }
-
- static
---
-2.11.0
-
+++ /dev/null
-From 513200cf76758de4668312c628d6362bdabfaf4b Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 25 May 2017 19:30:20 +0300
-Subject: [PATCH 1/3] Run binary package creation via thread pools.
-
-Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/226]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- build/pack.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
- configure.ac | 3 +++
- 2 files changed, 70 insertions(+), 14 deletions(-)
-
-diff --git a/build/pack.c b/build/pack.c
-index ccfd614cc..ed5b9ab4e 100644
---- a/build/pack.c
-+++ b/build/pack.c
-@@ -616,25 +616,78 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch
- return rc;
- }
-
--rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)
-+struct binaryPackageTaskData
- {
-- rpmRC rc;
- Package pkg;
-+ char *filename;
-+ rpmRC result;
-+ struct binaryPackageTaskData *next;
-+};
-+
-+static struct binaryPackageTaskData* runBinaryPackageTasks(rpmSpec spec, const char *cookie, int cheating)
-+{
-+ struct binaryPackageTaskData *tasks = NULL;
-+ struct binaryPackageTaskData *task = NULL;
-+ struct binaryPackageTaskData *prev = NULL;
-+
-+ for (Package pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
-+ task = rcalloc(1, sizeof(*task));
-+ task->pkg = pkg;
-+ if (pkg == spec->packages) {
-+ // the first package needs to be processed ahead of others, as they copy
-+ // changelog data from it, and so otherwise data races would happen
-+ task->result = packageBinary(spec, pkg, cookie, cheating, &(task->filename));
-+ rpmlog(RPMLOG_NOTICE, _("Finished binary package job, result %d, filename %s\n"), task->result, task->filename);
-+ tasks = task;
-+ }
-+ if (prev != NULL) {
-+ prev->next = task;
-+ }
-+ prev = task;
-+ }
-+
-+ #pragma omp parallel
-+ #pragma omp single
-+ // re-declaring task variable is necessary, or older gcc versions will produce code that segfaults
-+ for (struct binaryPackageTaskData *task = tasks; task != NULL; task = task->next) {
-+ if (task != tasks)
-+ #pragma omp task
-+ {
-+ task->result = packageBinary(spec, task->pkg, cookie, cheating, &(task->filename));
-+ rpmlog(RPMLOG_NOTICE, _("Finished binary package job, result %d, filename %s\n"), task->result, task->filename);
-+ }
-+ }
-+
-+ return tasks;
-+}
-+
-+static void freeBinaryPackageTasks(struct binaryPackageTaskData* tasks)
-+{
-+ while (tasks != NULL) {
-+ struct binaryPackageTaskData* next = tasks->next;
-+ rfree(tasks->filename);
-+ rfree(tasks);
-+ tasks = next;
-+ }
-+}
-+
-+rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)
-+{
- char *pkglist = NULL;
-
-- for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
-- char *fn = NULL;
-- rc = packageBinary(spec, pkg, cookie, cheating, &fn);
-- if (rc == RPMRC_OK) {
-- rstrcat(&pkglist, fn);
-- rstrcat(&pkglist, " ");
-- }
-- free(fn);
-- if (rc != RPMRC_OK) {
-- pkglist = _free(pkglist);
-- return rc;
-- }
-+ struct binaryPackageTaskData *tasks = runBinaryPackageTasks(spec, cookie, cheating);
-+
-+ for (struct binaryPackageTaskData *task = tasks; task != NULL; task = task->next) {
-+ if (task->result == RPMRC_OK) {
-+ rstrcat(&pkglist, task->filename);
-+ rstrcat(&pkglist, " ");
-+ } else {
-+ _free(pkglist);
-+ freeBinaryPackageTasks(tasks);
-+ return RPMRC_FAIL;
-+ }
- }
-+ freeBinaryPackageTasks(tasks);
-
- /* Now check the package set if enabled */
- if (pkglist != NULL) {
-diff --git a/configure.ac b/configure.ac
-index a506ec819..59fa0acaf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,6 +17,9 @@ AC_DISABLE_STATIC
-
- PKG_PROG_PKG_CONFIG
-
-+AC_OPENMP
-+RPMCFLAGS="$OPENMP_CFLAGS $RPMCFLAGS"
-+
- dnl Checks for programs.
- AC_PROG_CXX
- AC_PROG_AWK
---
-2.11.0
-
+++ /dev/null
-From c80892f17e44331206c8318d53b63bb6a99554d0 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 30 May 2017 13:58:30 +0300
-Subject: [PATCH 3/4] rpmstrpool.c: make operations over string pools
- thread-safe
-
-Otherwise multithreaded rpm building explodes in various ways due
-to data races.
-
-Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/226]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- rpmio/rpmstrpool.c | 56 +++++++++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 47 insertions(+), 9 deletions(-)
-
-diff --git a/rpmio/rpmstrpool.c b/rpmio/rpmstrpool.c
-index 30a57eb10..58ba95a02 100644
---- a/rpmio/rpmstrpool.c
-+++ b/rpmio/rpmstrpool.c
-@@ -113,6 +113,8 @@ static poolHash poolHashCreate(int numBuckets)
- return ht;
- }
-
-+static const char * rpmstrPoolStrNoLock(rpmstrPool pool, rpmsid sid);
-+
- static void poolHashResize(rpmstrPool pool, int numBuckets)
- {
- poolHash ht = pool->hash;
-@@ -120,7 +122,7 @@ static void poolHashResize(rpmstrPool pool, int numBuckets)
-
- for (int i=0; i<ht->numBuckets; i++) {
- if (!ht->buckets[i].keyid) continue;
-- unsigned int keyHash = rstrhash(rpmstrPoolStr(pool, ht->buckets[i].keyid));
-+ unsigned int keyHash = rstrhash(rpmstrPoolStrNoLock(pool, ht->buckets[i].keyid));
- for (unsigned int j=0;;j++) {
- unsigned int hash = hashbucket(keyHash, j) % numBuckets;
- if (!buckets[hash].keyid) {
-@@ -149,7 +151,7 @@ static void poolHashAddHEntry(rpmstrPool pool, const char * key, unsigned int ke
- ht->buckets[hash].keyid = keyid;
- ht->keyCount++;
- break;
-- } else if (!strcmp(rpmstrPoolStr(pool, ht->buckets[hash].keyid), key)) {
-+ } else if (!strcmp(rpmstrPoolStrNoLock(pool, ht->buckets[hash].keyid), key)) {
- return;
- }
- }
-@@ -191,7 +193,7 @@ static void poolHashPrintStats(rpmstrPool pool)
- int maxcollisions = 0;
-
- for (i=0; i<ht->numBuckets; i++) {
-- unsigned int keyHash = rstrhash(rpmstrPoolStr(pool, ht->buckets[i].keyid));
-+ unsigned int keyHash = rstrhash(rpmstrPoolStrNoLock(pool, ht->buckets[i].keyid));
- for (unsigned int j=0;;j++) {
- unsigned int hash = hashbucket(keyHash, i) % ht->numBuckets;
- if (hash==i) {
-@@ -221,7 +223,7 @@ static void rpmstrPoolRehash(rpmstrPool pool)
-
- pool->hash = poolHashCreate(sizehint);
- for (int i = 1; i <= pool->offs_size; i++)
-- poolHashAddEntry(pool, rpmstrPoolStr(pool, i), i);
-+ poolHashAddEntry(pool, rpmstrPoolStrNoLock(pool, i), i);
- }
-
- rpmstrPool rpmstrPoolCreate(void)
-@@ -245,6 +247,8 @@ rpmstrPool rpmstrPoolCreate(void)
-
- rpmstrPool rpmstrPoolFree(rpmstrPool pool)
- {
-+ #pragma omp critical(rpmstrpool)
-+ {
- if (pool) {
- if (pool->nrefs > 1) {
- pool->nrefs--;
-@@ -260,18 +264,24 @@ rpmstrPool rpmstrPoolFree(rpmstrPool pool)
- free(pool);
- }
- }
-+ }
- return NULL;
- }
-
- rpmstrPool rpmstrPoolLink(rpmstrPool pool)
- {
-+ #pragma omp critical(rpmstrpool)
-+ {
- if (pool)
- pool->nrefs++;
-+ }
- return pool;
- }
-
- void rpmstrPoolFreeze(rpmstrPool pool, int keephash)
- {
-+ #pragma omp critical(rpmstrpool)
-+ {
- if (pool && !pool->frozen) {
- if (!keephash) {
- pool->hash = poolHashFree(pool->hash);
-@@ -281,16 +291,20 @@ void rpmstrPoolFreeze(rpmstrPool pool, int keephash)
- pool->offs_alloced * sizeof(*pool->offs));
- pool->frozen = 1;
- }
-+ }
- }
-
- void rpmstrPoolUnfreeze(rpmstrPool pool)
- {
-+ #pragma omp critical(rpmstrpool)
-+ {
- if (pool) {
- if (pool->hash == NULL) {
- rpmstrPoolRehash(pool);
- }
- pool->frozen = 0;
- }
-+ }
- }
-
- static rpmsid rpmstrPoolPut(rpmstrPool pool, const char *s, size_t slen, unsigned int hash)
-@@ -350,7 +364,7 @@ static rpmsid rpmstrPoolGet(rpmstrPool pool, const char * key, size_t keylen,
- return 0;
- }
-
-- s = rpmstrPoolStr(pool, ht->buckets[hash].keyid);
-+ s = rpmstrPoolStrNoLock(pool, ht->buckets[hash].keyid);
- /* pool string could be longer than keylen, require exact matche */
- if (strncmp(s, key, keylen) == 0 && s[keylen] == '\0')
- return ht->buckets[hash].keyid;
-@@ -373,27 +387,31 @@ static inline rpmsid strn2id(rpmstrPool pool, const char *s, size_t slen,
- rpmsid rpmstrPoolIdn(rpmstrPool pool, const char *s, size_t slen, int create)
- {
- rpmsid sid = 0;
--
-+ #pragma omp critical(rpmstrpool)
-+ {
- if (s != NULL) {
- unsigned int hash = rstrnhash(s, slen);
- sid = strn2id(pool, s, slen, hash, create);
- }
-+ }
- return sid;
- }
-
- rpmsid rpmstrPoolId(rpmstrPool pool, const char *s, int create)
- {
- rpmsid sid = 0;
--
-+ #pragma omp critical(rpmstrpool)
-+ {
- if (s != NULL) {
- size_t slen;
- unsigned int hash = rstrlenhash(s, &slen);
- sid = strn2id(pool, s, slen, hash, create);
- }
-+ }
- return sid;
- }
-
--const char * rpmstrPoolStr(rpmstrPool pool, rpmsid sid)
-+static const char * rpmstrPoolStrNoLock(rpmstrPool pool, rpmsid sid)
- {
- const char *s = NULL;
- if (pool && sid > 0 && sid <= pool->offs_size)
-@@ -401,12 +419,25 @@ const char * rpmstrPoolStr(rpmstrPool pool, rpmsid sid)
- return s;
- }
-
-+const char * rpmstrPoolStr(rpmstrPool pool, rpmsid sid)
-+{
-+ const char *s = NULL;
-+ #pragma omp critical(rpmstrpool)
-+ {
-+ s = rpmstrPoolStrNoLock(pool, sid);
-+ }
-+ return s;
-+}
-+
- size_t rpmstrPoolStrlen(rpmstrPool pool, rpmsid sid)
- {
- size_t slen = 0;
-+ #pragma omp critical(rpmstrpool)
-+ {
- if (pool && sid > 0 && sid <= pool->offs_size) {
- slen = strlen(pool->offs[sid]);
- }
-+ }
- return slen;
- }
-
-@@ -421,5 +452,12 @@ int rpmstrPoolStreq(rpmstrPool poolA, rpmsid sidA,
-
- rpmsid rpmstrPoolNumStr(rpmstrPool pool)
- {
-- return (pool != NULL) ? pool->offs_size : 0;
-+ rpmsid id = 0;
-+ #pragma omp critical(rpmstrpool)
-+ {
-+ if (pool) {
-+ id = pool->offs_size;
-+ }
-+ }
-+ return id;
- }
---
-2.11.0
-
+++ /dev/null
-From 792693bb90768cfde4898e8dd31ee1b5de803d2f Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 8 Jun 2017 17:08:09 +0300
-Subject: [PATCH] build/pack.c: remove static local variables from buildHost()
- and getBuildTime()
-
-Their use is causing difficult to diagnoze data races when building multiple
-packages in parallel, and is a bad idea in general, as it also makes it more
-difficult to reason about code.
-
-Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/226]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- build/build.c | 54 ++++++++++++++++++++++++++++--
- build/pack.c | 84 +++++++++--------------------------------------
- build/rpmbuild_internal.h | 8 +++--
- 3 files changed, 74 insertions(+), 72 deletions(-)
-
-diff --git a/build/build.c b/build/build.c
-index 13c3df2..b154f08 100644
---- a/build/build.c
-+++ b/build/build.c
-@@ -6,6 +6,8 @@
- #include "system.h"
-
- #include <errno.h>
-+#include <netdb.h>
-+#include <time.h>
- #include <sys/wait.h>
-
- #include <rpm/rpmlog.h>
-@@ -16,6 +18,50 @@
-
- #include "debug.h"
-
-+static rpm_time_t getBuildTime(void)
-+{
-+ rpm_time_t buildTime = 0;
-+ char *srcdate;
-+ time_t epoch;
-+ char *endptr;
-+
-+ srcdate = getenv("SOURCE_DATE_EPOCH");
-+ if (srcdate) {
-+ errno = 0;
-+ epoch = strtol(srcdate, &endptr, 10);
-+ if (srcdate == endptr || *endptr || errno != 0)
-+ rpmlog(RPMLOG_ERR, _("unable to parse SOURCE_DATE_EPOCH\n"));
-+ else
-+ buildTime = (int32_t) epoch;
-+ } else
-+ buildTime = (int32_t) time(NULL);
-+
-+ return buildTime;
-+}
-+
-+static char * buildHost(void)
-+{
-+ char* hostname;
-+ struct hostent *hbn;
-+ char *bhMacro;
-+
-+ bhMacro = rpmExpand("%{?_buildhost}", NULL);
-+ if (strcmp(bhMacro, "") != 0) {
-+ rasprintf(&hostname, "%s", bhMacro);
-+ } else {
-+ hostname = rcalloc(1024, sizeof(*hostname));
-+ (void) gethostname(hostname, 1024);
-+ hbn = gethostbyname(hostname);
-+ if (hbn)
-+ strcpy(hostname, hbn->h_name);
-+ else
-+ rpmlog(RPMLOG_WARNING,
-+ _("Could not canonicalize hostname: %s\n"), hostname);
-+ }
-+ free(bhMacro);
-+ return(hostname);
-+}
-+
- /**
- */
- static rpmRC doRmSource(rpmSpec spec)
-@@ -201,6 +247,9 @@ static rpmRC buildSpec(BTA_t buildArgs, rpmSpec spec, int what)
- rpmRC rc = RPMRC_OK;
- int test = (what & RPMBUILD_NOBUILD);
- char *cookie = buildArgs->cookie ? xstrdup(buildArgs->cookie) : NULL;
-+ const char* host = buildHost();
-+ rpm_time_t buildTime = getBuildTime();
-+
-
- if (rpmExpandNumeric("%{?source_date_epoch_from_changelog}") &&
- getenv("SOURCE_DATE_EPOCH") == NULL) {
-@@ -269,11 +318,11 @@ static rpmRC buildSpec(BTA_t buildArgs, rpmSpec spec, int what)
- goto exit;
-
- if (((what & RPMBUILD_PACKAGESOURCE) && !test) &&
-- (rc = packageSources(spec, &cookie)))
-+ (rc = packageSources(spec, &cookie, buildTime, host)))
- goto exit;
-
- if (((what & RPMBUILD_PACKAGEBINARY) && !test) &&
-- (rc = packageBinaries(spec, cookie, (didBuild == 0))))
-+ (rc = packageBinaries(spec, cookie, (didBuild == 0), buildTime, host)))
- goto exit;
-
- if ((what & RPMBUILD_CLEAN) &&
-@@ -293,6 +342,7 @@ static rpmRC buildSpec(BTA_t buildArgs, rpmSpec spec, int what)
- (void) unlink(spec->specFile);
-
- exit:
-+ free(host);
- free(cookie);
- spec->rootDir = NULL;
- if (rc != RPMRC_OK && rpmlogGetNrecs() > 0) {
-diff --git a/build/pack.c b/build/pack.c
-index df15876..17a4b09 100644
---- a/build/pack.c
-+++ b/build/pack.c
-@@ -6,8 +6,6 @@
- #include "system.h"
-
- #include <errno.h>
--#include <netdb.h>
--#include <time.h>
- #include <sys/wait.h>
-
- #include <rpm/rpmlib.h> /* RPMSIGTAG*, rpmReadPackageFile */
-@@ -152,57 +150,6 @@ exit:
- return rc;
- }
-
--static rpm_time_t * getBuildTime(void)
--{
-- static rpm_time_t buildTime[1];
-- char *srcdate;
-- time_t epoch;
-- char *endptr;
--
-- if (buildTime[0] == 0) {
-- srcdate = getenv("SOURCE_DATE_EPOCH");
-- if (srcdate) {
-- errno = 0;
-- epoch = strtol(srcdate, &endptr, 10);
-- if (srcdate == endptr || *endptr || errno != 0)
-- rpmlog(RPMLOG_ERR, _("unable to parse SOURCE_DATE_EPOCH\n"));
-- else
-- buildTime[0] = (int32_t) epoch;
-- } else
-- buildTime[0] = (int32_t) time(NULL);
-- }
--
-- return buildTime;
--}
--
--static const char * buildHost(void)
--{
-- static char hostname[1024];
-- static int oneshot = 0;
-- struct hostent *hbn;
-- char *bhMacro;
--
-- if (! oneshot) {
-- bhMacro = rpmExpand("%{?_buildhost}", NULL);
-- if (strcmp(bhMacro, "") != 0 && strlen(bhMacro) < 1024) {
-- strcpy(hostname, bhMacro);
-- } else {
-- if (strcmp(bhMacro, "") != 0)
-- rpmlog(RPMLOG_WARNING, _("The _buildhost macro is too long\n"));
-- (void) gethostname(hostname, sizeof(hostname));
-- hbn = gethostbyname(hostname);
-- if (hbn)
-- strcpy(hostname, hbn->h_name);
-- else
-- rpmlog(RPMLOG_WARNING,
-- _("Could not canonicalize hostname: %s\n"), hostname);
-- }
-- free(bhMacro);
-- oneshot = 1;
-- }
-- return(hostname);
--}
--
- static rpmRC processScriptFiles(rpmSpec spec, Package pkg)
- {
- struct TriggerFileEntry *p;
-@@ -476,7 +423,8 @@ exit:
- * order to how the RPM format is laid on disk.
- */
- static rpmRC writeRPM(Package pkg, unsigned char ** pkgidp,
-- const char *fileName, char **cookie)
-+ const char *fileName, char **cookie,
-+ rpm_time_t buildTime, const char* buildHost)
- {
- FD_t fd = NULL;
- char * rpmio_flags = NULL;
-@@ -500,7 +448,7 @@ static rpmRC writeRPM(Package pkg, unsigned char ** pkgidp,
-
- /* Create and add the cookie */
- if (cookie) {
-- rasprintf(cookie, "%s %d", buildHost(), (int) (*getBuildTime()));
-+ rasprintf(cookie, "%s %d", buildHost, buildTime);
- headerPutString(pkg->header, RPMTAG_COOKIE, *cookie);
- }
-
-@@ -641,7 +589,7 @@ static rpmRC checkPackages(char *pkgcheck)
- return RPMRC_OK;
- }
-
--static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int cheating, char** filename)
-+static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int cheating, char** filename, rpm_time_t buildTime, const char* buildHost)
- {
- const char *errorString;
- rpmRC rc = RPMRC_OK;
-@@ -660,8 +608,8 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch
- headerCopyTags(spec->packages->header, pkg->header, copyTags);
-
- headerPutString(pkg->header, RPMTAG_RPMVERSION, VERSION);
-- headerPutString(pkg->header, RPMTAG_BUILDHOST, buildHost());
-- headerPutUint32(pkg->header, RPMTAG_BUILDTIME, getBuildTime(), 1);
-+ headerPutString(pkg->header, RPMTAG_BUILDHOST, buildHost);
-+ headerPutUint32(pkg->header, RPMTAG_BUILDTIME, &buildTime, 1);
-
- if (spec->sourcePkgId != NULL) {
- headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16);
-@@ -699,7 +647,7 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch
- free(binRpm);
- }
-
-- rc = writeRPM(pkg, NULL, *filename, NULL);
-+ rc = writeRPM(pkg, NULL, *filename, NULL, buildTime, buildHost);
- if (rc == RPMRC_OK) {
- /* Do check each written package if enabled */
- char *pkgcheck = rpmExpand("%{?_build_pkgcheck} ", *filename, NULL);
-@@ -719,7 +667,7 @@ struct binaryPackageTaskData
- struct binaryPackageTaskData *next;
- };
-
--static struct binaryPackageTaskData* runBinaryPackageTasks(rpmSpec spec, const char *cookie, int cheating)
-+static struct binaryPackageTaskData* runBinaryPackageTasks(rpmSpec spec, const char *cookie, int cheating, rpm_time_t buildTime, char* buildHost)
- {
- struct binaryPackageTaskData *tasks = NULL;
- struct binaryPackageTaskData *task = NULL;
-@@ -731,7 +679,7 @@ static struct binaryPackageTaskData* runBinaryPackageTasks(rpmSpec spec, const c
- if (pkg == spec->packages) {
- // the first package needs to be processed ahead of others, as they copy
- // changelog data from it, and so otherwise data races would happen
-- task->result = packageBinary(spec, pkg, cookie, cheating, &(task->filename));
-+ task->result = packageBinary(spec, pkg, cookie, cheating, &(task->filename), buildTime, buildHost);
- rpmlog(RPMLOG_NOTICE, _("Finished binary package job, result %d, filename %s\n"), task->result, task->filename);
- tasks = task;
- }
-@@ -748,7 +696,7 @@ static struct binaryPackageTaskData* runBinaryPackageTasks(rpmSpec spec, const c
- if (task != tasks)
- #pragma omp task
- {
-- task->result = packageBinary(spec, task->pkg, cookie, cheating, &(task->filename));
-+ task->result = packageBinary(spec, task->pkg, cookie, cheating, &(task->filename), buildTime, buildHost);
- rpmlog(RPMLOG_NOTICE, _("Finished binary package job, result %d, filename %s\n"), task->result, task->filename);
- }
- }
-@@ -766,11 +714,11 @@ static void freeBinaryPackageTasks(struct binaryPackageTaskData* tasks)
- }
- }
-
--rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)
-+rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating, rpm_time_t buildTime, char* buildHost)
- {
- char *pkglist = NULL;
-
-- struct binaryPackageTaskData *tasks = runBinaryPackageTasks(spec, cookie, cheating);
-+ struct binaryPackageTaskData *tasks = runBinaryPackageTasks(spec, cookie, cheating, buildTime, buildHost);
-
- for (struct binaryPackageTaskData *task = tasks; task != NULL; task = task->next) {
- if (task->result == RPMRC_OK) {
-@@ -797,7 +745,7 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)
- return RPMRC_OK;
- }
-
--rpmRC packageSources(rpmSpec spec, char **cookie)
-+rpmRC packageSources(rpmSpec spec, char **cookie, rpm_time_t buildTime, char* buildHost)
- {
- Package sourcePkg = spec->sourcePackage;
- rpmRC rc;
-@@ -805,8 +753,8 @@ rpmRC packageSources(rpmSpec spec, char **cookie)
-
- /* Add some cruft */
- headerPutString(sourcePkg->header, RPMTAG_RPMVERSION, VERSION);
-- headerPutString(sourcePkg->header, RPMTAG_BUILDHOST, buildHost());
-- headerPutUint32(sourcePkg->header, RPMTAG_BUILDTIME, getBuildTime(), 1);
-+ headerPutString(sourcePkg->header, RPMTAG_BUILDHOST, buildHost);
-+ headerPutUint32(sourcePkg->header, RPMTAG_BUILDTIME, &buildTime, 1);
- headerPutUint32(sourcePkg->header, RPMTAG_SOURCEPACKAGE, &one, 1);
-
- /* XXX this should be %_srpmdir */
-@@ -814,7 +762,7 @@ rpmRC packageSources(rpmSpec spec, char **cookie)
- char *pkgcheck = rpmExpand("%{?_build_pkgcheck_srpm} ", fn, NULL);
-
- spec->sourcePkgId = NULL;
-- rc = writeRPM(sourcePkg, &spec->sourcePkgId, fn, cookie);
-+ rc = writeRPM(sourcePkg, &spec->sourcePkgId, fn, cookie, buildTime, buildHost);
-
- /* Do check SRPM package if enabled */
- if (rc == RPMRC_OK && pkgcheck[0] != ' ') {
-diff --git a/build/rpmbuild_internal.h b/build/rpmbuild_internal.h
-index 439b7d3..07e8338 100644
---- a/build/rpmbuild_internal.h
-+++ b/build/rpmbuild_internal.h
-@@ -427,19 +427,23 @@ rpmRC processSourceFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags);
- * @param spec spec file control structure
- * @param cookie build identifier "cookie" or NULL
- * @param cheating was build shortcircuited?
-+ * @param buildTime the build timestamp that goes into packages
-+ * @param buildHost the hostname where the build is happening
- * @return RPMRC_OK on success
- */
- RPM_GNUC_INTERNAL
--rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating);
-+rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating, rpm_time_t buildTime, char* buildHost);
-
- /** \ingroup rpmbuild
- * Generate source package.
- * @param spec spec file control structure
- * @retval cookie build identifier "cookie" or NULL
-+ * @param buildTime the build timestamp that goes into packages
-+ * @param buildHost the hostname where the build is happening
- * @return RPMRC_OK on success
- */
- RPM_GNUC_INTERNAL
--rpmRC packageSources(rpmSpec spec, char **cookie);
-+rpmRC packageSources(rpmSpec spec, char **cookie, rpm_time_t buildTime, char* buildHost);
-
- RPM_GNUC_INTERNAL
- int addLangTag(rpmSpec spec, Header h, rpmTagVal tag,
+++ /dev/null
-From 5141d50d7b3d3c209a22c53deedb4ceef014401d Mon Sep 17 00:00:00 2001
-From: Peter Kjellerstedt <pkj@axis.com>
-Date: Mon, 15 May 2017 10:21:08 +0200
-Subject: [PATCH 09/15] Do not require that ELF binaries are executable to be
- identifiable
-
-There is nothing that requires, e.g., a DSO to be executable, but it
-is still an ELF binary and should be identified as such.
-
-Upstream probably expects all ELF binaries to be marked as executable,
-but rather than imposing such a limitation for OE, allow any file to
-be identified as an ELF binary regardless of whether it is executable
-or not.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
-
----
- fileattrs/elf.attr | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/fileattrs/elf.attr b/fileattrs/elf.attr
-index 5805dd0ee..3516f309d 100644
---- a/fileattrs/elf.attr
-+++ b/fileattrs/elf.attr
-@@ -1,4 +1,3 @@
- %__elf_provides %{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private}
- %__elf_requires %{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private}
- %__elf_magic ^(setuid,? )?(setgid,? )?(sticky )?ELF (32|64)-bit.*$
--%__elf_flags exeonly
---
-2.14.2
-
+++ /dev/null
-SUMMARY_python2-rpm = "Python bindings for apps which will manupulate RPM packages"
-DESCRIPTION_python2-rpm = "The python2-rpm package contains a module that permits applications \
-written in the Python programming language to use the interface \
-supplied by the RPM Package Manager libraries."
-
-HOMEPAGE = "http://www.rpm.org"
-
-# libraries are also LGPL - how to express this?
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0bf017c0fd1920e6158a333acabfd4a"
-
-SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \
- file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \
- file://0001-Do-not-read-config-files-from-HOME.patch \
- file://0001-When-cross-installing-execute-package-scriptlets-wit.patch \
- file://0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch \
- file://0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch \
- file://0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch \
- file://0001-Fix-build-with-musl-C-library.patch \
- file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \
- file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \
- file://0001-Split-binary-package-building-into-a-separate-functi.patch \
- file://0002-Run-binary-package-creation-via-thread-pools.patch \
- file://0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch \
- file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \
- file://0001-perl-disable-auto-reqs.patch \
- file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \
- "
-
-PE = "1"
-SRCREV = "753f6941dc32e94047b7cfe713ddd604a810b4db"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "nss libarchive db file popt xz bzip2 dbus elfutils python"
-DEPENDS_append_class-native = " file-replacement-native bzip2-replacement-native"
-
-inherit autotools gettext pkgconfig pythonnative
-export PYTHON_ABI
-
-# OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe
-EXTRA_AUTORECONF_append = " --exclude=gnu-configize"
-
-EXTRA_OECONF_append = " --without-lua --enable-python"
-EXTRA_OECONF_append_libc-musl = " --disable-nls"
-
-# --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs
-#
-# --localstatedir prevents rpm from writing its database to native sysroot when building images
-#
-# Disable dbus for native, so that rpm doesn't attempt to inhibit shutdown via session dbus even when plugins support is enabled.
-# Also disable plugins by default for native.
-EXTRA_OECONF_append_class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins"
-EXTRA_OECONF_append_class-nativesdk = " --sysconfdir=/etc --localstatedir=/var --disable-plugins"
-
-BBCLASSEXTEND = "native nativesdk"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils"
-
-ASNEEDED = ""
-
-do_compile_append () {
- cd python
- cp -r ../../git/python/* ./
- python setup.py build
-}
-
-do_install_append () {
- sed -i -e 's:${HOSTTOOLS_DIR}/::g' \
- ${D}/${libdir}/rpm/macros
-
- sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \
- ${D}${libdir}/rpm/pythondistdeps.py \
- ${D}${libdir}/rpm/python-macro-helper
-
- # remove all contents except python2-rpm
- rm -r ${D}/var
- rm -r ${D}/usr/share
- rm -r ${D}/usr/include
- rm -r ${D}/usr/lib/librpm*
- rm -r ${D}/usr/lib/pkgconfig
- # rm -r ${D}/usr/src
- rm -r ${D}/usr/lib/rpm
- rm -r ${D}/usr/lib/rpm-plugins
- # rm -r ${D}/usr/lib/.debug
- rm -r ${D}/usr/bin
-
- cd python
- python setup.py install \
- --root=${D} --prefix=/usr \
- --install-lib=${PYTHON_SITEPACKAGES_DIR}/ --install-data=${datadir}
-}
-
-PACKAGES = "python2-rpm rpm2-dbg"
-PROVIDES = "python2-rpm rpm2-dbg"
-FILES_python2-rpm = " \
- ${PYTHON_SITEPACKAGES_DIR}/rpm/ \
- ${PYTHON_SITEPACKAGES_DIR}/rpm-${PV}-py${PYTHON_BASEVERSION}.egg-info \
- "
-
-# rpm 5.x was packaging the rpm build tools separately
-#RPROVIDES_${PN} += "rpm-build"
-
-RDEPENDS_${PN} = "bash perl python-core"
-RDEPENDS_python2-rpm = "rpm"
-DEPENDS_python2-rpm = "rpm"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "rsync-config"
-
-LICENSE_append = " & Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/centos/rsync-config.spec;beginline=1;endline=10;md5=0b819b48e21c87ba7f5d0502e304af61 \
- "
-
-inherit systemd
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "rsync.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-
-do_install_append_class-target() {
- install -p -D -m 644 ${S}/packaging/systemd/rsync.service ${D}/${systemd_system_unitdir}/rsync.service
- install -m 644 ${STX_METADATA_PATH}/files/rsyncd.conf ${D}/${sysconfdir}/rsyncd.conf
-}
-
-FILES_${PN}_append = " ${systemd_system_unitdir}"
+++ /dev/null
-
-SUMMARY = "An interpreter of object-oriented scripting language"
-DESCRIPTION = "Ruby is an interpreted scripting language for quick \
-and easy object-oriented programming. It has many features to process \
-text files and to do system management tasks (as in Perl). \
-It is simple, straight-forward, and extensible. \
-"
-HOMEPAGE = "http://www.ruby-lang.org/"
-SECTION = "devel/ruby"
-LICENSE = "Ruby | BSD | GPLv2"
-LIC_FILES_CHKSUM = "\
- file://COPYING;md5=837b32593517ae48b9c3b5c87a5d288c \
- file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5 \
- file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
- file://LEGAL;md5=3ce1fae39fe573b818c0af162bce6579 \
-"
-
-DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline libffi libnsl2"
-DEPENDS_class-native = "zlib-native openssl-native libyaml-native readline-native libnsl2"
-
-SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
-SRC_URI = " \
- http://cache.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p648.tar.gz \
- file://0002-Obey-LDFLAGS-for-the-link-of-libruby.patch \
- "
-# file://0002-Obey-LDFLAGS-for-the-link-of-libruby.patch
-# file://extmk.patch
-UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/"
-
-inherit autotools ptest
-
-
-# This snippet lets compiled extensions which rely on external libraries,
-# such as zlib, compile properly. If we don't do this, then when extmk.rb
-# runs, it uses the native libraries instead of the target libraries, and so
-# none of the linking operations succeed -- which makes extconf.rb think
-# that the libraries aren't available and hence that the extension can't be
-# built.
-
-do_configure_prepend() {
- sed -i "s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS#" ${S}/common.mk
- rm -rf ${S}/ruby/
-}
+++ /dev/null
-From e6a66a83233eead74daab6bfe0390c70989ea110 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Tue, 24 Mar 2020 14:47:02 -0700
-Subject: [PATCH] openembedded socket extconf: hardcode wide getaddr info
-
-From 9341293e71c03fe606edc9157bf1e13e3dd5b507
-Without this the socket extension doesn't build correctly
----
- ext/socket/extconf.rb | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
-index 13937ac773..775d63335d 100644
---- a/ext/socket/extconf.rb
-+++ b/ext/socket/extconf.rb
-@@ -362,6 +362,12 @@ main(void)
- return EXIT_FAILURE;
- }
- EOF
-+
-+
-+# Ignore the actual result of the above test and assume that
-+# everything is OK.
-+getaddr_info_ok = true
-+
- if ipv6 and not getaddr_info_ok
- abort <<EOS
-
---
-2.23.0
-
+++ /dev/null
-diff -Nurpd a/Makefile.in b/Makefile.in
---- a/Makefile.in 2020-04-01 14:03:13.899047800 -0700
-+++ b/Makefile.in 2020-04-01 14:03:57.186887765 -0700
-@@ -70,7 +70,7 @@ EXTLIBS =
- LIBS = @LIBS@ $(EXTLIBS)
- MISSING = @LIBOBJS@ @ALLOCA@
- LDSHARED = @LIBRUBY_LDSHARED@
--DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
-+DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(LDFLAGS) $(ARCH_FLAG)
- SOLIBS = @SOLIBS@
- MAINLIBS = @MAINLIBS@
- ARCHMINIOBJS = @MINIOBJS@
+++ /dev/null
-diff -Nurpd a/ext/socket/extconf.rb b/ext/socket/extconf.rb
---- a/ext/socket/extconf.rb 2020-04-03 10:58:47.646427762 -0700
-+++ b/ext/socket/extconf.rb 2020-04-03 11:00:06.998097135 -0700
-@@ -362,6 +362,9 @@ main(void)
- return EXIT_FAILURE;
- }
- EOF
-+# Ignore the actual result of the above test and assume that
-+# everything is OK.
-+getaddr_info_ok = true
- if ipv6 and not getaddr_info_ok
- abort <<EOS
-
+++ /dev/null
-diff --git a/ext/extmk.rb b/ext/extmk.rb
-index 597fc78..8fad2cc 100755
---- a/ext/extmk.rb
-+++ b/ext/extmk.rb
-@@ -409,7 +409,6 @@ else
- end
- $ruby << " -I'$(topdir)'"
- unless CROSS_COMPILING
-- $ruby << " -I'$(top_srcdir)/lib'"
- $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
- ENV["RUBYLIB"] = "-"
- end
+++ /dev/null
-diff -Nurpd a/regparse.c b/regparse.c
---- a/regparse.c 2020-04-03 10:48:05.349134180 -0700
-+++ b/regparse.c 2020-04-03 10:55:16.647309795 -0700
-@@ -4412,9 +4412,11 @@ next_state_val(CClassNode* cc, OnigCodeP
-
- switch (*state) {
- case CCS_VALUE:
-- if (*type == CCV_SB)
-+ if (*type == CCV_SB) {
-+ if (*from > 0xff)
-+ return ONIGERR_INVALID_CODE_POINT_VALUE;
- BITSET_SET_BIT_CHKDUP(cc->bs, (int )(*vs));
-- else if (*type == CCV_CODE_POINT) {
-+ } else if (*type == CCV_CODE_POINT) {
- r = add_code_range(&(cc->mbuf), env, *vs, *vs);
- if (r < 0) return r;
- }
+++ /dev/null
-From 3b63d12038c8d8fc278e81c942fa9bec7c704c8b Mon Sep 17 00:00:00 2001
-From: "K.Kosako" <kosako@sofnec.co.jp>
-Date: Wed, 24 May 2017 13:43:25 +0900
-Subject: [PATCH] fix #60 : invalid state(CCS_VALUE) in parse_char_class()
-
----
- regparse.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- end of original header
-
-CVE: CVE-2017-9228
-
-Upstream-Status: Inappropriate [not author]
-Signed-off-by: Joe Slater <joe.slater@windriver.com>
-
-diff --git a/regparse.c b/regparse.c
-index 69875fa..1988747 100644
---- a/regparse.c
-+++ b/regparse.c
-@@ -4081,7 +4081,9 @@ next_state_class(CClassNode* cc, OnigCodePoint* vs, enum CCVALTYPE* type,
- }
- }
-
-- *state = CCS_VALUE;
-+ if (*state != CCS_START)
-+ *state = CCS_VALUE;
-+
- *type = CCV_CLASS;
- return 0;
- }
---
-1.7.9.5
-
+++ /dev/null
-
-require ruby.inc
-inherit openssl10
-
-DEPENDS += " libnsl2"
-
-SRCREV = "1a828cad2d559e2ff55a5f01cc5de217b9c9bc2b"
-
-SRC_URI += " \
- git://github.com/ruby/spec.git;protocol=https;rev=${SRCREV};destsuffix=spec/rubyspec \
- file://ruby-CVE-2017-9228.patch \
- file://ext.socket.extmk.patch \
- "
-
-SRC_URI[md5sum] = "05db49992d01731fee023cad09bb4e52"
-SRC_URI[sha256sum] = "8690bd6b4949c333b3919755c4e48885dbfed6fd055fe9ef89930bde0d2376f8"
-
-# it's unknown to configure script, but then passed to extconf.rb
-# maybe it's not really needed as we're hardcoding the result with
-# 0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
-UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo"
-
-PACKAGECONFIG ??= ""
-
-PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind"
-#PACKAGECONFIG[gmp] = "--with-gmp=yes, --with-gmp=no, gmp"
-
-EXTRA_AUTORECONF += "--exclude=aclocal"
-
-EXTRA_OECONF ?= " "
-EXTRA_OECONF = "\
- --disable-install-doc \
- --disable-rpath \
- --disable-dtrace \
- --enable-shared \
- --enable-load-relative \
-"
-
-EXTRA_OEMAKE = " \
- LIBRUBYARG='-lruby-static' \
-"
-
-do_configure_prepend() {
- cd ${S}
- rm -rf spec/rubyspec
- cp -rf ${WORKDIR}/spec ${S}
- cd ${B}
-}
-
-do_install() {
- oe_runmake 'DESTDIR=${D}' install
-}
-
-do_install_append_class-target () {
- # Find out rbconfig.rb from .installed.list
- rbconfig_rb=`grep rbconfig.rb ${B}/.installed.list`
- # Remove build host directories
- sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' \
- -e s:'--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g \
- -e 's|${DEBUG_PREFIX_MAP}||g' \
- -e 's:${HOSTTOOLS_DIR}/::g' \
- -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
- -e 's:${RECIPE_SYSROOT}::g' \
- -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
- ${D}$rbconfig_rb
-
-}
-
-do_install_ptest () {
- cp -rf ${S}/test ${D}${PTEST_PATH}/
- cp -r ${S}/include ${D}/${libdir}/ruby/
- test_case_rb=`grep rubygems/test_case.rb ${B}/.installed.list`
- sed -i -e 's:../../../test/:../../../ptest/test/:g' ${D}/$test_case_rb
-}
-
-FILES_${PN} += "${datadir}/rubygems"
-
-
-BBCLASSEXTEND = "native nativesdk"
-
-# INSANE_SKIP_${PN} += "ldflags"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += " \
- file://collectd-fix-for-LIBPYTHON_LDFLAGS.patch \
- file://default-plugins-cpu.conf \
- file://default-plugins-interface.conf \
- file://default-plugins-load.conf \
- file://default-plugins-memory.conf \
- file://default-plugins-syslog.conf \
- "
-
-PACKAGECONFIG += "python"
-
-PACKAGECONFIG[python] = "--enable-python --with-libpython,--disable-python --with-libpython=no,python"
-
-do_install_append () {
- install -m 755 -d ${D}${sysconfdir}/collectd.d/
- install -m 644 ${WORKDIR}/default-plugins-cpu.conf ${D}${sysconfdir}/collectd.d/90-default-plugins-cpu.conf
- install -m 644 ${WORKDIR}/default-plugins-interface.conf ${D}${sysconfdir}/collectd.d/90-default-plugins-interface.conf
- install -m 644 ${WORKDIR}/default-plugins-load.conf ${D}${sysconfdir}/collectd.d/90-default-plugins-load.conf
- install -m 644 ${WORKDIR}/default-plugins-memory.conf ${D}${sysconfdir}/collectd.d/90-default-plugins-memory.conf
- install -m 644 ${WORKDIR}/default-plugins-syslog.conf ${D}${sysconfdir}/collectd.d/90-default-plugins-syslog.conf
-}
+++ /dev/null
-From b619d111a63d83b4d4bfa3f2c6c28cbd94ba874b Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Sat, 11 Apr 2020 21:55:08 +0800
-Subject: [PATCH] fix for LIBPYTHON_LDFLAGS
-
-There is bug in oe-core's python-native that sysconfig module cat not
-get the correct Py_ENABLE_SHARED, which causes the "python-config --ldflags"
-add the prefix/lib/pythonX.Y/config dir which is the static lib dir,
-here is a workarond to remove the dir, we may need to fix the issue
-in oe-core later.
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b5f8e87..8a2d04f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4641,7 +4641,7 @@ if test "$PYTHON_CONFIG" != ""; then
- if test $? -ne 0; then
- with_libpython="no"
- fi
-- LIBPYTHON_LDFLAGS="`${PYTHON_CONFIG} --ldflags`"
-+ LIBPYTHON_LDFLAGS="`${PYTHON_CONFIG} --ldflags|sed 's/-L.*config //'`"
- if test $? -ne 0; then
- with_libpython="no"
- fi
---
-2.7.4
-
+++ /dev/null
-LoadPlugin cpu
+++ /dev/null
-LoadPlugin interface
+++ /dev/null
-LoadPlugin load
+++ /dev/null
-LoadPlugin memory
+++ /dev/null
-LoadPlugin syslog
+++ /dev/null
-
-DESCRIPTION = "Hardlink is a tool which replaces multiple copies of a file with hardlinks"
-
-HOMEPAGE = "https://jak-linux.org/projects/hardlink"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://hardlink.1;md5=c7a9a3326f28fa218d9af0251a5e1ae4"
-
-SRC_URI = "https://jak-linux.org/projects/hardlink/hardlink_0.3.0.tar.xz"
-SRC_URI[md5sum] = "72f1a460adb6874c151deab766e434ad"
-SRC_URI[sha256sum] = "e8c93dfcb24aeb44a75281ed73757cb862cc63b225d565db1c270af9dbb7300f"
-
-DEPENDS = " attr"
-inherit pkgconfig
-
-do_install() {
- cd ${S}
- oe_runmake -e DESTDIR=${D} BINDIR=${bindir} MANDIR=${datadir} install
-}
-
-FILES_${PN}-doc = "${datadir}/"
+++ /dev/null
-
-SUMMARY = "ibsh Iron Bar Shell"
-DESCRIPTION = "CGCS add default users types"
-SECTION = "base/shell"
-HOMEPAGE = "https://sourceforge.net/projects/ibsh/"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://COPYRIGHT;md5=e5ef2fe07fcba90ea59f9f1a61f7526b \
-"
-
-SRC_URI[md5sum] = "41ea08a03c6bd805dff1a5ff25ea1d5b"
-SRC_URI[sha256sum] = "4c40d0841527c76fc75ccc27d32b575543d02d661973fc3561004efb6033206d"
-SRC_URI = "https://downloads.sourceforge.net/project/ibsh/ibsh/ibsh-0.3e/ibsh-0.3e.tar.gz"
-
-do_install() {
- cd ${S}
- install -d -m0755 ${D}/${base_bindir}
- install -d -m0755 ${D}/${sysconfdir}/ibsh/cmds/
- install -d -m0755 ${D}/${sysconfdir}/ibsh/xtns/
- install -m0755 ibsh ${D}/${base_bindir}
- install -m0644 globals.cmds ${D}/${sysconfdir}/ibsh
- install -m0644 globals.xtns ${D}/${sysconfdir}/ibsh
-}
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "iptables-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- "
-
-inherit systemd
-SYSTEMD_PACKAGES += "${PN}"
-SYSETMD_SERVICE_${PN}_append = "iptables.service ip6tables.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-do_install_append() {
- install -d -m0755 ${D}/${sysconfdir}/sysconfig
- install -m 600 ${STX_METADATA_PATH}/files/iptables.rules ${D}/${sysconfdir}/sysconfig/iptables
- install -m 600 ${STX_METADATA_PATH}/files/ip6tables.rules ${D}/${sysconfdir}/sysconfig/ip6tables
-}
+++ /dev/null
-
-do_install_append() {
- install -d ${D}/${baselib}/security/
- ln -fs ${libdir}/security/pam_pwquality.so ${D}/${baselib}/security/
-}
-
-FILES_${PN} += "/${baselib}/security/"
-INSANE_SKIP_${PN} += "dev-so"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "logrotate-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- "
-
-RDEPENDS_${PN}_append = " cronie"
-
-do_install_append() {
- install -d -m0755 ${D}/${sysconfdir}/cron.d/
- install -m 644 ${STX_METADATA_PATH}/files/logrotate-cron.d ${D}/${sysconfdir}/cron.d/logrotate
- install -m 644 ${STX_METADATA_PATH}/files/logrotate.conf ${D}/${sysconfdir}/logrotate.conf
- #mv ${D}/${sysconfdir}/cron.daily/logrotate ${D}/${sysconfdir}/logrotate.cron
- #chmod 700 ${D}/${sysconfdir}/logrotate.cron
-}
-
+++ /dev/null
-From cf72e404927c807e4352d867f73f2a2c409fc524 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 13 Apr 2020 23:38:43 +0800
-Subject: [PATCH] service: redirect to restart for reload
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- service | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/service b/service
-index 357c2a6..1f3976c 100755
---- a/service
-+++ b/service
-@@ -70,6 +70,10 @@ while [ $# -gt 0 ]; do
- esac
- done
-
-+if [ "${ACTION}" = "reload" ]; then
-+ ACTION="restart"
-+fi
-+
- if [ -f "${SERVICEDIR}/${SERVICE}" ]; then
- # LSB daemons that dies abnormally in systemd looks alive in systemd's eyes due to RemainAfterExit=yes
- # lets reap them before next start
---
-2.7.4
-
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://service-redirect-to-restart-for-reload.patch"
-
-DEPENDS += "\
- gettext-native \
- glib-2.0 \
- popt \
-"
-
-unset do_configure[noexec]
-unset do_compile[noexec]
-
-do_install_append() {
- install -m 0755 -d ${D}/${sysconfdir}/profile.d/
- install -m 0644 ${S}/lang.sh ${D}${sysconfdir}/profile.d/lang.sh
- install -m 0755 -d ${D}/${base_sbindir}
- install -m 0755 ${S}/src/consoletype ${D}/${base_sbindir}
-
- install -m 0755 -d ${D}/${bindir}
- install -m 0755 ${S}/service ${D}/${bindir}
- sed -i -e 's|${bindir}|${base_bindir}|' ${D}/${bindir}/service
-}
-
-FILES_${PN}_append = "${sysconfdir}/profile.d/lang.sh"
+++ /dev/null
-diff --git a/util-linux-config/files/stx.postlogin b/util-linux-config/files/stx.postlogin
-new file mode 100644
-index 0000000..292bd8a
---- /dev/null
-+++ b/stx.postlogin
-@@ -0,0 +1,3 @@
-+session [default=1] pam_lastlog.so nowtmp showfailed
-+session optional pam_lastlog.so silent noupdate showfailed
-+
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "pam-config"
-
-LICENSE_append = " & Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/centos/pam-config.spec;beginline=1;endline=10;md5=fa5ec877c97a75a09b397bccc95b2b87 \
- "
-
-SRC_URI += " \
- file://util-linux-pam-postlogin.patch \
- "
-
-do_install_append () {
-
- # From util-linux-config patch
- install -m 644 ${S}/stx.postlogin ${D}/${sysconfdir}/pam.d/postlogin
-
- install -m 644 ${STX_METADATA_PATH}/files/sshd.pam ${D}/${sysconfdir}/pam.d/sshd.pam
- install -m 644 ${STX_METADATA_PATH}/files/common-account ${D}/${sysconfdir}/pam.d/common-account
- install -m 644 ${STX_METADATA_PATH}/files/common-auth ${D}/${sysconfdir}/pam.d/common-auth
- install -m 644 ${STX_METADATA_PATH}/files/common-password ${D}/${sysconfdir}/pam.d/common-password
- install -m 644 ${STX_METADATA_PATH}/files/common-session ${D}/${sysconfdir}/pam.d/common-session
-
- install -m 644 ${STX_METADATA_PATH}/files/common-session-noninteractive \
- ${D}/${sysconfdir}/pam.d/common-session-noninteractive
-
- install -m 644 ${STX_METADATA_PATH}/files/system-auth.pamd ${D}/${sysconfdir}/pam.d/system-auth
- # A better place is the autoconfig from kickstarter
- sed -i -e '/password .*pam_ldap.so/,/session .*revoke/ s/^$/password required pam_deny.so\n/g' \
- ${D}/${sysconfdir}/pam.d/system-auth
-}
-
-RRECOMMENDS_${PN}_append = " \
- nss-pam-ldapd \
- libpwquality \
- pam-plugin-access \
- pam-plugin-cracklib \
- pam-plugin-debug \
- pam-plugin-deny \
- pam-plugin-echo \
- pam-plugin-env \
- pam-plugin-exec \
- pam-plugin-faildelay \
- pam-plugin-filter \
- pam-plugin-ftp \
- pam-plugin-group \
- pam-plugin-issue \
- pam-plugin-keyinit \
- pam-plugin-lastlog \
- pam-plugin-limits \
- pam-plugin-listfile \
- pam-plugin-localuser \
- pam-plugin-loginuid \
- pam-plugin-mail \
- pam-plugin-mkhomedir \
- pam-plugin-motd \
- pam-plugin-namespace \
- pam-plugin-nologin \
- pam-plugin-permit \
- pam-plugin-pwhistory \
- pam-plugin-rhosts \
- pam-plugin-rootok \
- pam-plugin-securetty \
- pam-plugin-shells \
- pam-plugin-stress \
- pam-plugin-succeed-if \
- pam-plugin-tally \
- pam-plugin-stress \
- pam-plugin-succeed-if \
- pam-plugin-tally \
- pam-plugin-tally2 \
- pam-plugin-time \
- pam-plugin-timestamp \
- pam-plugin-umask \
- pam-plugin-unix \
- pam-plugin-warn \
- pam-plugin-wheel \
- pam-plugin-xauth \
- "
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "initscripts-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += " \
- file://${STX_METADATA_PATH}/centos/initscripts-config.spec;beginline=1;endline=10;md5=5c43895c2c3756125227c74209b8b791 \
- "
-
-do_install_append () {
- install -d -m 755 ${D}/${sysconfdir}
- install -m 644 ${STX_METADATA_PATH}/files/sysctl.conf ${D}/${sysconfdir}/sysctl.conf
-}
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "rabbitmq-server-config"
-
-LICENSE_append = " & Apache-2.0"
-
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/centos/rabbitmq-server-config.spec;beginline=1;endline=10;md5=47a43f492f496b985b830ce47b8c5cec \
- "
-
-do_install_append () {
-
- # Libdir here is hardcoded in other scripts.
- install -d ${D}/usr/lib/ocf/resource.d/rabbitmq
- install -d ${D}/${sysconfdir}/systemd/system
- install -d ${D}/${sysconfdir}/logrotate.d
-
- install -m 0755 ${STX_METADATA_PATH}/files/rabbitmq-server.ocf \
- ${D}/usr/lib/ocf/resource.d/rabbitmq/stx.rabbitmq-server
-
- install -m 0644 ${STX_METADATA_PATH}/files/rabbitmq-server.service.example \
- ${D}/${sysconfdir}/systemd/system/rabbitmq-server.service
- sed -i -e 's/notify/simple/' ${D}/${sysconfdir}/systemd/system/rabbitmq-server.service
- # Remove lib/systemd/
- rm -rf ${D}/${nonarch_base_libdir}
-
- install -m 0644 ${STX_METADATA_PATH}/files/rabbitmq-server.logrotate \
- ${D}/${sysconfdir}/logrotate.d/rabbitmq-server
-
-}
+++ /dev/null
-USERADD_PARAM_${PN} = "-r -g rpc -u 32 -d /var/lib/rpcbind -s /sbin/nologin -c 'Rpcbind Daemons' rpc"
-GROUPADD_PARAM_${PN} = "-r -g 32 rpc"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH0 = "shadow-utils-config"
-STX_SUBPATH1 = "util-linux-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/${STX_SUBPATH0}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- file://${STX_METADATA_PATH}/${STX_SUBPATH1}/centos/util-linux-config.spec;beginline=1;endline=10;md5=5801a9b9ee2a1468c289f27bd8ee8af3 \
- "
-
-do_install_append_class-target () {
-
- install -d ${D}/${sysconfdir}/pam.d
- install -m 644 ${STX_METADATA_PATH}/${STX_SUBPATH1}/files/stx.su ${D}/${sysconfdir}/pam.d/su
- install -m 644 ${STX_METADATA_PATH}/${STX_SUBPATH1}/files/stx.login ${D}/${sysconfdir}/pam.d/login
-
- install -D -m644 ${STX_METADATA_PATH}/${STX_SUBPATH0}/files/login.defs ${D}/${sysconfdir}/login.defs
- install -D -m644 ${STX_METADATA_PATH}/${STX_SUBPATH0}/files/clear_shadow_locks.service \
- ${D}/${systemd_system_unitdir}/clear_shadow_locks.service
-}
-
-inherit systemd
-SYSTEMD_PACKAGES += "shadow"
-SYSTEMD_SERVICE_${PN} = "clear_shadow_locks.service"
-SYSTEMD_AUTO_ENABLE_${PN} += "enable"
+++ /dev/null
-From e8e74bddb6fb4030b574a76e43e7d0618c0432c9 Mon Sep 17 00:00:00 2001
-From: Tomas Sykora <tosykora@redhat.com>
-Date: Fri, 19 Aug 2016 13:49:25 +0200
-Subject: [PATCH] We do not strip
-
-rebased from:
-Patch1: sudo-1.6.7p5-strip.patch
-
----
- install-sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/install-sh b/install-sh
-index 6944fba..49d383a 100755
---- a/install-sh
-+++ b/install-sh
-@@ -147,7 +147,7 @@ while ${MORETODO} ; do
- fi
- ;;
- X-s)
-- STRIPIT=true
-+ #STRIPIT=true
- ;;
- X--)
- shift
+++ /dev/null
-From 33cc84bc035773105a62b5b0a07e78d55cb6bf6e Mon Sep 17 00:00:00 2001
-From: Tomas Sykora <tosykora@redhat.com>
-Date: Fri, 19 Aug 2016 14:07:35 +0200
-Subject: [PATCH] Added "Enviroment debugging" message
-
-rebased from:
-Patch2: sudo-1.7.2p1-envdebug.patch
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 962a032..ade78f6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1408,7 +1408,7 @@ AC_ARG_ENABLE(env_debug,
- [AS_HELP_STRING([--enable-env-debug], [Whether to enable environment debugging.])],
- [ case "$enableval" in
- yes) AC_MSG_RESULT(yes)
-- AC_DEFINE(ENV_DEBUG)
-+ AC_DEFINE(ENV_DEBUG, [], [Environment debugging.])
- ;;
- no) AC_MSG_RESULT(no)
- ;;
+++ /dev/null
-From 1a9754ec64f703542a5faf9ae9c5058b50047b26 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Wed, 11 Dec 2019 19:43:19 -0800
- sudo-1.8.23-fix-double-quote-parsing-for-Defaults-values.patch
-
----
- plugins/sudoers/regress/sudoers/test2.json.ok | 6 +++---
- plugins/sudoers/regress/sudoers/test2.toke.ok | 6 +++---
- plugins/sudoers/toke.c | 2 +-
- plugins/sudoers/toke.l | 2 +-
- 4 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/plugins/sudoers/regress/sudoers/test2.json.ok b/plugins/sudoers/regress/sudoers/test2.json.ok
-index 8e6656e..769c3fd 100644
---- a/plugins/sudoers/regress/sudoers/test2.json.ok
-+++ b/plugins/sudoers/regress/sudoers/test2.json.ok
-@@ -34,7 +34,7 @@
- },
- {
- "Binding": [
-- { "username": "%them" }
-+ { "usergroup": "them" }
- ],
- "Options": [
- { "set_home": true }
-@@ -42,7 +42,7 @@
- },
- {
- "Binding": [
-- { "username": "%: non UNIX 0 c" }
-+ { "nonunixgroup": " non UNIX 0 c" }
- ],
- "Options": [
- { "set_home": true }
-@@ -50,7 +50,7 @@
- },
- {
- "Binding": [
-- { "username": "+net" }
-+ { "netgroup": "net" }
- ],
- "Options": [
- { "set_home": true }
-diff --git a/plugins/sudoers/regress/sudoers/test2.toke.ok b/plugins/sudoers/regress/sudoers/test2.toke.ok
-index fcd7b73..63e1648 100644
---- a/plugins/sudoers/regress/sudoers/test2.toke.ok
-+++ b/plugins/sudoers/regress/sudoers/test2.toke.ok
-@@ -29,9 +29,9 @@ DEFAULTS_HOST BEGINSTR STRBODY ENDSTR WORD(4) DEFVAR
- #
- DEFAULTS_USER BEGINSTR STRBODY ENDSTR WORD(4) DEFVAR
- DEFAULTS_USER BEGINSTR STRBODY ENDSTR WORD(4) DEFVAR
--DEFAULTS_USER BEGINSTR STRBODY ENDSTR WORD(4) DEFVAR
--DEFAULTS_USER BEGINSTR STRBODY ENDSTR WORD(4) DEFVAR
--DEFAULTS_USER BEGINSTR STRBODY ENDSTR WORD(4) DEFVAR
-+DEFAULTS_USER BEGINSTR STRBODY ENDSTR USERGROUP DEFVAR
-+DEFAULTS_USER BEGINSTR STRBODY ENDSTR USERGROUP DEFVAR
-+DEFAULTS_USER BEGINSTR STRBODY ENDSTR NETGROUP DEFVAR
-
- #
- DEFAULTS_RUNAS BEGINSTR STRBODY ENDSTR WORD(4) DEFVAR
-diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c
-index d0dd5e3..784218b 100644
---- a/plugins/sudoers/toke.c
-+++ b/plugins/sudoers/toke.c
-@@ -2512,7 +2512,7 @@ YY_RULE_SETUP
- LEXTRACE("ERROR "); /* empty string */
- LEXRETURN(ERROR);
- }
-- if (prev_state == INITIAL) {
-+ if (prev_state == INITIAL || prev_state == GOTDEFS) {
- switch (sudoerslval.string[0]) {
- case '%':
- if (sudoerslval.string[1] == '\0' ||
-diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l
-index d275a26..638d9ea 100644
---- a/plugins/sudoers/toke.l
-+++ b/plugins/sudoers/toke.l
-@@ -178,7 +178,7 @@ DEFVAR [a-z_]+
- LEXTRACE("ERROR "); /* empty string */
- LEXRETURN(ERROR);
- }
-- if (prev_state == INITIAL) {
-+ if (prev_state == INITIAL || prev_state == GOTDEFS) {
- switch (sudoerslval.string[0]) {
- case '%':
- if (sudoerslval.string[1] == '\0' ||
+++ /dev/null
-From bff4cd71cc41bf3104b35da24e73742571845ebd Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Wed, 11 Dec 2019 19:43:19 -0800
-
----
- plugins/sudoers/ldap.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c
-index bc2baec..ad8a890 100644
---- a/plugins/sudoers/ldap.c
-+++ b/plugins/sudoers/ldap.c
-@@ -920,8 +920,8 @@ sudo_ldap_build_pass1(LDAP *ld, struct passwd *pw)
- if (ldap_conf.search_filter)
- sz += strlen(ldap_conf.search_filter);
-
-- /* Then add (|(sudoUser=USERNAME)(sudoUser=ALL)) + NUL */
-- sz += 29 + sudo_ldap_value_len(pw->pw_name);
-+ /* Then add (|(sudoUser=USERNAME)(sudoUser=#uid)(sudoUser=ALL)) + NUL */
-+ sz += 29 + (12 + MAX_UID_T_LEN) + sudo_ldap_value_len(pw->pw_name);
-
- /* Add space for primary and supplementary groups and gids */
- if ((grp = sudo_getgrgid(pw->pw_gid)) != NULL) {
-@@ -982,6 +982,12 @@ sudo_ldap_build_pass1(LDAP *ld, struct passwd *pw)
- CHECK_LDAP_VCAT(buf, pw->pw_name, sz);
- CHECK_STRLCAT(buf, ")", sz);
-
-+ /* Append user uid */
-+ (void) snprintf(gidbuf, sizeof(gidbuf), "%u", (unsigned int)pw->pw_uid);
-+ (void) strlcat(buf, "(sudoUser=#", sz);
-+ (void) strlcat(buf, gidbuf, sz);
-+ (void) strlcat(buf, ")", sz);
-+
- /* Append primary group and gid */
- if (grp != NULL) {
- CHECK_STRLCAT(buf, "(sudoUser=%", sz);
+++ /dev/null
-From ce16b664df514c4d8b0e6b8733ae1dce3561a2a4 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Wed, 11 Dec 2019 19:43:19 -0800
-
----
- plugins/sudoers/cvtsudoers.c | 9 +++++++++
- plugins/sudoers/def_data.c | 4 ++++
- plugins/sudoers/def_data.h | 2 ++
- plugins/sudoers/def_data.in | 3 +++
- plugins/sudoers/defaults.c | 3 +++
- plugins/sudoers/sudoers.c | 4 ++++
- 6 files changed, 25 insertions(+)
-
-diff --git a/plugins/sudoers/cvtsudoers.c b/plugins/sudoers/cvtsudoers.c
-index 0221314..9d21d2f 100644
---- a/plugins/sudoers/cvtsudoers.c
-+++ b/plugins/sudoers/cvtsudoers.c
-@@ -346,6 +346,15 @@ main(int argc, char *argv[])
- sudo_fatalx("error: unhandled input %d", input_format);
- }
-
-+ /*
-+ * cvtsudoers group filtering doesn't work if def_match_group_by_gid
-+ * is set to true by default (at compile-time). It cannot be set to false
-+ * because cvtsudoers doesn't apply the parsed Defaults.
-+ *
-+ * Related: sudo-1.8.23-legacy-group-processing.patch
-+ */
-+ def_match_group_by_gid = def_legacy_group_processing = false;
-+
- /* Apply filters. */
- filter_userspecs(&parsed_policy, conf);
- filter_defaults(&parsed_policy, conf);
-diff --git a/plugins/sudoers/def_data.c b/plugins/sudoers/def_data.c
-index 07e3433..5fa45bb 100644
---- a/plugins/sudoers/def_data.c
-+++ b/plugins/sudoers/def_data.c
-@@ -494,6 +494,10 @@ struct sudo_defs_types sudo_defs_table[] = {
- N_("Ignore case when matching group names"),
- NULL,
- }, {
-+ "legacy_group_processing", T_FLAG,
-+ N_("Don't pre-resolve all group names"),
-+ NULL,
-+ }, {
- NULL, 0, NULL
- }
- };
-diff --git a/plugins/sudoers/def_data.h b/plugins/sudoers/def_data.h
-index 65f10c3..940fa8f 100644
---- a/plugins/sudoers/def_data.h
-+++ b/plugins/sudoers/def_data.h
-@@ -226,6 +226,8 @@
- #define def_case_insensitive_user (sudo_defs_table[I_CASE_INSENSITIVE_USER].sd_un.flag)
- #define I_CASE_INSENSITIVE_GROUP 113
- #define def_case_insensitive_group (sudo_defs_table[I_CASE_INSENSITIVE_GROUP].sd_un.flag)
-+#define I_LEGACY_GROUP_PROCESSING 114
-+#define def_legacy_group_processing (sudo_defs_table[I_LEGACY_GROUP_PROCESSING].sd_un.flag)
-
- enum def_tuple {
- never,
-diff --git a/plugins/sudoers/def_data.in b/plugins/sudoers/def_data.in
-index 99d4360..571bc96 100644
---- a/plugins/sudoers/def_data.in
-+++ b/plugins/sudoers/def_data.in
-@@ -357,3 +357,6 @@ case_insensitive_user
- case_insensitive_group
- T_FLAG
- "Ignore case when matching group names"
-+legacy_group_processing
-+ T_FLAG
-+ "Don't pre-resolve all group names"
-diff --git a/plugins/sudoers/defaults.c b/plugins/sudoers/defaults.c
-index 4c8c262..970755e 100644
---- a/plugins/sudoers/defaults.c
-+++ b/plugins/sudoers/defaults.c
-@@ -91,6 +91,7 @@ static struct early_default early_defaults[] = {
- { I_FQDN },
- #endif
- { I_MATCH_GROUP_BY_GID },
-+ { I_LEGACY_GROUP_PROCESSING },
- { I_GROUP_PLUGIN },
- { I_RUNAS_DEFAULT },
- { I_SUDOERS_LOCALE },
-@@ -492,6 +493,8 @@ init_defaults(void)
- }
-
- /* First initialize the flags. */
-+ def_legacy_group_processing = true;
-+ def_match_group_by_gid = true;
- #ifdef LONG_OTP_PROMPT
- def_long_otp_prompt = true;
- #endif
-diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
-index 1267949..d8f4dd0 100644
---- a/plugins/sudoers/sudoers.c
-+++ b/plugins/sudoers/sudoers.c
-@@ -217,6 +217,10 @@ sudoers_policy_init(void *info, char * const envp[])
- if (set_loginclass(runas_pw ? runas_pw : sudo_user.pw))
- ret = true;
-
-+ if (!def_match_group_by_gid || !def_legacy_group_processing) {
-+ def_match_group_by_gid = false;
-+ def_legacy_group_processing = false;
-+ }
- cleanup:
- if (!restore_perms())
- ret = -1;
+++ /dev/null
-From acbbefdbcf2951a2ce31fe4fc789cf8397a406cc Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Wed, 11 Dec 2019 19:43:19 -0800
-
----
- plugins/sudoers/def_data.c | 4 ++++
- plugins/sudoers/def_data.h | 2 ++
- plugins/sudoers/def_data.in | 3 +++
- plugins/sudoers/sudoers.c | 14 ++++++++++++++
- 4 files changed, 23 insertions(+)
-
-diff --git a/plugins/sudoers/def_data.c b/plugins/sudoers/def_data.c
-index 5fa45bb..9d7a842 100644
---- a/plugins/sudoers/def_data.c
-+++ b/plugins/sudoers/def_data.c
-@@ -498,6 +498,10 @@ struct sudo_defs_types sudo_defs_table[] = {
- N_("Don't pre-resolve all group names"),
- NULL,
- }, {
-+ "cmnd_no_wait", T_FLAG,
-+ N_("Don't fork and wait for the command to finish, just exec it"),
-+ NULL,
-+ }, {
- NULL, 0, NULL
- }
- };
-diff --git a/plugins/sudoers/def_data.h b/plugins/sudoers/def_data.h
-index 940fa8f..68ceed0 100644
---- a/plugins/sudoers/def_data.h
-+++ b/plugins/sudoers/def_data.h
-@@ -228,6 +228,8 @@
- #define def_case_insensitive_group (sudo_defs_table[I_CASE_INSENSITIVE_GROUP].sd_un.flag)
- #define I_LEGACY_GROUP_PROCESSING 114
- #define def_legacy_group_processing (sudo_defs_table[I_LEGACY_GROUP_PROCESSING].sd_un.flag)
-+#define I_CMND_NO_WAIT 115
-+#define def_cmnd_no_wait (sudo_defs_table[I_CMND_NO_WAIT].sd_un.flag)
-
- enum def_tuple {
- never,
-diff --git a/plugins/sudoers/def_data.in b/plugins/sudoers/def_data.in
-index 571bc96..4250917 100644
---- a/plugins/sudoers/def_data.in
-+++ b/plugins/sudoers/def_data.in
-@@ -360,3 +360,6 @@ case_insensitive_group
- legacy_group_processing
- T_FLAG
- "Don't pre-resolve all group names"
-+cmnd_no_wait
-+ T_FLAG
-+ "Don't fork and wait for the command to finish, just exec it"
-diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
-index d8f4dd0..00669b4 100644
---- a/plugins/sudoers/sudoers.c
-+++ b/plugins/sudoers/sudoers.c
-@@ -221,6 +221,20 @@ sudoers_policy_init(void *info, char * const envp[])
- def_match_group_by_gid = false;
- def_legacy_group_processing = false;
- }
-+
-+ /*
-+ * Emulate cmnd_no_wait option by disabling PAM session, PTY allocation
-+ * and I/O logging. This will cause sudo to execute the given command
-+ * directly instead of forking a separate process for it.
-+ */
-+ if (def_cmnd_no_wait) {
-+ def_pam_setcred = false;
-+ def_pam_session = false;
-+ def_use_pty = false;
-+ def_log_input = false;
-+ def_log_output = false;
-+ }
-+
- cleanup:
- if (!restore_perms())
- ret = -1;
+++ /dev/null
-From fcd6c299111dd5dee6e387047c8f60dfef24e32a Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Wed, 11 Dec 2019 19:43:19 -0800
-
----
- doc/Makefile.in | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index e8d2605..b2e16f4 100644
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -349,10 +349,16 @@ install-doc: install-dirs
- rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)$(MANCOMPRESSEXT); \
- echo ln -s sudo.$(mansectsu)$(MANCOMPRESSEXT) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)$(MANCOMPRESSEXT); \
- ln -s sudo.$(mansectsu)$(MANCOMPRESSEXT) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)$(MANCOMPRESSEXT); \
-+ rm -f $(DESTDIR)$(mandirform)/sudo-ldap.conf.$(mansectform)$(MANCOMPRESSEXT); \
-+ echo ln -s sudoers.ldap.$(mansectform)$(MANCOMPRESSEXT) $(DESTDIR)$(mandirform)/sudo-ldap.conf.$(mansectform)$(MANCOMPRESSEXT); \
-+ ln -s sudoers.ldap.$(mansectform)$(MANCOMPRESSEXT) $(DESTDIR)$(mandirform)/sudo-ldap.conf.$(mansectform)$(MANCOMPRESSEXT); \
- else \
- rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \
- echo ln -s sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \
- ln -s sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \
-+ rm -f $(DESTDIR)$(mandirform)/sudo-ldap.conf.$(mansectform); \
-+ echo ln -s sudoers.ldap.$(mansectform) $(DESTDIR)$(mandirform)/sudo-ldap.conf.$(mansectform); \
-+ ln -s sudoers.ldap.$(mansectform) $(DESTDIR)$(mandirform)/sudo-ldap.conf.$(mansectform); \
- fi
-
- install-plugin:
-@@ -367,8 +373,9 @@ uninstall:
- $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) \
- $(DESTDIR)$(mandirform)/sudo.conf.$(mansectform) \
- $(DESTDIR)$(mandirform)/sudoers.$(mansectform) \
-- $(DESTDIR)$(mandirform)/sudoers_timestamp.$(mansectform)
-- $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform)
-+ $(DESTDIR)$(mandirform)/sudoers_timestamp.$(mansectform) \
-+ $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform) \
-+ $(DESTDIR)$(mandirform)/sudo-ldap.conf.$(mansectform)
-
- splint:
-
+++ /dev/null
-From 7ee2d1e7fd55da7074a39b41fe342e261dd1f191 Mon Sep 17 00:00:00 2001
-From: Tomas Sykora <tosykora@redhat.com>
-Date: Wed, 17 Aug 2016 10:12:11 +0200
-Subject: [PATCH] Sudo logs username root instead of realuser
-
-RHEL7 sudo logs username root instead of realuser in /var/log/secure
-
-Rebased from:
-Patch50: sudo-1.8.6p7-logsudouser.patch
-
-Resolves:
-rhbz#1312486
-
----
- plugins/sudoers/logging.c | 14 +++++++-------
- plugins/sudoers/sudoers.h | 1 +
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c
-index 9562609..775fd0c 100644
---- a/plugins/sudoers/logging.c
-+++ b/plugins/sudoers/logging.c
-@@ -116,7 +116,7 @@ do_syslog(int pri, char *msg)
- * Log the full line, breaking into multiple syslog(3) calls if necessary
- */
- fmt = _("%8s : %s");
-- maxlen = def_syslog_maxlen - (strlen(fmt) - 5 + strlen(user_name));
-+ maxlen = def_syslog_maxlen - (strlen(fmt) - 5 + strlen(sudo_user_name));
- for (p = msg; *p != '\0'; ) {
- len = strlen(p);
- if (len > maxlen) {
-@@ -132,7 +132,7 @@ do_syslog(int pri, char *msg)
- save = *tmp;
- *tmp = '\0';
-
-- mysyslog(pri, fmt, user_name, p);
-+ mysyslog(pri, fmt, sudo_user_name, p);
-
- *tmp = save; /* restore saved character */
-
-@@ -140,11 +140,11 @@ do_syslog(int pri, char *msg)
- for (p = tmp; *p == ' '; p++)
- continue;
- } else {
-- mysyslog(pri, fmt, user_name, p);
-+ mysyslog(pri, fmt, sudo_user_name, p);
- p += len;
- }
- fmt = _("%8s : (command continued) %s");
-- maxlen = def_syslog_maxlen - (strlen(fmt) - 5 + strlen(user_name));
-+ maxlen = def_syslog_maxlen - (strlen(fmt) - 5 + strlen(sudo_user_name));
- }
-
- sudoers_setlocale(oldlocale, NULL);
-@@ -191,10 +191,10 @@ do_logfile(const char *msg)
- timestr = "invalid date";
- if (def_log_host) {
- len = asprintf(&full_line, "%s : %s : HOST=%s : %s",
-- timestr, user_name, user_srunhost, msg);
-+ timestr, sudo_user_name, user_srunhost, msg);
- } else {
- len = asprintf(&full_line, "%s : %s : %s",
-- timestr, user_name, msg);
-+ timestr, sudo_user_name, msg);
- }
- if (len == -1) {
- sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
-@@ -844,7 +844,7 @@ send_mail(const char *fmt, ...)
-
- if ((timestr = get_timestr(time(NULL), def_log_year)) == NULL)
- timestr = "invalid date";
-- (void) fprintf(mail, "\n\n%s : %s : %s : ", user_host, timestr, user_name);
-+ (void) fprintf(mail, "\n\n%s : %s : %s : ", user_host, timestr, sudo_user_name);
- va_start(ap, fmt);
- (void) vfprintf(mail, fmt, ap);
- va_end(ap);
-diff --git a/plugins/sudoers/sudoers.h b/plugins/sudoers/sudoers.h
-index 28dbbb3..99e137b 100644
---- a/plugins/sudoers/sudoers.h
-+++ b/plugins/sudoers/sudoers.h
-@@ -188,6 +188,7 @@ struct sudo_user {
- /*
- * Shortcuts for sudo_user contents.
- */
-+#define sudo_user_name (sudo_user.pw->pw_name)
- #define user_name (sudo_user.name)
- #define user_uid (sudo_user.uid)
- #define user_gid (sudo_user.gid)
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-DEPENDS += " \
- openldap \
- libgcrypt \
- "
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "sudo-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- "
-
-SRC_URI += " \
- file://sudo-1.6.7p5-strip.patch \
- file://sudo-1.7.2p1-envdebug.patch \
- file://sudo-1.8.23-sudoldapconfman.patch \
- file://sudo-1.8.23-legacy-group-processing.patch \
- file://sudo-1.8.23-ldapsearchuidfix.patch \
- file://sudo-1.8.6p7-logsudouser.patch \
- file://sudo-1.8.23-nowaitopt.patch \
- file://sudo-1.8.23-fix-double-quote-parsing-for-Defaults-values.patch \
- "
-
-EXTRA_OECONF += " \
- --with-pam-login \
- --with-editor=${base_bindir}/vi \
- --with-env-editor \
- --with-ignore-dot \
- --with-tty-tickets \
- --with-ldap \
- --with-ldap-conf-file="${sysconfdir}/sudo-ldap.conf" \
- --with-passprompt="[sudo] password for %Zp: " \
- --with-sssd \
- "
-
-do_install_append () {
- install -m755 -d ${D}/${sysconfdir}/openldap/schema
- install -m644 ${S}/doc/schema.OpenLDAP ${D}/${sysconfdir}/openldap/schema/sudo.schema
- install -m 440 ${STX_METADATA_PATH}/files/sysadmin.sudo ${D}/${sysconfdir}/sudoers.d/sysadmin
-}
-
-# This means sudo package only owns files
-# to avoid install conflict with openldap on
-# /etc/openldap. Sure there is a better way.
-DIRFILES = "1"
+++ /dev/null
-
-inherit selinux
-DEPENDS += " libselinux"
-RDEPENDS_${PN}_append = " libselinux"
+++ /dev/null
-
-require linux-yocto-stx.inc
+++ /dev/null
-
-FILESEXTRAPATHS_append:= ":${THISDIR}/linux:"
-
-SRC_URI_append_poky-stx = " file://stx-kconfig.cfg"
-SRC_URI_append_anaconda = " file://stx-anaconda-kconfig.cfg"
-SRC_URI_append = " file://Notification-of-Death-of-arbitrary-processes.patch"
-
-KERNEL_EXTRA_FEATURES_append = " \
- features/xfs/xfs.scc \
- features/iommu/iommu.scc \
- features/vfio/vfio.scc \
- features/x2apic \
- cfg/debug/sched/debug-sched.scc \
- "
+++ /dev/null
-
-require linux-yocto-stx.inc
+++ /dev/null
-From 4cfbf1a112e17b071fcdae207e4f785c096a198c Mon Sep 17 00:00:00 2001
-From: Saul Wold <sgw@linux.intel.com>
-Date: Thu, 2 Jul 2020 09:46:12 -0700
-Subject: [PATCH] Notification of Death of arbitrary processes
-
-Note: this commit was copied from Titanium Cloud Rel2
-
-This exposes a new feature which may be called to request
-notification when an arbitrary process changes state. The
-caller specifies a pid, signal number, and event mask, and
-when that pid dies, or is stopped, or anything else that
-would normally cause a SIGCHLD, the kernel will send the
-specified signal to the caller if the event is in the event
-mask originally passed down. The siginfo_t struct will
-contain the same information as would be included with SIGCHLD.
-
-This is exposed to userspace via the prctl() call with the
-PR_DO_NOTIFY_TASK_STATE option.
-
-Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
-Signed-off-by: Zhang Zhiguo <zhangzhg@neusoft.com>
-Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
----
- include/linux/init_task.h | 9 ++
- include/linux/sched.h | 6 +
- include/uapi/linux/prctl.h | 18 +++
- init/Kconfig | 15 +++
- init/init_task.c | 1 +
- kernel/Makefile | 1 +
- kernel/death_notify.c | 228 +++++++++++++++++++++++++++++++++++++
- kernel/death_notify.h | 46 ++++++++
- kernel/exit.c | 6 +
- kernel/fork.c | 4 +
- kernel/signal.c | 11 ++
- kernel/sys.c | 8 ++
- 12 files changed, 353 insertions(+)
- create mode 100644 kernel/death_notify.c
- create mode 100644 kernel/death_notify.h
-
-diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index a7083a45a26c..1ad2341b3036 100644
---- a/include/linux/init_task.h
-+++ b/include/linux/init_task.h
-@@ -24,6 +24,15 @@
- extern struct files_struct init_files;
- extern struct fs_struct init_fs;
- extern struct nsproxy init_nsproxy;
-+
-+#ifdef CONFIG_SIGEXIT
-+#define INIT_SIGEXIT(tsk) \
-+ .notify = LIST_HEAD_INIT(tsk.notify), \
-+ .monitor = LIST_HEAD_INIT(tsk.monitor),
-+#else
-+#define INIT_SIGEXIT(tsk)
-+#endif
-+
- extern struct group_info init_groups;
- extern struct cred init_cred;
-
-diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 9b35aff09f70..d6f5a2711b7d 100644
---- a/include/linux/sched.h
-+++ b/include/linux/sched.h
-@@ -1015,6 +1015,12 @@ struct task_struct {
- short il_prev;
- short pref_node_fork;
- #endif
-+#ifdef CONFIG_SIGEXIT
-+ /* list of processes to notify on death */
-+ struct list_head notify;
-+ /* list of outstanding monitor requests */
-+ struct list_head monitor;
-+#endif
- #ifdef CONFIG_NUMA_BALANCING
- int numa_scan_seq;
- unsigned int numa_scan_period;
-diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h
-index b4875a93363a..d50c435a04ea 100644
---- a/include/uapi/linux/prctl.h
-+++ b/include/uapi/linux/prctl.h
-@@ -63,6 +63,24 @@
- # define PR_ENDIAN_LITTLE 1 /* True little endian mode */
- # define PR_ENDIAN_PPC_LITTLE 2 /* "PowerPC" pseudo little endian */
-
-+#ifdef CONFIG_SIGEXIT
-+#define PR_DO_NOTIFY_TASK_STATE 17 /* Set/get notification for task
-+ state changes */
-+
-+/* This is the data structure for requestion process death
-+ * (and other state change) information. Sig of -1 means
-+ * query, sig of 0 means deregistration, positive sig means
-+ * that you want to set it. sig and events are value-result
-+ * and will be updated with the previous values on every
-+ * successful call.
-+ */
-+struct task_state_notify_info {
-+ pid_t pid;
-+ int sig;
-+ unsigned int events;
-+};
-+#endif
-+
- /* Get/set process seccomp mode */
- #define PR_GET_SECCOMP 21
- #define PR_SET_SECCOMP 22
-diff --git a/init/Kconfig b/init/Kconfig
-index bdf4f284509b..8102ef3d2adb 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1648,6 +1648,21 @@ config VM_EVENT_COUNTERS
- on EXPERT systems. /proc/vmstat will only show page counts
- if VM event counters are disabled.
-
-+config SIGEXIT
-+ bool "Notification of death of arbitrary processes"
-+ default n
-+ help
-+ When enabled this exposes a new feature which may be called to request
-+ notification when an arbitrary process changes state. The caller specifies
-+ a pid, signal number, and event mask, and when that pid dies, or is
-+ stopped, or anything else that would normally cause a SIGCHLD, the
-+ kernel will send the specified signal to the caller if the event is in
-+ the event mask originally passed down. The siginfo_t struct will
-+ contain the same information as would be included with SIGCHLD.
-+
-+ This is exposed to userspace via the prctl()
-+ call with the PR_DO_NOTIFY_TASK_STATE option
-+
- config SLUB_DEBUG
- default y
- bool "Enable SLUB debugging support" if EXPERT
-diff --git a/init/init_task.c b/init/init_task.c
-index 5aebe3be4d7c..d0891101ac7d 100644
---- a/init/init_task.c
-+++ b/init/init_task.c
-@@ -116,6 +116,7 @@ struct task_struct init_task
- .alloc_lock = __SPIN_LOCK_UNLOCKED(init_task.alloc_lock),
- .journal_info = NULL,
- INIT_CPU_TIMERS(init_task)
-+ INIT_SIGEXIT(init_task)
- .pi_lock = __RAW_SPIN_LOCK_UNLOCKED(init_task.pi_lock),
- .timer_slack_ns = 50000, /* 50 usec default slack */
- .thread_pid = &init_struct_pid,
-diff --git a/kernel/Makefile b/kernel/Makefile
-index 1ea0ba13a445..f839f425ca09 100644
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -99,6 +99,7 @@ obj-$(CONFIG_TRACEPOINTS) += trace/
- obj-$(CONFIG_IRQ_WORK) += irq_work.o
- obj-$(CONFIG_CPU_PM) += cpu_pm.o
- obj-$(CONFIG_BPF) += bpf/
-+obj-$(CONFIG_SIGEXIT) += death_notify.o
-
- obj-$(CONFIG_PERF_EVENTS) += events/
-
-diff --git a/kernel/death_notify.c b/kernel/death_notify.c
-new file mode 100644
-index 000000000000..5819d35a2564
---- /dev/null
-+++ b/kernel/death_notify.c
-@@ -0,0 +1,228 @@
-+/*
-+ * kernel/death_notify.c, Process death notification support
-+ *
-+ * Copyright (c) 2006-2014 Wind River Systems, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+ * See the GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ */
-+
-+#include <linux/errno.h>
-+#include <linux/signal.h>
-+#include <linux/sched.h>
-+#include <linux/sched/task.h>
-+#include <linux/slab.h>
-+#include <linux/prctl.h>
-+#include <linux/uaccess.h>
-+#include "death_notify.h"
-+
-+static void unlink_status_notifier(struct signotifier *n)
-+{
-+ list_del(&n->monitor_list);
-+ list_del(&n->notify_list);
-+ kfree(n);
-+}
-+
-+static void handle_already_monitoring(struct signotifier *node,
-+ struct task_state_notify_info *args,
-+ struct task_state_notify_info *oldargs)
-+{
-+ /* Store the old values */
-+ oldargs->sig = node->sig;
-+ oldargs->events = node->events;
-+
-+ /* We know that args->sig is 0 or a valid signal. */
-+ if (args->sig > 0) {
-+ /* Update the new values */
-+ node->sig = args->sig;
-+ node->events = args->events;
-+ } else if (!args->sig) {
-+ /* args->sig of 0 means to deregister */
-+ unlink_status_notifier(node);
-+ }
-+}
-+
-+static void setup_new_node(struct task_struct *p,
-+ struct signotifier *node,
-+ struct task_state_notify_info *args)
-+{
-+ node->notify_tsk = current;
-+ node->sig = args->sig;
-+ node->events = args->events;
-+
-+ /* Add this node to the list of notification requests
-+ * for the specified process.
-+ */
-+ list_add_tail(&node->notify_list, &p->notify);
-+
-+ /* Also add this node to the list of monitor requests
-+ * for the current process.
-+ */
-+ list_add_tail(&node->monitor_list, ¤t->monitor);
-+}
-+
-+/* Returns 0 if arguments are valid, 1 if they are not. */
-+static int invalid_args(struct task_state_notify_info *args)
-+{
-+ int ret = 1;
-+
-+ if (args->pid <= 0)
-+ goto out;
-+
-+ /* Sig of -1 implies query, sig of 0 implies deregistration.
-+ * Otherwise sig must be positive and within range.
-+ */
-+ if ((args->sig < -1) || (args->sig > _NSIG))
-+ goto out;
-+
-+ /* If positive sig, must have valid events. */
-+ if (args->sig > 0) {
-+ if (!args->events || (args->events >= (1 << (NSIGCHLD+1))))
-+ goto out;
-+ }
-+
-+ ret = 0;
-+out:
-+ return ret;
-+}
-+
-+/* Notify those registered for process state updates via do_notify_task_state().
-+ * If "del" is nonzero, the process is dying and we want to free
-+ * the nodes in the list as we go.
-+ *
-+ * Note: we only notify processes for events in which they have registered
-+ * interest.
-+ *
-+ * Must be called holding a lock on tasklist_lock.
-+ */
-+void do_notify_others(struct task_struct *tsk, struct kernel_siginfo *info)
-+{
-+ struct signotifier *node;
-+ unsigned int events;
-+
-+ /* This method of generating the event bit must be
-+ * matched in the userspace library.
-+ */
-+ events = 1 << (info->si_code & 0xFF);
-+
-+ list_for_each_entry(node, &tsk->notify, notify_list) {
-+ if (events & node->events) {
-+ info->si_signo = node->sig;
-+ group_send_sig_info(node->sig, info, node->notify_tsk, PIDTYPE_TGID);
-+ }
-+ }
-+}
-+
-+void release_notify_others(struct task_struct *p)
-+{
-+ struct signotifier *n, *t;
-+
-+ /* Need to clean up any outstanding requests where we
-+ * wanted to be notified when others died.
-+ */
-+ list_for_each_entry_safe(n, t, &p->monitor, monitor_list) {
-+ unlink_status_notifier(n);
-+ }
-+
-+ /* Also need to clean up any outstanding requests where others
-+ * wanted to be notified when we died.
-+ */
-+ list_for_each_entry_safe(n, t, &p->notify, notify_list) {
-+ unlink_status_notifier(n);
-+ }
-+}
-+
-+/* If the config is defined, then processes can call this routine
-+ * to request notification when the specified task's state changes.
-+ * On the death (or other state change) of the specified process,
-+ * we will send them the specified signal if the event is listed
-+ * in their event bitfield.
-+ *
-+ * A sig of 0 means that we want to deregister.
-+ *
-+ * The sig/events fields are value/result. On success we update them
-+ * to reflect what they were before the call.
-+ *
-+ * Returns error code on error, on success we return 0.
-+ */
-+int do_notify_task_state(unsigned long arg)
-+{
-+ int err;
-+ struct task_struct *p;
-+ struct signotifier *node, *tmp;
-+ struct task_state_notify_info args, oldargs;
-+
-+ if (copy_from_user(&args, (struct task_state_notify_info __user *)arg,
-+ sizeof(args)))
-+ return -EFAULT;
-+ oldargs.pid = args.pid;
-+
-+ /* Validate the arguments passed in. */
-+ err = -EINVAL;
-+ if (invalid_args(&args))
-+ goto out;
-+
-+ /* We must hold a write lock on tasklist_lock to add the notification
-+ * later on, and we need some lock on tasklist_lock for
-+ * find_task_by_pid(), so may as well take the write lock now.
-+ * Must use write_lock_irq().
-+ */
-+ write_lock_irq(&tasklist_lock);
-+
-+ err = -ESRCH;
-+ p = find_task_by_vpid(args.pid);
-+ if (!p)
-+ goto unlock_out;
-+
-+ /* Now we know pid exists, unlikely to fail. */
-+ err = 0;
-+
-+ /* Check if we're already monitoring the specified pid. If so, update
-+ * the monitoring parameters and return the old ones.
-+ */
-+ list_for_each_entry(tmp, &p->notify, notify_list) {
-+ if (tmp->notify_tsk == current) {
-+ handle_already_monitoring(tmp, &args, &oldargs);
-+ goto unlock_out;
-+ }
-+ }
-+
-+ /* If we get here, we're not currently monitoring the process. */
-+ oldargs.sig = 0;
-+ oldargs.events = 0;
-+
-+ /* If we wanted to set up a new monitor, do it now. If we didn't
-+ * manage to allocate memory for the new node, then we return
-+ * an appropriate error.
-+ */
-+ if (args.sig > 0) {
-+ node = kmalloc(sizeof(*node), GFP_ATOMIC);
-+ if (node)
-+ setup_new_node(p, node, &args);
-+ else
-+ err = -ENOMEM;
-+ }
-+
-+unlock_out:
-+ write_unlock_irq(&tasklist_lock);
-+
-+ /* Copy the old values back to caller. */
-+ if (copy_to_user((struct task_state_notify_info __user *)arg,
-+ &oldargs, sizeof(oldargs)))
-+ err = -EFAULT;
-+
-+out:
-+ return err;
-+}
-+
-diff --git a/kernel/death_notify.h b/kernel/death_notify.h
-new file mode 100644
-index 000000000000..14a0995b79af
---- /dev/null
-+++ b/kernel/death_notify.h
-@@ -0,0 +1,46 @@
-+/*
-+ * kernel/death_notify.h, Process death notification support
-+ *
-+ * Copyright (c) 2006-2014 Wind River Systems, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+ * See the GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ */
-+#ifndef _KERNEL_DEATH_NOTIFY_H
-+#define _KERNEL_DEATH_NOTIFY_H
-+
-+#ifdef CONFIG_SIGEXIT
-+
-+struct signotifier {
-+ struct task_struct *notify_tsk;
-+ struct list_head notify_list;
-+ struct list_head monitor_list;
-+ int sig;
-+ unsigned int events;
-+};
-+
-+extern int do_notify_task_state(unsigned long arg);
-+extern void do_notify_others(struct task_struct *tsk,
-+ struct kernel_siginfo *info);
-+extern void release_notify_others(struct task_struct *p);
-+
-+#else /* !CONFIG_SIGEXIT */
-+
-+static inline void do_notify_others(struct task_struct *tsk,
-+ struct kernel_siginfo *info) {}
-+static inline void release_notify_others(struct task_struct *p) {}
-+
-+#endif /* CONFIG_SIGEXIT */
-+#endif
-+
-diff --git a/kernel/exit.c b/kernel/exit.c
-index 2166c2d92ddc..f35f3a5870a8 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -67,6 +67,9 @@
- #include <asm/unistd.h>
- #include <asm/pgtable.h>
- #include <asm/mmu_context.h>
-+#ifdef CONFIG_SIGEXIT
-+#include "death_notify.h"
-+#endif
-
- static void __unhash_process(struct task_struct *p, bool group_dead)
- {
-@@ -196,6 +199,9 @@ void release_task(struct task_struct *p)
- proc_flush_task(p);
-
- write_lock_irq(&tasklist_lock);
-+#ifdef CONFIG_SIGEXIT
-+ release_notify_others(p);
-+#endif
- ptrace_release_task(p);
- __exit_signal(p);
-
-diff --git a/kernel/fork.c b/kernel/fork.c
-index 17389e9935c4..4d79f261c365 100644
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -1907,6 +1907,10 @@ static __latent_entropy struct task_struct *copy_process(
- p->sequential_io = 0;
- p->sequential_io_avg = 0;
- #endif
-+#ifdef CONFIG_SIGEXIT
-+ INIT_LIST_HEAD(&p->notify);
-+ INIT_LIST_HEAD(&p->monitor);
-+#endif
-
- /* Perform scheduler related setup. Assign this task to a CPU. */
- retval = sched_fork(clone_flags, p);
-diff --git a/kernel/signal.c b/kernel/signal.c
-index 57b7771e20d7..41126fa53102 100644
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -51,6 +51,9 @@
- #include <asm/siginfo.h>
- #include <asm/cacheflush.h>
- #include "audit.h" /* audit_signal_info() */
-+#ifdef CONFIG_SIGEXIT
-+#include "death_notify.h"
-+#endif
-
- /*
- * SLAB caches for signal bits.
-@@ -1893,6 +1896,10 @@ bool do_notify_parent(struct task_struct *tsk, int sig)
- __wake_up_parent(tsk, tsk->parent);
- spin_unlock_irqrestore(&psig->siglock, flags);
-
-+#ifdef CONFIG_SIGEXIT
-+ do_notify_others(tsk, &info);
-+#endif
-+
- return autoreap;
- }
-
-@@ -1965,6 +1972,10 @@ static void do_notify_parent_cldstop(struct task_struct *tsk,
- */
- __wake_up_parent(tsk, parent);
- spin_unlock_irqrestore(&sighand->siglock, flags);
-+
-+#ifdef CONFIG_SIGEXIT
-+ do_notify_others(tsk, &info);
-+#endif
- }
-
- static inline bool may_ptrace_stop(void)
-diff --git a/kernel/sys.c b/kernel/sys.c
-index f7eb62eceb24..9fadbbe9565f 100644
---- a/kernel/sys.c
-+++ b/kernel/sys.c
-@@ -72,6 +72,9 @@
- #include <asm/unistd.h>
-
- #include "uid16.h"
-+#ifdef CONFIG_SIGEXIT
-+#include "death_notify.h"
-+#endif
-
- #ifndef SET_UNALIGN_CTL
- # define SET_UNALIGN_CTL(a, b) (-EINVAL)
-@@ -2405,6 +2408,11 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
- else
- error = PR_MCE_KILL_DEFAULT;
- break;
-+#ifdef CONFIG_SIGEXIT
-+ case PR_DO_NOTIFY_TASK_STATE:
-+ error = do_notify_task_state(arg2);
-+ break;
-+#endif
- case PR_SET_MM:
- error = prctl_set_mm(arg2, arg3, arg4, arg5);
- break;
---
-2.17.1
-
+++ /dev/null
-CONFIG_NF_TABLES=m
-CONFIG_NFT_COMPAT=m
-CONFIG_BLK_DEV_DRBD=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_FPGA=y
-
-# Support for iscsi
-CONFIG_BE2ISCSI=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_IBFT=m
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_TARGET=m
-CONFIG_ISCSI_TCP=y
-CONFIG_QED_ISCSI=y
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_ISCSI_ATTRS=y
-CONFIG_SCSI_QLA_ISCSI=m
-
-# for HP Smart Array
-CONFIG_SCSI_HPSA=y
-
-# for Broadcom Tigon3 and bcm 8517
-CONFIG_TIGON3=y
-CONFIG_TIGON3_HWMON=y
-
-# for Emulex Blade Engine
-CONFIG_BE2NET=m
-
-# config fragments for Broadcom NetExtremeII
-CONFIG_BNX2=m
-CONFIG_BNX2X=m
-
-# config fragment for HP misc
-CONFIG_HP_ILO=y
-CONFIG_HP_WATCHDOG=y
-
-# config fragment for Intel C600 SAS controller
-CONFIG_SCSI_ISCI=y
-
-# config fragment for Emulex LightPulse Family of Fibre Channel PCI host adapters
-CONFIG_SCSI_LPFC=m
-
-# config fragments for Mellanox ethernet support
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_DCB=y
-CONFIG_MLX4_CORE=m
-
-# config fragment for LSI SAS controllers
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-
-# config fragment for QLogic storage and NIC adapters
-CONFIG_SCSI_QLA_FC=m
-CONFIG_QLA3XXX=m
-
-# config fragment for PERC H740 controllers
-CONFIG_MEGARAID_SAS=y
+++ /dev/null
-CONFIG_NF_TABLES=m
-CONFIG_NFT_COMPAT=m
-CONFIG_BLK_DEV_DRBD=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_FPGA=y
-
-# Support for docker
-CONFIG_VETH=y
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-
-# overlay support for kubernetes
-CONFIG_OVERLAY_FS=y
-CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
-
-# Support for openvswitch
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-
-# Support for NUMA
-CONFIG_NUMA=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-
-# Support for ipset
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_NETFILTER_XT_SET=m
-
-# Support for iscsi
-CONFIG_BE2ISCSI=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_IBFT=m
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_TARGET=m
-CONFIG_ISCSI_TCP=y
-CONFIG_QED_ISCSI=y
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_ISCSI_ATTRS=y
-CONFIG_SCSI_QLA_ISCSI=m
-
-# Support for vlan
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_MACVLAN=m
-CONFIG_NET_ACT_VLAN=m
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VLAN_8021Q_MVRP=y
-
-# Support for nfsd
-CONFIG_NFSD=m
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-
-# generated by diffconfig:
-# ./diffconfig -m config-5.0.19-yocto-standard config-3.10.0-957.21.3.el7.2.tis.x86_64
-CONFIG_8139TOO_8129=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_BGRT=y
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_HED=y
-CONFIG_ACPI_NFIT=m
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_ACPI_SBS=m
-CONFIG_AMD8111_ETH=m
-CONFIG_AMD_IOMMU=y
-CONFIG_AMD_MEM_ENCRYPT=y
-CONFIG_AMD_PHY=m
-CONFIG_AMD_XGBE=m
-CONFIG_AQTION=m
-CONFIG_ASYNC_TX_DMA=y
-CONFIG_ATA_GENERIC=m
-CONFIG_ATA_OVER_ETH=m
-CONFIG_ATM=m
-CONFIG_AUXDISPLAY=y
-CONFIG_BE2NET=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_THROTTLING=y
-CONFIG_BNXT_DCB=y
-CONFIG_BOOT_PRINTK_DELAY=y
-CONFIG_BROADCOM_PHY=m
-CONFIG_CAN=m
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_LIB=m
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_CGROUP_HUGETLB=y
-CONFIG_CIFS_ACL=y
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_UPCALL=y
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_CLEANCACHE=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CMA=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CRASH_DUMP=y
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_CCITT=y
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DH=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SHA1_SSSE3=y
-CONFIG_CRYPTO_SHA256_SSSE3=y
-CONFIG_CRYPTO_SHA512_SSSE3=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_VMAC=m
-CONFIG_DAX=y
-CONFIG_DEBUG_BOOT_PARAMS=y
-CONFIG_DEBUG_LIST=y
-CONFIG_DEBUG_SECTION_MISMATCH=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_DELL_RBTN=m
-CONFIG_DELL_SMBIOS=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DLM=m
-CONFIG_DMI_SYSFS=y
-CONFIG_DM_CACHE=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_VERITY=m
-CONFIG_DNET=m
-CONFIG_DRBD_FAULT_INJECTION=y
-CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_DP_AUX_CHARDEV=y
-CONFIG_DRM_I915_GVT=y
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_EARLY_PRINTK_DBGP=y
-CONFIG_EARLY_PRINTK_EFI=y
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EFI_MIXED=y
-CONFIG_ENA_ETHERNET=m
-CONFIG_ENIC=m
-CONFIG_FB_TILEBLITTING=y
-CONFIG_FIXED_PHY=y
-CONFIG_FRONTSWAP=y
-CONFIG_FSCACHE=m
-CONFIG_FS_DAX=y
-CONFIG_FUJITSU_ES=m
-CONFIG_FUSION=y
-CONFIG_FW_CFG_SYSFS=y
-CONFIG_GART_IOMMU=y
-CONFIG_GFS2_FS=m
-CONFIG_GPIO_AMDPT=m
-CONFIG_GPIO_ICH=m
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-CONFIG_HEADERS_CHECK=y
-CONFIG_HIBERNATION=y
-CONFIG_HID_ALPS=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_PLANTRONICS=y
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
-CONFIG_HID_SENSOR_PRESS=m
-CONFIG_HID_SENSOR_PROX=m
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_HP_ILO=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_HWLAT_TRACER=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_I2C_HID=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_SCMI=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
-CONFIG_IFB=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_INPUT_GP2A=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INTEL_HID_EVENT=m
-CONFIG_INTEL_IOMMU_DEFAULT_ON=y
-CONFIG_INTEL_IPS=m
-CONFIG_INTEL_ISH_HID=y
-CONFIG_INTEL_PMC_CORE=m
-CONFIG_INTEL_TXT=y
-CONFIG_INTEL_VBTN=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IP_DCCP=m
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_VS=m
-CONFIG_IRQ_REMAP=y
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_JUMP_LABEL=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KEXEC=y
-CONFIG_KEXEC_FILE=y
-CONFIG_KSM=y
-CONFIG_KVM_MMU_AUDIT=y
-CONFIG_L2TP=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LIBNVDIMM=m
-CONFIG_LIQUIDIO=m
-CONFIG_LIQUIDIO_VF=m
-CONFIG_LPC_SCH=m
-CONFIG_LWTUNNEL=y
-CONFIG_MAC802154=m
-CONFIG_MACSEC=m
-CONFIG_MARVELL_PHY=m
-CONFIG_MD_RAID456=m
-CONFIG_MEGARAID_SAS=y
-CONFIG_MEMORY_FAILURE=y
-CONFIG_MEM_SOFT_DIRTY=y
-CONFIG_MLXFW=m
-CONFIG_MLXSW_CORE=m
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_SIG=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_MODVERSIONS=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MTD=m
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NET_ACT_CONNMARK=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SAMPLE=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_DEVLINK=m
-CONFIG_NET_DROP_MONITOR=y
-CONFIG_NET_EMATCH=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_PLUG=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NFP=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_REJECT=m
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_TABLES_ARP=m
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NF_TABLES_INET=m
-CONFIG_NF_TABLES_IPV4=m
-CONFIG_NF_TABLES_IPV6=m
-CONFIG_NO_HZ_FULL=y
-CONFIG_NTB=m
-CONFIG_NVME_FC=m
-CONFIG_NVME_TARGET=m
-CONFIG_NVRAM=y
-CONFIG_PACKET_DIAG=m
-CONFIG_PATA_ACPI=m
-CONFIG_PCI_STUB=y
-CONFIG_PINCTRL_AMD=m
-CONFIG_PINCTRL_DENVERTON=m
-CONFIG_PINCTRL_GEMINILAKE=m
-CONFIG_PINCTRL_LEWISBURG=m
-CONFIG_PMBUS=m
-CONFIG_PM_TRACE_RTC=y
-CONFIG_POWER_RESET=y
-CONFIG_PPTP=m
-CONFIG_PRINTK_TIME=y
-CONFIG_PROFILING=y
-CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
-CONFIG_PSAMPLE=m
-CONFIG_PSTORE=y
-CONFIG_QED=m
-CONFIG_QLA3XXX=m
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_RAID_ATTRS=y
-CONFIG_RAW_DRIVER=y
-CONFIG_RMI4_CORE=m
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RX4581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_SCHEDSTATS=y
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_SCSI_3W_9XXX=y
-CONFIG_SCSI_3W_SAS=y
-CONFIG_SCSI_AACRAID=y
-CONFIG_SCSI_AIC94XX=y
-CONFIG_SCSI_ARCMSR=y
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_DH=y
-CONFIG_SCSI_DPT_I2O=y
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_GDTH=y
-CONFIG_SCSI_HPSA=y
-CONFIG_SCSI_HPTIOP=y
-CONFIG_SCSI_IPS=y
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_MPT2SAS=y
-CONFIG_SCSI_MPT3SAS=y
-CONFIG_SCSI_MVSAS=y
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_PMCRAID=y
-CONFIG_SCSI_SAS_ATTRS=y
-CONFIG_SCSI_SAS_LIBSAS=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_SCSI_SMARTPQI=y
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_STEX=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
-CONFIG_SDIO_UART=m
-CONFIG_SECURITY_NETWORK_XFRM=y
-CONFIG_SECURITY_PATH=y
-CONFIG_SECURITY_YAMA=y
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_SERIO_RAW=m
-CONFIG_SFC_FALCON=m
-CONFIG_SFI=y
-CONFIG_SIGNED_PE_FILE_VERIFICATION=y
-CONFIG_SQUASHFS=y
-CONFIG_STACK_TRACER=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_TARGET_CORE=m
-CONFIG_TASK_XACCT=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_MD5SIG=y
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THUNDERBOLT=y
-CONFIG_TLAN=m
-CONFIG_TYPEC_UCSI=y
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UNIX_DIAG=m
-CONFIG_USBIP_CORE=m
-CONFIG_USB_LEDS_TRIGGER_USBPORT=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_UAS=m
-CONFIG_USERFAULTFD=y
-CONFIG_VFIO_MDEV=m
-CONFIG_VFIO_NOIOMMU=y
-CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_VMD=y
-CONFIG_VMXNET3=m
-CONFIG_VSOCKETS=m
-CONFIG_VXLAN=m
-CONFIG_WATCHDOG_SYSFS=y
-CONFIG_WDAT_WDT=m
-CONFIG_X86_AMD_PLATFORM_DEVICE=y
-CONFIG_X86_INTEL_MPX=y
-CONFIG_X86_MCE_INJECT=m
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_PMEM_LEGACY=m
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_ZBUD=y
-CONFIG_ZPOOL=y
-CONFIG_ZSMALLOC=y
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_WATCHDOG=y
-CONFIG_AMD_IOMMU_V2=m
-CONFIG_AMD_XGBE_HAVE_ECC=y
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ATM_BR2684=m
-CONFIG_ATM_CLIP=m
-CONFIG_ATM_LANE=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BLK_DEV_PMEM=m
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_BTREE=y
-CONFIG_BTT=y
-CONFIG_CACHEFILES=m
-CONFIG_CAN_8DEV_USB=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_CALC_BITTIMING=y
-CONFIG_CAN_CC770=m
-CONFIG_CAN_CC770_PLATFORM=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PCI=m
-CONFIG_CAN_C_CAN_PLATFORM=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_EMS_PCI=m
-CONFIG_CAN_EMS_USB=m
-CONFIG_CAN_ESD_USB2=m
-CONFIG_CAN_GW=m
-CONFIG_CAN_KVASER_PCI=m
-CONFIG_CAN_KVASER_USB=m
-CONFIG_CAN_LEDS=y
-CONFIG_CAN_PEAK_PCI=m
-CONFIG_CAN_PEAK_PCIEC=y
-CONFIG_CAN_PEAK_USB=m
-CONFIG_CAN_PLX_PCI=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_SJA1000=m
-CONFIG_CAN_SJA1000_PLATFORM=m
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_SOFTING=m
-CONFIG_CAN_VCAN=m
-CONFIG_CEPH_FS_POSIX_ACL=y
-CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
-CONFIG_CHASH=m
-CONFIG_CMA_ALIGNMENT=8
-CONFIG_CMA_AREAS=7
-CONFIG_CMA_SIZE_MBYTES=16
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-CONFIG_CONTEXT_TRACKING=y
-CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_FIPS=y
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CYCLADES=m
-CONFIG_DAX_DRIVER=y
-CONFIG_DEFAULT_CUBIC=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_DELL_LAPTOP=m
-CONFIG_DLM_DEBUG=y
-CONFIG_DMA_CMA=y
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DP83640_PHY=y
-CONFIG_DRM_AMD_DC=y
-CONFIG_DRM_AMD_DC_DCN1_0=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_SCHED=m
-CONFIG_EARLY_PRINTK_USB=y
-CONFIG_EFI_RUNTIME_MAP=y
-CONFIG_EFI_VARS_PSTORE=y
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-CONFIG_FB_HYPERV=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LOGGING=y
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_SAS=y
-CONFIG_FUSION_SPI=m
-CONFIG_GACT_PROB=y
-CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ=y
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HID_HYPERV_MOUSE=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HMC_DRV=m
-CONFIG_HPWDT_NMI_DECODING=y
-CONFIG_HSA_AMD=m
-CONFIG_HWPOISON_INJECT=m
-CONFIG_HYPERV=m
-CONFIG_HYPERV_BALLOON=m
-CONFIG_HYPERV_KEYBOARD=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_TSCPAGE=y
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_VSOCKETS=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_INET_DCCP_DIAG=m
-CONFIG_IOMMU_HELPER=y
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_DMI_DECODE=y
-CONFIG_IPMI_POWEROFF=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-CONFIG_IP_DCCP_CCID3=y
-CONFIG_IP_DCCP_TFRC_LIB=y
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_IPV6=y
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_NQ=m
-CONFIG_IP_VS_PE_SIP=m
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_SCTP=y
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SH_TAB_BITS=8
-CONFIG_IP_VS_TAB_BITS=12
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_WRR=m
-CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
-CONFIG_KEXEC_CORE=y
-CONFIG_KEXEC_JUMP=y
-CONFIG_KEXEC_VERIFY_SIG=y
-CONFIG_KVM_GUEST=y
-CONFIG_L2TP_DEBUGFS=m
-CONFIG_L2TP_ETH=m
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_V3=y
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_LIVEPATCH=y
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_MAX_RAW_DEVS=8192
-CONFIG_MEMORY_ISOLATION=y
-CONFIG_MLXSW_CORE_HWMON=y
-CONFIG_MLXSW_CORE_THERMAL=y
-CONFIG_MLXSW_I2C=m
-CONFIG_MLXSW_MINIMAL=m
-CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_SPECTRUM=m
-CONFIG_MLXSW_SPECTRUM_DCB=y
-CONFIG_MLXSW_SWITCHIB=m
-CONFIG_MLXSW_SWITCHX2=m
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MODULE_SIG_ALL=y
-CONFIG_MODULE_SIG_HASH="sha256"
-CONFIG_MODULE_SIG_SHA256=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_BEB_LIMIT=20
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_ND_BLK=m
-CONFIG_ND_BTT=m
-CONFIG_ND_CLAIM=y
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NFP_APP_FLOWER=y
-CONFIG_NFS_FSCACHE=y
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-CONFIG_NFS_V4_2=y
-CONFIG_NFS_V4_SECURITY_LABEL=y
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_LOG_BRIDGE=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NTB_AMD=m
-CONFIG_NTB_NETDEV=m
-CONFIG_NTB_PERF=m
-CONFIG_NTB_TRANSPORT=m
-CONFIG_NVME_FABRICS=m
-CONFIG_NVME_TARGET_FC=m
-CONFIG_NVME_TARGET_FCLOOP=m
-CONFIG_NVME_TARGET_LOOP=m
-CONFIG_N_HDLC=m
-CONFIG_ORE=m
-CONFIG_PADATA=y
-CONFIG_PARAVIRT=y
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_PARAVIRT_SPINLOCKS=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
-CONFIG_PARMAN=m
-CONFIG_PCH_DMA=m
-CONFIG_PCI_HYPERV=m
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_TRACE=y
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_PRINT_QUOTA_WARNING=y
-CONFIG_PROC_VMCORE=y
-CONFIG_PSTORE_RAM=m
-CONFIG_PTP_1588_CLOCK_KVM=y
-CONFIG_PTP_1588_CLOCK_PCH=y
-CONFIG_QEDE=m
-CONFIG_QEDF=m
-CONFIG_QEDI=m
-CONFIG_QED_FCOE=y
-CONFIG_QED_LL2=y
-CONFIG_QED_OOO=y
-CONFIG_QED_SRIOV=y
-CONFIG_QFMT_V2=y
-CONFIG_QUOTA_TREE=y
-CONFIG_RCU_FANOUT=64
-CONFIG_RCU_FANOUT_LEAF=16
-CONFIG_RCU_NOCB_CPU=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_RMI4_2D_SENSOR=y
-CONFIG_RMI4_F03=y
-CONFIG_RMI4_F03_SERIO=m
-CONFIG_RMI4_F11=y
-CONFIG_RMI4_F12=y
-CONFIG_RMI4_F30=y
-CONFIG_RMI4_SMB=m
-CONFIG_ROCKER=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_SOFT_WATCHDOG=y
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_DH_ALUA=y
-CONFIG_SCSI_DH_EMC=y
-CONFIG_SCSI_DH_HP_SW=y
-CONFIG_SCSI_DH_RDAC=y
-CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MVSAS_TASKLET=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SFC_FALCON_MTD=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_TCM_FC=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_QLA2XXX=m
-CONFIG_TCM_USER2=m
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_DCTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_THUNDERBOLT_NET=m
-CONFIG_UCSI_ACPI=y
-CONFIG_UEFI_CPER=y
-CONFIG_UIO_HV_GENERIC=m
-CONFIG_VFIO_MDEV_DEVICE=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST_VSOCK=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VSOCKMON=m
-CONFIG_X86_PMEM_LEGACY_DEVICE=y
-CONFIG_X86_X2APIC=y
-CONFIG_ZRAM=m
-CONFIG_ZSWAP=y
+++ /dev/null
-
-SUMMARY = "Manage Linux IP sets"
-DESCRIPTION = " \
-IP sets are a framework inside the Linux kernel since version 2.4.x, which can \
-be administered by the ipset utility. Depending on the type, currently an IP \
-set may store IP addresses, (TCP/UDP) port numbers or IP addresses with MAC \
-addresses in a way, which ensures lightning speed when matching an entry \
-against a set. \
-\
-If you want to: \
- - store multiple IP addresses or port numbers and match against the collection \
- by iptables at one swoop; \
- - dynamically update iptables rules against IP addresses or ports without \
- performance penalty; \
- - express complex IP address and ports based rulesets with one single iptables \
- rule and benefit from the speed of IP sets \
-then ipset may be the proper tool for you. \
-"
-
-HOMEPAGE = "http://ipset.netfilter.org"
-
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-SECTION = "network"
-
-DEPENDS = "libtool libmnl"
-
-SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2"
-
-SRC_URI[md5sum] = "0e5d9c85f6b78e7dff0c996e2900574b"
-SRC_URI[sha256sum] = "ceef625ba31fe0aaa422926c7231a819de0b07644c02c17ebdd3022a29e3e244"
-
-inherit autotools pkgconfig module-base
-
-EXTRA_OECONF += "-with-kbuild=${KBUILD_OUTPUT} --with-ksource=${STAGING_KERNEL_DIR}"
-
-RDEPENDS_${PN} = "kernel-module-ip-set"
-RRECOMMENDS_${PN} = "\
- kernel-module-ip-set-bitmap-ip \
- kernel-module-ip-set-bitmap-ipmac \
- kernel-module-ip-set-bitmap-port \
- kernel-module-ip-set-hash-ip \
- kernel-module-ip-set-hash-ipmac \
- kernel-module-ip-set-hash-ipmark \
- kernel-module-ip-set-hash-ipport \
- kernel-module-ip-set-hash-ipportip \
- kernel-module-ip-set-hash-ipportnet \
- kernel-module-ip-set-hash-mac \
- kernel-module-ip-set-hash-net \
- kernel-module-ip-set-hash-netiface \
- kernel-module-ip-set-hash-netnet \
- kernel-module-ip-set-hash-netport \
- kernel-module-ip-set-hash-netportnet \
- kernel-module-ip-set-list-set \
-"
+++ /dev/null
-SRCREV_FORMAT = "opendev"
-SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
-SUBPATH0 = "net-snmp-config"
-DSTSUFX0 = "stx-configfiles"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://stx-configfiles-LICENSE;beginline=1;endline=10;md5=ea07d0b28c02168e45abc208d8193e1a \
- "
-
-SRC_URI += " \
- git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX0};branch="r/stx.3.0";subpath=${SUBPATH0};name=opendev \
- "
-
-inherit useradd
-
-USERADD_PACKAGES = "net-snmp-server-snmpd"
-USERADD_PARAM_net-snmp-server-snmpd = "-r -g snmpd -d /usr/share/snmp -s /sbin/nologin -c 'net-snmp' snmpd"
-GROUPADD_PARAM_net-snmp-server-snmpd = "-r snmpd"
-
-SYSTEMD_AUTO_ENABLE_${PN}-server-snmpd = "disable"
-SYSTEMD_AUTO_ENABLE_${PN}-server-snmptrapd = "disable"
-
-SYSTEMD_SERVICE_${PN}_append = "snmpd.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-
-
-do_unpack_append() {
- bb.build.exec_func('do_copy_config_files', d)
-}
-
-do_copy_config_files () {
- cp -pf ${WORKDIR}/${DSTSUFX0}/centos/net-snmp-config.spec ${S}/stx-configfiles-LICENSE
-}
-
-do_install_append () {
-
- install -d ${D}/${sysconfdir}/rc.d/init.d
- install -d ${D}/${sysconfdir}/init.d
- install -d ${D}/${sysconfdir}/systemd/system
-
- install -m 640 ${WORKDIR}/${DSTSUFX0}/files/stx.snmpd.conf ${D}/${sysconfdir}/snmp/snmpd.conf
- install -m 755 ${WORKDIR}/${DSTSUFX0}/files/stx.snmpd ${D}/${sysconfdir}/rc.d/init.d/snmpd
- install -m 755 ${WORKDIR}/${DSTSUFX0}/files/stx.snmpd ${D}/${sysconfdir}/init.d/snmpd
- install -m 660 ${WORKDIR}/${DSTSUFX0}/files/stx.snmp.conf ${D}/${datadir}/snmp/snmp.conf
- install -m 644 ${WORKDIR}/${DSTSUFX0}/files/snmpd.service ${D}/${sysconfdir}/systemd/system/snmpd.service
- chmod 640 ${D}/${sysconfdir}/snmp/snmpd.conf
- chmod 640 ${D}/${sysconfdir}/snmp/snmptrapd.conf
-}
-
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-FILES_${PN}-server-snmpd_append = " ${sysconfdir}/rc.d/init.d/snmpd"
+++ /dev/null
-PACKAGECONFIG ?= "numa"
-PACKAGECONFIG[numa] = ",,numactl,numactl"
-
-EXTRA_OEMAKE = "\
- ${@bb.utils.contains('PACKAGECONFIG', 'numa', 'NUMA=1', 'NUMA=0', d)} \
- PYLIB=${libdir}/python2.7/site-packages \
-"
-
-FILES_${PN} += "\
- ${libdir}/python2.7/site-packages \
-"
-
-RDEPENDS_${PN} += "python"
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "audit-config"
-
-do_unpack_append () {
- bb.build.exec_func('do_copy_audit_config', d)
-}
-
-do_copy_audit_config () {
- cp -f ${STX_METADATA_PATH}/files/syslog.conf ${S}/audisp/plugins/builtins/syslog.conf
-}
+++ /dev/null
---- src/util/verto/Makefile.in 2018-05-03 10:34:47.000000000 -0400
-+++ src/util/verto/Makefile.in.new 2019-08-14 06:05:03.779775294 -0400
-@@ -3,7 +3,7 @@
- RELDIR=../util/verto
-
- LIBBASE=verto
--LIBMAJOR=0
-+LIBMAJOR=1
- LIBMINOR=0
-
- LOCALINCLUDES=-I$(srcdir) -I.
+++ /dev/null
-
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-#SRC_URI_append = "file://soname_majversion.diff"
-DEPENDS += "libverto"
-
-PACKAGES_remove = "libverto"
-
-RDEPENDS_${PN} += "\
- libverto \
-"
-RDEPENDS_krb5-admin-server += "\
- libverto \
-"
-RDEPENDS_krb5-kdc += "\
- libverto \
-"
+++ /dev/null
-
-SUMMARY = "A comprehensive, portable cryptographic toolkit"
-DESCRIPTION = " \
- A comprehensive, modular and portable cryptographic toolkit that provides \
- developers with a vast array of well known published block ciphers, one-way \
- hash functions, chaining modes, pseudo-random number generators, public key \
- cryptography and a plethora of other routines. Designed from the ground up to \
- be very simple to use. It has a modular and standard API that allows new ciphers, \
- hashes and PRNGs to be added or removed without change to the overall end application. \
- It features easy to use functions and a complete user manual which has many source \
- snippet examples. \
-"
-HOMEPAGE = "https://github.com/libtom/libtomcrypt"
-
-LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=71baacc459522324ef3e2b9e052e8180"
-
-DEPENDS = "libtool-cross"
-
-SRC_URI = "https://github.com/libtom/libtomcrypt/releases/download/v${PV}/crypt-${PV}.tar.xz"
-
-SRC_URI[md5sum] = "e8d22351b7c95bef423c1cd02dcf836d"
-SRC_URI[sha256sum] = "96ad4c3b8336050993c5bc2cf6c057484f2b0f9f763448151567fbab5e767b84"
-
-EXTRA_OEMAKE = " \
- LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool \
- LIBPATH=${libdir} \
- INCPATH=${includedir} \
- -f makefile.shared \
- "
-
-do_compile() {
- oe_runmake library
-}
-
-do_install() {
- oe_runmake install DESTDIR=${D}
-}
+++ /dev/null
-
-SUMMARY = "A portable number theoretic multiple-precision integer library"
-DESCRIPTION = " \
- A free open source portable number theoretic multiple-precision integer \
- library written entirely in C. (phew!). The library is designed to provide \
- a simple to work with API that provides fairly efficient routines that \
- build out of the box without configuration. \
-"
-HOMEPAGE = "https://github.com/libtom/libtommath"
-
-LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=23e7e0a32e53a2b1d35f5fd9ef053402"
-
-DEPENDS = "libtool-cross"
-
-SRC_URI = "https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}.tar.xz"
-
-SRC_URI[md5sum] = "b2da4488c9024976d36870132f4b8a42"
-SRC_URI[sha256sum] = "90466c88783d1fe9f5c2364a69f5479f10d73ed616011be6196f35f7f1537ead"
-
-EXTRA_OEMAKE = " \
- LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool \
- LIBPATH=${libdir} \
- INCPATH=${includedir} \
- -f makefile.shared \
- "
-
-do_install() {
- oe_runmake install DESTDIR=${D}
-}
+++ /dev/null
-DEP_PYTHON = "\
- python \
- python-native \
- python-numpy-native \
- python3 \
- python3-native \
- python3-numpy-native \
-"
-
-PACKAGECONFIG = "locale python"
-PACKAGECONFIG[python] = ",,${DEP_PYTHON}"
-
-BJAM_OPTS += "${@bb.utils.contains('BOOST_LIBS', 'python', 'python=${PYTHON_BASEVERSION},2.7', '', d)}"
-
-do_configure_append () {
- if ${@bb.utils.contains('BOOST_LIBS', 'python', 'true', 'false', d)}; then
- echo "using python : 2.7 : ${STAGING_BINDIR_NATIVE}/python-native/python : ${STAGING_INCDIR}/python2.7 : ${STAGING_LIBDIR}/python2.7 ;" >> ${WORKDIR}/user-config.jam
- sed -i -e 's|${STAGING_DIR_HOST}${bindir}/python3|${STAGING_BINDIR_NATIVE}/python3-native/python3|' ${WORKDIR}/user-config.jam
- fi
-}
-
-PACKAGES += "${PN}-python3"
-
-FILES_${PN}-python = " \
- ${libdir}/libboost_python2*.so.* \
- ${libdir}/libboost_numpy2*.so.* \
-"
-FILES_${PN}-python3 = " \
- ${libdir}/libboost_python3*.so.* \
- ${libdir}/libboost_numpy3*.so.* \
-"
+++ /dev/null
-From 86924cbbd595cde81584d74f6c93bcc4a080fcdd Mon Sep 17 00:00:00 2001
-From: Li xin <lixin.fnst@cn.fujitsu.com>
-Date: Tue, 18 Aug 2015 17:43:29 +0900
-Subject: [PATCH] don't compile doc and Error Fix
-
-| help2man: can't get `--help' info from ../../lrm/admin/lrmadmin
-| make[2]: *** [lrmadmin.8] Error 1
-
-| make[2]: a2x: Command not found
-| /usr/bin/xsltproc \
-| --xinclude \
-| http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl ha_logd.xml
-| make[2]: *** [hb_report.8] Error 127
-
-Upstream-Status: pending
-
-Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
----
- Makefile.am | 2 +-
- configure.ac | 6 ++++++
- lrm/admin/Makefile.am | 14 +++++++-------
- 3 files changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 93dbaf6..2f4d03b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -23,7 +23,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure DRF/config-h.in \
- DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
-
- SUBDIRS = include $(LIBLTDL_DIR) replace lib lrm logd \
-- hb_report doc config
-+ hb_report config
-
- install-exec-local:
- $(INSTALL) -d $(DESTDIR)/$(HA_COREDIR)
-diff --git a/configure.ac b/configure.ac
-index 36bcf12..809fae6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1437,3 +1437,9 @@ AC_MSG_RESULT([ CFLAGS = ${CFLAGS}])
- AC_MSG_RESULT([ Libraries = ${LIBS}])
- AC_MSG_RESULT([ Stack Libraries = ${CLUSTERLIBS}])
-
-+if test "$TARGET_PYTHON"; then
-+ TARGET_PYTHON=$TARGET_PYTHON
-+else
-+ TARGET_PYTHON=$PYTHON
-+fi
-+ AC_SUBST(TARGET_PYTHON)
-diff --git a/lrm/admin/Makefile.am b/lrm/admin/Makefile.am
-index a92cd72..de525ea 100644
---- a/lrm/admin/Makefile.am
-+++ b/lrm/admin/Makefile.am
-@@ -31,10 +31,10 @@ lrmadmin_LDFLAGS = $(COMMONLIBS)
- lrmadmin_LDADD = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
- lrmadmin_DEPENDENCIES = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
-
--if BUILD_HELP
--man8_MANS = $(sbin_PROGRAMS:%=%.8)
--%.8: %
-- echo Creating $@
-- chmod a+x $<
-- help2man --output $@ --no-info --section 8 --name "Part of the Linux-HA project" $(top_builddir)/lrm/admin/$<
--endif
-+#if BUILD_HELP
-+#man8_MANS = $(sbin_PROGRAMS:%=%.8)
-+#%.8: %
-+# echo Creating $@
-+# chmod a+x $<
-+# help2man --output $@ --no-info --section 8 --name "Part of the Linux-HA project" $(top_builddir)/lrm/admin/$<
-+#endif
---
-1.8.4.2
-
+++ /dev/null
-From a2c66927b75547cee1db1340a67449ded0812df3 Mon Sep 17 00:00:00 2001
-From: Li xin <lixin.fnst@cn.fujitsu.com>
-Date: Wed, 19 Aug 2015 11:13:46 +0900
-Subject: [PATCH] ribcl.py.in: Warning Fix
-
-WARNING: QA Issue: /usr/lib/stonith/plugins/stonith2/ribcl.py_cluster-glue-plugin-stonith2-ribcl
-contained in package cluster-glue-plugin-stonith2-ribcl requires /usr/local/bin/python,
-but no providers found in its RDEPENDS [file-rdeps]
-
-Add target python handling
-Allow the build to specify a path for the python instead of reusing
-the PYTHON variable which can lead to inconsistencies if we are cross
-compiling.
-
-Upstream-Status: pending
-
-Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
----
- lib/plugins/stonith/ribcl.py.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/plugins/stonith/ribcl.py.in b/lib/plugins/stonith/ribcl.py.in
-index 14e070c..01205e3 100644
---- a/lib/plugins/stonith/ribcl.py.in
-+++ b/lib/plugins/stonith/ribcl.py.in
-@@ -1,4 +1,4 @@
--#!@PYTHON@
-+#!@TRAGET_PYTHON@
-
-
- #
---
-1.8.4.2
-
+++ /dev/null
-Index: Reusable-Cluster-Components-glue-1.0.3/configure.ac
-===================================================================
---- Reusable-Cluster-Components-glue-1.0.3.orig/configure.ac 2010-04-23 12:35:52.000000000 +0400
-+++ Reusable-Cluster-Components-glue-1.0.3/configure.ac 2010-04-23 12:36:00.000000000 +0400
-@@ -1135,7 +1135,6 @@
-
- # We had to eliminate -Wnested-externs because of libtool changes
- EXTRA_FLAGS="-fgnu89-inline
-- -fstack-protector-all
- -Wall
- -Waggregate-return
- -Wbad-function-cast
+++ /dev/null
-d /var/lib/heartbeat 0755 root root -
-d /var/lib/heartbeat/pengine 0750 hacluster haclient -
-d /var/lib/heartbeat/cores 0755 hacluster haclient -
-d /var/lib/heartbeat/cores/hacluster 0700 hacluster haclient -
-d /var/lib/heartbeat/cores/root 0700 root root -
-d /var/lib/heartbeat/cores/nobody 0700 nobody nogroup -
-d /var/run/heartbeat 0755 root root -
-
+++ /dev/null
-d root root 0755 /var/lib/heartbeat none
-d hacluster haclient 0750 /var/lib/heartbeat/pengine none
-d hacluster haclient 0755 /var/lib/heartbeat/cores none
-d hacluster haclient 0700 /var/lib/heartbeat/cores/hacluster none
-d root root 0700 /var/lib/heartbeat/cores/root none
-d nobody nogroup 0700 /var/lib/heartbeat/cores/nobody none
-d root root 0755 /var/run/heartbeat none
+++ /dev/null
-
-DESCRIPTION = "Cluster Glue is a set of libraries, tools and utilities suitable for \
-the Heartbeat/Pacemaker cluster stack. In essence, Glue is everything that \
-is not the cluster messaging layer (Heartbeat), nor the cluster resource manager \
-(Pacemaker), nor a Resource Agent."
-HOMEPAGE = "http://clusterlabs.org/"
-LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
- file://COPYING.LIB;md5=243b725d71bb5df4a1e5920b344b86ad \
-"
-
-DEPENDS = "libxml2 libtool glib-2.0 bzip2 util-linux net-snmp openhpi"
-
-SRC_URI = " \
- http://hg.linux-ha.org/glue/archive/glue-${PV}.tar.bz2 \
- file://0001-don-t-compile-doc-and-Error-Fix.patch \
- file://0001-ribcl.py.in-Warning-Fix.patch \
- file://volatiles \
- file://tmpfiles \
-"
-SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch"
-
-SRC_URI[md5sum] = "ec620466d6f23affa3b074b72bca7870"
-SRC_URI[sha256sum] = "feba102fa1e24b6be2005089ebe362b82d6567af60005cf371679b1b44ec503f"
-
-inherit autotools useradd pkgconfig systemd
-
-SYSTEMD_SERVICE_${PN} = "logd.service"
-SYSTEMD_AUTO_ENABLE = "disable"
-
-HA_USER = "hacluster"
-HA_GROUP = "haclient"
-
-S = "${WORKDIR}/Reusable-Cluster-Components-glue--glue-${PV}"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir,systemd"
-
-EXTRA_OECONF = "--with-daemon-user=${HA_USER} \
- --with-daemon-group=${HA_GROUP} \
- --disable-fatal-warnings \
- "
-
-CACHED_CONFIGUREVARS="ac_cv_path_XML2CONFIG=0"
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--home-dir=${localstatedir}/lib/heartbeat/cores/${HA_USER} \
- -g ${HA_GROUP} -r -s ${sbindir}/nologin -c 'cluster user' ${HA_USER} \
- "
-GROUPADD_PARAM_${PN} = "-r ${HA_GROUP}"
-
-do_configure_prepend() {
- ln -sf ${PKG_CONFIG_SYSROOT_DIR}/usr/include/libxml2/libxml ${PKG_CONFIG_SYSROOT_DIR}/usr/include/libxml
-}
-
-do_install_append() {
- install -d ${D}${sysconfdir}/default/volatiles
- install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/04_cluster-glue
- install -d ${D}${sysconfdir}/tmpfiles.d
- install -m 0644 ${WORKDIR}/tmpfiles ${D}${sysconfdir}/tmpfiles.d/${PN}.conf
-}
-
-pkg_postinst_${PN} () {
- if [ -z "$D" ]; then
- if type systemd-tmpfiles >/dev/null; then
- systemd-tmpfiles --create
- elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
- ${sysconfdir}/init.d/populate-volatile.sh update
- fi
- fi
-}
-
-PACKAGES += "\
- ${PN}-plugin-test \
- ${PN}-plugin-test-dbg \
- ${PN}-plugin-test-staticdev \
- ${PN}-plugin-stonith2 \
- ${PN}-plugin-stonith2-dbg \
- ${PN}-plugin-stonith2-staticdev \
- ${PN}-plugin-stonith2-ribcl \
- ${PN}-plugin-stonith-external \
- ${PN}-plugin-raexec \
- ${PN}-plugin-raexec-dbg \
- ${PN}-plugin-raexec-staticdev \
- ${PN}-plugin-interfacemgr \
- ${PN}-plugin-interfacemgr-dbg \
- ${PN}-plugin-interfacemgr-staticdev \
- ${PN}-lrmtest \
- ${PN}-plugin-compress \
- ${PN}-plugin-compress-dbg \
- ${PN}-plugin-compress-staticdev \
- "
-
-FILES_${PN} = "${sysconfdir} /var ${libdir}/lib*.so.* ${sbindir} ${datadir}/cluster-glue/*sh ${datadir}/cluster-glue/*pl\
- ${libdir}/heartbeat/transient-test.sh \
- ${libdir}/heartbeat/logtest \
- ${libdir}/heartbeat/ipctransientserver \
- ${libdir}/heartbeat/base64_md5_test \
- ${libdir}/heartbeat/ipctest \
- ${libdir}/heartbeat/ipctransientclient \
- ${libdir}/heartbeat/ha_logd \
- ${libdir}/heartbeat/lrmd \
- ${systemd_unitdir} \
- "
-
-FILES_${PN}-dbg += "${libdir}/heartbeat/.debug/ \
- "
-FILES_${PN}-plugin-compress = "${libdir}/heartbeat/plugins/compress/*.so"
-FILES_${PN}-plugin-compress-staticdev = "${libdir}/heartbeat/plugins/compress/*.*a"
-FILES_${PN}-plugin-compress-dbg = "${libdir}/heartbeat/plugins/compress/.debug/"
-
-FILES_${PN}-plugin-test = "${libdir}/heartbeat/plugins/test/test.so"
-FILES_${PN}-plugin-test-staticdev = "${libdir}/heartbeat/plugins/test/test.*a"
-FILES_${PN}-plugin-test-dbg = "${libdir}/heartbeat/plugins/test/.debug/"
-FILES_${PN}-plugin-stonith2 = " \
- ${libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper \
- ${libdir}/stonith/plugins/stonith2/*.so \
- "
-FILES_${PN}-plugin-stonith2-ribcl = "${libdir}/stonith/plugins/stonith2/ribcl.py"
-
-FILES_${PN}-plugin-stonith2-dbg = "${libdir}/stonith/plugins/stonith2/.debug/"
-FILES_${PN}-plugin-stonith2-staticdev = "${libdir}/stonith/plugins/stonith2/*.*a"
-
-FILES_${PN}-plugin-stonith-external = "${libdir}/stonith/plugins/external/"
-FILES_${PN}-plugin-raexec = "${libdir}/heartbeat/plugins/RAExec/*.so"
-FILES_${PN}-plugin-raexec-staticdev = "${libdir}/heartbeat/plugins/RAExec/*.*a"
-FILES_${PN}-plugin-raexec-dbg = "${libdir}/heartbeat/plugins/RAExec/.debug/"
-
-FILES_${PN}-plugin-interfacemgr = "${libdir}/heartbeat/plugins/InterfaceMgr/generic.so"
-FILES_${PN}-plugin-interfacemgr-staticdev = "${libdir}/heartbeat/plugins/InterfaceMgr/generic.*a"
-FILES_${PN}-plugin-interfacemgr-dbg = "${libdir}/heartbeat/plugins/InterfaceMgr/.debug/"
-
-FILES_${PN}-lrmtest = "${datadir}/cluster-glue/lrmtest/"
-
-RDEPENDS_${PN} += "perl"
-RDEPENDS_${PN}-plugin-stonith2 += "bash"
-RDEPENDS_${PN}-plugin-stonith-external += "bash python perl"
-RDEPENDS_${PN}-plugin-stonith2-ribcl += "python"
+++ /dev/null
-
-DESCRIPTION = "Makedeltarpm creates a deltarpm from two rpms. The deltarpm can \
- later be used to recreate the new rpm from either filesystem data \
- or the old rpm. Use the -v option to make makedeltarpm more verbose \
- about its work (use it twice to make it even more verbose).\
- "
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=574af071cf0d60a71cb781844bbe2d76"
-
-SRCREV = "c5e0ca7482e2cfea5e4d902ffe488e0a71ed3e67"
-# SRCREV = "8660d976f5d2b73adf1088d67341be9c3646f2f2"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "3.6.2+git${SRCPV}"
-
-SRC_URI = "git://github.com/rpm-software-management/deltarpm.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
- file://0001-Makefile-patch-fix-build-errors.patch \
- "
-
-DEPENDS += " python perl bzip2 rpm zlib python xz zstd"
-
-do_compile_append () {
- cd ${S}
- oe_runmake -e DESTDIR=${D} bindir=${bindir} mandir=${mandir} python
-
-}
-
-do_install () {
- cd ${S}
- oe_runmake -e DESTDIR=${D} bindir=${bindir} mandir=${mandir} install
-}
-
-FILES_${PN}_append += " \
- /usr/lib/python2.7/site-packages/deltarpm.py \
- /usr/lib/python2.7/site-packages/_deltarpmmodule.so \
- "
+++ /dev/null
-From 0904c124156935c17f29a74e9ba7b49c9dddb56b Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Mon, 26 Aug 2019 13:05:32 -0700
-Subject: [PATCH] Makefile patch fix build errors
-
----
- Makefile | 35 ++++++++++-----------------------
- zlib-1.2.2.f-rsyncable/Makefile | 6 +++---
- 2 files changed, 13 insertions(+), 28 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e6d4609..bce1b0d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,10 +8,10 @@ zlibbundled=$(zlibdir)/libz.a
- zlibldflags=$(zlibbundled)
- zlibcppflags=-I$(zlibdir)
- pylibprefix=/
--CFLAGS = -fPIC -O2 -Wall -g -DWITH_ZSTD=1
--CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" $(zlibcppflags)
-+CFLAGS += -fPIC -O2 -Wall -g -DWITH_ZSTD=1
-+CPPFLAGS += -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" $(zlibcppflags)
- LDLIBS = -lbz2 $(zlibldflags) -llzma -lzstd
--LDFLAGS =
-+LDFLAGS ?=
- PYTHONS = python python3
-
- all: makedeltarpm applydeltarpm rpmdumpheader makedeltaiso applydeltaiso combinedeltarpm fragiso
-@@ -38,17 +38,10 @@ applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibbundled)
- fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o $(zlibbundled)
-
- _deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibbundled)
-- for PY in $(PYTHONS) ; do \
-- if [ -x /usr/bin/$$PY-config ] && [ -x /usr/bin/$$PY ]; then \
-- PYVER=`$$PY -c 'from distutils import sysconfig ; print(sysconfig.get_python_version())'`; \
-- PYCFLAGS=`$$PY-config --cflags`; \
-- if [ ! -f "python$$PYVER/$@" ]; then \
-- mkdir -p python$$PYVER ;\
-- $(CC) $(CFLAGS) $$PYCFLAGS $(zlibcppflags) -fPIC -c -o python$$PYVER/deltarpmmodule.o deltarpmmodule.c ;\
-- $(CC) $(LDFLAGS) -o python$$PYVER/$@ python$$PYVER/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS); \
-- fi; \
-- fi; \
-- done
-+ mkdir -p python2.7
-+ $(CC) $(CFLAGS) -I=/usr/include/python2.7 $(zlibcppflags) -fPIC -c -o python2.7/_deltarpmmodule.o deltarpmmodule.c
-+ $(CC) $(LDFLAGS) -o python2.7/_deltarpmmodule.so python2.7/_deltarpmmodule.o $^ \
-+ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS)
-
- $(zlibbundled):
- cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
-@@ -76,17 +69,9 @@ install:
- install -m 644 applydeltaiso.8 $(DESTDIR)$(mandir)/man8
- install -m 644 fragiso.8 $(DESTDIR)$(mandir)/man8
- install -m 644 drpmsync.8 $(DESTDIR)$(mandir)/man8
-- for PY in $(PYTHONS) ; do \
-- if [ -x /usr/bin/$$PY ]; then \
-- PYLIB=`$$PY -c 'from distutils import sysconfig ; print(sysconfig.get_python_lib(1))'` ; \
-- PYVER=`$$PY -c 'from distutils import sysconfig ; print(sysconfig.get_python_version())'` ; \
-- if [ -e python$$PYVER/_deltarpmmodule.so ]; then \
-- mkdir -p $(DESTDIR)$(pylibprefix)$$PYLIB ; \
-- install -m 755 python$$PYVER/_deltarpmmodule.so $(DESTDIR)$(pylibprefix)$$PYLIB ; \
-- install -m 644 deltarpm.py $(DESTDIR)$(pylibprefix)$$PYLIB ; \
-- fi; \
-- fi; \
-- done
-+ mkdir -p $(DESTDIR)/$(libdir)/python2.7/site-packages/
-+ install -m 755 python2.7/_deltarpmmodule.so $(DESTDIR)/$(libdir)/python2.7/site-packages/
-+ install -m 644 deltarpm.py $(DESTDIR)/$(libdir)/python2.7/site-packages/
-
- .PHONY: clean install perl
-
-diff --git a/zlib-1.2.2.f-rsyncable/Makefile b/zlib-1.2.2.f-rsyncable/Makefile
-index 29f53de..23b5daf 100644
---- a/zlib-1.2.2.f-rsyncable/Makefile
-+++ b/zlib-1.2.2.f-rsyncable/Makefile
-@@ -16,15 +16,15 @@
- # To install in $HOME instead of /usr/local, use:
- # make install prefix=$HOME
-
--CC=cc
-+CC?=cc
-
--CFLAGS=-O
-+CFLAGS?=-O
- #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
- #CFLAGS=-g -DDEBUG
- #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
- # -Wstrict-prototypes -Wmissing-prototypes
-
--LDFLAGS=libz.a
-+LDFLAGS+=libz.a
- LDSHARED=$(CC)
- CPP=$(CC) -E
-
---
-2.17.1
-
+++ /dev/null
-d root root 0755 /run/dnsmasq none
+++ /dev/null
-#!/bin/bash
-#
-# Borrowing heavily from the dnsmasq initscript's version of support for
-# resolvconf, intended for use in systemd-only configurations.
-#
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/dnsmasq
-NAME=dnsmasq
-
-# Most configuration options in /etc/default/dnsmasq are deprecated
-# but still honoured.
-if [ -r /etc/default/$NAME ]; then
- . /etc/default/$NAME
-fi
-
-start_resolvconf()
-{
- # If interface "lo" is explicitly disabled in /etc/default/dnsmasq
- # Then dnsmasq won't be providing local DNS, so don't add it to
- # the resolvconf server set.
- for interface in $DNSMASQ_EXCEPT
- do
- [ $interface = lo ] && return
- done
-
- if [ -x /sbin/resolvconf ] ; then
- echo "nameserver 127.0.0.1" |
- /sbin/resolvconf -a lo.$NAME
- fi
- return 0
-}
-
-stop_resolvconf()
-{
- if [ -x /sbin/resolvconf ] ; then
- /sbin/resolvconf -d lo.$NAME
- fi
- return 0
-}
-
-case "$1" in
- start)
- start_resolvconf
- exit 0
- ;;
- stop)
- stop_resolvconf
- exit 0
- ;;
- restart)
- stop_resolvconf
- start_resolvconf
- exit 0
- ;;
- *)
- echo "Usage: /etc/init.d/$NAME {start|stop|restart}" >&2
- exit 3
- ;;
-esac
-
-exit 0
-
+++ /dev/null
-[Unit]
-Description=DNS forwarder and DHCP server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/dnsmasq.pid
-ExecStartPre=/usr/bin/dnsmasq --test
-ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d --local-service
-ExecStartPost=/usr/bin/dnsmasq-resolvconf-helper start
-ExecStopPre=/usr/bin/dnsmasq-resolvconf-helper stop
-ExecStop=/bin/kill $MAINPID
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
-
+++ /dev/null
-#!/bin/sh
-#
-# Script to update the resolver list for dnsmasq
-#
-# N.B. Resolvconf may run us even if dnsmasq is not (yet) running.
-# If dnsmasq is installed then we go ahead and update the resolver list
-# in case dnsmasq is started later.
-#
-# Assumption: On entry, PWD contains the resolv.conf-type files.
-#
-# This file is part of the dnsmasq package.
-#
-
-set -e
-
-RUN_DIR="/run/dnsmasq"
-RSLVRLIST_FILE="${RUN_DIR}/resolv.conf"
-TMP_FILE="${RSLVRLIST_FILE}_new.$$"
-MY_NAME_FOR_RESOLVCONF="dnsmasq"
-
-[ -x /usr/bin/dnsmasq ] || exit 0
-[ -x /lib/resolvconf/list-records ] || exit 1
-
-PATH=/bin:/sbin
-
-report_err() { echo "$0: Error: $*" >&2 ; }
-
-# Stores arguments (minus duplicates) in RSLT, separated by spaces
-# Doesn't work properly if an argument itself contains whitespace
-uniquify()
-{
- RSLT=""
- while [ "$1" ] ; do
- for E in $RSLT ; do
- [ "$1" = "$E" ] && { shift ; continue 2 ; }
- done
- RSLT="${RSLT:+$RSLT }$1"
- shift
- done
-}
-
-if [ ! -d "$RUN_DIR" ] && ! mkdir --parents --mode=0755 "$RUN_DIR" ; then
- report_err "Failed trying to create directory $RUN_DIR"
- exit 1
-fi
-
-RSLVCNFFILES=""
-for F in $(/lib/resolvconf/list-records --after "lo.$MY_NAME_FOR_RESOLVCONF") ; do
- case "$F" in
- "lo.$MY_NAME_FOR_RESOLVCONF")
- # Omit own record
- ;;
- lo.*)
- # Include no more records after one for a local nameserver
- RSLVCNFFILES="${RSLVCNFFILES:+$RSLVCNFFILES }$F"
- break
- ;;
- *)
- RSLVCNFFILES="${RSLVCNFFILES:+$RSLVCNFFILES }$F"
- ;;
- esac
-done
-
-NMSRVRS=""
-if [ "$RSLVCNFFILES" ] ; then
- uniquify $(sed -n -e 's/^[[:space:]]*nameserver[[:space:]]\+//p' $RSLVCNFFILES)
- NMSRVRS="$RSLT"
-fi
-
-# Dnsmasq uses the mtime of $RSLVRLIST_FILE, with a resolution of one second,
-# to detect changes in the file. This means that if a resolvconf update occurs
-# within one second of the previous one then dnsmasq may fail to notice the
-# more recent change. To work around this problem we sleep one second here
-# if necessary in order to ensure that the new mtime is different.
-if [ -f "$RSLVRLIST_FILE" ] && [ "$(stat -c %X "$RSLVRLIST_FILE")" = "$(date +%s)" ] ; then
- sleep 1
-fi
-
-clean_up() { rm -f "$TMP_FILE" ; }
-trap clean_up EXIT
-: >| "$TMP_FILE"
-for N in $NMSRVRS ; do echo "nameserver $N" >> "$TMP_FILE" ; done
-mv -f "$TMP_FILE" "$RSLVRLIST_FILE"
-
+++ /dev/null
-#!/bin/sh
-DAEMON=/usr/bin/dnsmasq
-NAME=dnsmasq
-DESC="DNS forwarder and DHCP server"
-ARGS="-7 /etc/dnsmasq.d"
-
-test -f $DAEMON || exit 0
-
-set -e
-
-if [ -r /etc/default/$NAME ]
-then
- . /etc/default/$NAME
-fi
-
-DNSMASQ_CONF="/etc/dnsmasq.conf"
-test "/etc/dnsmasq.d/*" != '/etc/dnsmasq.d/*' && DNSMASQ_CONF="${DNSMASQ_CONF} /etc/dnsmasq.d/*"
-
-test -z "${PIDFILE}" && PIFILE="/run/dnsmasq.pid"
-
-if [ -z "$IGNORE_RESOLVCONF" ]
-then
- egrep -h -q '^no-resolv' ${DNSMASQ_CONF} && IGNORE_RESOLVCONF="yes"
-fi
-
-# RESOLV_CONF:
-# If the resolvconf package is installed then use the resolv conf file
-# that it provides as the default. Otherwise use /etc/resolv.conf as
-# the default.
-#
-# If IGNORE_RESOLVCONF is set in /etc/default/dnsmasq or an explicit
-# filename is set there then this inhibits the use of the resolvconf-provided
-# information.
-#
-# Note that if the resolvconf package is installed it is not possible to
-# override it just by configuration in /etc/dnsmasq.conf, it is necessary
-# to set IGNORE_RESOLVCONF=yes in /etc/default/dnsmasq.
-
-test -z "$RESOLV_CONF" -a "$IGNORE_RESOLVCONF" != "yes" -a -x /sbin/resolvconf && \
- RESOLV_CONF=/run/dnsmasq/resolv.conf
-
-start_resolvconf()
-{
- if [ "$IGNORE_RESOLVCONF" != "yes" -a -x /sbin/resolvconf ]
- then
- echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo.$NAME
- fi
- :
-}
-
-stop_resolvconf()
-{
- if [ "$IGNORE_RESOLVCONF" != "yes" -a -x /sbin/resolvconf ]
- then
- /sbin/resolvconf -d lo.$NAME
- fi
- :
-}
-
-case "$1" in
- start)
- echo -n "starting $DESC: $NAME... "
- test -d /var/lib/misc/ || mkdir /var/lib/misc/
- start-stop-daemon -S -x $DAEMON -- $ARGS \
- ${RESOLV_CONF:+ -r $RESOLV_CONF} \
- ${PIDFILE:+ -x $PIDFILE}
- test $? -eq 0 && start_resolvconf
- echo "done."
- ;;
- stop)
- echo -n "stopping $DESC: $NAME... "
- stop_resolvconf
- start-stop-daemon -K -x $DAEMON
- echo "done."
- ;;
- status)
- echo -n "dnsmasq "
- start-stop-daemon -q -K -t -x $DAEMON
- RET=$?
- if [ "$RET" = "0" ]; then
- PID=`cat ${PIDFILE}`
- echo "($PID) is running"
- else
- echo "is not running"
- exit $RET
- fi
- ;;
- restart)
- echo "restarting $DESC: $NAME... "
- $0 stop
- $0 start
- echo "done."
- ;;
- reload)
- echo -n "reloading $DESC: $NAME... "
- killall -HUP $(basename ${DAEMON})
- echo "done."
- ;;
- systemd-start-resolvconf)
- start_resolvconf
- ;;
- systemd-stop-resolvconf)
- stop_resolvconf
- ;;
- systemd-exec)
- test -d /var/lib/misc/ || mkdir /var/lib/misc/
- exec $DAEMON --keep-in-foreground $ARGS \
- ${RESOLV_CONF:+ -r $RESOLV_CONF} \
- ${PIDFILE:+ -x $PIDFILE}
- ;;
- *)
- echo "Usage: $0 {start|stop|status|restart|reload}"
- exit 1
- ;;
-esac
-
-exit 0
+++ /dev/null
-From 7a7ba871bc9280e76c13ffd87c7d9aaa72dad88d Mon Sep 17 00:00:00 2001
-From: Joe MacDonald <joe_macdonald@mentor.com>
-Date: Tue, 9 Sep 2014 10:24:58 -0400
-Subject: [PATCH] Upstream-status: Inappropriate [OE specific]
-
-Signed-off-by: Christopher Larson <chris_larson@mentor.com>
-
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index dd0513b..c49e84f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -57,8 +57,8 @@ idn_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) -
- idn_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --libs libidn`
- ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack`
- ct_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`
--lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.1`
--lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.1`
-+lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua`
-+lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua`
- nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags nettle hogweed`
- nettle_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs nettle hogweed`
- gmp_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC NO_GMP --copy -lgmp`
+++ /dev/null
-From 858e259bf7125695c068301d0ef56cc4750d6544 Mon Sep 17 00:00:00 2001
-From: Don Penney <don.penney@windriver.com>
-Date: Thu, 15 Sep 2016 13:32:03 -0400
-Subject: [PATCH 1/1] Close tftp sockets immediately
-
----
- src/tftp.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/tftp.c b/src/tftp.c
-index d7d050f..ecc6ce8 100644
---- a/src/tftp.c
-+++ b/src/tftp.c
-@@ -768,9 +768,11 @@ int do_tftp_script_run(void)
- if ((transfer = daemon->tftp_done_trans))
- {
- daemon->tftp_done_trans = transfer->next;
-+#if 0 /* Disable delayed closing of TFTP UDP socket */
- #ifdef HAVE_SCRIPT
- queue_tftp(transfer->file->size, transfer->file->filename, &transfer->peer);
- #endif
-+#endif
- free_transfer(transfer);
- return 1;
- }
---
-1.9.1
-
+++ /dev/null
-From 62cb936cb7ad5f219715515ae7d32dd281a5aa1f Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Tue, 26 Sep 2017 22:00:11 +0100
-Subject: Security fix, CVE-2017-14491, DNS heap buffer overflow.
-
-Further fix to 0549c73b7ea6b22a3c49beb4d432f185a81efcbc
-Handles case when RR name is not a pointer to the question,
-only occurs for some auth-mode replies, therefore not
-detected by fuzzing (?)
----
- src/rfc1035.c | 27 +++++++++++++++------------
- 1 file changed, 15 insertions(+), 12 deletions(-)
-
-diff --git a/src/rfc1035.c b/src/rfc1035.c
-index 27af023..56ab88b 100644
---- a/src/rfc1035.c
-+++ b/src/rfc1035.c
-@@ -1086,32 +1086,35 @@ int add_resource_record(struct dns_header *header, char *limit, int *truncp, int
-
- va_start(ap, format); /* make ap point to 1st unamed argument */
-
-- /* nameoffset (1 or 2) + type (2) + class (2) + ttl (4) + 0 (2) */
-- CHECK_LIMIT(12);
--
- if (nameoffset > 0)
- {
-+ CHECK_LIMIT(2);
- PUTSHORT(nameoffset | 0xc000, p);
- }
- else
- {
- char *name = va_arg(ap, char *);
-- if (name)
-- p = do_rfc1035_name(p, name, limit);
-- if (!p)
-- {
-- va_end(ap);
-- goto truncated;
-- }
--
-+ if (name && !(p = do_rfc1035_name(p, name, limit)))
-+ {
-+ va_end(ap);
-+ goto truncated;
-+ }
-+
- if (nameoffset < 0)
- {
-+ CHECK_LIMIT(2);
- PUTSHORT(-nameoffset | 0xc000, p);
- }
- else
-- *p++ = 0;
-+ {
-+ CHECK_LIMIT(1);
-+ *p++ = 0;
-+ }
- }
-
-+ /* type (2) + class (2) + ttl (4) + rdlen (2) */
-+ CHECK_LIMIT(10);
-+
- PUTSHORT(type, p);
- PUTSHORT(class, p);
- PUTLONG(ttl, p); /* TTL */
---
-2.7.4
-
+++ /dev/null
-From 8868a04895b27d42d42e364f1a0c0196c1505b04 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Mon, 25 Sep 2017 18:17:11 +0100
-Subject: [PATCH 1/9] Security fix, CVE-2017-14491 DNS heap buffer
- overflow.
-
- Fix heap overflow in DNS code. This is a potentially serious
- security hole. It allows an attacker who can make DNS
- requests to dnsmasq, and who controls the contents of
- a domain, which is thereby queried, to overflow
- (by 2 bytes) a heap buffer and either crash, or
- even take control of, dnsmasq.
----
- src/dnsmasq.h | 2 +-
- src/dnssec.c | 2 +-
- src/option.c | 2 +-
- src/rfc1035.c | 50 +++++++++++++++++++++++++++++++++++++++++---------
- src/rfc2131.c | 4 ++--
- src/rfc3315.c | 4 ++--
- src/util.c | 7 ++++++-
- 7 files changed, 54 insertions(+), 17 deletions(-)
-
-diff --git a/src/dnsmasq.h b/src/dnsmasq.h
-index 1179492..06e5579 100644
---- a/src/dnsmasq.h
-+++ b/src/dnsmasq.h
-@@ -1162,7 +1162,7 @@ u32 rand32(void);
- u64 rand64(void);
- int legal_hostname(char *c);
- char *canonicalise(char *s, int *nomem);
--unsigned char *do_rfc1035_name(unsigned char *p, char *sval);
-+unsigned char *do_rfc1035_name(unsigned char *p, char *sval, char *limit);
- void *safe_malloc(size_t size);
- void safe_pipe(int *fd, int read_noblock);
- void *whine_malloc(size_t size);
-diff --git a/src/dnssec.c b/src/dnssec.c
-index 3c77c7d..f45c804 100644
---- a/src/dnssec.c
-+++ b/src/dnssec.c
-@@ -2227,7 +2227,7 @@ size_t dnssec_generate_query(struct dns_header *header, unsigned char *end, char
-
- p = (unsigned char *)(header+1);
-
-- p = do_rfc1035_name(p, name);
-+ p = do_rfc1035_name(p, name, NULL);
- *p++ = 0;
- PUTSHORT(type, p);
- PUTSHORT(class, p);
-diff --git a/src/option.c b/src/option.c
-index eb78b1a..3469f53 100644
---- a/src/option.c
-+++ b/src/option.c
-@@ -1378,7 +1378,7 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
- }
-
- p = newp;
-- end = do_rfc1035_name(p + len, dom);
-+ end = do_rfc1035_name(p + len, dom, NULL);
- *end++ = 0;
- len = end - p;
- free(dom);
-diff --git a/src/rfc1035.c b/src/rfc1035.c
-index 24d08c1..78410d6 100644
---- a/src/rfc1035.c
-+++ b/src/rfc1035.c
-@@ -1049,6 +1049,7 @@ int check_for_ignored_address(struct dns_header *header, size_t qlen, struct bog
- return 0;
- }
-
-+
- int add_resource_record(struct dns_header *header, char *limit, int *truncp, int nameoffset, unsigned char **pp,
- unsigned long ttl, int *offset, unsigned short type, unsigned short class, char *format, ...)
- {
-@@ -1058,12 +1059,21 @@ int add_resource_record(struct dns_header *header, char *limit, int *truncp, int
- unsigned short usval;
- long lval;
- char *sval;
-+#define CHECK_LIMIT(size) \
-+ if (limit && p + (size) > (unsigned char*)limit) \
-+ { \
-+ va_end(ap); \
-+ goto truncated; \
-+ }
-
- if (truncp && *truncp)
- return 0;
--
-+
- va_start(ap, format); /* make ap point to 1st unamed argument */
--
-+
-+ /* nameoffset (1 or 2) + type (2) + class (2) + ttl (4) + 0 (2) */
-+ CHECK_LIMIT(12);
-+
- if (nameoffset > 0)
- {
- PUTSHORT(nameoffset | 0xc000, p);
-@@ -1072,7 +1082,13 @@ int add_resource_record(struct dns_header *header, char *limit, int *truncp, int
- {
- char *name = va_arg(ap, char *);
- if (name)
-- p = do_rfc1035_name(p, name);
-+ p = do_rfc1035_name(p, name, limit);
-+ if (!p)
-+ {
-+ va_end(ap);
-+ goto truncated;
-+ }
-+
- if (nameoffset < 0)
- {
- PUTSHORT(-nameoffset | 0xc000, p);
-@@ -1093,6 +1109,7 @@ int add_resource_record(struct dns_header *header, char *limit, int *truncp, int
- {
- #ifdef HAVE_IPV6
- case '6':
-+ CHECK_LIMIT(IN6ADDRSZ);
- sval = va_arg(ap, char *);
- memcpy(p, sval, IN6ADDRSZ);
- p += IN6ADDRSZ;
-@@ -1100,36 +1117,47 @@ int add_resource_record(struct dns_header *header, char *limit, int *truncp, int
- #endif
-
- case '4':
-+ CHECK_LIMIT(INADDRSZ);
- sval = va_arg(ap, char *);
- memcpy(p, sval, INADDRSZ);
- p += INADDRSZ;
- break;
-
- case 'b':
-+ CHECK_LIMIT(1);
- usval = va_arg(ap, int);
- *p++ = usval;
- break;
-
- case 's':
-+ CHECK_LIMIT(2);
- usval = va_arg(ap, int);
- PUTSHORT(usval, p);
- break;
-
- case 'l':
-+ CHECK_LIMIT(4);
- lval = va_arg(ap, long);
- PUTLONG(lval, p);
- break;
-
- case 'd':
-- /* get domain-name answer arg and store it in RDATA field */
-- if (offset)
-- *offset = p - (unsigned char *)header;
-- p = do_rfc1035_name(p, va_arg(ap, char *));
-- *p++ = 0;
-+ /* get domain-name answer arg and store it in RDATA field */
-+ if (offset)
-+ *offset = p - (unsigned char *)header;
-+ p = do_rfc1035_name(p, va_arg(ap, char *), limit);
-+ if (!p)
-+ {
-+ va_end(ap);
-+ goto truncated;
-+ }
-+ CHECK_LIMIT(1);
-+ *p++ = 0;
- break;
-
- case 't':
- usval = va_arg(ap, int);
-+ CHECK_LIMIT(usval);
- sval = va_arg(ap, char *);
- if (usval != 0)
- memcpy(p, sval, usval);
-@@ -1141,20 +1169,24 @@ int add_resource_record(struct dns_header *header, char *limit, int *truncp, int
- usval = sval ? strlen(sval) : 0;
- if (usval > 255)
- usval = 255;
-+ CHECK_LIMIT(usval + 1);
- *p++ = (unsigned char)usval;
- memcpy(p, sval, usval);
- p += usval;
- break;
- }
-
-+#undef CHECK_LIMIT
- va_end(ap); /* clean up variable argument pointer */
-
- j = p - sav - 2;
-- PUTSHORT(j, sav); /* Now, store real RDLength */
-+ /* this has already been checked against limit before */
-+ PUTSHORT(j, sav); /* Now, store real RDLength */
-
- /* check for overflow of buffer */
- if (limit && ((unsigned char *)limit - p) < 0)
- {
-+truncated:
- if (truncp)
- *truncp = 1;
- return 0;
-diff --git a/src/rfc2131.c b/src/rfc2131.c
-index 8b99d4b..75893a6 100644
---- a/src/rfc2131.c
-+++ b/src/rfc2131.c
-@@ -2420,10 +2420,10 @@ static void do_options(struct dhcp_context *context,
-
- if (fqdn_flags & 0x04)
- {
-- p = do_rfc1035_name(p, hostname);
-+ p = do_rfc1035_name(p, hostname, NULL);
- if (domain)
- {
-- p = do_rfc1035_name(p, domain);
-+ p = do_rfc1035_name(p, domain, NULL);
- *p++ = 0;
- }
- }
-diff --git a/src/rfc3315.c b/src/rfc3315.c
-index 3f4d69c..73bdee4 100644
---- a/src/rfc3315.c
-+++ b/src/rfc3315.c
-@@ -1472,10 +1472,10 @@ static struct dhcp_netid *add_options(struct state *state, int do_refresh)
- if ((p = expand(len + 2)))
- {
- *(p++) = state->fqdn_flags;
-- p = do_rfc1035_name(p, state->hostname);
-+ p = do_rfc1035_name(p, state->hostname, NULL);
- if (state->send_domain)
- {
-- p = do_rfc1035_name(p, state->send_domain);
-+ p = do_rfc1035_name(p, state->send_domain, NULL);
- *p = 0;
- }
- }
-diff --git a/src/util.c b/src/util.c
-index 1a9f228..be9f8a6 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -218,15 +218,20 @@ char *canonicalise(char *in, int *nomem)
- return ret;
- }
-
--unsigned char *do_rfc1035_name(unsigned char *p, char *sval)
-+unsigned char *do_rfc1035_name(unsigned char *p, char *sval, char *limit)
- {
- int j;
-
- while (sval && *sval)
- {
-+ if (limit && p + 1 > (unsigned char*)limit)
-+ return p;
-+
- unsigned char *cp = p++;
- for (j = 0; *sval && (*sval != '.'); sval++, j++)
- {
-+ if (limit && p + 1 > (unsigned char*)limit)
-+ return p;
- #ifdef HAVE_DNSSEC
- if (option_bool(OPT_DNSSEC_VALID) && *sval == NAME_ESCAPE)
- *p++ = (*(++sval))-1;
---
-2.9.5
-
+++ /dev/null
-From c14b8b511ac55f6933aebefbd6cc27c1ec74ad58 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Mon, 25 Sep 2017 18:47:15 +0100
-Subject: [PATCH 2/9] Security fix, CVE-2017-14492, DHCPv6 RA heap
- overflow.
-
- Fix heap overflow in IPv6 router advertisement code.
- This is a potentially serious security hole, as a
- crafted RA request can overflow a buffer and crash or
- control dnsmasq. Attacker must be on the local network.
----
- src/radv.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/radv.c b/src/radv.c
-index 749b666..d09fe0e 100644
---- a/src/radv.c
-+++ b/src/radv.c
-@@ -198,6 +198,9 @@ void icmp6_packet(time_t now)
- /* look for link-layer address option for logging */
- if (sz >= 16 && packet[8] == ICMP6_OPT_SOURCE_MAC && (packet[9] * 8) + 8 <= sz)
- {
-+ if ((packet[9] * 8 - 2) * 3 - 1 >= MAXDNAME) {
-+ return;
-+ }
- print_mac(daemon->namebuff, &packet[10], (packet[9] * 8) - 2);
- mac = daemon->namebuff;
- }
---
-2.9.5
-
+++ /dev/null
-From 5086b12a4b1269d1576b5bab01f72c6fa19c55bc Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Mon, 25 Sep 2017 18:52:50 +0100
-Subject: [PATCH 3/9] Security fix, CVE-2017-14493, DHCPv6 - Stack buffer
- overflow.
-
- Fix stack overflow in DHCPv6 code. An attacker who can send
- a DHCPv6 request to dnsmasq can overflow the stack frame and
- crash or control dnsmasq.
----
- src/rfc3315.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/rfc3315.c b/src/rfc3315.c
-index 73bdee4..8d18a28 100644
---- a/src/rfc3315.c
-+++ b/src/rfc3315.c
-@@ -206,6 +206,9 @@ static int dhcp6_maybe_relay(struct state *state, void *inbuff, size_t sz,
- /* RFC-6939 */
- if ((opt = opt6_find(opts, end, OPTION6_CLIENT_MAC, 3)))
- {
-+ if (opt6_len(opt) - 2 > DHCP_CHADDR_MAX) {
-+ return 0;
-+ }
- state->mac_type = opt6_uint(opt, 0, 2);
- state->mac_len = opt6_len(opt) - 2;
- memcpy(&state->mac[0], opt6_ptr(opt, 2), state->mac_len);
---
-2.9.5
-
+++ /dev/null
-From 8c8fe650dc17aad0fbafc920fde719218dc4568d Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Mon, 25 Sep 2017 20:05:11 +0100
-Subject: [PATCH 4/9] Security fix, CVE-2017-14494, Infoleak handling
- DHCPv6 forwarded requests.
-
- Fix information leak in DHCPv6. A crafted DHCPv6 packet can
- cause dnsmasq to forward memory from outside the packet
- buffer to a DHCPv6 server when acting as a relay.
----
- src/rfc3315.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/rfc3315.c b/src/rfc3315.c
-index 8d18a28..03b3f84 100644
---- a/src/rfc3315.c
-+++ b/src/rfc3315.c
-@@ -216,6 +216,9 @@ static int dhcp6_maybe_relay(struct state *state, void *inbuff, size_t sz,
-
- for (opt = opts; opt; opt = opt6_next(opt, end))
- {
-+ if (opt6_ptr(opt, 0) + opt6_len(opt) >= end) {
-+ return 0;
-+ }
- int o = new_opt6(opt6_type(opt));
- if (opt6_type(opt) == OPTION6_RELAY_MSG)
- {
---
-2.9.5
-
+++ /dev/null
-From f2ad2cecb55825f7e4409222de1688b9ceebceda Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Mon, 25 Sep 2017 20:16:50 +0100
-Subject: [PATCH 6/9] Security fix, CVE-2017-14495, OOM in DNS response
- creation.
-
- Fix out-of-memory Dos vulnerability. An attacker which can
- send malicious DNS queries to dnsmasq can trigger memory
- allocations in the add_pseudoheader function
- The allocated memory is never freed which leads to a DoS
- through memory exhaustion. dnsmasq is vulnerable only
- if one of the following option is specified:
- --add-mac, --add-cpe-id or --add-subnet.
----
- src/edns0.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/edns0.c b/src/edns0.c
-index eed135e..5bdc133 100644
---- a/src/edns0.c
-+++ b/src/edns0.c
-@@ -192,9 +192,15 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
- !(p = skip_section(p,
- ntohs(header->ancount) + ntohs(header->nscount) + ntohs(header->arcount),
- header, plen)))
-+ {
-+ free(buff);
- return plen;
-+ }
- if (p + 11 > limit)
-- return plen; /* Too big */
-+ {
-+ free(buff);
-+ return plen; /* Too big */
-+ }
- *p++ = 0; /* empty name */
- PUTSHORT(T_OPT, p);
- PUTSHORT(udp_sz, p); /* max packet length, 512 if not given in EDNS0 header */
---
-2.9.5
-
+++ /dev/null
-From 5ab67e936085a9e584c9b3e43f442ef5bee7f40e Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Mon, 25 Sep 2017 20:11:58 +0100
-Subject: [PATCH 5/9] Security fix, CVE-2017-14496, Integer underflow in
- DNS response creation.
-
- Fix DoS in DNS. Invalid boundary checks in the
- add_pseudoheader function allows a memcpy call with negative
- size An attacker which can send malicious DNS queries
- to dnsmasq can trigger a DoS remotely.
- dnsmasq is vulnerable only if one of the following option is
- specified: --add-mac, --add-cpe-id or --add-subnet.
----
- src/edns0.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/edns0.c b/src/edns0.c
-index d2b514b..eed135e 100644
---- a/src/edns0.c
-+++ b/src/edns0.c
-@@ -144,7 +144,7 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
- GETSHORT(len, p);
-
- /* malformed option, delete the whole OPT RR and start again. */
-- if (i + len > rdlen)
-+ if (i + 4 + len > rdlen)
- {
- rdlen = 0;
- is_last = 0;
-@@ -193,6 +193,8 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
- ntohs(header->ancount) + ntohs(header->nscount) + ntohs(header->arcount),
- header, plen)))
- return plen;
-+ if (p + 11 > limit)
-+ return plen; /* Too big */
- *p++ = 0; /* empty name */
- PUTSHORT(T_OPT, p);
- PUTSHORT(udp_sz, p); /* max packet length, 512 if not given in EDNS0 header */
-@@ -204,6 +206,11 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
- /* Copy back any options */
- if (buff)
- {
-+ if (p + rdlen > limit)
-+ {
-+ free(buff);
-+ return plen; /* Too big */
-+ }
- memcpy(p, buff, rdlen);
- free(buff);
- p += rdlen;
-@@ -217,8 +224,12 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
- /* Add new option */
- if (optno != 0 && replace != 2)
- {
-+ if (p + 4 > limit)
-+ return plen; /* Too big */
- PUTSHORT(optno, p);
- PUTSHORT(optlen, p);
-+ if (p + optlen > limit)
-+ return plen; /* Too big */
- memcpy(p, opt, optlen);
- p += optlen;
- PUTSHORT(p - datap, lenp);
---
-2.9.5
-
+++ /dev/null
-From 7ab5d6bd1f8b018c73341f50a395405dee6873d8 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Wed, 15 Mar 2017 14:26:04 +0100
-Subject: [PATCH] Coverity fixes
-
----
- src/dbus.c | 2 +-
- src/dhcp-common.c | 2 +-
- src/dhcp.c | 4 ++--
- src/dnsmasq.h | 2 +-
- src/edns0.c | 2 ++
- src/inotify.c | 9 ++++++---
- src/lease.c | 4 ++--
- src/network.c | 8 ++++----
- src/option.c | 16 +++++++++++-----
- src/tftp.c | 2 +-
- src/util.c | 2 +-
- 11 files changed, 32 insertions(+), 21 deletions(-)
-
-diff --git a/src/dbus.c b/src/dbus.c
-index 2e1a48e..f27ec3e 100644
---- a/src/dbus.c
-+++ b/src/dbus.c
-@@ -550,7 +550,7 @@ static DBusMessage *dbus_add_lease(DBusMessage* message)
- "Invalid IP address '%s'", ipaddr);
-
- hw_len = parse_hex((char*)hwaddr, dhcp_chaddr, DHCP_CHADDR_MAX, NULL, &hw_type);
-- if (hw_type == 0 && hw_len != 0)
-+ if (hw_type == 0 && hw_len > 0)
- hw_type = ARPHRD_ETHER;
-
- lease_set_hwaddr(lease, dhcp_chaddr, clid, hw_len, hw_type,
-diff --git a/src/dhcp-common.c b/src/dhcp-common.c
-index 08528e8..ebf06b6 100644
---- a/src/dhcp-common.c
-+++ b/src/dhcp-common.c
-@@ -487,7 +487,7 @@ void bindtodevice(char *device, int fd)
- {
- struct ifreq ifr;
-
-- strcpy(ifr.ifr_name, device);
-+ strncpy(ifr.ifr_name, device, IF_NAMESIZE-1);
- /* only allowed by root. */
- if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr)) == -1 &&
- errno != EPERM)
-diff --git a/src/dhcp.c b/src/dhcp.c
-index 10f1fb9..37bb71e 100644
---- a/src/dhcp.c
-+++ b/src/dhcp.c
-@@ -246,7 +246,7 @@ void dhcp_packet(time_t now, int pxe_fd)
- }
- else
- {
-- strncpy(ifr.ifr_name, bridge->iface, IF_NAMESIZE);
-+ strncpy(ifr.ifr_name, bridge->iface, IF_NAMESIZE-1);
- break;
- }
- }
-@@ -270,7 +270,7 @@ void dhcp_packet(time_t now, int pxe_fd)
- is_relay_reply = 1;
- iov.iov_len = sz;
- #ifdef HAVE_LINUX_NETWORK
-- strncpy(arp_req.arp_dev, ifr.ifr_name, 16);
-+ strncpy(arp_req.arp_dev, ifr.ifr_name, IF_NAMESIZE-1);
- #endif
- }
- else
-diff --git a/src/dnsmasq.h b/src/dnsmasq.h
-index dfd15aa..1179492 100644
---- a/src/dnsmasq.h
-+++ b/src/dnsmasq.h
-@@ -180,7 +180,7 @@ struct event_desc {
- #define EC_INIT_OFFSET 10
-
- /* Trust the compiler dead-code eliminator.... */
--#define option_bool(x) (((x) < 32) ? daemon->options & (1u << (x)) : daemon->options2 & (1u << ((x) - 32)))
-+#define option_bool(x) (((x) < 32) ? daemon->options & (1u << ((x)&0x1F)) : daemon->options2 & (1u << ((x) - 32)))
-
- #define OPT_BOGUSPRIV 0
- #define OPT_FILTER 1
-diff --git a/src/edns0.c b/src/edns0.c
-index c7a101e..d2b514b 100644
---- a/src/edns0.c
-+++ b/src/edns0.c
-@@ -263,6 +263,8 @@ static size_t add_dns_client(struct dns_header *header, size_t plen, unsigned ch
- encode[8] = 0;
- }
- }
-+ else
-+ encode[0] = '\0';
-
- return add_pseudoheader(header, plen, limit, PACKETSZ, EDNS0_OPTION_NOMDEVICEID, (unsigned char *)encode, strlen(encode), 0, replace);
- }
-diff --git a/src/inotify.c b/src/inotify.c
-index 603ce9d..fcc0d97 100644
---- a/src/inotify.c
-+++ b/src/inotify.c
-@@ -224,17 +224,20 @@ int inotify_check(time_t now)
-
- if (rc <= 0)
- break;
-+ else
-+ inotify_buffer[rc] = '\0';
-
- for (p = inotify_buffer; rc - (p - inotify_buffer) >= (int)sizeof(struct inotify_event); p += sizeof(struct inotify_event) + in->len)
- {
- in = (struct inotify_event*)p;
--
-+
- for (res = daemon->resolv_files; res; res = res->next)
-- if (res->wd == in->wd && in->len != 0 && strcmp(res->file, in->name) == 0)
-+ if (res->wd == in->wd && in->len != 0 && strncmp(res->file, in->name, NAME_MAX) == 0)
- hit = 1;
-
- /* ignore emacs backups and dotfiles */
-- if (in->len == 0 ||
-+ if (in->len == 0 ||
-+ in->len > NAME_MAX+1 ||
- in->name[in->len - 1] == '~' ||
- (in->name[0] == '#' && in->name[in->len - 1] == '#') ||
- in->name[0] == '.')
-diff --git a/src/lease.c b/src/lease.c
-index 20cac90..9ad106d 100644
---- a/src/lease.c
-+++ b/src/lease.c
-@@ -827,9 +827,9 @@ void lease_set_hwaddr(struct dhcp_lease *lease, const unsigned char *hwaddr,
-
- if (hw_len != lease->hwaddr_len ||
- hw_type != lease->hwaddr_type ||
-- (hw_len != 0 && memcmp(lease->hwaddr, hwaddr, hw_len) != 0))
-+ (hw_len > 0 && memcmp(lease->hwaddr, hwaddr, hw_len) != 0))
- {
-- if (hw_len != 0)
-+ if (hw_len > 0)
- memcpy(lease->hwaddr, hwaddr, hw_len);
- lease->hwaddr_len = hw_len;
- lease->hwaddr_type = hw_type;
-diff --git a/src/network.c b/src/network.c
-index 6119039..fcd9d8d 100644
---- a/src/network.c
-+++ b/src/network.c
-@@ -188,7 +188,7 @@ int loopback_exception(int fd, int family, struct all_addr *addr, char *name)
- struct ifreq ifr;
- struct irec *iface;
-
-- strncpy(ifr.ifr_name, name, IF_NAMESIZE);
-+ strncpy(ifr.ifr_name, name, IF_NAMESIZE-1);
- if (ioctl(fd, SIOCGIFFLAGS, &ifr) != -1 &&
- ifr.ifr_flags & IFF_LOOPBACK)
- {
-@@ -1206,7 +1206,7 @@ int local_bind(int fd, union mysockaddr *addr, char *intname, int is_tcp)
- return 0;
-
- #if defined(SO_BINDTODEVICE)
-- if (intname[0] != 0 &&
-+ if (intname && intname[0] != 0 &&
- setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, intname, IF_NAMESIZE) == -1)
- return 0;
- #endif
-@@ -1245,7 +1245,7 @@ static struct serverfd *allocate_sfd(union mysockaddr *addr, char *intname)
- /* may have a suitable one already */
- for (sfd = daemon->sfds; sfd; sfd = sfd->next )
- if (sockaddr_isequal(&sfd->source_addr, addr) &&
-- strcmp(intname, sfd->interface) == 0 &&
-+ intname && strcmp(intname, sfd->interface) == 0 &&
- ifindex == sfd->ifindex)
- return sfd;
-
-@@ -1437,7 +1437,7 @@ void add_update_server(int flags,
- serv->flags |= SERV_HAS_DOMAIN;
-
- if (interface)
-- strcpy(serv->interface, interface);
-+ strncpy(serv->interface, interface, sizeof(serv->interface)-1);
- if (addr)
- serv->addr = *addr;
- if (source_addr)
-diff --git a/src/option.c b/src/option.c
-index 5503b79..eb78b1a 100644
---- a/src/option.c
-+++ b/src/option.c
-@@ -3929,13 +3929,15 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
-
- case LOPT_HOST_REC: /* --host-record */
- {
-- struct host_record *new = opt_malloc(sizeof(struct host_record));
-- memset(new, 0, sizeof(struct host_record));
-- new->ttl = -1;
-+ struct host_record *new;
-
- if (!arg || !(comma = split(arg)))
- ret_err(_("Bad host-record"));
-
-+ new = opt_malloc(sizeof(struct host_record));
-+ memset(new, 0, sizeof(struct host_record));
-+ new->ttl = -1;
-+
- while (arg)
- {
- struct all_addr addr;
-@@ -3956,10 +3958,11 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
- {
- int nomem;
- char *canon = canonicalise(arg, &nomem);
-- struct name_list *nl = opt_malloc(sizeof(struct name_list));
-+ struct name_list *nl;
- if (!canon)
- ret_err(_("Bad name in host-record"));
-
-+ nl = opt_malloc(sizeof(struct name_list));
- nl->name = canon;
- /* keep order, so that PTR record goes to first name */
- nl->next = NULL;
-@@ -4023,7 +4026,10 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
- !atoi_check8(algo, &new->algo) ||
- !atoi_check8(digest, &new->digest_type) ||
- !(new->name = canonicalise_opt(arg)))
-- ret_err(_("bad trust anchor"));
-+ {
-+ free(new);
-+ ret_err(_("bad trust anchor"));
-+ }
-
- /* Upper bound on length */
- len = (2*strlen(keyhex))+1;
-diff --git a/src/tftp.c b/src/tftp.c
-index 5e4a32a..bd8c622 100644
---- a/src/tftp.c
-+++ b/src/tftp.c
-@@ -234,7 +234,7 @@ void tftp_request(struct listener *listen, time_t now)
- #endif
- }
-
-- strncpy(ifr.ifr_name, name, IF_NAMESIZE);
-+ strncpy(ifr.ifr_name, name, IF_NAMESIZE-1);
- if (ioctl(listen->tftpfd, SIOCGIFMTU, &ifr) != -1)
- {
- mtu = ifr.ifr_mtu;
-diff --git a/src/util.c b/src/util.c
-index 93b24f5..1a9f228 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -491,7 +491,7 @@ int parse_hex(char *in, unsigned char *out, int maxlen,
- int j, bytes = (1 + (r - in))/2;
- for (j = 0; j < bytes; j++)
- {
-- char sav = sav;
-+ char sav;
- if (j < bytes - 1)
- {
- sav = in[(j+1)*2];
---
-2.9.3
-
+++ /dev/null
-From 87444dc6977b61096127dcdfe87dc6cf2c0167d6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Sun, 16 Apr 2017 20:20:08 +0100
-Subject: [PATCH] Capture and log STDOUT and STDERR output from dhcp-script.
-
-(cherry picked from commit c77fb9d8f09d136fa71bde2469c4fd11cefa6f4a)
-
-Compile-time check on buffer sizes for leasefile parsing code.
-
-(cherry picked from commit bf4e62c19e619f7edf8d03d58d33a5752f190bfd)
-
-Improve error handling with shcp-script "init" mode.
-
-(cherry picked from commit 3a8b0f6fccf464b1ec6d24c0e00e540ab2b17705)
-
-Tweak logging introduced in 3a8b0f6fccf464b1ec6d24c0e00e540ab2b17705
-
-(cherry picked from commit efff74c1aea14757ce074db28e02671c7f7bb5f5)
-
-Don't die() on failing to parse lease-script output.
-
-(cherry picked from commit 05f76dab89d5b879519a4f45b0cccaa1fc3d162d)
----
- man/dnsmasq.8 | 4 +-
- src/dhcp-common.c | 16 +++---
- src/dhcp-protocol.h | 4 ++
- src/dnsmasq.c | 8 +++
- src/dnsmasq.h | 54 +++++++++---------
- src/helper.c | 56 +++++++++++++++++-
- src/lease.c | 159 +++++++++++++++++++++++++++++++---------------------
- src/log.c | 4 +-
- src/rfc3315.c | 2 +-
- 9 files changed, 202 insertions(+), 105 deletions(-)
-
-diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
-index 0521534..97d0a4f 100644
---- a/man/dnsmasq.8
-+++ b/man/dnsmasq.8
-@@ -1551,8 +1551,8 @@ database.
-
-
- All file descriptors are
--closed except stdin, stdout and stderr which are open to /dev/null
--(except in debug mode).
-+closed except stdin, which is open to /dev/null, and stdout and stderr which capture output for logging by dnsmasq.
-+(In debug mode, stdio, stdout and stderr file are left as those inherited from the invoker of dnsmasq).
-
- The script is not invoked concurrently: at most one instance
- of the script is ever running (dnsmasq waits for an instance of script to exit
-diff --git a/src/dhcp-common.c b/src/dhcp-common.c
-index 08528e8..ecc752b 100644
---- a/src/dhcp-common.c
-+++ b/src/dhcp-common.c
-@@ -20,11 +20,11 @@
-
- void dhcp_common_init(void)
- {
-- /* These each hold a DHCP option max size 255
-- and get a terminating zero added */
-- daemon->dhcp_buff = safe_malloc(256);
-- daemon->dhcp_buff2 = safe_malloc(256);
-- daemon->dhcp_buff3 = safe_malloc(256);
-+ /* These each hold a DHCP option max size 255
-+ and get a terminating zero added */
-+ daemon->dhcp_buff = safe_malloc(DHCP_BUFF_SZ);
-+ daemon->dhcp_buff2 = safe_malloc(DHCP_BUFF_SZ);
-+ daemon->dhcp_buff3 = safe_malloc(DHCP_BUFF_SZ);
-
- /* dhcp_packet is used by v4 and v6, outpacket only by v6
- sizeof(struct dhcp_packet) is as good an initial size as any,
-@@ -855,14 +855,14 @@ void log_context(int family, struct dhcp_context *context)
- if (context->flags & CONTEXT_RA_STATELESS)
- {
- if (context->flags & CONTEXT_TEMPLATE)
-- strncpy(daemon->dhcp_buff, context->template_interface, 256);
-+ strncpy(daemon->dhcp_buff, context->template_interface, DHCP_BUFF_SZ);
- else
- strcpy(daemon->dhcp_buff, daemon->addrbuff);
- }
- else
- #endif
-- inet_ntop(family, start, daemon->dhcp_buff, 256);
-- inet_ntop(family, end, daemon->dhcp_buff3, 256);
-+ inet_ntop(family, start, daemon->dhcp_buff, DHCP_BUFF_SZ);
-+ inet_ntop(family, end, daemon->dhcp_buff3, DHCP_BUFF_SZ);
- my_syslog(MS_DHCP | LOG_INFO,
- (context->flags & CONTEXT_RA_STATELESS) ?
- _("%s stateless on %s%.0s%.0s%s") :
-diff --git a/src/dhcp-protocol.h b/src/dhcp-protocol.h
-index a31d829..0ea449b 100644
---- a/src/dhcp-protocol.h
-+++ b/src/dhcp-protocol.h
-@@ -19,6 +19,10 @@
- #define DHCP_CLIENT_ALTPORT 1068
- #define PXE_PORT 4011
-
-+/* These each hold a DHCP option max size 255
-+ and get a terminating zero added */
-+#define DHCP_BUFF_SZ 256
-+
- #define BOOTREQUEST 1
- #define BOOTREPLY 2
- #define DHCP_COOKIE 0x63825363
-diff --git a/src/dnsmasq.c b/src/dnsmasq.c
-index 045ec53..9cd4052 100644
---- a/src/dnsmasq.c
-+++ b/src/dnsmasq.c
-@@ -1294,6 +1294,7 @@ static void async_event(int pipe, time_t now)
- daemon->tcp_pids[i] = 0;
- break;
-
-+#if defined(HAVE_SCRIPT)
- case EVENT_KILLED:
- my_syslog(LOG_WARNING, _("script process killed by signal %d"), ev.data);
- break;
-@@ -1307,12 +1308,19 @@ static void async_event(int pipe, time_t now)
- daemon->lease_change_command, strerror(ev.data));
- break;
-
-+ case EVENT_SCRIPT_LOG:
-+ my_syslog(MS_SCRIPT | LOG_DEBUG, "%s", msg ? msg : "");
-+ free(msg);
-+ msg = NULL;
-+ break;
-+
- /* necessary for fatal errors in helper */
- case EVENT_USER_ERR:
- case EVENT_DIE:
- case EVENT_LUA_ERR:
- fatal_event(&ev, msg);
- break;
-+#endif
-
- case EVENT_REOPEN:
- /* Note: this may leave TCP-handling processes with the old file still open.
-diff --git a/src/dnsmasq.h b/src/dnsmasq.h
-index 1896a64..0cfd3c6 100644
---- a/src/dnsmasq.h
-+++ b/src/dnsmasq.h
-@@ -145,30 +145,31 @@ struct event_desc {
- int event, data, msg_sz;
- };
-
--#define EVENT_RELOAD 1
--#define EVENT_DUMP 2
--#define EVENT_ALARM 3
--#define EVENT_TERM 4
--#define EVENT_CHILD 5
--#define EVENT_REOPEN 6
--#define EVENT_EXITED 7
--#define EVENT_KILLED 8
--#define EVENT_EXEC_ERR 9
--#define EVENT_PIPE_ERR 10
--#define EVENT_USER_ERR 11
--#define EVENT_CAP_ERR 12
--#define EVENT_PIDFILE 13
--#define EVENT_HUSER_ERR 14
--#define EVENT_GROUP_ERR 15
--#define EVENT_DIE 16
--#define EVENT_LOG_ERR 17
--#define EVENT_FORK_ERR 18
--#define EVENT_LUA_ERR 19
--#define EVENT_TFTP_ERR 20
--#define EVENT_INIT 21
--#define EVENT_NEWADDR 22
--#define EVENT_NEWROUTE 23
--#define EVENT_TIME_ERR 24
-+#define EVENT_RELOAD 1
-+#define EVENT_DUMP 2
-+#define EVENT_ALARM 3
-+#define EVENT_TERM 4
-+#define EVENT_CHILD 5
-+#define EVENT_REOPEN 6
-+#define EVENT_EXITED 7
-+#define EVENT_KILLED 8
-+#define EVENT_EXEC_ERR 9
-+#define EVENT_PIPE_ERR 10
-+#define EVENT_USER_ERR 11
-+#define EVENT_CAP_ERR 12
-+#define EVENT_PIDFILE 13
-+#define EVENT_HUSER_ERR 14
-+#define EVENT_GROUP_ERR 15
-+#define EVENT_DIE 16
-+#define EVENT_LOG_ERR 17
-+#define EVENT_FORK_ERR 18
-+#define EVENT_LUA_ERR 19
-+#define EVENT_TFTP_ERR 20
-+#define EVENT_INIT 21
-+#define EVENT_NEWADDR 22
-+#define EVENT_NEWROUTE 23
-+#define EVENT_TIME_ERR 24
-+#define EVENT_SCRIPT_LOG 25
-
- /* Exit codes. */
- #define EC_GOOD 0
-@@ -242,8 +243,9 @@ struct event_desc {
-
- /* extra flags for my_syslog, we use a couple of facilities since they are known
- not to occupy the same bits as priorities, no matter how syslog.h is set up. */
--#define MS_TFTP LOG_USER
--#define MS_DHCP LOG_DAEMON
-+#define MS_TFTP LOG_USER
-+#define MS_DHCP LOG_DAEMON
-+#define MS_SCRIPT LOG_MAIL
-
- struct all_addr {
- union {
-diff --git a/src/helper.c b/src/helper.c
-index 9c37e37..de31383 100644
---- a/src/helper.c
-+++ b/src/helper.c
-@@ -14,6 +14,7 @@
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-+#include <stdio.h>
- #include "dnsmasq.h"
-
- #ifdef HAVE_SCRIPT
-@@ -135,7 +136,7 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
- max_fd != STDIN_FILENO && max_fd != pipefd[0] &&
- max_fd != event_fd && max_fd != err_fd)
- close(max_fd);
--
-+
- #ifdef HAVE_LUASCRIPT
- if (daemon->luascript)
- {
-@@ -189,6 +190,7 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
- unsigned char *buf = (unsigned char *)daemon->namebuff;
- unsigned char *end, *extradata, *alloc_buff = NULL;
- int is6, err = 0;
-+ int pipeout[2];
-
- free(alloc_buff);
-
-@@ -472,16 +474,54 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
- if (!daemon->lease_change_command)
- continue;
-
-+ /* Pipe to capture stdout and stderr from script */
-+ if (!option_bool(OPT_DEBUG) && pipe(pipeout) == -1)
-+ continue;
-+
- /* possible fork errors are all temporary resource problems */
- while ((pid = fork()) == -1 && (errno == EAGAIN || errno == ENOMEM))
- sleep(2);
-
- if (pid == -1)
-- continue;
-+ {
-+ if (!option_bool(OPT_DEBUG))
-+ {
-+ close(pipeout[0]);
-+ close(pipeout[1]);
-+ }
-+ continue;
-+ }
-
- /* wait for child to complete */
- if (pid != 0)
- {
-+ if (!option_bool(OPT_DEBUG))
-+ {
-+ FILE *fp;
-+
-+ close(pipeout[1]);
-+
-+ /* Read lines sent to stdout/err by the script and pass them back to be logged */
-+ if (!(fp = fdopen(pipeout[0], "r")))
-+ close(pipeout[0]);
-+ else
-+ {
-+ while (fgets(daemon->packet, daemon->packet_buff_sz, fp))
-+ {
-+ /* do not include new lines, log will append them */
-+ size_t len = strlen(daemon->packet);
-+ if (len > 0)
-+ {
-+ --len;
-+ if (daemon->packet[len] == '\n')
-+ daemon->packet[len] = 0;
-+ }
-+ send_event(event_fd, EVENT_SCRIPT_LOG, 0, daemon->packet);
-+ }
-+ fclose(fp);
-+ }
-+ }
-+
- /* reap our children's children, if necessary */
- while (1)
- {
-@@ -504,6 +544,15 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
-
- continue;
- }
-+
-+ if (!option_bool(OPT_DEBUG))
-+ {
-+ /* map stdout/stderr of script to pipeout */
-+ close(pipeout[0]);
-+ dup2(pipeout[1], STDOUT_FILENO);
-+ dup2(pipeout[1], STDERR_FILENO);
-+ close(pipeout[1]);
-+ }
-
- if (data.action != ACTION_TFTP && data.action != ACTION_ARP)
- {
-@@ -579,7 +628,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
- hostname = NULL;
-
- my_setenv("DNSMASQ_LOG_DHCP", option_bool(OPT_LOG_OPTS) ? "1" : NULL, &err);
-- }
-+ }
-+
- /* we need to have the event_fd around if exec fails */
- if ((i = fcntl(event_fd, F_GETFD)) != -1)
- fcntl(event_fd, F_SETFD, i | FD_CLOEXEC);
-diff --git a/src/lease.c b/src/lease.c
-index 20cac90..64047f9 100644
---- a/src/lease.c
-+++ b/src/lease.c
-@@ -21,94 +21,62 @@
- static struct dhcp_lease *leases = NULL, *old_leases = NULL;
- static int dns_dirty, file_dirty, leases_left;
-
--void lease_init(time_t now)
-+static int read_leases(time_t now, FILE *leasestream)
- {
- unsigned long ei;
- struct all_addr addr;
- struct dhcp_lease *lease;
- int clid_len, hw_len, hw_type;
-- FILE *leasestream;
--
-- leases_left = daemon->dhcp_max;
--
-- if (option_bool(OPT_LEASE_RO))
-- {
-- /* run "<lease_change_script> init" once to get the
-- initial state of the database. If leasefile-ro is
-- set without a script, we just do without any
-- lease database. */
--#ifdef HAVE_SCRIPT
-- if (daemon->lease_change_command)
-- {
-- strcpy(daemon->dhcp_buff, daemon->lease_change_command);
-- strcat(daemon->dhcp_buff, " init");
-- leasestream = popen(daemon->dhcp_buff, "r");
-- }
-- else
-+ int items;
-+ char *domain = NULL;
-+
-+ *daemon->dhcp_buff3 = *daemon->dhcp_buff2 = '\0';
-+
-+ /* client-id max length is 255 which is 255*2 digits + 254 colons
-+ borrow DNS packet buffer which is always larger than 1000 bytes
-+
-+ Check various buffers are big enough for the code below */
-+
-+#if (DHCP_BUFF_SZ < 255) || (MAXDNAME < 64) || (PACKETSZ+MAXDNAME+RRFIXEDSZ < 764)
-+# error Buffer size breakage in leasefile parsing.
- #endif
-- {
-- file_dirty = dns_dirty = 0;
-- return;
-- }
-
-- }
-- else
-- {
-- /* NOTE: need a+ mode to create file if it doesn't exist */
-- leasestream = daemon->lease_stream = fopen(daemon->lease_file, "a+");
--
-- if (!leasestream)
-- die(_("cannot open or create lease file %s: %s"), daemon->lease_file, EC_FILE);
--
-- /* a+ mode leaves pointer at end. */
-- rewind(leasestream);
-- }
--
-- /* client-id max length is 255 which is 255*2 digits + 254 colons
-- borrow DNS packet buffer which is always larger than 1000 bytes */
-- if (leasestream)
-- while (fscanf(leasestream, "%255s %255s", daemon->dhcp_buff3, daemon->dhcp_buff2) == 2)
-+ while ((items=fscanf(leasestream, "%255s %255s", daemon->dhcp_buff3, daemon->dhcp_buff2)) == 2)
- {
-+ *daemon->namebuff = *daemon->dhcp_buff = *daemon->packet = '\0';
-+ hw_len = hw_type = clid_len = 0;
-+
- #ifdef HAVE_DHCP6
- if (strcmp(daemon->dhcp_buff3, "duid") == 0)
- {
- daemon->duid_len = parse_hex(daemon->dhcp_buff2, (unsigned char *)daemon->dhcp_buff2, 130, NULL, NULL);
-+ if (daemon->duid_len < 0)
-+ return 0;
- daemon->duid = safe_malloc(daemon->duid_len);
- memcpy(daemon->duid, daemon->dhcp_buff2, daemon->duid_len);
- continue;
- }
- #endif
--
-- ei = atol(daemon->dhcp_buff3);
-
- if (fscanf(leasestream, " %64s %255s %764s",
- daemon->namebuff, daemon->dhcp_buff, daemon->packet) != 3)
-- break;
-+ return 0;
-
-- clid_len = 0;
-- if (strcmp(daemon->packet, "*") != 0)
-- clid_len = parse_hex(daemon->packet, (unsigned char *)daemon->packet, 255, NULL, NULL);
--
-- if (inet_pton(AF_INET, daemon->namebuff, &addr.addr.addr4) &&
-- (lease = lease4_allocate(addr.addr.addr4)))
-+ if (inet_pton(AF_INET, daemon->namebuff, &addr.addr.addr4))
- {
-+ if ((lease = lease4_allocate(addr.addr.addr4)))
-+ domain = get_domain(lease->addr);
-+
- hw_len = parse_hex(daemon->dhcp_buff2, (unsigned char *)daemon->dhcp_buff2, DHCP_CHADDR_MAX, NULL, &hw_type);
- /* For backwards compatibility, no explict MAC address type means ether. */
- if (hw_type == 0 && hw_len != 0)
- hw_type = ARPHRD_ETHER;
--
-- lease_set_hwaddr(lease, (unsigned char *)daemon->dhcp_buff2, (unsigned char *)daemon->packet,
-- hw_len, hw_type, clid_len, now, 0);
--
-- if (strcmp(daemon->dhcp_buff, "*") != 0)
-- lease_set_hostname(lease, daemon->dhcp_buff, 0, get_domain(lease->addr), NULL);
- }
- #ifdef HAVE_DHCP6
- else if (inet_pton(AF_INET6, daemon->namebuff, &addr.addr.addr6))
- {
- char *s = daemon->dhcp_buff2;
- int lease_type = LEASE_NA;
-- int iaid;
-
- if (s[0] == 'T')
- {
-@@ -116,23 +84,30 @@ void lease_init(time_t now)
- s++;
- }
-
-- iaid = strtoul(s, NULL, 10);
--
- if ((lease = lease6_allocate(&addr.addr.addr6, lease_type)))
- {
-- lease_set_hwaddr(lease, NULL, (unsigned char *)daemon->packet, 0, 0, clid_len, now, 0);
-- lease_set_iaid(lease, iaid);
-- if (strcmp(daemon->dhcp_buff, "*") != 0)
-- lease_set_hostname(lease, daemon->dhcp_buff, 0, get_domain6((struct in6_addr *)lease->hwaddr), NULL);
-+ lease_set_iaid(lease, strtoul(s, NULL, 10));
-+ domain = get_domain6((struct in6_addr *)lease->hwaddr);
- }
- }
- #endif
- else
-- break;
-+ return 0;
-
- if (!lease)
- die (_("too many stored leases"), NULL, EC_MISC);
--
-+
-+ if (strcmp(daemon->packet, "*") != 0)
-+ clid_len = parse_hex(daemon->packet, (unsigned char *)daemon->packet, 255, NULL, NULL);
-+
-+ lease_set_hwaddr(lease, (unsigned char *)daemon->dhcp_buff2, (unsigned char *)daemon->packet,
-+ hw_len, hw_type, clid_len, now, 0);
-+
-+ if (strcmp(daemon->dhcp_buff, "*") != 0)
-+ lease_set_hostname(lease, daemon->dhcp_buff, 0, domain, NULL);
-+
-+ ei = atol(daemon->dhcp_buff3);
-+
- #ifdef HAVE_BROKEN_RTC
- if (ei != 0)
- lease->expires = (time_t)ei + now;
-@@ -148,7 +123,62 @@ void lease_init(time_t now)
- /* set these correctly: the "old" events are generated later from
- the startup synthesised SIGHUP. */
- lease->flags &= ~(LEASE_NEW | LEASE_CHANGED);
-+
-+ *daemon->dhcp_buff3 = *daemon->dhcp_buff2 = '\0';
- }
-+
-+ return (items == 0 || items == EOF);
-+}
-+
-+void lease_init(time_t now)
-+{
-+ FILE *leasestream;
-+
-+ leases_left = daemon->dhcp_max;
-+
-+ if (option_bool(OPT_LEASE_RO))
-+ {
-+ /* run "<lease_change_script> init" once to get the
-+ initial state of the database. If leasefile-ro is
-+ set without a script, we just do without any
-+ lease database. */
-+#ifdef HAVE_SCRIPT
-+ if (daemon->lease_change_command)
-+ {
-+ strcpy(daemon->dhcp_buff, daemon->lease_change_command);
-+ strcat(daemon->dhcp_buff, " init");
-+ leasestream = popen(daemon->dhcp_buff, "r");
-+ }
-+ else
-+#endif
-+ {
-+ file_dirty = dns_dirty = 0;
-+ return;
-+ }
-+
-+ }
-+ else
-+ {
-+ /* NOTE: need a+ mode to create file if it doesn't exist */
-+ leasestream = daemon->lease_stream = fopen(daemon->lease_file, "a+");
-+
-+ if (!leasestream)
-+ die(_("cannot open or create lease file %s: %s"), daemon->lease_file, EC_FILE);
-+
-+ /* a+ mode leaves pointer at end. */
-+ rewind(leasestream);
-+ }
-+
-+ if (leasestream)
-+ {
-+ if (!read_leases(now, leasestream))
-+ my_syslog(MS_DHCP | LOG_ERR, _("failed to parse lease database, invalid line: %s %s %s %s ..."),
-+ daemon->dhcp_buff3, daemon->dhcp_buff2,
-+ daemon->namebuff, daemon->dhcp_buff);
-+
-+ if (ferror(leasestream))
-+ die(_("failed to read lease file %s: %s"), daemon->lease_file, EC_FILE);
-+ }
-
- #ifdef HAVE_SCRIPT
- if (!daemon->lease_stream)
-@@ -162,6 +192,7 @@ void lease_init(time_t now)
- errno = ENOENT;
- else if (WEXITSTATUS(rc) == 126)
- errno = EACCES;
-+
- die(_("cannot run lease-init script %s: %s"), daemon->lease_change_command, EC_FILE);
- }
-
-diff --git a/src/log.c b/src/log.c
-index 8e66629..5fc860b 100644
---- a/src/log.c
-+++ b/src/log.c
-@@ -288,7 +288,9 @@ void my_syslog(int priority, const char *format, ...)
- func = "-tftp";
- else if ((LOG_FACMASK & priority) == MS_DHCP)
- func = "-dhcp";
--
-+ else if ((LOG_FACMASK & priority) == MS_SCRIPT)
-+ func = "-script";
-+
- #ifdef LOG_PRI
- priority = LOG_PRI(priority);
- #else
-diff --git a/src/rfc3315.c b/src/rfc3315.c
-index 3f4d69c..a3715cd 100644
---- a/src/rfc3315.c
-+++ b/src/rfc3315.c
-@@ -1975,7 +1975,7 @@ static void log6_packet(struct state *state, char *type, struct in6_addr *addr,
-
- if (addr)
- {
-- inet_ntop(AF_INET6, addr, daemon->dhcp_buff2, 255);
-+ inet_ntop(AF_INET6, addr, daemon->dhcp_buff2, DHCP_BUFF_SZ - 1);
- strcat(daemon->dhcp_buff2, " ");
- }
- else
---
-2.9.3
-
+++ /dev/null
-From 2675f2061525bc954be14988d64384b74aa7bf8b Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Sun, 28 Aug 2016 20:44:05 +0100
-Subject: [PATCH] Handle binding upstream servers to an interface
- (--server=1.2.3.4@eth0) when the named interface is destroyed and recreated
- in the kernel.
-
----
- CHANGELOG | 5 +++++
- src/dnsmasq.h | 1 +
- src/network.c | 31 +++++++++++++++++++++++++++++--
- 3 files changed, 35 insertions(+), 2 deletions(-)
-
-diff --git a/src/dnsmasq.h b/src/dnsmasq.h
-index 27385a9..f239ce5 100644
---- a/src/dnsmasq.h
-+++ b/src/dnsmasq.h
-@@ -488,6 +488,7 @@ struct serverfd {
- int fd;
- union mysockaddr source_addr;
- char interface[IF_NAMESIZE+1];
-+ unsigned int ifindex, used;
- struct serverfd *next;
- };
-
-diff --git a/src/network.c b/src/network.c
-index e7722fd..ddf8d31 100644
---- a/src/network.c
-+++ b/src/network.c
-@@ -1204,6 +1204,7 @@ int local_bind(int fd, union mysockaddr *addr, char *intname, int is_tcp)
- static struct serverfd *allocate_sfd(union mysockaddr *addr, char *intname)
- {
- struct serverfd *sfd;
-+ unsigned int ifindex = 0;
- int errsave;
-
- /* when using random ports, servers which would otherwise use
-@@ -1224,11 +1225,15 @@ static struct serverfd *allocate_sfd(union mysockaddr *addr, char *intname)
- return NULL;
- #endif
- }
-+
-+ if (intname && strlen(intname) != 0)
-+ ifindex = if_nametoindex(intname); /* index == 0 when not binding to an interface */
-
- /* may have a suitable one already */
- for (sfd = daemon->sfds; sfd; sfd = sfd->next )
- if (sockaddr_isequal(&sfd->source_addr, addr) &&
-- strcmp(intname, sfd->interface) == 0)
-+ strcmp(intname, sfd->interface) == 0 &&
-+ ifindex == sfd->ifindex)
- return sfd;
-
- /* need to make a new one. */
-@@ -1250,11 +1255,13 @@ static struct serverfd *allocate_sfd(union mysockaddr *addr, char *intname)
- errno = errsave;
- return NULL;
- }
--
-+
- strcpy(sfd->interface, intname);
- sfd->source_addr = *addr;
- sfd->next = daemon->sfds;
-+ sfd->ifindex = ifindex;
- daemon->sfds = sfd;
-+
- return sfd;
- }
-
-@@ -1429,12 +1436,16 @@ void check_servers(void)
- {
- struct irec *iface;
- struct server *serv;
-+ struct serverfd *sfd, *tmp, **up;
- int port = 0, count;
-
- /* interface may be new since startup */
- if (!option_bool(OPT_NOWILD))
- enumerate_interfaces(0);
-
-+ for (sfd = daemon->sfds; sfd; sfd = sfd->next)
-+ sfd->used = 0;
-+
- #ifdef HAVE_DNSSEC
- /* Disable DNSSEC validation when using server=/domain/.... servers
- unless there's a configured trust anchor. */
-@@ -1505,6 +1516,8 @@ void check_servers(void)
- serv->flags |= SERV_MARK;
- continue;
- }
-+
-+ serv->sfd->used = 1;
- }
-
- if (!(serv->flags & SERV_NO_REBIND) && !(serv->flags & SERV_LITERAL_ADDRESS))
-@@ -1547,6 +1560,20 @@ void check_servers(void)
- if (count - 1 > SERVERS_LOGGED)
- my_syslog(LOG_INFO, _("using %d more nameservers"), count - SERVERS_LOGGED - 1);
-
-+ /* Remove unused sfds */
-+ for (sfd = daemon->sfds, up = &daemon->sfds; sfd; sfd = tmp)
-+ {
-+ tmp = sfd->next;
-+ if (!sfd->used)
-+ {
-+ *up = sfd->next;
-+ close(sfd->fd);
-+ free(sfd);
-+ }
-+ else
-+ up = &sfd->next;
-+ }
-+
- cleanup_servers();
- }
-
---
-2.7.4
-
+++ /dev/null
-diff --git a/src/helper.c b/src/helper.c
-index de31383..a843b41 100644
---- a/src/helper.c
-+++ b/src/helper.c
-@@ -14,7 +14,6 @@
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
--#include <stdio.h>
- #include "dnsmasq.h"
-
- #ifdef HAVE_SCRIPT
+++ /dev/null
-From 16800ea072dd0cdf14d951c4bb8d2808b3dfe53d Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Tue, 30 Aug 2016 23:07:06 +0100
-Subject: [PATCH] Fix crash introduced in
- 2675f2061525bc954be14988d64384b74aa7bf8b
-
----
- src/network.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/network.c b/src/network.c
-index ddf8d31..d87d08f 100644
---- a/src/network.c
-+++ b/src/network.c
-@@ -1516,8 +1516,9 @@ void check_servers(void)
- serv->flags |= SERV_MARK;
- continue;
- }
--
-- serv->sfd->used = 1;
-+
-+ if (serv->sfd)
-+ serv->sfd->used = 1;
- }
-
- if (!(serv->flags & SERV_NO_REBIND) && !(serv->flags & SERV_LITERAL_ADDRESS))
---
-2.9.3
-
+++ /dev/null
-From 591ed1e90503817938ccf5f127e677a8dd48b6d8 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Mon, 11 Jul 2016 18:18:42 +0100
-Subject: [PATCH] Fix bad behaviour with some DHCP option arrangements.
-
-The check that there's enough space to store the DHCP agent-id
-at the end of the packet could succeed when it should fail
-if the END option is in either of the oprion-overload areas.
-That could overwrite legit options in the request and cause
-bad behaviour. It's highly unlikely that any sane DHCP client
-would trigger this bug, and it's never been seen, but this
-fixes the problem.
-
-Also fix off-by-one in bounds checking of option processing.
-Worst case scenario on that is a read one byte beyond the
-end off a buffer with a crafted packet, and maybe therefore
-a SIGV crash if the memory after the buffer is not mapped.
-
-Thanks to Timothy Becker for spotting these.
----
- src/rfc2131.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/rfc2131.c b/src/rfc2131.c
-index b7c167e..8b99d4b 100644
---- a/src/rfc2131.c
-+++ b/src/rfc2131.c
-@@ -186,7 +186,8 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
- be enough free space at the end of the packet to copy the option. */
- unsigned char *sopt;
- unsigned int total = option_len(opt) + 2;
-- unsigned char *last_opt = option_find(mess, sz, OPTION_END, 0);
-+ unsigned char *last_opt = option_find1(&mess->options[0] + sizeof(u32), ((unsigned char *)mess) + sz,
-+ OPTION_END, 0);
- if (last_opt && last_opt < end - total)
- {
- end -= total;
-@@ -1606,7 +1607,7 @@ static unsigned char *option_find1(unsigned char *p, unsigned char *end, int opt
- {
- while (1)
- {
-- if (p > end)
-+ if (p >= end)
- return NULL;
- else if (*p == OPTION_END)
- return opt == OPTION_END ? p : NULL;
---
-2.9.3
-
+++ /dev/null
-From 2c1aec1e979a209eb2f2b035314a8c973b4ac269 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Thu, 7 Sep 2017 20:45:00 +0100
-Subject: [PATCH 7/9] Don't return arcount=1 if EDNS0 RR won't fit in the
- packet.
-
- Omitting the EDNS0 RR but setting arcount gives a malformed packet.
- Also, don't accept UDP packet size less than 512 in recieved EDNS0.
----
- src/edns0.c | 5 ++++-
- src/forward.c | 2 ++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/edns0.c b/src/edns0.c
-index 5bdc133..a8d0167 100644
---- a/src/edns0.c
-+++ b/src/edns0.c
-@@ -221,7 +221,10 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
- free(buff);
- p += rdlen;
- }
-- header->arcount = htons(ntohs(header->arcount) + 1);
-+
-+ /* Only bump arcount if RR is going to fit */
-+ if (((ssize_t)optlen) <= (limit - (p + 4)))
-+ header->arcount = htons(ntohs(header->arcount) + 1);
- }
-
- if (((ssize_t)optlen) > (limit - (p + 4)))
-diff --git a/src/forward.c b/src/forward.c
-index 9b464d3..0f8f462 100644
---- a/src/forward.c
-+++ b/src/forward.c
-@@ -1408,6 +1408,8 @@ void receive_query(struct listener *listen, time_t now)
- defaults to 512 */
- if (udp_size > daemon->edns_pktsz)
- udp_size = daemon->edns_pktsz;
-+ else if (udp_size < PACKETSZ)
-+ udp_size = PACKETSZ; /* Sanity check - can't reduce below default. RFC 6891 6.2.3 */
- }
-
- #ifdef HAVE_AUTH
---
-2.9.5
-
+++ /dev/null
-diff --git a/src/dnsmasq.c b/src/dnsmasq.c
-index e1d3bbd..99e5437 100644
---- a/src/dnsmasq.c
-+++ b/src/dnsmasq.c
-@@ -358,7 +358,8 @@ int main (int argc, char **argv)
- }
-
- #ifdef HAVE_INOTIFY
-- if (daemon->port != 0 || daemon->dhcp || daemon->doing_dhcp6)
-+ if ((daemon->port != 0 || daemon->dhcp || daemon->doing_dhcp6)
-+ && (!option_bool(OPT_NO_RESOLV) || daemon->dynamic_dirs))
- inotify_dnsmasq_init();
- else
- daemon->inotifyfd = -1;
+++ /dev/null
-From 6eaafb18e56928881bae371ba8bb05ee93f55d54 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Tue, 14 Mar 2017 15:24:58 +0100
-Subject: [PATCH 2/2] Document real behaviour of labels with --interface
-
----
- man/dnsmasq.8 | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
-index 523c823..6e93cf1 100644
---- a/man/dnsmasq.8
-+++ b/man/dnsmasq.8
-@@ -203,12 +203,14 @@ or
- options are given dnsmasq listens on all available interfaces except any
- given in
- .B \--except-interface
--options. IP alias interfaces (eg "eth1:0") cannot be used with
--.B --interface
-+options. IP alias interface names (eg "eth1:0") can be used only in
-+.B \--bind-interfaces
- or
--.B --except-interface
--options, use --listen-address instead. A simple wildcard, consisting
--of a trailing '*', can be used in
-+.B \--bind-dynamic
-+mode. Use
-+.B \--listen-address
-+in the default mode instead. A simple wildcard, consisting of a trailing '*',
-+can be used in
- .B \--interface
- and
- .B \--except-interface
---
-2.9.3
-
+++ /dev/null
-From c3d10a1132ada7baa80914f61abb720f94400465 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Tue, 14 Mar 2017 15:23:22 +0100
-Subject: [PATCH 1/2] Warn when using label in default mode
-
----
- src/dnsmasq.c | 2 ++
- src/dnsmasq.h | 3 ++-
- src/network.c | 13 +++++++++++++
- 3 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/src/dnsmasq.c b/src/dnsmasq.c
-index 456b0e8..d2cc7cc 100644
---- a/src/dnsmasq.c
-+++ b/src/dnsmasq.c
-@@ -771,6 +771,8 @@ int main (int argc, char **argv)
-
- if (option_bool(OPT_NOWILD))
- warn_bound_listeners();
-+ else if (!option_bool(OPT_CLEVERBIND))
-+ warn_wild_labels();
-
- warn_int_names();
-
-diff --git a/src/dnsmasq.h b/src/dnsmasq.h
-index a27fbc1..6b44e53 100644
---- a/src/dnsmasq.h
-+++ b/src/dnsmasq.h
-@@ -522,7 +522,7 @@ struct ipsets {
- struct irec {
- union mysockaddr addr;
- struct in_addr netmask; /* only valid for IPv4 */
-- int tftp_ok, dhcp_ok, mtu, done, warned, dad, dns_auth, index, multicast_done, found;
-+ int tftp_ok, dhcp_ok, mtu, done, warned, dad, dns_auth, index, multicast_done, found, label;
- char *name;
- struct irec *next;
- };
-@@ -1252,6 +1252,7 @@ int enumerate_interfaces(int reset);
- void create_wildcard_listeners(void);
- void create_bound_listeners(int die);
- void warn_bound_listeners(void);
-+void warn_wild_labels(void);
- void warn_int_names(void);
- int is_dad_listeners(void);
- int iface_check(int family, struct all_addr *addr, char *name, int *auth_dns);
-diff --git a/src/network.c b/src/network.c
-index eb41624..e5ceb76 100644
---- a/src/network.c
-+++ b/src/network.c
-@@ -244,6 +244,7 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label,
- int tftp_ok = !!option_bool(OPT_TFTP);
- int dhcp_ok = 1;
- int auth_dns = 0;
-+ int is_label = 0;
- #if defined(HAVE_DHCP) || defined(HAVE_TFTP)
- struct iname *tmp;
- #endif
-@@ -264,6 +265,8 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label,
-
- if (!label)
- label = ifr.ifr_name;
-+ else
-+ is_label = strcmp(label, ifr.ifr_name);
-
- /* maintain a list of all addresses on all interfaces for --local-service option */
- if (option_bool(OPT_LOCAL_SERVICE))
-@@ -482,6 +485,7 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label,
- iface->found = 1;
- iface->done = iface->multicast_done = iface->warned = 0;
- iface->index = if_index;
-+ iface->label = is_label;
- if ((iface->name = whine_malloc(strlen(ifr.ifr_name)+1)))
- {
- strcpy(iface->name, ifr.ifr_name);
-@@ -1034,6 +1038,15 @@ void warn_bound_listeners(void)
- my_syslog(LOG_WARNING, _("LOUD WARNING: use --bind-dynamic rather than --bind-interfaces to avoid DNS amplification attacks via these interface(s)"));
- }
-
-+void warn_wild_labels(void)
-+{
-+ struct irec *iface;
-+
-+ for (iface = daemon->interfaces; iface; iface = iface->next)
-+ if (iface->found && iface->name && iface->label)
-+ my_syslog(LOG_WARNING, _("warning: using interface %s instead"), iface->name);
-+}
-+
- void warn_int_names(void)
- {
- struct interface_name *intname;
---
-2.9.3
-
+++ /dev/null
-From 3947ab0069e443e72debe26379b8517fac8f6e41 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Mon, 25 Sep 2017 20:19:55 +0100
-Subject: [PATCH 8/9] Misc code cleanups arising from Google analysis.
- No security impleications or CVEs.
-
----
- src/edns0.c | 2 +-
- src/rfc1035.c | 4 +++-
- src/rfc2131.c | 2 +-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/edns0.c b/src/edns0.c
-index a8d0167..0552d38 100644
---- a/src/edns0.c
-+++ b/src/edns0.c
-@@ -159,7 +159,7 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
- /* delete option if we're to replace it. */
- p -= 4;
- rdlen -= len + 4;
-- memcpy(p, p+len+4, rdlen - i);
-+ memmove(p, p+len+4, rdlen - i);
- PUTSHORT(rdlen, lenp);
- lenp -= 2;
- }
-diff --git a/src/rfc1035.c b/src/rfc1035.c
-index 78410d6..917bac2 100644
---- a/src/rfc1035.c
-+++ b/src/rfc1035.c
-@@ -37,7 +37,7 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp,
- /* end marker */
- {
- /* check that there are the correct no of bytes after the name */
-- if (!CHECK_LEN(header, p, plen, extrabytes))
-+ if (!CHECK_LEN(header, p1 ? p1 : p, plen, extrabytes))
- return 0;
-
- if (isExtract)
-@@ -485,6 +485,8 @@ static unsigned char *do_doctor(unsigned char *p, int count, struct dns_header *
- {
- unsigned int i, len = *p1;
- unsigned char *p2 = p1;
-+ if ((p1 + len - p) >= rdlen)
-+ return 0; /* bad packet */
- /* make counted string zero-term and sanitise */
- for (i = 0; i < len; i++)
- {
-diff --git a/src/rfc2131.c b/src/rfc2131.c
-index 75893a6..71d5846 100644
---- a/src/rfc2131.c
-+++ b/src/rfc2131.c
-@@ -155,7 +155,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
- for (offset = 0; offset < (len - 5); offset += elen + 5)
- {
- elen = option_uint(opt, offset + 4 , 1);
-- if (option_uint(opt, offset, 4) == BRDBAND_FORUM_IANA)
-+ if (option_uint(opt, offset, 4) == BRDBAND_FORUM_IANA && offset + elen + 5 <= len)
- {
- unsigned char *x = option_ptr(opt, offset + 5);
- unsigned char *y = option_ptr(opt, offset + elen + 5);
---
-2.9.5
-
+++ /dev/null
-From 396750cef533cf72c7e6a72e47a9c93e2e431cb7 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Sat, 13 Aug 2016 22:34:11 +0100
-Subject: [PATCH] Refactor openBSD pftables code to remove blatant copyright
- violation.
-
----
- src/tables.c | 90 +++++++++++++++++++++---------------------------------------
- 1 file changed, 32 insertions(+), 58 deletions(-)
-
-diff --git a/src/tables.c b/src/tables.c
-index aae1252..4fa3487 100644
---- a/src/tables.c
-+++ b/src/tables.c
-@@ -53,52 +53,6 @@ static char *pfr_strerror(int errnum)
- }
- }
-
--static int pfr_add_tables(struct pfr_table *tbl, int size, int *nadd, int flags)
--{
-- struct pfioc_table io;
--
-- if (size < 0 || (size && tbl == NULL))
-- {
-- errno = EINVAL;
-- return (-1);
-- }
-- bzero(&io, sizeof io);
-- io.pfrio_flags = flags;
-- io.pfrio_buffer = tbl;
-- io.pfrio_esize = sizeof(*tbl);
-- io.pfrio_size = size;
-- if (ioctl(dev, DIOCRADDTABLES, &io))
-- return (-1);
-- if (nadd != NULL)
-- *nadd = io.pfrio_nadd;
-- return (0);
--}
--
--static int fill_addr(const struct all_addr *ipaddr, int flags, struct pfr_addr* addr) {
-- if ( !addr || !ipaddr)
-- {
-- my_syslog(LOG_ERR, _("error: fill_addr missused"));
-- return -1;
-- }
-- bzero(addr, sizeof(*addr));
--#ifdef HAVE_IPV6
-- if (flags & F_IPV6)
-- {
-- addr->pfra_af = AF_INET6;
-- addr->pfra_net = 0x80;
-- memcpy(&(addr->pfra_ip6addr), &(ipaddr->addr), sizeof(struct in6_addr));
-- }
-- else
--#endif
-- {
-- addr->pfra_af = AF_INET;
-- addr->pfra_net = 0x20;
-- addr->pfra_ip4addr.s_addr = ipaddr->addr.addr4.s_addr;
-- }
-- return 1;
--}
--
--/*****************************************************************************/
-
- void ipset_init(void)
- {
-@@ -111,14 +65,13 @@ void ipset_init(void)
- }
-
- int add_to_ipset(const char *setname, const struct all_addr *ipaddr,
-- int flags, int remove)
-+ int flags, int remove)
- {
- struct pfr_addr addr;
- struct pfioc_table io;
- struct pfr_table table;
-- int n = 0, rc = 0;
-
-- if ( dev == -1 )
-+ if (dev == -1)
- {
- my_syslog(LOG_ERR, _("warning: no opened pf devices %s"), pf_device);
- return -1;
-@@ -126,31 +79,52 @@ int add_to_ipset(const char *setname, const struct all_addr *ipaddr,
-
- bzero(&table, sizeof(struct pfr_table));
- table.pfrt_flags |= PFR_TFLAG_PERSIST;
-- if ( strlen(setname) >= PF_TABLE_NAME_SIZE )
-+ if (strlen(setname) >= PF_TABLE_NAME_SIZE)
- {
- my_syslog(LOG_ERR, _("error: cannot use table name %s"), setname);
- errno = ENAMETOOLONG;
- return -1;
- }
-
-- if ( strlcpy(table.pfrt_name, setname,
-- sizeof(table.pfrt_name)) >= sizeof(table.pfrt_name))
-+ if (strlcpy(table.pfrt_name, setname,
-+ sizeof(table.pfrt_name)) >= sizeof(table.pfrt_name))
- {
- my_syslog(LOG_ERR, _("error: cannot strlcpy table name %s"), setname);
- return -1;
- }
-
-- if ((rc = pfr_add_tables(&table, 1, &n, 0)))
-+ bzero(&io, sizeof io);
-+ io.pfrio_flags = 0;
-+ io.pfrio_buffer = &table;
-+ io.pfrio_esize = sizeof(table);
-+ io.pfrio_size = 1;
-+ if (ioctl(dev, DIOCRADDTABLES, &io))
- {
-- my_syslog(LOG_WARNING, _("warning: pfr_add_tables: %s(%d)"),
-- pfr_strerror(errno),rc);
-+ my_syslog(LOG_WARNING, _("IPset: error:%s"), pfr_strerror(errno));
-+
- return -1;
- }
-+
- table.pfrt_flags &= ~PFR_TFLAG_PERSIST;
-- if (n)
-+ if (io.pfrio_nadd)
- my_syslog(LOG_INFO, _("info: table created"));
--
-- fill_addr(ipaddr,flags,&addr);
-+
-+ bzero(&addr, sizeof(addr));
-+#ifdef HAVE_IPV6
-+ if (flags & F_IPV6)
-+ {
-+ addr.pfra_af = AF_INET6;
-+ addr.pfra_net = 0x80;
-+ memcpy(&(addr.pfra_ip6addr), &(ipaddr->addr), sizeof(struct in6_addr));
-+ }
-+ else
-+#endif
-+ {
-+ addr.pfra_af = AF_INET;
-+ addr.pfra_net = 0x20;
-+ addr.pfra_ip4addr.s_addr = ipaddr->addr.addr4.s_addr;
-+ }
-+
- bzero(&io, sizeof(io));
- io.pfrio_flags = 0;
- io.pfrio_table = table;
---
-2.9.3
-
+++ /dev/null
-From d4f2e0b8d8f0b5daa0d468f62a0d5f1df58ac325 Mon Sep 17 00:00:00 2001
-From: Doran Moppert <dmoppert@redhat.com>
-Date: Tue, 26 Sep 2017 14:48:20 +0930
-Subject: [PATCH 9/9] google patch hand-applied
-
----
- src/edns0.c | 10 +++++-----
- src/forward.c | 4 ++++
- src/rfc1035.c | 6 ++++--
- 3 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/src/edns0.c b/src/edns0.c
-index 0552d38..bec4a36 100644
---- a/src/edns0.c
-+++ b/src/edns0.c
-@@ -212,11 +212,11 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
- /* Copy back any options */
- if (buff)
- {
-- if (p + rdlen > limit)
-- {
-- free(buff);
-- return plen; /* Too big */
-- }
-+ if (p + rdlen > limit)
-+ {
-+ free(buff);
-+ return plen; /* Too big */
-+ }
- memcpy(p, buff, rdlen);
- free(buff);
- p += rdlen;
-diff --git a/src/forward.c b/src/forward.c
-index 0f8f462..a729c06 100644
---- a/src/forward.c
-+++ b/src/forward.c
-@@ -1412,6 +1412,10 @@ void receive_query(struct listener *listen, time_t now)
- udp_size = PACKETSZ; /* Sanity check - can't reduce below default. RFC 6891 6.2.3 */
- }
-
-+ // Make sure the udp size is not smaller than the incoming message so that we
-+ // do not underflow
-+ if (udp_size < n) udp_size = n;
-+
- #ifdef HAVE_AUTH
- if (auth_dns)
- {
-diff --git a/src/rfc1035.c b/src/rfc1035.c
-index 917bac2..ae65702 100644
---- a/src/rfc1035.c
-+++ b/src/rfc1035.c
-@@ -1182,8 +1182,8 @@ int add_resource_record(struct dns_header *header, char *limit, int *truncp, int
- va_end(ap); /* clean up variable argument pointer */
-
- j = p - sav - 2;
-- /* this has already been checked against limit before */
-- PUTSHORT(j, sav); /* Now, store real RDLength */
-+ /* this has already been checked against limit before */
-+ PUTSHORT(j, sav); /* Now, store real RDLength */
-
- /* check for overflow of buffer */
- if (limit && ((unsigned char *)limit - p) < 0)
-@@ -1243,6 +1243,8 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
- int nxdomain = 0, auth = 1, trunc = 0, sec_data = 1;
- struct mx_srv_record *rec;
- size_t len;
-+ // Make sure we do not underflow here too.
-+ if (qlen > (limit - ((char *)header))) return 0;
-
- if (ntohs(header->ancount) != 0 ||
- ntohs(header->nscount) != 0 ||
---
-2.9.5
-
+++ /dev/null
-From 13dee6f49e1d035b8069947be84ee8da2af0c420 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Tue, 28 Feb 2017 16:51:58 +0000
-Subject: [PATCH] Compilation warning fixes.
-
----
- src/dbus.c | 9 ++++-----
- src/option.c | 3 ++-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/dbus.c b/src/dbus.c
-index 7e0d342..2e1a48e 100644
---- a/src/dbus.c
-+++ b/src/dbus.c
-@@ -549,17 +549,16 @@ static DBusMessage *dbus_add_lease(DBusMessage* message)
- return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,
- "Invalid IP address '%s'", ipaddr);
-
-- hw_len = parse_hex((char*)hwaddr, dhcp_chaddr, DHCP_CHADDR_MAX, NULL,
-- &hw_type);
-+ hw_len = parse_hex((char*)hwaddr, dhcp_chaddr, DHCP_CHADDR_MAX, NULL, &hw_type);
- if (hw_type == 0 && hw_len != 0)
- hw_type = ARPHRD_ETHER;
--
-- lease_set_hwaddr(lease, dhcp_chaddr, clid, hw_len, hw_type,
-+
-+ lease_set_hwaddr(lease, dhcp_chaddr, clid, hw_len, hw_type,
- clid_len, now, 0);
- lease_set_expires(lease, expires, now);
- if (hostname_len != 0)
- lease_set_hostname(lease, hostname, 0, get_domain(lease->addr), NULL);
--
-+
- lease_update_file(now);
- lease_update_dns(0);
-
-diff --git a/src/option.c b/src/option.c
-index 4a5ef5f..e03b1e3 100644
---- a/src/option.c
-+++ b/src/option.c
-@@ -4089,7 +4089,7 @@ static void read_file(char *file, FILE *f, int hard_opt)
- {
- int white, i;
- volatile int option = (hard_opt == LOPT_REV_SERV) ? 0 : hard_opt;
-- char *errmess, *p, *arg = NULL, *start;
-+ char *errmess, *p, *arg, *start;
- size_t len;
-
- /* Memory allocation failure longjmps here if mem_recover == 1 */
-@@ -4100,6 +4100,7 @@ static void read_file(char *file, FILE *f, int hard_opt)
- mem_recover = 1;
- }
-
-+ arg = NULL;
- lineno++;
- errmess = NULL;
-
---
-2.9.3
-
+++ /dev/null
-From 1a91b72146893dab1cca1354dd3b0a8fa74d6b55 Mon Sep 17 00:00:00 2001
-From: Scott Little <scott.little@windriver.com>
-Date: Tue, 18 Oct 2016 13:07:56 -0400
-Subject: WRS: Patch22: dnsmasq-update-ipv6-leases-from-config.patch
-
----
- src/lease.c | 53 +++++++++++++++++++++++++++++++++++++++++++----------
- 1 file changed, 43 insertions(+), 10 deletions(-)
-
-diff --git a/src/lease.c b/src/lease.c
-index 69e698c..bc56c47 100644
---- a/src/lease.c
-+++ b/src/lease.c
-@@ -210,6 +210,18 @@ void lease_init(time_t now)
- dns_dirty = 1;
- }
-
-+static int lease_match_config_addr(struct dhcp_lease *lease, struct dhcp_config *config)
-+{
-+ if (!(lease->flags & (LEASE_TA | LEASE_NA)) && (config->flags & CONFIG_ADDR))
-+ return (lease->addr.s_addr == config->addr.s_addr);
-+#ifdef HAVE_DHCP6
-+ else if ((lease->flags & (LEASE_TA | LEASE_NA)) && (config->flags & CONFIG_ADDR6))
-+ return IN6_ARE_ADDR_EQUAL(&config->addr6, &lease->addr6);
-+#endif
-+ else
-+ return 0;
-+}
-+
- void lease_update_from_configs(void)
- {
- /* changes to the config may change current leases. */
-@@ -218,16 +230,37 @@ void lease_update_from_configs(void)
- struct dhcp_config *config;
- char *name;
-
-- for (lease = leases; lease; lease = lease->next)
-- if (lease->flags & (LEASE_TA | LEASE_NA))
-- continue;
-- else if ((config = find_config(daemon->dhcp_conf, NULL, lease->clid, lease->clid_len,
-- lease->hwaddr, lease->hwaddr_len, lease->hwaddr_type, NULL)) &&
-- (config->flags & CONFIG_NAME) &&
-- (!(config->flags & CONFIG_ADDR) || config->addr.s_addr == lease->addr.s_addr))
-- lease_set_hostname(lease, config->hostname, 1, get_domain(lease->addr), NULL);
-- else if ((name = host_from_dns(lease->addr)))
-- lease_set_hostname(lease, name, 1, get_domain(lease->addr), NULL); /* updates auth flag only */
-+ for (lease = leases; lease; lease = lease->next) {
-+ if (lease->flags & LEASE_TA)
-+ continue; /* we do not update temporary ipv6 leases */
-+
-+ config = find_config(daemon->dhcp_conf, NULL, lease->clid, lease->clid_len,
-+ (lease->hwaddr_len > 0 ? lease->hwaddr : NULL),
-+ lease->hwaddr_len, lease->hwaddr_type, NULL);
-+ if (config)
-+ {
-+ if ((!(config->flags & (CONFIG_ADDR | CONFIG_ADDR6))) ||
-+ lease_match_config_addr(lease, config))
-+ {
-+ /*
-+ * Either we matched on a config that doesn't have an address in
-+ * which case we'll just use the hostname, or we matched on a
-+ * config that has the same IP address.
-+ */
-+ if (!(lease->flags & (LEASE_TA | LEASE_NA)))
-+ lease_set_hostname(lease, config->hostname, 1, get_domain(lease->addr), NULL);
-+#ifdef HAVE_DHCP6
-+ else
-+ lease_set_hostname(lease, config->hostname, 1, get_domain6(&lease->addr6), NULL);
-+#endif
-+ continue; /* lease updated; move on to next lease */
-+ }
-+ }
-+
-+ /* attempt to find a matching DNS cache entry for an IPv4 entry */
-+ if (!(lease->flags & (LEASE_TA | LEASE_NA)) && (name = host_from_dns(lease->addr)))
-+ lease_set_hostname(lease, name, 1, get_domain(lease->addr), NULL); /* updates auth flag only */
-+ }
- }
-
- static void ourprintf(int *errp, char *format, ...)
---
-2.7.4
-
+++ /dev/null
-[Unit]
-Description=DNS caching server.
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/dnsmasq -k
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-SUMMARY = "Lightweight, easy to configure DNS forwarder and DHCP server"
-DESCRIPTION = "\
-Dnsmasq is lightweight, easy to configure DNS forwarder and DHCP server. \
-It is designed to provide DNS and, optionally, DHCP, to a small network. \
-It can serve the names of local machines which are not in the global \
-DNS. The DHCP server integrates with the DNS server and allows machines \
-with DHCP-allocated addresses to appear in the DNS with names configured \
-either in each host or in a central configuration file. Dnsmasq supports \
-static and dynamic DHCP leases and BOOTP for network booting of diskless \
-machines. \
-"
-HOMEPAGE = "http://www.thekelleys.org.uk/dnsmasq"
-SECTION = "net"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "dnsmasq-config"
-
-# GPLv3 was added in version 2.41 as license option
-LICENSE = "GPLv2 | GPLv3"
-LIC_FILES_CHKSUM = "\
- file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
- file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504 \
-"
-
-SRC_URI = " \
- http://www.thekelleys.org.uk/${BPN}/${BP}.tar.gz \
- file://init \
- file://dnsmasq-resolvconf.service \
- file://lua.patch \
- \
- file://stx/dnsmasq-2.76-dns-sleep-resume.patch \
- file://stx/dnsmasq-2.76-fix-dhcp-option-arrangements.patch \
- file://stx/dnsmasq-2.76-pftables.patch \
- file://stx/dnsmasq-2.76-fix-crash-dns-resume.patch \
- file://stx/dnsmasq-2.76-warning-fixes.patch \
- file://stx/dnsmasq-2.76-label-warning.patch \
- file://stx/dnsmasq-2.76-label-man.patch \
- file://stx/dnsmasq-2.76-coverity.patch \
- file://stx/dnsmasq-2.76-dhcp-script-log.patch \
- file://stx/dnsmasq-2.76-file_offset32.patch \
- file://stx/dnsmasq-2.76-CVE-2017-14491.patch \
- file://stx/dnsmasq-2.76-CVE-2017-14492.patch \
- file://stx/dnsmasq-2.76-CVE-2017-14493.patch \
- file://stx/dnsmasq-2.76-CVE-2017-14494.patch \
- file://stx/dnsmasq-2.76-CVE-2017-14496.patch \
- file://stx/dnsmasq-2.76-CVE-2017-14495.patch \
- file://stx/dnsmasq-2.76-gita3303e196.patch \
- file://stx/dnsmasq-2.76-underflow.patch \
- file://stx/dnsmasq-2.76-misc-cleanups.patch \
- file://stx/dnsmasq-2.76-CVE-2017-14491-2.patch \
- file://stx/dnsmasq-2.76-inotify.patch \
- file://stx/dnsmasq-update-ipv6-leases-from-config.patch \
- file://stx/close-tftp-sockets-immediately.patch \
- file://stx/dnsmasq.service \
-"
-SRC_URI[md5sum] = "6610f8233ca89b15a1bb47c788ffb84f"
-SRC_URI[sha256sum] = "777c4762d2fee3738a0380401f2d087b47faa41db2317c60660d69ad10a76c32"
-
-inherit pkgconfig update-rc.d systemd
-
-INITSCRIPT_NAME = "dnsmasq"
-INITSCRIPT_PARAMS = "defaults"
-
-PACKAGECONFIG ?= "dbus idn"
-PACKAGECONFIG[dbus] = ",,dbus"
-PACKAGECONFIG[idn] = ",,libidn"
-PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack"
-PACKAGECONFIG[lua] = ",,lua"
-PACKAGECONFIG[resolvconf] = ",,,resolvconf"
-
-EXTRA_OEMAKE = "\
- 'COPTS=${@bb.utils.contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \
- ${@bb.utils.contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \
- ${@bb.utils.contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \
- ${@bb.utils.contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \
- 'CFLAGS=${CFLAGS}' \
- 'LDFLAGS=${LDFLAGS}' \
-"
-
-SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'file://dnsmasq.resolvconf file://99_dnsmasq file://dnsmasq-resolvconf-helper', '', d)}"
-
-do_compile_append() {
- # build dhcp_release
- cd ${S}/contrib/lease-tools
- oe_runmake
-}
-
-do_install () {
- oe_runmake "PREFIX=${D}${prefix}" \
- "BINDIR=${D}${bindir}" \
- "MANDIR=${D}${mandir}" \
- install
-
- install -d ${D}${sysconfdir}/
- install -d ${D}${sysconfdir}/init.d
- install -d ${D}${sysconfdir}/dnsmasq.d
-
- install -m 644 ${S}/dnsmasq.conf.example ${D}${sysconfdir}/dnsmasq.conf
- cat << EOF >> ${D}${sysconfdir}/dnsmasq.conf
-
-# Include all files in /etc/dnsmasq.d except RPM backup files
-conf-dir=/etc/dnsmasq.d,.rpmnew,.rpmsave,.rpmorig
-EOF
-
- install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq
-
- install -d ${D}${systemd_system_unitdir}
-
- if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then
- install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_system_unitdir}/dnsmasq.service
- else
- install -m 0644 ${WORKDIR}/stx/dnsmasq.service ${D}${systemd_system_unitdir}/dnsmasq.service
- fi
-
- install -m 0755 ${S}/contrib/lease-tools/dhcp_release ${D}${bindir}
- install -m 0755 ${S}/contrib/lease-tools/dhcp_release6 ${D}${bindir}
- install -m 0755 ${S}/contrib/lease-tools/dhcp_lease_time ${D}${bindir}
-
- if [ "${@bb.utils.filter('PACKAGECONFIG', 'dbus', d)}" ]; then
- install -d ${D}${sysconfdir}/dbus-1/system.d
- install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/
- fi
- if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then
- install -d ${D}${sysconfdir}/resolvconf/update.d/
- install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq
-
- install -d ${D}${sysconfdir}/default/volatiles
- install -m 0644 ${WORKDIR}/99_dnsmasq ${D}${sysconfdir}/default/volatiles
- install -m 0755 ${WORKDIR}/dnsmasq-resolvconf-helper ${D}${bindir}
- fi
- install -m 755 ${STX_METADATA_PATH}/files/init ${D}/${sysconfdir}/init.d/dnsmasq
-}
-
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "dnsmasq.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
+++ /dev/null
-From 424eef1074c56ce5137bf0b2718711ca706280e7 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sat, 26 Oct 2019 02:06:18 -0700
-Subject: [PATCH] Include sysmacros for major minor macros.
-
----
- user/drbdadm_adjust.c | 1 +
- user/legacy/drbdadm_adjust.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/user/drbdadm_adjust.c b/user/drbdadm_adjust.c
-index efa09a7f..09c38944 100644
---- a/user/drbdadm_adjust.c
-+++ b/user/drbdadm_adjust.c
-@@ -39,6 +39,7 @@
- #include <stdlib.h>
- #include <stdarg.h>
- #include <stdbool.h>
-+#include <sys/sysmacros.h>
-
- #include "drbdadm.h"
- #include "drbdtool_common.h"
-diff --git a/user/legacy/drbdadm_adjust.c b/user/legacy/drbdadm_adjust.c
-index 0de5b620..b4d783d4 100644
---- a/user/legacy/drbdadm_adjust.c
-+++ b/user/legacy/drbdadm_adjust.c
-@@ -36,6 +36,7 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <stdarg.h>
-+#include <sys/sysmacros.h>
-
- #include "drbdadm.h"
- #include "drbdtool_common.h"
---
-2.17.1
-
+++ /dev/null
-From 27ef15d12cc63432332212fbf8c5cc4d77a29de9 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sat, 26 Oct 2019 14:17:48 +0000
-Subject: [PATCH] disable documentation
-
----
- Makefile.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index fd6a7443..348389e5 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -56,7 +56,7 @@ KDIR ?= /lib/modules/$(KVER)/build
- # and not in e.g. dash. I'm too lazy to fix it to be compatible.
- SHELL=/bin/bash
-
--SUBDIRS = user scripts documentation drbd
-+SUBDIRS = user scripts drbd
-
- REL_VERSION := $(shell $(SED) -ne '/^\#define REL_VERSION/{s/^[^"]*"\([^ "]*\).*/\1/;p;q;}' drbd/linux/drbd_config.h)
- ifdef FORCE
-@@ -181,7 +181,6 @@ drbd/drbd_buildtag.c:
- .filelist:
- @$(GIT) ls-files | sed '$(if $(PRESERVE_DEBIAN),,/^debian/d);s#^#drbd-$(DIST_VERSION)/#' > .filelist
- @[ -s .filelist ] # assert there is something in .filelist now
-- @find documentation -name "[^.]*.[58]" -o -name "*.html" | \
- sed "s/^/drbd-$(DIST_VERSION)\//" >> .filelist ; \
- echo drbd-$(DIST_VERSION)/drbd_config.h >> .filelist ; \
- echo drbd-$(DIST_VERSION)/drbd/drbd_buildtag.c >> .filelist ; \
---
-2.17.1
-
+++ /dev/null
-[Unit]
-Description=Control drbd resources.
-After=network.target sshd.service
-
-[Service]
-Type=forking
-Restart=no
-KillMode=process
-RemainAfterExit=yes
-ExecStart=/etc/init.d/drbd start
-ExecStop=/etc/init.d/drbd stop
-ExecReload=/etc/init.d/drbd reload
-TimeoutSec=5min
-
-[Install]
-WantedBy=multi-user.target
-
+++ /dev/null
-
-SUMMARY = "Distributed block device driver for Linux"
-
-DESCRIPTION = " DRBD, developed by LINBIT, is a software that allows RAID 1 functionality over \
- TCP/IP and RDMA for GNU/Linux. DRBD is a block device which is designed to build high \
- availability clusters and software defined storage by providing a virtual shared device \
- which keeps disks in nodes synchronised using TCP/IP or RDMA. This simulates RAID 1 but \
- avoids the use of uncommon hardware (shared SCSI buses or Fibre Channel)."
-HOMEPAGE = "http://www.drbd.org/"
-SECTION = "admin"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
-
-# SRCREV = "89a294209144b68adb3ee85a73221f964d3ee515"
-SRCREV = "136c0e42691aed4a4607c79969de87cb8410285c"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "8.4.3rc1"
-
-SRC_URI = "git://github.com/LINBIT/drbd-8.4.git;name="git";protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-
-# https://www.linbit.com/downloads/drbd/8.4/archive/
-
-inherit autotools
-
-DEPENDS += " \
- linux-libc-headers \
- glibc \
- "
-# UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases"
-
-inherit autotools-brokensep
-
-RDEPENDS_${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy"
-
-do_install_append() {
- rm -rf ${D}/var/lock
-}
+++ /dev/null
-
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "filesystem/drbd/drbd-tools/centos"
-
-SRC_URI_STX += " \
- file://patches/0001-skip_wait_con_int_on_simplex.patch \
- file://patches/0002-drbd-conditional-crm-dependency.patch \
- file://patches/0003-drbd_report_condition.patch \
- file://patches/0004-drbdadm-ipaddr-change.patch \
- file://patches/0005-drbd_reconnect_standby_standalone.patch \
- file://patches/0006-avoid-kernel-userspace-version-check.patch \
- file://patches/0007-Update-OCF-to-attempt-connect-in-certain-states.patch \
- file://patches/0008-Increase-short-cmd-timeout-to-15-secs.patch \
- file://patches/0009-Check-for-mounted-device-before-demoting-Primary-DRB.patch \
- file://patches/0010-backport-drbd-main-ipv6-Fix-interface-indices-larger.patch \
- file://patches/0011-Unmount-all-targets-during-drbd-stop.patch \
- "
-
-SRC_URI += " \
- file://0010-Include-sysmacros-for-major-minor-macros.patch \
- file://0011-Disable-documentation.patch \
- file://drbd.service \
- "
-
-EXTRA_OECONF = " \
- --with-utils \
- --with-initdir=/etc/init.d \
- --without-km \
- --with-pacemaker \
- --with-rgmanager \
- --with-bashcompletion \
- --with-udev \
- --with-heartbeat \
- --with-distro debian \
- "
-
-FILES_${PN} = "\
- /var/lib/drbd \
- /run \
- ${base_sbindir}/drbdsetup \
- ${base_sbindir}/drbdadm \
- ${base_sbindir}/drbdmeta \
- ${nonarch_base_libdir}/drbd/drbdsetup-83 \
- ${nonarch_base_libdir}/drbd/drbdadm-83 \
- ${sysconfdir}/init.d/drbd \
- ${sysconfdir}/drbd.conf \
- ${sysconfdir}/xen \
- ${sysconfdir}/drbd.d \
- ${sbindir}/drbd-overview \
- ${libdir}/drbd/outdate-peer.sh \
- ${libdir}/drbd/snapshot-resync-target-lvm.sh \
- ${libdir}/drbd/unsnapshot-resync-target-lvm.sh \
- ${libdir}/drbd/notify-out-of-sync.sh \
- ${libdir}/drbd/notify-split-brain.sh \
- ${libdir}/drbd/notify-emergency-reboot.sh \
- ${libdir}/drbd/notify-emergency-shutdown.sh \
- ${libdir}/drbd/notify-io-error.sh \
- ${libdir}/drbd/notify-pri-lost-after-sb.sh \
- ${libdir}/drbd/notify-pri-lost.sh \
- ${libdir}/drbd/notify-pri-on-incon-degr.sh \
- ${libdir}/drbd/notify.sh \
- ${libdir}/drbd/rhcs_fence \
- ${sysconfdir}/udev/rules.d/65-drbd.rules \
- ${libdir}/drbd/crm-fence-peer.sh \
- ${libdir}/drbd/crm-unfence-peer.sh \
- ${libdir}/drbd/stonith_admin-fence-peer.sh \
- ${libdir}/ocf/resource.d/linbit/drbd \
- ${datadir}/cluster/drbd.sh.drbd-utils \
- ${datadir}/cluster/drbd.metadata \
- ${sysconfdir}/ha.d/resource.d/drbddisk \
- ${sysconfdir}/ha.d/resource.d/drbdupper \
- ${sysconfdir}/bash_completion.d/drbdadm* \
- ${systemd_system_unitdir}/drbd.service \
- "
-
-inherit update-alternatives
-ALTERNATIVE_PRIORITY = "80"
-ALTERNATIVE_${PN} = "drbd.sh"
-ALTERNATIVE_LINK_NAME[drbd.sh] = "${datadir}/cluster/drbd.sh"
-
-do_install_append() {
- mv ${D}${datadir}/cluster/drbd.sh ${D}${datadir}/cluster/drbd.sh.drbd-utils
- install -d -m 755 ${D}/${systemd_system_unitdir}
- install -p -D -m 644 ${WORKDIR}/drbd.service ${D}/${systemd_system_unitdir}
-}
-
-#inherit systemd
-#SYSTEMD_PACKAGES += "${PN}"
-#SYSTEMD_SERVICE_${PN} = "drbd.service"
-
-pkg_postinst_ontarget_drbd-utils() {
- ${base_bindir}/systemctl enable drbd.service
-}
+++ /dev/null
-
-SUMMARY = "syslog replacement"
-DESCRIPTION = " \
- The EventLog library aims to be a replacement of the simple syslog() API \
- provided on UNIX systems. The major difference between EventLog and syslog \
- is that EventLog tries to add structure to messages. \
- \
- Where you had a simple non-structrured string in syslog() you have a \
- combination of description and tag/value pairs. \
- \
- EventLog provides an interface to build, format and output an event record. \
- The exact format and output method can be customized by the administrator \
- via a configuration file \
- "
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b8ba8e77bcda9a53fac0fe39fe957767"
-
-SRCREV = "a5c19163ba131f79452c6dfe4e31c2b4ce4be741"
-PROTOCOL = "https"
-BRANCH = "master"
-S = "${WORKDIR}/git"
-PV = "1.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/balabit/eventlog.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-inherit autotools pkgconfig
+++ /dev/null
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd libevent-2.0.21-stable/test/Makefile.am libevent-2.0.21-stable/test/Makefile.am
---- libevent-2.0.21-stable/test/Makefile.am 2012-05-31 07:08:19.000000000 +0300
-+++ libevent-2.0.21-stable/test/Makefile.am 2013-02-08 02:06:20.227475872 +0200
-@@ -19,8 +19,6 @@
- EXTRA_PROGRAMS = regress
- noinst_HEADERS = tinytest.h tinytest_macros.h regress.h tinytest_local.h
-
--TESTS = $(top_srcdir)/test/test.sh
--
- BUILT_SOURCES =
- if BUILD_REGRESS
- BUILT_SOURCES += regress.gen.c regress.gen.h
+++ /dev/null
-Upstream-Status: Submitted [https://sourceforge.net/tracker/?func=detail&aid=3603774&group_id=50884&atid=461322]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd libevent-2.0.21-stable/configure.in libevent-2.0.21-stable/configure.in
---- libevent-2.0.21-stable/configure.in 2012-11-18 08:34:13.000000000 +0200
-+++ libevent-2.0.21-stable/configure.in 2013-02-08 02:03:58.403476183 +0200
-@@ -12,7 +12,7 @@
- AC_CONFIG_MACRO_DIR([m4])
-
- AM_INIT_AUTOMAKE(libevent,2.0.21-stable)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_DEFINE(NUMERIC_VERSION, 0x02001500, [Numeric representation of the version])
-
- dnl Initialize prefix.
+++ /dev/null
-SUMMARY = "An asynchronous event notification library"
-HOMEPAGE = "http://libevent.org/"
-BUGTRACKER = "https://github.com/libevent/libevent/issues"
-SECTION = "libs"
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=45c5316ff684bcfe2f9f86d8b1279559"
-
-inherit stx-metadata
-
-STX_REPO = "integ"
-STX_SUBPATH = "base/libevent/files"
-
-SRC_URI = " \
- https://github.com/downloads/libevent/libevent/${BP}-stable.tar.gz \
- file://libevent-obsolete_automake_macros.patch \
- file://libevent-disable_tests.patch \
-"
-
-SRC_URI_STX = " \
- file://libevent-ipv6-client-socket.patch \
-"
-
-SRC_URI[md5sum] = "b2405cc9ebf264aa47ff615d9de527a2"
-SRC_URI[sha256sum] = "22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5"
-
-S = "${WORKDIR}/${BP}-stable"
-
-inherit openssl10
-
-PACKAGECONFIG ??= "openssl"
-PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl10"
-
-inherit autotools
-
-# Needed for Debian packaging
-LEAD_SONAME = "libevent-2.0.so"
-
-BBCLASSEXTEND = "native nativesdk"
+++ /dev/null
-
-SUMMARY = "Event loop abstraction for Libraries"
-DESCRIPTION = "Libverto exists to isolate libraries from the particular event loop \
-chosen by an application. Libverto provides an asynchronous \
-programming interface independent of any particular event loop and \
-allows applications to attach this interface to whatever event loop \
-they select."
-HOMEPAGE = "http://fedorahosted.net/libverto"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bc8917ab981cfa6161dc29319a4038d9"
-
-
-DEPENDS += "libevent libtevent"
-
-# fedorahosted tarball cannot be fetched completely, so switch to use other source
-# SRC_URI = "http://fedorahosted.org/releases/l/i/${PN}/${PN}-${PV}.tar.gz"
-SRC_URI = "https://github.com/latchset/libverto/releases/download/0.2.5/${PN}-${PV}.tar.gz \
- "
-SRC_URI[md5sum] = "144fb8f00759ef8ad71c472333847f03"
-
-inherit autotools pkgconfig
-
-PACKAGECONFIG ??= "libevent tevent"
-PACKAGECONFIG[glib] = "--with-glib,--without-glib,glib-2.0"
-PACKAGECONFIG[libev] = "--with-libev,--without-libev,libev"
-PACKAGECONFIG[libevent] = "--with-libevent,--without-libevent,libevent"
-PACKAGECONFIG[tevent] = "--with-tevent,--without-tevent,libtevent"
-
-PACKAGES =+ "${PN}-libevent ${PN}-tevent"
-
-FILES_${PN}-libevent = "${libdir}/libverto-libevent${SOLIBS}"
-FILES_${PN}-tevent = "${libdir}/libverto-tevent${SOLIBS}"
-
-RPROVIDES_${PN}-libevent += "${PN}-module-base"
-RPROVIDES_${PN}-tevent += "${PN}-module-base"
-
+++ /dev/null
-PORT="11211"
-USER="memcached"
-MAXCONN="1024"
-CACHESIZE="64"
-OPTIONS="-l 127.0.0.1,::1"
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "memcached-custom"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/centos/memcached-custom.spec;beginline=1;endline=10;md5=b3063b05db239c326cb7f5c267e0d023 \
- "
-
-SRC_URI += " \
- file://memcached.sysconfig \
- "
-
-inherit useradd
-
-USERADD_PACKAGES = "${PN}"
-
-USERADD_PARAM_${PN} = "-r -g memcached -d /run/memcached -s /sbin/nologin -c 'Memcached daemon' memcached"
-GROUPADD_PARAM_${PN} = "-r memcached"
-
-do_install_append () {
- install -d ${D}${sysconfdir}/sysconfig
- install -d ${D}/${sysconfdir}/systemd/system/
- install -m 0644 ${WORKDIR}/memcached.sysconfig ${D}${sysconfdir}/sysconfig/memcached
- install -m 0644 ${STX_METADATA_PATH}/files/memcached.service \
- ${D}/${sysconfdir}/systemd/system/memcached
-}
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "ntp-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- "
-
-do_install_append () {
- install -D -m644 ${STX_METADATA_PATH}/files/ntpd.sysconfig ${D}/${sysconfdir}/sysconfig/ntpd
- install -D -m644 ${STX_METADATA_PATH}/files/ntp.conf ${D}/${sysconfdir}/ntp.conf
-}
-
-SYSTEMD_AUTO_ENABLE = "disable"
-RDEPENDS_${PN}_append = " bash"
-
-FILES_${PN}_append = " ${sysconfdir}/sysconfig/ntpd"
+++ /dev/null
-From 462675a5b797afb411de4506425f12ac6ebdf56a Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:28:29 -0800
-Subject: [PATCH 01/20] Various manual pages changes:
-
-remove LIBEXECDIR from slapd.8
-remove references to non-existing manpages (bz 624616)
----
- doc/man/man1/ldapmodify.1 | 3 +--
- doc/man/man5/ldap.conf.5 | 1 +
- doc/man/man8/slapd.8 | 8 ++++----
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1
-index 19263eb..46a8593 100644
---- a/doc/man/man1/ldapmodify.1
-+++ b/doc/man/man1/ldapmodify.1
-@@ -397,8 +397,7 @@ exit status and a diagnostic message being written to standard error.
- .BR ldap_add_ext (3),
- .BR ldap_delete_ext (3),
- .BR ldap_modify_ext (3),
--.BR ldap_modrdn_ext (3),
--.BR ldif (5).
-+.BR ldif (5)
- .SH AUTHOR
- The OpenLDAP Project <http://www.openldap.org/>
- .SH ACKNOWLEDGEMENTS
-diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
-index 0c8ec8a..49f1830 100644
---- a/doc/man/man5/ldap.conf.5
-+++ b/doc/man/man5/ldap.conf.5
-@@ -318,6 +318,7 @@ certificates in separate individual files. The
- .B TLS_CACERT
- is always used before
- .B TLS_CACERTDIR.
-+The specified directory must be managed with the OpenSSL c_rehash utility.
- This parameter is ignored with GnuTLS.
-
- When using Mozilla NSS, <path> may contain a Mozilla NSS cert/key
-diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
-index b554305..22fff11 100644
---- a/doc/man/man8/slapd.8
-+++ b/doc/man/man8/slapd.8
-@@ -5,7 +5,7 @@
- .SH NAME
- slapd \- Stand-alone LDAP Daemon
- .SH SYNOPSIS
--.B LIBEXECDIR/slapd
-+.B slapd
- [\c
- .BR \-4 | \-6 ]
- [\c
-@@ -317,7 +317,7 @@ the LDAP databases defined in the default config file, just type:
- .LP
- .nf
- .ft tt
-- LIBEXECDIR/slapd
-+ slapd
- .ft
- .fi
- .LP
-@@ -328,7 +328,7 @@ on voluminous debugging which will be printed on standard error, type:
- .LP
- .nf
- .ft tt
-- LIBEXECDIR/slapd \-f /var/tmp/slapd.conf \-d 255
-+ slapd -f /var/tmp/slapd.conf -d 255
- .ft
- .fi
- .LP
-@@ -336,7 +336,7 @@ To test whether the configuration file is correct or not, type:
- .LP
- .nf
- .ft tt
-- LIBEXECDIR/slapd \-Tt
-+ slapd -Tt
- .ft
- .fi
- .LP
---
-2.17.1
-
+++ /dev/null
-From ceaad5c741c95c78d924cb6b179daa6c6b60bf91 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Wed, 4 Dec 2019 08:07:24 -0800
-Subject: [PATCH] stx openldap config files
-
----
- stx-openldap-config/LICENSE | 202 ++++++++++++++++++++++++
- stx-openldap-config/initial_config.ldif | 80 ++++++++++
- stx-openldap-config/initscript | 100 ++++++++++++
- stx-openldap-config/slapd.conf | 117 ++++++++++++++
- stx-openldap-config/slapd.service | 23 +++
- stx-openldap-config/slapd.sysconfig | 15 ++
- 6 files changed, 537 insertions(+)
- create mode 100644 stx-openldap-config/LICENSE
- create mode 100644 stx-openldap-config/initial_config.ldif
- create mode 100755 stx-openldap-config/initscript
- create mode 100644 stx-openldap-config/slapd.conf
- create mode 100644 stx-openldap-config/slapd.service
- create mode 100644 stx-openldap-config/slapd.sysconfig
-
-diff --git a/stx-openldap-config/LICENSE b/stx-openldap-config/LICENSE
-new file mode 100644
-index 000000000..d64569567
---- /dev/null
-+++ b/stx-openldap-config/LICENSE
-@@ -0,0 +1,202 @@
-+
-+ Apache License
-+ Version 2.0, January 2004
-+ http://www.apache.org/licenses/
-+
-+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-+
-+ 1. Definitions.
-+
-+ "License" shall mean the terms and conditions for use, reproduction,
-+ and distribution as defined by Sections 1 through 9 of this document.
-+
-+ "Licensor" shall mean the copyright owner or entity authorized by
-+ the copyright owner that is granting the License.
-+
-+ "Legal Entity" shall mean the union of the acting entity and all
-+ other entities that control, are controlled by, or are under common
-+ control with that entity. For the purposes of this definition,
-+ "control" means (i) the power, direct or indirect, to cause the
-+ direction or management of such entity, whether by contract or
-+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
-+ outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+ "You" (or "Your") shall mean an individual or Legal Entity
-+ exercising permissions granted by this License.
-+
-+ "Source" form shall mean the preferred form for making modifications,
-+ including but not limited to software source code, documentation
-+ source, and configuration files.
-+
-+ "Object" form shall mean any form resulting from mechanical
-+ transformation or translation of a Source form, including but
-+ not limited to compiled object code, generated documentation,
-+ and conversions to other media types.
-+
-+ "Work" shall mean the work of authorship, whether in Source or
-+ Object form, made available under the License, as indicated by a
-+ copyright notice that is included in or attached to the work
-+ (an example is provided in the Appendix below).
-+
-+ "Derivative Works" shall mean any work, whether in Source or Object
-+ form, that is based on (or derived from) the Work and for which the
-+ editorial revisions, annotations, elaborations, or other modifications
-+ represent, as a whole, an original work of authorship. For the purposes
-+ of this License, Derivative Works shall not include works that remain
-+ separable from, or merely link (or bind by name) to the interfaces of,
-+ the Work and Derivative Works thereof.
-+
-+ "Contribution" shall mean any work of authorship, including
-+ the original version of the Work and any modifications or additions
-+ to that Work or Derivative Works thereof, that is intentionally
-+ submitted to Licensor for inclusion in the Work by the copyright owner
-+ or by an individual or Legal Entity authorized to submit on behalf of
-+ the copyright owner. For the purposes of this definition, "submitted"
-+ means any form of electronic, verbal, or written communication sent
-+ to the Licensor or its representatives, including but not limited to
-+ communication on electronic mailing lists, source code control systems,
-+ and issue tracking systems that are managed by, or on behalf of, the
-+ Licensor for the purpose of discussing and improving the Work, but
-+ excluding communication that is conspicuously marked or otherwise
-+ designated in writing by the copyright owner as "Not a Contribution."
-+
-+ "Contributor" shall mean Licensor and any individual or Legal Entity
-+ on behalf of whom a Contribution has been received by Licensor and
-+ subsequently incorporated within the Work.
-+
-+ 2. Grant of Copyright License. Subject to the terms and conditions of
-+ this License, each Contributor hereby grants to You a perpetual,
-+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+ copyright license to reproduce, prepare Derivative Works of,
-+ publicly display, publicly perform, sublicense, and distribute the
-+ Work and such Derivative Works in Source or Object form.
-+
-+ 3. Grant of Patent License. Subject to the terms and conditions of
-+ this License, each Contributor hereby grants to You a perpetual,
-+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+ (except as stated in this section) patent license to make, have made,
-+ use, offer to sell, sell, import, and otherwise transfer the Work,
-+ where such license applies only to those patent claims licensable
-+ by such Contributor that are necessarily infringed by their
-+ Contribution(s) alone or by combination of their Contribution(s)
-+ with the Work to which such Contribution(s) was submitted. If You
-+ institute patent litigation against any entity (including a
-+ cross-claim or counterclaim in a lawsuit) alleging that the Work
-+ or a Contribution incorporated within the Work constitutes direct
-+ or contributory patent infringement, then any patent licenses
-+ granted to You under this License for that Work shall terminate
-+ as of the date such litigation is filed.
-+
-+ 4. Redistribution. You may reproduce and distribute copies of the
-+ Work or Derivative Works thereof in any medium, with or without
-+ modifications, and in Source or Object form, provided that You
-+ meet the following conditions:
-+
-+ (a) You must give any other recipients of the Work or
-+ Derivative Works a copy of this License; and
-+
-+ (b) You must cause any modified files to carry prominent notices
-+ stating that You changed the files; and
-+
-+ (c) You must retain, in the Source form of any Derivative Works
-+ that You distribute, all copyright, patent, trademark, and
-+ attribution notices from the Source form of the Work,
-+ excluding those notices that do not pertain to any part of
-+ the Derivative Works; and
-+
-+ (d) If the Work includes a "NOTICE" text file as part of its
-+ distribution, then any Derivative Works that You distribute must
-+ include a readable copy of the attribution notices contained
-+ within such NOTICE file, excluding those notices that do not
-+ pertain to any part of the Derivative Works, in at least one
-+ of the following places: within a NOTICE text file distributed
-+ as part of the Derivative Works; within the Source form or
-+ documentation, if provided along with the Derivative Works; or,
-+ within a display generated by the Derivative Works, if and
-+ wherever such third-party notices normally appear. The contents
-+ of the NOTICE file are for informational purposes only and
-+ do not modify the License. You may add Your own attribution
-+ notices within Derivative Works that You distribute, alongside
-+ or as an addendum to the NOTICE text from the Work, provided
-+ that such additional attribution notices cannot be construed
-+ as modifying the License.
-+
-+ You may add Your own copyright statement to Your modifications and
-+ may provide additional or different license terms and conditions
-+ for use, reproduction, or distribution of Your modifications, or
-+ for any such Derivative Works as a whole, provided Your use,
-+ reproduction, and distribution of the Work otherwise complies with
-+ the conditions stated in this License.
-+
-+ 5. Submission of Contributions. Unless You explicitly state otherwise,
-+ any Contribution intentionally submitted for inclusion in the Work
-+ by You to the Licensor shall be under the terms and conditions of
-+ this License, without any additional terms or conditions.
-+ Notwithstanding the above, nothing herein shall supersede or modify
-+ the terms of any separate license agreement you may have executed
-+ with Licensor regarding such Contributions.
-+
-+ 6. Trademarks. This License does not grant permission to use the trade
-+ names, trademarks, service marks, or product names of the Licensor,
-+ except as required for reasonable and customary use in describing the
-+ origin of the Work and reproducing the content of the NOTICE file.
-+
-+ 7. Disclaimer of Warranty. Unless required by applicable law or
-+ agreed to in writing, Licensor provides the Work (and each
-+ Contributor provides its Contributions) on an "AS IS" BASIS,
-+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-+ implied, including, without limitation, any warranties or conditions
-+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-+ PARTICULAR PURPOSE. You are solely responsible for determining the
-+ appropriateness of using or redistributing the Work and assume any
-+ risks associated with Your exercise of permissions under this License.
-+
-+ 8. Limitation of Liability. In no event and under no legal theory,
-+ whether in tort (including negligence), contract, or otherwise,
-+ unless required by applicable law (such as deliberate and grossly
-+ negligent acts) or agreed to in writing, shall any Contributor be
-+ liable to You for damages, including any direct, indirect, special,
-+ incidental, or consequential damages of any character arising as a
-+ result of this License or out of the use or inability to use the
-+ Work (including but not limited to damages for loss of goodwill,
-+ work stoppage, computer failure or malfunction, or any and all
-+ other commercial damages or losses), even if such Contributor
-+ has been advised of the possibility of such damages.
-+
-+ 9. Accepting Warranty or Additional Liability. While redistributing
-+ the Work or Derivative Works thereof, You may choose to offer,
-+ and charge a fee for, acceptance of support, warranty, indemnity,
-+ or other liability obligations and/or rights consistent with this
-+ License. However, in accepting such obligations, You may act only
-+ on Your own behalf and on Your sole responsibility, not on behalf
-+ of any other Contributor, and only if You agree to indemnify,
-+ defend, and hold each Contributor harmless for any liability
-+ incurred by, or claims asserted against, such Contributor by reason
-+ of your accepting any such warranty or additional liability.
-+
-+ END OF TERMS AND CONDITIONS
-+
-+ APPENDIX: How to apply the Apache License to your work.
-+
-+ To apply the Apache License to your work, attach the following
-+ boilerplate notice, with the fields enclosed by brackets "[]"
-+ replaced with your own identifying information. (Don't include
-+ the brackets!) The text should be enclosed in the appropriate
-+ comment syntax for the file format. We also recommend that a
-+ file or class name and description of purpose be included on the
-+ same "printed page" as the copyright notice for easier
-+ identification within third-party archives.
-+
-+ Copyright [yyyy] [name of copyright owner]
-+
-+ Licensed under the Apache License, Version 2.0 (the "License");
-+ you may not use this file except in compliance with the License.
-+ You may obtain a copy of the License at
-+
-+ http://www.apache.org/licenses/LICENSE-2.0
-+
-+ Unless required by applicable law or agreed to in writing, software
-+ distributed under the License is distributed on an "AS IS" BASIS,
-+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ See the License for the specific language governing permissions and
-+ limitations under the License.
-diff --git a/stx-openldap-config/initial_config.ldif b/stx-openldap-config/initial_config.ldif
-new file mode 100644
-index 000000000..672e364b5
---- /dev/null
-+++ b/stx-openldap-config/initial_config.ldif
-@@ -0,0 +1,80 @@
-+#ldapadd -D "cn=ldapadmin,dc=cgcs,dc=local" -W -f /etc/openldap/initial_config.ldif
-+#ldapsearch -x -b 'dc=cgcs,dc=local' '(objectclass=*)'
-+dn: dc=cgcs,dc=local
-+dc: cgcs
-+objectClass: top
-+objectClass: domain
-+
-+dn: ou=policies,dc=cgcs,dc=local
-+ou: policies
-+objectClass: top
-+objectClass: organizationalUnit
-+
-+dn: ou=People,dc=cgcs,dc=local
-+ou: People
-+objectClass: top
-+objectClass: organizationalUnit
-+
-+dn: ou=Group,dc=cgcs,dc=local
-+ou: Group
-+objectClass: top
-+objectClass: organizationalUnit
-+
-+dn: ou=SUDOers,dc=cgcs,dc=local
-+objectClass: top
-+objectClass: organizationalUnit
-+ou: SUDOers
-+
-+dn: cn=users,ou=Group,dc=cgcs,dc=local
-+objectClass: posixGroup
-+objectClass: top
-+cn: users
-+userPassword: {crypt}x
-+gidNumber: 100
-+
-+dn: cn=cgcs,ou=Group,dc=cgcs,dc=local
-+objectClass: posixGroup
-+objectClass: top
-+cn: cgcs
-+userPassword: {crypt}x
-+gidNumber: 1000
-+
-+dn: cn=default,ou=policies,dc=cgcs,dc=local
-+objectClass: top
-+objectClass: device
-+objectClass: pwdPolicy
-+objectClass: pwdPolicyChecker
-+cn: default
-+pwdAttribute: userPassword
-+pwdMaxAge: 0
-+pwdExpireWarning: 432000
-+pwdInHistory: 2
-+pwdCheckModule: check_password.so
-+pwdCheckQuality: 1
-+pwdMinLength: 7
-+pwdMaxFailure: 5
-+pwdLockout: TRUE
-+pwdLockoutDuration: 300
-+pwdFailureCountInterval: 0
-+pwdMustChange: TRUE
-+pwdAllowUserChange: TRUE
-+pwdSafeModify: FALSE
-+pwdGraceAuthNLimit: 0
-+
-+dn: cn=defaults,ou=SUDOers,dc=cgcs,dc=local
-+objectClass: top
-+objectClass: sudoRole
-+cn: defaults
-+description: Default sudoOption's go here
-+sudoOrder: 1
-+
-+dn: cn=admin,ou=SUDOers,dc=cgcs,dc=local
-+objectClass: top
-+objectClass: sudoRole
-+cn: admin
-+sudoUser: admin
-+sudoHost: ALL
-+sudoRunAsUser: ALL
-+sudoCommand: ALL
-+sudoOrder: 2
-+sudoOption: secure_path=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
-diff --git a/stx-openldap-config/initscript b/stx-openldap-config/initscript
-new file mode 100755
-index 000000000..d3208dd9a
---- /dev/null
-+++ b/stx-openldap-config/initscript
-@@ -0,0 +1,100 @@
-+#! /bin/sh
-+#
-+# This is an init script for openembedded
-+# Copy it to /etc/init.d/openldap and type
-+# > update-rc.d openldap defaults 60
-+#
-+. /etc/init.d/functions
-+
-+################################################################################
-+# Wait for a process to stop running.
-+#
-+################################################################################
-+function wait_for_proc_stop()
-+{
-+ PROGNAME=$1
-+ TIMEOUT=${2:-"5"}
-+
-+ for I in $(seq 1 $TIMEOUT); do
-+ PID=$(pidof $PROGNAME 2> /dev/null)
-+ if [ $? -ne 0 ]; then
-+ ## already dead
-+ return 0
-+ fi
-+ sleep 1
-+ done
-+
-+ return 1
-+}
-+
-+slapd=/usr/sbin/slapd
-+test -x "$slapd" || exit 0
-+
-+RETVAL=0
-+
-+case "$1" in
-+ start)
-+ echo -n "Starting SLAPD: "
-+ if [ -f /etc/openldap/schema/cn=config.ldif ]; then
-+ start-stop-daemon --start --oknodo --quiet --exec $slapd \
-+ -- -F /etc/openldap/schema/
-+ RETVAL=$?
-+ else
-+ start-stop-daemon --start --oknodo --quiet --exec $slapd
-+ RETVAL=$?
-+ fi
-+ if [ $RETVAL -ne 0 ]; then
-+ echo "Failed to start SLAPD."
-+ exit $RETVAL
-+ fi
-+
-+ # we need to start nscd service as part of this openldap
-+ # init.d script since SM manages this as a service and both
-+ # daemons should be running on a controller host
-+ systemctl status nscd.service
-+ if [ $? -ne 0 ]; then
-+ echo -n "Starting NSCD: "
-+ systemctl start nscd.service
-+ RETVAL=$?
-+ if [ $RETVAL -ne 0 ]; then
-+ echo "Failed to start NSCD."
-+ exit $RETVAL
-+ fi
-+ fi
-+
-+ echo "."
-+ ;;
-+ stop)
-+ echo -n "Stopping NSCD: "
-+ systemctl stop nscd.service
-+ rm -f /var/run/nscd/nscd.pid
-+
-+ echo -n "Stopping SLAPD: "
-+ start-stop-daemon --retry 60 --stop --oknodo --quiet --pidfile /var/run/slapd.pid
-+ RETVAL=$?
-+ wait_for_proc_stop $slapd 10
-+ WRETVAL=$?
-+ while [ $WRETVAL -eq 1 ]; do
-+ killproc $slapd
-+ wait_for_proc_stop $slapd 10
-+ WRETVAL=$?
-+ done
-+ rm -f /var/run/slapd.pid
-+ echo "."
-+ ;;
-+ status)
-+ status $slapd
-+ [ $? -eq 0 ] || exit $?
-+ systemctl status nscd.service
-+ [ $? -eq 0 ] || exit $?
-+ ;;
-+ restart)
-+ $0 stop
-+ $0 start
-+ ;;
-+ *)
-+ echo "Usage: /etc/init.d/openldap {start|stop|status|restart}"
-+ exit 1
-+esac
-+
-+exit $RETVAL
-diff --git a/stx-openldap-config/slapd.conf b/stx-openldap-config/slapd.conf
-new file mode 100644
-index 000000000..3b6fcc545
---- /dev/null
-+++ b/stx-openldap-config/slapd.conf
-@@ -0,0 +1,117 @@
-+#
-+# See slapd.conf(5) for details on configuration options.
-+# This file should NOT be world readable.
-+#
-+include /etc/openldap/schema/core.schema
-+include /etc/openldap/schema/cosine.schema
-+include /etc/openldap/schema/inetorgperson.schema
-+include /etc/openldap/schema/nis.schema
-+include /etc/openldap/schema/ppolicy.schema
-+include /etc/openldap/schema/sudo.schema
-+
-+# Define global ACLs to disable default read access.
-+
-+# Do not enable referrals until AFTER you have a working directory
-+# service AND an understanding of referrals.
-+#referral ldap://root.openldap.org
-+
-+pidfile /var/run/slapd.pid
-+argsfile /var/run/slapd.args
-+
-+# uniquely identifies this server
-+serverID 001
-+
-+# Load dynamic backend modules:
-+modulepath /usr/libexec/openldap
-+moduleload back_mdb.la
-+moduleload ppolicy.la
-+moduleload syncprov.la
-+
-+# Sample security restrictions
-+# Require integrity protection (prevent hijacking)
-+# Require 112-bit (3DES or better) encryption for updates
-+# Require 63-bit encryption for simple bind
-+# security ssf=1 update_ssf=112 simple_bind=64
-+
-+# Sample access control policy:
-+# Root DSE: allow anyone to read it
-+# Subschema (sub)entry DSE: allow anyone to read it
-+# Other DSEs:
-+# Allow self write access
-+# Allow authenticated users read access
-+# Allow anonymous users to authenticate
-+# Directives needed to implement policy:
-+#access to dn.base="" by * read
-+#access to dn.base="cn=Subschema" by * read
-+#access to *
-+# by self write
-+# by anonymous auth
-+# by * read
-+#
-+# if no access controls are present, the default policy
-+# allows anyone and everyone to read anything but restricts
-+# updates to rootdn. (e.g., "access to * by * read")
-+#
-+# rootdn can always read and write EVERYTHING!
-+
-+#######################################################################
-+# BDB database definitions
-+#######################################################################
-+
-+database mdb
-+suffix "dc=cgcs,dc=local"
-+rootdn "cn=ldapadmin,dc=cgcs,dc=local"
-+# Cleartext passwords, especially for the rootdn, should
-+# be avoid. See slappasswd(8) and slapd.conf(5) for details.
-+# Use of strong authentication encouraged.
-+rootpw _LDAPADMIN_PW_
-+# The database directory MUST exist prior to running slapd AND
-+# should only be accessible by the slapd and slap tools.
-+# Mode 700 recommended.
-+directory /var/lib/openldap-data
-+# Maximum size
-+maxsize 1073741824
-+# Indices to maintain
-+index cn eq
-+index objectClass eq
-+index uid eq,pres,sub
-+index uidNumber eq
-+index gidNumber eq
-+index memberUid eq
-+index sudoUser eq,sub
-+
-+access to *
-+ by self write
-+ by * read
-+
-+loglevel none
-+
-+overlay ppolicy
-+ppolicy_default "cn=default,ou=policies,dc=cgcs,dc=local"
-+ppolicy_use_lockout
-+
-+# NOTE:
-+# syncrepl directives for each of the other masters
-+syncrepl rid=000
-+ provider=ldap://controller-1
-+ type=refreshAndPersist
-+ retry="5 5 300 +"
-+ searchbase="dc=cgcs,dc=local"
-+ attrs="*,+"
-+ bindmethod=simple
-+ binddn="cn=ldapadmin,dc=cgcs,dc=local"
-+ credentials=_LDAPADMIN_PW_
-+
-+# syncprov specific indexing (add others as required)
-+index entryCSN eq
-+index entryUUID eq
-+# ...
-+# # mirror mode essential to allow writes
-+# # and must appear after all syncrepl directives
-+mirrormode TRUE
-+#
-+# # define the provider to use the syncprov overlay
-+# # (last directives in database section)
-+overlay syncprov
-+# # contextCSN saved to database every 100 updates or ten minutes
-+syncprov-checkpoint 1 1
-diff --git a/stx-openldap-config/slapd.service b/stx-openldap-config/slapd.service
-new file mode 100644
-index 000000000..24b39380a
---- /dev/null
-+++ b/stx-openldap-config/slapd.service
-@@ -0,0 +1,23 @@
-+[Unit]
-+Description=OpenLDAP Server Daemon
-+Before=rsyncd.service
-+After=network.target syslog-ng.target
-+Documentation=man:slapd
-+Documentation=man:slapd-config
-+Documentation=man:slapd-hdb
-+Documentation=man:slapd-mdb
-+Documentation=file:///usr/share/doc/openldap-servers/guide.html
-+
-+[Service]
-+Type=forking
-+PIDFile=/var/run/slapd.pid
-+Environment="SLAPD_URLS=ldap:/// ldapi:///" "SLAPD_OPTIONS="
-+EnvironmentFile=/etc/sysconfig/slapd
-+ExecStartPre=/usr/libexec/openldap/check-config.sh
-+ExecStart=/etc/init.d/openldap start
-+ExecStop=/etc/init.d/openldap stop
-+ExecReload=/etc/init.d/openldap restart
-+RemainAfterExit=yes
-+
-+[Install]
-+WantedBy=multi-user.target
-diff --git a/stx-openldap-config/slapd.sysconfig b/stx-openldap-config/slapd.sysconfig
-new file mode 100644
-index 000000000..573486da4
---- /dev/null
-+++ b/stx-openldap-config/slapd.sysconfig
-@@ -0,0 +1,15 @@
-+# OpenLDAP server configuration
-+# see 'man slapd' for additional information
-+
-+# Where the server will run (-h option)
-+# - ldapi:/// is required for on-the-fly configuration using client tools
-+# (use SASL with EXTERNAL mechanism for authentication)
-+# - default: ldapi:/// ldap:///
-+# - example: ldapi:/// ldap://127.0.0.1/ ldap://10.0.0.1:1389/ ldaps:///
-+SLAPD_URLS="ldapi:/// ldap:///"
-+
-+# Any custom options
-+SLAPD_OPTIONS=""
-+
-+# Keytab location for GSSAPI Kerberos authentication
-+#KRB5_KTNAME="FILE:/etc/openldap/ldap.keytab"
---
-2.17.1
-
+++ /dev/null
-From 35907952c646b971ba5b14002db2aac8d2324f21 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:30:27 -0800
-Subject: [PATCH 02/20] Correct log levels in ppolicy overlay
-
-From STX 1901 openldap-ppolicy-loglevels.patch
----
- servers/slapd/overlays/ppolicy.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
-index 7d26b73..3f41e27 100644
---- a/servers/slapd/overlays/ppolicy.c
-+++ b/servers/slapd/overlays/ppolicy.c
-@@ -685,7 +685,7 @@ check_password_quality( struct berval *cred, PassPolicy *pp, LDAPPasswordPolicyE
- if ((mod = lt_dlopen( pp->pwdCheckModule )) == NULL) {
- err = lt_dlerror();
-
-- Debug(LDAP_DEBUG_ANY,
-+ Log3(LDAP_DEBUG_ANY, LDAP_LEVEL_WARNING,
- "check_password_quality: lt_dlopen failed: (%s) %s.\n",
- pp->pwdCheckModule, err, 0 );
- ok = LDAP_OTHER; /* internal error */
-@@ -700,7 +700,7 @@ check_password_quality( struct berval *cred, PassPolicy *pp, LDAPPasswordPolicyE
- if ((prog = lt_dlsym( mod, "check_password" )) == NULL) {
- err = lt_dlerror();
-
-- Debug(LDAP_DEBUG_ANY,
-+ Log3(LDAP_DEBUG_ANY, LDAP_LEVEL_WARNING,
- "check_password_quality: lt_dlsym failed: (%s) %s.\n",
- pp->pwdCheckModule, err, 0 );
- ok = LDAP_OTHER;
-@@ -709,7 +709,7 @@ check_password_quality( struct berval *cred, PassPolicy *pp, LDAPPasswordPolicyE
- ok = prog( ptr, txt, e );
- ldap_pvt_thread_mutex_unlock( &chk_syntax_mutex );
- if (ok != LDAP_SUCCESS) {
-- Debug(LDAP_DEBUG_ANY,
-+ Log3(LDAP_DEBUG_ANY, LDAP_LEVEL_WARNING,
- "check_password_quality: module error: (%s) %s.[%d]\n",
- pp->pwdCheckModule, *txt ? *txt : "", ok );
- }
---
-2.17.1
-
+++ /dev/null
-From 15b7c5ebcbb607cd2edc2119dfefd16b41cddc21 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:32:09 -0800
-Subject: [PATCH 03/20] Removes unnecessary linking of SQL Libs into slad.
-
-This makes openldap-servers package independent of libodbc (SQL
-backend is packaged separately in openldap-servers-sql.)
-
-From STX openldap-sql-linking.patch
----
- build/top.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/top.mk b/build/top.mk
-index 3b9e202..4364187 100644
---- a/build/top.mk
-+++ b/build/top.mk
-@@ -201,7 +201,7 @@ SLAPD_SQL_LDFLAGS = @SLAPD_SQL_LDFLAGS@
- SLAPD_SQL_INCLUDES = @SLAPD_SQL_INCLUDES@
- SLAPD_SQL_LIBS = @SLAPD_SQL_LIBS@
-
--SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@ $(ICU_LIBS)
-+SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@ $(ICU_LIBS)
-
- # Our Defaults
- CC = $(AC_CC)
---
-2.17.1
-
+++ /dev/null
-From df22708bcbe727570daada3fbf8065a447444716 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:34:19 -0800
-Subject: [PATCH 04/20] openlap reentrant gethostby
-
-The non-reentrant gethostbyXXXX() functions deadlock if called recursively, for
-example if libldap needs to be initialized from within gethostbyXXXX() (which
-actually happens if nss_ldap is used for hostname resolution and earlier
-modules can't resolve the local host name), so use the reentrant versions of
-the functions, even if we're not being compiled for use in libldap_r
-
-From STX openldap-reentrant-gethostby.patch
----
- libraries/libldap/util-int.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
-index e65db0c..0628951 100644
---- a/libraries/libldap/util-int.c
-+++ b/libraries/libldap/util-int.c
-@@ -52,8 +52,8 @@ extern int h_errno;
- #ifndef LDAP_R_COMPILE
- # undef HAVE_REENTRANT_FUNCTIONS
- # undef HAVE_CTIME_R
--# undef HAVE_GETHOSTBYNAME_R
--# undef HAVE_GETHOSTBYADDR_R
-+/* # undef HAVE_GETHOSTBYNAME_R */
-+/* # undef HAVE_GETHOSTBYADDR_R */
-
- #else
- # include <ldap_pvt_thread.h>
-@@ -420,7 +420,7 @@ ldap_pvt_csnstr(char *buf, size_t len, unsigned int replica, unsigned int mod)
- #define BUFSTART (1024-32)
- #define BUFMAX (32*1024-32)
-
--#if defined(LDAP_R_COMPILE)
-+#if defined(LDAP_R_COMPILE) || defined(HAVE_GETHOSTBYNAME_R) && defined(HAVE_GETHOSTBYADDR_R)
- static char *safe_realloc( char **buf, int len );
-
- #if !(defined(HAVE_GETHOSTBYNAME_R) && defined(HAVE_GETHOSTBYADDR_R))
---
-2.17.1
-
+++ /dev/null
-From 75e89e30c2ef819169b5f77b0ac8d450271f516b Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:35:23 -0800
-Subject: [PATCH 05/20] openldap smbk5pwd overlay
-
-Compile smbk5pwd together with other overlays.
-
-From STX: openldap-smbk5pwd-overlay.patch
----
- contrib/slapd-modules/smbk5pwd/README | 5 +++++
- servers/slapd/overlays/Makefile.in | 11 +++++++++--
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/slapd-modules/smbk5pwd/README b/contrib/slapd-modules/smbk5pwd/README
-index a7ef2ce..6780f9e 100644
---- a/contrib/slapd-modules/smbk5pwd/README
-+++ b/contrib/slapd-modules/smbk5pwd/README
-@@ -1,3 +1,8 @@
-+******************************************************************************
-+Red Hat note: We do not provide Heimdal Kerberos but MIT. Therefore the module
-+is compiled only with Samba features in Fedora and Red Hat Enterprise Linux.
-+******************************************************************************
-+
- This directory contains a slapd overlay, smbk5pwd, that extends the
- PasswordModify Extended Operation to update Kerberos keys and Samba
- password hashes for an LDAP user.
-diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
-index 40b6fa5..e3f415a 100644
---- a/servers/slapd/overlays/Makefile.in
-+++ b/servers/slapd/overlays/Makefile.in
-@@ -33,7 +33,8 @@ SRCS = overlays.c \
- syncprov.c \
- translucent.c \
- unique.c \
-- valsort.c
-+ valsort.c \
-+ smbk5pwd.c
- OBJS = statover.o \
- @SLAPD_STATIC_OVERLAYS@ \
- overlays.o
-@@ -53,7 +54,7 @@ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
- UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
-
- LIBRARY = ../liboverlays.a
--PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@
-+PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@ smbk5pwd.la
-
- XINCPATH = -I.. -I$(srcdir)/..
- XDEFS = $(MODULES_CPPFLAGS)
-@@ -125,6 +126,12 @@ unique.la : unique.lo
- valsort.la : valsort.lo
- $(LTLINK_MOD) -module -o $@ valsort.lo version.lo $(LINK_LIBS)
-
-+smbk5pwd.lo : smbk5pwd.c
-+ $(LTCOMPILE_MOD) -DDO_SAMBA -UHAVE_MOZNSS -DHAVE_OPENSSL $(shell pkg-config openssl --cflags) $<
-+
-+smbk5pwd.la : smbk5pwd.lo
-+ $(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo $(LINK_LIBS) $(shell pkg-config openssl --libs)
-+
- install-local: $(PROGRAMS)
- @if test -n "$?" ; then \
- $(MKDIR) $(DESTDIR)$(moduledir); \
---
-2.17.1
-
+++ /dev/null
-From b7f7a583e8a63b1787c3a98f4c43ccbb6c3e39df Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:36:48 -0800
-Subject: [PATCH 06/20] openldap ldaprc currentdir
-
-From Stx 1901: openldap-ldaprc-currentdir.patch
-
-Disables opening of ldaprc file in current directory.
-Disables opening of ldaprc file in current directory.
-
-Resolves: #38402
-Upstream: ITS #1131
-Author: Henning Schmiedehausen <hps@intermeta.de>
----
- libraries/libldap/init.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
-index 9b877a9..89235f9 100644
---- a/libraries/libldap/init.c
-+++ b/libraries/libldap/init.c
-@@ -352,9 +352,6 @@ static void openldap_ldap_init_w_userconf(const char *file)
- if(path != NULL) {
- LDAP_FREE(path);
- }
--
-- /* try file */
-- openldap_ldap_init_w_conf(file, 1);
- }
-
- static void openldap_ldap_init_w_env(
---
-2.17.1
-
+++ /dev/null
-From c4906ff521df3f1c9fc4a302300fc135447ee40a Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:38:21 -0800
-Subject: [PATCH 07/20] openldap userconfig setgid
-
-From Stx 1901: openldap-userconfig-setgid.patch
-
-Normally, skips reading of user configuration file when running with different effective UID.
-This patch adds the same behavior for GID.
-
-Author: Nalin Dahyabhai <nalin@redhat.com>
----
- libraries/libldap/init.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
-index 89235f9..de16b60 100644
---- a/libraries/libldap/init.c
-+++ b/libraries/libldap/init.c
-@@ -684,7 +684,7 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
- openldap_ldap_init_w_sysconf(LDAP_CONF_FILE);
-
- #ifdef HAVE_GETEUID
-- if ( geteuid() != getuid() )
-+ if ( geteuid() != getuid() || getegid() != getgid() )
- return;
- #endif
-
---
-2.17.1
-
+++ /dev/null
-From ac607279df96d4f29f0778ad2657b1f962b496bb Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:40:33 -0800
-Subject: [PATCH 08/20] openldap allop overlay
-
-From Stx 1901: openldap-allop-overlay.patch
-
-Compile AllOp together with other overlays.
-
-Author: Matus Honek <mhonek@redhat.com>
-Resolves: #990893
----
- servers/slapd/overlays/Makefile.in | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
-index e3f415a..d940560 100644
---- a/servers/slapd/overlays/Makefile.in
-+++ b/servers/slapd/overlays/Makefile.in
-@@ -34,7 +34,8 @@ SRCS = overlays.c \
- translucent.c \
- unique.c \
- valsort.c \
-- smbk5pwd.c
-+ smbk5pwd.c \
-+ allop.c
- OBJS = statover.o \
- @SLAPD_STATIC_OVERLAYS@ \
- overlays.o
-@@ -54,7 +55,7 @@ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
- UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
-
- LIBRARY = ../liboverlays.a
--PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@ smbk5pwd.la
-+PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@ smbk5pwd.la allop.la
-
- XINCPATH = -I.. -I$(srcdir)/..
- XDEFS = $(MODULES_CPPFLAGS)
-@@ -132,6 +133,12 @@ smbk5pwd.lo : smbk5pwd.c
- smbk5pwd.la : smbk5pwd.lo
- $(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo $(LINK_LIBS) $(shell pkg-config openssl --libs)
-
-+allop.lo : allop.c
-+ $(LTCOMPILE_MOD) -DDO_SAMBA -UHAVE_MOZNSS -DHAVE_OPENSSL $(shell pkg-config openssl --cflags) $<
-+
-+allop.la : allop.lo
-+ $(LTLINK_MOD) -module -o $@ allop.lo version.lo $(LINK_LIBS) $(shell pkg-config openssl --libs)
-+
- install-local: $(PROGRAMS)
- @if test -n "$?" ; then \
- $(MKDIR) $(DESTDIR)$(moduledir); \
---
-2.17.1
-
+++ /dev/null
-From d87f33bf42e3ee1ce47ea61fde809fe693eede87 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:42:04 -0800
-Subject: [PATCH 09/20] openldap syncrepl unset tls options
-
-From Stx 1901: openldap-syncrepl-unset-tls-options.patch
-
-allow unsetting of tls_* syncrepl options
-
-Author: Patrick Monnerat <pm@datasphere.ch>
-Upstream ITS: #7042
-Resolves: #734187
----
- libraries/libldap/tls2.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
-index d25c190..46ccefa 100644
---- a/libraries/libldap/tls2.c
-+++ b/libraries/libldap/tls2.c
-@@ -747,27 +747,27 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
- return 0;
- case LDAP_OPT_X_TLS_CACERTFILE:
- if ( lo->ldo_tls_cacertfile ) LDAP_FREE( lo->ldo_tls_cacertfile );
-- lo->ldo_tls_cacertfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+ lo->ldo_tls_cacertfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- return 0;
- case LDAP_OPT_X_TLS_CACERTDIR:
- if ( lo->ldo_tls_cacertdir ) LDAP_FREE( lo->ldo_tls_cacertdir );
-- lo->ldo_tls_cacertdir = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+ lo->ldo_tls_cacertdir = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- return 0;
- case LDAP_OPT_X_TLS_CERTFILE:
- if ( lo->ldo_tls_certfile ) LDAP_FREE( lo->ldo_tls_certfile );
-- lo->ldo_tls_certfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+ lo->ldo_tls_certfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- return 0;
- case LDAP_OPT_X_TLS_KEYFILE:
- if ( lo->ldo_tls_keyfile ) LDAP_FREE( lo->ldo_tls_keyfile );
-- lo->ldo_tls_keyfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+ lo->ldo_tls_keyfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- return 0;
- case LDAP_OPT_X_TLS_DHFILE:
- if ( lo->ldo_tls_dhfile ) LDAP_FREE( lo->ldo_tls_dhfile );
-- lo->ldo_tls_dhfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+ lo->ldo_tls_dhfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- return 0;
- case LDAP_OPT_X_TLS_CRLFILE: /* GnuTLS only */
- if ( lo->ldo_tls_crlfile ) LDAP_FREE( lo->ldo_tls_crlfile );
-- lo->ldo_tls_crlfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+ lo->ldo_tls_crlfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- return 0;
- case LDAP_OPT_X_TLS_REQUIRE_CERT:
- if ( !arg ) return -1;
-@@ -795,7 +795,7 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
- #endif
- case LDAP_OPT_X_TLS_CIPHER_SUITE:
- if ( lo->ldo_tls_ciphersuite ) LDAP_FREE( lo->ldo_tls_ciphersuite );
-- lo->ldo_tls_ciphersuite = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+ lo->ldo_tls_ciphersuite = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- return 0;
-
- case LDAP_OPT_X_TLS_PROTOCOL_MIN:
-@@ -806,7 +806,7 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
- if ( ld != NULL )
- return -1;
- if ( lo->ldo_tls_randfile ) LDAP_FREE (lo->ldo_tls_randfile );
-- lo->ldo_tls_randfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+ lo->ldo_tls_randfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- break;
- case LDAP_OPT_X_TLS_NEWCTX:
- if ( !arg ) return -1;
---
-2.17.1
-
+++ /dev/null
-From 6fcc222021258cf00cef05bdc487c614c33ab371 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:44:05 -0800
-Subject: [PATCH 10/20] openldap ai addrconfig
-
-From stx 1901: openldap-ai-addrconfig.patch
-use AI_ADDRCONFIG if defined in the environment
-
-Author: Jan Vcelak <jvcelak@redhat.com>
-Upstream ITS: #7326
-Resolves: #835013
----
- libraries/libldap/os-ip.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
-index 623dfad..0618900 100644
---- a/libraries/libldap/os-ip.c
-+++ b/libraries/libldap/os-ip.c
-@@ -594,8 +594,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
-
- #if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP )
- memset( &hints, '\0', sizeof(hints) );
--#ifdef USE_AI_ADDRCONFIG /* FIXME: configure test needed */
-- /* Use AI_ADDRCONFIG only on systems where its known to be needed. */
-+#ifdef AI_ADDRCONFIG
- hints.ai_flags = AI_ADDRCONFIG;
- #endif
- hints.ai_family = ldap_int_inet4or6;
---
-2.17.1
-
+++ /dev/null
-From b0b00385bf7564fa39f711f958b90512559f7f70 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:45:27 -0800
-Subject: [PATCH 11/20] openldap switch to t_dlopenadvise to get RTLD_GLOBAL
- set
-
-From-stx-1901: openldap-switch-to-t_dlopenadvise-to-get-RTLD_GLOBAL-set.patch
-
-From: Jan-Marek Glogowski <jan-marek.glogowski@muenchen.de>
-Date: Tue, 18 May 2010 17:47:05 +0200
-Subject: [PATCH] Switch to lt_dlopenadvise() to get RTLD_GLOBAL set.
-
-Proof of concept for fixing http://bugs.debian.org/327585
-(patch ported from freeradius bug http://bugs.debian.org/416266)
-
-Resolves: #960048
----
- servers/slapd/module.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/servers/slapd/module.c b/servers/slapd/module.c
-index 2a8aa0a..994b885 100644
---- a/servers/slapd/module.c
-+++ b/servers/slapd/module.c
-@@ -117,6 +117,20 @@ int module_unload( const char *file_name )
- return -1; /* not found */
- }
-
-+static lt_dlhandle slapd_lt_dlopenext_global( const char *filename )
-+{
-+ lt_dlhandle handle = 0;
-+ lt_dladvise advise;
-+
-+ if (!lt_dladvise_init (&advise) && !lt_dladvise_ext (&advise)
-+ && !lt_dladvise_global (&advise))
-+ handle = lt_dlopenadvise (filename, advise);
-+
-+ lt_dladvise_destroy (&advise);
-+
-+ return handle;
-+}
-+
- int module_load(const char* file_name, int argc, char *argv[])
- {
- module_loaded_t *module;
-@@ -180,7 +194,7 @@ int module_load(const char* file_name, int argc, char *argv[])
- * to calling Debug. This is because Debug is a macro that expands
- * into multiple function calls.
- */
-- if ((module->lib = lt_dlopenext(file)) == NULL) {
-+ if ((module->lib = slapd_lt_dlopenext_global(file)) == NULL) {
- error = lt_dlerror();
- #ifdef HAVE_EBCDIC
- strcpy( ebuf, error );
---
-2.17.1
-
+++ /dev/null
-From b2623b57b79becf707ff1800bfb5153af3f0d1fc Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Wed, 4 Dec 2019 07:58:45 -0800
-Subject: [PATCH 12/12] openldap ldapi sasl
-
-From stx 1901: openldap-ldapi-sasl.patch
----
- libraries/libldap/cyrus.c | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
-index 8a496f990..06a9fdf41 100644
---- a/libraries/libldap/cyrus.c
-+++ b/libraries/libldap/cyrus.c
-@@ -385,6 +385,8 @@ ldap_int_sasl_bind(
- struct berval ccred = BER_BVNULL;
- int saslrc, rc;
- unsigned credlen;
-+ char my_hostname[HOST_NAME_MAX + 1];
-+ int free_saslhost = 0;
-
- Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_bind: %s\n",
- mechs ? mechs : "<null>", 0, 0 );
-@@ -445,14 +447,25 @@ ldap_int_sasl_bind(
-
- /* If we don't need to canonicalize just use the host
- * from the LDAP URI.
-+ * Always use the result of gethostname() for LDAPI.
- */
-- if ( nocanon )
-+ if (ld->ld_defconn->lconn_server->lud_scheme != NULL &&
-+ strcmp("ldapi", ld->ld_defconn->lconn_server->lud_scheme) == 0) {
-+ rc = gethostname(my_hostname, HOST_NAME_MAX + 1);
-+ if (rc == 0) {
-+ saslhost = my_hostname;
-+ } else {
-+ saslhost = "localhost";
-+ }
-+ } else if ( nocanon )
- saslhost = ld->ld_defconn->lconn_server->lud_host;
-- else
-+ else {
- saslhost = ldap_host_connected_to( ld->ld_defconn->lconn_sb,
- "localhost" );
-+ free_saslhost = 1;
-+ }
- rc = ldap_int_sasl_open( ld, ld->ld_defconn, saslhost );
-- if ( !nocanon )
-+ if ( free_saslhost )
- LDAP_FREE( saslhost );
- }
-
---
-2.17.1
-
+++ /dev/null
-From 7cc8c2c22dc6a5999554e64b25f162b3673cd922 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:48:29 -0800
-Subject: [PATCH 13/20] openldap missing unlock in accesslog overlay
-
-From stx 1901: openldap-missing-unlock-in-accesslog-overlay.patch
-A mutex lock might not get unlocked when plausible
-
-In the preceding if-statement a mutex may get locked. This is unlocked on
-'done' label, but not called when plausible. Based on the current code logic
-this seems to not be able to happen, but might when code gets changed at
-some point in time. This patch fixes the issue.
-
-The issue was found by Coverity scan
-http://cov01.lab.eng.brq.redhat.com/covscanhub/waiving/11054/38577/
-
-Author: Matus Honek <mhonek@redhat.com>
-Resolves: #1261003
----
- servers/slapd/overlays/accesslog.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
-index 6162b57..f6d7fc1 100644
---- a/servers/slapd/overlays/accesslog.c
-+++ b/servers/slapd/overlays/accesslog.c
-@@ -1517,7 +1517,7 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
-
- /* ignore these internal reads */
- if (( lo->mask & LOG_OP_READS ) && op->o_do_not_cache ) {
-- return SLAP_CB_CONTINUE;
-+ goto done;
- }
-
- if ( li->li_success && rs->sr_err != LDAP_SUCCESS )
---
-2.17.1
-
+++ /dev/null
-From 1281efe5b451e0fd030406bc68be9d1f9356adc5 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:55:58 -0800
-Subject: [PATCH 14/20] openldap module passwd sha2
-
-From Stx 1901: openldap-module-passwd-sha2.patch
-Include sha2 module
-
-Author: Matus Honek <mhonek@redhat.com>
----
- servers/slapd/overlays/Makefile.in | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
-index d940560..0b3eeb7 100644
---- a/servers/slapd/overlays/Makefile.in
-+++ b/servers/slapd/overlays/Makefile.in
-@@ -35,7 +35,8 @@ SRCS = overlays.c \
- unique.c \
- valsort.c \
- smbk5pwd.c \
-- allop.c
-+ allop.c \
-+ sha2.c slapd-sha2.c
- OBJS = statover.o \
- @SLAPD_STATIC_OVERLAYS@ \
- overlays.o
-@@ -55,7 +56,7 @@ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
- UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
-
- LIBRARY = ../liboverlays.a
--PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@ smbk5pwd.la allop.la
-+PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@ smbk5pwd.la allop.la pw-sha2.la
-
- XINCPATH = -I.. -I$(srcdir)/..
- XDEFS = $(MODULES_CPPFLAGS)
-@@ -139,6 +140,15 @@ allop.lo : allop.c
- allop.la : allop.lo
- $(LTLINK_MOD) -module -o $@ allop.lo version.lo $(LINK_LIBS) $(shell pkg-config openssl --libs)
-
-+sha2.lo : sha2.c
-+ $(LTCOMPILE_MOD) $<
-+
-+slapd-sha2.lo : slapd-sha2.c
-+ $(LTCOMPILE_MOD) $<
-+
-+pw-sha2.la : sha2.lo slapd-sha2.lo
-+ $(LTLINK_MOD) -module -o $@ $? version.lo $(LINK_LIBS)
-+
- install-local: $(PROGRAMS)
- @if test -n "$?" ; then \
- $(MKDIR) $(DESTDIR)$(moduledir); \
---
-2.17.1
-
+++ /dev/null
-From 26c18423ab3b7e9100ea915b175c40ed7345df74 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Wed, 4 Dec 2019 08:03:25 -0800
-Subject: [PATCH] openldap man tls reqcert
-
-From stx 1901: openldap-man-tls-reqcert.patch
-From f7027b3118ea90d616d0ddeeb348f15ba91cd08b
----
- doc/man/man5/ldap.conf.5 | 18 ++++++++----------
- 1 file changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
-index 49f1830a0..313b9c275 100644
---- a/doc/man/man5/ldap.conf.5
-+++ b/doc/man/man5/ldap.conf.5
-@@ -433,8 +433,8 @@ The environment variable RANDFILE can also be used to specify the filename.
- This parameter is ignored with GnuTLS and Mozilla NSS.
- .TP
- .B TLS_REQCERT <level>
--Specifies what checks to perform on server certificates in a TLS session,
--if any. The
-+Specifies what checks to perform on server certificates in a TLS session.
-+The
- .B <level>
- can be specified as one of the following keywords:
- .RS
-@@ -443,19 +443,17 @@ can be specified as one of the following keywords:
- The client will not request or check any server certificate.
- .TP
- .B allow
--The server certificate is requested. If no certificate is provided,
--the session proceeds normally. If a bad certificate is provided, it will
-+The server certificate is requested. If a bad certificate is provided, it will
- be ignored and the session proceeds normally.
- .TP
- .B try
--The server certificate is requested. If no certificate is provided,
--the session proceeds normally. If a bad certificate is provided,
--the session is immediately terminated.
-+The server certificate is requested. If a bad certificate is provided, the
-+session is immediately terminated.
- .TP
- .B demand | hard
--These keywords are equivalent. The server certificate is requested. If no
--certificate is provided, or a bad certificate is provided, the session
--is immediately terminated. This is the default setting.
-+These keywords are equivalent and semantically same as
-+.BR try .
-+This is the default setting.
- .RE
- .TP
- .B TLS_CRLCHECK <level>
---
-2.17.1
-
+++ /dev/null
-From 8196f53139c4d7e6c1cb8508d1a421299f7eaa61 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 15:14:39 -0800
-Subject: [PATCH 16/20] openldap man ldap conf
-
-From Stx 1901: openldap-man-ldap-conf.patch
-
-This patch makes clear what is the actual behavior in RHEL due to bug #38402.
-
-Author: Matus Honek <mhonek@redhat.com>
-Resolves: #1498841
----
- doc/man/man5/ldap.conf.5 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
-index 313b9c2..904bf24 100644
---- a/doc/man/man5/ldap.conf.5
-+++ b/doc/man/man5/ldap.conf.5
-@@ -25,7 +25,7 @@ in their home directory which will be used to override the system-wide
- defaults file.
- The file
- .I ldaprc
--in the current working directory is also used.
-+in the current working directory is \fBNOT\fP used (this differs from upstream).
- .LP
- .LP
- Additional configuration files can be specified using
-@@ -50,7 +50,7 @@ Thus the following files and variables are read, in order:
- .nf
- variable $LDAPNOINIT, and if that is not set:
- system file ETCDIR/ldap.conf,
-- user files $HOME/ldaprc, $HOME/.ldaprc, ./ldaprc,
-+ user files $HOME/ldaprc, $HOME/.ldaprc, (\fBNOT\fP ./ldaprc, see above),
- system file $LDAPCONF,
- user files $HOME/$LDAPRC, $HOME/.$LDAPRC, ./$LDAPRC,
- variables $LDAP<uppercase option name>.
---
-2.17.1
-
+++ /dev/null
-From 4e495a37939a605577c72ed43e1f5a3ab3780611 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 15:16:35 -0800
-Subject: [PATCH 17/20] openldap bdb_idl_fetch_key correct key pointer
-
-From Stx 1901: openldap-bdb_idl_fetch_key-correct-key-pointer.patch
-
-Correct key pointer usage in bdb_idl_fetch_key.
-
-Author: Shogo Matsumoto
-Resolves: #1356165
----
- servers/slapd/back-bdb/idl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/servers/slapd/back-bdb/idl.c b/servers/slapd/back-bdb/idl.c
-index 3e0d7a6..7dae9ff 100644
---- a/servers/slapd/back-bdb/idl.c
-+++ b/servers/slapd/back-bdb/idl.c
-@@ -626,7 +626,7 @@ bdb_idl_fetch_key(
- BDB_DISK2ID( j, i );
- }
- }
-- rc = cursor->c_get( cursor, key, &data, flags | DB_NEXT_DUP );
-+ rc = cursor->c_get( cursor, kptr, &data, flags | DB_NEXT_DUP );
- }
- if ( rc == DB_NOTFOUND ) rc = 0;
- ids[0] = i - ids;
---
-2.17.1
-
+++ /dev/null
-From 35b08487213749c6da625a446f605b6e7f74d07f Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 15:24:11 -0800
-Subject: [PATCH 18/20] openldap tlsmc
-
-From Stx 1901: openldap-tlsmc.patch
----
- configure.in | 21 +
- doc/man/man3/ldap_get_option.3 | 13 +
- doc/man/man5/ldap.conf.5 | 5 +
- doc/man/man5/slapd-config.5 | 5 +
- doc/man/man5/slapd.conf.5 | 5 +
- include/ldap.h | 4 +
- libraries/libldap/Makefile.in | 4 +-
- libraries/libldap/init.c | 7 +-
- libraries/libldap/ldap-int.h | 3 +-
- libraries/libldap/tls2.c | 47 ++
- libraries/libldap/tls_mc.c | 1369 +++++++++++++++++++++++++++++++
- libraries/libldap/tls_mc.h | 18 +
- libraries/libldap/tls_mc_ossl.c | 95 +++
- libraries/libldap/tls_mc_ossl.h | 12 +
- libraries/libldap_r/Makefile.in | 4 +-
- 15 files changed, 1606 insertions(+), 6 deletions(-)
- create mode 100644 libraries/libldap/tls_mc.c
- create mode 100644 libraries/libldap/tls_mc.h
- create mode 100644 libraries/libldap/tls_mc_ossl.c
- create mode 100644 libraries/libldap/tls_mc_ossl.h
-
-diff --git a/configure.in b/configure.in
-index caa49a1..949a1b2 100644
---- a/configure.in
-+++ b/configure.in
-@@ -237,6 +237,7 @@ dnl OL_ARG_ENABLE(referrals,[ --enable-referrals enable LDAPv2+ Referrals (ex
- ol_enable_referrals=${ol_enable_referrals-no}
- OL_ARG_ENABLE(ipv6,[ --enable-ipv6 enable IPv6 support], auto)dnl
- OL_ARG_ENABLE(local,[ --enable-local enable AF_LOCAL (AF_UNIX) socket support], auto)dnl
-+OL_ARG_ENABLE(moznss_compatibility,[ --enable-moznss-compatibility enable MozNSS compatibility], no)dnl
-
- dnl ----------------------------------------------------------------
- dnl General "with" options
-@@ -1256,6 +1257,26 @@ if test $ol_link_tls = no ; then
- fi
- fi
-
-+if test $ol_enable_moznss_compatibility = yes ; then
-+ if test $have_openssl = yes ; then
-+ if test $ol_with_tls = openssl ; then
-+ PKG_CHECK_MODULES(MOZNSS, [nss nspr], [have_moznss_libs=yes], [have_moznss_libs=no])
-+ if test $have_moznss_libs = yes ; then
-+ AC_DEFINE(HAVE_MOZNSS_COMPATIBILITY, 1,
-+ [define if you want to support MozNSS databases when compiled with OpenSSL])
-+ TLS_LIBS="$TLS_LIBS $MOZNSS_LIBS"
-+ CFLAGS="$CFLAGS $MOZNSS_CFLAGS"
-+ else
-+ AC_MSG_ERROR([For MOZNSS_COMPATIBILITY you have to have MozNSS present.])
-+ fi
-+ else
-+ AC_MSG_ERROR([For MOZNSS_COMPATIBILITY you have to compile with OpenSSL for crypto. (see --with-tls flag)])
-+ fi
-+ else
-+ AC_MSG_ERROR([For MOZNSS_COMPATIBILITY you have to have OpenSSL devel available. (unable to build with OpenSSL)])
-+ fi
-+fi
-+
- WITH_TLS=no
- if test $ol_link_tls = yes ; then
- AC_DEFINE(HAVE_TLS, 1, [define if you have TLS])
-diff --git a/doc/man/man3/ldap_get_option.3 b/doc/man/man3/ldap_get_option.3
-index af5ede1..e4cf843 100644
---- a/doc/man/man3/ldap_get_option.3
-+++ b/doc/man/man3/ldap_get_option.3
-@@ -772,6 +772,19 @@ must be
- When using the OpenSSL library this is an SSL*. When using other
- crypto libraries this is a pointer to an OpenLDAP private structure.
- Applications generally should not use this option.
-+.TP
-+.B LDAP_OPT_X_TLS_MOZNSS_COMPATIBILITY
-+Sets/gets the status of the MozNSS database compatibility layer for TLS options. This options is available only if OpenLDAP is compiled with OpenSSL. This has effect only before the TLS context is established.
-+This option defaults to be on.
-+.BR invalue
-+should either be
-+.BR LDAP_OPT_OFF
-+or
-+.BR LDAP_OPT_ON ;
-+.BR outvalue
-+must be
-+.BR "int *" .
-+When set, just before TLS context initialization the library will first check if TLS settings are MozNSS-specific and if so it will export certificates from a preconfigured database and set other TLS settings so that OpenSSL can continue without issues.
- .SH ERRORS
- On success, the functions return
- .BR LDAP_OPT_SUCCESS ,
-diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
-index 904bf24..24c0155 100644
---- a/doc/man/man5/ldap.conf.5
-+++ b/doc/man/man5/ldap.conf.5
-@@ -480,6 +480,11 @@ Check the CRL for a whole certificate chain
- Specifies the file containing a Certificate Revocation List to be used
- to verify if the server certificates have not been revoked. This
- parameter is only supported with GnuTLS and Mozilla NSS.
-+.RE
-+.TP
-+.B TLS_MOZNSS_COMPATIBILITY <on/true/yes/off/false/no>
-+Specifies whether the MozNSS database compatibility layer for TLS options should be enabled. This options is available only if OpenLDAP is compiled with OpenSSL.
-+This option defaults to be on.
- .SH "ENVIRONMENT VARIABLES"
- .TP
- LDAPNOINIT
-diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
-index 9c72e82..42032d4 100644
---- a/doc/man/man5/slapd-config.5
-+++ b/doc/man/man5/slapd-config.5
-@@ -1004,6 +1004,11 @@ Check the CRL for a whole certificate chain
- Specifies a file containing a Certificate Revocation List to be used
- for verifying that certificates have not been revoked. This parameter
- is only valid when using GnuTLS or Mozilla NSS.
-+.RE
-+.TP
-+.B olcTLSMozNSSCompatibility <on/true/yes/off/false/no>
-+Specifies whether the MozNSS database compatibility layer for TLS options should be enabled. This options is available only if OpenLDAP is compiled with OpenSSL.
-+This option defaults to be on.
- .SH DYNAMIC MODULE OPTIONS
- If
- .B slapd
-diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
-index f504adc..2d4431f 100644
---- a/doc/man/man5/slapd.conf.5
-+++ b/doc/man/man5/slapd.conf.5
-@@ -1235,6 +1235,11 @@ Check the CRL for a whole certificate chain
- Specifies a file containing a Certificate Revocation List to be used
- for verifying that certificates have not been revoked. This directive is
- only valid when using GnuTLS and Mozilla NSS.
-+.RE
-+.TP
-+.B TLSMozNSSCompatibility <on/true/yes/off/false/no>
-+Specifies whether the MozNSS database compatibility layer for TLS options should be enabled. This options is available only if OpenLDAP is compiled with OpenSSL.
-+This option defaults to be on.
- .SH GENERAL BACKEND OPTIONS
- Options in this section only apply to the configuration file section
- for the specified backend. They are supported by every
-diff --git a/include/ldap.h b/include/ldap.h
-index c245651..7bc0644 100644
---- a/include/ldap.h
-+++ b/include/ldap.h
-@@ -158,6 +158,10 @@ LDAP_BEGIN_DECL
- #define LDAP_OPT_X_TLS_NEWCTX 0x600f
- #define LDAP_OPT_X_TLS_CRLFILE 0x6010 /* GNUtls only */
- #define LDAP_OPT_X_TLS_PACKAGE 0x6011
-+#define LDAP_OPT_X_TLS_MOZNSS_COMPATIBILITY 0x6050
-+
-+#define LDAP_OPT_X_TLS_MOZNSS_COMPATIBILITY_DISABLED 0
-+#define LDAP_OPT_X_TLS_MOZNSS_COMPATIBILITY_ENABLED 1
-
- #define LDAP_OPT_X_TLS_NEVER 0
- #define LDAP_OPT_X_TLS_HARD 1
-diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
-index 58d9cc7..80b81f0 100644
---- a/libraries/libldap/Makefile.in
-+++ b/libraries/libldap/Makefile.in
-@@ -26,7 +26,7 @@ SRCS = bind.c open.c result.c error.c compare.c search.c \
- request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \
- init.c options.c print.c string.c util-int.c schema.c \
- charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
-- tls2.c tls_o.c tls_g.c tls_m.c \
-+ tls2.c tls_o.c tls_g.c tls_m.c tls_mc.c tls_mc_ossl.c \
- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
- assertion.c deref.c ldif.c fetch.c
-
-@@ -39,7 +39,7 @@ OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
- request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
- init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
-- tls2.lo tls_o.lo tls_g.lo tls_m.lo \
-+ tls2.lo tls_o.lo tls_g.lo tls_m.lo tls_mc.lo tls_mc_ossl.lo \
- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
- assertion.lo deref.lo ldif.lo fetch.lo
-
-diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
-index de16b60..d016bdc 100644
---- a/libraries/libldap/init.c
-+++ b/libraries/libldap/init.c
-@@ -137,7 +137,9 @@ static const struct ol_attribute {
- #ifdef HAVE_GNUTLS
- {0, ATTR_TLS, "TLS_CRLFILE", NULL, LDAP_OPT_X_TLS_CRLFILE},
- #endif
--
-+#ifdef HAVE_MOZNSS_COMPATIBILITY
-+ {0, ATTR_TLS, "TLS_MOZNSS_COMPATIBILITY", NULL, LDAP_OPT_X_TLS_MOZNSS_COMPATIBILITY},
-+#endif
- #endif
-
- {0, ATTR_NONE, NULL, NULL, 0}
-@@ -579,6 +581,9 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl
- gopts->ldo_tls_connect_cb = NULL;
- gopts->ldo_tls_connect_arg = NULL;
- gopts->ldo_tls_require_cert = LDAP_OPT_X_TLS_DEMAND;
-+#ifdef HAVE_MOZNSS_COMPATIBILITY
-+ gopts->ldo_tls_moznss_compatibility = LDAP_OPT_X_TLS_MOZNSS_COMPATIBILITY_ENABLED;
-+#endif
- #endif
- gopts->ldo_keepalive_probes = 0;
- gopts->ldo_keepalive_interval = 0;
-diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
-index 66e04ae..15092c1 100644
---- a/libraries/libldap/ldap-int.h
-+++ b/libraries/libldap/ldap-int.h
-@@ -260,7 +260,8 @@ struct ldapoptions {
- int ldo_tls_require_cert;
- int ldo_tls_impl;
- int ldo_tls_crlcheck;
--#define LDAP_LDO_TLS_NULLARG ,0,0,0,{0,0,0,0,0,0,0,0,0},0,0,0,0
-+ int ldo_tls_moznss_compatibility;
-+#define LDAP_LDO_TLS_NULLARG ,0,0,0,{0,0,0,0,0,0,0,0,0},0,0,0,0,0
- #else
- #define LDAP_LDO_TLS_NULLARG
- #endif
-diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
-index 46ccefa..198d0b1 100644
---- a/libraries/libldap/tls2.c
-+++ b/libraries/libldap/tls2.c
-@@ -37,6 +37,8 @@
-
- #include "ldap-tls.h"
-
-+#include "tls_mc.h"
-+
- static tls_impl *tls_imp = &ldap_int_tls_impl;
- #define HAS_TLS( sb ) ber_sockbuf_ctrl( sb, LBER_SB_OPT_HAS_IO, \
- (void *)tls_imp->ti_sbio )
-@@ -96,6 +98,7 @@ tls_ctx_ref( tls_ctx *ctx )
- * an extra mutex for the default ctx.
- */
- static ldap_pvt_thread_mutex_t tls_def_ctx_mutex;
-+ldap_pvt_thread_mutex_t tlsmc_mutex;
- #endif
-
- void
-@@ -161,6 +164,7 @@ tls_init(tls_impl *impl )
- if ( !tls_initialized++ ) {
- #ifdef LDAP_R_COMPILE
- ldap_pvt_thread_mutex_init( &tls_def_ctx_mutex );
-+ ldap_pvt_thread_mutex_init( &tlsmc_mutex );
- #endif
- }
-
-@@ -196,6 +200,27 @@ ldap_int_tls_init_ctx( struct ldapoptions *lo, int is_server )
-
- tls_init( ti );
-
-+#ifdef HAVE_MOZNSS_COMPATIBILITY
-+ if ( LDAP_OPT_X_TLS_MOZNSS_COMPATIBILITY_ENABLED == lo->ldo_tls_moznss_compatibility ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "TLSMC: MozNSS compatibility interception begins.\n",
-+ 0, 0, 0 );
-+ if ( 0 == tlsmc_intercept_initialization( lo, is_server ) ) {
-+ Debug( LDAP_DEBUG_TRACE,
-+ "TLSMC: ERROR: MozNSS compatibility layer failed.\n",
-+ 0, 0, 0 );
-+ }
-+ lts = lo->ldo_tls_info;
-+ Debug( LDAP_DEBUG_ANY,
-+ "TLSMC: MozNSS compatibility interception ends.\n",
-+ 0, 0, 0 );
-+ } else {
-+ Debug( LDAP_DEBUG_TRACE,
-+ "TLS: MozNSS compatibility layer disabled.\n",
-+ 0, 0, 0 );
-+ }
-+#endif
-+
- if ( is_server && !lts.lt_certfile && !lts.lt_keyfile &&
- !lts.lt_cacertfile && !lts.lt_cacertdir ) {
- /* minimum configuration not provided */
-@@ -584,6 +609,21 @@ ldap_int_tls_config( LDAP *ld, int option, const char *arg )
- return ldap_pvt_tls_set_option( ld, option, &i );
- }
- return -1;
-+#endif
-+#ifdef HAVE_MOZNSS_COMPATIBILITY
-+ case LDAP_OPT_X_TLS_MOZNSS_COMPATIBILITY:
-+ i = -1;
-+ if ( (strcasecmp( arg, "yes" ) == 0) ||
-+ (strcasecmp( arg, "true" ) == 0) ||
-+ (strcasecmp( arg, "on" ) == 0) ) {
-+ i = LDAP_OPT_X_TLS_MOZNSS_COMPATIBILITY_ENABLED;
-+ }
-+ if ( (strcasecmp( arg, "no" ) == 0) ||
-+ (strcasecmp( arg, "false" ) == 0) ||
-+ (strcasecmp( arg, "off" ) == 0) ) {
-+ i = LDAP_OPT_X_TLS_MOZNSS_COMPATIBILITY_DISABLED;
-+ }
-+ return ldap_pvt_tls_set_option( ld, option, &i );
- #endif
- }
- return -1;
-@@ -687,6 +727,9 @@ ldap_pvt_tls_get_option( LDAP *ld, int option, void *arg )
- case LDAP_OPT_X_TLS_CONNECT_ARG:
- *(void **)arg = lo->ldo_tls_connect_arg;
- break;
-+ case LDAP_OPT_X_TLS_MOZNSS_COMPATIBILITY:
-+ *(int *)arg = lo->ldo_tls_moznss_compatibility;
-+ break;
- default:
- return -1;
- }
-@@ -814,6 +857,10 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
- ldap_pvt_tls_ctx_free( lo->ldo_tls_ctx );
- lo->ldo_tls_ctx = NULL;
- return ldap_int_tls_init_ctx( lo, *(int *)arg );
-+ case LDAP_OPT_X_TLS_MOZNSS_COMPATIBILITY:
-+ if ( !arg ) return -1;
-+ lo->ldo_tls_moznss_compatibility = *(int *)arg;
-+ break;
- default:
- return -1;
- }
-diff --git a/libraries/libldap/tls_mc.c b/libraries/libldap/tls_mc.c
-new file mode 100644
-index 0000000..7ba2a07
---- /dev/null
-+++ b/libraries/libldap/tls_mc.c
-@@ -0,0 +1,1369 @@
-+#include "portable.h"
-+
-+#ifdef HAVE_MOZNSS_COMPATIBILITY
-+
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#include <ac/unistd.h>
-+#include <ac/errno.h>
-+#include <ac/termios.h>
-+#include <fcntl.h>
-+#include <dirent.h>
-+
-+#include <nspr/nspr.h>
-+#include <nspr/private/pprio.h>
-+
-+#include <nss/nss.h>
-+#include <nss/pk11pub.h>
-+#include <nss/cert.h>
-+
-+#include <nss/base64.h>
-+#include <nss/key.h>
-+#include <nss/keyt.h>
-+#include <nss/blapi.h>
-+#include <nss/certdb.h>
-+
-+#include "ldap-int.h"
-+#include "ldap-tls.h"
-+#include "ldap_pvt_thread.h"
-+
-+#include "tls_mc.h"
-+#include "tls_mc_ossl.h"
-+
-+#define TLSMC_CHECKSUM_LEN 32
-+
-+#define TLSMC_CACERTS_DIR_NAME "cacerts"
-+#define TLSMC_CERT_FILE_NAME "cert.pem"
-+#define TLSMC_KEY_FILE_NAME "key.pem"
-+#define TLSMC_README_FILE_NAME "README"
-+
-+#define TLSM_CERTDB_DESC "ldap"
-+#define DEFAULT_TOKEN_NAME "default"
-+
-+#define TLSMC_IS_INPLACE 1
-+#define TLSMC_IS_TEMPORARY 2
-+
-+#define DONOTEDIT \
-+ "This file is auto-generated by the MozNSS Compatibility Layer of OpenLDAP software.\n" \
-+ "This layer is not part of the OpenLDAP software distributed in upstream.\n" \
-+ "Please file any related bugs with your GNU/Linux distribution.\n" \
-+ "Do not edit contents of this directory structure directly. Rather, change your configuration to use the OpenSSL-style TLS options, so that this directory structure does not need to be generated anymore.\n" \
-+ "Please refer to the slapd.conf(5), slapd-config(5), and ldap.conf(5) man pages for more information."
-+#define PEM_CERT_HEADER "-----BEGIN CERTIFICATE-----"
-+#define PEM_CERT_FOOTER "-----END CERTIFICATE-----"
-+#define PEM_KEY_HEADER "-----BEGIN PRIVATE KEY-----"
-+#define PEM_KEY_FOOTER "-----END PRIVATE KEY-----"
-+#define README_HEADER "The contents of this file are hashed and used as part of the name of the parent directory.\n"
-+
-+#ifdef LDAP_R_COMPILE
-+ldap_pvt_thread_mutex_t tlsmc_mutex;
-+#endif
-+/*******************************************************************/
-+
-+
-+char *
-+tlsmc_path2name( char *path )
-+{
-+ if ( NULL == path ) return NULL;
-+ char *last_slash = strrchr( path, '/' );
-+ if ( NULL == last_slash )
-+ return path;
-+ else
-+ return last_slash + 1;
-+}
-+
-+
-+int
-+tlsmc_write_file( char *filename, char *buf, mode_t final_mode )
-+{
-+ int rv = 0;
-+ int fd = -1;
-+ if ( 0 > ( fd = open( filename, O_WRONLY | O_CREAT | O_EXCL, S_IWUSR ) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_write_file: ERROR: could not open file: `%s': %s.\n",
-+ filename, strerror(errno), 0 );
-+ goto bail;
-+ }
-+ if ( -1 >= write( fd, buf, strlen(buf) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_write_file: ERROR: could not write file: `%s': %s.\n",
-+ filename, strerror(errno), 0 );
-+ goto bail;
-+ }
-+ if ( -1 >= fchmod( fd, final_mode ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_write_file: ERROR: could not set file mode: `%s': %s.\n",
-+ filename, strerror(errno), 0 );
-+ goto bail;
-+ }
-+ if ( -1 >= fsync( fd ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_write_file: ERROR: could not fsync file: `%s': %s.\n",
-+ filename, strerror(errno), 0 );
-+ goto bail;
-+ }
-+ if ( 0 > close( fd ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_write_file: ERROR: could not close file: `%s': %s.\n",
-+ filename, strerror(errno), 0 );
-+ fd = -1;
-+ goto bail;
-+ }
-+ fd = -1;
-+ rv = 1;
-+bail:
-+ if ( fd > -1 ) close( fd );
-+ return rv;
-+}
-+
-+
-+static int
-+tlsmc_remove_dir_recursively( const char *dir_name )
-+{
-+ int rv = 0;
-+ DIR *dir = NULL;
-+ struct dirent *entry = NULL;
-+ char *full_path = NULL;
-+
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_remove_dir_recursively: INFO: starting recursively removing directory `%s'.\n",
-+ dir_name, 0, 0 );
-+ if ( NULL == ( dir = opendir( dir_name ) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_remove_dir_recursively: ERROR: could not open the directory (errno %d: %s).\n",
-+ errno, strerror( errno ), 0 );
-+ goto bail;
-+ }
-+
-+ while ( NULL != ( entry = readdir( dir ) ) ) {
-+ struct stat info;
-+
-+ full_path = NULL;
-+ full_path = PR_smprintf( "%s/%s", dir_name, entry->d_name );
-+
-+ if ( 0 != strcmp( entry->d_name, "." ) && 0 != strcmp( entry->d_name, ".." ) ) {
-+ if ( 0 == lstat( full_path, &info ) ) {
-+ if ( S_ISDIR( info.st_mode ) ) {
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_remove_dir_recursively: INFO: stepping into directory `%s'.\n",
-+ entry->d_name, 0, 0 );
-+ if ( 0 == tlsmc_remove_dir_recursively( full_path ) ) {
-+ goto bail_and_close_dir;
-+ }
-+ } else {
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_remove_dir_recursively: INFO: removing file `%s'.\n",
-+ entry->d_name, 0, 0 );
-+ if ( 0 != remove( full_path ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_remove_dir_recursively: ERROR: could not remove the file (errno %d: %s).\n",
-+ errno, strerror( errno ), 0 );
-+ goto bail_and_close_dir;
-+ }
-+ }
-+ } else {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_remove_dir_recursively: ERROR: could not stat `%s', (errno %d: %s).\n",
-+ full_path, errno, strerror( errno ) );
-+ goto bail_and_close_dir;
-+ }
-+ }
-+
-+ if ( full_path ) {
-+ PR_smprintf_free( full_path );
-+ full_path = NULL;
-+ }
-+
-+ }
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_remove_dir_recursively: INFO: stepping out of the directory.\n",
-+ 0, 0, 0 );
-+ if ( 0 != closedir( dir ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_remove_dir_recursively: WARN: could not close the directory (errno %d: %s).\n",
-+ errno, strerror( errno ), 0 );
-+ goto bail;
-+ }
-+
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_remove_dir_recursively: INFO: removing the directory itself.\n",
-+ 0, 0, 0 );
-+ if ( 0 != remove( dir_name ) ) {
-+ PRErrorCode errcode = PR_GetError();
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_remove_dir_recursively: ERROR: could not remove the directory (errno %d: %s).\n",
-+ errno, strerror( errno ), 0 );
-+ goto bail;
-+ }
-+
-+ rv = 1;
-+ goto bail;
-+bail_and_close_dir:
-+ closedir( dir );
-+bail:
-+ if ( full_path ) PR_smprintf_free( full_path );
-+ return rv;
-+}
-+
-+
-+/* BORROWED FROM tls_m.c */
-+static void
-+tlsmc_get_certdb_prefix( const char *certdir, char **nsscertdir, char **realcertdir, char **prefix )
-+{
-+ char sep = PR_GetDirectorySeparator();
-+ char *ptr = NULL;
-+ char *chkpath = NULL;
-+ struct PRFileInfo prfi;
-+ PRStatus prc;
-+
-+ *realcertdir = (char *)certdir; /* default is the one passed in */
-+
-+ /* if certdir is not given, just return */
-+ if ( !certdir ) return;
-+
-+ *nsscertdir = certdir;
-+
-+ /* ignore database type prefix (e.g. sql:, dbm:) if provided */
-+ if ( NULL != ( chkpath = strchr( certdir, ':' ) ) ) {
-+ *realcertdir = chkpath + 1;
-+ }
-+
-+ /* if certdir exists (file or directory) then it cannot specify a prefix */
-+ prc = PR_GetFileInfo( *realcertdir, &prfi );
-+ if ( prc == PR_SUCCESS ) {
-+ goto finish;
-+ }
-+
-+ /* if certdir was given, and there is a '/' in certdir, see if there
-+ is anything after the last '/' - if so, assume it is the prefix */
-+ /* if ( ( ( ptr = strrchr( *realcertdir, sep ) ) ) && *(ptr + 1) ) { */
-+ /* *realcertdir = PL_strndup( *realcertdir, ptr - (*realcertdir) ); */
-+ /* *prefix = PL_strdup( ptr + 1 ); */
-+ /* } */
-+
-+
-+ if ( ptr = strrchr( *realcertdir, sep ) ) {
-+ if ( *(ptr + 1) ) {
-+ *ptr = '\0';
-+ *prefix = ptr + 1;
-+ } else {
-+ *prefix = *realcertdir + strlen( *realcertdir ); // empty string
-+ }
-+ } else {
-+ *prefix = *realcertdir;
-+ *realcertdir = *prefix + strlen( *prefix ); // empty string
-+ }
-+finish:
-+ /* drop potential last '/' from realcertdir */
-+ do {
-+ ptr = strrchr( *realcertdir, sep );
-+ if ( ptr && (! *(ptr+1) ) ) {
-+ *ptr = '\0';
-+ } else {
-+ break;
-+ }
-+ } while (1);
-+
-+ return;
-+}
-+
-+
-+/* BORROWED FROM tls_m.c */
-+static char *
-+tlsmc_get_pin_from_file(const char *token_name, char *filename)
-+{
-+ char *pwdstr = NULL;
-+ char *contents = NULL;
-+ char *lasts = NULL;
-+ char *line = NULL;
-+ char *candidate = NULL;
-+ PRFileInfo file_info;
-+ PRFileDesc *pwd_fileptr = NULL;
-+ pwd_fileptr = PR_Open( filename, PR_RDONLY, 00400 );
-+
-+ /* open the password file */
-+ if ( !pwd_fileptr ) {
-+ PRErrorCode errcode = PR_GetError();
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_get_pin_from_file: could not open security pin file %s - error %d:%s.\n",
-+ filename, errcode,
-+ PR_ErrorToString( errcode, PR_LANGUAGE_I_DEFAULT ) );
-+ goto done;
-+ }
-+
-+ /* get the file size */
-+ if ( PR_SUCCESS != PR_GetFileInfo( filename, &file_info ) ) {
-+ PRErrorCode errcode = PR_GetError();
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_get_pin_from_file: could not get file info from pin file %s - error %d:%s.\n",
-+ filename, errcode,
-+ PR_ErrorToString( errcode, PR_LANGUAGE_I_DEFAULT ) );
-+ goto done;
-+ }
-+
-+ /* create a buffer to hold the file contents */
-+ if ( !( contents = PR_CALLOC( file_info.size + 1 ) ) ) {
-+ PRErrorCode errcode = PR_GetError();
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_get_pin_from_file: could not alloc a buffer for contents of pin file %s - error %d:%s.\n",
-+ filename, errcode, PR_ErrorToString( errcode, PR_LANGUAGE_I_DEFAULT ) );
-+ goto done;
-+ }
-+
-+ /* read file into the buffer */
-+ if( PR_Read( pwd_fileptr, contents, file_info.size ) <= 0 ) {
-+ PRErrorCode errcode = PR_GetError();
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_get_pin_from_file: could not read the file contents from pin file %s - error %d:%s.\n",
-+ filename, errcode, PR_ErrorToString( errcode, PR_LANGUAGE_I_DEFAULT ) );
-+ goto done;
-+ }
-+
-+ /* format is [tokenname:]password EOL [tokenname:]password EOL ... */
-+ /* if you want to use a password containing a colon character, use
-+ the special tokenname "default" */
-+ for ( line = PL_strtok_r( contents, "\r\n", &lasts ); line;
-+ line = PL_strtok_r( NULL, "\r\n", &lasts ) ) {
-+ char *colon;
-+
-+ if ( !*line ) {
-+ continue; /* skip blank lines */
-+ }
-+ colon = PL_strchr( line, ':' );
-+ if ( colon ) {
-+ if ( *(colon + 1) && token_name &&
-+ !PL_strncmp( token_name, line, colon-line ) ) {
-+ candidate = colon + 1; /* found a definite match */
-+ break;
-+ } else if ( !PL_strncmp( DEFAULT_TOKEN_NAME, line, colon-line ) ) {
-+ candidate = colon + 1; /* found possible match */
-+ }
-+ } else { /* no token name */
-+ candidate = line;
-+ }
-+ }
-+done:
-+ if ( pwd_fileptr ) {
-+ PR_Close( pwd_fileptr );
-+ }
-+ if ( candidate ) {
-+ pwdstr = PL_strdup( candidate );
-+ }
-+ PL_strfree( contents );
-+
-+ return pwdstr;
-+}
-+
-+
-+/* BORROWED FROM tls_m.c */
-+/*
-+ * Turn the echoing off on a tty.
-+ */
-+static void
-+echoOff(int fd)
-+{
-+ if ( isatty( fd ) ) {
-+ struct termios tio;
-+ tcgetattr( fd, &tio );
-+ tio.c_lflag &= ~ECHO;
-+ tcsetattr( fd, TCSAFLUSH, &tio );
-+ }
-+}
-+
-+/* BORROWED FROM tls_m.c */
-+/*
-+ * Turn the echoing on on a tty.
-+ */
-+static void
-+echoOn(int fd)
-+{
-+ if ( isatty( fd ) ) {
-+ struct termios tio;
-+ tcgetattr( fd, &tio );
-+ tio.c_lflag |= ECHO;
-+ tcsetattr( fd, TCSAFLUSH, &tio );
-+ tcsetattr( fd, TCSAFLUSH, &tio );
-+ }
-+}
-+
-+
-+/* BORROWED FROM tls_m.c */
-+char *
-+tlsmc_get_pin( PK11SlotInfo *slot, PRBool retry, void * filename)
-+{
-+ char *token_name = NULL;
-+ char *pwdstr = NULL;
-+
-+ token_name = PK11_GetTokenName( slot );
-+ /* Try to get the passwords from the password file if it exists.
-+ * THIS IS UNSAFE and is provided for convenience only. Without this
-+ * capability the server would have to be started in foreground mode
-+ * if using an encrypted key.
-+ */
-+ if ( filename ) {
-+ fprintf( stderr,
-+ "tlsmc_get_pin: INFO: Please note the extracted key file will not be protected with a PIN any more, however it will be still protected at least by file permissions.\n");
-+ pwdstr = tlsmc_get_pin_from_file( token_name, (char *)filename );
-+ if ( retry && pwdstr != NULL )
-+ return NULL;
-+ }
-+ if ( !pwdstr ) {
-+ int infd = PR_FileDesc2NativeHandle( PR_STDIN );
-+ int isTTY = isatty( infd );
-+ unsigned char phrase[200];
-+ /* Prompt for password */
-+ if ( isTTY ) {
-+ fprintf( stderr,
-+ "tlsmc_get_pin: INFO: Please note the extracted key file will not be protected with a PIN any more, however it will be still protected at least by file permissions.\n");
-+ fprintf( stdout,
-+ "Please enter pin, password, or pass phrase for security token '%s': ",
-+ token_name ? token_name : DEFAULT_TOKEN_NAME );
-+ echoOff( infd );
-+ }
-+ fgets( (char*)phrase, sizeof(phrase), stdin );
-+ if ( isTTY ) {
-+ fprintf( stdout, "\n" );
-+ echoOn( infd );
-+ }
-+ /* stomp on newline */
-+ phrase[strlen((char*)phrase)-1] = 0;
-+
-+ pwdstr = PL_strdup( (char*)phrase );
-+ }
-+
-+ return pwdstr;
-+}
-+
-+
-+int
-+tlsmc_hash( char **dest, const char *src )
-+{
-+ int rv = 0;
-+ unsigned char fp[SHA256_LENGTH];
-+ SECItem fpItem;
-+
-+ if ( SECSuccess != ( rv = PK11_HashBuf( SEC_OID_SHA256, fp, src, strlen(src) ) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_hash: could not hash a buffer",
-+ NULL, NULL, NULL );
-+ goto bail;
-+ }
-+ fpItem.data = fp;
-+ fpItem.len = SHA256_LENGTH;
-+ if ( NULL == ( *dest = CERT_Hexify( &fpItem, 0 ) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_hash: could not hexify the hash",
-+ NULL, NULL, NULL );
-+ goto bail;
-+ }
-+
-+ rv = 1;
-+bail:
-+ return rv;
-+}
-+
-+
-+/* BORROWED FROM tls_m.c */
-+int
-+tlsmc_open_nssdb( char *ld_cacertdir, NSSInitContext **out_initctx, char **out_nssdb_dir, char **out_nssdb_prefix )
-+{
-+#define SECURITYDIRS_COUNT 3
-+ int rc = 0;
-+ PRErrorCode errcode = 1;
-+
-+ /* restart secmod modules */
-+#ifdef HAVE_SECMOD_RESTARTMODULES
-+ /* NSS enforces the pkcs11 requirement that modules should be unloaded after
-+ a fork() - since there is no portable way to determine if NSS has been
-+ already initialized in a parent process, we just call SECMOD_RestartModules
-+ with force == FALSE - if the module has been unloaded due to a fork, it will
-+ be reloaded, otherwise, it is a no-op */
-+ if ( 0 == ( rc = SECMOD_RestartModules(PR_FALSE /* do not force */) ) ) {
-+ errcode = PORT_GetError();
-+ if ( errcode != SEC_ERROR_NOT_INITIALIZED ) {
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_open_nssdb: WARN: could not restart the security modules: %d:%s.\n",
-+ errcode, PR_ErrorToString( errcode, PR_LANGUAGE_I_DEFAULT ), 0 );
-+ } else {
-+ errcode = 1;
-+ }
-+ }
-+#endif
-+
-+
-+ /* context and certdb */
-+ char *dir_moznss = PR_GetEnv( "MOZNSS_DIR" );
-+ char *dir_default_moznss = PR_GetEnv( "DEFAULT_MOZNSS_DIR" );
-+ const char *securitydirs[SECURITYDIRS_COUNT] = { dir_moznss, ld_cacertdir, dir_default_moznss };
-+ int done = 0;
-+ int ii = 0;
-+ for ( ii = 0; !done && ( ii < SECURITYDIRS_COUNT ); ++ii ) {
-+ // get certdb prefix
-+ const char *securitydir = securitydirs[ii];
-+ char *nsscertdir = NULL;
-+ char *realcertdir = NULL;
-+ const char *defprefix = "";
-+ char *prefix = (char *)defprefix;
-+ if ( securitydir == NULL ) continue;
-+ tlsmc_get_certdb_prefix( securitydir, &nsscertdir, &realcertdir, &prefix );
-+ *out_nssdb_dir = strdup( realcertdir );
-+ *out_nssdb_prefix = strdup( prefix );
-+
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_open_nssdb: INFO: trying to initialize moznss using security dir `%s` prefix `%s`.\n",
-+ nsscertdir, prefix, NULL);
-+
-+ // init context
-+ NSSInitContext *initctx = NULL;
-+ NSSInitParameters initparams;
-+ memset( &initparams, 0, sizeof( initparams ) );
-+ initparams.length = sizeof( initparams );
-+
-+ initctx = NSS_InitContext( nsscertdir,
-+ prefix,
-+ prefix,
-+ SECMOD_DB,
-+ &initparams,
-+ NSS_INIT_READONLY // | NSS_INIT_NOCERTDB
-+ );
-+ rc = initctx ? 1 : 0;
-+
-+ *out_initctx = initctx;
-+
-+ if ( rc != 1 ) {
-+ errcode = PORT_GetError();
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_open_nssdb: WARN: could not initialize MozNSS context - error %d.\n",
-+ errcode, 0, 0 );
-+ } else {
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_open_nssdb: INFO: initialized MozNSS context.\n",
-+ 0, 0, 0 );
-+ errcode = 0;
-+ done = 1;
-+ }
-+ }
-+
-+ PR_Free( dir_moznss );
-+ PR_Free( dir_default_moznss );
-+
-+ PK11_SetPasswordFunc( tlsmc_get_pin );
-+
-+ if ( done && (errcode == 0) && out_initctx ) {
-+ return 1;
-+ } else {
-+ return 0;
-+ }
-+}
-+
-+
-+int
-+tlsmc_filestamp( char **filestamp, char *path )
-+{
-+ int rv = 0;
-+ struct stat attr;
-+ char stime[20];
-+
-+ if ( 0 != stat( path, &attr ) ) {
-+ rv = -1;
-+ goto bail;
-+ }
-+ if ( 0 == strftime(stime, sizeof(stime), "%FT%T", localtime(&attr.st_mtime)) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_filestamp: ERROR: could not format mtime: %s.\n",
-+ strerror(errno), 0, 0 );
-+ goto bail;
-+ }
-+
-+ *filestamp = PR_smprintf("mtime %s.%d, size %lld",
-+ stime, attr.st_mtim.tv_nsec, (long long) attr.st_size);
-+
-+ rv = 1;
-+bail:
-+ return rv;
-+}
-+
-+
-+char *
-+tlsmc_compute_checksum( char *nssdb_dir, char *nssdb_prefix,
-+ char *ld_cacertdir, char *ld_cert, char *ld_key,
-+ char **out_data)
-+{
-+ int rv = 0;
-+ char *data = NULL;
-+ char *checksum = NULL;
-+
-+ /* gather data */
-+ data = PR_sprintf_append( data,
-+ DONOTEDIT "\n"
-+ README_HEADER "\n"
-+ "PARAMETERS:\n"
-+ "nssdb_dir: %s\n"
-+ "nssdb_prefix: %s\n"
-+ "ld_cacertdir: %s\n"
-+ "ld_cert: %s\n"
-+ "ld_key: %s\n"
-+ "euid: %d\n\n"
-+ "FILES:\n",
-+ nssdb_dir, nssdb_prefix, ld_cacertdir, ld_cert, ld_key, geteuid() );
-+
-+ char *files[] = { "cert8.db", "cert9.db", "key3.db", "key4.db", "secmod.db", NULL };
-+ char **filep = NULL;
-+ for ( filep = files; NULL != *filep; filep++ ) {
-+ char *filestamp = NULL;
-+ char *path = NULL;
-+ path = PR_smprintf( "%s/%s%s", nssdb_dir, nssdb_prefix, *filep );
-+ if ( 0 == tlsmc_filestamp( &filestamp, path ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_compute_checksum: INFO: could not check file `%s'.\n",
-+ path, 0, 0 );
-+ rv = -1;
-+ } else {
-+ data = PR_sprintf_append( data, "%s: %s\n", *filep, filestamp );
-+ }
-+ if ( filestamp ) PR_smprintf_free( filestamp );
-+ if ( path ) PR_smprintf_free( path );
-+ if ( -1 == rv ) goto bail;
-+ }
-+
-+ /* compute data checksum */
-+ if ( 1 != tlsmc_hash( &checksum, (const char*) data ) ) {
-+ checksum = NULL;
-+ goto bail;
-+ }
-+
-+ /* possibly supply data */
-+ if ( out_data ) {
-+ *out_data = strdup( data );
-+ }
-+
-+ /* return checksum */
-+bail:
-+ if ( data ) PR_smprintf_free( data );
-+ return checksum;
-+}
-+
-+
-+int
-+tlsmc_prepare_dir( char *dir )
-+{
-+ int rv = 0;
-+ char *cacerts_dir = NULL;
-+
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_prepare_dir: INFO: preparing PEM directory `%s'.\n",
-+ dir, 0, 0 );
-+
-+ if ( 0 != mkdir( dir, S_IRWXU /* u+rwx */ ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_prepare_dir: WARN: could not create the PEM directory.\n",
-+ 0, 0, 0 );
-+ rv = 0;
-+ goto bail;
-+ }
-+
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_prepare_dir: INFO: creating a subdirectory `%s'.\n",
-+ TLSMC_CACERTS_DIR_NAME, 0, 0 );
-+ cacerts_dir = PR_smprintf( "%s/%s", dir, TLSMC_CACERTS_DIR_NAME );
-+ if ( 0 != mkdir( cacerts_dir, S_IRWXU /* u+rwx */ ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_prepare_dir: WARN: could not create the subdirectory.\n",
-+ 0, 0, 0 );
-+ rv = 0;
-+ goto bail;
-+ }
-+
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_prepare_dir: INFO: successfully created PEM directory structure.\n",
-+ TLSMC_CACERTS_DIR_NAME, 0, 0 );
-+ rv = 1;
-+
-+bail:
-+ if ( cacerts_dir ) PR_smprintf_free( cacerts_dir );
-+ return rv;
-+}
-+
-+
-+/* BORROWED FROM 389ds: ssl.c */
-+int
-+tlsmc_extract_cert_to_file(CERTCertDBHandle *certdb_handle, CERTCertificate *cert, char *file_path)
-+{
-+ int rv = 0;
-+ SECItem data;
-+ char *b64 = NULL;
-+ char *output = NULL;
-+
-+ if ( ! cert ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cert_to_file: ERROR: cert empty.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+
-+ data.data = cert->derCert.data;
-+ data.len = cert->derCert.len;
-+ b64 = BTOA_DataToAscii(data.data, data.len);
-+ if ( ! b64 ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cert_to_file: ERROR: could not base64 encode.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+
-+ output = PR_smprintf( DONOTEDIT "\n\n"
-+ "NSS nickname: %s\n"
-+ "Issuer: %s\n"
-+ "Subject: %s\n"
-+ PEM_CERT_HEADER "\n"
-+ "%s\n"
-+ PEM_CERT_FOOTER "\n",
-+ cert->nickname,
-+ cert->issuerName,
-+ cert->subjectName,
-+ b64 );
-+
-+ if ( 0 == tlsmc_write_file( file_path, output, S_IRUSR ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cert_to_file: ERROR: could not write certificate.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+
-+ rv = 1;
-+bail:
-+ if ( output ) PR_smprintf_free( output );
-+ if ( b64 ) PORT_Free( b64 );
-+ return rv;
-+}
-+
-+
-+/* BORROWED FROM 389ds: ssl.c */
-+int
-+tlsmc_decrypt_key(SECKEYEncryptedPrivateKeyInfo *epki,
-+ SECOidTag algTag,
-+ SECItem *pwitem,
-+ void *pin_arg,
-+ SECItem *derPKI)
-+{
-+ SECItem *cryptoParam = NULL;
-+ PK11SymKey *symKey = NULL;
-+ PK11Context *ctx = NULL;
-+ int rv = 0;
-+
-+ if (!pwitem) return rv;
-+
-+ do {
-+ SECAlgorithmID algid = epki->algorithm;
-+ CK_MECHANISM_TYPE cryptoMechType;
-+ CK_ATTRIBUTE_TYPE operation = CKA_DECRYPT;
-+ PK11SlotInfo *slot = NULL;
-+
-+ cryptoMechType = PK11_GetPBECryptoMechanism(&algid, &cryptoParam, pwitem);
-+ if (cryptoMechType == CKM_INVALID_MECHANISM) {
-+ goto bail;
-+ }
-+
-+ if ( NULL == ( slot = PK11_GetBestSlot(cryptoMechType, NULL) ) ) {
-+ goto bail;
-+ }
-+
-+ if ( NULL == ( symKey = PK11_PBEKeyGen(slot, &algid, pwitem, PR_FALSE, pin_arg) ) ) {
-+ rv = -1;
-+ goto bail_one;
-+ }
-+
-+ if ( NULL == ( ctx = PK11_CreateContextBySymKey(
-+ cryptoMechType, operation, symKey, cryptoParam) ) ) {
-+ rv = -1;
-+ goto bail_one;
-+ }
-+
-+ if ( SECSuccess != PK11_CipherOp(ctx,
-+ derPKI->data, /* out */
-+ (int *)(&derPKI->len), /* out len */
-+ (int)epki->encryptedData.len, /* max out */
-+ epki->encryptedData.data, /* in */
-+ (int)epki->encryptedData.len /* in len */ ) ) {
-+ rv = -1;
-+ goto bail_one;
-+ }
-+
-+ if ( derPKI->len != epki->encryptedData.len ) goto bail_one;
-+ if ( SECSuccess != PK11_Finalize(ctx) ) goto bail_one;
-+ bail_one:
-+ if (slot) PK11_FreeSlot(slot);
-+ } while (0);
-+
-+ rv = ((rv == 0) ? 1 : 0);
-+bail:
-+ if (symKey) PK11_FreeSymKey(symKey);
-+ if (cryptoParam) {
-+ SECITEM_ZfreeItem(cryptoParam, PR_TRUE);
-+ cryptoParam = NULL;
-+ }
-+ if (ctx) PK11_DestroyContext(ctx, PR_TRUE);
-+
-+ return rv;
-+}
-+
-+
-+/* BORROWED FROM 389ds: ssl.c */
-+int
-+tlsmc_extract_key_of_cert_to_file(CERTCertificate *cert,
-+ char *pin_filename,
-+ char *filename)
-+{
-+ int rv = 0;
-+ SECKEYPrivateKey *key = NULL;
-+ SECItem pwitem;
-+ SECKEYEncryptedPrivateKeyInfo *epki = NULL;
-+ PLArenaPool *arenaForPKI = NULL;
-+ SECItem clearKeyDER;
-+ char *b64 = NULL;
-+ char *output = NULL;
-+
-+ // establish password
-+ pwitem.data = "secretpw"; // FIXME use pin_filename
-+ pwitem.len = strlen(pwitem.data);
-+ pwitem.type = siBuffer;
-+
-+ // get key
-+ if ( NULL == ( key = PK11_FindKeyByAnyCert(cert, (void *)pin_filename) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_key_of_cert_to_file: ERROR: PK11_FindKeyByAnyCert failed.\n",
-+ 0,0,0);
-+ goto bail;
-+ }
-+
-+ // get key info
-+ if ( NULL == ( epki = PK11_ExportEncryptedPrivKeyInfo(
-+ NULL, SEC_OID_DES_EDE3_CBC, &pwitem, key, 1000, (void *)pin_filename) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_key_of_cert_to_file: ERROR: PK11_ExportEncryptedPrivKeyInfo returned NULL.\n",
-+ 0,0,0);
-+ goto bail;
-+ }
-+
-+ // get clear DER
-+ if ( NULL == ( arenaForPKI = PORT_NewArena(2048) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_key_of_cert_to_file: ERROR: PORT_NewArena failed.\n",
-+ 0,0,0);
-+ goto bail;
-+ }
-+
-+ clearKeyDER.data = PORT_ArenaAlloc(arenaForPKI, epki->encryptedData.len);
-+ clearKeyDER.len = epki->encryptedData.len;
-+ clearKeyDER.type = siBuffer;
-+
-+ if ( 0 == tlsmc_decrypt_key(epki, SEC_OID_DES_EDE3_CBC, &pwitem,
-+ (void *)pin_filename, &clearKeyDER) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_key_of_cert_to_file: ERROR: could not decrypt the key.\n",
-+ 0,0,0);
-+ goto bail;
-+ }
-+
-+ // base64 encode
-+ if ( NULL == ( b64 = BTOA_ConvertItemToAscii(&clearKeyDER) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_key_of_cert_to_file: ERROR: could not base64 encode.\n",
-+ 0,0,0);
-+ goto bail;
-+ }
-+
-+ // print out
-+ output = PR_smprintf( DONOTEDIT "\n"
-+ PEM_KEY_HEADER "\n"
-+ "%s\n"
-+ PEM_KEY_FOOTER "\n",
-+ b64 );
-+
-+ if ( 0 == tlsmc_write_file( filename, output, S_IRUSR ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_key_of_cert_to_file: ERROR: could not write PK.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+
-+ rv = 1;
-+
-+bail:
-+ if (b64) PORT_Free(b64);
-+ if (arenaForPKI) PORT_FreeArena(arenaForPKI, PR_FALSE);
-+ if (epki) SECKEY_DestroyEncryptedPrivateKeyInfo(epki, PR_TRUE);
-+ if (key) SECKEY_DestroyPrivateKey(key);
-+ return rv;
-+}
-+
-+
-+/* BORROWED FROM 389ds: ssl.c */
-+int
-+tlsmc_extract_cert_key_pair(char *nickname, char *pin_filename, char *dir_name)
-+{
-+ int rv = 0;
-+ CERTCertDBHandle *certHandle = NULL;
-+ CERTCertificate *cert = NULL;
-+ char *cert_file_path = NULL;
-+ char *key_file_path = NULL;
-+ char *file_realpath = NULL;
-+
-+
-+ cert_file_path = PR_smprintf( "%s/cert.pem", dir_name );
-+ key_file_path = PR_smprintf( "%s/key.pem", dir_name );
-+
-+ if ( NULL == nickname ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cert_key_pair: WARN: supplied nickname is empty (NULL).\n",
-+ 0, 0, 0 );
-+ rv = 1;
-+ goto bail;
-+ }
-+ if ( NULL == ( certHandle = CERT_GetDefaultCertDB() ) ) {
-+ // FIXME see same in tlsmc_extract_cacerts()
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cert_key_pair: ERROR: could not get certificate handle.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+ if ( NULL != ( cert = PK11_FindCertFromNickname(nickname, NULL) ) ) {
-+ /* extract cert/key from NSS db */
-+
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_extract_cert_key_pair: INFO: extracting certificate `%s' to file `%s'.\n",
-+ nickname, cert_file_path, 0 );
-+ if ( 0 == tlsmc_extract_cert_to_file(certHandle, cert, cert_file_path) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cert_key_pair: ERROR: could not extract certificate.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_extract_cert_key_pair: INFO: extracting associated PK to file `%s'.\n",
-+ key_file_path, 0, 0 );
-+ if ( 0 == tlsmc_extract_key_of_cert_to_file( cert, pin_filename, key_file_path ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cert_key_pair: ERROR: could not extract PK.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+ } else {
-+ /* symlink PEM cert/key PEM files */
-+
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cert_key_pair: INFO: could not find certificate with nickname `%s', expecting a PEM file.\n",
-+ nickname, 0, 0 );
-+
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_extract_cert_key_pair: INFO: symlinking certificate file `%s' to file `%s'.\n",
-+ nickname, cert_file_path, 0 );
-+ if ( NULL == ( file_realpath = realpath( nickname, NULL ) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cert_key_pair: ERROR: could not get realpath of certificate file `%s'.\n",
-+ nickname, 0, 0 );
-+ goto bail;
-+ }
-+ if ( -1 == symlink( file_realpath, cert_file_path ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cert_key_pair: ERROR: could not create a symlink of `%s' to `%s'.\n",
-+ file_realpath, cert_file_path, 0 );
-+ goto bail;
-+ }
-+ if ( file_realpath ) free( file_realpath );
-+
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_extract_cert_key_pair: INFO: symlinking PK file `%s' to file `%s'.\n",
-+ pin_filename, key_file_path, 0 );
-+ if ( NULL == ( file_realpath = realpath( pin_filename, NULL ) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cert_key_pair: ERROR: could not get realpath of PK file `%s'.\n",
-+ pin_filename, 0, 0 );
-+ goto bail;
-+ }
-+ if ( -1 == symlink( file_realpath, key_file_path ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cert_key_pair: ERROR: could not create a symlink of `%s' to `%s'.\n",
-+ file_realpath, key_file_path, 0 );
-+ goto bail;
-+ }
-+ }
-+
-+ rv = 1;
-+
-+bail:
-+ if (file_realpath) free(file_realpath);
-+ if (key_file_path) PR_smprintf_free(key_file_path);
-+ if (cert_file_path) PR_smprintf_free(cert_file_path);
-+ if (cert) CERT_DestroyCertificate(cert);
-+ return rv;
-+}
-+
-+
-+/* BORROWED FROM 389ds: ssl.c */
-+int
-+tlsmc_extract_cacerts( char *dir_name )
-+{
-+ int rv = 0;
-+ CERTCertDBHandle *certHandle = NULL;
-+ CERTCertListNode *node = NULL;
-+ CERTCertList *list = NULL;
-+ char *cacerts_dir = NULL;
-+ int cert_cnt = 0;
-+
-+ cacerts_dir = PR_smprintf( "%s/" TLSMC_CACERTS_DIR_NAME, dir_name );
-+
-+ certHandle = CERT_GetDefaultCertDB(); // FIXME maybe we should really use certdb_slot?
-+ if ( ! certHandle ) {
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_extract_cacerts: could not get certificate database handle.\n",
-+ 0, 0, 0);
-+ goto bail;
-+ }
-+
-+ list = PK11_ListCerts(PK11CertListAll, NULL);
-+ if ( ! list ) {
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_extract_cacerts: could not get list of certificates.\n",
-+ 0, 0, 0);
-+ goto bail;
-+ }
-+ for ( node = CERT_LIST_HEAD(list);
-+ !CERT_LIST_END(node, list);
-+ node = CERT_LIST_NEXT(node)) {
-+
-+ CERTCertificate *cert = NULL;
-+ CERTCertTrust trust;
-+ char *cert_file_path = NULL;
-+ int is_ca = 0;
-+
-+ cert = node->cert;
-+ if ( SECFailure == CERT_GetCertTrust( cert, &trust ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cacerts: ERROR: could not get trust flags of certificate nick=`%s'.\n",
-+ cert->nickname, 0, 0);
-+ goto bail;
-+ }
-+ if (trust.sslFlags &
-+ (CERTDB_VALID_CA | CERTDB_TRUSTED_CA | CERTDB_TRUSTED_CLIENT_CA)) {
-+ is_ca = 1;
-+ }
-+
-+ Debug(LDAP_DEBUG_TRACE,
-+ "tlsmc_extract_cacerts: INFO: found cert nick=`%s'%s.\n",
-+ cert->nickname, is_ca ? ", a trusted CA" : ", _not_ a trusted CA, skipping", 0);
-+ if ( ! is_ca ) continue;
-+
-+ cert_file_path = PR_smprintf( "%s/cert%d.pem", cacerts_dir, cert_cnt );
-+ cert_cnt++;
-+ Debug(LDAP_DEBUG_TRACE,
-+ "tlsmc_extract_cacerts: INFO: extracting cert nick=`%s' to file `%s'.\n",
-+ cert->nickname, cert_file_path, 0);
-+ if ( 0 == tlsmc_extract_cert_to_file( certHandle, cert, cert_file_path ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cacerts: ERROR: could not extract the certificate.\n",
-+ 0, 0, 0);
-+ goto bail_one;
-+ }
-+ if ( 0 == tlsmc_cert_create_hash_symlink( cert_file_path, cacerts_dir ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_cacerts: ERROR: could not rehash the certificate.\n",
-+ 0, 0, 0);
-+ goto bail_one;
-+ }
-+ if ( cert_file_path ) PR_smprintf_free( cert_file_path );
-+ continue;
-+ bail_one:
-+ if ( cert_file_path ) PR_smprintf_free( cert_file_path );
-+ goto bail;
-+ }
-+
-+ rv = 1;
-+bail:
-+ if ( cacerts_dir ) PR_smprintf_free( cacerts_dir );
-+ if ( list ) CERT_DestroyCertList( list );
-+ return rv;
-+}
-+
-+
-+/* returns 1 if successfull;
-+ returns -1 if only cert-key pair is NULL or could not be extracted;
-+ returns 0 if any other error
-+*/
-+int
-+tlsmc_extract_nssdb( char *dir_name, char **ld_cacertdir, char **ld_cert, char **ld_key )
-+{
-+ int rv = 0;
-+
-+ if ( ! dir_name ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_nssdb: FATAL: target dir name empty.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+
-+ if ( 0 == tlsmc_extract_cacerts( dir_name ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_nssdb: ERROR: could not export CA certificates.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+
-+ if ( 0 == tlsmc_extract_cert_key_pair( *ld_cert, *ld_key, dir_name ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_extract_nssdb: ERROR: could not export user cert and/or key.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+
-+ rv = 1;
-+bail:
-+ return rv;
-+}
-+
-+
-+/* BORROWED FROM tls_m.c */
-+int
-+tlsmc_close_nssdb(NSSInitContext **initctx)
-+{
-+ if ( *initctx && NSS_ShutdownContext( *initctx ) ) {
-+ PRErrorCode errcode = PR_GetError();
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_close_nssdb: ERROR: could not shutdown NSS - error %d:%s.\n",
-+ errcode, PR_ErrorToString( errcode, PR_LANGUAGE_I_DEFAULT ), 0 );
-+ return 0;
-+ } else {
-+ return 1;
-+ }
-+}
-+
-+
-+int
-+tlsmc_convert( char **ld_cacertdir, char **ld_cert, char **ld_key )
-+{
-+
-+ int rv = 0;
-+
-+ NSSInitContext *nss_ctx = NULL;
-+ char *nssdb_dir_path = NULL;
-+ char *nssdb_prefix = NULL;
-+ char *pem_dir = NULL;
-+ char *readme_path = NULL;
-+ char *data = NULL; // data before checksum
-+ char *checksum = NULL; // checksummed data
-+ struct stat stat_buf;
-+
-+#ifdef LDAP_R_COMPILE
-+ ldap_pvt_thread_mutex_lock( &tlsmc_mutex );
-+#endif
-+
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_convert: INFO: trying to open NSS DB with CACertDir = `%s'.\n",
-+ *ld_cacertdir, 0, 0 );
-+ if ( NULL == ld_cacertdir || NULL == ld_cert || NULL == ld_key ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_convert: ERROR: cannot proceed, some of the arguments are NULL.\n",
-+ 0, 0, 0 );
-+ rv = 1;
-+ goto bail;
-+ }
-+ if ( 0 == tlsmc_open_nssdb( *ld_cacertdir, &nss_ctx, &nssdb_dir_path, &nssdb_prefix ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_convert: INFO: cannot open the NSS DB, expecting PEM configuration is present.\n",
-+ 0, 0, 0 );
-+ rv = 1;
-+ goto bail;
-+ }
-+
-+ if ( NULL == ( checksum = tlsmc_compute_checksum( nssdb_dir_path, nssdb_prefix,
-+ *ld_cacertdir, *ld_cert, *ld_key,
-+ &data ) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_convert: ERROR: could not compute checksum.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+
-+ if ( NULL == ( pem_dir = PR_smprintf( "/tmp/openldap-tlsmc-%s-%s-%s",
-+ tlsmc_path2name( nssdb_dir_path ),
-+ nssdb_prefix,
-+ checksum) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_convert: FATAL: could not allocate memory.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+ if ( NULL == ( readme_path = PR_smprintf( "%s/" TLSMC_README_FILE_NAME, pem_dir ) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_convert: FATAL: could not allocate memory.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_convert: INFO: trying with PEM dir = `%s'.\n",
-+ pem_dir, 0, 0 );
-+ if ( 0 == stat( pem_dir, &stat_buf ) ) {
-+ if ( S_ISDIR(stat_buf.st_mode) ) {
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_convert: INFO: using the existing PEM dir.\n",
-+ 0, 0, 0 );
-+ if ( 0 == stat( readme_path, &stat_buf ) ) {
-+ goto pem_dir_exists;
-+ } else {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_convert: ERROR: the PEM dir found does not contain README file. Will remove the PEM dir and try to recreate it.\n",
-+ 0, 0, 0 );
-+ if ( 0 == tlsmc_remove_dir_recursively( pem_dir ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_convert: FATAL: could not remove the PEM dir. Cannot properly set TLS.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+ }
-+ } else {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_convert: FATAL: tried to stat the PEM dir but it is not a directory.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+ }
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_convert: WARN: will try to create PEM dir.\n",
-+ 0, 0, 0 );
-+ if ( 0 == tlsmc_prepare_dir( pem_dir ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_convert: FATAL: cannot prepare the PEM dir.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+ if ( 0 == tlsmc_extract_nssdb( pem_dir, ld_cacertdir, ld_cert, ld_key ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_convert: FATAL: could not extract from the NSS DB.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+ if ( 0 == tlsmc_write_file( readme_path, data, S_IRUSR ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_convert: ERROR: could not create README file.\n",
-+ 0, 0, 0 );
-+ }
-+
-+pem_dir_exists:
-+ if (*ld_cacertdir) free(*ld_cacertdir);
-+ *ld_cacertdir = PR_smprintf( "%s/" TLSMC_CACERTS_DIR_NAME, pem_dir );
-+ if ( ! ( ( 0 == stat( *ld_cacertdir, &stat_buf ) )
-+ && S_ISDIR(stat_buf.st_mode) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_convert: WARN: extracted cacerts dir is not present.\n",
-+ 0, 0, 0 );
-+ if ( *ld_cacertdir ) PR_smprintf_free( *ld_cacertdir );
-+ *ld_cacertdir = NULL;
-+ }
-+
-+ if (*ld_cert) free(*ld_cert);
-+ *ld_cert = PR_smprintf( "%s/" TLSMC_CERT_FILE_NAME, pem_dir );
-+ if ( ! ( ( 0 == stat( *ld_cert, &stat_buf ) )
-+ && ( S_ISREG(stat_buf.st_mode)
-+ || S_ISLNK(stat_buf.st_mode) ) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_convert: WARN: extracted cert file is not present.\n",
-+ 0, 0, 0 );
-+ if ( *ld_cert ) PR_smprintf_free( *ld_cert );
-+ *ld_cert = NULL;
-+ }
-+
-+ if (*ld_key) free(*ld_key);
-+ *ld_key = PR_smprintf( "%s/" TLSMC_KEY_FILE_NAME, pem_dir );
-+ if ( ! ( ( 0 == stat( *ld_key, &stat_buf ) )
-+ && ( S_ISREG(stat_buf.st_mode)
-+ || S_ISLNK(stat_buf.st_mode) ) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_convert: WARN: extracted key file is not present.\n",
-+ 0, 0, 0 );
-+ if ( *ld_key ) PR_smprintf_free( *ld_key );
-+ *ld_key = NULL;
-+ }
-+
-+ rv = 1;
-+
-+bail:
-+ if ( checksum ) free( checksum );
-+ if ( pem_dir ) PR_smprintf_free( pem_dir );
-+ if ( readme_path ) PR_smprintf_free( readme_path );
-+ if ( data ) free( data );
-+ if ( nssdb_prefix ) free( nssdb_prefix );
-+ if ( nssdb_dir_path ) free( nssdb_dir_path );
-+ if ( nss_ctx ) tlsmc_close_nssdb( &nss_ctx );
-+
-+#ifdef LDAP_R_COMPILE
-+ ldap_pvt_thread_mutex_unlock( &tlsmc_mutex );
-+#endif
-+
-+ return rv;
-+}
-+
-+
-+// returns 0 when successful
-+int
-+tlsmc_intercept_initialization( struct ldapoptions *lo, int is_server )
-+{
-+ int rv = 0;
-+ char *ld_cacertdir = NULL;
-+ char *ld_cert = NULL;
-+ char *ld_key = NULL;
-+
-+ ld_cacertdir = lo->ldo_tls_cacertdir ? LDAP_STRDUP( (char *) lo->ldo_tls_cacertdir ) : NULL;
-+ ld_cert = lo->ldo_tls_certfile ? LDAP_STRDUP( (char *) lo->ldo_tls_certfile ) : NULL;
-+ ld_key = lo->ldo_tls_keyfile ? LDAP_STRDUP( (char *) lo->ldo_tls_keyfile ) : NULL;
-+
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_intercept_initialization: INFO: entry options follow:\n"
-+ "tlsmc_intercept_initialization: INFO: cacertdir = `%s'\n"
-+ "tlsmc_intercept_initialization: INFO: certfile = `%s'\n"
-+ "tlsmc_intercept_initialization: INFO: keyfile = `%s'\n",
-+ lo->ldo_tls_cacertdir, lo->ldo_tls_certfile, lo->ldo_tls_keyfile );
-+
-+ if ( 0 == tlsmc_convert( &ld_cacertdir, &ld_cert, &ld_key ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_intercept_initialization: FATAL: could not intercept TLS initialization. TLS will not work!\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+
-+ if ( lo->ldo_tls_cacertdir ) LDAP_FREE( lo->ldo_tls_cacertdir );
-+ lo->ldo_tls_cacertdir = ld_cacertdir ? LDAP_STRDUP( (char *) ld_cacertdir ) : NULL;
-+
-+ if ( lo->ldo_tls_certfile ) LDAP_FREE( lo->ldo_tls_certfile );
-+ lo->ldo_tls_certfile = ld_cert ? LDAP_STRDUP( (char *) ld_cert ) : NULL;
-+
-+ if ( lo->ldo_tls_keyfile ) LDAP_FREE( lo->ldo_tls_keyfile );
-+ lo->ldo_tls_keyfile = ld_key ? LDAP_STRDUP( (char *) ld_key ) : NULL;
-+
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_intercept_initialization: INFO: altered options follow:\n"
-+ "tlsmc_intercept_initialization: INFO: cacertdir = `%s'\n"
-+ "tlsmc_intercept_initialization: INFO: certfile = `%s'\n"
-+ "tlsmc_intercept_initialization: INFO: keyfile = `%s'\n",
-+ lo->ldo_tls_cacertdir, lo->ldo_tls_certfile, lo->ldo_tls_keyfile );
-+
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_intercept_initialization: INFO: successfully intercepted TLS initialization. Continuing with OpenSSL only.\n",
-+ 0, 0, 0 );
-+ rv = 1;
-+bail:
-+ if ( ld_cacertdir ) LDAP_FREE( ld_cacertdir );
-+ if ( ld_cert ) LDAP_FREE( ld_cert );
-+ if ( ld_key ) LDAP_FREE( ld_key );
-+ return rv;
-+}
-+
-+
-+#endif /* HAVE_MOZNSS_COMPATIBILITY */
-+/*
-+ emacs settings
-+ Local Variables:
-+ indent-tabs-mode: t
-+ tab-width: 4
-+ End:
-+*/
-diff --git a/libraries/libldap/tls_mc.h b/libraries/libldap/tls_mc.h
-new file mode 100644
-index 0000000..2e6e567
---- /dev/null
-+++ b/libraries/libldap/tls_mc.h
-@@ -0,0 +1,18 @@
-+#ifndef _LDAP_TLSMC_H
-+#define _LDAP_TLSMC_H
-+
-+#include "portable.h"
-+
-+#ifdef HAVE_MOZNSS_COMPATIBILITY
-+
-+#include "ldap-int.h"
-+
-+int
-+tlsmc_convert( char **ld_cacertdir, char **ld_cert, char **ld_key );
-+
-+int
-+tlsmc_intercept_initialization( struct ldapoptions *lo, int is_server );
-+
-+
-+#endif /* HAVE_MOZNSS_COMPATIBILITY */
-+#endif /* _LDAP_TLSMC_H */
-diff --git a/libraries/libldap/tls_mc_ossl.c b/libraries/libldap/tls_mc_ossl.c
-new file mode 100644
-index 0000000..62ff54d
---- /dev/null
-+++ b/libraries/libldap/tls_mc_ossl.c
-@@ -0,0 +1,95 @@
-+#include "portable.h"
-+
-+/* This file contains functions that require OpenSSL headers due to some
-+ conflicts with what MozNSS defines.
-+*/
-+
-+#ifdef HAVE_MOZNSS_COMPATIBILITY
-+
-+#include <openssl/x509.h>
-+#include <openssl/pem.h>
-+#include "ldap-int.h"
-+#include <nspr/nspr.h>
-+#include <unistd.h>
-+#include <errno.h>
-+
-+
-+int
-+tlsmc_cert_create_hash_symlink( char *cert_path, char *cacerts_dir )
-+{
-+ int rv = 0;
-+ X509 *cert = NULL;
-+ FILE *fp = NULL;
-+ unsigned long hash = 0;
-+ char *cert_filename_p = NULL;
-+ char *last_slash_p = NULL;
-+ char *symlink_path = NULL;
-+ int cnt = 0;
-+
-+ if ( NULL == ( fp = fopen( cert_path, "r" ) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_cert_create_hash_symlink: ERROR: could not open the cert file.\n",
-+ 0, 0, 0 );
-+ perror( "tlsmc_cert_create_hash_symlink: ERROR: OS error" );
-+ goto bail;
-+ }
-+ if ( NULL == PEM_read_X509( fp, &cert, NULL, NULL ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_cert_create_hash_symlink: ERROR: could not read PEM data.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+ if ( 0 == ( hash = X509_subject_name_hash( cert ) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_cert_create_hash_symlink: ERROR: could not hash subject.\n",
-+ 0, 0, 0 );
-+ goto bail;
-+ }
-+
-+ last_slash_p = strrchr( cert_path, '/' );
-+ cert_filename_p = last_slash_p ? last_slash_p + 1 : cert_path;
-+ for ( cnt = 0; cnt < 10; cnt++ ) {
-+ if ( NULL == ( symlink_path = PR_smprintf( "%s/%08lx.%d", cacerts_dir, hash, cnt ) ) ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_cert_create_hash_symlink: ERROR: memory allocation error.\n",
-+ 0, 0, 0 );
-+ continue;
-+ }
-+ if ( 0 != symlink( cert_filename_p, symlink_path ) ) {
-+ if ( errno == EEXIST ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_cert_create_hash_symlink: INFO: symlink `%s' already exists.\n",
-+ symlink_path, 0, 0 );
-+ if ( symlink_path ) PR_smprintf( symlink_path );
-+ continue;
-+ }
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_cert_create_hash_symlink: ERROR: could not create symlink.\n",
-+ 0, 0, 0 );
-+ perror( "tlsmc_cert_create_hash_symlink: ERROR: OS error" );
-+ goto bail;
-+ }
-+ Debug( LDAP_DEBUG_TRACE,
-+ "tlsmc_cert_create_hash_symlink: INFO: the cert is now symlinked to %s.\n",
-+ symlink_path, 0, 0 );
-+ rv = 1;
-+ goto bail;
-+ }
-+ Debug( LDAP_DEBUG_ANY,
-+ "tlsmc_cert_create_hash_symlink: INFO: could not create symlink (all possible file names taken).\n",
-+ 0, 0, 0 );
-+bail:
-+ if ( symlink_path ) PR_smprintf_free( symlink_path );
-+ if ( cert ) X509_free( cert );
-+ if ( fp ) fclose( fp );
-+ return rv;
-+}
-+
-+#endif /* HAVE_MOZNSS_COMPATIBILITY */
-+/*
-+ emacs settings
-+ Local Variables:
-+ indent-tabs-mode: t
-+ tab-width: 4
-+ End:
-+*/
-diff --git a/libraries/libldap/tls_mc_ossl.h b/libraries/libldap/tls_mc_ossl.h
-new file mode 100644
-index 0000000..1b42845
---- /dev/null
-+++ b/libraries/libldap/tls_mc_ossl.h
-@@ -0,0 +1,12 @@
-+#ifndef _LDAP_TLSMC_OSSL_H
-+#define _LDAP_TLSMC_OSSL_H
-+
-+#include "portable.h"
-+
-+#ifdef HAVE_MOZNSS_COMPATIBILITY
-+
-+int
-+tlsmc_cert_create_hash_symlink( char *cert_path, char *cacerts_dir );
-+
-+#endif
-+#endif
-diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in
-index a43ce6e..6615f6c 100644
---- a/libraries/libldap_r/Makefile.in
-+++ b/libraries/libldap_r/Makefile.in
-@@ -28,7 +28,7 @@ XXSRCS = apitest.c test.c \
- request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \
- init.c options.c print.c string.c util-int.c schema.c \
- charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
-- tls2.c tls_o.c tls_g.c tls_m.c \
-+ tls2.c tls_o.c tls_g.c tls_m.c tls_mc.c tls_mc_ossl.c \
- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
- assertion.c deref.c ldif.c fetch.c
- SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \
-@@ -46,7 +46,7 @@ OBJS = threads.lo rdwr.lo rmutex.lo tpool.lo rq.lo \
- request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
- init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
-- tls2.lo tls_o.lo tls_g.lo tls_m.lo \
-+ tls2.lo tls_o.lo tls_g.lo tls_m.lo tls_mc.lo tls_mc_ossl.lo \
- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
- assertion.lo deref.lo ldif.lo fetch.lo
-
---
-2.17.1
-
+++ /dev/null
-From dc82cdf9c6c25c69c7eee203d1c4f4c91f969ba9 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Tue, 5 Nov 2019 09:30:49 -0800
-Subject: [PATCH 19/20] openldap openssl ITS7596 Add EC support
-
-From e631ce808ed56119e61321463d06db7999ba5a08
-From stx 1901 openldap-openssl-ITS7595-Add-EC-support-1.patch
----
- doc/man/man5/slapd-config.5 | 7 +++++++
- doc/man/man5/slapd.conf.5 | 7 +++++++
- include/ldap.h | 1 +
- libraries/libldap/ldap-int.h | 2 ++
- libraries/libldap/tls2.c | 17 +++++++++++++++++
- libraries/libldap/tls_o.c | 33 ++++++++++++++++++++++++++++++---
- servers/slapd/bconfig.c | 12 +++++++++++-
- 7 files changed, 75 insertions(+), 4 deletions(-)
-
-diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
-index 42032d4..733ff1e 100644
---- a/doc/man/man5/slapd-config.5
-+++ b/doc/man/man5/slapd-config.5
-@@ -922,6 +922,13 @@ are not used.
- When using Mozilla NSS these parameters are always generated randomly
- so this directive is ignored.
- .TP
-+.B olcTLSECName: <name>
-+Specify the name of a curve to use for Elliptic curve Diffie-Hellman
-+ephemeral key exchange. This is required to enable ECDHE algorithms in
-+OpenSSL. This option is not used with GnuTLS; the curves may be
-+chosen in the GnuTLS ciphersuite specification. This option is also
-+ignored for Mozilla NSS.
-+.TP
- .B olcTLSProtocolMin: <major>[.<minor>]
- Specifies minimum SSL/TLS protocol version that will be negotiated.
- If the server doesn't support at least that version,
-diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
-index 2d4431f..ffe74ff 100644
---- a/doc/man/man5/slapd.conf.5
-+++ b/doc/man/man5/slapd.conf.5
-@@ -1153,6 +1153,13 @@ are not used.
- When using Mozilla NSS these parameters are always generated randomly
- so this directive is ignored.
- .TP
-+.B TLSECName <name>
-+Specify the name of a curve to use for Elliptic curve Diffie-Hellman
-+ephemeral key exchange. This is required to enable ECDHE algorithms in
-+OpenSSL. This option is not used with GnuTLS; the curves may be
-+chosen in the GnuTLS ciphersuite specification. This option is also
-+ignored for Mozilla NSS.
-+.TP
- .B TLSProtocolMin <major>[.<minor>]
- Specifies minimum SSL/TLS protocol version that will be negotiated.
- If the server doesn't support at least that version,
-diff --git a/include/ldap.h b/include/ldap.h
-index 7bc0644..bb22cb8 100644
---- a/include/ldap.h
-+++ b/include/ldap.h
-@@ -158,6 +158,7 @@ LDAP_BEGIN_DECL
- #define LDAP_OPT_X_TLS_NEWCTX 0x600f
- #define LDAP_OPT_X_TLS_CRLFILE 0x6010 /* GNUtls only */
- #define LDAP_OPT_X_TLS_PACKAGE 0x6011
-+#define LDAP_OPT_X_TLS_ECNAME 0x6012
- #define LDAP_OPT_X_TLS_MOZNSS_COMPATIBILITY 0x6050
-
- #define LDAP_OPT_X_TLS_MOZNSS_COMPATIBILITY_DISABLED 0
-diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
-index 15092c1..f504f44 100644
---- a/libraries/libldap/ldap-int.h
-+++ b/libraries/libldap/ldap-int.h
-@@ -165,6 +165,7 @@ struct ldaptls {
- char *lt_ciphersuite;
- char *lt_crlfile;
- char *lt_randfile; /* OpenSSL only */
-+ char *lt_ecname; /* OpenSSL only */
- int lt_protocol_min;
- };
- #endif
-@@ -250,6 +251,7 @@ struct ldapoptions {
- #define ldo_tls_certfile ldo_tls_info.lt_certfile
- #define ldo_tls_keyfile ldo_tls_info.lt_keyfile
- #define ldo_tls_dhfile ldo_tls_info.lt_dhfile
-+#define ldo_tls_ecname ldo_tls_info.lt_ecname
- #define ldo_tls_cacertfile ldo_tls_info.lt_cacertfile
- #define ldo_tls_cacertdir ldo_tls_info.lt_cacertdir
- #define ldo_tls_ciphersuite ldo_tls_info.lt_ciphersuite
-diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
-index 198d0b1..ba4b9c5 100644
---- a/libraries/libldap/tls2.c
-+++ b/libraries/libldap/tls2.c
-@@ -121,6 +121,10 @@ ldap_int_tls_destroy( struct ldapoptions *lo )
- LDAP_FREE( lo->ldo_tls_dhfile );
- lo->ldo_tls_dhfile = NULL;
- }
-+ if ( lo->ldo_tls_ecname ) {
-+ LDAP_FREE( lo->ldo_tls_ecname );
-+ lo->ldo_tls_ecname = NULL;
-+ }
- if ( lo->ldo_tls_cacertfile ) {
- LDAP_FREE( lo->ldo_tls_cacertfile );
- lo->ldo_tls_cacertfile = NULL;
-@@ -257,6 +261,10 @@ ldap_int_tls_init_ctx( struct ldapoptions *lo, int is_server )
- lts.lt_dhfile = LDAP_STRDUP( lts.lt_dhfile );
- __atoe( lts.lt_dhfile );
- }
-+ if ( lts.lt_ecname ) {
-+ lts.lt_ecname = LDAP_STRDUP( lts.lt_ecname );
-+ __atoe( lts.lt_ecname );
-+ }
- #endif
- lo->ldo_tls_ctx = ti->ti_ctx_new( lo );
- if ( lo->ldo_tls_ctx == NULL ) {
-@@ -282,6 +290,7 @@ error_exit:
- LDAP_FREE( lts.lt_crlfile );
- LDAP_FREE( lts.lt_cacertdir );
- LDAP_FREE( lts.lt_dhfile );
-+ LDAP_FREE( lts.lt_ecname );
- #endif
- return rc;
- }
-@@ -686,6 +695,10 @@ ldap_pvt_tls_get_option( LDAP *ld, int option, void *arg )
- *(char **)arg = lo->ldo_tls_dhfile ?
- LDAP_STRDUP( lo->ldo_tls_dhfile ) : NULL;
- break;
-+ case LDAP_OPT_X_TLS_ECNAME:
-+ *(char **)arg = lo->ldo_tls_ecname ?
-+ LDAP_STRDUP( lo->ldo_tls_ecname ) : NULL;
-+ break;
- case LDAP_OPT_X_TLS_CRLFILE: /* GnuTLS only */
- *(char **)arg = lo->ldo_tls_crlfile ?
- LDAP_STRDUP( lo->ldo_tls_crlfile ) : NULL;
-@@ -808,6 +821,10 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
- if ( lo->ldo_tls_dhfile ) LDAP_FREE( lo->ldo_tls_dhfile );
- lo->ldo_tls_dhfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- return 0;
-+ case LDAP_OPT_X_TLS_ECNAME:
-+ if ( lo->ldo_tls_ecname ) LDAP_FREE( lo->ldo_tls_ecname );
-+ lo->ldo_tls_ecname = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+ return 0;
- case LDAP_OPT_X_TLS_CRLFILE: /* GnuTLS only */
- if ( lo->ldo_tls_crlfile ) LDAP_FREE( lo->ldo_tls_crlfile );
- lo->ldo_tls_crlfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
-diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
-index 92c708b..45afc11 100644
---- a/libraries/libldap/tls_o.c
-+++ b/libraries/libldap/tls_o.c
-@@ -371,10 +371,9 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server )
- return -1;
- }
-
-- if ( lo->ldo_tls_dhfile ) {
-- DH *dh = NULL;
-+ if ( is_server && lo->ldo_tls_dhfile ) {
-+ DH *dh;
- BIO *bio;
-- SSL_CTX_set_options( ctx, SSL_OP_SINGLE_DH_USE );
-
- if (( bio=BIO_new_file( lt->lt_dhfile,"r" )) == NULL ) {
- Debug( LDAP_DEBUG_ANY,
-@@ -393,7 +392,35 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server )
- }
- BIO_free( bio );
- SSL_CTX_set_tmp_dh( ctx, dh );
-+ SSL_CTX_set_options( ctx, SSL_OP_SINGLE_DH_USE );
-+ DH_free( dh );
-+ }
-+
-+#ifdef SSL_OP_SINGLE_ECDH_USE
-+ if ( is_server && lo->ldo_tls_ecname ) {
-+ EC_KEY *ecdh;
-+
-+ int nid = OBJ_sn2nid( lt->lt_ecname );
-+ if ( nid == NID_undef ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "TLS: could not use EC name `%s'.\n",
-+ lo->ldo_tls_ecname,0,0);
-+ tlso_report_error();
-+ return -1;
-+ }
-+ ecdh = EC_KEY_new_by_curve_name( nid );
-+ if ( ecdh == NULL ) {
-+ Debug( LDAP_DEBUG_ANY,
-+ "TLS: could not generate key for EC name `%s'.\n",
-+ lo->ldo_tls_ecname,0,0);
-+ tlso_report_error();
-+ return -1;
-+ }
-+ SSL_CTX_set_tmp_ecdh( ctx, ecdh );
-+ SSL_CTX_set_options( ctx, SSL_OP_SINGLE_ECDH_USE );
-+ EC_KEY_free( ecdh );
- }
-+#endif
-
- if ( tlso_opt_trace ) {
- SSL_CTX_set_info_callback( ctx, tlso_info_cb );
-diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
-index 250f141..8b1e4e5 100644
---- a/servers/slapd/bconfig.c
-+++ b/servers/slapd/bconfig.c
-@@ -194,6 +194,7 @@ enum {
- CFG_ACL_ADD,
- CFG_SYNC_SUBENTRY,
- CFG_LTHREADS,
-+ CFG_TLS_ECNAME,
-
- CFG_LAST
- };
-@@ -738,6 +739,14 @@ static ConfigTable config_back_cf_table[] = {
- #endif
- "( OLcfgGlAt:77 NAME 'olcTLSDHParamFile' "
- "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
-+ { "TLSECName", NULL, 2, 2, 0,
-+#ifdef HAVE_TLS
-+ CFG_TLS_ECNAME|ARG_STRING|ARG_MAGIC, &config_tls_option,
-+#else
-+ ARG_IGNORED, NULL,
-+#endif
-+ "( OLcfgGlAt:96 NAME 'olcTLSECName' "
-+ "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
- { "TLSProtocolMin", NULL, 2, 2, 0,
- #ifdef HAVE_TLS
- CFG_TLS_PROTOCOL_MIN|ARG_STRING|ARG_MAGIC, &config_tls_config,
-@@ -819,7 +828,7 @@ static ConfigOCs cf_ocs[] = {
- "olcThreads $ olcTimeLimit $ olcTLSCACertificateFile $ "
- "olcTLSCACertificatePath $ olcTLSCertificateFile $ "
- "olcTLSCertificateKeyFile $ olcTLSCipherSuite $ olcTLSCRLCheck $ "
-- "olcTLSRandFile $ olcTLSVerifyClient $ olcTLSDHParamFile $ "
-+ "olcTLSRandFile $ olcTLSVerifyClient $ olcTLSDHParamFile $ olcTLSECName $ "
- "olcTLSCRLFile $ olcTLSProtocolMin $ olcToolThreads $ olcWriteTimeout $ "
- "olcObjectIdentifier $ olcAttributeTypes $ olcObjectClasses $ "
- "olcDitContentRules $ olcLdapSyntaxes ) )", Cft_Global },
-@@ -3824,6 +3833,7 @@ config_tls_option(ConfigArgs *c) {
- case CFG_TLS_CA_PATH: flag = LDAP_OPT_X_TLS_CACERTDIR; break;
- case CFG_TLS_CA_FILE: flag = LDAP_OPT_X_TLS_CACERTFILE; break;
- case CFG_TLS_DH_FILE: flag = LDAP_OPT_X_TLS_DHFILE; break;
-+ case CFG_TLS_ECNAME: flag = LDAP_OPT_X_TLS_ECNAME; break;
- #ifdef HAVE_GNUTLS
- case CFG_TLS_CRL_FILE: flag = LDAP_OPT_X_TLS_CRLFILE; break;
- #endif
---
-2.17.1
-
+++ /dev/null
-From 14058818a2d2aa42427a0e9433957c90a1264ec5 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Tue, 5 Nov 2019 09:50:55 -0800
-Subject: [PATCH 20/20] openldap openssl ITS7596 Add EC support patch 2
-
-From 721e46fe6695077d63a3df6ea2e397920a72308d
-From stx 1901 openldap-openssl-ITS7595-Add-EC-support-2.patch
----
- libraries/libldap/tls_o.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
-index 45afc11..0a70156 100644
---- a/libraries/libldap/tls_o.c
-+++ b/libraries/libldap/tls_o.c
-@@ -396,8 +396,12 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server )
- DH_free( dh );
- }
-
--#ifdef SSL_OP_SINGLE_ECDH_USE
- if ( is_server && lo->ldo_tls_ecname ) {
-+#ifdef OPENSSL_NO_EC
-+ Debug( LDAP_DEBUG_ANY,
-+ "TLS: Elliptic Curves not supported.\n", 0,0,0 );
-+ return -1;
-+#else
- EC_KEY *ecdh;
-
- int nid = OBJ_sn2nid( lt->lt_ecname );
-@@ -419,8 +423,8 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server )
- SSL_CTX_set_tmp_ecdh( ctx, ecdh );
- SSL_CTX_set_options( ctx, SSL_OP_SINGLE_ECDH_USE );
- EC_KEY_free( ecdh );
-- }
- #endif
-+ }
-
- if ( tlso_opt_trace ) {
- SSL_CTX_set_info_callback( ctx, tlso_info_cb );
---
-2.17.1
-
+++ /dev/null
-From 2adc9fa71e3a47542793e61c7794629fa9255a57 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Tue, 5 Nov 2019 14:49:06 -0800
-Subject: [PATCH] openldap and stx source and config files
-
-From stx 1901 openldap-2.4.44-21.el7_6.src.rpm
----
- stx-sources/ldap.conf | 18 +++
- stx-sources/libexec-check-config.sh | 91 ++++++++++++
- stx-sources/libexec-convert-config.sh | 79 ++++++++++
- stx-sources/libexec-create-certdb.sh | 70 +++++++++
- stx-sources/libexec-functions | 136 +++++++++++++++++
- stx-sources/libexec-generate-server-cert.sh | 118 +++++++++++++++
- stx-sources/libexec-update-ppolicy-schema.sh | 142 ++++++++++++++++++
- stx-sources/libexec-upgrade-db.sh | 40 +++++
- stx-sources/openldap.tmpfiles | 3 +
- stx-sources/slapd.ldif | 148 +++++++++++++++++++
- stx-sources/slapd.service | 19 +++
- stx-sources/slapd.sysconfig | 15 ++
- stx-sources/slapd.tmpfiles | 2 +
- 13 files changed, 881 insertions(+)
- create mode 100644 stx-sources/ldap.conf
- create mode 100755 stx-sources/libexec-check-config.sh
- create mode 100755 stx-sources/libexec-convert-config.sh
- create mode 100755 stx-sources/libexec-create-certdb.sh
- create mode 100644 stx-sources/libexec-functions
- create mode 100755 stx-sources/libexec-generate-server-cert.sh
- create mode 100755 stx-sources/libexec-update-ppolicy-schema.sh
- create mode 100755 stx-sources/libexec-upgrade-db.sh
- create mode 100644 stx-sources/openldap.tmpfiles
- create mode 100644 stx-sources/slapd.ldif
- create mode 100644 stx-sources/slapd.service
- create mode 100644 stx-sources/slapd.sysconfig
- create mode 100644 stx-sources/slapd.tmpfiles
-
-diff --git a/stx-sources/ldap.conf b/stx-sources/ldap.conf
-new file mode 100644
-index 0000000..aa6f8fd
---- /dev/null
-+++ b/stx-sources/ldap.conf
-@@ -0,0 +1,18 @@
-+#
-+# LDAP Defaults
-+#
-+
-+# See ldap.conf(5) for details
-+# This file should be world readable but not world writable.
-+
-+#BASE dc=example,dc=com
-+#URI ldap://ldap.example.com ldap://ldap-master.example.com:666
-+
-+#SIZELIMIT 12
-+#TIMELIMIT 15
-+#DEREF never
-+
-+TLS_CACERTDIR /etc/openldap/certs
-+
-+# Turning this off breaks GSSAPI used with krb5 when rdns = false
-+SASL_NOCANON on
-diff --git a/stx-sources/libexec-check-config.sh b/stx-sources/libexec-check-config.sh
-new file mode 100755
-index 0000000..87e377f
---- /dev/null
-+++ b/stx-sources/libexec-check-config.sh
-@@ -0,0 +1,91 @@
-+#!/bin/sh
-+# Author: Jan Vcelak <jvcelak@redhat.com>
-+
-+. /usr/libexec/openldap/functions
-+
-+function check_config_syntax()
-+{
-+ retcode=0
-+ tmp_slaptest=`mktemp --tmpdir=/var/run/openldap`
-+ run_as_ldap "/usr/sbin/slaptest $SLAPD_GLOBAL_OPTIONS -u" &>$tmp_slaptest
-+ if [ $? -ne 0 ]; then
-+ error "Checking configuration file failed:"
-+ cat $tmp_slaptest >&2
-+ retcode=1
-+ fi
-+ rm $tmp_slaptest
-+ return $retcode
-+}
-+
-+function check_certs_perms()
-+{
-+ retcode=0
-+ for cert in `certificates`; do
-+ run_as_ldap "/usr/bin/test -e \"$cert\""
-+ if [ $? -ne 0 ]; then
-+ error "TLS certificate/key/DB '%s' was not found." "$cert"
-+ retcoder=1
-+ continue
-+ fi
-+ run_as_ldap "/usr/bin/test -r \"$cert\""
-+ if [ $? -ne 0 ]; then
-+ error "TLS certificate/key/DB '%s' is not readable." "$cert"
-+ retcode=1
-+ fi
-+ done
-+ return $retcode
-+}
-+
-+function check_db_perms()
-+{
-+ retcode=0
-+ for dbdir in `databases`; do
-+ [ -d "$dbdir" ] || continue
-+ for dbfile in `find ${dbdir} -maxdepth 1 -name "*.dbb" -or -name "*.gdbm" -or -name "*.bdb" -or -name "__db.*" -or -name "log.*" -or -name "alock"`; do
-+ run_as_ldap "/usr/bin/test -r \"$dbfile\" -a -w \"$dbfile\""
-+ if [ $? -ne 0 ]; then
-+ error "Read/write permissions for DB file '%s' are required." "$dbfile"
-+ retcode=1
-+ fi
-+ done
-+ done
-+ return $retcode
-+}
-+
-+function check_everything()
-+{
-+ retcode=0
-+ check_config_syntax || retcode=1
-+ # TODO: need support for Mozilla NSS, disabling temporarily
-+ #check_certs_perms || retcode=1
-+ check_db_perms || retcode=1
-+ return $retcode
-+}
-+
-+if [ `id -u` -ne 0 ]; then
-+ error "You have to be root to run this script."
-+ exit 4
-+fi
-+
-+load_sysconfig
-+
-+if [ -n "$SLAPD_CONFIG_DIR" ]; then
-+ if [ ! -d "$SLAPD_CONFIG_DIR" ]; then
-+ error "Configuration directory '%s' does not exist." "$SLAPD_CONFIG_DIR"
-+ else
-+ check_everything
-+ exit $?
-+ fi
-+fi
-+
-+if [ -n "$SLAPD_CONFIG_FILE" ]; then
-+ if [ ! -f "$SLAPD_CONFIG_FILE" ]; then
-+ error "Configuration file '%s' does not exist." "$SLAPD_CONFIG_FILE"
-+ else
-+ error "Warning: Usage of a configuration file is obsolete!"
-+ check_everything
-+ exit $?
-+ fi
-+fi
-+
-+exit 1
-diff --git a/stx-sources/libexec-convert-config.sh b/stx-sources/libexec-convert-config.sh
-new file mode 100755
-index 0000000..824c3b1
---- /dev/null
-+++ b/stx-sources/libexec-convert-config.sh
-@@ -0,0 +1,79 @@
-+#!/bin/sh
-+# Author: Jan Vcelak <jvcelak@redhat.com>
-+
-+. /usr/libexec/openldap/functions
-+
-+function help()
-+{
-+ error "usage: %s [-f config-file] [-F config-dir]\n" "`basename $0`"
-+ exit 2
-+}
-+
-+load_sysconfig
-+
-+while getopts :f:F: opt; do
-+ case "$opt" in
-+ f)
-+ SLAPD_CONFIG_FILE="$OPTARG"
-+ ;;
-+ F)
-+ SLAPD_CONFIG_DIR="$OPTARG"
-+ ;;
-+ *)
-+ help
-+ ;;
-+ esac
-+done
-+shift $((OPTIND-1))
-+[ -n "$1" ] && help
-+
-+# check source, target
-+
-+if [ ! -f "$SLAPD_CONFIG_FILE" ]; then
-+ error "Source configuration file '%s' not found." "$SLAPD_CONFIG_FILE"
-+ exit 1
-+fi
-+
-+if grep -iq '^dn: cn=config$' "$SLAPD_CONFIG_FILE"; then
-+ SLAPD_CONFIG_FILE_FORMAT=ldif
-+else
-+ SLAPD_CONFIG_FILE_FORMAT=conf
-+fi
-+
-+if [ -d "$SLAPD_CONFIG_DIR" ]; then
-+ if [ `find "$SLAPD_CONFIG_DIR" -maxdepth 0 -empty | wc -l` -eq 0 ]; then
-+ error "Target configuration directory '%s' is not empty." "$SLAPD_CONFIG_DIR"
-+ exit 1
-+ fi
-+fi
-+
-+# perform the conversion
-+
-+tmp_convert=`mktemp --tmpdir=/var/run/openldap`
-+
-+if [ `id -u` -eq 0 ]; then
-+ install -d --owner $SLAPD_USER --group `id -g $SLAPD_USER` --mode 0750 "$SLAPD_CONFIG_DIR" &>>$tmp_convert
-+ if [ $SLAPD_CONFIG_FILE_FORMAT = ldif ]; then
-+ run_as_ldap "/usr/sbin/slapadd -F \"$SLAPD_CONFIG_DIR\" -n 0 -l \"$SLAPD_CONFIG_FILE\"" &>>$tmp_convert
-+ else
-+ run_as_ldap "/usr/sbin/slaptest -f \"$SLAPD_CONFIG_FILE\" -F \"$SLAPD_CONFIG_DIR\"" &>>$tmp_convert
-+ fi
-+ retcode=$?
-+else
-+ error "You are not root! Permission will not be set."
-+ install -d --mode 0750 "$SLAPD_CONFIG_DIR" &>>$tmp_convert
-+ if [ $SLAPD_CONFIG_FILE_FORMAT = ldif ]; then
-+ /usr/sbin/slapadd -F "$SLAPD_CONFIG_DIR" -n 0 -l "$SLAPD_CONFIG_FILE" &>>$tmp_convert
-+ else
-+ /usr/sbin/slaptest -f "$SLAPD_CONFIG_FILE" -F "$SLAPD_CONFIG_DIR" &>>$tmp_convert
-+ fi
-+ retcode=$?
-+fi
-+
-+if [ $retcode -ne 0 ]; then
-+ error "Configuration conversion failed:"
-+ cat $tmp_convert >&2
-+fi
-+
-+rm $tmp_convert
-+exit $retcode
-diff --git a/stx-sources/libexec-create-certdb.sh b/stx-sources/libexec-create-certdb.sh
-new file mode 100755
-index 0000000..2377fdd
---- /dev/null
-+++ b/stx-sources/libexec-create-certdb.sh
-@@ -0,0 +1,70 @@
-+#!/bin/bash
-+# Author: Jan Vcelak <jvcelak@redhat.com>
-+
-+set -e
-+
-+# default options
-+
-+CERTDB_DIR=/etc/openldap/certs
-+
-+# internals
-+
-+MODULE_CKBI="$(rpm --eval %{_libdir})/libnssckbi.so"
-+RANDOM_SOURCE=/dev/urandom
-+PASSWORD_BYTES=32
-+
-+# parse arguments
-+
-+usage() {
-+ printf "usage: create-certdb.sh [-d certdb]\n" >&2
-+ exit 1
-+}
-+
-+while getopts "d:" opt; do
-+ case "$opt" in
-+ d)
-+ CERTDB_DIR="$OPTARG"
-+ ;;
-+ \?)
-+ usage
-+ ;;
-+ esac
-+done
-+
-+[ "$OPTIND" -le "$#" ] && usage
-+
-+# verify target location
-+
-+if [ ! -d "$CERTDB_DIR" ]; then
-+ printf "Directory '%s' does not exist.\n" "$CERTDB_DIR" >&2
-+ exit 1
-+fi
-+
-+if [ ! "$(find "$CERTDB_DIR" -maxdepth 0 -empty | wc -l)" -eq 1 ]; then
-+ printf "Directory '%s' is not empty.\n" "$CERTDB_DIR" >&2
-+ exit 1
-+fi
-+
-+# create the database
-+
-+printf "Creating certificate database in '%s'.\n" "$CERTDB_DIR" >&2
-+
-+PASSWORD_FILE="$CERTDB_DIR/password"
-+OLD_UMASK="$(umask)"
-+umask 0377
-+dd if=$RANDOM_SOURCE bs=$PASSWORD_BYTES count=1 2>/dev/null | base64 > "$PASSWORD_FILE"
-+umask "$OLD_UMASK"
-+
-+certutil -d "$CERTDB_DIR" -N -f "$PASSWORD_FILE" &>/dev/null
-+
-+# load module with builtin CA certificates
-+
-+echo | modutil -dbdir "$CERTDB_DIR" -add "Root Certs" -libfile "$MODULE_CKBI" &>/dev/null
-+
-+# tune permissions
-+
-+for dbfile in "$CERTDB_DIR"/*.db; do
-+ chmod 0644 "$dbfile"
-+done
-+
-+exit 0
-diff --git a/stx-sources/libexec-functions b/stx-sources/libexec-functions
-new file mode 100644
-index 0000000..98c8631
---- /dev/null
-+++ b/stx-sources/libexec-functions
-@@ -0,0 +1,136 @@
-+# Author: Jan Vcelak <jvcelak@redhat.com>
-+
-+SLAPD_USER=
-+SLAPD_CONFIG_FILE=
-+SLAPD_CONFIG_DIR=
-+SLAPD_CONFIG_CUSTOM=
-+SLAPD_GLOBAL_OPTIONS=
-+SLAPD_SYSCONFIG_FILE=
-+
-+function default_config()
-+{
-+ SLAPD_USER=ldap
-+ SLAPD_CONFIG_FILE=/etc/openldap/slapd.conf
-+ SLAPD_CONFIG_DIR=/etc/openldap/slapd.d
-+ SLAPD_CONFIG_CUSTOM=
-+ SLAPD_GLOBAL_OPTIONS=
-+ SLAPD_SYSCONFIG_FILE=/etc/sysconfig/slapd
-+}
-+
-+function parse_config_options()
-+{
-+ user=
-+ config_file=
-+ config_dir=
-+ while getopts :u:f:F: opt; do
-+ case "$opt" in
-+ u)
-+ user="$OPTARG"
-+ ;;
-+ f)
-+ config_file="$OPTARG"
-+ ;;
-+ F)
-+ config_dir="$OPTARG"
-+ ;;
-+ esac
-+ done
-+
-+ unset OPTIND
-+
-+ if [ -n "$user" ]; then
-+ SLAPD_USER="$user"
-+ fi
-+
-+ if [ -n "$config_dir" ]; then
-+ SLAPD_CONFIG_DIR="$config_dir"
-+ SLAPD_CONFIG_FILE=
-+ SLAPD_CONFIG_CUSTOM=1
-+ SLAPD_GLOBAL_OPTIONS="-F '$config_dir'"
-+ elif [ -n "$config_file" ]; then
-+ SLAPD_CONFIG_DIR=
-+ SLAPD_CONFIG_FILE="$config_file"
-+ SLAPD_CONFIG_CUSTOM=1
-+ SLAPD_GLOBAL_OPTIONS="-f '$config_file'"
-+ fi
-+}
-+
-+function uses_new_config()
-+{
-+ [ -n "$SLAPD_CONFIG_DIR" ]
-+ return $?
-+}
-+
-+function run_as_ldap()
-+{
-+ /sbin/runuser --shell /bin/sh --session-command "$1" "$SLAPD_USER"
-+ return $?
-+}
-+
-+function ldif_unbreak()
-+{
-+ sed ':a;N;s/\n //;ta;P;D'
-+}
-+
-+function ldif_value()
-+{
-+ sed 's/^[^:]*: //'
-+}
-+
-+function databases_new()
-+{
-+ slapcat $SLAPD_GLOBAL_OPTIONS -c \
-+ -H 'ldap:///cn=config???(|(objectClass=olcBdbConfig)(objectClass=olcHdbConfig))' 2>/dev/null | \
-+ ldif_unbreak | \
-+ grep '^olcDbDirectory: ' | \
-+ ldif_value
-+}
-+
-+function databases_old()
-+{
-+ awk 'begin { database="" }
-+ $1 == "database" { database=$2 }
-+ $1 == "directory" { if (database == "bdb" || database == "hdb") print $2}' \
-+ "$SLAPD_CONFIG_FILE"
-+}
-+
-+function certificates_new()
-+{
-+ slapcat $SLAPD_GLOBAL_OPTIONS -c -H 'ldap:///cn=config???(cn=config)' 2>/dev/null | \
-+ ldif_unbreak | \
-+ grep '^olcTLS\(CACertificateFile\|CACertificatePath\|CertificateFile\|CertificateKeyFile\): ' | \
-+ ldif_value
-+}
-+
-+function certificates_old()
-+{
-+ awk '$1 ~ "^TLS(CACertificate(File|Path)|CertificateFile|CertificateKeyFile)$" { print $2 } ' \
-+ "$SLAPD_CONFIG_FILE"
-+}
-+
-+function certificates()
-+{
-+ uses_new_config && certificates_new || certificates_old
-+}
-+
-+function databases()
-+{
-+ uses_new_config && databases_new || databases_old
-+}
-+
-+
-+function error()
-+{
-+ format="$1\n"; shift
-+ printf "$format" $@ >&2
-+}
-+
-+function load_sysconfig()
-+{
-+ [ -r "$SLAPD_SYSCONFIG_FILE" ] || return
-+
-+ . "$SLAPD_SYSCONFIG_FILE"
-+ [ -n "$SLAPD_OPTIONS" ] && parse_config_options $SLAPD_OPTIONS
-+}
-+
-+default_config
-diff --git a/stx-sources/libexec-generate-server-cert.sh b/stx-sources/libexec-generate-server-cert.sh
-new file mode 100755
-index 0000000..e2f4974
---- /dev/null
-+++ b/stx-sources/libexec-generate-server-cert.sh
-@@ -0,0 +1,118 @@
-+#!/bin/bash
-+# Author: Jan Vcelak <jvcelak@redhat.com>
-+
-+set -e
-+
-+# default options
-+
-+CERTDB_DIR=/etc/openldap/certs
-+CERT_NAME="OpenLDAP Server"
-+PASSWORD_FILE=
-+HOSTNAME_FQDN="$(hostname --fqdn)"
-+ALT_NAMES=
-+ONCE=0
-+
-+# internals
-+
-+RANDOM_SOURCE=/dev/urandom
-+CERT_RANDOM_BYTES=256
-+CERT_KEY_TYPE=rsa
-+CERT_KEY_SIZE=1024
-+CERT_VALID_MONTHS=12
-+
-+# parse arguments
-+
-+usage() {
-+ printf "usage: generate-server-cert.sh [-d certdb-dir] [-n cert-name]\n" >&2
-+ printf " [-p password-file] [-h hostnames]\n" >&2
-+ printf " [-a dns-alt-names] [-o]\n" >&2
-+ exit 1
-+}
-+
-+while getopts "d:n:p:h:a:o" opt; do
-+ case "$opt" in
-+ d)
-+ CERTDB_DIR="$OPTARG"
-+ ;;
-+ n)
-+ CERT_NAME="$OPTARG"
-+ ;;
-+ p)
-+ PASSWORD_FILE="$OPTARG"
-+ ;;
-+ h)
-+ HOSTNAME_FQDN="$OPTARG"
-+ ;;
-+ a)
-+ ALT_NAMES="$OPTARG"
-+ ;;
-+ o)
-+ ONCE=1
-+ ;;
-+ \?)
-+ usage
-+ ;;
-+ esac
-+done
-+
-+[ "$OPTIND" -le "$#" ] && usage
-+
-+# generated options
-+
-+ONCE_FILE="$CERTDB_DIR/.slapd-leave"
-+PASSWORD_FILE="${PASSWORD_FILE:-${CERTDB_DIR}/password}"
-+ALT_NAMES="${ALT_NAMES:-${HOSTNAME_FQDN},localhost,localhost.localdomain}"
-+
-+# verify target location
-+
-+if [ "$ONCE" -eq 1 -a -f "$ONCE_FILE" ]; then
-+ printf "Skipping certificate generating, '%s' exists.\n" "$ONCE_FILE" >&2
-+ exit 0
-+fi
-+
-+if ! certutil -d "$CERTDB_DIR" -U &>/dev/null; then
-+ printf "Directory '%s' is not a valid certificate database.\n" "$CERTDB_DIR" >&2
-+ exit 1
-+fi
-+
-+printf "Creating new server certificate in '%s'.\n" "$CERTDB_DIR" >&2
-+
-+if [ ! -r "$PASSWORD_FILE" ]; then
-+ printf "Password file '%s' is not readable.\n" "$PASSWORD_FILE" >&2
-+ exit 1
-+fi
-+
-+if certutil -d "$CERTDB_DIR" -L -a -n "$CERT_NAME" &>/dev/null; then
-+ printf "Certificate '%s' already exists in the certificate database.\n" "$CERT_NAME" >&2
-+ exit 1
-+fi
-+
-+# generate server certificate (self signed)
-+
-+
-+CERT_RANDOM=$(mktemp --tmpdir=/var/run/openldap)
-+dd if=$RANDOM_SOURCE bs=$CERT_RANDOM_BYTES count=1 of=$CERT_RANDOM &>/dev/null
-+
-+certutil -d "$CERTDB_DIR" -f "$PASSWORD_FILE" -z "$CERT_RANDOM" \
-+ -S -x -n "$CERT_NAME" \
-+ -s "CN=$HOSTNAME_FQDN" \
-+ -t TC,, \
-+ -k $CERT_KEY_TYPE -g $CERT_KEY_SIZE \
-+ -v $CERT_VALID_MONTHS \
-+ -8 "$ALT_NAMES" \
-+ &>/dev/null
-+
-+rm -f $CERT_RANDOM
-+
-+# tune permissions
-+
-+if [ "$(id -u)" -eq 0 ]; then
-+ chgrp ldap "$PASSWORD_FILE"
-+ chmod g+r "$PASSWORD_FILE"
-+else
-+ printf "WARNING: The server requires read permissions on the password file in order to\n" >&2
-+ printf " load it's private key from the certificate database.\n" >&2
-+fi
-+
-+touch "$ONCE_FILE"
-+exit 0
-diff --git a/stx-sources/libexec-update-ppolicy-schema.sh b/stx-sources/libexec-update-ppolicy-schema.sh
-new file mode 100755
-index 0000000..a853b27
---- /dev/null
-+++ b/stx-sources/libexec-update-ppolicy-schema.sh
-@@ -0,0 +1,142 @@
-+#!/bin/bash
-+# This script serves one purpose, to add a possibly missing attribute
-+# to a ppolicy schema in a dynamic configuration of OpenLDAP. This
-+# attribute was introduced in openldap-2.4.43 and slapd will not
-+# start without it later on.
-+#
-+# The script tries to update in a directory given as first parameter,
-+# or in /etc/openldap/slapd.d implicitly.
-+#
-+# Author: Matus Honek <mhonek@redhat.com>
-+# Bugzilla: #1487857
-+
-+function log {
-+ echo "Update dynamic configuration: " $@
-+ true
-+}
-+
-+function iferr {
-+ if [ $? -ne 0 ]; then
-+ log "ERROR: " $@
-+ true
-+ else
-+ false
-+ fi
-+}
-+
-+function update {
-+ set -u
-+ shopt -s extglob
-+
-+ ORIGINAL="${1:-/etc/openldap/slapd.d}"
-+ ORIGINAL="${ORIGINAL%*(/)}"
-+
-+ ### check if necessary
-+ grep -r "pwdMaxRecordedFail" "${ORIGINAL}/cn=config/cn=schema" >/dev/null
-+ [ $? -eq 0 ] && log "Schemas look up to date. Ok. Quitting." && return 0
-+
-+ ### prep
-+ log "Prepare environment."
-+
-+ TEMPDIR=$(mktemp -d)
-+ iferr "Could not create a temporary directory. Quitting." && return 1
-+ DBDIR="${TEMPDIR}/db"
-+ SUBDBDIR="${DBDIR}/cn=temporary"
-+
-+ mkdir "${DBDIR}"
-+ iferr "Could not create temporary configuration directory. Quitting." && return 1
-+ cp -r --no-target-directory "${ORIGINAL}" "${SUBDBDIR}"
-+ iferr "Could not copy configuration. Quitting." && return 1
-+
-+ pushd "$TEMPDIR" >/dev/null
-+
-+ cat > temp.conf <<EOF
-+database ldif
-+suffix cn=temporary
-+directory db
-+access to * by * manage
-+EOF
-+
-+ SOCKET="$(pwd)/socket"
-+ LISTENER="ldapi://${SOCKET//\//%2F}"
-+ CONN_PARAMS=("-Y" "EXTERNAL" "-H" "${LISTENER}")
-+
-+ slapd -f temp.conf -h "$LISTENER" -d 0 >/dev/null 2>&1 &
-+ SLAPDPID="$!"
-+ sleep 2
-+
-+ ldapadd ${CONN_PARAMS[@]} -d 0 >/dev/null 2>&1 <<EOF
-+dn: cn=temporary
-+objectClass: olcGlobal
-+cn: temporary
-+EOF
-+ iferr "Could not populate the temporary database. Quitting." && return 1
-+
-+ ### update
-+ log "Update with new pwdMaxRecordedFailure attribute."
-+ FILTER="(&"
-+ FILTER+="(olcObjectClasses=*'pwdPolicy'*)"
-+ FILTER+="(!(olcObjectClasses=*'pwdPolicy'*'pwdMaxRecordedFailure'*))"
-+ FILTER+="(!(olcAttributeTypes=*'pwdMaxRecordedFailure'*))"
-+ FILTER+=")"
-+ RES=$(ldapsearch ${CONN_PARAMS[@]} \
-+ -b cn=schema,cn=config,cn=temporary \
-+ -LLL \
-+ -o ldif-wrap=no \
-+ "$FILTER" \
-+ dn olcObjectClasses \
-+ 2>/dev/null \
-+ | sed '/^$/d')
-+ DN=$(printf "$RES" | grep '^dn:')
-+ OC=$(printf "$RES" | grep "^olcObjectClasses:.*'pwdPolicy'")
-+ NEWOC="${OC//$ pwdSafeModify /$ pwdSafeModify $ pwdMaxRecordedFailure }"
-+
-+ test $(echo "$DN" | wc -l) = 1
-+ iferr "Received more than one DN. Cannot continue. Quitting." && return 1
-+ test "$NEWOC" != "$OC"
-+ iferr "Updating pwdPolicy objectClass definition failed. Quitting." && return 1
-+
-+ ldapmodify ${CONN_PARAMS[@]} -d 0 >/dev/null 2>&1 <<EOF
-+$DN
-+changetype: modify
-+add: olcAttributeTypes
-+olcAttributeTypes: ( 1.3.6.1.4.1.42.2.27.8.1.30 NAME 'pwdMaxRecordedFailur
-+ e' EQUALITY integerMatch ORDERING integerOrderingMatch SYNTAX 1.3.6.1.4.1.
-+ 1466.115.121.1.27 SINGLE-VALUE )
-+-
-+delete: olcObjectClasses
-+$OC
-+-
-+add: olcObjectClasses
-+$NEWOC
-+EOF
-+ iferr "Updating with new attribute failed. Quitting." && return 1
-+
-+ popd >/dev/null
-+
-+ ### apply
-+ log "Apply changes."
-+ cp -r --no-target-directory "$ORIGINAL" "$ORIGINAL~backup"
-+ iferr "Backing up old configuration failed. Quitting." && return 1
-+ cp -r --no-target-directory "$SUBDBDIR" "$ORIGINAL"
-+ iferr "Applying new configuration failed. Quitting." && return 1
-+
-+ ### clean up
-+ log "Clean up."
-+ kill "$SLAPDPID"
-+ SLAPDPID=
-+ rm -rf "$TEMPDIR"
-+ TEMPDIR=
-+}
-+
-+SLAPDPID=
-+TEMPDIR=
-+update "$1"
-+if [ $? -ne 0 ]; then
-+ log "Clean up."
-+ echo "$SLAPDPID"
-+ echo "$TEMPDIR"
-+ kill "$SLAPDPID"
-+ rm -rf "$TEMPDIR"
-+fi
-+log "Finished."
-diff --git a/stx-sources/libexec-upgrade-db.sh b/stx-sources/libexec-upgrade-db.sh
-new file mode 100755
-index 0000000..1543c80
---- /dev/null
-+++ b/stx-sources/libexec-upgrade-db.sh
-@@ -0,0 +1,40 @@
-+#!/bin/sh
-+# Author: Jan Vcelak <jvcelak@redhat.com>
-+
-+. /usr/libexec/openldap/functions
-+
-+if [ `id -u` -ne 0 ]; then
-+ error "You have to be root to run this command."
-+ exit 4
-+fi
-+
-+load_sysconfig
-+retcode=0
-+
-+for dbdir in `databases`; do
-+ upgrade_log="$dbdir/db_upgrade.`date +%Y%m%d%H%M%S`.log"
-+ bdb_files=`find "$dbdir" -maxdepth 1 -name "*.bdb" -printf '"%f" '`
-+
-+ # skip uninitialized database
-+ [ -z "$bdb_files"] || continue
-+
-+ printf "Updating '%s', logging into '%s'\n" "$dbdir" "$upgrade_log"
-+
-+ # perform the update
-+ for command in \
-+ "/usr/bin/db_recover -v -h \"$dbdir\"" \
-+ "/usr/bin/db_upgrade -v -h \"$dbdir\" $bdb_files" \
-+ "/usr/bin/db_checkpoint -v -h \"$dbdir\" -1" \
-+ ; do
-+ printf "Executing: %s\n" "$command" &>>$upgrade_log
-+ run_as_ldap "$command" &>>$upgrade_log
-+ result=$?
-+ printf "Exit code: %d\n" $result >>"$upgrade_log"
-+ if [ $result -ne 0 ]; then
-+ printf "Upgrade failed: %d\n" $result
-+ retcode=1
-+ fi
-+ done
-+done
-+
-+exit $retcode
-diff --git a/stx-sources/openldap.tmpfiles b/stx-sources/openldap.tmpfiles
-new file mode 100644
-index 0000000..aa0e805
---- /dev/null
-+++ b/stx-sources/openldap.tmpfiles
-@@ -0,0 +1,3 @@
-+# OpenLDAP TLSMC runtime directories
-+x /tmp/openldap-tlsmc-*
-+X /tmp/openldap-tlsmc-*
-diff --git a/stx-sources/slapd.ldif b/stx-sources/slapd.ldif
-new file mode 100644
-index 0000000..7b7f328
---- /dev/null
-+++ b/stx-sources/slapd.ldif
-@@ -0,0 +1,148 @@
-+#
-+# See slapd-config(5) for details on configuration options.
-+# This file should NOT be world readable.
-+#
-+
-+dn: cn=config
-+objectClass: olcGlobal
-+cn: config
-+olcArgsFile: /var/run/openldap/slapd.args
-+olcPidFile: /var/run/openldap/slapd.pid
-+#
-+# TLS settings
-+#
-+olcTLSCACertificatePath: /etc/openldap/certs
-+olcTLSCertificateFile: "OpenLDAP Server"
-+olcTLSCertificateKeyFile: /etc/openldap/certs/password
-+#
-+# Do not enable referrals until AFTER you have a working directory
-+# service AND an understanding of referrals.
-+#
-+#olcReferral: ldap://root.openldap.org
-+#
-+# Sample security restrictions
-+# Require integrity protection (prevent hijacking)
-+# Require 112-bit (3DES or better) encryption for updates
-+# Require 64-bit encryption for simple bind
-+#
-+#olcSecurity: ssf=1 update_ssf=112 simple_bind=64
-+
-+
-+#
-+# Load dynamic backend modules:
-+# - modulepath is architecture dependent value (32/64-bit system)
-+# - back_sql.la backend requires openldap-servers-sql package
-+# - dyngroup.la and dynlist.la cannot be used at the same time
-+#
-+
-+#dn: cn=module,cn=config
-+#objectClass: olcModuleList
-+#cn: module
-+#olcModulepath: /usr/lib/openldap
-+#olcModulepath: /usr/lib64/openldap
-+#olcModuleload: accesslog.la
-+#olcModuleload: auditlog.la
-+#olcModuleload: back_dnssrv.la
-+#olcModuleload: back_ldap.la
-+#olcModuleload: back_mdb.la
-+#olcModuleload: back_meta.la
-+#olcModuleload: back_null.la
-+#olcModuleload: back_passwd.la
-+#olcModuleload: back_relay.la
-+#olcModuleload: back_shell.la
-+#olcModuleload: back_sock.la
-+#olcModuleload: collect.la
-+#olcModuleload: constraint.la
-+#olcModuleload: dds.la
-+#olcModuleload: deref.la
-+#olcModuleload: dyngroup.la
-+#olcModuleload: dynlist.la
-+#olcModuleload: memberof.la
-+#olcModuleload: pcache.la
-+#olcModuleload: ppolicy.la
-+#olcModuleload: refint.la
-+#olcModuleload: retcode.la
-+#olcModuleload: rwm.la
-+#olcModuleload: seqmod.la
-+#olcModuleload: smbk5pwd.la
-+#olcModuleload: sssvlv.la
-+#olcModuleload: syncprov.la
-+#olcModuleload: translucent.la
-+#olcModuleload: unique.la
-+#olcModuleload: valsort.la
-+
-+
-+#
-+# Schema settings
-+#
-+
-+dn: cn=schema,cn=config
-+objectClass: olcSchemaConfig
-+cn: schema
-+
-+include: file:///etc/openldap/schema/core.ldif
-+
-+#
-+# Frontend settings
-+#
-+
-+dn: olcDatabase=frontend,cn=config
-+objectClass: olcDatabaseConfig
-+objectClass: olcFrontendConfig
-+olcDatabase: frontend
-+#
-+# Sample global access control policy:
-+# Root DSE: allow anyone to read it
-+# Subschema (sub)entry DSE: allow anyone to read it
-+# Other DSEs:
-+# Allow self write access
-+# Allow authenticated users read access
-+# Allow anonymous users to authenticate
-+#
-+#olcAccess: to dn.base="" by * read
-+#olcAccess: to dn.base="cn=Subschema" by * read
-+#olcAccess: to *
-+# by self write
-+# by users read
-+# by anonymous auth
-+#
-+# if no access controls are present, the default policy
-+# allows anyone and everyone to read anything but restricts
-+# updates to rootdn. (e.g., "access to * by * read")
-+#
-+# rootdn can always read and write EVERYTHING!
-+#
-+
-+#
-+# Configuration database
-+#
-+
-+dn: olcDatabase=config,cn=config
-+objectClass: olcDatabaseConfig
-+olcDatabase: config
-+olcAccess: to * by dn.base="gidNumber=0+uidNumber=0,cn=peercred,cn=external,c
-+ n=auth" manage by * none
-+
-+#
-+# Server status monitoring
-+#
-+
-+dn: olcDatabase=monitor,cn=config
-+objectClass: olcDatabaseConfig
-+olcDatabase: monitor
-+olcAccess: to * by dn.base="gidNumber=0+uidNumber=0,cn=peercred,cn=external,c
-+ n=auth" read by dn.base="cn=Manager,dc=my-domain,dc=com" read by * none
-+
-+#
-+# Backend database definitions
-+#
-+
-+dn: olcDatabase=hdb,cn=config
-+objectClass: olcDatabaseConfig
-+objectClass: olcHdbConfig
-+olcDatabase: hdb
-+olcSuffix: dc=my-domain,dc=com
-+olcRootDN: cn=Manager,dc=my-domain,dc=com
-+olcDbDirectory: /var/lib/ldap
-+olcDbIndex: objectClass eq,pres
-+olcDbIndex: ou,cn,mail,surname,givenname eq,pres,sub
-diff --git a/stx-sources/slapd.service b/stx-sources/slapd.service
-new file mode 100644
-index 0000000..8a3a722
---- /dev/null
-+++ b/stx-sources/slapd.service
-@@ -0,0 +1,19 @@
-+[Unit]
-+Description=OpenLDAP Server Daemon
-+After=syslog.target network-online.target
-+Documentation=man:slapd
-+Documentation=man:slapd-config
-+Documentation=man:slapd-hdb
-+Documentation=man:slapd-mdb
-+Documentation=file:///usr/share/doc/openldap-servers/guide.html
-+
-+[Service]
-+Type=forking
-+PIDFile=/var/run/openldap/slapd.pid
-+Environment="SLAPD_URLS=ldap:/// ldapi:///" "SLAPD_OPTIONS="
-+EnvironmentFile=/etc/sysconfig/slapd
-+ExecStartPre=/usr/libexec/openldap/check-config.sh
-+ExecStart=/usr/sbin/slapd -u ldap -h ${SLAPD_URLS} $SLAPD_OPTIONS
-+
-+[Install]
-+WantedBy=multi-user.target
-diff --git a/stx-sources/slapd.sysconfig b/stx-sources/slapd.sysconfig
-new file mode 100644
-index 0000000..68091a5
---- /dev/null
-+++ b/stx-sources/slapd.sysconfig
-@@ -0,0 +1,15 @@
-+# OpenLDAP server configuration
-+# see 'man slapd' for additional information
-+
-+# Where the server will run (-h option)
-+# - ldapi:/// is required for on-the-fly configuration using client tools
-+# (use SASL with EXTERNAL mechanism for authentication)
-+# - default: ldapi:/// ldap:///
-+# - example: ldapi:/// ldap://127.0.0.1/ ldap://10.0.0.1:1389/ ldaps:///
-+SLAPD_URLS="ldapi:/// ldap:///"
-+
-+# Any custom options
-+#SLAPD_OPTIONS=""
-+
-+# Keytab location for GSSAPI Kerberos authentication
-+#KRB5_KTNAME="FILE:/etc/openldap/ldap.keytab"
-diff --git a/stx-sources/slapd.tmpfiles b/stx-sources/slapd.tmpfiles
-new file mode 100644
-index 0000000..56aa32e
---- /dev/null
-+++ b/stx-sources/slapd.tmpfiles
-@@ -0,0 +1,2 @@
-+# openldap runtime directory for slapd.arg and slapd.pid
-+d /var/run/openldap 0755 ldap ldap -
---
-2.17.1
-
+++ /dev/null
-From 26002bd1d02d871e3c0526f3a0b7b99e25f3564c Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Tue, 5 Nov 2019 18:02:38 -0800
-Subject: [PATCH] ltb project openldap ppolicy check password 1.1
-
-From stx 1901 openldap src RPM 2.4.44
-Upstream at https://github.com/ltb-project/openldap-ppolicy-check-password.git
----
- .../INSTALL | 31 ++
- .../LICENSE | 50 ++
- .../Makefile | 48 ++
- .../README | 146 ++++++
- .../check_password.c | 447 ++++++++++++++++++
- 5 files changed, 722 insertions(+)
- create mode 100644 ltb-project-openldap-ppolicy-check-password-1.1/INSTALL
- create mode 100644 ltb-project-openldap-ppolicy-check-password-1.1/LICENSE
- create mode 100644 ltb-project-openldap-ppolicy-check-password-1.1/Makefile
- create mode 100644 ltb-project-openldap-ppolicy-check-password-1.1/README
- create mode 100644 ltb-project-openldap-ppolicy-check-password-1.1/check_password.c
-
-diff --git a/ltb-project-openldap-ppolicy-check-password-1.1/INSTALL b/ltb-project-openldap-ppolicy-check-password-1.1/INSTALL
-new file mode 100644
-index 0000000..eb2dab4
---- /dev/null
-+++ b/ltb-project-openldap-ppolicy-check-password-1.1/INSTALL
-@@ -0,0 +1,31 @@
-+INSTALLATION
-+============
-+
-+Build dependencies
-+------------------
-+cracklib header files (link with -lcrack). The Makefile does not look for
-+cracklib; you may need to provide the paths manually.
-+
-+Build
-+-----
-+Use the provided Makefile to build the module.
-+
-+Copy the resulting check_password.so into the OpenLDAP modulepath.
-+
-+Or, change the installation path to match with the OpenLDAP module path in the
-+Makefile and use 'make install'.
-+
-+
-+USAGE
-+=====
-+Add objectClass 'pwdPolicyChecker' with an attribute
-+
-+ pwdCheckModule: check_password.so
-+
-+to a password policy entry.
-+
-+The module depends on a working cracklib installation including wordlist files.
-+If the wordlist files are not readable, the cracklib check will be skipped
-+silently.
-+
-+But you can use this module without cracklib, just checks for syntatic checks.
-diff --git a/ltb-project-openldap-ppolicy-check-password-1.1/LICENSE b/ltb-project-openldap-ppolicy-check-password-1.1/LICENSE
-new file mode 100644
-index 0000000..03f692b
---- /dev/null
-+++ b/ltb-project-openldap-ppolicy-check-password-1.1/LICENSE
-@@ -0,0 +1,50 @@
-+OpenLDAP Public License
-+
-+The OpenLDAP Public License
-+ Version 2.8.1, 25 November 2003
-+
-+Redistribution and use of this software and associated documentation
-+("Software"), with or without modification, are permitted provided
-+that the following conditions are met:
-+
-+1. Redistributions in source form must retain copyright statements
-+ and notices,
-+
-+2. Redistributions in binary form must reproduce applicable copyright
-+ statements and notices, this list of conditions, and the following
-+ disclaimer in the documentation and/or other materials provided
-+ with the distribution, and
-+
-+3. Redistributions must contain a verbatim copy of this document.
-+
-+The OpenLDAP Foundation may revise this license from time to time.
-+Each revision is distinguished by a version number. You may use
-+this Software under terms of this license revision or under the
-+terms of any subsequent revision of the license.
-+
-+THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
-+CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-+SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
-+OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGE.
-+
-+The names of the authors and copyright holders must not be used in
-+advertising or otherwise to promote the sale, use or other dealing
-+in this Software without specific, written prior permission. Title
-+to copyright in this Software shall at all times remain with copyright
-+holders.
-+
-+OpenLDAP is a registered trademark of the OpenLDAP Foundation.
-+
-+Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
-+California, USA. All rights reserved. Permission to copy and
-+distribute verbatim copies of this document is granted.
-+
-diff --git a/ltb-project-openldap-ppolicy-check-password-1.1/Makefile b/ltb-project-openldap-ppolicy-check-password-1.1/Makefile
-new file mode 100644
-index 0000000..91de40b
---- /dev/null
-+++ b/ltb-project-openldap-ppolicy-check-password-1.1/Makefile
-@@ -0,0 +1,48 @@
-+# contrib/slapd-modules/check_password/Makefile
-+# Copyright 2007 Michael Steinmann, Calivia. All Rights Reserved.
-+# Updated by Pierre-Yves Bonnetain, B&A Consultants, 2008
-+#
-+
-+CC=gcc
-+
-+# Where to look for the CrackLib dictionaries
-+#
-+CRACKLIB=/usr/share/cracklib/pw_dict
-+
-+# Path to the configuration file
-+#
-+CONFIG=/etc/openldap/check_password.conf
-+
-+CFLAGS+=-fpic \
-+ -DHAVE_CRACKLIB -DCRACKLIB_DICTPATH="\"$(CRACKLIB)\"" \
-+ -DCONFIG_FILE="\"$(CONFIG)\"" \
-+ -DDEBUG
-+
-+LDAP_LIB=-lldap_r -llber
-+
-+# Comment out this line if you do NOT want to use the cracklib.
-+# You may have to add an -Ldirectory if the libcrak is not in a standard
-+# location
-+#
-+CRACKLIB_LIB=-lcrack
-+
-+LIBS=$(LDAP_LIB) $(CRACKLIB_LIB)
-+
-+LIBDIR=/usr/lib/openldap/
-+
-+
-+all: check_password
-+
-+check_password.o:
-+ $(CC) $(CFLAGS) -c $(LDAP_INC) check_password.c
-+
-+check_password: clean check_password.o
-+ $(CC) $(LDFLAGS) -shared -o check_password.so check_password.o $(CRACKLIB_LIB)
-+
-+install: check_password
-+ cp -f check_password.so ../../../usr/lib/openldap/modules/
-+
-+clean:
-+ $(RM) check_password.o check_password.so check_password.lo
-+ $(RM) -r .libs
-+
-diff --git a/ltb-project-openldap-ppolicy-check-password-1.1/README b/ltb-project-openldap-ppolicy-check-password-1.1/README
-new file mode 100644
-index 0000000..10191c2
---- /dev/null
-+++ b/ltb-project-openldap-ppolicy-check-password-1.1/README
-@@ -0,0 +1,146 @@
-+
-+check_password.c - OpenLDAP pwdChecker library
-+
-+2007-06-06 Michael Steinmann <msl@calivia.com>
-+2008-01-30 Pierre-Yves Bonnetain <py.bonnetain@ba-cst.com>
-+2009 Clement Oudot <clem.oudot@gmail.com> - LTB-project
-+2009 Jerome HUET - LTB-project
-+
-+check_password.c is an OpenLDAP pwdPolicyChecker module used to check the
-+strength and quality of user-provided passwords.
-+
-+This module is used as an extension of the OpenLDAP password policy controls,
-+see slapo-ppolicy(5) section pwdCheckModule.
-+
-+check_password.c will run a number of checks on the passwords to ensure minimum
-+strength and quality requirements are met. Passwords that do not meet these
-+requirements are rejected.
-+
-+
-+Password checks
-+---------------
-+ - passwords shorter than 6 characters are rejected if cracklib is used (because
-+ cracklib WILL reject them).
-+
-+ - syntactic checks controls how many different character classes are used
-+ (lower, upper, digit and punctuation characters). The minimum number of
-+ classes is defined in a configuration file. You can set the minimum for each
-+ class.
-+
-+ - passwords are checked against cracklib if cracklib is enabled at compile
-+ time. It can be disabled in configuration file.
-+
-+INSTALLATION
-+------------
-+Use the provided Makefile to build the module.
-+
-+Compilation constants :
-+
-+CONFIG_FILE : Path to the configuration file.
-+ Defaults to /etc/openldap/check_password.conf
-+
-+DEBUG : If defined, check_password will syslog() its actions.
-+
-+Build dependencies
-+cracklib header files (link with -lcrack). The Makefile does not look for
-+cracklib; you may need to provide the paths manually.
-+
-+Install into the slapd server module path. Change the installation
-+path to match with the OpenLDAP module path in the Makefile.
-+
-+The module may be defined with slapd.conf parameter "modulepath".
-+
-+USAGE
-+-----
-+To use this module you need to add objectClass pwdPolicyChecker with an
-+attribute 'pwdCheckModule: check_password.so' to a password policy entry.
-+
-+The module depends on a working cracklib installation including wordlist files.
-+If the wordlist files are not readable, the cracklib check will be skipped
-+silently.
-+
-+Note: pwdPolicyChecker modules are loaded on *every* password change operation.
-+
-+Configuration
-+-------------
-+The configuration file (/etc/openldap/check_password.conf by default) contains
-+parameters for the module. If the file is not found, parameters are given their
-+default value.
-+
-+The syntax of the file is :
-+
-+parameter value
-+
-+with spaces being delimiters. Parameter names ARE case sensitive (this may
-+change in the future).
-+
-+Current parameters :
-+
-+- useCracklib: integer. Default value: 1. Set it to 0 to disable cracklib verification.
-+ It has no effect if cracklib is not included at compile time.
-+
-+- minPoints: integer. Default value: 3. Minimum number of quality points a new
-+ password must have to be accepted. One quality point is awarded for each character
-+ class used in the password.
-+
-+- minUpper: integer. Defaut value: 0. Minimum upper characters expected.
-+
-+- minLower: integer. Defaut value: 0. Minimum lower characters expected.
-+
-+- minDigit: integer. Defaut value: 0. Minimum digit characters expected.
-+
-+- minPunct: integer. Defaut value: 0. Minimum punctuation characters expected.
-+
-+Logs
-+----
-+If a user password is rejected by an OpenLDAP pwdChecker module, the user will
-+*not* get a detailed error message, this is by design.
-+
-+Typical user message from ldappasswd(5):
-+ Result: Constraint violation (19)
-+ Additional info: Password fails quality checking policy
-+
-+A more detailed message is written to the server log.
-+
-+Server log:
-+ check_password_quality: module error: (check_password.so)
-+ Password for dn=".." does not pass required number of strength checks (2 of 3)
-+
-+
-+Caveats
-+-------
-+Runtime errors with this module (such as cracklib configuration problems) may
-+bring down the slapd process.
-+
-+Use at your own risk.
-+
-+
-+TODO
-+----
-+* use proper malloc function, see ITS#4998
-+
-+
-+HISTORY
-+-------
-+* 2009-10-30 Clement OUDOT - LTB-project
-+ Version 1.1
-+ - Apply patch from Jerome HUET for minUpper/minLower/minDigit/minPunct
-+
-+* 2009-02-05 Clement Oudot <clem.oudot@gmail.com> - LINAGORA Group
-+ Version 1.0.3
-+ - Add useCracklib parameter in config file (with help of Pascal Pejac)
-+ - Prefix log messages with "check_password: "
-+ - Log what character type is found for quality checking
-+
-+* 2008-01-31 Pierre-Yves Bonnetain <py.bonnetain@ba-cst.com>
-+ Version 1.0.2
-+ - Several bug fixes.
-+ - Add external config file
-+
-+* 2007-06-06 Michael Steinmann <msl@calivia.com>
-+ Version 1.0.1
-+ - add dn to error messages
-+
-+* 2007-06-02 Michael Steinmann <msl@calivia.com>
-+ Version 1.0
-+
-diff --git a/ltb-project-openldap-ppolicy-check-password-1.1/check_password.c b/ltb-project-openldap-ppolicy-check-password-1.1/check_password.c
-new file mode 100644
-index 0000000..f4dd1cb
---- /dev/null
-+++ b/ltb-project-openldap-ppolicy-check-password-1.1/check_password.c
-@@ -0,0 +1,447 @@
-+/*
-+ * check_password.c for OpenLDAP
-+ *
-+ * See LICENSE, README and INSTALL files
-+ */
-+
-+#include <string.h>
-+#include <ctype.h>
-+#include <portable.h>
-+#include <slap.h>
-+
-+#ifdef HAVE_CRACKLIB
-+#include <crack.h>
-+#endif
-+
-+#if defined(DEBUG)
-+#include <syslog.h>
-+#endif
-+
-+#ifndef CRACKLIB_DICTPATH
-+#define CRACKLIB_DICTPATH "/usr/share/cracklib/pw_dict"
-+#endif
-+
-+#ifndef CONFIG_FILE
-+#define CONFIG_FILE "/etc/openldap/check_password.conf"
-+#endif
-+
-+#define DEFAULT_QUALITY 3
-+#define DEFAULT_CRACKLIB 1
-+#define MEMORY_MARGIN 50
-+#define MEM_INIT_SZ 64
-+#define FILENAME_MAXLEN 512
-+
-+#define PASSWORD_TOO_SHORT_SZ \
-+ "Password for dn=\"%s\" is too short (%d/6)"
-+#define PASSWORD_QUALITY_SZ \
-+ "Password for dn=\"%s\" does not pass required number of strength checks for the required character sets (%d of %d)"
-+#define BAD_PASSWORD_SZ \
-+ "Bad password for dn=\"%s\" because %s"
-+#define UNKNOWN_ERROR_SZ \
-+ "An unknown error occurred, please see your systems administrator"
-+
-+typedef int (*validator) (char*);
-+static int read_config_file ();
-+static validator valid_word (char *);
-+static int set_quality (char *);
-+static int set_cracklib (char *);
-+
-+int check_password (char *pPasswd, char **ppErrStr, Entry *pEntry);
-+
-+struct config_entry {
-+ char* key;
-+ char* value;
-+ char* def_value;
-+} config_entries[] = { { "minPoints", NULL, "3"},
-+ { "useCracklib", NULL, "1"},
-+ { "minUpper", NULL, "0"},
-+ { "minLower", NULL, "0"},
-+ { "minDigit", NULL, "0"},
-+ { "minPunct", NULL, "0"},
-+ { NULL, NULL, NULL }};
-+
-+int get_config_entry_int(char* entry) {
-+ struct config_entry* centry = config_entries;
-+
-+ int i = 0;
-+ char* key = centry[i].key;
-+ while (key != NULL) {
-+ if ( strncmp(key, entry, strlen(key)) == 0 ) {
-+ if ( centry[i].value == NULL ) {
-+ return atoi(centry[i].def_value);
-+ }
-+ else {
-+ return atoi(centry[i].value);
-+ }
-+ }
-+ i++;
-+ key = centry[i].key;
-+ }
-+
-+ return -1;
-+}
-+
-+void dealloc_config_entries() {
-+ struct config_entry* centry = config_entries;
-+
-+ int i = 0;
-+ while (centry[i].key != NULL) {
-+ if ( centry[i].value != NULL ) {
-+ ber_memfree(centry[i].value);
-+ }
-+ i++;
-+ }
-+}
-+
-+char* chomp(char *s)
-+{
-+ char* t = ber_memalloc(strlen(s)+1);
-+ strncpy (t,s,strlen(s)+1);
-+
-+ if ( t[strlen(t)-1] == '\n' ) {
-+ t[strlen(t)-1] = '\0';
-+ }
-+
-+ return t;
-+}
-+
-+static int set_quality (char *value)
-+{
-+#if defined(DEBUG)
-+ syslog(LOG_INFO, "check_password: Setting quality to [%s]", value);
-+#endif
-+
-+ /* No need to require more quality than we can check for. */
-+ if (!isdigit(*value) || (int) (value[0] - '0') > 4) return DEFAULT_QUALITY;
-+ return (int) (value[0] - '0');
-+
-+}
-+
-+static int set_cracklib (char *value)
-+{
-+#if defined(DEBUG)
-+ syslog(LOG_INFO, "check_password: Setting cracklib usage to [%s]", value);
-+#endif
-+
-+
-+ return (int) (value[0] - '0');
-+
-+}
-+
-+static int set_digit (char *value)
-+{
-+#if defined(DEBUG)
-+ syslog(LOG_INFO, "check_password: Setting parameter to [%s]", value);
-+#endif
-+ if (!isdigit(*value) || (int) (value[0] - '0') > 9) return 0;
-+ return (int) (value[0] - '0');
-+}
-+
-+static validator valid_word (char *word)
-+{
-+ struct {
-+ char * parameter;
-+ validator dealer;
-+ } list[] = { { "minPoints", set_quality },
-+ { "useCracklib", set_cracklib },
-+ { "minUpper", set_digit },
-+ { "minLower", set_digit },
-+ { "minDigit", set_digit },
-+ { "minPunct", set_digit },
-+ { NULL, NULL } };
-+ int index = 0;
-+
-+#if defined(DEBUG)
-+ syslog(LOG_DEBUG, "check_password: Validating parameter [%s]", word);
-+#endif
-+
-+ while (list[index].parameter != NULL) {
-+ if (strlen(word) == strlen(list[index].parameter) &&
-+ strcmp(list[index].parameter, word) == 0) {
-+#if defined(DEBUG)
-+ syslog(LOG_DEBUG, "check_password: Parameter accepted.");
-+#endif
-+ return list[index].dealer;
-+ }
-+ index++;
-+ }
-+
-+#if defined(DEBUG)
-+ syslog(LOG_DEBUG, "check_password: Parameter rejected.");
-+#endif
-+
-+ return NULL;
-+}
-+
-+static int read_config_file ()
-+{
-+ FILE * config;
-+ char * line;
-+ int returnValue = -1;
-+
-+ line = ber_memcalloc(260, sizeof(char));
-+
-+ if ( line == NULL ) {
-+ return returnValue;
-+ }
-+
-+ if ( (config = fopen(CONFIG_FILE, "r")) == NULL) {
-+#if defined(DEBUG)
-+ syslog(LOG_ERR, "check_password: Opening file %s failed", CONFIG_FILE);
-+#endif
-+
-+ ber_memfree(line);
-+ return returnValue;
-+ }
-+
-+ returnValue = 0;
-+
-+ while (fgets(line, 256, config) != NULL) {
-+ char *start = line;
-+ char *word, *value;
-+ validator dealer;
-+
-+#if defined(DEBUG)
-+ /* Debug traces to syslog. */
-+ syslog(LOG_DEBUG, "check_password: Got line |%s|", line);
-+#endif
-+
-+ while (isspace(*start) && isascii(*start)) start++;
-+
-+ /* If we've got punctuation, just skip the line. */
-+ if ( ispunct(*start)) {
-+#if defined(DEBUG)
-+ /* Debug traces to syslog. */
-+ syslog(LOG_DEBUG, "check_password: Skipped line |%s|", line);
-+#endif
-+ continue;
-+ }
-+
-+ if( isascii(*start)) {
-+
-+ struct config_entry* centry = config_entries;
-+ int i = 0;
-+ char* keyWord = centry[i].key;
-+ if ((word = strtok(start, " \t")) && (value = strtok(NULL, " \t"))) {
-+ while ( keyWord != NULL ) {
-+ if ((strncmp(keyWord,word,strlen(keyWord)) == 0) && (dealer = valid_word(word)) ) {
-+
-+#if defined(DEBUG)
-+ syslog(LOG_DEBUG, "check_password: Word = %s, value = %s", word, value);
-+#endif
-+
-+ centry[i].value = chomp(value);
-+ break;
-+ }
-+ i++;
-+ keyWord = centry[i].key;
-+ }
-+ }
-+ }
-+ }
-+ fclose(config);
-+ ber_memfree(line);
-+
-+ return returnValue;
-+}
-+
-+static int realloc_error_message (char ** target, int curlen, int nextlen)
-+{
-+ if (curlen < nextlen + MEMORY_MARGIN) {
-+#if defined(DEBUG)
-+ syslog(LOG_WARNING, "check_password: Reallocating szErrStr from %d to %d",
-+ curlen, nextlen + MEMORY_MARGIN);
-+#endif
-+ ber_memfree(*target);
-+ curlen = nextlen + MEMORY_MARGIN;
-+ *target = (char *) ber_memalloc(curlen);
-+ }
-+
-+ return curlen;
-+}
-+
-+int
-+check_password (char *pPasswd, char **ppErrStr, Entry *pEntry)
-+{
-+
-+ char *szErrStr = (char *) ber_memalloc(MEM_INIT_SZ);
-+ int mem_len = MEM_INIT_SZ;
-+
-+ int nLen;
-+ int nLower = 0;
-+ int nUpper = 0;
-+ int nDigit = 0;
-+ int nPunct = 0;
-+ int minLower = 0;
-+ int minUpper = 0;
-+ int minDigit = 0;
-+ int minPunct = 0;
-+ int nQuality = 0;
-+ int i;
-+
-+ /* Set a sensible default to keep original behaviour. */
-+ int minQuality = DEFAULT_QUALITY;
-+ int useCracklib = DEFAULT_CRACKLIB;
-+
-+ /** bail out early as cracklib will reject passwords shorter
-+ * than 6 characters
-+ */
-+
-+ nLen = strlen (pPasswd);
-+ if ( nLen < 6) {
-+ mem_len = realloc_error_message(&szErrStr, mem_len,
-+ strlen(PASSWORD_TOO_SHORT_SZ) +
-+ strlen(pEntry->e_name.bv_val) + 1);
-+ sprintf (szErrStr, PASSWORD_TOO_SHORT_SZ, pEntry->e_name.bv_val, nLen);
-+ goto fail;
-+ }
-+
-+ if (read_config_file() == -1) {
-+ syslog(LOG_ERR, "Warning: Could not read values from config file %s. Using defaults.", CONFIG_FILE);
-+ }
-+
-+ minQuality = get_config_entry_int("minPoints");
-+ useCracklib = get_config_entry_int("useCracklib");
-+ minUpper = get_config_entry_int("minUpper");
-+ minLower = get_config_entry_int("minLower");
-+ minDigit = get_config_entry_int("minDigit");
-+ minPunct = get_config_entry_int("minPunct");
-+
-+ /** The password must have at least minQuality strength points with one
-+ * point for the first occurrance of a lower, upper, digit and
-+ * punctuation character
-+ */
-+
-+ for ( i = 0; i < nLen; i++ ) {
-+
-+ if ( islower (pPasswd[i]) ) {
-+ minLower--;
-+ if ( !nLower && (minLower < 1)) {
-+ nLower = 1; nQuality++;
-+#if defined(DEBUG)
-+ syslog(LOG_DEBUG, "check_password: Found lower character - quality raise %d", nQuality);
-+#endif
-+ }
-+ continue;
-+ }
-+
-+ if ( isupper (pPasswd[i]) ) {
-+ minUpper--;
-+ if ( !nUpper && (minUpper < 1)) {
-+ nUpper = 1; nQuality++;
-+#if defined(DEBUG)
-+ syslog(LOG_DEBUG, "check_password: Found upper character - quality raise %d", nQuality);
-+#endif
-+ }
-+ continue;
-+ }
-+
-+ if ( isdigit (pPasswd[i]) ) {
-+ minDigit--;
-+ if ( !nDigit && (minDigit < 1)) {
-+ nDigit = 1; nQuality++;
-+#if defined(DEBUG)
-+ syslog(LOG_DEBUG, "check_password: Found digit character - quality raise %d", nQuality);
-+#endif
-+ }
-+ continue;
-+ }
-+
-+ if ( ispunct (pPasswd[i]) ) {
-+ minPunct--;
-+ if ( !nPunct && (minPunct < 1)) {
-+ nPunct = 1; nQuality++;
-+#if defined(DEBUG)
-+ syslog(LOG_DEBUG, "check_password: Found punctuation character - quality raise %d", nQuality);
-+#endif
-+ }
-+ continue;
-+ }
-+ }
-+
-+ /*
-+ * If you have a required field, then it should be required in the strength
-+ * checks.
-+ */
-+
-+ if (
-+ (minLower > 0 ) ||
-+ (minUpper > 0 ) ||
-+ (minDigit > 0 ) ||
-+ (minPunct > 0 ) ||
-+ (nQuality < minQuality)
-+ ) {
-+ mem_len = realloc_error_message(&szErrStr, mem_len,
-+ strlen(PASSWORD_QUALITY_SZ) +
-+ strlen(pEntry->e_name.bv_val) + 2);
-+ sprintf (szErrStr, PASSWORD_QUALITY_SZ, pEntry->e_name.bv_val,
-+ nQuality, minQuality);
-+ goto fail;
-+ }
-+
-+#ifdef HAVE_CRACKLIB
-+
-+ /** Check password with cracklib */
-+
-+ if ( useCracklib > 0 ) {
-+ int j = 0;
-+ FILE* fp;
-+ char filename[FILENAME_MAXLEN];
-+ char const* ext[] = { "hwm", "pwd", "pwi" };
-+ int nErr = 0;
-+
-+ /**
-+ * Silently fail when cracklib wordlist is not found
-+ */
-+
-+ for ( j = 0; j < 3; j++ ) {
-+
-+ snprintf (filename, FILENAME_MAXLEN - 1, "%s.%s", \
-+ CRACKLIB_DICTPATH, ext[j]);
-+
-+ if (( fp = fopen ( filename, "r")) == NULL ) {
-+
-+ nErr = 1;
-+ break;
-+
-+ } else {
-+
-+ fclose (fp);
-+
-+ }
-+ }
-+
-+ char *r;
-+ if ( nErr == 0) {
-+
-+ r = (char *) FascistCheck (pPasswd, CRACKLIB_DICTPATH);
-+ if ( r != NULL ) {
-+ mem_len = realloc_error_message(&szErrStr, mem_len,
-+ strlen(BAD_PASSWORD_SZ) +
-+ strlen(pEntry->e_name.bv_val) +
-+ strlen(r));
-+ sprintf (szErrStr, BAD_PASSWORD_SZ, pEntry->e_name.bv_val, r);
-+ goto fail;
-+ }
-+ }
-+ }
-+
-+ else {
-+#if defined(DEBUG)
-+ syslog(LOG_NOTICE, "check_password: Cracklib verification disabled by configuration");
-+#endif
-+ }
-+
-+#endif
-+ dealloc_config_entries();
-+ *ppErrStr = strdup ("");
-+ ber_memfree(szErrStr);
-+ return (LDAP_SUCCESS);
-+
-+fail:
-+ dealloc_config_entries();
-+ *ppErrStr = strdup (szErrStr);
-+ ber_memfree(szErrStr);
-+ return (EXIT_FAILURE);
-+
-+}
---
-2.17.1
-
+++ /dev/null
-From 9456b0eee753d9fd368347b6974a2f6f8d941d4f Mon Sep 17 00:00:00 2001
-From: Kam Nasim <kam.nasim@windriver.com>
-Date: Tue, 11 Apr 2017 17:23:03 -0400
-Subject: [PATCH] rootdn should not bypass ppolicy
-
----
- servers/slapd/overlays/ppolicy.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
-index b446deb..fa79872 100644
---- a/servers/slapd/overlays/ppolicy.c
-+++ b/servers/slapd/overlays/ppolicy.c
-@@ -1905,7 +1905,8 @@ ppolicy_modify( Operation *op, SlapReply *rs )
- for(p=tl; p; p=p->next, hsize++); /* count history size */
- }
-
-- if (be_isroot( op )) goto do_modify;
-+ /* WRS UPDATE: Run ppolicy for all user password modify ops */
-+ //if (be_isroot( op )) goto do_modify;
-
- /* NOTE: according to draft-behera-ldap-password-policy
- * pwdAllowUserChange == FALSE must only prevent pwd changes
-@@ -2009,7 +2010,13 @@ ppolicy_modify( Operation *op, SlapReply *rs )
- }
-
- bv = newpw.bv_val ? &newpw : &addmod->sml_values[0];
-- if (pp.pwdCheckQuality > 0) {
-+
-+ /* WRS UPDATE:
-+ * If this is a rootDN op and this is the first password
-+ * then bypass password policies as this is a new account
-+ * creation
-+ */
-+ if (pp.pwdCheckQuality > 0 && !(be_isroot( op ) && !pa)) {
-
- rc = check_password_quality( bv, &pp, &pErr, e, (char **)&txt );
- if (rc != LDAP_SUCCESS) {
---
-1.9.1
-
+++ /dev/null
-
-#
-# LDAP Defaults
-#
-
-# See ldap.conf(5) for details
-# This file should be world readable but not world writable.
-
-#BASE dc=example,dc=com
-#URI ldap://ldap.example.com ldap://ldap-master.example.com:666
-
-#SIZELIMIT 12
-#TIMELIMIT 15
-#DEREF never
-
-TLS_CACERTDIR /etc/openldap/certs
-
-# Turning this off breaks GSSAPI used with krb5 when rdns = false
-SASL_NOCANON on
+++ /dev/null
-#!/bin/sh
-# Author: Jan Vcelak <jvcelak@redhat.com>
-
-. /usr/libexec/openldap/functions
-
-function check_config_syntax()
-{
- retcode=0
- tmp_slaptest=`mktemp --tmpdir=/var/run/openldap`
- run_as_ldap "/usr/sbin/slaptest $SLAPD_GLOBAL_OPTIONS -u" &>$tmp_slaptest
- if [ $? -ne 0 ]; then
- error "Checking configuration file failed:"
- cat $tmp_slaptest >&2
- retcode=1
- fi
- rm $tmp_slaptest
- return $retcode
-}
-
-function check_certs_perms()
-{
- retcode=0
- for cert in `certificates`; do
- run_as_ldap "/usr/bin/test -e \"$cert\""
- if [ $? -ne 0 ]; then
- error "TLS certificate/key/DB '%s' was not found." "$cert"
- retcoder=1
- continue
- fi
- run_as_ldap "/usr/bin/test -r \"$cert\""
- if [ $? -ne 0 ]; then
- error "TLS certificate/key/DB '%s' is not readable." "$cert"
- retcode=1
- fi
- done
- return $retcode
-}
-
-function check_db_perms()
-{
- retcode=0
- for dbdir in `databases`; do
- [ -d "$dbdir" ] || continue
- for dbfile in `find ${dbdir} -maxdepth 1 -name "*.dbb" -or -name "*.gdbm" -or -name "*.bdb" -or -name "__db.*" -or -name "log.*" -or -name "alock"`; do
- run_as_ldap "/usr/bin/test -r \"$dbfile\" -a -w \"$dbfile\""
- if [ $? -ne 0 ]; then
- error "Read/write permissions for DB file '%s' are required." "$dbfile"
- retcode=1
- fi
- done
- done
- return $retcode
-}
-
-function check_everything()
-{
- retcode=0
- check_config_syntax || retcode=1
- # TODO: need support for Mozilla NSS, disabling temporarily
- #check_certs_perms || retcode=1
- check_db_perms || retcode=1
- return $retcode
-}
-
-if [ `id -u` -ne 0 ]; then
- error "You have to be root to run this script."
- exit 4
-fi
-
-load_sysconfig
-
-if [ -n "$SLAPD_CONFIG_DIR" ]; then
- if [ ! -d "$SLAPD_CONFIG_DIR" ]; then
- error "Configuration directory '%s' does not exist." "$SLAPD_CONFIG_DIR"
- else
- check_everything
- exit $?
- fi
-fi
-
-if [ -n "$SLAPD_CONFIG_FILE" ]; then
- if [ ! -f "$SLAPD_CONFIG_FILE" ]; then
- error "Configuration file '%s' does not exist." "$SLAPD_CONFIG_FILE"
- else
- error "Warning: Usage of a configuration file is obsolete!"
- check_everything
- exit $?
- fi
-fi
-
-exit 1
+++ /dev/null
-#!/bin/sh
-# Author: Jan Vcelak <jvcelak@redhat.com>
-
-. /usr/libexec/openldap/functions
-
-function help()
-{
- error "usage: %s [-f config-file] [-F config-dir]\n" "`basename $0`"
- exit 2
-}
-
-load_sysconfig
-
-while getopts :f:F: opt; do
- case "$opt" in
- f)
- SLAPD_CONFIG_FILE="$OPTARG"
- ;;
- F)
- SLAPD_CONFIG_DIR="$OPTARG"
- ;;
- *)
- help
- ;;
- esac
-done
-shift $((OPTIND-1))
-[ -n "$1" ] && help
-
-# check source, target
-
-if [ ! -f "$SLAPD_CONFIG_FILE" ]; then
- error "Source configuration file '%s' not found." "$SLAPD_CONFIG_FILE"
- exit 1
-fi
-
-if grep -iq '^dn: cn=config$' "$SLAPD_CONFIG_FILE"; then
- SLAPD_CONFIG_FILE_FORMAT=ldif
-else
- SLAPD_CONFIG_FILE_FORMAT=conf
-fi
-
-if [ -d "$SLAPD_CONFIG_DIR" ]; then
- if [ `find "$SLAPD_CONFIG_DIR" -maxdepth 0 -empty | wc -l` -eq 0 ]; then
- error "Target configuration directory '%s' is not empty." "$SLAPD_CONFIG_DIR"
- exit 1
- fi
-fi
-
-# perform the conversion
-
-tmp_convert=`mktemp --tmpdir=/var/run/openldap`
-
-if [ `id -u` -eq 0 ]; then
- install -d --owner $SLAPD_USER --group `id -g $SLAPD_USER` --mode 0750 "$SLAPD_CONFIG_DIR" &>>$tmp_convert
- if [ $SLAPD_CONFIG_FILE_FORMAT = ldif ]; then
- run_as_ldap "/usr/sbin/slapadd -F \"$SLAPD_CONFIG_DIR\" -n 0 -l \"$SLAPD_CONFIG_FILE\"" &>>$tmp_convert
- else
- run_as_ldap "/usr/sbin/slaptest -f \"$SLAPD_CONFIG_FILE\" -F \"$SLAPD_CONFIG_DIR\"" &>>$tmp_convert
- fi
- retcode=$?
-else
- error "You are not root! Permission will not be set."
- install -d --mode 0750 "$SLAPD_CONFIG_DIR" &>>$tmp_convert
- if [ $SLAPD_CONFIG_FILE_FORMAT = ldif ]; then
- /usr/sbin/slapadd -F "$SLAPD_CONFIG_DIR" -n 0 -l "$SLAPD_CONFIG_FILE" &>>$tmp_convert
- else
- /usr/sbin/slaptest -f "$SLAPD_CONFIG_FILE" -F "$SLAPD_CONFIG_DIR" &>>$tmp_convert
- fi
- retcode=$?
-fi
-
-if [ $retcode -ne 0 ]; then
- error "Configuration conversion failed:"
- cat $tmp_convert >&2
-fi
-
-rm $tmp_convert
-exit $retcode
+++ /dev/null
-#!/bin/bash
-# Author: Jan Vcelak <jvcelak@redhat.com>
-
-set -e
-
-# default options
-
-CERTDB_DIR=/etc/openldap/certs
-
-# internals
-
-MODULE_CKBI="$(rpm --eval %{_libdir})/libnssckbi.so"
-RANDOM_SOURCE=/dev/urandom
-PASSWORD_BYTES=32
-
-# parse arguments
-
-usage() {
- printf "usage: create-certdb.sh [-d certdb]\n" >&2
- exit 1
-}
-
-while getopts "d:" opt; do
- case "$opt" in
- d)
- CERTDB_DIR="$OPTARG"
- ;;
- \?)
- usage
- ;;
- esac
-done
-
-[ "$OPTIND" -le "$#" ] && usage
-
-# verify target location
-
-if [ ! -d "$CERTDB_DIR" ]; then
- printf "Directory '%s' does not exist.\n" "$CERTDB_DIR" >&2
- exit 1
-fi
-
-if [ ! "$(find "$CERTDB_DIR" -maxdepth 0 -empty | wc -l)" -eq 1 ]; then
- printf "Directory '%s' is not empty.\n" "$CERTDB_DIR" >&2
- exit 1
-fi
-
-# create the database
-
-printf "Creating certificate database in '%s'.\n" "$CERTDB_DIR" >&2
-
-PASSWORD_FILE="$CERTDB_DIR/password"
-OLD_UMASK="$(umask)"
-umask 0377
-dd if=$RANDOM_SOURCE bs=$PASSWORD_BYTES count=1 2>/dev/null | base64 > "$PASSWORD_FILE"
-umask "$OLD_UMASK"
-
-certutil -d "$CERTDB_DIR" -N -f "$PASSWORD_FILE" &>/dev/null
-
-# load module with builtin CA certificates
-
-echo | modutil -dbdir "$CERTDB_DIR" -add "Root Certs" -libfile "$MODULE_CKBI" &>/dev/null
-
-# tune permissions
-
-for dbfile in "$CERTDB_DIR"/*.db; do
- chmod 0644 "$dbfile"
-done
-
-exit 0
+++ /dev/null
-# Author: Jan Vcelak <jvcelak@redhat.com>
-
-SLAPD_USER=
-SLAPD_CONFIG_FILE=
-SLAPD_CONFIG_DIR=
-SLAPD_CONFIG_CUSTOM=
-SLAPD_GLOBAL_OPTIONS=
-SLAPD_SYSCONFIG_FILE=
-
-function default_config()
-{
- SLAPD_USER=ldap
- SLAPD_CONFIG_FILE=/etc/openldap/slapd.conf
- SLAPD_CONFIG_DIR=/etc/openldap/slapd.d
- SLAPD_CONFIG_CUSTOM=
- SLAPD_GLOBAL_OPTIONS=
- SLAPD_SYSCONFIG_FILE=/etc/sysconfig/slapd
-}
-
-function parse_config_options()
-{
- user=
- config_file=
- config_dir=
- while getopts :u:f:F: opt; do
- case "$opt" in
- u)
- user="$OPTARG"
- ;;
- f)
- config_file="$OPTARG"
- ;;
- F)
- config_dir="$OPTARG"
- ;;
- esac
- done
-
- unset OPTIND
-
- if [ -n "$user" ]; then
- SLAPD_USER="$user"
- fi
-
- if [ -n "$config_dir" ]; then
- SLAPD_CONFIG_DIR="$config_dir"
- SLAPD_CONFIG_FILE=
- SLAPD_CONFIG_CUSTOM=1
- SLAPD_GLOBAL_OPTIONS="-F '$config_dir'"
- elif [ -n "$config_file" ]; then
- SLAPD_CONFIG_DIR=
- SLAPD_CONFIG_FILE="$config_file"
- SLAPD_CONFIG_CUSTOM=1
- SLAPD_GLOBAL_OPTIONS="-f '$config_file'"
- fi
-}
-
-function uses_new_config()
-{
- [ -n "$SLAPD_CONFIG_DIR" ]
- return $?
-}
-
-function run_as_ldap()
-{
- /sbin/runuser --shell /bin/sh --session-command "$1" "$SLAPD_USER"
- return $?
-}
-
-function ldif_unbreak()
-{
- sed ':a;N;s/\n //;ta;P;D'
-}
-
-function ldif_value()
-{
- sed 's/^[^:]*: //'
-}
-
-function databases_new()
-{
- slapcat $SLAPD_GLOBAL_OPTIONS -c \
- -H 'ldap:///cn=config???(|(objectClass=olcBdbConfig)(objectClass=olcHdbConfig))' 2>/dev/null | \
- ldif_unbreak | \
- grep '^olcDbDirectory: ' | \
- ldif_value
-}
-
-function databases_old()
-{
- awk 'begin { database="" }
- $1 == "database" { database=$2 }
- $1 == "directory" { if (database == "bdb" || database == "hdb") print $2}' \
- "$SLAPD_CONFIG_FILE"
-}
-
-function certificates_new()
-{
- slapcat $SLAPD_GLOBAL_OPTIONS -c -H 'ldap:///cn=config???(cn=config)' 2>/dev/null | \
- ldif_unbreak | \
- grep '^olcTLS\(CACertificateFile\|CACertificatePath\|CertificateFile\|CertificateKeyFile\): ' | \
- ldif_value
-}
-
-function certificates_old()
-{
- awk '$1 ~ "^TLS(CACertificate(File|Path)|CertificateFile|CertificateKeyFile)$" { print $2 } ' \
- "$SLAPD_CONFIG_FILE"
-}
-
-function certificates()
-{
- uses_new_config && certificates_new || certificates_old
-}
-
-function databases()
-{
- uses_new_config && databases_new || databases_old
-}
-
-
-function error()
-{
- format="$1\n"; shift
- printf "$format" $@ >&2
-}
-
-function load_sysconfig()
-{
- [ -r "$SLAPD_SYSCONFIG_FILE" ] || return
-
- . "$SLAPD_SYSCONFIG_FILE"
- [ -n "$SLAPD_OPTIONS" ] && parse_config_options $SLAPD_OPTIONS
-}
-
-default_config
+++ /dev/null
-#!/bin/bash
-# Author: Jan Vcelak <jvcelak@redhat.com>
-
-set -e
-
-# default options
-
-CERTDB_DIR=/etc/openldap/certs
-CERT_NAME="OpenLDAP Server"
-PASSWORD_FILE=
-HOSTNAME_FQDN="$(hostname --fqdn)"
-ALT_NAMES=
-ONCE=0
-
-# internals
-
-RANDOM_SOURCE=/dev/urandom
-CERT_RANDOM_BYTES=256
-CERT_KEY_TYPE=rsa
-CERT_KEY_SIZE=1024
-CERT_VALID_MONTHS=12
-
-# parse arguments
-
-usage() {
- printf "usage: generate-server-cert.sh [-d certdb-dir] [-n cert-name]\n" >&2
- printf " [-p password-file] [-h hostnames]\n" >&2
- printf " [-a dns-alt-names] [-o]\n" >&2
- exit 1
-}
-
-while getopts "d:n:p:h:a:o" opt; do
- case "$opt" in
- d)
- CERTDB_DIR="$OPTARG"
- ;;
- n)
- CERT_NAME="$OPTARG"
- ;;
- p)
- PASSWORD_FILE="$OPTARG"
- ;;
- h)
- HOSTNAME_FQDN="$OPTARG"
- ;;
- a)
- ALT_NAMES="$OPTARG"
- ;;
- o)
- ONCE=1
- ;;
- \?)
- usage
- ;;
- esac
-done
-
-[ "$OPTIND" -le "$#" ] && usage
-
-# generated options
-
-ONCE_FILE="$CERTDB_DIR/.slapd-leave"
-PASSWORD_FILE="${PASSWORD_FILE:-${CERTDB_DIR}/password}"
-ALT_NAMES="${ALT_NAMES:-${HOSTNAME_FQDN},localhost,localhost.localdomain}"
-
-# verify target location
-
-if [ "$ONCE" -eq 1 -a -f "$ONCE_FILE" ]; then
- printf "Skipping certificate generating, '%s' exists.\n" "$ONCE_FILE" >&2
- exit 0
-fi
-
-if ! certutil -d "$CERTDB_DIR" -U &>/dev/null; then
- printf "Directory '%s' is not a valid certificate database.\n" "$CERTDB_DIR" >&2
- exit 1
-fi
-
-printf "Creating new server certificate in '%s'.\n" "$CERTDB_DIR" >&2
-
-if [ ! -r "$PASSWORD_FILE" ]; then
- printf "Password file '%s' is not readable.\n" "$PASSWORD_FILE" >&2
- exit 1
-fi
-
-if certutil -d "$CERTDB_DIR" -L -a -n "$CERT_NAME" &>/dev/null; then
- printf "Certificate '%s' already exists in the certificate database.\n" "$CERT_NAME" >&2
- exit 1
-fi
-
-# generate server certificate (self signed)
-
-
-CERT_RANDOM=$(mktemp --tmpdir=/var/run/openldap)
-dd if=$RANDOM_SOURCE bs=$CERT_RANDOM_BYTES count=1 of=$CERT_RANDOM &>/dev/null
-
-certutil -d "$CERTDB_DIR" -f "$PASSWORD_FILE" -z "$CERT_RANDOM" \
- -S -x -n "$CERT_NAME" \
- -s "CN=$HOSTNAME_FQDN" \
- -t TC,, \
- -k $CERT_KEY_TYPE -g $CERT_KEY_SIZE \
- -v $CERT_VALID_MONTHS \
- -8 "$ALT_NAMES" \
- &>/dev/null
-
-rm -f $CERT_RANDOM
-
-# tune permissions
-
-if [ "$(id -u)" -eq 0 ]; then
- chgrp ldap "$PASSWORD_FILE"
- chmod g+r "$PASSWORD_FILE"
-else
- printf "WARNING: The server requires read permissions on the password file in order to\n" >&2
- printf " load it's private key from the certificate database.\n" >&2
-fi
-
-touch "$ONCE_FILE"
-exit 0
+++ /dev/null
-#!/bin/bash
-# This script serves one purpose, to add a possibly missing attribute
-# to a ppolicy schema in a dynamic configuration of OpenLDAP. This
-# attribute was introduced in openldap-2.4.43 and slapd will not
-# start without it later on.
-#
-# The script tries to update in a directory given as first parameter,
-# or in /etc/openldap/slapd.d implicitly.
-#
-# Author: Matus Honek <mhonek@redhat.com>
-# Bugzilla: #1487857
-
-function log {
- echo "Update dynamic configuration: " $@
- true
-}
-
-function iferr {
- if [ $? -ne 0 ]; then
- log "ERROR: " $@
- true
- else
- false
- fi
-}
-
-function update {
- set -u
- shopt -s extglob
-
- ORIGINAL="${1:-/etc/openldap/slapd.d}"
- ORIGINAL="${ORIGINAL%*(/)}"
-
- ### check if necessary
- grep -r "pwdMaxRecordedFail" "${ORIGINAL}/cn=config/cn=schema" >/dev/null
- [ $? -eq 0 ] && log "Schemas look up to date. Ok. Quitting." && return 0
-
- ### prep
- log "Prepare environment."
-
- TEMPDIR=$(mktemp -d)
- iferr "Could not create a temporary directory. Quitting." && return 1
- DBDIR="${TEMPDIR}/db"
- SUBDBDIR="${DBDIR}/cn=temporary"
-
- mkdir "${DBDIR}"
- iferr "Could not create temporary configuration directory. Quitting." && return 1
- cp -r --no-target-directory "${ORIGINAL}" "${SUBDBDIR}"
- iferr "Could not copy configuration. Quitting." && return 1
-
- pushd "$TEMPDIR" >/dev/null
-
- cat > temp.conf <<EOF
-database ldif
-suffix cn=temporary
-directory db
-access to * by * manage
-EOF
-
- SOCKET="$(pwd)/socket"
- LISTENER="ldapi://${SOCKET//\//%2F}"
- CONN_PARAMS=("-Y" "EXTERNAL" "-H" "${LISTENER}")
-
- slapd -f temp.conf -h "$LISTENER" -d 0 >/dev/null 2>&1 &
- SLAPDPID="$!"
- sleep 2
-
- ldapadd ${CONN_PARAMS[@]} -d 0 >/dev/null 2>&1 <<EOF
-dn: cn=temporary
-objectClass: olcGlobal
-cn: temporary
-EOF
- iferr "Could not populate the temporary database. Quitting." && return 1
-
- ### update
- log "Update with new pwdMaxRecordedFailure attribute."
- FILTER="(&"
- FILTER+="(olcObjectClasses=*'pwdPolicy'*)"
- FILTER+="(!(olcObjectClasses=*'pwdPolicy'*'pwdMaxRecordedFailure'*))"
- FILTER+="(!(olcAttributeTypes=*'pwdMaxRecordedFailure'*))"
- FILTER+=")"
- RES=$(ldapsearch ${CONN_PARAMS[@]} \
- -b cn=schema,cn=config,cn=temporary \
- -LLL \
- -o ldif-wrap=no \
- "$FILTER" \
- dn olcObjectClasses \
- 2>/dev/null \
- | sed '/^$/d')
- DN=$(printf "$RES" | grep '^dn:')
- OC=$(printf "$RES" | grep "^olcObjectClasses:.*'pwdPolicy'")
- NEWOC="${OC//$ pwdSafeModify /$ pwdSafeModify $ pwdMaxRecordedFailure }"
-
- test $(echo "$DN" | wc -l) = 1
- iferr "Received more than one DN. Cannot continue. Quitting." && return 1
- test "$NEWOC" != "$OC"
- iferr "Updating pwdPolicy objectClass definition failed. Quitting." && return 1
-
- ldapmodify ${CONN_PARAMS[@]} -d 0 >/dev/null 2>&1 <<EOF
-$DN
-changetype: modify
-add: olcAttributeTypes
-olcAttributeTypes: ( 1.3.6.1.4.1.42.2.27.8.1.30 NAME 'pwdMaxRecordedFailur
- e' EQUALITY integerMatch ORDERING integerOrderingMatch SYNTAX 1.3.6.1.4.1.
- 1466.115.121.1.27 SINGLE-VALUE )
--
-delete: olcObjectClasses
-$OC
--
-add: olcObjectClasses
-$NEWOC
-EOF
- iferr "Updating with new attribute failed. Quitting." && return 1
-
- popd >/dev/null
-
- ### apply
- log "Apply changes."
- cp -r --no-target-directory "$ORIGINAL" "$ORIGINAL~backup"
- iferr "Backing up old configuration failed. Quitting." && return 1
- cp -r --no-target-directory "$SUBDBDIR" "$ORIGINAL"
- iferr "Applying new configuration failed. Quitting." && return 1
-
- ### clean up
- log "Clean up."
- kill "$SLAPDPID"
- SLAPDPID=
- rm -rf "$TEMPDIR"
- TEMPDIR=
-}
-
-SLAPDPID=
-TEMPDIR=
-update "$1"
-if [ $? -ne 0 ]; then
- log "Clean up."
- echo "$SLAPDPID"
- echo "$TEMPDIR"
- kill "$SLAPDPID"
- rm -rf "$TEMPDIR"
-fi
-log "Finished."
+++ /dev/null
-#!/bin/sh
-# Author: Jan Vcelak <jvcelak@redhat.com>
-
-. /usr/libexec/openldap/functions
-
-if [ `id -u` -ne 0 ]; then
- error "You have to be root to run this command."
- exit 4
-fi
-
-load_sysconfig
-retcode=0
-
-for dbdir in `databases`; do
- upgrade_log="$dbdir/db_upgrade.`date +%Y%m%d%H%M%S`.log"
- bdb_files=`find "$dbdir" -maxdepth 1 -name "*.bdb" -printf '"%f" '`
-
- # skip uninitialized database
- [ -z "$bdb_files"] || continue
-
- printf "Updating '%s', logging into '%s'\n" "$dbdir" "$upgrade_log"
-
- # perform the update
- for command in \
- "/usr/bin/db_recover -v -h \"$dbdir\"" \
- "/usr/bin/db_upgrade -v -h \"$dbdir\" $bdb_files" \
- "/usr/bin/db_checkpoint -v -h \"$dbdir\" -1" \
- ; do
- printf "Executing: %s\n" "$command" &>>$upgrade_log
- run_as_ldap "$command" &>>$upgrade_log
- result=$?
- printf "Exit code: %d\n" $result >>"$upgrade_log"
- if [ $result -ne 0 ]; then
- printf "Upgrade failed: %d\n" $result
- retcode=1
- fi
- done
-done
-
-exit $retcode
+++ /dev/null
-# OpenLDAP TLSMC runtime directories
-x /tmp/openldap-tlsmc-*
-X /tmp/openldap-tlsmc-*
+++ /dev/null
-#
-# See slapd-config(5) for details on configuration options.
-# This file should NOT be world readable.
-#
-
-dn: cn=config
-objectClass: olcGlobal
-cn: config
-olcArgsFile: /var/run/openldap/slapd.args
-olcPidFile: /var/run/openldap/slapd.pid
-#
-# TLS settings
-#
-olcTLSCACertificatePath: /etc/openldap/certs
-olcTLSCertificateFile: "OpenLDAP Server"
-olcTLSCertificateKeyFile: /etc/openldap/certs/password
-#
-# Do not enable referrals until AFTER you have a working directory
-# service AND an understanding of referrals.
-#
-#olcReferral: ldap://root.openldap.org
-#
-# Sample security restrictions
-# Require integrity protection (prevent hijacking)
-# Require 112-bit (3DES or better) encryption for updates
-# Require 64-bit encryption for simple bind
-#
-#olcSecurity: ssf=1 update_ssf=112 simple_bind=64
-
-
-#
-# Load dynamic backend modules:
-# - modulepath is architecture dependent value (32/64-bit system)
-# - back_sql.la backend requires openldap-servers-sql package
-# - dyngroup.la and dynlist.la cannot be used at the same time
-#
-
-#dn: cn=module,cn=config
-#objectClass: olcModuleList
-#cn: module
-#olcModulepath: /usr/lib/openldap
-#olcModulepath: /usr/lib64/openldap
-#olcModuleload: accesslog.la
-#olcModuleload: auditlog.la
-#olcModuleload: back_dnssrv.la
-#olcModuleload: back_ldap.la
-#olcModuleload: back_mdb.la
-#olcModuleload: back_meta.la
-#olcModuleload: back_null.la
-#olcModuleload: back_passwd.la
-#olcModuleload: back_relay.la
-#olcModuleload: back_shell.la
-#olcModuleload: back_sock.la
-#olcModuleload: collect.la
-#olcModuleload: constraint.la
-#olcModuleload: dds.la
-#olcModuleload: deref.la
-#olcModuleload: dyngroup.la
-#olcModuleload: dynlist.la
-#olcModuleload: memberof.la
-#olcModuleload: pcache.la
-#olcModuleload: ppolicy.la
-#olcModuleload: refint.la
-#olcModuleload: retcode.la
-#olcModuleload: rwm.la
-#olcModuleload: seqmod.la
-#olcModuleload: smbk5pwd.la
-#olcModuleload: sssvlv.la
-#olcModuleload: syncprov.la
-#olcModuleload: translucent.la
-#olcModuleload: unique.la
-#olcModuleload: valsort.la
-
-
-#
-# Schema settings
-#
-
-dn: cn=schema,cn=config
-objectClass: olcSchemaConfig
-cn: schema
-
-include: file:///etc/openldap/schema/core.ldif
-
-#
-# Frontend settings
-#
-
-dn: olcDatabase=frontend,cn=config
-objectClass: olcDatabaseConfig
-objectClass: olcFrontendConfig
-olcDatabase: frontend
-#
-# Sample global access control policy:
-# Root DSE: allow anyone to read it
-# Subschema (sub)entry DSE: allow anyone to read it
-# Other DSEs:
-# Allow self write access
-# Allow authenticated users read access
-# Allow anonymous users to authenticate
-#
-#olcAccess: to dn.base="" by * read
-#olcAccess: to dn.base="cn=Subschema" by * read
-#olcAccess: to *
-# by self write
-# by users read
-# by anonymous auth
-#
-# if no access controls are present, the default policy
-# allows anyone and everyone to read anything but restricts
-# updates to rootdn. (e.g., "access to * by * read")
-#
-# rootdn can always read and write EVERYTHING!
-#
-
-#
-# Configuration database
-#
-
-dn: olcDatabase=config,cn=config
-objectClass: olcDatabaseConfig
-olcDatabase: config
-olcAccess: to * by dn.base="gidNumber=0+uidNumber=0,cn=peercred,cn=external,c
- n=auth" manage by * none
-
-#
-# Server status monitoring
-#
-
-dn: olcDatabase=monitor,cn=config
-objectClass: olcDatabaseConfig
-olcDatabase: monitor
-olcAccess: to * by dn.base="gidNumber=0+uidNumber=0,cn=peercred,cn=external,c
- n=auth" read by dn.base="cn=Manager,dc=my-domain,dc=com" read by * none
-
-#
-# Backend database definitions
-#
-
-dn: olcDatabase=hdb,cn=config
-objectClass: olcDatabaseConfig
-objectClass: olcHdbConfig
-olcDatabase: hdb
-olcSuffix: dc=my-domain,dc=com
-olcRootDN: cn=Manager,dc=my-domain,dc=com
-olcDbDirectory: /var/lib/ldap
-olcDbIndex: objectClass eq,pres
-olcDbIndex: ou,cn,mail,surname,givenname eq,pres,sub
+++ /dev/null
-[Unit]
-Description=OpenLDAP Server Daemon
-After=syslog.target network-online.target
-Documentation=man:slapd
-Documentation=man:slapd-config
-Documentation=man:slapd-hdb
-Documentation=man:slapd-mdb
-Documentation=file:///usr/share/doc/openldap-servers/guide.html
-
-[Service]
-Type=forking
-PIDFile=/var/run/openldap/slapd.pid
-Environment="SLAPD_URLS=ldap:/// ldapi:///" "SLAPD_OPTIONS="
-EnvironmentFile=/etc/sysconfig/slapd
-ExecStartPre=/usr/libexec/openldap/check-config.sh
-ExecStart=/usr/sbin/slapd -u ldap -h ${SLAPD_URLS} $SLAPD_OPTIONS
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-# OpenLDAP server configuration
-# see 'man slapd' for additional information
-
-# Where the server will run (-h option)
-# - ldapi:/// is required for on-the-fly configuration using client tools
-# (use SASL with EXTERNAL mechanism for authentication)
-# - default: ldapi:/// ldap:///
-# - example: ldapi:/// ldap://127.0.0.1/ ldap://10.0.0.1:1389/ ldaps:///
-SLAPD_URLS="ldapi:/// ldap:///"
-
-# Any custom options
-#SLAPD_OPTIONS=""
-
-# Keytab location for GSSAPI Kerberos authentication
-#KRB5_KTNAME="FILE:/etc/openldap/ldap.keytab"
+++ /dev/null
-# openldap runtime directory for slapd.arg and slapd.pid
-d /var/run/openldap 0755 ldap ldap -
+++ /dev/null
-[Unit]
-Description=OpenLDAP Server Daemon
-After=syslog.target network-online.target
-Documentation=man:slapd
-Documentation=man:slapd-config
-Documentation=man:slapd-hdb
-Documentation=man:slapd-mdb
-Documentation=file:///usr/share/doc/openldap-servers/guide.html
-
-[Service]
-Type=forking
-RuntimeDirectory=openldap
-StateDirectory=openldap-data
-# PIDFile=/var/run/openldap/slapd.pid
-Environment="SLAPD_URLS=ldap:/// ldapi:///" "SLAPD_OPTIONS="
-EnvironmentFile=/etc/sysconfig/slapd
-ExecStartPre=/usr/libexec/openldap/check-config.sh
-ExecStart=/usr/sbin/slapd -u root -h ${SLAPD_URLS} $SLAPD_OPTIONS
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "openldap-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- "
-
-SRC_URI += " \
- file://rootdn-should-not-bypass-ppolicy.patch \
- file://0021-openldap-and-stx-source-and-config-files.patch \
- "
-RRECOMMENDS_openldap += " \
- openldap-backend-shell \
- openldap-backend-passwd \
- openldap-backend-null \
- openldap-backend-monitor \
- openldap-backend-meta \
- openldap-backend-ldap \
- openldap-backend-dnssrv \
- openldap-staticdev \
- openldap-locale \
- openldap-overlay-proxycache \
- openldap-slapd \
- openldap-slurpd \
- openldap-bin \
- "
-
-inherit pkgconfig useradd
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "-r -g ldap -u 55 -d / -s /sbin/nologin -c 'OpenLDAP server' ldap"
-GROUPADD_PARAM_${PN} = "-r -g 55 ldap"
-
-inherit systemd
-SYSTEMD_PACKAGES += "${PN}"
-SYSTEMD_SERVICE_${PN}_append = "slapd.service"
-SYSETMD_AUTO_ENABLE_${PN} = "enable"
-# Needed for stx init.d/openldap
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-PACKAGECONFIG_CONFARGS_remove = "--with-tls=gnutls "
-DEPENDS += " \
- openssl \
- glibc \
- mariadb \
- mariadb-native \
- libtirpc \
- "
-
-RDEPENDS_${PN}_append = " bash"
-
-# Do not remove libtool la files slapd.conf uses ppolicy.la
-REMOVE_LIBTOOL_LA = "0"
-
-
-# Defaults:
-# --enable-bdb=no
-# --enable-hdb=no
-# --enable-bdb=no
-# --enable-monitor=mod
-######
-# Stx :
-# --enable-wrappers=yes
-# --enable-moznss-compatibility=yes
-
-#################
-# TODO:
-# mysql_config: native command missing
-
-EXTRA_OECONF += " \
- --enable-syslog \
- --enable-proctitle \
- --enable-ipv6 \
- --enable-local \
- --enable-slapd \
- --enable-dynacl \
- --enable-aci \
- --enable-cleartext \
- --enable-crypt \
- --enable-lmpasswd \
- --enable-modules \
- --enable-rewrite \
- --enable-rlookups \
- --disable-slp \
- --enable-wrappers=no \
- --enable-backends=mod \
- --enable-bdb=yes \
- --enable-hdb=yes \
- --enable-mdb=yes \
- --enable-monitor=yes \
- --disable-ndb \
- --enable-overlays=mod \
- --disable-static \
- --enable-shared \
- --with-cyrus-sasl \
- --without-fetch \
- --with-tls=openssl \
- "
-# --enable-moznss-compatibility=no
-# NEW:
-# --enable-lmpasswd
-# --enable-slapi
-# --enable-wrappers
-# --enable-moznss-compatibility=yes
-
-do_configure_append () {
- cd ${S}
- ln -f -s ${S}/contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays
- ln -f -s ${S}/contrib/slapd-modules/allop/allop.c servers/slapd/overlays
- ln -f -s ${S}/contrib/slapd-modules/passwd/sha2/sha2.c servers/slapd/overlays
- ln -f -s ${S}/contrib/slapd-modules/passwd/sha2/sha2.h servers/slapd/overlays
- ln -f -s ${S}/contrib/slapd-modules/passwd/sha2/slapd-sha2.c servers/slapd/overlays
-}
-
-
-do_install_append () {
-
- # For this we need to build ltb-project-openldap
- #install -m 755 check_password.so.%{check_password_version} %{buildroot}%{_libdir}/openldap/
-
- cd ${S}/stx-sources
- install -m 0755 -d ${D}/var/run/openldap
- install -m 0755 -d ${D}/${sysconfdir}/tmpfiles.d
- install -m 0755 ${S}/stx-sources/slapd.tmpfiles ${D}/${sysconfdir}/tmpfiles.d/slapd.conf
- install -m 0755 ${S}/stx-sources/openldap.tmpfiles ${D}/${sysconfdir}/tmpfiles.d/openldap.conf
- install -m 0755 ${S}/stx-sources/ldap.conf ${D}/${sysconfdir}/tmpfiles.d/ldap.conf
-
- # The database directory MUST exist prior to running slapd AND
- # should only be accessible by the slapd and slap tools.
- # Mode 700 recommended.
- echo "d /var/lib/openldap-data 0700 ldap ldap -" >> ${D}/${sysconfdir}/tmpfiles.d/slapd.conf
-
- install -m 0644 libexec-functions ${D}/${libexecdir}/openldap/functions
- install -m 0755 libexec-convert-config.sh ${D}/${libexecdir}/openldap/convert-config.sh
- install -m 0755 libexec-check-config.sh ${D}/${libexecdir}/openldap/check-config.sh
- install -m 0755 libexec-upgrade-db.sh ${D}/${libexecdir}/openldap/upgrade-db.sh
-
- install -m 0755 libexec-create-certdb.sh ${D}/${libexecdir}/openldap/create-certdb.sh
- install -m 0755 libexec-generate-server-cert.sh ${D}/${libexecdir}/openldap/generate-server-cert.sh
- install -m 0755 libexec-update-ppolicy-schema.sh ${D}/${libexecdir}/openldap/update-ppolicy-schema.sh
-
- install -m 0755 -d ${D}/${sysconfdir}/sysconfig
- install -m 0644 slapd.sysconfig ${D}/${sysconfdir}/sysconfig/slapd
- install -m 0755 -d ${D}/${datadir}/openldap-servers
- install -m 0644 slapd.ldif ${D}/${datadir}/openldap-servers/slapd.ldif
- install -m 0750 -d ${D}/${sysconfdir}/openldap/slapd.d
- rm -rf ${D}/var/run
-
- sed -i -e 's:\(/sbin/runuser\):/usr\1:g' ${D}/usr/libexec/openldap/functions
-
- install -m 755 ${STX_METADATA_PATH}/files/initscript ${D}/${sysconfdir}/init.d/openldap
- install -m 600 ${STX_METADATA_PATH}/files/slapd.conf ${D}/${sysconfdir}/openldap/slapd.conf
-
- install -m 600 ${STX_METADATA_PATH}/files/initial_config.ldif ${D}/${sysconfdir}/openldap/initial_config.ldif
-
- install -D -m 644 ${STX_METADATA_PATH}/files/slapd.service ${D}/${systemd_system_unitdir}/slapd.service
- sed -i -e 's|/var/run|/run|' ${D}/${systemd_system_unitdir}/slapd.service
-
- install -m 644 ${STX_METADATA_PATH}/files/slapd.sysconfig ${D}/${sysconfdir}/sysconfig/slapd
-
-}
-
-
-FILES_${PN}_append = " \
- ${datadir}/openldap-servers/ \
- ${libexecdir}/openldap/ \
- ${sysconfdir}/sysconfig \
- ${sysconfdir}/tmpfiles.d \
- ${systemd_system_unitdir}/slapd.service \
- ${sysconfdir}/openldap/initial_config.ldif \
- "
-
-# *.la are openldap modules.
-FILES_${PN}-dev = " \
- ${includedir} \
- ${FILES_SOLIBSDEV} \
- ${libdir}/*.la \
- ${libexecdir}/openldap/*${SOLIBSDEV} \
- "
-
+++ /dev/null
-From 78029f7aa8f8231fc657a094f41fb4ae1baba95e Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Sat, 28 Mar 2020 22:53:47 +0800
-Subject: [PATCH] syslog-ng.conf: replace match with message
-
-Fix the warning:
- WARNING: the match() filter without the use of the value() option is
- deprecated and hinders performance, please use a more specific filter
- like message() and/or program() instead;
- location='/etc/syslog-ng/syslog-ng.conf:255:80'
- [2020-03-26T09:55:01.825267] WARNING: With use-dns(no), dns-cache()
- will be forced to 'no' too!;
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- syslog-ng-config/files/syslog-ng.conf | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/syslog-ng-config/files/syslog-ng.conf b/syslog-ng-config/files/syslog-ng.conf
-index 1e06c02..7373031 100644
---- a/syslog-ng-config/files/syslog-ng.conf
-+++ b/syslog-ng-config/files/syslog-ng.conf
-@@ -252,7 +252,7 @@ filter f_newsnotice { facility(news) and filter(f_notice); };
- #filter f_syslog3 { not facility(auth, authpriv, mail) and not filter(f_debug); };
- filter f_syslog { facility(syslog); };
- filter f_user { facility(user) and not filter(f_vim) and not filter(f_vim_api)
-- and not filter(f_vim_webserver) and not match("fmClientCli");
-+ and not filter(f_vim_webserver) and not message("fmClientCli");
- and not program("^(-)?(ba)?(su|sh)$"); };
- filter f_uucp { facility(uucp); };
-
-@@ -303,12 +303,12 @@ filter f_fm_event { facility(local5) and program(fmManager); };
- filter f_fm_manager { facility(local1) and program(fmManager); };
-
- # IMA Filters
--filter f_ima { facility(auth) and program(audispd) and match("type=INTEGRITY_") ; };
--filter f_ima_appraise { filter(f_ima) and match("appraise_data") ; };
-+filter f_ima { facility(auth) and program(audispd) and message("type=INTEGRITY_") ; };
-+filter f_ima_appraise { filter(f_ima) and message("appraise_data") ; };
-
- # Sysinv Log Filter
--filter f_sysinv { facility(local6) and program(sysinv) and not match("sysinv.api.hooks.auditor"); };
--filter f_sysinvapi { facility(local6) and program(sysinv) and match("sysinv.api.hooks.auditor"); };
-+filter f_sysinv { facility(local6) and program(sysinv) and not message("sysinv.api.hooks.auditor"); };
-+filter f_sysinvapi { facility(local6) and program(sysinv) and message("sysinv.api.hooks.auditor"); };
-
- # Distributed Cloud Log Filters
- filter f_dcmanagermanager { facility(local2) and program(dcmanager-manager); };
-@@ -324,8 +324,8 @@ filter f_dcdbsyncopenstackapi { facility(local3) and program(dcdbsync-api); }
- # Openstack Log Filters
- filter f_horizon { facility(local7) };
- filter f_libvirtd { program(libvirtd) };
--filter f_keystoneall { facility(local2) and message("keystone.*") and not match("keystone.common.wsgi"); };
--filter f_keystoneapi { facility(local2) and match("keystone.common.wsgi"); };
-+filter f_keystoneall { facility(local2) and message("keystone.*") and not message("keystone.common.wsgi"); };
-+filter f_keystoneapi { facility(local2) and message("keystone.common.wsgi"); };
- filter f_barbicanapi { facility(local2) and program(barbican-api); };
- filter f_barbicandbsync { facility(local2) and program(barbican-dbsync); };
- filter f_barbicankeystonelistener { facility(local2) and program(barbican-keystone-listener); };
---
-2.7.4
-
+++ /dev/null
-diff --git a/syslog-ng-config/files/syslog-ng.conf b/syslog-ng-config/files/syslog-ng.conf
-index 43a4067..b1bab2c 100644
---- a/syslog-ng-config/files/syslog-ng.conf
-+++ b/syslog-ng-config/files/syslog-ng.conf
-@@ -183,7 +183,7 @@ destination d_newscrit { file("/var/log/news/news.crit"); };
- destination d_newserr { file("/var/log/news/news.err"); };
- destination d_newsnotice { file("/var/log/news/news.notice"); };
-
--# Some `catch-all' logfiles.
-+# Some 'catch-all' logfiles.
- #
- destination d_debug { file("/var/log/debug"); };
- destination d_error { file("/var/log/error"); };
+++ /dev/null
-diff --git a/syslog-ng-config/files/syslog-ng.service b/syslog-ng-config/files/syslog-ng.service
-index 606a967..b8d90d2 100644
---- a/syslog-ng-config/files/syslog-ng.service
-+++ b/syslog-ng-config/files/syslog-ng.service
-@@ -5,7 +5,7 @@ Documentation=man:syslog-ng(8)
- [Service]
- Type=notify
- Sockets=syslog.socket
--ExecStartPre=-/usr/bin/mkdir -p /var/run/syslog-ng/
-+ExecStartPre=-/bin/mkdir -p /var/run/syslog-ng/
- ExecStart=/usr/sbin/syslog-ng -F -p /var/run/syslog-ng/syslog-ng.pid
- ExecReload=/bin/kill -HUP $MAINPID
- StandardOutput=null
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "syslog-ng-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://stx-configfiles-LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- "
-
-SRC_URI += " \
- file://syslog-ng-config-parse-err.patch;striplevel=3 \
- file://syslog-ng-config-systemd-service.patch;striplevel=3 \
- file://syslog-ng-conf-replace-match-with-message.patch;striplevel=3 \
- "
-
-
-do_unpack_append() {
- bb.build.exec_func('do_copy_config_files', d)
-}
-
-do_copy_config_files () {
- cp -pf ${STX_METADATA_PATH}/files/LICENSE ${S}/stx-configfiles-LICENSE
- cp -pf ${STX_METADATA_PATH}/files/syslog-ng.conf ${S}/syslog-ng.conf
- cp -pf ${STX_METADATA_PATH}/files/syslog-ng.service ${S}/syslog-ng.service
- cp -pf ${STX_METADATA_PATH}/files/syslog-ng.logrotate ${S}/syslog-ng.logortate
- cp -pf ${STX_METADATA_PATH}/files/remotelogging.conf ${S}/remotelogging.conf
- cp -pf ${STX_METADATA_PATH}/files//fm_event_syslogger ${S}/fm_event_syslogger
-}
-
-do_install_append () {
- rm -rf ${D}${systemd_unitdir}/system/multi-user.target.wants
-
- chmod 644 ${D}/${sysconfdir}/syslog-ng/syslog-ng.conf
-
- install -D -m644 ${S}/remotelogging.conf ${D}/${sysconfdir}/syslog-ng/remotelogging.conf
- install -D -m700 ${S}/fm_event_syslogger ${D}/${sbindir}/fm_event_syslogger
-
-
- install -D -m700 ${S}/fm_event_syslogger ${D}/${sbindir}/fm_event_syslogger
- install -D -m644 ${S}/syslog-ng.logrotate ${D}/${sysconfdir}/logrotate.d/syslog
- install -D -m644 ${S}/remotelogging.conf ${D}/${sysconfdir}/syslog-ng/remotelogging.conf
- install -D -m644 ${S}/syslog-ng.conf ${D}/${sysconfdir}/syslog-ng/syslog-ng.conf
-
- # install -D -m644 ${S}/syslog-ng.service ${D}/${sysconfdir}/systemd/system/syslog-ng.service
- install -D -m644 ${S}/syslog-ng.service ${D}/${systemd_system_unitdir}/syslog-ng.service
- # Fix the config version to avoid warning
- sed -i -e 's/\(@version: \).*/\1 3.19/' ${D}${sysconfdir}/syslog-ng/syslog-ng.conf
- # Workaround: comment out the udp source to aviod the service fail to start at boot time
- sed -i -e 's/\(.*s_udp.*\)/#\1/' ${D}/${sysconfdir}/syslog-ng/syslog-ng.conf
- # And replace default unit file with stx specific service file
- rm -f ${D}/${systemd_system_unitdir}/syslog-ng@.service
-
-}
-
-# SYSTEMD_PACKAGES_append = "${PN}"
-SYSTEMD_SERVICE_${PN} = "syslog-ng.service"
-SYSTEMD_AUTO_ENABLE = "enable"
-RDEPENDS_${PN}_append = " bash"
+++ /dev/null
-
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
- ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "stx-virt-layer"
-BBFILE_PATTERN_stx-virt-layer := "^${LAYERDIR}/"
-BBFILE_PRIORITY_stx-virt-layer = "5"
-
-LAYERDEPENDS_STX_VIRT = "\
- core \
- dpdk \
- networking-layer \
- openembedded-layer \
- networking-layer \
- filesystems-layer \
- perl-layer \
- meta-python \
- webserver \
- virtualization-layer \
- cloud-services-layer \
- openstack-layer \
-"
-
-# This should only be incremented on significant changes that will
-# cause compatibility issues with other layers
-LAYERVERSION_stx-virt-version = "1"
-LAYERSERIES_COMPAT_stx-virt-layer = "thud warrior"
-
-LAYER_PATH_meta-stx-virt = "${LAYERDIR}"
-
-# Masked recipes:
-BBMASK += "/meta-python2/recipes-core/images/meta-python-ptest-image.bb"
-BBMASK += "/meta-python2/recipes-core/images/meta-python-image-base.bb"
-BBMASK += "/meta-python2/recipes-core/images/meta-python-image.bb"
-BBMASK += "/meta-stak-common/recipes-containers/kubernetes/kubernetes_git.bbappend"
-BBMASK += "/meta-cloud-services/meta-openstack/recipes-devtools/python/python-cephclient_0.1.0.5.bb"
-BBMASK += "/meta-openstack/recipes-devtools/qemu/qemu_2.%.bbappend"
-BBMASK += "/meta-cloud-services/meta-openstack/recipes-kernel/linux/linux-yocto_4.18.bbappend"
-BBMASK += "/meta-selinux/recipes-graphics/mesa/mesa_%.bbappend"
-BBMASK += "/meta-virtualization/recipes-containers/docker-distribution/docker-distribution_git.bb"
-BBMASK += "/meta-starlingX/recipes-containers/docker-distribution/docker-distribution_git.bbappend"
-BBMASK += "/meta-starlingX/recipes-support/puppet/puppetlabs-stdlib_git.bbappend"
+++ /dev/null
-
-SUMMARY = "A distributed key-value store for shared config and service discovery"
-DESCRIPTION = " \
- etcd is a distributed reliable key-value store for the most critical data \
- of a distributed system, with a focus on being: \
- \
- * Simple: well-defined, user-facing API (gRPC) \
- * Secure: automatic TLS with optional client cert authentication \
- * Fast: benchmarked 10,000 writes/sec \
- * Reliable: properly distributed using Raft \
-"
-HOMEPAGE = "https://github.com/coreos/etcd"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = " \
- git://github.com/coreos/etcd.git;branch=release-3.3 \
- "
-
-SRCREV = "94745a4eed0425653b3b4275a208d38babceeaec"
-PV = "3.3.15+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-inherit go goarch systemd useradd
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = " \
- --system --shell ${sbindir}/nologin --comment 'etcd user' \
- --home-dir ${localstatedir}/lib --groups etcd --gid etcd etcd \
- "
-GROUPADD_PARAM_${PN} = "etcd"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-GO_IMPORT = "import"
-
-do_compile() {
- export GOARCH="${TARGET_GOARCH}"
-
- # Setup vendor directory so that it can be used in GOPATH.
- #
- # Go looks in a src directory under any directory in GOPATH but
- # uses 'vendor' instead of 'vendor/src'. We can fix this with a symlink.
- #
- # We also need to link in the ipallocator directory as that is not under
- # a src directory.
- export GOPATH="${B}/src/import/"
- mkdir -p ${B}/src/import/src/github.com/coreos/
- ln -s ${S}/src/import ${B}/src/import/src/github.com/coreos/etcd
-
- # Pass the needed cflags/ldflags so that cgo
- # can find the needed headers files and libraries
- export CGO_ENABLED="1"
- export CFLAGS=""
- export LDFLAGS=""
- export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-
- if [ "${TARGET_ARCH}" = "x86_64" ]; then
- export GOARCH="amd64"
- elif [ "${TARGET_ARCH}" = "i586" ]; then
- export GOARCH="386"
- fi
-
- ./src/import/build
-}
-
-do_install() {
- install -d ${D}/${bindir}
- install -m 0755 ${B}/bin/etcd ${D}/${bindir}/etcd
- install -m 0755 ${B}/bin/etcdctl ${D}/${bindir}/etcdctl
-
- install -d ${D}${systemd_system_unitdir}
- install -m 0644 ${S}/src/import/contrib/systemd/etcd.service ${D}${systemd_system_unitdir}
-
- # etcd state is in /var/lib/etcd
- install -d ${D}${sysconfdir}/tmpfiles.d
- echo "d ${localstatedir}/lib/${BPN} 0755 etcd etcd -" \
- > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
-
- # we aren't creating a user, so we need to comment out this line
- sed -i '/User/s/^/#/' ${D}${systemd_unitdir}/system/etcd.service
-}
-
-deltask compile_ptest_base
-
-RDEPENDS_${PN} = "bash"
-
-# During packaging etcd gets the warning "no GNU hash in elf binary"
-# This issue occurs due to compiling without ldflags, but a
-# solution has yet to be found. For now we ignore this error with
-# the line below.
-#INSANE_SKIP_${PN} = "ldflags"
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += " \
- file://etcd.service \
- file://etcd.conf \
- "
-
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "etcd.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-
-do_install_append() {
- install -m 0644 ${WORKDIR}/etcd.service ${D}${systemd_system_unitdir}
- install -d ${D}${sysconfdir}/etcd
- install -m 0644 ${WORKDIR}/etcd.conf ${D}${sysconfdir}/etcd
-}
+++ /dev/null
-
-#[Member]
-#ETCD_CORS=""
-ETCD_DATA_DIR="/var/lib/etcd/default.etcd"
-#ETCD_WAL_DIR=""
-#ETCD_LISTEN_PEER_URLS="http://localhost:2380"
-ETCD_LISTEN_CLIENT_URLS="http://localhost:2379"
-#ETCD_MAX_SNAPSHOTS="5"
-#ETCD_MAX_WALS="5"
-ETCD_NAME="default"
-#ETCD_SNAPSHOT_COUNT="100000"
-#ETCD_HEARTBEAT_INTERVAL="100"
-#ETCD_ELECTION_TIMEOUT="1000"
-#ETCD_QUOTA_BACKEND_BYTES="0"
-#ETCD_MAX_REQUEST_BYTES="1572864"
-#ETCD_GRPC_KEEPALIVE_MIN_TIME="5s"
-#ETCD_GRPC_KEEPALIVE_INTERVAL="2h0m0s"
-#ETCD_GRPC_KEEPALIVE_TIMEOUT="20s"
-#
-#[Clustering]
-#ETCD_INITIAL_ADVERTISE_PEER_URLS="http://localhost:2380"
-ETCD_ADVERTISE_CLIENT_URLS="http://localhost:2379"
-#ETCD_DISCOVERY=""
-#ETCD_DISCOVERY_FALLBACK="proxy"
-#ETCD_DISCOVERY_PROXY=""
-#ETCD_DISCOVERY_SRV=""
-#ETCD_INITIAL_CLUSTER="default=http://localhost:2380"
-#ETCD_INITIAL_CLUSTER_TOKEN="etcd-cluster"
-#ETCD_INITIAL_CLUSTER_STATE="new"
-#ETCD_STRICT_RECONFIG_CHECK="true"
-#ETCD_ENABLE_V2="true"
-#
-#[Proxy]
-#ETCD_PROXY="off"
-#ETCD_PROXY_FAILURE_WAIT="5000"
-#ETCD_PROXY_REFRESH_INTERVAL="30000"
-#ETCD_PROXY_DIAL_TIMEOUT="1000"
-#ETCD_PROXY_WRITE_TIMEOUT="5000"
-#ETCD_PROXY_READ_TIMEOUT="0"
-#
-#[Security]
-#ETCD_CERT_FILE=""
-#ETCD_KEY_FILE=""
-#ETCD_CLIENT_CERT_AUTH="false"
-#ETCD_TRUSTED_CA_FILE=""
-#ETCD_AUTO_TLS="false"
-#ETCD_PEER_CERT_FILE=""
-#ETCD_PEER_KEY_FILE=""
-#ETCD_PEER_CLIENT_CERT_AUTH="false"
-#ETCD_PEER_TRUSTED_CA_FILE=""
-#ETCD_PEER_AUTO_TLS="false"
-#
-#[Logging]
-#ETCD_DEBUG="false"
-#ETCD_LOG_PACKAGE_LEVELS=""
-#ETCD_LOG_OUTPUT="default"
-#
-#[Unsafe]
-#ETCD_FORCE_NEW_CLUSTER="false"
-#
-#[Version]
-#ETCD_VERSION="false"
-#ETCD_AUTO_COMPACTION_RETENTION="0"
-#
-#[Profiling]
-#ETCD_ENABLE_PPROF="false"
-#ETCD_METRICS="basic"
-#
-#[Auth]
-#ETCD_AUTH_TOKEN="simple"
+++ /dev/null
-[Unit]
-Description=Etcd Server
-After=network.target
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=notify
-WorkingDirectory=/var/lib/etcd/
-EnvironmentFile=-/etc/etcd/etcd.conf
-User=etcd
-# set GOMAXPROCS to number of processors
-ExecStart=/bin/bash -c "GOMAXPROCS=$(nproc) /usr/bin/etcd --name=\"${ETCD_NAME}\" --data-dir=\"${ETCD_DATA_DIR}\" --listen-client-urls=\"${ETCD_LISTEN_CLIENT_URLS}\""
-Restart=on-failure
-LimitNOFILE=65536
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-HOMEPAGE = "http://github.com/docker/distribution"
-SUMMARY = "The Docker toolset to pack, ship, store, and deliver content"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
-
-GO_PKG_PATH = "github.com/docker/distribution"
-GO_IMPORT = "import"
-
-SRCREV_distribution="48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89"
-SRC_URI = " \
- git://github.com/docker/distribution.git;branch=release/2.6;name=distribution;destsuffix=git/src/${GO_PKG_PATH} \
- file://${BPN}.service \
- file://config.yml \
- "
-
-PV = "v2.6.2"
-S = "${WORKDIR}/git/src/${GO_PKG_PATH}"
-
-inherit goarch
-inherit go
-
-# This disables seccomp and apparmor, which are on by default in the
-# go package.
-EXTRA_OEMAKE="BUILDTAGS=''"
-
-do_compile() {
- export GOARCH="${TARGET_GOARCH}"
- export GOPATH="${WORKDIR}/git/"
- export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
- # Pass the needed cflags/ldflags so that cgo
- # can find the needed headers files and libraries
- export CGO_ENABLED="1"
- export CFLAGS=""
- export LDFLAGS=""
- export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- export GO_GCFLAGS=""
- export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-
- cd ${S}
-
- oe_runmake binaries
-}
-
-do_install() {
- install -d ${D}/${bindir}
- install ${S}/bin/registry ${D}/${bindir}
-
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
- install -d ${D}${systemd_system_unitdir}
- install -m 644 ${WORKDIR}/${BPN}.service ${D}/${systemd_system_unitdir}
- fi
-
- install -d ${D}/${sysconfdir}/${BPN}/registry/
- install ${WORKDIR}/config.yml ${D}/${sysconfdir}/${BPN}/registry/config.yml
-
- # storage for the registry containers
- install -d ${D}/${localstatedir}/lib/registry/
-}
-
-FILES_${PN} = "\
- ${bindir}/* \
- ${systemd_system_unitdir}/${BPN}.service \
- ${sysconfdir}/${BPN}/* \
- ${localstatedir}/lib/registry/ \
- "
-
-SYSTEMD_SERVICE_${BPN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${BPN}.service','',d)}"
-SYSTEMD_AUTO_ENABLE_${BPN} = "disable"
-
-
-SYSROOT_PREPROCESS_FUNCS += "docker_distribution_sysroot_preprocess"
-
-docker_distribution_sysroot_preprocess () {
- install -d ${SYSROOT_DESTDIR}${prefix}/local/go/src/${GO_PKG_PATH}
- cp -r ${S} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${GO_PKG_PATH})
-}
+++ /dev/null
-
-PKG_NAME = "github.com/docker/distribution"
-
-SYSROOT_PREPROCESS_FUNCS += "docker_distribution_sysroot_preprocess"
-
-docker_distribution_sysroot_preprocess () {
- install -d ${SYSROOT_DESTDIR}${prefix}/local/go/src/${PKG_NAME}
- cp -r ${S} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
-}
+++ /dev/null
-# This is a puppet managed config file
+++ /dev/null
-[Unit]
-Description=v2 Registry server for Docker
-
-[Service]
-Type=simple
-Environment=REGISTRY_STORAGE_DELETE_ENABLED=true
-ExecStart=/usr/bin/registry serve /etc/docker-distribution/registry/config.yml
-Restart=on-failure
-ExecStartPost=/bin/bash -c 'echo $MAINPID > /var/run/docker-distribution.pid'
-ExecStopPost=/bin/rm -f /var/run/docker-distribution.pid
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-
-SUMMARY = "Forward stdin to journald"
-HOMEPAGE = "https://github.com/docker/docker"
-SECTION = "devel"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/forward-journald/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-
-PROTOCOL = "https"
-SRCNAME = "forward-journald"
-SRCREV = "77e02a9774a6ca054e41c27f6f319d701f1cbaea"
-PV = "1.10.3+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/projectatomic/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};"
-
-GO_IMPORT = "forward-journald"
-inherit go goarch
-
-do_compile() {
- mkdir -p _build/src
- ln -sfn ${S}/src/forward-journald ./_build/src/${SRCNAME}
- export GOARCH=${TARGET_GOARCH}
- export CGO_ENABLED="1"
- export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-
- export GOPATH="${WORKDIR}/build/_build:${STAGING_DIR_TARGET}/${prefix}/local/go"
- cd _build/src/${SRCNAME}
- export GOROOT=${STAGING_DIR_TARGET}/${prefix}/local/go
- go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" -o ${WORKDIR}/build/bin/forward-journald forward-journald
-}
-
-do_install() {
- install -m 0755 -d ${D}/${bindir}/
-
- install -m 0755 bin/forward-journald ${D}/${bindir}/
-}
+++ /dev/null
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "docker-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- "
-
-RDEPENDS_${PN}_append = " logrotate"
-
-do_install_append () {
- rm -f ${D}${sysconfdir}/docker
- install -d -m 0755 ${D}${sysconfdir}/docker
- install -d -m 0755 ${D}/${sysconfdir}/pmon.d
- install -d -m 0755 ${D}/${sysconfdir}/systemd/system/docker.service.d
-
- install -D -m 644 ${STX_METADATA_PATH}/files/docker-pmond.conf ${D}/${sysconfdir}/pmon.d/docker.conf
-
- install -D -m 644 ${STX_METADATA_PATH}/files/docker-stx-override.conf \
- ${D}/${sysconfdir}/systemd/system/docker.service.d/docker-stx-override.conf
- install -D -m 644 ${STX_METADATA_PATH}/files/docker.logrotate ${D}/${sysconfdir}/logrotate.d/docker.logrotate
-}
+++ /dev/null
-This is originally copied from kubernetes-contrib-v1.16.2.tar.gz in https://github.com/kubernetes/contrib,
-which is EOL now and we can't get it directly from github.
+++ /dev/null
-###
-# kubernetes system config
-#
-# The following values are used to configure the kube-apiserver
-#
-
-# The address on the local server to listen to.
-KUBE_API_ADDRESS="--insecure-bind-address=127.0.0.1"
-
-# The port on the local server to listen on.
-# KUBE_API_PORT="--port=8080"
-
-# Port minions listen on
-# KUBELET_PORT="--kubelet-port=10250"
-
-# Comma separated list of nodes in the etcd cluster
-KUBE_ETCD_SERVERS="--etcd-servers=http://127.0.0.1:2379,http://127.0.0.1:4001"
-
-# Address range to use for services
-KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=10.254.0.0/16"
-
-# default admission control policies
-KUBE_ADMISSION_CONTROL="--admission-control=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"
-
-# Add your own!
-KUBE_API_ARGS=""
+++ /dev/null
-###
-# kubernetes system config
-#
-# The following values are used to configure various aspects of all
-# kubernetes services, including
-#
-# kube-apiserver.service
-# kube-controller-manager.service
-# kube-scheduler.service
-# kubelet.service
-# kube-proxy.service
-# logging to stderr means we get it in the systemd journal
-KUBE_LOGTOSTDERR="--logtostderr=true"
-
-# journal message level, 0 is debug
-KUBE_LOG_LEVEL="--v=0"
-
-# Should this cluster be allowed to run privileged docker containers
-KUBE_ALLOW_PRIV="--allow-privileged=false"
-
-# How the controller-manager, scheduler, and proxy find the apiserver
-KUBE_MASTER="--master=http://127.0.0.1:8080"
+++ /dev/null
-###
-# The following values are used to configure the kubernetes controller-manager
-
-# defaults from config and apiserver should be adequate
-
-# Add your own!
-KUBE_CONTROLLER_MANAGER_ARGS=""
+++ /dev/null
-###
-# kubernetes kubelet (minion) config
-
-# The address for the info server to serve on (set to 0.0.0.0 or "" for all interfaces)
-KUBELET_ADDRESS="--address=127.0.0.1"
-
-# The port for the info server to serve on
-# KUBELET_PORT="--port=10250"
-
-# You may leave this blank to use the actual hostname
-KUBELET_HOSTNAME="--hostname-override=127.0.0.1"
-
-# Edit the kubelet.kubeconfig to have correct cluster server address
-KUBELET_KUBECONFIG=/etc/kubernetes/kubelet.kubeconfig
-
-# Add your own!
-KUBELET_ARGS="--cgroup-driver=systemd --fail-swap-on=false"
+++ /dev/null
-apiVersion: v1
-kind: Config
-clusters:
- - cluster:
- server: http://127.0.0.1:8080/
- name: local
-contexts:
- - context:
- cluster: local
- name: local
-current-context: local
-
+++ /dev/null
-###
-# kubernetes proxy config
-
-# default config should be adequate
-
-# Add your own!
-KUBE_PROXY_ARGS=""
+++ /dev/null
-###
-# kubernetes scheduler config
-
-# default config should be adequate
-
-# Add your own!
-KUBE_SCHEDULER_ARGS=""
+++ /dev/null
-[Unit]
-Description=Kubernetes API Server
-Documentation=https://kubernetes.io/docs/concepts/overview/components/#kube-apiserver https://kubernetes.io/docs/reference/generated/kube-apiserver/
-After=network.target
-After=etcd.service
-
-[Service]
-EnvironmentFile=-/etc/kubernetes/config
-EnvironmentFile=-/etc/kubernetes/apiserver
-User=kube
-ExecStart=/usr/bin/kube-apiserver \
- $KUBE_LOGTOSTDERR \
- $KUBE_LOG_LEVEL \
- $KUBE_ETCD_SERVERS \
- $KUBE_API_ADDRESS \
- $KUBE_API_PORT \
- $KUBELET_PORT \
- $KUBE_ALLOW_PRIV \
- $KUBE_SERVICE_ADDRESSES \
- $KUBE_ADMISSION_CONTROL \
- $KUBE_API_ARGS
-Restart=on-failure
-Type=notify
-LimitNOFILE=65536
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-[Unit]
-Description=Kubernetes Controller Manager
-Documentation=https://kubernetes.io/docs/concepts/overview/components/#kube-controller-manager https://kubernetes.io/docs/reference/generated/kube-controller-manager/
-
-[Service]
-EnvironmentFile=-/etc/kubernetes/config
-EnvironmentFile=-/etc/kubernetes/controller-manager
-User=kube
-ExecStart=/usr/bin/kube-controller-manager \
- $KUBE_LOGTOSTDERR \
- $KUBE_LOG_LEVEL \
- $KUBE_MASTER \
- $KUBE_CONTROLLER_MANAGER_ARGS
-Restart=on-failure
-LimitNOFILE=65536
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-[Unit]
-Description=Kubernetes Kube-Proxy Server
-Documentation=https://kubernetes.io/docs/concepts/overview/components/#kube-proxy https://kubernetes.io/docs/reference/generated/kube-proxy/
-After=network.target
-
-[Service]
-EnvironmentFile=-/etc/kubernetes/config
-EnvironmentFile=-/etc/kubernetes/proxy
-ExecStart=/usr/bin/kube-proxy \
- $KUBE_LOGTOSTDERR \
- $KUBE_LOG_LEVEL \
- $KUBE_MASTER \
- $KUBE_PROXY_ARGS
-Restart=on-failure
-LimitNOFILE=65536
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-[Unit]
-Description=Kubernetes Scheduler Plugin
-Documentation=https://kubernetes.io/docs/concepts/overview/components/#kube-scheduler https://kubernetes.io/docs/reference/generated/kube-scheduler/
-
-[Service]
-EnvironmentFile=-/etc/kubernetes/config
-EnvironmentFile=-/etc/kubernetes/scheduler
-User=kube
-ExecStart=/usr/bin/kube-scheduler \
- $KUBE_LOGTOSTDERR \
- $KUBE_LOG_LEVEL \
- $KUBE_MASTER \
- $KUBE_SCHEDULER_ARGS
-Restart=on-failure
-LimitNOFILE=65536
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-[Unit]
-Description=Kubernetes Kubelet Server
-Documentation=https://kubernetes.io/docs/concepts/overview/components/#kubelet https://kubernetes.io/docs/reference/generated/kubelet/
-After=docker.service
-Requires=docker.service
-
-[Service]
-WorkingDirectory=/var/lib/kubelet
-EnvironmentFile=-/etc/kubernetes/config
-EnvironmentFile=-/etc/kubernetes/kubelet
-ExecStart=/usr/bin/kubelet \
- $KUBE_LOGTOSTDERR \
- $KUBE_LOG_LEVEL \
- $KUBELET_KUBECONFIG \
- $KUBELET_ADDRESS \
- $KUBELET_PORT \
- $KUBELET_HOSTNAME \
- $KUBE_ALLOW_PRIV \
- $KUBELET_ARGS
-Restart=on-failure
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-
-d /var/run/kubernetes 0755 kube kube -
+++ /dev/null
-#!/bin/bash
-
-#
-# Copyright (c) 2018 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-# This script takes the names of packaged helm charts as arguments.
-# It installs them in the on-node helm chart repository and regenerates
-# the repository index.
-
-
-# We want to run as the "www" user and scripts can't be setuid. The
-# sudoers permissions are set up to allow wrsroot to run this script
-# as the "www" user without a password.
-if [ $USER != "www" ]; then
- exec sudo -u www $0 $@
-fi
-
-
-RETVAL=0
-REINDEX=0
-
-REPO_BASE='/www/pages/helm_charts'
-
-# First argument is always the repo where the charts need to be placed
-if [ $# -lt 2 ]; then
- echo "Usage: helm-upload <repo name> <chart 1> .. <chart N>"
- exit 1
-fi
-
-# Make sure the repo directory exists
-REPO_DIR="${REPO_BASE}/$1"
-if [ ! -e $REPO_DIR ]; then
- echo "$REPO_DIR doesn't exist."
- exit 1
-fi
-
-shift 1
-
-for FILE in "$@"; do
- if [ -r $FILE ]; then
- # QUESTION: should we disallow overwriting an existing file?
- # The versions are embedded in the filename, so it shouldn't
- # cause problems.
- cp $FILE $REPO_DIR
- if [ $? -ne 0 ]; then
- echo Problem adding $FILE to helm chart registry.
- RETVAL=1
- else
- REINDEX=1
- fi
- else
- echo Cannot read file ${FILE}.
- RETVAL=1
- fi
-done
-
-
-# Now re-index the helm repository if we successfully copied in
-# any new charts.
-if [ $REINDEX -eq 1 ]; then
- /usr/sbin/helm repo index $REPO_DIR
-fi
-
-exit $RETVAL
+++ /dev/null
-wrsroot ALL=(www) NOPASSWD: /usr/local/sbin/helm-upload
-
-Defaults lecture=never, secure_path=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
+++ /dev/null
-
-# Note: This dropin only works with kubeadm and kubelet v1.11+
-[Service]
-Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf"
-Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml"
-# This is a file that "kubeadm init" and "kubeadm join" generates at runtime, populating the KUBELET_KUBEADM_ARGS variable dynamically
-EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env
-# This is a file that the user can use for overrides of the kubelet args as a last resort. Preferably, the user should use
-# the .NodeRegistration.KubeletExtraArgs object in the configuration files instead. KUBELET_EXTRA_ARGS should be sourced from this file.
-EnvironmentFile=-/etc/sysconfig/kubelet
-ExecStart=
-ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS $KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS
-ExecStartPre=-/usr/bin/kubelet-cgroup-setup.sh
-ExecStartPost=/bin/bash -c 'echo $MAINPID > /var/run/kubelet.pid;'
-ExecStopPost=/bin/rm -f /var/run/kubelet.pid
-Restart=always
-StartLimitInterval=0
-RestartSec=10
+++ /dev/null
-#!/bin/bash
-#
-# Copyright (c) 2019 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# This script does minimal cgroup setup for kubelet. This creates k8s-infra
-# cgroup for a minimal set of resource controllers, and configures cpuset
-# attributes to span all online cpus and nodes. This will do nothing if
-# the k8s-infra cgroup already exists (i.e., assume already configured).
-# NOTE: The creation of directories under /sys/fs/cgroup is volatile, and
-# does not persist reboots. The cpuset.mems and cpuset.cpus is later updated
-# by puppet kubernetes.pp manifest.
-#
-
-# Define minimal path
-PATH=/bin:/usr/bin:/usr/local/bin
-
-# Log info message to /var/log/daemon.log
-function LOG {
- logger -p daemon.info "$0($$): $@"
-}
-
-# Log error message to /var/log/daemon.log
-function ERROR {
- logger -s -p daemon.error "$0($$): ERROR: $@"
-}
-
-# Create minimal cgroup directories and configure cpuset attributes
-# pids should be first in the list, since it appears to get auto deleted
-function create_cgroup {
- local cg_name=$1
- local cg_nodeset=$2
- local cg_cpuset=$3
-
- local CGROUP=/sys/fs/cgroup
- local CONTROLLERS=("pids" "cpuset" "memory" "cpu,cpuacct" "systemd")
- local cnt=''
- local CGDIR=''
- local RC=0
-
- # Create the cgroup for required controllers
- for cnt in ${CONTROLLERS[@]}; do
- CGDIR=${CGROUP}/${cnt}/${cg_name}
- if [ -d ${CGDIR} ]; then
- LOG "Nothing to do, already configured: ${CGDIR}."
- exit ${RC}
- fi
- LOG "Creating: ${CGDIR}"
- mkdir -p ${CGDIR}
- RC=$?
- if [ ${RC} -ne 0 ]; then
- ERROR "Creating: ${CGDIR}, rc=${RC}"
- exit ${RC}
- fi
- done
-
- # Customize cpuset attributes
- LOG "Configuring cgroup: ${cg_name}, nodeset: ${cg_nodeset}, cpuset: ${cg_cpuset}"
- CGDIR=${CGROUP}/cpuset/${cg_name}
- local CGMEMS=${CGDIR}/cpuset.mems
- local CGCPUS=${CGDIR}/cpuset.cpus
- local CGTASKS=${CGDIR}/tasks
-
- # Assign cgroup memory nodeset
- LOG "Assign nodeset ${cg_nodeset} to ${CGMEMS}"
- /bin/echo ${cg_nodeset} > ${CGMEMS}
- RC=$?
- if [ ${RC} -ne 0 ]; then
- ERROR "Unable to write to: ${CGMEMS}, rc=${RC}"
- exit ${RC}
- fi
-
- # Assign cgroup cpus
- LOG "Assign cpuset ${cg_cpuset} to ${CGCPUS}"
- /bin/echo ${cg_cpuset} > ${CGCPUS}
- RC=$?
- if [ ${RC} -ne 0 ]; then
- ERROR "Assigning: ${cg_cpuset} to ${CGCPUS}, rc=${RC}"
- exit ${RC}
- fi
-
- # Set file ownership
- chown root:root ${CGMEMS} ${CGCPUS} ${CGTASKS}
- RC=$?
- if [ ${RC} -ne 0 ]; then
- ERROR "Setting owner for: ${CGMEMS}, ${CGCPUS}, ${CGTASKS}, rc=${RC}"
- exit ${RC}
- fi
-
- # Set file mode permissions
- chmod 644 ${CGMEMS} ${CGCPUS} ${CGTASKS}
- RC=$?
- if [ ${RC} -ne 0 ]; then
- ERROR "Setting mode for: ${CGMEMS}, ${CGCPUS}, ${CGTASKS}, rc=${RC}"
- exit ${RC}
- fi
-
- return ${RC}
-}
-
-if [ $UID -ne 0 ]; then
- ERROR "Require sudo/root."
- exit 1
-fi
-
-# Configure default kubepods cpuset to span all online cpus and nodes.
-ONLINE_NODESET=$(/bin/cat /sys/devices/system/node/online)
-ONLINE_CPUSET=$(/bin/cat /sys/devices/system/cpu/online)
-
-# Configure kubelet cgroup to match cgroupRoot.
-create_cgroup 'k8s-infra' ${ONLINE_NODESET} ${ONLINE_CPUSET}
-
-exit $?
-
+++ /dev/null
-
-[Manager]
-DefaultCPUAccounting=yes
-DefaultMemoryAccounting=yes
-
+++ /dev/null
-
-SUMMARY = "The Kubernetes Package Manager"
-HOMEPAGE = "https://github.com/kubernetes/helm/releases "
-SECTION = "devel"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0c7bcb474e766c7d92924a18cd9d3878"
-
-#SRCREV = "618447cbf203d147601b4b9bd7f8c37a5d39fbb4"
-SRCNAME = "helm"
-#PROTOCOL = "https"
-#BRANCH = "release-2.13"
-S = "${WORKDIR}/linux-amd64"
-PV = "2.13.1"
-
-SRC_URI = " \
- https://get.helm.sh/helm-v2.13.1-linux-amd64.tar.gz \
- file://helm-upload \
- file://helm.sudo \
- "
-# Client: &version.Version{SemVer:"v2.13.1", GitCommit:"618447cbf203d147601b4b9bd7f8c37a5d39fbb4", GitTreeState:"clean"}
-SRC_URI[md5sum] = "ffbe37fe328d99156d14a950bbd8107c"
-SRC_URI[sha256sum] = "c1967c1dfcd6c921694b80ededdb9bd1beb27cb076864e58957b1568bc98925a"
-
-INSANE_SKIP_${PN} = "ldflags"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-RDEPENDS_${PN} += " bash"
-
-
-do_configure() {
- :
-}
-
-do_compile() {
- :
-}
-
-do_install() {
- install -m 0755 -d ${D}/${sbindir}/
- install -m 0750 -d ${D}/${sysconfdir}/sudoers.d
-
- install -m 0755 ${S}/helm ${D}/${sbindir}/
- install -m 0755 ${S}/../helm.sudo ${D}/${sysconfdir}/sudoers.d/helm
- install -m 0755 ${S}/../helm-upload ${D}/${sbindir}/
-}
-
-BBCLASSEXTEND = "native nativesdk"
-
-FILES_${PN} = " \
- ${sbindir}/helm \
- ${sbindir}/helm-upload \
- ${sysconfdir}/sudoers.d \
- ${sysconfdir}/sudoers.d/helm \
- "
+++ /dev/null
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-PV = "1.16.2+git${SRCREV_kubernetes}"
-SRCREV_kubernetes = "c97fe5036ef3df2967d086711e6c0c405941e14b"
-
-LICENSE += "(Apache-2.0&MIT)&(Apache-2.0|CC-BY-4.0)"
-LIC_FILES_CHKSUM_append = " \
- file://src/import/logo/LICENSE;md5=b431638b9986506145774a9da0d0ad85 \
- file://src/import/vendor/github.com/morikuni/aec/LICENSE;md5=86852eb2df591157c788f3ba889c8aec \
- file://src/import/staging/src/k8s.io/sample-controller/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- file://src/import/test/images/kitten/Dockerfile;beginline=1;endline=13;md5=78cb21f802c15df77b75bd56f9417ccf \
- file://src/import/test/images/nautilus/Dockerfile;beginline=1;endline=13;md5=78cb21f802c15df77b75bd56f9417ccf \
- file://src/import/staging/src/k8s.io/kubectl/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e \
- file://src/import/vendor/github.com/grpc-ecosystem/go-grpc-middleware/LICENSE;md5=7ab5c73bb7e4679b16dd7c11b3559acf \
- "
-
-SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.16;name=kubernetes \
- file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \
- file://0001-cross-don-t-build-tests-by-default.patch \
- file://kubernetes-accounting.conf \
- file://kubeadm.conf \
- file://kubelet-cgroup-setup.sh \
- file://contrib/* \
- "
-
-INSANE_SKIP_${PN} += "textrel"
-INSANE_SKIP_${PN}-misc += "textrel"
-INSANE_SKIP_kubelet += "textrel"
-
-
-do_install () {
- install -d ${D}${bindir}
- install -d ${D}${systemd_system_unitdir}/
-
- # Install binaries
- install -m 755 -D ${S}/src/import/_output/local/bin/${TARGET_GOOS}/${TARGET_GOARCH}/* ${D}/${bindir}
-
- # kubeadm:
- install -d -m 0755 ${D}/${sysconfdir}/systemd/system/kubelet.service.d
- install -m 0644 ${WORKDIR}/kubeadm.conf ${D}/${sysconfdir}/systemd/system/kubelet.service.d
-
- # kubelete-cgroup-setup.sh
- install -m 0700 ${WORKDIR}/kubelet-cgroup-setup.sh ${D}/${bindir}
-
- # install the bash completion
- install -d -m 0755 ${D}${datadir}/bash-completion/completions/
- ${D}${bindir}/kubectl completion bash > ${D}${datadir}/bash-completion/completions/kubectl
-
- # install config files
- install -d -m 0755 ${D}${sysconfdir}/${BPN}
- install -m 644 -t ${D}${sysconfdir}/${BPN} ${WORKDIR}/contrib/init/systemd/environ/*
-
- # install service files
- install -d -m 0755 ${D}${systemd_system_unitdir}
- install -m 0644 -t ${D}${systemd_system_unitdir} ${WORKDIR}/contrib/init/systemd/*.service
-
- # install the place the kubelet defaults to put volumes
- install -d ${D}${localstatedir}/lib/kubelet
-
- # install systemd tmpfiles
- install -d -m 0755 ${D}${sysconfdir}/tmpfiles.d
- install -p -m 0644 -t ${D}${sysconfdir}/tmpfiles.d ${WORKDIR}/contrib/init/systemd/tmpfiles.d/kubernetes.conf
-
- # enable CPU and Memory accounting
- install -d -m 0755 ${D}/${sysconfdir}/systemd/system.conf.d
- install -m 0644 ${WORKDIR}/kubernetes-accounting.conf ${D}/${sysconfdir}//systemd/system.conf.d/
-}
-
-SYSTEMD_PACKAGES += "${PN} kube-proxy"
-SYSTEMD_SERVICE_kube-proxy = "kube-proxy.service"
-SYSTEMD_SERVICE_${PN} = "\
- kube-scheduler.service \
- kube-apiserver.service \
- kube-controller-manager.service \
- "
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
-SYSTEMD_AUTO_ENABLE_kubelet = "disable"
-SYSTEMD_AUTO_ENABLE_kube-proxy = "disable"
-
-FILES_${PN} += "\
- ${bindir}/kube-scheduler \
- ${bindir}/kube-apiserver \
- ${bindir}/kube-controller-manager \
- ${bindir}/hyperkube \
- ${bindir}/kubelet-cgroup-setup.sh \
- "
-
-FILES_kubectl += "\
- ${datadir}/bash-completion/completions/kubectl \
- "
-
-FILES_${PN}-misc = "\
- ${bindir}/conversion-gen \
- ${bindir}/openapi-gen \
- ${bindir}/apiextensions-apiserver \
- ${bindir}/defaulter-gen \
- ${bindir}/mounter \
- ${bindir}/deepcopy-gen \
- ${bindir}/go-bindata \
- ${bindir}/go2make \
- "
-
-RDEPENDS_${PN} += "\
- bash \
- kube-proxy \
- "
+++ /dev/null
-From a53605694d5301b7bb543464b17f74bbbd35d372 Mon Sep 17 00:00:00 2001
-From: Dengke Du <dengke.du@windriver.com>
-Date: Tue, 28 Aug 2018 10:04:40 +0800
-Subject: [PATCH] Correct the path to find version.h in rocksdb
-
-Signed-off-by: Dengke Du <dengke.du@windriver.com>
----
- cmake/modules/Findrocksdb.cmake | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/modules/Findrocksdb.cmake b/cmake/modules/Findrocksdb.cmake
-index f8369f7..36b67ea 100644
---- a/cmake/modules/Findrocksdb.cmake
-+++ b/cmake/modules/Findrocksdb.cmake
-@@ -9,17 +9,17 @@
- # ROCKSDB_VERSION_MINOR
- # ROCKSDB_VERSION_PATCH
-
--find_path(ROCKSDB_INCLUDE_DIR rocksdb/db.h)
-+find_path(ROCKSDB_INCLUDE_DIR rocksdb/db.h ${CMAKE_SYSROOT})
-
--find_library(ROCKSDB_LIBRARIES rocksdb)
-+find_library(ROCKSDB_LIBRARIES rocksdb ${CMAKE_SYSROOT})
-
- if(ROCKSDB_INCLUDE_DIR AND EXISTS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h")
- foreach(ver "MAJOR" "MINOR" "PATCH")
-- file(STRINGS "${ROCKSDB_INCLUDE_DIR}/version.h" ROCKSDB_VER_${ver}_LINE
-+ file(STRINGS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h" ROCKSDB_VER_${ver}_LINE
- REGEX "^#define[ \t]+ROCKSDB_${ver}[ \t]+[0-9]+$")
- string(REGEX REPLACE "^#define[ \t]+ROCKSDB_${ver}[ \t]+([0-9]+)$"
-- "\\1" ROCKSDB_VERSION_${ver} "${ROCKDB_VER_${ver}_LINE}")
-- unset(${ROCKDB_VER_${ver}_LINE})
-+ "\\1" ROCKSDB_VERSION_${ver} "${ROCKSDB_VER_${ver}_LINE}")
-+ unset(ROCKSDB_VER_${ver}_LINE)
- endforeach()
- set(ROCKSDB_VERSION_STRING
- "${ROCKSDB_VERSION_MAJOR}.${ROCKSDB_VERSION_MINOR}.${ROCKSDB_VERSION_PATCH}")
---
-2.7.4
-
+++ /dev/null
-From 3e86b6d9db2682b123839e38e9bf45060e2bb2ab Mon Sep 17 00:00:00 2001
-From: Dengke Du <dengke.du@windriver.com>
-Date: Wed, 29 Aug 2018 16:57:52 +0800
-Subject: [PATCH] zstd: fix error for cross compile
-
-Signed-off-by: Dengke Du <dengke.du@windriver.com>
----
- src/compressor/zstd/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt
-index e30cb89..b298a3d 100644
---- a/src/compressor/zstd/CMakeLists.txt
-+++ b/src/compressor/zstd/CMakeLists.txt
-@@ -9,7 +9,7 @@ ExternalProject_Add(zstd_ext
- CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${ZSTD_C_FLAGS}
-- -DCMAKE_AR=${CMAKE_AR}
-+ -DCMAKE_SYSROOT=${CMAKE_SYSROOT}
- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzstd
- BUILD_COMMAND $(MAKE) libzstd_static
- INSTALL_COMMAND "true")
---
-2.7.4
-
+++ /dev/null
-From 00d44940c2e83bf73101a05d2aa8f88c2e2fca58 Mon Sep 17 00:00:00 2001
-From: Dengke Du <dengke.du@windriver.com>
-Date: Tue, 23 Oct 2018 15:34:53 +0800
-Subject: [PATCH] ceph: add pybind support in OE
-
-1. add sysroot to CFLAGS when cross compiling pybind
-2. change the pybind's INSTALL path to OE's INSTALL path
-3. delete the check for header files, because the check method using
- host compiler.
-
-Signed-off-by: Dengke Du <dengke.du@windriver.com>
-Upstream-Status: Inappropriate [oe specific]
----
- cmake/modules/Distutils.cmake | 12 +++---------
- src/pybind/cephfs/setup.py | 8 --------
- src/pybind/rados/setup.py | 8 --------
- src/pybind/rbd/setup.py | 8 --------
- src/pybind/rgw/setup.py | 8 --------
- 5 files changed, 3 insertions(+), 41 deletions(-)
-
-diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
-index d6e9f38..3091d97 100644
---- a/cmake/modules/Distutils.cmake
-+++ b/cmake/modules/Distutils.cmake
-@@ -47,7 +47,7 @@ function(distutils_add_cython_module name src)
- LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
- CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}
- CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-- CFLAGS=\"-iquote${CMAKE_SOURCE_DIR}/src/include -w\"
-+ CFLAGS=\"-iquote${CMAKE_SOURCE_DIR}/src/include -w --sysroot=${CMAKE_SYSROOT}\"
- ${PYTHON${PYTHON_VERSION}_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py
- build --verbose --build-base ${CYTHON_MODULE_DIR}
- --build-platlib ${CYTHON_MODULE_DIR}/lib.${PYTHON${PYTHON_VERSION}_VERSION_MAJOR}
-@@ -69,14 +69,8 @@ function(distutils_install_cython_module name)
- set(ENV{CEPH_LIBDIR} \"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\")
-
- set(options --prefix=${CMAKE_INSTALL_PREFIX})
-- if(DEFINED ENV{DESTDIR})
-- if(EXISTS /etc/debian_version)
-- list(APPEND options --install-layout=deb)
-- endif()
-- list(APPEND options --root=\$ENV{DESTDIR})
-- else()
-- list(APPEND options --root=/)
-- endif()
-+ list(APPEND options --root=${CMAKE_DESTDIR})
-+ list(APPEND options --install-lib=${PYTHON_SITEPACKAGES_DIR})
- execute_process(
- COMMAND
- ${PYTHON${PYTHON_VERSION}_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py
-diff --git a/src/pybind/cephfs/setup.py b/src/pybind/cephfs/setup.py
-index 6533f41..1ee4a59 100755
---- a/src/pybind/cephfs/setup.py
-+++ b/src/pybind/cephfs/setup.py
-@@ -121,14 +121,6 @@ def check_sanity():
- finally:
- shutil.rmtree(tmp_dir)
-
--
--if 'BUILD_DOC' in os.environ.keys():
-- pass
--elif check_sanity():
-- pass
--else:
-- sys.exit(1)
--
- cmdclass = {}
- try:
- from Cython.Build import cythonize
-diff --git a/src/pybind/rados/setup.py b/src/pybind/rados/setup.py
-index ef7c307..5204017 100755
---- a/src/pybind/rados/setup.py
-+++ b/src/pybind/rados/setup.py
-@@ -117,14 +117,6 @@ def check_sanity():
- finally:
- shutil.rmtree(tmp_dir)
-
--
--if 'BUILD_DOC' in os.environ.keys():
-- pass
--elif check_sanity():
-- pass
--else:
-- sys.exit(1)
--
- cmdclass = {}
- try:
- from Cython.Build import cythonize
-diff --git a/src/pybind/rbd/setup.py b/src/pybind/rbd/setup.py
-index bcf96f2..d4cbbeb 100755
---- a/src/pybind/rbd/setup.py
-+++ b/src/pybind/rbd/setup.py
-@@ -120,14 +120,6 @@ def check_sanity():
- finally:
- shutil.rmtree(tmp_dir)
-
--
--if 'BUILD_DOC' in os.environ.keys():
-- pass
--elif check_sanity():
-- pass
--else:
-- sys.exit(1)
--
- cmdclass = {}
- try:
- from Cython.Build import cythonize
-diff --git a/src/pybind/rgw/setup.py b/src/pybind/rgw/setup.py
-index f14f30c..ee7570b 100755
---- a/src/pybind/rgw/setup.py
-+++ b/src/pybind/rgw/setup.py
-@@ -120,14 +120,6 @@ def check_sanity():
- finally:
- shutil.rmtree(tmp_dir)
-
--
--if 'BUILD_DOC' in os.environ.keys():
-- pass
--elif check_sanity():
-- pass
--else:
-- sys.exit(1)
--
- cmdclass = {}
- try:
- from Cython.Build import cythonize
---
-2.7.4
-
+++ /dev/null
-From 6aaf04036f0affbeddda123bff111990c4d5fd72 Mon Sep 17 00:00:00 2001
-From: Dengke Du <dengke.du@windriver.com>
-Date: Fri, 26 Oct 2018 14:31:10 +0800
-Subject: [PATCH] ceph-detect-init: correct the installation for OE
-
-Signed-off-by: Dengke Du <dengke.du@windriver.com>
-Upstream-Status: Inappropriate [oe specific]
----
- cmake/modules/Distutils.cmake | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
-index 3091d97..c50fe77 100644
---- a/cmake/modules/Distutils.cmake
-+++ b/cmake/modules/Distutils.cmake
-@@ -16,15 +16,8 @@ function(distutils_install_module name)
- cmake_parse_arguments(DU "" INSTALL_SCRIPT "" ${ARGN})
- install(CODE "
- set(options --prefix=${CMAKE_INSTALL_PREFIX})
-- if(DEFINED ENV{DESTDIR})
-- if(EXISTS /etc/debian_version)
-- list(APPEND options --install-layout=deb)
-- endif()
-- list(APPEND options --root=\$ENV{DESTDIR})
-- if(NOT \"${DU_INSTALL_SCRIPT}\" STREQUAL \"\")
-- list(APPEND options --install-script=${DU_INSTALL_SCRIPT})
-- endif()
-- endif()
-+ list(APPEND options --root=${CMAKE_DESTDIR})
-+ list(APPEND options --install-lib=${PYTHON_SITEPACKAGES_DIR})
- execute_process(
- COMMAND ${PYTHON${PYTHON_VERSION}_EXECUTABLE}
- setup.py install \${options}
---
-2.7.4
-
+++ /dev/null
-From 3763a20314ec2b80ec9d8525a1d3867b3c731266 Mon Sep 17 00:00:00 2001
-From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
-Date: Sat, 22 Feb 2020 04:48:04 -0800
-Subject: [PATCH] ceph rebase on stx.3.0 and warrior
-
-From 03340eaf0004e3cc8e3f8991ea96a46757d92830 Mon Sep 17 00:00:00 2001
-From: Don Penney <don.penney@windriver.com>
-Date: Sat, 26 Jan 2019 13:34:55 -0500
-Subject: [PATCH] Add hooks for orderly shutdown on controller
-
-Hook the ceph init script to add systemd overrides to define
-an orderly shutdown for StarlingX controllers.
----
- src/init-ceph.in | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
-diff --git a/src/init-ceph.in b/src/init-ceph.in
-index 1843710..a31b900 100755
---- a/src/init-ceph.in
-+++ b/src/init-ceph.in
-@@ -434,6 +434,38 @@ for name in $what; do
- continue
- fi
-
-+ . /etc/platform/platform.conf
-+ if [ "${nodetype}" = "controller" ]; then
-+ # StarlingX: Hook the transient services launched by systemd-run
-+ # to allow for proper cleanup and orderly shutdown
-+
-+ # Set nullglob so wildcards will return empty string if no match
-+ shopt -s nullglob
-+
-+ OSD_SERVICES=$(for svc in /run/systemd/system/ceph-osd*.service; do basename $svc; done | xargs echo)
-+ for d in /run/systemd/system/ceph-osd*.d; do
-+ cat <<EOF > $d/starlingx-overrides.conf
-+[Unit]
-+Before=docker.service
-+After=sm-shutdown.service
-+
-+EOF
-+ done
-+
-+ for d in /run/systemd/system/ceph-mon*.d; do
-+ cat <<EOF > $d/starlingx-overrides.conf
-+[Unit]
-+Before=docker.service
-+After=sm-shutdown.service ${OSD_SERVICES}
-+
-+EOF
-+ done
-+
-+ shopt -u nullglob
-+
-+ systemctl daemon-reload
-+ fi
-+
- [ -n "$post_start" ] && do_cmd "$post_start"
- [ -n "$lockfile" ] && [ "$?" -eq 0 ] && touch $lockfile
- ;;
---
-2.23.0
-
+++ /dev/null
-diff -Nurpd a/src/pybind/rados/rados.pyx b/src/pybind/rados/rados.pyx
---- a/src/pybind/rados/rados.pyx 2020-04-11 17:15:00.793220981 -0700
-+++ b/src/pybind/rados/rados.pyx 2020-04-11 17:18:32.536405851 -0700
-@@ -326,7 +326,10 @@ LIBRADOS_OPERATION_IGNORE_CACHE = _LIBRA
- LIBRADOS_OPERATION_SKIPRWLOCKS = _LIBRADOS_OPERATION_SKIPRWLOCKS
- LIBRADOS_OPERATION_IGNORE_OVERLAY = _LIBRADOS_OPERATION_IGNORE_OVERLAY
-
--LIBRADOS_ALL_NSPACES = _LIBRADOS_ALL_NSPACES.decode('utf-8')
-+if isinstance(_LIBRADOS_ALL_NSPACES, str):
-+ LIBRADOS_ALL_NSPACES = _LIBRADOS_ALL_NSPACES
-+else:
-+ LIBRADOS_ALL_NSPACES = _LIBRADOS_ALL_NSPACES.decode('utf-8')
-
- LIBRADOS_CREATE_EXCLUSIVE = _LIBRADOS_CREATE_EXCLUSIVE
- LIBRADOS_CREATE_IDEMPOTENT = _LIBRADOS_CREATE_IDEMPOTENT
-diff --git a/src/pybind/rados/rados.pyx b/src/pybind/rados/rados.pyx
-index fe17620..beca5ae 100644
---- a/src/pybind/rados/rados.pyx
-+++ b/src/pybind/rados/rados.pyx
-@@ -555,6 +555,8 @@ def decode_cstr(val, encoding="utf-8"):
- """
- if val is None:
- return None
-+ if isinstance(val, str):
-+ return val
-
- return val.decode(encoding)
+++ /dev/null
-SUMMARY = "User space components of the Ceph file system"
-DESCRIPTION = "\
-Ceph is a massively scalable, open-source, distributed storage system that runs \
-on commodity hardware and delivers object, block and file system storage. \
-"
-HOMEPAGE = "https://ceph.io"
-
-LICENSE = "LGPLv2.1 & GPLv2 & Apache-2.0 & MIT"
-LIC_FILES_CHKSUM = "\
- file://COPYING-LGPL2.1;md5=fbc093901857fcd118f065f900982c24 \
- file://COPYING-GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
- file://COPYING;md5=92d301c8fccd296f2221a68a8dd53828 \
-"
-
-DEPENDS = "\
- boost rdma-core bzip2 curl expat \
- gperf-native keyutils libaio lz4 \
- nspr nss oath openldap openssl \
- python python-cython-native rocksdb \
- snappy udev valgrind xfsprogs zlib \
-"
-
-S = "${WORKDIR}/git"
-BRANCH = "stx/v${PV}"
-SRCREV = "7567060fea1f8d719d317277f1eb01161cf3bfef"
-
-BRANCH_lua = "lua-5.3-ceph"
-SRCREV_lua = "1fce39c6397056db645718b8f5821571d97869a4"
-DESTSUF_lua = "git/src/lua"
-
-BRANCH_ceph-object-corpus = "master"
-SRCREV_ceph-object-corpus = "e32bf8ca3dc6151ebe7f205ba187815bc18e1cef"
-DESTSUF_ceph-object-corpus = "git/ceph-object-corpus"
-
-BRANCH_civetweb = "ceph-mimic"
-SRCREV_civetweb = "ff2881e2cd5869a71ca91083bad5d12cccd22136"
-DESTSUF_civetweb = "git/src/civetweb"
-
-BRANCH_jerasure = "v2-ceph"
-SRCREV_jerasure = "96c76b89d661c163f65a014b8042c9354ccf7f31"
-DESTSUF_jerasure = "git/src/erasure-code/jerasure/jerasure"
-
-BRANCH_gf-complete = "v3-ceph"
-SRCREV_gf-complete = "7e61b44404f0ed410c83cfd3947a52e88ae044e1"
-DESTSUF_gf-complete = "git/src/erasure-code/jerasure/gf-complete"
-
-BRANCH_xxHash = "master"
-SRCREV_xxHash = "1f40c6511fa8dd9d2e337ca8c9bc18b3e87663c9"
-DESTSUF_xxHash = "git/src/xxHash"
-
-# the tag v1.3.2 is not on any branch
-BRANCH_zstd = "nobranch=1"
-SRCREV_zstd = "f4340f46b2387bc8de7d5320c0b83bb1499933ad"
-DESTSUF_zstd = "git/src/zstd"
-
-BRANCH_rocksdb = "ceph-mimic"
-SRCREV_rocksdb = "f4a857da0b720691effc524469f6db895ad00d8e"
-DESTSUF_rocksdb = "git/src/rocksdb"
-
-BRANCH_ceph-erasure-code-corpus = "master"
-SRCREV_ceph-erasure-code-corpus = "2d7d78b9cc52e8a9529d8cc2d2954c7d375d5dd7"
-DESTSUF_ceph-erasure-code-corpus = "git/ceph-erasure-code-corpus"
-
-BRANCH_spdk = "wip-25032-mimic"
-SRCREV_spdk = "f474ce6930f0a44360e1cc4ecd606d2348481c4c"
-DESTSUF_spdk = "git/src/spdk"
-
-BRANCH_isa-l = "master"
-SRCREV_isa-l = "7e1a337433a340bc0974ed0f04301bdaca374af6"
-DESTSUF_isa-l = "git/src/isa-l"
-
-BRANCH_blkin = "master"
-SRCREV_blkin = "f24ceec055ea236a093988237a9821d145f5f7c8"
-DESTSUF_blkin = "git/src/blkin"
-
-BRANCH_rapidjson = "master"
-SRCREV_rapidjson = "f54b0e47a08782a6131cc3d60f94d038fa6e0a51"
-DESTSUF_rapidjson = "git/src/rapidjson"
-
-BRANCH_googletest = "ceph-release-1.7.x"
-SRCREV_googletest = "fdb850479284e2aae047b87df6beae84236d0135"
-DESTSUF_googletest = "git/src/googletest"
-
-BRANCH_crypto = "master"
-SRCREV_crypto = "603529a4e06ac8a1662c13d6b31f122e21830352"
-DESTSUF_crypto = "git/src/crypto/isa-l/isa-l_crypto"
-
-BRANCH_rapidjson-gtest = "ceph-release-1.7.x"
-SRCREV_rapidjson-gtest = "0a439623f75c029912728d80cb7f1b8b48739ca4"
-DESTSUF_rapidjson-gtest = "git/src/rapidjson/thirdparty/gtest"
-
-
-SRC_URI = "\
- git://github.com/starlingx-staging/stx-ceph.git;branch=${BRANCH} \
- git://github.com/ceph/lua;name=lua;branch=${BRANCH_lua};destsuffix=${DESTSUF_lua} \
- git://github.com/ceph/ceph-object-corpus;name=ceph-object-corpus;branch=${BRANCH_ceph-object-corpus};destsuffix=${DESTSUF_ceph-object-corpus} \
- git://github.com/ceph/civetweb;name=civetweb;branch=${BRANCH_civetweb};destsuffix=${DESTSUF_civetweb} \
- git://github.com/ceph/jerasure;name=jerasure;branch=${BRANCH_jerasure};destsuffix=${DESTSUF_jerasure} \
- git://github.com/ceph/gf-complete;name=gf-complete;branch=${BRANCH_gf-complete};destsuffix=${DESTSUF_gf-complete} \
- git://github.com/ceph/xxHash;name=xxHash;branch=${BRANCH_xxHash};destsuffix=${DESTSUF_xxHash} \
- git://github.com/facebook/zstd;name=zstd;${BRANCH_zstd};destsuffix=${DESTSUF_zstd} \
- git://github.com/ceph/rocksdb;name=rocksdb;branch=${BRANCH_rocksdb};destsuffix=${DESTSUF_rocksdb} \
- git://github.com/ceph/ceph-erasure-code-corpus;name=ceph-erasure-code-corpus;branch=${BRANCH_ceph-erasure-code-corpus};destsuffix=${DESTSUF_ceph-erasure-code-corpus} \
- git://github.com/ceph/spdk;name=spdk;branch=${BRANCH_spdk};destsuffix=${DESTSUF_spdk} \
- git://github.com/ceph/isa-l;name=isa-l;branch=${BRANCH_isa-l};destsuffix=${DESTSUF_isa-l} \
- git://github.com/intel/isa-l_crypto;name=crypto;branch=${BRANCH_crypto};destsuffix=${DESTSUF_crypto} \
- git://github.com/ceph/blkin;name=blkin;branch=${BRANCH_blkin};destsuffix=${DESTSUF_blkin} \
- git://github.com/ceph/rapidjson;name=rapidjson;branch=${BRANCH_rapidjson};destsuffix=${DESTSUF_rapidjson} \
- git://github.com/ceph/googletest;name=googletest;branch=${BRANCH_googletest};destsuffix=${DESTSUF_googletest} \
- git://github.com/ceph/googletest;name=rapidjson-gtest;branch=${BRANCH_rapidjson-gtest};destsuffix=${DESTSUF_rapidjson-gtest} \
- \
- file://0001-Correct-the-path-to-find-version.h-in-rocksdb.patch \
- file://0002-zstd-fix-error-for-cross-compile.patch \
- file://0003-ceph-add-pybind-support-in-OE.patch \
- file://0004-ceph-detect-init-correct-the-installation-for-OE.patch \
- \
- file://ceph-init-wrapper.sh \
- file://ceph-manage-journal.py \
- file://ceph-preshutdown.sh \
- file://ceph-radosgw.service \
- file://ceph.conf \
- file://ceph.conf.pmon \
- file://ceph.service \
- file://ceph.sh \
- file://mgr-restful-plugin.py \
- file://mgr-restful-plugin.service \
- file://starlingx-docker-override.conf \
-"
-
-inherit cmake pythonnative python-dir systemd
-
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-SYSTEMD_SERVICE_${PN} = " \
- ceph-radosgw@.service \
- ceph-radosgw.target \
- ceph-mon@.service \
- ceph-mon.target \
- ceph-mds@.service \
- ceph-mds.target \
- ceph-disk@.service \
- ceph-osd@.service \
- ceph-osd.target \
- ceph.target \
- ceph-fuse@.service \
- ceph-fuse.target \
- ceph-rbd-mirror@.service \
- ceph-rbd-mirror.target \
- ceph-volume@.service \
- ceph-mgr@.service \
- ceph-mgr.target \
- rbdmap.service \
-"
-SYSTEMD_AUTO_ENABLE = "disable"
-
-OECMAKE_GENERATOR = "Unix Makefiles"
-
-EXTRA_OECMAKE = "\
- -DWITH_MANPAGE=OFF \
- -DWITH_FUSE=OFF \
- -DWITH_SPDK=OFF \
- -DWITH_LEVELDB=OFF \
- -DWITH_LTTNG=OFF \
- -DWITH_BABELTRACE=OFF \
- -DWITH_TESTS=OFF \
- -DDEBUG_GATHER=OFF \
- -DWITH_PYTHON2=ON \
- -DWITH_MGR=ON \
- -DMGR_PYTHON_VERSION=2.7 \
- -DWITH_MGR_DASHBOARD_FRONTEND=OFF \
- -DWITH_SYSTEM_BOOST=ON \
- -DWITH_SYSTEM_ROCKSDB=ON \
- -DCMAKE_INSTALL_INITCEPH=${sysconfdir}/init.d \
-"
-
-do_configure_prepend () {
- echo "set( CMAKE_SYSROOT \"${RECIPE_SYSROOT}\" )" >> ${WORKDIR}/toolchain.cmake
- echo "set( CMAKE_DESTDIR \"${D}\" )" >> ${WORKDIR}/toolchain.cmake
- echo "set( PYTHON_SITEPACKAGES_DIR \"${PYTHON_SITEPACKAGES_DIR}\" )" >> ${WORKDIR}/toolchain.cmake
- ln -sf ${STAGING_LIBDIR}/libboost_python27.so ${STAGING_LIBDIR}/libboost_python.so
- echo ${SRCREV} > ${S}/src/.git_version
- echo v${PV} >> ${S}/src/.git_version
-}
-
-do_install_append () {
- mv ${D}${bindir}/ceph-disk ${D}${sbindir}/ceph-disk
- sed -i -e 's:${WORKDIR}.*python2.7:${bindir}/python:' ${D}${sbindir}/ceph-disk
- sed -i -e 's:${sbindir}/service:${bindir}/service:' ${D}/${libdir}/python2.7/site-packages/ceph_disk/main.py
- sed -i -e 's:${WORKDIR}.*python2.7:${bindir}/python:' ${D}${bindir}/ceph
- sed -i -e 's:${WORKDIR}.*python2.7:${bindir}/python:' ${D}${bindir}/ceph-detect-init
- find ${D} -name SOURCES.txt | xargs sed -i -e 's:${WORKDIR}::'
-
- install -d ${D}${systemd_unitdir}
- mv ${D}${libexecdir}/systemd/system ${D}${systemd_unitdir}
- mv ${D}${libexecdir}/ceph/ceph-osd-prestart.sh ${D}${libdir}/ceph
- install -m 0755 ${D}${libexecdir}/ceph/ceph_common.sh ${D}${libdir}/ceph
-
- install -d ${D}${sysconfdir}/ceph
- install -m 0644 ${WORKDIR}/ceph.conf ${D}${sysconfdir}/ceph/
- install -m 0644 ${WORKDIR}/ceph-radosgw.service ${D}${systemd_system_unitdir}/ceph-radosgw@.service
- install -m 0644 ${WORKDIR}/ceph.service ${D}${systemd_system_unitdir}
- install -m 0644 ${WORKDIR}/mgr-restful-plugin.service ${D}${systemd_system_unitdir}
-
- install -m 0700 ${WORKDIR}/ceph-manage-journal.py ${D}${sbindir}/ceph-manage-journal
- install -Dm 0750 ${WORKDIR}/mgr-restful-plugin.py ${D}${sysconfdir}/rc.d/init.d/mgr-restful-plugin
- install -Dm 0750 ${WORKDIR}/mgr-restful-plugin.py ${D}${sysconfdir}/init.d/mgr-restful-plugin
- install -m 0750 ${WORKDIR}/ceph.conf.pmon ${D}${sysconfdir}/ceph/
-
- install -d -m 0750 ${D}${sysconfdir}/services.d/controller
- install -d -m 0750 ${D}${sysconfdir}/services.d/storage
- install -d -m 0750 ${D}${sysconfdir}/services.d/worker
-
- install -m 0750 ${WORKDIR}/ceph.sh ${D}${sysconfdir}/services.d/controller
- install -m 0750 ${WORKDIR}/ceph.sh ${D}${sysconfdir}/services.d/storage
- install -m 0750 ${WORKDIR}/ceph.sh ${D}${sysconfdir}/services.d/worker
-
- install -Dm 0750 ${WORKDIR}/ceph-init-wrapper.sh ${D}${sysconfdir}/rc.d/init.d/ceph-init-wrapper
- install -Dm 0750 ${WORKDIR}/ceph-init-wrapper.sh ${D}${sysconfdir}/init.d/ceph-init-wrapper
- sed -i -e 's|/usr/lib64|${libdir}|' ${D}${sysconfdir}/rc.d/init.d/ceph-init-wrapper ${D}${sysconfdir}/init.d/ceph-init-wrapper
-
- install -m 0700 ${WORKDIR}/ceph-preshutdown.sh ${D}${sbindir}/ceph-preshutdown.sh
-
- install -Dm 0644 ${WORKDIR}/starlingx-docker-override.conf ${D}${systemd_system_unitdir}/docker.service.d/starlingx-docker-override.conf
-
- install -m 0644 -D ${S}/src/etc-rbdmap ${D}${sysconfdir}/ceph/rbdmap
- install -m 0644 -D ${S}/etc/sysconfig/ceph ${D}${sysconfdir}/sysconfig/ceph
- install -m 0644 -D ${S}/src/logrotate.conf ${D}${sysconfdir}/logrotate.d/ceph
-
- install -m 0644 -D ${S}/COPYING ${D}${docdir}/ceph/COPYING
- install -m 0644 -D ${S}/etc/sysctl/90-ceph-osd.conf ${D}${libdir}/sysctl.d/90-ceph-osd.conf
- install -m 0644 -D ${S}/udev/50-rbd.rules ${D}${libdir}/udev/rules.d/50-rbd.rules
- install -m 0644 -D ${S}/udev/60-ceph-by-parttypeuuid.rules ${D}${libdir}/udev/rules.d/60-ceph-by-parttypeuuid.rules
-
- mkdir -p ${D}${localstatedir}/ceph
- mkdir -p ${D}${localstatedir}/log/ceph
- mkdir -p ${D}${localstatedir}/lib/ceph/tmp
- mkdir -p ${D}${localstatedir}/lib/ceph/mon
- mkdir -p ${D}${localstatedir}/lib/ceph/osd
- mkdir -p ${D}${localstatedir}/lib/ceph/mds
- mkdir -p ${D}${localstatedir}/lib/ceph/mgr
- mkdir -p ${D}${localstatedir}/lib/ceph/radosgw
- mkdir -p ${D}${localstatedir}/lib/ceph/bootstrap-osd
- mkdir -p ${D}${localstatedir}/lib/ceph/bootstrap-mds
- mkdir -p ${D}${localstatedir}/lib/ceph/bootstrap-rgw
- mkdir -p ${D}${localstatedir}/lib/ceph/bootstrap-mgr
- mkdir -p ${D}${localstatedir}/lib/ceph/bootstrap-rbd
-
- install -m 0755 -d ${D}/${sysconfdir}/tmpfiles.d
- echo "d ${localstatedir}/run/ceph 0755 ceph ceph -" >> ${D}/${sysconfdir}/tmpfiles.d/ceph.conf
-
- install -m 0750 -D ${S}/src/init-radosgw ${D}${sysconfdir}/rc.d/init.d/ceph-radosgw
- install -m 0750 -D ${S}/src/init-radosgw ${D}${sysconfdir}/init.d/ceph-radosgw
- sed -i '/### END INIT INFO/a SYSTEMCTL_SKIP_REDIRECT=1' ${D}${sysconfdir}/rc.d/init.d/ceph-radosgw
- sed -i '/### END INIT INFO/a SYSTEMCTL_SKIP_REDIRECT=1' ${D}${sysconfdir}/init.d/ceph-radosgw
- install -m 0750 -D ${S}/src/init-rbdmap ${D}${sysconfdir}/rc.d/init.d/rbdmap
- install -m 0750 -D ${S}/src/init-rbdmap ${D}${sysconfdir}/init.d/rbdmap
- install -m 0750 -D ${B}/bin/init-ceph ${D}${sysconfdir}/rc.d/init.d/ceph
- install -m 0750 -D ${B}/bin/init-ceph ${D}${sysconfdir}/init.d/ceph
- sed -i -e 's|/usr/lib64|${libdir}|' ${D}${sysconfdir}/init.d/ceph ${D}${sysconfdir}/rc.d/init.d/ceph
- install -d -m 0750 ${D}${localstatedir}/log/radosgw
-}
-
-PACKAGES += " \
- ${PN}-python \
-"
-
-FILES_${PN} += "\
- ${libdir}/rados-classes/*.so.* \
- ${libdir}/ceph/compressor/*.so \
- ${libdir}/rados-classes/*.so \
- ${libdir}/ceph/*.so \
- ${localstatedir} \
- ${docdir}/ceph/COPYING \
- ${libdir}/sysctl.d/90-ceph-osd.conf \
- ${libdir}/udev/rules.d/50-rbd.rules \
- ${libdir}/udev/rules.d/60-ceph-by-parttypeuuid.rules \
- ${systemd_system_unitdir}/mgr-restful-plugin.service \
- ${systemd_system_unitdir}/ceph-radosgw@.service \
- ${systemd_system_unitdir}/ceph.service \
- ${systemd_system_unitdir}/docker.service.d/starlingx-docker-override.conf \
-"
-FILES_${PN}-python = "\
- ${PYTHON_SITEPACKAGES_DIR}/* \
-"
-
-RDEPENDS_${PN} += "\
- bash \
- python \
- python-misc \
- python-modules \
- python-prettytable \
- rdma-core \
- xfsprogs-mkfs \
- ${PN}-python \
-"
-
-COMPATIBLE_HOST = "(x86_64).*"
-
-INSANE_SKIP_${PN}-python += "ldflags"
-INSANE_SKIP_${PN} += "dev-so"
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:${THISDIR}/files:"
-
-inherit python3native python3-dir
-
-DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-
-SRC_URI += "\
- file://0001-ceph-rebase-on-stx.3.0-and-warrior.patch \
- file://ceph.conf \
- file://ceph-init-wrapper.sh \
- file://ceph-preshutdown.sh \
- file://ceph.service \
- file://mgr-restful-plugin.py \
- file://starlingx-docker-override.conf \
- file://ceph.conf.pmon \
- file://ceph-manage-journal.py \
- file://ceph-radosgw.service \
- file://ceph.sh \
- file://mgr-restful-plugin.service \
- file://rados.runtime.decode.error.patch \
- "
-DEPENDS = "boost rdma-core bzip2 curl expat gperf-native \
- keyutils libaio lz4 \
- nspr nss oath openldap openssl \
- python3 python3-cython-native rocksdb snappy udev \
- python-cython-native valgrind xfsprogs zlib \
- rabbitmq-c \
- "
-RDEPENDS_${PN} += " rdma-core python3-core python3 xfsprogs-mkfs python3-prettytable"
-
-
-EXTRA_OECMAKE = "-DWITH_MANPAGE=OFF \
- -DWITH_FUSE=OFF \
- -DWITH_SPDK=OFF \
- -DWITH_LEVELDB=OFF \
- -DWITH_LTTNG=OFF \
- -DWITH_BABELTRACE=OFF \
- -DWITH_TESTS=OFF \
- -DWITH_MGR=ON \
- -DWITH_PYTHON2=OFF \
- -DWITH_PYTHON3=ON \
- -DMGR_PYTHON_VERSION=3 \
- -DWITH_MGR_DASHBOARD_FRONTEND=OFF \
- -DWITH_SYSTEM_BOOST=ON \
- -DWITH_SYSTEM_ROCKSDB=ON \
- -DWITH_RDMA=OFF \
- -DWITH_RADOSGW_AMQP_ENDPOINT=OFF \
- "
-
-# TODO: Should be fixed in either boost package or CMake files.
-#do_configure_prepend() {
-# ln -f -s ${WORKDIR}/recipe-sysroot/usr/lib/libboost_python35.so \
-# ${WORKDIR}/recipe-sysroot/usr/lib/libboost_python.so
-#}
-
-do_install_append () {
- install -d ${D}${sysconfdir}/ceph
- install -m 0644 ${WORKDIR}/ceph.conf ${D}${sysconfdir}/ceph/
- install -m 0644 ${WORKDIR}/ceph-radosgw.service ${D}${systemd_system_unitdir}/ceph-radosgw@.service
- install -m 0644 ${WORKDIR}/ceph.service ${D}${systemd_system_unitdir}
- install -m 0644 ${WORKDIR}/mgr-restful-plugin.service ${D}${systemd_system_unitdir}
-
- install -m 0700 ${WORKDIR}/ceph-manage-journal.py ${D}${sbindir}/ceph-manage-journal
- install -Dm 0750 ${WORKDIR}/mgr-restful-plugin.py ${D}${sysconfdir}/rc.d/init.d/mgr-restful-plugin
- install -Dm 0750 ${WORKDIR}/mgr-restful-plugin.py ${D}${sysconfdir}/init.d/mgr-restful-plugin
- install -m 0750 ${WORKDIR}/ceph.conf.pmon ${D}${sysconfdir}/ceph/
-
- install -d -m 0750 ${D}${sysconfdir}/services.d/controller
- install -d -m 0750 ${D}${sysconfdir}/services.d/storage
- install -d -m 0750 ${D}${sysconfdir}/services.d/worker
-
- install -m 0750 ${WORKDIR}/ceph.sh ${D}${sysconfdir}/services.d/controller
- install -m 0750 ${WORKDIR}/ceph.sh ${D}${sysconfdir}/services.d/storage
- install -m 0750 ${WORKDIR}/ceph.sh ${D}${sysconfdir}/services.d/worker
-
- install -Dm 0750 ${WORKDIR}/ceph-init-wrapper.sh ${D}${sysconfdir}/rc.d/init.d/ceph-init-wrapper
- install -Dm 0750 ${WORKDIR}/ceph-init-wrapper.sh ${D}${sysconfdir}/init.d/ceph-init-wrapper
- sed -i -e 's|/usr/lib64|${libdir}|' ${D}${sysconfdir}/rc.d/init.d/ceph-init-wrapper ${D}${sysconfdir}/init.d/ceph-init-wrapper
-
- install -m 0700 ${WORKDIR}/ceph-preshutdown.sh ${D}${sbindir}/ceph-preshutdown.sh
-
- install -Dm 0644 ${WORKDIR}/starlingx-docker-override.conf ${D}${systemd_system_unitdir}/docker.service.d/starlingx-docker-override.conf
-
- install -m 0644 -D ${S}/src/etc-rbdmap ${D}${sysconfdir}/ceph/rbdmap
- install -m 0644 -D ${S}/etc/sysconfig/ceph ${D}${sysconfdir}/sysconfig/ceph
- install -m 0644 -D ${S}/src/logrotate.conf ${D}${sysconfdir}/logrotate.d/ceph
-
- install -m 0644 -D ${S}/COPYING ${D}${docdir}/ceph/COPYING
- install -m 0644 -D ${S}/etc/sysctl/90-ceph-osd.conf ${D}${libdir}/sysctl.d/90-ceph-osd.conf
- install -m 0644 -D ${S}/udev/50-rbd.rules ${D}${libdir}/udev/rules.d/50-rbd.rules
- # install -m 0644 -D ${S}/udev/60-ceph-by-parttypeuuid.rules ${D}${libdir}/udev/rules.d/60-ceph-by-parttypeuuid.rules
-
- mkdir -p ${D}${localstatedir}/ceph
- mkdir -p ${D}${localstatedir}/log/ceph
- mkdir -p ${D}${localstatedir}/lib/ceph/tmp
- mkdir -p ${D}${localstatedir}/lib/ceph/mon
- mkdir -p ${D}${localstatedir}/lib/ceph/osd
- mkdir -p ${D}${localstatedir}/lib/ceph/mds
- mkdir -p ${D}${localstatedir}/lib/ceph/mgr
- mkdir -p ${D}${localstatedir}/lib/ceph/radosgw
- mkdir -p ${D}${localstatedir}/lib/ceph/bootstrap-osd
- mkdir -p ${D}${localstatedir}/lib/ceph/bootstrap-mds
- mkdir -p ${D}${localstatedir}/lib/ceph/bootstrap-rgw
- mkdir -p ${D}${localstatedir}/lib/ceph/bootstrap-mgr
- mkdir -p ${D}${localstatedir}/lib/ceph/bootstrap-rbd
- mkdir -p ${D}${localstatedir}/lib/ceph/crash/posted
-
- install -m 0755 -d ${D}/${sysconfdir}/tmpfiles.d
- echo "d ${localstatedir}/run/ceph 0755 ceph ceph -" >> ${D}/${sysconfdir}/tmpfiles.d/ceph.conf
-
- install -m 0755 ${D}${libdir}/ceph/ceph_common.sh ${D}${libexecdir}/ceph
-
- install -m 0750 -D ${S}/src/init-radosgw ${D}${sysconfdir}/rc.d/init.d/ceph-radosgw
- install -m 0750 -D ${S}/src/init-radosgw ${D}${sysconfdir}/init.d/ceph-radosgw
- sed -i '/### END INIT INFO/a SYSTEMCTL_SKIP_REDIRECT=1' ${D}${sysconfdir}/rc.d/init.d/ceph-radosgw
- sed -i '/### END INIT INFO/a SYSTEMCTL_SKIP_REDIRECT=1' ${D}${sysconfdir}/init.d/ceph-radosgw
- install -m 0750 -D ${S}/src/init-rbdmap ${D}${sysconfdir}/rc.d/init.d/rbdmap
- install -m 0750 -D ${S}/src/init-rbdmap ${D}${sysconfdir}/init.d/rbdmap
- install -m 0750 -D ${B}/bin/init-ceph ${D}${sysconfdir}/rc.d/init.d/ceph
- install -m 0750 -D ${B}/bin/init-ceph ${D}${sysconfdir}/init.d/ceph
- install -d -m 0750 ${D}${localstatedir}/log/radosgw
-
- sed -i -e 's:${WORKDIR}.*python3:${bindir}/python3:' ${D}${bindir}/ceph
- # sed -i -e 's:${WORKDIR}.*python3:${bindir}/python3:' ${D}${bindir}/ceph-disk
- # sed -i -e 's:${WORKDIR}.*python3:${bindir}/python3:' ${D}${bindir}/ceph-detect-init
-
- sed -i -e 's:${WORKDIR}.*python3:${bindir}/python3:' ${D}${bindir}/ceph-crash
- sed -i -e 's:${WORKDIR}.*python3:${bindir}/python3:' ${D}${bindir}/ceph-volume
- sed -i -e 's:${WORKDIR}.*python3:${bindir}/python3:' ${D}${bindir}/ceph-volume-systemd
- #sed -i -e '1s:python$:python3:' ${D}${bindir}/ceph-volume
- #sed -i -e '1s:python$:python3:' ${D}${bindir}/ceph-volume-systemd
- sed -i -e 's:/sbin/:/bin/:' ${D}${systemd_system_unitdir}/ceph-volume@.service
-}
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-RDEPENDS_${PN} += "\
- bash \
-"
-
-FILES_${PN} += "\
- ${localstatedir} \
- ${docdir}/ceph/COPYING \
- ${libdir}/sysctl.d/90-ceph-osd.conf \
- ${libdir}/udev/rules.d/50-rbd.rules \
- ${libdir}/udev/rules.d/60-ceph-by-parttypeuuid.rules \
- ${systemd_system_unitdir}/mgr-restful-plugin.service \
- ${systemd_system_unitdir}/ceph-radosgw@.service \
- ${systemd_system_unitdir}/ceph.service \
- ${systemd_system_unitdir}/docker.service.d/starlingx-docker-override.conf \
- home/root/cluster/ceph-mon_config.sh \
- home/root/cluster/ceph-mgr_manual.sh \
- home/root/cluster/ceph-volume_manual.sh \
-"
-# /run/ceph
+++ /dev/null
-#!/bin/bash
-#
-# Copyright (c) 2019 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# This script is a helper wrapper for pmon monitoring of ceph
-# processes. The "/etc/init.d/ceph" script does not know if ceph is
-# running on the node. For example when the node is locked, ceph
-# processes are not running. In that case we do not want pmond to
-# monitor these processes.
-#
-# The script "/etc/services.d/<node>/ceph.sh" will create the file
-# "/var/run/.ceph_started" when ceph is running and remove it when
-# is not.
-#
-# The script also extracts one or more ceph process names that are
-# reported as 'not running' or 'dead' or 'failed' by '/etc/intit.d/ceph status'
-# and writes the names to a text file: /tmp/ceph_status_failure.txt for
-# pmond to access. The pmond adds the text to logs and alarms. Example of text
-# samples written to file by this script are:
-# 'osd.1'
-# 'osd.1, osd.2'
-# 'mon.storage-0'
-# 'mon.storage-0, osd.2'
-#
-# Moreover, for processes that are reported as 'hung' by '/etc/intit.d/ceph status'
-# the script will try increase their logging to 'debug' for a configurable interval.
-# With logging increased it will outputs a few stack traces then, at the end of this
-# interval, it dumps its stack core and kills it.
-#
-# Return values;
-# zero - /etc/init.d/ceph returned success or ceph is not running on the node
-# non-zero /etc/init.d/ceph returned a failure or invalid syntax
-#
-
-source /usr/bin/tsconfig
-source /etc/platform/platform.conf
-
-CEPH_SCRIPT="/etc/init.d/ceph"
-CEPH_FILE="$VOLATILE_PATH/.ceph_started"
-CEPH_GET_MON_STATUS_FILE="$VOLATILE_PATH/.ceph_getting_mon_status"
-CEPH_GET_OSD_STATUS_FILE="$VOLATILE_PATH/.ceph_getting_osd_status"
-CEPH_STATUS_FAILURE_TEXT_FILE="/tmp/ceph_status_failure.txt"
-
-BINDIR=/usr/bin
-SBINDIR=/usr/sbin
-LIBDIR=/usr/lib64/ceph
-ETCDIR=/etc/ceph
-source $LIBDIR/ceph_common.sh
-
-LOG_PATH=/var/log/ceph
-LOG_FILE=$LOG_PATH/ceph-process-states.log
-LOG_LEVEL=NORMAL # DEBUG
-verbose=0
-
-DATA_PATH=$VOLATILE_PATH/ceph_hang # folder where we keep state information
-mkdir -p $DATA_PATH # make sure folder exists
-
-MONITORING_INTERVAL=15
-TRACE_LOOP_INTERVAL=5
-CEPH_STATUS_TIMEOUT=20
-
-LOCK_CEPH_MON_SERVICE_FILE="$VOLATILE_PATH/.ceph_mon_status"
-LOCK_CEPH_OSD_SERVICE_FILE="$VOLATILE_PATH/.ceph_osd_status"
-LOCK_CEPH_MON_STATUS_FILE="$VOLATILE_PATH/.ceph_mon_service"
-LOCK_CEPH_OSD_STATUS_FILE="$VOLATILE_PATH/.ceph_osd_service"
-
-# Seconds to wait for ceph status to finish before
-# continuing to execute a service action
-MONITOR_STATUS_TIMEOUT=30
-MAX_STATUS_TIMEOUT=120
-
-RC=0
-
-# SM can only pass arguments through environment variable
-# when ARGS is not empty use it to extend command line arguments
-args=("$@")
-if [ ! -z $ARGS ]; then
- IFS=";" read -r -a new_args <<< "$ARGS"
- args+=("${new_args[@]}")
-fi
-
-with_service_lock ()
-{
- local target="$1"; shift
- [ -z "${target}" ] && target="mon osd"
-
- # Run in sub-shell so we don't leak file descriptors
- # used for locking service actions
- (
- # Grab service locks
- wlog "-" INFO "Grab service locks"
- [[ "${target}" == *"mon"* ]] && flock ${LOCK_CEPH_MON_SERVICE_FD}
- [[ "${target}" == *"osd"* ]] && flock ${LOCK_CEPH_OSD_SERVICE_FD}
-
- # Try to lock status with a timeout in case status is stuck
- wlog "-" INFO "Lock service status"
- deadline=$((SECONDS + MAX_STATUS_TIMEOUT + 1))
- if [[ "${target}" == *"mon"* ]]; then
- flock --exclusive --timeout ${MONITOR_STATUS_TIMEOUT} ${LOCK_CEPH_MON_STATUS_FD}
- fi
- if [[ "${target}" == *"osd"* ]]; then
- timeout=$((deadline - SECONDS))
- if [[ $timeout -gt 0 ]]; then
- flock --exclusive --timeout ${timeout} ${LOCK_CEPH_OSD_STATUS_FD}
- fi
- fi
-
- # Close lock file descriptors so they are
- # not inherited by the spawned process then
- # run service action
- wlog "-" INFO "Run service action: $@"
- "$@" {LOCK_CEPH_MON_SERVICE_FD}>&- \
- {LOCK_CEPH_MON_STATUS_FD}>&- \
- {LOCK_CEPH_OSD_SERVICE_FD}>&- \
- {LOCK_CEPH_OSD_STATUS_FD}>&-
-
- ) {LOCK_CEPH_MON_SERVICE_FD}>${LOCK_CEPH_MON_SERVICE_FILE} \
- {LOCK_CEPH_MON_STATUS_FD}>${LOCK_CEPH_MON_STATUS_FILE} \
- {LOCK_CEPH_OSD_SERVICE_FD}>${LOCK_CEPH_OSD_SERVICE_FILE} \
- {LOCK_CEPH_OSD_STATUS_FD}>${LOCK_CEPH_OSD_STATUS_FILE}
- RC=$?
-}
-
-start ()
-{
- if [ ! -f ${CEPH_FILE} ]; then
- # Ceph is not running on this node, return success
- exit 0
- fi
- wlog "-" INFO "Ceph START $1 command received"
- with_service_lock "$1" ${CEPH_SCRIPT} start $1
- wlog "-" INFO "Ceph START $1 command finished."
-}
-
-stop ()
-{
- wlog "-" INFO "Ceph STOP $1 command received."
- with_service_lock "$1" ${CEPH_SCRIPT} stop $1
- wlog "-" INFO "Ceph STOP $1 command finished."
-}
-
-restart ()
-{
- if [ ! -f ${CEPH_FILE} ]; then
- # Ceph is not running on this node, return success
- exit 0
- fi
- wlog "-" INFO "Ceph RESTART $1 command received."
- with_service_lock "$1" ${CEPH_SCRIPT} restart $1
- wlog "-" INFO "Ceph RESTART $1 command finished."
-}
-
-log_and_restart_blocked_osds ()
-{
- # Log info about the blocked osd daemons and then restart it
- local names=$1
- local message=$2
- for name in $names; do
- wlog $name "INFO" "$message"
- ${CEPH_SCRIPT} restart $name
- done
-}
-
-log_and_kill_hung_procs ()
-{
- # Log info about the hung processes and then kill them; later on pmon will restart them
- local names=$1
- for name in $names; do
- type=`echo $name | cut -c 1-3` # e.g. 'mon', if $item is 'mon1'
- id=`echo $name | cut -c 4- | sed 's/^\\.//'`
- get_conf run_dir "/var/run/ceph" "run dir"
- get_conf pid_file "$run_dir/$type.$id.pid" "pid file"
- pid=$(cat $pid_file)
- wlog $name "INFO" "Dealing with hung process (pid:$pid)"
-
- # monitoring interval
- wlog $name "INFO" "Increasing log level"
- execute_ceph_cmd ret $name "ceph daemon $name config set debug_$type 20/20"
- monitoring=$MONITORING_INTERVAL
- while [ $monitoring -gt 0 ]; do
- if [ $(($monitoring % $TRACE_LOOP_INTERVAL)) -eq 0 ]; then
- date=$(date "+%Y-%m-%d_%H-%M-%S")
- log_file="$LOG_PATH/hang_trace_${name}_${pid}_${date}.log"
- wlog $name "INFO" "Dumping stack trace to: $log_file"
- $(pstack $pid >$log_file) &
- fi
- let monitoring-=1
- sleep 1
- done
- wlog $name "INFO" "Trigger core dump"
- kill -ABRT $pid &>/dev/null
- rm -f $pid_file # process is dead, core dump is archiving, preparing for restart
- # Wait for pending systemd core dumps
- sleep 2 # hope systemd_coredump has started meanwhile
- deadline=$(( $(date '+%s') + 300 ))
- while [[ $(date '+%s') -lt "${deadline}" ]]; do
- systemd_coredump_pid=$(pgrep -f "systemd-coredump.*${pid}.*ceph-${type}")
- [[ -z "${systemd_coredump_pid}" ]] && break
- wlog $name "INFO" "systemd-coredump ceph-${type} in progress: pid ${systemd_coredump_pid}"
- sleep 2
- done
- kill -KILL $pid &>/dev/null
- done
-}
-
-status ()
-{
- local target="$1" # no shift here
- [ -z "${target}" ] && target="mon osd"
-
- if [ ! -f ${CEPH_FILE} ]; then
- # Ceph is not running on this node, return success
- exit 0
- fi
-
- if [[ "$system_type" == "All-in-one" ]] && [[ "$system_mode" != "simplex" ]] && [[ "$1" == "osd" ]]; then
- timeout $CEPH_STATUS_TIMEOUT ceph -s
- if [ "$?" -ne 0 ]; then
- # Ceph cluster is not accessible. Don't panic, controller swact
- # may be in progress.
- wlog "-" INFO "Ceph is down, ignoring OSD status."
- exit 0
- fi
- fi
-
- # Report success while ceph mon is running a service action
- # otherwise mark ceph mon status is in progress
- exec {LOCK_CEPH_MON_STATUS_FD}>${LOCK_CEPH_MON_STATUS_FILE}
- if [[ "${target}" == *"mon"* ]]; then
- flock --shared --nonblock ${LOCK_CEPH_MON_SERVICE_FILE} true
- if [[ $? -ne 0 ]]; then
- exit 0
- fi
- # Lock will be released when script exits
- flock --shared ${LOCK_CEPH_MON_STATUS_FD}
- fi
- # Report success while ceph mon is running a service action
- # otherwise mark ceph osd status is in progress
- exec {LOCK_CEPH_OSD_STATUS_FD}>${LOCK_CEPH_OSD_STATUS_FILE}
- if [[ "${target}" == *"osd"* ]]; then
- flock --shared --nonblock ${LOCK_CEPH_OSD_SERVICE_FILE} true
- if [[ $? -ne 0 ]]; then
- exit 0
- fi
- # Lock will be released when script exits
- flock --shared ${LOCK_CEPH_OSD_STATUS_FD}
- fi
-
- result=`${CEPH_SCRIPT} status $1 {LOCK_CEPH_MON_STATUS_FD}>&- {LOCK_CEPH_OSD_STATUS_FD}>&-`
- RC=$?
- if [ "$RC" -ne 0 ]; then
- erred_procs=`echo "$result" | sort | uniq | awk ' /not running|dead|failed/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'`
- hung_procs=`echo "$result" | sort | uniq | awk ' /hung/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'`
- blocked_ops_procs=`echo "$result" | sort | uniq | awk ' /blocked ops/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'`
- stuck_peering_procs=`echo "$result" | sort | uniq | awk ' /stuck peering/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'`
- invalid=0
- host=`hostname`
- if [[ "$system_type" == "All-in-one" ]] && [[ "$system_mode" != "simplex" ]]; then
- # On 2 node configuration we have a floating monitor
- host="controller"
- fi
- for i in $(echo $erred_procs $hung_procs); do
- if [[ "$i" =~ osd.?[0-9]?[0-9]|mon.$host ]]; then
- continue
- else
- invalid=1
- fi
- done
-
- log_and_restart_blocked_osds "$blocked_ops_procs"\
- "Restarting OSD with blocked operations"
- log_and_restart_blocked_osds "$stuck_peering_procs"\
- "Restarting OSD stuck peering"
- log_and_kill_hung_procs $hung_procs
-
- rm -f $CEPH_STATUS_FAILURE_TEXT_FILE
- if [ $invalid -eq 0 ]; then
- text=""
- for i in $erred_procs; do
- text+="$i, "
- done
- for i in $hung_procs; do
- text+="$i (process hang), "
- done
- echo "$text" | tr -d '\n' > $CEPH_STATUS_FAILURE_TEXT_FILE
- else
- echo "$host: '${CEPH_SCRIPT} status $1' result contains invalid process names: $erred_procs"
- echo "Undetermined osd or monitor id" > $CEPH_STATUS_FAILURE_TEXT_FILE
- fi
- fi
-
- if [[ $RC == 0 ]] && [[ "$1" == "mon" ]] && [[ "$system_type" == "All-in-one" ]] && [[ "$system_mode" != "simplex" ]]; then
- # SM needs exit code != 0 from 'status mon' argument of the init script on
- # standby controller otherwise it thinks that the monitor is running and
- # tries to stop it.
- # '/etc/init.d/ceph status mon' checks the status of monitors configured in
- # /etc/ceph/ceph.conf and if it should be running on current host.
- # If it should not be running it just exits with code 0. This is what
- # happens on the standby controller.
- # When floating monitor is running on active controller /var/lib/ceph/mon of
- # standby is not mounted (Ceph monitor partition is DRBD synced).
- test -e "/var/lib/ceph/mon/ceph-controller"
- if [ "$?" -ne 0 ]; then
- exit 3
- fi
- fi
-}
-
-
-case "${args[0]}" in
- start)
- start ${args[1]}
- ;;
- stop)
- stop ${args[1]}
- ;;
- restart)
- restart ${args[1]}
- ;;
- status)
- status ${args[1]}
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|status} [{mon|osd|osd.<number>|mon.<hostname>}]"
- exit 1
- ;;
-esac
-
-exit $RC
+++ /dev/null
-#!/usr/bin/python
-#
-# Copyright (c) 2019 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-import ast
-import os
-import os.path
-import re
-import subprocess
-import sys
-
-DEVICE_NAME_NVME = "nvme"
-
-#########
-# Utils #
-#########
-
-
-def command(arguments, **kwargs):
- """Execute e command and capture stdout, stderr & return code"""
- process = subprocess.Popen(
- arguments,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
- **kwargs)
- out, err = process.communicate()
- return out, err, process.returncode
-
-
-def get_input(arg, valid_keys):
- """Convert the input to a dict and perform basic validation"""
- json_string = arg.replace("\\n", "\n")
- try:
- input_dict = ast.literal_eval(json_string)
- if not all(k in input_dict for k in valid_keys):
- return None
- except Exception:
- return None
-
- return input_dict
-
-
-def get_partition_uuid(dev):
- output, _, _ = command(['blkid', dev])
- try:
- return re.search('PARTUUID=\"(.+?)\"', output).group(1)
- except AttributeError:
- return None
-
-
-def device_path_to_device_node(device_path):
- try:
- output, _, _ = command(["udevadm", "settle", "-E", device_path])
- out, err, retcode = command(["readlink", "-f", device_path])
- out = out.rstrip()
- except Exception as e:
- return None
-
- return out
-
-
-###########################################
-# Manage Journal Disk Partitioning Scheme #
-###########################################
-
-DISK_BY_PARTUUID = "/dev/disk/by-partuuid/"
-JOURNAL_UUID = '45b0969e-9b03-4f30-b4c6-b4b80ceff106' # Type of a journal partition
-
-
-def is_partitioning_correct(disk_path, partition_sizes):
- """Validate the existence and size of journal partitions"""
-
- # Obtain the device node from the device path.
- disk_node = device_path_to_device_node(disk_path)
-
- # Check that partition table format is GPT
- output, _, _ = command(["udevadm", "settle", "-E", disk_node])
- output, _, _ = command(["parted", "-s", disk_node, "print"])
- if not re.search('Partition Table: gpt', output):
- print("Format of disk node %s is not GPT, zapping disk" % disk_node)
- return False
-
- # Check each partition size
- partition_index = 1
- for size in partition_sizes:
- # Check that each partition size matches the one in input
- if DEVICE_NAME_NVME in disk_node:
- partition_node = '{}p{}'.format(disk_node, str(partition_index))
- else:
- partition_node = '{}{}'.format(disk_node, str(partition_index))
-
- output, _, _ = command(["udevadm", "settle", "-E", partition_node])
- cmd = ["parted", "-s", partition_node, "unit", "MiB", "print"]
- output, _, _ = command(cmd)
-
- regex = ("^Disk " + str(partition_node) + ":\\s*" +
- str(size) + "[\\.0]*MiB")
- if not re.search(regex, output, re.MULTILINE):
- print("Journal partition %(node)s size is not %(size)s, "
- "zapping disk" % {"node": partition_node, "size": size})
- return False
-
- partition_index += 1
-
- output, _, _ = command(["udevadm", "settle", "-t", "10"])
- return True
-
-
-def create_partitions(disk_path, partition_sizes):
- """Recreate partitions"""
-
- # Obtain the device node from the device path.
- disk_node = device_path_to_device_node(disk_path)
-
- # Issue: After creating a new partition table on a device, Udev does not
- # always remove old symlinks (i.e. to previous partitions on that device).
- # Also, even if links are erased before zapping the disk, some of them will
- # be recreated even though there is no partition to back them!
- # Therefore, we have to remove the links AFTER we erase the partition table
- # Issue: DISK_BY_PARTUUID directory is not present at all if there are no
- # GPT partitions on the storage node so nothing to remove in this case
- links = []
- if os.path.isdir(DISK_BY_PARTUUID):
- links = [os.path.join(DISK_BY_PARTUUID, l) for l in os.listdir(DISK_BY_PARTUUID)
- if os.path.islink(os.path.join(DISK_BY_PARTUUID, l))]
-
- # Erase all partitions on current node by creating a new GPT table
- _, err, ret = command(["parted", "-s", disk_node, "mktable", "gpt"])
- if ret:
- print("Error erasing partition table of %(node)s\n"
- "Return code: %(ret)s reason: %(reason)s" %
- {"node": disk_node, "ret": ret, "reason": err})
- exit(1)
-
- # Erase old symlinks
- for l in links:
- if disk_node in os.path.realpath(l):
- os.remove(l)
-
- # Create partitions in order
- used_space_mib = 1 # leave 1 MB at the beginning of the disk
- num = 1
- for size in partition_sizes:
- cmd = ['parted', '-s', disk_node, 'unit', 'mib',
- 'mkpart', 'primary',
- str(used_space_mib), str(used_space_mib + size)]
- _, err, ret = command(cmd)
- parms = {"disk_node": disk_node,
- "start": used_space_mib,
- "end": used_space_mib + size,
- "reason": err}
- print("Created partition from start=%(start)s MiB to end=%(end)s MiB"
- " on %(disk_node)s" % parms)
- if ret:
- print("Failed to create partition with "
- "start=%(start)s, end=%(end)s "
- "on %(disk_node)s reason: %(reason)s" % parms)
- exit(1)
- # Set partition type to ceph journal
- # noncritical operation, it makes 'ceph-disk list' output correct info
- cmd = ['sgdisk',
- '--change-name={num}:ceph journal'.format(num=num),
- '--typecode={num}:{uuid}'.format(
- num=num,
- uuid=JOURNAL_UUID,
- ),
- disk_node]
- _, err, ret = command(cmd)
- if ret:
- print("WARNINIG: Failed to set partition name and typecode")
- used_space_mib += size
- num += 1
-
-
-###########################
-# Manage Journal Location #
-###########################
-
-OSD_PATH = "/var/lib/ceph/osd/"
-
-
-def mount_data_partition(data_path, osdid):
- """Mount an OSD data partition and return the mounted path"""
-
- # Obtain the device node from the device path.
- data_node = device_path_to_device_node(data_path)
-
- mount_path = OSD_PATH + "ceph-" + str(osdid)
- output, _, _ = command(['mount'])
- regex = "^" + data_node + ".*" + mount_path
- if not re.search(regex, output, re.MULTILINE):
- cmd = ['mount', '-t', 'xfs', data_node, mount_path]
- _, _, ret = command(cmd)
- params = {"node": data_node, "path": mount_path}
- if ret:
- print("Failed to mount %(node)s to %(path), aborting" % params)
- exit(1)
- else:
- print("Mounted %(node)s to %(path)s" % params)
- return mount_path
-
-
-def is_location_correct(path, journal_path, osdid):
- """Check if location points to the correct device"""
-
- # Obtain the device node from the device path.
- journal_node = device_path_to_device_node(journal_path)
-
- cur_node = os.path.realpath(path + "/journal")
- if cur_node == journal_node:
- return True
- else:
- return False
-
-
-def fix_location(mount_point, journal_path, osdid):
- """Move the journal to the new partition"""
-
- # Obtain the device node from the device path.
- journal_node = device_path_to_device_node(journal_path)
-
- # Fix symlink
- path = mount_point + "/journal" # 'journal' symlink path used by ceph-osd
- journal_uuid = get_partition_uuid(journal_node)
- new_target = DISK_BY_PARTUUID + journal_uuid
- params = {"path": path, "target": new_target}
- try:
- if os.path.lexists(path):
- os.unlink(path) # delete the old symlink
- os.symlink(new_target, path)
- print("Symlink created: %(path)s -> %(target)s" % params)
- except:
- print("Failed to create symlink: %(path)s -> %(target)s" % params)
- exit(1)
- # Fix journal_uuid
- path = mount_point + "/journal_uuid"
- try:
- with open(path, 'w') as f:
- f.write(journal_uuid)
- except Exception as ex:
- # The operation is noncritical, it only makes 'ceph-disk list'
- # display complete output. We log and continue.
- params = {"path": path, "uuid": journal_uuid}
- print("WARNING: Failed to set uuid of %(path)s to %(uuid)s" % params)
-
- # Clean the journal partition
- # even if erasing the partition table, if another journal was present here
- # it's going to be reused. Journals are always bigger than 100MB.
- command(['dd', 'if=/dev/zero', 'of=%s' % journal_node,
- 'bs=1M', 'count=100'])
-
- # Format the journal
- cmd = ['/usr/bin/ceph-osd', '-i', str(osdid),
- '--pid-file', '/var/run/ceph/osd.%s.pid' % osdid,
- '-c', '/etc/ceph/ceph.conf',
- '--cluster', 'ceph',
- '--mkjournal']
- out, err, ret = command(cmd)
- params = {"journal_node": journal_node,
- "osdid": osdid,
- "ret": ret,
- "reason": err}
- if not ret:
- print("Prepared new journal partition: %(journal_node)s "
- "for osd id: %(osdid)s" % params)
- else:
- print("Error initializing journal node: "
- "%(journal_node)s for osd id: %(osdid)s "
- "ceph-osd return code: %(ret)s reason: %(reason)s" % params)
-
-
-########
-# Main #
-########
-
-def main(argv):
- # parse and validate arguments
- err = False
- partitions = None
- location = None
- if len(argv) != 2:
- err = True
- elif argv[0] == "partitions":
- valid_keys = ['disk_path', 'journals']
- partitions = get_input(argv[1], valid_keys)
- if not partitions:
- err = True
- elif not isinstance(partitions['journals'], list):
- err = True
- elif argv[0] == "location":
- valid_keys = ['data_path', 'journal_path', 'osdid']
- location = get_input(argv[1], valid_keys)
- if not location:
- err = True
- elif not isinstance(location['osdid'], int):
- err = True
- else:
- err = True
- if err:
- print("Command intended for internal use only")
- exit(-1)
-
- if partitions:
- # Recreate partitions only if the existing ones don't match input
- if not is_partitioning_correct(partitions['disk_path'],
- partitions['journals']):
- create_partitions(partitions['disk_path'], partitions['journals'])
- else:
- print("Partition table for %s is correct, "
- "no need to repartition" %
- device_path_to_device_node(partitions['disk_path']))
- elif location:
- # we need to have the data partition mounted & we can let it mounted
- mount_point = mount_data_partition(location['data_path'],
- location['osdid'])
- # Update journal location only if link point to another partition
- if not is_location_correct(mount_point,
- location['journal_path'],
- location['osdid']):
- print("Fixing journal location for "
- "OSD id: %(id)s" % {"node": location['data_path'],
- "id": location['osdid']})
- fix_location(mount_point,
- location['journal_path'],
- location['osdid'])
- else:
- print("Journal location for %s is correct,"
- "no need to change it" % location['data_path'])
-
-
-main(sys.argv[1:])
+++ /dev/null
-#!/bin/bash
-#
-# Copyright (c) 2019 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-script=$(basename $0)
-
-# Set nullglob so wildcards will return empty string if no match
-shopt -s nullglob
-
-for dev in /dev/rbd[0-9]*; do
- for mnt in $(mount | awk -v dev=$dev '($1 == dev) {print $3}'); do
- logger -t ${script} "Unmounting $mnt"
- /usr/bin/umount $mnt
- done
- logger -t ${script} "Unmounted $dev"
-done
-
-for dev in /dev/rbd[0-9]*; do
- /usr/bin/rbd unmap -o force $dev
- logger -t ${script} "Unmapped $dev"
-done
-
-lsmod | grep -q '^rbd\>' && /usr/sbin/modprobe -r rbd
-lsmod | grep -q '^libceph\>' && /usr/sbin/modprobe -r libceph
-
-exit 0
-
+++ /dev/null
-[Unit]
-Description=radosgw RESTful rados gateway
-After=network.target
-#After=remote-fs.target nss-lookup.target network-online.target time-sync.target
-#Wants=network-online.target
-
-[Service]
-Type=forking
-Restart=no
-KillMode=process
-RemainAfterExit=yes
-ExecStart=/etc/rc.d/init.d/ceph-radosgw start
-ExecStop=/etc/rc.d/init.d/ceph-radosgw stop
-ExecReload=/etc/rc.d/init.d/ceph-radosgw reload
-
-[Install]
-WantedBy=multi-user.target
-
+++ /dev/null
-[global]
- # Unique ID for the cluster.
- fsid = %CLUSTER_UUID%
- # Public network where the monitor is connected to, i.e, 128.224.0.0/16
- #public network = 127.0.0.1/24
- # For version 0.55 and beyond, you must explicitly enable
- # or disable authentication with "auth" entries in [global].
- auth_cluster_required = cephx
- auth_service_required = cephx
- auth_client_required = cephx
- osd_journal_size = 1024
-
- # Uncomment the following line if you are mounting with ext4
- # filestore xattr use omap = true
-
- # Number of replicas of objects. Write an object 2 times.
- # Cluster cannot reach an active + clean state until there's enough OSDs
- # to handle the number of copies of an object. In this case, it requires
- # at least 2 OSDs
- osd_pool_default_size = 2
-
- # Allow writing one copy in a degraded state.
- osd_pool_default_min_size = 1
-
- # Ensure you have a realistic number of placement groups. We recommend
- # approximately 100 per OSD. E.g., total number of OSDs multiplied by 100
- # divided by the number of replicas (i.e., osd pool default size). So for
- # 2 OSDs and osd pool default size = 2, we'd recommend approximately
- # (100 * 2) / 2 = 100.
- osd_pool_default_pg_num = 64
- osd_pool_default_pgp_num = 64
- osd_crush_chooseleaf_type = 1
- setuser match path = /var/lib/ceph/$type/$cluster-$id
-
- # Override Jewel default of 2 reporters. StarlingX has replication factor 2
- mon_osd_min_down_reporters = 1
-
- # Use Hammer's report interval default value
- osd_mon_report_interval_max = 120
-
- # Configure max PGs per OSD to cover worst-case scenario of all possible
- # StarlingX deployments i.e. AIO-SX with one OSD. Otherwise using
- # the default value provided by Ceph Mimic leads to "too many PGs per OSD"
- # health warning as the pools needed by stx-openstack are being created.
- mon_max_pg_per_osd = 2048
- osd_max_pg_per_osd_hard_ratio = 1.2
-
-[osd]
- osd_mkfs_type = xfs
- osd_mkfs_options_xfs = "-f"
- osd_mount_options_xfs = "rw,noatime,inode64,logbufs=8,logbsize=256k"
-
-[mon]
- mon warn on legacy crush tunables = false
- # Quiet new warnings on move to Hammer
- mon pg warn max per osd = 2048
- mon pg warn max object skew = 0
- mgr initial modules = restful
+++ /dev/null
-[process]
-process = ceph
-script = /etc/init.d/ceph-init-wrapper
-
-style = lsb
-severity = major ; minor, major, critical
-restarts = 3 ; restart retries before error assertion
-interval = 30 ; number of seconds to wait between restarts
-
-mode = status ; Monitoring mode: passive (default) or active
- ; passive: process death monitoring (default: always)
- ; active : heartbeat monitoring, i.e. request / response messaging
- ; status : determine process health with executing "status" command
- ; "start" is used to start the process(es) again
- ; ignore : do not monitor or stop monitoring
-
-; Status and Active Monitoring Options
-
-period = 30 ; monitor period in seconds
-timeout = 120 ; for active mode, messaging timeout period in seconds, must be shorter than period
- ; for status mode, max amount of time for a command to execute
-
-; Status Monitoring Options
-start_arg = start ; start argument for the script
-status_arg = status ; status argument for the script
-status_failure_text = /tmp/ceph_status_failure.txt ; text to be added to alarms or logs, this is optional
+++ /dev/null
-[Unit]
-Description=StarlingX Ceph Startup
-After=network.target
-
-[Service]
-Type=forking
-Restart=no
-KillMode=process
-RemainAfterExit=yes
-ExecStart=/etc/rc.d/init.d/ceph start
-ExecStop=/etc/rc.d/init.d/ceph stop
-PIDFile=/var/run/ceph/ceph.pid
-
-[Install]
-WantedBy=multi-user.target
-
+++ /dev/null
-#!/bin/bash
-
-INITDIR=/etc/init.d
-LOGFILE=/var/log/ceph/ceph-init.log
-CEPH_FILE=/var/run/.ceph_started
-
-# Get our nodetype
-. /etc/platform/platform.conf
-
-# Exit immediately if ceph not configured (i.e. no mon in the config file)
-if ! grep -q "mon\." /etc/ceph/ceph.conf
-then
- exit 0
-fi
-
-logecho ()
-{
- echo $1
- date >> ${LOGFILE}
- echo $1 >> ${LOGFILE}
-}
-
-start ()
-{
- logecho "Starting ceph services..."
- ${INITDIR}/ceph start >> ${LOGFILE} 2>&1
- RC=$?
-
- if [ ! -f ${CEPH_FILE} ]; then
- touch ${CEPH_FILE}
- fi
-}
-
-stop ()
-{
- if [[ "$system_type" == "All-in-one" ]] && [[ "$system_mode" == "simplex" ]]; then
- logecho "Ceph services will continue to run on node"
- exit 0
- fi
-
- logecho "Stopping ceph services..."
-
- if [ -f ${CEPH_FILE} ]; then
- rm -f ${CEPH_FILE}
- fi
-
- ${INITDIR}/ceph stop >> ${LOGFILE} 2>&1
- RC=$?
-}
-
-RC=0
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- *)
- echo "Usage: $0 {start|stop}"
- exit 1
- ;;
-esac
-
-logecho "RC was: $RC"
-exit $RC
+++ /dev/null
-#!/usr/bin/python
-#
-# Copyright (c) 2019 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-
-### BEGIN INIT INFO
-# Provides: ceph/mgr RESTful API plugin
-# Required-Start: $ceph
-# Required-Stop: $ceph
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Ceph MGR RESTful API plugin
-# Description: Ceph MGR RESTful API plugin
-### END INIT INFO
-
-import argparse
-import contextlib
-import errno
-import fcntl
-import inspect
-import json
-import logging
-import multiprocessing
-import os
-import shutil
-import signal
-import socket
-import subprocess
-import sys
-import tempfile
-import time
-
-import daemon
-import psutil
-import requests
-
-# 'timeout' command returns exit status 124
-# if command times out (see man page)
-GNU_TIMEOUT_EXPIRED_RETCODE = 124
-
-
-def psutil_terminate_kill(target, timeout):
-
- """Extend psutil functionality to stop a process.
-
- SIGINT is sent to each target then after a grace period SIGKILL
- is sent to the ones that are still running.
- """
-
- if not isinstance(target, list):
- target = [target]
- _, target = psutil.wait_procs(target, timeout=0)
- for action in [lambda p: p.terminate(), lambda p: p.kill()]:
- for proc in target:
- action(proc)
- _, target = psutil.wait_procs(
- target, timeout=timeout)
-
-
-class Config(object):
-
- """ceph-mgr service wrapper configuration options.
-
- In the future we may want to load them from a configuration file
- (for example /etc/ceph/mgr-restful-plugin.conf )
- """
-
- def __init__(self):
- self.log_level = logging.INFO
- self.log_dir = '/var/log'
-
- self.ceph_mgr_service = '/usr/bin/ceph-mgr'
- self.ceph_mgr_config = '/etc/ceph/ceph.conf'
- self.ceph_mgr_cluster = 'ceph'
- self.ceph_mgr_rundir = '/var/run/ceph/mgr'
- self.ceph_mgr_confdir = '/var/lib/ceph/mgr'
- self.ceph_mgr_identity = socket.gethostname()
-
- self.service_name = 'mgr-restful-plugin'
- self.service_socket = os.path.join(
- self.ceph_mgr_rundir, '{}.socket'.format(self.service_name))
- self.service_lock = os.path.join(
- self.ceph_mgr_rundir, '{}.lock'.format(self.service_name))
- self.service_pid_file = os.path.join(
- '/var/run/ceph', '{}.pid'.format(self.service_name))
-
- self.restful_plugin_port = 5001
-
- # maximum size of a message received/sent via
- # service monitor control socket
- self.service_socket_bufsize = 1024
-
- # maximum time to wait for ceph cli to exit
- self.ceph_cli_timeout_sec = 30
-
- # how much time to wait after ceph cli commands fail with timeout
- # before running any other commands
- self.cluster_grace_period_sec = 30
-
- # after ceph-mgr is started it goes through an internal initialization
- # phase before; how much time to wait before querying ceph-mgr
- self.ceph_mgr_grace_period_sec = 15
-
- # after sending SIGTERM to ceph-mgr how much time to wait before
- # sending SIGKILL (maximum time allowed for ceph-mgr cleanup)
- self.ceph_mgr_kill_delay_sec = 5
-
- # if service monitor is running a recovery procedure it reports
- # status OK even if ceph-mgr is currently down. This sets the
- # maximum number of consecutive ceph-mgr failures before reporting
- # status error
- self.ceph_mgr_fail_count_report_error = 3
-
- # maximum number of consecutive ceph-mgr failures before
- # stopping mgr-restful-plugin service
- self.ceph_mgr_fail_count_exit = 5
-
- # maximum time allowed for ceph-mgr to respond to a REST API request
- self.rest_api_timeout_sec = 15
-
- # interval between consecutive REST API requests (ping's). A smaller
- # value here triggers more requests to ceph-mgr restful plugin. A
- # higher value makes recovery slower when services become unavailable
- self.restful_plugin_ping_delay_sec = 3
-
- # where to save the self-signed certificate generated by ceph-mgr
- self.restful_plugin_cert_path = os.path.join(
- self.ceph_mgr_rundir, 'restful.crt')
-
- # time to wait after enabling restful plugin
- self.restful_plugin_grace_period_sec = 3
-
- # after how many REST API ping failures to restart ceph-mgr
- self.ping_fail_count_restart_mgr = 3
-
- # after how many REST API ping failures to report status error.
- # Until then service monitor reports status OK just in case
- # restful plugin recovers
- self.ping_fail_count_report_error = 5
-
- @staticmethod
- def load():
- return Config()
-
-
-def setup_logging(name=None, cleanup_handlers=False):
- if not name:
- name = CONFIG.service_name
- log = logging.getLogger(name)
- log.setLevel(CONFIG.log_level)
- if cleanup_handlers:
- try:
- for handler in log.handlers:
- if isinstance(handler, logging.StreamHandler):
- handler.flush()
- if isinstance(handler, logging.FileHandler):
- handler.close()
- log.handlers = []
- except Exception:
- pass
- elif log.handlers:
- return log
- handler = logging.FileHandler(
- os.path.join(CONFIG.log_dir,
- '{}.log'.format(CONFIG.service_name)))
- handler.setFormatter(
- logging.Formatter('%(asctime)s %(process)s %(levelname)s %(name)s %(message)s'))
- log.addHandler(handler)
- return log
-
-
-CONFIG = Config.load()
-LOG = setup_logging(name='init-wrapper')
-
-
-class ServiceException(Exception):
-
- """Generic mgr-restful-plugin service exception.
-
- Build exception string based on static (per exception class)
- string plus args, keyword args passed to exception constructor.
- """
-
- message = ""
-
- def __init__(self, *args, **kwargs):
- if "message" not in kwargs:
- try:
- message = self.message.format(*args, **kwargs)
- except Exception: # noqa
- message = '{}, args:{}, kwargs: {}'.format(
- self.message, args, kwargs)
- else:
- message = kwargs["message"]
- super(ServiceException, self).__init__(message)
-
-
-class ServiceAlreadyStarted(ServiceException):
- message = ('Service monitor already started')
-
-
-class ServiceLockFailed(ServiceException):
- message = ('Unable to lock service monitor: '
- 'reason={reason}')
-
-
-class ServiceNoSocket(ServiceException):
- message = ('Unable to create service monitor socket: '
- 'reason={reason}')
-
-
-class ServiceSocketBindFailed(ServiceException):
- message = ('Failed to bind service monitor socket: '
- 'path={path}, reason={reason}')
-
-
-class ServiceNoPidFile(ServiceException):
- message = ('Failed to update pid file: '
- 'path={path}, reason={reason}')
-
-
-class CommandFailed(ServiceException):
- message = ('Command failed: command={command}, '
- 'reason={reason}, out={out}')
-
-
-class CommandTimeout(ServiceException):
- message = ('Command timeout: command={command}, '
- 'timeout={timeout}')
-
-
-class CephMgrStartFailed(ServiceException):
- message = ('Failed to start ceph_mgr: '
- 'reason={reason}')
-
-
-class CephRestfulPluginFailed(ServiceException):
- message = ('Failed to start restful plugin: '
- 'reason={reason}')
-
-
-class RestApiPingFailed(ServiceException):
- message = ('REST API ping failed: '
- 'reason={reason}')
-
-
-class ServiceMonitor(object):
-
- """Configure and monitor ceph-mgr and restful plugin (Ceph REST API)
-
- 1. process init script service requests: status, stop. Requests are
- received via a control socket. Stop has priority over whatever
- the monitor is doing currently. Any ceph command that may be running
- is terminated/killed. Note that while ceph-mgr and restful plugin
- configuration is in progress ServiceMonitor reports status OK to
- avoid being restarted by SM.
-
- 2. configure ceph-mgr and mgr restful plugin: authentication, REST API
- service port, self signed certificate. This runs as a separate
- process so it can be stopped when init script requests it.
-
- 3. periodically check (ping) REST API responds to HTTPS requests.
- Recovery actions are taken if REST API fails to respond: restart
- ceph-mgr, wait for cluster to become available again.
- """
-
- def __init__(self):
- # process running configuration & REST API ping loop
- self.monitor = None
-
- # command socket used by init script
- self.command = None
-
- # ceph-mgr process
- self.ceph_mgr = None
-
- # consecutive ceph-mgr/restful-plugin start failures. Service monitor
- # reports failure after CONFIG.ceph_mgr_max_failure_count
- self.ceph_mgr_failure_count = 0
-
- # consecutive REST API ping failures. ceph-mgr service is restarted
- # after CONFIG.ping_fail_count_restart_mgr threshold is exceeded
- self.ping_failure_count = 0
-
- # REST API url reported by ceph-mgr after enabling restful plugin
- self.restful_plugin_url = ''
-
- # REST API self signed certificate generated by restful plugin
- self.certificate = ''
-
- def run(self):
- self.disable_certificate_check()
- with self.service_lock(), self.service_socket(), \
- self.service_pid_file():
- self.start_monitor()
- self.server_loop()
-
- def disable_certificate_check(self):
- # ceph-mgr restful plugin is configured with a self-signed
- # certificate. Certificate host is hard-coded to "ceph-restful"
- # which causes HTTPS requests to fail because they don't
- # match current host name ("controller-..."). Disable HTTPS
- # certificates check in urllib3
- LOG.warning('Disable urllib3 certifcates check')
- requests.packages.urllib3.disable_warnings()
-
- def server_loop(self):
- self.command.listen(2)
- while True:
- try:
- client, _ = self.command.accept()
- request = client.recv(CONFIG.service_socket_bufsize)
- LOG.debug('Monitor command socket: request=%s', str(request))
- cmd = request.split(' ')
- cmd, args = cmd[0], cmd[1:]
- if cmd == 'status':
- self.send_response(client, request, self.status())
- elif cmd == 'stop':
- self.stop()
- self.send_response(client, request, 'OK')
- break
- elif cmd == 'restful-url':
- try:
- self.restful_plugin_url = args[0]
- self.send_response(client, request, 'OK')
- except IndexError:
- LOG.warning('Failed to update restful plugin url: '
- 'args=%s', str(args))
- self.send_response(client, request, 'ERR')
- elif cmd == 'certificate':
- try:
- self.certificate = args[0] if args else ''
- self.send_response(client, request, 'OK')
- except IndexError:
- LOG.warning('Failed to update certificate path: '
- 'args=%s', str(args))
- self.send_response(client, request, 'ERR')
- elif cmd == 'ceph-mgr-failures':
- try:
- self.ceph_mgr_failure_count = int(args[0])
- self.send_response(client, request, 'OK')
- if self.ceph_mgr_failure_count >= CONFIG.ceph_mgr_fail_count_exit:
- self.stop()
- break
- except (IndexError, ValueError):
- LOG.warning('Failed to update ceph-mgr failures: '
- 'args=%s', str(args))
- self.send_response(client, request, 'ERR')
- elif cmd == 'ping-failures':
- try:
- self.ping_failure_count = int(args[0])
- self.send_response(client, request, 'OK')
- except (IndexError, ValueError):
- LOG.warning('Failed to update ping failures: '
- 'args=%s', str(args))
- self.send_response(client, request, 'ERR')
- except Exception as err:
- LOG.exception(err)
-
- @staticmethod
- def send_response(client, request, response):
- try:
- client.send(response)
- except socket.error as err:
- LOG.warning('Failed to send response back. '
- 'request=%s, response=%s, reason=%s',
- request, response, err)
-
- def status(self):
- if not self.restful_plugin_url:
- if self.ceph_mgr_failure_count < CONFIG.ceph_mgr_fail_count_report_error \
- and self.ping_failure_count < CONFIG.ping_fail_count_report_error:
- LOG.debug('Monitor is starting services. Report status OK')
- return 'OK'
- LOG.debug('Too many failures: '
- 'ceph_mgr=%d < %d, ping=%d < %d. '
- 'Report status ERR',
- self.ceph_mgr_failure_count,
- CONFIG.ceph_mgr_fail_count_report_error,
- self.ping_failure_count,
- CONFIG.ping_fail_count_report_error)
- return 'ERR.down'
- try:
- self.restful_plugin_ping()
- LOG.debug('Restful plugin ping successful. Report status OK')
- return 'OK'
- except (CommandFailed, RestApiPingFailed):
- if self.ceph_mgr_failure_count < CONFIG.ceph_mgr_fail_count_report_error \
- and self.ping_failure_count < CONFIG.ping_fail_count_report_error:
- LOG.info('Restful plugin does not respond but failure '
- 'count is within acceptable limits: '
- ' ceph_mgr=%d < %d, ping=%d < %d. '
- 'Report status OK',
- self.ceph_mgr_failure_count,
- CONFIG.ceph_mgr_fail_count_report_error,
- self.ping_failure_count,
- CONFIG.ping_fail_count_report_error)
- return 'OK'
- LOG.debug('Restful does not respond (ping failure count %d). '
- 'Report status ERR', self.ping_failure_count)
- return 'ERR.ping_failed'
-
- def stop(self):
- if not self.monitor:
- return
- LOG.info('Stop monitor with SIGTERM to process group %d',
- self.monitor.pid)
- try:
- os.killpg(self.monitor.pid, signal.SIGTERM)
- except OSError as err:
- LOG.info('Stop monitor failed: reason=%s', str(err))
- return
- time.sleep(CONFIG.ceph_mgr_kill_delay_sec)
- LOG.info('Stop monitor with SIGKILL to process group %d',
- self.monitor.pid)
- try:
- os.killpg(self.monitor.pid, signal.SIGKILL)
- os.waitpid(self.monitor.pid, 0)
- except OSError as err:
- LOG.info('Stop monitor failed: reason=%s', str(err))
- return
- LOG.info('Monitor stopped: pid=%d', self.monitor.pid)
-
- @contextlib.contextmanager
- def service_lock(self):
- LOG.info('Take service lock: path=%s', CONFIG.service_lock)
- try:
- os.makedirs(os.path.dirname(CONFIG.service_lock))
- except OSError:
- pass
- lock_file = open(CONFIG.service_lock, 'w')
- try:
- fcntl.flock(lock_file.fileno(),
- fcntl.LOCK_EX | fcntl.LOCK_NB)
- except (IOError, OSError) as err:
- if err.errno == errno.EAGAIN:
- raise ServiceAlreadyStarted()
- else:
- raise ServiceLockFailed(reason=str(err))
- # even if we have the lock here there might be another service manager
- # running whose CONFIG.ceph_mgr_rundir was removed before starting
- # this instance. Make sure there is only one service manager running
- self.stop_other_service_managers()
- try:
- yield
- finally:
- os.unlink(CONFIG.service_lock)
- lock_file.close()
- LOG.info('Release service lock: path=%s', CONFIG.service_lock)
-
- def stop_other_service_managers(self):
- service = os.path.join('/etc/init.d', CONFIG.service_name)
- for p in psutil.process_iter():
- if p.cmdline()[:2] not in [[service], ['/usr/bin/python', service]]:
- continue
- if p.pid == os.getpid():
- continue
- p.kill()
-
- @contextlib.contextmanager
- def service_socket(self):
- LOG.info('Create service socket')
- try:
- self.command = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET)
- except socket.error as err:
- raise ServiceNoSocket(reason=str(err))
- LOG.info('Remove existing socket files')
- try:
- os.unlink(CONFIG.service_socket)
- except OSError:
- pass
- LOG.info('Bind service socket: path=%s', CONFIG.service_socket)
- try:
- self.command.bind(CONFIG.service_socket)
- except socket.error as err:
- raise ServiceSocketBindFailed(
- path=CONFIG.service_socket, reason=str(err))
- try:
- yield
- finally:
- LOG.info('Close service socket and remove file: path=%s',
- CONFIG.service_socket)
- self.command.close()
- os.unlink(CONFIG.service_socket)
-
- @contextlib.contextmanager
- def service_pid_file(self):
- LOG.info('Update service pid file: path=%s', CONFIG.service_pid_file)
- try:
- pid_file = open(CONFIG.service_pid_file, 'w')
- pid_file.write(str(os.getpid()))
- pid_file.flush()
- except OSError as err:
- raise ServiceNoPidFile(
- path=CONFIG.service_pid_file, reason=str(err))
- try:
- yield
- finally:
- LOG.info('Remove service pid file: path=%s',
- CONFIG.service_pid_file)
- try:
- os.unlink(CONFIG.service_pid_file)
- except OSError:
- pass
-
- def start_monitor(self):
- LOG.info('Start monitor loop')
- self.monitor = multiprocessing.Process(target=self.monitor_loop)
- self.monitor.start()
-
- def stop_unmanaged_ceph_mgr(self):
- LOG.info('Stop unmanaged running ceph-mgr processes')
- service_name = os.path.basename(CONFIG.ceph_mgr_service)
- if self.ceph_mgr:
- psutil_terminate_kill(
- [proc for proc in psutil.process_iter()
- if (proc.name() == service_name
- and proc.pid != self.ceph_mgr.pid)],
- CONFIG.ceph_mgr_kill_delay_sec)
- else:
- psutil_terminate_kill(
- [proc for proc in psutil.process_iter()
- if proc.name() == service_name],
- CONFIG.ceph_mgr_kill_delay_sec)
-
- def monitor_loop(self):
-
- """Bring up and monitor ceph-mgr restful plugin.
-
- Steps:
- - wait for Ceph cluster to become available
- - configure and start ceph-mgr
- - configure and enable restful plugin
- - send periodic requests to REST API
- - recover from failures
-
- Note: because this runs as a separate process it
- must send status updates to service monitor
- via control socket for: ping_failure_count,
- restful_plugin_url and certificate.
- """
-
- # Promote to process group leader so parent (service monitor)
- # can kill the monitor plus processes spawned by it. Otherwise
- # children of monitor_loop() will keep running in background and
- # will be reaped by init when they finish but by then they might
- # interfere with any new service instance.
- os.setpgrp()
-
- # Ignoring SIGTERM here ensures process group is not reused by
- # the time parent (service monitor) issues the final SIGKILL.
- signal.signal(signal.SIGTERM, signal.SIG_IGN)
-
- while True:
- try:
- # steps to configure/start ceph-mgr and restful plugin
- self.ceph_fsid_get()
- self.ceph_mgr_auth_create()
- self.restful_plugin_set_server_port()
- self.restful_plugin_create_certificate()
- self.ceph_mgr_start()
- self.restful_plugin_enable()
- self.restful_plugin_create_admin_key()
- self.restful_plugin_get_url()
- self.restful_plugin_get_certificate()
-
- # REST API should be available now
- # start making periodic requests (ping)
- while True:
- try:
- self.restful_plugin_ping()
- self.ping_failure_count = 0
- self.request_update_ping_failures(
- self.ping_failure_count)
- self.ceph_mgr_failure_count = 0
- self.request_update_ceph_mgr_failures(
- self.ceph_mgr_failure_count)
- time.sleep(CONFIG.restful_plugin_ping_delay_sec)
- continue
- except RestApiPingFailed as err:
- LOG.warning(str(err))
-
- LOG.info('REST API ping failure count=%d',
- self.ping_failure_count)
- self.ping_failure_count += 1
- self.request_update_ping_failures(
- self.ping_failure_count)
-
- # maybe request failed because ceph-mgr is not running
- if not self.ceph_mgr_is_running():
- self.ceph_mgr_failure_count += 1
- self.request_update_ceph_mgr_failures(
- self.ceph_mgr_failure_count)
- self.ceph_mgr_start()
- time.sleep(CONFIG.ceph_mgr_grace_period_sec)
- continue
-
- # maybe request failed because cluster health is not ok
- if not self.ceph_fsid_get():
- LOG.info('Unable to get cluster fsid. '
- 'Sleep for a while')
- time.sleep(CONFIG.cluster_grace_period_sec)
- break
-
- # too many failures? Restart ceph-mgr and go again
- # through configuration steps
- if (self.ping_failure_count
- % CONFIG.ping_fail_count_restart_mgr == 0):
- LOG.info('Too many consecutive REST API failures. '
- 'Restart ceph-mgr. Update service '
- 'url and certificate')
- self.ceph_mgr_stop()
- self.restful_plugin_url = ''
- self.request_update_plugin_url(self.restful_plugin_url)
- self.certificate = ''
- self.request_update_certificate(self.certificate)
- break
-
- time.sleep(CONFIG.restful_plugin_ping_delay_sec)
-
- except CommandFailed as err:
- LOG.warning(str(err))
- time.sleep(CONFIG.cluster_grace_period_sec)
- except CommandTimeout as err:
- LOG.warning(str(err))
- except (CephMgrStartFailed, CephRestfulPluginFailed) as err:
- LOG.warning(str(err))
- self.ceph_mgr_failure_count += 1
- self.request_update_ceph_mgr_failures(
- self.ceph_mgr_failure_count)
- time.sleep(CONFIG.ceph_mgr_grace_period_sec)
- except Exception as err:
- LOG.exception(err)
- time.sleep(CONFIG.cluster_grace_period_sec)
-
- @staticmethod
- def run_with_timeout(command, timeout, stderr=subprocess.STDOUT):
- try:
- LOG.info('Run command: %s', ' '.join(command))
- return subprocess.check_output(
- ['/usr/bin/timeout', str(timeout)] + command,
- stderr=stderr, shell=False).strip()
- except subprocess.CalledProcessError as err:
- if err.returncode == GNU_TIMEOUT_EXPIRED_RETCODE:
- raise CommandTimeout(command=err.cmd, timeout=timeout)
- raise CommandFailed(command=err.cmd, reason=str(err),
- out=err.output)
-
- def ceph_fsid_get(self):
- return self.run_with_timeout(['/usr/bin/ceph', 'fsid'],
- CONFIG.ceph_cli_timeout_sec)
-
- def ceph_mgr_has_auth(self):
- path = '{}/ceph-{}'.format(
- CONFIG.ceph_mgr_confdir, CONFIG.ceph_mgr_identity)
- try:
- os.makedirs(path)
- except OSError as err:
- pass
- try:
- self.run_with_timeout(
- ['/usr/bin/ceph', 'auth', 'get',
- 'mgr.{}'.format(CONFIG.ceph_mgr_identity),
- '-o', '{}/keyring'.format(path)],
- CONFIG.ceph_cli_timeout_sec)
- return True
- except CommandFailed as err:
- if 'ENOENT' in str(err):
- return False
- raise
-
- def ceph_mgr_auth_create(self):
- if self.ceph_mgr_has_auth():
- return
- LOG.info('Create ceph-mgr authentication')
- self.run_with_timeout(
- ['/usr/bin/ceph', 'auth', 'get-or-create',
- 'mgr.{}'.format(CONFIG.ceph_mgr_identity),
- 'mon', 'allow *', 'osd', 'allow *'],
- CONFIG.ceph_cli_timeout_sec)
-
- def ceph_mgr_is_running(self):
- if not self.ceph_mgr:
- return None
- try:
- self.ceph_mgr.wait(timeout=0)
- except psutil.TimeoutExpired:
- return True
- return False
-
- def ceph_mgr_start(self):
- if self.ceph_mgr_is_running():
- return
- self.stop_unmanaged_ceph_mgr()
- LOG.info('Start ceph-mgr daemon')
- try:
- with open(os.devnull, 'wb') as null:
- self.ceph_mgr = psutil.Popen(
- [CONFIG.ceph_mgr_service,
- '--cluster', CONFIG.ceph_mgr_cluster,
- '--conf', CONFIG.ceph_mgr_config,
- '--id', CONFIG.ceph_mgr_identity,
- '-f'],
- close_fds=True,
- stdout=null,
- stderr=null,
- shell=False)
- except (OSError, ValueError) as err:
- raise CephMgrStartFailed(reason=str(err))
- time.sleep(CONFIG.ceph_mgr_grace_period_sec)
-
- def ceph_mgr_stop(self):
- if not self.ceph_mgr:
- return
- LOG.info('Stop ceph-mgr')
- psutil_terminate_kill(self.ceph_mgr, CONFIG.ceph_mgr_kill_delay_sec)
-
- def restful_plugin_has_server_port(self):
- try:
- with open(os.devnull, 'wb') as null:
- out = self.run_with_timeout(
- ['/usr/bin/ceph', 'config-key', 'get',
- 'mgr/restful/server_port'],
- CONFIG.ceph_cli_timeout_sec, stderr=null)
- if out == str(CONFIG.restful_plugin_port):
- return True
- LOG.warning('Restful plugin port mismatch: '
- 'current=%d, expected=%d', out,
- CONFIG.restful_plugin_port)
- except CommandFailed as err:
- LOG.warning('Failed to get restful plugin port: '
- 'reason=%s', str(err))
- return False
-
- def restful_plugin_set_server_port(self):
- if self.restful_plugin_has_server_port():
- return
- LOG.info('Set restful plugin port=%d', CONFIG.restful_plugin_port)
- self.run_with_timeout(
- ['/usr/bin/ceph', 'config-key', 'set',
- 'mgr/restful/server_port', str(CONFIG.restful_plugin_port)],
- CONFIG.ceph_cli_timeout_sec)
-
- def restful_plugin_has_admin_key(self):
- try:
- self.run_with_timeout(
- ['/usr/bin/ceph', 'config-key', 'get',
- 'mgr/restful/keys/admin'],
- CONFIG.ceph_cli_timeout_sec)
- return True
- except CommandFailed:
- pass
- return False
-
- def restful_plugin_create_admin_key(self):
- if self.restful_plugin_has_admin_key():
- return
- LOG.info('Create restful plugin admin key')
- self.run_with_timeout(
- ['/usr/bin/ceph', 'restful',
- 'create-key', 'admin'],
- CONFIG.ceph_cli_timeout_sec)
-
- def restful_plugin_has_certificate(self):
- try:
- self.run_with_timeout(
- ['/usr/bin/ceph', 'config-key', 'get',
- 'config/mgr/restful/{}/crt'.format(CONFIG.ceph_mgr_identity)],
- CONFIG.ceph_cli_timeout_sec)
- self.run_with_timeout(
- ['/usr/bin/ceph', 'config-key', 'get',
- 'mgr/restful/{}/crt'.format(CONFIG.ceph_mgr_identity)],
- CONFIG.ceph_cli_timeout_sec)
- self.run_with_timeout(
- ['/usr/bin/ceph', 'config-key', 'get',
- 'config/mgr/restful/{}/key'.format(CONFIG.ceph_mgr_identity)],
- CONFIG.ceph_cli_timeout_sec)
- self.run_with_timeout(
- ['/usr/bin/ceph', 'config-key', 'get',
- '/mgr/restful/{}/key'.format(CONFIG.ceph_mgr_identity)],
- CONFIG.ceph_cli_timeout_sec)
- return True
- except CommandFailed:
- pass
- return False
-
- def restful_plugin_create_certificate(self):
- if self.restful_plugin_has_certificate():
- return
- LOG.info('Create restful plugin self signed certificate')
- path = tempfile.mkdtemp()
- try:
- try:
- with tempfile.NamedTemporaryFile() as restful_cnf:
- restful_cnf.write((
- '[req]\n'
- 'req_extensions = v3_ca\n'
- 'distinguished_name = req_distinguished_name\n'
- '[v3_ca]\n'
- 'subjectAltName=DNS:{}\n'
- 'basicConstraints = CA:true\n'
- '[ req_distinguished_name ]\n'
- '0.organizationName = IT\n'
- 'commonName = ceph-restful\n').format(
- CONFIG.ceph_mgr_identity))
- restful_cnf.flush()
- subprocess.check_call([
- '/usr/bin/openssl', 'req', '-new', '-nodes', '-x509',
- '-subj', '/O=IT/CN=' + CONFIG.ceph_mgr_identity,
- '-days', '3650',
- '-config', restful_cnf.name,
- '-out', os.path.join(path, 'crt'),
- '-keyout', os.path.join(path, 'key'),
- '-extensions', 'v3_ca'])
- except subprocess.CalledProcessError as err:
- raise CommandFailed(
- command=' '.join(err.cmd),
- reason='failed to generate self-signed certificate: {}'.format(str(err)),
- out=err.output)
- self.run_with_timeout(
- ['/usr/bin/ceph', 'config-key', 'set',
- 'config/mgr/restful/{}/crt'.format(CONFIG.ceph_mgr_identity),
- '-i', os.path.join(path, 'crt')],
- CONFIG.ceph_cli_timeout_sec)
- self.run_with_timeout(
- ['/usr/bin/ceph', 'config-key', 'set',
- 'mgr/restful/{}/crt'.format(CONFIG.ceph_mgr_identity),
- '-i', os.path.join(path, 'crt')],
- CONFIG.ceph_cli_timeout_sec)
- self.run_with_timeout(
- ['/usr/bin/ceph', 'config-key', 'set',
- 'config/mgr/restful/{}/key'.format(CONFIG.ceph_mgr_identity),
- '-i', os.path.join(path, 'key')],
- CONFIG.ceph_cli_timeout_sec)
- self.run_with_timeout(
- ['/usr/bin/ceph', 'config-key', 'set',
- 'mgr/restful/{}/key'.format(CONFIG.ceph_mgr_identity),
- '-i', os.path.join(path, 'key')],
- CONFIG.ceph_cli_timeout_sec)
- finally:
- shutil.rmtree(path)
-
- def restful_plugin_is_enabled(self):
- command = ['/usr/bin/ceph', 'mgr', 'module', 'ls',
- '--format', 'json']
- with open(os.devnull, 'wb') as null:
- out = self.run_with_timeout(
- command, CONFIG.ceph_cli_timeout_sec, stderr=null)
- try:
- if 'restful' in json.loads(out)['enabled_modules']:
- return True
- except ValueError as err:
- raise CommandFailed(
- command=' '.join(command),
- reason='unable to decode json: {}'.format(err), out=out)
- except KeyError as err:
- raise CommandFailed(
- command=' '.join(command),
- reason='missing expected key: {}'.format(err), out=out)
- return False
-
- def restful_plugin_enable(self):
- if not self.restful_plugin_is_enabled():
- LOG.info('Enable restful plugin')
- self.run_with_timeout(
- ['/usr/bin/ceph', 'mgr',
- 'module', 'enable', 'restful'],
- CONFIG.ceph_cli_timeout_sec)
- time.sleep(CONFIG.restful_plugin_grace_period_sec)
-
- def restful_plugin_get_url(self):
- command = ['/usr/bin/ceph', 'mgr', 'services',
- '--format', 'json']
- with open(os.devnull, 'wb') as null:
- out = self.run_with_timeout(
- command, CONFIG.ceph_cli_timeout_sec, stderr=null)
- try:
- self.restful_plugin_url = json.loads(out)['restful']
- except ValueError as err:
- raise CephRestfulPluginFailed(
- reason='unable to decode json: {} output={}'.format(err, out))
- except KeyError as err:
- raise CephRestfulPluginFailed(
- reason='missing expected key: {} in ouput={}'.format(err, out))
- self.request_update_plugin_url(self.restful_plugin_url)
-
- def restful_plugin_get_certificate(self):
- command = ['/usr/bin/ceph', 'config-key', 'get',
- 'config/mgr/restful/{}/crt'.format(CONFIG.ceph_mgr_identity)]
- with open(os.devnull, 'wb') as null:
- certificate = self.run_with_timeout(
- command, CONFIG.ceph_cli_timeout_sec, stderr=null)
- with open(CONFIG.restful_plugin_cert_path, 'wb') as cert_file:
- cert_file.write(certificate)
- self.certificate = CONFIG.restful_plugin_cert_path
- self.request_update_certificate(
- self.certificate)
-
- def restful_plugin_ping(self):
- if not self.restful_plugin_url:
- raise RestApiPingFailed(reason='missing service url')
- if not self.certificate:
- raise RestApiPingFailed(reason='missing certificate')
- LOG.debug('Ping restful plugin: url=%d', self.restful_plugin_url)
- try:
- response = requests.request(
- 'GET', self.restful_plugin_url, verify=False,
- timeout=CONFIG.rest_api_timeout_sec)
- if not response.ok:
- raise RestApiPingFailed(
- reason='response not ok ({})'.format(response))
- LOG.debug('Ping restful plugin OK')
- except (requests.ConnectionError,
- requests.Timeout,
- requests.HTTPError) as err:
- raise RestApiPingFailed(reason=str(err))
-
- @staticmethod
- def _make_client_socket():
- sock = socket.socket(
- socket.AF_UNIX, socket.SOCK_SEQPACKET)
- sock.settimeout(2 * CONFIG.rest_api_timeout_sec)
- sock.connect(CONFIG.service_socket)
- return sock
-
- @staticmethod
- def request_status():
- try:
- with contextlib.closing(
- ServiceMonitor._make_client_socket()) as sock:
- sock.send('status')
- status = sock.recv(CONFIG.service_socket_bufsize)
- LOG.debug('Status %s', status)
- return status.startswith('OK')
- except socket.error as err:
- LOG.error('Status error: reason=%s', err)
- return False
-
- @staticmethod
- def request_stop():
- try:
- with contextlib.closing(
- ServiceMonitor._make_client_socket()) as sock:
- sock.send('stop')
- response = sock.recv(CONFIG.service_socket_bufsize)
- LOG.debug('Stop response: %s', response)
- return True
- except socket.error as err:
- LOG.error('Stop error: reason=%s', err)
- return False
-
- @staticmethod
- def request_update_ceph_mgr_failures(count):
- try:
- with contextlib.closing(
- ServiceMonitor._make_client_socket()) as sock:
- sock.send('ceph-mgr-failures {}'.format(count))
- sock.recv(CONFIG.service_socket_bufsize)
- return True
- except socket.error as err:
- LOG.error('Stop error: reason=%s', err)
- return False
-
- @staticmethod
- def request_update_ping_failures(count):
- try:
- with contextlib.closing(
- ServiceMonitor._make_client_socket()) as sock:
- sock.send('ping-failures {}'.format(count))
- sock.recv(CONFIG.service_socket_bufsize)
- return True
- except socket.error as err:
- LOG.error('Stop error: reason=%s', err)
- return False
-
- @staticmethod
- def request_update_plugin_url(url):
- try:
- with contextlib.closing(
- ServiceMonitor._make_client_socket()) as sock:
- sock.send('restful-url {}'.format(url))
- sock.recv(CONFIG.service_socket_bufsize)
- return True
- except socket.error as err:
- LOG.error('Stop error: reason=%s', err)
- return False
-
- @staticmethod
- def request_update_certificate(path):
- try:
- with contextlib.closing(
- ServiceMonitor._make_client_socket()) as sock:
- sock.send('certificate {}'.format(path))
- sock.recv(CONFIG.service_socket_bufsize)
- return True
- except socket.error as err:
- LOG.error('Stop error: reason=%s', err)
- return False
-
-
-class InitWrapper(object):
-
- """Handle System V init script actions: start, stop, restart, etc. """
-
- def __init__(self):
-
- """Dispatch command line action to the corresponding function.
-
- Candidate action functions are all class methods except ones
- that start with an underscore.
- """
-
- parser = argparse.ArgumentParser()
- actions = [m[0]
- for m in inspect.getmembers(self)
- if (inspect.ismethod(m[1])
- and not m[0].startswith('_'))]
- parser.add_argument(
- 'action',
- choices=actions)
- self.args = parser.parse_args()
- getattr(self, self.args.action)()
-
- def start(self):
-
- """Start ServiceMonitor as a daemon unless one is already running.
-
- Use a pipe to report monitor status back to this process.
- """
-
- pipe = os.pipe()
- child = os.fork()
- if child == 0:
- os.close(pipe[0])
- with daemon.DaemonContext(files_preserve=[pipe[1]]):
- # prevent duplication of messages in log
- global LOG
- LOG = setup_logging(cleanup_handlers=True)
- try:
- monitor = ServiceMonitor()
- status = 'OK'
- except ServiceAlreadyStarted:
- os.write(pipe[1], 'OK')
- os.close(pipe[1])
- return
- except Exception as err:
- status = str(err)
- os.write(pipe[1], status)
- os.close(pipe[1])
- if status == 'OK':
- try:
- monitor.run()
- except ServiceException as err:
- LOG.warning(str(err))
- except Exception as err:
- LOG.exception('Service monitor error: reason=%s', err)
- else:
- os.close(pipe[1])
- try:
- status = os.read(pipe[0], CONFIG.service_socket_bufsize)
- if status == 'OK':
- sys.exit(0)
- else:
- LOG.warning('Service monitor failed to start: '
- 'status=%s', status)
- except IOError as err:
- LOG.warning('Failed to read monitor status: reason=%s', err)
- os.close(pipe[0])
- os.waitpid(child, 0)
- sys.exit(1)
-
- def stop(self):
-
- """Tell ServiceMonitor daemon to stop running.
-
- In case request fails stop ServiceMonitor and ceph_mgr proecsses
- using SIGTERM followed by SIGKILL.
- """
-
- result = ServiceMonitor.request_stop()
- if not result:
- ceph_mgr = os.path.basename(CONFIG.ceph_mgr_service)
- procs = []
- for proc in psutil.process_iter():
- name = proc.name()
- if name == CONFIG.service_name:
- procs.append(proc)
- if name == ceph_mgr:
- procs.append(proc)
- psutil_terminate_kill(procs, CONFIG.ceph_mgr_kill_delay_sec)
-
- def restart(self):
- self.stop()
- self.start()
-
- def force_reload(self):
- self.stop()
- self.start()
-
- def reload(self):
- self.stop()
- self.start()
-
- def status(self):
-
- """Report status from ServiceMonitor.
-
- We don't just try to access REST API here because ServiceMonitor may
- be in the process of starting/configuring ceph-mgr and restful
- plugin in which case we report OK to avoid being restarted by SM.
- """
-
- status = ServiceMonitor.request_status()
- sys.exit(0 if status is True else 1)
-
-
-if __name__ == '__main__':
- InitWrapper()
+++ /dev/null
-[Unit]
-Description=Ceph MGR RESTful API Plugin
-After=network-online.target sw-patch.service
-
-[Service]
-Type=forking
-Restart=no
-KillMode=process
-RemainAfterExit=yes
-ExecStart=/etc/rc.d/init.d/mgr-restful-plugin start
-ExecStop=/etc/rc.d/init.d/mgr-restul-plugin stop
-ExecReload=/etc/rc.d/init.d/mgr-restful-plugin reload
-
-[Install]
-WantedBy=multi-user.target
+++ /dev/null
-[Service]
-ExecStopPost=/usr/sbin/ceph-preshutdown.sh
-
+++ /dev/null
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-RDEPENDS_${PN} += " \
- python-pyelftools \
- firewalld \
- logrotate \
- hwdata \
- "
-
-PACKAGECONFIG = "libcap-ng ssl dpdk"
-PACKAGECONFIG[ssl] = "--enable-ssl,--disable-ssl,openssl,"
-PACKAGECONFIG[dpdk] = "--with-dpdk=${STAGING_DIR_TARGET}${DPDK_INSTALL_DIR}/share/${TARGET_ARCH}-native-linuxapp-gcc,,dpdk,"
-
-inherit stx-metadata
-
-STX_REPO = "config-files"
-STX_SUBPATH = "openvswitch-config"
-
-LICENSE_append = "& Apache-2.0"
-LIC_FILES_CHKSUM += "\
- file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- "
-
-do_install_append () {
- cd ${S}
- install -d -p -m0755 ${D}/${base_libdir}/udev/rules.d
- install -d -m0755 ${D}/${systemd_system_unitdir}
- install -p -m0644 rhel/usr_lib_udev_rules.d_91-vfio.rules ${D}/${base_libdir}/udev/rules.d/91-vfio.rules
-
- install -p -m0644 \
- rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service \
- ${D}/${systemd_system_unitdir}/ovs-delete-transient-ports.service
-
- install -p -m0644 \
- rhel/usr_lib_systemd_system_ovn-controller.service \
- ${D}/${systemd_system_unitdir}/ovn-controller.service \
-
- install -p -m0644 \
- rhel/usr_lib_systemd_system_ovn-controller-vtep.service \
- ${D}/${systemd_system_unitdir}/ovn-controller-vtep.service \
-
- install -p -m0644 \
- rhel/usr_lib_systemd_system_ovn-northd.service \
- ${D}/${systemd_system_unitdir}/ovn-northd.service \
-
-##############
-# TODO: Do we need to use sysv?
-#
-# install -m 0755 rhel/etc_init.d_openvswitch \
-# $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/openvswitch.init
-#
-# TODO: Is this the best solution?
-# install -d -m 0755 $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/
-# install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifdown-ovs \
-# $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
-# install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifup-ovs \
-# $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
-# TODO: warrior builds openvswitch with python3.
-# install -d -m 0755 $RPM_BUILD_ROOT%{python2_sitelib}
-# cp -a $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/* \
-# $RPM_BUILD_ROOT%{python2_sitelib}
-#
-# TODO: who needs this script?
-# install -p -D -m 0755 \
-# rhel/usr_share_openvswitch_scripts_ovs-systemd-reload \
-# $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/ovs-systemd-reload
-###########
-
- install -d -p -m0755 ${D}/${sysconfdir}/logrotate.d
- install -p -D -m 0644 rhel/etc_logrotate.d_openvswitch \
- ${D}/${sysconfdir}/logrotate.d/openvswitch
-
-
- install -d -p -m 0755 ${D}/${sharedstatedir}/openvswitch
- install -d -p -m 0755 ${D}/${libdir}/firewalld/services/
- install -p -m 0644 rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml \
- ${D}/${libdir}/firewalld/services/ovn-central-firewall-service.xml
-
- install -d -p -m 0755 ${D}/${libdir}/ocf/resource.d/ovn
- ln -s ${datadir}/openvswitch/scripts/ovndb-servers.ocf ${D}/${libdir}/ocf/resource.d/ovn/ovndb-servers
-
- if ${@bb.utils.contains('PACKAGECONFIG', 'dpdk', 'true', 'false', d)}; then
- install -m 0755 ${STAGING_DATADIR}/dpdk/usertools/dpdk-pmdinfo.py ${D}${datadir}/openvswitch/scripts/dpdk-pmdinfo.py
- install -m 0755 ${STAGING_DATADIR}/dpdk/usertools/dpdk-devbind.py ${D}${datadir}/openvswitch/scripts/dpdk-devbind.py
- fi
-
- install -m 0644 ${STX_METADATA_PATH}/files/ovsdb-server.pmon.conf ${D}/${sysconfdir}/openvswitch/ovsdb-server.pmon.conf
- install -m 0644 ${STX_METADATA_PATH}/files/ovs-vswitchd.pmon.conf ${D}/${sysconfdir}/openvswitch/ovs-vswitchd.pmon.conf
- install -m 0644 ${STX_METADATA_PATH}/files/etc_logrotate.d_openvswitch ${D}/${sysconfdir}/logrotate.d/openvswitch
-
-}
-
-
-FILES_${PN}_append = " \
- ${libdir}/ \
- ${base_libdir}/ \
- "
Code Review / pti / rtp.git / commitdiff