diff options
| author | Elena, Reshetova <elena.reshetova@intel.com> | 2012-06-29 15:39:36 +0300 |
|---|---|---|
| committer | Elena, Reshetova <elena.reshetova@intel.com> | 2012-07-10 11:10:11 +0300 |
| commit | d38ce083f4a97f2a10071566274c341c0914257b (patch) | |
| tree | 6fdf29b4285a2267d6a11eb7f78c0bb05c3e0421 /packaging | |
| parent | f573430403c3937a73a874da8a724c94d0f650f3 (diff) | |
| download | rpm-d38ce083f4a97f2a10071566274c341c0914257b.tar.gz rpm-d38ce083f4a97f2a10071566274c341c0914257b.tar.bz2 rpm-d38ce083f4a97f2a10071566274c341c0914257b.zip | |
Fixing bugs PTSEC-22 (dbus configuration file generation), PTSEC-24 (smack rules handing lon update)
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/rpm.changes | 4 | ||||
| -rw-r--r-- | packaging/security_4.9.1.patch | 21 |
2 files changed, 14 insertions, 11 deletions
diff --git a/packaging/rpm.changes b/packaging/rpm.changes index 1688d90..3017b14 100644 --- a/packaging/rpm.changes +++ b/packaging/rpm.changes @@ -1,3 +1,7 @@ +* Fri Jul 10 2012 Elena Reshetova <elena.reshetova@intel.com> - 4.9.0 +- Fixing rpm-security-plugin bug PTSEC-22: dbus manifest is not generated correctly +- Fixing rpm-security-plugin bug PTSEC-24: package upgrade removes the file from /etc/smack/accesses.d + * Wed Jul 04 2012 Anas Nashif <anas.nashif@intel.com> 6bf3412 - remove auto dependencies diff --git a/packaging/security_4.9.1.patch b/packaging/security_4.9.1.patch index 86c943c..2a51c9b 100644 --- a/packaging/security_4.9.1.patch +++ b/packaging/security_4.9.1.patch @@ -1570,7 +1570,7 @@ index 0000000..c99a5e8 + msmCancelPackage(ctx->mfx->name); + goto fail; + } -+ } ++ } + if (ctx->mfx->define) { + if (ctx->mfx->define->name) + smackLabel = 1; @@ -1581,7 +1581,7 @@ index 0000000..c99a5e8 + msmCancelPackage(ctx->mfx->name); + goto fail; + } -+ } ++ } + if (ctx->mfx->request) { + if (ctx->mfx->request->ac_domain) + smackLabel = 1; @@ -1797,16 +1797,16 @@ index 0000000..c99a5e8 + + if (ctx->mfx->sw_source) { + if (rpmteDependsOn(ctx->te)) { -+ rpmlog(RPMLOG_INFO, "upgrading %s manifest data\n", ++ rpmlog(RPMLOG_INFO, "upgrading %s manifest data\n", + rpmteN(ctx->te)); + } else { -+ rpmlog(RPMLOG_INFO, "removing %s manifest data\n", ++ rpmlog(RPMLOG_INFO, "removing %s manifest data\n", + rpmteN(ctx->te)); ++ if (ctx->mfx->define || ctx->mfx->provides || ctx->mfx->sw_sources) { ++ msmRemoveRules(ctx->smack_accesses, ctx->mfx, SmackEnabled); ++ } ++ msmRemoveConfig(ctx->mfx); + } -+ if (ctx->mfx->define || ctx->mfx->provides || ctx->mfx->sw_sources) { -+ msmRemoveRules(ctx->smack_accesses, ctx->mfx, SmackEnabled); -+ } -+ msmRemoveConfig(ctx->mfx); + } + + } @@ -4076,7 +4076,7 @@ new file mode 100644 index 0000000..c0850f0 --- /dev/null +++ b/security/msmxattr.c -@@ -0,0 +1,1296 @@ +@@ -0,0 +1,1295 @@ +/* + * This file is part of MSM security plugin + * Greatly based on the code of MSSF security plugin @@ -4860,8 +4860,8 @@ index 0000000..c0850f0 + } + if (session) msmSetupDBusConfig(package, session, -1); + if (system) msmSetupDBusConfig(package, system, -1); ++ session = system = NULL; + } -+ + return 0; + +} @@ -4916,7 +4916,6 @@ index 0000000..c0850f0 + rpmlog(RPMLOG_ERR, "Failed to setup define with empty name\n"); + return -1; + } -+ + /* need to check if domain hasn't been already defined by other package */ + + HASH_FIND(hh, all_ac_domains, mfx->define->name, strlen(mfx->define->name), defined_ac_domain); |