rpms/nss_db/devel nss_db-2.2.3-selinux.patch, 1.1, 1.2 nss_db.spec, 1.49, 1.50

Nalin Dahyabhai nalin at fedoraproject.org
Fri Feb 5 15:26:59 UTC 2010


Author: nalin

Update of /cvs/pkgs/rpms/nss_db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9328/devel

Modified Files:
	nss_db-2.2.3-selinux.patch nss_db.spec 
Log Message:
- correct some tests in the patch for detecting SELinux support (#562052)


nss_db-2.2.3-selinux.patch:
 nss_db-2.2.3/src/Makefile.am |    2 -
 nss_db-2.2.3/src/makedb.c    |   64 +++++++++++++++++++++++++++++++++++++++++++
 nss_db-2.2/configure.in      |   38 +++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 1 deletion(-)

Index: nss_db-2.2.3-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nss_db/devel/nss_db-2.2.3-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nss_db-2.2.3-selinux.patch	25 Jan 2010 23:13:40 -0000	1.1
+++ nss_db-2.2.3-selinux.patch	5 Feb 2010 15:26:59 -0000	1.2
@@ -12,7 +12,7 @@ Note that this does *not* change the con
 +selinux=auto)
 +
 +libsave="$LIBS"
-+if test x$selinux != no ; then
++if test x$selinux != xno ; then
 +  AC_CHECK_HEADERS(selinux/selinux.h)
 +  if test x$ac_cv_header_selinux_selinux_h = xno ; then
 +    if test x$selinux = xyes ; then
@@ -24,7 +24,7 @@ Note that this does *not* change the con
 +  fi
 +fi
 +
-+if test x$selinux != no ; then
++if test x$selinux != xno ; then
 +  AC_CHECK_FUNC(setfscreatecon,,[AC_CHECK_LIB(selinux,setfscreatecon)])
 +  if test x$ac_cv_func_setfscreatecon = xno ; then
 +    if test x$ac_cv_lib_selinux_setfscreatecon = xno ; then
@@ -37,7 +37,7 @@ Note that this does *not* change the con
 +    fi
 +  fi
 +fi
-+if test x$selinux != no ; then
++if test x$selinux != xno ; then
 +  AC_DEFINE(SELINUX,1,[Define to have makedb set SELinux file contexts on created files.])
 +fi
 +


Index: nss_db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_db/devel/nss_db.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- nss_db.spec	26 Jan 2010 02:22:47 -0000	1.49
+++ nss_db.spec	5 Feb 2010 15:26:59 -0000	1.50
@@ -4,7 +4,7 @@
 Summary: An NSS library for the Berkeley DB
 Name: nss_db
 Version: 2.2.3
-Release: 0.1.pre1%{?dist}
+Release: 0.2.pre1%{?dist}
 Source: ftp://sources.redhat.com/pub/glibc/old-releases/nss_db-%{version}pre1.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
 Source2: db-getent-Makefile
@@ -135,6 +135,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) /var/db/Makefile
 
 %changelog
+* Fri Feb  5 2010 Nalin Dahyabhai <nalin at redhat.com> - 2.2.3-0.2.pre1
+- correct some tests in the patch for detecting SELinux support (#562052)
+
 * Mon Jan 25 2010 Nalin Dahyabhai <nalin at redhat.com> - 2.2.3-0.1.pre1
 - update to 2.2.3pre1, which you can still get from upstream
 - build with -fno-strict-aliasing to avoid problems triggered by strict aliasing



More information about the scm-commits mailing list