From 423d0d2f67fab749bba1fb7334da11e71731372b Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Thu, 15 Nov 2012 15:47:28 -0500 Subject: [PATCH] update the paths-in-man-pages patch --- krb5-1.10-manpaths.txt | 7 -- krb5-1.10.2-manpaths.patch | 190 ------------------------------------- krb5-1.11-manpaths.patch | 51 ++++++++++ krb5-1.11-manpaths.txt | 6 ++ krb5.spec | 10 +- 5 files changed, 61 insertions(+), 203 deletions(-) delete mode 100644 krb5-1.10-manpaths.txt delete mode 100644 krb5-1.10.2-manpaths.patch create mode 100644 krb5-1.11-manpaths.patch create mode 100644 krb5-1.11-manpaths.txt diff --git a/krb5-1.10-manpaths.txt b/krb5-1.10-manpaths.txt deleted file mode 100644 index 16cbbb6..0000000 --- a/krb5-1.10-manpaths.txt +++ /dev/null @@ -1,7 +0,0 @@ -appl/sample/sserver/sserver.M -config-files/kdc.conf.M -config-files/krb5.conf.M -gen-manpages/kerberos.M -kadmin/cli/kadmin.M -slave/kpropd.M -slave/kprop.M diff --git a/krb5-1.10.2-manpaths.patch b/krb5-1.10.2-manpaths.patch deleted file mode 100644 index 2ef0a83..0000000 --- a/krb5-1.10.2-manpaths.patch +++ /dev/null @@ -1,190 +0,0 @@ -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. Originally RT#6525 - ---- krb5/src/aclocal.m4 -+++ krb5/src/aclocal.m4 -@@ -1770,3 +1770,24 @@ AC_SUBST(PAM_LIBS) - 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"` -+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_CONFIG_FILES($1) -+]) ---- krb5/src/configure.in -+++ krb5/src/configure.in -@@ -1054,6 +1054,17 @@ fi - AC_SUBST(localedir) - - AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config]) -+ -+V5_AC_OUTPUT_MANPAGE([ -+ appl/sample/sserver/sserver.M -+ config-files/kdc.conf.M -+ config-files/krb5.conf.M -+ gen-manpages/kerberos.M -+ kadmin/cli/kadmin.M -+ slave/kpropd.M -+ slave/kprop.M -+]) -+ - V5_AC_OUTPUT_MAKEFILE(. - - util util/support util/profile util/profile/testmod util/send-pr ---- krb5/src/appl/sample/sserver/sserver.M -+++ krb5/src/appl/sample/sserver/sserver.M -@@ -59,7 +59,7 @@ option allows for a different keytab tha - 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: ---- krb5/src/config-files/kdc.conf.M -+++ krb5/src/config-files/kdc.conf.M -@@ -82,14 +82,14 @@ This - .B string - specifies the location of the access control list (acl) file that - kadmin uses to determine which principals are allowed which permissions --on the database. The default value is /usr/local/var/krb5kdc/kadm5.acl. -+on the database. The default value is @manlocalstatedir@/krb5kdc/kadm5.acl. - - .IP admin_keytab - This - .B string - Specifies the location of the keytab file that kadmin uses to - authenticate to the database. The default value is --/usr/local/var/krb5kdc/kadm5.keytab. -+@manlocalstatedir@/krb5kdc/kadm5.keytab. - - .IP database_name - This -@@ -254,7 +254,7 @@ tickets should be checked against the tr - realm names and the [capaths] section of its krb5.conf file - - .SH FILES --/usr/local/var/krb5kdc/kdc.conf -+@manlocalstatedir@/krb5kdc/kdc.conf - - .SH SEE ALSO - krb5.conf(5), krb5kdc(8) ---- krb5/src/config-files/krb5.conf.M -+++ krb5/src/config-files/krb5.conf.M -@@ -808,6 +808,6 @@ is whitespace-separated. The LDAP server - This module implements the encrypted timestamp mechanism. - - .SH FILES --/etc/krb5.conf -+@mansysconfdir@/krb5.conf - .SH SEE ALSO - syslog(3) ---- krb5/src/gen-manpages/kerberos.M -+++ krb5/src/gen-manpages/kerberos.M -@@ -126,7 +126,7 @@ - Specifies the location of the KDC configuration file, which contains - additional configuration directives for the Key Distribution Center - daemon and associated programs. The default is --/usr/local/var/krb5kdc/kdc.conf. -+@manlocalstatedir@/krb5kdc/kdc.conf. - .TP - .B KRB5RCACHETYPE - Specifies the default type of replay cache to use for servers. Valid ---- krb5/src/kadmin/cli/kadmin.M -+++ krb5/src/kadmin/cli/kadmin.M -@@ -869,9 +869,9 @@ option is specified, less verbose status - .RS - .TP - EXAMPLE: --kadmin: ktremove -k /usr/local/var/krb5kdc/kadmind.keytab kadmin/admin -+kadmin: ktremove -k @manlocalstatedir@/krb5kdc/kadmind.keytab kadmin/admin - Entry for principal kadmin/admin with kvno 3 removed -- from keytab WRFILE:/usr/local/var/krb5kdc/kadmind.keytab. -+ from keytab WRFILE:@manlocalstatedir@/krb5kdc/kadmind.keytab. - kadmin: - .RE - .fi ---- krb5/src/slave/kpropd.M -+++ krb5/src/slave/kpropd.M -@@ -74,7 +74,7 @@ Normally, kpropd is invoked out of - This is done by adding a line to the inetd.conf file which looks like - this: - --kprop stream tcp nowait root /usr/local/sbin/kpropd kpropd -+kprop stream tcp nowait root @mansbindir@/kpropd kpropd - - However, kpropd can also run as a standalone daemon, if the - .B \-S -@@ -111,13 +111,13 @@ is used. - \fB\-f\fP \fIfile\fP - specifies the filename where the dumped principal database file is to be - stored; by default the dumped database file is KPROPD_DEFAULT_FILE --(normally /usr/local/var/krb5kdc/from_master). -+(normally @manlocalstatedir@/krb5kdc/from_master). - .TP - .B \-p - allows the user to specify the pathname to the - .IR kdb5_util (8) - program; by default the pathname used is KPROPD_DEFAULT_KDB5_UTIL --(normally /usr/local/sbin/kdb5_util). -+(normally @mansbindir@/kdb5_util). - .TP - .B \-S - turn on standalone mode. Normally, kpropd is invoked out of -@@ -148,14 +148,14 @@ mode. - allows the user to specify the path to the - kpropd.acl - file; by default the path used is KPROPD_ACL_FILE --(normally /usr/local/var/krb5kdc/kpropd.acl). -+(normally @manlocalstatedir@/krb5kdc/kpropd.acl). - .SH FILES - .TP "\w'kpropd.acl\ \ 'u" - kpropd.acl - Access file for - .BR kpropd ; - the default location is KPROPD_ACL_FILE (normally --/usr/local/var/krb5kdc/kpropd.acl). -+@manlocalstatedir@/krb5kdc/kpropd.acl). - Each entry is a line containing the principal of a host from which the - local machine will allow Kerberos database propagation via kprop. - .SH SEE ALSO ---- krb5/src/slave/kprop.M -+++ krb5/src/slave/kprop.M -@@ -39,7 +39,7 @@ Kerberos server to a slave Kerberos serv - This is done by transmitting the dumped database file to the slave - server over an encrypted, secure channel. The dump file must be created - by kdb5_util, and is normally KPROP_DEFAULT_FILE --(/usr/local/var/krb5kdc/slave_datatrans). -+(@manlocalstatedir@/krb5kdc/slave_datatrans). - .SH OPTIONS - .TP - \fB\-r\fP \fIrealm\fP -@@ -51,7 +51,7 @@ is used. - \fB\-f\fP \fIfile\fP - specifies the filename where the dumped principal database file is to be - found; by default the dumped database file is KPROP_DEFAULT_FILE --(normally /usr/local/var/krb5kdc/slave_datatrans). -+(normally @manlocalstatedir@/krb5kdc/slave_datatrans). - .TP - \fB\-P\fP \fIport\fP - specifies the port to use to contact the diff --git a/krb5-1.11-manpaths.patch b/krb5-1.11-manpaths.patch new file mode 100644 index 0000000..4799a9d --- /dev/null +++ b/krb5-1.11-manpaths.patch @@ -0,0 +1,51 @@ +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. Originally RT#6525 + +--- krb5/src/aclocal.m4 ++++ krb5/src/aclocal.m4 +@@ -1770,3 +1770,24 @@ AC_SUBST(PAM_LIBS) + 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"` ++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_CONFIG_FILES($1) ++]) +--- krb5/src/configure.in ++++ krb5/src/configure.in +@@ -1054,6 +1054,16 @@ fi + [Define to default client keytab name]) + + AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config]) ++ ++V5_AC_OUTPUT_MANPAGE([ ++ ../doc/admins/admin_commands/sserver.rst ++ ../doc/admins/admin_commands/kadmin_local.rst ++ ../doc/admins/admin_commands/kprop.rst ++ ../doc/admins/admin_commands/kpropd.rst ++ ../doc/admins/conf_files/kdc_conf.rst ++ ../doc/admins/conf_files/krb5_conf.rst ++]) ++ + V5_AC_OUTPUT_MAKEFILE(. + + util util/support util/profile util/profile/testmod util/send-pr diff --git a/krb5-1.11-manpaths.txt b/krb5-1.11-manpaths.txt new file mode 100644 index 0000000..ebb1c10 --- /dev/null +++ b/krb5-1.11-manpaths.txt @@ -0,0 +1,6 @@ +doc/admins/admin_commands/sserver.rst +doc/admins/admin_commands/kadmin_local.rst +doc/admins/admin_commands/kprop.rst +doc/admins/admin_commands/kpropd.rst +doc/admins/conf_files/kdc_conf.rst +doc/admins/conf_files/krb5_conf.rst diff --git a/krb5.spec b/krb5.spec index 18f573c..a821c2f 100644 --- a/krb5.spec +++ b/krb5.spec @@ -42,7 +42,7 @@ Source10: kdc.conf Source11: kadm5.acl Source19: krb5kdc.sysconfig Source20: kadmin.sysconfig -Source25: krb5-1.10-manpaths.txt +Source25: krb5-1.11-manpaths.txt Source29: ksu.pamd Source30: kerberos-iv.portreserve Source31: kerberos-adm.portreserve @@ -65,7 +65,7 @@ Patch39: krb5-1.8-api.patch Patch56: krb5-1.10-doublelog.patch Patch59: krb5-1.10-kpasswd_tcp.patch Patch60: krb5-1.11-pam.patch -Patch61: krb5-1.10.2-manpaths.patch +Patch61: krb5-1.11-manpaths.patch Patch63: krb5-1.10.2-selinux-label.patch Patch71: krb5-1.9-dirsrv-accountlock.patch Patch75: krb5-pkinit-debug.patch @@ -236,7 +236,7 @@ to obtain initial credentials from a KDC using a private key and a certificate. %prep -%setup -q -a 23 -n %{name}-%{version}-alpha1 +%setup -q -n %{name}-%{version}-alpha1 ln -s NOTICE LICENSE %patch60 -p1 -b .pam @@ -265,13 +265,11 @@ ln -s NOTICE LICENSE chmod -x doc/krb5-protocol/*.txt # Rename the man pages so that they'll get generated correctly. Uses the -# "krb5-1.8-manpaths.txt" source file. +# "krb5-1.11-manpaths.txt" source file. if test -z "%{?_rawbuild}" ; then - pushd src cat %{SOURCE25} | while read manpage ; do mv "$manpage" "$manpage".in done - popd fi # Generate an FDS-compatible LDIF file.