summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiaran McCreesh <ciaranm@gentoo.org>2004-09-28 14:51:25 +0000
committerCiaran McCreesh <ciaranm@gentoo.org>2004-09-28 14:51:25 +0000
commit4f4bc8f93f710e115ef88a95f429e5d78c9bbfbf (patch)
tree4c1903a087fb078496eb421a7e7b33954c5f1b7c /sys-apps/vixie-cron
parentcorrecting herd (Manifest recommit) (diff)
downloadgentoo-2-4f4bc8f93f710e115ef88a95f429e5d78c9bbfbf.tar.gz
gentoo-2-4f4bc8f93f710e115ef88a95f429e5d78c9bbfbf.tar.bz2
gentoo-2-4f4bc8f93f710e115ef88a95f429e5d78c9bbfbf.zip
Fix up selinux patch
Diffstat (limited to 'sys-apps/vixie-cron')
-rw-r--r--sys-apps/vixie-cron/ChangeLog6
-rw-r--r--sys-apps/vixie-cron/Manifest12
-rw-r--r--sys-apps/vixie-cron/files/vixie-cron-4.1-selinux.diff9
3 files changed, 6 insertions, 21 deletions
diff --git a/sys-apps/vixie-cron/ChangeLog b/sys-apps/vixie-cron/ChangeLog
index 5c90d756d78d..75752bf67087 100644
--- a/sys-apps/vixie-cron/ChangeLog
+++ b/sys-apps/vixie-cron/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/vixie-cron
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/ChangeLog,v 1.26 2004/09/25 15:10:00 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/ChangeLog,v 1.27 2004/09/28 14:51:25 ciaranm Exp $
+
+ 28 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+ files/vixie-cron-4.1-selinux.diff:
+ Fix up selinux patch
25 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> -vixie-cron-4.1.ebuild:
Remove 4.1, 4.1-r1 is about to be unmasked
diff --git a/sys-apps/vixie-cron/Manifest b/sys-apps/vixie-cron/Manifest
index 5fb4f7144524..54a7dfb3fe7b 100644
--- a/sys-apps/vixie-cron/Manifest
+++ b/sys-apps/vixie-cron/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 dd33c1120b51b3d049054c798c20d5fa vixie-cron-3.0.1-r3.ebuild 1748
MD5 3ff8b5eb733d9a828e916a46eabfa6ca vixie-cron-3.0.1-r4.ebuild 1852
MD5 2aaf9ac265d46dc063c3c256aaf5bfa9 ChangeLog 7950
@@ -8,7 +5,7 @@ MD5 ab3b7df1ed3ce81f23a9050de83ca101 vixie-cron-3.0.1-r5.ebuild 2035
MD5 dfd6ea62f7a18c13729d8c240f7692af vixie-cron-4.1-r1.ebuild 2062
MD5 141bf296f623dc44f4bfa4d856dc21fa vixie-cron-3.0.1-r1.ebuild 1502
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 dfcd801cb702528f508aa6cd0f9c04aa files/vixie-cron-4.1-selinux.diff 3842
+MD5 4c35adb745265e3008fe1999d6a18952 files/vixie-cron-4.1-selinux.diff 3557
MD5 90b7dda2ca0ecdd2f4dcd9764eaa2358 files/crontab-3.0.1-r4 617
MD5 1915f29deae7e87c569877f1dbbbec67 files/vixie-cron-3.0.1-selinux.diff.bz2 1853
MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r5 144
@@ -24,10 +21,3 @@ MD5 de84c3326555349db053b4aa13c0805f files/crontab.5.diff 772
MD5 5eab102dfecfc35810ab8cf50f95d0d3 files/cron.pam.d 123
MD5 8692002451e69ee31d667eb2d0dc904d files/vixie-cron-4.1-cron.deny 220
MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r3 144
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBVYmMLLFUmVNQ7rkRAhWcAJ45rp/s+1H36MKKvVMwyJDV+a0CwgCfeMwH
-5D1dBNiP9mdgl0e+sjfcjNg=
-=sQzB
------END PGP SIGNATURE-----
diff --git a/sys-apps/vixie-cron/files/vixie-cron-4.1-selinux.diff b/sys-apps/vixie-cron/files/vixie-cron-4.1-selinux.diff
index 8403eb0920d9..a4621e2530da 100644
--- a/sys-apps/vixie-cron/files/vixie-cron-4.1-selinux.diff
+++ b/sys-apps/vixie-cron/files/vixie-cron-4.1-selinux.diff
@@ -28,15 +28,6 @@
#define TMAX(a,b) ((a)>(b)?(a):(b))
static void process_crontab(const char *, const char *,
-@@ -111,7 +120,7 @@
- (void) strncpy(fname, dp->d_name, MAXNAMLEN);
- snprintf(tabname, MAXNAMLEN+1, "/etc/cron.d/%s", fname);
-
-- process_crontab("root", "*system*", tabname,
-+ process_crontab("root", SYSUSERNAME, tabname,
- &crond_stat, &new_db, old_db);
- }
- closedir(dir);
@@ -217,7 +226,7 @@
if (fname == NULL) {
/* must be set to something for logging purposes.