From 5e83a6945dbcd78233514549a3e5bdf0a17f2d2b Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Fri, 12 May 2017 22:28:38 -0400
Subject: [PATCH] manylinux: Do not over ride repositories

The upstream manylinux images have switched to the CentOS Vault
repositories.

This addresses the manylinux-x86 image build.
---
 common.manylinux                 |   5 -
 imagefiles/etc/CentOS-Base.repo  |  56 -----
 imagefiles/etc/CentOS-Vault.repo | 359 -------------------------------
 imagefiles/etc/libselinux.repo   |   9 -
 4 files changed, 429 deletions(-)
 delete mode 100644 imagefiles/etc/CentOS-Base.repo
 delete mode 100644 imagefiles/etc/CentOS-Vault.repo
 delete mode 100644 imagefiles/etc/libselinux.repo

diff --git a/common.manylinux b/common.manylinux
index 5250354..72871d1 100644
--- a/common.manylinux
+++ b/common.manylinux
@@ -1,8 +1,3 @@
-
-ADD imagefiles/etc/CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo
-ADD imagefiles/etc/CentOS-Vault.repo /etc/yum.repos.d/CentOS-Vault.repo
-ADD imagefiles/etc/libselinux.repo /etc/yum.repos.d/libselinux.repo
-
 ENV GOSU_VERSION 1.10
 RUN set -x \
 	&& yum -y install epel-release \
diff --git a/imagefiles/etc/CentOS-Base.repo b/imagefiles/etc/CentOS-Base.repo
deleted file mode 100644
index e3b5d3b..0000000
--- a/imagefiles/etc/CentOS-Base.repo
+++ /dev/null
@@ -1,56 +0,0 @@
-# CentOS-Base.repo
-#
-# The mirror system uses the connecting IP address of the client and the
-# update status of each mirror to pick mirrors that are updated to and
-# geographically close to the client.  You should use this for CentOS updates
-# unless you are manually picking other mirrors.
-#
-# If the mirrorlist= does not work for you, as a fall back you can try the
-# remarked out baseurl= line instead.
-#
-#
-
-[base]
-name=CentOS-$releasever - Base
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
-#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-
-#released updates
-[updates]
-name=CentOS-$releasever - Updates
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates
-#baseurl=http://mirror.centos.org/centos/$releasever/updates/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-
-#additional packages that may be useful
-[extras]
-name=CentOS-$releasever - Extras
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras
-#baseurl=http://mirror.centos.org/centos/$releasever/extras/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-
-#additional packages that extend functionality of existing packages
-[centosplus]
-name=CentOS-$releasever - Plus
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus
-#baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-
-#contrib - packages by Centos Users
-[contrib]
-name=CentOS-$releasever - Contrib
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib
-#baseurl=http://mirror.centos.org/centos/$releasever/contrib/$basearch/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-
diff --git a/imagefiles/etc/CentOS-Vault.repo b/imagefiles/etc/CentOS-Vault.repo
deleted file mode 100644
index 5ee3185..0000000
--- a/imagefiles/etc/CentOS-Vault.repo
+++ /dev/null
@@ -1,359 +0,0 @@
-# CentOS-Vault.repo
-#
-# The mirror system uses the connecting IP address of the client and the
-# update status of each mirror to pick mirrors that are updated to and
-# geographically close to the client.  You should use this for CentOS updates
-# unless you are manually picking other mirrors.
-#
-#
-#
-#---- Packages previously released as 5.11, and its updates
-[C5.11-base]
-name=CentOS-5.11 - Base
-baseurl=http://vault.centos.org/5.11/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=1
-
-[C5.11-updates]
-name=CentOS-5.11 - Updates
-baseurl=http://vault.centos.org/5.11/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=1
-
-[C5.11-extras]
-name=CentOS-5.11 - Extras
-baseurl=http://vault.centos.org/5.11/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=1
-
-[C5.11-centosplus]
-name=CentOS-5.11 - Plus
-baseurl=http://vault.centos.org/5.11/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=1
-
-#---- Packages previously released as 5.10, and its updates
-[C5.10-base]
-name=CentOS-5.10 - Base
-baseurl=http://vault.centos.org/5.10/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.10-updates]
-name=CentOS-5.10 - Updates
-baseurl=http://vault.centos.org/5.10/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.10-extras]
-name=CentOS-5.10 - Extras
-baseurl=http://vault.centos.org/5.10/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.10-centosplus]
-name=CentOS-5.10 - Plus
-baseurl=http://vault.centos.org/5.10/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-#---- Packages previously released as 5.9, and its updates
-[C5.9-base]
-name=CentOS-5.9 - Base
-baseurl=http://vault.centos.org/5.9/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.9-updates]
-name=CentOS-5.9 - Updates
-baseurl=http://vault.centos.org/5.9/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.9-extras]
-name=CentOS-5.9 - Extras
-baseurl=http://vault.centos.org/5.9/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.9-centosplus]
-name=CentOS-5.9 - Plus
-baseurl=http://vault.centos.org/5.9/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-#---- Packages previously released as 5.8, and its updates
-[C5.8-base]
-name=CentOS-5.8 - Base
-baseurl=http://vault.centos.org/5.8/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.8-updates]
-name=CentOS-5.8 - Updates
-baseurl=http://vault.centos.org/5.8/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.8-extras]
-name=CentOS-5.8 - Extras
-baseurl=http://vault.centos.org/5.8/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.8-centosplus]
-name=CentOS-5.8 - Plus
-baseurl=http://vault.centos.org/5.8/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-#---- Packages previously released as 5.7, and its updates
-[C5.7-base]
-name=CentOS-5.7 - Base
-baseurl=http://vault.centos.org/5.7/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.7-updates]
-name=CentOS-5.7 - Updates
-baseurl=http://vault.centos.org/5.7/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.7-extras]
-name=CentOS-5.7 - Extras
-baseurl=http://vault.centos.org/5.7/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.7-centosplus]
-name=CentOS-5.7 - Plus
-baseurl=http://vault.centos.org/5.7/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-#---- Packages previously released as 5.6, and its updates
-[C5.6-base]
-name=CentOS-5.6 - Base
-baseurl=http://vault.centos.org/5.6/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.6-updates]
-name=CentOS-5.6 - Updates
-baseurl=http://vault.centos.org/5.6/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.6-extras]
-name=CentOS-5.6 - Extras
-baseurl=http://vault.centos.org/5.6/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.6-centosplus]
-name=CentOS-5.6 - Plus
-baseurl=http://vault.centos.org/5.6/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-#---- Packages previously released as 5.5, and its updates
-[C5.5-base]
-name=CentOS-5.5 - Base
-baseurl=http://vault.centos.org/5.5/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.5-updates]
-name=CentOS-5.5 - Updates
-baseurl=http://vault.centos.org/5.5/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.5-extras]
-name=CentOS-5.5 - Extras
-baseurl=http://vault.centos.org/5.5/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.5-centosplus]
-name=CentOS-5.5 - Plus
-baseurl=http://vault.centos.org/5.5/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-#---- Packages previously released as 5.4 and its updates
-[C5.4-base]
-name=CentOS-5.4 - Base
-baseurl=http://vault.centos.org/5.4/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.4-updates]
-name=CentOS-5.4 - Updates
-baseurl=http://vault.centos.org/5.4/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.4-extras]
-name=CentOS-5.4 - Extras
-baseurl=http://vault.centos.org/5.4/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.4-centosplus]
-name=CentOS-5.4 - Plus
-baseurl=http://vault.centos.org/5.4/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-
-#---- Packages previously released as 5.3 and its updates
-[C5.3-base]
-name=CentOS-5.3 - Base
-baseurl=http://vault.centos.org/5.3/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.3-updates]
-name=CentOS-5.3 - Updates
-baseurl=http://vault.centos.org/5.3/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.3-extras]
-name=CentOS-5.3 - Extras
-baseurl=http://vault.centos.org/5.3/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.3-centosplus]
-name=CentOS-5.3 - Plus
-baseurl=http://vault.centos.org/5.3/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-#---- Packages previously released as 5.2 and its updates
-[C5.2-base]
-name=CentOS-5.2 - Base
-baseurl=http://vault.centos.org/5.2/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.2-updates]
-name=CentOS-5.2 - Updates
-baseurl=http://vault.centos.org/5.2/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.2-extras]
-name=CentOS-5.2 - Extras
-baseurl=http://vault.centos.org/5.2/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.2-centosplus]
-name=CentOS-5.2 - Plus
-baseurl=http://vault.centos.org/5.2/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-#---- Packages previously released as 5.1 and its updates
-[C5.1-base]
-name=CentOS-5.1 - Base
-baseurl=http://vault.centos.org/5.1/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.1-updates]
-name=CentOS-5.1 - Updates
-baseurl=http://vault.centos.org/5.1/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.1-extras]
-name=CentOS-5.1 - Extras
-baseurl=http://vault.centos.org/5.1/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.1-centosplus]
-name=CentOS-5.1 - Plus
-baseurl=http://vault.centos.org/5.1/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-
-#---- Packages previously released as 5.0 and its updates
-[C5.0-base]
-name=CentOS-5.0 - Base
-baseurl=http://vault.centos.org/5.0/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.0-updates]
-name=CentOS-5.0 - Updates
-baseurl=http://vault.centos.org/5.0/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.0-extras]
-name=CentOS-5.0 - Extras
-baseurl=http://vault.centos.org/5.0/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
-[C5.0-centosplus]
-name=CentOS-5.0 - Plus
-baseurl=http://vault.centos.org/5.0/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=0
-
diff --git a/imagefiles/etc/libselinux.repo b/imagefiles/etc/libselinux.repo
deleted file mode 100644
index 1c305f5..0000000
--- a/imagefiles/etc/libselinux.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[libselinux]
-name=CentOS-$releasever - libselinux
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus
-#baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-includepkgs=libselinux*
-