rpms/krb5/devel krb5-1.7-selinux-label.patch, 1.4, 1.5 krb5-trunk-manpaths.patch, 1.5, 1.6 krb5-trunk-manpaths.txt, 1.2, 1.3 krb5.spec, 1.206, 1.207
Nalin Dahyabhai
nalin at fedoraproject.org
Mon Jul 6 22:56:11 UTC 2009
- Previous message (by thread): rpms/krb5/devel krb5.spec, 1.205, 1.206 krb5-1.7-largefile.patch, 1.1, 1.2
- Next message (by thread): rpms/kernel/F-10 drm-connector-dpms-fix.patch, NONE, 1.1 drm-radeon-cs-oops-fix.patch, NONE, 1.1 drm-radeon-fix-ring-commit.patch, NONE, 1.1 kernel.spec, 1.1392, 1.1393
- 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-serv4368
Modified Files:
krb5-1.7-selinux-label.patch krb5-trunk-manpaths.patch
krb5-trunk-manpaths.txt krb5.spec
Log Message:
- simplify the man pages patch by only preprocessing the files we care about
and moving shared configure.in logic into a shared function
krb5-1.7-selinux-label.patch:
Index: krb5-1.7-selinux-label.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5-1.7-selinux-label.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- krb5-1.7-selinux-label.patch 29 Jun 2009 21:36:53 -0000 1.4
+++ krb5-1.7-selinux-label.patch 6 Jul 2009 22:56:11 -0000 1.5
@@ -42,10 +42,10 @@ diff -up krb5-1.7/src/aclocal.m4 krb5-1.
KRB5_LIB_PARAMS
KRB5_AC_INITFINI
KRB5_AC_ENABLE_THREADS
-@@ -1854,3 +1855,51 @@ AC_SUBST(PAM_LIBS)
- AC_SUBST(PAM_MAN)
- AC_SUBST(NON_PAM_MAN)
- ])dnl
+@@ -1876,3 +1877,51 @@ AC_SUBST(PAM_LIBS)
+ AC_SUBST(manlibexecdir)
+ AC_CONFIG_FILES($1)
+ ])
+dnl
+dnl Use libselinux to set file contexts on newly-created files.
+dnl
@@ -158,7 +158,7 @@ diff -up krb5-1.7/src/configure.in krb5-
+
AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
- mansysconfdir=$sysconfdir
+ V5_AC_OUTPUT_MANPAGE([
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
krb5-trunk-manpaths.patch:
Index: krb5-trunk-manpaths.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5-trunk-manpaths.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- krb5-trunk-manpaths.patch 29 Jun 2009 19:28:01 -0000 1.5
+++ krb5-trunk-manpaths.patch 6 Jul 2009 22:56:11 -0000 1.6
@@ -1,134 +1,81 @@
Change the absolute paths included in the man pages so that the correct
values can be dropped in by config.status. After applying this patch,
these files should be renamed to their ".in" counterparts, and then the
-configure scripts should be rebuilt.
- appl/bsd/klogind.M
- appl/bsd/kshd.M
- appl/bsd/login.M
- appl/bsd/rcp.M
- appl/bsd/rlogin.M
- appl/bsd/rsh.M
- appl/gssftp/ftpd/ftpd.M
- appl/gssftp/ftp/ftp.M
- appl/sample/sclient/sclient.M
- appl/sample/sserver/sserver.M
- appl/telnet/telnetd/telnetd.8
- appl/telnet/telnet/telnet.1
- clients/kcpytkt/kcpytkt.M
- clients/kdeltkt/kdeltkt.M
- clients/kdestroy/kdestroy.M
- clients/kinit/kinit.M
- clients/klist/klist.M
- clients/kpasswd/kpasswd.M
- clients/ksu/ksu.M
- clients/kvno/kvno.M
- config-files/kdc.conf.M
- config-files/krb5.conf.M
- gen-manpages/k5login.M
- gen-manpages/kerberos.M
- kadmin/cli/k5srvutil.M
- kadmin/cli/kadmin.local.M
- kadmin/cli/kadmin.M
- kadmin/dbutil/kdb5_util.M
- kadmin/ktutil/ktutil.M
- kadmin/passwd/kpasswd.M
- kadmin/server/kadmind.M
- kdc/krb5kdc.M
- krb5-config.M
- plugins/kdb/ldap/ldap_util/kdb5_ldap_util.M
- slave/kpropd.M
- slave/kprop.M
- tests/create/kdb5_mkdums.M
- util/et/com_err.3
- util/et/compile_et.1
- util/profile/profile.5
- util/send-pr/send-pr.1
+configure scripts should be rebuilt. RT#TBD
+
Index: configure.in
===================================================================
---- configure.in (revision 22424)
+--- configure.in (revision 22425)
+++ configure.in (working copy)
-@@ -1043,6 +1043,59 @@
+@@ -1043,6 +1043,16 @@
KRB5_WITH_PAM
AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
+
-+mansysconfdir=$sysconfdir
-+mansysconfdir=`eval echo $mansysconfdir | sed -e "s,NONE,$prefix,g"`
-+mansysconfdir=`eval echo $mansysconfdir | sed -e "s,NONE,$ac_default_prefix,g"`
-+mansbindir=$sbindir
-+mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$exec_prefix,g"`
-+mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$prefix,g"`
-+mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$ac_default_prefix,g"`
-+manlocalstatedir=$localstatedir
-+manlocalstatedir=`eval echo $manlocalstatedir | sed -e "s,NONE,$prefix,g"`
-+manlocalstatedir=`eval echo $manlocalstatedir | sed -e "s,NONE,$ac_default_prefix,g"`
-+manlibexecdir=$libexecdir
-+manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$exec_prefix,g"`
-+manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$prefix,g"`
-+manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$ac_default_prefix,g"`
-+AC_SUBST(mansysconfdir)
-+AC_SUBST(mansbindir)
-+AC_SUBST(manlocalstatedir)
-+AC_SUBST(manlibexecdir)
-+AC_OUTPUT([
-+ appl/sample/sclient/sclient.M
++V5_AC_OUTPUT_MANPAGE([
+ appl/sample/sserver/sserver.M
-+ clients/kcpytkt/kcpytkt.M
-+ clients/kdeltkt/kdeltkt.M
-+ clients/kdestroy/kdestroy.M
-+ clients/kinit/kinit.M
-+ clients/klist/klist.M
-+ clients/kpasswd/kpasswd.M
-+ clients/ksu/ksu.M
-+ clients/kvno/kvno.M
+ config-files/kdc.conf.M
+ config-files/krb5.conf.M
-+ gen-manpages/k5login.M
-+ gen-manpages/kerberos.M
-+ kadmin/cli/k5srvutil.M
-+ kadmin/cli/kadmin.local.M
+ kadmin/cli/kadmin.M
-+ kadmin/dbutil/kdb5_util.M
-+ kadmin/ktutil/ktutil.M
-+ kadmin/passwd/kpasswd.M
-+ kadmin/server/kadmind.M
-+ kdc/krb5kdc.M
-+ krb5-config.M
-+ plugins/kdb/ldap/ldap_util/kdb5_ldap_util.M
+ slave/kpropd.M
+ slave/kprop.M
-+ tests/create/kdb5_mkdums.M
-+ util/et/com_err.3
-+ util/et/compile_et.1
-+ util/profile/profile.5
-+ util/send-pr/send-pr.1
+])
+
V5_AC_OUTPUT_MAKEFILE(.
util util/support util/profile util/send-pr
-Index: appl/sample/sserver/sserver.M
-===================================================================
---- appl/sample/sserver/sserver.M (revision 22424)
-+++ appl/sample/sserver/sserver.M (working copy)
-@@ -59,7 +59,7 @@
- using a line in
- /etc/inetd.conf that looks like this:
- .PP
--sample stream tcp nowait root /usr/local/sbin/sserver sserver
-+sample stream tcp nowait root @mansbindir@/sserver sserver
- .PP
- Since \fBsample\fP is normally not a port defined in /etc/services, you will
- usually have to add a line to /etc/services which looks like this:
Index: appl/gssftp/configure.in
===================================================================
---- appl/gssftp/configure.in (revision 22424)
+--- appl/gssftp/configure.in (revision 22425)
+++ appl/gssftp/configure.in (working copy)
-@@ -65,4 +65,28 @@
+@@ -65,4 +65,9 @@
dnl
dnl
KRB5_BUILD_PROGRAM
+
++V5_AC_OUTPUT_MANPAGE([
++ ftpd/ftpd.M
++])
++
+ V5_AC_OUTPUT_MAKEFILE(. ftp ftpd)
+Index: appl/bsd/configure.in
+===================================================================
+--- appl/bsd/configure.in (revision 22425)
++++ appl/bsd/configure.in (working copy)
+@@ -156,4 +156,10 @@
+
+ KRB5_AC_LIBUTIL
+ KRB5_BUILD_PROGRAM
++
++V5_AC_OUTPUT_MANPAGE([
++ klogind.M
++ kshd.M
++])
++
+ V5_AC_OUTPUT_MAKEFILE
+Index: appl/telnet/configure.in
+===================================================================
+--- appl/telnet/configure.in (revision 22425)
++++ appl/telnet/configure.in (working copy)
+@@ -161,4 +161,9 @@
+ LIBS="$old_LIBS"
+ dnl
+ KRB5_AC_LIBUTIL
++
++V5_AC_OUTPUT_MANPAGE([
++ telnetd/telnetd.8
++])
++
+ V5_AC_OUTPUT_MAKEFILE(. libtelnet telnet telnetd)
+Index: aclocal.m4
+===================================================================
+--- aclocal.m4 (revision 22425)
++++ aclocal.m4 (working copy)
+@@ -1854,3 +1854,24 @@
+ AC_SUBST(PAM_MAN)
+ AC_SUBST(NON_PAM_MAN)
+ ])dnl
++AC_DEFUN(V5_AC_OUTPUT_MANPAGE,[
+mansysconfdir=$sysconfdir
+mansysconfdir=`eval echo $mansysconfdir | sed -e "s,NONE,$prefix,g"`
+mansysconfdir=`eval echo $mansysconfdir | sed -e "s,NONE,$ac_default_prefix,g"`
@@ -147,15 +94,24 @@ Index: appl/gssftp/configure.in
+AC_SUBST(mansbindir)
+AC_SUBST(manlocalstatedir)
+AC_SUBST(manlibexecdir)
-+AC_OUTPUT([
-+ ftpd/ftpd.M
-+ ftp/ftp.M
++AC_CONFIG_FILES($1)
+])
-+
- V5_AC_OUTPUT_MAKEFILE(. ftp ftpd)
+Index: appl/sample/sserver/sserver.M
+===================================================================
+--- appl/sample/sserver/sserver.M (revision 22425)
++++ appl/sample/sserver/sserver.M (working copy)
+@@ -59,7 +59,7 @@
+ using a line in
+ /etc/inetd.conf that looks like this:
+ .PP
+-sample stream tcp nowait root /usr/local/sbin/sserver sserver
++sample stream tcp nowait root @mansbindir@/sserver sserver
+ .PP
+ Since \fBsample\fP is normally not a port defined in /etc/services, you will
+ usually have to add a line to /etc/services which looks like this:
Index: appl/bsd/klogind.M
===================================================================
---- appl/bsd/klogind.M (revision 22424)
+--- appl/bsd/klogind.M (revision 22425)
+++ appl/bsd/klogind.M (working copy)
@@ -27,7 +27,7 @@
the port indicated in /etc/inetd.conf. A typical /etc/inetd.conf
@@ -168,7 +124,7 @@ Index: appl/bsd/klogind.M
Index: appl/bsd/kshd.M
===================================================================
---- appl/bsd/kshd.M (revision 22424)
+--- appl/bsd/kshd.M (revision 22425)
+++ appl/bsd/kshd.M (working copy)
@@ -8,7 +8,7 @@
.SH NAME
@@ -188,46 +144,9 @@ Index: appl/bsd/kshd.M
When a service request is received, the following protocol is initiated:
-Index: appl/bsd/configure.in
-===================================================================
---- appl/bsd/configure.in (revision 22424)
-+++ appl/bsd/configure.in (working copy)
-@@ -156,4 +156,32 @@
-
- KRB5_AC_LIBUTIL
- KRB5_BUILD_PROGRAM
-+
-+mansysconfdir=$sysconfdir
-+mansysconfdir=`eval echo $mansysconfdir | sed -e "s,NONE,$prefix,g"`
-+mansysconfdir=`eval echo $mansysconfdir | sed -e "s,NONE,$ac_default_prefix,g"`
-+mansbindir=$sbindir
-+mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$exec_prefix,g"`
-+mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$prefix,g"`
-+mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$ac_default_prefix,g"`
-+manlocalstatedir=$localstatedir
-+manlocalstatedir=`eval echo $manlocalstatedir | sed -e "s,NONE,$prefix,g"`
-+manlocalstatedir=`eval echo $manlocalstatedir | sed -e "s,NONE,$ac_default_prefix,g"`
-+manlibexecdir=$libexecdir
-+manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$exec_prefix,g"`
-+manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$prefix,g"`
-+manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$ac_default_prefix,g"`
-+AC_SUBST(mansysconfdir)
-+AC_SUBST(mansbindir)
-+AC_SUBST(manlocalstatedir)
-+AC_SUBST(manlibexecdir)
-+AC_OUTPUT([
-+ klogind.M
-+ kshd.M
-+ login.M
-+ rcp.M
-+ rlogin.M
-+ rsh.M
-+])
-+
- V5_AC_OUTPUT_MAKEFILE
Index: appl/telnet/telnetd/telnetd.8
===================================================================
---- appl/telnet/telnetd/telnetd.8 (revision 22424)
+--- appl/telnet/telnetd/telnetd.8 (revision 22425)
+++ appl/telnet/telnetd/telnetd.8 (working copy)
@@ -37,7 +37,7 @@
.SM DARPA TELNET
@@ -238,42 +157,22 @@ Index: appl/telnet/telnetd/telnetd.8
[\fB\-a\fP \fIauthmode\fP] [\fB\-B\fP] [\fB\-D\fP] [\fIdebugmode\fP]
[\fB\-e\fP] [\fB\-h\fP] [\fB\-I\fP\fIinitid\fP] [\fB\-l\fP]
[\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP]
-Index: appl/telnet/configure.in
+Index: appl/gssftp/ftpd/ftpd.M
===================================================================
---- appl/telnet/configure.in (revision 22424)
-+++ appl/telnet/configure.in (working copy)
-@@ -161,4 +161,28 @@
- LIBS="$old_LIBS"
- dnl
- KRB5_AC_LIBUTIL
-+
-+mansysconfdir=$sysconfdir
-+mansysconfdir=`eval echo $mansysconfdir | sed -e "s,NONE,$prefix,g"`
-+mansysconfdir=`eval echo $mansysconfdir | sed -e "s,NONE,$ac_default_prefix,g"`
-+mansbindir=$sbindir
-+mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$exec_prefix,g"`
-+mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$prefix,g"`
-+mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$ac_default_prefix,g"`
-+manlocalstatedir=$localstatedir
-+manlocalstatedir=`eval echo $manlocalstatedir | sed -e "s,NONE,$prefix,g"`
-+manlocalstatedir=`eval echo $manlocalstatedir | sed -e "s,NONE,$ac_default_prefix,g"`
-+manlibexecdir=$libexecdir
-+manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$exec_prefix,g"`
-+manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$prefix,g"`
-+manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$ac_default_prefix,g"`
-+AC_SUBST(mansysconfdir)
-+AC_SUBST(mansbindir)
-+AC_SUBST(manlocalstatedir)
-+AC_SUBST(manlibexecdir)
-+AC_OUTPUT([
-+ telnetd/telnetd.8
-+ telnet/telnet.1
-+])
-+
- V5_AC_OUTPUT_MAKEFILE(. libtelnet telnet telnetd)
+--- appl/gssftp/ftpd/ftpd.M (revision 22425)
++++ appl/gssftp/ftpd/ftpd.M (working copy)
+@@ -35,7 +35,7 @@
+ .SH NAME
+ ftpd \- DARPA Internet File Transfer Protocol server
+ .SH SYNOPSIS
+-.B ftpd
++.B @mansbindir@/ftpd
+ [\fB\-A \fP|\fB -a\fP] [\fB\-C\fP] [\fB\-c\fP] [\fB\-d\fP] [\fB-E\fP]
+ [\fB\-l\fP] [\fB\-v\fP] [\fB\-T\fP \fImaxtimeout\fP] [\fB\-t\fP \fItimeout\fP]
+ [\fB\-p\fP \fIport\fP] [\fB\-U\fP \fIftpusers-file\fP] [\fB\-u\fP \fIumask\fP]
Index: kadmin/cli/kadmin.M
===================================================================
---- kadmin/cli/kadmin.M (revision 22424)
+--- kadmin/cli/kadmin.M (revision 22425)
+++ kadmin/cli/kadmin.M (working copy)
@@ -850,9 +850,9 @@
.RS
@@ -298,7 +197,7 @@ Index: kadmin/cli/kadmin.M
.IR kerberos (1),
Index: config-files/kdc.conf.M
===================================================================
---- config-files/kdc.conf.M (revision 22424)
+--- config-files/kdc.conf.M (revision 22425)
+++ config-files/kdc.conf.M (working copy)
@@ -82,14 +82,14 @@
.B string
@@ -326,9 +225,21 @@ Index: config-files/kdc.conf.M
.SH SEE ALSO
krb5.conf(5), krb5kdc(8)
+Index: config-files/krb5.conf.M
+===================================================================
+--- config-files/krb5.conf.M (revision 22425)
++++ config-files/krb5.conf.M (working copy)
+@@ -643,6 +643,6 @@
+ This LDAP specific tag indicates the number of connections to be maintained per
+ LDAP server.
+ .SH FILES
+-/etc/krb5.conf
++ at mansysconfdir@/krb5.conf
+ .SH SEE ALSO
+ syslog(3)
Index: slave/kprop.M
===================================================================
---- slave/kprop.M (revision 22424)
+--- slave/kprop.M (revision 22425)
+++ slave/kprop.M (working copy)
@@ -39,7 +39,7 @@
This is done by transmitting the dumped database file to the slave
@@ -350,7 +261,7 @@ Index: slave/kprop.M
specifies the port to use to contact the
Index: slave/kpropd.M
===================================================================
---- slave/kpropd.M (revision 22424)
+--- slave/kpropd.M (revision 22425)
+++ slave/kpropd.M (working copy)
@@ -74,7 +74,7 @@
This is done by adding a line to the inetd.conf file which looks like
Index: krb5-trunk-manpaths.txt
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5-trunk-manpaths.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- krb5-trunk-manpaths.txt 4 Jun 2009 22:18:04 -0000 1.2
+++ krb5-trunk-manpaths.txt 6 Jul 2009 22:56:11 -0000 1.3
@@ -1,41 +1,10 @@
appl/bsd/klogind.M
appl/bsd/kshd.M
-appl/bsd/login.M
-appl/bsd/rcp.M
-appl/bsd/rlogin.M
-appl/bsd/rsh.M
-appl/gssftp/ftpd/ftpd.M
-appl/gssftp/ftp/ftp.M
-appl/sample/sclient/sclient.M
appl/sample/sserver/sserver.M
appl/telnet/telnetd/telnetd.8
-appl/telnet/telnet/telnet.1
-clients/kcpytkt/kcpytkt.M
-clients/kdeltkt/kdeltkt.M
-clients/kdestroy/kdestroy.M
-clients/kinit/kinit.M
-clients/klist/klist.M
-clients/kpasswd/kpasswd.M
-clients/ksu/ksu.M
-clients/kvno/kvno.M
+appl/gssftp/ftpd/ftpd.M
config-files/kdc.conf.M
config-files/krb5.conf.M
-gen-manpages/k5login.M
-gen-manpages/kerberos.M
-kadmin/cli/k5srvutil.M
-kadmin/cli/kadmin.local.M
kadmin/cli/kadmin.M
-kadmin/dbutil/kdb5_util.M
-kadmin/ktutil/ktutil.M
-kadmin/passwd/kpasswd.M
-kadmin/server/kadmind.M
-kdc/krb5kdc.M
-krb5-config.M
-plugins/kdb/ldap/ldap_util/kdb5_ldap_util.M
slave/kpropd.M
slave/kprop.M
-tests/create/kdb5_mkdums.M
-util/et/com_err.3
-util/et/compile_et.1
-util/profile/profile.5
-util/send-pr/send-pr.1
Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- krb5.spec 6 Jul 2009 22:54:34 -0000 1.206
+++ krb5.spec 6 Jul 2009 22:56:11 -0000 1.207
@@ -208,6 +208,8 @@ certificate.
%changelog
* Mon Jul 6 2009 Nalin Dahyabhai <nalin at redhat.com>
+- simplify the man pages patch by only preprocessing the files we care about
+ and moving shared configure.in logic into a shared function
- catch the case of ftpd printing file sizes using %i, when they might be
bigger than an int now
- Previous message (by thread): rpms/krb5/devel krb5.spec, 1.205, 1.206 krb5-1.7-largefile.patch, 1.1, 1.2
- Next message (by thread): rpms/kernel/F-10 drm-connector-dpms-fix.patch, NONE, 1.1 drm-radeon-cs-oops-fix.patch, NONE, 1.1 drm-radeon-fix-ring-commit.patch, NONE, 1.1 kernel.spec, 1.1392, 1.1393
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list