gentoo resync : 10.11.2017

3 files changed, 2 insertions, 120 deletions

diff --git a/sys-process/vixie-cron/Manifest b/sys-process/vixie-cron/Manifest
index 4cd3b312dc27..b892019e5d4b 100644
--- a/sys-process/vixie-cron/Manifest
+++ b/sys-process/vixie-cron/Manifest
@@ -10,14 +10,13 @@ AUX vixie-cron-4.1-hardlink.patch 369 SHA256 abce88d7f48f902baddf532a8c137b6d55a
 AUX vixie-cron-4.1-pam.patch 1714 SHA256 7dbfc2aaa50ab7aff012e97306fa12a1751e96c42e3af0ae82b9659ab24e660e SHA512 596e3888c9ba484b5e4f2b0db14aac0449760d9e4ca91105cac19555c4e45ae96c9e5e302335c5559697881286eae98d7149742e4f01102cc5042edf795d46fc WHIRLPOOL fef465a81aea7748645cc76aeece6aaeb1ea7d4e4deea99a3015266b4ef453584b48ed838ab9d926af8b11068cf2b4ffe123a84e83282311b46465ba45275cda
 AUX vixie-cron-4.1-selinux-1.diff 4658 SHA256 35909d7c59e60ee77833a17fdf58bd03590e710e67905ebb3331bc7eff92d091 SHA512 aa226982ace71b951d46af7777c173c8c4a1dcb4fc5967fa7396cbe617a7c341add25cfbf6210aa99ab8f1af9773d55fc57985f396a827b75acca12dd542dc54 WHIRLPOOL 2bf4608cd45bb17b6cab5f1b3785928d86909bd9b9db33d822532d2153cdecccc36e6536067a516838e3414da5b5fe22557d28a64bb867e64e13e558433eb520
 AUX vixie-cron-4.1-selinux-2.patch 6566 SHA256 57aa9e3c45c3d738038bce3cbc59a2a2c2e6a44e2cfd03a8639a2257ae8a31e8 SHA512 b272b8a9dda7b80f6213ce7b0b38dc3beb16bf38ae202410c9062ae0c14653174dc309fe6dffa469058acf58fae903e0eb670b721213bbdcba3bf21eccfbdfd3 WHIRLPOOL 79bbc51793eadbab1cf4b437e84766a3edf4625e71e77ada55c2431ef2df107cc4fb1979f16f646bea62839e1780a762ffc3fc895a8f068d403dfa0f1d9aacac
-AUX vixie-cron-4.1-selinux.diff 3557 SHA256 2e5df441230bed3f7fef9c63bb730d43a6293f756b64ffae29f8b98daff64524 SHA512 d8efaced8447e717ba68ab3c1b2e3097036647c46c328862bdc6060f7948c3d54ea6717dd7d684de517e516091ea28e35ca3b651e504f9b0481de21a812b2eb6 WHIRLPOOL 6b5593f074fad21a5b70461c6f2ff9787b9c8f551509c97586bb77e77e17d8b2a01f9f4c50ddfc383076ae5fc00e684a4b6a20d123fcef8b0ee0c47ef403a1ff
 AUX vixie-cron-4.1-setuid_check.patch 767 SHA256 63722e28b0477f5c3195d919b6a46647b76be50c0192879e64fcd17e54882ed5 SHA512 4c49ac5465a142a49799ce1ab816aacd458b44287a3200d9dc35afe1b717d095b2db93eee70913c3c6ee4171afe1293d6838af3f0e6156a96e1e6431ded2af70 WHIRLPOOL 75d04b2a5888500393976495a283112ac3439276e7f9622576eddf6d26917015c84136311cba6bd7f9600ea03ffe2ee74d0a192c0f0b451afddb027a13617924
 AUX vixie-cron.rc7 239 SHA256 3cdbe2c12e9d694103537795c66912721f1ab9cf2bbbd3552d36437f6f965c5d SHA512 d491ae5db8e6ad00bf59380a3358577dfe45a0d137fa5100c22252b8d6d84149d379aae860a30b39c4bdbfc0274ed6cf8fe8d2dfedbea29f4260d5aaab975766 WHIRLPOOL ce0dd40f8e579829be9d540eb848dc72cf23c172fb181fb75213d4e474b246e22d69b635a72c0715fc88ff89e0a3666222673d5dced0d3763949bbf4a7dd595d
 AUX vixie-cron.service 178 SHA256 248368dc7dcdd94ff641ad017cc64ed7a82a3791f81dcedea48bcc4d3e1a2a21 SHA512 09af14c9010c55c204db8755872df531d0e28b473d56f0b5f99c037e2183e2f9e2be9cc66895f4da2036b74efa7bc472e932331fac13722a505ae2be400a068d WHIRLPOOL d2fc8b7cb9c1e39f1095534f25d3c647c27c96fdfd0ed218f4b3a6544aa0c3e273c40ee50cb5a82dab29c0322cce52d04653bb252065101c912da0a7a6163aa6
 DIST vixie-cron-4.1-gentoo-r4.patch.bz2 4204 SHA256 8de14b11da567f7859df3dcf71802f32ac1b3650ae07c6cb6dbc259e1f6da7fc SHA512 eec8f89a97927a3557bd1350ed7e9baa0ec133e2c49f8f0fbf51adf62c377451dc48867ca6affcc7576833a5b6b749613c9b99641b1b658853f91d8071c3411b WHIRLPOOL 9951885d10f0f49cb0b66b1b592a870f24c04647688422c7fb396e266af0aeed7ae357bb571f13ee30aeec747ecfe78abb0335f80ea5bfd0084aee4321a581d4
 DIST vixie-cron-4.1.tar.bz2 54246 SHA256 fd25119b301e0e8306ec27ee912298740c5c8ae879bac02381429cf355d1122d SHA512 1db9a246243dbd4934438ce70bf022215ccffed4b899a77b076d5a7679a7b98a23ef67344e329fc7a836df90685581e10b1c95709db40601c33d2052ce561e04 WHIRLPOOL e137a0e056103efc1bf0aa022bf0f9e2ca3ab8bb3ff97645de27c2e381a4aa5303d477cd1bc6220177aa503c2bce5bbe2331d311dfac4f5ab43cf6928dbe1ea7
 EBUILD vixie-cron-4.1-r14.ebuild 3493 SHA256 54bdc9689ae51ea6a8d961c5a862b2b179d05219cd79b7b993d1600e15124086 SHA512 b51b9b7b81394c285db9b1a44aa4cc0b194c0b9480fbc1a57cf644db6b689b5715a763585c6145b8551a44e1676aabe409bc08c96a16de663c57d14184079c2c WHIRLPOOL f73639db790901d1e448062c1a36e5eccc1a4c1b7f7cc073032146f3477322470b5c568648597e256fbb39270cdae04fa285037f10f356ff6807df8dd9413839
-EBUILD vixie-cron-4.1-r15.ebuild 3506 SHA256 067208a20525a9aed621dd0e97380c047ad276542cab594ad220c8d7aa01f9b4 SHA512 af1a861f6483e998e07689cdcd3746be30747faefdc3e214dee65805f3c6c7fb1aa7a06962b1cfeaf25ad484dd6363be57e51dc15aeed8dfa029cd91965d2098 WHIRLPOOL fbced7b6045182ec518a503ed0793c904a2337fa1ed944726a688d4121f4cf3d010e4ed4f3a82c63ec8494cce43d5d53ef027aa934bcb3267532e9d5e4637330
+EBUILD vixie-cron-4.1-r15.ebuild 3501 SHA256 64dc80b81b9e3745d87023275858d15ef6404decb578973576196594df685fc2 SHA512 3cea9df9474af3676b98520cffd352c67b73b1e6ee24748a6a23af360f8cd87a41188dbb5e2d61813591816de72a67e574c5578f6808050aa7f4f2a8c149ffba WHIRLPOOL 4fc9029133a3308f70ce8c7838f9b98de4fc57a4c24a8be61e5e7d84910bc9225c6214c2c101b7fc31ed875c37b92de89fbfd4ebd1b1bda28f95bcfd0894c4de
 MISC ChangeLog 3256 SHA256 8331d01c2abdf9d5ea9abc969c3d172a07e38e8395a3b9ab4a8dafc80d41fc55 SHA512 d6c5ac7898ad8be3e4171e90d0957fea01b48f6d0dea011b8a8cc6e2120907721f5e4ec4461a7741ee9909efb9fb1a73218ba45479977f3c276e9b53db9f7f15 WHIRLPOOL 1c8740f364acb4e34e1d40b0a0040634f2766e84c72264ffada2e828f1be4535461f0bdde2a785ebbd427eddbecbe2aa8e01fe09d9d74ce9beb153af43d2b639
 MISC ChangeLog-2015 24228 SHA256 9ab7b065b5fc93ce8b3602cf1105dee690b53a2e3ab58ccf4fafc9b7bf7b1e42 SHA512 faf5e627979e5b3500ca99af9eaf4d0b3b362ffed25be809f8e129f841227bbdd881750b3f18d7cd2c997c58e98b7e7890e69f2696b51b748bac82a245de1379 WHIRLPOOL d120d61750414f765097afdf93e1977846d41607aba77047ae8140a4c318ce1ccedfbbabcd850369f1284ed5e37ef6946252ff150d21cadc5a91e6b0f41684cc
 MISC metadata.xml 256 SHA256 cbca1ae57df68811dc0f0eeceb7449e69bc046966ad0feff3279e148f7db2f18 SHA512 155f3cbb14ae54e9dfb98e954f6bdf7f23bf5654ae2d00549f7722085a7243d934dfd99d6f1325b00dcaeb50c5344e818e602dc4e2fe47dc7aeb1fdb77668521 WHIRLPOOL 37d54b13f923df58d35217014422b6b484597ce1f80f39a4c6d8a4906d3c5dff6d8c4e14972abb5bdc3a041006c5b691d1d284dbcab35bdffd0e6a013c110215
diff --git a/sys-process/vixie-cron/files/vixie-cron-4.1-selinux.diff b/sys-process/vixie-cron/files/vixie-cron-4.1-selinux.diff
deleted file mode 100644
index a4621e2530da..000000000000
--- a/sys-process/vixie-cron/files/vixie-cron-4.1-selinux.diff
+++ /dev/null
@@ -1,117 +0,0 @@
---- vixie-cron-3.0.1/Makefile.selinux	2003-05-20 14:52:06.000000000 -0400
-+++ vixie-cron-3.0.1/Makefile	2003-05-20 14:52:21.000000000 -0400
-@@ -71,7 +71,8 @@ LINTFLAGS	=	-hbxa $(INCLUDE) $(COMPAT) $
- #<<want to use a nonstandard CC?>>
- #CC		=	vcc
- #<<manifest defines>>
--DEFS		=
-+DEFS		= -s -DWITH_SELINUX
-+LIBS		+= 	-lselinux
- #(SGI IRIX systems need this)
- #DEFS		=	-D_BSD_SIGNALS -Dconst=
- #<<the name of the BSD-like install program>>
---- vixie-cron-3.0.1/database.c.selinux	2003-05-20 14:52:56.000000000 -0400
-+++ vixie-cron-3.0.1/database.c	2003-05-23 13:27:24.898020960 -0400
-@@ -28,6 +28,15 @@
- 
- #include "cron.h"
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#include <selinux/flask.h>
-+#include <selinux/av_permissions.h>
-+#define SYSUSERNAME "system_u"
-+#else
-+#define SYSUSERNAME "*system*"
-+#endif
-+
- #define TMAX(a,b) ((a)>(b)?(a):(b))
- 
- static	void		process_crontab(const char *, const char *,
-@@ -217,7 +226,7 @@
- 	if (fname == NULL) {
- 		/* must be set to something for logging purposes.
- 		 */
--		fname = "*system*";
-+		fname = SYSUSERNAME;
- 	} else if ((pw = getpwnam(uname)) == NULL) {
- 		/* file doesn't have a user in passwd file.
- 		 */
-@@ -279,6 +288,43 @@
- 		free_user(u);
- 		log_it(fname, getpid(), "RELOAD", tabname);
- 	}
-+#ifdef WITH_SELINUX
-+	if (is_selinux_enabled())	{
-+	  security_context_t  file_context=NULL;
-+	  security_context_t   user_context=NULL;
-+	  struct av_decision avd;
-+	  int retval=0;
-+
-+	  if (fgetfilecon(crontab_fd, &file_context) < OK) {
-+	    log_it(fname, getpid(), "getfilecon FAILED", tabname);
-+	    goto next_crontab;
-+	  }
-+
-+	  /*
-+	   * Since crontab files are not directly executed,
-+	   * crond must ensure that the crontab file has
-+	   * a context that is appropriate for the context of
-+	   * the user cron job.  It performs an entrypoint
-+	   * permission check for this purpose.
-+	   */
-+	  if (get_default_context(fname, NULL, &user_context)) {
-+	    log_it(fname, getpid(), "NO CONTEXT", tabname);
-+	    freecon(file_context);
-+	    goto next_crontab;
-+	  }
-+	  retval = security_compute_av(user_context,
-+				       file_context,
-+				       SECCLASS_FILE,
-+				       FILE__ENTRYPOINT,
-+				       &avd);
-+	  freecon(user_context);
-+	  freecon(file_context);
-+	  if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) {
-+	    log_it(fname, getpid(), "ENTRYPOINT FAILED", tabname);
-+	    goto next_crontab;
-+	  }
-+	}
-+#endif
- 	u = load_user(crontab_fd, pw, fname);
- 	if (u != NULL) {
- 		u->mtime = statbuf->st_mtime;
---- vixie-cron-3.0.1/do_command.c.selinux	2003-05-20 14:53:12.000000000 -0400
-+++ vixie-cron-3.0.1/do_command.c	2003-05-20 14:58:06.000000000 -0400
-@@ -25,6 +25,10 @@
- 
- #include "cron.h"
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif
-+
- static void		child_process(entry *, user *);
- static int		safe_p(const char *, const char *);
- 
-@@ -265,6 +269,20 @@
- 				_exit(OK_EXIT);
- 			}
- # endif /*DEBUGGING*/
-+#ifdef WITH_SELINUX
-+			if (is_selinux_enabled()) {
-+			  security_context_t scontext;
-+			  if (get_default_context(u->name, NULL, &scontext)) {
-+			    fprintf(stderr, "execle_secure: couldn't get security context for user %s\n", u->name); 
-+			    _exit(ERROR_EXIT);
-+			  }
-+			  if (setexeccon(scontext) < 0) {
-+			    fprintf(stderr, "Could not set exec context to %s for user  %s\n", scontext,u->name);
-+			    _exit(ERROR_EXIT);
-+			  }
-+			  freecon(scontext);
-+			}
-+#endif
- 			execle(shell, shell, "-c", e->cmd, (char *)0, e->envp);
- 			fprintf(stderr, "execl: couldn't exec `%s'\n", shell);
- 			perror("execl");
diff --git a/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild b/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild
index 9df5efc8c14f..a06340b19aef 100644
--- a/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild
+++ b/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${GENTOO_PATCH_REV}.patch.bz2"
 
 LICENSE="ISC BSD-2 BSD"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="selinux pam debug"
 
 DEPEND="selinux? ( sys-libs/libselinux )