[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Sven Vermeulen]

commit:     88326fb9c8a25da67709418ca5f328261defce23
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Mon Nov 24 10:12:14 2014 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Mon Nov 24 10:15:09 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=88326fb9

make the gentoo release script a little more user-agnostic

---
 gentoo/release-prepare.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gentoo/release-prepare.sh b/gentoo/release-prepare.sh
index 073ff58..afeed8f 100644
--- a/gentoo/release-prepare.sh
+++ b/gentoo/release-prepare.sh
@@ -7,7 +7,8 @@
 
 TRANSLATE="s:\(${HARDENEDREFPOL}\|${REFPOLRELEASE}\):refpolicy/:g";
 NEWVERSION="${1}";
-REMOTELOCATION="swift@dev.gentoo.org:public_html/patches/selinux-base-policy";
+# If remote requires a different username, it should be set in ~/.ssh/config
+REMOTELOCATION="dev.gentoo.org:/home/swift/public_html/patches/selinux-base-policy";
 
 usage() {
   echo "Usage: $0 <newversion>";
@@ -20,12 +21,12 @@ usage() {
   echo "The following environment variables must be declared correctly for the script";
   echo "to function properly:";
   echo "  - GENTOOX86 should point to the gentoo-x86 checkout";
-  echo "    E.g. export GENTOOX86=\"/home/user/dev/gentoo-x86\"";
+  echo "    E.g. export GENTOOX86=\"/home/user/dev/gentoo-x86/\"";
   echo "  - HARDENEDREFPOL should point to the hardened-refpolicy.git checkout";
-  echo "    E.g. export HARDENEDREFPOL=\"/home/user/dev/hardened-refpolicy\"";
+  echo "    E.g. export HARDENEDREFPOL=\"/home/user/dev/hardened-refpolicy/\"";
   echo "  - REFPOLRELEASE should point to the current latest /release/ of the reference"
   echo "    policy (so NOT to a checkout), extracted somewhere on the file system."
-  echo "    E.g. export REFPOLRELEASE=\"/home/user/local/refpolicy-20130424\"";
+  echo "    E.g. export REFPOLRELEASE=\"/home/user/local/refpolicy-20130424/\"";
 }
 
 assertDirEnvVar() {
@@ -98,7 +99,7 @@ tagRelease() {
   printf "Creating tag ${NEWVERSION} in our repository... ";
   cd ${HARDENEDREFPOL};
   git tag -a ${NEWVERSION} -m "Release set of ${NEWVERSION}" > /dev/null 2>&1 || die "Failed to create tag";
-  git push origin ${NEWVERSION} > /dev/null 2>&1 || die "Faield to push tag to origin repository";
+  git push origin ${NEWVERSION} > /dev/null 2>&1 || die "Failed to push tag to origin repository";
   printf "done\n";
 };
 

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     bf7bf93cac7be902065deabf41e62d8c717a3962
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Thu Feb 19 10:44:26 2015 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 10:44:26 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=bf7bf93c

Merge upstream

---
 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 69975a3..6e1eb68 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at 8e24b4d70c8c8b4f580560c42d0739d7a6597422
-master is at bf1d9c5b83d97664518fd51622f57dc5c0514047
+contrib is at 5e52fa021effdbaa108f4efce560c93905c856d4
+master is at 9a215ef9d971afa3d084efaa4c82fe885bf0d207

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     0ade147b88ab1fa05079ee3610f5c3fc9bc02625
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Sun Feb 15 17:37:34 2015 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Feb 15 17:37:34 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=0ade147b

Merge upstream

---
 gentoo/STATE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index ff7886d..69975a3 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
 contrib is at 8e24b4d70c8c8b4f580560c42d0739d7a6597422
-master is at fd0c07c8b300d7ca91edbf4fb0a579ae8781f3e5
+master is at bf1d9c5b83d97664518fd51622f57dc5c0514047

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     2e3158ea26500965f534b6e9db12281562feef0b
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Wed Mar 25 15:53:44 2015 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 15:53:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=2e3158ea

merge upstream contrib

 gentoo/STATE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 6e1eb68..331b868 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at 5e52fa021effdbaa108f4efce560c93905c856d4
+contrib is at 0733583453033b3b6527bce73dc30af2ce733537
 master is at 9a215ef9d971afa3d084efaa4c82fe885bf0d207

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Sven Vermeulen]

commit:     ef62cd34fbeb013f149ba7a6f71d2194ff548996
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Sun Jun  7 09:05:35 2015 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Sun Jun  7 09:05:35 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=ef62cd34

Forgot to update STATE file

 gentoo/STATE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index db02aa0..afcea71 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
 contrib is at 56dc33212bd7214f38547d3f0bd4d97ccad5925f
-master is at bd994e2a58c4e8eea33da370d3b7487572d9ac84
+master is at 0a088aa8ac7c328a4894cc0f89b9688707349d40

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     7e5fd8a35b947f1ff31f2f7b9926fc23072e1efd
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Sun Aug  2 19:22:58 2015 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Aug  2 19:22:58 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=7e5fd8a3

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 27a441f..c011913 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at 2292e4bf40e6a12124963dcb866d9a2e43af073f
-master is at 11697e1a69b7707f4528f80dce5572b0f446dc57
+contrib is at 32c25f2d965569e18489913fbda5e0f0c6f90d51
+master is at c8c2b8b0c80a59414aefc4d32fdd2e8152ea5af2

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     a36c93a714a15e954194ddf927839cc9f2fedb95
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Thu Aug 27 19:10:01 2015 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 19:10:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=a36c93a7

Merge Upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index c011913..2cf2a2b 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at 32c25f2d965569e18489913fbda5e0f0c6f90d51
-master is at c8c2b8b0c80a59414aefc4d32fdd2e8152ea5af2
+contrib is at 6cd699cdca5acbe2020899c2dce919e87a8d3364
+master is at 1d51a2f4c45a847d16b01a4e959cfbc37d592804

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     107c53784485e58d5f04a26e9cb462eaf7740865
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Thu Aug 27 19:33:18 2015 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 19:33:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=107c5378

release-prepare.sh: update for cvs->git migration and sign tags

 gentoo/release-prepare.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/gentoo/release-prepare.sh b/gentoo/release-prepare.sh
index efd5447..d88b7ba 100644
--- a/gentoo/release-prepare.sh
+++ b/gentoo/release-prepare.sh
@@ -98,8 +98,7 @@ createEbuilds() {
 tagRelease() {
   printf "Creating tag ${NEWVERSION} in our repository... ";
   cd ${HARDENEDREFPOL};
-  git tag -a ${NEWVERSION} -m "Release set of ${NEWVERSION}" > /dev/null 2>&1 || die "Failed to create tag";
-  git push origin ${NEWVERSION} > /dev/null 2>&1 || die "Failed to push tag to origin repository";
+  git tag -a ${NEWVERSION} -m "Release set of ${NEWVERSION}" --sign > /dev/null 2>&1 || die "Failed to create tag";
   printf "done\n";
 };
 
@@ -128,14 +127,21 @@ cat << EOF
 The release has now been prepared.
 
 Please go do the following to finish up:
-- In ${GENTOOX86}/sec-policy go "cvs add" all the new ebuilds
-- In ${GENTOOX86}/sec-policy run "repoman manifest" and "repoman full"
+
+In ${GENTOOX86}/sec-policy:
+git add .
+repoman --digest=y full
 
 Then, before finally committing - do a run yourself, ensuring that the right
 version is deployed of course:
 - "emerge -1 \$(qlist -IC sec-policy)"
 
-Only then do a 'repoman commit -m 'Release of ${NEWVERSION}''.
+Only then do:
+repoman commit -m 'sec-policy: Release of SELinux policies ${NEWVERSION}'
+git push --sign
+
+In ${HARDENEDREFPOL} do:
+git push origin --tags
 EOF
 
 cleanTmp;

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     b38f7e772822fa91284e763d47fc6f4650ce5d1b
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Sun Sep  6 11:23:24 2015 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 11:23:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=b38f7e77

Merge upstream

 gentoo/STATE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 2cf2a2b..e61fdb9 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at 6cd699cdca5acbe2020899c2dce919e87a8d3364
+contrib is at 2f3bcb51158d933607ae85fedc875240c645a79b
 master is at 1d51a2f4c45a847d16b01a4e959cfbc37d592804

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     a5cffbaf159bec628ee02f6c734d4c12ea9a461c
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Sun Sep 20 06:53:44 2015 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 06:53:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=a5cffbaf

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index e61fdb9..8725022 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at 2f3bcb51158d933607ae85fedc875240c645a79b
-master is at 1d51a2f4c45a847d16b01a4e959cfbc37d592804
+contrib is at 559464c749ca91dc6988fd87e7e1f31c90653f27
+master is at 778dfaf776800887d1f9c320a7ac6199139b694b

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     d24c7866d84f1c0d7104bb6e8393457461418f2e
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Tue Oct 13 14:49:15 2015 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 14:49:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=d24c7866

Merge upstream

 gentoo/STATE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 8725022..4ce5f5f 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
 contrib is at 559464c749ca91dc6988fd87e7e1f31c90653f27
-master is at 778dfaf776800887d1f9c320a7ac6199139b694b
+master is at 4d28cb714f75969c9d18d5e9afcfe5d830969d0b

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     fca753e1e0fcb56de6819f3bbc9d81b9f4721895
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Mon Oct 26 04:16:39 2015 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 04:16:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=fca753e1

Merge upstream systemd additions

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 4ce5f5f..026b604 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at 559464c749ca91dc6988fd87e7e1f31c90653f27
-master is at 4d28cb714f75969c9d18d5e9afcfe5d830969d0b
+contrib is at f2555763a1b645153004d7690c5e4c4d8f253fed
+master is at 17694adc7bae6b232a95d8bebf8cf8867b9874d2

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     243c53876e27e09ce1fb024ed3ab56195b90baa4
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Sat Aug 13 17:25:26 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 18:29:12 2016 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=243c5387

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index b986c88..1c89965 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at a4b70fa0fe684595d4b3ff5f12fa043a9e723d11
-master is at 461451d7a7fb2bb2b1c65d55b2cb64c9135380b2
+contrib is at 6549ec7bdc37ee84251730e9efe15c7f6a65997d
+master is at bfa6cc8bf5f00c2900a57e0fa084c304a02b0d42

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     024d1ed5b0c53296826769360e6bc089a926ef06
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Wed Aug 17 16:49:30 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 16:49:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=024d1ed5

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 1c89965..978d6d7 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at 6549ec7bdc37ee84251730e9efe15c7f6a65997d
-master is at bfa6cc8bf5f00c2900a57e0fa084c304a02b0d42
+contrib is at 3774b2aa7fc842ab99a7d9c29c85c8a2fc4660f0
+master is at bc7c71be42f690e42c46203c3398b6b14618cc1e

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     8f2b69446de393985c98be0eabf8e3357ad4d45d
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Mon Oct  3 06:15:05 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 06:15:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=8f2b6944

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 3dd764e..138a3b6 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at 13a564e603f5724255f3cddc2f9c62879e43376c
-master is at 9d1727712e204e9984476418a5753a04cc92d838
+contrib is at 2cf2dfca863c667da43c8b06e9046c48aff0ce38
+master is at b96f32a1f311d8c6a00e963821a1999d2d12f92c

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Sven Vermeulen]

commit:     b5c1b84427ef68516b5f8c2aee210a3cb01c37f7
Author:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 16:01:55 2016 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 16:01:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=b5c1b844

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 138a3b6..a42c875 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at 2cf2dfca863c667da43c8b06e9046c48aff0ce38
-master is at b96f32a1f311d8c6a00e963821a1999d2d12f92c
+contrib is at 082f271d9304aaa8e7d8107d94ba47b71b875a8d
+master is at 633ab9fea3c82a85aaa9d2ee19eea0d5ceba4f9d

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     b042d634f2b93d7cc9257ca4f1f59a195aa4b14b
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Tue Dec  6 13:35:58 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 13:35:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=b042d634

merge upstream

Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 1139d7b..4762680 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at 082f271d9304aaa8e7d8107d94ba47b71b875a8d
-master is at f9c98632f58832d591f6653ec71faae066922a47
+master 0d11ccb87b81778e376f2fa5e602641460f5cea1
+contrib d79b8e85aa93272d69d3c60205a5d2a6d8d98ba7

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     a9cea575d1e3a23960360252e55ea9d3eb65743c
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Thu Dec  8 04:54:13 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Dec  8 05:02:53 2016 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=a9cea575

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 4762680..ab3f2fe 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-master 0d11ccb87b81778e376f2fa5e602641460f5cea1
-contrib d79b8e85aa93272d69d3c60205a5d2a6d8d98ba7
+master 97470c7670efdd31ce701a7bb7e79285db056777
+contrib eb5607e31d4b0c3fa279e7ad82afa0cf1a065804

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     083681514c8de9385bbee10773c4829519404988
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Sun Jan  1 16:33:38 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Jan  1 16:33:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=08368151

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 7aed063..6a73fa2 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-master e972582ad5af001abd43826992fc0cb2b365dde0
-contrib 83f82559d8a82ffe5a581e6121c3d7d7cab6ac67
+master 49545aad8fb956ffd1edc442f71c7e097b976be0
+contrib 2f0e37e19865de883e09a21dfc8111c7e9930495

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     0daed5830897c62f8132b94349a8f107a547c816
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Fri Feb 17 08:42:46 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 08:42:46 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=0daed583

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 6228c35b..3c7b673b 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-master c205e90e753a8ae89cff662f669dd1a5ded848ba
-contrib 53b431b930ffec0be75789b761d76649e7f3cd01
+master d9980666a42d183307fdfd2fbf37b39b4d5481da
+contrib 9dd465a5d5ae5c37f2efbde3ed9aa13d6a7f4913

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     7c7c1ea697655c5574d01510b85e273e7445e75d
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Sat Feb 25 14:50:38 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 14:50:54 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=7c7c1ea6

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index d2397380..a730447a 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-master 14cc33cba96dc95b4f8d790a1e2e32d3abce6e55
-contrib f3bc298a8a524a68316b398ea0ca613fb7907c09
+master 7cc502dfe5d01f2f8d86ba236ba3bfbbb83048a3
+contrib 3e57e85675dba33e8742475a960409fcac148ca7

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     c5b0eda0841db8b9737d4249d3bfb8b8cb6649ed
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Sat Feb 25 16:53:46 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 16:53:46 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=c5b0eda0

Merge upstream

 gentoo/STATE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index a730447a..f1cdc6d1 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-master 7cc502dfe5d01f2f8d86ba236ba3bfbbb83048a3
+master 4f5c53411ae56eb60516dee647064e2d9259d475
 contrib 3e57e85675dba33e8742475a960409fcac148ca7

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     3139d4e1544ac7d1ac98ca20dfd7d87414545289
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Mon Feb 27 10:46:51 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 10:46:51 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=3139d4e1

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index f1cdc6d1..bc7c43b7 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-master 4f5c53411ae56eb60516dee647064e2d9259d475
-contrib 3e57e85675dba33e8742475a960409fcac148ca7
+master ca04cdb14b73c4d05034e073c11ddc949cf527a4
+contrib 1ea381eab188e59d2691ccb87512086cb3385778

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     3eab238d3953972d41ff559674147d51b4ed3bba
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Thu Mar 30 14:01:18 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 14:01:18 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=3eab238d

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index b75757ee..7626723c 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-master 2f3691e4c808f8f4653595c20276f4f68b32535a
-contrib 1ea381eab188e59d2691ccb87512086cb3385778
+master 160d08f3aec78012b89155ea7fc26368ce4a597c
+contrib 2128180acf3e02131dfb02d7cf1835d0a1f62b1b

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     fc3916c7c333a541c2ea78de4f0228e046f7a945
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Sun Apr 30 09:22:38 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 09:22:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=fc3916c7

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index c774a956..994fc7c6 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-master 466286aa3925b543d0b8f7686e483f6d7c6a7fde
-contrib 443f5abc9ca3e5f10ecbccde88dbf8d7906cab81
+master f81025dc037300613d788b1496173b11620c922a
+contrib d5cc97664a50786c10be4383a69f06d1dcd2cbf0

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     c499735d34d390c5384a227ebbd9cd6245ba4fec
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Sun May  7 16:03:11 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun May  7 16:03:11 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=c499735d

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 994fc7c6..f08b3335 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-master f81025dc037300613d788b1496173b11620c922a
-contrib d5cc97664a50786c10be4383a69f06d1dcd2cbf0
+master a599f28196e9107c63f458fcf79c7e2718751795
+contrib 39d09b7b6ef5a9bcd4c8b34c2ad52b1c8ba978b7

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     6496414a74c2156b3a54d04277752eb78c10857e
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Thu May 25 16:40:16 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu May 25 16:40:16 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=6496414a

Merge upstream

 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 6b31d8dd..2e738904 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-master cfe0a94feb3e965663ea20961ac866ac8712b94a
-contrib 557b097ed8176846a4b4113f92bfeaceb8525d51
+master 602b77236d851ee76004137cd04bc4ffa7fa73b4
+contrib 9c61bb68dc47ec27dce607bae4b020ddeba59b31

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     025c6670635106959a7f93b054cd1a95141bb4c0
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Wed Jul 12 04:41:00 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Jul 22 10:50:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=025c6670

Start of script to handle userspace releases

 gentoo/release-userspace.sh | 134 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)

diff --git a/gentoo/release-userspace.sh b/gentoo/release-userspace.sh
new file mode 100644
index 00000000..0841f77c
--- /dev/null
+++ b/gentoo/release-userspace.sh
@@ -0,0 +1,134 @@
+#!/bin/sh
+
+# Copyright 2013,2014 Sven Vermeulen <swift@gentoo.org>
+# Copyright 2017 Jason Zaman <perfinion@gentoo.org>
+# Licensed under the GPL-3 license
+
+RELEASEDATE="${1}";
+NEWVERSION="${2}";
+
+PACKAGES="
+sys-libs/libsepol
+sys-libs/libselinux
+sys-libs/libsemanage
+sys-apps/checkpolicy
+sys-apps/policycoreutils
+sys-apps/selinux-python
+sys-apps/semodule-utils
+sys-apps/secilc
+sys-apps/mcstrans
+sys-apps/restorecond
+"
+# app-admin/setools not released together
+# dev-python/sepolgen became selinux-python in 2.7 release
+
+usage() {
+  echo "Usage: $0 <release date> <newversion>";
+  echo "";
+  echo "Example: $0 20170101 2.7_rc1"
+  echo "";
+  echo "The script will copy the live ebuilds towards the";
+  echo "<newversion>."
+  echo "";
+  echo "The following environment variables must be declared correctly for the script";
+  echo "to function properly:";
+  echo "  - GENTOOX86 should point to the gentoo-x86 checkout";
+  echo "    E.g. export GENTOOX86=\"/home/user/dev/gentoo-x86/\"";
+  echo "  - HARDENEDREFPOL should point to the hardened-refpolicy.git checkout";
+  echo "    E.g. export HARDENEDREFPOL=\"/home/user/dev/hardened-refpolicy/\"";
+  echo "  - REFPOLRELEASE should point to the current latest /release/ of the reference"
+  echo "    policy (so NOT to a checkout), extracted somewhere on the file system."
+  echo "    E.g. export REFPOLRELEASE=\"/home/user/local/refpolicy-20130424/\"";
+}
+
+assertDirEnvVar() {
+  VARNAME="${1}";
+  eval VARVALUE='$'${VARNAME};
+  if [ -z "${VARVALUE}" ] || [ ! -d "${VARVALUE}" ];
+  then
+    echo "Variable ${VARNAME} (value \"${VARVALUE}\") does not point to a valid directory.";
+    exit 1;
+  fi
+}
+
+# cleanTmp - Clean up TMPDIR
+cleanTmp() {
+  if [ -z "${NOCLEAN}" ];
+  then
+    echo "Not cleaning TMPDIR (${TMPDIR}) upon request.";
+  else
+    [ -d "${TMPDIR}" ] && [ -f "${TMPDIR}/.istempdir" ] && rm -rf "${TMPDIR}"
+  fi
+}
+
+die() {
+  printf "\n";
+  echo "!!! $*";
+  cleanTmp;
+  exit 2;
+};
+
+# set the release date in the live ebuilds so it will be correct when copying to the new version
+setLiveReleaseDate() {
+    local PKG
+    local PN
+    cd ${GENTOOX86}
+    echo "Setting release date var in live ebuilds... "
+
+    for PKG in $PACKAGES;
+    do
+        cd "${GENTOOX86}/${PKG}"
+        PN="${PKG#*/}"
+        [[ -f "${PN}-9999.ebuild" ]] || continue;
+        sed -i "/^MY_RELEASEDATE=/s/.*/MY_RELEASEDATE=\"${RELEASEDATE}\"/" "${PN}-9999.ebuild"
+        git add .
+        git --no-pager diff --cached
+        repoman full && repoman commit -m "$PKG: update live ebuild"
+    done
+    echo -e "\ndone"
+}
+
+# Create (or modify) the new ebuilds
+createEbuilds() {
+    local PKG
+    local PN
+    cd ${GENTOOX86}
+    echo "Creating new ebuilds based on 9999 version... "
+
+    for PKG in $PACKAGES;
+    do
+        cd "${GENTOOX86}/${PKG}"
+        PN="${PKG#*/}"
+        [[ -f "${PN}-9999.ebuild" ]] || continue
+        [[ -f "Manifest" ]] || continue
+        sed -i -e "/${PN}-${NEWVERSION//_/-}/d" Manifest || die
+        cp ${PN}-9999.ebuild ${PN}-${NEWVERSION}.ebuild || die
+        repoman manifest
+        git add .
+        #git --no-pager diff --cached
+        repoman full
+        repoman commit -m "$PKG: bump to ${NEWVERSION}"
+    done
+    echo -e "\ndone"
+}
+
+if [ $# -ne 2 ];
+then
+  usage;
+  exit 3;
+fi
+
+# Assert that all needed information is available
+assertDirEnvVar GENTOOX86;
+assertDirEnvVar HARDENEDREFPOL;
+assertDirEnvVar REFPOLRELEASE;
+
+TMPDIR=$(mktemp -d);
+touch ${TMPDIR}/.istempdir;
+
+setLiveReleaseDate
+
+# Create ebuilds
+createEbuilds;
+
+cleanTmp;

[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Jason Zaman]

commit:     2f8d83089694fbacd3e546db5bdf599e8721dd88
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Wed Jul 12 04:41:00 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 13:53:30 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=2f8d8308

Start of script to handle userspace releases

 gentoo/release-userspace.sh | 134 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)

diff --git a/gentoo/release-userspace.sh b/gentoo/release-userspace.sh
new file mode 100644
index 00000000..0841f77c
--- /dev/null
+++ b/gentoo/release-userspace.sh
@@ -0,0 +1,134 @@
+#!/bin/sh
+
+# Copyright 2013,2014 Sven Vermeulen <swift@gentoo.org>
+# Copyright 2017 Jason Zaman <perfinion@gentoo.org>
+# Licensed under the GPL-3 license
+
+RELEASEDATE="${1}";
+NEWVERSION="${2}";
+
+PACKAGES="
+sys-libs/libsepol
+sys-libs/libselinux
+sys-libs/libsemanage
+sys-apps/checkpolicy
+sys-apps/policycoreutils
+sys-apps/selinux-python
+sys-apps/semodule-utils
+sys-apps/secilc
+sys-apps/mcstrans
+sys-apps/restorecond
+"
+# app-admin/setools not released together
+# dev-python/sepolgen became selinux-python in 2.7 release
+
+usage() {
+  echo "Usage: $0 <release date> <newversion>";
+  echo "";
+  echo "Example: $0 20170101 2.7_rc1"
+  echo "";
+  echo "The script will copy the live ebuilds towards the";
+  echo "<newversion>."
+  echo "";
+  echo "The following environment variables must be declared correctly for the script";
+  echo "to function properly:";
+  echo "  - GENTOOX86 should point to the gentoo-x86 checkout";
+  echo "    E.g. export GENTOOX86=\"/home/user/dev/gentoo-x86/\"";
+  echo "  - HARDENEDREFPOL should point to the hardened-refpolicy.git checkout";
+  echo "    E.g. export HARDENEDREFPOL=\"/home/user/dev/hardened-refpolicy/\"";
+  echo "  - REFPOLRELEASE should point to the current latest /release/ of the reference"
+  echo "    policy (so NOT to a checkout), extracted somewhere on the file system."
+  echo "    E.g. export REFPOLRELEASE=\"/home/user/local/refpolicy-20130424/\"";
+}
+
+assertDirEnvVar() {
+  VARNAME="${1}";
+  eval VARVALUE='$'${VARNAME};
+  if [ -z "${VARVALUE}" ] || [ ! -d "${VARVALUE}" ];
+  then
+    echo "Variable ${VARNAME} (value \"${VARVALUE}\") does not point to a valid directory.";
+    exit 1;
+  fi
+}
+
+# cleanTmp - Clean up TMPDIR
+cleanTmp() {
+  if [ -z "${NOCLEAN}" ];
+  then
+    echo "Not cleaning TMPDIR (${TMPDIR}) upon request.";
+  else
+    [ -d "${TMPDIR}" ] && [ -f "${TMPDIR}/.istempdir" ] && rm -rf "${TMPDIR}"
+  fi
+}
+
+die() {
+  printf "\n";
+  echo "!!! $*";
+  cleanTmp;
+  exit 2;
+};
+
+# set the release date in the live ebuilds so it will be correct when copying to the new version
+setLiveReleaseDate() {
+    local PKG
+    local PN
+    cd ${GENTOOX86}
+    echo "Setting release date var in live ebuilds... "
+
+    for PKG in $PACKAGES;
+    do
+        cd "${GENTOOX86}/${PKG}"
+        PN="${PKG#*/}"
+        [[ -f "${PN}-9999.ebuild" ]] || continue;
+        sed -i "/^MY_RELEASEDATE=/s/.*/MY_RELEASEDATE=\"${RELEASEDATE}\"/" "${PN}-9999.ebuild"
+        git add .
+        git --no-pager diff --cached
+        repoman full && repoman commit -m "$PKG: update live ebuild"
+    done
+    echo -e "\ndone"
+}
+
+# Create (or modify) the new ebuilds
+createEbuilds() {
+    local PKG
+    local PN
+    cd ${GENTOOX86}
+    echo "Creating new ebuilds based on 9999 version... "
+
+    for PKG in $PACKAGES;
+    do
+        cd "${GENTOOX86}/${PKG}"
+        PN="${PKG#*/}"
+        [[ -f "${PN}-9999.ebuild" ]] || continue
+        [[ -f "Manifest" ]] || continue
+        sed -i -e "/${PN}-${NEWVERSION//_/-}/d" Manifest || die
+        cp ${PN}-9999.ebuild ${PN}-${NEWVERSION}.ebuild || die
+        repoman manifest
+        git add .
+        #git --no-pager diff --cached
+        repoman full
+        repoman commit -m "$PKG: bump to ${NEWVERSION}"
+    done
+    echo -e "\ndone"
+}
+
+if [ $# -ne 2 ];
+then
+  usage;
+  exit 3;
+fi
+
+# Assert that all needed information is available
+assertDirEnvVar GENTOOX86;
+assertDirEnvVar HARDENEDREFPOL;
+assertDirEnvVar REFPOLRELEASE;
+
+TMPDIR=$(mktemp -d);
+touch ${TMPDIR}/.istempdir;
+
+setLiveReleaseDate
+
+# Create ebuilds
+createEbuilds;
+
+cleanTmp;