rpms/krb5/devel krb5-1.7-selinux-label.patch, 1.5, 1.6 krb5.spec, 1.213, 1.214
Nalin Dahyabhai
nalin at fedoraproject.org
Fri Oct 23 20:29:54 UTC 2009
- Previous message (by thread): rpms/perl-Perl-Critic/F-12 perl-Perl-Critic.spec, 1.21, 1.22 sources, 1.12, 1.13
- Next message (by thread): rpms/qpidc/F-11 .cvsignore, 1.27, 1.28 qpidc.spec, 1.93, 1.94 sources, 1.49, 1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nalin
Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29049
Modified Files:
krb5-1.7-selinux-label.patch krb5.spec
Log Message:
add some conditional logic to simplify building on older Fedora releases
krb5-1.7-selinux-label.patch:
aclocal.m4 | 51 +++
appl/bsd/configure.in | 1
appl/gssftp/configure.in | 1
appl/telnet/configure.in | 1
config/pre.in | 3
configure.in | 2
include/autoconf.h.in | 13
include/k5-int.h | 1
include/k5-label.h | 27 ++
include/krb5/krb5.hin | 6
kadmin/dbutil/dump.c | 2
krb5-config.in | 3
lib/kadm5/logger.c | 4
lib/krb5/keytab/kt_file.c | 4
plugins/kdb/db2/adb_openclose.c | 2
plugins/kdb/db2/kdb_db2.c | 4
plugins/kdb/db2/libdb2/btree/bt_open.c | 3
plugins/kdb/db2/libdb2/hash/hash.c | 3
plugins/kdb/db2/libdb2/recno/rec_open.c | 3
plugins/kdb/db2/libdb2/test/Makefile.in | 3
plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c | 12
slave/kpropd.c | 2
util/profile/prof_file.c | 3
util/support/Makefile.in | 3
util/support/selinux.c | 314 ++++++++++++++++++++++++
25 files changed, 448 insertions(+), 23 deletions(-)
Index: krb5-1.7-selinux-label.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5-1.7-selinux-label.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- krb5-1.7-selinux-label.patch 6 Jul 2009 22:56:11 -0000 1.5
+++ krb5-1.7-selinux-label.patch 23 Oct 2009 20:29:53 -0000 1.6
@@ -42,7 +42,7 @@ diff -up krb5-1.7/src/aclocal.m4 krb5-1.
KRB5_LIB_PARAMS
KRB5_AC_INITFINI
KRB5_AC_ENABLE_THREADS
-@@ -1876,3 +1877,51 @@ AC_SUBST(PAM_LIBS)
+@@ -1876,3 +1877,53 @@ AC_SUBST(PAM_LIBS)
AC_SUBST(manlibexecdir)
AC_CONFIG_FILES($1)
])
@@ -56,7 +56,7 @@ diff -up krb5-1.7/src/aclocal.m4 krb5-1.
+if test "$withselinux" != no ; then
+ AC_MSG_RESULT([checking for libselinux...])
+ SELINUX_LIBS=
-+ AC_CHECK_HEADERS(selinux/selinux.h)
++ AC_CHECK_HEADERS(selinux/selinux.h selinux/label.h)
+ if test "x$ac_cv_header_selinux_selinux_h" != xyes ; then
+ if test "$withselinux" = auto ; then
+ AC_MSG_RESULT([Unable to locate selinux/selinux.h.])
@@ -68,11 +68,13 @@ diff -up krb5-1.7/src/aclocal.m4 krb5-1.
+
+ LIBS=
+ unset ac_cv_func_setfscreatecon
-+ AC_CHECK_FUNCS(setfscreatecon)
++ AC_CHECK_FUNCS(setfscreatecon selabel_open)
+ if test "x$ac_cv_func_setfscreatecon" = xno ; then
+ AC_CHECK_LIB(selinux,setfscreatecon)
++ AC_CHECK_LIB(selinux,selabel_open)
+ unset ac_cv_func_setfscreatecon
-+ AC_CHECK_FUNCS(setfscreatecon)
++ unset ac_cv_func_selabel_open
++ AC_CHECK_FUNCS(setfscreatecon selabel_open)
+ if test "x$ac_cv_func_setfscreatecon" = xyes ; then
+ SELINUX_LIBS="$LIBS"
+ else
@@ -162,17 +164,20 @@ diff -up krb5-1.7/src/configure.in krb5-
diff -up krb5-1.7/src/include/autoconf.h.in krb5-1.7/src/include/autoconf.h.in
--- krb5-1.7/src/include/autoconf.h.in 2009-06-01 20:58:35.000000000 -0400
+++ krb5-1.7/src/include/autoconf.h.in 2009-06-04 13:47:20.000000000 -0400
-@@ -389,6 +389,9 @@
+@@ -389,6 +389,12 @@
/* Define to 1 if you have the `sched_yield' function. */
#undef HAVE_SCHED_YIELD
++/* Define to 1 if you have the <selinux/label.h> header file. */
++#undef HAVE_SELINUX_LABEL_H
++
+/* Define to 1 if you have the <selinux/selinux.h> header file. */
+#undef HAVE_SELINUX_SELINUX_H
+
/* Define to 1 if you have the <semaphore.h> header file. */
#undef HAVE_SEMAPHORE_H
-@@ -401,6 +404,9 @@
+@@ -401,6 +407,9 @@
/* Define to 1 if you have the `setegid' function. */
#undef HAVE_SETEGID
@@ -182,7 +187,7 @@ diff -up krb5-1.7/src/include/autoconf.h
/* Define to 1 if you have the `setenv' function. */
#undef HAVE_SETENV
-@@ -768,6 +774,10 @@
+@@ -768,6 +777,10 @@
/* Define if the KDC should use a replay cache */
#undef USE_RCACHE
@@ -536,7 +541,7 @@ diff -up krb5-1.7/src/util/support/Makef
diff -up /dev/null krb5-1.7/src/util/support/selinux.c
--- /dev/null 2009-06-04 10:34:55.169007373 -0400
+++ krb5-1.7/src/util/support/selinux.c 2009-06-04 13:47:20.000000000 -0400
-@@ -0,0 +1,300 @@
+@@ -0,0 +1,314 @@
+/*
+ * Copyright 2007,2008,2009 Red Hat, Inc. All Rights Reserved.
+ *
@@ -588,7 +593,9 @@ diff -up /dev/null krb5-1.7/src/util/sup
+#include <string.h>
+#include <unistd.h>
+#include <selinux/selinux.h>
++#ifdef HAVE_SELINUX_LABEL_H
+#include <selinux/label.h>
++#endif
+
+/* #define DEBUG 1 */
+
@@ -607,8 +614,10 @@ diff -up /dev/null krb5-1.7/src/util/sup
+push_fscreatecon(const char *pathname, mode_t mode)
+{
+ security_context_t previous, next;
-+ struct selabel_handle *ctx;
+ const char *fullpath;
++#ifdef HAVE_SELINUX_LABEL_H
++ struct selabel_handle *ctx;
++#endif
+
+ previous = NULL;
+ if (is_selinux_enabled()) {
@@ -648,6 +657,7 @@ diff -up /dev/null krb5-1.7/src/util/sup
+ "\"%s\"(%05o).\n", fullpath, mode);
+ }
+#endif
++#ifdef HAVE_SELINUX_LABEL_H
+ ctx = selabel_open(SELABEL_CTX_FILE, NULL, 0);
+ if (ctx != NULL) {
+ if (selabel_lookup(ctx, &next,
@@ -661,6 +671,15 @@ diff -up /dev/null krb5-1.7/src/util/sup
+ }
+ selabel_close(ctx);
+ }
++#else
++ if (matchpathcon(fullpath, mode, &next) != 0) {
++ free(genpath);
++ if (previous != NULL) {
++ freecon(previous);
++ }
++ return NULL;
++ }
++#endif
+ free(genpath);
+#ifdef DEBUG
+ if (isatty(fileno(stderr))) {
Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- krb5.spec 13 Oct 2009 15:49:29 -0000 1.213
+++ krb5.spec 23 Oct 2009 20:29:53 -0000 1.214
@@ -85,7 +85,9 @@ URL: http://web.mit.edu/kerberos/www/
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, bison, flex, gawk
+%if 0%{?fedora} >= 12
BuildRequires: libcom_err-devel, libss-devel
+%endif
BuildRequires: gzip, ncurses-devel, rsh, texinfo, texinfo-tex, tar
BuildRequires: tetex-latex
BuildRequires: keyutils-libs-devel
@@ -107,7 +109,10 @@ practice of cleartext passwords.
%package devel
Summary: Development files needed to compile Kerberos 5 programs
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}, libcom_err-devel
+Requires: %{name}-libs = %{version}-%{release}
+%if 0%{?fedora} >= 12
+Requires: libcom_err-devel
+%endif
Requires: keyutils-libs-devel, libselinux-devel
%description devel
@@ -210,7 +215,10 @@ to obtain initial credentials from a KDC
certificate.
%changelog
-* Tue Oct 13 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-9
+* Fri Oct 23 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-9
+- add some conditional logic to simplify building on older Fedora releases
+
+* Tue Oct 13 2009 Nalin Dahyabhai <nalin at redhat.com>
- don't forget the README
* Mon Sep 14 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-8
@@ -1537,7 +1545,11 @@ CPPFLAGS="`echo $DEFINES $INCLUDES`"
CC="%{__cc}" \
CFLAGS="$CFLAGS" \
CPPFLAGS="$CPPFLAGS" \
+%if 0%{?fedora} >= 7
SS_LIB="-lss -ltinfo" \
+%else
+ SS_LIB="-lss -lncurses" \
+%endif
--enable-shared \
--bindir=%{krb5prefix}/bin \
--mandir=%{krb5prefix}/man \
- Previous message (by thread): rpms/perl-Perl-Critic/F-12 perl-Perl-Critic.spec, 1.21, 1.22 sources, 1.12, 1.13
- Next message (by thread): rpms/qpidc/F-11 .cvsignore, 1.27, 1.28 qpidc.spec, 1.93, 1.94 sources, 1.49, 1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list