RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 24-Jun-2016 21:08:23 Branch: rpm-5_4 Handle: 2016062419082201 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac rpm/rpmio rpmsx.c Log: - selinux: use rpm_execcon only if available. Summary: Revision Changes Path 1.3501.2.497+1 -0 rpm/CHANGES 2.472.2.150 +3 -0 rpm/configure.ac 2.4.4.5 +4 -0 rpm/rpmio/rpmsx.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3501.2.496 -r1.3501.2.497 CHANGES --- rpm/CHANGES 24 Jun 2016 19:04:18 -0000 1.3501.2.496 +++ rpm/CHANGES 24 Jun 2016 19:08:22 -0000 1.3501.2.497 @@ -1,4 +1,5 @@ 5.4.17 -> 5.4.18: + - jbj: selinux: use rpm_execcon only if available. - jbj: use poptArgvFree to avoid memory leaks. - jbj: autofu: don't bother carrying around install-sh/mkinstalldirs. - jbj: autofu: default db-utils seaches to $PATH. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac ============================================================================ $ cvs diff -u -r2.472.2.149 -r2.472.2.150 configure.ac --- rpm/configure.ac 22 Jun 2016 22:48:32 -0000 2.472.2.149 +++ rpm/configure.ac 24 Jun 2016 19:08:22 -0000 2.472.2.150 @@ -2173,6 +2173,9 @@ [selinux], [is_selinux_enabled], [selinux/selinux.h], [no,external:none], [], [ AC_DEFINE(WITH_SELINUX, 1, [Define if building with Libselinux]) + AC_CHECK_LIB([selinux], [rpm_execcon], [ + AC_DEFINE(HAVE_SELINUX_RPM_EXECCON, 1, [Define to 1 if you have the rpm_execcon() function.]) + ]) ], []) dnl # Libsepol @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmsx.c ============================================================================ $ cvs diff -u -r2.4.4.4 -r2.4.4.5 rpmsx.c --- rpm/rpmio/rpmsx.c 9 Sep 2014 17:12:08 -0000 2.4.4.4 +++ rpm/rpmio/rpmsx.c 24 Jun 2016 19:08:23 -0000 2.4.4.5 @@ -300,7 +300,11 @@ SPEW((stderr, "--> %s(%p,%d,%p)\n", __FUNCTION__, sx, verified, argv)); #if defined(WITH_SELINUX) +#if defined(HAVE_SELINUX_RPM_EXECCON) rc = rpm_execcon(verified, argv[0], (char *const *)argv, environ); +#else + rc = execvpe(argv[0], (char *const *)argv, environ); +#endif #endif SPEW((stderr, "<-- %s(%p,%d,%p) rc %d\n", __FUNCTION__, sx, verified, argv, rc)); @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org