Merge pull request #1025 from untergeek/release_prep2/5.1.2

Release prep2/5.1.2
elastic · Aug 3, 2017 · a0a2485 · a0a2485
2 parents 52f4016 + bdb5969
commit a0a2485
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 31 deletions.
diff --git a/curator/_version.py b/curator/_version.py
@@ -1,2 +1,2 @@
-__version__ = '5.1.2.dev0'
+__version__ = '5.1.2'
 
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -3,8 +3,8 @@
 Changelog
 =========
 
-5.1.2 (? ? ?)
--------------
+5.1.2 (?? August 2017)
+----------------------
 
 **Errata**
 
@@ -18,6 +18,11 @@ Changelog
 
     Tests and documentation have been updated to address these changes.
 
+  * Debian 9 changed SSL versions, which means that the pre-built debian 
+    packages no longer work in Debian 9.  In the short term, this requires 
+    a new repository.  In the long term, I will try to get a better 
+    repository system working for these so they all work together, better.
+
 **Bug Fixes**
 
   * Support date math in reindex operations better.  It did work previously,

diff --git a/docs/asciidoc/index.asciidoc b/docs/asciidoc/index.asciidoc
@@ -1,9 +1,9 @@
-:curator_version: 5.1.2.dev0
+:curator_version: 5.1.2
 :curator_major: 5
 :curator_doc_tree: 5.1
 :es_py_version: 5.4.0
 :es_doc_tree: 5.5
-:pybuild_ver: 3.6.1
+:pybuild_ver: 3.6.2
 :ref:  http://www.elastic.co/guide/en/elasticsearch/reference/{es_doc_tree}
 
 [[curator-reference]]

diff --git a/requirements.txt b/requirements.txt
@@ -3,4 +3,4 @@ elasticsearch>=5.4.0,<6.0.0
 click>=6.7
 pyyaml>=3.10
 voluptuous>=0.9.3
-certifi>=2017.4.17
+certifi>=2017.7.27.1
diff --git a/unix_packages/build_official_package.sh b/unix_packages/build_official_package.sh
@@ -7,7 +7,7 @@ CX_VER="5.0.1"
 CX_FILE="/curator_source/unix_packages/cx_freeze-${CX_VER}.dev.tar.gz"
 CX_PATH="anthony_tuininga-cx_freeze-0e565139e6a3"
 PYVER=3.6
-MINOR=1
+MINOR=2
 INPUT_TYPE=python
 CATEGORY=python
 VENDOR=Elastic
@@ -28,6 +28,28 @@ for file in ${C_POST_INSTALL} ${C_PRE_REMOVE} ${C_POST_REMOVE}; do
   chmod +x ${file}
 done
 
+remove_python() {
+  sudo rm -f /usr/local/lib/libpython${1}m.a
+  sudo rm -f /usr/local/lib/pkgconfig/python-${1}.pc
+  sudo rm -rf /usr/local/lib/python${1}
+  sudo rm -f /usr/lib/libpython${1}.a
+  sudo rm -rf /usr/local/include/python${1}m
+  cd /usr/local/bin
+  sudo rm -f 2to3-${1} easy_install-${1} idle${1} pip${1} pydoc${1} python${1} python${1}m python${1}m-config pyvenv-${1}
+  cd -
+}
+
+build_python() {
+  cd /tmp
+  wget -c https://www.python.org/ftp/python/${1}/Python-${1}.tgz
+  tar zxf Python-${1}.tgz
+  cd Python-${1}
+  ./configure --prefix=/usr/local
+  sudo make altinstall
+  sudo ln -s /usr/local/lib/libpython${1}m.a /usr/lib/libpython${1}.a
+  cd -
+}
+
 echo "ln -s /opt/elasticsearch-curator/curator /usr/bin/curator" >> ${C_POST_INSTALL}
 echo "ln -s /opt/elasticsearch-curator/curator_cli /usr/bin/curator_cli" >> ${C_POST_INSTALL}
 echo "ln -s /opt/elasticsearch-curator/es_repo_mgr /usr/bin/es_repo_mgr" >> ${C_POST_INSTALL}
@@ -58,16 +80,20 @@ if [ "${1}x" == "x" ]; then
 else
   FILE="v${1}.tar.gz"
   cd ${WORKDIR}
-  wget https://github.com/elastic/curator/archive/${FILE}
+  wget -c https://github.com/elastic/curator/archive/${FILE}
 fi
 
 case "$ID" in
   ubuntu|debian)
     PKGTYPE=deb
     PLATFORM=debian
-    PACKAGEDIR="${PKG_TARGET}/${1}/${PLATFORM}"
+    case "$VERSION_ID" in
+      1404|1604|8) PACKAGEDIR="${PKG_TARGET}/${1}/${PLATFORM}";;
+      9)           PACKAGEDIR="${PKG_TARGET}/${1}/${PLATFORM}${VERSION_ID}";;
+      *)           PACKAGEDIR="${PKG_TARGET}/${1}/${PLATFORM}";;
+    esac
     sudo apt update -y
-    sudo apt install -y openssl
+    sudo apt install -y openssl zlib1g zlib1g-dev libreadline-gplv2-dev libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev dirmngr curl
   ;;
   centos|rhel)
     PKGTYPE=rpm
@@ -87,15 +113,13 @@ esac
 
 HAS_PY3=$(which python${PYVER})
 if [ "${HAS_PY3}x" == "x" ]; then
-  cd /tmp
-  wget https://www.python.org/ftp/python/${PYVER}.${MINOR}/Python-${PYVER}.${MINOR}.tgz
-  tar zxf Python-${PYVER}.${MINOR}.tgz
-  cd Python-${PYVER}.${MINOR}
-  ./configure --prefix=/usr/local
-  sudo make altinstall
-  cd /usr/lib
-  sudo ln -s /usr/local/lib/libpython${PYVER}m.a libpython${PYVER}.a
-  cd ${WORKDIR}
+  build_python ${PYVER}.${MINOR}
+fi
+
+FOUNDVER=$(python${PYVER} --version | awk '{print $2}')
+if [ "${FOUNDVER}" != "${PYVER}.${MINOR}" ]; then
+  remove_python $(echo ${FOUNDVER} | awk -F\. '{print $1"."$2}')
+  build_python ${PYVER}.${MINOR}
 fi
 
 PIPBIN=/usr/local/bin/pip${PYVER}

diff --git a/unix_packages/build_package_from_source.sh b/unix_packages/build_package_from_source.sh
@@ -7,7 +7,7 @@ CX_VER="5.0.1"
 CX_FILE="/curator_source/unix_packages/cx_freeze-${CX_VER}.dev.tar.gz"
 CX_PATH="anthony_tuininga-cx_freeze-0e565139e6a3"
 PYVER=3.6
-MINOR=1
+MINOR=2
 INPUT_TYPE=python
 CATEGORY=python
 VENDOR=Elastic
@@ -28,6 +28,28 @@ for file in ${C_POST_INSTALL} ${C_PRE_REMOVE} ${C_POST_REMOVE}; do
   chmod +x ${file}
 done
 
+remove_python() {
+  sudo rm -f /usr/local/lib/libpython${1}m.a
+  sudo rm -f /usr/local/lib/pkgconfig/python-${1}.pc
+  sudo rm -rf /usr/local/lib/python${1}
+  sudo rm -f /usr/lib/libpython${1}.a
+  sudo rm -rf /usr/local/include/python${1}m
+  cd /usr/local/bin
+  sudo rm -f 2to3-${1} easy_install-${1} idle${1} pip${1} pydoc${1} python${1} python${1}m python${1}m-config pyvenv-${1}
+  cd -
+}
+
+build_python() {
+  cd /tmp
+  wget -c https://www.python.org/ftp/python/${1}/Python-${1}.tgz
+  tar zxf Python-${1}.tgz
+  cd Python-${1}
+  ./configure --prefix=/usr/local
+  sudo make altinstall
+  sudo ln -s /usr/local/lib/libpython${1}m.a /usr/lib/libpython${1}.a
+  cd -
+}
+
 echo "ln -s /opt/elasticsearch-curator/curator /usr/bin/curator" >> ${C_POST_INSTALL}
 echo "ln -s /opt/elasticsearch-curator/curator_cli /usr/bin/curator_cli" >> ${C_POST_INSTALL}
 echo "ln -s /opt/elasticsearch-curator/es_repo_mgr /usr/bin/es_repo_mgr" >> ${C_POST_INSTALL}
@@ -64,9 +86,13 @@ case "$ID" in
   ubuntu|debian)
   	PKGTYPE=deb
   	PLATFORM=debian
-    PACKAGEDIR="${PKG_TARGET}/${1}/${PLATFORM}"
+    case "$VERSION_ID" in
+      1404|1604|8) PACKAGEDIR="${PKG_TARGET}/${1}/${PLATFORM}";;
+      9)           PACKAGEDIR="${PKG_TARGET}/${1}/${PLATFORM}${VERSION_ID}";;
+      *)           PACKAGEDIR="${PKG_TARGET}/${1}/${PLATFORM}";;
+    esac
     sudo apt update -y
-    sudo apt install -y openssl
+    sudo apt install -y openssl zlib1g zlib1g-dev libreadline-gplv2-dev libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev dirmngr curl
 	;;
   centos|rhel)
   	PKGTYPE=rpm
@@ -86,15 +112,13 @@ esac
 
 HAS_PY3=$(which python${PYVER})
 if [ "${HAS_PY3}x" == "x" ]; then
-  cd /tmp
-  wget https://www.python.org/ftp/python/${PYVER}.${MINOR}/Python-${PYVER}.${MINOR}.tgz
-  tar zxf Python-${PYVER}.${MINOR}.tgz
-  cd Python-${PYVER}.${MINOR}
-  ./configure --prefix=/usr/local
-  sudo make altinstall
-  cd /usr/lib
-  sudo ln -s /usr/local/lib/libpython${PYVER}m.a libpython${PYVER}.a
-  cd ${WORKDIR}
+  build_python ${PYVER}.${MINOR}
+fi
+
+FOUNDVER=$(python${PYVER} --version | awk '{print $2}')
+if [ "${FOUNDVER}" != "${PYVER}.${MINOR}" ]; then
+  remove_python $(echo ${FOUNDVER} | awk -F\. '{print $1"."$2}')
+  build_python ${PYVER}.${MINOR}
 fi
 
 PIPBIN=/usr/local/bin/pip${PYVER}