Merge pull request #783 from untergeek/fix/780

Fix binary packages to fully support SSL/TLS

Vagrant/centos/6/Vagrantfile

@@ -6,7 +6,7 @@ Vagrant.configure(2) do |config|
 
   config.vm.provision "shell", inline: <<-SHELL
     sudo yum -y groupinstall "Development Tools"
-    sudo yum -y install python-devel
+    sudo yum -y install python-devel zlib-devel bzip2-devel sqlite sqlite-devel openssl-devel
   SHELL
 
   config.vm.synced_folder "/curator_packages", "/curator_packages", create: true, owner: "vagrant", group: "vagrant"

Vagrant/centos/7/Vagrantfile

@@ -6,7 +6,7 @@ Vagrant.configure(2) do |config|
 
   config.vm.provision "shell", inline: <<-SHELL
     sudo yum -y groupinstall "Development Tools"
-    sudo yum -y install python-devel
+    sudo yum -y install python-devel zlib-devel bzip2-devel sqlite sqlite-devel openssl-devel
   SHELL
 
   config.vm.synced_folder "/curator_packages", "/curator_packages", create: true, owner: "vagrant", group: "vagrant"

Vagrant/ubuntu/14.04/Vagrantfile

@@ -7,7 +7,7 @@ Vagrant.configure(2) do |config|
   config.vm.provision "shell", inline: <<-SHELL
     sudo apt-get -y autoremove
     sudo apt-get update
-    sudo apt-get install -y libxml2-dev zlib1g-dev pkg-config python-pip python-dev python3-dev python3-setuptools
+    sudo apt-get install -y libxml2-dev zlib1g-dev pkg-config python-dev make build-essential libssl-dev libbz2-dev libsqlite3-dev
   SHELL
 
   config.vm.synced_folder "/curator_packages", "/curator_packages", create: true, owner: "vagrant", group: "vagrant"

curator/_version.py

@@ -1 +1 @@
-__version__ = '4.1.2'
+__version__ = '4.2.0.dev0'

docs/Changelog.rst

@@ -3,6 +3,17 @@
 Changelog
 =========
 
+4.2.0 (? ? ?)
+-------------
+
+**Bug Fixes**
+
+  * Guarantee that binary packages are built from the latest Python + libraries.
+    This ensures that SSL/TLS will work without warning messages about insecure
+    connections, unless they actually are insecure. Reported in #780, though
+    the reported problem isn't what was fixed. The fix is needed based on what
+    was discovered while troubleshooting the problem. (untergeek)
+
 4.1.2 (6 October 2016)
 ----------------------
 

unix_packages/build_packages3.sh

@@ -0,0 +1,148 @@
+#!/bin/bash
+
+BASEPATH=$(pwd)
+PKG_TARGET=/curator_packages
+WORKDIR=/tmp/curator
+CX_VER="5.0"
+CX_FILE="/curator_source/unix_packages/cx_freeze-${CX_VER}.dev.tar.gz"
+CX_PATH="anthony_tuininga-cx_freeze-71554144c9cc"
+INPUT_TYPE=python
+CATEGORY=python
+VENDOR=Elastic
+MAINTAINER="'Elastic Developers <info@elastic.co>'"
+C_POST_INSTALL=${WORKDIR}/es_curator_after_install.sh
+C_PRE_REMOVE=${WORKDIR}/es_curator_before_removal.sh
+C_POST_REMOVE=${WORKDIR}/es_curator_after_removal.sh
+
+# Build our own package pre/post scripts
+sudo rm -rf ${WORKDIR} /opt/elasticsearch-curator
+mkdir -p ${WORKDIR}
+
+for file in ${C_POST_INSTALL} ${C_PRE_REMOVE} ${C_POST_REMOVE}; do
+  echo '#!/bin/bash' > ${file}
+  echo >> ${file}
+  chmod +x ${file}
+done
+
+echo "ln -s /opt/elasticsearch-curator/curator /usr/bin/curator" >> ${C_POST_INSTALL}
+echo "ln -s /opt/elasticsearch-curator/es_repo_mgr /usr/bin/es_repo_mgr" >> ${C_POST_INSTALL}
+echo "rm /usr/bin/curator" >> ${C_PRE_REMOVE}
+echo "rm /usr/bin/es_repo_mgr" >> ${C_PRE_REMOVE}
+echo 'if [ -d "/opt/elasticsearch-curator" ]; then' >> ${C_POST_REMOVE}
+echo '  rm -rf /opt/elasticsearch-curator' >> ${C_POST_REMOVE}
+echo 'fi' >> ${C_POST_REMOVE}
+
+ID=$(grep ^ID\= /etc/*release | awk -F\= '{print $2}' | tr -d \")
+VERSION_ID=$(grep ^VERSION_ID\= /etc/*release | awk -F\= '{print $2}' | tr -d \")
+if [ "${ID}x" == "x" ]; then
+  ID=$(cat /etc/*release | grep -v LSB | uniq | awk '{print $1}' | tr "[:upper:]" "[:lower:]" )
+  VERSION_ID=$(cat /etc/*release | grep -v LSB | uniq | awk '{print $3}' | awk -F\. '{print $1}')
+fi
+
+# build
+if [ "${1}x" == "x" ]; then
+  echo "Must provide version number"
+  exit 1
+else
+  FILE="v${1}.tar.gz"
+  cd ${WORKDIR}
+  wget https://github.com/elastic/curator/archive/${FILE}
+fi
+
+case "$ID" in
+  ubuntu|debian)
+  	PKGTYPE=deb
+  	PLATFORM=debian
+    PACKAGEDIR="${PKG_TARGET}/${1}/${PLATFORM}"
+	;;
+  centos|rhel)
+  	PKGTYPE=rpm
+    PLATFORM=centos
+	case "$VERSION_ID" in
+	  6|7)
+      sudo rm -f /etc/yum.repos.d/puppetlabs-pc1.repo
+      sudo yum -y update
+		;;
+ 	  *) echo "unknown system version: ${VERSION_ID}"; exit 1;;
+	esac
+  PACKAGEDIR="${PKG_TARGET}/${1}/${PLATFORM}/${VERSION_ID}"
+	;;
+  *) echo "unknown system type: ${ID}"; exit 1;;
+esac
+
+HAS_PY3=$(which python3.5)
+if [ "${HAS_PY3}x" == "x" ]; then
+  cd /tmp
+  wget https://www.python.org/ftp/python/3.5.2/Python-3.5.2.tgz
+  tar zxf Python-3.5.2.tgz
+  cd Python-3.5.2
+  ./configure --prefix=/usr/local
+  sudo make altinstall
+  cd /usr/lib
+  sudo ln -s /usr/local/lib/libpython3.5m.a libpython3.5.a
+  cd ${WORKDIR}
+fi
+
+PYVER=3.5
+PIPBIN=/usr/local/bin/pip3.5
+PYBIN=/usr/local/bin/python3.5
+
+if [ "${CX_VER}" != "$(${PIPBIN} list | grep cx | awk '{print $2}' | tr -d '()')" ]; then
+  cd ${WORKDIR}
+  rm -rf ${CX_PATH}
+  tar zxf ${CX_FILE}
+  cd ${CX_PATH}
+  ${PIPBIN} install -U --user .
+  cd ${WORKDIR}
+fi
+
+if [ -e "/home/vagrant/.rvm/scripts/rvm" ]; then
+  source /home/vagrant/.rvm/scripts/rvm
+fi
+HAS_FPM=$(which fpm)
+if [ "${HAS_FPM}x" == "x" ]; then
+  gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+  curl -sSL https://get.rvm.io | bash -s stable
+  source /home/vagrant/.rvm/scripts/rvm
+  rvm install ruby
+  gem install fpm
+fi
+
+tar zxf ${FILE}
+
+mkdir -p ${PACKAGEDIR}
+cd curator-${1}
+cp setup.py setup.py.orig
+grep -v 'compress' setup.py.orig > setup.py
+rm setup.py.orig
+${PIPBIN} install -U --user setuptools
+${PIPBIN} install -U --user requests_aws4auth
+${PIPBIN} install -U --user certifi
+${PIPBIN} install -U --user -r requirements.txt
+${PYBIN} setup.py build_exe
+sudo mv build/exe.linux-x86_64-${PYVER} /opt/elasticsearch-curator
+sudo chown -R root:root /opt/elasticsearch-curator
+cd ..
+fpm \
+ -s dir \
+ -t ${PKGTYPE} \
+ -n elasticsearch-curator \
+ -v ${1} \
+ --vendor ${VENDOR} \
+ --maintainer "${MAINTAINER}" \
+ --license 'Apache-2.0' \
+ --category tools \
+ --description 'Have indices in Elasticsearch? This is the tool for you!\n\nLike a museum curator manages the exhibits and collections on display, \nElasticsearch Curator helps you curate, or manage your indices.' \
+ --after-install ${C_POST_INSTALL} \
+ --before-remove ${C_PRE_REMOVE} \
+ --after-remove ${C_POST_REMOVE} \
+ --provides elasticsearch-curator \
+ --conflicts python-elasticsearch-curator \
+ --conflicts python3-elasticsearch-curator \
+/opt/elasticsearch-curator
+
+mv ${WORKDIR}/*.${PKGTYPE} ${PACKAGEDIR}
+
+rm ${C_POST_INSTALL} ${C_PRE_REMOVE} ${C_POST_REMOVE}
+# go back to where we started
+cd ${BASEPATH}