selinux-refpolicy-git RELEASE_2_20180701.r14.g3899825c1cde-1 update

2 files changed, 13 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d2d741cea1a..3bf5be3a35af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = selinux-refpolicy-git
 	pkgdesc = Modular SELinux reference policy including headers and docs
-	pkgver = RELEASE_2_20180114.r30.g6b0abaf88089
+	pkgver = RELEASE_2_20180701.r14.g3899825c1cde
 	pkgrel = 1
-	url = https://github.com/TresysTechnology/refpolicy/wiki
+	url = https://github.com/SELinuxProject/refpolicy/wiki
 	install = selinux-refpolicy-git.install
 	arch = any
 	groups = selinux
@@ -14,11 +14,9 @@ pkgbase = selinux-refpolicy-git
 	depends = policycoreutils>=2.8
 	optdepends = linux-hardened: Linux kernel with SELinux support
 	optdepends = linux-selinux: Linux kernel with SELinux support
-	source = git+https://github.com/TresysTechnology/refpolicy
-	source = git+https://github.com/TresysTechnology/refpolicy-contrib
+	source = git+https://github.com/SELinuxProject/refpolicy
 	source = config
 	sha256sums = SKIP
-	sha256sums = SKIP
 	sha256sums = a5faaa2a2c3f986770a9296882b1887c2bdd38b0a990a36f95fe22f22ffb5c13
 
 pkgname = selinux-refpolicy-git
diff --git a/PKGBUILD b/PKGBUILD
index edfeccbcfe41..5e4821b6c74d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,15 @@
 # Maintainer: Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)
+#
+# This PKGBUILD is maintained on https://github.com/archlinuxhardened/selinux.
+# If you want to help keep it up to date, please open a Pull Request there.
 
 pkgname=selinux-refpolicy-git
 _policyname=refpolicy-git
-pkgver=RELEASE_2_20180114.r30.g6b0abaf88089
+pkgver=RELEASE_2_20180701.r14.g3899825c1cde
 pkgrel=1
 pkgdesc="Modular SELinux reference policy including headers and docs"
 arch=('any')
-url="https://github.com/TresysTechnology/refpolicy/wiki"
+url="https://github.com/SELinuxProject/refpolicy/wiki"
 license=('GPL2')
 groups=('selinux')
 makedepends=('git' 'python' 'checkpolicy>=2.8' 'semodule-utils')
@@ -14,11 +17,13 @@ depends=('policycoreutils>=2.8')
 optdepends=('linux-hardened: Linux kernel with SELinux support'
             'linux-selinux: Linux kernel with SELinux support')
 install="${pkgname}.install"
-source=("git+https://github.com/TresysTechnology/refpolicy"
-        "git+https://github.com/TresysTechnology/refpolicy-contrib"
+# refpolicy 2.20180701 moved the repository to SELinuxProject Github organization
+# When updating, if makepkg reports "refpolicy is not a clone of https://github.com/SELinuxProject/refpolicy",
+# you need to update the remote of the git repository, for example with the following command:
+#   git -C refpolicy remote set-url origin https://github.com/SELinuxProject/refpolicy
+source=("git+https://github.com/SELinuxProject/refpolicy"
         'config')
 sha256sums=('SKIP'
-            'SKIP'
             'a5faaa2a2c3f986770a9296882b1887c2bdd38b0a990a36f95fe22f22ffb5c13')
 
 pkgver() {
@@ -29,11 +34,6 @@ pkgver() {
 prepare() {
   cd refpolicy
 
-  # Check out contrib module
-  git submodule init
-  git config submodule.policy/modules/contrib.url "${srcdir}/refpolicy-contrib"
-  git submodule update
-
   # Ensure the environment is clean
   make bare